From d30844310a6d26b145b015dfc374a4c54bd1bede Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 16 Mar 2020 15:19:28 +0700 Subject: [PATCH] i18n: remove `html` wrap from `.properties` #KT-37483 --- idea/idea-jvm/resources/messages/KotlinJvmBundle.properties | 6 +++--- .../UnsupportedAbiVersionNotificationPanelProvider.kt | 6 +++--- idea/resources/messages/KotlinBundle.properties | 2 +- .../kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties b/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties index 407bc7d34b2..57fd3fe2380 100644 --- a/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties +++ b/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties @@ -153,13 +153,13 @@ library.update.failed=Library update failed failed.to.update.0.1=Failed to update {0}: {1} library.update.failed1=Library update failed failed.to.find.root.for.file.0=Failed to find root for file: {0} -html.b.0.choice.0.1.1.some.kotlin.runtime.librar.0.choice.0.1.y.1.ies.b.1.choice.0.1.and.one.other.jar.1.and.1.other.jars.1.choice.0.has.0.have.an.unsupported.binary.format.html={0,choice,0#|1#|1{1,choice,0#|1# and one other jar|1< and {1} other jars} {1,choice,0#has|0 +html.b.0.choice.0.1.1.some.kotlin.runtime.librar.0.choice.0.1.y.1.ies.b.1.choice.0.1.and.one.other.jar.1.and.1.other.jars.1.choice.0.has.0.have.an.unsupported.binary.format.html={0,choice,0#|1#|1{1,choice,0#|1# and one other jar|1< and {1} other jars} {1,choice,0#has|0Kotlin library '{'0'}' has outdated binary format and can''t be read by current plugin. Please update the library. -html.kotlin.library.b.0.b.was.compiled.with.a.newer.kotlin.compiler.and.can.t.be.read.please.update.kotlin.plugin.html=Kotlin library '{'0'}' was compiled with a newer Kotlin compiler and can''t be read. Please update Kotlin plugin. +html.kotlin.library.b.0.b.has.outdated.binary.format.and.can.t.be.read.by.current.plugin.please.update.the.library.html=Kotlin library '{'0'}' has outdated binary format and can''t be read by current plugin. Please update the library. +html.kotlin.library.b.0.b.was.compiled.with.a.newer.kotlin.compiler.and.can.t.be.read.please.update.kotlin.plugin.html=Kotlin library '{'0'}' was compiled with a newer Kotlin compiler and can''t be read. Please update Kotlin plugin. some.kotlin.libraries.attached.to.this.project.have.unsupported.binary.format.please.update.the.libraries.or.the.plugin=Some Kotlin libraries attached to this project have unsupported binary format. Please update the libraries or the plugin. some.kotlin.libraries.attached.to.this.project.have.outdated.binary.format.and.can.t.be.read.by.current.plugin.please.update.found.libraries=Some Kotlin libraries attached to this project have outdated binary format and can't be read by current plugin. Please update found libraries. some.kotlin.libraries.attached.to.this.project.were.compiled.with.a.newer.kotlin.compiler.and.can.t.be.read.please.update.kotlin.plugin=Some Kotlin libraries attached to this project were compiled with a newer Kotlin compiler and can't be read. Please update Kotlin plugin. diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt index caf391d2c6f..1b9a4383fe4 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt @@ -63,7 +63,7 @@ class UnsupportedAbiVersionNotificationPanelProvider(private val project: Projec val badRootsInRuntimeLibraries = findBadRootsInRuntimeLibraries(badRuntimeLibraries, badVersionedRoots) val otherBadRootsCount = badVersionedRoots.size - badRootsInRuntimeLibraries.size - val text = KotlinJvmBundle.message( + val text = KotlinJvmBundle.htmlMessage( "html.b.0.choice.0.1.1.some.kotlin.runtime.librar.0.choice.0.1.y.1.ies.b.1.choice.0.1.and.one.other.jar.1.and.1.other.jars.1.choice.0.has.0.have.an.unsupported.binary.format.html", badRuntimeLibraries.size, otherBadRootsCount @@ -103,7 +103,7 @@ class UnsupportedAbiVersionNotificationPanelProvider(private val project: Projec when { isPluginOldForAllRoots -> { answer.setText( - KotlinJvmBundle.message( + KotlinJvmBundle.htmlMessage( "html.kotlin.library.b.0.b.was.compiled.with.a.newer.kotlin.compiler.and.can.t.be.read.please.update.kotlin.plugin.html", presentableName ) @@ -113,7 +113,7 @@ class UnsupportedAbiVersionNotificationPanelProvider(private val project: Projec isPluginNewForAllRoots -> answer.setText( - KotlinJvmBundle.message( + KotlinJvmBundle.htmlMessage( "html.kotlin.library.b.0.b.has.outdated.binary.format.and.can.t.be.read.by.current.plugin.please.update.the.library.html", presentableName ) diff --git a/idea/resources/messages/KotlinBundle.properties b/idea/resources/messages/KotlinBundle.properties index d2b74ebd47e..bf60febe444 100644 --- a/idea/resources/messages/KotlinBundle.properties +++ b/idea/resources/messages/KotlinBundle.properties @@ -270,7 +270,7 @@ scratch.inlay.output.mode.description=Inlay output mode # Code insight dialog.import.on.paste.title3=Select Import to Remove -copy.paste.reference.notification={0} {0, choice, 1#import was|2#imports were} added

Review Added Imports... +copy.paste.reference.notification={0} {0, choice, 1#import was|2#imports were} added

Review Added Imports... # Experimental features experimental.ml.completion=ML Completion for Kotlin diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt index e59cbff22d8..963ad55c7a3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt @@ -47,7 +47,7 @@ object ReviewAddedImports { removeImports(project, file, importsToBeDeleted) return } - val notificationText = KotlinBundle.message("copy.paste.reference.notification", imported.size) + val notificationText = KotlinBundle.htmlMessage("copy.paste.reference.notification", imported.size) ApplicationManager.getApplication().invokeLater( Runnable { showHint(