From 970f9053522368b1fb3661915393cf5e2b933f32 Mon Sep 17 00:00:00 2001 From: Eric Quesada Date: Sun, 11 Jan 2015 11:50:32 +0100 Subject: [PATCH] Add the default language as last choice for preferred languages --- cocos2d-ui/CCBReader/CCBLocalizationManager.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cocos2d-ui/CCBReader/CCBLocalizationManager.m b/cocos2d-ui/CCBReader/CCBLocalizationManager.m index bc154e99a1d..888fcb76b16 100644 --- a/cocos2d-ui/CCBReader/CCBLocalizationManager.m +++ b/cocos2d-ui/CCBReader/CCBLocalizationManager.m @@ -69,7 +69,14 @@ - (void) loadStringsFile:(NSString*) file // Determine which language to use NSString* userLanguage = NULL; - NSArray* preferredLangs = [NSLocale preferredLanguages]; + NSMutableArray* preferredLangs = [[NSLocale preferredLanguages] mutableCopy]; + + // Add the default language as last choice for preferred languages + NSString* defaultLanguage = [ser objectForKey:@"defaultLanguage"]; + if (defaultLanguage) { + [preferredLangs addObject:defaultLanguage]; + } + for (NSString* preferredLang in preferredLangs) { if ([languages containsObject:preferredLang])