From 6c7a9434ca50e9e9904affa85140e88617aa410f Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:06:45 +0100
Subject: [PATCH 1/5] chore: create display texts for langs

---
 client/src/main/resources/locale/lang.properties    | 4 ++++
 client/src/main/resources/locale/lang_en.properties | 4 ++++
 client/src/main/resources/locale/lang_nl.properties | 4 ++++
 client/src/main/resources/locale/lang_pl.properties | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/client/src/main/resources/locale/lang.properties b/client/src/main/resources/locale/lang.properties
index d4f71f4..dc22e10 100644
--- a/client/src/main/resources/locale/lang.properties
+++ b/client/src/main/resources/locale/lang.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Remove Step
 menu.button.edit=Edit
 menu.button.clone=Clone
 menu.button.print=Print recipe
+
+lang.en.display=English
+lang.nl.display=Dutch
+lang.pl.display=Polish
\ 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 d4f71f4..874d231 100644
--- a/client/src/main/resources/locale/lang_en.properties
+++ b/client/src/main/resources/locale/lang_en.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Remove Step
 menu.button.edit=Edit
 menu.button.clone=Clone
 menu.button.print=Print recipe
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
\ 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 9ab41ae..7067697 100644
--- a/client/src/main/resources/locale/lang_nl.properties
+++ b/client/src/main/resources/locale/lang_nl.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Stap verwijderen
 menu.button.edit=Bewerken
 menu.button.clone=Dupliceren
 menu.button.print=Recept afdrukken
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
diff --git a/client/src/main/resources/locale/lang_pl.properties b/client/src/main/resources/locale/lang_pl.properties
index 10076de..28b1079 100644
--- a/client/src/main/resources/locale/lang_pl.properties
+++ b/client/src/main/resources/locale/lang_pl.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Usuń instrukcję
 menu.button.edit=Edytuj
 menu.button.clone=Duplikuj
 menu.button.print=Drukuj przepis
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
\ No newline at end of file

From f7ff7497a28da5b868a22cca7449bf2028c8be7e Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:07:15 +0100
Subject: [PATCH 2/5] feat: lang button into combo box

---
 .../client/scenes/FoodpalApplication.fxml     | 63 +++----------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index 27b5bc2..a621046 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -15,6 +15,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.control.ComboBox?>
 <BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
 
     <!-- TOP BAR -->
@@ -23,58 +24,12 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-            <GridPane>
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="198.0" minWidth="10.0" prefWidth="130.0" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="2.0" prefWidth="70.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints maxHeight="54.0" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
-                    <RowConstraints maxHeight="25.0" minHeight="6.0" prefHeight="6.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
-                        <font>
-                            <Font name="System Bold" size="29.0" />
-                        </font>
-                    </Label>
-                    <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="2">
-                        <buttons>
-                            <ToolBar prefHeight="35.0" prefWidth="123.0">
-                                <items>
-                                    <Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchLocale" userData="en" prefHeight="25.0" prefWidth="33.0" text="EN" />
-                                    <Button fx:id="flagNlButton" onAction="#switchLocale" userData="nl" text="NL" />
-                                    <Button fx:id="flagPlButton" onAction="#switchLocale" userData="pl" text="PL" />
-                                </items>
-                            </ToolBar>
-                        </buttons>
-                    </ButtonBar>
-                </children>
-            </GridPane>
-
-            <Pane HBox.hgrow="ALWAYS" />
-
-            <HBox spacing="5" />
-            <GridPane prefHeight="90.0" prefWidth="114.0">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="32.1666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="24.8333740234375" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="173.0" minWidth="10.0" prefWidth="28.6666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="34.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
-                </children>
-            </GridPane>
-        </HBox>
+            <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
+                <font>
+                    <Font name="System Bold" size="29.0" />
+                </font>
+            </Label>
+            </HBox>
     </top>
 
     <!-- LEFT: RECIPE LIST -->
@@ -83,7 +38,9 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-
+            <ComboBox fx:id="langSelectMenu" onAction="#switchLocale">
+            </ComboBox>
+            <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
             <Label fx:id="recipesLabel" text="Recipes">
                 <font>
                     <Font name="System Bold" size="15.0" />

From 6b0d728ad326152b9dbe4cee4dc4ae9b39433f85 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:07:32 +0100
Subject: [PATCH 3/5] chore: acquired flag images of langs

---
 client/src/main/resources/flag_en.png | Bin 0 -> 995 bytes
 client/src/main/resources/flag_nl.png | Bin 0 -> 266 bytes
 client/src/main/resources/flag_pl.png | Bin 0 -> 241 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 client/src/main/resources/flag_en.png
 create mode 100644 client/src/main/resources/flag_nl.png
 create mode 100644 client/src/main/resources/flag_pl.png

diff --git a/client/src/main/resources/flag_en.png b/client/src/main/resources/flag_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dec928a9c6957fddfbb6e8514e81d0f863484da
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkRl}SWFRCt{2nNLVlaRA4^d;4vNwYAniWr+PD7#=e750tY*)<KDR
zDG7y$Xe2W)dC7w!Vh6j_A=8S1NT9^>l7yYS<TP-a3N?fdC1a=|!`||+>FiK%uD8AY
zee<_J?{k~{-tT?CpS|~!{eCjpDa$TI=1spDH|oy^Kd%pu;roN$gyuN;v<t^?Uk`qM
zJMkGe+pMBx<X}XfG0Tty&<;QwNdWBtw2=hR4nP}5sgTpoKn<lr4rY0>2QAGt$R`m>
zg&Zx-HCUeP0aL8kVW77O`5+>+_&{$HiuJm^H6WKoL@K`R*@Wv+KL~#?C!)hrhrYoN
z7_!a4=ii}`J7ts#Iqo!GM2Dpg#d;k8VB52a)#tCV`f3CL?^d_~j%*eYPjL=G0UX&R
zB9Y=8F$HjBvWR4gb1+WRU9eM*xNnw8i)FOMZQ)!!+)u26<u%3%l)STou=Y7P8_duc
zD^T>%0!>Y2TsNorM5OYK^Lqwg0Wn3S3o(mx$UYq^jkqP2s0fY~w+BA|HqM+l7W|tS
zTVmgS{De|LL@Ulg7_}<m1gSg`>3|a|R&fqewm5-bA7_DG;k{A+h6g_P8kG8i<kE{p
zAb{WVU!Xc`!0Bf_g2R;h0;sD><C>BXofd~1u8I{gy)X>4SE|LGQq<Y9kh~W_)`!Q^
zeiL?jeqXLh2El)W`9j{m0+ImQ0cax$pdElVk^tHPXd?-r9e_5H0NMd)BU>G^rTw=6
zJ3WsL+xvvBInsCyn(Fd2CEA08?z^RvL<MN7%dsEX^8OXbdjWADjd^F6;B&7<9V1sC
zfcEkQfT8Qv=U#(%b}9NGnG6RnRmB#-PC4LuJP6i4Cpd;tt5A5a8HM+6Q7;et-4#|G
z)xp*G0<2y5*pE@Ggaxp62V8ye7biL`fXD|UV!%HbiG{{kiIQ>azaEiA1iV|}YXEC^
zz-cnWX)+6zXVfa_+s!CjoIp`$8;DMe6}JbiU86A6c4OhIE5UlPS@`OLp|%^XU87iW
zd*Z&16Hzj5g~k|uND^{3C~S&D=o{a!!%?4q2QNpaFl3tvJ0pyR&=Wzjp*SBgMG&XS
zEI2sRit`aeM8rif(~I*-MZ|vsvaL9uWJC}k`-}5QL<G^dn{%c(pLj%&qRut|xmBD`
zG!Z11i}Q&jf*5MMbG|sAP!UYNl@G<|-;wqMBmuMo&_)tKI{<AY0ki|q<_~h4d$(7M
RE(8Do002ovPDHLkV1gSPx_<xw

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/flag_nl.png b/client/src/main/resources/flag_nl.png
new file mode 100644
index 0000000000000000000000000000000000000000..75f9e527498e0a63223903f283ba8f94c9ae6063
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;if@
zi(^Q|oVPa&1(^axjt1B@^GI3stg+k^5V(dR=E9?7$77mtixei$ynW~Eo_qDn56;=z
zu#6$fA(%mTfo6l)1rZ1C46X&NCaf2jW-(<j`Z8_-OB>rA__gob#pN%o`jSf;J_>8#
rRthsI=G%97>ws&y)g@hi#MvO<Q^fn7Q-4km&>sw*u6{1-oD!M<^3+%V

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/flag_pl.png b/client/src/main/resources/flag_pl.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a2c9df1c19d02550bfc413971a207a42cad8f07
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;jxQ
zi(^Q|oVT|e1se<mSR9+!o;<kE5~p|Kh5Is5pSRW5&%Ak^u$}LMlmmMP?*is6Y!?`#
zm|rlgWh`m9#$e@;%^<tLv;nX5+V_>e+2^bwUIUtWxA?!mWLvZ%{^mxYa~V8c{an^L
HB{Ts5hXPI$

literal 0
HcmV?d00001


From 7e69976e5ef918c81b136499439ac62634c49804 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:09:03 +0100
Subject: [PATCH 4/5] feat: controller for language list control

---
 .../client/scenes/FoodpalApplicationCtrl.java | 109 ++++++++++++------
 1 file changed, 73 insertions(+), 36 deletions(-)

diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
index bcb6f44..6dd2841 100644
--- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
+++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
@@ -2,6 +2,7 @@ package client.scenes;
 
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -9,11 +10,11 @@ import java.util.Locale;
 import client.exception.UpdateException;
 import client.scenes.recipe.IngredientListCtrl;
 import client.scenes.recipe.RecipeStepListCtrl;
+
 import client.utils.DefaultRecipeFactory;
 import client.utils.LocaleAware;
 import client.utils.LocaleManager;
 import client.utils.ServerUtils;
-
 import commons.Recipe;
 
 import jakarta.inject.Inject;
@@ -21,14 +22,18 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
+import javafx.util.StringConverter;
 
 public class FoodpalApplicationCtrl implements LocaleAware {
     private final ServerUtils server;
@@ -39,21 +44,10 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     public VBox detailsScreen;
     public HBox editableTitleArea;
 
-
-    // all of these aren't used with only my part of the code
-    // everything in the top bar ===
-    @FXML
-    private Button flagEnButton;   //already here for advanced stuff
-
-    @FXML
-    private Button flagNlButton;   //already here for advanced stuff
-
-    @FXML
-    private Button flagPlButton;   //already here for advanced stuff
-
     // everything in the left lane
     @FXML
     public Label recipesLabel;
+    public ComboBox<String> langSelectMenu;
 
     @FXML
     private ListView<Recipe> recipeList;
@@ -90,9 +84,30 @@ public class FoodpalApplicationCtrl implements LocaleAware {
         this.ingredientListCtrl = ingredientListCtrl;
         this.stepListCtrl = stepListCtrl;
     }
-    @Override
-    public void initializeComponents() {
-        // TODO Reduce code duplication??
+    private void initRecipeList() {
+        // Show recipe name in the list
+        recipeList.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(Recipe item, boolean empty) {
+                super.updateItem(item, empty);
+                setText(empty || item == null ? "" : item.getName());
+            }
+        });
+
+        // When your selection changes, update details in the panel
+        recipeList.getSelectionModel().selectedItemProperty().addListener(
+                (obs, oldRecipe, newRecipe) -> showRecipeDetails(newRecipe)
+        );
+
+        // Double-click to go to detail screen
+        recipeList.setOnMouseClicked(event -> {
+            final int DOUBLE_CLICK = 2;   //to not get magic number:P
+            if (event.getClickCount() == DOUBLE_CLICK) {
+                openSelectedRecipe();
+            }
+        });
+    }
+    private void initStepsIngredientsList() {
         // Initialize callback for ingredient list updates
         this.ingredientListCtrl.setUpdateCallback(newList -> {
             Recipe selectedRecipe = recipeList.getSelectionModel().getSelectedItem();
@@ -122,28 +137,50 @@ public class FoodpalApplicationCtrl implements LocaleAware {
                 throw new UpdateException("Unable to update recipe to server for " + selectedRecipe);
             }
         });
-        // Show recipe name in the list
-        recipeList.setCellFactory(list -> new ListCell<>() {
+    }
+    @Override
+    public void initializeComponents() {
+        // TODO Reduce code duplication??
+        langSelectMenu.getItems().setAll("en", "pl", "nl");
+        langSelectMenu.setConverter(new StringConverter<String>() {
             @Override
-            protected void updateItem(Recipe item, boolean empty) {
+            public String toString(String s) {
+                if (s == null) {
+                    return "";
+                }
+                return getLocaleString("lang." + s + ".display");
+            }
+
+            @Override
+            public String fromString(String s) {
+                return s;
+            }
+        });
+        langSelectMenu.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                final int IMAGE_HEIGHT = 32;
+                final int HBOX_SPACING = 10;
                 super.updateItem(item, empty);
-                setText(empty || item == null ? "" : item.getName());
+                if (item == null || empty) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
+                    if (imageStream == null) {
+                        setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
+                        return;
+                    }
+                    Image img = new Image(imageStream);
+                    ImageView imageView = new ImageView(img);
+                    imageView.setFitHeight(IMAGE_HEIGHT);
+                    imageView.setFitWidth(IMAGE_HEIGHT);
+                    setGraphic(new HBox(HBOX_SPACING, imageView, new Label(getLocaleString("lang." + item + ".display"))));
+                }
             }
         });
-
-        // When your selection changes, update details in the panel
-        recipeList.getSelectionModel().selectedItemProperty().addListener(
-                (obs, oldRecipe, newRecipe) -> showRecipeDetails(newRecipe)
-        );
-
-        // Double-click to go to detail screen
-        recipeList.setOnMouseClicked(event -> {
-            final int DOUBLE_CLICK = 2;   //to not get magic number:P
-            if (event.getClickCount() == DOUBLE_CLICK) {
-                openSelectedRecipe();
-            }
-        });
-
+        initStepsIngredientsList();
+        initRecipeList();
         refresh();
     }
     private void showName(String name) {
@@ -298,8 +335,8 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     // Language buttons
     @FXML
     private void switchLocale(ActionEvent event) {
-        Button button = (Button)event.getSource();
-        String lang = (String)button.getUserData();
+        System.out.println("switching");
+        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
         localeManager.setLocale(Locale.of(lang));
     }
 

From ca7c5cbfb9385dbf370effa9e59336c2ea49c350 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Fri, 19 Dec 2025 23:29:27 +0200
Subject: [PATCH 5/5] fix(logic): immigrates LangSelectMenu to own controller

fix(println): also disappears the debug println statement from prod code
TODO: in the distant future, consider using a nice logging framework
(log4j?? or whatever spring boot is using..)
---
 .../client/scenes/FoodpalApplicationCtrl.java |  52 ---------
 .../client/scenes/LangSelectMenuCtrl.java     | 100 ++++++++++++++++++
 .../client/scenes/FoodpalApplication.fxml     |   3 +-
 .../resources/client/scenes/LangSelect.fxml   |  16 +++
 4 files changed, 117 insertions(+), 54 deletions(-)
 create mode 100644 client/src/main/java/client/scenes/LangSelectMenuCtrl.java
 create mode 100644 client/src/main/resources/client/scenes/LangSelect.fxml

diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
index 6dd2841..16acd3a 100644
--- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
+++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
@@ -2,10 +2,8 @@ package client.scenes;
 
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 import client.exception.UpdateException;
 import client.scenes.recipe.IngredientListCtrl;
@@ -18,7 +16,6 @@ import client.utils.ServerUtils;
 import commons.Recipe;
 
 import jakarta.inject.Inject;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
@@ -27,13 +24,10 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
-import javafx.util.StringConverter;
 
 public class FoodpalApplicationCtrl implements LocaleAware {
     private final ServerUtils server;
@@ -141,44 +135,7 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     @Override
     public void initializeComponents() {
         // TODO Reduce code duplication??
-        langSelectMenu.getItems().setAll("en", "pl", "nl");
-        langSelectMenu.setConverter(new StringConverter<String>() {
-            @Override
-            public String toString(String s) {
-                if (s == null) {
-                    return "";
-                }
-                return getLocaleString("lang." + s + ".display");
-            }
 
-            @Override
-            public String fromString(String s) {
-                return s;
-            }
-        });
-        langSelectMenu.setCellFactory(list -> new ListCell<>() {
-            @Override
-            protected void updateItem(String item, boolean empty) {
-                final int IMAGE_HEIGHT = 32;
-                final int HBOX_SPACING = 10;
-                super.updateItem(item, empty);
-                if (item == null || empty) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
-                    if (imageStream == null) {
-                        setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
-                        return;
-                    }
-                    Image img = new Image(imageStream);
-                    ImageView imageView = new ImageView(img);
-                    imageView.setFitHeight(IMAGE_HEIGHT);
-                    imageView.setFitWidth(IMAGE_HEIGHT);
-                    setGraphic(new HBox(HBOX_SPACING, imageView, new Label(getLocaleString("lang." + item + ".display"))));
-                }
-            }
-        });
         initStepsIngredientsList();
         initRecipeList();
         refresh();
@@ -331,15 +288,6 @@ public class FoodpalApplicationCtrl implements LocaleAware {
         edit.requestFocus();
     }
 
-
-    // Language buttons
-    @FXML
-    private void switchLocale(ActionEvent event) {
-        System.out.println("switching");
-        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
-        localeManager.setLocale(Locale.of(lang));
-    }
-
     @FXML
     private void makePrintable() {
         System.out.println("Recipe printed");
diff --git a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java
new file mode 100644
index 0000000..1df3e54
--- /dev/null
+++ b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java
@@ -0,0 +1,100 @@
+package client.scenes;
+
+import client.utils.LocaleAware;
+import client.utils.LocaleManager;
+import com.google.inject.Inject;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.util.StringConverter;
+
+import java.io.InputStream;
+import java.util.Locale;
+
+/**
+ * The language selection menu controller.
+ * This needs to implement {@link LocaleAware LocaleAware} so that the
+ * <code>getLocaleString(String)</code> function is available.
+ */
+public class LangSelectMenuCtrl implements LocaleAware {
+    public ComboBox<String> langSelectMenu;
+    private final LocaleManager manager;
+
+    @Inject
+    public LangSelectMenuCtrl(LocaleManager manager) {
+        this.manager = manager;
+    }
+
+    /**
+     * Switches the locale of the application depending on which button the user selects in the list.
+     * @param event The action event triggered by the user.
+     */
+    @FXML
+    private void switchLocale(ActionEvent event) {
+        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
+        manager.setLocale(Locale.of(lang));
+    }
+
+    @Override
+    public void initializeComponents() {
+        langSelectMenu.getItems().setAll("en", "pl", "nl");
+        langSelectMenu.setConverter(new StringConverter<String>() {
+            @Override
+            public String toString(String s) {
+                if (s == null) {
+                    return "";
+                }
+                return getLocaleString("lang." + s + ".display");
+            }
+
+            @Override
+            public String fromString(String s) {
+                return s;
+            }
+        });
+        langSelectMenu.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                final int IMAGE_HEIGHT = 32;
+                final int HBOX_SPACING = 10;
+                super.updateItem(item, empty);
+                if (item == null || empty) {
+                    setText(null);
+                    setGraphic(null);
+                    return;
+                }
+                InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
+                if (imageStream == null) {
+                    setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
+                    return;
+                }
+                Image img = new Image(imageStream);
+                ImageView imageView = new ImageView(img);
+                imageView.setFitHeight(IMAGE_HEIGHT);
+                imageView.setFitWidth(IMAGE_HEIGHT);
+                setGraphic(
+                        new HBox(
+                                HBOX_SPACING,
+                                imageView,
+                                new Label(getLocaleString("lang." + item + ".display"))
+                        )
+                );
+            }
+        });
+    }
+
+    @Override
+    public void updateText() {
+        // doesn't do anything; the text doesn't need to be updated.
+    }
+
+    @Override
+    public LocaleManager getLocaleManager() {
+        return manager;
+    }
+}
diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index a621046..b9edd58 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -38,8 +38,7 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-            <ComboBox fx:id="langSelectMenu" onAction="#switchLocale">
-            </ComboBox>
+            <fx:include source="LangSelect.fxml" />
             <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
             <Label fx:id="recipesLabel" text="Recipes">
                 <font>
diff --git a/client/src/main/resources/client/scenes/LangSelect.fxml b/client/src/main/resources/client/scenes/LangSelect.fxml
new file mode 100644
index 0000000..b72080d
--- /dev/null
+++ b/client/src/main/resources/client/scenes/LangSelect.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<ComboBox
+        fx:id="langSelectMenu"
+        xmlns="http://javafx.com/javafx/25"
+        xmlns:fx="http://javafx.com/fxml/1"
+        onAction="#switchLocale"
+        fx:controller="client.scenes.LangSelectMenuCtrl"
+>
+</ComboBox>