From 93493bdc094c5a9ea0eb8b9604ea428098b127a7 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Tue, 25 Feb 2020 17:53:49 +0300 Subject: [PATCH] i18n: add bundle for idea/refactoring/memberInfo --- .../org/jetbrains/kotlin/idea/KotlinBundle.properties | 2 ++ .../kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt | 5 +++-- .../kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties index 155eb3bea57..d631403d068 100644 --- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -804,6 +804,8 @@ label.text.receiver.type=Receiver &type:\u0020 label.text.target.file.name=Target file name: label.text.type=&Type:\u0020 label.text.visibility=&Visibility:\u0020 +member.info.abstract.0=abstract {0} +member.info.companion.0=companion {0} message.change.signature.is.not.applicable.to.dynamically.invoked.functions=Change signature is not applicable to dynamically invoked functions message.do.not.show.for.local.variables.in.future=Do not show for local variables in future message.text.return.type.cannot.be.resolved=Return type ''{0}'' cannot be resolved.\nContinue? diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt index 811bca0c4be..a0cf9571c1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.lexer.KtTokens @@ -51,10 +52,10 @@ class KotlinMemberInfo @JvmOverloads constructor( } else { displayName = RENDERER.render(memberDescriptor) if (member.hasModifier(KtTokens.ABSTRACT_KEYWORD)) { - displayName = "abstract $displayName" + displayName = KotlinBundle.message("member.info.abstract.0", displayName) } if (isCompanionMember) { - displayName = "companion $displayName" + displayName = KotlinBundle.message("member.info.companion.0", displayName) } val overriddenDescriptors = (memberDescriptor as? CallableMemberDescriptor)?.overriddenDescriptors ?: emptySet() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt index 11c5dc70f84..769f56c7686 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaClassDescriptor @@ -49,7 +50,7 @@ fun PsiNamedElement.qualifiedClassNameForRendering(): String { is PsiClass -> qualifiedName else -> throw AssertionError("Not a class: ${getElementTextWithContext()}") } - return fqName ?: name ?: "[Anonymous]" + return fqName ?: name ?: KotlinBundle.message("text.anonymous") } fun KotlinMemberInfo.getChildrenToAnalyze(): List {