ref #7097 configure language based on vaadin session locale

diff --git a/pom.xml b/pom.xml
index ab7907ab9579a22d26ccac0764be979524529315..de22f4d53034fe2b351aae9786220f8282dd89fc 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -167,14 +167,6 @@
         <!-- all main resources without filtering -->
         <directory>src/main/resources</directory>
       </resource>
-      <resource>
-        <!-- i10n resources -->
-        <directory>src/main/java/eu/etaxonomy/cdm/i10n</directory>
-        <targetPath>../classes/eu/etaxonomy/cdm/i10n</targetPath>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
     </resources>
     <plugins>
       <plugin>

diff --git a/src/main/java/eu/etaxonomy/cdm/i10n/Messages.java b/src/main/java/eu/etaxonomy/cdm/i10n/Messages.java
deleted file mode 100644 (file)
index afe4503..0000000
--- a/src/main/java/eu/etaxonomy/cdm/i10n/Messages.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2017 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.cdm.i10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author freimeier
- * @date 27.11.2017
- *
- */
-public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "eu.etaxonomy.cdm.i10n.messages"; //$NON-NLS-1$
-    public static String AreaAndTaxonSettingsConfigWindow_AREAS;
-    public static String AreaAndTaxonSettingsConfigWindow_CLASSIFICATION;
-    public static String AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA;
-    public static String AreaAndTaxonSettingsConfigWindow_FILTER;
-    public static String AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME;
-    public static String AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE;
-    public static String AreaAndTaxonSettingsConfigWindow_LOADING_TAXA;
-    public static String AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION;
-    public static String AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA;
-    public static String AreaAndTaxonSettingsConfigWindow_TAXONOMY;
-    public static String DetailWindow_NO_DESCRIPTIVE_DATA_FOUND;
-    public static String DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS;
-    public static String DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS;
-    public static String DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM;
-    public static String DistributionTableViewBean_AREAS_AND_TAXA;
-    public static String DistributionTableViewBean_SELECT_TAXON;
-    public static String DistributionTableViewBean_STATUS;
-    public static String DistributionTableViewBean_TAXON;
-    public static String DistributionTableViewBean_TAXON_DETAILS;
-    public static String DistributionTableViewBean_TOTAL_TAXA;
-    public static String DistributionToolbar_AREAS_AND_TAXA;
-    public static String DistributionToolbar_DETAIL;
-    public static String DistributionToolbar_EDIT;
-    public static String DistributionToolbar_LOGIN;
-    public static String DistributionToolbar_LOGOUT;
-    public static String DistributionToolbar_SAVE;
-    public static String DistributionToolbar_STATUS;
-    public static String SettingsDialogWindowBase_CANCEL;
-    public static String SettingsDialogWindowBase_OK;
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-    }
-
-    private Messages() {
-    }
-}

diff --git a/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java b/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java
new file mode 100644 (file)
index 0000000..5926fc3
--- /dev/null
+++ b/src/main/java/eu/etaxonomy/cdm/i18n/Messages.java
@@ -0,0 +1,57 @@
+// $Id$
+/**
+* Copyright (C) 2017 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.cdm.i18n;
+
+import java.io.Serializable;
+import java.util.ResourceBundle;
+
+import com.vaadin.server.VaadinSession;
+
+/**
+ * @author freimeier
+ * @date 07.12.2017
+ *
+ */
+public class Messages implements Serializable {
+    public static final String BUNDLE_NAME = "eu.etaxonomy.cdm.i18n.messages";
+    public static String AreaAndTaxonSettingsConfigWindow_AREAS = "AreaAndTaxonSettingsConfigWindow_AREAS";
+    public static String AreaAndTaxonSettingsConfigWindow_CLASSIFICATION = "AreaAndTaxonSettingsConfigWindow_CLASSIFICATION";
+    public static String AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA = "AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA";
+    public static String AreaAndTaxonSettingsConfigWindow_FILTER = "AreaAndTaxonSettingsConfigWindow_FILTER";
+    public static String AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME = "AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME";
+    public static String AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE = "AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE";
+    public static String AreaAndTaxonSettingsConfigWindow_LOADING_TAXA = "AreaAndTaxonSettingsConfigWindow_LOADING_TAXA";
+    public static String AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION = "AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION";
+    public static String AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA = "AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA";
+    public static String AreaAndTaxonSettingsConfigWindow_TAXONOMY = "AreaAndTaxonSettingsConfigWindow_TAXONOMY";
+    public static String DetailWindow_NO_DESCRIPTIVE_DATA_FOUND = "DetailWindow_NO_DESCRIPTIVE_DATA_FOUND";
+    public static String DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS = "DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS";
+    public static String DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS = "DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS";
+    public static String DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM = "DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM";
+    public static String DistributionTableViewBean_AREAS_AND_TAXA = "DistributionTableViewBean_AREAS_AND_TAXA";
+    public static String DistributionTableViewBean_SELECT_TAXON = "DistributionTableViewBean_SELECT_TAXON";
+    public static String DistributionTableViewBean_STATUS = "DistributionTableViewBean_STATUS";
+    public static String DistributionTableViewBean_TAXON = "DistributionTableViewBean_TAXON";
+    public static String DistributionTableViewBean_TAXON_DETAILS = "DistributionTableViewBean_TAXON_DETAILS";
+    public static String DistributionTableViewBean_TOTAL_TAXA = "DistributionTableViewBean_TOTAL_TAXA";
+    public static String DistributionToolbar_AREAS_AND_TAXA = "DistributionToolbar_AREAS_AND_TAXA";
+    public static String DistributionToolbar_DETAIL = "DistributionToolbar_DETAIL";
+    public static String DistributionToolbar_EDIT = "DistributionToolbar_EDIT";
+    public static String DistributionToolbar_LOGIN = "DistributionToolbar_LOGIN";
+    public static String DistributionToolbar_LOGOUT = "DistributionToolbar_LOGOUT";
+    public static String DistributionToolbar_SAVE = "DistributionToolbar_SAVE";
+    public static String DistributionToolbar_STATUS = "DistributionToolbar_STATUS";
+    public static String SettingsDialogWindowBase_CANCEL = "SettingsDialogWindowBase_CANCEL";
+    public static String SettingsDialogWindowBase_OK = "SettingsDialogWindowBase_OK";
+
+    public static String getLocalizedString(String key) {
+        return ResourceBundle.getBundle(BUNDLE_NAME, VaadinSession.getCurrent().getLocale()).getString(key);
+    }
+}

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java
index 8acc8586d582329e77ac87e7880e054937c08182..8ad76f63562efb8675ad55b0d547340471d52d14 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Window;
 
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
@@ -44,7 +44,7 @@ public class DetailWindow extends CustomComponent{
                window.setCaption(taxon.getName().getTitleCache());
                window.setCloseShortcut(KeyCode.W, ModifierKey.CTRL);
                if(listDescriptions.isEmpty()){
-                       window.setContent(new Label(Messages.DetailWindow_NO_DESCRIPTIVE_DATA_FOUND));
+                       window.setContent(new Label(Messages.getLocalizedString(Messages.DetailWindow_NO_DESCRIPTIVE_DATA_FOUND)));
                }
                else{
                        window.setContent(constructDescriptionTree(taxon));

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java
index ddb2032f51a89a64007b5245c3565cff05665982..c340e262690432221311996f75b6ff1c8b94261f 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java
@@ -18,7 +18,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
 
 import eu.etaxonomy.cdm.api.application.CdmRepository;
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.service.CdmUserHelper;
 import eu.etaxonomy.cdm.vaadin.event.AuthenticationSuccessEvent;
 import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent;
@@ -46,21 +46,21 @@ public class DistributionToolbar extends HorizontalLayout implements Serializabl
     @Autowired
     private CdmUserHelper userHelper;
 
-    private final Button loginButton = new Button(Messages.DistributionToolbar_LOGIN);
+    private final Button loginButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_LOGIN));
 
-    private final Button logoutButton = new Button(Messages.DistributionToolbar_LOGOUT);
+    private final Button logoutButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_LOGOUT));
 
     private final Button userButton = new Button(FontAwesome.USER);
 
-       private final Button editButton = new Button(Messages.DistributionToolbar_EDIT);
+       private final Button editButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_EDIT));
 
-       private final Button saveButton = new Button(Messages.DistributionToolbar_SAVE);
+       private final Button saveButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_SAVE));
 
-       private final Button detailButton = new Button(Messages.DistributionToolbar_DETAIL);
+       private final Button detailButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_DETAIL));
 
-       private final Button distributionSettingsButton =  new Button(Messages.DistributionToolbar_AREAS_AND_TAXA);
+       private final Button distributionSettingsButton =  new Button(Messages.getLocalizedString(Messages.DistributionToolbar_AREAS_AND_TAXA));
 
-       private final Button settingsButton =  new Button(Messages.DistributionToolbar_STATUS);
+       private final Button settingsButton =  new Button(Messages.getLocalizedString(Messages.DistributionToolbar_STATUS));
 
 //     private final Authentication authentication;
 //     private ExcelExporter exporter = new ExcelExporter();

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/AreaAndTaxonSettingsConfigWindow.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/AreaAndTaxonSettingsConfigWindow.java
index 8a77fe6c01d5e070ac12f3f97df1b08ff37300c6..9c961fad4b1360c31bc385a11b84a494a3863e7d 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/AreaAndTaxonSettingsConfigWindow.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/AreaAndTaxonSettingsConfigWindow.java
@@ -40,7 +40,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Classification;
@@ -157,9 +157,9 @@ public class AreaAndTaxonSettingsConfigWindow
         rightContainer.setSizeFull();
 
         //classification
-        classificationBox = new ComboBox(Messages.AreaAndTaxonSettingsConfigWindow_CLASSIFICATION);
+        classificationBox = new ComboBox(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_CLASSIFICATION));
         classificationBox.setItemCaptionPropertyId(TaxonNodeContainer.LABEL);
-        classificationBox.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION);
+        classificationBox.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION));
         classificationBox.setImmediate(true);
         classificationBox.setNewItemsAllowed(false);
         classificationBox.setNullSelectionAllowed(false);
@@ -167,14 +167,14 @@ public class AreaAndTaxonSettingsConfigWindow
         classificationBox.setWidth("100%"); //$NON-NLS-1$
 
         //taxonFilter
-        taxonFilter = new TextField(Messages.AreaAndTaxonSettingsConfigWindow_FILTER);
-        taxonFilter.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME);
+        taxonFilter = new TextField(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_FILTER));
+        taxonFilter.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME));
         taxonFilter.setSizeFull();
         taxonFilter.setImmediate(true);
 
         //distribution area box
-        distAreaBox = new ComboBox(Messages.AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA);
-        distAreaBox.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA);
+        distAreaBox = new ComboBox(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA));
+        distAreaBox.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA));
         distAreaBox.setImmediate(true);
         distAreaBox.setNullSelectionAllowed(false);
         distAreaBox.setNewItemsAllowed(false);
@@ -183,12 +183,12 @@ public class AreaAndTaxonSettingsConfigWindow
 
         // named areas
         namedAreaList = new ListSelect();
-        namedAreaList.setCaption(Messages.AreaAndTaxonSettingsConfigWindow_AREAS);
+        namedAreaList.setCaption(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_AREAS));
         namedAreaList.setSizeFull();
         namedAreaList.setMultiSelect(true);
 
         //taxonomy
-        taxonTree = new TreeTable(Messages.AreaAndTaxonSettingsConfigWindow_TAXONOMY);
+        taxonTree = new TreeTable(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_TAXONOMY));
         taxonTree.setSelectable(true);
         taxonTree.setSizeFull();
         taxonTree.setImmediate(true);
@@ -235,7 +235,7 @@ public class AreaAndTaxonSettingsConfigWindow
             String filterText = taxonFilter.getValue();
             Property<?> uuidProperty = classificationBox.getContainerProperty(classificationBox.getValue(),"uuid"); //$NON-NLS-1$
             if(uuidProperty==null){
-               Notification.show(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION);
+               Notification.show(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION));
             }
             else{
                if(CdmUtils.isNotBlank(filterText)){
@@ -309,7 +309,7 @@ public class AreaAndTaxonSettingsConfigWindow
         UI.getCurrent().setPollInterval(500);
         taxonTree.setEnabled(false);
         taxonTree.removeAllItems();
-        Notification.show(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_TAXA);
+        Notification.show(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_TAXA));
 
         new TreeUpdater(children).start();
     }
@@ -358,7 +358,7 @@ public class AreaAndTaxonSettingsConfigWindow
                                public void run() {
                                        taxonTree.setContainerDataSource(new TaxonNodeContainer(children));
 
-                               Notification notification = new Notification(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE);
+                               Notification notification = new Notification(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE));
                                notification.setDelayMsec(500);
                                notification.show(Page.getCurrent());
                                taxonTree.setEnabled(true);

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionStatusSettingsConfigWindow.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionStatusSettingsConfigWindow.java
index a44cabbd403da532bf0011d49443b7a4850569aa..bf9e58b594beefd96ed07c8641d29a62e890b053 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionStatusSettingsConfigWindow.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionStatusSettingsConfigWindow.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.ListSelect;
 import com.vaadin.ui.VerticalLayout;
 
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil;
 import eu.etaxonomy.cdm.vaadin.view.distributionStatus.settings.DistributionStatusSettingsPresenter;
 
@@ -74,14 +74,14 @@ public class DistributionStatusSettingsConfigWindow
         mainLayout.setSpacing(true);
 
         //distribution status
-        distStatusSelect = new ListSelect(Messages.DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS);
+        distStatusSelect = new ListSelect(Messages.getLocalizedString(Messages.DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS));
         distStatusSelect.setImmediate(false);
         distStatusSelect.setMultiSelect(true);
         distStatusSelect.setSizeFull();
         distStatusSelect.setWidth("100%"); //$NON-NLS-1$
 
         //toggle abbreviated labels
-        boxToggleAbbreviatedLabels = new CheckBox(Messages.DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS, DistributionEditorUtil.isAbbreviatedLabels());
+        boxToggleAbbreviatedLabels = new CheckBox(Messages.getLocalizedString(Messages.DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS), DistributionEditorUtil.isAbbreviatedLabels());
         boxToggleAbbreviatedLabels.setImmediate(true);
 
         mainLayout.addComponent(boxToggleAbbreviatedLabels);

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
index 6c7150386db3f252a27ac31e0b833730e4d78b7f..28bad2e3d1de2ea3beab499e9fb319cc7722b07a 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
@@ -33,7 +33,7 @@ import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Notification;
 
 import eu.etaxonomy.cdm.api.application.CdmRepository;
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
@@ -105,7 +105,7 @@ public class DistributionTablePresenter extends AbstractPresenter<IDistributionT
                }
            }
            if(namedArea==null){
-               Notification.show(Messages.DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM);
+               Notification.show(Messages.getLocalizedString(Messages.DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM));
                repo.commitTransaction(tx);
                return -1;
            }

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java
index 39cc29d26560fde6b053dc3b986651fd7312d06f..f11163969b7a99451e84cfde2487c6f1580e9a9e 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java
@@ -37,7 +37,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;
@@ -258,7 +258,7 @@ public class DistributionTableViewBean
 
                table.setVisibleColumns(columnList.toArray());
                table.setColumnHeaders(columnList.toArray(string));
-               table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, "Total amount of Taxa displayed: " + container.size());
+               table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, String.format(Messages.getLocalizedString(Messages.DistributionTableViewBean_TOTAL_TAXA), gridcontainer.size()));
 
 //        gridcontainer = getPresenter().getAreaDistributionStatusContainer();
 //        if(gridcontainer==null){
@@ -331,7 +331,7 @@ public class DistributionTableViewBean
        private void createEditClickListener(){
                //details
            Button detailButton = toolbar.getDetailButton();
-               detailButton.setCaption(Messages.DistributionTableViewBean_TAXON_DETAILS);
+               detailButton.setCaption(Messages.getLocalizedString(Messages.DistributionTableViewBean_TAXON_DETAILS));
                detailButton.addClickListener(event -> {
                                Object selectedItemId = DistributionTableViewBean.this.table.getValue();
 //                             Object selectedItemId = DistributionTableViewBean.this.grid.getSelectedRow();
@@ -347,7 +347,7 @@ public class DistributionTableViewBean
                                        getUI().addWindow(window);
                                }
                                else{
-                                       Notification.show(Messages.DistributionTableViewBean_SELECT_TAXON, Type.HUMANIZED_MESSAGE);
+                                       Notification.show(Messages.getLocalizedString(Messages.DistributionTableViewBean_SELECT_TAXON), Type.HUMANIZED_MESSAGE);
                                }
                        }
                );
@@ -369,7 +369,7 @@ public class DistributionTableViewBean
         if(distributionStatusConfigWindow==null){
             distributionStatusConfigWindow = new DistributionStatusSettingsConfigWindow(this);
         }
-        Window window  = distributionStatusConfigWindow.createWindow(Messages.DistributionTableViewBean_STATUS);
+        Window window  = distributionStatusConfigWindow.createWindow(Messages.getLocalizedString(Messages.DistributionTableViewBean_STATUS));
         window.setWidth("25%"); //$NON-NLS-1$
         window.setHeight("60%"); //$NON-NLS-1$
         UI.getCurrent().addWindow(window);
@@ -383,7 +383,7 @@ public class DistributionTableViewBean
                if(areaAndTaxonConfigWindow==null){
                        areaAndTaxonConfigWindow = new AreaAndTaxonSettingsConfigWindow(this);
                }
-        Window window  = areaAndTaxonConfigWindow.createWindow(Messages.DistributionTableViewBean_AREAS_AND_TAXA);
+        Window window  = areaAndTaxonConfigWindow.createWindow(Messages.getLocalizedString(Messages.DistributionTableViewBean_AREAS_AND_TAXA));
         UI.getCurrent().addWindow(window);
        }
 

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/SettingsDialogWindowBase.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/SettingsDialogWindowBase.java
index 565df73b519863dde072a106d40b5ca1254b3c3a..1ef22964a8205f80bb930fd9104f8b62ba322325 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/SettingsDialogWindowBase.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/SettingsDialogWindowBase.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Window;
 
-import eu.etaxonomy.cdm.i10n.Messages;
+import eu.etaxonomy.cdm.i18n.Messages;
 import eu.etaxonomy.cdm.vaadin.view.distributionStatus.settings.SettingsPresenterBase;
 
 @SuppressWarnings("serial")
@@ -35,14 +35,14 @@ public abstract class SettingsDialogWindowBase<P extends SettingsPresenterBase>
                HorizontalLayout buttonToolBar = new HorizontalLayout();
            // cancelButton
            cancelButton = new Button();
-           cancelButton.setCaption(Messages.SettingsDialogWindowBase_CANCEL);
+           cancelButton.setCaption(Messages.getLocalizedString(Messages.SettingsDialogWindowBase_CANCEL));
            cancelButton.setImmediate(true);
            cancelButton.addStyleName("dialogButton"); //$NON-NLS-1$
            buttonToolBar.addComponent(cancelButton);
 
            // okButton
            okButton = new Button();
-           okButton.setCaption(Messages.SettingsDialogWindowBase_OK);
+           okButton.setCaption(Messages.getLocalizedString(Messages.SettingsDialogWindowBase_OK));
            okButton.setImmediate(true);
            okButton.addStyleName("dialogButton"); //$NON-NLS-1$
            buttonToolBar.addComponent(okButton);

diff --git a/src/main/java/eu/etaxonomy/cdm/i10n/messages.properties b/src/main/resources/eu/etaxonomy/cdm/i18n/messages.properties
similarity index 100%
rename from src/main/java/eu/etaxonomy/cdm/i10n/messages.properties
rename to src/main/resources/eu/etaxonomy/cdm/i18n/messages.properties

diff --git a/src/main/java/eu/etaxonomy/cdm/i10n/messages_de.properties b/src/main/resources/eu/etaxonomy/cdm/i18n/messages_de.properties
similarity index 100%
rename from src/main/java/eu/etaxonomy/cdm/i10n/messages_de.properties
rename to src/main/resources/eu/etaxonomy/cdm/i18n/messages_de.properties