Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
29 changed files:
- client-core/src/main/map/style.xml
- client-core/src/main/i18n/templates/about_en_GB.ftl → observe-i18n/src/main/i18n/templates/about_en_GB.ftl
- client-core/src/main/i18n/templates/about_es_ES.ftl → observe-i18n/src/main/i18n/templates/about_es_ES.ftl
- client-core/src/main/i18n/templates/about_fr_FR.ftl → observe-i18n/src/main/i18n/templates/about_fr_FR.ftl
- client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_en_GB.ftl
- client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_es_ES.ftl
- client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_fr_FR.ftl
- client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl
- client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl
- client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl
- client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_en_GB.ftl
- client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_es_ES.ftl
- client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl
- client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl
- client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl
- client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl
- client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl
- client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl
- client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl
- client-core/src/main/i18n/templates/initStorage_en_GB.ftl → observe-i18n/src/main/i18n/templates/initStorage_en_GB.ftl
- client-core/src/main/i18n/templates/initStorage_es_ES.ftl → observe-i18n/src/main/i18n/templates/initStorage_es_ES.ftl
- client-core/src/main/i18n/templates/initStorage_fr_FR.ftl → observe-i18n/src/main/i18n/templates/initStorage_fr_FR.ftl
- client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl
- client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl
- client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl
- client-core/src/main/i18n/templates/validationReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/validationReport_en_GB.ftl
- client-core/src/main/i18n/templates/validationReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/validationReport_es_ES.ftl
- client-core/src/main/i18n/templates/validationReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/validationReport_fr_FR.ftl
- validation/src/main/i18n/getters/validation-messages.getter
Changes:
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 |
</NamedLayer>
|
| 89 | 89 |
|
| 90 | 90 |
<NamedLayer>
|
| 91 |
- <Name>Trip longline obs zone</Name>
|
|
| 91 |
+ <Name>Trip longline observation zone</Name>
|
|
| 92 | 92 |
<UserStyle>
|
| 93 | 93 |
<IsDefault>true</IsDefault>
|
| 94 | 94 |
<Title>SLD Cook Book: Simple Line</Title>
|
| ... | ... | @@ -168,7 +168,7 @@ |
| 168 | 168 |
</NamedLayer>
|
| 169 | 169 |
|
| 170 | 170 |
<NamedLayer>
|
| 171 |
- <Name>Trip longline obs line</Name>
|
|
| 171 |
+ <Name>Trip longline observation line</Name>
|
|
| 172 | 172 |
<UserStyle>
|
| 173 | 173 |
<IsDefault>true</IsDefault>
|
| 174 | 174 |
<Title>SLD Cook Book: Simple Line</Title>
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| 1 | 1 |
<#--
|
| 2 | 2 |
#%L
|
| 3 |
- ObServe :: Client core
|
|
| 3 |
+ ObServe :: I18n
|
|
| 4 | 4 |
%%
|
| 5 | 5 |
Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
|
| 6 | 6 |
%%
|
| ... | ... | @@ -68,7 +68,6 @@ observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp |
| 68 | 68 |
observe.validation.set.size.supportVesselName
|
| 69 | 69 |
observe.validation.set.startTime.after.time
|
| 70 | 70 |
observe.validation.setLongline.baitsComposition.uniqueKey
|
| 71 |
-observe.validation.setLongline.branchlinesComposition.uniqueKey
|
|
| 72 | 71 |
observe.validation.setLongline.duplicated.homeId
|
| 73 | 72 |
observe.validation.setLongline.duplicated.number
|
| 74 | 73 |
observe.validation.setLongline.floatlinesComposition.uniqueKey
|