Fix of #8299 (Linux crash when selecting locales)
This commit is contained in:
parent
7fbaf0f96c
commit
c99de065f7
@ -1962,15 +1962,17 @@ static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguage
|
||||
}),
|
||||
locales.end());
|
||||
|
||||
// Is there a candidate matching a country code of a system language? Move it to the end,
|
||||
// while maintaining the order of matches, so that the best match ends up at the very end.
|
||||
std::string system_country = "_" + into_u8(system_language->CanonicalName.AfterFirst('_')).substr(0, 2);
|
||||
int cnt = locales.size();
|
||||
for (int i=0; i<cnt; ++i)
|
||||
if (locales[i].find(system_country) != std::string::npos) {
|
||||
locales.emplace_back(std::move(locales[i]));
|
||||
locales[i].clear();
|
||||
}
|
||||
if (system_language) {
|
||||
// Is there a candidate matching a country code of a system language? Move it to the end,
|
||||
// while maintaining the order of matches, so that the best match ends up at the very end.
|
||||
std::string system_country = "_" + into_u8(system_language->CanonicalName.AfterFirst('_')).substr(0, 2);
|
||||
int cnt = locales.size();
|
||||
for (int i=0; i<cnt; ++i)
|
||||
if (locales[i].find(system_country) != std::string::npos) {
|
||||
locales.emplace_back(std::move(locales[i]));
|
||||
locales[i].clear();
|
||||
}
|
||||
}
|
||||
|
||||
// Now try them one by one.
|
||||
for (auto it = locales.rbegin(); it != locales.rend(); ++ it)
|
||||
|
Loading…
Reference in New Issue
Block a user