From 63338625ba28fa4b1d774469cfb92b26df2185e1 Mon Sep 17 00:00:00 2001
From: "Dmitry.Krasilschikov" <kradima@jetbrains.com>
Date: Mon, 13 Jan 2020 23:36:04 +0200
Subject: [PATCH] i10n Python configurables

GitOrigin-RevId: d785abdf038cb909c9ff7f280dd180ac61011e7f
---
 .../META-INF/pycharm-community-customization.xml  | 12 ++++++++----
 .../buildout/BuildoutModulesConfigurable.java     |  3 ++-
 .../configuration/PyDependenciesConfigurable.java |  3 ++-
 .../PythonContentEntriesConfigurable.java         |  3 ++-
 .../pluginResources/messages/PyBundle.properties  |  4 ++++
 python/src/META-INF/python-core-common.xml        | 15 +++++++++++----
 .../PyActiveSdkModuleConfigurable.java            |  3 ++-
 7 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/python/ide/impl/resources/META-INF/pycharm-community-customization.xml b/python/ide/impl/resources/META-INF/pycharm-community-customization.xml
index 3c17e9407fd2..ba44c7b46703 100644
--- a/python/ide/impl/resources/META-INF/pycharm-community-customization.xml
+++ b/python/ide/impl/resources/META-INF/pycharm-community-customization.xml
@@ -20,15 +20,18 @@
 
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
-                         displayName="Project Structure"
+                         bundle="messages.PyBundle"
+                         key="configurable.PythonContentEntriesConfigurable.display.name"
                          provider="com.jetbrains.python.configuration.PythonContentEntriesConfigurableProvider"/>
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
-                         displayName="Project Interpreter"
+                         bundle="messages.PyBundle"
+                         key="configurable.PyActiveSdkModuleConfigurable.display.name"
                          instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/>
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PyDependenciesConfigurable"
-                         displayName="Project Dependencies"
+                         bundle="messages.PyBundle"
+                         key="configurable.PyDependenciesConfigurable.display.name"
                          provider="com.jetbrains.python.configuration.PyDependenciesConfigurableProvider"/>
 
     <filetype.prebuiltStubsProvider filetype="Python" implementationClass="com.jetbrains.python.psi.impl.stubs.PyPrebuiltStubsProvider"/>
@@ -37,7 +40,8 @@
 
     <projectConfigurable groupId="build"
                          id="com.jetbrains.python.buildout.BuildoutModulesConfigurable"
-                         displayName="Buildout Support"
+                         bundle="messages.PyBundle"
+                         key="configurable.BuildoutModulesConfigurable.display.name"
                          instance="com.jetbrains.python.buildout.BuildoutModulesConfigurable"/>
 
     <directoryProjectConfigurator implementation="com.jetbrains.python.PythonSourceRootConfigurator" id="sourceRoot"
diff --git a/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
index 049a74b2ace2..46cf06d496ec 100644
--- a/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
+++ b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.NonDefaultProjectConfigurable;
 import com.intellij.openapi.project.Project;
+import com.jetbrains.python.PyBundle;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -27,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class BuildoutModulesConfigurable extends ModuleAwareProjectConfigurable implements NonDefaultProjectConfigurable {
   public BuildoutModulesConfigurable(Project project) {
-    super(project, "Buildout Support", "reference-python-buildout");
+    super(project, PyBundle.message("configurable.BuildoutModulesConfigurable.display.name"), "reference-python-buildout");
   }
 
   @NotNull
diff --git a/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
index 5054f2b743e0..668675f2975b 100644
--- a/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
+++ b/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
@@ -19,6 +19,7 @@ import com.intellij.application.options.ModuleAwareProjectConfigurable;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.openapi.project.Project;
+import com.jetbrains.python.PyBundle;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -26,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class PyDependenciesConfigurable extends ModuleAwareProjectConfigurable {
   public PyDependenciesConfigurable(Project project) {
-    super(project, "Project Dependencies", "reference.settingsdialog.project.dependencies");
+    super(project, PyBundle.message("configurable.PyDependenciesConfigurable.display.name"), "reference.settingsdialog.project.dependencies");
   }
 
   @NotNull
diff --git a/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
index 9d7794ab604c..6fb6014553fb 100644
--- a/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
+++ b/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.options.NonDefaultProjectConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.PlatformContentEntriesConfigurable;
 import com.intellij.util.PlatformUtils;
+import com.jetbrains.python.PyBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 
@@ -30,7 +31,7 @@ import org.jetbrains.jps.model.java.JavaSourceRootType;
  */
 public class PythonContentEntriesConfigurable extends ModuleAwareProjectConfigurable implements NonDefaultProjectConfigurable {
   public PythonContentEntriesConfigurable(final Project project) {
-    super(project, "Project Structure", "reference.settingsdialog.project.structure");
+    super(project, PyBundle.message("configurable.PythonContentEntriesConfigurable.display.name"), "reference.settingsdialog.project.structure");
   }
 
   @NotNull
diff --git a/python/pluginResources/messages/PyBundle.properties b/python/pluginResources/messages/PyBundle.properties
index f3854dd84f52..132690aba01d 100644
--- a/python/pluginResources/messages/PyBundle.properties
+++ b/python/pluginResources/messages/PyBundle.properties
@@ -1026,8 +1026,12 @@ action.ForceStepInto.description=Step into, ignore stepping filters for librarie
 configurable.Tab.display.name=Buildout
 configurable.PyConsoleOptionsConfigurable.display.name=Console
 configurable.BuildoutConfigurable.display.name=Buildout
+configurable.BuildoutModulesConfigurable.display.name=Buildout Support
 configurable.PySmartKeysOptions.display.name=Python
 configurable.PyContentEntriesModuleConfigurable.display.name=Project Structure
+configurable.PythonContentEntriesConfigurable.display.name=Project Structure
+configurable.PyActiveSdkModuleConfigurable.display.name=Project Interpreter
+configurable.PyDependenciesConfigurable.display.name=Project Dependencies
 configurable.PyIntegratedToolsConfigurable.display.name=Python Integrated Tools
 configurable.PyScientificConfigurable.display.name=Python Scientific
 configurable.PythonSdkEditorTab.display.name=Python SDK
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 7b0724c86a65..ceaf1ce5ca8b 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -496,7 +496,9 @@
 
     <problemFileHighlightFilter implementation="com.jetbrains.python.codeInsight.PyProblemFileHighlightFilter"/>
 
-    <editorSmartKeysConfigurable instance="com.jetbrains.python.codeInsight.PySmartKeysOptions" id="editor.preferences.pyOptions"/>
+    <editorSmartKeysConfigurable instance="com.jetbrains.python.codeInsight.PySmartKeysOptions" id="editor.preferences.pyOptions"
+                                 bundle="messages.PyBundle"
+                                 key="configurable.PySmartKeysOptions.display.name"/>
 
     <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PyConsoleFileReferenceContributor" language="Python" order="before filePath"/>
     <psi.referenceContributor implementation="com.jetbrains.python.testing.pyTestFixtures.PyTestFixtureReferenceContributor" language="Python"/>
@@ -512,11 +514,16 @@
     <treeStructureProvider implementation="com.jetbrains.python.projectView.PyTreeStructureProvider"/>
 
     <projectConfigurable groupId="build" dynamic="true" id="pyconsole" instance="com.jetbrains.python.console.PyConsoleOptionsConfigurable"
-                         displayName="Console"/>
+                         bundle="messages.PyBundle"
+                         key="configurable.PyConsoleOptionsConfigurable.display.name"/>
+
     <projectService serviceImplementation="com.jetbrains.python.console.PyConsoleOptions"/>
 
-    <projectConfigurable groupId="build" groupWeight="119" id="reference.idesettings.debugger.python" instance="com.jetbrains.python.debugger.PyDebuggerConfigurable"
-                         displayName="Python Debugger"/>
+    <projectConfigurable groupId="build" groupWeight="119" id="reference.idesettings.debugger.python"
+                         instance="com.jetbrains.python.debugger.PyDebuggerConfigurable"
+                         bundle="messages.PyBundle"
+                         key="configurable.PyDebuggerConfigurable.display.name"/>
+
     <projectService serviceImplementation="com.jetbrains.python.debugger.PyDebuggerOptionsProvider"/>
 
     <codeBlockProvider language="Python" implementationClass="com.jetbrains.python.codeInsight.PyCodeBlockProvider"/>
diff --git a/python/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java b/python/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
index 4fd8521f02f8..cfb399e71a75 100644
--- a/python/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
+++ b/python/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.testing.VFSTestFrameworkListener;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,7 +32,7 @@ public class PyActiveSdkModuleConfigurable extends ModuleAwareProjectConfigurabl
   private final Project myProject;
 
   public PyActiveSdkModuleConfigurable(Project project) {
-    super(project, "Project Interpreter", "reference.settings.project.interpreter");
+    super(project, PyBundle.message("configurable.PyActiveSdkModuleConfigurable.display.name"), "reference.settings.project.interpreter");
     myProject = project;
   }