From 84f6dd6fdf55f6930a1821172490019e929f47a4 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 4 Jul 2018 16:32:34 +0200
Subject: [PATCH] OO-3573: add the name of the resource in the catalog step of
the publishing wizard
---
.../java/org/olat/course/editor/PublishStepCatalog.java | 7 +++++--
.../org/olat/course/editor/_content/publish_catalog.html | 2 +-
.../olat/course/editor/_i18n/LocalStrings_de.properties | 2 ++
.../olat/course/editor/_i18n/LocalStrings_en.properties | 2 ++
.../olat/course/editor/_i18n/LocalStrings_fr.properties | 2 ++
.../olat/course/editor/_i18n/LocalStrings_it.properties | 1 +
.../olat/course/editor/_i18n/LocalStrings_pl.properties | 1 +
.../olat/course/editor/_i18n/LocalStrings_pt_BR.properties | 1 +
8 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/PublishStepCatalog.java b/src/main/java/org/olat/course/editor/PublishStepCatalog.java
index 464d4a86b25..c3a2f65aa99 100644
--- a/src/main/java/org/olat/course/editor/PublishStepCatalog.java
+++ b/src/main/java/org/olat/course/editor/PublishStepCatalog.java
@@ -174,6 +174,7 @@ class PublishStepCatalog extends BasicStep {
}
flc.contextPut("categories", deleteLinks);
+ flc.contextPut("courseTitle", courseEnv.getCourseGroupManager().getCourseEntry().getDisplayname());
}
private String getPath(CatalogEntry entry) {
@@ -198,7 +199,7 @@ class PublishStepCatalog extends BasicStep {
}
private void doAddCatalog(UserRequest ureq) {
- List<CategoryLabel> categories = new ArrayList<CategoryLabel>();
+ List<CategoryLabel> categories = new ArrayList<>();
for(FormLink deleteLink:deleteLinks) {
CategoryLabel label = (CategoryLabel)deleteLink.getUserObject();
categories.add(label);
@@ -208,8 +209,10 @@ class PublishStepCatalog extends BasicStep {
catalogAddController = new SpecialCatalogEntryAddController(ureq, getWindowControl(), repositoryEntry, categories);
listenTo(catalogAddController);
removeAsListenerAndDispose(cmc);
+
+ String displayName = courseEnv.getCourseGroupManager().getCourseEntry().getDisplayname();
cmc = new CloseableModalController(getWindowControl(), "close",
- catalogAddController.getInitialComponent(), true, translate("publish.catalog.add"));
+ catalogAddController.getInitialComponent(), true, translate("publish.catalog.add.title", new String[] { displayName }));
listenTo(cmc);
cmc.activate();
}
diff --git a/src/main/java/org/olat/course/editor/_content/publish_catalog.html b/src/main/java/org/olat/course/editor/_content/publish_catalog.html
index 47fa5d9a9e9..8a63ee48b07 100644
--- a/src/main/java/org/olat/course/editor/_content/publish_catalog.html
+++ b/src/main/java/org/olat/course/editor/_content/publish_catalog.html
@@ -1,5 +1,5 @@
<div class="o_course_editor_publish">
- <h4>$r.translate("publish.catalog.header")</h4>
+ <h4>$r.translate("publish.catalog.header.title", $courseTitle)</h4>
<div class='o_info'>
<p>$r.translate("publish.catalog.reminder1")</p>
<p>$r.translate("publish.catalog.reminder2")</p>
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties
index 189b9908f8a..a2f26142c7a 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties
@@ -466,9 +466,11 @@ pbl.remind.catalog=Falls Sie den Kurs f\u00FCr registrierte Benutzer oder f\u00F
pbl.success=Die gew\u00E4hlten \u00C4nderungen sind publiziert.
publish.access.header=\u00C4nderung des Kurszugriffs
publish.catalog.add=In Katalog hinzuf\u00FCgen
+publish.catalog.add.title="{0}" in Katalog hinzuf\u00FCgen
publish.catalog.box=Kurs in Katalog hinzuf\u00FCgen
publish.catalog.error=Sie m\u00FCssen mindestens eine Katalogeintrag erstellen.
publish.catalog.header=Katalogeintrag erstellen
+publish.catalog.header.title=Katalogeintrag erstellen f\u00FCr Kurs "{0}"
publish.catalog.reminder1=Ohne Katalogeintrag sind Kurse f\u00FCr Studierende schlecht auffindbar. W\u00E4hlen Sie daher ein oder mehrere Bereiche aus dem Katalog aus, in denen dieser Kurs aufgelistet sein soll. Sie k\u00F6nnen jederzeit weitere Katalogeintr\u00E4ge hinzuf\u00FCgen oder bestehende wieder entfernen.
publish.catalog.reminder2=Hinweis\: Ein Kurs wird im Katalog erst sichtbar, wenn im vorherigen Schritt "\u00C4nderung des Kurszugriffs" die Option "Alle registrierten OLAT Benutzer" gew\u00E4hlt wurde. W\u00E4hlen Sie "Zur\u00FCck" um die Zugriffsrechte zu \u00E4ndern.
publish.header=Publizieren der \u00C4nderungen von Kursbausteinen
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties
index 3ff1fcf2732..70a4e444af9 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties
@@ -466,9 +466,11 @@ pbl.remind.catalog=In case you unlock your course for registered users or guests
pbl.success=Selected modifications published successfully.
publish.access.header=Modification of course access
publish.catalog.add=Add to catalog
+publish.catalog.add.title=Add "{0}" to catalog
publish.catalog.box=Add course to catalog
publish.catalog.error=You must create at least one catalog entry.
publish.catalog.header=Create catalog entry
+publish.catalog.header.title=Create catalog entry for course "{0}"
publish.catalog.reminder1=Without catalog entry courses are difficult to find for students. Therefore it is recommended to select one or multiple catalog levels in which the course should be enlisted. You can add additional or remove existing catalog entries at any time.
publish.catalog.reminder2=Note\: a course is visible in the catalog only when the course access is set to all "Registered users" or "Registered users and guests" in the previous step. Select "back" to change this access settings.
publish.header=How to publish modifications of course elements
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties
index 614037adf88..96d8503c617 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties
@@ -137,9 +137,11 @@ pbl.remind.catalog=Si vous avez ouvert le cours pour les utilisateurs OLAT enreg
pbl.success=Les changements s\u00E9lectionn\u00E9s ont \u00E9t\u00E9 publi\u00E9s.
publish.access.header=Modification de l'acc\u00E8s raccourci
publish.catalog.add=Ajouter au catalogue
+publish.catalog.add.title=Ajouter "{0}" au catalogue
publish.catalog.box=Ajouter le cours au catalogue
publish.catalog.error=Vous devez choisir au moins une entr\u00E9e dans le catalogue.
publish.catalog.header=Cr\u00E9er une entr\u00E9e dans le catalogue
+publish.catalog.header.title=Cr\u00E9er une entr\u00E9e dans le catalogue pour le cours "{0}"
publish.catalog.reminder1=Si les cours ne sont pas r\u00E9f\u00E9renc\u00E9s dans le catalogue, les \u00E9tudiants auront plus de difficult\u00E9s \u00E0 les trouver. S\u00E9lectionnez un ou plusieurs dossiers du catalogue dans lequel le cours doit \u00EAtre r\u00E9pertori\u00E9. Vous pouvez toujours ajouter des entr\u00E9es de catalogue ou supprimer celles qui existent d\u00E9j\u00E0.
publish.catalog.reminder2=Remarque\: un cours dans le catalogue n'est visible qu'apr\u00E8s que l'\u00E9tape de "Modification de l'acc\u00E8s raccourci" du point pr\u00E9c\u00E9dente soit sur "Tous les utilisateurs OpenOLAT enregistr\u00E9s". S\u00E9lectionnez "retour" pour modifier les autorisations.
publish.header=Publication des modifications des \u00E9l\u00E9ments de cours
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties
index 2286bbab413..a5e06357820 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties
@@ -137,6 +137,7 @@ pbl.remind.catalog=Se Lei sblocca il corso per utenti registrati o per ospiti, n
pbl.success=Le modifiche selezionate sono state pubblicate.
publish.access.header=Modifica dell'accesso al corso
publish.catalog.add=Aggiungere al catalogo
+publish.catalog.add.title=Aggiungere "{0}" al catalogo
publish.catalog.box=Aggiungere il corso al catalogo
publish.catalog.error=Devi creare almeno un elemento nel catalogo.
publish.catalog.header=Creare un elemento nel catalogo
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pl.properties
index bbc578d03f9..a0e7652915b 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pl.properties
@@ -397,6 +397,7 @@ pbl.remind.catalog=Je\u017Celi odblokujesz kurs dla zarejestrowanych u\u017Cytko
pbl.success=Wybrane modyfikacje zosta\u0142y pomy\u015Blnie opublikowane.
publish.access.header=Modyfikacja ustawie\u0144 dost\u0119pu do kursu
publish.catalog.add=Dodaj do katalogu
+publish.catalog.add.title=Dodaj "{0}" do katalogu
publish.catalog.box=Dodaj kurs do katalogu
publish.catalog.error=Musisz utworzy\u0107 przynajmniej jeden wpis.
publish.catalog.header=Utw\u00F3rz wpis w katalogu
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
index 811095fabf3..e11d5683a6f 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
@@ -137,6 +137,7 @@ pbl.remind.catalog=No caso de voc\u00EA desbloquear o seu curso para usu\u00E1ri
pbl.success=Modifica\u00E7\u00F5es selecionadas publicadas com sucesso.
publish.access.header=Modifica\u00E7\u00E3o de acesso ao curso
publish.catalog.add=Adicionar ao cat\u00E1logo
+publish.catalog.add.title=Adicionar "{0}" ao cat\u00E1logo
publish.catalog.box=Adicionar curso ao cat\u00E1logo
publish.catalog.error=Voc\u00EA deve criar pelo menos uma entrada de cat\u00E1logo.
publish.catalog.header=Criar entrada no cat\u00E1logo
--
GitLab