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

1 files changed, 46 insertions, 33 deletions

diff --git a/platform/darwin/test/MGLCompassDirectionFormatterTests.m b/platform/darwin/test/MGLCompassDirectionFormatterTests.m
index 034e07818b..c2a6f69c47 100644
--- a/platform/darwin/test/MGLCompassDirectionFormatterTests.m
+++ b/platform/darwin/test/MGLCompassDirectionFormatterTests.m
@@ -17,49 +17,62 @@
     MGLCompassDirectionFormatter *longFormatter = [[MGLCompassDirectionFormatter alloc] init];
     longFormatter.unitStyle = NSFormattingUnitStyleLong;
     
-    XCTAssertEqualObjects(@"NW", [shortFormatter stringFromDirection:-45]);
-    XCTAssertEqualObjects(@"northwest", [mediumFormatter stringFromDirection:-45]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:-45], [longFormatter stringFromDirection:-45]);
+    CLLocationDirection direction;
     
-    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:0]);
-    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:0]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:0], [longFormatter stringFromDirection:0]);
+    direction = -45;
+    XCTAssertEqualObjects(@"NW", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"northwest", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"northwest", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:1]);
-    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:1]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:1], [longFormatter stringFromDirection:1]);
+    direction = 0;
+    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"N×E", [shortFormatter stringFromDirection:10]);
-    XCTAssertEqualObjects(@"north by east", [mediumFormatter stringFromDirection:10]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:10], [longFormatter stringFromDirection:10]);
+    direction = 1;
+    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"NNE", [shortFormatter stringFromDirection:20]);
-    XCTAssertEqualObjects(@"north-northeast", [mediumFormatter stringFromDirection:20]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:20], [longFormatter stringFromDirection:20]);
+    direction = 10;
+    XCTAssertEqualObjects(@"N×E", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north by east", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north by east", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"NE", [shortFormatter stringFromDirection:45]);
-    XCTAssertEqualObjects(@"northeast", [mediumFormatter stringFromDirection:45]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:45], [longFormatter stringFromDirection:45]);
+    direction = 20;
+    XCTAssertEqualObjects(@"NNE", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north-northeast", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north-northeast", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"E", [shortFormatter stringFromDirection:90]);
-    XCTAssertEqualObjects(@"east", [mediumFormatter stringFromDirection:90]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:90], [longFormatter stringFromDirection:90]);
+    direction = 45;
+    XCTAssertEqualObjects(@"NE", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"northeast", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"northeast", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"S", [shortFormatter stringFromDirection:180]);
-    XCTAssertEqualObjects(@"south", [mediumFormatter stringFromDirection:180]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:180], [longFormatter stringFromDirection:180]);
+    direction = 90;
+    XCTAssertEqualObjects(@"E", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"east", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"east", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"W", [shortFormatter stringFromDirection:270]);
-    XCTAssertEqualObjects(@"west", [mediumFormatter stringFromDirection:270]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:270], [longFormatter stringFromDirection:270]);
+    direction = 180;
+    XCTAssertEqualObjects(@"S", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"south", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"south", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:360]);
-    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:360]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:360], [longFormatter stringFromDirection:360]);
+    direction = 270;
+    XCTAssertEqualObjects(@"W", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"west", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"west", [longFormatter stringFromDirection:direction]);
     
-    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:720]);
-    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:720]);
-    XCTAssertEqualObjects([mediumFormatter stringFromDirection:720], [longFormatter stringFromDirection:720]);
+    direction = 360;
+    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [longFormatter stringFromDirection:direction]);
+    
+    direction = 720;
+    XCTAssertEqualObjects(@"N", [shortFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [mediumFormatter stringFromDirection:direction]);
+    XCTAssertEqualObjects(@"north", [longFormatter stringFromDirection:direction]);
 }
 
 @end