From a6269004c56de3ef73c6c2b437cd1f4fd6a504a6 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 3 Mar 2020 15:28:00 +0700 Subject: [PATCH] i18n: add bundle for idea/refactoring/ui --- .../resources/messages/KotlinBundle.properties | 7 ++++++- .../idea/refactoring/ui/CreateKotlinClassDialog.java | 4 +++- .../refactoring/ui/KotlinDestinationFolderComboBox.java | 7 ++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/idea/idea-analysis/resources/messages/KotlinBundle.properties b/idea/idea-analysis/resources/messages/KotlinBundle.properties index 4a8cbeb04d7..83e169c2256 100644 --- a/idea/idea-analysis/resources/messages/KotlinBundle.properties +++ b/idea/idea-analysis/resources/messages/KotlinBundle.properties @@ -1011,4 +1011,9 @@ unsupported.usage.0=Unsupported usage: {0} do.you.want.to.delete.this.parameter.in.expected.declaration.and.all.related.actual.ones=Do you want to delete this parameter in expected declaration and all related actual ones? do.you.want.to.delete.expected.declaration.together.with.all.related.actual.ones=Do you want to delete expected declaration together with all related actual ones? -delete.with.usage.search=delete (with usage search) \ No newline at end of file +delete.with.usage.search=delete (with usage search) + +destination.not.found.for.package.0=Destination not found for package ''{0}'' +leave.in.same.source.root=Leave in same source root +test.root.is.selected.while.the.source.root.is.expected=Test root is selected while the source root is expected +source.root.is.selected.while.the.test.root.is.expected=Source root is selected while the test root is expected \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/CreateKotlinClassDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/CreateKotlinClassDialog.java index 6b5a41690a6..c4b1c14773b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/CreateKotlinClassDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/CreateKotlinClassDialog.java @@ -38,6 +38,8 @@ import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.KotlinBundle; + import static org.jetbrains.kotlin.idea.roots.ProjectRootUtilsKt.getSuitableDestinationSourceRoots; import javax.swing.*; @@ -238,7 +240,7 @@ public class CreateKotlinClassDialog extends DialogWrapper { myTargetDirectory = WriteAction.compute(() -> { PsiDirectory baseDir = getBaseDir(packageName); if (baseDir == null && destination instanceof MultipleRootsMoveDestination) { - errorString[0] = "Destination not found for package '" + packageName + "'"; + errorString[0] = KotlinBundle.message("destination.not.found.for.package.0", packageName); return null; } return destination.getTargetDirectory(baseDir); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/KotlinDestinationFolderComboBox.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/KotlinDestinationFolderComboBox.java index 0e2884a04f9..bc3a85da6b9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/KotlinDestinationFolderComboBox.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/ui/KotlinDestinationFolderComboBox.java @@ -27,6 +27,7 @@ import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackages import com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDestination; import com.intellij.ui.*; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.KotlinBundle; import javax.swing.*; import java.awt.*; @@ -39,7 +40,7 @@ import static org.jetbrains.kotlin.idea.roots.ProjectRootUtilsKt.getKotlinAwareD // Based on com.intellij.refactoring.move.moveClassesOrPackages.DestinationFolderComboBox public abstract class KotlinDestinationFolderComboBox extends ComboboxWithBrowseButton { - private static final String LEAVE_IN_SAME_SOURCE_ROOT = "Leave in same source root"; + private static final String LEAVE_IN_SAME_SOURCE_ROOT = KotlinBundle.message("leave.in.same.source.root"); private static final DirectoryChooser.ItemWrapper NULL_WRAPPER = new DirectoryChooser.ItemWrapper(null, null); private PsiDirectory myInitialTargetDirectory; private List mySourceRoots; @@ -180,11 +181,11 @@ public abstract class KotlinDestinationFolderComboBox extends ComboboxWithBrowse boolean inTestSourceContent = fileIndex.isInTestSourceContent(myInitialTargetDirectory.getVirtualFile()); if (isSelectionInTestSourceContent != inTestSourceContent) { if (inTestSourceContent && reportBaseInTestSelectionInSource()) { - updateErrorMessage.pass("Source root is selected while the test root is expected"); + updateErrorMessage.pass(KotlinBundle.message("source.root.is.selected.while.the.test.root.is.expected")); } if (isSelectionInTestSourceContent && reportBaseInSourceSelectionInTest()) { - updateErrorMessage.pass("Test root is selected while the source root is expected"); + updateErrorMessage.pass(KotlinBundle.message("test.root.is.selected.while.the.source.root.is.expected")); } } }