Fix language initialization when setting is empty

Also use [NSLocale preferredLanguages].
koraktor · Feb 2, 2015 · ba29aea · ba29aea
1 parent 58e0c50
commit ba29aea
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Suitcase/Classes/SCLanguage.m b/Suitcase/Classes/SCLanguage.m
@@ -19,8 +19,8 @@ + (void)initialize {
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *currentLanguage = [defaults objectForKey:@"language"];
-    if ([currentLanguage isEqualToString:@"auto"]) {
-        currentLanguage = [defaults objectForKey:@"AppleLanguages"][0];
+    if (currentLanguage == nil || [currentLanguage isEqualToString:@"auto"]) {
+        currentLanguage = [NSLocale preferredLanguages][0];
     }
     [self setLanguage:currentLanguage];
 }
@@ -29,8 +29,8 @@ + (NSLocale *)currentLanguage {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *currentLanguage = [defaults stringForKey:@"language"];
 
-    if ([currentLanguage isEqualToString:@"auto"]) {
-        currentLanguage = [defaults objectForKey:@"AppleLanguages"][0];
+    if (currentLanguage == nil || [currentLanguage isEqualToString:@"auto"]) {
+        currentLanguage = [NSLocale preferredLanguages][0];
     }
 
     return [NSLocale localeWithLocaleIdentifier:currentLanguage];