diff --git a/nj2k/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.properties b/nj2k/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.properties new file mode 100644 index 00000000000..39378d8af5e --- /dev/null +++ b/nj2k/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.properties @@ -0,0 +1,4 @@ +progress.text={0} – phase {1,number,#} of {2,number,#} +progress.searching.usages.to.update=Searching usages to update… + +phase.converting.j2k=Converting Java code to Kotlin code \ No newline at end of file diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt new file mode 100644 index 00000000000..86862d1d1a6 --- /dev/null +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt @@ -0,0 +1,24 @@ +/* + * 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.nj2k + +import com.intellij.CommonBundle +import org.jetbrains.annotations.NonNls +import org.jetbrains.annotations.PropertyKey +import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase +import java.util.* + +object KotlinNJ2KBundle : KotlinBundleBase() { + @NonNls + private const val BUNDLE = "org.jetbrains.kotlin.nj2k.KotlinNJ2KBundle" + + override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) + + @JvmStatic + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { + return CommonBundle.message(bundle, key, *params) + } +} \ No newline at end of file diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt index 915495cae05..e274c2ea36c 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt @@ -117,7 +117,7 @@ class NewJavaToKotlinConverter( override fun elementsToKotlin(inputElements: List, processor: WithProgressProcessor): Result { - val phaseDescription = "Converting Java code to Kotlin code" + val phaseDescription = KotlinNJ2KBundle.message("phase.converting.j2k") val contextElement = inputElements.firstOrNull() ?: return Result(emptyList(), null, null) val resolver = JKResolver(project, targetModule, contextElement) val symbolProvider = JKSymbolProvider(resolver) @@ -208,7 +208,7 @@ class NewJ2kWithProgressProcessor( override fun updateState(fileIndex: Int?, phase: Int, description: String) { progress?.checkCanceled() progress?.fraction = phase / phasesCount.toDouble() - progress?.text = "$description - phase $phase of $phasesCount" + progress?.text = KotlinNJ2KBundle.message("progress.text", description, phase, phasesCount) progress?.text2 = when { files != null && files.isNotEmpty() && fileIndex != null -> files[fileIndex].virtualFile.presentableUrl else -> "" diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt index e2f85efb04d..8fc71a4bb65 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.j2k.ExternalCodeProcessing import org.jetbrains.kotlin.j2k.ProgressPortionReporter import org.jetbrains.kotlin.j2k.ReferenceSearcher import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.nj2k.KotlinNJ2KBundle import org.jetbrains.kotlin.nj2k.fqNameWithoutCompanions import org.jetbrains.kotlin.nj2k.psi import org.jetbrains.kotlin.nj2k.tree.JKDeclaration @@ -72,7 +73,7 @@ class NewExternalCodeProcessing( } override fun prepareWriteOperation(progress: ProgressIndicator?): (List) -> Unit { - progress?.text = "Searching usages to update..." + progress?.text = KotlinNJ2KBundle.message("progress.searching.usages.to.update") val usages = mutableListOf() for ((index, member) in members.values.withIndex()) {