From 42970a1c89c676b4aaf86d73af9b0d288f8dd94f Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 9 Jan 2019 16:00:47 +0100
Subject: [PATCH] FEAT #8489 wording
---
.../sendmail/sendmail-administration.component.html | 4 ++--
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 3 ++-
src/frontend/lang/lang-nl.ts | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/administration/sendmail/sendmail-administration.component.html b/src/frontend/app/administration/sendmail/sendmail-administration.component.html
index 255c4bf2261..6ef8191613c 100644
--- a/src/frontend/app/administration/sendmail/sendmail-administration.component.html
+++ b/src/frontend/app/administration/sendmail/sendmail-administration.component.html
@@ -86,7 +86,7 @@
<div class="col-md-12">
<mat-form-field>
<input name="mailFrom" [(ngModel)]="sendmail.from" [disabled]="sendmail.type != 'smtp'"
- matInput placeholder="{{lang.mailFrom}}">
+ matInput placeholder="{{lang.mailFrom}}" pattern="(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)">
</mat-form-field>
</div>
</div>
@@ -108,7 +108,7 @@
<div class="form-group" [style.opacity]="sendmail.type != 'smtp' ? '0.5' : '1'">
<div class="col-md-12">
<mat-form-field>
- <input matInput placeholder="Adresse d'envoi" [(ngModel)]="recipientTest" [disabled]="emailSendLoading">
+ <input matInput placeholder="{{lang.mailTo}}" [(ngModel)]="recipientTest" [disabled]="emailSendLoading">
<mat-icon *ngIf="!emailSendLoading" title="{{lang.beginSendTest}}" (click)="testEmailSend()" color="primary" style="cursor: pointer;" matSuffix
class="fa fa-paper-plane fa-2x"></mat-icon>
</mat-form-field>
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 1c69b35457d..3b981745b63 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -732,6 +732,7 @@ export const LANG_EN = {
"configurationUpdated" : "Configuration updated",
"port" : "Port",
"mailFrom" : "Mail address used",
+ "mailTo" : "Mail address destination",
"eraseAllFilters" : "Erase all filters",
"isMulticontact" : "Multi-contact",
"emailSendTest" : "Email send test",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index c8a350c7ab4..f3731aa844f 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -757,7 +757,8 @@ export const LANG_FR = {
"undefined" : "Non défini",
"configurationUpdated" : "Configuration mise à jour",
"port" : "Port",
- "mailFrom" : "Adresse e-mail utilisée",
+ "mailFrom" : "Adresse d'envoi",
+ "mailTo" : "Adresse de réception",
"eraseAllFilters" : "Effacer tous les filtres",
"isMulticontact" : "Multi-contact",
"emailSendTest" : "Test d'envoi",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 83b87099525..3d6de2e89e6 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -760,6 +760,7 @@ export const LANG_NL = {
"configurationUpdated" : "_TO_TRANSLATE",
"port" : "_TO_TRANSLATE",
"mailFrom" : "_TO_TRANSLATE",
+ "mailTo" : "_TO_TRANSLATE",
"eraseAllFilters" : "_TO_TRANSLATE",
"isMulticontact" : "_TO_TRANSLATE",
"emailSendTest" : "_TO_TRANSLATE",
--
GitLab