summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLCompassDirectionFormatter.m
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-23 11:36:46 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-04-24 16:13:54 -0700
commite4752912dad7dcedfb5853e5773b2194980e07e1 (patch)
tree5a7d3eb58c12fb0b2d67e8a8f2e05eb4f72399f9 /platform/darwin/src/MGLCompassDirectionFormatter.m
parent6c9ca4be50e74a260d9cc2bc731fe56d85c353d2 (diff)
downloadqtlocation-mapboxgl-e4752912dad7dcedfb5853e5773b2194980e07e1.tar.gz
[ios, osx] Corrected clock, coordinate formats
Long unit style isn’t intended to be spelled out, so the clock and coordinate direction formatters now use numerals for long unit style, differing from medium unit style in less drastic ways. The locale no longer needs to be exposed, since it’ll always match the overall string’s locale. Added support to the coordinate formatter for different unit styles. Made minutes and seconds of arc optional. Maintain strings for darwin/ formatter classes in a separate Foundation strings table that can be shared between the iOS and OS X SDKs. Added an English .stringsdict override that correctly pluralizes units. Capitalize osxapp window titles, now that they spell out the directions.
Diffstat (limited to 'platform/darwin/src/MGLCompassDirectionFormatter.m')
-rw-r--r--platform/darwin/src/MGLCompassDirectionFormatter.m128
1 files changed, 64 insertions, 64 deletions
diff --git a/platform/darwin/src/MGLCompassDirectionFormatter.m b/platform/darwin/src/MGLCompassDirectionFormatter.m
index f719745ce6..c5dd9b4899 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 = @[
- NSLocalizedString(@"N", @"North, short"),
- NSLocalizedString(@"N×E", @"North by east, short"),
- NSLocalizedString(@"NNE", @"North-northeast, short"),
- NSLocalizedString(@"NE×N", @"Northeast by north, short"),
- NSLocalizedString(@"NE", @"Northeast, short"),
- NSLocalizedString(@"NE×E", @"Northeast by east, short"),
- NSLocalizedString(@"ENE", @"East-northeast, short"),
- NSLocalizedString(@"E×N", @"East by north, short"),
+ 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"),
- NSLocalizedString(@"E", @"East, short"),
- NSLocalizedString(@"E×S", @"East by south, short"),
- NSLocalizedString(@"ESE", @"East-southeast, short"),
- NSLocalizedString(@"SE×E", @"Southeast by east, short"),
- NSLocalizedString(@"SE", @"Southeast, short"),
- NSLocalizedString(@"SE×S", @"Southeast by south, short"),
- NSLocalizedString(@"SSE", @"South-southeast, short"),
- NSLocalizedString(@"S×E", @"South by east, 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"),
- NSLocalizedString(@"S", @"South, short"),
- NSLocalizedString(@"S×W", @"South by west, short"),
- NSLocalizedString(@"SSW", @"South-southwest, short"),
- NSLocalizedString(@"SW×S", @"Southwest by south, short"),
- NSLocalizedString(@"SW", @"Southwest, short"),
- NSLocalizedString(@"SW×W", @"Southwest by west, short"),
- NSLocalizedString(@"WSW", @"West-southwest, short"),
- NSLocalizedString(@"W×S", @"West by south, 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"),
- NSLocalizedString(@"W", @"West, short"),
- NSLocalizedString(@"W×N", @"West by north, short"),
- NSLocalizedString(@"WNW", @"West-northwest, short"),
- NSLocalizedString(@"NW×W", @"Northwest by west, short"),
- NSLocalizedString(@"NW", @"Northwest, short"),
- NSLocalizedString(@"NW×N", @"Northwest by north, short"),
- NSLocalizedString(@"NNW", @"North-northwest, short"),
- NSLocalizedString(@"N×W", @"North by west, 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"),
];
longStrings = @[
- NSLocalizedString(@"north", @"North, long"),
- NSLocalizedString(@"north by east", @"North by east, long"),
- NSLocalizedString(@"north-northeast", @"North-northeast, long"),
- NSLocalizedString(@"northeast by north", @"Northeast by north, long"),
- NSLocalizedString(@"northeast", @"Northeast, long"),
- NSLocalizedString(@"northeast by east", @"Northeast by east, long"),
- NSLocalizedString(@"east-northeast", @"East-northeast, long"),
- NSLocalizedString(@"east by north", @"East by north, long"),
+ 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"),
- NSLocalizedString(@"east", @"East, long"),
- NSLocalizedString(@"east by south", @"East by south, long"),
- NSLocalizedString(@"east-southeast", @"East-southeast, long"),
- NSLocalizedString(@"southeast by east", @"Southeast by east, long"),
- NSLocalizedString(@"southeast", @"Southeast, long"),
- NSLocalizedString(@"southeast by south", @"Southeast by south, long"),
- NSLocalizedString(@"south-southeast", @"South-southeast, long"),
- NSLocalizedString(@"south by east", @"South by east, 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"),
- NSLocalizedString(@"south", @"South, long"),
- NSLocalizedString(@"south by west", @"South by west, long"),
- NSLocalizedString(@"south-southwest", @"South-southwest, long"),
- NSLocalizedString(@"southwest by south", @"Southwest by south, long"),
- NSLocalizedString(@"southwest", @"Southwest, long"),
- NSLocalizedString(@"southwest by west", @"Southwest by west, long"),
- NSLocalizedString(@"west-southwest", @"West-southwest, long"),
- NSLocalizedString(@"west by south", @"West by south, 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"),
- NSLocalizedString(@"west", @"West, long"),
- NSLocalizedString(@"west by north", @"West by north, long"),
- NSLocalizedString(@"west-northwest", @"West-northwest, long"),
- NSLocalizedString(@"northwest by west", @"Northwest by west, long"),
- NSLocalizedString(@"northwest", @"Northwest, long"),
- NSLocalizedString(@"northwest by north", @"Northwest by north, long"),
- NSLocalizedString(@"north-northwest", @"North-northwest, long"),
- NSLocalizedString(@"north by west", @"North by west, 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"),
];
NSAssert(shortStrings.count == longStrings.count, @"Long and short compass direction string arrays must have the same size.");