From 2e152742583ad4fa749d75b3154be2bf6b27d292 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 25 Jun 2018 15:46:35 +0200
Subject: [PATCH] OO-3241: wording
---
.../java/org/olat/core/util/mail/ContactMessage.java | 12 ++++--------
.../ui/ParticipantLectureBlocksController.java | 12 ++++++++++--
.../lecture/ui/_i18n/LocalStrings_de.properties | 3 ++-
.../lecture/ui/_i18n/LocalStrings_en.properties | 3 ++-
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/olat/core/util/mail/ContactMessage.java b/src/main/java/org/olat/core/util/mail/ContactMessage.java
index 6362cd6dd87..7e2c3116276 100644
--- a/src/main/java/org/olat/core/util/mail/ContactMessage.java
+++ b/src/main/java/org/olat/core/util/mail/ContactMessage.java
@@ -22,8 +22,7 @@
* This file has been modified by the OpenOLAT community. Changes are licensed
* under the Apache 2.0 license as the original file.
* <p>
-*/
-
+*/
package org.olat.core.util.mail;
import java.util.ArrayList;
@@ -34,16 +33,13 @@ import java.util.Map;
import org.olat.core.id.Identity;
/**
- * Description:<br>
- * TODO: patrick Class Description for ContactMessage
- * <P>
* Initial Date: Jan 22, 2006 <br>
*
* @author patrick
*/
public class ContactMessage {
- private Map<String,ContactList> contactLists = new HashMap<String,ContactList>();
+ private Map<String,ContactList> contactLists = new HashMap<>();
private List<Identity> disabledIdentities;
private String bodyText;
private String subject;
@@ -55,7 +51,7 @@ public class ContactMessage {
*/
public ContactMessage(Identity from){
this.from = from;
- disabledIdentities = new ArrayList<Identity>();
+ disabledIdentities = new ArrayList<>();
}
public Identity getFrom(){
@@ -125,6 +121,6 @@ public class ContactMessage {
* @return
*/
public List<ContactList> getEmailToContactLists() {
- return new ArrayList<ContactList>(contactLists.values());
+ return new ArrayList<>(contactLists.values());
}
}
diff --git a/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java b/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
index fea2663c914..858a2a5d53b 100644
--- a/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
@@ -55,6 +55,7 @@ import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.creator.ControllerCreator;
import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
import org.olat.core.id.Identity;
+import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper;
import org.olat.core.util.mail.ContactList;
@@ -362,16 +363,23 @@ public class ParticipantLectureBlocksController extends FormBasicController {
teacherNames.append(teacher.getUser().getFirstName()).append(" ").append(teacher.getUser().getLastName());
}
String date = Formatter.getInstance(getLocale()).formatDate(block.getStartDate());
+ String businessPath = "[RepositoryEntry:" + entry.getKey() + "][LectureBlock:" + block.getKey() + "]";
+ String url = BusinessControlFactory.getInstance().getURLFromBusinessPathString(businessPath);
String[] args = new String[] {
row.getLectureBlockTitle(),
teacherNames.toString(),
- date
+ date,
+ url
};
+ StringBuilder body = new StringBuilder(1024);
+ body.append(translate("appeal.body.title", args))
+ .append(translate("appeal.body", args));
+
ContactMessage cmsg = new ContactMessage(getIdentity());
cmsg.addEmailTo(contactList);
cmsg.setSubject(translate("appeal.subject", args));
- cmsg.setBodyText(translate("appeal.body", args));
+ cmsg.setBodyText(body.toString());
appealCtrl = new ContactFormController(ureq, getWindowControl(), true, false, false, cmsg);
appealCtrl.setUserObject(row);
appealCtrl.setContactFormTitle(translate("new.appeal.title"));
diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
index 07559b60129..b79075015b9 100644
--- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
@@ -13,6 +13,7 @@ all.teachers.switch.tooltip.on=Nur meine Lektionenbl\u00F6cke anzeigen
appeal=Rekurs
appeal.approved=BestÃĪtigt
appeal.body=<p>Liebe / Lieber {1}</p><p>Ich melde mich bez\u00FCglich meiner Absenz vom {2}, welche aus meiner Sicht nicht korrekt erfasst wurde.</p><p>Begr\u00FCndung\:</p><p><span style\="color\: \#ff0000;">(Bitte Grund eintragen)</span></p><p>Vielen Dank im Voraus f\u00FCr die Pr\u00FCfung und f\u00FCr eine allf\u00E4llige Korrektur.</p><p>Liebe Gr\u00FCsse</p>
+appeal.body.title=<h4>Rekursanfrage zu folgendem Lektionenblock:</h4><p><a href="{3}">{3}</a></p>
appeal.closed=Geschlossen
appeal.contact.list=Dozent
appeal.from=Ab {0}
@@ -27,7 +28,7 @@ appeal.approved=Angenommen
appeal.rejected=Abgelehnt
appeal.pending=Pendent
appeal.status=Status
-appeal.form.explain=Entscheid m\u00FCssen begr\u00FCndet werden.
+appeal.form.explain=Der Entscheid m\u00FCssen begr\u00FCndet werden.
archive.entry=Archivierung
attendance.list=Absenzenliste
attendance.list.title=Absenzenliste\: {0}
diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties
index 252a350829b..3f3312beb46 100644
--- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties
@@ -13,6 +13,7 @@ all.teachers.switch.tooltip.on=Show only my lecture blocks
appeal=Appeal
appeal.approved=Approved
appeal.body=<p>Dear {1}</p>
+appeal.body.title=<h4>Appeal of the following lecture block:</h4><p><a href="{3}">{3}</a></p>
appeal.closed=Closed
appeal.contact.list=Teacher
appeal.from=From {0}
@@ -27,7 +28,7 @@ appeal.approved=Approved
appeal.rejected=Rejected
appeal.pending=Pending
appeal.status=Status
-appeal.form.explain=Decision need to be motivated.
+appeal.form.explain=The decision need to be motivated.
archive.entry=Archive
attendance.list=Absence list
attendance.list.title=Absence list: {0}
--
GitLab