summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2017-12-18 09:43:26 -0800
committerMinh Nguyễn <mxn@1ec5.org>2017-12-18 11:41:56 -0800
commit9c1dfe46cf39147ebe25a98eb0603828d4e8c61d (patch)
tree8599e0117dbb22f1adee625dd28206c9f3f17a2c
parentc618d513b1838e370eb1410001f80768c7b7a347 (diff)
downloadqtlocation-mapboxgl-9c1dfe46cf39147ebe25a98eb0603828d4e8c61d.tar.gz
[ios, macos] Cleaned up base localization files
Localizable strings in Darwin classes need to specify “Foundation” as the table so that NSBundle consults the right .strings files. Reran make genstrings to add some missing strings to the base localizations and undo some manual edits to the base localizations that contained errors.
-rw-r--r--platform/darwin/resources/Base.lproj/Foundation.strings6
-rw-r--r--platform/darwin/src/MGLAttributionInfo.mm4
-rw-r--r--platform/ios/resources/Base.lproj/Localizable.stringsbin7378 -> 3962 bytes
-rw-r--r--platform/macos/sdk/Base.lproj/Localizable.stringsbin298 -> 840 bytes
4 files changed, 8 insertions, 2 deletions
diff --git a/platform/darwin/resources/Base.lproj/Foundation.strings b/platform/darwin/resources/Base.lproj/Foundation.strings
index 9d63dfa697..ba7db3fc63 100644
--- a/platform/darwin/resources/Base.lproj/Foundation.strings
+++ b/platform/darwin/resources/Base.lproj/Foundation.strings
@@ -289,3 +289,9 @@
/* West longitude format, short: {longitude} */
"COORD_W_SHORT" = "%@W";
+/* OpenStreetMap full name attribution */
+"OSM_FULL_NAME" = "OpenStreetMap";
+
+/* OpenStreetMap short name attribution */
+"OSM_SHORT_NAME" = "OSM";
+
diff --git a/platform/darwin/src/MGLAttributionInfo.mm b/platform/darwin/src/MGLAttributionInfo.mm
index 29dd5229a7..52a83fd18e 100644
--- a/platform/darwin/src/MGLAttributionInfo.mm
+++ b/platform/darwin/src/MGLAttributionInfo.mm
@@ -170,8 +170,8 @@
- (NSAttributedString *)titleWithStyle:(MGLAttributionInfoStyle)style
{
- NSString *openStreetMap = NSLocalizedStringWithDefaultValue(@"OSM_FULL_NAME", nil, nil, @"OpenStreetMap", @"OpenStreetMap full name attribution");
- NSString *OSM = NSLocalizedStringWithDefaultValue(@"OSM_SHORT_NAME", nil, nil, @"OSM", @"OpenStreetMap short name attribution");
+ NSString *openStreetMap = NSLocalizedStringWithDefaultValue(@"OSM_FULL_NAME", @"Foundation", nil, @"OpenStreetMap", @"OpenStreetMap full name attribution");
+ NSString *OSM = NSLocalizedStringWithDefaultValue(@"OSM_SHORT_NAME", @"Foundation", nil, @"OSM", @"OpenStreetMap short name attribution");
NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithAttributedString:self.title];
[title removeAttribute:NSUnderlineStyleAttributeName range:NSMakeRange(0, [title.string length])];
diff --git a/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/resources/Base.lproj/Localizable.strings
index 245b122fb6..571a6bca6b 100644
--- a/platform/ios/resources/Base.lproj/Localizable.strings
+++ b/platform/ios/resources/Base.lproj/Localizable.strings
Binary files differ
diff --git a/platform/macos/sdk/Base.lproj/Localizable.strings b/platform/macos/sdk/Base.lproj/Localizable.strings
index cb085add6a..68360320eb 100644
--- a/platform/macos/sdk/Base.lproj/Localizable.strings
+++ b/platform/macos/sdk/Base.lproj/Localizable.strings
Binary files differ