Supports more Source Languages (ko, ja)

* Requires build with SDK provided after official deployment of macOS 13
PangMo5 · Sep 13, 2022 · 8615126 · 8615126
1 parent 598e8ac
commit 8615126
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 8 deletions.
diff --git a/Swifty-OCR-Translator.xcodeproj/project.pbxproj b/Swifty-OCR-Translator.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		62B8701826981DAF0078BFB2 /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62B8701726981DAF0078BFB2 /* MenuView.swift */; };
 		62B8701B269823910078BFB2 /* Defaults++.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62B8701A269823910078BFB2 /* Defaults++.swift */; };
 		62B8702726982FC60078BFB2 /* LanguageTranslatorV3 in Frameworks */ = {isa = PBXBuildFile; productRef = 62B8702626982FC60078BFB2 /* LanguageTranslatorV3 */; };
+		62C4E5DE2850858700224761 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C4E5DD2850858700224761 /* Language.swift */; };
 		62EB5C1B269E839F001DA95A /* Translator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EB5C1A269E839F001DA95A /* Translator.swift */; };
 		62EB5C1E269E8421001DA95A /* APIInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EB5C1D269E8421001DA95A /* APIInfo.swift */; };
 		62EB5C26269E93A9001DA95A /* Moya in Frameworks */ = {isa = PBXBuildFile; productRef = 62EB5C25269E93A9001DA95A /* Moya */; };
@@ -37,6 +38,7 @@
 		62B870122698194E0078BFB2 /* MenuViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewModel.swift; sourceTree = "<group>"; };
 		62B8701726981DAF0078BFB2 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = "<group>"; };
 		62B8701A269823910078BFB2 /* Defaults++.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Defaults++.swift"; sourceTree = "<group>"; };
+		62C4E5DD2850858700224761 /* Language.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Language.swift; sourceTree = "<group>"; };
 		62EB5C1A269E839F001DA95A /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; sourceTree = "<group>"; };
 		62EB5C1D269E8421001DA95A /* APIInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIInfo.swift; sourceTree = "<group>"; };
 		62EB5C29269E93CC001DA95A /* GoogleTranslateAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleTranslateAPI.swift; sourceTree = "<group>"; };
@@ -140,6 +142,7 @@
 			isa = PBXGroup;
 			children = (
 				62EB5C1A269E839F001DA95A /* Translator.swift */,
+				62C4E5DD2850858700224761 /* Language.swift */,
 			);
 			path = Enums;
 			sourceTree = "<group>";
@@ -252,6 +255,7 @@
 				62B8701B269823910078BFB2 /* Defaults++.swift in Sources */,
 				62EB5C2C269E9626001DA95A /* GoogleTranslateModels.swift in Sources */,
 				62B870132698194E0078BFB2 /* MenuViewModel.swift in Sources */,
+				62C4E5DE2850858700224761 /* Language.swift in Sources */,
 				62EB5C1E269E8421001DA95A /* APIInfo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -394,7 +398,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.PangMo5.Swifty-OCR-Translator";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -421,7 +425,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.PangMo5.Swifty-OCR-Translator";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Swifty-OCR-Translator/Enums/Language.swift b/Swifty-OCR-Translator/Enums/Language.swift
@@ -0,0 +1,48 @@
+//
+//  Language.swift
+//  Swifty-OCR-Translator
+//
+//  Created by PangMo5 on 2022/06/08.
+//
+
+import Foundation
+import Defaults
+
+enum Language: String, CaseIterable, DefaultsSerializable {
+    case en
+    case ko
+    case ja
+    case fr
+    case it
+    case de
+    case es
+    case pt
+    case zh
+
+    var toLocaleStrings: [String] {
+        switch self {
+        case .en:
+            return ["en-US"]
+        case .ko:
+            return ["ko-KR"]
+        case .ja:
+            return ["ja-JP"]
+        case .fr:
+            return ["fr-FR"]
+        case .it:
+            return ["it-IT"]
+        case .de:
+            return ["de-DE"]
+        case .es:
+            return ["es-ES"]
+        case .pt:
+            return ["pt-BR"]
+        case .zh:
+            return ["zh-Hans", "zh-Hant"]
+        }
+    }
+
+    var toLocalized: String {
+        Locale.current.localizedString(forLanguageCode: rawValue) ?? "unknown"
+    }
+}
diff --git a/Swifty-OCR-Translator/Extensions/Defaults++.swift b/Swifty-OCR-Translator/Extensions/Defaults++.swift
@@ -8,7 +8,7 @@
 import Defaults
 
 extension Defaults.Keys {
-    static let selectedSourceLanuage = Key<String>("selectedSourceLanuage", default: "")
+    static let selectedSourceLanuage = Key<Language>("selectedSourceLanuage", default: .en)
     static let selectedTargetLanuage = Key<String>("selectedTargetLanuage", default: "")
     static let selectedTranslator = Key<Translator>("selectedTranslator", default: .allCases.first!)
     static let apiInfoDict = Key<[Translator: APIInfo]>("apiInfoDict", default: [:])

diff --git a/Swifty-OCR-Translator/ViewModels/MainViewModel.swift b/Swifty-OCR-Translator/ViewModels/MainViewModel.swift
@@ -17,7 +17,7 @@ final class MainViewModel: ObservableObject {
     fileprivate var googleTranslateProvider = MoyaProvider<GoogleTranslateAPI>()
 
     @Published
-    var supportedOCRLanguages = ["en", "fr", "it", "de", "es", "pt", "zh"]
+    var supportedOCRLanguages = Language.allCases
     @Published
     var supportedTargetLanuages = [String]()
 

diff --git a/Swifty-OCR-Translator/ViewModels/MenuViewModel.swift b/Swifty-OCR-Translator/ViewModels/MenuViewModel.swift
@@ -53,7 +53,10 @@ final class MenuViewModel: ObservableObject {
 
         let request = VNRecognizeTextRequest(completionHandler: recognizeTextHandler(request:error:))
         request.recognitionLevel = .accurate
-        request.recognitionLanguages = ["zh-Hans", "zh-Hant", "en-US", "fr-FR", "it-IT", "de-DE", "es-ES", "pt-BR"]
+        var languages = Language.allCases
+        languages.removeAll(where: { $0 == Defaults[.selectedSourceLanuage] })
+        languages.insert(Defaults[.selectedSourceLanuage], at: 0)
+        request.recognitionLanguages = languages.map(\.toLocaleStrings).flatMap { $0 }
         request.usesLanguageCorrection = true
         do {
             try requestHandler.perform([request])
@@ -92,8 +95,10 @@ final class MenuViewModel: ObservableObject {
         languageTranslator.serviceURL = Defaults[.apiInfoDict].current.url
 
         languageTranslator
-            .translate(text: textList,
-                       modelID: "\(Defaults[.selectedSourceLanuage])-\(Defaults[.selectedTargetLanuage])") { [weak self] response, error in
+            .translate(
+                text: textList,
+                modelID: "\(Defaults[.selectedSourceLanuage].rawValue)-\(Defaults[.selectedTargetLanuage])"
+            ) { [weak self] response, error in
 
                 guard let translation = response?.result else {
                     print(error?.localizedDescription ?? "unknown error")
@@ -110,7 +115,7 @@ final class MenuViewModel: ObservableObject {
 
     fileprivate func translateWithGoogle(textList: [String]) {
         googleTranslateProvider
-            .requestPublisher(.translate(q: textList, target: Defaults[.selectedTargetLanuage], source: Defaults[.selectedSourceLanuage]))
+            .requestPublisher(.translate(q: textList, target: Defaults[.selectedTargetLanuage], source: Defaults[.selectedSourceLanuage].rawValue))
             .map(GoogleTranslateAPIResponse.Translations.self, atKeyPath: "data")
             .print()
             .replaceError(with: .init(translations: []))