From 25c8da92e328acc8d29532e190627ae3145f1755 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 22 Sep 2020 15:07:04 +0300 Subject: [PATCH] IDEA-249437 [i18n] 'intellij.platform.editor' module internationalization don't use localizable anti-aliasing type names for serialization GitOrigin-RevId: 4a3ede0ca534442a1d58ece216956f0e5c05bb6e --- .../com/intellij/ide/ui/AntialiasingType.java | 27 +++++++++++++------ .../intellij/ide/ui/AppearanceConfigurable.kt | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/AntialiasingType.java b/platform/editor-ui-api/src/com/intellij/ide/ui/AntialiasingType.java index 89f81e5e3e93..dc60b0b1039f 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/ui/AntialiasingType.java +++ b/platform/editor-ui-api/src/com/intellij/ide/ui/AntialiasingType.java @@ -5,6 +5,7 @@ import com.intellij.openapi.editor.PlatformEditorBundle; import com.intellij.openapi.util.SystemInfo; import com.intellij.util.ui.GraphicsUtil; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.awt.*; @@ -14,9 +15,9 @@ import java.util.function.Supplier; import static org.jetbrains.annotations.Nls.Capitalization.Sentence; public enum AntialiasingType { - SUBPIXEL(() -> PlatformEditorBundle.message("settings.editor.antialiasing.subpixel"), RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB, true), - GREYSCALE(() -> PlatformEditorBundle.message("settings.editor.antialiasing.greyscale"), RenderingHints.VALUE_TEXT_ANTIALIAS_ON, true), - OFF(() -> PlatformEditorBundle.message("settings.editor.antialiasing.no.antialiasing"), RenderingHints.VALUE_TEXT_ANTIALIAS_OFF, false); + SUBPIXEL("Subpixel", () -> PlatformEditorBundle.message("settings.editor.antialiasing.subpixel"), RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB, true), + GREYSCALE("Greyscale", () -> PlatformEditorBundle.message("settings.editor.antialiasing.greyscale"), RenderingHints.VALUE_TEXT_ANTIALIAS_ON, true), + OFF("No antialiasing", () -> PlatformEditorBundle.message("settings.editor.antialiasing.no.antialiasing"), RenderingHints.VALUE_TEXT_ANTIALIAS_OFF, false); public static Object getAAHintForSwingComponent() { UISettings uiSettings = UISettings.getInstanceOrNull(); @@ -49,12 +50,17 @@ public enum AntialiasingType { ? context : new FontRenderContext(context.getTransform(), aaHint, context.getFractionalMetricsHint()); } - private final Supplier<@Nls(capitalization = Sentence) String> myName; + private final String mySerializationName; + private final Supplier<@Nls(capitalization = Sentence) String> myPresentableName; private final Object myHint; private final boolean isEnabled; - AntialiasingType(Supplier<@Nls(capitalization = Sentence) String> name, Object hint, boolean enabled) { - myName = name; + AntialiasingType(@NonNls String serializationName, + Supplier<@Nls(capitalization = Sentence) String> presentableName, + Object hint, + boolean enabled) { + mySerializationName = serializationName; + myPresentableName = presentableName; myHint = hint; isEnabled = enabled; } @@ -64,8 +70,13 @@ public enum AntialiasingType { } @Override - @Nls(capitalization = Sentence) + @NonNls public String toString() { - return myName.get(); + return mySerializationName; + } + + @Nls(capitalization = Sentence) + public String getPresentableName() { + return myPresentableName.get(); } } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt index faa3f404229e..05d8f052302a 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt @@ -369,6 +369,6 @@ private class AAListCellRenderer(private val myUseEditorFont: Boolean) : SimpleL font = Font(scheme.editorFontName, Font.PLAIN, scheme.editorFontSize) } - text = value.toString() + text = value.presentableName } }