From e300b30de14686511d1426c28e9441c473fd4140 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 24 Mar 2020 12:57:41 +0300 Subject: [PATCH] Do not use hard coded string literals in UI --- .../resources/messages/KotlinIdeaCoreBundle.properties | 3 +++ .../core/script/ScriptConfigurationNotificationFactory.kt | 8 ++++---- .../res/messages/KotlinIdeaGradleBundle.properties | 6 +++++- .../kotlin/idea/scripting/gradle/GradleImportHelper.kt | 1 - 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties index ea28403ecc9..d4745892e42 100644 --- a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties +++ b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties @@ -6,7 +6,10 @@ surround.with.error.cannot.perform.action=Cannot perform Surround With action to surround.with.title=Surround with notification.action.text.apply.context=Apply context notification.action.text.enable.auto.reload=Enable auto-reload +notification.action.text.load.script.configuration=Load configuration notification.text.there.is.a.new.script.context.available=There is a new script context available. +notification.text.script.configuration.has.been.changed=Script Configuration has been changed. +notification.description.text.script.configuration.has.been.changed=Load changes to get script code insight without loading the external Gradle project. text.kotlin.loading.script.dependencies=Kotlin: Loading script dependencies... text.loading.kotlin.script.definitions=Loading kotlin script definitions text.loading.kotlin.script.dependencies=Loading kotlin script dependencies diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationNotificationFactory.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationNotificationFactory.kt index 8936e40e577..fbf36e946b0 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationNotificationFactory.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationNotificationFactory.kt @@ -17,6 +17,7 @@ import com.intellij.ui.EditorNotificationPanel import com.intellij.ui.HyperlinkLabel import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings +import org.jetbrains.kotlin.idea.core.util.KotlinIdeaCoreBundle import org.jetbrains.kotlin.psi.UserDataProperty interface ScriptConfigurationNotificationFactory { @@ -88,13 +89,12 @@ class DefaultScriptConfigurationNotificationFactory : ScriptConfigurationNotific ) : EditorNotificationPanel() { init { - setText("Script Configuration might be changed") - createComponentActionLabel("Load configuration") { + setText(KotlinIdeaCoreBundle.message("notification.text.script.configuration.has.been.changed")) + createComponentActionLabel(KotlinIdeaCoreBundle.message("notification.action.text.load.script.configuration")) { onClick() - } - createComponentActionLabel("Enable auto-reload") { + createComponentActionLabel(KotlinIdeaCoreBundle.message("notification.action.text.enable.auto.reload")) { onClick() KotlinScriptingSettings.getInstance(project).isAutoReloadEnabled = true } diff --git a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties index b84dc25a5cd..32cb8b42e3d 100644 --- a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties +++ b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties @@ -48,4 +48,8 @@ display.name.kotlin.jvm=Kotlin/JVM display.name.kotlin.js.for.node.js=Kotlin/JS for Node.js display.name.kotlin.js.for.browser=Kotlin/JS for browser comman.name.configure.kotlin=Configure Kotlin -command.name.configure.0=Configure {0} \ No newline at end of file +command.name.configure.0=Configure {0} +notification.title.script.configuration.has.been.changed=Script configurations has been changed. +notification.text.script.configuration.has.been.changed=Gradle Project needs to be imported to load changes. +action.label.import.project=Import Project +action.label.enable.auto.import=Enable Auto-Import diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt index c83c6f4f718..8f260be0f94 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt @@ -15,7 +15,6 @@ import org.jetbrains.plugins.gradle.settings.GradleProjectSettings import org.jetbrains.plugins.gradle.util.GradleConstants fun runPartialGradleImport(project: Project) { - // TODO: partial import val gradleSettings = ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID) val projectSettings = gradleSettings.getLinkedProjectsSettings() .filterIsInstance()