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] 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=Ingrediënten +menu.label.ingredients=Ingrediënten menu.label.preparation=Bereiding menu.button.add.recipe=Recept toevoegen -menu.button.add.ingredient=Ingrediënt 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=Ingrediënt 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