Author: tchemit Date: 2012-12-06 18:16:09 +0100 (Thu, 06 Dec 2012) New Revision: 31 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/31 Log: optimize i18n Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/catches/species/SpeciesTabUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-06 17:03:05 UTC (rev 30) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-06 17:16:09 UTC (rev 31) @@ -286,7 +286,6 @@ //-- Species Batch methods --// //------------------------------------------------------------------------// - @Override public List<SpeciesBatch> getAllSpeciesBatch(String traitId) { checkDriverExists(); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-06 17:03:05 UTC (rev 30) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-06 17:16:09 UTC (rev 31) @@ -3,29 +3,20 @@ tutti.config.data.directory=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). tutti.config.license.organizationName=Nom de l'organisation dans la licence tutti.config.tmp.directory=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application) -tutti.property.beaufortScale= -tutti.property.beaufortScaleBean=Vent beaufort -tutti.property.campaign= -tutti.property.campaignBean=Campagne +tutti.property.beaufortScale=Vent beaufort +tutti.property.campaign=Campagne tutti.property.codeMemo=Code Memo -tutti.property.country= -tutti.property.countryBean=Pays +tutti.property.country=Pays tutti.property.date=Date -tutti.property.gear= -tutti.property.gearBean=Engin +tutti.property.gear=Engin tutti.property.genusSpecies=Nom scientifique tutti.property.name=Nom -tutti.property.seaState= -tutti.property.seaStateBean=État de la mer +tutti.property.seaState=État de la mer tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association -tutti.property.survey= -tutti.property.surveyBean=Série de campagne +tutti.property.survey=Série de campagne tutti.property.trait=Trait -tutti.property.user= -tutti.property.userBean=Utilisateur -tutti.property.vessel= -tutti.property.vesselBean=Navire -tutti.property.zone= -tutti.property.zoneBean=Zone +tutti.property.user=Utilisateur +tutti.property.vessel=Navire +tutti.property.zone=Zone tutti.service.config=Configuration des services de Tutti Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/catches/species/SpeciesTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/catches/species/SpeciesTabUI.css 2012-12-06 17:03:05 UTC (rev 30) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/catches/species/SpeciesTabUI.css 2012-12-06 17:16:09 UTC (rev 31) @@ -30,7 +30,7 @@ } #totalWeightLabel { - text:"tutti.label.fishes.totalWeight"; + text:"tutti.label.species.totalWeight"; labelFor:{totalWeightField}; } @@ -42,7 +42,7 @@ } #totalVracWeightLabel { - text:"tutti.label.fishes.totalVracWeight"; + text:"tutti.label.species.totalVracWeight"; labelFor:{totalVracWeightField}; } @@ -54,7 +54,7 @@ } #sampleVracWeightLabel { - text:"tutti.label.fishes.sampleVracWeight"; + text:"tutti.label.species.sampleVracWeight"; labelFor:{sampleVracWeightField}; } @@ -66,7 +66,7 @@ } #totalHorsVracWeightLabel { - text:"tutti.label.fishes.totalHorsVracWeight"; + text:"tutti.label.species.totalHorsVracWeight"; labelFor:{totalHorsVracWeightField}; } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-06 17:03:05 UTC (rev 30) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-06 17:16:09 UTC (rev 31) @@ -37,7 +37,7 @@ tutti.config.ui.autoPopupNumberEditor=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.ui.config=Chemin du fichier de configuration des interfaces graphiques tutti.config.ui.showNumberEditorButton=Afficher le pavé numérique de saisie -tutti.label.benthos.sampleTotalWeight=Poids échantilloné +tutti.label.benthos.sampleTotalWeight=Poids total échantillonné tutti.label.benthos.totalWeight=Poids total tutti.label.campaign=Campagne tutti.label.campaign.country=Pays @@ -47,11 +47,7 @@ tutti.label.captureAccidentel.sampleTotalWeight=Poids total échantillonné tutti.label.captureAccidentel.totalWeight=Poids total tutti.label.comment=Commentaire -tutti.label.fishes.sampleVracWeight=Poids total vrac échant. -tutti.label.fishes.totalHorsVracWeight=Poids total hors vrac -tutti.label.fishes.totalVracWeight=Poids total vrac -tutti.label.fishes.totalWeight=Poids total -tutti.label.frequencyConfiguration= +tutti.label.frequencyConfiguration=Mode de saisie tutti.label.list.gear=Engin(s) tutti.label.list.headOfMission=Chef(s) de mission tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri @@ -62,6 +58,10 @@ tutti.label.no.trait.selected=< Aucun trait sélectionné > tutti.label.plancton.sampleTotalWeight=Poids total échantillonné tutti.label.plancton.totalWeight=Poids total +tutti.label.species.sampleVracWeight=Poids total vrac échant. +tutti.label.species.totalHorsVracWeight=Poids total hors vrac +tutti.label.species.totalVracWeight=Poids total vrac +tutti.label.species.totalWeight=Poids total tutti.label.survey=Série de campagne tutti.label.survey.name=Nom tutti.label.survey.zone=Zone @@ -121,12 +121,12 @@ tutti.menu.synchronisationImport.tip=Effectuer des imports tutti.menu.synchronisations=Synchronisation tutti.menu.synchronisations.tip=Import/Export -tutti.speciesFrequency.configurationMode.autoGenerate= -tutti.speciesFrequency.configurationMode.autoGenerate.tip= -tutti.speciesFrequency.configurationMode.rafale= -tutti.speciesFrequency.configurationMode.rafale.tip= -tutti.speciesFrequency.configurationMode.simple= -tutti.speciesFrequency.configurationMode.simple.tip= +tutti.speciesFrequency.configurationMode.autoGenerate=Génération des classes +tutti.speciesFrequency.configurationMode.autoGenerate.tip=Mode où toutes les classes de taille sont générées +tutti.speciesFrequency.configurationMode.rafale=Mode "rafale" +tutti.speciesFrequency.configurationMode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...) +tutti.speciesFrequency.configurationMode.simple=Mode simple +tutti.speciesFrequency.configurationMode.simple.tip=Mode par défaut on on doit tout saisir (les classes de tailles et les nombres) tutti.table.benthos.header.number=Nombre observé tutti.table.benthos.header.speciesByCode=Espèce tutti.table.benthos.header.weight=Poids observé