fix TM merge form with new stats

zanata · May 28, 2013 · b5a0dba · b5a0dba
1 parent 0a5e73c
commit b5a0dba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
@@ -36,19 +36,16 @@ public interface EnumMessages extends com.google.gwt.i18n.client.Messages
    @DefaultMessage("Lucene")
    String searchTypeRaw();
 
-   @DefaultMessage("Reject")
+   @DefaultMessage("Don''t Copy")
    String rejectMerge();
 
-   @DefaultMessage("Don''t care")
+   @DefaultMessage("Next Condition")
    String ignoreDifference();
 
-   @DefaultMessage("Downgrade to Fuzzy")
+   @DefaultMessage("Copy as Fuzzy")
    String downgradeToFuzzy();
 
-   @DefaultMessage("Needs Review")
-   String fuzzyStatus();
-
-   @DefaultMessage("Approved")
+   @DefaultMessage("Translated")
    String approvedStatus();
 
    @DefaultMessage("Next Fuzzy")

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
@@ -46,7 +46,7 @@ public String render(MergeOption option)
       switch (option)
       {
       case FUZZY:
-         return messages.fuzzyStatus();
+         return messages.downgradeToFuzzy();
       case IGNORE_CHECK:
          return messages.ignoreDifference();
       case REJECT:

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
@@ -134,7 +134,7 @@ public void onThresholdPercentChange(ChangeEvent event)
       else
       {
          differentContentStatus.setStyleName(style.downgrade_action());
-         differentContentStatus.setText(enumMessages.fuzzyStatus());
+         differentContentStatus.setText(enumMessages.downgradeToFuzzy());
          differentContentLabel.setText(enumMessages.downgradeToFuzzy());
       }
    }