Fix langs & Append template (#1605)

2020-01-05 19:11:52 +01:00 · 2020-01-05 19:11:52 +01:00 · b08400d4bb
commit b08400d4bb
parent 42a760efab
17 changed files with 65 additions and 14 deletions
--- a/lemonldap-ng-portal/MANIFEST
+++ b/lemonldap-ng-portal/MANIFEST
@ -442,6 +442,7 @@ site/templates/common/mail/tr.json
 site/templates/common/mail/vi.json
 site/templates/common/mail/zh_CN.json
 site/templates/common/mail_2fcode.tpl
+site/templates/common/mail_certificateConfirm.tpl
 site/templates/common/mail_certificateReset.tpl
 site/templates/common/mail_confirm.tpl
 site/templates/common/mail_footer.tpl
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm
@ -378,7 +378,7 @@ sub _certificateReset {
            # Use HTML template
            $body = $self->loadMailTemplate(
                $req,
-                'mail_confirm',
+                'mail_certificateConfirm',
                filter => $tr,
                params => \%tplPrms
            );
--- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"اختر أحد التطبيقات المسموح لك بالدخول إليها",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"الرجاء الضغط هنا",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"أغلق جلسة الدخول الموحد (سسو)",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"المصادقات المتبقية، غير كلمة المرور الخاصة بك!",
 "proxyError":"بوابة سيئة: غير قادر على الانضمام لالخادم البعيد",
-"pwdChange":"تغيير كلمة المرور",
 "pwd":"كلمة المرور",
+"pwdChange":"تغيير كلمة المرور",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"تم إصدار طلب إعادة تعيين كلمة المرور من قبل",
 "pwdWillExpire":"٪ s من الأيام و٪ s من الساعات و٪ s من الدقائق و٪ s من الثواني قبل انتهاء صلاحية كلمة المرور، قم بتغييرها!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json
@ -124,6 +124,8 @@
 "choose2f":"Wählen deinen Ihren zweiten Faktor",
 "chooseApp":"Wählen Sie eine Anwendung aus, auf die du zugreifen darfst",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Bitte hier klicken",
 "clickOnYubikey":"Klicke auf deinen Yubikey",
 "closeSSO":"Schließe deine SSO-Sitzung",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Please click here",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Close your SSO session",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit": "Minimal digit characters:",
 "ppGrace": "authentications remaining, change your password!",
 "proxyError": "Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
 "pwd":"Password",
+"pwdChange":"Password change",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"%s days, %s hours, %s minutes and %s seconds before password expiration, change it!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json
@ -124,6 +124,8 @@
 "choose2f":"Seleccione su segundo factor",
 "chooseApp":"Elija una aplicación a la cual se le está permitido acceder",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Por favor haga clic aquí",
 "clickOnYubikey":"Haga clic en su Yubikey",
 "closeSSO":"Cierre su sesión SSO",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Dígitos, como mínimo:",
 "ppGrace":"autenticaciones restantes, ¡cambie su contraseña!.",
 "proxyError":"Puerta de enlace no válida: servidor remoto inalcanzable",
-"pwdChange":"Cambio de contraseña",
 "pwd":"Contraseña",
+"pwdChange":"Cambio de contraseña",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"Ya fue expedida una solicitud de reinicio de contraseña",
 "pwdWillExpire":"Faltan %s días, %s horas, %s minutos y %s segundos para que su contraseña caduque.",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/fi.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/fi.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Please click here",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Sulje SSO istuntosi",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
 "pwd":"Salasana",
+"pwdChange":"Password change",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"%d päivää, %d tuntia, %d minuuttia ja %sekunttia jäljellä salasanan vanhentumiseen, vaihda salasana!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json
@ -124,6 +124,8 @@
 "choose2f":"Choisissez votre second facteur",
 "chooseApp":"Choisissez une application à laquelle vous êtes autorisé à accéder",
 "cipheredValue":"Valeur cryptée",
+"click2Reset":"Cliquez içi pour réinitialiser votre mot de passe",
+"click2ResetCertificate":"Cliquez içi pour réinitialiser votre certificat",
 "clickHere":"Cliquez ici",
 "clickOnYubikey":"Cliquez sur votre Yubikey",
 "closeSSO":"Fermer votre Session SSO",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit": "Minimum de chiffres :",
 "ppGrace": "authentifications restantes, changez votre mot de passe !",
 "proxyError": "Mauvaise passerelle : impossible de joindre le serveur amont",
-"pwdChange":"Changement de mot de passe",
 "pwd":"Mot de passe",
+"pwdChange":"Changement de mot de passe",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"Une demande de réinitialisation de mot de passe a déjà été faite le ",
 "pwdWillExpire":"%s jours, %s heures, %s minutes et %s secondes avant expiration de votre mot de passe, pensez à le changer !",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json
@ -124,6 +124,8 @@
 "choose2f":"Scegli il tuo secondo fattore",
 "chooseApp":"Scegli un'applicazione alla quale ti è consentito l'accesso",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Per favore clicka qui",
 "clickOnYubikey":"Clicca sulla tua Yubikey",
 "closeSSO":"Chiudi la sessione SSO",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"autenticazioni restanti, modifica la tua password!",
 "proxyError":"Gateway errata: impossibile associarsi a un server remoto",
-"pwdChange":"Cambio password",
 "pwd":"Password",
+"pwdChange":"Cambio password",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"Una richiesta di ripristino della password é già stata rilasciata",
 "pwdWillExpire":"%s giorni, %s ore, %s minuti e %s secondi prima della scadenza della password, cambiala!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Please click here",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Close your SSO session",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
 "pwd":"Password",
+"pwdChange":"Password change",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"%s days, %s hours, %s minutes and %s seconds before password expiration, change it!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Please click here",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Close your SSO session",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
 "pwd":"Password",
+"pwdChange":"Password change",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"%s days, %s hours, %s minutes and %s seconds before password expiration, change it!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Please click here",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Close your SSO session",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
 "pwd":"Password",
+"pwdChange":"Password change",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"%s days, %s hours, %s minutes and %s seconds before password expiration, change it!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/tr.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/tr.json
@ -124,6 +124,8 @@
 "choose2f":"İkinci faktörünüzü seçin",
 "chooseApp":"Erişim yetkiniz olan bir uygulama seçin",
 "cipheredValue":"Şifrelenmiş değer",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Lütfen buraya tıklayın",
 "clickOnYubikey":"Yubikey'e tıklayın",
 "closeSSO":"TOA oturumunuzu kapatın",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimum rakam karakter sayısı",
 "ppGrace":"kimlik doğrulaması kaldı, parolanızı değiştirin!",
 "proxyError":"Kötü ağ geçidi: uzak sunucuya katılamıyor",
-"pwdChange":"Parola değişimi",
 "pwd":"Parola",
+"pwdChange":"Parola değişimi",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"Parola sıfırlama istediği zaten şu tarihte alındı:",
 "pwdWillExpire":"Parola süresinin dolmasına %s gün, %s saat, %s dakika ve %s saniye kaldı, parolayı değiştirin!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Chọn một ứng dụng bạn được phép truy cập vào",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"Vui lòng nhấp vào đây",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Đóng phiên SSO của bạn",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"chứng thực vẫn còn, thay đổi mật khẩu của bạn!",
 "proxyError":"Gateway không chính xác: không thể kết nối máy chủ từ xa",
-"pwdChange":"Thay đổi mật khẩu",
 "pwd":"Mật khẩu",
+"pwdChange":"Thay đổi mật khẩu",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"Yêu cầu đặt lại mật khẩu đã được ban hành",
 "pwdWillExpire":"%s ngày, %s giờ, %s phút và %s giây trước khi hết hạn mật khẩu, hãy thay đổi nó!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/zh.json
@ -124,6 +124,8 @@
 "choose2f":"Choose your second factor",
 "chooseApp":"Choose an application your are allowed to access to",
 "cipheredValue":"Ciphered value",
+"click2Reset":"Click here to reset your password",
+"click2ResetCertificate":"Click here to reset your certificate",
 "clickHere":"请点击这里",
 "clickOnYubikey":"Click on your Yubikey",
 "closeSSO":"Close your SSO session",
@ -217,8 +219,9 @@
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"错误的网关：无法连接远程服务器",
-"pwdChange":"更改密码",
 "pwd":"密码",
+"pwdChange":"更改密码",
+"pwdChanged":"Your password has been successfully changed!",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"距离密码失效还有 %d 天, %d 小时, %d 分钟, %d 秒, 请修改!",
 "radius2f":"Radius",
--- a/lemonldap-ng-portal/site/templates/common/mail_certificateConfirm.tpl
+++ b/lemonldap-ng-portal/site/templates/common/mail_certificateConfirm.tpl
@ -0,0 +1,12 @@
+<TMPL_INCLUDE NAME="mail_header.tpl">
+
+<p>
+<span trspan="hello">Hello</span> $cn,<br />
+<br />
+<span><img src="cid:arrow:../common/bullet_go.png" /></span>
+<a href="$url" style="text-decoration:none;color:orange;">
+<span trspan="click2ResetCertificate">Click here to reset your certificate</span>
+</a>
+</p>
+
+<TMPL_INCLUDE NAME="mail_footer.tpl">
--- a/lemonldap-ng-portal/site/templates/common/mail_password.tpl
+++ b/lemonldap-ng-portal/site/templates/common/mail_password.tpl
@ -8,7 +8,7 @@
 <span><img src="cid:key:../common/key.png" /></span>
 <b>$password</b>
 <TMPL_ELSE>
-<span trspan="pwdChanged">Your password was changed.</span> 
+<span trspan="pwdChanged">Your password has been successfully changed!</span> 
 </TMPL_IF>
 </p>