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

2018-08-21 09:46:12 -07:00
parent 691555fb56
commit 30b4e4962f
1 changed files with 10 additions and 1 deletions
--- a/project/src/system/Locale.mm
+++ b/project/src/system/Locale.mm
@@ -17,7 +17,16 @@ namespace lime {
 		#endif

 		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];

 		std::string* result = 0;