summaryrefslogtreecommitdiff
path: root/platform/osx
diff options
context:
space:
mode:
authorDidier Vandekerckhove <didierv@mac.com>2015-10-16 19:42:26 +0200
committerDidier Vandekerckhove <didierv@mac.com>2015-10-16 19:42:26 +0200
commitd48a1bd22d624bfe381d5e1770aab14f2c59c142 (patch)
treee582d766bb51a2a0a5bfbab7719d3e6ef08c2cea /platform/osx
parent79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff)
Added specific get_locale to OSX platform
The default unix get_locale didn’t work. OS X requires a specific one.
Diffstat (limited to 'platform/osx')
-rw-r--r--platform/osx/os_osx.h2
-rw-r--r--platform/osx/os_osx.mm5
2 files changed, 7 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 49fa6c0862..e8277688ac 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -157,6 +157,8 @@ public:
Error shell_open(String p_uri);
void push_input(const InputEvent& p_event);
+ String get_locale() const;
+
virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0);
virtual VideoMode get_video_mode(int p_screen=0) const;
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index b0ce37cecf..4990d04ab6 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1254,6 +1254,11 @@ Error OS_OSX::shell_open(String p_uri) {
return OK;
}
+String OS_OSX::get_locale() const {
+ NSString* preferredLang = [[NSLocale preferredLanguages] objectAtIndex:0];
+ return [preferredLang UTF8String];
+}
+
void OS_OSX::swap_buffers() {
[context flushBuffer];