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

Commits:

3 changed files:

Changes:

  • client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl
    ... ... @@ -76,11 +76,42 @@
    76 76 
             </ul>
    77 77 
         </#if>
    78 78 
     <#else>
    79 
    -    <#if .data_model.initModel.onConnectModeLocal>
    80 
    -        <h2>Connection to the local database</h2>
    79 
    +    <#if .data_model.initModel.onConnectMode>
    80 
    +        <#if .data_model.initModel.onConnectModeLocal>
    81 
    +            <h2>Connection to the local database</h2>
    81 82
    82 
    -        <@storageInfo.storageModelDataSourceInformation .data_model/>
    83 
    +            <@storageInfo.storageModelDataSourceInformation .data_model/>
    83 84
    85 
    +        <#elseif .data_model.initModel.onConnectModeRemote>
    86 
    +            <#if !.data_model.adminAction??>
    87 
    +                <h2>Remote database connection</h2>
    88 
    +                <hr/>
    89 
    +                <h3>Remote database information :</h3>
    90 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    91 
    +            <#else>
    92 
    +                <h2>${.data_model.adminActionLabel}</h2>
    93 
    +                <hr/>
    94 
    +                <h3>Remote connection information:</h3>
    95 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    96 
    +                <@storageInfo.onAdminActionCreate .data_model />
    97 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    98 
    +            </#if>
    99 
    +
    100 
    +        <#elseif .data_model.initModel.onConnectModeServer>
    101 
    +            <#if !.data_model.adminAction??>
    102 
    +                <h2>Remote server connection</h2>
    103 
    +                <hr/>
    104 
    +                <h3>Remote server informations:</h3>
    105 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    106 
    +            <#else>
    107 
    +                <h2>${.data_model.adminAction.label}</h2>
    108 
    +                <hr/>
    109 
    +                <h3>Remote server informations :</h3>
    110 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    111 
    +                <@storageInfo.onAdminActionCreate .data_model />
    112 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    113 
    +            </#if>
    114 
    +        </#if>
    84 115 
         <#elseif .data_model.initModel.onCreateMode>
    85 116 
             <#if .data_model.doBackup>
    86 117 
                 <h2>Local database backup</h2>
    ... ... @@ -109,36 +140,6 @@
    109 140 
                 <h3>Reference data import from a remote server:</h3>
    110 141 
                 <@storageInfo.storageModelDataSourceInformation .data_model />
    111 142 
             </#if>
    112 
    -
    113 
    -    <#elseif .data_model.initModel.onConnectModeRemote>
    114 
    -        <#if !.data_model.adminAction??>
    115 
    -            <h2>Remote database connection</h2>
    116 
    -            <hr/>
    117 
    -            <h3>Remote database information :</h3>
    118 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    119 
    -        <#else>
    120 
    -            <h2>${.data_model.adminActionLabel}</h2>
    121 
    -            <hr/>
    122 
    -            <h3>Remote connection information:</h3>
    123 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    124 
    -            <@storageInfo.onAdminActionCreate .data_model />
    125 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    126 
    -        </#if>
    127 
    -
    128 
    -    <#elseif .data_model.initModel.onConnectModeServer>>
    129 
    -        <#if !.data_model.adminAction??>
    130 
    -            <h2>Remote server connection</h2>
    131 
    -            <hr/>
    132 
    -            <h3>Remote server informations:</h3>
    133 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    134 
    -        <#else>
    135 
    -            <h2>${.data_model.adminAction.label}</h2>
    136 
    -            <hr/>
    137 
    -            <h3>Remote server informations :</h3>
    138 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    139 
    -            <@storageInfo.onAdminActionCreate .data_model />
    140 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    141 
    -        </#if>
    142 143 
         </#if>
    143 144 
         <h3>Update policy</h3>
    144 145 
         <ul>

  • client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl
    ... ... @@ -77,10 +77,42 @@
    77 77 
             </ul>
    78 78 
         </#if>
    79 79 
     <#else>
    80 
    -    <#if .data_model.initModel.onConnectModeLocal>
    81 
    -        <h2>Conexión a la base local</h2>
    82 
    -        <@storageInfo.storageModelDataSourceInformation .data_model/>
    80 
    +    <#if .data_model.initModel.onConnectMode>
    81 
    +        <#if .data_model.initModel.onConnectModeLocal>
    82 
    +            <h2>Conexión a la base local</h2>
    83 
    +            <@storageInfo.storageModelDataSourceInformation .data_model/>
    83 84
    85 
    +        <#elseif .data_model.initModel.onConnectModeRemote>
    86 
    +            <#if !.data_model.adminAction??>
    87 
    +                <h2>Conexión a una base remota</h2>
    88 
    +                <hr/>
    89 
    +                <h3>Informaciones sobre la base remota a utilizar:</h3>
    90 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    91 
    +            <#else>
    92 
    +                <h2>${.data_model.adminActionLabel}</h2>
    93 
    +                <hr/>
    94 
    +                <h3>Informaciones sobre la base remota a utilizar:</h3>
    95 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    96 
    +
    97 
    +                <@storageInfo.onAdminActionCreate .data_model />
    98 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    99 
    +            </#if>
    100 
    +
    101 
    +        <#elseif .data_model.initModel.onConnectModeServer>>
    102 
    +            <#if !.data_model.adminAction??>
    103 
    +                <h2>Connexion a un servicio web remoto</h2>
    104 
    +                <hr/>
    105 
    +                <h3>Informaciones sobre el servicio web remoto a utilizar:</h3>
    106 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    107 
    +            <#else>
    108 
    +                <h2>${.data_model.adminAction.label}</h2>
    109 
    +                <hr/>
    110 
    +                <h3>Informaciones sobre el servicio web remoto a utilizar:</h3>
    111 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    112 
    +                <@storageInfo.onAdminActionCreate .data_model />
    113 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    114 
    +            </#if>
    115 
    +        </#if>
    84 116 
         <#elseif .data_model.initModel.onCreateMode>
    85 117 
             <#if .data_model.doBackup>
    86 118 
                 <h2>Copia de seguridad de la base local</h2>
    ... ... @@ -109,37 +141,6 @@
    109 141 
                 <h3>Importación del referencial con un servicio web remoto:</h3>
    110 142 
                 <@storageInfo.storageModelDataSourceInformation .data_model />
    111 143 
             </#if>
    112 
    -
    113 
    -    <#elseif .data_model.initModel.onConnectModeRemote>
    114 
    -        <#if !.data_model.adminAction??>
    115 
    -            <h2>Conexión a una base remota</h2>
    116 
    -            <hr/>
    117 
    -            <h3>Informaciones sobre la base remota a utilizar:</h3>
    118 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    119 
    -        <#else>
    120 
    -            <h2>${.data_model.adminActionLabel}</h2>
    121 
    -            <hr/>
    122 
    -            <h3>Informaciones sobre la base remota a utilizar:</h3>
    123 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    124 
    -
    125 
    -            <@storageInfo.onAdminActionCreate .data_model />
    126 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    127 
    -        </#if>
    128 
    -
    129 
    -    <#elseif .data_model.initModel.onConnectModeServer>>
    130 
    -        <#if !.data_model.adminAction??>
    131 
    -            <h2>Connexion a un servicio web remoto</h2>
    132 
    -            <hr/>
    133 
    -            <h3>Informaciones sobre el servicio web remoto a utilizar:</h3>
    134 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    135 
    -        <#else>
    136 
    -            <h2>${.data_model.adminAction.label}</h2>
    137 
    -            <hr/>
    138 
    -            <h3>Informaciones sobre el servicio web remoto a utilizar:</h3>
    139 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    140 
    -            <@storageInfo.onAdminActionCreate .data_model />
    141 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    142 
    -        </#if>
    143 144 
         </#if>
    144 145 
         <h3>Política de actualización</h3>
    145 146 
         <ul>

  • client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl
    ... ... @@ -77,10 +77,40 @@
    77 77 
             </ul>
    78 78 
         </#if>
    79 79 
     <#else>
    80 
    -    <#if .data_model.initModel.onConnectModeLocal>
    81 
    -        <h2>Connection à la base locale</h2>
    82 
    -        <@storageInfo.storageModelDataSourceInformation .data_model/>
    80 
    +    <#if .data_model.initModel.onConnectMode>
    81 
    +        <#if .data_model.initModel.onConnectModeLocal>
    82 
    +            <h2>Connection à la base locale</h2>
    83 
    +            <@storageInfo.storageModelDataSourceInformation .data_model/>
    84 
    +        <#elseif .data_model.initModel.onConnectModeRemote>
    85 
    +            <#if !.data_model.adminAction??>
    86 
    +                <h2>Connexion directe à une base distante</h2>
    87 
    +                <hr/>
    88 
    +                <h3>Informations sur la base distante à utiliser :</h3>
    89 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    90 
    +            <#else>
    91 
    +                <h2>${.data_model.adminActionLabel}</h2>
    92 
    +                <hr/>
    93 
    +                <h3>Informations sur la base distante à utiliser :</h3>
    94 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    83 95
    96 
    +                <@storageInfo.onAdminActionCreate .data_model />
    97 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    98 
    +            </#if>
    99 
    +        <#elseif .data_model.initModel.onConnectModeServer>>
    100 
    +            <#if !.data_model.adminAction??>
    101 
    +                <h2>Connexion à un service web distant</h2>
    102 
    +                <hr/>
    103 
    +                <h3>Informations sur le service web distant à utiliser :</h3>
    104 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    105 
    +            <#else>
    106 
    +                <h2>${.data_model.adminAction.label}</h2>
    107 
    +                <hr/>
    108 
    +                <h3>Informations sur le service web à utiliser :</h3>
    109 
    +                <@storageInfo.storageModelDataSourceInformation .data_model />
    110 
    +                <@storageInfo.onAdminActionCreate .data_model />
    111 
    +                <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    112 
    +            </#if>
    113 
    +        </#if>
    84 114 
         <#elseif .data_model.initModel.onCreateMode>
    85 115 
             <#if .data_model.doBackup>
    86 116 
                 <h2>Sauvegarde de la base locale</h2>
    ... ... @@ -109,37 +139,6 @@
    109 139 
                 <h3>Import du référentiel depuis un service web distant :</h3>
    110 140 
                 <@storageInfo.storageModelDataSourceInformation .data_model />
    111 141 
             </#if>
    112 
    -
    113 
    -    <#elseif .data_model.initModel.onConnectModeRemote>
    114 
    -        <#if !.data_model.adminAction??>
    115 
    -            <h2>Connexion directe à une base distante</h2>
    116 
    -            <hr/>
    117 
    -            <h3>Informations sur la base distante à utiliser :</h3>
    118 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    119 
    -        <#else>
    120 
    -            <h2>${.data_model.adminActionLabel}</h2>
    121 
    -            <hr/>
    122 
    -            <h3>Informations sur la base distante à utiliser :</h3>
    123 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    124 
    -
    125 
    -            <@storageInfo.onAdminActionCreate .data_model />
    126 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    127 
    -        </#if>
    128 
    -
    129 
    -    <#elseif .data_model.initModel.onConnectModeServer>>
    130 
    -        <#if !.data_model.adminAction??>
    131 
    -            <h2>Connexion à un service web distant</h2>
    132 
    -            <hr/>
    133 
    -            <h3>Informations sur le service web distant à utiliser :</h3>
    134 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    135 
    -        <#else>
    136 
    -            <h2>${.data_model.adminAction.label}</h2>
    137 
    -            <hr/>
    138 
    -            <h3>Informations sur le service web à utiliser :</h3>
    139 
    -            <@storageInfo.storageModelDataSourceInformation .data_model />
    140 
    -            <@storageInfo.onAdminActionCreate .data_model />
    141 
    -            <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation />
    142 
    -        </#if>
    143 142 
         </#if>
    144 143
    145 144 
         <h3>Politique de mise à jour</h3>

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