bugfix: don't delete translations from server when merging

zanata · Jun 14, 2011 · 44cf2bb · 44cf2bb
1 parent 2340ad8
commit 44cf2bb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
@@ -818,7 +818,7 @@ public Response putTranslations(@PathParam("id") String idNoSlash, @PathParam("l
             }
             current = null;
          }
-         else
+         else if (mergeType == MergeType.IMPORT)
          {
             HTextFlowTarget hTarget = textFlow.getTargets().get(hLocale);
             if (hTarget != null)