From c7f2007a99aa2d59f8b14f647089cd8d9941cc8b Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Tue, 14 Jan 2020 00:40:21 +0300 Subject: [PATCH] i18n for color&fonts GitOrigin-RevId: 7e63c3818a306177f4b44a6e45b69fdab3a43de1 --- .../options/colors/ColorAndFontOptions.java | 14 ++++++++------ .../options/colors/ConsoleFontOptions.java | 2 +- .../editor/fonts/AppEditorFontOptionsPanel.java | 2 +- .../src/messages/ApplicationBundle.properties | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 7719b85927db..3b08866e9b3b 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -10,7 +10,6 @@ import com.intellij.execution.impl.ConsoleViewUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.colors.*; import com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager; @@ -68,7 +67,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract private static final Logger LOG = Logger.getInstance(ColorAndFontOptions.class); public static final String ID = "reference.settingsdialog.IDE.editor.colors"; - public static final String FONT_CONFIGURABLE_NAME = "Color Scheme Font"; private Map mySchemes; private MyColorScheme mySelectedScheme; @@ -470,12 +468,16 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract return new ArrayList<>(extensions); } + public static String getFontConfigurableName() { + return ApplicationBundle.message("title.colors.scheme.font"); + } + private static class FontConfigurableFactory implements ColorAndFontPanelFactoryEx { @Override @NotNull public NewColorAndFontPanel createPanel(@NotNull ColorAndFontOptions options) { FontEditorPreview previewPanel = new FontEditorPreview(()->options.getSelectedScheme(), true); - return new NewColorAndFontPanel(new SchemesPanel(options, 0), new FontOptions(options), previewPanel, FONT_CONFIGURABLE_NAME, null, null){ + return new NewColorAndFontPanel(new SchemesPanel(options, 0), new FontOptions(options), previewPanel, getFontConfigurableName(), null, null){ @Override public boolean containsFontOptions() { return true; @@ -486,7 +488,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override @NotNull public String getPanelDisplayName() { - return FONT_CONFIGURABLE_NAME; + return getFontConfigurableName(); } @Override @@ -505,7 +507,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract return ConsoleViewUtil.updateConsoleColorScheme(selectedScheme); } }; - return new NewColorAndFontPanel(new SchemesPanel(options, 0), new ConsoleFontOptions(options), previewPanel, "Font", null, null){ + return new NewColorAndFontPanel(new SchemesPanel(options, 0), new ConsoleFontOptions(options), previewPanel, ApplicationBundle.message("label.font.type"), null, null){ @Override public boolean containsFontOptions() { return true; @@ -516,7 +518,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override @NotNull public String getPanelDisplayName() { - return "Console Font"; + return ApplicationBundle.message("title.console.font"); } @NotNull diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/ConsoleFontOptions.java b/platform/platform-impl/src/com/intellij/application/options/colors/ConsoleFontOptions.java index dd85771b83f1..e2626978ea80 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/ConsoleFontOptions.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/ConsoleFontOptions.java @@ -39,7 +39,7 @@ public class ConsoleFontOptions extends FontOptions { if (allSettings != null) { ColorAndFontOptions colorAndFontOptions = allSettings.find(ColorAndFontOptions.class); if (colorAndFontOptions != null) { - Configurable editorFontConfigurable = colorAndFontOptions.findSubConfigurable(ColorAndFontOptions.FONT_CONFIGURABLE_NAME); + Configurable editorFontConfigurable = colorAndFontOptions.findSubConfigurable(ColorAndFontOptions.getFontConfigurableName()); if (editorFontConfigurable != null) { allSettings.select(editorFontConfigurable); } diff --git a/platform/platform-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontOptionsPanel.java b/platform/platform-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontOptionsPanel.java index 65bd9d33fe05..e077aa72aad8 100644 --- a/platform/platform-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontOptionsPanel.java +++ b/platform/platform-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontOptionsPanel.java @@ -179,7 +179,7 @@ public class AppEditorFontOptionsPanel extends AbstractFontOptionsPanel { final Configurable colorSchemeConfigurable = allSettings.find(ColorAndFontOptions.ID); if (colorSchemeConfigurable instanceof ColorAndFontOptions) { Configurable fontOptions = - ((ColorAndFontOptions)colorSchemeConfigurable).findSubConfigurable(ColorAndFontOptions.FONT_CONFIGURABLE_NAME); + ((ColorAndFontOptions)colorSchemeConfigurable).findSubConfigurable(ColorAndFontOptions.getFontConfigurableName()); if (fontOptions != null) { allSettings.select(fontOptions); } diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index e489fd8c5305..c8ebef3f09a2 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -640,6 +640,8 @@ file.status.color.menu.normal.text=UI Font Color file.status.color.menu.reset.to.default=Default title.scope.based=By Scope title.colors.and.fonts=Color Scheme +title.colors.scheme.font=Color Scheme Font +title.console.font=Console Font progress.analysing.font=Analysing font: {0} group.editor.font=Editor Font label.fallback.fonts.list.description=For symbols not supported by the main font