summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-07-03 00:53:47 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-07-03 09:11:01 -0700
commit71a72d269a3f0de6f3cdb7780d2bf44f6a4e2c21 (patch)
treea2cf83c0988ae0abc0e693088625b6e33e52a6b9
parentbfd6fb7b52f910f4b20eb18a757d542d9dfa2d90 (diff)
downloadqtlocation-mapboxgl-71a72d269a3f0de6f3cdb7780d2bf44f6a4e2c21.tar.gz
[ios, macos] Autolocalize into Japanese, Korean
Added Japanese and Korean to the list of languages for which the Mapbox Streets source has dedicated name fields.
-rw-r--r--platform/darwin/src/MGLVectorTileSource.mm6
-rw-r--r--platform/ios/CHANGELOG.md1
-rw-r--r--platform/macos/CHANGELOG.md1
3 files changed, 6 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLVectorTileSource.mm b/platform/darwin/src/MGLVectorTileSource.mm
index 88ddee1d98..a3241d3bce 100644
--- a/platform/darwin/src/MGLVectorTileSource.mm
+++ b/platform/darwin/src/MGLVectorTileSource.mm
@@ -82,7 +82,8 @@
https://www.mapbox.com/vector-tiles/mapbox-streets-v7/#overview
*/
static NSArray * const MGLMapboxStreetsLanguages = @[
- @"ar", @"de", @"en", @"es", @"fr", @"pt", @"ru", @"zh", @"zh-Hans",
+ @"ar", @"de", @"en", @"es", @"fr", @"ja", @"ko", @"pt", @"ru", @"zh",
+ @"zh-Hans",
];
/**
@@ -90,7 +91,8 @@ static NSArray * const MGLMapboxStreetsLanguages = @[
`+[NSBundle preferredLocalizationsFromArray:forPreferences:]`.
*/
static NSArray * const MGLMapboxStreetsAlternativeLanguages = @[
- @"mul", @"ar", @"de", @"es", @"fr", @"pt", @"ru", @"zh", @"zh-Hans",
+ @"mul", @"ar", @"de", @"es", @"fr", @"ja", @"ko", @"pt", @"ru", @"zh",
+ @"zh-Hans",
];
+ (NSSet<NSString *> *)mapboxStreetsLanguages {
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 9b377913de..4d052e0269 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
# master
* Added `-[MGLMapView camera:fittingShape:edgePadding:]` and `-[MGLMapView camera:fittingCoordinateBounds:edgePadding:]` allowing you specify the pitch and direction for the calculated camera. ([#12213](https://github.com/mapbox/mapbox-gl-native/pull/12213))
+* `-[MGLStyle localizeLabelsIntoLocale:]` and `-[NSExpression mgl_expressionLocalizedIntoLocale:]` can automatically localize labels into Japanese or Korean based on the system’s language settings. ([#12286](https://github.com/mapbox/mapbox-gl-native/pull/12286))
## 4.2.0
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 4a43552902..e12ac427d8 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -3,6 +3,7 @@
# master
* Added `-[MGLMapView camera:fittingShape:edgePadding:]` and `-[MGLMapView camera:fittingCoordinateBounds:edgePadding:]` allowing you specify the pitch and direction for the calculated camera. ([#12213](https://github.com/mapbox/mapbox-gl-native/pull/12213))
+* `-[MGLStyle localizeLabelsIntoLocale:]` and `-[NSExpression mgl_expressionLocalizedIntoLocale:]` can automatically localize labels into Japanese or Korean based on the system’s language settings. ([#12286](https://github.com/mapbox/mapbox-gl-native/pull/12286))
## 0.7.2 - June 22, 2018