From 1ce2c1f1f70b109df89db2799f2e44892f7ed150 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 28 Aug 2019 15:03:21 +0200
Subject: [PATCH] OO-4204: Wording of deprecation message
---
.../java/org/olat/course/editor/EditorMainController.java | 4 ++++
src/main/java/org/olat/course/editor/_content/index.html | 8 ++++++--
.../olat/course/editor/_i18n/LocalStrings_de.properties | 5 +++--
.../olat/course/editor/_i18n/LocalStrings_en.properties | 1 +
.../olat/course/editor/_i18n/LocalStrings_fr.properties | 1 -
.../olat/course/editor/_i18n/LocalStrings_it.properties | 1 +
.../course/editor/_i18n/LocalStrings_pt_BR.properties | 1 +
7 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/EditorMainController.java b/src/main/java/org/olat/course/editor/EditorMainController.java
index 19547769792..c05ef7a5fad 100644
--- a/src/main/java/org/olat/course/editor/EditorMainController.java
+++ b/src/main/java/org/olat/course/editor/EditorMainController.java
@@ -458,6 +458,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
//set all dirty
TreeVisitor tv = new TreeVisitor( new Visitor() {
+ @Override
public void visit(INode node) {
((CourseEditorTreeNode)node).setDirty(true);
}
@@ -529,6 +530,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
boolean deprecated = cnConfig.isDeprecated();
main.contextPut("courseNodeDisabled", disabled);
main.contextPut("courseNodeDeprecated", deprecated);
+ main.contextPut("courseNodeDeprecatedHasAlternative", !cnConfig.getAlternativeCourseNodes().isEmpty());
alternativeLink.setVisible((disabled || deprecated) && !cnConfig.getAlternativeCourseNodes().isEmpty());
alternativeLink.setUserObject(chosenNode);
String nodeCssClass = null;
@@ -998,6 +1000,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
moveFrom.setDirty(true);
//mark subtree as dirty
TreeVisitor tv = new TreeVisitor( new Visitor() {
+ @Override
public void visit(INode node) {
CourseEditorTreeNode cetn = (CourseEditorTreeNode)node;
cetn.setDirty(true);
@@ -1182,6 +1185,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
return publishTreeModel.hasPublishableChanges();
}
+ @Override
protected void doDispose() {
ICourse course = CourseFactory.loadCourse(ores.getResourceableId());
CoordinatorManager.getInstance().getCoordinator().getEventBus().deregisterFor(this, course);
diff --git a/src/main/java/org/olat/course/editor/_content/index.html b/src/main/java/org/olat/course/editor/_content/index.html
index 2b0019a672c..6a64c3a2788 100644
--- a/src/main/java/org/olat/course/editor/_content/index.html
+++ b/src/main/java/org/olat/course/editor/_content/index.html
@@ -12,8 +12,12 @@
#end
#if($courseNodeDeprecated)
<div class="o_block o_important">
- <p>$r.translate("course.building.block.deprecated")</p>
- $r.render("alternative")
+ #if($courseNodeDeprecatedHasAlternative)
+ <p>$r.translate("course.building.block.deprecated")</p>
+ $r.render("alternative")
+ #else
+ <p>$r.translate("course.building.block.deprecated.no.alternative")</p>
+ #end
</div>
#end
#if($targetSelection)
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 a2f26142c7a..62373e20fa8 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
@@ -353,6 +353,7 @@ condition.visibility.title=Sichtbarkeit
content=Wissensvermittlung
copy.course.element.title=Kursbaustein kopieren
course.building.block.deprecated=<b>Dieser Kursbausteintyp ist veraltet.</b> <p> Kurse die diesen Bausteintyp enthalten k\u00F6nnen diesen weiterhin verwenden, es k\u00F6nnen aber keine neuen Bausteine von diesem Typ zum Kurs hinzugef\u00FCgt werden. W\u00E4hlen Sie die Schaltfl\u00E4che "$\:alternative" um einen alternativen Baustein mit \u00E4hnlicher Funktion zu suchen und den Baustein zu konvertieren.
+course.building.block.deprecated.no.alternative=<b>Dieser Kursbausteintyp ist veraltet.</b> <p> Kurse die diesen Bausteintyp enthalten k\u00F6nnen diesen weiterhin verwenden, es k\u00F6nnen aber keine neuen Bausteine von diesem Typ zum Kurs hinzugef\u00FCgt werden.
course.building.block.disabled=Dieser Kursbausteintyp wurde deaktiviert. Kontaktieren Sie den Administrator, l\u00F6schen Sie den Baustein aus Ihrem Kurs oder w\u00E4hlen Sie die Schaltfl\u00E4che "$\:alternative" um einen alternativen Baustein mit \u00E4hnlicher Funktion zu suchen und den Baustein zu konvertieren.
course.building.block.disabled.user=Dieser Kursbausteintyp wurde deaktiviert. Kontaktieren Sie den Administrator oder die Kursleitung.
coursefolder.close=Ablageordner schliessen
@@ -411,7 +412,7 @@ legend.ok=Kursbaustein bereit zum Publizieren
legend.title=Legende
legend.warn=Konfiguration enth\u00E4lt m\u00F6glicherweise Fehler
lock.alreadylocked=Der Kurseditor wird momentan vom Benutzer {0} verwendet (seit {1}). Bitte kontaktieren Sie den Benutzer oder versuchen Sie es sp\u00E4ter noch einmal.
-longtitle.placeholder=Geben Sie hier einen optionalen Inhaltstitel an f\u00fcr "{0}"
+longtitle.placeholder=Geben Sie hier einen optionalen Inhaltstitel an f\u00FCr "{0}"
management=Verwaltung und Organisation
move.course.element.title=Kursbaustein verschieben
movecopynode.error.overlap=Kopieren/Verschieben nicht m\u00F6glich\: Der Zielknoten ist Teil des ausgew\u00E4hlten Baumes.
@@ -456,7 +457,7 @@ pbl.intro=Bitte w\u00E4hlen Sie die Kursbausteine aus, welche Sie publizieren m\
pbl.intro.warning=Beim Publizieren von gel\u00F6schten Kursbausteinen werden deren untergeordnete Kursbausteine ebenfalls gel\u00F6scht. Analog werden beim Publizieren von neuen Kursbausteinen deren untergeordnete Kursbausteine ebenfalls publiziert.
pbl.intro.warning.header=Wichtig
pbl.quick.title=\u00C4nderungen publizieren
-pbl.quick.description=Der Kurs enth\u00e4lt unver\u00f6ffentlichte \u00C4nderungen. Wollen Sie diese vor dem Schliessen publizieren?
+pbl.quick.description=Der Kurs enth\u00E4lt unver\u00F6ffentlichte \u00C4nderungen. Wollen Sie diese vor dem Schliessen publizieren?
pbl.quick.no=Nein
pbl.quick.manual=Ja, manuell
pbl.quick.auto=Ja, automatisch
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 70a4e444af9..fc0e86eeeea 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
@@ -353,6 +353,7 @@ condition.visibility.title=Visibility
content=Knowledge transfer
copy.course.element.title=Copy course element
course.building.block.deprecated=<b>This course element is deprecated.</b><p>Courses that already use this course element can continue using it, however it is not possible to create new instances of this course element. Select the button "$\:alternative" to search for a course element with similar functionality and to convert the course element.
+course.building.block.deprecated.no.alternative=<b>This course element is deprecated.</b><p>Courses that already use this course element can continue using it, however it is not possible to create new instances of this course element.
course.building.block.disabled=This course element type has been deactivated. Please contact the system administrator, delete the course element from the course or select the button "$\:alternative" to search for a course element with similar functionality and to convert the course element.
course.building.block.disabled.user=This course element type has been deactivated. Please contact the system or course administrator.
coursefolder.close=Close storage folder
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 349624d097c..4dbebb87e1a 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
@@ -31,7 +31,6 @@ condition.noAccessExplanation.title=Informations si visible et pas d'acc\u00E8s
condition.visibility.title=Visibilit\u00E9
content=Partager les connaissances
copy.course.element.title=Copier l'\u00E9l\u00E9ment de cours
-course.building.block.deprecated=Cet \u00E9l\u00E9ment de cours est obsol\u00E8te.
course.building.block.disabled=Les \u00E9l\u00E9ments de ce type ont \u00E9t\u00E9 d\u00E9sactiv\u00E9. Contactez l'administrateur ou retirer l'\u00E9l\u00E9ment de votre cours.
course.building.block.disabled.user=Les \u00E9l\u00E9ments de ce type ont \u00E9t\u00E9 d\u00E9sactiv\u00E9. Contactez l'administrateur ou l'auteur du cours.
coursefolder.close=Fermer dossier de stockage
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 a5e06357820..ed8ab3ca885 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
@@ -32,6 +32,7 @@ condition.visibility.title=Visibilit\u00E0
content=Trasferimento della conoscenza
copy.course.element.title=Copiare elementi di corso
course.building.block.deprecated=<b>Questo elemento di corso \u00E8 deprecato.</b><p>Corsi che usano gi\u00E0 questo elemento possono continuare ad utilizzarlo, ma non \u00E8 possibile creare nuove istanze di questo elemento di corso. Selezionare il bottone "$\:alternative" per cercare un elemento di corso alternativo con funzioni simili e convertire l'elemento di corso deprecato.
+course.building.block.deprecated.no.alternative=<b>Questo elemento di corso \u00E8 deprecato.</b><p>Corsi che usano gi\u00E0 questo elemento possono continuare ad utilizzarlo, ma non \u00E8 possibile creare nuove istanze di questo elemento di corso.
course.building.block.disabled=Questo elemento di corso \u00E8 stato disattivato. Contattare l'amministratore di sistema, eliminare l'elemento di corso o selezionare il bottone "$\:alternative" per cercare un elemento di corso con funzioni simili e convertire l'elemento di corso.
course.building.block.disabled.user=Gli elementi di questo tipo sono stati disattivati. Contattare l'amministratore del sistema o l'autore del corso.
coursefolder.close=Chiudere cartella di deposito
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 c30a2c3cc3b..e42bbb95b7a 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
@@ -32,6 +32,7 @@ condition.visibility.title=Visibilidade
content=Conhecimento
copy.course.element.title=Copiar elemento do curso
course.building.block.deprecated=<b>Este elemento de curso est\u00E1 obsoleto.</b><p>Cursos que j\u00E1 utilizam este elemento de curso podem continuar a us\u00E1-lo, no entanto, n\u00E3o \u00E9 poss\u00EDvel criar novas inst\u00E2ncias deste elemento de curso. Selecione o bot\u00E3o "$\:alternative" para procurar um elemento de curso com funcionalidade semelhante e para converter o elemento de curso.
+course.building.block.deprecated.no.alternative=<b>Este elemento de curso est\u00E1 obsoleto.</b><p>Cursos que j\u00E1 utilizam este elemento de curso podem continuar a us\u00E1-lo, no entanto, n\u00E3o \u00E9 poss\u00EDvel criar novas inst\u00E2ncias deste elemento de curso.
course.building.block.disabled=Este tipo de elemento de curso foi desativado. Entre em contato com o administrador do sistema ou exclua o elemento do curso.
course.building.block.disabled.user=Este tipo de elemento de curso foi desativado. Entre em contato com o administrador do sistema ou curso.
coursefolder.close=Fechar pasta de armazenamento
--
GitLab