fix bug - should us TM result text flow details

zanata · Jun 19, 2012 · f67d2b7 · f67d2b7
1 parent 8e34be5
commit f67d2b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
@@ -79,7 +79,7 @@ public interface UiMessages extends Messages
    @DefaultMessage("Send")
    String sendLabel();
 
-   @DefaultMessage("Merge TM")
+   @DefaultMessage("TM merge for this page")
    String mergeTMButtonLabel();
 
    @DefaultMessage("Select TM match percentage to pre-fill translations.")

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
@@ -133,17 +133,19 @@ private TransMemoryResultItem findTMAboveThreshold(ArrayList<TransMemoryResultIt
       }
    }
 
-   private TransUnitUpdateRequest createRequest(TransMemoryMerge action, HLocale hLocale, Map<Long, TransUnitUpdateRequest> requestMap, HTextFlow hTextFlow, TransMemoryResultItem tmResult)
+   private TransUnitUpdateRequest createRequest(TransMemoryMerge action, HLocale hLocale, Map<Long, TransUnitUpdateRequest> requestMap, HTextFlow hTextFlowToBeFilled, TransMemoryResultItem tmResult)
    {
       if (tmResult == null)
       {
          return null;
       }
-      TransMemoryDetails tmDetail = getTransMemoryDetailsHandler.getTransMemoryDetail(hLocale, hTextFlow);
-      ContentState statusToSet = new TransMemoryMergeStatusResolver().workOutStatus(action, hTextFlow, tmDetail, tmResult);
+      Long tmSourceId = tmResult.getSourceIdList().get(0);
+      HTextFlow tmSource = textFlowDAO.findById(tmSourceId, false);
+      TransMemoryDetails tmDetail = getTransMemoryDetailsHandler.getTransMemoryDetail(hLocale, tmSource);
+      ContentState statusToSet = new TransMemoryMergeStatusResolver().workOutStatus(action, hTextFlowToBeFilled, tmDetail, tmResult);
       if (statusToSet != null)
       {
-         TransUnitUpdateRequest unfilledRequest = requestMap.get(hTextFlow.getId());
+         TransUnitUpdateRequest unfilledRequest = requestMap.get(hTextFlowToBeFilled.getId());
          TransUnitUpdateRequest request = new TransUnitUpdateRequest(unfilledRequest.getTransUnitId(), tmResult.getTargetContents(), statusToSet, unfilledRequest.getBaseTranslationVersion());
          log.debug("auto translate from translation memory {}", request);
          return request;