GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-30 01:54:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux locales detection: A little refactoring

Browse Source
This commit is contained in:
Vojtech Bubnik 2020-12-12 13:37:50 +01:00 committed by Lukas Matena
parent 1249fdb71d
commit b9bdfd26e3
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/slic3r/GUI/GUI_App.cpp
View File

@ -1293,34 +1293,40 @@ static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguage
} }
// locales now contain all candidates for this language. // locales now contain all candidates for this language.
// Sort them so ones containing anything about UTF-8 are at the beginning. // Sort them so ones containing anything about UTF-8 are at the end.
std::sort(locales.begin(), locales.end(), [](const std::string& a, const std::string& b) std::sort(locales.begin(), locales.end(), [](const std::string& a, const std::string& b)
{ {
auto has_utf8 = [](const std::string & s) { auto has_utf8 = [](const std::string & s) {
return boost::to_upper_copy(s).find("UTF") != std::string::npos auto S = boost::to_upper_copy(s);
&& s.find("8") != std::string::npos; return S.find("UTF8") != std::string::npos || S.find("UTF-8") != std::string::npos;
}; };
return (has_utf8(a) && ! has_utf8(b)); return ! has_utf8(a) && has_utf8(b);
}); });
// Remove the suffix. // Remove the suffix.
for (std::string& s : locales) for (std::string& s : locales)
s = s.substr(0, s.find(".")); s = s.substr(0, s.find("."));
// Is there a candidate matching a country code of a system language? Put it at the beginning // Is there a candidate matching a country code of a system language? Move it to the end,
// (duplicates do not matter). Check backwards so the utf8 one ends up first if there are more. // while maintaining the order of matches, so that the best match ends up at the very end.
// We just hope that dear Linux "locale -a" returns country codes in ISO 3166-1 alpha-2 code (two letter) format.
// https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
std::string system_country = "_" + into_u8(system_language->CanonicalName.AfterFirst('_')).substr(0, 2); std::string system_country = "_" + into_u8(system_language->CanonicalName.AfterFirst('_')).substr(0, 2);
int cnt = locales.size(); int cnt = locales.size();
for (int i=0; i<cnt; ++i) for (int i=0; i<cnt; ++i)
if (locales[locales.size()-i-1].find(system_country) != std::string::npos) if (locales[i].find(system_country) != std::string::npos) {
locales.insert(locales.begin(), locales[locales.size()-i-1]); locales.emplace_back(std::move[locales[i]]);
locales[i].clear();
}
// Now try them one by one. // Now try them one by one.
for (const std::string& locale : locales) { for (auto it = locales.rbegin(); it != locales.rend(); ++ it)
const wxLanguageInfo* lang = wxLocale::FindLanguageInfo(locale.substr(0, locale.find("."))); if (! it->empty()) {
if (wxLocale::IsAvailable(lang->Language)) const std::string &locale = *it;
return lang; const wxLanguageInfo* lang = wxLocale::FindLanguageInfo(locale.substr(0, locale.find(".")));
} if (wxLocale::IsAvailable(lang->Language))
return lang;
}
return language; return language;
} }
#endif #endif