diff --git a/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties
index e86dda31eb237ba9dbd21830d9aeef7b5b466090..a6d560438c3bedefdde702cff12accfb051f5d4d 100644
--- a/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Thu May 05 10:01:22 CEST 2016
+#Wed Jun 01 11:47:42 CEST 2016
AdminSiteDef=Administration
CatalogAdminSiteDef=Administration du catalogue
CatalogSiteDef=Catalogue
@@ -17,6 +17,7 @@ PortalSiteDef=Portail
QuestionPoolSiteDef=Banque des questions
RepositorySiteDef=Ressources didactiques
UserAdminSiteDef=Utilisateurs
+VideoSiteDef=LearnTube
admin.menu.title=Sites
admin.menu.title.alt=Configurer les sites
adminSiteSecurityCallback=Administrateurs syst\u00E8me
diff --git a/src/main/java/org/olat/core/gui/control/controller/BasicController.java b/src/main/java/org/olat/core/gui/control/controller/BasicController.java
index eff380ec3b74a1407fd8bfc624772e98b1a6a577..01cc65299bb3a383548e5a09302bbd2785961481 100644
--- a/src/main/java/org/olat/core/gui/control/controller/BasicController.java
+++ b/src/main/java/org/olat/core/gui/control/controller/BasicController.java
@@ -502,6 +502,11 @@ public abstract class BasicController extends DefaultController {
getWindowControl().setWarning(
getTranslator().translate(key, new String[] { arg }));
}
+
+ protected void showWarning(String key, String[] args) {
+ getWindowControl().setWarning(
+ getTranslator().translate(key, args));
+ }
/**
* convenience method to send an error msg to the user. this will call
diff --git a/src/main/java/org/olat/course/nodes/gta/TaskHelper.java b/src/main/java/org/olat/course/nodes/gta/TaskHelper.java
index 789657f66decb2b2ff6baf50f928edaf1e512e40..0b20bd24432366d441d918af0a902bfa74fbee9d 100644
--- a/src/main/java/org/olat/course/nodes/gta/TaskHelper.java
+++ b/src/main/java/org/olat/course/nodes/gta/TaskHelper.java
@@ -96,8 +96,9 @@ public class TaskHelper {
return false;
}
- public static String getDocumentsLocked(VFSContainer documentsContainer, File[] documents) {
- StringBuilder sb = new StringBuilder();
+ public static FilesLocked getDocumentsLocked(VFSContainer documentsContainer, File[] documents) {
+ StringBuilder by = new StringBuilder();
+ StringBuilder files = new StringBuilder();
boolean locked = false;
for(File submittedDocument:documents) {
@@ -115,17 +116,44 @@ public class TaskHelper {
if(lockedBy != null) {
fullname = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(lockedBy);
}
- if(sb.length() > 0) {
- sb.append(", ");
+ if(by.length() > 0) {
+ by.append(", ");
+ files.append(", ");
}
- sb.append(fullname);
+ by.append(fullname);
+ files.append(submittedDocument.getName());
}
}
if(locked) {
- return sb.toString();
+ return new FilesLocked(by.toString(), files.toString());
}
return null;
}
+
+ public static class FilesLocked {
+ private String lockedBy;
+ private String lockedFiles;
+
+ public FilesLocked(String lockedBy, String lockedFiles) {
+ this.lockedBy = lockedBy;
+ this.lockedFiles = lockedFiles;
+ }
+ public String getLockedBy() {
+ return lockedBy;
+ }
+
+ public void setLockedBy(String lockedBy) {
+ this.lockedBy = lockedBy;
+ }
+
+ public String getLockedFiles() {
+ return lockedFiles;
+ }
+
+ public void setLockedFiles(String lockedFiles) {
+ this.lockedFiles = lockedFiles;
+ }
+ }
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
index 72e09f112350d358710907570c75210a3fd95930..cecf9a185ba4d3f22f9b8040106d0336f74d8544 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
@@ -71,7 +71,7 @@ public class GTAAssignmentEditController extends AbstractAssignmentEditControlle
//coach allowed to upload tasks
String[] onValues = new String[]{ "" };
- coachAllowedTasksEl = uifactory.addCheckboxesVertical("coachTasks", "task.coack.allowed.uplaod", configCont, onKeys, onValues, 1);
+ coachAllowedTasksEl = uifactory.addCheckboxesVertical("coachTasks", "task.coach.allowed.upload", configCont, onKeys, onValues, 1);
coachAllowedTasksEl.addActionListener(FormEvent.ONCHANGE);
boolean coachUpload = config.getBooleanSafe(GTACourseNode.GTASK_COACH_ALLOWED_UPLOAD_TASKS, false);
if(coachUpload) {
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
index 1be06793cfc932941ad62ecf123e1a0842addb1c..1ae20849a547e0aa0051c9c28b21fce4df5affe6 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
@@ -56,6 +56,7 @@ import org.olat.course.nodes.gta.AssignmentResponse;
import org.olat.course.nodes.gta.GTAType;
import org.olat.course.nodes.gta.Task;
import org.olat.course.nodes.gta.TaskHelper;
+import org.olat.course.nodes.gta.TaskHelper.FilesLocked;
import org.olat.course.nodes.gta.TaskProcess;
import org.olat.course.nodes.gta.model.TaskDefinition;
import org.olat.course.nodes.gta.ui.events.SubmitEvent;
@@ -301,9 +302,9 @@ public class GTAParticipantController extends GTAAbstractController {
}
}
- String lockedBy = TaskHelper.getDocumentsLocked(documentsContainer, submittedDocuments);
+ FilesLocked lockedBy = TaskHelper.getDocumentsLocked(documentsContainer, submittedDocuments);
if(lockedBy != null) {
- showWarning("warning.submit.documents.edited", lockedBy);
+ showWarning("warning.submit.documents.edited", new String[]{ lockedBy.getLockedBy(), lockedBy.getLockedFiles() });
} else {
confirmSubmitDialog = activateOkCancelDialog(ureq, title, text, confirmSubmitDialog);
confirmSubmitDialog.setUserObject(task);
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
index b64aaf3dbe3959f5787feb658049c8d6e97be91b..8b403c7a7378a391ad13144bde89d7054f28a6e0 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
@@ -50,6 +50,7 @@ import org.olat.course.nodes.gta.GTAManager;
import org.olat.course.nodes.gta.GTAType;
import org.olat.course.nodes.gta.Task;
import org.olat.course.nodes.gta.TaskHelper;
+import org.olat.course.nodes.gta.TaskHelper.FilesLocked;
import org.olat.course.nodes.gta.TaskProcess;
import org.olat.course.nodes.gta.ui.events.SubmitEvent;
import org.olat.course.nodes.gta.ui.events.TaskMultiUserEvent;
@@ -278,9 +279,9 @@ public class GTAParticipantRevisionAndCorrectionsController extends BasicControl
}
}
- String lockedBy = TaskHelper.getDocumentsLocked(documentsContainer, submittedDocuments);
+ FilesLocked lockedBy = TaskHelper.getDocumentsLocked(documentsContainer, submittedDocuments);
if(lockedBy != null) {
- showWarning("warning.submit.documents.edited", lockedBy);
+ showWarning("warning.submit.documents.edited", new String[]{ lockedBy.getLockedBy(), lockedBy.getLockedFiles() });
} else {
confirmSubmitDialog = activateOkCancelDialog(ureq, title, text, confirmSubmitDialog);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
index 49c1f7d8ed870928b3122fbef2bdf80c0129c46b..e6f169dd15b44b6e6baefb5258bdd637809dcf2e 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.olat.core.commons.services.help.HelpModule;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -92,6 +93,8 @@ public class GTAWorkflowEditController extends FormBasicController {
private List<Long> groupKeys;
private final RepositoryEntry courseRe;
+ @Autowired
+ private HelpModule helpModule;
@Autowired
private GTAManager gtaManager;
@Autowired
@@ -452,7 +455,8 @@ public class GTAWorkflowEditController extends FormBasicController {
private void doConfirmChanges(UserRequest ureq) {
String title = translate("warning.tasks.in.process.title");
- String text = translate("warning.tasks.in.process.text");
+ String url = helpModule.getHelpProvider().getURL(getLocale(), "Task - Further Configurations#_concurrent_edits");
+ String text = translate("warning.tasks.in.process.text", new String[]{ url });
confirmChangesCtrl = activateOkCancelDialog(ureq, title, text, confirmChangesCtrl);
}
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 d2d1002046121011f3da55f4af41a15b711a3cd0..7eeb26d93f09921608f36ad9bd279560b6a14a6f 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
@@ -1,4 +1,4 @@
-#Wed Jun 01 10:53:33 CEST 2016
+#Wed Jun 01 11:46:29 CEST 2016
add.solution=Musterl\u00F6sung hochladen
add.task=Aufgabe hinzuf\u00FCgen
assessment.group.tool=Gruppe bewerten
@@ -18,9 +18,9 @@ choose.groups=Gruppe ausw\u00E4hlen
choosed.areas=Lernbereich
choosed.groups=Gruppe
coach.assessment=Bewerten
-coach.back.to.submission=Zur\u00FCck zu Abgabeschritt
-coach.back.to.submission.confirm.text=Wollen Sie wirklich erlauben neue Dokumente zu abgeben?
-coach.back.to.submission.confirm.title=Abgabe wieder \u00F6ffnen
+coach.back.to.submission=Abgabe erneut \u00F6ffnen
+coach.back.to.submission.confirm.text=Sind Sie sicher dass Sie die Abgabe f\u00FCr "{0}" nochmals \u00F6ffnen m\u00F6chten?
+coach.back.to.submission.confirm.title=Abgabe erneut \u00F6ffnen
coach.close.revision.button=Revision akzeptieren
coach.collect.confirm.desc=Sie k\u00F6nnen Dokumente des Teilnehmers aktiv einziehen f\u00FCr den Fall, dass ein Teilnehmner vergessen hat die endg\u00FCltige Abgabe durchzuf\u00FCren.
coach.collect.confirm.text=Sie sind gerade dabei den Abgabeprozess f\u00FCr "{0}" zu beenden. Bitte klicken Sie nur dann auf "OK", wenn Sie sicher sind dass bereits alle ben\u00F6tigten Dokumente abgegeben wurden.
@@ -79,7 +79,7 @@ embedded.editor=Abgabe mit OpenOLAT Texteditor
enabled=eingeschaltet
error.assignment.closed=Zuweisung ist geschlossen.
error.duplicate.coaching=Der Teilnehmer ist Teilnehmer von mehreren Gruppen f\u00FCr diese Aufgabe.
-error.duplicate.memberships=Die folgenden Teilnehmer sind Mitglieder von mehreren Gruppen\: {1}
+error.duplicate.memberships=Die folgenden Teilnehmer sind Mitglieder von mehreren der eingebundenen Gruppen, und m\u00FCssen diese Aufgabe deshalb mehrfach bearbeiten\: {1}
error.editor.atLeastOne=Sie m\u00FCssen mindestens einen Editortyp w\u00E4hlen.
error.file.exists=$org.olat.core.commons.modules.bc\:cfile.already.exists
error.file.invalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
@@ -195,9 +195,9 @@ run.submit.individual.description.all=Geben Sie Ihre L\u00F6sung ab indem Sie en
run.submit.individual.description.editor=Schreiben Sie Ihre L\u00F6sung direkt im Editor.
run.submit.individual.description.upload=Laden Sie Ihre L\u00F6sung als fertiges Dokument hoch.
run.submit.revision.button=\u00DCberarbeitung abgeben
-run.submit.revision.confirm=Bitte best\u00E4tigen Sie die Abgabe der \u00DCberarbeitung. Die Abgabe der \u00DCberarbeitung ist endg\u00FCltig und kann nicht zur\u00FCckgezogen werden.
+run.submit.revision.confirm=Bitte best\u00E4tigen Sie die Abgabe der \u00FCberarbeitung. Die Abgabe der \u00FCberarbeitung ist endg\u00FCltig und kann nicht zur\u00FCckgezogen werden.
run.submit.revision.confirm.group=$\:run.submit.revision.confirm<br/>Dies ist eine Gruppenaufgabe\! Die hier getroffene Auswahl ist f\u00FCr alle Mitglieder der Gruppe "{0}" g\u00FCltig\!
-run.submit.revision.confirm.warning=Sie haben noch kein Dokument hochgeladen bzw. erstellt. M\u00F6chten Sie trotzdem die \u00FCberarbeitende Aufgabe abgeben? Die \u00DCberarbeitung ist endg\u00FCltig und kann nicht widerrufen werden. <br/><br/> Sie k\u00F6nnen danach keine Dokumente mehr hochladen.<br/>
+run.submit.revision.confirm.warning=Sie haben noch kein Dokument hochgeladen bzw. erstellt. M\u00F6chten Sie trotzdem die \u00FCberarbeitende Aufgabe abgeben? Die \u00FCberarbeitung ist endg\u00FCltig und kann nicht widerrufen werden. <br/><br/> Sie k\u00F6nnen danach keine Dokumente mehr hochladen.
run.submit.revision.confirm.warning.group=$\:run.submit.revision.confirm.warning<br/>Dies ist eine Gruppenaufgabe\! Die hier getroffene Auswahl ist f\u00FCr alle Mitglieder der Gruppe "{0}" g\u00FCltig\!
run.submitted.description=Die folgenden L\u00F6sungen wurden von Ihnen abgegeben\:
run.submitted.nofiles=Die Abgabe erfolgte ohne Dokumente.
@@ -243,7 +243,7 @@ task.assignment.error=Ein unerwarteter Fehler ist aufgetreten\!
task.assignment.type=$org.olat.course.nodes.ta\:form.task.type
task.assignment.type.auto=$org.olat.course.nodes.ta\:form.task.type.auto
task.assignment.type.manual=$org.olat.course.nodes.ta\:form.task.type.manual
-task.coack.allowed.uplaod=Betreuer k\u00F6nnen Aufgabe hochladen
+task.coach.allowed.upload=Betreuer k\u00F6nnen Aufgabe hochladen
task.description=Beschreibung
task.execution=Aufgabe
task.execution.group=Als Gruppe
@@ -266,9 +266,9 @@ warning.group.submit=Dies ist eine Gruppenaufgabe\! Das abgegebene Dokument ist
warning.group.task=Dies ist eine Gruppenaufgabe\! Aufgabenzuweisung, Abgabe sowie die Bewertung werden f\u00FCr die Gruppe vorgenommen. Besprechen Sie mit den anderen Teilnehmern ihrer Gruppe wie sie gemeinsam die Aufgabe ausw\u00E4hlen und bearbeiten wollen.
warning.no.task.choosed=Wie es scheint war es Ihnen aufgrund von \u00C4nderungen am Kurselement nicht m\u00F6glich eine Aufgabe f\u00FCr dieses Aufgabenelement auszuw\u00E4hlen.
warning.no.task.choosed.coach=Wie es scheint war es der Assignee aufgrund von \u00C4nderungen am Kurselement nicht m\u00F6glich eine Aufgabe f\u00FCr dieses Aufgabenelement auszuw\u00E4hlen.
-warning.submit.documents.edited=Sie k\u00F6nnen den Aufgabe nicht abgeben, weil Dokument noch von "{0}" editiert werden.
+warning.submit.documents.edited=Sie k\u00F6nnen die Aufgabe nicht abgeben, da das Dokument "{1}" noch von "{0}" bearbeitet wird.
warning.tasks.in.process.delete.text=Wollen Sie wirklich dieser Aufgabe l\u00F6schen? Es gibt bereits Benutzer die den Aufgabenprozess gestartet haben. Das kann f\u00FCr diese Benutzer zu Problemen f\u00FChren.
warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
-warning.tasks.in.process.text=Es gibt bereits Benutzer die den Aufgabenprozess gestartet haben. \u00C4nderungen an der Workflow-Konfiguration kann f\u00FCr diese Benutzer zu Problemen f\u00FChren.
+warning.tasks.in.process.text=Es gibt bereits Benutzer die den Aufgabenprozess gestartet haben. \u00C4nderungen an der Workflow-Konfiguration kann f\u00FCr diese Benutzer zu Problemen f\u00FChren. Informationen dazu finden Sie im <a href\="{0}" target\="_blank"><i class\='o_icon o_icon_help'> </i> Handbuch</a>.
warning.tasks.in.process.title=Aufgabenprozess bereits gestartet
-warning.tasks.submitted=Sie k\u00F6nnen den Aufgabe nicht mehr editieren, es wurde abgegeben.
+warning.tasks.submitted=Sie k\u00F6nnen diese Aufgabe nicht mehr bearbeiten, sie wurde bereits abgegeben.
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 70f733d84d589f98435fd8dfc182d93691f793f6..72ffbb060fe6cf93a470a83097c8bc37d8b83917 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
@@ -18,9 +18,9 @@ choose.groups=Select groups
choosed.areas=Areas
choosed.groups=Groups
coach.assessment=Grade
-coach.back.to.submission=Back to submission step
-coach.back.to.submission.confirm.title=Reopen submission
-coach.back.to.submission.confirm.text=Do you really to reopen the submission of new documents?
+coach.back.to.submission=Re-open submission
+coach.back.to.submission.confirm.title=Re-open submission
+coach.back.to.submission.confirm.text=Are you sure you wish to re-open the task submission for "{0}"?
coach.close.revision.button=Revision accepted
coach.collect.confirm.title=Collect document(s)
coach.collect.confirm.text=You are about to close the submission for "{0}". Please make sure all required documents were submitted before clicking "OK".
@@ -74,7 +74,7 @@ embedded.editor=Submit with OpenOLAT text editor
enabled=enabled
error.assignment.closed=Assignment is closed
error.duplicate.coaching=This user is a member of multiple groups in this task.
-error.duplicate.memberships=The following users are members of multiple groups\: {1}
+error.duplicate.memberships=The following users are members of multiple groups, and are therefore required to hand in this assignment multiple times: {1}
error.editor.atLeastOne=You must choose at least one kind of editor.
error.file.exists=$org.olat.core.commons.modules.bc\:cfile.already.exists
error.file.invalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
@@ -191,9 +191,9 @@ run.submit.individual.description.editor=Submit your solution by using the edito
run.submit.individual.description.upload=Submit your solution by uploading a document you created on your computer.
run.submit.revision.button=Submit revision
run.submit.revision.confirm=Please confirm the submission for this revision. The submission of the revision is final and can not be undone.
-run.submit.revision.confirm.group=$\:run.submit.revision.confirm<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
-run.submit.revision.confirm.warning=You have not yet uploaded / created a document. Do you still wish to submit? The submission of the revised task is final and can not be undone. <br/> The drop box is closed. You will not be able to upload any documents.
-run.submit.revision.confirm.warning.group=$\:run.submit.revision.confirm.warning<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
+run.submit.revision.confirm.group=$\:run.submit.revision.confirm<br/>This is a group task! The submitted document is valid for all members of the group "{0}"!
+run.submit.revision.confirm.warning=You have not yet uploaded / created a document. Do you still wish to submit? The submission of the revised task is final and can not be undone.<br/><br/>The drop box is closed. You will not be able to upload any documents.
+run.submit.revision.confirm.warning.group=$\:run.submit.revision.confirm.warning<br/>This is a group task! The submitted document is valid for all members of the group "{0}"!
run.submitted.description=The following solutions have been submitted by you\:
run.submitted.nofiles=The submission was done without documents
sample.solution=Sample solution
@@ -255,7 +255,9 @@ warning.group.submit=This is a group task\! The submitted document is valid for
warning.group.task=This is a group task\! The task assignment, submission of documents and grading are performed as a group. Contact your group peers on how to proceed on deciding for a task and to collaboratively solve the task.
warning.no.task.choosed=It\u00A0seems\u00A0that\u00A0due\u00A0to\u00A0a\u00A0change in the course element configuration, you\u00A0weren't\u00A0able\u00A0to\u00A0choose a\u00A0task\u00A0for\u00A0this\u00A0task element.
warning.no.task.choosed.coach=It\u00A0seems\u00A0that\u00A0due\u00A0to\u00A0a\u00A0change in the course element configuration, the assignee\u00A0wasn't\u00A0able\u00A0to\u00A0choose a\u00A0task\u00A0for\u00A0this\u00A0task element.
+warning.submit.documents.edited=You cannot submit the task. The document "{1}" is currently being edited by "{0}".
warning.tasks.in.process.delete.text=Do you really wan to delete this task? There are already users who have started the task process. It could result in problems for these users.
warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
-warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users.
+warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users. Please refer to the <a href="{0}" target="_blank"><i class='o_icon o_icon_help'> </i> manual</a> for more information.
warning.tasks.in.process.title=Task already started
+warning.tasks.submitted=You cannot edit this task anymore, it has already been submitted.
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
index 0cdab105201f8e5d0d4a27c49475b772f546dea0..f74be6bc6ee0d90cf20bfabaac2dfc2ed7468a42 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
@@ -253,5 +253,5 @@ warning.no.task.choosed=Il semble qu'il n'a pas \u00E9t\u00E9 possible de vous c
warning.no.task.choosed.coach=Il semble qu'en raison d'un changement dans la configuration de l'\u00E9l\u00E9ment de cours, un utilisateur n'a pas pu se voir assigner un devoir.
warning.tasks.in.process.delete.text=Voulez-vous vraiment supprimer ce devoir? Des utilisateurs l'ont d\u00E9j\u00E0 commenc\u00E9. Cela entra\u00EEnera des probl\u00E8mes pour ces utilisateurs.
warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
-warning.tasks.in.process.text=Il ya d\u00E9j\u00E0 des utilisateurs qui ont commenc\u00E9 les devoirs. Des modifications de la configuration du processus pourra entra\u00EEner des probl\u00E8mes pour ces utilisateurs.
+warning.tasks.in.process.text=Il ya d\u00E9j\u00E0 des utilisateurs qui ont commenc\u00E9 les devoirs. Des modifications de la configuration du processus pourra entra\u00EEner des probl\u00E8mes pour ces utilisateurs. Pour plus d'informations, vous pouvez vous r\u00E9f\u00E9rer au <a href="{0}" target="_blank"><i class='o_icon o_icon_help'> </i> manuel d'utilisation</a>.
warning.tasks.in.process.title=Devoirs d\u00E9j\u00E0 commenc\u00E9s
diff --git a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupSearchController.java b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupSearchController.java
index 64b3521bf8b605cefc538c37e22fdf013d73bb79..44e230cedac0ce0748447e70fa3056a28ed2856d 100644
--- a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupSearchController.java
+++ b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupSearchController.java
@@ -127,7 +127,7 @@ public class OpenBusinessGroupSearchController extends FormBasicController imple
protected boolean validateFormLogic(UserRequest ureq) {
boolean allOk = true;
if (isEmpty()) {
- showWarning("cif.error.allempty", null);
+ showWarning("cif.error.allempty");
allOk &= false;
}
return allOk && super.validateFormLogic(ureq);
diff --git a/src/main/java/org/olat/repository/controllers/SearchForm.java b/src/main/java/org/olat/repository/controllers/SearchForm.java
index bb0b8d5ec88596d6666d88e04c2d221fe7979052..6e80458282e80e614fd4844fd9399808acfad981 100644
--- a/src/main/java/org/olat/repository/controllers/SearchForm.java
+++ b/src/main/java/org/olat/repository/controllers/SearchForm.java
@@ -113,7 +113,7 @@ public class SearchForm extends FormBasicController {
@Override
protected boolean validateFormLogic(UserRequest ureq) {
if (displayName.isEmpty() && author.isEmpty() && description.isEmpty() && (id != null && id.isEmpty())) {
- showWarning("cif.error.allempty", null);
+ showWarning("cif.error.allempty");
return false;
}
return true;
diff --git a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
index 947986bfb90980af0fe2eafcde84891d1d95576e..50cba0ca9236e865f26392d1fbe3f22a7c08c0ab 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
@@ -207,7 +207,7 @@ public class AuthorSearchController extends FormBasicController implements Exten
if(!enabled) return true;
if (displayName.isEmpty() && author.isEmpty() && description.isEmpty() && (id != null && id.isEmpty())) {
- showWarning("cif.error.allempty", null);
+ showWarning("cif.error.allempty");
return false;
}
return true;
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
index 3a9540f41ccf3b84e031455c704512dad0c057e1..f009f7506d1680687a84ea62ceb681ffa8522d01 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
@@ -157,7 +157,7 @@ public class RepositoryEntrySearchController extends FormBasicController impleme
if(!enabled) return true;
if (text.isEmpty() && author.isEmpty() && (id != null && id.isEmpty())) {
- showWarning("cif.error.allempty", null);
+ showWarning("cif.error.allempty");
return false;
}
return true;