Author: kmorin Date: 2013-02-25 17:55:04 +0100 (Mon, 25 Feb 2013) New Revision: 469 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/469 Log: refs #1896 [TECH] - Gestion du multilinguisme Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-25 16:55:04 UTC (rev 469) @@ -33,6 +33,8 @@ } BeanDoubleList { + showReset: true; + i18nPrefix: "tutti.property."; bean: {model}; } @@ -50,6 +52,7 @@ #nameField { text: {model.getName()}; + _validatorLabel : {_("tutti.label.cruise.name")}; } #yearLabel { @@ -62,6 +65,7 @@ model: {model.getYear()}; useFloat: false; numberPattern: {INT_4_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.cruise.year")}; } #surveyPartLabel { @@ -71,6 +75,7 @@ #surveyPartField { text: {model.getSurveyPart()}; + _validatorLabel : {_("tutti.label.cruise.surveyPart")}; } #countryLabel { @@ -81,6 +86,7 @@ #countryComboBox { property: country; selectedItem: {model.getCountry()}; + _validatorLabel : {_("tutti.label.cruise.country")}; } #programLabel { @@ -91,24 +97,27 @@ #surveyComboBox { property: program; selectedItem: {model.getProgram()}; + _validatorLabel : {_("tutti.label.cruise.program")}; } #beginDateLabel { - text: "tutti.label.cruise.beginDate"; - labelFor: {beginDateField}; + text: "tutti.label.cruise.beginDate"; + labelFor: {beginDateField}; } #beginDateField { - date: {model.getBeginDate()}; + date: {model.getBeginDate()}; + _validatorLabel : {_("tutti.label.cruise.beginDate")}; } #endDateLabel { - text: "tutti.label.cruise.endDate"; - labelFor: {endDateField}; + text: "tutti.label.cruise.endDate"; + labelFor: {endDateField}; } #endDateField { - date: {model.getEndDate()}; + date: {model.getEndDate()}; + _validatorLabel : {_("tutti.label.cruise.endDate")}; } #multirigNumberLabel { @@ -121,6 +130,7 @@ model: {model.getMultirigNumber()}; useFloat: false; numberPattern: {INT_1_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.cruise.multirigNumber")}; } #filterVesselLabel { @@ -156,21 +166,25 @@ #vesselList { property: vessel; border: {BorderFactory.createTitledBorder(_("tutti.label.list.vessel"))}; + _validatorLabel : {_("tutti.label.list.vessel")}; } #gearList { property: gear; border: {BorderFactory.createTitledBorder(_("tutti.label.list.gear"))}; + _validatorLabel : {_("tutti.label.list.gear")}; } #headOfMissionList { property: headOfMission; border: {BorderFactory.createTitledBorder(_("tutti.label.list.headOfMission"))}; + _validatorLabel : {_("tutti.label.list.headOfMission")}; } #headOfSortRoomList { property: headOfSortRoom; border: {BorderFactory.createTitledBorder(_("tutti.label.list.headOfSortRoom"))}; + _validatorLabel : {_("tutti.label.list.headOfSortRoom")}; } #commentPane { @@ -179,6 +193,7 @@ #commentField { text: {model.getComment()}; + _validatorLabel : {_("tutti.label.comment")}; } #saveButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-02-25 16:55:04 UTC (rev 469) @@ -38,6 +38,7 @@ beanType: {Program.class}; selectedItem: {model.getProgram()}; enabled: {!programCombobox.isEmpty()}; + _validatorLabel : {_("tutti.label.program")}; } #editProgramButton { @@ -59,6 +60,7 @@ property: cruise; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; + _validatorLabel : {_("tutti.label.cruise")}; } #editCruiseButton { @@ -81,6 +83,7 @@ property: protocol; selectedItem: {model.getProtocol()}; enabled: {!protocolCombobox.isEmpty()}; + _validatorLabel : {_("tutti.label.protocol")}; } #newProtocolComboBox { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-25 16:55:04 UTC (rev 469) @@ -33,6 +33,8 @@ } BeanDoubleList { + showReset: true; + i18nPrefix: "tutti.property."; bean: {model}; } @@ -63,6 +65,7 @@ #stationNumberField { text: {model.getStationNumber()}; + _validatorLabel : {_("tutti.label.fishingOperation.stationNumber")}; } #fishingOperationNumberLabel { @@ -75,6 +78,7 @@ model: {model.getFishingOperationNumber()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.fishingOperationNumber")}; } #strataLabel { @@ -85,6 +89,7 @@ #strataComboBox { property: strata; selectedItem: {model.getStrata()}; + _validatorLabel : {_("tutti.label.fishingOperation.strata")}; } #subStrataLabel { @@ -95,6 +100,7 @@ #subStrataComboBox { property: subStrata; selectedItem: {model.getSubStrata()}; + _validatorLabel : {_("tutti.label.fishingOperation.subStrata")}; } #locationLabel { @@ -105,6 +111,7 @@ #locationComboBox { property: location; selectedItem: {model.getLocation()}; + _validatorLabel : {_("tutti.label.fishingOperation.location")}; } #gearLongitudeLabel { @@ -152,6 +159,7 @@ #vesselComboBox { property: vessel; selectedItem: {model.getVessel()}; + _validatorLabel : {_("tutti.label.fishingOperation.vessel")}; } #gearLabel { @@ -163,6 +171,7 @@ #gearComboBox { property: gear; selectedItem: {model.getGear()}; + _validatorLabel : {_("tutti.label.fishingOperation.gear")}; } #multirigAggregationLabel { @@ -172,6 +181,7 @@ #multirigAggregationField { text: {model.getMultirigAggregation()}; + _validatorLabel : {_("tutti.label.fishingOperation.multirigAggregation")}; } .degree { @@ -209,27 +219,32 @@ property: gearShootingStartLongitudeDegree; model: {model.getGearShootingStartLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeDegree")}; } #gearShootingStartLongitudeDMSMinuteField { property: gearShootingStartLongitudeMinute; model: {model.getGearShootingStartLongitudeMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeMinute")}; } #gearShootingStartLongitudeDMSSecondField { property: gearShootingStartLongitudeSecond; model: {model.getGearShootingStartLongitudeSecond()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeSecond")}; } #gearShootingStartLongitudeDMDDegreeField { property: gearShootingStartLongitudeDegree; model: {model.getGearShootingStartLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeDegree")}; } #gearShootingStartLongitudeDMDMinuteField { property: gearShootingStartLongitudeDecimalMinute; model: {model.getGearShootingStartLongitudeDecimalMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitudeMinute")}; } #gearShootingStartLongitudeDDField { @@ -238,6 +253,7 @@ showReset: false; useFloat: true; useSign: true; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLongitude")}; } #gearShootingStartLatitudePanel { @@ -248,27 +264,32 @@ property: gearShootingStartLatitudeDegree; model: {model.getGearShootingStartLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeDegree")}; } #gearShootingStartLatitudeDMSMinuteField { property: gearShootingStartLatitudeMinute; model: {model.getGearShootingStartLatitudeMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeMinute")}; } #gearShootingStartLatitudeDMSSecondField { property: gearShootingStartLatitudeSecond; model: {model.getGearShootingStartLatitudeSecond()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeSecond")}; } #gearShootingStartLatitudeDMDDegreeField { property: gearShootingStartLatitudeDegree; model: {model.getGearShootingStartLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeDegree")}; } #gearShootingStartLatitudeDMDMinuteField { property: gearShootingStartLatitudeDecimalMinute; model: {model.getGearShootingStartLatitudeDecimalMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitudeMinute")}; } #gearShootingStartLatitudeDDField { @@ -277,10 +298,12 @@ showReset: false; useFloat: true; useSign: true; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartLatitude")}; } #gearShootingStartDateField { date: {model.getGearShootingStartDate()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingStartDate")}; } #gearShootingStartTimeField { @@ -296,27 +319,32 @@ property: gearShootingEndLongitudeDegree; model: {model.getGearShootingEndLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeDegree")}; } #gearShootingEndLongitudeDMSMinuteField { property: gearShootingEndLongitudeMinute; model: {model.getGearShootingEndLongitudeMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeMinute")}; } #gearShootingEndLongitudeDMSSecondField { property: gearShootingEndLongitudeSecond; model: {model.getGearShootingEndLongitudeSecond()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeSecond")}; } #gearShootingEndLongitudeDMDDegreeField { property: gearShootingEndLongitudeDegree; model: {model.getGearShootingEndLongitudeDegree()}; numberPattern: {SIGNED_INT_3_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeDegree")}; } #gearShootingEndLongitudeDMDMinuteField { property: gearShootingEndLongitudeDecimalMinute; model: {model.getGearShootingEndLongitudeDecimalMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitudeMinute")}; } #gearShootingEndLongitudeDDField { @@ -325,6 +353,7 @@ showReset: false; useFloat: true; useSign: true; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLongitude")}; } #gearShootingEndLatitudePanel { @@ -335,27 +364,32 @@ property: gearShootingEndLatitudeDegree; model: {model.getGearShootingEndLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeDegree")}; } #gearShootingEndLatitudeDMSMinuteField { property: gearShootingEndLatitudeMinute; model: {model.getGearShootingEndLatitudeMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeMinute")}; } #gearShootingEndLatitudeDMSSecondField { property: gearShootingEndLatitudeSecond; model: {model.getGearShootingEndLatitudeSecond()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeSecond")}; } #gearShootingEndLatitudeDMDDegreeField { property: gearShootingEndLatitudeDegree; model: {model.getGearShootingEndLatitudeDegree()}; numberPattern: {SIGNED_INT_2_DIGITS_PATTERN}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeDegree")}; } #gearShootingEndLatitudeDMDMinuteField { property: gearShootingEndLatitudeDecimalMinute; model: {model.getGearShootingEndLatitudeDecimalMinute()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitudeMinute")}; } #gearShootingEndLatitudeDDField { @@ -364,10 +398,12 @@ showReset: false; useFloat: true; useSign: true; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndLatitude")}; } #gearShootingEndDateField { date: {model.getGearShootingEndDate()}; + _validatorLabel : {_("tutti.label.fishingOperation.gearShootingEndDate")}; } #gearShootingEndTimeField { @@ -379,6 +415,7 @@ floatable: false; borderPainted: false; opaque: false; + _validatorLabel : {_("tutti.label.fishingOperation.fishingOperationValidity")}; } #resetValidStateButton { @@ -420,6 +457,7 @@ numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; toolTipText: {model.getTrawlDistance() != null ? _("tutti.tooltip.distanceInMilles", TuttiUIUtil.getDistanceInMilles(model.getTrawlDistance())) : null}; + _validatorLabel : {_("tutti.label.fishingOperation.trawlDistance")}; } #durationLabel { @@ -431,11 +469,13 @@ text: {TuttiUIUtil.getDuration( model.getGearShootingStartDate(), model.getGearShootingEndDate())}; enabled: false; + _validatorLabel : {_("tutti.label.fishingOperation.duration")}; } #saisisseurList { property: saisisseur; border: {BorderFactory.createTitledBorder(_("tutti.label.list.saisisseur"))}; + _validatorLabel : {_("tutti.label.list.saisisseur")}; } #commentPane { @@ -444,6 +484,7 @@ #commentField { text: {model.getComment()}; + _validatorLabel : {_("tutti.label.comment")}; } #saveButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-02-25 16:55:04 UTC (rev 469) @@ -39,6 +39,7 @@ #nameField { text: {model.getName()}; + _validatorLabel : {_("tutti.label.program.name")}; } #commentPane { @@ -47,6 +48,7 @@ #commentField { text: {getStringValue(model.getComment())}; + _validatorLabel : {_("tutti.label.comment")}; } #zoneLabel { @@ -57,6 +59,7 @@ #zoneComboBox { property: zone; selectedItem: {model.getZone()}; + _validatorLabel : {_("tutti.label.program.zone")}; } #saveButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-25 16:55:04 UTC (rev 469) @@ -27,6 +27,8 @@ } BeanDoubleList { + showReset: true; + i18nPrefix: "tutti.property."; bean: {model}; } @@ -35,12 +37,13 @@ } #nameLabel { - text: "tutti.label.program.name"; + text: "tutti.label.protocol.name"; labelFor: {nameField}; } #nameField { text: {model.getName()}; + _validatorLabel : {_("tutti.label.protocol.name")}; } #commentPane { @@ -49,6 +52,7 @@ #commentField { text: {getStringValue(model.getComment())}; + _validatorLabel : {_("tutti.label.comment")}; } #saveWarningContainer { 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 2013-02-25 16:39:38 UTC (rev 468) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-25 16:55:04 UTC (rev 469) @@ -252,12 +252,31 @@ tutti.label.fishingOperation.fishingOperationNumber=Numéro de Trait tutti.label.fishingOperation.fishingOperationRectiligne=Trait rectiligne tutti.label.fishingOperation.fishingOperationValid=Trait valide +tutti.label.fishingOperation.fishingOperationValidity=Validité du trait tutti.label.fishingOperation.gear=Engin tutti.label.fishingOperation.gearDate=Date tutti.label.fishingOperation.gearLatitude=Latitude (%s) tutti.label.fishingOperation.gearLongitude=Longitude (%s) tutti.label.fishingOperation.gearShootingEnd=Fin de traine +tutti.label.fishingOperation.gearShootingEndDate=Date de fin de traine +tutti.label.fishingOperation.gearShootingEndLatitude=Latitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLatitudeDegree=Degré de latitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLatitudeMinute=Minute de latitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLatitudeSecond=Seconde de latitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLongitude=Longitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLongitudeDegree=Degré de longitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLongitudeMinute=Minute de longitude de fin de traine +tutti.label.fishingOperation.gearShootingEndLongitudeSecond=Seconde de longitude de fin de traine tutti.label.fishingOperation.gearShootingStart=Début de traine +tutti.label.fishingOperation.gearShootingStartDate=Date de début de traine +tutti.label.fishingOperation.gearShootingStartLatitude=Latitude de début de traine +tutti.label.fishingOperation.gearShootingStartLatitudeDegree=Degré de latitude de début de traine +tutti.label.fishingOperation.gearShootingStartLatitudeMinute=Minute de latitude de début de traine +tutti.label.fishingOperation.gearShootingStartLatitudeSecond=Seconde de latitude de début de traine +tutti.label.fishingOperation.gearShootingStartLongitude=Longitude de début de traine +tutti.label.fishingOperation.gearShootingStartLongitudeDegree=Degré de longitude de début de traine +tutti.label.fishingOperation.gearShootingStartLongitudeMinute=Minute de longitude de début de traine +tutti.label.fishingOperation.gearShootingStartLongitudeSecond=Seconde de longitude de début de traine tutti.label.fishingOperation.gearTime=Heure tutti.label.fishingOperation.location=Localité tutti.label.fishingOperation.multirigAggregation=Numéro de poche @@ -293,6 +312,7 @@ tutti.label.protocol=Protocol de saisie tutti.label.protocol.clone.warning=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.label.protocol.import.warning=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". +tutti.label.protocol.name=Nom tutti.label.referential.gear=Référentiel Engin tutti.label.referential.person=Référentiel Personne tutti.label.referential.species=Référentiel Espèce