From f67e05de723f1bf7da5647174c2ce6f4f6799b13 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 14 Oct 2015 16:46:26 +0300 Subject: [PATCH] No i18n --- .../src/org/jetbrains/kotlin/idea/JetBundle.properties | 2 -- .../kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt | 3 +-- .../kotlin/idea/quickfix/RemoveFunctionParametersFix.kt | 5 +---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 8f25ae7bbb2..da7b7ab0715 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties @@ -61,8 +61,6 @@ change.type=Change type from ''{0}'' to ''{1}'' change.type.family=Change Type change.function.signature=Change the signature of function ''{0}'' change.function.literal.signature=Change the signature of function literal -remove.parameter=Remove parameter ''{0}'' -change.signature.family=Change signature of function/constructor cast.expression.to.type=Cast expression ''{0}'' to ''{1}'' cast.expression.family=Cast Expression diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt index f23f6a9f57f..b1fed57a5c8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH import org.jetbrains.kotlin.diagnostics.Errors.UNUSED_PARAMETER -import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde @@ -52,7 +51,7 @@ abstract class ChangeFunctionSignatureFix( protected val functionDescriptor: FunctionDescriptor ) : KotlinQuickFixAction(context) { - override fun getFamilyName() = JetBundle.message("change.signature.family") + override fun getFamilyName() = "Change signature of function/constructor" override fun startInWriteAction() = false diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.kt index a2bae65e194..4d795d10ce5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor import org.jetbrains.kotlin.idea.refactoring.changeSignature.modify @@ -34,9 +33,7 @@ class RemoveFunctionParametersFix( private val parameterToRemove: ValueParameterDescriptor ) : ChangeFunctionSignatureFix(context, functionDescriptor) { - override fun getText(): String { - return JetBundle.message("remove.parameter", parameterToRemove.name.asString()) - } + override fun getText() = "Remove parameter '${parameterToRemove.name.asString()}'" override fun invoke(project: Project, editor: Editor?, file: JetFile) { runChangeSignature(