Add locale functions for string

tomlokhorst · tomlokhorst · commit de9453e9b40a · 2022-11-28T12:20:39.000+01:00
diff --git a/Examples/ResourceApp/ResourceAppTests/StringsTests.swift b/Examples/ResourceApp/ResourceAppTests/StringsTests.swift
@@ -30,27 +30,25 @@ class StringsTests: XCTestCase {
 
   func testCorrectValues() {
 
-    /*
     // Force locales, for decimal point and decimal comma versions
-    let genericEN = R.string.generic(preferredLanguages: ["en_US"]) // (bundle: .main, locale: Locale(identifier: "en_US"))
-    let genericNL = R.string.generic(preferredLanguages: ["nl_NL"]) // (bundle: .main, locale: Locale(identifier: "nl_NL"))
-    let genericFR = R.string.generic(preferredLanguages: ["fr_FR"]) //(bundle: .main, locale: Locale(identifier: "fr_FR"))
-
-    XCTAssertEqual(genericEN.precision1(12345.678), "one   -    12,345.68")
-    XCTAssertEqual(genericEN.precision2(12345.678), "two   -    12,345.68")
-    XCTAssertEqual(genericEN.precision3(12345.678), "three -  12,345.6780")
-    XCTAssertEqual(genericEN.precision4(12345.678), "four  - 12,345.68")
-
-    XCTAssertEqual(genericNL.precision1(12345.678), "one   -    12.345,68")
-    XCTAssertEqual(genericNL.precision2(12345.678), "two   -    12.345,68")
-    XCTAssertEqual(genericNL.precision3(12345.678), "three -  12.345,6780")
-    XCTAssertEqual(genericNL.precision4(12345.678), "four  - 12.345,68")
-
-    XCTAssertEqual(genericFR.precision1(12345.678), "one   -    12\u{202F}345,68")
-    XCTAssertEqual(genericFR.precision2(12345.678), "two   -    12\u{202F}345,68")
-    XCTAssertEqual(genericFR.precision3(12345.678), "three -  12\u{202F}345,6780")
-    XCTAssertEqual(genericFR.precision4(12345.678), "four  - 12\u{202F}345,68")
-     */
+    let stringsEN = R.string(locale: Locale(identifier: "en_US"))
+    let stringsNL = R.string(locale: Locale(identifier: "nl_NL"))
+    let stringsFR = R.string(locale: Locale(identifier: "fr_FR"))
+
+    XCTAssertEqual(stringsEN.generic.precision1(12345.678), "one   -    12,345.68")
+    XCTAssertEqual(stringsEN.generic.precision2(12345.678), "two   -    12,345.68")
+    XCTAssertEqual(stringsEN.generic.precision3(12345.678), "three -  12,345.6780")
+    XCTAssertEqual(stringsEN.generic.precision4(12345.678), "four  - 12,345.68")
+
+    XCTAssertEqual(stringsNL.generic.precision1(12345.678), "one   -    12.345,68")
+    XCTAssertEqual(stringsNL.generic.precision2(12345.678), "two   -    12.345,68")
+    XCTAssertEqual(stringsNL.generic.precision3(12345.678), "three -  12.345,6780")
+    XCTAssertEqual(stringsNL.generic.precision4(12345.678), "four  - 12.345,68")
+
+    XCTAssertEqual(stringsFR.generic.precision1(12345.678), "one   -    12\u{202F}345,68")
+    XCTAssertEqual(stringsFR.generic.precision2(12345.678), "two   -    12\u{202F}345,68")
+    XCTAssertEqual(stringsFR.generic.precision3(12345.678), "three -  12\u{202F}345,6780")
+    XCTAssertEqual(stringsFR.generic.precision4(12345.678), "four  - 12\u{202F}345,68")
 
     XCTAssertEqual(
       R.string.settings.multilineKeyWeird(),
diff --git a/Sources/RswiftGenerators/StringsTable+Generator.swift b/Sources/RswiftGenerators/StringsTable+Generator.swift
@@ -15,7 +15,7 @@ extension Struct {
             deploymentTarget: deploymentTarget,
             name: SwiftIdentifier(name: name),
             typeReference: TypeReference(module: .host, rawName: self.name.value),
-            valueCodeString: ".init(bundle: bundle, preferredLanguages: nil)"
+            valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: nil)"
         )
     }
 
@@ -26,7 +26,18 @@ extension Struct {
             name: SwiftIdentifier(name: name),
             params: [.init(name: "bundle", localName: nil, typeReference: .bundle, defaultValue: nil)],
             returnType: TypeReference(module: .host, rawName: self.name.value),
-            valueCodeString: ".init(bundle: bundle, preferredLanguages: nil)"
+            valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: nil)"
+        )
+    }
+
+    public func generateLocaleFunctionForString(name: String) -> Function {
+        Function(
+            comments: [],
+            deploymentTarget: deploymentTarget,
+            name: SwiftIdentifier(name: name),
+            params: [.init(name: "locale", localName: nil, typeReference: .locale, defaultValue: nil)],
+            returnType: TypeReference(module: .host, rawName: self.name.value),
+            valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: locale)"
         )
     }
 
@@ -35,9 +46,12 @@ extension Struct {
             comments: [],
             deploymentTarget: deploymentTarget,
             name: SwiftIdentifier(name: name),
-            params: [.init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]"), defaultValue: nil)],
+            params: [
+                .init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]"), defaultValue: nil),
+                .init(name: "locale", localName: nil, typeReference: .init(module: .stdLib, rawName: "Locale?"), defaultValue: "nil")
+            ],
             returnType: TypeReference(module: .host, rawName: self.name.value),
-            valueCodeString: ".init(bundle: bundle, preferredLanguages: preferredLanguages)"
+            valueCodeString: ".init(bundle: bundle, preferredLanguages: preferredLanguages, locale: locale)"
         )
     }
 }
@@ -85,10 +99,12 @@ extension StringsTable {
             params: [
                 .init(name: "bundle", localName: nil, typeReference: .bundle, defaultValue: nil),
                 .init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]?"), defaultValue: "nil"),
+                .init(name: "locale", localName: nil, typeReference: .init(module: .stdLib, rawName: "Locale?"), defaultValue: "nil"),
             ],
             valueCodeString: """
                 self.bundle = bundle
                 self.preferredLanguages = preferredLanguages
+                self.locale = locale
                 """
         )
     }
@@ -131,7 +147,7 @@ extension StringsTable {
         VarGetter(
             name: name,
             typeReference: TypeReference(module: .host, rawName: name.value),
-            valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages))"#
+            valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages, locale: locale))"#
         )
     }
 
@@ -156,7 +172,7 @@ extension StringsTable {
                 .init(name: "preferredLanguages", localName: nil, typeReference: TypeReference(module: .stdLib, rawName: "[String]"), defaultValue: nil),
             ],
             returnType: TypeReference(module: .host, rawName: name.value),
-            valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages))"#
+            valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages, locale: locale))"#
         )
     }
 
diff --git a/Sources/RswiftResources/Integrations/StringResource+Integrations.swift b/Sources/RswiftResources/Integrations/StringResource+Integrations.swift
@@ -187,13 +187,18 @@ extension Text {
 }
 
 extension StringResource.Source {
-    public init(bundle: Bundle, tableName: String, preferredLanguages: [String]?) {
+    public init(bundle: Bundle, tableName: String, preferredLanguages: [String]?, locale overrideLocale: Locale?) {
         guard let preferredLanguages = preferredLanguages else {
-            self = .hosting(bundle)
+            if let locale = overrideLocale {
+                self = .selected(bundle, locale)
+            } else {
+                self = .hosting(bundle)
+            }
+
             return
         }
         if let (bundle, locale) = bundle.firstBundleAndLocale(tableName: tableName, preferredLanguages: preferredLanguages) {
-            self = .selected(bundle, locale)
+            self = .selected(bundle, overrideLocale ?? locale)
         } else {
             self = .none
         }
diff --git a/Sources/rswift/RswiftCore.swift b/Sources/rswift/RswiftCore.swift
@@ -218,6 +218,7 @@ public struct RswiftCore {
             if generateString {
                 stringStruct.generateBundleVarGetterForString(name: "string")
                 stringStruct.generateBundleFunctionForString(name: "string")
+                stringStruct.generateLocaleFunctionForString(name: "string")
                 stringStruct.generatePreferredLanguagesFunctionForString(name: "string")
                 stringStruct
             }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ extension Struct {`
`15`	`15`	`deploymentTarget: deploymentTarget,`
`16`	`16`	`name: SwiftIdentifier(name: name),`
`17`	`17`	`typeReference: TypeReference(module: .host, rawName: self.name.value),`
`18`		`- valueCodeString: ".init(bundle: bundle, preferredLanguages: nil)"`
	`18`	`+ valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: nil)"`
`19`	`19`	`)`
`20`	`20`	`}`
`21`	`21`
`@@ -26,7 +26,18 @@ extension Struct {`
`26`	`26`	`name: SwiftIdentifier(name: name),`
`27`	`27`	`params: [.init(name: "bundle", localName: nil, typeReference: .bundle, defaultValue: nil)],`
`28`	`28`	`returnType: TypeReference(module: .host, rawName: self.name.value),`
`29`		`- valueCodeString: ".init(bundle: bundle, preferredLanguages: nil)"`
	`29`	`+ valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: nil)"`
	`30`	`+ )`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ public func generateLocaleFunctionForString(name: String) -> Function {`
	`34`	`+ Function(`
	`35`	`+ comments: [],`
	`36`	`+ deploymentTarget: deploymentTarget,`
	`37`	`+ name: SwiftIdentifier(name: name),`
	`38`	`+ params: [.init(name: "locale", localName: nil, typeReference: .locale, defaultValue: nil)],`
	`39`	`+ returnType: TypeReference(module: .host, rawName: self.name.value),`
	`40`	`+ valueCodeString: ".init(bundle: bundle, preferredLanguages: nil, locale: locale)"`
`30`	`41`	`)`
`31`	`42`	`}`
`32`	`43`
`@@ -35,9 +46,12 @@ extension Struct {`
`35`	`46`	`comments: [],`
`36`	`47`	`deploymentTarget: deploymentTarget,`
`37`	`48`	`name: SwiftIdentifier(name: name),`
`38`		`- params: [.init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]"), defaultValue: nil)],`
	`49`	`+ params: [`
	`50`	`+ .init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]"), defaultValue: nil),`
	`51`	`+ .init(name: "locale", localName: nil, typeReference: .init(module: .stdLib, rawName: "Locale?"), defaultValue: "nil")`
	`52`	`+ ],`
`39`	`53`	`returnType: TypeReference(module: .host, rawName: self.name.value),`
`40`		`- valueCodeString: ".init(bundle: bundle, preferredLanguages: preferredLanguages)"`
	`54`	`+ valueCodeString: ".init(bundle: bundle, preferredLanguages: preferredLanguages, locale: locale)"`
`41`	`55`	`)`
`42`	`56`	`}`
`43`	`57`	`}`
`@@ -85,10 +99,12 @@ extension StringsTable {`
`85`	`99`	`params: [`
`86`	`100`	`.init(name: "bundle", localName: nil, typeReference: .bundle, defaultValue: nil),`
`87`	`101`	`.init(name: "preferredLanguages", localName: nil, typeReference: .init(module: .stdLib, rawName: "[String]?"), defaultValue: "nil"),`
	`102`	`+ .init(name: "locale", localName: nil, typeReference: .init(module: .stdLib, rawName: "Locale?"), defaultValue: "nil"),`
`88`	`103`	`],`
`89`	`104`	`valueCodeString: """`
`90`	`105`	`self.bundle = bundle`
`91`	`106`	`self.preferredLanguages = preferredLanguages`
	`107`	`+ self.locale = locale`
`92`	`108`	`"""`
`93`	`109`	`)`
`94`	`110`	`}`
`@@ -131,7 +147,7 @@ extension StringsTable {`
`131`	`147`	`VarGetter(`
`132`	`148`	`name: name,`
`133`	`149`	`typeReference: TypeReference(module: .host, rawName: name.value),`
`134`		`- valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages))"#`
	`150`	`+ valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages, locale: locale))"#`
`135`	`151`	`)`
`136`	`152`	`}`
`137`	`153`
`@@ -156,7 +172,7 @@ extension StringsTable {`
`156`	`172`	`.init(name: "preferredLanguages", localName: nil, typeReference: TypeReference(module: .stdLib, rawName: "[String]"), defaultValue: nil),`
`157`	`173`	`],`
`158`	`174`	`returnType: TypeReference(module: .host, rawName: name.value),`
`159`		`- valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages))"#`
	`175`	`+ valueCodeString: #".init(source: .init(bundle: bundle, tableName: "\#(tableName.escapedStringLiteral)", preferredLanguages: preferredLanguages, locale: locale))"#`
`160`	`176`	`)`
`161`	`177`	`}`
`162`	`178`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ public struct RswiftCore {`
`218`	`218`	`if generateString {`
`219`	`219`	`stringStruct.generateBundleVarGetterForString(name: "string")`
`220`	`220`	`stringStruct.generateBundleFunctionForString(name: "string")`
	`221`	`+ stringStruct.generateLocaleFunctionForString(name: "string")`
`221`	`222`	`stringStruct.generatePreferredLanguagesFunctionForString(name: "string")`
`222`	`223`	`stringStruct`
`223`	`224`	`}`