No commit message

blawar · Mar 15, 2020 · 8e8d219 · 8e8d219
1 parent 7f01a6c
commit 8e8d219
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/romfs/lang/de.json b/romfs/lang/de.json
@@ -179,7 +179,7 @@
         "language": {
             "title": "Wähle Tinleaf Installer Sprache",
             "desc": "Die Software wird danach beendet. Drücke B um den Vorgang abzubrechen.",
-            "system_language": "System Standard"
+            "system_language": "System"
         },
         "title": "Ändere Tinleaf Installer Einstellungen!",
         "buttons": "\ue0e0 Auswählen/Ändern    \ue0e1 Abbrechen "

diff --git a/romfs/lang/en.json b/romfs/lang/en.json
@@ -179,7 +179,7 @@
         "language": {
             "title": "Select Tinleaf Installer's language",
             "desc": "The software will be closed after changing languages. Press B to cancel.",
-            "system_language": "System default"
+            "system_language": "System"
         },
         "title": "Change Tinleaf Installer's settings!",
         "buttons": "\ue0e0 Select/Change    \ue0e1 Cancel"

diff --git a/romfs/lang/it.json b/romfs/lang/it.json
@@ -179,7 +179,7 @@
         "language": {
             "title": "Seleziona la lingua di Tinleaf Installer",
             "desc": "Il software verrà chiuso dopo aver cambiato la lingua. Premi B per annullare.",
-            "system_language": "Default di sistema"
+            "system_language": "Sistema"
         },
         "title": "Cambia le impostazioni di Tinleaf Installer!",
         "buttons": "\ue0e0 Seleziona/Cambia    \ue0e1 Annulla"

diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp
@@ -16,7 +16,7 @@
 namespace inst::ui {
     extern MainApplication *mainApp;
 
-    std::vector<std::string> languageStrings = {"English", "Français", "Deutsch", "Italiano", "Русский"};
+    std::vector<std::string> languageStrings = {"English", "日本語", "Français", "Deutsch", "Italiano", "Русский"};
 
     optionsPage::optionsPage() : Layout::Layout() {
         this->SetBackgroundColor(COLOR("#670000FF"));
@@ -79,15 +79,17 @@ namespace inst::ui {
             case 1:
             case 12:
                 return languageStrings[0];
+            case 0:
+                return languageStrings[1];
             case 2:
             case 13:
-                return languageStrings[1];
-            case 3:
                 return languageStrings[2];
-            case 4:
+            case 3:
                 return languageStrings[3];
-            case 10:
+            case 4:
                 return languageStrings[4];
+            case 10:
+                return languageStrings[5];
             default:
                 return "options.language.system_language"_lang;
         }
@@ -184,15 +186,18 @@ namespace inst::ui {
                             inst::config::languageSetting = 1;
                             break;
                         case 1:
-                            inst::config::languageSetting = 2;
+                            inst::config::languageSetting = 0;
                             break;
                         case 2:
-                            inst::config::languageSetting = 3;
+                            inst::config::languageSetting = 2;
                             break;
                         case 3:
-                            inst::config::languageSetting = 4;
+                            inst::config::languageSetting = 3;
                             break;
                         case 4:
+                            inst::config::languageSetting = 4;
+                            break;
+                        case 5:
                             inst::config::languageSetting = 10;
                             break;
                         default:

diff --git a/source/util/lang.cpp b/source/util/lang.cpp
@@ -22,7 +22,7 @@ namespace Language {
         } 
         switch (langInt) {
             case 0:
-                languagePath = "romfs:/lang/ja.json";
+                languagePath = "romfs:/lang/jp.json";
                 break;
             case 2:
             case 13: