[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.

3 files changed, 252 insertions, 230 deletions

diff --git a/platform/ios/resources/Base.lproj/Foundation.strings b/platform/ios/resources/Base.lproj/Foundation.strings
index 30fe3a3e91..f76ac949d7 100644
--- a/platform/ios/resources/Base.lproj/Foundation.strings
+++ b/platform/ios/resources/Base.lproj/Foundation.strings
@@ -1,269 +1,291 @@
-/* Degrees-minutes format, long */
-"%@ and %@" = "%1$@ and %2$@";
+/* Clock position format, long: {hours} o’clock */
+"CLOCK_FMT_LONG" = "%@ o’clock";
 
-/* Latitude-longitude format, long */
-"%@ by %@" = "%1$@ by %2$@";
+/* Clock position format, medium: {hours} o’clock */
+"CLOCK_FMT_MEDIUM" = "%@ o’clock";
 
-/* East longitude format, long
-   East longitude format, medium */
-"%@ east" = "%@ east";
+/* Clock position format, short: {hours}:00 */
+"CLOCK_FMT_SHORT" = "%@:00";
 
-/* North latitude format, long
-   North latitude format, medium */
-"%@ north" = "%@ north";
+/* East, long */
+"COMPASS_E_LONG" = "east";
 
-/* Clock position format, long style
-   Clock position format, medium style */
-"%@ o’clock" = "%@ o’clock";
+/* East, short */
+"COMPASS_E_SHORT" = "E";
 
-/* South latitude format, long
-   South latitude format, medium */
-"%@ south" = "%@ south";
+/* East-northeast, long */
+"COMPASS_ENE_LONG" = "east-northeast";
 
-/* West longitude format, long
-   West longitude format, medium */
-"%@ west" = "%@ west";
+/* East-northeast, short */
+"COMPASS_ENE_SHORT" = "ENE";
 
-/* Degrees-minutes format, medium
-   Degrees-minutes format, short */
-"%@%@" = "%1$@%2$@";
+/* East-southeast, long */
+"COMPASS_ESE_LONG" = "east-southeast";
 
-/* Degrees-minutes-seconds format, medium
-   Degrees-minutes-seconds format, short */
-"%@%@%@" = "%1$@%2$@%3$@";
+/* East-southeast, short */
+"COMPASS_ESE_SHORT" = "ESE";
 
-/* Latitude-longitude format, medium
-   Latitude-longitude format, short */
-"%@, %@" = "%1$@, %2$@";
+/* East by north, long */
+"COMPASS_ExN_LONG" = "east by north";
 
-/* Degrees-minutes-seconds format, long */
-"%@, %@, and %@" = "%1$@, %2$@, and %3$@";
+/* East by north, short */
+"COMPASS_ExN_SHORT" = "E×N";
 
-/* Clock position format, short style */
-"%@:00" = "%@:00";
+/* East by south, long */
+"COMPASS_ExS_LONG" = "east by south";
 
-/* East longitude format, short */
-"%@E" = "%@E";
+/* East by south, short */
+"COMPASS_ExS_SHORT" = "E×S";
 
-/* North latitude format, short */
-"%@N" = "%@N";
+/* North, long */
+"COMPASS_N_LONG" = "north";
 
-/* South latitude format, short */
-"%@S" = "%@S";
+/* North, short */
+"COMPASS_N_SHORT" = "N";
 
-/* West longitude format, short */
-"%@W" = "%@W";
+/* Northeast, long */
+"COMPASS_NE_LONG" = "northeast";
 
-/* Degrees format, long */
-"%d degree(s)" = "%d degree(s)";
+/* Northeast, short */
+"COMPASS_NE_SHORT" = "NE";
 
-/* Minutes format, long */
-"%d minute(s)" = "%d minute(s)";
+/* Northeast by east, long */
+"COMPASS_NExE_LONG" = "northeast by east";
 
-/* Seconds format, long */
-"%d second(s)" = "%d second(s)";
+/* Northeast by east, short */
+"COMPASS_NExE_SHORT" = "NE×E";
 
-/* Degrees format, medium
-   Degrees format, short */
-"%d°" = "%d°";
+/* Northeast by north, long */
+"COMPASS_NExN_LONG" = "northeast by north";
 
-/* Minutes format, medium
-   Minutes format, short */
-"%d′" = "%d′";
+/* Northeast by north, short */
+"COMPASS_NExN_SHORT" = "NE×N";
 
-/* Seconds format, medium
-   Seconds format, short */
-"%d″" = "%d″";
+/* North-northeast, long */
+"COMPASS_NNE_LONG" = "north-northeast";
 
-/* East, short */
-"E" = "E";
+/* North-northeast, short */
+"COMPASS_NNE_SHORT" = "NNE";
 
-/* East, long */
-"east" = "east";
+/* North-northwest, long */
+"COMPASS_NNW_LONG" = "north-northwest";
 
-/* East by north, long */
-"east by north" = "east by north";
+/* North-northwest, short */
+"COMPASS_NNW_SHORT" = "NNW";
 
-/* East by south, long */
-"east by south" = "east by south";
+/* Northwest, long */
+"COMPASS_NW_LONG" = "northwest";
 
-/* East-northeast, long */
-"east-northeast" = "east-northeast";
+/* Northwest, short */
+"COMPASS_NW_SHORT" = "NW";
 
-/* East-southeast, long */
-"east-southeast" = "east-southeast";
+/* Northwest by north, long */
+"COMPASS_NWxN_LONG" = "northwest by north";
 
-/* East-northeast, short */
-"ENE" = "ENE";
+/* Northwest by north, short */
+"COMPASS_NWxN_SHORT" = "NW×N";
 
-/* East-southeast, short */
-"ESE" = "ESE";
+/* Northwest by west, long */
+"COMPASS_NWxW_LONG" = "northwest by west";
 
-/* East by north, short */
-"E×N" = "E×N";
+/* Northwest by west, short */
+"COMPASS_NWxW_SHORT" = "NW×W";
 
-/* East by south, short */
-"E×S" = "E×S";
+/* North by east, long */
+"COMPASS_NxE_LONG" = "north by east";
 
-/* North, short */
-"N" = "N";
+/* North by east, short */
+"COMPASS_NxE_SHORT" = "N×E";
 
-/* Northeast, short */
-"NE" = "NE";
+/* North by west, long */
+"COMPASS_NxW_LONG" = "north by west";
 
-/* Northeast by east, short */
-"NE×E" = "NE×E";
+/* North by west, short */
+"COMPASS_NxW_SHORT" = "N×W";
 
-/* Northeast by north, short */
-"NE×N" = "NE×N";
+/* South, long */
+"COMPASS_S_LONG" = "south";
 
-/* North-northeast, short */
-"NNE" = "NNE";
+/* South, short */
+"COMPASS_S_SHORT" = "S";
 
-/* North-northwest, short */
-"NNW" = "NNW";
+/* Southeast, long */
+"COMPASS_SE_LONG" = "southeast";
 
-/* North, long */
-"north" = "north";
+/* Southeast, short */
+"COMPASS_SE_SHORT" = "SE";
 
-/* North by east, long */
-"north by east" = "north by east";
+/* Southeast by east, long */
+"COMPASS_SExE_LONG" = "southeast by east";
 
-/* North by west, long */
-"north by west" = "north by west";
+/* Southeast by east, short */
+"COMPASS_SExE_SHORT" = "SE×E";
 
-/* North-northeast, long */
-"north-northeast" = "north-northeast";
+/* Southeast by south, long */
+"COMPASS_SExS_LONG" = "southeast by south";
 
-/* North-northwest, long */
-"north-northwest" = "north-northwest";
+/* Southeast by south, short */
+"COMPASS_SExS_SHORT" = "SE×S";
 
-/* Northeast, long */
-"northeast" = "northeast";
+/* South-southeast, long */
+"COMPASS_SSE_LONG" = "south-southeast";
 
-/* Northeast by east, long */
-"northeast by east" = "northeast by east";
+/* South-southeast, short */
+"COMPASS_SSE_SHORT" = "SSE";
 
-/* Northeast by north, long */
-"northeast by north" = "northeast by north";
+/* South-southwest, long */
+"COMPASS_SSW_LONG" = "south-southwest";
 
-/* Northwest, long */
-"northwest" = "northwest";
+/* South-southwest, short */
+"COMPASS_SSW_SHORT" = "SSW";
 
-/* Northwest by north, long */
-"northwest by north" = "northwest by north";
+/* Southwest, long */
+"COMPASS_SW_LONG" = "southwest";
 
-/* Northwest by west, long */
-"northwest by west" = "northwest by west";
+/* Southwest, short */
+"COMPASS_SW_SHORT" = "SW";
 
-/* Northwest, short */
-"NW" = "NW";
+/* Southwest by south, long */
+"COMPASS_SWxS_LONG" = "southwest by south";
 
-/* Northwest by north, short */
-"NW×N" = "NW×N";
+/* Southwest by south, short */
+"COMPASS_SWxS_SHORT" = "SW×S";
 
-/* Northwest by west, short */
-"NW×W" = "NW×W";
+/* Southwest by west, long */
+"COMPASS_SWxW_LONG" = "southwest by west";
 
-/* North by east, short */
-"N×E" = "N×E";
+/* Southwest by west, short */
+"COMPASS_SWxW_SHORT" = "SW×W";
 
-/* North by west, short */
-"N×W" = "N×W";
+/* South by east, long */
+"COMPASS_SxE_LONG" = "south by east";
 
-/* South, short */
-"S" = "S";
+/* South by east, short */
+"COMPASS_SxE_SHORT" = "S×E";
 
-/* Southeast, short */
-"SE" = "SE";
+/* South by west, long */
+"COMPASS_SxW_LONG" = "south by west";
 
-/* Southeast by east, short */
-"SE×E" = "SE×E";
+/* South by west, short */
+"COMPASS_SxW_SHORT" = "S×W";
 
-/* Southeast by south, short */
-"SE×S" = "SE×S";
+/* West, long */
+"COMPASS_W_LONG" = "west";
 
-/* South, long */
-"south" = "south";
+/* West, short */
+"COMPASS_W_SHORT" = "W";
 
-/* South by east, long */
-"south by east" = "south by east";
+/* West-northwest, long */
+"COMPASS_WNW_LONG" = "west-northwest";
 
-/* South by west, long */
-"south by west" = "south by west";
+/* West-northwest, short */
+"COMPASS_WNW_SHORT" = "WNW";
 
-/* South-southeast, long */
-"south-southeast" = "south-southeast";
+/* West-southwest, long */
+"COMPASS_WSW_LONG" = "west-southwest";
 
-/* South-southwest, long */
-"south-southwest" = "south-southwest";
+/* West-southwest, short */
+"COMPASS_WSW_SHORT" = "WSW";
 
-/* Southeast, long */
-"southeast" = "southeast";
+/* West by north, long */
+"COMPASS_WxN_LONG" = "west by north";
 
-/* Southeast by east, long */
-"southeast by east" = "southeast by east";
+/* West by north, short */
+"COMPASS_WxN_SHORT" = "W×N";
 
-/* Southeast by south, long */
-"southeast by south" = "southeast by south";
+/* West by south, long */
+"COMPASS_WxS_LONG" = "west by south";
 
-/* Southwest, long */
-"southwest" = "southwest";
+/* West by south, short */
+"COMPASS_WxS_SHORT" = "W×S";
 
-/* Southwest by south, long */
-"southwest by south" = "southwest by south";
+/* Degrees format, long */
+"COORD_DEG_LONG" = "%d degree(s)";
 
-/* Southwest by west, long */
-"southwest by west" = "southwest by west";
+/* Degrees format, medium: {degrees} */
+"COORD_DEG_MEDIUM" = "%d°";
 
-/* South-southeast, short */
-"SSE" = "SSE";
+/* Degrees format, short: {degrees} */
+"COORD_DEG_SHORT" = "%d°";
 
-/* South-southwest, short */
-"SSW" = "SSW";
+/* Coordinate format, long: {degrees}{minutes} */
+"COORD_DM_LONG" = "%1$@ and %2$@";
 
-/* Southwest, short */
-"SW" = "SW";
+/* Coordinate format, medium: {degrees}{minutes} */
+"COORD_DM_MEDIUM" = "%1$@%2$@";
 
-/* Southwest by south, short */
-"SW×S" = "SW×S";
+/* Coordinate format, short: {degrees}{minutes} */
+"COORD_DM_SHORT" = "%1$@%2$@";
 
-/* Southwest by west, short */
-"SW×W" = "SW×W";
+/* Coordinate format, long: {degrees}{minutes}{seconds} */
+"COORD_DMS_LONG" = "%1$@, %2$@, and %3$@";
 
-/* South by east, short */
-"S×E" = "S×E";
+/* Coordinate format, medium: {degrees}{minutes}{seconds} */
+"COORD_DMS_MEDIUM" = "%1$@%2$@%3$@";
 
-/* South by west, short */
-"S×W" = "S×W";
+/* Coordinate format, short: {degrees}{minutes}{seconds} */
+"COORD_DMS_SHORT" = "%1$@%2$@%3$@";
 
-/* West, short */
-"W" = "W";
+/* East longitude format, long: {longitude} */
+"COORD_E_LONG" = "%@ east";
 
-/* West, long */
-"west" = "west";
+/* East longitude format, medium: {longitude} */
+"COORD_E_MEDIUM" = "%@ east";
 
-/* West by north, long */
-"west by north" = "west by north";
+/* East longitude format, short: {longitude} */
+"COORD_E_SHORT" = "%@E";
 
-/* West by south, long */
-"west by south" = "west by south";
+/* Coordinate pair format, long: {latitude}, {longitude} */
+"COORD_FMT_LONG" = "%1$@ by %2$@";
 
-/* West-northwest, long */
-"west-northwest" = "west-northwest";
+/* Coordinate pair format, medium: {latitude}, {longitude} */
+"COORD_FMT_MEDIUM" = "%1$@, %2$@";
 
-/* West-southwest, long */
-"west-southwest" = "west-southwest";
+/* Coordinate pair format, short: {latitude}, {longitude} */
+"COORD_FMT_SHORT" = "%1$@, %2$@";
 
-/* West-northwest, short */
-"WNW" = "WNW";
+/* Minutes format, long */
+"COORD_MIN_LONG" = "%d minute(s)";
 
-/* West-southwest, short */
-"WSW" = "WSW";
+/* Minutes format, medium: {minutes} */
+"COORD_MIN_MEDIUM" = "%d′";
 
-/* West by north, short */
-"W×N" = "W×N";
+/* Minutes format, short: {minutes} */
+"COORD_MIN_SHORT" = "%d′";
 
-/* West by south, short */
-"W×S" = "W×S";
+/* North latitude format, long: {latitude} */
+"COORD_N_LONG" = "%@ north";
+
+/* North latitude format, medium: {latitude} */
+"COORD_N_MEDIUM" = "%@ north";
+
+/* North latitude format, short: {latitude} */
+"COORD_N_SHORT" = "%@N";
+
+/* South latitude format, long: {latitude} */
+"COORD_S_LONG" = "%@ south";
+
+/* South latitude format, medium: {latitude} */
+"COORD_S_MEDIUM" = "%@ south";
+
+/* South latitude format, short: {latitude} */
+"COORD_S_SHORT" = "%@S";
+
+/* Seconds format, long */
+"COORD_SEC_LONG" = "%d second(s)";
+
+/* Seconds format, medium: {seconds} */
+"COORD_SEC_MEDIUM" = "%d″";
+
+/* Seconds format, short: {seconds} */
+"COORD_SEC_SHORT" = "%d″";
+
+/* West longitude format, long: {longitude} */
+"COORD_W_LONG" = "%@ west";
+
+/* West longitude format, medium: {longitude} */
+"COORD_W_MEDIUM" = "%@ west";
+
+/* West longitude format, short: {longitude} */
+"COORD_W_SHORT" = "%@W";
 
diff --git a/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/resources/Base.lproj/Localizable.strings
index b72bc21e63..cf6de337c4 100644
--- a/platform/ios/resources/Base.lproj/Localizable.strings
+++ b/platform/ios/resources/Base.lproj/Localizable.strings
@@ -1,75 +1,75 @@
-/* Accessibility label */
-"Attribution info" = "Attribution info";
+/* No comment provided by engineer. */
+"API_CLIENT_400_DESC" = "The session data task failed. Original request was: %@";
+
+/* No comment provided by engineer. */
+"API_CLIENT_400_REASON" = "The status code was %ld";
 
 /* No comment provided by engineer. */
-"Cancel" = "Cancel";
+"CANCEL" = "Cancel";
 
 /* Accessibility label */
-"Compass" = "Compass";
+"COMPASS_A11Y_LABEL" = "Compass";
 
-/* Telemetry prompt button */
-"Don’t Participate" = "Don’t Participate";
+/* Compass abbreviation for north */
+"COMPASS_NORTH" = "N";
 
-/* Action in attribution sheet */
-"Improve This Map" = "Improve This Map";
+/* Copyright notice in attribution sheet */
+"COPY_MAPBOX" = "© Mapbox";
 
-/* Telemetry prompt button */
-"Keep Participating" = "Keep Participating";
+/* Copyright notice in attribution sheet */
+"COPY_OSM" = "© OpenStreetMap";
 
-/* Telemetry prompt title */
-"Make Mapbox Maps Better" = "Make Mapbox Maps Better";
+/* Instructions in Interface Builder designable; {key}, {plist file name} */
+"DESIGNABLE" = "To display a Mapbox-hosted map here, set %1$@ to your access token in %2$@\n\nFor detailed instructions, see:";
+
+/* Setup documentation URL display string; keep as short as possible */
+"FIRST_STEPS_URL" = "mapbox.com/help/first-steps-ios-sdk";
 
 /* Accessibility label */
-"Map" = "Map";
+"INFO_A11Y_LABEL" = "Attribution info";
 
-/* Action sheet title */
-"Mapbox iOS SDK" = "Mapbox iOS SDK";
+/* Accessibility label */
+"LOGO_A11Y_LABEL" = "Mapbox logo";
 
 /* Accessibility label */
-"Mapbox logo" = "Mapbox logo";
+"MAP_A11Y_LABEL" = "Map";
 
 /* Action in attribution sheet */
-"Mapbox Telemetry" = "Mapbox Telemetry";
+"MAP_FEEDBACK" = "Improve This Map";
 
-/* Setup documentation URL display string */
-"mapbox.com/help/first-steps-ios-sdk" = "mapbox.com/help/first-steps-ios-sdk";
+/* Action sheet title */
+"SDK_NAME" = "Mapbox iOS SDK";
 
-/* Compass abbreviation for north */
-"N" = "N";
+/* Telemetry prompt message */
+"TELEMETRY_DISABLED_MSG" = "You can help make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.";
+
+/* Telemetry prompt button */
+"TELEMETRY_DISABLED_OFF" = "Don’t Participate";
 
 /* Telemetry prompt button */
-"Participate" = "Participate";
+"TELEMETRY_DISABLED_ON" = "Participate";
+
+/* Telemetry prompt message */
+"TELEMETRY_ENABLED_MSG" = "You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.";
 
 /* Telemetry prompt button */
-"Stop Participating" = "Stop Participating";
+"TELEMETRY_ENABLED_OFF" = "Stop Participating";
 
 /* Telemetry prompt button */
-"Tell Me More" = "Tell Me More";
+"TELEMETRY_ENABLED_ON" = "Keep Participating";
 
-/* No comment provided by engineer. */
-"The session data task failed. Original request was: %@" = "The session data task failed. Original request was: %@";
+/* Telemetry prompt button */
+"TELEMETRY_MORE" = "Tell Me More";
 
-/* No comment provided by engineer. */
-"The status code was %ld" = "The status code was %ld";
+/* Action in attribution sheet */
+"TELEMETRY_NAME" = "Mapbox Telemetry";
 
-/* Instructions in Interface Builder designable; property list dictionary key, file name */
-"To display a Mapbox-hosted map here, set %@ to your access token in %@\n\nFor detailed instructions, see:" = "To display a Mapbox-hosted map here, set %1$@ to your access token in %2$@\n\nFor detailed instructions, see:";
+/* Telemetry prompt title */
+"TELEMETRY_TITLE" = "Make Mapbox Maps Better";
 
 /* Accessibility label */
-"User location" = "User location";
-
-/* Telemetry prompt message */
-"You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data." = "You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.";
+"USER_DOT_A11Y_LABEL" = "User location";
 
 /* Default user location annotation title */
-"You Are Here" = "You Are Here";
-
-/* Telemetry prompt message */
-"You can help make OpenStreetMap and Mapbox maps better by contributing anonymous usage data." = "You can help make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.";
-
-/* Action in attribution sheet */
-"© Mapbox" = "© Mapbox";
-
-/* Action in attribution sheet */
-"© OpenStreetMap" = "© OpenStreetMap";
+"USER_DOT_TITLE" = "You Are Here";
 
diff --git a/platform/ios/resources/en.lproj/Foundation.stringsdict b/platform/ios/resources/en.lproj/Foundation.stringsdict
index 99352d3d4a..5f23fff93b 100644
--- a/platform/ios/resources/en.lproj/Foundation.stringsdict
+++ b/platform/ios/resources/en.lproj/Foundation.stringsdict
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>%d degree(s)</key>
+	<key>COORD_DEG_LONG</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@degrees@</string>
@@ -18,7 +18,7 @@
 			<string>%d degrees</string>
 		</dict>
 	</dict>
-	<key>%d minute(s)</key>
+	<key>COORD_MIN_LONG</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@minutes@</string>
@@ -34,7 +34,7 @@
 			<string>%d minutes</string>
 		</dict>
 	</dict>
-	<key>%d second(s)</key>
+	<key>COORD_SEC_LONG</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@seconds@</string>