Merge pull request #768 from mac-cain13/update

Always use String(format:), also for strings without arguments

Author: tomlokhorst

Documentation/Migration.md

@@ -6,6 +6,10 @@ Pointers for migration between major versions.
 
 [Demo video: Updating from R.swift 6 to Rswift 7](https://www.youtube.com/watch?v=icihJ_hin3I)
 
+#### R.string changes
+ - Strings are always formatted using `String(format:)`, even strings without arguments, make sure to escape any percentage signs (`%`) with `%%`
+ - Use a custom language: `R.string(preferredLanguages: ["fr"]).example.hello()`
+
 #### Running the executable
 
 If you're using Swift Package Manager:

Examples/ResourceApp/ResourceApp/Strings/Generic.strings

@@ -12,3 +12,6 @@
 "precision2" = "two   - %12.2f";
 "precision3" = "three - %12.4f";
 "precision4" = "four  - %.2f";
+"discount10" = "Today, 10%% off!";
+"discountX" = "Today, %d%% off!";
+"url" = "http%%3A%%2F%%2Fwww.abc.xyz";

Examples/ResourceApp/ResourceApp/Strings/en.lproj/Localizable.strings

@@ -11,3 +11,5 @@ one = One;
 two = 2;
 
 "quote" = "There are %d lights!";
+"discount10" = "Today, 10%% off!";
+"discountX" = "Today, %d%% off!";

Examples/ResourceApp/ResourceApp/Strings/es.lproj/Localizable.strings

@@ -10,4 +10,6 @@
 one = Uno;
 two = 2;
 
-"quote" = "Hay %d luces!";
+"quote" = "Hay %d luces!";
+"discount10" = "Today, 10%% off!";
+"discountX" = "Today, %d%% off!";

Examples/ResourceApp/ResourceApp/Strings/ja.lproj/Localizable.strings

@@ -11,4 +11,6 @@ one = "一つ";
 two = 2;
 
 "quote" = "%dつの光があります！";
+"discount10" = "Today, 10%% off!";
+"discountX" = "Today, %d%% off!";
 "japanese only" = "Not translated in other languages, and there is no Base";

Examples/ResourceApp/ResourceAppTests/StringsTests.swift

@@ -50,6 +50,12 @@ class StringsTests: XCTestCase {
     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.generic.discount10(), "Today, 10% off!")
+    XCTAssertEqual(R.string.generic.discountX(20), "Today, 20% off!")
+    XCTAssertEqual(R.string.localizable.discount10(), "Today, 10% off!")
+    XCTAssertEqual(R.string.localizable.discountX(20), "Today, 20% off!")
+    XCTAssertEqual(R.string.generic.url(), "http%3A%2F%2Fwww.abc.xyz")
+
     XCTAssertEqual(
       R.string.settings.multilineKeyWeird(),
       NSLocalizedString("Multiline\t\\key/\n\"weird\"?!", tableName: "Settings", comment: ""))

Sources/RswiftResources/Integrations/StringResource+Integrations.swift

@@ -9,30 +9,6 @@ import Foundation
 import SwiftUI
 
 extension String {
-    init(key: StaticString, tableName: String, source: StringResource.Source, developmentValue: String?) {
-        switch source {
-        case let .hosting(bundle):
-            // With fallback to developmentValue
-            self = NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: developmentValue ?? "", comment: "")
-
-        case let .selected(bundle, _):
-            // Don't use developmentValue with selected bundle/locale
-            self = NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: "", comment: "")
-
-        case .none:
-            self = key.description
-        }
-    }
-
-    init(key: StaticString, tableName: String, source: StringResource.Source, developmentValue: String?, preferredLanguages: [String]) {
-        guard let (bundle, locale) = source.bundle?.firstBundleAndLocale(tableName: tableName, preferredLanguages: preferredLanguages) else {
-            self = key.description
-            return
-        }
-
-        self.init(key: key, tableName: tableName, source: .selected(bundle, locale), developmentValue: developmentValue)
-    }
-
     init(key: StaticString, tableName: String, source: StringResource.Source, developmentValue: String?, locale overrideLocale: Locale?, arguments: [CVarArg]) {
         switch source {
         case let .hosting(bundle):
@@ -62,11 +38,11 @@ extension String {
 
 extension String {
     public init(resource: StringResource) {
-        self.init(key: resource.key, tableName: resource.tableName, source: resource.source, developmentValue: resource.developmentValue)
+        self.init(key: resource.key, tableName: resource.tableName, source: resource.source, developmentValue: resource.developmentValue, locale: nil, arguments: [])
     }
 
     public init(resource: StringResource, preferredLanguages: [String], locale overrideLocale: Locale? = nil) {
-        self.init(key: resource.key, tableName: resource.tableName, source: resource.source, developmentValue: resource.developmentValue, preferredLanguages: preferredLanguages)
+        self.init(key: resource.key, tableName: resource.tableName, source: resource.source, developmentValue: resource.developmentValue, preferredLanguages: preferredLanguages, locale: nil, arguments: [])
     }
 
     public init<Arg1: CVarArg>(format resource: StringResource1<Arg1>, locale overrideLocale: Locale? = nil, _ arg1: Arg1) {