diff: codereview

move strings to corresponding bundle

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/HighlightModeAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/HighlightModeAction.java
index 5c7760fa117c5793a7f1ddecf8303e598664dbbc..8ae6fa277738ccc0be7246949c3f2d6994c66759 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/HighlightModeAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/HighlightModeAction.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.diff.actions;
 
-import com.intellij.CommonBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -52,7 +51,7 @@ public class HighlightModeAction extends ComboBoxAction implements DumbAware {
   @Override
   public JComponent createCustomComponent(final Presentation presentation) {
     JPanel panel = new JPanel(new BorderLayout());
-    final JLabel label = new JLabel(CommonBundle.message("diff.acton.highlight.mode.action.name"));
+    final JLabel label = new JLabel(DiffBundle.message("diff.acton.highlight.mode.action.name"));
     label.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
     panel.add(label, BorderLayout.WEST);
     panel.add(super.createCustomComponent(presentation), BorderLayout.CENTER);

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
index d470671679660c46c119c31744397a5134eb03c3..930db0e4f3371b14a67c432b77360af3bfe4d64b 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.diff.actions;
 
-import com.intellij.CommonBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -50,7 +49,7 @@ public class IgnoreWhiteSpacesAction extends ComboBoxAction implements DumbAware
   @Override
   public JComponent createCustomComponent(final Presentation presentation) {
     JPanel panel = new JPanel(new BorderLayout());
-    final JLabel label = new JLabel(CommonBundle.message("comparison.ignore.whitespace.acton.name"));
+    final JLabel label = new JLabel(DiffBundle.message("ignore.whitespace.acton.name"));
     label.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
     panel.add(label, BorderLayout.WEST);
     panel.add(super.createCustomComponent(presentation), BorderLayout.CENTER);

diff --git a/platform/platform-resources-en/src/messages/CommonBundle.properties b/platform/platform-resources-en/src/messages/CommonBundle.properties
index e027bc32a12da2ed099ac3578cae00af625004fc..7820960979a71823a18edc4ffeca5d715b4e8f5f 100644 (file)
--- a/platform/platform-resources-en/src/messages/CommonBundle.properties
+++ b/platform/platform-resources-en/src/messages/CommonBundle.properties
@@ -155,7 +155,6 @@ smth.already.exist.error.message={0} with name ''{1}'' already exist.
 comparison.policy.default.name=Default
 comparison.policy.trim.space.name=Trim space
 comparison.policy.ignore.spaces.name=Ignore spaces
-comparison.ignore.whitespace.acton.name=Ignore whitespace:
 
 safe.write.failed=Cannot save {0}.\nUnable to create a backup file ({1}).\nThe file left unchanged.
 safe.write.rename.original=Cannot save {0}.\nThe file left unchanged.\nYour changes were written to {1}.
@@ -175,5 +174,4 @@ This may lead to incorrect behaviour. Proxy should be set in Settings | HTTP Pro
 This JVM property is old and its usage is not recommended by Oracle.\n\
 \n(Note: It could have been assigned by some code dynamically.)
 label.proxy.exceptions.text=Example\: *.domain.com, 192.168.*
-checkbox.automatic.proxy.configuration.url=Automatic proxy configuration URL\:
-diff.acton.highlight.mode.action.name=Highlighting Mode
\ No newline at end of file
+checkbox.automatic.proxy.configuration.url=Automatic proxy configuration URL\:
\ No newline at end of file

diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties
index b0515df7f6f269446fee4407a371e5a636c7269b..7958798ab01adb971450e2b776855d4cecf98a6b 100644 (file)
--- a/platform/platform-resources-en/src/messages/DiffBundle.properties
+++ b/platform/platform-resources-en/src/messages/DiffBundle.properties
@@ -31,6 +31,7 @@ diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
 diff.acton.ignore.whitespace.policy.do.not.ignore=Do not ignore
 diff.acton.ignore.whitespace.policy.leading.and.trailing=Leading and trailing
 diff.acton.ignore.whitespace.policy.all=All
+ignore.whitespace.acton.name=Ignore whitespace:
 ignore.whitespace.action.not.available.action.name=<Not available>
 diff.dialog.select.change.action.name=Select Change
 diff.dialog.select.change.action.description=Select changed text in this version and corresponding in other
@@ -87,3 +88,4 @@ diff.acton.highlight.mode.action.by.word=By Word
 diff.acton.highlight.mode.action.by.line=By Line
 diff.acton.highlight.mode.action.no.highlighting=No Highlighting
 diff.acton.highlight.mode.not.available.action.name=<Not available>
+diff.acton.highlight.mode.action.name=Highlighting Mode