Merge pull request #664 from zanata/zanata-spa-plural

Fix getContents for plural in zanata-spa
zanata · Jan 19, 2015 · e901909 · e901909
2 parents 2d84f53 + e49b082
commit e901909
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java b/zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
@@ -81,13 +81,10 @@ public void setPlural(boolean plural) {
 
     @JsonIgnore
     public List<String> getContents() {
-        if (content != null) {
-            return Lists.newArrayList(content);
-        } else if (contents != null) {
-            return contents;
-        } else {
-            return Collections.emptyList();
+        if(contents == null && content == null) {
+            return Collections.<String>emptyList();
         }
+        return isPlural() ? contents : Lists.newArrayList(content);
     }
 
     @JsonIgnore