diff --git a/src/frontend/app/activate-user.component.html b/src/frontend/app/activate-user.component.html index 9e0563220c2d4d1c1b558fdd47e96e07341c1734..d6b6c7391019ce83993dc09898d2774e759cc433 100755 --- a/src/frontend/app/activate-user.component.html +++ b/src/frontend/app/activate-user.component.html @@ -16,7 +16,6 @@ <div class="text-center" style="margin-top: 50px;"> {{lang.missingAdvert}}<br> {{lang.missingAdvert2}}<br> - {{lang.missingChoose}}<br> <ng-container *ngIf="user.redirectedBaskets.length > 0"> <br> {{lang.missingBasket}}<br> @@ -51,6 +50,7 @@ <span (click)="selectionBaskets.toggle(basket);" matTooltip="{{basket.basket_name}} [{{basket.group_desc}}]" style="flex: 2;overflow: hidden;text-overflow: ellipsis;"> {{basket.basket_name}} <span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span> + <span style="opacity: 0.5;font-style: italic;font-size: 80%;"> {{lang.redirectedTo}} {{basket.userToDisplay}}</span> </span> </h4> </mat-list-item> @@ -62,6 +62,8 @@ <div style="clear:both;"></div> <div *ngIf="!loading" class="text-center" style="position:relative; top:50px;"> + {{lang.missingChoose}}<br> + <br> <button mat-raised-button color="primary" type="button" (click)="activateUser()">{{lang.validate}}</button> <button mat-raised-button color="primary" type="button" (click)="logout()">{{lang.cancel}}</button> </div> diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index b6f4e968debe996880b4a22ef5002c79c8218d8c..2fc23e16654d19263f13315dd504c59de69efb89 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -743,7 +743,7 @@ export const LANG_EN = { "emailSendFailed" : "Email send failed", "doNotReply" : "Do not reply", "none" : "None", - "missingBasket" : "Select the baskets you would like reactivate with your account.", + "missingBasket" : "Select the baskets wish you want to delete the redirection.", "docDate" : "Document date", "reference" : "Reference", "departureDate" : "Departure date", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index d4823b3b7c59ad5322e5c0e0c27346c7e973931e..b1efe0ff43dd9fff11c7e29cb157e4d263d18d0a 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -769,7 +769,7 @@ export const LANG_FR = { "emailSendFailed" : "Échec d'envoi", "doNotReply" : "Ne pas répondre", "none" : "Aucune", - "missingBasket" : "Sélectionner les bannettes que vous souhaitez réactiver avec votre compte.", + "missingBasket" : "Sélectionner les bannettes pour lesquelles vous souhaitez supprimer la redirection :", "docDate" : "Date du document", "reference" : "Référence", "departureDate" : "Date de départ",