Fix memory leak caused by NSLocalizedString

mac-cain13 · Apr 2, 2024 · b590a5c · b590a5c
1 parent 8d26021
commit b590a5c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Sources/RswiftResources/Integrations/StringResource+Integrations.swift b/Sources/RswiftResources/Integrations/StringResource+Integrations.swift
@@ -12,12 +12,20 @@ extension String {
         switch source {
         case let .hosting(bundle):
             // With fallback to developmentValue
-            let format = NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: developmentValue ?? "", comment: "")
+            let format = if #available(macOS 12, iOS 15, tvOS 15, watchOS 8, *) {
+                String(localized: key, defaultValue: .init(developmentValue ?? ""), table: tableName, bundle: bundle, comment: "")
+            } else {
+                NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: developmentValue ?? "", comment: "")
+            }
             self = String(format: format, locale: overrideLocale ?? Locale.current, arguments: arguments)
 
         case let .selected(bundle, locale):
             // Don't use developmentValue with selected bundle/locale
-            let format = NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: "", comment: "")
+            let format = if #available(macOS 12, iOS 15, tvOS 15, watchOS 8, *) {
+                String(localized: key, defaultValue: .init(developmentValue ?? ""), table: tableName, bundle: bundle, comment: "")
+            } else {
+                NSLocalizedString(key.description, tableName: tableName, bundle: bundle, value: developmentValue ?? "", comment: "")
+            }
             self = String(format: format, locale: overrideLocale ?? locale, arguments: arguments)
 
         case .none: