From a22e742b042fbeda9b411a57a1dcdff90ff5e11d Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Mon, 17 Dec 2012 16:48:28 +0100
Subject: [PATCH] OO-377 improved wording, typo in comment, filter html in
course description in emails
---
.../java/org/olat/group/ui/BGMailHelper.java | 16 ++++++++--------
.../ui/edit/_i18n/LocalStrings_de.properties | 2 +-
.../ui/edit/_i18n/LocalStrings_en.properties | 2 +-
.../ui/main/_i18n/LocalStrings_de.properties | 2 +-
.../ui/main/_i18n/LocalStrings_en.properties | 2 +-
.../org/olat/group/ui/run/_content/waiting.html | 4 +++-
.../org/olat/repository/RepositoryMailing.java | 4 +++-
7 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/olat/group/ui/BGMailHelper.java b/src/main/java/org/olat/group/ui/BGMailHelper.java
index edc64b0d7d3..9b7b4cf3bf8 100644
--- a/src/main/java/org/olat/group/ui/BGMailHelper.java
+++ b/src/main/java/org/olat/group/ui/BGMailHelper.java
@@ -58,7 +58,7 @@ import org.olat.repository.RepositoryEntryShort;
public class BGMailHelper {
/**
- * The mail templated when adding users to a group. The method chooses
+ * The mail template when adding users to a group. The method chooses
* automatically the right translator for the given group type to customize
* the template text
*
@@ -73,7 +73,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when removing users from a group. The method chooses
+ * The mail template when removing users from a group. The method chooses
* automatically the right translator for the given group type to customize
* the template text
*
@@ -88,7 +88,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when deleting a whole group. The method chooses
+ * The mail template when deleting a whole group. The method chooses
* automatically the right translator for the given group type to customize
* the template text
*
@@ -103,7 +103,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when a user added himself to a group. The method chooses
+ * The mail template when a user added himself to a group. The method chooses
* automatically the right translator for the given group type to customize
* the template text
*
@@ -118,7 +118,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when a user removed himself from a group. The method
+ * The mail template when a user removed himself from a group. The method
* chooses automatically the right translator for the given group type to
* customize the template text
*
@@ -133,7 +133,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when adding users to a waitinglist. The method chooses
+ * The mail template when adding users to a waitinglist. The method chooses
* automatically the right translator for the given group type to customize
* the template text
*
@@ -148,7 +148,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when removing users from a waiting list. The method
+ * The mail template when removing users from a waiting list. The method
* chooses automatically the right translator for the given group type to
* customize the template text
*
@@ -163,7 +163,7 @@ public class BGMailHelper {
}
/**
- * The mail templated when automatically transferring users from the
+ * The mail template when automatically transferring users from the
* waitinglist to the participants list adding users to a waitinglist. The
* method chooses automatically the right translator for the given group type
* to customize the template text
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
index 5b5c4af274c..52306ec5d89 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
@@ -39,7 +39,7 @@ chelp.membLearn2=Hier k\u00F6nnen Sie bestimmen, wer die Mitglieder und Wartelis
chelp.membLearn5=Wenn Sie eine neue Gruppe erstellen, sind Sie automatisch Betreuer dieser Gruppe. Betreuer der Gruppe erhalten den Link "$org.olat.group.ui.run\:menutree.administration" im Menu.
chelp.membLearn6=Sie k\u00F6nnen die $org.olat.group.ui\:LearningGroup also administrieren, insbesondere auch andere Benutzer zu Betreuern ernennen und die Gruppe löschen.
chelp.membLearn7=$org.olat.group.ui\:fieldset.legend.groupowners k\u00F6nnen beliebige Benutzer als $\:fieldset.legend.grouppartips in die Gruppe einladen.
-chelp.membLearn8=Betreuer können die Kandidaten in der Warteliste als Teilnehmer übernehmen oder aus der Warteliste entfernen. In beiden Fällen können sie bestimmen, ob die Benutzer darüber per Email notifiziert werden sollen und können gegenfalls den Emailtext anpassen.
+chelp.membLearn8=Betreuer können die Kandidaten in der Warteliste als Teilnehmer zulassen oder aus der Warteliste entfernen. In beiden Fällen können sie bestimmen, ob die Benutzer darüber per Email notifiziert werden sollen und können gegenfalls den Emailtext anpassen.
chelp.resource1=Hier legen Sie fest, ob und mit welchen Kursen eine Gruppe verbunden ist. Über "$:cmd.addresource" können Sie die Kurse einbinden, bei denen Sie als Besitzer eingetragen sind. Es gibt keine Beschränkung der Anzahl eingebundener Kurse.
chelp.resource2=Sobald die Gruppe mit mindestens einem Kurs verbunden wurde, erscheint der Eintrag "Kurs" in der Navigation.
chelp.right1=Sie haben die M\u00F6glichkeit, den Mitgliedern der Gruppe innerhalb des Kurses die Berechtigung f\u00FCr den Zugriff und die Verwendung der folgenden Werkzeuge zu vergeben\:
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
index 050505a5328..181dc1a8653 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
@@ -39,7 +39,7 @@ chelp.membLearn2=Here you can decide which user groups are allowed to view the m
chelp.membLearn5=If you create a new group, you are automatically one of the coaches of this group. Coaches of this group will see the link "$org.olat.group.ui.run\:menutree.administration" in the menu. They can then administer this group, appoint other users as owners and delete the group.
chelp.membLearn6=They can then administer that group and appoint other OLAT users as coaches.
chelp.membLearn7=Coaches can invite users to be participants of their group.
-chelp.membLearn8=Coaches can accept candidates from a waiting list as participants or delete them. Either way you can determine if users should be notified via e-mail; its text will be adaptable.
+chelp.membLearn8=Coaches can admit candidates from a waiting list as participants or delete them. Either way you can determine if users should be notified via e-mail; its text will be adaptable.
chelp.resource1=Here you can determine whether a group is connected to one or multiple courses. Clicking on "$:cmd.addresource" allows you to link as many courses you are owner of with the group. There is no limit to the number of embedded courses.
chelp.resource2=Once the group has been associated with at least one course, the entry "Course" appears in the navigation.
chelp.right1=You have the possibility to assign access rights as well as the right to use the following tools to members of a group with the same rights during this course\:
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
index 5ff228216da..5b7486b8caa 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
@@ -147,7 +147,7 @@ edit.member.title=Mitgliederrechte Kurs "{0}"
table.header.edit=Bearbeiten
table.header.remove=Entfernen
-table.header.graduate=\u00DCbernehmen
+table.header.graduate=Zulassen
tbl_graduate=$:table.header.graduate
table.header.firstName=Vorname
table.header.lastName=Name
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
index 49b9d42099e..ab900b57b22 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
@@ -95,7 +95,7 @@ table.header.description=Description
table.header.edit=Edit
table.header.firstTime=Registration
table.header.freePlaces=Slots
-table.header.graduate=Promote
+table.header.graduate=Admit
table.header.group.full=Full
table.header.key=ID
table.header.lastTime=Last visit
diff --git a/src/main/java/org/olat/group/ui/run/_content/waiting.html b/src/main/java/org/olat/group/ui/run/_content/waiting.html
index f3857c669df..f0f36a712de 100644
--- a/src/main/java/org/olat/group/ui/run/_content/waiting.html
+++ b/src/main/java/org/olat/group/ui/run/_content/waiting.html
@@ -1,4 +1,6 @@
<h4 class="b_with_small_icon_left b_group_icon">
$name
</h4>
-$r.translate("group.on.waitinglist")
\ No newline at end of file
+<p class="b_warning">
+ $r.translate("group.on.waitinglist")
+</p>
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/RepositoryMailing.java b/src/main/java/org/olat/repository/RepositoryMailing.java
index 73bddfab952..a69ab7b6d9a 100644
--- a/src/main/java/org/olat/repository/RepositoryMailing.java
+++ b/src/main/java/org/olat/repository/RepositoryMailing.java
@@ -27,7 +27,9 @@ import org.olat.core.gui.translator.Translator;
import org.olat.core.id.Identity;
import org.olat.core.id.User;
import org.olat.core.id.UserConstants;
+import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
+import org.olat.core.util.filter.FilterFactory;
import org.olat.core.util.i18n.I18nManager;
import org.olat.core.util.mail.MailContext;
import org.olat.core.util.mail.MailContextImpl;
@@ -139,7 +141,7 @@ public class RepositoryMailing {
private static MailTemplate createMailTemplate(RepositoryEntry re, Identity actor, String subjectKey, String bodyKey) {
// build learning resources as list of url as string
final String reName = re.getDisplayname();
- final String redescription = re.getDescription();
+ final String redescription = (StringHelper.containsNonWhitespace(re.getDescription()) ? FilterFactory.getHtmlTagAndDescapingFilter().filter(re.getDescription()) : "");
// get some data about the actor and fetch the translated subject / body via i18n module
String[] bodyArgs = new String[] {
--
GitLab