Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5981cc31 by Tony Chemit at 2021-03-22T09:55:16+01:00 Fix and improve StorageUIModel templates - - - - - 3 changed files: - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl Changes: ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl ===================================== @@ -76,11 +76,42 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Connection to the local database</h2> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Connection to the local database</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Remote database connection</h2> + <hr/> + <h3>Remote database information :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Remote connection information:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + + <#elseif .data_model.initModel.onConnectModeServer> + <#if !.data_model.adminAction??> + <h2>Remote server connection</h2> + <hr/> + <h3>Remote server informations:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Remote server informations :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Local database backup</h2> @@ -109,36 +140,6 @@ <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Remote database connection</h2> - <hr/> - <h3>Remote database information :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Remote connection information:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Remote server connection</h2> - <hr/> - <h3>Remote server informations:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Remote server informations :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Update policy</h3> <ul> ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl ===================================== @@ -77,10 +77,42 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Conexión a la base local</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Conexión a la base local</h2> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Conexión a una base remota</h2> + <hr/> + <h3>Informaciones sobre la base remota a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Informaciones sobre la base remota a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + + <#elseif .data_model.initModel.onConnectModeServer>> + <#if !.data_model.adminAction??> + <h2>Connexion a un servicio web remoto</h2> + <hr/> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Copia de seguridad de la base local</h2> @@ -109,37 +141,6 @@ <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Conexión a una base remota</h2> - <hr/> - <h3>Informaciones sobre la base remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Informaciones sobre la base remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Connexion a un servicio web remoto</h2> - <hr/> - <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Política de actualización</h3> <ul> ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl ===================================== @@ -77,10 +77,40 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Connection à la base locale</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Connection à la base locale</h2> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Connexion directe à une base distante</h2> + <hr/> + <h3>Informations sur la base distante à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Informations sur la base distante à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + <#elseif .data_model.initModel.onConnectModeServer>> + <#if !.data_model.adminAction??> + <h2>Connexion à un service web distant</h2> + <hr/> + <h3>Informations sur le service web distant à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Informations sur le service web à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Sauvegarde de la base locale</h2> @@ -109,37 +139,6 @@ <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Connexion directe à une base distante</h2> - <hr/> - <h3>Informations sur la base distante à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Informations sur la base distante à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Connexion à un service web distant</h2> - <hr/> - <h3>Informations sur le service web distant à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Informations sur le service web à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Politique de mise à jour</h3> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5981cc31f09433abeb78573105... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5981cc31f09433abeb78573105... You're receiving this email because of your account on gitlab.com.