Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

4 changed files:

Changes:

  • validation/pom.xml
    ... ... @@ -215,74 +215,19 @@
    215 215 
             <artifactId>i18n-maven-plugin</artifactId>
    216 216 
             <executions>
    217 217 
               <execution>
    218 
    -            <id>parse-java-default</id>
    219 218 
                 <phase>process-classes</phase>
    220 219 
                 <goals>
    221 220 
                   <goal>parse-java</goal>
    222 
    -            </goals>
    223 
    -            <configuration>
    224 
    -              <treatDefaultEntry>false</treatDefaultEntry>
    225 
    -              <entries>
    226 
    -                <entry>
    227 
    -                  <basedir>${project.build.directory}/generated-sources/java/</basedir>
    228 
    -                </entry>
    229 
    -              </entries>
    230 
    -            </configuration>
    231 
    -          </execution>
    232 
    -          <execution>
    233 
    -            <id>parse-validation-default</id>
    234 
    -            <phase>process-classes</phase>
    235 
    -            <goals>
    236 221 
                   <goal>parse-validation</goal>
    222 
    +              <goal>generate</goal>
    237 223 
                 </goals>
    238 224 
                 <configuration>
    239 
    -              <treatDefaultEntry>false</treatDefaultEntry>
    240 
    -              <entries>
    241 
    -                <entry>
    242 
    -                  <basedir>${project.basedir}/src/main/resources/</basedir>
    243 
    -                  <includes>
    244 
    -                    <param>**/**-validation.xml</param>
    245 
    -                  </includes>
    246 
    -                </entry>
    247 
    -              </entries>
    225 
    +              <force>true</force>
    248 226 
                 </configuration>
    249 227 
               </execution>
    250 
    -          <execution>
    251 
    -            <id>generate-default</id>
    252 
    -            <phase>process-classes</phase>
    253 
    -            <goals>
    254 
    -              <goal>generate</goal>
    255 
    -            </goals>
    256 
    -          </execution>
    257 
    -
    258 228 
             </executions>
    259 229 
           </plugin>
    260 230
    261 
    -      <!--<plugin>-->
    262 
    -        <!--<artifactId>maven-antrun-plugin</artifactId>-->
    263 
    -        <!--<executions>-->
    264 
    -          <!--<execution>-->
    265 
    -            <!--<id>copy i18n files</id>-->
    266 
    -            <!--<phase>process-classes</phase>-->
    267 
    -            <!--<configuration>-->
    268 
    -              <!--<target>-->
    269 
    -                <!--<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">-->
    270 
    -                  <!--<filterset>-->
    271 
    -                    <!--<filter value="${observe.model.version}" token="observe.model.version" />-->
    272 
    -                  <!--</filterset>-->
    273 
    -                  <!--<fileset dir="${project.build.directory}/generated-sources/i18n">-->
    274 
    -                    <!--<include name="*.properties" />-->
    275 
    -                  <!--</fileset>-->
    276 
    -                <!--</copy>-->
    277 
    -              <!--</target>-->
    278 
    -            <!--</configuration>-->
    279 
    -            <!--<goals>-->
    280 
    -              <!--<goal>run</goal>-->
    281 
    -            <!--</goals>-->
    282 
    -          <!--</execution>-->
    283 
    -        <!--</executions>-->
    284 
    -      <!--</plugin>-->
    285 
    -
    286 231 
         </plugins>
    287 232 
       </build>
    288 233 
     </project>

  • validation/src/main/i18n/validation_en_GB.properties
    ... ... @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=A comment is
    396 396 
     observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode.
    397 397 
     observe.validation.catchLongline.required.position=Position must be filled.
    398 398 
     observe.validation.catchLongline.required.speciesCatch=Species catch must be filled.
    399 
    +observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound.
    400 
    +observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound.
    401 
    +observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound.
    402 
    +observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound.
    403 
    +observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound.
    404 
    +observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound.
    399 405 
     observe.validation.country.invalid.iso2Code.uniqueKey=Iso 2 code is not unique.
    400 406 
     observe.validation.country.invalid.iso3Code.uniqueKey=Iso 3 code is not unique.
    401 407 
     observe.validation.country.required.iso2Code=Iso 2 code must be filled.

  • validation/src/main/i18n/validation_es_ES.properties
    ... ... @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Se necesita u
    396 396 
     observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado.
    397 397 
     observe.validation.catchLongline.required.position=Se necesita la posición sobre el palangre.
    398 398 
     observe.validation.catchLongline.required.speciesCatch=Se necesita la especie.
    399 
    +observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound. \#TODO
    400 
    +observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound. \#TODO
    401 
    +observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound. \#TODO
    402 
    +observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound. \#TODO
    403 
    +observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound. \#TODO
    404 
    +observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound. \#TODO
    399 405 
     observe.validation.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
    400 406 
     observe.validation.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
    401 407 
     observe.validation.country.required.iso2Code=Código ISO2 no especificado

  • validation/src/main/i18n/validation_fr_FR.properties
    ... ... @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Un commentair
    396 396 
     observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé.
    397 397 
     observe.validation.catchLongline.required.position=Pas de position renseignée sur la palangre.
    398 398 
     observe.validation.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée.
    399 
    +observe.validation.coordinate.degree.latitude.outOfBound=Les degrés de la latitude sont hors borne.
    400 
    +observe.validation.coordinate.degree.longitude.outOfBound=Les degrés de la longitude sont hors borne.
    401 
    +observe.validation.coordinate.minute.latitude.outOfBound=Les minutes de la latitude sont hors borne.
    402 
    +observe.validation.coordinate.minute.longitude.outOfBound=Les minutes de la longitude sont hors borne.
    403 
    +observe.validation.coordinate.second.latitude.outOfBound=Les secondes de la latitude sont hors borne.
    404 
    +observe.validation.coordinate.second.longitude.outOfBound=Les secondes de la longitude sont hors borne.
    399 405 
     observe.validation.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique
    400 406 
     observe.validation.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique
    401 407 
     observe.validation.country.required.iso2Code=Code ISO2 non renseigné.

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.