Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add the default language as last choice for preferred languages #1158

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add the default language as last choice for preferred languages #1158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion cocos2d-ui/CCBReader/CCBLocalizationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down