Fixes #2367

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index caa39cb90fdf3b6a4e553d7c07496848d30cfa5d..467acc68ab268218e6d620a4d43adfe3b71d7ca8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -122,7 +122,7 @@ public class DescriptionHelper {
        public static void setCache(DescriptionElementBase element,
                        String value, Language language) {
                if (element instanceof TextData) {
        public static void setCache(DescriptionElementBase element,
                        String value, Language language) {
                if (element instanceof TextData) {

-                       ((TextData) element).putText(value, language);
+                       ((TextData) element).putText(language, value);

                        return;
                }
                if (element instanceof CommonTaxonName) {
                        return;
                }
                if (element instanceof CommonTaxonName) {


@@ -325,7 +325,9 @@ public class DescriptionHelper {
                                text = "No sources provided";
                        }
                }else{
                                text = "No sources provided";
                        }
                }else{

-                       text = element.getText(CdmStore.getDefaultLanguage());
+                       List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});
+                       LanguageString languageString = element.getPreferredLanguageString(languages);
+                       text = languageString != null ? languageString.getText() : null;

                }
                return CdmUtils.isEmpty(text) ? "No text provided" : text;
        }
                }
                return CdmUtils.isEmpty(text) ? "No text provided" : text;
        }