perf: use config first langauge instead language manager userFirstLan…

…guage
tisfeng · Nov 17, 2023 · c90c8b7 · c90c8b7
1 parent 51cc85f
commit c90c8b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Easydict/Feature/Service/Apple/EZAppleService.m b/Easydict/Feature/Service/Apple/EZAppleService.m
@@ -579,7 +579,7 @@ - (EZLanguage)appleDetectTextLanguage:(NSString *)text printLog:(BOOL)logFlag {
 
     // !!!: Numbers will be return empty dict @{}: 729
     if (languageProbabilityDict.count == 0) {
-        EZLanguage firstLanguage = [self.languageManager userFirstLanguage];
+        EZLanguage firstLanguage = EZConfiguration.shared.firstLanguage;
         dominantLanguage = [self appleLanguageFromLanguageEnum:firstLanguage];
         languageProbabilityDict = @{dominantLanguage : @(0)};
     }

diff --git a/Easydict/Feature/Service/Language/EZLanguageManager.h b/Easydict/Feature/Service/Language/EZLanguageManager.h
@@ -24,9 +24,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// preferredLanguages = userPreferredTwoLanguages + systemPreferredLanguages, remove the same language
 @property (nonatomic, copy, readonly) NSArray<EZLanguage> *preferredLanguages;
 
-@property (nonatomic, copy, readonly) EZLanguage userFirstLanguage;
-@property (nonatomic, copy, readonly) EZLanguage userSecondLanguage;
-
 @property (nonatomic, copy, readonly) NSArray<EZLanguage> *allLanguages;
 
 /// <EZLanguageEnglish : 🇬🇧 英语>

diff --git a/Easydict/Feature/Service/OpenAI/EZOpenAIService.m b/Easydict/Feature/Service/OpenAI/EZOpenAIService.m
@@ -785,7 +785,7 @@ - (NSArray *)translatioMessages:(NSString *)text from:(EZLanguage)sourceLanguage
 
 /// Sentence messages.
 - (NSArray<NSDictionary *> *)sentenceMessages:(NSString *)sentence from:(EZLanguage)sourceLanguage to:(EZLanguage)targetLanguage {
-    NSString *answerLanguage = [EZLanguageManager.shared userFirstLanguage];
+    NSString *answerLanguage = EZConfiguration.shared.firstLanguage;
     self.result.to = answerLanguage;
 
     NSString *prompt = @"";
@@ -955,7 +955,7 @@ - (NSArray *)translatioMessages:(NSString *)text from:(EZLanguage)sourceLanguage
     // V5. prompt
     NSString *prompt = @"";
 
-    NSString *answerLanguage = [EZLanguageManager.shared userFirstLanguage];
+    NSString *answerLanguage = EZConfiguration.shared.firstLanguage;
     self.result.to = answerLanguage;
 
     NSString *pronunciation = @"Pronunciation";
@@ -1413,7 +1413,7 @@ - (NSString *)getChineseLanguageType:(NSString *)language accordingToLanguage:(N
 - (NSArray<NSDictionary *> *)jsonDictPromptMessages:(NSString *)word from:(EZLanguage)sourceLanguage to:(EZLanguage)targetLanguage {
     NSString *prompt = @"";
 
-    NSString *answerLanguage = [EZLanguageManager.shared userFirstLanguage];
+    NSString *answerLanguage = EZConfiguration.shared.firstLanguage;
     NSString *translationLanguageTitle = targetLanguage;
 
     BOOL isEnglishWord = NO;

diff --git a/Easydict/Feature/Utility/AppleScript/EZAppleScriptManager.m b/Easydict/Feature/Utility/AppleScript/EZAppleScriptManager.m
@@ -7,7 +7,7 @@
 //
 
 #import "EZAppleScriptManager.h"
-#import "EZLanguageManager.h"
+#import "EZConfiguration.h"
 
 @interface EZAppleScriptManager ()
 
@@ -225,7 +225,7 @@ - (void)checkApplicationSupportCopyAction:(NSString *)appBundleID completion:(vo
     NSString *edit;
 
     if (!appLanguage) {
-        appLanguage = [EZLanguageManager.shared userFirstLanguage];
+        appLanguage = EZConfiguration.shared.firstLanguage;
     }
 
     if ([appLanguage isEqualToString:EZLanguageEnglish]) {