From 8b585e25dff338b006ec71ac8bab9ac6d000e4ef Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Sun, 5 May 2024 18:12:44 +0200 Subject: [PATCH 1/4] #2063 add 5 new countries to international flags module --- src/main/java/core/db/IfaMatchTable.java | 8 ++++---- src/main/java/core/model/WorldDetailLeague.java | 5 +++++ src/main/java/module/ifa/FlagPanel.java | 2 +- src/main/resources/release_notes.md | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/core/db/IfaMatchTable.java b/src/main/java/core/db/IfaMatchTable.java index e83395b5e..bbaa88758 100644 --- 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 index 22081353d..57d9f4968 100644 --- 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 index c5791c154..1d4a5b78e 100644 --- a/src/main/java/module/ifa/FlagPanel.java +++ b/src/main/java/module/ifa/FlagPanel.java @@ -94,7 +94,7 @@ void setHeaderVisible(boolean enable) { } private void createFlagLabels(boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) { - this.flagLabels = new ArrayList(); + this.flagLabels = new ArrayList<>(); WorldDetailsManager.instance().getLeagues().stream() .filter(l->l.getLeagueId()!=APACHE_LEAGUE_ID) .sorted((l1,l2)-> ObjectUtils.compare(l1.getCountryName(),l2.getCountryName())) diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md index 0091c5820..4dcc2b8cd 100644 --- a/src/main/resources/release_notes.md +++ b/src/main/resources/release_notes.md @@ -75,6 +75,7 @@ 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 From 4f727df3b9ebe33465cca75ee996878ace979302 Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Sun, 5 May 2024 18:14:19 +0200 Subject: [PATCH 2/4] #2063 add 5 new countries to international flags module (review) --- src/main/java/module/ifa/FlagPanel.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/module/ifa/FlagPanel.java b/src/main/java/module/ifa/FlagPanel.java index 1d4a5b78e..5428a3ba8 100644 --- 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(); @@ -96,9 +96,9 @@ void setHeaderVisible(boolean enable) { private void createFlagLabels(boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) { 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); } } From 5312851c3a9015da5abce25abf1bc4b659630a12 Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Sun, 5 May 2024 18:22:02 +0200 Subject: [PATCH 3/4] release_notes.md translator --- src/main/resources/release_notes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md index 4dcc2b8cd..c7d6eabe4 100644 --- a/src/main/resources/release_notes.md +++ b/src/main/resources/release_notes.md @@ -79,15 +79,15 @@ ## 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 From 13a40356bbee47daa63877da5b67b1aecbbfd24d Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Sun, 5 May 2024 18:33:18 +0200 Subject: [PATCH 4/4] #2063 the flag files --- src/main/resources/flags/166flag.png | Bin 852 -> 463 bytes src/main/resources/flags/167flag.png | Bin 0 -> 191 bytes src/main/resources/flags/168flag.png | Bin 0 -> 530 bytes src/main/resources/flags/169flag.png | Bin 0 -> 355 bytes src/main/resources/flags/170flag.png | Bin 0 -> 392 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/flags/167flag.png create mode 100644 src/main/resources/flags/168flag.png create mode 100644 src/main/resources/flags/169flag.png create mode 100644 src/main/resources/flags/170flag.png diff --git a/src/main/resources/flags/166flag.png b/src/main/resources/flags/166flag.png index 856199dbbe420165f0ac8252a474d5bd4b55441c..d0081f8f6b59edc23847d076c2176aa9c77428cb 100644 GIT binary patch delta 438 zcmV;n0ZIPU2G0YKBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj5v`|b`Ma~f> z&JZTf4kpbGCd~~d*gYc85GKGMD$PnI;ZY#nP9frFAKXqM(GMkzG&m@XQ=GCf^3NIn z(-r*E7W~r|^3WM5j8cm;H~@QJ0C`_9i%_JqFZIqC|I!uw(SH{G(-s7MT>yGsH;qoM zwk`C_819xEIE_w+GC6>!Ienr!0efBmd|qs9K<8>6h%z~Fn?8$#HwAuNYGy&_YaRl6 zUG>Zu?w1?=)E58L72QuE;$|Ps3?}AullK4s010qNS#tmY4#NNd4#NS*Z>VGd005*( zL_t&-S51%C5`Tg)6a_;G9i=IRY6NV61w`8a|Ca_PgAe<%Gk4Bj02r3zA>=6>%K#vV zlB}qzrY$J4Bnm*^Yz@=09mghEJ7d4mf$n<955g!;k~j(jA9*g32ZZo3&GI};PZ;4@ zo-fxMMnzdwWq~kWH0xUS_5c6?07*qoM6N<$f~}#oxc~qF literal 852 zcmWlXA?RN>5XTS7Ae5G#n91CeaSL<5sXqQ?`-f6W=uFh$$sbiQg}Cy}ATly;L}o7X zQ7R(JAY!m*22Y+Vkx#y*;w~ZIz}7Y#*fLteLD|m$id2Wyr__Y zu~qh)Y?AZ<2 zlUR|h^Sq*UfkED-(k9SB)ccgN0bjPY1WU%%eCsiD&YDEImKlR#Xmukj84HR-b*?J6 z7ZZ@sO4VH3 zye%#fZbma8>(JKG4IiW0ZaNz*?uLkPAfSw7d7F95sAm~WIkfLO1hpC0`BG2xquhb@ z(0X<;*r?;;tnR!UD+4D%vSeAvmTU`eh7%)QvM#iF$LCb$JV~Y(5sqBERc5DKv>a3x zO3EG+&9X+urSxmHsJbE4TH-uFZFkM*jB6rq)>;xVC2izxG;c?El8z*0IY#K&lHg_@ z7pY0pAji0gi*mj?-zQ*}FR~x99^dGw+u_!@4UnSWh2Vnvwzo~FrS1Ld$Jj;}B1N25 z!?n-nsHpQdnJn^Y0)32az^=PXGV_ diff --git a/src/main/resources/flags/167flag.png b/src/main/resources/flags/167flag.png new file mode 100644 index 0000000000000000000000000000000000000000..08433e7cf7f59d5fc542de7dd03f219de03c525e GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W;!VDxQC^eh_QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`6$5-iT;FT!zSq%xuc`YfP~%at+K|MEi1Fc*>aWbgtpAR zK*gK|9+AZi419+{nDKc2iWH!rx~Gd{h{WY&1ug@w12a##6)elPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jEhsK~y+TV^BA0 zS;KACug*Xvz+B8JvoiG4{m75<0SpgyOD-_nTk#tzM;2iA6wqz(`|^;>^xG>}(eJNZ zA1H?1{rr5-eW*OifQgZbk>NiVCxg79GDF(8yQY&~o!B0#RXCHudX_X)4QZg?Amjg+ z*{lD9z=ytt{~yXZ|GzA1|G!@``jNSQZ8C$$PFAQ=q5!iihkAp?yQd6aAH8BYd*JH7 zr_VnAde6e~U*zu(UfJJYeO~|hX8KGq>l8#3A7Eer05F}h UqdQxBQ~&?~07*qoM6N<$g2CANzyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/flags/169flag.png b/src/main/resources/flags/169flag.png new file mode 100644 index 0000000000000000000000000000000000000000..80b921a55356f9114760674db402abf777b45482 GIT binary patch literal 355 zcmV-p0i6DcP)c+9(N>3NFPeYH_hHQYmi!LvZS#I29MsQE>1R`2`e(R_Ih*ThuPr!J!(5 zq#7EmN%3u8X+fbVh!VW@?wQZ*o%v6)Z1C7Mk5QO7+;aRFON%6(t*sM~j-_jI5pnMt72mHu7vdxkDL}F90 zmmOp{qC(fas-x&>>`;n=Ymm2WF6=wZ*E(;VcCYPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ub$1K~yMHWBkL! z!ay!yg3@FG#$OXAGBGnkc?j^If#KP|tM~p1aCo?OW<{u0U-T%Ms{@ePNL7tU4Mu3samw_Rl zfdM^qu=x4MuP={ZzIt<3`iZvd3n7U)u&_r~AMf0!U%;&BfT|T38^{?^e zf9AK&XkNUf|MwqexM0)F%FO%uo6Y5)`seR(pTEy@;k(A$4`xh^oKR^b!1(jkD-1s~ z+u-lHJZEBLv^A8J5XNFH m5HS8^!V*zL0t!+X0|Nl0c3qn_#$#Uq0000