pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] English is set as default language.

Browse source
This commit is contained in:
Timur Bernikowich 2014-11-07 11:37:33 +03:00 • committed by Alex Zolotarev
parent 53376be433
commit a88e1c684e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/Classes/InAppMessagesManager.mm
View file

@ -318,9 +318,9 @@ NSString * const MWMProVersionPrefix = @"MWMPro";
{
NSDictionary * imageParameters = [[AppInfo sharedInfo] featureValue:[self appFeatureNameForMessage:messageName] forKey:@"Variants"];
NSArray * languages = imageParameters[imageType][@"Languages"];
// if message does not use localized text we should pass '*' instead of language name
// then, message image must be in /all directory on server
NSString * messageLanguage = nil;
NSString * defaultLanguage = @"en";
NSString * messageLanguage = ([languages containsObject:defaultLanguage]) ? defaultLanguage : nil;
for (NSString * preferredLanguage in [NSLocale preferredLanguages])
{
// We don't support country specific languages yet, so we strip country code.
@ -333,6 +333,9 @@ NSString * const MWMProVersionPrefix = @"MWMPro";
}
if (messageLanguage)
return messageLanguage;
// if message does not use localized text we should pass '*' instead of language name
// then, message image must be in /all directory on server
if ([languages containsObject:@"*"])
return @"all";
return nil;