Merge pull request #296 from MiguelGarcia-E/feature/native-language-names-291

[Feature]: Show language names in their native language

Author: jvondermarck

src/main/java/com/dinosaur/dinosaurexploder/utils/LanguageManager.java

@@ -14,8 +14,30 @@
 import javafx.beans.property.StringProperty;
 
 public class LanguageManager {
-  private final StringProperty selectedLanguage = new SimpleStringProperty("English");
+
+  public static final String DEFAULT_LANGUAGE = "English";
+  private final StringProperty selectedLanguage = new SimpleStringProperty(DEFAULT_LANGUAGE);
   private Map<String, String> translations = new HashMap<>();
+  private static final Map<String, String> NATIVE_LANGUAGE_NAMES =
+      Map.of(
+          DEFAULT_LANGUAGE,
+          DEFAULT_LANGUAGE,
+          "French",
+          "Français",
+          "German",
+          "Deutsch",
+          "Spanish",
+          "Español",
+          "Japanese",
+          "日本語",
+          "Russian",
+          "Русский",
+          "Portuguese",
+          "Português",
+          "Greek",
+          "Ελληνικά",
+          "Bulgarian",
+          "Български");
 
   private static final String RESOURCE_PATH_SEPARATOR = "/"; // Always forward slash for classpath
   private static final String TRANSLATION_PATH_NO_SLASH = "assets/translation/";
@@ -32,7 +54,7 @@ private LanguageManager() {}
   public static synchronized LanguageManager getInstance() {
     if (languageManager == null) {
       languageManager = new LanguageManager();
-      languageManager.setSelectedLanguage("English");
+      languageManager.setSelectedLanguage(DEFAULT_LANGUAGE);
     }
     return languageManager;
   }
@@ -62,6 +84,12 @@ public List<String> getAvailableLanguages() {
     return languages;
   }
 
+  // Returns the language name in the native word (ex. English->English, Spanish->Español). Default
+  // returns word in english
+  public String getNativeLanguageName(String language) {
+    return NATIVE_LANGUAGE_NAMES.getOrDefault(language, language);
+  }
+
   // Check if the application is running inside a JAR
   private boolean isRunningInsideJar() {
     try (InputStream is =

src/main/java/com/dinosaur/dinosaurexploder/view/DinosaurMenu.java

@@ -1,6 +1,7 @@
 package com.dinosaur.dinosaurexploder.view;
 
 import static com.almasb.fxgl.dsl.FXGLForKtKt.getUIFactoryService;
+import static com.dinosaur.dinosaurexploder.utils.LanguageManager.DEFAULT_LANGUAGE;
 
 import com.almasb.fxgl.app.scene.FXGLMenu;
 import com.almasb.fxgl.app.scene.MenuType;
@@ -19,10 +20,7 @@
 import javafx.animation.TranslateTransition;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.Slider;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
@@ -165,12 +163,34 @@ private VBox createLanguageSelector() {
     languageComboBox.setPrefWidth(ComboBox.USE_COMPUTED_SIZE);
     languageComboBox.setMinWidth(ComboBox.USE_COMPUTED_SIZE);
 
-    languageComboBox.setValue(settings.getLanguage() != null ? settings.getLanguage() : "English");
+    languageComboBox.setValue(
+        settings.getLanguage() != null ? settings.getLanguage() : DEFAULT_LANGUAGE);
 
     if (settings.getLanguage() != null) {
       changeLanguage(settings.getLanguage());
     }
 
+    // Define what text is drawn, keeping orignal item value (Draws text->"Français" while item
+    // value->"French"
+    languageComboBox.setCellFactory(
+        cb ->
+            new ListCell<>() {
+              @Override
+              protected void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
+                setText(empty || item == null ? null : languageManager.getNativeLanguageName(item));
+              }
+            });
+
+    languageComboBox.setButtonCell(
+        new ListCell<>() {
+          @Override
+          protected void updateItem(String item, boolean empty) {
+            super.updateItem(item, empty);
+            setText(empty || item == null ? null : languageManager.getNativeLanguageName(item));
+          }
+        });
+
     applyStylesheet(languageComboBox);
     languageComboBox.setOnAction(
         event -> {