Merge branch 'master' into info-plist

Author: tomlokhorst

ResourceApp/ResourceAppTests/StringsTests.swift

@@ -30,7 +30,14 @@ class StringsTests: XCTestCase {
 
   func testCorrectValues() {
 
-    XCTAssertEqual(R.string.generic.precision1(12345.678), "one   - 0,000,012,345.68")
+    // Question: Why is this different between iOS 12 and 13?
+    // "precision1" = "one   - %012.2f";
+    if #available(iOS 13, *) {
+      XCTAssertEqual(R.string.generic.precision1(12345.678), "one   -    12,345.68")
+    } else {
+      XCTAssertEqual(R.string.generic.precision1(12345.678), "one   - 0,000,012,345.68")
+    }
+
     XCTAssertEqual(R.string.generic.precision2(12345.678), "two   -    12,345.68")
     XCTAssertEqual(R.string.generic.precision3(12345.678), "three -  12,345.6780")
     XCTAssertEqual(R.string.generic.precision4(12345.678), "four  - 12,345.68")

Sources/RswiftCore/Generators/StringsStructGenerator.swift

@@ -258,7 +258,7 @@ struct StringsStructGenerator: ExternalOnlyStructGenerator {
         }
 
         guard let (_, bundle) = localeBundle(tableName: "\(values.tableName)", preferredLanguages: preferredLanguages) else {
-          return "\(values.key)"
+          return "\(values.key.escapedStringLiteral)"
         }
 
         return \(values.swiftCode(bundle: "bundle"))