diff options
| author | Rémi Verschelde | 2017-05-27 11:27:39 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-27 11:27:39 +0200 |
| commit | 96be4649528f4b6f4cefacc6adac6f2ddd14aa10 (patch) | |
| tree | b7f9331e4e7c41cc0f2ecb53db5847807cbc66c1 | |
| parent | 94edf16272df95a4d90ec3537f921c2fca20b903 (diff) | |
| parent | 062744586324a80a003e1488275b14841cf105d7 (diff) | |
| download | godot-96be4649528f4b6f4cefacc6adac6f2ddd14aa10.tar.gz godot-96be4649528f4b6f4cefacc6adac6f2ddd14aa10.tar.zst godot-96be4649528f4b6f4cefacc6adac6f2ddd14aa10.zip | |
Merge pull request #8935 from volzhs/get-locale-master
Make OS.get_locale() returns same value
Diffstat (limited to '')
| -rw-r--r-- | platform/iphone/app_delegate.mm | 3 | ||||
| -rw-r--r-- | 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 576292b92..1f81f0f86 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -402,8 +402,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 d13486b49..13bc2226f 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() { |