From 738d2a39c30a193905cf3c2d72c05da52ab7e8eb Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 15 Sep 2024 21:53:43 +0200 Subject: [PATCH] Changed the position of the ko_KR language --- es-app/src/guis/GuiMenu.cpp | 2 +- es-app/src/guis/GuiScraperMenu.cpp | 2 +- es-core/src/ThemeData.cpp | 4 ++-- es-core/src/utils/LocalizationUtil.cpp | 8 ++++---- locale/languages | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 1d891bc4d..a0be4a6fc 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -574,8 +574,8 @@ void GuiMenu::openUIOptions() applicationLanguage->add("РУССКИЙ", "ru_RU", selectedApplicationLanguage == "ru_RU"); applicationLanguage->add("SVENSKA", "sv_SE", selectedApplicationLanguage == "sv_SE"); applicationLanguage->add("日本語", "ja_JP", selectedApplicationLanguage == "ja_JP"); - applicationLanguage->add("简体中文", "zh_CN", selectedApplicationLanguage == "zh_CN"); applicationLanguage->add("한국어", "ko_KR", selectedApplicationLanguage == "ko_KR"); + applicationLanguage->add("简体中文", "zh_CN", selectedApplicationLanguage == "zh_CN"); // If there are no objects returned, then there must be a manually modified entry in the // configuration file. Simply set the application langauge to "automatic" in this case. if (applicationLanguage->getSelectedObjects().size() == 0) diff --git a/es-app/src/guis/GuiScraperMenu.cpp b/es-app/src/guis/GuiScraperMenu.cpp index 9c78bc0d5..9288e2e95 100644 --- a/es-app/src/guis/GuiScraperMenu.cpp +++ b/es-app/src/guis/GuiScraperMenu.cpp @@ -860,8 +860,8 @@ void GuiScraperMenu::openOtherOptions() scraperLanguage->add("SVENSKA", "sv", selectedScraperLanguage == "sv"); scraperLanguage->add("TÜRKÇE", "tr", selectedScraperLanguage == "tr"); scraperLanguage->add("日本語", "ja", selectedScraperLanguage == "ja"); - scraperLanguage->add("简体中文", "zh", selectedScraperLanguage == "zh"); scraperLanguage->add("한국어", "ko", selectedScraperLanguage == "ko"); + scraperLanguage->add("简体中文", "zh", selectedScraperLanguage == "zh"); // clang-format on // If there are no objects returned, then there must be a manually modified entry in the // configuration file. Simply set the language to "English" in this case. diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index 372436315..5a0d0ee57 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -115,8 +115,8 @@ std::vector> ThemeData::sSupportedLanguages {"ru_RU", "РУССКИЙ"}, {"sv_SE", "SVENSKA"}, {"ja_JP", "日本語"}, - {"zh_CN", "简体中文"}, - {"ko_KR", "한국어"}}; + {"ko_KR", "한국어"}, + {"zh_CN", "简体中文"}}; std::map> ThemeData::sPropertyAttributeMap // The data type is defined by the parent property. diff --git a/es-core/src/utils/LocalizationUtil.cpp b/es-core/src/utils/LocalizationUtil.cpp index 332d865b3..c9f277810 100644 --- a/es-core/src/utils/LocalizationUtil.cpp +++ b/es-core/src/utils/LocalizationUtil.cpp @@ -40,8 +40,8 @@ namespace Utils {{"ru"}, {"RU"}}, {{"sv"}, {"SE"}}, {{"ja"}, {"JP"}}, - {{"zh"}, {"CN"}}, - {{"ko"}, {"KR"}}}; + {{"ko"}, {"KR"}}, + {{"zh"}, {"CN"}}}; // clang-format on std::string sCurrentLocale {"en_US"}; @@ -203,10 +203,10 @@ namespace Utils sMenuTitleScaleFactor = 0.87f; else if (localePair.first == "ja") sMenuTitleScaleFactor = 0.94f; - else if (localePair.first == "zh") - sMenuTitleScaleFactor = 0.94f; else if (localePair.first == "ko") sMenuTitleScaleFactor = 0.96f; + else if (localePair.first == "zh") + sMenuTitleScaleFactor = 0.94f; std::string localePath; localePath.append("/") diff --git a/locale/languages b/locale/languages index c621bf93f..519961a9e 100644 --- a/locale/languages +++ b/locale/languages @@ -9,5 +9,5 @@ pt_BR ro_RO ru_RU sv_SE -zh_CN ko_KR +zh_CN