ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing country names translation when system language is used

Browse Source
This commit is contained in:
Benau 2020-05-13 08:44:28 +08:00
parent 5d3ccb54b0
commit e802b21d15
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/translation.cpp
View File

@ -378,6 +378,16 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
if (language != "") if (language != "")
{ {
auto ignore_country = [](const std::string& test_full_form)
{
// Use a country to test if the test_full_form is supported by
// localized name
auto it = m_localized_country_codes.find("HK");
if (it != m_localized_country_codes.end())
return it->second.find(test_full_form) == it->second.end();
return true;
};
Log::verbose("translation", "Env var LANGUAGE = '%s'.", Log::verbose("translation", "Env var LANGUAGE = '%s'.",
language.c_str()); language.c_str());
@ -404,7 +414,8 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
m_current_language_name = l.get_name(); m_current_language_name = l.get_name();
m_current_language_name_code = l.get_language(); m_current_language_name_code = l.get_language();
m_current_language_tag = m_current_language_name_code; m_current_language_tag = m_current_language_name_code;
if (!l.get_country().empty()) if (!l.get_country().empty() && !ignore_country(
m_current_language_name_code + "-" + l.get_country()))
{ {
m_current_language_tag += "-"; m_current_language_tag += "-";
m_current_language_tag += l.get_country(); m_current_language_tag += l.get_country();
@ -431,7 +442,8 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
m_current_language_name = tgtLang.get_name(); m_current_language_name = tgtLang.get_name();
m_current_language_name_code = tgtLang.get_language(); m_current_language_name_code = tgtLang.get_language();
m_current_language_tag = m_current_language_name_code; m_current_language_tag = m_current_language_name_code;
if (!tgtLang.get_country().empty()) if (!tgtLang.get_country().empty() && !ignore_country(
m_current_language_name_code + "-" + tgtLang.get_country()))
{ {
m_current_language_tag += "-"; m_current_language_tag += "-";
m_current_language_tag += tgtLang.get_country(); m_current_language_tag += tgtLang.get_country();