Merge branch 'integration/master' of github.com:zanata/zanata into in…

…tegration/master
zanata · Jul 20, 2012 · 372e599 · 372e599
2 parents 4f328db + a7ad310
commit 372e599
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -566,6 +566,11 @@ public List<TranslationResult> revertTranslations(LocaleId localeId, List<TransU
          HLocale hLocale = validateLocale(localeId, sampleHTextFlow);
          for (TransUnitUpdateInfo info : translationsToRevert)
          {
+            if (!info.isSuccess() || !info.isTargetChanged())
+            {
+               continue;
+            }
+
             TransUnitId tuId = info.getTransUnit().getId();
             HTextFlow hTextFlow = entityManager.find(HTextFlow.class, tuId.getValue());
             HTextFlowTarget hTextFlowTarget = getOrCreateTarget(hTextFlow, hLocale);

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
@@ -450,7 +450,7 @@ tr.ApprovedStateDecoration td.TableEditorCell-Target .TableEditorContent-Edit
 
 .projectWideSearchPanel
 {
-	color: #999999;
+	color: #555555;
 	background-color: #f3f2f2;
 	border-bottom: 1px solid lightgrey;
 	padding: 0px 20px;