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

…tegration/master
zanata · Apr 18, 2012 · 38156bc · 38156bc
2 parents 3cb236b + 36a92dc
commit 38156bc
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java b/common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
@@ -310,20 +310,34 @@ private static boolean allEmpty(List<String> strings)
 
    static ContentState getContentState(Message message)
    {
-      boolean fuzzy = message.isFuzzy();
-      if (message.isPlural() && allEmpty(message.getMsgstrPlural()))
+      return getContentState(message.isFuzzy(), message.getMsgstr(), message.isPlural(), message.getMsgstrPlural());
+   }
+
+   private static ContentState getContentState(boolean fuzzy, String msgstr, boolean plural, List<String> msgstrPlural)
+   {
+      if (plural && allEmpty(msgstrPlural))
       {
          fuzzy = false;
       }
       if (fuzzy)
       {
          return ContentState.NeedReview;
       }
-      if ((message.getMsgstr() != null && !message.getMsgstr().isEmpty()) || allNonEmpty(message.getMsgstrPlural()))
+
+      if (plural)
       {
-         return ContentState.Approved;
+         if (allNonEmpty(msgstrPlural))
+            return ContentState.Approved;
+         else
+            return ContentState.New;
+      }
+      else
+      {
+         if (msgstr == null || msgstr.isEmpty())
+            return ContentState.New;
+         else
+            return ContentState.Approved;
       }
-      return ContentState.New;
    }
 
    static String createId(Message message)