r3913 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/ui/config java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/variable java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/vcs java/fr/ifremer/isisfish/ui/widget/filter resources/i18n - Isis-fish-commits

1 Apr 2014

Author: echatellier
Date: 2014-04-01 18:27:53 +0200 (Tue, 01 Apr 2014)
New Revision: 3913

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3913

Log:
Finish i18n migration

Modified:
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
   branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
===================================================================

--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric
+  Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
@@ -35,7 +35,7 @@
     
     ]]></script>
 
-  <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}'
+  <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.connection"))}'
     fill='horizontal'>
     <row>
       <cell>
@@ -70,7 +70,7 @@
       </cell>
     </row>
   </Table>
-  <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'>
+  <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.environment"))}'>
     <row fill='horizontal'>
       <cell>
         <JLabel id='sshUserhomeLabel' text='isisfish.config.main.simulation.ssh.userhome'
@@ -194,7 +194,7 @@
       </cell>
     </row>
   </Table>
-  <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.status"))}'>
+  <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.status"))}'>
     <row fill='horizontal'>
       <cell columns="2" fill='horizontal'>
         <JLabel id='messageLabel' text=' ' font-weight='bold' opaque='true' horizontalAlignment='center'

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     java.awt.event.MouseEvent;
     fr.ifremer.isisfish.entities.Cell;
     com.bbn.openmap.gui.Tool;
@@ -54,8 +54,8 @@
 boolean cellChanged = true;
 
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueZones"));
-    setNextPath(n_("isisfish.input.tree.zones"));
+    setButtonTitle(t("isisfish.input.continueZones"));
+    setNextPath(n("isisfish.input.tree.zones"));
 
     new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) {
         @Override

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -148,7 +148,7 @@
                     </JScrollPane>
                 </cell>
                 <cell columns='2' fill='both' weightx='1.0'>
-                    <Table border='{BorderFactory.createTitledBorder(_("isisfish.effortDescription.effortTitle"))}'>
+                    <Table border='{BorderFactory.createTitledBorder(t("isisfish.effortDescription.effortTitle"))}'>
                         <row>
                             <cell anchor='east'>
                                 <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{getEffortDescription() != null}'/>
@@ -193,7 +193,7 @@
              </row>
              <row>
                 <cell columns='2' fill='both' weighty='1.0'>
-                     <Table anchor='north' fill='both' weighty='1.0' border='{BorderFactory.createTitledBorder(_("isisfish.effortDescription.economicTitle"))}'>
+                     <Table anchor='north' fill='both' weighty='1.0' border='{BorderFactory.createTitledBorder(t("isisfish.effortDescription.economicTitle"))}'>
                         <row>
                             <cell anchor='east' fill='none' weighty='0.0'>
                                 <JLabel text="isisfish.effortDescription.crewSize" enabled='{getEffortDescription() != null}'/>

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.FisheryRegion;
     fr.ifremer.isisfish.map.CopyMapToClipboardListener;
     com.bbn.openmap.gui.Tool;
@@ -55,8 +55,8 @@
     // add copy to clipboard support
     cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap));
     
-    setButtonTitle(_("isisfish.input.continueCells"));
-    setNextPath(n_("isisfish.input.tree.cells"));
+    setButtonTitle(t("isisfish.input.continueCells"));
+    setNextPath(n("isisfish.input.tree.cells"));
     
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
@@ -119,11 +119,11 @@
 
 protected void check() {
     getContextValue(InputAction.class).checkFisheryRegion(getBean());
-    setInfoText(_("isisfish.message.check.finished"));
+    setInfoText(t("isisfish.message.check.finished"));
 }
 
 protected void save() {
-    setInfoText(_("isisfish.message.checking.cell"));
+    setInfoText(t("isisfish.message.checking.cell"));
 
     // this make save done by verifier instead of saveFisheryRegion
     // and refresh tree is not working
@@ -136,7 +136,7 @@
     InputUI inputUI = getParentContainer(InputUI.class);
     inputUI.getHandler().reloadFisheryTree(inputUI);
 
-    setInfoText(_("isisfish.message.save.finished"));
+    setInfoText(t("isisfish.message.save.finished"));
 }
     ]]></script>
     <JPanel id="body">

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -27,15 +27,15 @@
     <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     java.beans.PropertyChangeEvent;
     java.beans.PropertyChangeListener;
     </import>
     <script><![CDATA[
 
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueMetiers"));
-    setNextPath(n_("isisfish.input.tree.metiers"));
+    setButtonTitle(t("isisfish.input.continueMetiers"));
+    setNextPath(n("isisfish.input.tree.metiers"));
     
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -154,7 +154,7 @@
 
     // TODO binding don't work
     if (getText() == null) {
-        setText(_("isisfish.common.equation"));    
+        setText(t("isisfish.common.equation"));    
     }
 
     editor.getCurrentEditor().removeDocumentListener(listener);
@@ -199,7 +199,7 @@
 protected void saveModel() {
     getContextValue(InputAction.class).saveAsModel(formuleCategory, "Java", editor.getText());
     setComboModel();
-    setInfoText(_("isisfish.message.saveModel.finished"));
+    setInfoText(t("isisfish.message.saveModel.finished"));
 }
 
 /**

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -27,14 +27,14 @@
     <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n._
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.t
+    static org.nuiton.i18n.I18n.n
     </import>
 
 <script><![CDATA[
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueTripTypes"));
-    setNextPath(n_("isisfish.input.tree.triptypes"));
+    setButtonTitle(t("isisfish.input.continueTripTypes"));
+    setNextPath(n("isisfish.input.tree.triptypes"));
     
     // install change listener
     // (depends on sensitivity can't be done on constructor)

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -82,8 +82,8 @@
  */
 protected void createGroups() {
 
-    int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"),
-        _("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+    int response = JOptionPane.showConfirmDialog(this, t("isisfish.populationBasics.confirmCreateGroups"),
+        t("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
     
     if (response == JOptionPane.YES_OPTION) {
         JFrame wizardFrame = new JFrame();
@@ -91,7 +91,7 @@
         WizardGroupCreationUI wizard = new WizardGroupCreationUI(this);
         wizard.init(this);
         wizardFrame.add(wizard, BorderLayout.CENTER);
-        wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title"));
+        wizardFrame.setTitle(t("isisfish.wizardGroupCreation.title"));
         Species species = getBean().getSpecies();
         wizard.setAgeType(species.getAgeGroupType());
         if (wizard.isAgeType()) {
@@ -129,7 +129,7 @@
     // create node and select it
     Population population = getContextValue(InputAction.class).createPopulation(getTopiaContext(), species);
     inputUI.getHandler().insertTreeNode(inputUI, Population.class, population);
-    setInfoText(_("isisfish.message.creation.finished"));
+    setInfoText(t("isisfish.message.creation.finished"));
 }
     ]]>
     </script>

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -163,17 +163,17 @@
                 <cell columns='2' fill='both' weightx='1.0' weighty='0.7'>
                     <JPanel id="hidablePanel" layout='{new CardLayout()}'>
                         <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"' enabled='{getPopInfo() != null}'>
-                            <tab title='{_("isisfish.populationMigrationMigration.title")}'>
+                            <tab title='{t("isisfish.populationMigrationMigration.title")}'>
                               <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed'
                               bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}"
                               _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"MigrationMatrix"' />
                             </tab>
-                            <tab title='{_("isisfish.populationMigrationImmigration.title")}'>
+                            <tab title='{t("isisfish.populationMigrationImmigration.title")}'>
                               <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed'
                               bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}"
                               _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ImmigrationMatrix"' />
                             </tab>
-                            <tab title='{_("isisfish.populationMigrationEmigration.title")}'>
+                            <tab title='{t("isisfish.populationMigrationEmigration.title")}'>
                               <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed'
                               bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}"
                               _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"EmigrationMatrix"' />

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -77,7 +77,7 @@
         if (log.isErrorEnabled()) {
             log.error("Can't (un)spacialize Matrix Change Of Group", eee);
         }
-        ErrorHelper.showErrorDialog(_("isisfish.error.input.spacializematrix"), eee);
+        ErrorHelper.showErrorDialog(t("isisfish.error.input.spacializematrix"), eee);
     }
 }
 
@@ -98,7 +98,7 @@
     }
     MatrixPanelEditor panel = new MatrixPanelEditor(false, 800, 300);
     panel.setMatrix(lengthChangeMatrix);
-    JOptionPane.showMessageDialog(this, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE);
+    JOptionPane.showMessageDialog(this, panel, t("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE);
 }
     ]]></script>
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,13 +28,13 @@
     <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     </import>
 
     <script><![CDATA[
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueGears"));
-    setNextPath(n_("isisfish.input.tree.gears"));
+    setButtonTitle(t("isisfish.input.continueGears"));
+    setNextPath(n("isisfish.input.tree.gears"));
     
     // install change listener
     // (depends on sensitivity can't be done on constructor)

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.Port
     fr.ifremer.isisfish.entities.Cell
     com.bbn.openmap.gui.Tool
@@ -80,8 +80,8 @@
         }
     };
 
-    setButtonTitle(_("isisfish.input.continueSpecies"));
-    setNextPath(n_("isisfish.input.tree.species"));
+    setButtonTitle(t("isisfish.input.continueSpecies"));
+    setNextPath(n("isisfish.input.tree.species"));
     
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -27,13 +27,13 @@
     <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     </import>
 
     <script><![CDATA[
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueStrategies"));
-    setNextPath(n_("isisfish.input.tree.strategies"));
+    setButtonTitle(t("isisfish.input.continueStrategies"));
+    setNextPath(n("isisfish.input.tree.strategies"));
 
     // install change listener
     // (depends on sensitivity can't be done on constructor)

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.Species;
     java.beans.PropertyChangeEvent;
     java.beans.PropertyChangeListener;
@@ -42,7 +42,7 @@
 
     <script><![CDATA[
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continuePopulations"));
+    setButtonTitle(t("isisfish.input.continuePopulations"));
     
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
@@ -67,10 +67,10 @@
     InputUI inputUI = getParentContainer(InputUI.class);
     if (inputUI != null) {
         if (getBean() == null) {
-            inputUI.getHandler().setTreeSelection(this, n_("isisfish.input.tree.species"), n_("isisfish.input.tree.populations"));
+            inputUI.getHandler().setTreeSelection(this, n("isisfish.input.tree.species"), n("isisfish.input.tree.populations"));
         }
         else {
-            inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n_("isisfish.input.tree.populations"));
+            inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n("isisfish.input.tree.populations"));
         }
     }
 }

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -43,7 +43,7 @@
     org.apache.commons.lang3.StringUtils
     java.beans.PropertyChangeEvent
     java.beans.PropertyChangeListener
-    static org.nuiton.i18n.I18n._
+    static org.nuiton.i18n.I18n.t
     org.nuiton.math.matrix.gui.MatrixPanelEvent
     org.nuiton.math.matrix.MatrixND
     </import>
@@ -193,55 +193,55 @@
             <row>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyJanuary' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo0()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo0()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.january"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyFebuary' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo1()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo1()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.february"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyMarch' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo2()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo2()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.march"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyApril' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo3()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo3()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.april"))}' />
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyMay' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo4()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo4()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.may"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyJune' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo5()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo5()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.june"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyJuly' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo6()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo6()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.july"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyAugust' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo7()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo7()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.august"))}' />
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategySeptember' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo8()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo8()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.september"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyOctober' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo9()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo9()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.october"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyNovember' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo10()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo10()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.november"))}' />
                 </cell>
                 <cell fill='horizontal' weightx='1' insets='0'>
                     <StrategyOneMonthInfoUI id='strategyDecember' bean="{getBean()}" active="{isActive()}" constructorParams='this'
-                        strategyMonthInfo="{getStrategyMonthInfo11()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' />
+                        strategyMonthInfo="{getStrategyMonthInfo11()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.december"))}' />
                 </cell>
             </row>
             <row>

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.TripType
     fr.ifremer.isisfish.types.TimeUnit
     java.beans.PropertyChangeEvent
@@ -43,8 +43,8 @@
 
     <script><![CDATA[
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueVesselTypes"));
-    setNextPath(n_("isisfish.input.tree.vesseltypes"));
+    setButtonTitle(t("isisfish.input.continueVesselTypes"));
+    setNextPath(n("isisfish.input.tree.vesseltypes"));
 
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -28,7 +28,7 @@
     <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.VesselType
     fr.ifremer.isisfish.entities.TripType
     fr.ifremer.isisfish.types.TimeUnit
@@ -47,8 +47,8 @@
 protected boolean init;
 
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continueSetOfVessels"));
-    setNextPath(n_("isisfish.input.tree.setofvessels"));
+    setButtonTitle(t("isisfish.input.continueSetOfVessels"));
+    setNextPath(n("isisfish.input.tree.setofvessels"));
 
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -270,10 +270,10 @@
                     int numberOfGroup = getNumberOfGroup();
                     double step = getGroupSize();
                     if (numberOfGroup < 0){
-//                            return new OutputView("Error.xml", "error", _("isisfish.error.number.classes.upper.zero"));
+//                            return new OutputView("Error.xml", "error", t("isisfish.error.number.classes.upper.zero"));
                     }
                     if (step == 0){
-//                            return new OutputView("Error.xml", "error", _("isisfish.error.no.null.time.step"));
+//                            return new OutputView("Error.xml", "error", t"isisfish.error.no.null.time.step"));
                     }
 
                     double maxLength = minLength;
@@ -295,7 +295,7 @@
 
                     Equation equation = pop.getGrowth();
                     if(equation == null){
-//                            return new OutputView("Error.xml", "error", _("isisfish.error.growth.equation.before.create.group.population"));
+//                            return new OutputView("Error.xml", "error", t("isisfish.error.growth.equation.before.create.group.population"));
                     }
                     double deltat = -1;
                     double Lmin = minLength;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -27,13 +27,13 @@
     <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/>
 
     <import>
-    static org.nuiton.i18n.I18n.n_
+    static org.nuiton.i18n.I18n.n
     </import>
     <script><![CDATA[
 
 protected void $afterCompleteSetup() {
-    setButtonTitle(_("isisfish.input.continuePorts"));
-    setNextPath(n_("isisfish.input.tree.ports"));
+    setButtonTitle(t("isisfish.input.continuePorts"));
+    setNextPath(n("isisfish.input.tree.ports"));
 
     // install change listener
     // (depends on sensitivity can't be done on constructor)

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -52,7 +52,7 @@
     <Table>
         <row>
             <cell fill="both" weightx='1.0' weighty='1.0'>
-                <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variableslist"))}'>
+                <Table border='{BorderFactory.createTitledBorder(t("isisfish.variables.variableslist"))}'>
                     <row>
                         <cell fill="both" weightx='1.0' weighty='1.0'>
                             <JScrollPane>
@@ -73,7 +73,7 @@
                 </Table>
             </cell>
             <cell fill="both" weightx='3.0' weighty='1.0' rows="2">
-                <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'>
+                <Table border='{BorderFactory.createTitledBorder(t("isisfish.variables.variabledetail"))}'>
                     <row>
                         <cell fill="horizontal">
                             <JLabel text="isisfish.variables.entityname"

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -37,7 +37,7 @@
     <!-- <row>
         <cell fill="horizontal">
             <com.bbn.openmap.InformationDelegator id="informationDelegator"
-                label='{_("isisfish.simpleResult.more.information")}'
+                label='{t("isisfish.simpleResult.more.information")}'
                 map="{getIsisMapBean()}" showLights="false" />
         </cell>
     </row> -->

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -91,7 +91,7 @@
         Map<String, String> tagValues = getContextValue(SimulAction.class).getSimulationParameter().getTagValue();
         
         // TODO make a table model for it
-        String columnName[] = { _("isisfish.common.tag"), _("isisfish.common.value")};
+        String columnName[] = { t("isisfish.common.tag"), t("isisfish.common.value")};
         if (tagValues != null) {
             DefaultTableModel model = new DefaultTableModel(columnName, tagValues.size()) {
                 @Override
@@ -212,7 +212,7 @@
     </row>
     <row>
         <cell columns="5" fill="both" weighty="1" weightx="1">
-            <Table border='{BorderFactory.createTitledBorder(_("isisfish.advancedParams.freeParameters"))}'>
+            <Table border='{BorderFactory.createTitledBorder(t("isisfish.advancedParams.freeParameters"))}'>
                 <row>
                     <cell fill="horizontal">
                         <JLabel text="isisfish.common.tag"/>

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -87,7 +87,7 @@
         getSimulAction().getSimulationParameter().setExportNames(exportNames);
         
         getSimulAction().saveExport();
-        setInfoText(_("isisfish.export.saved"));
+        setInfoText(t("isisfish.export.saved"));
     }
     
     protected void setInfoText(String txt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -114,14 +114,14 @@
         log.debug(" selected " + selected);
     }
     if(selected != null && !selected.trim().isEmpty()) {
-        getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.region"));
+        getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.loading.region"));
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
                 simulAction.regionChange(ParamsUI.this, selected);
                 refresh();
                 setSensitivityTabRegion();
-                getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.region.loaded"));
+                getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.region.loaded"));
             }
         });
     }
@@ -176,7 +176,7 @@
     final String selected = fieldSimulParamsSelect.getSelectedItem().toString();
     // le premier item est " " pour ne pas avoir de selection par defaut
     if (selected != null && !selected.equals(" ")) {
-        getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.old.simulation"));
+        getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.loading.old.simulation"));
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
@@ -191,7 +191,7 @@
                 // regles
                 ruleChooser.setRulesList(simulAction.getSimulationParameter().getRules());
 
-                getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.old.simulation.loaded"));
+                getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.old.simulation.loaded"));
             }
         });
     }
@@ -327,7 +327,7 @@
                             <row>
                                 <cell fill="horizontal">
                                     <JLabel id='lblName'
-                                        text='{isSensitivity() ? _("isisfish.params.sensitivityName") : _("isisfish.params.simulationName")}'
+                                        text='{isSensitivity() ? t("isisfish.params.sensitivityName") : t("isisfish.params.simulationName")}'
                                         minimumSize='{new Dimension(195,25)}'
                                         preferredSize='{new Dimension(195,25)}' />
                                 </cell>
@@ -403,7 +403,7 @@
                 <row>
                     <cell columns="4" fill="both" weightx="1.0" weighty="0.6">
                         <JTabbedPane id="parametersTabbedPane" enabled="{getRegionStorage() != null}">
-                            <tab title='{_("isisfish.params.stategiesAndPopulations")}'>
+                            <tab title='{t("isisfish.params.stategiesAndPopulations")}'>
                                 <Table>
                                     <row>
                                         <cell fill="horizontal">
@@ -453,7 +453,7 @@
                                     </row>
                                 </Table>
                             </tab>
-                            <tab title='{_("isisfish.params.rules")}'>
+                            <tab title='{t("isisfish.params.rules")}'>
                                 <Table>
                                     <row>
                                         <cell fill="both" weightx="1" weighty="1">

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -68,7 +68,7 @@
   
     protected void saveConfigResultNames() {
         getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValues());
-        setStatusMessage(_("isisfish.resultChoice.saved"));
+        setStatusMessage(t("isisfish.resultChoice.saved"));
     }
 
     protected void setStatusMessage(String txt) {

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -76,9 +76,9 @@
 
         StringBuilder builder = new StringBuilder();
         builder.append("<a href='").append(DOC_URL).append("'>");
-        builder.append(_("isisfish.vcs.howto.save.key")).append("</a><br/>");
+        builder.append(t("isisfish.vcs.howto.save.key")).append("</a><br/>");
         builder.append("<a href='").append(REGISTER_KEY_URL).append("'>");
-        builder.append(_("isisfish.vcs.save.key")).append("</a>");
+        builder.append(t("isisfish.vcs.save.key")).append("</a>");
 
         helpEditor.setEditorKit(new HTMLEditorKit());
         helpEditor.setText(builder.toString());

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2014-04-01 16:27:53 UTC (rev 3913)
@@ -151,7 +151,7 @@
     }
     protected void refreshResult() {
         if (model == null) return;
-        labelResult.setText(_("isisfish.filter.result.found", model.getNbResult(), model.getNbOriginal()));
+        labelResult.setText(t("isisfish.filter.result.found", model.getNbResult(), model.getNbOriginal()));
 
         if (getComboResult() != null) {
             if (modelResult == null) {

Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties
===================================================================
--- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties	2014-04-01 15:05:25 UTC (rev 3912)
+++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties	2014-04-01 16:27:53 UTC (rev 3913)
@@ -655,7 +655,9 @@
 isisfish.month.september=september
 isisfish.optimisation.observation=
 isisfish.optimization.export=
+isisfish.optimization.exports=
 isisfish.optimization.methodfactorsupported=
+isisfish.optimization.objective=
 isisfish.optimization.objectives=
 isisfish.optimization.observation=
 isisfish.optimization.optimization=

    

echatellier＠users.forge.codelutin.com

tags

participants (1)