ref #8136: externalization

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 18b2a1d24a24c09b5cf0f246bdb27fc485e14842..103ba12d48161aa5633e94933a26cb2ad5e9ccba 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -549,6 +549,12 @@ public class Messages extends NLS {
     public static String NamedAreaTypeMenuPreferences;
 
 
+    public static String NameTypeDesignationElement_4;
+
+
+    public static String NameTypeDesignationElement_5;
+
+
     public static String NameTypeDesignationStatusMenuPreferences_configure;
     public static String GeneralPreference_open_common_name_area_selection;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index 978b24b441b1823b461fe3b7f64caa3038b60ba6..44d3debd1e0e281eb17f49cc4770123491261b61 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -434,6 +434,8 @@ NameDetailsViewConfiguration_description=Configure the simple name details view.
 NameDetailsViewConfiguration_description_not_available=The configuration of the name details view is not possible in local preferences. \nIf you want to change the configuration, please contact an administrator.
 NameRelationshipTypeMenuPreferences_relationshipTypes=Configure name relationship types
 NameRelationshipWizardPage_description=Choose namerelationship type and related name
+NameTypeDesignationElement_4=Citation will be removed
+NameTypeDesignationElement_5=When changing the type from lectotype to a non lectotype the citation will be removed.Do you want to continue?
 NameTypeDesignationStatusMenuPreferences_configure=Configure name type designation status
 NavigatorOrderEnum_1=Alphabetical Order
 NavigatorOrderEnum_3=Natural Order

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 32de17014459f4480896a273083992708dc60821..1a832994665a7e8812eae23b1a1c35ccf59af432 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -434,6 +434,8 @@ NameDetailsViewConfiguration_description=Konfiguration eines vereinfachten Namen
 NameDetailsViewConfiguration_description_not_available=Die Konfiguration des Details Views kann nur über die Admin Präferenzen geändert werden, da kein lokales Überschreiben erlaubt ist. \nWenn Sie dennoch Änderungen vornehmen möchten, wenden Sie sich an einen Administrator.
 NameRelationshipTypeMenuPreferences_relationshipTypes=Auswahl der zur Verf\u00FCgung stehenden Namensrelationstypen
 NameRelationshipWizardPage_description=Auswahl des Relationstyps und des in Beziehung stehenden Namens 
+NameTypeDesignationElement_4=Referenz wird entfernt
+NameTypeDesignationElement_5=Beim Ändern des Typs von Lectotype zu einem anderen Typ wird das Zitat entfernt. Wollen Sie fortfahren?
 NameTypeDesignationStatusMenuPreferences_configure=Auswahl der zur Verf\u00FCgung stehenden Nametypedesignation Status
 NavigatorOrderEnum_1=alphabetisch
 NavigatorOrderEnum_3=natürlich

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
index 6d5f94e1c0a6ee7f3d688209fcde16ccae4b7734..6de23505952927aafd5d382825f97f7ed7131af1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
@@ -16,6 +16,7 @@ import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
@@ -49,15 +50,15 @@ public class NameTypeDesignationElement extends
        public void createControls(ICdmFormElement formElement, int style) {
 
                checkbox_rejectedType = formFactory.createCheckbox(formElement,
-                               "Rejected Type", false, style);
+                               "Rejected Type", false, style); //$NON-NLS-1$
                checkbox_conservedType = formFactory.createCheckbox(formElement,
-                               "Conserved Type", false, style);
+                               "Conserved Type", false, style); //$NON-NLS-1$
                selection_typeName = formFactory
                                .createSelectionElement(TaxonName.class,//getConversationHolder(),
-                                       formElement, "Name", null,
+                                       formElement, "Name", null, //$NON-NLS-1$
                                                EntitySelectionElement.ALL, style);
                combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.NameTypeDesignationStatus, formElement,
-                                               "Designation Status", null, style);
+                                               "Designation Status", null, style); //$NON-NLS-1$
 
                super.createControls(formElement, style);
        }
@@ -86,8 +87,8 @@ public class NameTypeDesignationElement extends
                } else if (eventSource == selection_typeName) {
                        getEntity().setTypeName(selection_typeName.getEntity());
                } else if (eventSource == combo_typeStatus) {
-                   if (getEntity().getTypeStatus().isLectotype() && !combo_typeStatus.getSelection().isLectotype() && entity.getCitation() != null){
-                boolean ok = MessagingUtils.confirmDialog("Citation will be removed", "When changing the type from lectotype to a non lectotype the citation will be removed.Do you want to continue?");
+                   if (entity.getTypeStatus() != null && getEntity().getTypeStatus().isLectotype() && !combo_typeStatus.getSelection().isLectotype() && entity.getCitation() != null){
+                boolean ok = MessagingUtils.confirmDialog(Messages.NameTypeDesignationElement_4, Messages.NameTypeDesignationElement_5);
                 if (!ok){
                     combo_typeStatus.setSelection(entity.getTypeStatus());
                     return;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index e0441d58cebede3c494bcd932d4d48240a6882ca..a2b034fd75c88fb1aea6684cd97cf22ac577a864 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -18,6 +18,7 @@ import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
@@ -79,8 +80,9 @@ public class SpecimenTypeDesignationElement extends
        public void handleEvent(Object eventSource) {
            super.handleEvent(eventSource);
                if (eventSource == combo_typeStatus) {
-                   if (getEntity().getTypeStatus().isLectotype() && !combo_typeStatus.getSelection().isLectotype() && entity.getCitation() != null){
-                       boolean ok = MessagingUtils.confirmDialog("Citation will be removed", "When changing the type from lectotype to a non lectotype the citation will be removed.Do you want to continue?");
+
+                   if (entity.getTypeStatus() != null && getEntity().getTypeStatus().isLectotype() && !combo_typeStatus.getSelection().isLectotype() && entity.getCitation() != null){
+                       boolean ok = MessagingUtils.confirmDialog(Messages.NameTypeDesignationElement_4, Messages.NameTypeDesignationElement_5);
                        if (!ok){
                            combo_typeStatus.setSelection(entity.getTypeStatus());
                            return;