summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-12-08 13:29:15 -0800
committerFabian Guerra Soto <fabian.guerra@mapbox.com>2018-01-03 11:37:53 -0600
commite8abb8c81abe85e85b07c11af7c57a77aa14111e (patch)
treec68eb26639fe79235f862e21be02ca48425a4555
parentb94929ca08f706a372d1336850d1346f09677ca4 (diff)
downloadqtlocation-mapboxgl-e8abb8c81abe85e85b07c11af7c57a77aa14111e.tar.gz
[ios,macos] Revert ideographic->ideograph name change.
Original GL JS name was meant to represent "font family to use for locally generating ideographs", but "ideographic font family" communicates a similar intent more concisely.
-rw-r--r--platform/darwin/src/MGLRendererConfiguration.h2
-rw-r--r--platform/darwin/src/MGLRendererConfiguration.mm2
-rw-r--r--platform/ios/app/Info.plist2
-rw-r--r--platform/ios/docs/guides/Info.plist Keys.md2
-rw-r--r--platform/macos/docs/guides/Info.plist Keys.md4
5 files changed, 6 insertions, 6 deletions
diff --git a/platform/darwin/src/MGLRendererConfiguration.h b/platform/darwin/src/MGLRendererConfiguration.h
index dc434a4fbb..31aad0a742 100644
--- a/platform/darwin/src/MGLRendererConfiguration.h
+++ b/platform/darwin/src/MGLRendererConfiguration.h
@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
Currently only used for CJK glyphs. Changing this at run time is not currently
supported. Enable client-side rendering of CJK glyphs by setting
- `MGLIdeographFontFamilyName` in your containing app's Info.plist to a value
+ `MGLIdeographicFontFamilyName` in your containing app's Info.plist to a value
which will be available at run time, e.g. "PingFang". */
@property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName;
diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm
index be60c3c787..ae7d7dd9fe 100644
--- a/platform/darwin/src/MGLRendererConfiguration.mm
+++ b/platform/darwin/src/MGLRendererConfiguration.mm
@@ -35,7 +35,7 @@
}
- (mbgl::optional<std::string>)localFontFamilyName {
- NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographFontFamilyName"];
+ NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"];
return fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>();
}
diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist
index e04976ba2a..9f772324c5 100644
--- a/platform/ios/app/Info.plist
+++ b/platform/ios/app/Info.plist
@@ -24,7 +24,7 @@
<string>7877</string>
<key>LSRequiresIPhoneOS</key>
<true/>
- <key>MGLIdeographFontFamilyName</key>
+ <key>MGLIdeographicFontFamilyName</key>
<string>PingFang</string>
<key>NSHumanReadableCopyright</key>
<string>© 2014–2017 Mapbox</string>
diff --git a/platform/ios/docs/guides/Info.plist Keys.md b/platform/ios/docs/guides/Info.plist Keys.md
index 40d53fb9f8..305714268d 100644
--- a/platform/ios/docs/guides/Info.plist Keys.md
+++ b/platform/ios/docs/guides/Info.plist Keys.md
@@ -20,6 +20,6 @@ The default value is `https://api.mapbox.com`.
If you have implemented custom opt-out of Mapbox Telemetry within the user interface of your app, use this key to disable the built-in check for opt-out support. See [this guide](https://www.mapbox.com/ios-sdk/#telemetry_opt_out) for more details.
-## MGLIdeographFontFamilyName
+## MGLIdeographicFontFamilyName
The name of the font family to use for client-side text rendering of CJK ideographs. Set this to the name of a font family which will be available at run time, e.g. `PingFang`.
diff --git a/platform/macos/docs/guides/Info.plist Keys.md b/platform/macos/docs/guides/Info.plist Keys.md
index 736f1cf7e6..c60635162f 100644
--- a/platform/macos/docs/guides/Info.plist Keys.md
+++ b/platform/macos/docs/guides/Info.plist Keys.md
@@ -16,6 +16,6 @@ Use this key if you need to customize the API base URL used throughout the SDK.
The default value is `https://api.mapbox.com`.
-## MGLIdeographFontFamilyName
-
+## MGLIdeographicFontFamilyName
+
The name of the font family to use for client-side text rendering of CJK ideographs. Set this to the name of a font family which will be available at run time, e.g. `PingFang`.