azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix messages for script configuration loading

Browse Source 
Remove word "dependencies" from UI, use "configuration" instead
This commit is contained in:
Natalia Selezneva
2020-04-22 14:40:46 +03:00
parent f3687dcd00
commit 34df3066b3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties
+2 -2
View File
@@ -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.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.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. 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.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 implement.members.handler.title=Implement Members
override.members.handler.title=Override Members override.members.handler.title=Override Members
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt
+1 -1
View File
@@ -34,7 +34,7 @@ class ScriptTrafficLightRendererContributor : TrafficLightRendererContributor {
!ScriptConfigurationManager.getInstance(project).hasConfiguration(file) !ScriptConfigurationManager.getInstance(project).hasConfiguration(file)
&& !ScriptConfigurationManager.isManualConfigurationLoading(file.originalFile.virtualFile) && !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 status.errorAnalyzingFinished = false
} }
return status return status
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/DefaultBackgroundExecutor.kt
+1 -1
View File
@@ -204,7 +204,7 @@ internal class DefaultBackgroundExecutor(
override fun start() { override fun start() {
super.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) { override fun run(indicator: ProgressIndicator) {
progressIndicator = indicator progressIndicator = indicator
updateProgress() updateProgress()