From 2d64ded3c7431021f08cb2873a719feb26201fda Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 20 Apr 2020 13:57:20 +0700 Subject: [PATCH] i18n: fix text in `AbstractKotlinInlineDialog` #KT-37822 Fixed --- idea/resources/messages/KotlinBundle.properties | 2 +- .../idea/refactoring/inline/AbstractKotlinInlineDialog.kt | 4 +++- .../idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/resources/messages/KotlinBundle.properties b/idea/resources/messages/KotlinBundle.properties index 34d1e36acc9..218bcb08ab1 100644 --- a/idea/resources/messages/KotlinBundle.properties +++ b/idea/resources/messages/KotlinBundle.properties @@ -915,7 +915,7 @@ text.incorrect.target.path.directory.0.does.not.belong.to.current.project=Incorr text.indirect.outer.instances.will.not.be.extracted.0=Indirect outer instances won''t be extracted: {0} text.inline.0.1.2=Inline {0} ''{1}''? {2} text.inline.0=Inline {0} -text.inline.all.references.and.0.the.1=Inline all references and {0} the kind {1} +text.inline.all.references.and.verb.0.the.kind.1.occurrences.2=Inline all references and {0} the {1} {2} text.inline.recursive.function.is.supported.only.on.references=Inline recursive function is supported only on references text.inline.this.reference.and.keep.the.0=Inline this reference and keep the {0} text.inlining.0.1=Inlining {0} {1} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt index f05d2722ce8..105abf94c85 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt @@ -55,8 +55,10 @@ abstract class AbstractKotlinInlineDialog( return "${kind.capitalize()} ${callable.nameAsSafeName} $occurrencesString" } - private fun getInlineText(verb: String) = KotlinBundle.message("text.inline.all.references.and.0.the.1", + private fun getInlineText(verb: String) = KotlinBundle.message( + "text.inline.all.references.and.verb.0.the.kind.1.occurrences.2", verb, + kind, (occurrencesString?.let { "($it)" } ?: "") ) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt index 6e77f9ad1ea..fb336b03a38 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.types.Variance class KotlinInlineTypeAliasHandler : InlineActionHandler() { companion object { - val REFACTORING_NAME = KotlinBundle.message("name.inline.type.alias") + val REFACTORING_NAME get() = KotlinBundle.message("name.inline.type.alias") } private fun showErrorHint(project: Project, editor: Editor?, message: String) {