asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8935 from volzhs/get-locale-master

Browse source 
Make OS.get_locale() returns same value
This commit is contained in:
Rémi Verschelde 2017-05-27 11:27:39 +02:00 committed by GitHub
commit 96be464952
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/iphone/app_delegate.mm
View file

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

4
platform/osx/os_osx.mm
View file

@ -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() {