Mercurial > hg > toolkit / file diff

--- a/ui/cocoa/resource.m	Fri Apr 11 17:02:19 2014 +0200
+++ b/ui/cocoa/resource.m	Fri Apr 11 21:45:24 2014 +0200
@@ -31,19 +31,28 @@
 #import <string.h>
 
 #import "resource.h"
+#import "../common/properties.h"
 
 
 
-void ui_load_lang(char *locale) {
+void ui_load_lang_def(char *locale, char *default_locale) {
     NSString *localeString = nil;
     if(locale) {
         localeString = [[NSString alloc]initWithUTF8String:locale];
     } else {
-        localeString = @"en_EN";
+        localeString = [[NSString alloc]initWithUTF8String:default_locale];
     }
     
     NSString *path = [[NSBundle mainBundle] pathForResource:localeString ofType:@"properties" inDirectory:@"locales"];
     
     const char *p = [path UTF8String];
-    uic_load_language_file(p);
+    uic_load_language_file((char*)p);
 }
+
+void ui_locales_dir(char *path) {
+    // empty
+}
+
+void ui_pixmaps_dir(char *path) {
+    // empty
+}
\ No newline at end of file