Merge branch 'next' into compat/203-212

YiiGuxing · Nov 19, 2023 · 1c3d943 · 1c3d943
2 parents e04dc23 + c552d71
commit 1c3d943
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/kotlin/cn/yiiguxing/plugin/translate/Settings.kt b/src/main/kotlin/cn/yiiguxing/plugin/translate/Settings.kt
@@ -2,7 +2,6 @@ package cn.yiiguxing.plugin.translate
 
 import cn.yiiguxing.plugin.translate.trans.Lang
 import cn.yiiguxing.plugin.translate.ui.settings.TranslationEngine
-import cn.yiiguxing.plugin.translate.ui.settings.TranslationEngine.GOOGLE
 import cn.yiiguxing.plugin.translate.util.*
 import cn.yiiguxing.plugin.translate.util.credential.SimpleStringCredentialManager
 import com.intellij.credentialStore.CredentialAttributes
@@ -35,7 +34,7 @@ class Settings : PersistentStateComponent<Settings> {
      * 翻译API
      */
     var translator: TranslationEngine
-            by Delegates.observable(GOOGLE) { _, oldValue: TranslationEngine, newValue: TranslationEngine ->
+            by Delegates.observable(TranslationEngine.DEFAULT) { _, oldValue: TranslationEngine, newValue: TranslationEngine ->
                 if (isInitialized && oldValue != newValue) {
                     SETTINGS_CHANGE_PUBLISHER.onTranslatorChanged(this, newValue)
                 }

diff --git a/src/main/kotlin/cn/yiiguxing/plugin/translate/trans/TranslateService.kt b/src/main/kotlin/cn/yiiguxing/plugin/translate/trans/TranslateService.kt
@@ -21,7 +21,6 @@ import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.util.messages.MessageBusConnection
-import java.util.*
 
 
 /**
@@ -31,7 +30,7 @@ import java.util.*
 class TranslateService private constructor() : Disposable {
 
     @Volatile
-    var translator: Translator = DEFAULT_TRANSLATOR
+    var translator: Translator = GoogleTranslator
         private set
 
     private val listeners = mutableMapOf<ListenerKey, MutableSet<ListenerInfo>>()
@@ -195,10 +194,6 @@ class TranslateService private constructor() : Disposable {
     private data class ListenerInfo(val modalityState: ModalityState, val listener: TranslateListener)
 
     companion object {
-        val DEFAULT_TRANSLATOR: Translator by lazy {
-            if (Locale.getDefault() == Locale.CHINA) MicrosoftTranslator else GoogleTranslator
-        }
-
         val instance: TranslateService
             get() = ApplicationManager.getApplication().getService(TranslateService::class.java)
 

diff --git a/src/main/kotlin/cn/yiiguxing/plugin/translate/ui/settings/TranslationEngine.kt b/src/main/kotlin/cn/yiiguxing/plugin/translate/ui/settings/TranslationEngine.kt
@@ -22,6 +22,7 @@ import cn.yiiguxing.plugin.translate.ui.AppKeySettingsDialog
 import cn.yiiguxing.plugin.translate.ui.AppKeySettingsPanel
 import cn.yiiguxing.plugin.translate.util.Settings
 import icons.TranslationIcons
+import java.util.*
 import javax.swing.Icon
 
 enum class TranslationEngine(
@@ -121,4 +122,9 @@ enum class TranslationEngine(
         }
     }
 
+    companion object {
+        val DEFAULT: TranslationEngine by lazy {
+            if (Locale.getDefault() == Locale.CHINA) MICROSOFT else GOOGLE
+        }
+    }
 }