From 062744586324a80a003e1488275b14841cf105d7 Mon Sep 17 00:00:00 2001 From: volzhs Date: Sat, 27 May 2017 03:50:22 +0900 Subject: [PATCH] Make OS.get_locale() returns same value --- platform/iphone/app_delegate.mm | 3 +-- platform/osx/os_osx.mm | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 0d9750d7010..d02cc153392 100644 --- a/platform/iphone/app_delegate.mm +++ b/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])); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index d13486b4906..13bc2226f4d 100644 --- a/platform/osx/os_osx.mm +++ b/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() {