Skip to content

Commit 6092710

Browse files
hazco75hazco75
authored
Merge pull request #3376 from ProgrammeVitam/cp_8.0_14887
CP V8.0 - Bug #14887 : Missing translations in operations log
2 parents 98fecbf + 7a07bf3 commit 6092710

File tree

4 files changed

+46
-13
lines changed

4 files changed

+46
-13
lines changed

‎ui/ui-frontend/projects/ingest/src/app/ingest/ingest-preview/ingest-errors-details-tab/ingest-errors-details-tab.component.html‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@
66
<div class="top-right">
77
<ng-container [ngSwitch]="getEventStatus(node)">
88
<div *ngSwitchCase="'OK'">
9-
<span class="ingest-message-text" [ngStyle]="{ color: 'black' }">{{ node.eventData.outMessg }}</span>
9+
<span class="ingest-message-text">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
10+
<span class="ev-det-tech-data">{{ getEvDetData(node) }}</span>
1011
</div>
1112
<div *ngSwitchCase="'KO'">
12-
<span class="ingest-message-text" [ngStyle]="{ color: 'red' }">{{ node.eventData.outMessg }}</span>
13+
<span class="ingest-message-text text danger bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
14+
<span class="ev-det-tech-data text danger">{{ getEvDetData(node) }}</span>
1315
</div>
1416
<div *ngSwitchCase="'FATAL'">
15-
<span class="ingest-message-text" [ngStyle]="{ color: 'grey' }">{{ node.eventData.outMessg }}</span>
17+
<span class="ingest-message-text text light bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
1618
</div>
1719
<div *ngSwitchCase="'WARNING'">
18-
<span class="ingest-message-text" [ngStyle]="{ color: 'orange' }">{{ node.eventData.outMessg }}</span>
20+
<span class="ingest-message-text text warning bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
21+
<span class="ev-det-tech-data text warning">{{ getEvDetData(node) }}</span>
1922
</div>
2023
</ng-container>
2124
</div>
@@ -45,19 +48,19 @@
4548
<div class="top-right">
4649
<ng-container [ngSwitch]="getEventStatus(node)">
4750
<div *ngSwitchCase="'OK'">
48-
<span class="ingest-message-text" [ngStyle]="{ color: 'black' }">{{ node.eventData.outMessg }}</span>
49-
<span class="ev-det-tech-data" [ngStyle]="{ color: 'black' }">{{ getEvDetData(node) }}</span>
51+
<span class="ingest-message-text">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
52+
<span class="ev-det-tech-data">{{ getEvDetData(node) }}</span>
5053
</div>
5154
<div *ngSwitchCase="'KO'">
52-
<span class="ingest-message-text" [ngStyle]="{ color: 'red' }">{{ node.eventData.outMessg }}</span>
53-
<span class="ev-det-tech-data" [ngStyle]="{ color: 'red' }">{{ getEvDetData(node) }}</span>
55+
<span class="ingest-message-text text danger bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
56+
<span class="ev-det-tech-data text danger bold">{{ getEvDetData(node) }}</span>
5457
</div>
5558
<div *ngSwitchCase="'FATAL'">
56-
<span class="ingest-message-text" [ngStyle]="{ color: 'grey' }">{{ node.eventData.outMessg }}</span>
59+
<span class="ingest-message-text text light bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
5760
</div>
5861
<div *ngSwitchCase="'WARNING'">
59-
<span class="ingest-message-text" [ngStyle]="{ color: 'orange' }">{{ node.eventData.outMessg }}</span>
60-
<span class="ev-det-tech-data" [ngStyle]="{ color: 'orange' }">{{ getEvDetData(node) }}</span>
62+
<span class="ingest-message-text text warning bold">{{ 'EVENT_TYPE_LABEL.' + node.eventData.evType | translate }}</span>
63+
<span class="ev-det-tech-data text warning">{{ getEvDetData(node) }}</span>
6164
</div>
6265
</ng-container>
6366
</div>

‎ui/ui-frontend/projects/vitamui-library/src/app/modules/logbook/history/history-events/history-events.component.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
<span class="history-event-outcome">{{ event.outcome }}</span>
1818
</div>
1919
<div class="history-event-outmessage">
20-
{{ event.outMessage }}<span *ngIf="event.userIdentifier"> par l'utilisateur {{ event.userIdentifier }}</span
21-
><span *ngIf="event.subrogatorIdentifier"> (subrogé par {{ event.subrogatorIdentifier }})</span>.
20+
<vitamui-common-event-type-label [key]="event.outDetail"></vitamui-common-event-type-label>
21+
<span *ngIf="event.userIdentifier"> {{ 'COMMON.BY_USER' | translate: { userIdentifier: event.userIdentifier } }}</span>
22+
<span *ngIf="event.subrogatorIdentifier">
23+
({{ 'COMMON.SUBROGATED_BY' | translate: { subrogatorIdentifier: event.subrogatorIdentifier } }})</span
24+
>.
2225
</div>
2326
<div class="history-event-details" *ngIf="checkEventData(event)">{{ getEventData(event) }}</div>
2427
</div>

‎ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"INCORRECT_VALUE": "Incorrect value",
2020
"NO_RESULT": "No result",
2121
"SHOW_MORE_RESULTS": "Show more results",
22+
"BY_USER": " by user {{userIdentifier}}",
23+
"SUBROGATED_BY": "subrogated by {{subrogatorIdentifier}}",
2224
"LANGUAGE": {
2325
"TITLE": "Language",
2426
"ENGLISH": "English",
@@ -3155,26 +3157,37 @@
31553157
"EXT_VITAMUI_AUTHENTIFICATION_OTP_USER": "User authentication with OTP",
31563158
"EXT_VITAMUI_AUTHENTICATION_OTP_USER": "User authentication with OTP",
31573159
"EXT_VITAMUI_CREATE_CUSTOMER": "Creation of the organization",
3160+
"EXT_VITAMUI_CREATE_CUSTOMER.OK": "Success of the creation of the organization",
31583161
"EXT_VITAMUI_UPDATE_CUSTOMER": "Modification of the organization",
31593162
"EXT_VITAMUI_CREATE_GROUP": "Group creation",
3163+
"EXT_VITAMUI_CREATE_GROUP.OK": "Success of the group creation",
31603164
"EXT_VITAMUI_UPDATE_GROUP": "Modification of the group",
31613165
"EXT_VITAMUI_CREATE_IDP": "Creation of the IDP of the organization",
3166+
"EXT_VITAMUI_CREATE_IDP.OK": "Success of the creation of the IDP of the organization",
31623167
"EXT_VITAMUI_UPDATE_IDP": "Modification of the organization's IDP",
31633168
"EXT_VITAMUI_CREATE_OWNER": "Creation of the owner",
3169+
"EXT_VITAMUI_CREATE_OWNER.OK": "Success of the creation of the owner",
31643170
"EXT_VITAMUI_UPDATE_OWNER": "Modification of the owner",
31653171
"EXT_VITAMUI_CREATE_PROFILE": "Profile creation",
3172+
"EXT_VITAMUI_CREATE_PROFILE.OK": "Success of the profile creation",
31663173
"EXT_VITAMUI_UPDATE_PROFILE": "Profile modification",
31673174
"EXT_VITAMUI_START_SURROGATE_USER": "Start of user subrogation",
31683175
"EXT_VITAMUI_START_SURROGATE_GENERIC": "Start of generic user subrogation",
3176+
"EXT_VITAMUI_START_SURROGATE_GENERIC.OK": "Success of the start of generic user subrogation",
31693177
"EXT_VITAMUI_STOP_SURROGATE": "Stopping user subrogation",
3178+
"EXT_VITAMUI_STOP_SURROGATE.OK": "Success of stopping user subrogation",
31703179
"EXT_VITAMUI_DECLINE_SURROGATE": "Refusal of the subrogation by the user",
31713180
"EXT_VITAMUI_LOGOUT_SURROGATE": "Stop by disconnecting user subrogation",
3181+
"EXT_VITAMUI_LOGOUT_SURROGATE.OK": "Success of the stop by disconnecting user subrogation",
31723182
"EXT_VITAMUI_CREATE_TENANT": "Creation of the owner's safe",
3183+
"EXT_VITAMUI_CREATE_TENANT.OK": "Success of the creation of the owner's safe",
31733184
"EXT_VITAMUI_UPDATE_TENANT": "Modification of the owner's safe",
31743185
"EXT_VITAMUI_CREATE_USER": "User creation",
3186+
"EXT_VITAMUI_CREATE_USER.OK": "Success of the user creation",
31753187
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM_PROFILE": "External setting profile creation",
31763188
"EXT_VITAMUI_UPDATE_EXTERNAL_PARAM_PROFILE": "External setting profile update",
31773189
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM": "External setting creation",
3190+
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM.OK": "Success of the external setting creation",
31783191
"EXT_VITAMUI_UPDATE_EXTERNAL_PARAM": "External setting update",
31793192
"TRANSFER_REPLY": "Transfer acknowledgment",
31803193
"STP_TRANSFER_REPLY_PREPARATION.STARTED": "Start of transfer acknowledgment preparation process",

‎ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"INCORRECT_VALUE": "Valeur incorrecte",
2020
"NO_RESULT": "Aucun résultat",
2121
"SHOW_MORE_RESULTS": "Afficher plus de résultats...",
22+
"BY_USER": " par l'utilisateur {{userIdentifier}}",
23+
"SUBROGATED_BY": "subrogé par {{subrogatorIdentifier}}",
2224
"LANGUAGE": {
2325
"TITLE": "Langue",
2426
"ENGLISH": "Anglais",
@@ -4080,23 +4082,34 @@
40804082
"EXT_VITAMUI_AUTHENTIFICATION_USER": "Authentification de l'utilisateur",
40814083
"EXT_VITAMUI_BLOCK_USER": "Blocage de l'utilisateur",
40824084
"EXT_VITAMUI_CREATE_CUSTOMER": "Création de l'organisation",
4085+
"EXT_VITAMUI_CREATE_CUSTOMER.OK": "Succès de la création de l'organisation",
40834086
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM_PROFILE": "Création du profil de paramétrages externes",
40844087
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM": "Création d'un paramétrage externe",
4088+
"EXT_VITAMUI_CREATE_EXTERNAL_PARAM.OK": "Succès de la création d'un paramétrage externe",
40854089
"EXT_VITAMUI_CREATE_GROUP": "Création du groupe",
4090+
"EXT_VITAMUI_CREATE_GROUP.OK": "Succès de la création du groupe",
40864091
"EXT_VITAMUI_CREATE_IDP": "Création de L'IDP de l'organisaton",
4092+
"EXT_VITAMUI_CREATE_IDP.OK": "Succès de la création de L'IDP de l'organisaton",
40874093
"EXT_VITAMUI_CREATE_OWNER": "Création du propriétaire",
4094+
"EXT_VITAMUI_CREATE_OWNER.OK": "Succès de la création du propriétaire",
40884095
"EXT_VITAMUI_CREATE_PROFILE": "Création du profil",
4096+
"EXT_VITAMUI_CREATE_PROFILE.OK": "Succès de la création du profil",
40894097
"EXT_VITAMUI_CREATE_TENANT": "Création du coffre du propriétaire",
40904098
"EXT_VITAMUI_CREATE_USER_INFO": "Création des informations utilisateur",
4099+
"EXT_VITAMUI_CREATE_USER_INFO.OK": "Succes de la création des informations utilisateur",
40914100
"EXT_VITAMUI_CREATE_USER": "Création de l'utilisateur",
4101+
"EXT_VITAMUI_CREATE_USER.OK": "Succès de la création de l'utilisateur",
40924102
"EXT_VITAMUI_DECLINE_SURROGATE": "Refus de la subrogation par l'utilisateur",
40934103
"EXT_VITAMUI_LOGOUT_SURROGATE": "Arrêt par déconnexion de la subrogation de l'utilisateur",
4104+
"EXT_VITAMUI_LOGOUT_SURROGATE.OK": "Succès de l'arrêt par déconnexion de la subrogation de l'utilisateur",
40944105
"EXT_VITAMUI_PASSWORD_CHANGE": "Modification du mot de passe",
40954106
"EXT_VITAMUI_PASSWORD_INIT": "Initialisation du mot de passe",
40964107
"EXT_VITAMUI_PASSWORD_REVOCATION": "Révocation du mot de passe",
40974108
"EXT_VITAMUI_START_SURROGATE_GENERIC": "Démarrage de la subrogation de l'utilisateur générique",
4109+
"EXT_VITAMUI_START_SURROGATE_GENERIC.OK": "Succès du démarrage de la subrogation de l'utilisateur générique",
40984110
"EXT_VITAMUI_START_SURROGATE_USER": "Démarrage de la subrogation de l'utilisateur",
40994111
"EXT_VITAMUI_STOP_SURROGATE": "Arrêt de la subrogation de l'utilisateur",
4112+
"EXT_VITAMUI_STOP_SURROGATE.OK": "Succès de l'arrêt de la subrogation de l'utilisateur",
41004113
"EXT_VITAMUI_UPDATE_CUSTOMER": "Modification de l'organisation",
41014114
"EXT_VITAMUI_UPDATE_EXTERNAL_PARAM_PROFILE": "Modification du profil de paramétrages externes",
41024115
"EXT_VITAMUI_UPDATE_EXTERNAL_PARAM": "Modification d'un paramétrages externes",
@@ -4106,6 +4119,7 @@
41064119
"EXT_VITAMUI_UPDATE_PROFILE": "Modification du profil",
41074120
"EXT_VITAMUI_UPDATE_TENANT": "Modification du coffre du propriétaire",
41084121
"EXT_VITAMUI_UPDATE_USER_INFO": "Modification des informations utilisateur",
4122+
"EXT_VITAMUI_UPDATE_USER_INFO.OK": "Succès de la modification des informations utilisateur",
41094123
"EXT_VITAMUI_UPDATE_USER": "Modification de l'utilisateur",
41104124
"FINALIZE_OG_LFC_TRACEABILITY.FINALIZE_OG_LFC_TRACEABILITY.FATAL": "Erreur technique lors de la finalisation de la sécurisation des journaux du cycle de vie des groupes d'objets",
41114125
"FINALIZE_OG_LFC_TRACEABILITY.FINALIZE_OG_LFC_TRACEABILITY.KO": "Échec de la finalisation de la sécurisation des journaux du cycle de vie des groupes d'objets",

0 commit comments

Comments
 (0)