From 676b8dbee01f0efcee7594ee9383573404e2b5da Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sat, 17 Jan 2026 14:21:35 +0100 Subject: [PATCH 01/51] chore(lang): zh_TW --- .../client/scenes/LangSelectMenuCtrl.java | 2 +- client/src/main/resources/flag_zht.png | Bin 0 -> 1101 bytes .../src/main/resources/locale/lang.properties | 3 +- .../main/resources/locale/lang_en.properties | 3 +- .../main/resources/locale/lang_nl.properties | 9 +++-- .../main/resources/locale/lang_pl.properties | 3 +- .../main/resources/locale/lang_tok.properties | 3 +- .../main/resources/locale/lang_zht.properties | 35 ++++++++++++++++++ 8 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 client/src/main/resources/flag_zht.png create mode 100644 client/src/main/resources/locale/lang_zht.properties diff --git a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java index 8cb6ddf..15331ad 100644 --- a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java +++ b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java @@ -45,7 +45,7 @@ public class LangSelectMenuCtrl implements LocaleAware { @Override public void initializeComponents() { - langSelectMenu.getItems().setAll("en", "pl", "nl", "tok", "tr"); + langSelectMenu.getItems().setAll("en", "pl", "nl", "zht", "tok", "tr"); langSelectMenu.setValue(manager.getLocale().getLanguage()); langSelectMenu.setConverter(new StringConverter() { @Override diff --git a/client/src/main/resources/flag_zht.png b/client/src/main/resources/flag_zht.png new file mode 100644 index 0000000000000000000000000000000000000000..5c5b076b7b70071eeea143fbc117c6d73a11e7fa GIT binary patch literal 1101 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|WDa zPZ!6KiaBp*`Flr4O0>^E@?W`g!tEoGE&<|wAYo$u>0Q_ai)9GmN(`S zi77|Uo#>E#?5OXWsVMe&()oIUiF-M=Fg$y9?@@`?k)-4Z9o?ASX|91$0aN~FcQ0*? z$l+NYoS64+?UG{OOq)F(Dn%mQ))q2iOpNRgKNxM#`^)E`x7}6Y!GVVx0(9O@@OW~h zCENG$hXVCZm%gIP{s0YMlU>Ko&c1JC{8_oVS&ZRQ=2VZA*4x|DKUD43oc=u{!{9;D z%?}m3Hbg~NetDs9W?tU1{PTaq5Ur_ulM35`+BK#mmVM)6W}dccuCe6Qix;Q+`0yAQ z8hW_98=p*J+-~i)uwYxM;~o(|HSQTczAlTikNe3bBpf*O=8f#4i>5xymNlQ;Z}Iub zeio^D_W$2aU%S?5?%ewY|Lg8|GUseFi`)NidiZ)X4wiooq1(@^elXtrT&g~<$JRFO z(8JW4eUsJeJI-Hsx7g$3-yd1+dQJP7%Okn6>fPHO%xyd9$X!-#-Fd{;%uMdXo16SS z{qbv0Z`ygTe*fpoFN%C8pU$1=w>oBj-P4d}pr>=b+3H<4@%FCNn##Rxk3-Mu)w6&6 z{p+Hny3qR_0cb9Lxd27ZjuZdnO zOG->07u{5uo82YWaQyPptKU}bI(sQ-o>Ss%r^NqJq1y|0$4~GP14c1K$<UJx&Qy4PwKYrOLwi} zz2Mif%2z||beL>NKfC;Y*T;pu`S)_-rnO7N|4sAYcZhP3a+Y-2&p+YW>i_I77(KW> q7PBkpD)h=VY-un7XCLwf Date: Sat, 17 Jan 2026 14:26:34 +0100 Subject: [PATCH 02/51] chore(lang): adds Chinese that looks just a liiiiiiittle bit different --- .../client/scenes/LangSelectMenuCtrl.java | 2 +- client/src/main/resources/flag_zhc.png | Bin 0 -> 1112 bytes .../src/main/resources/locale/lang.properties | 1 + .../main/resources/locale/lang_en.properties | 1 + .../main/resources/locale/lang_nl.properties | 1 + .../main/resources/locale/lang_pl.properties | 1 + .../main/resources/locale/lang_tr.properties | 11 +++-- .../main/resources/locale/lang_zhc.properties | 38 ++++++++++++++++++ .../main/resources/locale/lang_zht.properties | 5 ++- 9 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 client/src/main/resources/flag_zhc.png create mode 100644 client/src/main/resources/locale/lang_zhc.properties diff --git a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java index 15331ad..cc764f0 100644 --- a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java +++ b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java @@ -45,7 +45,7 @@ public class LangSelectMenuCtrl implements LocaleAware { @Override public void initializeComponents() { - langSelectMenu.getItems().setAll("en", "pl", "nl", "zht", "tok", "tr"); + langSelectMenu.getItems().setAll("en", "pl", "nl", "zht", "zhc", "tok", "tr"); langSelectMenu.setValue(manager.getLocale().getLanguage()); langSelectMenu.setConverter(new StringConverter() { @Override diff --git a/client/src/main/resources/flag_zhc.png b/client/src/main/resources/flag_zhc.png new file mode 100644 index 0000000000000000000000000000000000000000..e14c147a5757c701e991fc5de19b6752db353a24 GIT binary patch literal 1112 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|N_} zr;B4q#hkY@{WD}jWscjwKYQlgnRjXBxzf5VTQUSfR&nSaUDUzGqAwQ}BET=Vgngmt z6tDMHUzUmRR|)D|;@Zn;$sxK*{9qgtuZWUIF4MBk**Rt9W&dpXy(gRc-ne`7%|DHE z&rMG6oB4C!`Pr5K-E{3@P5<;?yu`TVB#Q@oK;OYtDoNkP1ry|bH1-KB&^i3X-FMBV z7;_aRg{Z4j;} zIoUdS?y}o|EX^-e-rKBr?_Od-zG~ zvWTaN9E`V2D~=yt`}jzB?fmQ)Q+%C{z6!s$?*Bb~_3iD#T`T9ksVrT}Gu1eE)%zd(89`hHyXvY7zPz$ZTi(o) zb$|Do_|wTg@5^slPD+sV=?F6kGgY$}4z_(9y!#nnz|w;Od&8RF84LE;T{7cFHTkj2jCjTy;8^@!vp!(3`^SAHVnjgGdEd1m1w{@wPlEQ`g_S~2HW%c($z4{8C z%lGpVLV5qkltu2}WxGu~b;X{$&nA}FKAQFDT=mm^$NtWJvMkwaJ)6a4&emYX-q(B| zmo54>*Zq!!@BT~Qg(uW&9dp@Gv(e>k*YEjUQj1r_7Dn!iIOH;SQzpl|h%NciJI
sUx!|+dkqf(C3jE1TWU&+IsN4RLaefEZrkL6CEHdIhr@b~z) zT=_eqa{7bP0l+XkKZqy4E literal 0 HcmV?d00001 diff --git a/client/src/main/resources/locale/lang.properties b/client/src/main/resources/locale/lang.properties index ced09f0..7622bb6 100644 --- a/client/src/main/resources/locale/lang.properties +++ b/client/src/main/resources/locale/lang.properties @@ -33,3 +33,4 @@ lang.pl.display=Polish lang.tok.display=toki pona lang.tr.display=T\u00FCrk\u00E7e lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_en.properties b/client/src/main/resources/locale/lang_en.properties index c9cfb45..02c0e2d 100644 --- a/client/src/main/resources/locale/lang_en.properties +++ b/client/src/main/resources/locale/lang_en.properties @@ -35,3 +35,4 @@ lang.pl.display=Polski lang.tok.display=toki pona lang.tr.display=T\u00FCrk\u00E7e lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_nl.properties b/client/src/main/resources/locale/lang_nl.properties index c234c7b..1ebead8 100644 --- a/client/src/main/resources/locale/lang_nl.properties +++ b/client/src/main/resources/locale/lang_nl.properties @@ -34,3 +34,4 @@ lang.pl.display=Polski lang.tok.display=toki pona lang.tr.display=T\u00FCrk\u00E7e lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_pl.properties b/client/src/main/resources/locale/lang_pl.properties index fd5412e..e46b4d1 100644 --- a/client/src/main/resources/locale/lang_pl.properties +++ b/client/src/main/resources/locale/lang_pl.properties @@ -35,3 +35,4 @@ lang.pl.display=Polski lang.tok.display=toki pona lang.tr.display=T\u00FCrk\u00E7e lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_tr.properties b/client/src/main/resources/locale/lang_tr.properties index 1b4ceb6..917c3c9 100644 --- a/client/src/main/resources/locale/lang_tr.properties +++ b/client/src/main/resources/locale/lang_tr.properties @@ -27,7 +27,12 @@ menu.button.print=Tarifi Yazd\u0131r menu.label.selected-langs=Diller -lang.en.display=\u0130ngilizce -lang.nl.display=Hollandaca -lang.pl.display=Leh\u00E7e +menu.search=Aramak + +lang.en.display=English +lang.nl.display=Nederlands +lang.pl.display=Polski +lang.tok.display=toki pona lang.tr.display=T\u00FCrk\u00E7e +lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_zhc.properties b/client/src/main/resources/locale/lang_zhc.properties new file mode 100644 index 0000000..646ce54 --- /dev/null +++ b/client/src/main/resources/locale/lang_zhc.properties @@ -0,0 +1,38 @@ +add.ingredient.title=添加配料 +add.recipe.title=创建食谱 +add.step.title=添加步骤 + +add.ingredient.label=配料 +add.recipe.label=食谱名称 +add.step.label=步骤 + +button.ok=确认 +button.cancel=取消 + +menu.label.recipes=食谱 +menu.label.ingredients=配料 +menu.label.preparation=准备步骤 + +menu.button.add.recipe=创建食谱 +menu.button.add.ingredient=添加配料 +menu.button.add.step=添加步骤 + +menu.button.remove.recipe=清除食谱 +menu.button.remove.ingredient=清除配料 +menu.button.remove.step=清除步骤 + +menu.button.edit=编辑 +menu.button.clone=复制 +menu.button.print=打印食谱 + +menu.search=搜索 + +menu.label.selected-langs=语言 + +lang.en.display=English +lang.nl.display=Nederlands +lang.pl.display=Polski +lang.tok.display=toki pona +lang.tr.display=T\u00FCrk\u00E7e +lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） diff --git a/client/src/main/resources/locale/lang_zht.properties b/client/src/main/resources/locale/lang_zht.properties index 6b604b9..fe5c3fb 100644 --- a/client/src/main/resources/locale/lang_zht.properties +++ b/client/src/main/resources/locale/lang_zht.properties @@ -32,4 +32,7 @@ menu.label.selected-langs=語言 lang.en.display=English lang.nl.display=Nederlands lang.pl.display=Polski -lang.zht.display=中文（台灣） \ No newline at end of file +lang.tok.display=toki pona +lang.tr.display=T\u00FCrk\u00E7e +lang.zht.display=中文（台灣） +lang.zhc.display=中文（中国大陆） From 638220bb07434659b8e871006a6e5c5fb37c1669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Rasie=C5=84ski?= Date: Wed, 21 Jan 2026 13:51:11 +0100 Subject: [PATCH 03/51] Fixed lang in main menu --- .../java/client/scenes/FoodpalApplicationCtrl.java | 6 ++++++ .../java/client/scenes/LangSelectMenuCtrl.java | 1 + client/src/main/resources/locale/lang.properties | 6 +++++- .../src/main/resources/locale/lang_en.properties | 8 +++++--- .../src/main/resources/locale/lang_nl.properties | 14 ++++++++------ .../src/main/resources/locale/lang_pl.properties | 8 +++++--- .../src/main/resources/locale/lang_tok.properties | 2 ++ .../src/main/resources/locale/lang_tr.properties | 4 ++++ 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java index e7cb0df..fb24069 100644 --- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java +++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java @@ -84,6 +84,9 @@ public class FoodpalApplicationCtrl implements LocaleAware { @FXML private ToggleButton favouritesOnlyToggle; + @FXML + private Button manageIngredientsButton; + private List allRecipes = new ArrayList<>(); @FXML @@ -290,6 +293,9 @@ public class FoodpalApplicationCtrl implements LocaleAware { removeRecipeButton.setText(getLocaleString("menu.button.remove.recipe")); cloneRecipeButton.setText(getLocaleString("menu.button.clone")); recipesLabel.setText(getLocaleString("menu.label.recipes")); + + favouritesOnlyToggle.setText(getLocaleString("menu.button.favourites")); + manageIngredientsButton.setText(getLocaleString("menu.button.ingredients")); } @Override diff --git a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java index 8cb6ddf..0dc719a 100644 --- a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java +++ b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java @@ -41,6 +41,7 @@ public class LangSelectMenuCtrl implements LocaleAware { String lang = langSelectMenu.getSelectionModel().getSelectedItem(); logger.info("Switching locale to " + lang); manager.setLocale(Locale.of(lang)); + initializeComponents(); } @Override diff --git a/client/src/main/resources/locale/lang.properties b/client/src/main/resources/locale/lang.properties index df67ba5..00bfea8 100644 --- a/client/src/main/resources/locale/lang.properties +++ b/client/src/main/resources/locale/lang.properties @@ -16,6 +16,8 @@ menu.label.preparation=Preparation menu.button.add.recipe=Add Recipe menu.button.add.ingredient=Add Ingredient menu.button.add.step=Add Step +menu.button.favourites=Favourites +menu.button.ingredients=Ingredients menu.button.remove.recipe=Remove Recipe menu.button.remove.ingredient=Remove Ingredient @@ -25,10 +27,12 @@ menu.button.edit=Edit menu.button.clone=Clone menu.button.print=Print recipe +menu.search=Search... + menu.label.selected-langs=Languages lang.en.display=English lang.nl.display=Dutch lang.pl.display=Polish lang.tok.display=toki pona -lang.tr.display=T\u00FCrk\u00E7e \ No newline at end of file +lang.tr.display=Turkish \ No newline at end of file diff --git a/client/src/main/resources/locale/lang_en.properties b/client/src/main/resources/locale/lang_en.properties index 2344205..00bfea8 100644 --- a/client/src/main/resources/locale/lang_en.properties +++ b/client/src/main/resources/locale/lang_en.properties @@ -16,6 +16,8 @@ menu.label.preparation=Preparation menu.button.add.recipe=Add Recipe menu.button.add.ingredient=Add Ingredient menu.button.add.step=Add Step +menu.button.favourites=Favourites +menu.button.ingredients=Ingredients menu.button.remove.recipe=Remove Recipe menu.button.remove.ingredient=Remove Ingredient @@ -30,7 +32,7 @@ menu.search=Search... menu.label.selected-langs=Languages lang.en.display=English -lang.nl.display=Nederlands -lang.pl.display=Polski +lang.nl.display=Dutch +lang.pl.display=Polish lang.tok.display=toki pona -lang.tr.display=T\u00FCrk\u00E7e \ No newline at end of file +lang.tr.display=Turkish \ No newline at end of file diff --git a/client/src/main/resources/locale/lang_nl.properties b/client/src/main/resources/locale/lang_nl.properties index 0a65cf8..813bcb9 100644 --- a/client/src/main/resources/locale/lang_nl.properties +++ b/client/src/main/resources/locale/lang_nl.properties @@ -10,15 +10,17 @@ button.ok=Ok button.cancel=Annuleren menu.label.recipes=Recepten -menu.label.ingredients=Ingredinten +menu.label.ingredients=Ingrediënten menu.label.preparation=Bereiding menu.button.add.recipe=Recept toevoegen -menu.button.add.ingredient=Ingredint toevoegen +menu.button.add.ingredient=Ingrediënt toevoegen menu.button.add.step=Stap toevoegen +menu.button.favourites=Favorieten +menu.button.ingredients=Ingrediënten menu.button.remove.recipe=Recept verwijderen -menu.button.remove.ingredient=Ingredint verwijderen +menu.button.remove.ingredient=Ingrediënt verwijderen menu.button.remove.step=Stap verwijderen menu.button.edit=Bewerken @@ -28,8 +30,8 @@ menu.button.print=Recept afdrukken menu.label.selected-langs=Talen menu.search=Zoeken... -lang.en.display=English +lang.en.display=Engels lang.nl.display=Nederlands -lang.pl.display=Polski +lang.pl.display=Pools lang.tok.display=toki pona -lang.tr.display=T\u00FCrk\u00E7e \ No newline at end of file +lang.tr.display=Turks \ No newline at end of file diff --git a/client/src/main/resources/locale/lang_pl.properties b/client/src/main/resources/locale/lang_pl.properties index 841d9b8..2712074 100644 --- a/client/src/main/resources/locale/lang_pl.properties +++ b/client/src/main/resources/locale/lang_pl.properties @@ -16,6 +16,8 @@ menu.label.preparation=Przygotowanie menu.button.add.recipe=Dodaj przepis menu.button.add.ingredient=Dodaj składnik menu.button.add.step=Dodaj instrukcję +menu.button.favourites=Ulubione +menu.button.ingredients=Składniki menu.button.remove.recipe=Usuń przepis menu.button.remove.ingredient=Usuń składnik @@ -29,8 +31,8 @@ menu.search=Szukaj... menu.label.selected-langs=Języki -lang.en.display=English -lang.nl.display=Nederlands +lang.en.display=Inglisz +lang.nl.display=Holenderski lang.pl.display=Polski lang.tok.display=toki pona -lang.tr.display=T\u00FCrk\u00E7e \ No newline at end of file +lang.tr.display=Turecki \ No newline at end of file diff --git a/client/src/main/resources/locale/lang_tok.properties b/client/src/main/resources/locale/lang_tok.properties index 1b44b6a..18bb9b1 100644 --- a/client/src/main/resources/locale/lang_tok.properties +++ b/client/src/main/resources/locale/lang_tok.properties @@ -16,6 +16,8 @@ menu.label.preparation=nasin pi pali moku ni menu.button.add.recipe=o pali e lipu moku sin menu.button.add.ingredient=o pali e kipisi moku sin menu.button.add.step=o pali e nasin pi pali moku ni +menu.button.favourites=ijo pi pona mute tawa sina +menu.button.ingredients=kipisi moku mute menu.button.remove.recipe=o weka e lipu moku ni menu.button.remove.ingredient=o weka e kipisi moku ni diff --git a/client/src/main/resources/locale/lang_tr.properties b/client/src/main/resources/locale/lang_tr.properties index 1b4ceb6..e0700ff 100644 --- a/client/src/main/resources/locale/lang_tr.properties +++ b/client/src/main/resources/locale/lang_tr.properties @@ -16,6 +16,8 @@ menu.label.preparation=Haz\u0131rl\u0131k menu.button.add.recipe=Tarif Ekle menu.button.add.ingredient=Malzeme Ekle menu.button.add.step=Ad\u0131m Ekle +menu.button.favourites=Favoriler +menu.button.ingredients=Malzemeler menu.button.remove.recipe=Tarifi Sil menu.button.remove.ingredient=Malzemeyi Sil @@ -25,6 +27,8 @@ menu.button.edit=D\u00FCzenle menu.button.clone=Kopyala menu.button.print=Tarifi Yazd\u0131r +menu.search=Arama... + menu.label.selected-langs=Diller lang.en.display=\u0130ngilizce From 8989cab770845ec44502d5e86b0ae365217e13bf Mon Sep 17 00:00:00 2001 From: Mei Chang van der Werff Date: Wed, 21 Jan 2026 14:21:30 +0100 Subject: [PATCH 04/51] A favourited recipe now becomes blue in text --- .../main/java/client/scenes/FoodpalApplicationCtrl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java index e7cb0df..420ac95 100644 --- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java +++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java @@ -40,6 +40,7 @@ import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.control.TextInputDialog; import javafx.scene.control.ToggleButton; +import javafx.scene.paint.Color; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -200,6 +201,12 @@ public class FoodpalApplicationCtrl implements LocaleAware { } //gives star in front fav items boolean fav = config.isFavourite(item.getId()); setText((fav ? "★ " : "") + item.getName()); + + if(fav){ + setTextFill(Color.BLUE); + }else{ + setTextFill(Color.BLACK); + } } }); // When your selection changes, update details in the panel From 969d052230578fc475d8c206fababedf417386ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Rasie=C5=84ski?= Date: Wed, 21 Jan 2026 14:34:57 +0100 Subject: [PATCH 05/51] translated ingredients menu --- .../client/scenes/FoodpalApplicationCtrl.java | 2 +- .../scenes/Ingredient/IngredientListCtrl.java | 37 +++++++++++++++---- .../scenes/nutrition/IngredientList.fxml | 10 ++--- .../src/main/resources/locale/lang.properties | 7 ++++ .../main/resources/locale/lang_en.properties | 7 ++++ .../main/resources/locale/lang_nl.properties | 7 ++++ .../main/resources/locale/lang_pl.properties | 7 ++++ .../main/resources/locale/lang_tok.properties | 7 ++++ .../main/resources/locale/lang_tr.properties | 7 ++++ 9 files changed, 78 insertions(+), 13 deletions(-) diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java index fb24069..1b26009 100644 --- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java +++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java @@ -564,7 +564,7 @@ public class FoodpalApplicationCtrl implements LocaleAware { var root = pair.getValue(); var stage = new javafx.stage.Stage(); - stage.setTitle("Nutrition values view"); + stage.setTitle(getLocaleString("menu.ingredients.title")); stage.initModality(javafx.stage.Modality.APPLICATION_MODAL); stage.setScene(new javafx.scene.Scene(root)); stage.showAndWait(); diff --git a/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java b/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java index dfcd7be..bc1cc97 100644 --- a/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java +++ b/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java @@ -1,14 +1,13 @@ package client.scenes.Ingredient; import client.scenes.nutrition.NutritionDetailsCtrl; +import client.utils.LocaleAware; +import client.utils.LocaleManager; import client.utils.server.ServerUtils; import commons.Ingredient; import jakarta.inject.Inject; import javafx.fxml.FXML; -import javafx.scene.control.Alert; -import javafx.scene.control.ListCell; -import javafx.scene.control.ListView; -import javafx.scene.control.TextInputDialog; +import javafx.scene.control.*; import javafx.stage.Stage; import java.io.IOException; @@ -19,10 +18,18 @@ import java.util.logging.Logger; //TODO and check for capital letter milk and MILK are seen as different -public class IngredientListCtrl { - +public class IngredientListCtrl implements LocaleAware { private final ServerUtils server; + private final LocaleManager localeManager; private final Logger logger = Logger.getLogger(IngredientListCtrl.class.getName()); + + @FXML + public Label ingredientsLabel; + public Button addButton; + public Button refreshButton; + public Button deleteButton; + public Button closeButton; + @FXML private ListView ingredientListView; @FXML @@ -31,12 +38,28 @@ public class IngredientListCtrl { @Inject public IngredientListCtrl( ServerUtils server, + LocaleManager localeManager, NutritionDetailsCtrl nutritionDetailsCtrl ) { this.server = server; + this.localeManager = localeManager; this.nutritionDetailsCtrl = nutritionDetailsCtrl; } + @Override + public void updateText() { + ingredientsLabel.setText(getLocaleString("menu.label.ingredients")); + addButton.setText(getLocaleString("menu.button.add")); + refreshButton.setText(getLocaleString("menu.button.refresh")); + deleteButton.setText(getLocaleString("menu.button.delete")); + closeButton.setText(getLocaleString("menu.button.close")); + } + + @Override + public LocaleManager getLocaleManager() { + return this.localeManager; + } + @FXML public void initialize() { ingredientListView.setCellFactory(list -> new ListCell<>() { @@ -60,6 +83,7 @@ public class IngredientListCtrl { refresh(); } + @FXML private void addIngredient() { TextInputDialog dialog = new TextInputDialog(); @@ -86,7 +110,6 @@ public class IngredientListCtrl { } } - @FXML private void refresh() { try { diff --git a/client/src/main/resources/client/scenes/nutrition/IngredientList.fxml b/client/src/main/resources/client/scenes/nutrition/IngredientList.fxml index 653beaa..751ed0b 100644 --- a/client/src/main/resources/client/scenes/nutrition/IngredientList.fxml +++ b/client/src/main/resources/client/scenes/nutrition/IngredientList.fxml @@ -15,16 +15,16 @@ -