Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: With new iOS versions (and perhaps OS X), locale can contains country code

Browse source
This commit is contained in:
kervala 2016-03-09 11:24:01 +01:00
parent 2221bae1b2
commit 3300934591
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/nel/src/misc/i18n.cpp
View file

@ -306,11 +306,20 @@ std::string CI18N::getSystemLanguageCode ()
CFRelease(langCF); CFRelease(langCF);
} }
// only keep language code if supported by NeL if (!lang.empty())
if (!lang.empty() && isLanguageCodeSupported(lang))
{ {
s_cachedSystemLanguage = lang; // fix language code if country is specified
break; std::string::size_type pos = lang.find('-');
if (pos != std::string::npos)
lang = lang.substr(0, pos);
// only keep language code if supported by NeL
if (isLanguageCodeSupported(lang))
{
s_cachedSystemLanguage = lang;
break;
}
} }
} }