#2063 add 5 new countries to international flags module (#2064)

* #2063 add 5 new countries to international flags module * #2063 add 5 new countries to international flags module (review) * release_notes.md translator * #2063 the flag files
ho-dev · May 8, 2024 · 6caf5cc · 6caf5cc
1 parent 53f0d82
commit 6caf5cc
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/core/db/IfaMatchTable.java b/src/main/java/core/db/IfaMatchTable.java
@@ -69,10 +69,10 @@ void insertMatch(IfaMatch match) {
  store(match);
  }
 
- @Override
- protected String createSelectStatement(){
- return createSelectStatement("");
- }
+// @Override
+// protected String createSelectStatement(){
+// return createSelectStatement("");
+// }
  void deleteAllMatches() {
  executePreparedDelete();
  }

diff --git a/src/main/java/core/model/WorldDetailLeague.java b/src/main/java/core/model/WorldDetailLeague.java
@@ -153,6 +153,11 @@ public class WorldDetailLeague extends AbstractTable.Storable {
  new WorldDetailLeague(163,191,"San Marino"),
  new WorldDetailLeague(164,188,"Haiti"),
  new WorldDetailLeague(165,190,"Puerto Rico"),
+ new WorldDetailLeague(166,194,"Grenada"),
+ new WorldDetailLeague(167,193,"Burkina Faso"),
+ new WorldDetailLeague(168,192,"Nepal"),
+ new WorldDetailLeague(169,197,"Guyana"),
+ new WorldDetailLeague(170,196,"Tahiti"),
  new WorldDetailLeague(1000,1000,"International")
  };
 

diff --git a/src/main/java/module/ifa/FlagPanel.java b/src/main/java/module/ifa/FlagPanel.java
@@ -74,7 +74,7 @@ private void initialize(boolean away, IfaModel ifaModel, FlagDisplayModel flagDi
  constraints.gridwidth = 1;
 
  if (this.flagLabels != null) {
- int i=0;
+ int i = 0;
  for (var flagLabel : this.flagLabels) {
  constraints.gridx = i % flagDisplayModel.getFlagWidth();
  constraints.gridy = 2 + i / flagDisplayModel.getFlagWidth();
@@ -94,11 +94,11 @@ void setHeaderVisible(boolean enable) {
  }
 
  private void createFlagLabels(boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) {
- this.flagLabels = new ArrayList<FlagLabel>();
+ this.flagLabels = new ArrayList<>();
  WorldDetailsManager.instance().getLeagues().stream()
- .filter(l->l.getLeagueId()!=APACHE_LEAGUE_ID)
- .sorted((l1,l2)-> ObjectUtils.compare(l1.getCountryName(),l2.getCountryName()))
- .forEach(l->addFlagLabel(l, away, ifaModel, flagDisplayModel));
+ .filter(l -> l.getLeagueId() != APACHE_LEAGUE_ID)
+ .sorted((l1, l2) -> ObjectUtils.compare(l1.getCountryName(), l2.getCountryName()))
+ .forEach(l -> addFlagLabel(l, away, ifaModel, flagDisplayModel));
  }
 
  private void addFlagLabel(WorldDetailLeague league, boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) {
@@ -107,13 +107,7 @@ private void addFlagLabel(WorldDetailLeague league, boolean away, IfaModel ifaMo
  flagLabel.setCountryName(league.getCountryName());
  flagLabel.setIcon(ImageUtilities.getCountryFlagIcon(flagLabel.getCountryId()));
  flagLabel.setToolTipText(flagLabel.getCountryName());
-
- if ((away && ifaModel.isVisited(league.getCountryId()))
- || (!away && ifaModel.isHosted(league.getCountryId()))) {
- flagLabel.setEnabled(true);
- } else {
- flagLabel.setEnabled(false);
- }
+ flagLabel.setEnabled((away && ifaModel.isVisited(league.getCountryId())) || (!away && ifaModel.isHosted(league.getCountryId())));
  this.flagLabels.add(flagLabel);
  }
 }
diff --git a/src/main/resources/flags/166flag.png b/src/main/resources/flags/166flag.png
diff --git a/src/main/resources/flags/167flag.png b/src/main/resources/flags/167flag.png
diff --git a/src/main/resources/flags/168flag.png b/src/main/resources/flags/168flag.png
diff --git a/src/main/resources/flags/169flag.png b/src/main/resources/flags/169flag.png
diff --git a/src/main/resources/flags/170flag.png b/src/main/resources/flags/170flag.png
diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md
@@ -76,18 +76,19 @@
  HO now downloads the update in the browser when HO install is un-managed.
 * Enable standard custom popup menu in oauth dialog's text fields (#1471)
 * Move previous series download checkbox to the check box tree of download dialog (#1434)
+* Add 5 new countries to international flag module (#2063)
 
 ## Translations
 
-Reports by Contributors - September 24, 2023 - April 28, 2024
+Reports by Contributors - September 24, 2023 - May 05, 2024
 
 * wsbrenk 355
+* \_KOHb\_ 230
 * Lidegand 178
 * Sebastien 156
 * Achilles 70
-* \_KOHb\_ 22
 * Georgi 10
 * Moorhuhninho 3
 * sich 3
 
-Total 797
+Total 1025