ref #9805: adapt labels

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 5d41d7e708edc1dbfd8110acf847cf499fd70a66..dad22738f094c66d87cf232c9f7a00327d239ebb 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
@@ -711,6 +711,8 @@ public class Messages extends NLS {
     public static String StructuredDescriptionAggregationWizardPage_SELECT_ALL_SUBTREES;
 //    public static String StructuredDescriptionAggregationWizardPage_TOOLTIP_SELECT_ALL_SUBTREES;
     public static String StructuredDescriptionAggregationWizardPage_SELECT_SELECTED_TAXA_ONLY;
+    public static String StructuredDescriptionAggregationWizardPage_SOURCEMODE_CHILD_PARENT;
+    public static String StructuredDescriptionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON;
 
     public static String CommonNameLanguages_Title;
 

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 d751b707e89bc718409a29e99d96322bb9e56c41..cda2c3c8a6ab345425d23de8884ee310a1fade78 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
@@ -609,6 +609,8 @@ StructuredDescriptionAggregationWizardPage_SELECT_DEFINE_SCOPE=Aggregation inclu
 StructuredDescriptionAggregationWizardPage_SELECT_DEFAULT_DESCRIPTION=Default descriptions
 StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION=Literature descriptions
 StructuredDescriptionAggregationWizardPage_SELECT_UNPUBLISHED_TAXA=Unpublished taxa
+StructuredDescriptionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON=Specimen and literature to taxon
+StructuredDescriptionAggregationWizardPage_SOURCEMODE_CHILD_PARENT=From child to parent taxon
 CommonNameLanguages_Title=Common Name Languages
 CommonNameVocabularyPreferencePage_description=Select the vocabularies for common name area selection.
 CommonNameLanguagePreferencePage_description=Choose the languages available for common names.

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 33e13e805070679e21217801f4a86f1dab29046c..2bcfa5131d031aa63c82cee5f3a19fc3f75e2641 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
@@ -607,6 +607,8 @@ StructuredDescriptionAggregationWizardPage_SELECT_UNPUBLISHED_TAXA=Unpublizierte
 StructuredDescriptionAggregationWizardPage_SELECT_DEFINE_SCOPE=Bei Aggregation einschließen:
 StructuredDescriptionAggregationWizardPage_SELECT_DEFAULT_DESCRIPTION=Default Beschreibungen
 StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION=Literatur Beschreibungen
+StructuredDescriptionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON=Specimen and Literatur zum Taxon
+StructuredDescriptionAggregationWizardPage_SOURCEMODE_CHILD_PARENT=Vom Kind- zum Eltern-Taxon
 CommonNameLanguages_Title=Sprachen für Trivialnamen
 CommonNameVocabularyPreferencePage_description=Wählen Sie die Vokabulare, für die Area-Auswahl bei Trivialnamen.
 CommonNameLanguagePreferencePage_description=Wählen Sie die für Trivialnamen verfügbaren Sprachen.

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
index 153001717fb7068b1ffbbe89f5ef8cfdd4d49b61..aca8c9a8ef8da151c8cdc0713f2ca755d487710c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
@@ -236,6 +236,11 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
             @Override
             public String getText(Object element){
                 if (element instanceof AggregationMode){
+                       if (((AggregationMode)element).getKey().equals("INTAX")){
+                               return Messages.StructuredDescriptionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON;
+                       }else if (((AggregationMode)element).getKey().equals("TOPAR")){
+                               return Messages.StructuredDescriptionAggregationWizardPage_SOURCEMODE_CHILD_PARENT;
+                       }
                    return ((AggregationMode)element).getLabel();
                 }
                 return null;
@@ -269,7 +274,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
 
         //source mode within taxon
         Label sourceModeLabelWithin = new Label(control, SWT.NULL);
-        sourceModeLabelWithin.setText(Messages.DistributionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON);
+        sourceModeLabelWithin.setText(Messages.StructuredDescriptionAggregationWizardPage_SOURCEMODE_WITHIN_TAXON);
         sourceModeLabelWithin.setToolTipText(Messages.DistributionAggregationWizardPage_TOOLTIP_SOURCEMODE_WITHIN_TAXON);
         comboSourceModeWithinTaxon = new Combo(control,  SWT.BORDER| SWT.READ_ONLY);
         comboSourceModeWithinTaxon.setText(Messages.DistributionAggregationWizardPage_AGGREGATION_MODE);
@@ -291,7 +296,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
 
         //source mode child parent
         Label sourceModeChildParentLabel = new Label(control, SWT.NULL);
-        sourceModeChildParentLabel.setText(Messages.DistributionAggregationWizardPage_SOURCEMODE_CHILD_PARENT);
+        sourceModeChildParentLabel.setText(Messages.StructuredDescriptionAggregationWizardPage_SOURCEMODE_CHILD_PARENT);
         sourceModeChildParentLabel.setToolTipText(Messages.DistributionAggregationWizardPage_TOOLTIP_SOURCEMODE_CHILD_PARENT);
         comboSourceModeChildParent = new Combo(control,  SWT.BORDER| SWT.READ_ONLY);
         comboSourceModeChildParent.setText(Messages.DistributionAggregationWizardPage_AGGREGATION_MODE);