Project

General

Profile

« Previous | Next » 

Revision c3333d6a

Added by Fabian Reimeier over 5 years ago

ref #7097 added translations and fixed NPE

View differences:

src/main/java/eu/etaxonomy/cdm/i18n/Messages.java
36 36 
    public static String DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS = "DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS";
37 37 
    public static String DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM = "DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM";
38 38 
    public static String DistributionTableViewBean_AREAS_AND_TAXA = "DistributionTableViewBean_AREAS_AND_TAXA";
39 
    public static String DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS = "DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS";
40 
    public static String DistributionTableViewBean_NO_STATUS_SELECT = "DistributionTableViewBean_NO_STATUS_SELECT";
39 41 
    public static String DistributionTableViewBean_SELECT_TAXON = "DistributionTableViewBean_SELECT_TAXON";
40 42 
    public static String DistributionTableViewBean_STATUS = "DistributionTableViewBean_STATUS";
41 43 
    public static String DistributionTableViewBean_TAXON = "DistributionTableViewBean_TAXON";
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java
166 166 
                    }
167 167 
                }
168 168 
                //popup window
169 
                final Window popup = new Window("Choose distribution status");
169 
                final Window popup = new Window(Messages.getLocalizedString(Messages.DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS));
170 170 
                final ListSelect termSelect = new ListSelect();
171 171 
                termSelect.setSizeFull();
172 172 
                termSelect.setContainerDataSource(getPresenter().getPresenceAbsenceTermContainer());
173 173 
                termSelect.setNullSelectionAllowed(presenceAbsenceTerm != null);
174 174 
                if(presenceAbsenceTerm != null){
175 
                	termSelect.setNullSelectionItemId("[no status]");
175 
                	termSelect.setNullSelectionItemId(Messages.getLocalizedString(Messages.DistributionTableViewBean_NO_STATUS_SELECT));
176 176 
                }else{
177 177 
                    logger.debug("No distribution status exists yet for area");
178 178 
                }
......
258 258 

  		




  259
  259
  
    
		table.setVisibleColumns(columnList.toArray());


  		




  260
  260
  
    
		table.setColumnHeaders(columnList.toArray(string));


  		




  261
  
  
    
		table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, String.format(Messages.getLocalizedString(Messages.DistributionTableViewBean_TOTAL_TAXA), gridcontainer.size()));


  		




  
  261
  
    
		table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, String.format(Messages.getLocalizedString(Messages.DistributionTableViewBean_TOTAL_TAXA), container.size()));


  		




  262
  262
  
    

  		




  263
  263
  
    
//        gridcontainer = getPresenter().getAreaDistributionStatusContainer();


  		




  264
  264
  
    
//        if(gridcontainer==null){


  		












  

    
      src/main/resources/eu/etaxonomy/cdm/i18n/messages.properties
    
  





  13
  13
  
    
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Show abbreviated labels


  		




  14
  14
  
    
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Error during update of distribution term\!


  		




  15
  15
  
    
DistributionTableViewBean_AREAS_AND_TAXA=Areas and Taxa


  		




  
  16
  
    
DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS=Choose distribution status


  		




  
  17
  
    
DistributionTableViewBean_NO_STATUS_SELECT=[no status]


  		




  16
  18
  
    
DistributionTableViewBean_SELECT_TAXON=Please select a taxon


  		




  17
  19
  
    
DistributionTableViewBean_STATUS=Status


  		




  18
  20
  
    
DistributionTableViewBean_TAXON=Taxon


  		












  

    
      src/main/resources/eu/etaxonomy/cdm/i18n/messages_de.properties
    
  





  10
  10
  
    
AreaAndTaxonSettingsConfigWindow_SELECT_DISTRIBUTION_AREA=Bitte w?hlen Sie ein Verbreitungsgebiet aus...


  		




  11
  11
  
    
DetailWindow_NO_DESCRIPTIVE_DATA_FOUND=Keine deskriptive Daten gefunden


  		




  12
  12
  
    
DistributionStatusSettingsConfigWindow_DISTRIBUTION_STATUS=Verbreitungsstatus:


  		




  13
  
  
    
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Abk?rzungen anzeigen


  		




  
  13
  
    
DistributionStatusSettingsConfigWindow_SHOW_ABBREVIATED_LABELS=Abk?rzungen verwenden


  		




  14
  14
  
    
DistributionTablePresenter_ERROR_UPDATE_DISTRIBUTION_TERM=Fehler beim Aktualisiren des Verbreitungs-Terms!


  		




  15
  15
  
    
DistributionTableViewBean_AREAS_AND_TAXA=Gebiete und Taxa


  		




  
  16
  
    
DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS=Verbreitungs-Status w?hlen


  		




  
  17
  
    
DistributionTableViewBean_NO_STATUS_SELECT=[kein Status]


  		




  16
  18
  
    
DistributionTableViewBean_SELECT_TAXON=Bitte w?hlen Sie ein Taxon aus


  		




  17
  19
  
    
DistributionTableViewBean_STATUS=Status


  		




  18
  20
  
    
DistributionTableViewBean_TAXON=Taxon


  		












Also available in:  Unified diff