From d15ecbc459722de363f4ca5b6652fa4bd562430e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 13 May 2015 15:11:52 +0200
Subject: [PATCH] OO-1494: implements feedback
---
.../olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties | 2 +-
.../olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties | 2 +-
.../java/org/olat/course/reminder/ui/AttemptsRuleEditor.java | 2 +-
.../olat/course/reminder/ui/CourseReminderListController.java | 2 --
.../olat/course/reminder/ui/_i18n/LocalStrings_de.properties | 4 ++--
.../olat/course/reminder/ui/_i18n/LocalStrings_en.properties | 4 ++--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
index 94ba92de38b..ffbf00aa160 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
@@ -65,7 +65,7 @@ file.name=Dateiname
file.name.example=Document.html
grading=Bewertung
group.apply.toall=F\u00FCr die ganze Gruppe
-group.passed=Gruppe bestanden/nicht bestanden
+group.passed=Gruppe bestanden
group.score=Gruppe Punkte
group.title=Leistungs\u00FCbersicht
info.title=$org.olat.course.nodes.ms\:info.title
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
index 22fff506f10..2a277c9ebad 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
@@ -65,7 +65,7 @@ file.name=File name
file.name.example=Document.html
grading=Grading
group.apply.toall=For the whole group
-group.passed=Group passed/failed
+group.passed=Group passed
group.score=Group score
group.title=Score summary
info.title=$org.olat.course.nodes.ms\:info.title
diff --git a/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java b/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java
index fcf23ef8c93..afcbbdc33a4 100644
--- a/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java
+++ b/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java
@@ -95,7 +95,7 @@ public class AttemptsRuleEditor extends RuleEditorFragment {
String[] nodeValues = new String[attemptableNodes.size()];
for(int i=0; i<attemptableNodes.size(); i++) {
- CourseNode attemptableNode = attemptableNodes.get(1);
+ CourseNode attemptableNode = attemptableNodes.get(i);
nodeKeys[i] = attemptableNode.getIdent();
nodeValues[i] = attemptableNode.getShortTitle() + " ( " + attemptableNode.getIdent() + " )";
}
diff --git a/src/main/java/org/olat/course/reminder/ui/CourseReminderListController.java b/src/main/java/org/olat/course/reminder/ui/CourseReminderListController.java
index adb5c0cef05..21a7433eabe 100644
--- a/src/main/java/org/olat/course/reminder/ui/CourseReminderListController.java
+++ b/src/main/java/org/olat/course/reminder/ui/CourseReminderListController.java
@@ -114,8 +114,6 @@ public class CourseReminderListController extends FormBasicController implements
true, ReminderCols.creationDate.name()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, ReminderCols.lastModified.i18nKey(), ReminderCols.lastModified.ordinal(),
true, ReminderCols.lastModified.name()));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ReminderCols.sendTime.i18nKey(), ReminderCols.sendTime.ordinal(),
- true, ReminderCols.sendTime.name()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ReminderCols.send.i18nKey(), ReminderCols.send.ordinal(),
true, ReminderCols.send.name()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ReminderCols.tools.i18nKey(), ReminderCols.tools.ordinal()));
diff --git a/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_de.properties
index f2e082cd9ea..7e8e2944b7d 100644
--- a/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_de.properties
@@ -26,12 +26,12 @@ reminder.id=ID
reminder.resend=Erinnerung wurde erfolgreich geschickt.
reminders=Erinnerungen
resend=Wieder schicken
-rule.assign.task=Gruppenaufgabe Zuweisung
+rule.assign.task=Aufgabe Zuweisung
rule.attempts=Versuche
rule.initial.attempts.date=Datum des ersten Versuchs
rule.passed=Bestanden
rule.score=Punkte
-rule.submission.task=Gruppenaufgabe Dokumente abgeben
+rule.submission.task=Aufgabe Dokumente abgeben
rules.description=Wenn folgende Bedingungen erf\u00FCllt sind
send=Erinnerung jetzt schicken
send.reminder=Geschickte Erinnerungen
diff --git a/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_en.properties
index d163a4c5e5c..2ee68c99aae 100644
--- a/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/reminder/ui/_i18n/LocalStrings_en.properties
@@ -27,11 +27,11 @@ reminder.resend=Reminder was successfully sent.
reminders=Reminders
resend=Resend
rule.attempts=Attempts
-rule.assign.task=Group task assignment
+rule.assign.task=Task assignment
rule.initial.attempts.date=Initial attempt date
rule.passed=Passed
rule.score=Score
-rule.submission.task=Group task documents submission
+rule.submission.task=Task documents submission
rules.description=When matching all of the following conditions
send=Send reminders now
send.reminder=Send reminders
--
GitLab