Release/1.0.5 (#214)

EgzonArifi · web-flow · commit 7409b2395a87 · 2024-09-25T15:18:24.000+02:00
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Lingua.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Lingua.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/LinguaLib.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/LinguaLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/LinguaTests.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/LinguaTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Lingua-App/Lingua/Lingua.xcodeproj/project.pbxproj b/Lingua-App/Lingua/Lingua.xcodeproj/project.pbxproj
diff --git a/Lingua-App/Lingua/Lingua.xcodeproj/xcshareddata/xcschemes/LinguaApp.xcscheme b/Lingua-App/Lingua/Lingua.xcodeproj/xcshareddata/xcschemes/LinguaApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Lingua-App/Lingua/Lingua/Resources/Assets.xcassets/lingua_menu_bar_icon.imageset/Contents.json b/Lingua-App/Lingua/Lingua/Resources/Assets.xcassets/lingua_menu_bar_icon.imageset/Contents.json
@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/Lingua-App/Lingua/Lingua/Resources/Localization/Lingua.swift b/Lingua-App/Lingua/Lingua/Resources/Localization/Lingua.swift
@@ -62,7 +62,7 @@ enum Lingua {
 		static let inputProjectName = tr("ProjectForm", "input_project_name")
 		/// Sheet ID *
 		static let inputSheetId = tr("ProjectForm", "input_sheet_id")
-		/// After you "Localize", you have to Add files to "%@"... in Xcode, if they are not added already
+		/// After you "Localize", you have to Add files to "%@"... in Xcode, if they are not added already.\n\nNOTE: If you are using Xcode 16 and have structured your project using 'Folders' instead of 'Groups', this step is not necessary.
 		static func iosLocalizationInfoMessage(_ param1: String) -> String {
 			return tr("ProjectForm", "ios_localization_info_message", param1)
 		}
diff --git a/Lingua-App/Lingua/Lingua/Resources/Localization/en.lproj/ProjectForm.strings b/Lingua-App/Lingua/Lingua/Resources/Localization/en.lproj/ProjectForm.strings
@@ -14,7 +14,9 @@
 "localize_button" = "Localize";
 "swift_code_toggle_title" = "Generate Swift Code";
 "input_directory_button" = "Choose Directory";
-"ios_localization_info_message" = "After you \"Localize\", you have to Add files to \"%@\"... in Xcode, if they are not added already";
+"ios_localization_info_message" = "After you \"Localize\", you have to Add files to \"%@\"... in Xcode, if they are not added already.
+
+NOTE: If you are using Xcode 16 and have structured your project using 'Folders' instead of 'Groups', this step is not necessary.";
 "api_key_help" = "Here are the steps to enable the Google Sheets API and create an API key:
 
 * Go to the https://console.cloud.google.com/.
diff --git a/README.md b/README.md
@@ -149,7 +149,10 @@ Then in the configuration file created you need to provide your data, like below
 
 The output directory property should be the path where you want the tool to create localization files. 
 
-* For iOS it can be any directory on your project. After you run the command, for the first time, you have to **`Add files to 'YourProject'`** in Xcode.
+* For iOS it can be any directory on your project. 
+
+  After you run the command, for the first time, you have to **`Add files to 'YourProject'`** in Xcode.\
+  **NOTE:** If you are using Xcode 16 and have structured your project using **Folders** instead of **Groups**, this step is not necessary.
 
 * For Android, since the translation are placed in a specific project directory, the output directory it should look something like this: **`path/YourProject/app/src/main/res `**
 
diff --git a/Sources/LinguaLib/Common/Extensions/String+Extension.swift b/Sources/LinguaLib/Common/Extensions/String+Extension.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public extension String {
   static let packageName = "Lingua"
-  static let version = "1.0.4"
+  static let version = "1.0.5"
   static let swiftLocalizedName = "\(String.packageName).swift"
   static let fileHeader = """
   This file was generated with Lingua command line tool. Please do not change it!
diff --git a/Sources/LinguaLib/Common/Foundation/CustomJSONEncoder.swift b/Sources/LinguaLib/Common/Foundation/CustomJSONEncoder.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-final class CustomJSONEncoder: JSONEncoder {
+final class CustomJSONEncoder: JSONEncoder, @unchecked Sendable {
   override func encode<T: Encodable>(_ value: T) throws -> Data {
     let encoder = JSONEncoder()
     encoder.outputFormatting = .prettyPrinted
diff --git a/Sources/LinguaLib/Infrastructure/SwiftLocalizeGenerator/PlaceholderExtractor/NSRegularExpressionPlaceholderExtractor.swift b/Sources/LinguaLib/Infrastructure/SwiftLocalizeGenerator/PlaceholderExtractor/NSRegularExpressionPlaceholderExtractor.swift
@@ -4,8 +4,8 @@ struct NSRegularExpressionPlaceholderExtractor: PlaceholderExtractorStrategy {
   func extractPlaceholders(from translation: String, pattern: String) -> [Placeholder] {
     guard let regex = try? NSRegularExpression(pattern: pattern) else { return [] }
     
-    let matches = regex.matches(in: translation,
-                                range: NSRange(location: 0, length: translation.count))
+    let range = NSRange(location: 0, length: translation.count)
+    let matches = regex.matches(in: translation, range: range)
     
     return matches
       .enumerated()

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,8 @@`
`8`	`8`	`"info" : {`
`9`	`9`	`"author" : "xcode",`
`10`	`10`	`"version" : 1`
	`11`	`+ },`
	`12`	`+ "properties" : {`
	`13`	`+ "template-rendering-intent" : "template"`
`11`	`14`	`}`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ enum Lingua {`
`62`	`62`	`static let inputProjectName = tr("ProjectForm", "input_project_name")`
`63`	`63`	`/// Sheet ID *`
`64`	`64`	`static let inputSheetId = tr("ProjectForm", "input_sheet_id")`
`65`		`- /// After you "Localize", you have to Add files to "%@"... in Xcode, if they are not added already`
	`65`	`+ /// After you "Localize", you have to Add files to "%@"... in Xcode, if they are not added already.\n\nNOTE: If you are using Xcode 16 and have structured your project using 'Folders' instead of 'Groups', this step is not necessary.`
`66`	`66`	`static func iosLocalizationInfoMessage(_ param1: String) -> String {`
`67`	`67`	`return tr("ProjectForm", "ios_localization_info_message", param1)`
`68`	`68`	`}`