Merge pull request #77775 from Maleclypse/Fix-Portuguese-

[Suggestions requested ] Portuguese for Portugal is still missing in options. Attempts to fix
CleverRaven · Nov 13, 2024 · 918bc6f · 918bc6f
2 parents d4abac3 + a57636c
commit 918bc6f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/cata_imgui.cpp b/src/cata_imgui.cpp
@@ -330,9 +330,9 @@ static void AddGlyphRangesFromCLDR( ImFontGlyphRangesBuilder *b, const std::stri
         AddGlyphRangesFromCLDRForNL( b );
     } else if( lang == "pl" ) {
         AddGlyphRangesFromCLDRForPL( b );
-    } else if( lang == "pt_BR" ) {
+    } else if( lang == "pt" ) {
         AddGlyphRangesFromCLDRForPT( b );
-    } else if( lang == "pt_PT" ) {
+    } else if( lang == "pt_BR" ) {
         AddGlyphRangesFromCLDRForPT( b );
     } else if( lang == "ru" ) {
         AddGlyphRangesFromCLDRForRU( b );

diff --git a/src/options.cpp b/src/options.cpp
@@ -1360,8 +1360,8 @@ std::vector<options_manager::id_and_option> options_manager::get_lang_options()
             { "nb", R"(Norsk)" },
             { "nl", R"(Nederlands)" },
             { "pl", R"(Polski)" },
+            { "pt", R"(Português (Portugal))" },
             { "pt_BR", R"(Português (Brasil))" },
-            { "pt_PT", R"(Português (Portugal))" },
             { "ru", R"(Русский)" },
             { "sr", R"(Српски)" },
             { "tr", R"(Türkçe)" },
@@ -4243,10 +4243,10 @@ void options_manager::update_global_locale()
             std::locale::global( std::locale( "nl_NL.UTF-8" ) );
         } else if( lang == "pl" ) {
             std::locale::global( std::locale( "pl_PL.UTF-8" ) );
+        } else if( lang == "pt" ) {
+            std::locale::global( std::locale( "pt_PT.UTF-8" ) );
         } else if( lang == "pt_BR" ) {
             std::locale::global( std::locale( "pt_BR.UTF-8" ) );
-        } else if( lang == "pt_PT" ) {
-            std::locale::global( std::locale( "pt_PT.UTF-8" ) );
         } else if( lang == "ru" ) {
             std::locale::global( std::locale( "ru_RU.UTF-8" ) );
         } else if( lang == "sr" ) {

diff --git a/src/system_locale.cpp b/src/system_locale.cpp
@@ -72,7 +72,8 @@ std::optional<std::string> Language()
         {"nb", {{ 1044, 2068 }} },
         {"nl", { 1043 } },
         {"pl", { 1045 } },
-        {"pt_BR", {{ 1046, 2070 }} },
+        {"pt", { 2070 } },
+        {"pt_BR", { 1046 } },
         {"ru", {{ 25, 1049, 2073 }} },
         {"sr", { 3098 } },
         {"tr", { 1055 } },