branch develop updated (1869d03 -> 8663e1a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1869d03 Fix bad topia generation (Fixes #8934) new 52570ec Petites mises au point sur le widget positions(fixes #8964) new 28561c4 fix doc new 0f58afb Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) new 17384ba le calendrier reste en anglais (fixes #8952) new 8663e1a Templates de traduction mis à jour (fixes #8967) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8663e1ac24386225181611061486e5db02482306 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 12:10:43 2017 +0100 Templates de traduction mis à jour (fixes #8967) commit 17384ba380092a2732a230fcd16c1280f29af0fe Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:17:45 2017 +0100 le calendrier reste en anglais (fixes #8952) commit 0f58afb1b8a5ec5d3955467eda60028be7ab92d1 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 20:08:59 2017 +0100 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) commit 28561c46d2e8a3f8bda0d38d24fd904866b8585a Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 20:03:54 2017 +0100 fix doc commit 52570ec01aaf188207fc9d9c54c39d75a4b71bd1 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 15:32:38 2017 +0100 Petites mises au point sur le widget positions(fixes #8964) Summary of changes: .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 1 + ...ivityLonglineDto-ui-create-error-validation.xml | 20 +++--- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++++--- .../SetLonglineDto-ui-create-error-validation.xml | 80 +++++++++++++--------- .../SetLonglineDto-ui-update-error-validation.xml | 80 +++++++++++++--------- ...ActivitySeineDto-ui-create-error-validation.xml | 22 +++--- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +++--- .../swing/ui/content/ContentUIInitializer.java | 2 +- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 ++++++++--------- .../ftl/dataSourceConnectionReport_es.ftl | 77 +++++++++++---------- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_en.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_es.ftl | 18 ++--- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +-- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_en.ftl | 18 ++--- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +-- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 +++---- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 +++---- application-web/pom.xml | 6 +- .../controller/v1/DataSourceServiceController.java | 12 +++- pom.xml | 4 +- .../ObserveTopiaApplicationContextFactory.java | 46 ++++++++++--- src/site/rst/administration-web.rst.vm | 8 +-- 30 files changed, 372 insertions(+), 277 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 52570ec01aaf188207fc9d9c54c39d75a4b71bd1 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 15:32:38 2017 +0100 Petites mises au point sur le widget positions(fixes #8964) --- .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 1 + ...ivityLonglineDto-ui-create-error-validation.xml | 20 +++--- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++++--- .../SetLonglineDto-ui-create-error-validation.xml | 80 +++++++++++++--------- .../SetLonglineDto-ui-update-error-validation.xml | 80 +++++++++++++--------- ...ActivitySeineDto-ui-create-error-validation.xml | 22 +++--- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +++--- pom.xml | 2 +- 9 files changed, 154 insertions(+), 102 deletions(-) diff --git a/application-swing-configuration/src/main/resources/log4j.properties b/application-swing-configuration/src/main/resources/log4j.properties index 04073d5..57efed8 100644 --- a/application-swing-configuration/src/main/resources/log4j.properties +++ b/application-swing-configuration/src/main/resources/log4j.properties @@ -1,8 +1,8 @@ ### # #%L -# ObServe :: Application Swing Configuration +# ObServe :: Application Swing # %% -# Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit +# Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -49,6 +49,7 @@ log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR log4j.logger.org.nuiton.config=INFO log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.nuiton.topia.service.sql=INFO +#log4j.logger.org.nuiton.jaxx.widgets.gis=INFO log4j.logger.org.nuiton.jaxx.validator.swing.SwingValidator=ERROR log4j.logger.org.hibernate.orm.deprecation=ERROR diff --git a/application-swing-configuration/src/main/resources/observe-log4j.properties b/application-swing-configuration/src/main/resources/observe-log4j.properties index a7eaea3..44410bc 100644 --- a/application-swing-configuration/src/main/resources/observe-log4j.properties +++ b/application-swing-configuration/src/main/resources/observe-log4j.properties @@ -49,6 +49,7 @@ log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR log4j.logger.org.nuiton.topia.service.sql=INFO log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.nuiton.config=INFO +#log4j.logger.org.nuiton.jaxx.widgets.gis=INFO log4j.logger.org.nuiton.jaxx.validator.swing.SwingValidator=ERROR log4j.logger.org.hibernate.orm.deprecation=ERROR diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml index 07d127d..614dc72 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml @@ -114,11 +114,13 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -137,11 +139,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml index 4fb47be..5c56654 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml @@ -20,8 +20,8 @@ --> <!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="vesselActivityLongline"> @@ -99,11 +99,14 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -122,11 +125,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml index 28c2339..7055c43 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml @@ -231,11 +231,13 @@ </field-validator> <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -254,11 +256,13 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -293,11 +297,13 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -316,11 +322,13 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLongitude##0.0##${doubles.max} </message> </field-validator> @@ -355,11 +363,13 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -378,11 +388,13 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -417,11 +429,13 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -440,11 +454,13 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml index ce24e7a..ec8accf 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml @@ -215,11 +215,13 @@ </field-validator> <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -238,11 +240,13 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -275,11 +279,13 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -298,11 +304,13 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.settingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.settingEndLongitude##0.0##${doubles.max} </message> </field-validator> @@ -335,11 +343,13 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} </message> </field-validator> @@ -358,11 +368,13 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingStartLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} </message> </field-validator> @@ -396,11 +408,13 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLatitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} </message> </field-validator> @@ -419,11 +433,13 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + </param> <message> - validator.ui.setLongline.bound.haulingEndLongitude##${0.0}##${maxInclusive} + validator.ui.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml index b79c596..9486049 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml @@ -3,7 +3,7 @@ #%L ObServe :: Application Swing Validation %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -193,11 +193,13 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -216,11 +218,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml index 32032b9..2aa75ef 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml @@ -51,11 +51,14 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-90.0</param> - <param name="maxInclusive">90.0</param> + + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-90.0|max:90.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.latitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.latitude##0.0##${doubles.max} </message> </field-validator> @@ -74,11 +77,13 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">-180.0</param> - <param name="maxInclusive">180.0</param> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:-180.0|max:180.0</param> + <param name="expression"> + <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> + </param> <message> - validator.ui.activity.bound.longitude##${0.0}##${maxInclusive} + validator.ui.activity.bound.longitude##0.0##${doubles.max} </message> </field-validator> diff --git a/pom.xml b/pom.xml index eab2fea..9e01755 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ <topiaVersion>3.2</topiaVersion> <jaxxVersion>3.0-alpha-3</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> - <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> + <nuitonValidatorVersion>3.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> <nuitonConfigVersion>3.1.1</nuitonConfigVersion> <xworkVersion>2.3.31</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 28561c46d2e8a3f8bda0d38d24fd904866b8585a Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 20:03:54 2017 +0100 fix doc --- src/site/rst/administration-web.rst.vm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/site/rst/administration-web.rst.vm b/src/site/rst/administration-web.rst.vm index f568610..1371cd0 100644 --- a/src/site/rst/administration-web.rst.vm +++ b/src/site/rst/administration-web.rst.vm @@ -144,12 +144,12 @@ Tester l'application Par défaut, l'application est déployée à l'adresse suivante : :: - http://localhost:8080/obwerveweb + http://localhost:8080/observeweb Vous pouvez accéder à une seule page qui regroupe l'ensemble des configurations de l'application : :: - http://localhost:8080/obwerveweb/admin/configuration?adminApiKey=changeme (ou la clef que vous avez configuré) + http://localhost:8080/observeweb/admin/configuration?adminApiKey=changeme (ou la clef que vous avez configuré) Si vous arrivez sur cette page, l'application est fonctionnelle. @@ -159,7 +159,7 @@ Recharger les configurations Vous pouvez recharger les configurations à chaud via l'adresse suivante : :: - http://localhost:8080/obwerveweb/admin/reloadConfiguration?adminApiKey=chang... (ou la clef que vous avez configuré) + http://localhost:8080/observeweb/admin/reloadConfiguration?adminApiKey=chang... (ou la clef que vous avez configuré) Supprimer les sessions utilisateurs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -167,7 +167,7 @@ Supprimer les sessions utilisateurs Vous pouvez supprimer toutes les sessions utilisateurs via l'adresse suivante : :: - http://localhost:8080/obwerveweb/admin/resetAuthenticationTokens?adminApiKey... (ou la clef que vous avez configuré) + http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKey... (ou la clef que vous avez configuré) .. _page des configurations: ./config-report.html#detail_observeWeb \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0f58afb1b8a5ec5d3955467eda60028be7ab92d1 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 20:08:59 2017 +0100 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) --- application-web/pom.xml | 6 ++- .../controller/v1/DataSourceServiceController.java | 12 ++++-- pom.xml | 2 +- .../ObserveTopiaApplicationContextFactory.java | 46 +++++++++++++++++----- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/application-web/pom.xml b/application-web/pom.xml index 748ba43..54e3e29 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -81,7 +81,11 @@ <artifactId>application-web-configuration</artifactId> <version>${project.version}</version> </dependency> - + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-topia</artifactId> + <version>${project.version}</version> + </dependency> <!-- commons dependencies --> <dependency> diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 23798d9..c78c1d8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -4,7 +4,7 @@ package fr.ird.observe.application.web.controller.v1; * #%L * ObServe :: Application Web * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -41,10 +41,12 @@ import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.File; +import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -99,8 +101,6 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport @Override public void close() { - getAuthenticatedService().close(); - ObserveWebRequestContext requestContext = getRequestContext(); String authenticationToken = requestContext.getAuthenticationToken(); getSecurityApplicationContext().invalidateAuthenticationToken(authenticationToken); @@ -108,6 +108,12 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport log.info("Invalidate authenticationToken: " + authenticationToken); } + Set<String> databaseAuthenticationTokens = new LinkedHashSet<>(); + for (ObserveDataSourceConfigurationAndConnection connection : getSecurityApplicationContext().getConfigurationByAuthenticationToken().values()) { + databaseAuthenticationTokens.add(connection.getConnection().getAuthenticationToken()); + } + + ObserveTopiaApplicationContextFactory.clearContexts(databaseAuthenticationTokens); } @Override diff --git a/pom.xml b/pom.xml index 9e01755..91473f5 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <topiaVersion>3.2</topiaVersion> + <topiaVersion>3.2.1</topiaVersion> <jaxxVersion>3.0-alpha-3</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java index 83dff4f..c41efc5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java @@ -38,6 +38,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; /** * Usine de contexte applicatif ToPIA. @@ -101,25 +103,51 @@ public class ObserveTopiaApplicationContextFactory { } + public static void clearContexts(Set<String> usedTokens) { + + Set<ObserveDataSourceConfigurationTopiaSupport> unusedConfigurations = TOPIA_APPLICATION_CONTEXT_CACHE.entrySet() + .stream() + .filter(e -> !usedTokens.contains(e.getValue().getAuthenticationToken())) + .map(Map.Entry::getKey) + .collect(Collectors.toSet()); + for (ObserveDataSourceConfigurationTopiaSupport unusedConfiguration : unusedConfigurations) { + + ObserveTopiaApplicationContext topiaApplicationContext = TOPIA_APPLICATION_CONTEXT_CACHE.get(unusedConfiguration); + if (log.isInfoEnabled()) { + log.info("Remove unsued topia application context for: " + unusedConfiguration); + } + close(topiaApplicationContext); + TOPIA_APPLICATION_CONTEXT_CACHE.remove(unusedConfiguration); + } + + if (log.isInfoEnabled()) { + log.info("Still using " + TOPIA_APPLICATION_CONTEXT_CACHE.size() + " topia application context(s)."); + } + } + public static void close() { for (TopiaApplicationContext topiaApplicationContext : new LinkedHashSet<>(TOPIA_APPLICATION_CONTEXT_CACHE.values())) { - if (!topiaApplicationContext.isClosed()) { - try { - topiaApplicationContext.close(); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not close topiaApplicationContext: " + topiaApplicationContext, e); - } - } - } + close(topiaApplicationContext); } TOPIA_APPLICATION_CONTEXT_CACHE.clear(); } + protected static void close(TopiaApplicationContext topiaApplicationContext) { + if (!topiaApplicationContext.isClosed()) { + try { + topiaApplicationContext.close(); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not close topiaApplicationContext: " + topiaApplicationContext, e); + } + } + } + } + public static ObserveTopiaConfiguration createTopiaConfiguration(ObserveDataSourceConfigurationTopiaPG configuration, boolean initSchema) { ObserveTopiaConfiguration topiaConfiguration = ObserveTopiaConfigurationFactory.forPostgresqlDatabase( -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 17384ba380092a2732a230fcd16c1280f29af0fe Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 13:17:45 2017 +0100 le calendrier reste en anglais (fixes #8952) --- .../ird/observe/application/swing/ui/content/ContentUIInitializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index 1a25f7f..b2af755 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -663,7 +663,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (log.isDebugEnabled()) { log.debug("init JXDatePicker editor" + picker.getName()); - } + }picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); JFormattedTextField editor = picker.getEditor(); editor.setEditable(true); JXMonthView monthView = new JXMonthView(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8663e1ac24386225181611061486e5db02482306 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 12:10:43 2017 +0100 Templates de traduction mis à jour (fixes #8967) --- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 ++++++++--------- .../ftl/dataSourceConnectionReport_es.ftl | 77 ++++++++++++---------- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_en.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_es.ftl | 18 ++--- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +-- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_en.ftl | 18 ++--- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +-- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 ++++---- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 ++++---- 16 files changed, 161 insertions(+), 156 deletions(-) diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl index 51e5e37..601a8f5 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl @@ -27,7 +27,7 @@ <#elseif connexionStatus.name() == "FAILED"> - <h3>the connection failed for the following reason :</h3> + <h3>The connection failed for the following reason :</h3> <ul> <li>${connexionStatusError}</li> diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl index bf94346..48111ba 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl @@ -23,11 +23,11 @@ <body> <#if connexionStatus.name() == "UNTESTED"> - <h3>La conexión no fue validada o ha sido modificada desde el última test de conexión.</h3> + <h3>La conexión no fue validada o ha sido modificada desde el último test de conexión.</h3> <#elseif connexionStatus.name() == "FAILED"> - <h3>La conexión falló por la razon siguiente :</h3> + <h3>La conexión falló por la razon siguiente:</h3> <ul> <li>${connexionStatusError}</li> @@ -35,7 +35,7 @@ <#elseif connexionStatus.name() == "SUCCESS"> - Información sobre la conexión : + Información sobre la conexión: <#import "storageModelDataSourceConfiguration_fr.ftl" as storageInfo> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl index 6a88680..2c8b0c1 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl @@ -27,7 +27,7 @@ <#elseif connexionStatus.name() == "FAILED"> - <h3>La connexion a échouée pour la raison suivante :</h3> + <h3>La connexion a échoué pour la raison suivante :</h3> <ul> <li>${connexionStatusError}</li> @@ -35,7 +35,7 @@ <#elseif connexionStatus.name() == "SUCCESS"> - Information sur la connexion : + Informations sur la connexion : <#import "storageModelDataSourceConfiguration_fr.ftl" as storageInfo> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl index 5d0063b..03da43c 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl @@ -37,7 +37,7 @@ <hr/> <h3> - Backup location : + Backup location: <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -45,7 +45,7 @@ <#if useSelectData && selectDataModel??> - <h3>Data to export :</h3> + <h3>Data to export:</h3> <ul> <li> @@ -70,7 +70,7 @@ ${selectDataModel.getSelectedCount()} trips </#if> - à exporter + to be exported <ul> @@ -103,7 +103,7 @@ </li> - <li>The referential will be exported</li> + <li>The reference data will be exported</li> </ul> </#if> @@ -127,7 +127,7 @@ <h2>Local database backup</h2> <hr/> - <h3>Backup location :</h3> + <h3>Backup location:</h3> <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -138,7 +138,7 @@ <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Referential Import from the last imported referential :</h3> + <h3>Import of reference data from the previous emported reference data:</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -146,7 +146,7 @@ <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Backup import :</h3> + <h3>Backup import:</h3> <ul> <li>${dumpFile.absolutePath}</li> @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -173,7 +173,7 @@ <h2>Remote database connection</h2> <hr/> - <h3>Remote database informations :</h3> + <h3>Remote database information :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Remote connection informations :</h3> + <h3>Remote connection information:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -192,7 +192,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Reference data import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -200,27 +200,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>No referential import</h3> + <h3>No reference data import</h3> </#if> <#if importData> <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Data import from a backup :</h3> + <h3>Data import from a backup:</h3> <ul> <li>${dataSourceModel.dumpFile.absolutePath}</li> @@ -228,13 +228,13 @@ <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Data import from a remote database :</h3> + <h3>Data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Data import from a remote server :</h3> + <h3>Data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -264,7 +264,7 @@ <h2>Remote server connection</h2> <hr/> - <h3>Remote server informations :</h3> + <h3>Remote server informations:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -283,7 +283,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Referential import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -291,27 +291,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>No referential import</h3> + <h3>No reference data import</h3> </#if> <#if importData> <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Reference data import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -319,13 +319,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -340,10 +340,10 @@ <h3>Sécurité</h3> <ul> - <li><strong>Owner : </strong>${securityModel.administrateur.name}</li> - <li><strong>Technicians : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Readers : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referentials : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Owner: </strong>${securityModel.administrateur.name}</li> + <li><strong>Technicians: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Readers: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referentials: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> @@ -366,7 +366,7 @@ <#if showMigrationSql> - <li>Show sql update queries</li> + <li>Show SQL update queries</li> </#if> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl index d2f90c9..d2ed2f9 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl @@ -30,14 +30,14 @@ <#elseif remote> Copia de seguridad de la base remota <#elseif server> - Copia de seguridad del servidor + Copia de seguridad del servicio web </#if> </h2> <hr/> <h3> - Ubicación de la copia de seguridad : + Ubicación de la copia de seguridad: <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -45,18 +45,23 @@ <#if useSelectData && selectDataModel??> - <h3>Datos a esportar :</h3> + <h3>Datos a esportar:</h3> <ul> <li> <#if selectDataModel.isEmpty()> - No hay datos de observaciones a exporter + No hay datos de observaciones a exportar <#elseif selectDataModel.isDataFull()> +<<<<<<< HEAD Todos los datos de observador deben ser exportados (<#if selectDataModel.getSelectCedount() == 1> +======= + Todos los datos del observador deben ser exportados + (<#if selectDataModel.selectDataSize() == 1> +>>>>>>> 64a0649... Templates de traduction mis à jour (fixes #8967) 1 marea <#else> ${selectDataModel.getSelectedCount()} mareas @@ -115,7 +120,7 @@ <h2>Conexión a la base local</h2> <hr/> - <h3>Ubicación de la base local :</h3> + <h3>Ubicación de la base local:</h3> <ul> <li>${h2Config.directory.absolutePath}</li> @@ -127,7 +132,7 @@ <h2>Copia de seguridad de la base local</h2> <hr/> - <h3>Ubicación de la copia de seguridad :</h3> + <h3>Ubicación de la copia de seguridad:</h3> <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -138,7 +143,7 @@ <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Importación con el último referencial cargado :</h3> + <h3>Importación con el último referencial descargado:</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -146,7 +151,7 @@ <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación con una copia de seguridad :</h3> + <h3>Importación con una copia de seguridad:</h3> <ul> <li>${dumpFile.absolutePath}</li> @@ -154,13 +159,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -173,7 +178,7 @@ <h2>Conexión a una base remota</h2> <hr/> - <h3>Informaciones sobre la base remota a utilizar :</h3> + <h3>Informaciones sobre la base remota a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -182,7 +187,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Informaciones sobre la conexión remota a utilisat :</h3> + <h3>Informaciones sobre la conexión remota a utilisar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -192,7 +197,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del reférencial con una copia de seguridad :</h3> + <h3>Importación del reférencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -200,13 +205,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -220,7 +225,7 @@ <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación de datos con una copia de seguridad :</h3> + <h3>Importación de datos con una copia de seguridad:</h3> <ul> <li>${dataSourceModel.dumpFile.absolutePath}</li> @@ -228,13 +233,13 @@ <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación de datos con una base remota :</h3> + <h3>Importación de datos con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación de datos con un servidor remoto :</h3> + <h3>Importación de datos con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -249,10 +254,10 @@ <h3>Seguridad</h3> <ul> - <li><strong>Proprietario : </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Proprietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> @@ -261,10 +266,10 @@ <#elseif dbMode.name() == "USE_SERVER"> <#if !adminAction??> - <h2>Connexion a un servidor remoto</h2> + <h2>Connexion a un servicio web remoto</h2> <hr/> - <h3>Informaciones sobre el servidor remoto a utilizar :</h3> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +278,7 @@ <h2>${adminAction.label}</h2> <hr/> - <h3>Informaciones sobre el servidor remoto a utilizar :</h3> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -283,7 +288,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del referencial con una copia de seguridad :</h3> + <h3>Importación del referencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -291,13 +296,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -311,7 +316,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del referencial con una copia de seguridad :</h3> + <h3>Importación del referencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -319,13 +324,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -340,10 +345,10 @@ <h3>Seguridad</h3> <ul> - <li><strong>Propietario : </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Propietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> @@ -356,7 +361,7 @@ <#if canMigrate> - <li>Actualización si se necesita (versión actual : ${modelVersion})</li> + <li>Actualización si se necesita (versión actual: ${modelVersion})</li> <#if showMigrationProgression> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index c6895fc..523c31d 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Import du référentiel depuis une une base distante :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -170,7 +170,7 @@ <#elseif dbMode.name() == "USE_REMOTE"> <#if !adminAction??> - <h2>Connexion à une base distante</h2> + <h2>Connexion directe à une base distante</h2> <hr/> <h3>Informations sur la base distante à utiliser :</h3> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Informations sur la connexion distance à utiliser :</h3> + <h3>Informations sur la base distante à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -206,7 +206,7 @@ <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -234,7 +234,7 @@ <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import de données depuis un serveur distant :</h3> + <h3>Import de données depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -261,10 +261,10 @@ <#elseif dbMode.name() == "USE_SERVER"> <#if !adminAction??> - <h2>Connexion à un serveur distant</h2> + <h2>Connexion à un service web distant</h2> <hr/> - <h3>Informations sur le serveur distant à utiliser :</h3> + <h3>Informations sur le service web à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +273,7 @@ <h2>${adminAction}</h2> <hr/> - <h3>Informations sur le serveur distant à utiliser :</h3> + <h3>Informations sur le service web distant à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -366,7 +366,7 @@ <#if showMigrationSql> - <li>Afficher les requêtes sql lors des mises à jour</li> + <li>Afficher les requêtes SQL lors des mises à jour</li> </#if> diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl index 427816d..5d9d59c 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl @@ -27,22 +27,22 @@ <ul> <#if isSqlDataSource() > <#if configuration.h2Database??> - <li><strong>User : </strong>${configuration.username}</li> + <li><strong>User: </strong>${configuration.username}</li> <#elseif configuration.postgresDatabase??> - <li><strong>Jdbc url : </strong>${configuration.jdbcUrl}</li> - <li><strong>User : </strong>${configuration.username}</li> - <li><strong>SSL mode : </strong>${configuration.useSsl?then('Yes', 'No')}</li> + <li><strong>Jdbc URL: </strong>${configuration.jdbcUrl}</li> + <li><strong>User: </strong>${configuration.username}</li> + <li><strong>SSL mode: </strong>${configuration.useSsl?then('Yes', 'No')}</li> </#if> <#else> - <li><strong>Server url : </strong>${configuration.serverUrl}</li> - <li><strong>User : </strong>${configuration.login}</li> + <li><strong>Web service url: </strong>${configuration.serverUrl}</li> + <li><strong>User: </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Database : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> <h3>Rights</h3> - <li><strong>Referential : </strong> + <li><strong>Reference data: </strong> <#if canReadReferential() > Read <#if canWriteReferential() > @@ -54,7 +54,7 @@ No rights </#if> </li> - <li><strong>Données observateur : </strong> + <li><strong>Données observateur: </strong> <#if canReadData() > Read <#if canWriteData() > @@ -70,7 +70,7 @@ <h3>Version</h3> v ${connection.version} <#else> - No datasource has been loaded + No data source loaded </#if> </body> diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl index 3c59e51..f1fbb77 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl @@ -27,22 +27,22 @@ <ul> <#if isSqlDataSource() > <#if configuration.h2Database??> - <li><strong>Usuario : </strong>${configuration.username}</li> + <li><strong>Usuario: </strong>${configuration.username}</li> <#elseif configuration.postgresDatabase??> - <li><strong>URL jdbc : </strong>${configuration.jdbcUrl}</li> - <li><strong>Usuario : </strong>${configuration.username}</li> - <li><strong>Modo SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> + <li><strong>URL jdbc: </strong>${configuration.jdbcUrl}</li> + <li><strong>Usuario: </strong>${configuration.username}</li> + <li><strong>Modo SSL: </strong>${configuration.useSsl?then('Oui', 'Non')}</li> </#if> <#else> - <li><strong>URL del servidor : </strong>${configuration.serverUrl}</li> - <li><strong>Usuario : </strong>${configuration.login}</li> + <li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li> + <li><strong>Usuario: </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Base de datos : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> <h3>Droits</h3> - <li><strong>Referencial : </strong> + <li><strong>Referencial: </strong> <#if canReadReferential() > Lectura <#if canWriteReferential() > @@ -54,7 +54,7 @@ No tiene derecho </#if> </li> - <li><strong>Datos observador : </strong> + <li><strong>Datos observador: </strong> <#if canReadData() > Lectura <#if canWriteData() > diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl index d1dfe5c..0cc2e91 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl @@ -34,10 +34,10 @@ <li><strong>Mode SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> </#if> <#else> - <li><strong>URL du serveur : </strong>${configuration.serverUrl}</li> + <li><strong>URL du service web : </strong>${configuration.serverUrl}</li> <li><strong>Utilisateur : </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Base de données : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> diff --git a/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl index a7c8883..de45ee7 100644 --- a/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl @@ -21,9 +21,9 @@ --> <html> <body> -Droits : +Rights: -<strong> • Referential : </strong> +<strong> • Reference data: </strong> <#if canReadReferential() > Read <#if canWriteReferential() > @@ -35,7 +35,7 @@ Droits : No rights </#if> -<strong> • Données observateur : </strong> +<strong> • Observer data: </strong> <#if canReadData() > Read <#if canWriteData() > @@ -46,7 +46,7 @@ Droits : <#else> No rights </#if> -<Strong> • Version : </Strong> +<Strong> • Version: </Strong> v ${version} </body> diff --git a/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl index 5d98eed..fe349e9 100644 --- a/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl @@ -21,9 +21,9 @@ --> <html> <body> -Droits : +Permisos: -<strong> • Référentiel : </strong> +<strong> • Datos de referencias: </strong> <#if canReadReferential() > Lectura <#if canWriteReferential() > @@ -35,7 +35,7 @@ Droits : No tiene derecho </#if> -<strong> • Données observateur : </strong> +<strong> • Datos observador: </strong> <#if canReadData() > Lectura <#if canWriteData() > @@ -46,7 +46,7 @@ Droits : <#else> No tiene derecho </#if> -<Strong> • Version : </Strong> +<Strong> • Version: </Strong> v ${version} </body> diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl index d5c0403..b4a5952 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl @@ -22,16 +22,16 @@ <html> <body> - <h3>Selected datasource type</h3> + <h3>Selected data source type</h3> <#if dbMode.name() == "USE_LOCAL"> - Use a h2 local database + Use a H2 local database <#elseif dbMode.name() == "CREATE_LOCAL"> - Create a h2 local database + Create a H2 local database <#elseif dbMode.name() == "USE_REMOTE"> - Use a postgres remote database + Use a PostgreSQL remote database <#elseif dbMode.name() == "USE_SERVER"> - Use a remote server + Use a remote web service <#else> No datasource type has been selected </#if> @@ -42,17 +42,17 @@ <#if !creationMode??> No creation mode has been selected <#elseif creationMode.name() == "EMPTY"> - Generate a new empty local database. This database won't have referentials and you will have to import one after that... + Generate a new empty local database. This database won't contain reference data and you will have to import them into it after that. <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> Generate a new local database from the last version of the embedded database. <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> Create a new local database from a previous backup. <#elseif creationMode.name() == "IMPORT_LOCAL_STORAGE"> - Generate a new local database and import the referentials of another local database in it. + Generate a new local database and import the reference data from another local database. <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - Generate a new local database and import the referentials of a remote database in it. + Generate a new local database and import the reference data from a remote database. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Generate a new local database and import the referentials of a remote server in it. + Generate a new local database and import the reference data from a remote web service. </#if> <#else> Not required. diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl index c36390a..4f517a0 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl @@ -25,13 +25,13 @@ <h3>Tipo de fuentes de datos seleccionado</h3> <#if dbMode.name() == "USE_LOCAL"> - Utilizar una base local de tipo h2 + Utilizar una base local de tipo H2 <#elseif dbMode.name() == "CREATE_LOCAL"> - Crear una base local de tipo h2 + Crear una base local de tipo H2 <#elseif dbMode.name() == "USE_REMOTE"> Utilizar una base remota de tipo postgres <#elseif dbMode.name() == "USE_SERVER"> - Utilizar un servidor remoto + Utilizar un servicio web remoto <#else> Ningún tipo de fuente de datos seleccionado </#if> @@ -52,7 +52,7 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> Generar una nueva base local e importar el referencial de una otra base remota. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Generar una nueva base local e importar el referencial de un servidor remoto. + Generar una nueva base local e importar el referencial de un servicio web remoto. </#if> <#else> No es necesario. diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl index b7a1ca5..93f8fda 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl @@ -25,13 +25,13 @@ <h3>Type de source de données sélectionné</h3> <#if dbMode.name() == "USE_LOCAL"> - Utiliser une base locale de type h2 + Utiliser une base locale de type H2 <#elseif dbMode.name() == "CREATE_LOCAL"> - Creer une base locale de type h2 + Creer une base locale de type H2 <#elseif dbMode.name() == "USE_REMOTE"> Utiliser une base distante de type postgres <#elseif dbMode.name() == "USE_SERVER"> - Utiliser un serveur distant + Utiliser un service web distant <#else> Aucun type de source de données sélectionné </#if> @@ -42,7 +42,7 @@ <#if !creationMode??> Aucun mode de création sélectionné <#elseif creationMode.name() == "EMPTY"> - Générer une nouvelle base locale vide.Cette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... + Générer une nouvelle base locale vide. Cette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel. <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> Générer une nouvelle base locale à partir de la dernière version de la base embarquée. <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> @@ -52,7 +52,7 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. + Générer une nouvelle base locale et y importer le référentiel depuis un service web distant. </#if> <#else> Non requis. diff --git a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl index a8bb54c..1490430 100644 --- a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl +++ b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl @@ -23,25 +23,25 @@ <#if storageModel??> <ul> <#if storageModel.editRemoteConfig> - <li><strong>Jdbc url : </strong>${storageModel.pgConfig.jdbcUrl}</li> - <li><strong>User : </strong>${storageModel.pgConfig.username}</li> - <li><strong>Password : </strong>*****</li> - <li><strong>SSL mode : </strong>${storageModel.pgConfig.useSsl?then('Yes', 'No')}</li> + <li><strong>Jdbc URL: </strong>${storageModel.pgConfig.jdbcUrl}</li> + <li><strong>User: </strong>${storageModel.pgConfig.username}</li> + <li><strong>Password: </strong>*****</li> + <li><strong>SSL mode: </strong>${storageModel.pgConfig.useSsl?then('Yes', 'No')}</li> <#elseif storageModel.editServerConfig> - <li><strong>Server url : </strong>${storageModel.restConfig.serverUrl}</li> - <li><strong>User : </strong>${storageModel.restConfig.login}</li> - <li><strong>Password : </strong>*****</li> + <li><strong>Web service URL: </strong>${storageModel.restConfig.serverUrl}</li> + <li><strong>User: </strong>${storageModel.restConfig.login}</li> + <li><strong>Password: </strong>*****</li> <#if storageModel.restConfig.optionalDatabaseName.present> - <li><strong>Database : </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> + <li><strong>Database alias: </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> </#if> <#else> - <li><strong>User : </strong>${storageModel.h2Config.username}</li> - <li><strong>Password : </strong>*****</li> + <li><strong>User: </strong>${storageModel.h2Config.username}</li> + <li><strong>Password: </strong>*****</li> </#if> - <li><strong>Rights : </strong> + <li><strong>Rights: </strong> <ul> <li> - <em>Referential : </em> + <em>Reference data: </em> <#if storageModel.dataSourceInformation.canReadReferential() > Read <#if storageModel.dataSourceInformation.canWriteReferential() > @@ -54,7 +54,7 @@ </#if> </li> <li> - <em>Données observateur : </em> + <em>Observer data: </em> <#if storageModel.dataSourceInformation.canReadData() > Read <#if storageModel.dataSourceInformation.canWriteData() > diff --git a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl index 418dad4..db09bb2 100644 --- a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl +++ b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl @@ -23,25 +23,25 @@ <#if storageModel??> <ul> <#if storageModel.editRemoteConfig> - <li><strong>URL jdbc : </strong>${storageModel.pgConfig.jdbcUrl}</li> - <li><strong>Usuario : </strong>${storageModel.pgConfig.username}</li> - <li><strong>Contraseña : </strong>*****</li> - <li><strong>Modo SSL : </strong>${storageModel.pgConfig.useSsl?then('Si', 'No')}</li> + <li><strong>URL jdbc: </strong>${storageModel.pgConfig.jdbcUrl}</li> + <li><strong>Usuario: </strong>${storageModel.pgConfig.username}</li> + <li><strong>Contraseña: </strong>*****</li> + <li><strong>Modo SSL: </strong>${storageModel.pgConfig.useSsl?then('Si', 'No')}</li> <#elseif storageModel.editServerConfig> - <li><strong>URL du serveur : </strong>${storageModel.restConfig.serverUrl}</li> - <li><strong>Usuario : </strong>${storageModel.restConfig.login}</li> - <li><strong>Contraseña : </strong>*****</li> + <li><strong>URL del servicio web: </strong>${storageModel.restConfig.serverUrl}</li> + <li><strong>Usuario: </strong>${storageModel.restConfig.login}</li> + <li><strong>Contraseña: </strong>*****</li> <#if storageModel.restConfig.optionalDatabaseName.present> - <li><strong>Base de datos : </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base: </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> </#if> <#else> - <li><strong>Usuario : </strong>${storageModel.h2Config.username}</li> - <li><strong>Contraseña : </strong>*****</li> + <li><strong>Usuario: </strong>${storageModel.h2Config.username}</li> + <li><strong>Contraseña: </strong>*****</li> </#if> - <li><strong>Derechos : </strong> + <li><strong>Derechos: </strong> <ul> <li> - <em>Referencial : </em> + <em>Referencial: </em> <#if storageModel.dataSourceInformation.canReadReferential() > Lectura <#if storageModel.dataSourceInformation.canWriteReferential() > @@ -54,7 +54,7 @@ </#if> </li> <li> - <em>Données observateur : </em> + <em>Datos observador: </em> <#if storageModel.dataSourceInformation.canReadData() > Lectura <#if storageModel.dataSourceInformation.canWriteData() > -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm