From 025d8a80e3f35b49f6bcfa61c408cd2297ba3bb2 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 26 Mar 2020 13:15:19 +0700 Subject: [PATCH] i18n: update bundle in `idea-core` #KT-37483 --- .../messages/KotlinIdeaCoreBundle.properties | 10 +++++----- .../org/jetbrains/kotlin/idea/core/moduleUtils.kt | 2 +- .../overrideImplement/ImplementMembersHandler.kt | 6 +++--- .../core/overrideImplement/OverrideMembersHandler.kt | 4 ++-- .../src/org/jetbrains/kotlin/idea/core/templates.kt | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties index 72ddcac0436..ea28403ecc9 100644 --- a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties +++ b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties @@ -1,7 +1,7 @@ action.text.implement.as.constructor.parameters=Implement as constructor parameters -action.text.implement.members=Implement members -hint.text.no.members.to.implement.have.been.found=No members to implement have been found -hint.text.no.members.to.override.have.been.found=No members to override have been found +implement.members.handler.family=Implement members +implement.members.handler.no.members.hint=No members to implement have been found +override.members.handler.no.members.hint=No members to override have been found surround.with.error.cannot.perform.action=Cannot perform Surround With action to the current context surround.with.title=Surround with notification.action.text.apply.context=Apply context @@ -10,5 +10,5 @@ notification.text.there.is.a.new.script.context.available=There is a new script text.kotlin.loading.script.dependencies=Kotlin: Loading script dependencies... text.loading.kotlin.script.definitions=Loading kotlin script definitions text.loading.kotlin.script.dependencies=Loading kotlin script dependencies -title.implement.members=Implement Members -title.override.members=Override Members +implement.members.handler.title=Implement Members +override.members.handler.title=Override Members diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt index 779d8e05c09..1122ec24a60 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo import org.jetbrains.kotlin.idea.caches.project.PlatformModuleInfo fun Module.isAndroidModule(modelsProvider: IdeModifiableModelsProvider? = null): Boolean { - val facetModel = if (modelsProvider != null) modelsProvider.getModifiableFacetModel(this) else FacetManager.getInstance(this) + val facetModel = modelsProvider?.getModifiableFacetModel(this) ?: FacetManager.getInstance(this) val facets = facetModel.allFacets return facets.any { it.javaClass.simpleName == "AndroidFacet" } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt index 87bfb9efe6f..86ee3dffb24 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt @@ -37,12 +37,12 @@ open class ImplementMembersHandler : OverrideImplementMembersHandler(), Intentio .map { OverrideMemberChooserObject.create(project, it, it, OverrideMemberChooserObject.BodyType.FROM_TEMPLATE) } } - override fun getChooserTitle() = KotlinIdeaCoreBundle.message("title.implement.members") + override fun getChooserTitle() = KotlinIdeaCoreBundle.message("implement.members.handler.title") - override fun getNoMembersFoundHint() = KotlinIdeaCoreBundle.message("hint.text.no.members.to.implement.have.been.found") + override fun getNoMembersFoundHint() = KotlinIdeaCoreBundle.message("implement.members.handler.no.members.hint") override fun getText() = familyName - override fun getFamilyName() = KotlinIdeaCoreBundle.message("action.text.implement.members") + override fun getFamilyName() = KotlinIdeaCoreBundle.message("implement.members.handler.family") override fun isAvailable(project: Project, editor: Editor, file: PsiFile) = isValidFor(editor, file) } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt index 10b13f99c49..9b871f118b9 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt @@ -89,7 +89,7 @@ class OverrideMembersHandler(private val preferConstructorParameters: Boolean = return overridden.flatMap { toRealSupers(it) }.distinctBy { it.original } } - override fun getChooserTitle() = KotlinIdeaCoreBundle.message("title.override.members") + override fun getChooserTitle() = KotlinIdeaCoreBundle.message("override.members.handler.title") - override fun getNoMembersFoundHint() = KotlinIdeaCoreBundle.message("hint.text.no.members.to.override.have.been.found") + override fun getNoMembersFoundHint() = KotlinIdeaCoreBundle.message("override.members.handler.no.members.hint") } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt index eba7bcaec41..fa8cd1594c2 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ @@ -13,11 +13,11 @@ import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.name.FqName import java.util.* -private val FUNCTION_BODY_TEMPLATE = "New Kotlin Function Body.kt" -private val PROPERTY_INITIALIZER_TEMPLATE = "New Kotlin Property Initializer.kt" -private val SECONDARY_CONSTRUCTOR_BODY_TEMPLATE = "New Kotlin Secondary Constructor Body.kt" -private val ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME" -private val ATTRIBUTE_PROPERTY_NAME = "PROPERTY_NAME" +private const val FUNCTION_BODY_TEMPLATE = "New Kotlin Function Body.kt" +private const val PROPERTY_INITIALIZER_TEMPLATE = "New Kotlin Property Initializer.kt" +private const val SECONDARY_CONSTRUCTOR_BODY_TEMPLATE = "New Kotlin Secondary Constructor Body.kt" +private const val ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME" +private const val ATTRIBUTE_PROPERTY_NAME = "PROPERTY_NAME" enum class TemplateKind(val templateFileName: String) { FUNCTION(FUNCTION_BODY_TEMPLATE),