From e49b08200aab9a7f69c28edf8d6f86bacaeaf913 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Mon, 19 Jan 2015 13:09:06 +1000 Subject: [PATCH] Fix getContents for plural in zanata-spa --- .../java/org/zanata/rest/editor/dto/TranslationData.java | 9 +++------ 1 file changed, 3 insertions(+), 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 index c1ec3f6fde..c7f803581c 100644 --- 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 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.emptyList(); } + return isPlural() ? contents : Lists.newArrayList(content); } @JsonIgnore