Author: tchemit Date: 2012-01-15 20:37:20 +0100 (Sun, 15 Jan 2012) New Revision: 279 Url: http://forge.codelutin.com/repositories/revision/echobase/279 Log: add some order on some associations + i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -130,7 +130,6 @@ echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= -echobase.common.m= echobase.common.maxDepth= echobase.common.maxFishLength= echobase.common.maxLatitude= @@ -156,7 +155,6 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.mz= echobase.common.name=Nom echobase.common.noiseDesign= echobase.common.notes= @@ -166,7 +164,6 @@ echobase.common.operationEvent= echobase.common.operationMetadata= echobase.common.operationMetadataValue= -echobase.common.operationType= echobase.common.operator= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Références organisation @@ -188,7 +185,6 @@ echobase.common.qualityDataFlagValues= echobase.common.r2= echobase.common.raptriBiometryDataType= -echobase.common.reference= echobase.common.referenceDatum=referenceDatum echobase.common.referenceDatumType= echobase.common.referencingMethod= Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -32,6 +32,14 @@ model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true +# ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.stereotype=ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.tagvalue.orderBy=startTime +fr.ifremer.echobase.entities.data.Transit.attribute.transect.stereotype=ordered +fr.ifremer.echobase.entities.data.Transit.attribute.transect.tagvalue.orderBy=timeCoverageStart +fr.ifremer.echobase.entities.data.Transect.attribute.operation.stereotype=ordered +fr.ifremer.echobase.entities.data.Transect.attribute.operation.tagvalue.orderBy=gearShootingStartTime + # big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -1,5 +1,4 @@ echobase.common.associationFile=Fichier d'associations de cellules -echobase.common.casinoFile=Fichier Casino echobase.common.echotypeFile=Fichier echotype echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.accousticRegionData=Import des cellules régions (accoustique) @@ -17,4 +16,7 @@ echobase.common.tblMensurationClasseFile=Fichier de classes de mensuration echobase.common.tblMensurationFile=Fichier de mensuration echobase.common.tlbeStationFile=Fichier des stations +echobase.common.transectFile=Fichier des transects +echobase.common.transitFile=Fichier des transits +echobase.common.voyageFile=Fichier des voayges echobase.common.xtblTriFile=Fichier Tri