kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve iOS locale calculation (thanks @maaniv, close #1224)

Browse Source
This commit is contained in:
Joshua Granick
2018-08-21 09:46:12 -07:00
parent 691555fb56
commit 30b4e4962f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
project/src/system/Locale.mm
View File

@@ -17,7 +17,16 @@ namespace lime {
#endif #endif
NSString* localeLanguage = [[NSLocale preferredLanguages] firstObject]; NSString* localeLanguage = [[NSLocale preferredLanguages] firstObject];
NSString* localeRegion = [[NSLocale currentLocale] countryCode]; if (localeLanguage == nil) localeLanguage = @"en";
NSString* localeRegion = nil;
NSLocale* currentLocale = [NSLocale autoupdatingCurrentLocale];
if (currentLocale == nil || ![currentLocale respondsToSelector:@selector(countryCode)]) {
localeRegion = @"";
} else {
localeRegion = [currentLocale countryCode];
}
NSString* locale = [[localeLanguage stringByAppendingString:@"_"] stringByAppendingString:localeRegion]; NSString* locale = [[localeLanguage stringByAppendingString:@"_"] stringByAppendingString:localeRegion];
std::string* result = 0; std::string* result = 0;