Merge branch 'v3.8/241' into next

Author: YiiGuxing

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+- Added new OpenAI TTS voices: Verse, Marin, and Cedar.
+- Added support for Hebrew, Thai, and Vietnamese to the DeepL translator.
+- Bug fixes.
+- 新增 OpenAI TTS 语音：Verse、Marin 与 Cedar
+- DeepL 翻译器新增对希伯来语、泰语和越南语的支持
+- Bug 修复
+
 ## [3.8.1] (2025/11/10)
 
 - Add support for quick documentation translation in Rider and CLion.

gradle.properties

@@ -6,7 +6,7 @@ pluginGroup = cn.yiiguxing.plugin.translate
 pluginRepositoryUrl = https://github.com/YiiGuxing/TranslationPlugin
 
 # SemVer format -> https://semver.org
-pluginMajorVersion = 3.8.1
+pluginMajorVersion = 3.8.2
 pluginPreReleaseVersion =
 pluginBuildMetadata =
 autoSnapshotVersion = true

src/main/kotlin/cn/yiiguxing/plugin/translate/trans/deepl/DeeplSupportedLanguages.kt

@@ -26,6 +26,7 @@ object DeeplSupportedLanguages : SupportedLanguages {
         Lang.FRENCH,
         Lang.GERMAN,
         Lang.GREEK,
+        Lang.HEBREW,
         Lang.HUNGARIAN,
         Lang.INDONESIAN,
         Lang.ITALIAN,
@@ -42,8 +43,10 @@ object DeeplSupportedLanguages : SupportedLanguages {
         Lang.SLOVENIAN,
         Lang.SPANISH,
         Lang.SWEDISH,
+        Lang.THAI,
         Lang.TURKISH,
         Lang.UKRAINIAN,
+        Lang.VIETNAMESE,
     )
 
     /**
@@ -65,6 +68,7 @@ object DeeplSupportedLanguages : SupportedLanguages {
         Lang.FRENCH,
         Lang.GERMAN,
         Lang.GREEK,
+        Lang.HEBREW,
         Lang.HUNGARIAN,
         Lang.INDONESIAN,
         Lang.ITALIAN,
@@ -82,8 +86,10 @@ object DeeplSupportedLanguages : SupportedLanguages {
         Lang.SLOVENIAN,
         Lang.SPANISH,
         Lang.SWEDISH,
+        Lang.THAI,
         Lang.TURKISH,
         Lang.UKRAINIAN,
+        Lang.VIETNAMESE,
     )
 }
 
@@ -105,6 +111,7 @@ private val adapter = object : BaseLanguageAdapter() {
         "FR" to Lang.FRENCH,
         "DE" to Lang.GERMAN,
         "EL" to Lang.GREEK,
+        "HE" to Lang.HEBREW,
         "HU" to Lang.HUNGARIAN,
         "IT" to Lang.ITALIAN,
         "ID" to Lang.INDONESIAN,
@@ -127,8 +134,10 @@ private val adapter = object : BaseLanguageAdapter() {
         "SL" to Lang.SLOVENIAN,
         "ES" to Lang.SPANISH,
         "SV" to Lang.SWEDISH,
+        "TH" to Lang.THAI,
         "TR" to Lang.TURKISH,
         "UK" to Lang.UKRAINIAN,
+        "VI" to Lang.VIETNAMESE,
     )
 }
 

src/main/kotlin/cn/yiiguxing/plugin/translate/trans/openai/OpenAiModel.kt

@@ -34,8 +34,18 @@ enum class OpenAiGPTModel(override val modelId: String, override val modelName:
 /**
  * See: [OpenAi TTS Models](https://platform.openai.com/docs/models/tts)
  */
-enum class OpenAiTTSModel(override val modelId: String, override val modelName: String) : OpenAiModel {
-    TTS_1("tts-1", "TTS-1"),
-    TTS_1_HD("tts-1-hd", "TTS-1 HD"),
+enum class OpenAiTTSModel(
+    override val modelId: String,
+    override val modelName: String,
+    val isClassic: Boolean = false
+) : OpenAiModel {
+    TTS_1("tts-1", "TTS-1", isClassic = true),
+    TTS_1_HD("tts-1-hd", "TTS-1 HD", isClassic = true),
     GPT_4O_MINI_TTS("gpt-4o-mini-tts", "GPT-4o mini TTS"),
+}
+
+fun OpenAiTTSModel.getSupportedVoices(): List<OpenAiTtsVoice> = if (isClassic) {
+    OpenAiTtsVoice.getClassicVoices()
+} else {
+    OpenAiTtsVoice.values().toList()
 }

src/main/kotlin/cn/yiiguxing/plugin/translate/trans/openai/OpenAiService.kt

@@ -98,10 +98,12 @@ class OpenAI(private val options: OpenAiService.OpenAIOptions) : OpenAiService {
     }
 
     override fun speech(text: String, indicator: ProgressIndicator?): ByteArray {
+        val supportedVoices = options.ttsModel.getSupportedVoices()
+        val fixedVoice = options.ttsVoice.takeIf { it in supportedVoices } ?: supportedVoices.first()
         val request = SpeechRequest(
             model = options.ttsModel.modelId,
             input = text,
-            voice = options.ttsVoice.value,
+            voice = fixedVoice.value,
             speed = OpenAiTTSSpeed.get(options.ttsSpeed)
         )
         val endpoint = with(options) { if (useSeparateTtsApiSettings) ttsEndpoint else endpoint }

src/main/kotlin/cn/yiiguxing/plugin/translate/trans/openai/OpenAiTtsVoice.kt

@@ -12,8 +12,27 @@ enum class OpenAiTtsVoice(val value: String, val voiceName: String) {
     CORAL("coral", "Coral"),
     ECHO("echo", "Echo"),
     FABLE("fable", "Fable"),
-    ONYX("onyx", "Onyx"),
     NOVA("nova", "Nova"),
+    ONYX("onyx", "Onyx"),
     SAGE("sage", "Sage"),
     SHIMMER("shimmer", "Shimmer"),
+    VERSE("verse", "Verse"),
+    MARIN("marin", "Marin"),
+    CEDAR("cedar", "Cedar");
+
+    companion object {
+        private val unsupportedForClassic = setOf(
+            BALLAD,
+            VERSE,
+            MARIN,
+            CEDAR
+        )
+
+        /**
+         * Returns a list of voices that are supported by the classic TTS models (e.g. tts-1 and tts-1-hd).
+         */
+        fun getClassicVoices(): List<OpenAiTtsVoice> {
+            return values().filter { it !in unsupportedForClassic }
+        }
+    }
 }

src/main/kotlin/cn/yiiguxing/plugin/translate/trans/openai/ui/OpenAISettingsDialog.kt

@@ -12,6 +12,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.ComponentValidator
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.ui.CollectionComboBoxModel
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.GotItTooltip
 import com.intellij.util.containers.orNull
@@ -132,8 +133,10 @@ class OpenAISettingsDialog(private val configType: ConfigType) : DialogWrapper(f
                     ConfigType.TRANSLATOR -> openAiState.model =
                         it.item as? OpenAiGPTModel ?: OpenAiGPTModel.values().first()
 
-                    ConfigType.TTS -> commonStates.ttsModel =
-                        it.item as? OpenAiTTSModel ?: OpenAiTTSModel.values().first()
+                    ConfigType.TTS -> {
+                        commonStates.ttsModel = it.item as? OpenAiTTSModel ?: OpenAiTTSModel.values().first()
+                        updateVoicesAndFixSelection()
+                    }
                 }
             }
         }
@@ -305,7 +308,7 @@ class OpenAISettingsDialog(private val configType: ConfigType) : DialogWrapper(f
         updateApiEndpoint()
         if (configType == ConfigType.TTS) {
             ui.modelComboBox.selected = commonStates.ttsModel
-            ui.ttsVoiceComboBox.selected = commonStates.ttsVoice
+            updateVoicesAndFixSelection()
             ui.ttsSpeedSlicer.value = commonStates.ttsSpeed
             ui.apiEndpointField.isEnabled = isAzure ||
                     ui.ttsApiSettingsTypeComboBox.selected === OpenAISettingsUI.TtsApiSettingsType.SEPARATE
@@ -320,6 +323,15 @@ class OpenAISettingsDialog(private val configType: ConfigType) : DialogWrapper(f
         ui.showComponents(componentType)
     }
 
+    private fun updateVoicesAndFixSelection() {
+        val currentVoice = commonStates.ttsVoice
+        val supportedVoices = commonStates.ttsModel.getSupportedVoices()
+        if (currentVoice !in supportedVoices) {
+            commonStates.ttsVoice = supportedVoices.first()
+        }
+        ui.ttsVoiceComboBox.model = CollectionComboBoxModel(supportedVoices, commonStates.ttsVoice)
+    }
+
     private fun showTipsIfAzureChecked() {
         if (provider == ServiceProvider.Azure) {
             val id = TranslationPlugin.generateId("tooltip.openai.azure")

src/main/kotlin/cn/yiiguxing/plugin/translate/util/Http.kt

@@ -20,7 +20,7 @@ object Http {
 
     const val MIME_TYPE_FORM = "application/x-www-form-urlencoded"
 
-    const val CHROMIUM_VERSION = "130.0.2849.68"
+    const val CHROMIUM_VERSION = "144.0.3719.92"
 
     val CHROMIUM_MAJOR_VERSION: Int = CHROMIUM_VERSION.substringBefore('.').toInt()
 

src/main/resources/META-INF/actions/jupyter.xml

@@ -7,7 +7,6 @@
             <separator/>
 
             <add-to-group group-id="JupyterEditorPopupActions" relative-to-action="EditorCopy" anchor="before"/>
-            <add-to-group group-id="JupyterConsoleEditorPopupActions" anchor="first"/>
         </group>
         <group id="Translation.JupyterOutputPopupActions">
             <separator/>