Author: tchemit Date: 2012-08-02 15:15:58 +0200 (Thu, 02 Aug 2012) New Revision: 344 Url: http://forge.codelutin.com/repositories/revision/sammoa/344 Log: use only gb i18n Removed: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_fr_FR.properties trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_fr_FR.properties Modified: trunk/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/pom.xml 2012-08-02 13:15:58 UTC (rev 344) @@ -128,6 +128,9 @@ <slf4jVersion>1.6.6</slf4jVersion> <logbackVersion>1.0.2</logbackVersion> + <i18n.bundles>en_GB</i18n.bundles> + <i18n.silent>false</i18n.silent> + <!--<googleSearchEnabled>true</googleSearchEnabled>--> <!-- license header configuration --> Deleted: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_fr_FR.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_fr_FR.properties 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_fr_FR.properties 2012-08-02 13:15:58 UTC (rev 344) @@ -1,33 +0,0 @@ -sammoa.config.admin.email=E-mail de l'administrateur -sammoa.config.application.site.url=Site Internet de l'application -sammoa.config.application.version=Version de l'application -sammoa.config.audio.directory=Répertoire où sont stockés les enregistrements audio -sammoa.config.background.shape.file= -sammoa.config.campaign.id= -sammoa.config.data.directory=Répertoire principale où sont stockées les données. Vous pouvez utiliser ${data.directory} pour d'autres propriétés (ex\: ${data.directory}/audio). -sammoa.config.effort.number= -sammoa.config.flight.number= -sammoa.config.fly.mode= -sammoa.config.gps.check.period= -sammoa.config.gps.device= -sammoa.config.gps.handler= -sammoa.config.gps.speed= -sammoa.config.gps.timeout= -sammoa.config.log.file=Chemin vers le fichier journal (log) de l'application -sammoa.config.observation.number= -sammoa.config.strate.shape.file= -sammoa.config.system.id= -sammoa.config.transect.shape.file= -sammoa.config.ui.add=Ajouter -sammoa.config.ui.begin=Démarrer -sammoa.config.ui.centerObservation=Observation depuis la place du milieu -sammoa.config.ui.circleBack=Faire un "circle-back" -sammoa.config.ui.config=Chemin vers le fichier de configuration des fenêtres de l'application -sammoa.config.ui.end=Fin -sammoa.config.ui.leftObservation=Observation depuis la place de gauche -sammoa.config.ui.locale=Langue -sammoa.config.ui.next=Suivant -sammoa.config.ui.rightObservation=Observation depuis la place de droite -sammoa.config.ui.start=Démarrer -sammoa.config.ui.stop=Arrêter -sammoa.copyright.text=Copyright CRMM 2012 Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css 2012-08-02 13:15:58 UTC (rev 344) @@ -32,18 +32,6 @@ mnemonic:F; } -#menuApplicationLanguageFR { - text:"sammoa.action.locale.fr"; - toolTipText:"sammoa.action.locale.fr.tip"; - actionIcon:"i18n-fr"; -} - -#menuApplicationLanguageUK { - text:"sammoa.action.locale.uk"; - toolTipText:"sammoa.action.locale.uk.tip"; - actionIcon:"i18n-uk"; -} - #menuFileConfiguration { text:"sammoa.action.configuration"; toolTipText:"sammoa.action.configuration.tip"; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-08-02 13:15:58 UTC (rev 344) @@ -62,11 +62,6 @@ <JMenuItem id='menuFileConfiguration' onActionPerformed="getHandler().showConfig()"/> <JSeparator/> - <JMenuItem id='menuApplicationLanguageUK' - onActionPerformed="getHandler().changeLanguage(Locale.UK)"/> - <JMenuItem id='menuApplicationLanguageFR' - onActionPerformed="getHandler().changeLanguage(Locale.FRANCE)"/> - <JSeparator/> <JMenuItem id='exit' onActionPerformed='getHandler().closeSammoa()'/> </JMenu> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-02 13:15:58 UTC (rev 344) @@ -49,7 +49,6 @@ import java.awt.Desktop; import java.io.File; import java.net.URL; -import java.util.Locale; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -214,16 +213,6 @@ ui.setVisible(true); } - public void changeLanguage(Locale locale) { - - // sauvegarde de la nouvelle locale - getConfig().setLocale(locale); - getConfig().save(); - - // reload sammoa - reloadSammoa(); - } - public void showConfig() { SammoaConfig config = context.getConfig(); Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-02 13:15:58 UTC (rev 344) @@ -5,7 +5,7 @@ sammoa.action.about.tip=About sammoa.action.break.tip=Break sammoa.action.cancel=Cancel -sammoa.action.choose.export.directory= +sammoa.action.choose.export.directory=Accept sammoa.action.circleback.tip=Circle Back sammoa.action.close=Close sammoa.action.configuration=Configuration @@ -14,6 +14,7 @@ sammoa.action.edit=Edit sammoa.action.export=Export sammoa.action.exportEffortsMap=Export Efforts +sammoa.action.exportGeoPointsMap=Export GPS Points sammoa.action.exportMap=Export Maps sammoa.action.exportObservationsMap=Export Observations sammoa.action.home=Home @@ -85,6 +86,7 @@ sammoa.label.campaign.transect=Transects\: sammoa.label.exportDirectory=Export directory sammoa.label.exportEffortsFilename=Export filename (Efforts) +sammoa.label.exportGeoPointsFilename=Export filename (GeoPoints) sammoa.label.exportObservationsFilename=Export filename (Observations) sammoa.label.flight=Flight\: sammoa.label.flight.beginDate=Start @@ -199,8 +201,11 @@ sammoa.timePattern=HH\:mm\:ss sammoa.title.about=About Sammoa sammoa.title.campaign=Campaign -sammoa.title.choose.export.directory= -sammoa.title.exportshape= +sammoa.title.choose.export.directory=Choose directory where to export maps +sammoa.title.export.exportEfforts= +sammoa.title.export.exportGeoPoints= +sammoa.title.export.exportObservations= +sammoa.title.exportshape=Export Maps sammoa.title.flight=System %1$s - Campaign %2$s - Region %3$s - Flight n°%4$d sammoa.title.home=Home sammoa.title.validation= Deleted: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_fr_FR.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_fr_FR.properties 2012-08-01 16:35:52 UTC (rev 343) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_fr_FR.properties 2012-08-02 13:15:58 UTC (rev 344) @@ -1,236 +0,0 @@ -SAMMOA=Sammoa -csv.import.error.unableToReadField=Unable to read value of column '%s' at line %s -sammoa.about.message=About Sammoa -sammoa.action.about=About -sammoa.action.about.tip=About -sammoa.action.break.tip=Break -sammoa.action.cancel=Cancel -sammoa.action.choose.export.directory= -sammoa.action.circleback.tip=Circle Back -sammoa.action.close=Close -sammoa.action.configuration=Configuration -sammoa.action.configuration.tip=Configuration -sammoa.action.create=Create -sammoa.action.edit=Edit -sammoa.action.export=Export -sammoa.action.exportEffortsMap=Export des efforts -sammoa.action.exportMap=Export Cartes -sammoa.action.exportObservationsMap=Export des Observations -sammoa.action.home=Home -sammoa.action.home.tip=Home -sammoa.action.import=Import -sammoa.action.locale.fr=fr -sammoa.action.locale.fr.tip=French -sammoa.action.locale.uk=en -sammoa.action.locale.uk.tip=English -sammoa.action.new=New -sammoa.action.next.tip=Next -sammoa.action.onBoard=On Board -sammoa.action.play.tip=Play -sammoa.action.quitExportMaps=Quitter -sammoa.action.reload.actions=Reload actions -sammoa.action.reload.ui=Reload sammoa ui -sammoa.action.save=Save -sammoa.action.site=Site -sammoa.action.site.tip=Display project site -sammoa.action.startFlight.tip=Start the flight -sammoa.action.stop.tip=Stop -sammoa.action.stopFlight.tip=Stop the flight -sammoa.action.validation=Validation -sammoa.config.category.applications=Application -sammoa.config.category.applications.description=Application -sammoa.config.category.other=Other -sammoa.config.category.other.description=Other -sammoa.config.category.shortcuts=Shortcuts -sammoa.config.category.shortcuts.description=List of all the shortcuts -sammoa.confirmDialog.campaignNotLoaded.message= -sammoa.confirmDialog.campaignNotLoaded.title= -sammoa.confirmDialog.flightInProgress.message.exit=A flight is in progress, are you sure you want to quit ? -sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ? -sammoa.confirmDialog.flightInProgress.title=Flight in progress -sammoa.copyright.text=Version %1$s UMS 3462, Codelutin @ 2012 -sammoa.datePattern=dd/MM/yyyy -sammoa.dateTimePattern=dd/MM/yyyy HH\:mm\:ss -sammoa.dialog.title.observerFile=Choose a csv file for observers -sammoa.dialog.title.region=Region -sammoa.dialog.title.speciesFile=Choose a csv file for species -sammoa.dialog.title.strateFile=Choose a shape file for strates -sammoa.dialog.title.transect=New Transect -sammoa.dialog.title.transectFile=Choose a shape file for transects -sammoa.flight.decorator.flight=Flight %1$d -sammoa.flight.decorator.newFlight=New flight -sammoa.flight.decorator.notEnded=not ended -sammoa.flight.decorator.notStarted=not started -sammoa.flightDialog.transecLbl=Transects / tracks\: -sammoa.flightPanel.table.column.action=Next -sammoa.flightPanel.table.column.crossingNumber=Crossing -sammoa.flightPanel.table.column.deleted=Del -sammoa.flightPanel.table.column.index=N° -sammoa.flightPanel.table.column.name=Name -sammoa.flightPanel.table.column.nbTimes=Nb Times -sammoa.flightPanel.table.column.position.co-navigator=Co-Nav -sammoa.flightPanel.table.column.position.left=Left -sammoa.flightPanel.table.column.position.navigator=Nav -sammoa.flightPanel.table.column.position.right=Right -sammoa.label.campaign=Campaign\: -sammoa.label.campaign.beginDate=Begin\: -sammoa.label.campaign.code=Code\: -sammoa.label.campaign.endDate=End\: -sammoa.label.campaign.name=Name\: -sammoa.label.campaign.observer=Observers\: -sammoa.label.campaign.period=Period\: -sammoa.label.campaign.period.filter=Period filter -sammoa.label.campaign.region=Region\: -sammoa.label.campaign.strate=Strates\: -sammoa.label.campaign.transect=Transects\: -sammoa.label.exportDirectory=Répertoire d'export -sammoa.label.exportEffortsFilename=Nom du fichier (Effort) -sammoa.label.exportObservationsFilename=Nom du fichier (Observations) -sammoa.label.flight=Flight\: -sammoa.label.flight.beginDate=Start -sammoa.label.flight.comment=Comment\: -sammoa.label.flight.endDate=Stop -sammoa.label.flight.immatriculation=Plane imma.\: -sammoa.label.flight.period=Time\: -sammoa.label.flight.platformType=Type\: -sammoa.label.observers=Observers\: -sammoa.label.region.code=Code\: -sammoa.label.region.name=Name\: -sammoa.label.region.species=Species\: -sammoa.label.routeTypeFilter=Route type filter -sammoa.label.speciesFilter=Species filter -sammoa.label.speciesTypeFilter=Species type filter -sammoa.label.strateFilter=Strate filter -sammoa.label.systemId=System Id\: -sammoa.label.transect.name=Name\: -sammoa.label.transect.strate=Strate\: -sammoa.map.mapFollow=Follow plane -sammoa.menu.exit=Exit -sammoa.menu.file=File -sammoa.menu.file.tip=File -sammoa.menu.help=Help -sammoa.menu.help.tip=Help -sammoa.menu.showLogs=Display logs -sammoa.menu.showLogs.tip=Display logs -sammoa.message.goto.site=Opening %1$s on navigator -sammoa.messageDialog.observers.import.success=%1$d observers are successfully imported -sammoa.messageDialog.species.import.success=%1$d species are successfully imported -sammoa.messageDialog.strates.import.success=%1$d strates are successfully imported -sammoa.messageDialog.transects.import.success=%1$d transects are successfully imported -sammoa.observation.observations.center=Center -sammoa.observation.observations.left=Left -sammoa.observation.observations.right=Right -sammoa.observation.title=<html><b>Observation</b></html> -sammoa.observationCondition.title=<html><b>Conditions</b></html> -sammoa.observations.observationTable.column.age=Age -sammoa.observations.observationTable.column.age.tip=Age -sammoa.observations.observationTable.column.behaviour=Behaviour -sammoa.observations.observationTable.column.behaviour.tip=Behaviour -sammoa.observations.observationTable.column.calves=Calves -sammoa.observations.observationTable.column.calves.tip=Calves -sammoa.observations.observationTable.column.circleback=Circle back -sammoa.observations.observationTable.column.circleback.tip=Circle back -sammoa.observations.observationTable.column.comment=Comments -sammoa.observations.observationTable.column.comment.tip=Comments -sammoa.observations.observationTable.column.cue=Cue -sammoa.observations.observationTable.column.cue.tip=Cue -sammoa.observations.observationTable.column.decAngle=Angle -sammoa.observations.observationTable.column.decAngle.tip=Angle -sammoa.observations.observationTable.column.deleted=Del -sammoa.observations.observationTable.column.deleted.tip=Del -sammoa.observations.observationTable.column.observationNumber=N° -sammoa.observations.observationTable.column.observationNumber.tip=N° -sammoa.observations.observationTable.column.observationStatus=Status -sammoa.observations.observationTable.column.observationStatus.tip=Status -sammoa.observations.observationTable.column.observationTime=Time -sammoa.observations.observationTable.column.observationTime.tip=Time -sammoa.observations.observationTable.column.observer=Obs -sammoa.observations.observationTable.column.observer.tip=Obs -sammoa.observations.observationTable.column.photo=Photo -sammoa.observations.observationTable.column.photo.tip=Photo -sammoa.observations.observationTable.column.podSize=Pod size -sammoa.observations.observationTable.column.podSize.tip=Pod size -sammoa.observations.observationTable.column.species=Species -sammoa.observations.observationTable.column.species.tip=Species -sammoa.observations.observationTable.column.swimDir=Swim dir -sammoa.observations.observationTable.column.swimDir.tip=Swim dir -sammoa.observations.routeTable.column.beginTime=Time -sammoa.observations.routeTable.column.beginTime.tip=Time -sammoa.observations.routeTable.column.cloudCover=Cloud -sammoa.observations.routeTable.column.cloudCover.tip=Cloud -sammoa.observations.routeTable.column.comment=Comment -sammoa.observations.routeTable.column.comment.tip=Comment -sammoa.observations.routeTable.column.deleted=Del -sammoa.observations.routeTable.column.deleted.tip=Del -sammoa.observations.routeTable.column.effortNumber=N° -sammoa.observations.routeTable.column.effortNumber.tip=N° -sammoa.observations.routeTable.column.glareFrom=Gl from -sammoa.observations.routeTable.column.glareFrom.tip=Gl from -sammoa.observations.routeTable.column.glareSeverity=Gl sev -sammoa.observations.routeTable.column.glareSeverity.tip=Gl sev -sammoa.observations.routeTable.column.glareTo=Gl to -sammoa.observations.routeTable.column.glareTo.tip=Gl to -sammoa.observations.routeTable.column.glareUnder=Gl under -sammoa.observations.routeTable.column.glareUnder.tip=Gl under -sammoa.observations.routeTable.column.routeType=Type -sammoa.observations.routeTable.column.routeType.tip=Type -sammoa.observations.routeTable.column.seaState=Sea -sammoa.observations.routeTable.column.seaState.tip=Sea -sammoa.observations.routeTable.column.skyGlint=Glint -sammoa.observations.routeTable.column.skyGlint.tip=Glint -sammoa.observations.routeTable.column.subjectiveConditions=Subj -sammoa.observations.routeTable.column.subjectiveConditions.tip=Subj -sammoa.observations.routeTable.column.swell=Swell -sammoa.observations.routeTable.column.swell.tip=Swell -sammoa.observations.routeTable.column.transect=Transect -sammoa.observations.routeTable.column.transect.tip=Transect -sammoa.observations.routeTable.column.turbidity=Turb -sammoa.observations.routeTable.column.turbidity.tip=Turb -sammoa.observations.routeTable.column.unexpectedLeft=Left -sammoa.observations.routeTable.column.unexpectedLeft.tip=Left -sammoa.observations.routeTable.column.unexpectedRight=Right -sammoa.observations.routeTable.column.unexpectedRight.tip=Right -sammoa.statusBar.audio=Audio -sammoa.statusBar.gps=GPS -sammoa.statusbar.alt=Alt %1$s ft -sammoa.statusbar.speed=Speed %1$s km/h -sammoa.strate.decorator.all=All strates -sammoa.strate.decorator.strate=Strate %1$s -sammoa.timePattern=HH\:mm\:ss -sammoa.title.about=About Sammoa -sammoa.title.campaign=Campaign -sammoa.title.choose.export.directory= -sammoa.title.exportshape= -sammoa.title.flight=System %1$s - Campaign %2$s - Region %3$s - Flight n°%4$d -sammoa.title.home=Home -sammoa.title.validation= -sammoa.validator.campaign.beginDate.required=The begin date must be defined -sammoa.validator.campaign.code.required=The campaign code must be defined -sammoa.validator.campaign.code.uniqueKey=The campaign code already exists -sammoa.validator.campaign.endDate.anterior=The end date can't be anterior to the begin date -sammoa.validator.campaign.endDate.required=The end date must be defined -sammoa.validator.campaign.region.required=The region must be set -sammoa.validator.campaign.uniqueKey=The campaign code '%1$s' already exists for the region '%2$s' -sammoa.validator.observation.age.unkownValue=The age must be \: J for "juvénile", I for "immature", A for "adulte" and M for mixed groups -sammoa.validator.observation.behaviour.unkownValue=The behaviour must be one of this value \: SW (normal), MI (milling), BR (breaching), LO (logging), FE (feeding), FA (feeding aggregation), SB (following boat), OT (other) -sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface -sammoa.validator.observation.decAngle.invalidRange=The angle must be between %1$s and %2$s degrees or for the band \: 1 (in the band), 2 (outside the band), 3 (put in the band) -sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s -sammoa.validator.observation.species.required=The species is mandatory -sammoa.validator.observation.swimDir.invalidRange=The swim direction must be between %1$s and %2$s degrees -sammoa.validator.region.code.required=The region code must be defined -sammoa.validator.region.uniqueKey=The region code '%1$s' already exists -sammoa.validator.route.cloudCover.invalidRange=The cloud cover must be between %1$s and %2$s (octa system \: 8 for covered, 0 for cleared) -sammoa.validator.route.glareFrom.invalidRange=The glare must be in degrees between %1$s and %2$s (plane nose is at 0°) -sammoa.validator.route.glareSeverity.invalidRange=The glare severity must be between %1$s and %2$s (0 \: no glare, 3 \: strong glare) -sammoa.validator.route.glareTo.invalidRange=The glare must be in degrees between %1$s and %2$s (plane nose is at 0°) -sammoa.validator.route.seaState.invalidRange=The sea state must be between %1$s and %2$s (beaufort system) -sammoa.validator.route.skyGlint.invalidMin=The sky glint must be higher than %1$s -sammoa.validator.route.subjectiveConditions.badLength=The subjective conditions must have %1$s characters (one letter for each side) -sammoa.validator.route.subjectiveConditions.required=The subjective conditions is mandatory -sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be \: E for excellent, G for good, M for medium, P for poor -sammoa.validator.route.swell.invalidRange=The swell must be between %1$s and %2$s (0 means no swell) -sammoa.validator.route.turbidity.unkownValue=The turbidity must be between 0 (clear water) and 2 (turbid water) or 9 for unkown -sammoa.validator.transect.name.required=The transect name must be defined -sammoa.validator.transect.strate.required=The strate must be defined -sammoa.validator.transect.uniqueKey=The transect name '%1$s' already exists