From 544313daea88dbeb72dc442fdfa77723e6665b76 Mon Sep 17 00:00:00 2001
From: mrdude2478 <mrdude2478@gmail.com>
Date: Mon, 18 Sep 2023 20:10:30 +0100
Subject: [PATCH] Finish auto localisation code mods

---
 source/ui/optionsPage.cpp | 21 +++++++++++----------
 source/util/lang.cpp      | 24 +++++++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp
index dbc53ce..c5d9d9b 100644
--- a/source/ui/optionsPage.cpp
+++ b/source/ui/optionsPage.cpp
@@ -20,7 +20,7 @@ namespace inst::ui {
 	s32 prev_touchcount = 0;
 	std::string flag = "romfs:/images/flags/en.png";
 
-	std::vector<std::string> languageStrings = { "En", "Jpn", "Fr", "De", "It", "Ru", "Es", "Tw", "Sys" };
+	std::vector<std::string> languageStrings = { "Sys", "En", "Jpn", "Fr", "De", "It", "Ru", "Es", "Tw" };
 
 	optionsPage::optionsPage() : Layout::Layout() {
 		this->infoRect = Rectangle::New(0, 95, 1280, 60, COLOR("#00000080"));
@@ -92,15 +92,15 @@ namespace inst::ui {
 
 	std::string optionsPage::getMenuLanguage(int ourLangCode) {
 		if (ourLangCode >= 0) {
-			if (ourLangCode == 0) flag = "romfs:/images/flags/en.png";
-			else if (ourLangCode == 1) flag = "romfs:/images/flags/jpn.png";
-			else if (ourLangCode == 2) flag = "romfs:/images/flags/fr.png";
-			else if (ourLangCode == 3) flag = "romfs:/images/flags/de.png";
-			else if (ourLangCode == 4) flag = "romfs:/images/flags/it.png";
-			else if (ourLangCode == 5) flag = "romfs:/images/flags/ru.png";
-			else if (ourLangCode == 6) flag = "romfs:/images/flags/es.png";
-			else if (ourLangCode == 7) flag = "romfs:/images/flags/tw.png";
-			else if (ourLangCode == 8) flag = "romfs:/images/flags/sys.png";
+			if (ourLangCode == 0) flag = "romfs:/images/flags/sys.png";
+			else if (ourLangCode == 1) flag = "romfs:/images/flags/en.png";
+			else if (ourLangCode == 2) flag = "romfs:/images/flags/jpn.png";
+			else if (ourLangCode == 3) flag = "romfs:/images/flags/fr.png";
+			else if (ourLangCode == 4) flag = "romfs:/images/flags/de.png";
+			else if (ourLangCode == 5) flag = "romfs:/images/flags/it.png";
+			else if (ourLangCode == 6) flag = "romfs:/images/flags/ru.png";
+			else if (ourLangCode == 7) flag = "romfs:/images/flags/es.png";
+			else if (ourLangCode == 8) flag = "romfs:/images/flags/tw.png";
 			return languageStrings[ourLangCode];
 		}
 		else {
@@ -358,6 +358,7 @@ namespace inst::ui {
 						break;
 					case 13:
 						languageList = languageStrings;
+						languageList[0] = "options.language.system_language"_lang; //replace "sys" with local language string 
 						rc = inst::ui::mainApp->CreateShowDialog("options.language.title"_lang, "options.language.desc"_lang, languageList, false, flag);
 						if (rc == -1) break;
 						switch (rc) {
diff --git a/source/util/lang.cpp b/source/util/lang.cpp
index 91e1aa4..64fe9d1 100644
--- a/source/util/lang.cpp
+++ b/source/util/lang.cpp
@@ -48,31 +48,31 @@ namespace Language {
 		}
 		else {
 			switch (langInt) {
-			case 0:
+			case 1:
 				languagePath = "romfs:/lang/en.json";
 				break;
-			case 1:
+			case 2:
 				languagePath = "romfs:/lang/jp.json";
 				break;
-			case 2:
+			case 3:
 				languagePath = "romfs:/lang/fr.json";
 				break;
-			case 3:
+			case 4:
 				languagePath = "romfs:/lang/de.json";
 				break;
-			case 4:
+			case 5:
 				languagePath = "romfs:/lang/it.json";
 				break;
-			case 5:
+			case 6:
 				languagePath = "romfs:/lang/ru.json";
 				break;
-			case 6:
+			case 7:
 				languagePath = "romfs:/lang/es.json";
 				break;
-			case 7:
+			case 8:
 				languagePath = "romfs:/lang/tw.json";
 				break;
-			case 8:
+			case 0:
 				switch (syslang) {
 					case 0:
 						languagePath = "romfs:/lang/jp.json";
@@ -104,6 +104,12 @@ namespace Language {
 					case 12:
 						languagePath = "romfs:/lang/en.json";
 						break;
+					case 13:
+						languagePath = "romfs:/lang/fr.json";
+						break;
+					case 14:
+						languagePath = "romfs:/lang/es.json";
+						break;
 					case 16:
 						languagePath = "romfs:/lang/tw.json";
 						break;