diff --git a/idea/resources/messages/KotlinCopyBundle.properties b/idea/resources/messages/KotlinCopyBundle.properties new file mode 100644 index 00000000000..8ebcfb906ea --- /dev/null +++ b/idea/resources/messages/KotlinCopyBundle.properties @@ -0,0 +1,6 @@ +text.adding.imports=Adding imports ... +text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin=Clipboard content seems to be Java code. Do you want to convert it to Kotlin? +text.convert.java.to.kotlin=Convert Java to Kotlin +text.copied.kotlin.code=Copied kotlin code +text.resolving.references=Resolving references ... +title.convert.code.from.java=Convert Code From Java \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt index 4173aa63c2e..901ae038168 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt @@ -377,7 +377,7 @@ fun runPostProcessing( processor.updateState(0, phase, description) } }, - "Convert Java to Kotlin", + KotlinCopyBundle.message("text.convert.java.to.kotlin"), true, project ) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt index 4a301f177db..25a9afb44f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt @@ -29,6 +29,6 @@ class CopiedKotlinCode(val fileText: String, val startOffsets: IntArray, val end override fun setOffsets(offsets: IntArray?, index: Int) = index companion object { - val DATA_FLAVOR: DataFlavor = DataFlavor(CopiedKotlinCode::class.java, "Copied kotlin code") + val DATA_FLAVOR: DataFlavor = DataFlavor(CopiedKotlinCode::class.java, KotlinCopyBundle.message("text.copied.kotlin.code")) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt new file mode 100644 index 00000000000..8ece7f20b13 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt @@ -0,0 +1,18 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.conversion.copy + +import org.jetbrains.annotations.NonNls +import org.jetbrains.annotations.PropertyKey +import org.jetbrains.kotlin.util.AbstractKotlinBundle + +@NonNls +private const val BUNDLE = "messages.KotlinCopyBundle" + +object KotlinCopyBundle : AbstractKotlinBundle(BUNDLE) { + @JvmStatic + fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) +} diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java index 19841e6ec95..6237c124779 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java @@ -39,9 +39,9 @@ public class KotlinPasteFromJavaDialog extends DialogWrapper { super(project, true); setModal(true); getRootPane().setDefaultButton(buttonOK); - setTitle("Convert Code From Java"); + setTitle(KotlinCopyBundle.message("title.convert.code.from.java")); if (isPlainText) { - questionLabel.setText("Clipboard content seems to be Java code. Do you want to convert it to Kotlin? "); + questionLabel.setText(KotlinCopyBundle.message("text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin")); //TODO: should we also use different set of settings? } init(); diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt index e68c3a36a64..c07b9fba8a8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt @@ -134,7 +134,7 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers } ProgressManager.getInstance().runProcessWithProgressSynchronously( - task, "Adding imports ...", true, project + task, KotlinCopyBundle.message("text.adding.imports"), true, project ) } @@ -229,7 +229,7 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers } ProgressManager.getInstance().runProcessWithProgressSynchronously( - task, "Resolving references ...", true, project + task, KotlinCopyBundle.message("text.resolving.references"), true, project ) }