Revision 4fc74453
Added by Fabian Reimeier over 6 years ago
| pom.xml | ||
|---|---|---|
| 167 | 167 |
<!-- all main resources without filtering --> |
| 168 | 168 |
<directory>src/main/resources</directory> |
| 169 | 169 |
</resource> |
| 170 |
<resource> |
|
| 171 |
<!-- i10n resources --> |
|
| 172 |
<directory>src/main/java/eu/etaxonomy/cdm/i10n</directory> |
|
| 173 |
<targetPath>../classes/eu/etaxonomy/cdm/i10n</targetPath> |
|
| 174 |
<excludes> |
|
| 175 |
<exclude>**/*.java</exclude> |
|
| 176 |
</excludes> |
|
| 177 |
</resource> |
|
| 178 | 170 |
</resources> |
| 179 | 171 |
<plugins> |
| 180 | 172 |
<plugin> |
| src/main/java/eu/etaxonomy/cdm/i10n/Messages.java | ||
|---|---|---|
| 1 |
// $Id$ |
|
| 2 |
/** |
|
| 3 |
* Copyright (C) 2017 EDIT |
|
| 4 |
* European Distributed Institute of Taxonomy |
|
| 5 |
* http://www.e-taxonomy.eu |
|
| 6 |
* |
|
| 7 |
* The contents of this file are subject to the Mozilla Public License Version 1.1 |
|
| 8 |
* See LICENSE.TXT at the top of this package for the full license terms. |
|
| 9 |
*/ |
|
| 10 |
package eu.etaxonomy.cdm.i10n; |
|
| 11 |
|
|
| 12 |
import org.eclipse.osgi.util.NLS; |
|
| 13 |
|
|
| 14 |
/** |
|
| 15 |
* @author freimeier |
|
| 16 |
* @date 27.11.2017 |
|
| 17 |
* |
|
| 18 |
*/ |
|
| 19 |
public class Messages extends NLS {
|
|
| 20 |
private static final String BUNDLE_NAME = "eu.etaxonomy.cdm.i10n.messages"; //$NON-NLS-1$ |
|
| 21 |
public static String AreaAndTaxonSettingsConfigWindow_AREAS; |
|
| 22 |
public static String AreaAndTaxonSettingsConfigWindow_CLASSIFICATION; |
|
| 23 |
public static String AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA; |
|
| 24 |
public static String AreaAndTaxonSettingsConfigWindow_FILTER; |
|
| 25 |
public static String AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME; |
|
| 26 |
public static String AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE; |
|
| 27 |
public static String AreaAndTaxonSettingsConfigWindow_LOADING_TAXA; |
|
| 28 |
public static String AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION; |
|
| 29 |
public static String AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA; |
|
| 30 |
public static String AreaAndTaxonSettingsConfigWindow_TAXONOMY; |
|
| 31 |
public static String DetailWindow_NO_DESCRIPTIVE_DATA_FOUND; |
|
| 32 |
public static String DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS; |
|
| 33 |
public static String DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS; |
|
| 34 |
public static String DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM; |
|
| 35 |
public static String DistributionTableViewBean_AREAS_AND_TAXA; |
|
| 36 |
public static String DistributionTableViewBean_SELECT_TAXON; |
|
| 37 |
public static String DistributionTableViewBean_STATUS; |
|
| 38 |
public static String DistributionTableViewBean_TAXON; |
|
| 39 |
public static String DistributionTableViewBean_TAXON_DETAILS; |
|
| 40 |
public static String DistributionTableViewBean_TOTAL_TAXA; |
|
| 41 |
public static String DistributionToolbar_AREAS_AND_TAXA; |
|
| 42 |
public static String DistributionToolbar_DETAIL; |
|
| 43 |
public static String DistributionToolbar_EDIT; |
|
| 44 |
public static String DistributionToolbar_LOGIN; |
|
| 45 |
public static String DistributionToolbar_LOGOUT; |
|
| 46 |
public static String DistributionToolbar_SAVE; |
|
| 47 |
public static String DistributionToolbar_STATUS; |
|
| 48 |
public static String SettingsDialogWindowBase_CANCEL; |
|
| 49 |
public static String SettingsDialogWindowBase_OK; |
|
| 50 |
static {
|
|
| 51 |
// initialize resource bundle |
|
| 52 |
NLS.initializeMessages(BUNDLE_NAME, Messages.class); |
|
| 53 |
} |
|
| 54 |
|
|
| 55 |
private Messages() {
|
|
| 56 |
} |
|
| 57 |
} |
|
| src/main/java/eu/etaxonomy/cdm/i10n/messages.properties | ||
|---|---|---|
| 1 |
AreaAndTaxonSettingsConfigWindow_AREAS=Areas |
|
| 2 |
AreaAndTaxonSettingsConfigWindow_TAXONOMY=Taxonomy |
|
| 3 |
AreaAndTaxonSettingsConfigWindow_LOADING_TAXA=Loading taxa... |
|
| 4 |
AreaAndTaxonSettingsConfigWindow_CLASSIFICATION=Classification |
|
| 5 |
AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE=Loading complete |
|
| 6 |
AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION=Please select a classification... |
|
| 7 |
AreaAndTaxonSettingsConfigWindow_FILTER=Filter |
|
| 8 |
AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME=Filter taxa by name... |
|
| 9 |
AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA=Distribution Area: |
|
| 10 |
AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA=Please select a distribution area... |
|
| 11 |
DetailWindow_NO_DESCRIPTIVE_DATA_FOUND=No descriptive data found |
|
| 12 |
DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS=Distribution Status: |
|
| 13 |
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Show abbreviated labels |
|
| 14 |
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Error during update of distribution term\! |
|
| 15 |
DistributionTableViewBean_AREAS_AND_TAXA=Areas and Taxa |
|
| 16 |
DistributionTableViewBean_SELECT_TAXON=Please select a taxon |
|
| 17 |
DistributionTableViewBean_STATUS=Status |
|
| 18 |
DistributionTableViewBean_TAXON=Taxon |
|
| 19 |
DistributionTableViewBean_TAXON_DETAILS=Taxon Details |
|
| 20 |
DistributionTableViewBean_TOTAL_TAXA=Total amount of Taxa displayed: %s |
|
| 21 |
DistributionToolbar_AREAS_AND_TAXA=Areas and Taxa |
|
| 22 |
DistributionToolbar_DETAIL=Detail |
|
| 23 |
DistributionToolbar_EDIT=Edit |
|
| 24 |
DistributionToolbar_LOGIN=Login |
|
| 25 |
DistributionToolbar_LOGOUT=Logout |
|
| 26 |
DistributionToolbar_SAVE=Save |
|
| 27 |
DistributionToolbar_STATUS=Status |
|
| 28 |
SettingsDialogWindowBase_CANCEL=Cancel |
|
| 29 |
SettingsDialogWindowBase_OK=OK |
|
| src/main/java/eu/etaxonomy/cdm/i10n/messages_de.properties | ||
|---|---|---|
| 1 |
AreaAndTaxonSettingsConfigWindow_AREAS=Gebiete |
|
| 2 |
AreaAndTaxonSettingsConfigWindow_TAXONOMY=Taxonomie |
|
| 3 |
AreaAndTaxonSettingsConfigWindow_LOADING_TAXA=Lade Taxa... |
|
| 4 |
AreaAndTaxonSettingsConfigWindow_CLASSIFICATION=Klassifikation |
|
| 5 |
AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE=Ladevorgang abgeschlossen |
|
| 6 |
AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION=Bitte w?hlen Sie eine Klassifikation aus... |
|
| 7 |
AreaAndTaxonSettingsConfigWindow_FILTER=Filter |
|
| 8 |
AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME=Taxa nach Namen filtern... |
|
| 9 |
AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA=Verbreitungsgebiet: |
|
| 10 |
AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA=Bitte w?hlen Sie ein Verbreitungsgebiet aus... |
|
| 11 |
DetailWindow_NO_DESCRIPTIVE_DATA_FOUND=Keine deskriptive Daten gefunden |
|
| 12 |
DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS=Verbreitungsstatus: |
|
| 13 |
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Abk?rzungen anzeigen |
|
| 14 |
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Fehler beim Aktualisiren des Verbreitungs-Terms! |
|
| 15 |
DistributionTableViewBean_AREAS_AND_TAXA=Gebiete und Taxa |
|
| 16 |
DistributionTableViewBean_SELECT_TAXON=Bitte w?hlen Sie ein Taxon aus |
|
| 17 |
DistributionTableViewBean_STATUS=Status |
|
| 18 |
DistributionTableViewBean_TAXON=Taxon |
|
| 19 |
DistributionTableViewBean_TAXON_DETAILS=Taxon Details |
|
| 20 |
DistributionTableViewBean_TOTAL_TAXA=Anzahl angezeigter Taxa: %s |
|
| 21 |
DistributionToolbar_AREAS_AND_TAXA=Gebiete und Taxa |
|
| 22 |
DistributionToolbar_DETAIL=Detail |
|
| 23 |
DistributionToolbar_EDIT=Bearbeiten |
|
| 24 |
DistributionToolbar_LOGIN=Einloggen |
|
| 25 |
DistributionToolbar_LOGOUT=Ausloggen |
|
| 26 |
DistributionToolbar_SAVE=Speichern |
|
| 27 |
DistributionToolbar_STATUS=Status |
|
| 28 |
SettingsDialogWindowBase_CANCEL=Abbrechen |
|
| 29 |
SettingsDialogWindowBase_OK=OK |
|
| src/main/java/eu/etaxonomy/cdm/i18n/Messages.java | ||
|---|---|---|
| 1 |
// $Id$ |
|
| 2 |
/** |
|
| 3 |
* Copyright (C) 2017 EDIT |
|
| 4 |
* European Distributed Institute of Taxonomy |
|
| 5 |
* http://www.e-taxonomy.eu |
|
| 6 |
* |
|
| 7 |
* The contents of this file are subject to the Mozilla Public License Version 1.1 |
|
| 8 |
* See LICENSE.TXT at the top of this package for the full license terms. |
|
| 9 |
*/ |
|
| 10 |
package eu.etaxonomy.cdm.i18n; |
|
| 11 |
|
|
| 12 |
import java.io.Serializable; |
|
| 13 |
import java.util.ResourceBundle; |
|
| 14 |
|
|
| 15 |
import com.vaadin.server.VaadinSession; |
|
| 16 |
|
|
| 17 |
/** |
|
| 18 |
* @author freimeier |
|
| 19 |
* @date 07.12.2017 |
|
| 20 |
* |
|
| 21 |
*/ |
|
| 22 |
public class Messages implements Serializable {
|
|
| 23 |
public static final String BUNDLE_NAME = "eu.etaxonomy.cdm.i18n.messages"; |
|
| 24 |
public static String AreaAndTaxonSettingsConfigWindow_AREAS = "AreaAndTaxonSettingsConfigWindow_AREAS"; |
|
| 25 |
public static String AreaAndTaxonSettingsConfigWindow_CLASSIFICATION = "AreaAndTaxonSettingsConfigWindow_CLASSIFICATION"; |
|
| 26 |
public static String AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA = "AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA"; |
|
| 27 |
public static String AreaAndTaxonSettingsConfigWindow_FILTER = "AreaAndTaxonSettingsConfigWindow_FILTER"; |
|
| 28 |
public static String AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME = "AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME"; |
|
| 29 |
public static String AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE = "AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE"; |
|
| 30 |
public static String AreaAndTaxonSettingsConfigWindow_LOADING_TAXA = "AreaAndTaxonSettingsConfigWindow_LOADING_TAXA"; |
|
| 31 |
public static String AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION = "AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION"; |
|
| 32 |
public static String AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA = "AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA"; |
|
| 33 |
public static String AreaAndTaxonSettingsConfigWindow_TAXONOMY = "AreaAndTaxonSettingsConfigWindow_TAXONOMY"; |
|
| 34 |
public static String DetailWindow_NO_DESCRIPTIVE_DATA_FOUND = "DetailWindow_NO_DESCRIPTIVE_DATA_FOUND"; |
|
| 35 |
public static String DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS = "DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS"; |
|
| 36 |
public static String DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS = "DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS"; |
|
| 37 |
public static String DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM = "DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM"; |
|
| 38 |
public static String DistributionTableViewBean_AREAS_AND_TAXA = "DistributionTableViewBean_AREAS_AND_TAXA"; |
|
| 39 |
public static String DistributionTableViewBean_SELECT_TAXON = "DistributionTableViewBean_SELECT_TAXON"; |
|
| 40 |
public static String DistributionTableViewBean_STATUS = "DistributionTableViewBean_STATUS"; |
|
| 41 |
public static String DistributionTableViewBean_TAXON = "DistributionTableViewBean_TAXON"; |
|
| 42 |
public static String DistributionTableViewBean_TAXON_DETAILS = "DistributionTableViewBean_TAXON_DETAILS"; |
|
| 43 |
public static String DistributionTableViewBean_TOTAL_TAXA = "DistributionTableViewBean_TOTAL_TAXA"; |
|
| 44 |
public static String DistributionToolbar_AREAS_AND_TAXA = "DistributionToolbar_AREAS_AND_TAXA"; |
|
| 45 |
public static String DistributionToolbar_DETAIL = "DistributionToolbar_DETAIL"; |
|
| 46 |
public static String DistributionToolbar_EDIT = "DistributionToolbar_EDIT"; |
|
| 47 |
public static String DistributionToolbar_LOGIN = "DistributionToolbar_LOGIN"; |
|
| 48 |
public static String DistributionToolbar_LOGOUT = "DistributionToolbar_LOGOUT"; |
|
| 49 |
public static String DistributionToolbar_SAVE = "DistributionToolbar_SAVE"; |
|
| 50 |
public static String DistributionToolbar_STATUS = "DistributionToolbar_STATUS"; |
|
| 51 |
public static String SettingsDialogWindowBase_CANCEL = "SettingsDialogWindowBase_CANCEL"; |
|
| 52 |
public static String SettingsDialogWindowBase_OK = "SettingsDialogWindowBase_OK"; |
|
| 53 |
|
|
| 54 |
public static String getLocalizedString(String key) {
|
|
| 55 |
return ResourceBundle.getBundle(BUNDLE_NAME, VaadinSession.getCurrent().getLocale()).getString(key); |
|
| 56 |
} |
|
| 57 |
} |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java | ||
|---|---|---|
| 10 | 10 |
import com.vaadin.ui.Tree; |
| 11 | 11 |
import com.vaadin.ui.Window; |
| 12 | 12 |
|
| 13 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 13 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 14 | 14 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 15 | 15 |
import eu.etaxonomy.cdm.model.common.Language; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.description.CategoricalData; |
| ... | ... | |
| 44 | 44 |
window.setCaption(taxon.getName().getTitleCache()); |
| 45 | 45 |
window.setCloseShortcut(KeyCode.W, ModifierKey.CTRL); |
| 46 | 46 |
if(listDescriptions.isEmpty()){
|
| 47 |
window.setContent(new Label(Messages.DetailWindow_NO_DESCRIPTIVE_DATA_FOUND));
|
|
| 47 |
window.setContent(new Label(Messages.getLocalizedString(Messages.DetailWindow_NO_DESCRIPTIVE_DATA_FOUND)));
|
|
| 48 | 48 |
} |
| 49 | 49 |
else{
|
| 50 | 50 |
window.setContent(constructDescriptionTree(taxon)); |
| src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java | ||
|---|---|---|
| 18 | 18 |
import com.vaadin.ui.HorizontalLayout; |
| 19 | 19 |
|
| 20 | 20 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
| 21 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 21 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 22 | 22 |
import eu.etaxonomy.cdm.service.CdmUserHelper; |
| 23 | 23 |
import eu.etaxonomy.cdm.vaadin.event.AuthenticationSuccessEvent; |
| 24 | 24 |
import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent; |
| ... | ... | |
| 46 | 46 |
@Autowired |
| 47 | 47 |
private CdmUserHelper userHelper; |
| 48 | 48 |
|
| 49 |
private final Button loginButton = new Button(Messages.DistributionToolbar_LOGIN);
|
|
| 49 |
private final Button loginButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_LOGIN));
|
|
| 50 | 50 |
|
| 51 |
private final Button logoutButton = new Button(Messages.DistributionToolbar_LOGOUT);
|
|
| 51 |
private final Button logoutButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_LOGOUT));
|
|
| 52 | 52 |
|
| 53 | 53 |
private final Button userButton = new Button(FontAwesome.USER); |
| 54 | 54 |
|
| 55 |
private final Button editButton = new Button(Messages.DistributionToolbar_EDIT);
|
|
| 55 |
private final Button editButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_EDIT));
|
|
| 56 | 56 |
|
| 57 |
private final Button saveButton = new Button(Messages.DistributionToolbar_SAVE);
|
|
| 57 |
private final Button saveButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_SAVE));
|
|
| 58 | 58 |
|
| 59 |
private final Button detailButton = new Button(Messages.DistributionToolbar_DETAIL);
|
|
| 59 |
private final Button detailButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_DETAIL));
|
|
| 60 | 60 |
|
| 61 |
private final Button distributionSettingsButton = new Button(Messages.DistributionToolbar_AREAS_AND_TAXA);
|
|
| 61 |
private final Button distributionSettingsButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_AREAS_AND_TAXA));
|
|
| 62 | 62 |
|
| 63 |
private final Button settingsButton = new Button(Messages.DistributionToolbar_STATUS);
|
|
| 63 |
private final Button settingsButton = new Button(Messages.getLocalizedString(Messages.DistributionToolbar_STATUS));
|
|
| 64 | 64 |
|
| 65 | 65 |
// private final Authentication authentication; |
| 66 | 66 |
// private ExcelExporter exporter = new ExcelExporter(); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/AreaAndTaxonSettingsConfigWindow.java | ||
|---|---|---|
| 40 | 40 |
import com.vaadin.ui.VerticalLayout; |
| 41 | 41 |
|
| 42 | 42 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 43 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 43 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 44 | 44 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 45 | 45 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 46 | 46 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| ... | ... | |
| 157 | 157 |
rightContainer.setSizeFull(); |
| 158 | 158 |
|
| 159 | 159 |
//classification |
| 160 |
classificationBox = new ComboBox(Messages.AreaAndTaxonSettingsConfigWindow_CLASSIFICATION);
|
|
| 160 |
classificationBox = new ComboBox(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_CLASSIFICATION));
|
|
| 161 | 161 |
classificationBox.setItemCaptionPropertyId(TaxonNodeContainer.LABEL); |
| 162 |
classificationBox.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION);
|
|
| 162 |
classificationBox.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION));
|
|
| 163 | 163 |
classificationBox.setImmediate(true); |
| 164 | 164 |
classificationBox.setNewItemsAllowed(false); |
| 165 | 165 |
classificationBox.setNullSelectionAllowed(false); |
| ... | ... | |
| 167 | 167 |
classificationBox.setWidth("100%"); //$NON-NLS-1$
|
| 168 | 168 |
|
| 169 | 169 |
//taxonFilter |
| 170 |
taxonFilter = new TextField(Messages.AreaAndTaxonSettingsConfigWindow_FILTER);
|
|
| 171 |
taxonFilter.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME);
|
|
| 170 |
taxonFilter = new TextField(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_FILTER));
|
|
| 171 |
taxonFilter.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME));
|
|
| 172 | 172 |
taxonFilter.setSizeFull(); |
| 173 | 173 |
taxonFilter.setImmediate(true); |
| 174 | 174 |
|
| 175 | 175 |
//distribution area box |
| 176 |
distAreaBox = new ComboBox(Messages.AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA);
|
|
| 177 |
distAreaBox.setInputPrompt(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA);
|
|
| 176 |
distAreaBox = new ComboBox(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA));
|
|
| 177 |
distAreaBox.setInputPrompt(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA));
|
|
| 178 | 178 |
distAreaBox.setImmediate(true); |
| 179 | 179 |
distAreaBox.setNullSelectionAllowed(false); |
| 180 | 180 |
distAreaBox.setNewItemsAllowed(false); |
| ... | ... | |
| 183 | 183 |
|
| 184 | 184 |
// named areas |
| 185 | 185 |
namedAreaList = new ListSelect(); |
| 186 |
namedAreaList.setCaption(Messages.AreaAndTaxonSettingsConfigWindow_AREAS);
|
|
| 186 |
namedAreaList.setCaption(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_AREAS));
|
|
| 187 | 187 |
namedAreaList.setSizeFull(); |
| 188 | 188 |
namedAreaList.setMultiSelect(true); |
| 189 | 189 |
|
| 190 | 190 |
//taxonomy |
| 191 |
taxonTree = new TreeTable(Messages.AreaAndTaxonSettingsConfigWindow_TAXONOMY);
|
|
| 191 |
taxonTree = new TreeTable(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_TAXONOMY));
|
|
| 192 | 192 |
taxonTree.setSelectable(true); |
| 193 | 193 |
taxonTree.setSizeFull(); |
| 194 | 194 |
taxonTree.setImmediate(true); |
| ... | ... | |
| 235 | 235 |
String filterText = taxonFilter.getValue(); |
| 236 | 236 |
Property<?> uuidProperty = classificationBox.getContainerProperty(classificationBox.getValue(),"uuid"); //$NON-NLS-1$ |
| 237 | 237 |
if(uuidProperty==null){
|
| 238 |
Notification.show(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION);
|
|
| 238 |
Notification.show(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION));
|
|
| 239 | 239 |
} |
| 240 | 240 |
else{
|
| 241 | 241 |
if(CdmUtils.isNotBlank(filterText)){
|
| ... | ... | |
| 309 | 309 |
UI.getCurrent().setPollInterval(500); |
| 310 | 310 |
taxonTree.setEnabled(false); |
| 311 | 311 |
taxonTree.removeAllItems(); |
| 312 |
Notification.show(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_TAXA);
|
|
| 312 |
Notification.show(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_TAXA));
|
|
| 313 | 313 |
|
| 314 | 314 |
new TreeUpdater(children).start(); |
| 315 | 315 |
} |
| ... | ... | |
| 358 | 358 |
public void run() {
|
| 359 | 359 |
taxonTree.setContainerDataSource(new TaxonNodeContainer(children)); |
| 360 | 360 |
|
| 361 |
Notification notification = new Notification(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE);
|
|
| 361 |
Notification notification = new Notification(Messages.getLocalizedString(Messages.AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE));
|
|
| 362 | 362 |
notification.setDelayMsec(500); |
| 363 | 363 |
notification.show(Page.getCurrent()); |
| 364 | 364 |
taxonTree.setEnabled(true); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionStatusSettingsConfigWindow.java | ||
|---|---|---|
| 21 | 21 |
import com.vaadin.ui.ListSelect; |
| 22 | 22 |
import com.vaadin.ui.VerticalLayout; |
| 23 | 23 |
|
| 24 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 24 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 25 | 25 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
| 26 | 26 |
import eu.etaxonomy.cdm.vaadin.view.distributionStatus.settings.DistributionStatusSettingsPresenter; |
| 27 | 27 |
|
| ... | ... | |
| 74 | 74 |
mainLayout.setSpacing(true); |
| 75 | 75 |
|
| 76 | 76 |
//distribution status |
| 77 |
distStatusSelect = new ListSelect(Messages.DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS);
|
|
| 77 |
distStatusSelect = new ListSelect(Messages.getLocalizedString(Messages.DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS));
|
|
| 78 | 78 |
distStatusSelect.setImmediate(false); |
| 79 | 79 |
distStatusSelect.setMultiSelect(true); |
| 80 | 80 |
distStatusSelect.setSizeFull(); |
| 81 | 81 |
distStatusSelect.setWidth("100%"); //$NON-NLS-1$
|
| 82 | 82 |
|
| 83 | 83 |
//toggle abbreviated labels |
| 84 |
boxToggleAbbreviatedLabels = new CheckBox(Messages.DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS, DistributionEditorUtil.isAbbreviatedLabels());
|
|
| 84 |
boxToggleAbbreviatedLabels = new CheckBox(Messages.getLocalizedString(Messages.DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS), DistributionEditorUtil.isAbbreviatedLabels());
|
|
| 85 | 85 |
boxToggleAbbreviatedLabels.setImmediate(true); |
| 86 | 86 |
|
| 87 | 87 |
mainLayout.addComponent(boxToggleAbbreviatedLabels); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java | ||
|---|---|---|
| 33 | 33 |
import com.vaadin.ui.Notification; |
| 34 | 34 |
|
| 35 | 35 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
| 36 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 36 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 37 | 37 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 38 | 38 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.common.Language; |
| ... | ... | |
| 105 | 105 |
} |
| 106 | 106 |
} |
| 107 | 107 |
if(namedArea==null){
|
| 108 |
Notification.show(Messages.DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM);
|
|
| 108 |
Notification.show(Messages.getLocalizedString(Messages.DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM));
|
|
| 109 | 109 |
repo.commitTransaction(tx); |
| 110 | 110 |
return -1; |
| 111 | 111 |
} |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java | ||
|---|---|---|
| 37 | 37 |
import com.vaadin.ui.Window; |
| 38 | 38 |
|
| 39 | 39 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 40 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 40 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 41 | 41 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 42 | 42 |
import eu.etaxonomy.cdm.model.common.Language; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.common.Representation; |
| ... | ... | |
| 258 | 258 |
|
| 259 | 259 |
table.setVisibleColumns(columnList.toArray()); |
| 260 | 260 |
table.setColumnHeaders(columnList.toArray(string)); |
| 261 |
table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, "Total amount of Taxa displayed: " + container.size());
|
|
| 261 |
table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, String.format(Messages.getLocalizedString(Messages.DistributionTableViewBean_TOTAL_TAXA), gridcontainer.size()));
|
|
| 262 | 262 |
|
| 263 | 263 |
// gridcontainer = getPresenter().getAreaDistributionStatusContainer(); |
| 264 | 264 |
// if(gridcontainer==null){
|
| ... | ... | |
| 331 | 331 |
private void createEditClickListener(){
|
| 332 | 332 |
//details |
| 333 | 333 |
Button detailButton = toolbar.getDetailButton(); |
| 334 |
detailButton.setCaption(Messages.DistributionTableViewBean_TAXON_DETAILS);
|
|
| 334 |
detailButton.setCaption(Messages.getLocalizedString(Messages.DistributionTableViewBean_TAXON_DETAILS));
|
|
| 335 | 335 |
detailButton.addClickListener(event -> {
|
| 336 | 336 |
Object selectedItemId = DistributionTableViewBean.this.table.getValue(); |
| 337 | 337 |
// Object selectedItemId = DistributionTableViewBean.this.grid.getSelectedRow(); |
| ... | ... | |
| 347 | 347 |
getUI().addWindow(window); |
| 348 | 348 |
} |
| 349 | 349 |
else{
|
| 350 |
Notification.show(Messages.DistributionTableViewBean_SELECT_TAXON, Type.HUMANIZED_MESSAGE);
|
|
| 350 |
Notification.show(Messages.getLocalizedString(Messages.DistributionTableViewBean_SELECT_TAXON), Type.HUMANIZED_MESSAGE);
|
|
| 351 | 351 |
} |
| 352 | 352 |
} |
| 353 | 353 |
); |
| ... | ... | |
| 369 | 369 |
if(distributionStatusConfigWindow==null){
|
| 370 | 370 |
distributionStatusConfigWindow = new DistributionStatusSettingsConfigWindow(this); |
| 371 | 371 |
} |
| 372 |
Window window = distributionStatusConfigWindow.createWindow(Messages.DistributionTableViewBean_STATUS);
|
|
| 372 |
Window window = distributionStatusConfigWindow.createWindow(Messages.getLocalizedString(Messages.DistributionTableViewBean_STATUS));
|
|
| 373 | 373 |
window.setWidth("25%"); //$NON-NLS-1$
|
| 374 | 374 |
window.setHeight("60%"); //$NON-NLS-1$
|
| 375 | 375 |
UI.getCurrent().addWindow(window); |
| ... | ... | |
| 383 | 383 |
if(areaAndTaxonConfigWindow==null){
|
| 384 | 384 |
areaAndTaxonConfigWindow = new AreaAndTaxonSettingsConfigWindow(this); |
| 385 | 385 |
} |
| 386 |
Window window = areaAndTaxonConfigWindow.createWindow(Messages.DistributionTableViewBean_AREAS_AND_TAXA);
|
|
| 386 |
Window window = areaAndTaxonConfigWindow.createWindow(Messages.getLocalizedString(Messages.DistributionTableViewBean_AREAS_AND_TAXA));
|
|
| 387 | 387 |
UI.getCurrent().addWindow(window); |
| 388 | 388 |
} |
| 389 | 389 |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/SettingsDialogWindowBase.java | ||
|---|---|---|
| 7 | 7 |
import com.vaadin.ui.HorizontalLayout; |
| 8 | 8 |
import com.vaadin.ui.Window; |
| 9 | 9 |
|
| 10 |
import eu.etaxonomy.cdm.i10n.Messages;
|
|
| 10 |
import eu.etaxonomy.cdm.i18n.Messages;
|
|
| 11 | 11 |
import eu.etaxonomy.cdm.vaadin.view.distributionStatus.settings.SettingsPresenterBase; |
| 12 | 12 |
|
| 13 | 13 |
@SuppressWarnings("serial")
|
| ... | ... | |
| 35 | 35 |
HorizontalLayout buttonToolBar = new HorizontalLayout(); |
| 36 | 36 |
// cancelButton |
| 37 | 37 |
cancelButton = new Button(); |
| 38 |
cancelButton.setCaption(Messages.SettingsDialogWindowBase_CANCEL);
|
|
| 38 |
cancelButton.setCaption(Messages.getLocalizedString(Messages.SettingsDialogWindowBase_CANCEL));
|
|
| 39 | 39 |
cancelButton.setImmediate(true); |
| 40 | 40 |
cancelButton.addStyleName("dialogButton"); //$NON-NLS-1$
|
| 41 | 41 |
buttonToolBar.addComponent(cancelButton); |
| 42 | 42 |
|
| 43 | 43 |
// okButton |
| 44 | 44 |
okButton = new Button(); |
| 45 |
okButton.setCaption(Messages.SettingsDialogWindowBase_OK);
|
|
| 45 |
okButton.setCaption(Messages.getLocalizedString(Messages.SettingsDialogWindowBase_OK));
|
|
| 46 | 46 |
okButton.setImmediate(true); |
| 47 | 47 |
okButton.addStyleName("dialogButton"); //$NON-NLS-1$
|
| 48 | 48 |
buttonToolBar.addComponent(okButton); |
| src/main/resources/eu/etaxonomy/cdm/i18n/messages.properties | ||
|---|---|---|
| 1 |
AreaAndTaxonSettingsConfigWindow_AREAS=Areas |
|
| 2 |
AreaAndTaxonSettingsConfigWindow_TAXONOMY=Taxonomy |
|
| 3 |
AreaAndTaxonSettingsConfigWindow_LOADING_TAXA=Loading taxa... |
|
| 4 |
AreaAndTaxonSettingsConfigWindow_CLASSIFICATION=Classification |
|
| 5 |
AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE=Loading complete |
|
| 6 |
AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION=Please select a classification... |
|
| 7 |
AreaAndTaxonSettingsConfigWindow_FILTER=Filter |
|
| 8 |
AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME=Filter taxa by name... |
|
| 9 |
AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA=Distribution Area: |
|
| 10 |
AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA=Please select a distribution area... |
|
| 11 |
DetailWindow_NO_DESCRIPTIVE_DATA_FOUND=No descriptive data found |
|
| 12 |
DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS=Distribution Status: |
|
| 13 |
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Show abbreviated labels |
|
| 14 |
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Error during update of distribution term\! |
|
| 15 |
DistributionTableViewBean_AREAS_AND_TAXA=Areas and Taxa |
|
| 16 |
DistributionTableViewBean_SELECT_TAXON=Please select a taxon |
|
| 17 |
DistributionTableViewBean_STATUS=Status |
|
| 18 |
DistributionTableViewBean_TAXON=Taxon |
|
| 19 |
DistributionTableViewBean_TAXON_DETAILS=Taxon Details |
|
| 20 |
DistributionTableViewBean_TOTAL_TAXA=Total amount of Taxa displayed: %s |
|
| 21 |
DistributionToolbar_AREAS_AND_TAXA=Areas and Taxa |
|
| 22 |
DistributionToolbar_DETAIL=Detail |
|
| 23 |
DistributionToolbar_EDIT=Edit |
|
| 24 |
DistributionToolbar_LOGIN=Login |
|
| 25 |
DistributionToolbar_LOGOUT=Logout |
|
| 26 |
DistributionToolbar_SAVE=Save |
|
| 27 |
DistributionToolbar_STATUS=Status |
|
| 28 |
SettingsDialogWindowBase_CANCEL=Cancel |
|
| 29 |
SettingsDialogWindowBase_OK=OK |
|
| src/main/resources/eu/etaxonomy/cdm/i18n/messages_de.properties | ||
|---|---|---|
| 1 |
AreaAndTaxonSettingsConfigWindow_AREAS=Gebiete |
|
| 2 |
AreaAndTaxonSettingsConfigWindow_TAXONOMY=Taxonomie |
|
| 3 |
AreaAndTaxonSettingsConfigWindow_LOADING_TAXA=Lade Taxa... |
|
| 4 |
AreaAndTaxonSettingsConfigWindow_CLASSIFICATION=Klassifikation |
|
| 5 |
AreaAndTaxonSettingsConfigWindow_LOADING_COMPLETE=Ladevorgang abgeschlossen |
|
| 6 |
AreaAndTaxonSettingsConfigWindow_SELECT_CLASSIFICATION=Bitte w?hlen Sie eine Klassifikation aus... |
|
| 7 |
AreaAndTaxonSettingsConfigWindow_FILTER=Filter |
|
| 8 |
AreaAndTaxonSettingsConfigWindow_FILTER_TAXA_BY_NAME=Taxa nach Namen filtern... |
|
| 9 |
AreaAndTaxonSettingsConfigWindow_DISTRIBUTION_AREA=Verbreitungsgebiet: |
|
| 10 |
AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA=Bitte w?hlen Sie ein Verbreitungsgebiet aus... |
|
| 11 |
DetailWindow_NO_DESCRIPTIVE_DATA_FOUND=Keine deskriptive Daten gefunden |
|
| 12 |
DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS=Verbreitungsstatus: |
|
| 13 |
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Abk?rzungen anzeigen |
|
| 14 |
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Fehler beim Aktualisiren des Verbreitungs-Terms! |
|
| 15 |
DistributionTableViewBean_AREAS_AND_TAXA=Gebiete und Taxa |
|
| 16 |
DistributionTableViewBean_SELECT_TAXON=Bitte w?hlen Sie ein Taxon aus |
|
| 17 |
DistributionTableViewBean_STATUS=Status |
|
| 18 |
DistributionTableViewBean_TAXON=Taxon |
|
| 19 |
DistributionTableViewBean_TAXON_DETAILS=Taxon Details |
|
| 20 |
DistributionTableViewBean_TOTAL_TAXA=Anzahl angezeigter Taxa: %s |
|
| 21 |
DistributionToolbar_AREAS_AND_TAXA=Gebiete und Taxa |
|
| 22 |
DistributionToolbar_DETAIL=Detail |
|
| 23 |
DistributionToolbar_EDIT=Bearbeiten |
|
| 24 |
DistributionToolbar_LOGIN=Einloggen |
|
| 25 |
DistributionToolbar_LOGOUT=Ausloggen |
|
| 26 |
DistributionToolbar_SAVE=Speichern |
|
| 27 |
DistributionToolbar_STATUS=Status |
|
| 28 |
SettingsDialogWindowBase_CANCEL=Abbrechen |
|
| 29 |
SettingsDialogWindowBase_OK=OK |
|
Also available in: Unified diff
ref #7097 configure language based on vaadin session locale