diff options
| author | Julian Rex <julian.rex@gmail.com> | 2018-06-11 15:23:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 15:23:40 -0400 |
| commit | ed7623092515f264ab4dc8e8dc7f493ecfd67a6c (patch) | |
| tree | e2576d3ef9e71c04b20973e47dbc37582a5afade /platform/darwin | |
| parent | 7a76eb23ea1e47a8fdbd8cdc5220f01e8671c00a (diff) | |
| download | qtlocation-mapboxgl-ed7623092515f264ab4dc8e8dc7f493ecfd67a6c.tar.gz | |
[ios,macos] Fixed crash in `-[MGLStyle localizeLabelsIntoLocale:]` on iOS 9.3 (#12123)
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/MGLVectorTileSource.mm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLVectorTileSource.mm b/platform/darwin/src/MGLVectorTileSource.mm index e55ed13060..88ddee1d98 100644 --- a/platform/darwin/src/MGLVectorTileSource.mm +++ b/platform/darwin/src/MGLVectorTileSource.mm @@ -109,7 +109,16 @@ static NSArray * const MGLMapboxStreetsAlternativeLanguages = @[ + (NSString *)preferredMapboxStreetsLanguageForPreferences:(NSArray<NSString *> *)preferencesArray { BOOL acceptsEnglish = [preferencesArray filteredArrayUsingPredicate: [NSPredicate predicateWithBlock:^BOOL(NSString * _Nullable language, NSDictionary<NSString *,id> * _Nullable bindings) { - return [[NSLocale localeWithLocaleIdentifier:language].languageCode isEqualToString:@"en"]; + NSString *languageCode; + + if (@available(iOS 10.0, macOS 10.12.0, *)) { + languageCode = [NSLocale localeWithLocaleIdentifier:language].languageCode; + } + else { + languageCode = [[NSLocale localeWithLocaleIdentifier:language] objectForKey:NSLocaleLanguageCode]; + } + + return [languageCode isEqualToString:@"en"]; }]].count; NSArray<NSString *> *availableLanguages = acceptsEnglish ? MGLMapboxStreetsLanguages : MGLMapboxStreetsAlternativeLanguages; |