rename method and wording of messages

zanata · Apr 29, 2014 · bb7d74b · bb7d74b
1 parent d2b5000
commit bb7d74b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
@@ -236,7 +236,7 @@ public void onKeyShortcut(KeyShortcutEvent event) {
                         .setHandler(new KeyShortcutEventHandler() {
                             @Override
                             public void onKeyShortcut(KeyShortcutEvent event) {
-                                targetContentsPresenter.switchEditor();
+                                targetContentsPresenter.toggleSyntaxHighlighting();
                             }
                         }).build();
         keyShortcutPresenter.register(switchEditorShortcut);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
@@ -713,9 +713,9 @@ protected void setStatesForTesting(TransUnitId currentTransUnitId,
         }
     }
 
-    public void switchEditor() {
+    public void toggleSyntaxHighlighting() {
         if (hasSelectedRow()) {
-            getCurrentDisplay().switchEditor();
+            getCurrentDisplay().toggleSyntaxHighlighting();
         }
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
@@ -141,6 +141,6 @@ String validationNotificationHeading(@PluralCount int warningCount,
     @DefaultMessage("Error message")
     String errorMessage();
 
-    @DefaultMessage("Switch between syntax highlighting editor and plain text")
+    @DefaultMessage("Turn syntax highlighting on or off. Spellcheck will not work when syntax highlighting is active.")
     String switchBetweenEditor();
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
@@ -528,7 +528,7 @@ String undoUnsuccessful(@PluralCount int unsuccessfulCount,
     @DefaultMessage("'Enter' key saves immediately")
     String enterKeySaves();
 
-    @DefaultMessage("Use syntax highlighting Editor (Warning: no spell check, long lines may have some wrapping issue)")
+    @DefaultMessage("Use syntax highlighting Editor (Warning: no spell check, long lines may have some wrapping issues)")
     String useSyntaxHighlight();
 
     @DefaultMessage("Show 'Save as Approved' warning")

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
@@ -246,7 +246,7 @@ public TransUnitId getId() {
     }
 
     @Override
-    public void switchType() {
+    public void toggleType() {
         String currentText = textArea.getText();
         int cursorPos = textArea.getCursorPos();
         boolean editing = textArea.isEditing();

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
@@ -29,7 +29,7 @@ public interface ToggleEditor extends IsWidget, HasText,
 
     TransUnitId getId();
 
-    void switchType();
+    void toggleType();
 
     static enum ViewMode {
         VIEW, EDIT

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
@@ -74,7 +74,7 @@ void updateCachedTargetsAndVersion(List<String> targets, Integer verNum,
 
     ContentState getCachedState();
 
-    void switchEditor();
+    void toggleSyntaxHighlighting();
 
     interface Listener {
         void validate(ToggleEditor editor);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
@@ -165,9 +165,9 @@ public ContentState getCachedState() {
     }
 
     @Override
-    public void switchEditor() {
+    public void toggleSyntaxHighlighting() {
         for (ToggleEditor editor : editors) {
-            editor.switchType();
+            editor.toggleType();
         }
     }