fixed small display bug in confirmation pop-up #2

HamletDuFromage · Feb 5, 2022 · f1d3eba · f1d3eba
1 parent b27995a
commit f1d3eba
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 38 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   nx-locale-switcher:
     runs-on: ubuntu-latest
-    container: hamletdufromage/devkita64_devkitarm
+    container: devkitpro/devkita64
     steps:
     - uses: actions/checkout@v1
 

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ DATA		:=	data
 INCLUDES	:=	include
 APP_TITLE	:=	NX Locale Switcher
 APP_AUTHOR	:=	HamletDuFromage
-APP_VERSION :=  1.1.1
+APP_VERSION :=  1.1.2
 TARGET		:=	$(notdir $(CURDIR))
 
 ROMFS				:=	resources

diff --git a/include/games_list.hpp b/include/games_list.hpp
@@ -11,23 +11,23 @@ class GamesList : public brls::List
         brls::ListItem* listItem;
         bool empty = true;
         std::vector<std::pair<std::string, std::string>> languages{
-            std::make_pair("menus/language/en-US"_i18n, "en-US"),
-            std::make_pair("menus/language/ja"_i18n, "ja"),
-            std::make_pair("menus/language/fr"_i18n, "fr"),
-            std::make_pair("menus/language/de"_i18n, "de"),
-            std::make_pair("menus/language/it"_i18n, "it"),
-            std::make_pair("menus/language/es"_i18n, "es"),
-            std::make_pair("menus/language/zh-CN"_i18n, "zh-CN"),
-            std::make_pair("menus/language/ko"_i18n, "ko"),
-            std::make_pair("menus/language/nl"_i18n, "nl"),
-            std::make_pair("menus/language/pt"_i18n, "pt"),
-            std::make_pair("menus/language/ru"_i18n, "ru"),
-            std::make_pair("menus/language/zh-TW"_i18n, "zh-TW"),
-            std::make_pair("menus/language/en-GB"_i18n, "en-GB"),
-            std::make_pair("menus/language/fr-CA"_i18n, "fr-CA"),
-            std::make_pair("menus/language/es-419"_i18n, "es-419"),
-            std::make_pair("menus/language/zh-Hant"_i18n, "zh-Hant"),
-            std::make_pair("menus/language/zh-Hans"_i18n, "zh-Hans")
+            std::make_pair("American English (en-US)", "en-US"),
+            std::make_pair("日本語 (ja)", "ja"),
+            std::make_pair("Français (fr)", "fr"),
+            std::make_pair("Deutsch (de)", "de"),
+            std::make_pair("Italiano (it)", "it"),
+            std::make_pair("Español (es)", "es"),
+            std::make_pair("简体中文 (zh-CN)", "zh-CN"),
+            std::make_pair("한국어 (ko)", "ko"),
+            std::make_pair("Nederlands (nl)", "nl"),
+            std::make_pair("Português (pt)", "pt"),
+            std::make_pair("Русский (ru)", "ru"),
+            std::make_pair("繁體中文 (zh-TW)", "zh-TW"),
+            std::make_pair("English (Great Britain) (en-GB)", "en-GB"),
+            std::make_pair("Français (Canada) (fr-CA)", "fr-CA"),
+            std::make_pair("Español (Latinoamérica) (es-419)", "es-419"),
+            std::make_pair("Traditional Chinese (zh-Hant)", "zh-Hant"),
+            std::make_pair("Simplified Chinese (zh-Hans)", "zh-Hans")
         };
 
         std::vector<std::pair<std::string, std::string>> regions{

diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json
@@ -30,24 +30,7 @@
     "all_done": "All done!"
   },
   "language": {
-    "system": "Default system language ({})",
-    "en-US": "American English ({})",
-    "ja": "Japanese ({})",
-    "fr": "French ({})",
-    "de": "German ({})",
-    "it": "Italian ({})",
-    "es": "Spanish ({})",
-    "zh-CN": "Simplified Chinese ({})",
-    "ko": "Korean ({})",
-    "nl": "Dutch ({})",
-    "pt": "Portuguese ({})",
-    "ru": "Russian ({})",
-    "zh-TW": "Traditional Chinese ({})",
-    "en-GB": "British English ({})",
-    "fr-CA": "Canadian French ({})",
-    "es-419": "Latin American Spanish ({})",
-    "zh-Hant": "Traditional Chinese ({})",
-    "zh-Hans": "Simplified Chinese ({})"
+    "system_default": "System default"
   },
   "region": {
     "jpn": "Japan (jpn)",

diff --git a/source/games_list.cpp b/source/games_list.cpp
@@ -37,7 +37,7 @@ void GamesList::PopupMenu(std::string tid) {
 
     brls::List* languageList = new brls::List();
 
-    brls::ListItem* languageItem = new brls::ListItem(fmt::format("menus/language/system"_i18n, i18n::getCurrentLocale()));
+    brls::ListItem* languageItem = new brls::ListItem(fmt::format("menus/language/system_default"_i18n, i18n::getCurrentLocale()));
     languageItem->registerAction("menus/list/select_language"_i18n, brls::Key::A, [this, tid] {
         SetOption(tid, "override_config", "override_language", i18n::getCurrentLocale());
         util::showDialog("menus/list/set_language_to"_i18n + fmt::format("menus/language/system"_i18n, i18n::getCurrentLocale()));