Merge branch 'dev' into feat-custom-prompt

tisfeng · Sep 17, 2024 · 4a419d0 · 4a419d0
2 parents 06dcd06 + 33726f3
commit 4a419d0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/Easydict/Swift/Feature/Localization/I18nHelper.swift b/Easydict/Swift/Feature/Localization/I18nHelper.swift
@@ -25,19 +25,15 @@ class I18nHelper: NSObject {
     }
 
     var localizeCode: String {
-        if let code = UserDefaults.standard.string(forKey: languagePreferenceLocalKey) {
+        if let code = UserDefaults.standard.string(forKey: languagePreferenceLocalKey),
+           LanguageState.LanguageType(rawValue: code) != nil {
             return code
         }
 
-        if let localLanguageType = LanguageState.LanguageType(rawValue: Locale.current.identifier) {
+        if let localLanguageType = Locale.current.languageType {
             return localLanguageType.rawValue
         }
 
-        // We should use EZLanguageModel localeIdentifier to rewrite this code.
-        if Locale.current.identifier == "zh_CN" {
-            return LanguageState.LanguageType.simplifiedChinese.rawValue
-        }
-
         return LanguageState.LanguageType.english.rawValue
     }
 

diff --git a/Easydict/Swift/Feature/Localization/LanguageState.swift b/Easydict/Swift/Feature/Localization/LanguageState.swift
@@ -48,3 +48,31 @@ class LanguageState: ObservableObject {
         }
     }
 }
+
+// https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPInternational/LanguageandLocaleIDs/LanguageandLocaleIDs.html
+extension Locale {
+    var languageType: LanguageState.LanguageType? {
+        let languageCode = language.languageCode?.identifier
+        let script = language.script?.identifier
+        let region = language.region?.identifier
+
+        let languageCodeScriptRegion = [languageCode, script, region].compactMap { $0 }.joined(separator: "-")
+        let languageCodeScript = [languageCode, script].compactMap { $0 }.joined(separator: "-")
+        let languageCodeRegion = [languageCode, region].compactMap { $0 }.joined(separator: "-")
+
+        if let languageCode, let type = LanguageState.LanguageType(rawValue: languageCode) {
+            return type
+        }
+        if let type = LanguageState.LanguageType(rawValue: languageCodeScriptRegion) {
+            return type
+        }
+        if let type = LanguageState.LanguageType(rawValue: languageCodeScript) {
+            return type
+        }
+        if let type = LanguageState.LanguageType(rawValue: languageCodeRegion) {
+            return type
+        }
+
+        return nil
+    }
+}