Explorar el Código

Make OS.get_locale() returns same value

volzhs hace 8 años
padre
commit
0627445863
Se han modificado 2 ficheros con 3 adiciones y 4 borrados
  1. 1 2
      platform/iphone/app_delegate.mm
  2. 2 2
      platform/osx/os_osx.mm

+ 1 - 2
platform/iphone/app_delegate.mm

@@ -401,8 +401,7 @@ static int frame_count = 0;
 			OSIPhone::get_singleton()->set_data_dir(
 					String::utf8([documentsDirectory UTF8String]));
 
-			NSString *locale_code =
-					[[[NSLocale preferredLanguages] objectAtIndex:0] substringToIndex:2];
+			NSString *locale_code = [[NSLocale currentLocale] localeIdentifier];
 			OSIPhone::get_singleton()->set_locale(
 					String::utf8([locale_code UTF8String]));
 

+ 2 - 2
platform/osx/os_osx.mm

@@ -1228,8 +1228,8 @@ Error OS_OSX::shell_open(String p_uri) {
 }
 
 String OS_OSX::get_locale() const {
-	NSString *preferredLang = [[NSLocale preferredLanguages] objectAtIndex:0];
-	return [preferredLang UTF8String];
+	NSString *locale_code = [[NSLocale currentLocale] localeIdentifier];
+	return [locale_code UTF8String];
 }
 
 void OS_OSX::swap_buffers() {