From b1fccf189046c65e7deab017da866fd9e124ac03 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Tue, 18 Apr 2017 15:14:01 +0200
Subject: [PATCH] OO-2619 alter mails
---
.../org/olat/registration/PwChangeController.java | 11 ++++++-----
.../registration/_i18n/LocalStrings_de.properties | 4 +++-
.../registration/_i18n/LocalStrings_en.properties | 4 +++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/registration/PwChangeController.java b/src/main/java/org/olat/registration/PwChangeController.java
index 0b63b7a2e2d..10b6b78b64e 100644
--- a/src/main/java/org/olat/registration/PwChangeController.java
+++ b/src/main/java/org/olat/registration/PwChangeController.java
@@ -272,15 +272,16 @@ public class PwChangeController extends BasicController {
myContent.contextPut("pwKey", tk.getRegistrationKey());
StringBuilder body = new StringBuilder();
body.append("<style>")
- .append(".o_m_bground {background: #FAFAFA; border: 1px solid #eee; border-radius: 5px; padding: 1em; margin: 1em;}")
+ .append(".o_footer {background: #FAFAFA; border: 1px solid #eee; border-radius: 5px; padding: 1em; margin: 1em;}")
+ .append(".o_body {background: #FAFAFA; padding: 1em; margin: 1em;}")
.append("</style>")
- .append("<div class='o_m_bground'>")
+ .append("<div class='o_body'>")
+ .append(userTrans.translate("pwchange.headline"))
.append(userTrans.translate("pwchange.intro", new String[] { identity.getName() }))
- .append("</div>")
- .append("<div class='o_m_bground'>")
.append(userTrans.translate("pwchange.body", new String[] { serverpath, tk.getRegistrationKey(), I18nManager.getInstance().getLocaleKey(ureq.getLocale()) }))
+ .append(userTrans.translate("pwchange.body.alt", new String[] { serverpath, tk.getRegistrationKey(), I18nManager.getInstance().getLocaleKey(ureq.getLocale()) }))
.append("</div>")
- .append("<div class='o_m_bground'>")
+ .append("<div class='o_footer'>")
.append(userTrans.translate("reg.wherefrom", new String[] { serverpath, today, ip }))
.append("</div>");
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
index 3334b755101..3a751243530 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
@@ -65,7 +65,9 @@ pw.change.confirm.token=SMS Authentifizierungscode
pw.change.sms=SMS Authentifizierung starten
pw.change.sms.descr=Sie haben eine Mobile Telefonnummer in OpenOLAT hinterlegt. Sie k\u00F6nnen sich daher \u00FCber SMS authentifizieren. W\u00E4hlen Sie den untenstehenden Button, um die SMS-Authentifizierung zu starten\:
pw.change.sms.title=SMS Authentifizierung
-pwchange.body=\u00DCber den Link <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a> \nk\u00F6nnen Sie Ihr OpenOLAT-Passwort neu setzen und sich anschlie\u00DFend unter {0}/dmz/1%3A1%3Aomain_loging%3A1%3A0%3Acid%3Alogin/?lp\=OLAT einloggen. \n\nIhr OpenOLAT-Team \n
+pwchange.headline=<p><b>Schl\u00FCssel f\u00FCr neues OpenOLAT-Passwort</b></p>
+pwchange.body=<p>Klicken Sie <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>hier um Ihr OpenOLAT Passwort neu zu setzen</a>. \nAnschließend k\u00F6nnen Sie sich bei <a href='{0}/dmz/1%3A1%3Aomain_loging%3A1%3A0%3Acid%3Alogin/?lp\=OLAT'>OpenOLAT anmelden</a>.</p>
+pwchange.body.alt=<p>Falls Ihr Emailprogramm HTML nicht nterst\u00FCtzt, kopieren Sie den folgenden Link in Ihren Webbrowser: <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a>/<p>
pwchange.homelink=Klicken Sie hier um sich anzumelden
pwchange.intro=Sie oder eine andere Person haben f\u00FCr den OpenOLAT-Benutzeraccount {0} ein neues Passwort angefordert.\n\n
pwchange.subject=Schl\u00FCssel f\u00FCr neues OpenOLAT-Passwort
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
index 4045d0d9737..8298b201ff7 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
@@ -65,7 +65,9 @@ pw.change.confirm.token=SMS authentication code
pw.change.sms=Start authentication by SMS
pw.change.sms.descr=You have enter a mobile telecom number in OpenOLAT. You can authenticate you by SMS. Choose the button below to start the authentication by SMS\:
pw.change.sms.title=Authentication by SMS
-pwchange.body=Please use the link <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a> \r\nto change your OpenOLAT password. \r\n\r\nYour OpenOLAT team
+pwchange.headline=<p><b>Key for new OpenOLAT password</b></p>
+pwchange.body=<p>Please click <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>here to reset your OpenOLAT password</a>. \nAfterwards you may <a href='{0}/dmz/1%3A1%3Aomain_loging%3A1%3A0%3Acid%3Alogin/?lp\=OLAT'>sign in OpenOLAT</a>.</p>
+pwchange.body.alt=<p>In case your mail program does not support HTML, copy this link to you webbrowser: <a href='{0}/dmz/pwchange/index.html?key\={1}&language\={2}'>{0}/dmz/pwchange/index.html?key\={1}&language\={2}</a></p>
pwchange.homelink=Please click here to log on
pwchange.intro=You have (or somebody else has) asked for a new password regarding the OpenOLAT user account {0}.
pwchange.subject=Key to a new OpenOLAT password
--
GitLab