From 34df3066b3918568ae60c0f868ee48bde933104b Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 22 Apr 2020 14:40:46 +0300 Subject: [PATCH] Fix messages for script configuration loading Remove word "dependencies" from UI, use "configuration" instead --- .../resources/messages/KotlinIdeaCoreBundle.properties | 4 ++-- .../idea/core/script/ScriptTrafficLightRendererContributor.kt | 2 +- .../script/configuration/utils/DefaultBackgroundExecutor.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties index d4745892e42..038d79eceda 100644 --- a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties +++ b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties @@ -10,8 +10,8 @@ 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.kotlin.loading.script.configuration=Kotlin: Loading script configuration... text.loading.kotlin.script.definitions=Loading kotlin script definitions -text.loading.kotlin.script.dependencies=Loading kotlin script dependencies +text.loading.kotlin.script.configuration=Loading script configuration implement.members.handler.title=Implement Members override.members.handler.title=Override Members diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt index 286cebd006f..68f50fa8b00 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt @@ -34,7 +34,7 @@ class ScriptTrafficLightRendererContributor : TrafficLightRendererContributor { !ScriptConfigurationManager.getInstance(project).hasConfiguration(file) && !ScriptConfigurationManager.isManualConfigurationLoading(file.originalFile.virtualFile) ) { - status.reasonWhySuspended = KotlinIdeaCoreBundle.message("text.loading.kotlin.script.dependencies") + status.reasonWhySuspended = KotlinIdeaCoreBundle.message("text.loading.kotlin.script.configuration") status.errorAnalyzingFinished = false } return status diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/DefaultBackgroundExecutor.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/DefaultBackgroundExecutor.kt index 3cc08df2ed0..7e1a7298fa5 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/DefaultBackgroundExecutor.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/DefaultBackgroundExecutor.kt @@ -204,7 +204,7 @@ internal class DefaultBackgroundExecutor( override fun start() { super.start() - object : Task.Backgroundable(project, KotlinIdeaCoreBundle.message("text.kotlin.loading.script.dependencies"), true) { + object : Task.Backgroundable(project, KotlinIdeaCoreBundle.message("text.kotlin.loading.script.configuration"), true) { override fun run(indicator: ProgressIndicator) { progressIndicator = indicator updateProgress()