Author: sletellier Date: 2009-01-30 09:28:04 +0000 (Fri, 30 Jan 2009) New Revision: 1762 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -140,7 +140,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{jaxx.runtime.Util.getStringValue(getEffortDescription().getFishingOperationDuration())}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -47,7 +47,7 @@ protected OMToolSet toolSet = new OMToolSet(); -setButtonTitle("isisfish.input.continueCells"); +setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); public void refresh(){ getVerifier().setSaveButton(save, false); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,11 +39,11 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Metier; -setButtonTitle("isisfish.input.continueMetiers"); +setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(gearTabUI, selectivityUI); + getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.Metier; -setButtonTitle("isisfish.input.continueTripTypes"); +setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -46,11 +46,11 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -setButtonTitle("isisfish.input.continueGears"); +setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ - getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); + getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -58,7 +58,7 @@ protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; -setButtonTitle("isisfish.input.continueSpecies"); +setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,11 +39,11 @@ <script><![CDATA[ -setButtonTitle("isisfish.input.continueStrategies"); +setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); + getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -44,7 +44,7 @@ import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.SpeciesImpl; -setButtonTitle("isisfish.input.continuePopulations"); +setButtonTitle(_("isisfish.input.continuePopulations")); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,7 +39,7 @@ strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(strategyTabUI, strategyMonthInfoUI); + getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -43,7 +43,7 @@ import fr.ifremer.isisfish.entities.TripTypeImpl; import fr.ifremer.isisfish.types.TimeUnit; -setButtonTitle("isisfish.input.continueVesselTypes"); +setButtonTitle(_("isisfish.input.continueVesselTypes")); setNextPath("$root/$vesselTypes"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -42,7 +42,7 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.types.TimeUnit; -setButtonTitle("isisfish.input.continueSetOfVessels"); +setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-30 09:28:04 UTC (rev 1762) @@ -444,8 +444,18 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Sum elements per year isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 -isisfish.input.continuePorts=Continue to Ports -isisfish.input.continueZones=Continue to Zones +isisfish.input.continueCell=Continue to cells +isisfish.input.continueCells= +isisfish.input.continueGears=Continue to gears +isisfish.input.continueMetiers=Continue to metiers +isisfish.input.continuePopulations=Continue to populations +isisfish.input.continuePorts=Continue to ports +isisfish.input.continueSetOfVessels=Continue to set of vessels +isisfish.input.continueSpecies= +isisfish.input.continueStrategies=Continue to strategies +isisfish.input.continueTripTypes=Continue to trip type +isisfish.input.continueVesselTypes=Continue to vessel types +isisfish.input.continueZones=Continue to zones isisfish.input.menu.addRegion=Add region isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy Region Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-30 09:28:04 UTC (rev 1762) @@ -444,8 +444,17 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 +isisfish.input.continueCell=Continuer vers les cells +isisfish.input.continueCells= +isisfish.input.continueGears=Continuer vers les gears +isisfish.input.continueMetiers=Continuer vers les metiers +isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueZones=Continuer vers les zones +isisfish.input.continueSetOfVessels=Continuer vers les set of vessels +isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces +isisfish.input.continueStrategies=Continuer vers les strategies +isisfish.input.continueTripTypes=Continuer vers les trip type +isisfish.input.continueVesselTypes=Continuer vers les vessel type isisfish.input.menu.addRegion=Ajouter une r\u00E9gion isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier r\u00E9gion