From c8f182b3f6793351bb743467482bcf9366d06762 Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Wed, 8 Jan 2020 16:24:40 +0200 Subject: [PATCH] bundle configurable display names GitOrigin-RevId: 21c47ad923428d23c6f9dbf6d2aa3dbe3c88a76b --- platform/credential-store/src/PasswordSafeConfigurable.kt | 5 +++-- .../src/com/intellij/util/net/HttpProxyConfigurable.java | 3 ++- .../src/com/intellij/ide/gdpr/ConsentConfigurable.java | 3 ++- .../intellij/ide/ui/text/DateTimeFormatConfigurable.java | 3 ++- .../intellij/openapi/keymap/impl/ui/QuickListsPanel.java | 3 ++- .../src/messages/IdeBundle.properties | 7 ++++++- .../src/messages/VcsBundle.properties | 1 + .../openapi/vcs/configurable/CommitDialogConfigurable.java | 4 ++-- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/platform/credential-store/src/PasswordSafeConfigurable.kt b/platform/credential-store/src/PasswordSafeConfigurable.kt index 10454881afef..b2ad946305b6 100644 --- a/platform/credential-store/src/PasswordSafeConfigurable.kt +++ b/platform/credential-store/src/PasswordSafeConfigurable.kt @@ -8,6 +8,7 @@ import com.intellij.credentialStore.keePass.DB_FILE_NAME import com.intellij.credentialStore.keePass.KeePassFileManager import com.intellij.credentialStore.keePass.MasterKeyFileStorage import com.intellij.credentialStore.keePass.getDefaultMasterPasswordFile +import com.intellij.ide.IdeBundle import com.intellij.ide.passwordSafe.PasswordSafe import com.intellij.ide.passwordSafe.impl.PasswordSafeImpl import com.intellij.ide.passwordSafe.impl.createPersistentCredentialStore @@ -36,8 +37,8 @@ import javax.swing.JPanel import javax.swing.JRadioButton internal class PasswordSafeConfigurable : ConfigurableBase("application.passwordSafe", - "Passwords", - "reference.ide.settings.password.safe") { + IdeBundle.message("password.safe.configurable"), + "reference.ide.settings.password.safe") { private val settings = service() override fun getSettings() = settings diff --git a/platform/platform-api/src/com/intellij/util/net/HttpProxyConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpProxyConfigurable.java index 4778c811d63e..9b8377e6b4d7 100644 --- a/platform/platform-api/src/com/intellij/util/net/HttpProxyConfigurable.java +++ b/platform/platform-api/src/com/intellij/util/net/HttpProxyConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.util.net; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.ConfigurableBase; import org.jetbrains.annotations.NotNull; @@ -26,7 +27,7 @@ public class HttpProxyConfigurable extends ConfigurableBase myConsents; public ConsentConfigurable() { - super("consents", "Data Sharing", "preferences.usage.statistics"); + super("consents", IdeBundle.message("consent.configurable"), "preferences.usage.statistics"); myConsents = new ArrayList<>(AppUIUtil.loadConsentsForEditing()); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurable.java index 0cfddf4dd3f4..dde55cec0540 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurable.java @@ -1,6 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.ui.text; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.ConfigurableBase; import com.intellij.util.text.DateTimeFormatManager; import org.jetbrains.annotations.NotNull; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; */ public class DateTimeFormatConfigurable extends ConfigurableBase { protected DateTimeFormatConfigurable() { - super("ide.date.format", "Date Formats", null); + super("ide.date.format", IdeBundle.message("date.time.format.configurable"), null); } @NotNull diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java index 18f2e8464277..0a97812db0ae 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.ex.QuickList; import com.intellij.openapi.actionSystem.ex.QuickListsManager; import com.intellij.openapi.options.ConfigurableBase; @@ -24,7 +25,7 @@ import java.util.List; public class QuickListsPanel extends ConfigurableBase> { public QuickListsPanel() { - super("reference.idesettings.quicklists", "Quick Lists", "reference.idesettings.quicklists"); + super("reference.idesettings.quicklists", IdeBundle.message("quick.lists.presentable.name"), "reference.idesettings.quicklists"); } @NotNull diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 4a263946320b..a0d27c1c95aa 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1410,4 +1410,9 @@ copy.reference=Cop&y Reference configurable.file.colors=File Colors configurable.font.name=Font configurable.notifications.name=Notifications -configurable.quick.lists.name=Quick Lists \ No newline at end of file +configurable.quick.lists.name=Quick Lists + +password.safe.configurable=Passwords +http.proxy.configurable=HTTP Proxy +consent.configurable=Data Sharing +date.time.format.configurable=Date Formats \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 91d0d0cc8e29..a02c158cc9e0 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -283,6 +283,7 @@ commit.dialog.changelist.label=Changelis&t: commit.dialog.changed.files.label=Changed &Files commit.dialog.partial.commit.warning.title=Partial Commit Is Not Supported commit.dialog.partial.commit.warning.body=Partial commit is not supported for ''{0}''.\nAll changes in the selected files will be committed. +commit.dialog.configurable=Commit Dialog commit.wait.util.synced.message=Please wait until VCS synchronization is finished. commit.wait.util.synced.title=Finishing VCS refresh change.list.manager.wait.lists.synchronization={0}: Local Changes Refresh diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.java index bb9bf50c61c1..072fc14b31a1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.configurable; import com.intellij.openapi.options.ConfigurableBase; import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsConfiguration; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -24,13 +25,12 @@ import org.jetbrains.annotations.NotNull; public class CommitDialogConfigurable extends ConfigurableBase { public static final String ID = "project.propVCSSupport.CommitDialog"; - public static final String DISPLAY_NAME = "Commit Dialog"; @NonNls private static final String HELP_ID = "reference.settings.VCS.CommitDialog"; @NotNull private final Project myProject; public CommitDialogConfigurable(@NotNull Project project) { - super(ID, DISPLAY_NAME, HELP_ID); + super(ID, VcsBundle.message("commit.dialog.configurable"), HELP_ID); myProject = project; }