[ios, osx] Made localizable strings unique; unlocalized iosapp

Assigned unique IDs to localizable English strings in code.

Made iosapp non-localizable. For the time being, it isn’t worth the trouble to localize more strings for this demo application than for the SDK itself.

1 files changed, 64 insertions, 64 deletions

diff --git a/platform/darwin/src/MGLCompassDirectionFormatter.m b/platform/darwin/src/MGLCompassDirectionFormatter.m
index c5dd9b4899..abf0db2da1 100644
--- a/platform/darwin/src/MGLCompassDirectionFormatter.m
+++ b/platform/darwin/src/MGLCompassDirectionFormatter.m
@@ -20,79 +20,79 @@
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         shortStrings = @[
-            NSLocalizedStringFromTable(@"N", @"Foundation", @"North, short"),
-            NSLocalizedStringFromTable(@"N×E", @"Foundation", @"North by east, short"),
-            NSLocalizedStringFromTable(@"NNE", @"Foundation", @"North-northeast, short"),
-            NSLocalizedStringFromTable(@"NE×N", @"Foundation", @"Northeast by north, short"),
-            NSLocalizedStringFromTable(@"NE", @"Foundation", @"Northeast, short"),
-            NSLocalizedStringFromTable(@"NE×E", @"Foundation", @"Northeast by east, short"),
-            NSLocalizedStringFromTable(@"ENE", @"Foundation", @"East-northeast, short"),
-            NSLocalizedStringFromTable(@"E×N", @"Foundation", @"East by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_N_SHORT", @"Foundation", nil, @"N", @"North, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NxE_SHORT", @"Foundation", nil, @"N×E", @"North by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NNE_SHORT", @"Foundation", nil, @"NNE", @"North-northeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NExN_SHORT", @"Foundation", nil, @"NE×N", @"Northeast by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NE_SHORT", @"Foundation", nil, @"NE", @"Northeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NExE_SHORT", @"Foundation", nil, @"NE×E", @"Northeast by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ENE_SHORT", @"Foundation", nil, @"ENE", @"East-northeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ExN_SHORT", @"Foundation", nil, @"E×N", @"East by north, short"),
             
-            NSLocalizedStringFromTable(@"E", @"Foundation", @"East, short"),
-            NSLocalizedStringFromTable(@"E×S", @"Foundation", @"East by south, short"),
-            NSLocalizedStringFromTable(@"ESE", @"Foundation", @"East-southeast, short"),
-            NSLocalizedStringFromTable(@"SE×E", @"Foundation", @"Southeast by east, short"),
-            NSLocalizedStringFromTable(@"SE", @"Foundation", @"Southeast, short"),
-            NSLocalizedStringFromTable(@"SE×S", @"Foundation", @"Southeast by south, short"),
-            NSLocalizedStringFromTable(@"SSE", @"Foundation", @"South-southeast, short"),
-            NSLocalizedStringFromTable(@"S×E", @"Foundation", @"South by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_E_SHORT", @"Foundation", nil, @"E", @"East, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ExS_SHORT", @"Foundation", nil, @"E×S", @"East by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ESE_SHORT", @"Foundation", nil, @"ESE", @"East-southeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SExE_SHORT", @"Foundation", nil, @"SE×E", @"Southeast by east, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SE_SHORT", @"Foundation", nil, @"SE", @"Southeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SExS_SHORT", @"Foundation", nil, @"SE×S", @"Southeast by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SSE_SHORT", @"Foundation", nil, @"SSE", @"South-southeast, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SxE_SHORT", @"Foundation", nil, @"S×E", @"South by east, short"),
             
-            NSLocalizedStringFromTable(@"S", @"Foundation", @"South, short"),
-            NSLocalizedStringFromTable(@"S×W", @"Foundation", @"South by west, short"),
-            NSLocalizedStringFromTable(@"SSW", @"Foundation", @"South-southwest, short"),
-            NSLocalizedStringFromTable(@"SW×S", @"Foundation", @"Southwest by south, short"),
-            NSLocalizedStringFromTable(@"SW", @"Foundation", @"Southwest, short"),
-            NSLocalizedStringFromTable(@"SW×W", @"Foundation", @"Southwest by west, short"),
-            NSLocalizedStringFromTable(@"WSW", @"Foundation", @"West-southwest, short"),
-            NSLocalizedStringFromTable(@"W×S", @"Foundation", @"West by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_S_SHORT", @"Foundation", nil, @"S", @"South, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SxW_SHORT", @"Foundation", nil, @"S×W", @"South by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SSW_SHORT", @"Foundation", nil, @"SSW", @"South-southwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxS_SHORT", @"Foundation", nil, @"SW×S", @"Southwest by south, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SW_SHORT", @"Foundation", nil, @"SW", @"Southwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxW_SHORT", @"Foundation", nil, @"SW×W", @"Southwest by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WSW_SHORT", @"Foundation", nil, @"WSW", @"West-southwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WxS_SHORT", @"Foundation", nil, @"W×S", @"West by south, short"),
             
-            NSLocalizedStringFromTable(@"W", @"Foundation", @"West, short"),
-            NSLocalizedStringFromTable(@"W×N", @"Foundation", @"West by north, short"),
-            NSLocalizedStringFromTable(@"WNW", @"Foundation", @"West-northwest, short"),
-            NSLocalizedStringFromTable(@"NW×W", @"Foundation", @"Northwest by west, short"),
-            NSLocalizedStringFromTable(@"NW", @"Foundation", @"Northwest, short"),
-            NSLocalizedStringFromTable(@"NW×N", @"Foundation", @"Northwest by north, short"),
-            NSLocalizedStringFromTable(@"NNW", @"Foundation", @"North-northwest, short"),
-            NSLocalizedStringFromTable(@"N×W", @"Foundation", @"North by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_W_SHORT", @"Foundation", nil, @"W", @"West, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WxN_SHORT", @"Foundation", nil, @"W×N", @"West by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WNW_SHORT", @"Foundation", nil, @"WNW", @"West-northwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxW_SHORT", @"Foundation", nil, @"NW×W", @"Northwest by west, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NW_SHORT", @"Foundation", nil, @"NW", @"Northwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxN_SHORT", @"Foundation", nil, @"NW×N", @"Northwest by north, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NNW_SHORT", @"Foundation", nil, @"NNW", @"North-northwest, short"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NxW_SHORT", @"Foundation", nil, @"N×W", @"North by west, short"),
         ];
         
         longStrings = @[
-            NSLocalizedStringFromTable(@"north", @"Foundation", @"North, long"),
-            NSLocalizedStringFromTable(@"north by east", @"Foundation", @"North by east, long"),
-            NSLocalizedStringFromTable(@"north-northeast", @"Foundation", @"North-northeast, long"),
-            NSLocalizedStringFromTable(@"northeast by north", @"Foundation", @"Northeast by north, long"),
-            NSLocalizedStringFromTable(@"northeast", @"Foundation", @"Northeast, long"),
-            NSLocalizedStringFromTable(@"northeast by east", @"Foundation", @"Northeast by east, long"),
-            NSLocalizedStringFromTable(@"east-northeast", @"Foundation", @"East-northeast, long"),
-            NSLocalizedStringFromTable(@"east by north", @"Foundation", @"East by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_N_LONG", @"Foundation", nil, @"north", @"North, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NxE_LONG", @"Foundation", nil, @"north by east", @"North by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NNE_LONG", @"Foundation", nil, @"north-northeast", @"North-northeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NExN_LONG", @"Foundation", nil, @"northeast by north", @"Northeast by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NE_LONG", @"Foundation", nil, @"northeast", @"Northeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NExE_LONG", @"Foundation", nil, @"northeast by east", @"Northeast by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ENE_LONG", @"Foundation", nil, @"east-northeast", @"East-northeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ExN_LONG", @"Foundation", nil, @"east by north", @"East by north, long"),
             
-            NSLocalizedStringFromTable(@"east", @"Foundation", @"East, long"),
-            NSLocalizedStringFromTable(@"east by south", @"Foundation", @"East by south, long"),
-            NSLocalizedStringFromTable(@"east-southeast", @"Foundation", @"East-southeast, long"),
-            NSLocalizedStringFromTable(@"southeast by east", @"Foundation", @"Southeast by east, long"),
-            NSLocalizedStringFromTable(@"southeast", @"Foundation", @"Southeast, long"),
-            NSLocalizedStringFromTable(@"southeast by south", @"Foundation", @"Southeast by south, long"),
-            NSLocalizedStringFromTable(@"south-southeast", @"Foundation", @"South-southeast, long"),
-            NSLocalizedStringFromTable(@"south by east", @"Foundation", @"South by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_E_LONG", @"Foundation", nil, @"east", @"East, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ExS_LONG", @"Foundation", nil, @"east by south", @"East by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_ESE_LONG", @"Foundation", nil, @"east-southeast", @"East-southeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SExE_LONG", @"Foundation", nil, @"southeast by east", @"Southeast by east, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SE_LONG", @"Foundation", nil, @"southeast", @"Southeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SExS_LONG", @"Foundation", nil, @"southeast by south", @"Southeast by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SSE_LONG", @"Foundation", nil, @"south-southeast", @"South-southeast, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SxE_LONG", @"Foundation", nil, @"south by east", @"South by east, long"),
             
-            NSLocalizedStringFromTable(@"south", @"Foundation", @"South, long"),
-            NSLocalizedStringFromTable(@"south by west", @"Foundation", @"South by west, long"),
-            NSLocalizedStringFromTable(@"south-southwest", @"Foundation", @"South-southwest, long"),
-            NSLocalizedStringFromTable(@"southwest by south", @"Foundation", @"Southwest by south, long"),
-            NSLocalizedStringFromTable(@"southwest", @"Foundation", @"Southwest, long"),
-            NSLocalizedStringFromTable(@"southwest by west", @"Foundation", @"Southwest by west, long"),
-            NSLocalizedStringFromTable(@"west-southwest", @"Foundation", @"West-southwest, long"),
-            NSLocalizedStringFromTable(@"west by south", @"Foundation", @"West by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_S_LONG", @"Foundation", nil, @"south", @"South, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SxW_LONG", @"Foundation", nil, @"south by west", @"South by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SSW_LONG", @"Foundation", nil, @"south-southwest", @"South-southwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxS_LONG", @"Foundation", nil, @"southwest by south", @"Southwest by south, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SW_LONG", @"Foundation", nil, @"southwest", @"Southwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_SWxW_LONG", @"Foundation", nil, @"southwest by west", @"Southwest by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WSW_LONG", @"Foundation", nil, @"west-southwest", @"West-southwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WxS_LONG", @"Foundation", nil, @"west by south", @"West by south, long"),
             
-            NSLocalizedStringFromTable(@"west", @"Foundation", @"West, long"),
-            NSLocalizedStringFromTable(@"west by north", @"Foundation", @"West by north, long"),
-            NSLocalizedStringFromTable(@"west-northwest", @"Foundation", @"West-northwest, long"),
-            NSLocalizedStringFromTable(@"northwest by west", @"Foundation", @"Northwest by west, long"),
-            NSLocalizedStringFromTable(@"northwest", @"Foundation", @"Northwest, long"),
-            NSLocalizedStringFromTable(@"northwest by north", @"Foundation", @"Northwest by north, long"),
-            NSLocalizedStringFromTable(@"north-northwest", @"Foundation", @"North-northwest, long"),
-            NSLocalizedStringFromTable(@"north by west", @"Foundation", @"North by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_W_LONG", @"Foundation", nil, @"west", @"West, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WxN_LONG", @"Foundation", nil, @"west by north", @"West by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_WNW_LONG", @"Foundation", nil, @"west-northwest", @"West-northwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxW_LONG", @"Foundation", nil, @"northwest by west", @"Northwest by west, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NW_LONG", @"Foundation", nil, @"northwest", @"Northwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NWxN_LONG", @"Foundation", nil, @"northwest by north", @"Northwest by north, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NNW_LONG", @"Foundation", nil, @"north-northwest", @"North-northwest, long"),
+            NSLocalizedStringWithDefaultValue(@"COMPASS_NxW_LONG", @"Foundation", nil, @"north by west", @"North by west, long"),
         ];
         
         NSAssert(shortStrings.count == longStrings.count, @"Long and short compass direction string arrays must have the same size.");