refactor(i18n): standardize label creation with i18nLabel

phodal · phodal · commit 4d72e00bb684 · 2025-05-29T15:23:37.000+08:00
Consolidate label methods by replacing jLabel, jBLabel with unified i18nLabel for better internationalization support and consistent UI rendering. This refactoring ensures all labels are properly localized throughout the application settings UI components.
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/SimplifiedLLMSettingComponent.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/SimplifiedLLMSettingComponent.kt
@@ -3,6 +3,7 @@ package cc.unitmesh.devti.settings
 import cc.unitmesh.devti.llm2.GithubCopilotManager
 import cc.unitmesh.devti.settings.locale.HUMAN_LANGUAGES
 import cc.unitmesh.devti.settings.locale.LanguageChangedCallback
+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel
 import cc.unitmesh.devti.settings.model.LLMModelManager
 import cc.unitmesh.devti.settings.ui.DeleteButtonEditor
 import cc.unitmesh.devti.settings.ui.DeleteButtonRenderer
@@ -302,12 +303,12 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
     private fun FormBuilder.addLLMParam(llmParam: LLMParam): FormBuilder = apply {
         when (llmParam.type) {
             LLMParam.ParamType.Text -> {
-                addLabeledComponent(JBLabel(llmParam.label), ReactiveTextField(llmParam) {
+                addLabeledComponent(i18nLabel(llmParam.label), ReactiveTextField(llmParam) {
                     isEnabled = it.isEditable
                 }, 1, false)
             }
             LLMParam.ParamType.ComboBox -> {
-                addLabeledComponent(JBLabel(llmParam.label), ReactiveComboBox(llmParam), 1, false)
+                addLabeledComponent(i18nLabel(llmParam.label), ReactiveComboBox(llmParam), 1, false)
             }
             else -> {
                 addSeparator()
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/coder/AutoDevCoderConfigurable.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/coder/AutoDevCoderConfigurable.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.settings.coder
 
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.fullWidthCell
-import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jLabel
+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel
 import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.tips
 import com.intellij.openapi.components.service
 import com.intellij.openapi.options.BoundConfigurable
@@ -13,7 +13,6 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.toMutableProperty
 import org.jetbrains.builtInWebServer.BuiltInServerOptions
 import java.net.InetAddress
-import java.net.NetworkInterface
 import javax.swing.JCheckBox
 import javax.swing.JTextField
 
@@ -39,7 +38,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
     val state = settings.state.copy()
 
     override fun createPanel(): DialogPanel = panel {
-        row(jLabel("settings.autodev.coder.recordingInLocal")) {
+        row(i18nLabel("settings.autodev.coder.recordingInLocal")) {
             fullWidthCell(recordingInLocalCheckBox)
                 .bind(
                     componentGet = { it.isSelected },
@@ -48,7 +47,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.disableAdvanceContext")) {
+        row(i18nLabel("settings.autodev.coder.disableAdvanceContext")) {
             fullWidthCell(disableAdvanceContextCheckBox)
                 .bind(
                     componentGet = { it.isSelected },
@@ -57,7 +56,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.noChatHistory")) {
+        row(i18nLabel("settings.autodev.coder.noChatHistory")) {
             fullWidthCell(noChatHistoryCheckBox)
                 .bind(
                     componentGet = { it.isSelected },
@@ -66,7 +65,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableExportAsMcpServer")) {
+        row(i18nLabel("settings.autodev.coder.enableExportAsMcpServer")) {
             fullWidthCell(enableMcpServerCheckBox)
                 .bind(
                     componentGet = { it.isSelected },
@@ -84,7 +83,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
             cell(portLabel)
         }
 
-        row(jLabel("settings.autodev.coder.enableObserver")) {
+        row(i18nLabel("settings.autodev.coder.enableObserver")) {
             fullWidthCell(enableObserver)
                 .bind(
                     componentGet = { it.isSelected },
@@ -93,7 +92,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.trimCodeBeforeSend")) {
+        row(i18nLabel("settings.autodev.coder.trimCodeBeforeSend")) {
             fullWidthCell(trimCodeBeforeSend)
                 .bind(
                     componentGet = { it.isSelected },
@@ -102,7 +101,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.inEditorCompletion")) {
+        row(i18nLabel("settings.autodev.coder.inEditorCompletion")) {
             fullWidthCell(inEditorCompletionCheckBox)
                 .bind(
                     componentGet = { it.isSelected },
@@ -111,7 +110,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableRenameSuggestion")) {
+        row(i18nLabel("settings.autodev.coder.enableRenameSuggestion")) {
             fullWidthCell(JCheckBox())
                 .bind(
                     componentGet = { it.isSelected },
@@ -120,7 +119,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableAutoRepairDiff")) {
+        row(i18nLabel("settings.autodev.coder.enableAutoRepairDiff")) {
             fullWidthCell(enableAutoRepairDiff)
                 .bind(
                     componentGet = { it.isSelected },
@@ -129,7 +128,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableAutoRunTerminal")) {
+        row(i18nLabel("settings.autodev.coder.enableAutoRunTerminal")) {
             fullWidthCell(enableAutoRunTerminal)
                 .bind(
                     componentGet = { it.isSelected },
@@ -138,7 +137,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableAutoLintCode")) {
+        row(i18nLabel("settings.autodev.coder.enableAutoLintCode")) {
             fullWidthCell(enableAutoLintCode)
                 .bind(
                     componentGet = { it.isSelected },
@@ -147,7 +146,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableRenderWebview")) {
+        row(i18nLabel("settings.autodev.coder.enableRenderWebview")) {
             fullWidthCell(enableRenderWebview)
                 .bind(
                     componentGet = { it.isSelected },
@@ -156,7 +155,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableAutoScrollInSketch")) {
+        row(i18nLabel("settings.autodev.coder.enableAutoScrollInSketch")) {
             fullWidthCell(enableAutoScrollInSketch)
                 .bind(
                     componentGet = { it.isSelected },
@@ -165,7 +164,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.autodev.coder.enableDiffViewer")) {
+        row(i18nLabel("settings.autodev.coder.enableDiffViewer")) {
             fullWidthCell(JCheckBox())
                 .bind(
                     componentGet = { it.isSelected },
@@ -174,7 +173,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable
                 )
         }
 
-        row(jLabel("settings.external.team.prompts.path")) {
+        row(i18nLabel("settings.external.team.prompts.path")) {
             fullWidthCell(teamPromptsField)
                 .bind(
                     componentGet = { it.text },
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/customize/CustomizeConfigurable.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/customize/CustomizeConfigurable.kt
@@ -9,7 +9,7 @@ import cc.unitmesh.devti.fullWidthCell
 import cc.unitmesh.devti.mcp.client.McpServicesTestDialog
 import cc.unitmesh.devti.provider.local.JsonTextProvider
 import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.componentStateChanged
-import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jBLabel
+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel
 import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.placeholder
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.Disposable
@@ -28,7 +28,7 @@ class CustomizeConfigurable(val project: Project) : BoundConfigurable(AutoDevBun
 
     override fun createPanel(): DialogPanel = panel {
         row {
-            cell(jBLabel("settings.autodev.coder.customActions", 1))
+            cell(i18nLabel("settings.autodev.coder.customActions", 1))
 
             link(AutoDevBundle.message("custom.action"), {
                 BrowserUtil.browse("https://ide.unitmesh.cc/custom/action")
@@ -86,7 +86,7 @@ class CustomizeConfigurable(val project: Project) : BoundConfigurable(AutoDevBun
                 )
         }
         row {
-            cell(jBLabel("counit.mcp.services.placeholder", 1))
+            cell(i18nLabel("counit.mcp.services.placeholder", 1))
             link(AutoDevBundle.message("sketch.mcp.services.docs"), {
                 BrowserUtil.browse("https://ide.unitmesh.cc/mcp")
             })
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/locale/LanguageChangedCallback.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/locale/LanguageChangedCallback.kt
@@ -29,11 +29,7 @@ object LanguageChangedCallback : SelectionChangedCallback {
 
     private val callBacks = ConcurrentHashMap<String, LanguageChangedCallback.() -> Unit>()
 
-    fun jLabel(key: String, index: Int = 0): JLabel {
-        return label(key, JLabel(), index)
-    }
-
-    fun jBLabel(key: String, index: Int = 0): JLabel {
+    fun i18nLabel(key: String, index: Int = 0): JLabel {
         return label(key, JBLabel(), index)
     }
 
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/ui/FormBuilderExtensions.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/ui/FormBuilderExtensions.kt
@@ -3,8 +3,7 @@ package cc.unitmesh.devti.settings.ui
 import cc.unitmesh.devti.settings.LLMParam
 import cc.unitmesh.devti.settings.ReactiveComboBox
 import cc.unitmesh.devti.settings.ReactiveTextField
-import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jBLabel
-import com.intellij.ui.components.JBTextField
+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel
 import com.intellij.util.ui.FormBuilder
 
 /**
@@ -13,12 +12,12 @@ import com.intellij.util.ui.FormBuilder
 fun FormBuilder.addLLMParam(llmParam: LLMParam): FormBuilder = apply {
     when (llmParam.type) {
         LLMParam.ParamType.Text -> {
-            addLabeledComponent(jBLabel(llmParam.label), ReactiveTextField(llmParam) {
+            addLabeledComponent(i18nLabel(llmParam.label), ReactiveTextField(llmParam) {
                 this.isEnabled = it.isEditable
             }, 1, false)
         }
         LLMParam.ParamType.ComboBox -> {
-            addLabeledComponent(jBLabel(llmParam.label), ReactiveComboBox(llmParam), 1, false)
+            addLabeledComponent(i18nLabel(llmParam.label), ReactiveComboBox(llmParam), 1, false)
         }
         else -> {
             addSeparator()
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/settings/ui/LLMUIComponents.kt b/core/src/main/kotlin/cc/unitmesh/devti/settings/ui/LLMUIComponents.kt
@@ -3,8 +3,7 @@ package cc.unitmesh.devti.settings.ui
 import cc.unitmesh.devti.settings.LLMParam
 import cc.unitmesh.devti.settings.ReactiveComboBox
 import cc.unitmesh.devti.settings.ReactiveTextField
-import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jBLabel
-import com.intellij.ui.components.JBLabel
+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel
 import com.intellij.util.ui.FormBuilder
 
 /**
@@ -13,12 +12,12 @@ import com.intellij.util.ui.FormBuilder
 private fun LLMParam.addToFormBuilder(formBuilder: FormBuilder) {
     when (this.type) {
         LLMParam.ParamType.Text -> {
-            formBuilder.addLabeledComponent(jBLabel(this.label), ReactiveTextField(this) {
+            formBuilder.addLabeledComponent(i18nLabel(this.label), ReactiveTextField(this) {
                 this.isEnabled = it.isEditable
             }, 1, false)
         }
         LLMParam.ParamType.ComboBox -> {
-            formBuilder.addLabeledComponent(jBLabel(this.label), ReactiveComboBox(this), 1, false)
+            formBuilder.addLabeledComponent(i18nLabel(this.label), ReactiveComboBox(this), 1, false)
         }
         else -> {
             formBuilder.addSeparator()

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package cc.unitmesh.devti.settings.coder`
`2`	`2`
`3`	`3`	`import cc.unitmesh.devti.AutoDevBundle`
`4`	`4`	`import cc.unitmesh.devti.fullWidthCell`
`5`		`-import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jLabel`
	`5`	`+import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.i18nLabel`
`6`	`6`	`import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.tips`
`7`	`7`	`import com.intellij.openapi.components.service`
`8`	`8`	`import com.intellij.openapi.options.BoundConfigurable`
`@@ -13,7 +13,6 @@ import com.intellij.ui.dsl.builder.panel`
`13`	`13`	`import com.intellij.ui.dsl.builder.toMutableProperty`
`14`	`14`	`import org.jetbrains.builtInWebServer.BuiltInServerOptions`
`15`	`15`	`import java.net.InetAddress`
`16`		`-import java.net.NetworkInterface`
`17`	`16`	`import javax.swing.JCheckBox`
`18`	`17`	`import javax.swing.JTextField`
`19`	`18`
`@@ -39,7 +38,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`39`	`38`	`val state = settings.state.copy()`
`40`	`39`
`41`	`40`	`override fun createPanel(): DialogPanel = panel {`
`42`		`- row(jLabel("settings.autodev.coder.recordingInLocal")) {`
	`41`	`+ row(i18nLabel("settings.autodev.coder.recordingInLocal")) {`
`43`	`42`	`fullWidthCell(recordingInLocalCheckBox)`
`44`	`43`	`.bind(`
`45`	`44`	`componentGet = { it.isSelected },`
`@@ -48,7 +47,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`48`	`47`	`)`
`49`	`48`	`}`
`50`	`49`
`51`		`- row(jLabel("settings.autodev.coder.disableAdvanceContext")) {`
	`50`	`+ row(i18nLabel("settings.autodev.coder.disableAdvanceContext")) {`
`52`	`51`	`fullWidthCell(disableAdvanceContextCheckBox)`
`53`	`52`	`.bind(`
`54`	`53`	`componentGet = { it.isSelected },`
`@@ -57,7 +56,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`57`	`56`	`)`
`58`	`57`	`}`
`59`	`58`
`60`		`- row(jLabel("settings.autodev.coder.noChatHistory")) {`
	`59`	`+ row(i18nLabel("settings.autodev.coder.noChatHistory")) {`
`61`	`60`	`fullWidthCell(noChatHistoryCheckBox)`
`62`	`61`	`.bind(`
`63`	`62`	`componentGet = { it.isSelected },`
`@@ -66,7 +65,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`66`	`65`	`)`
`67`	`66`	`}`
`68`	`67`
`69`		`- row(jLabel("settings.autodev.coder.enableExportAsMcpServer")) {`
	`68`	`+ row(i18nLabel("settings.autodev.coder.enableExportAsMcpServer")) {`
`70`	`69`	`fullWidthCell(enableMcpServerCheckBox)`
`71`	`70`	`.bind(`
`72`	`71`	`componentGet = { it.isSelected },`
`@@ -84,7 +83,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`84`	`83`	`cell(portLabel)`
`85`	`84`	`}`
`86`	`85`
`87`		`- row(jLabel("settings.autodev.coder.enableObserver")) {`
	`86`	`+ row(i18nLabel("settings.autodev.coder.enableObserver")) {`
`88`	`87`	`fullWidthCell(enableObserver)`
`89`	`88`	`.bind(`
`90`	`89`	`componentGet = { it.isSelected },`
`@@ -93,7 +92,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`93`	`92`	`)`
`94`	`93`	`}`
`95`	`94`
`96`		`- row(jLabel("settings.autodev.coder.trimCodeBeforeSend")) {`
	`95`	`+ row(i18nLabel("settings.autodev.coder.trimCodeBeforeSend")) {`
`97`	`96`	`fullWidthCell(trimCodeBeforeSend)`
`98`	`97`	`.bind(`
`99`	`98`	`componentGet = { it.isSelected },`
`@@ -102,7 +101,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`102`	`101`	`)`
`103`	`102`	`}`
`104`	`103`
`105`		`- row(jLabel("settings.autodev.coder.inEditorCompletion")) {`
	`104`	`+ row(i18nLabel("settings.autodev.coder.inEditorCompletion")) {`
`106`	`105`	`fullWidthCell(inEditorCompletionCheckBox)`
`107`	`106`	`.bind(`
`108`	`107`	`componentGet = { it.isSelected },`
`@@ -111,7 +110,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`111`	`110`	`)`
`112`	`111`	`}`
`113`	`112`
`114`		`- row(jLabel("settings.autodev.coder.enableRenameSuggestion")) {`
	`113`	`+ row(i18nLabel("settings.autodev.coder.enableRenameSuggestion")) {`
`115`	`114`	`fullWidthCell(JCheckBox())`
`116`	`115`	`.bind(`
`117`	`116`	`componentGet = { it.isSelected },`
`@@ -120,7 +119,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`120`	`119`	`)`
`121`	`120`	`}`
`122`	`121`
`123`		`- row(jLabel("settings.autodev.coder.enableAutoRepairDiff")) {`
	`122`	`+ row(i18nLabel("settings.autodev.coder.enableAutoRepairDiff")) {`
`124`	`123`	`fullWidthCell(enableAutoRepairDiff)`
`125`	`124`	`.bind(`
`126`	`125`	`componentGet = { it.isSelected },`
`@@ -129,7 +128,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`129`	`128`	`)`
`130`	`129`	`}`
`131`	`130`
`132`		`- row(jLabel("settings.autodev.coder.enableAutoRunTerminal")) {`
	`131`	`+ row(i18nLabel("settings.autodev.coder.enableAutoRunTerminal")) {`
`133`	`132`	`fullWidthCell(enableAutoRunTerminal)`
`134`	`133`	`.bind(`
`135`	`134`	`componentGet = { it.isSelected },`
`@@ -138,7 +137,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`138`	`137`	`)`
`139`	`138`	`}`
`140`	`139`
`141`		`- row(jLabel("settings.autodev.coder.enableAutoLintCode")) {`
	`140`	`+ row(i18nLabel("settings.autodev.coder.enableAutoLintCode")) {`
`142`	`141`	`fullWidthCell(enableAutoLintCode)`
`143`	`142`	`.bind(`
`144`	`143`	`componentGet = { it.isSelected },`
`@@ -147,7 +146,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`147`	`146`	`)`
`148`	`147`	`}`
`149`	`148`
`150`		`- row(jLabel("settings.autodev.coder.enableRenderWebview")) {`
	`149`	`+ row(i18nLabel("settings.autodev.coder.enableRenderWebview")) {`
`151`	`150`	`fullWidthCell(enableRenderWebview)`
`152`	`151`	`.bind(`
`153`	`152`	`componentGet = { it.isSelected },`
`@@ -156,7 +155,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`156`	`155`	`)`
`157`	`156`	`}`
`158`	`157`
`159`		`- row(jLabel("settings.autodev.coder.enableAutoScrollInSketch")) {`
	`158`	`+ row(i18nLabel("settings.autodev.coder.enableAutoScrollInSketch")) {`
`160`	`159`	`fullWidthCell(enableAutoScrollInSketch)`
`161`	`160`	`.bind(`
`162`	`161`	`componentGet = { it.isSelected },`
`@@ -165,7 +164,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`165`	`164`	`)`
`166`	`165`	`}`
`167`	`166`
`168`		`- row(jLabel("settings.autodev.coder.enableDiffViewer")) {`
	`167`	`+ row(i18nLabel("settings.autodev.coder.enableDiffViewer")) {`
`169`	`168`	`fullWidthCell(JCheckBox())`
`170`	`169`	`.bind(`
`171`	`170`	`componentGet = { it.isSelected },`
`@@ -174,7 +173,7 @@ class AutoDevCoderConfigurable(private val project: Project) : BoundConfigurable`
`174`	`173`	`)`
`175`	`174`	`}`
`176`	`175`
`177`		`- row(jLabel("settings.external.team.prompts.path")) {`
	`176`	`+ row(i18nLabel("settings.external.team.prompts.path")) {`
`178`	`177`	`fullWidthCell(teamPromptsField)`
`179`	`178`	`.bind(`
`180`	`179`	`componentGet = { it.text },`