From 944e917db0c4dee409eb61a69412a3412c3c74b4 Mon Sep 17 00:00:00 2001 From: srosse <stephane.rosse@frentix.com> Date: Thu, 10 Dec 2020 07:51:45 +0100 Subject: [PATCH] OO-5117: remove HTML in PDF absence list --- .../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties | 5 +++-- .../olat/modules/lecture/ui/_i18n/LocalStrings_en.properties | 5 +++-- .../olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties | 5 +++-- .../olat/modules/lecture/ui/_i18n/LocalStrings_it.properties | 1 + .../modules/lecture/ui/_i18n/LocalStrings_pt_BR.properties | 1 + .../modules/lecture/ui/export/LecturesBlockPDFExport.java | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties index 12ebbf8f866..3d0a8bc7950 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties @@ -363,8 +363,9 @@ results=Resultate rollcall=Anwesenheitskontrolle rollcall.absence=Absenz rollcall.absence.notice=Abmeldung -rollcall.coach.hint=<strong>Hinweis:</strong> Dieser Lektionenblock enth\u00E4lt <strong>{0} Lektion</strong>. Absenzen werden pro Lektion erfasst. Wird mehr als die H\u00E4lfte einer Lektion vers\u00E4umt, wird diese als Absenz eingetragen. -rollcall.coach.hints=<strong>Hinweis:</strong> Dieser Lektionenblock enth\u00E4lt <strong>{0} Lektionen</strong>. Absenzen werden pro Lektion erfasst. Wird mehr als die H\u00E4lfte einer Lektion vers\u00E4umt, wird diese als Absenz eingetragen. +rollcall.coach.hint=<strong>Hinweis:</strong> Dieser Lektionenblock enth\u00E4lt <strong>{0} Lektion</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hints=<strong>Hinweis:</strong> Dieser Lektionenblock enth\u00E4lt <strong>{0} Lektionen</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hint.generic=Absenzen werden pro Lektion erfasst. Wird mehr als die H\u00E4lfte einer Lektion vers\u00E4umt, wird diese als Absenz eingetragen. rollcall.comment=Bemerkung rollcall.dispensation=Dispens rollcall.status=Status Lektionenblock diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties index 99735310975..b67a59a88ea 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties @@ -363,8 +363,9 @@ results=Results rollcall=Roll call rollcall.absence=Absence rollcall.absence.notice=Notice of absence -rollcall.coach.hint=<strong>Note:</strong> This lectures block contains <strong>{0} lecture</strong>. Absences are recorded per lecture. If more than half of a lecture is missed, it is entered as absence. -rollcall.coach.hints=<strong>Note:</strong> This lectures block contains <strong>{0} lectures</strong>. Absences are recorded per lecture. If more than half of a lecture is missed, it is entered as absence. +rollcall.coach.hint=<strong>Note:</strong> This lectures block contains <strong>{0} lecture</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hints=<strong>Note:</strong> This lectures block contains <strong>{0} lectures</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hint.generic=Absences are recorded per lecture. If more than half of a lecture is missed, it is entered as absence. rollcall.comment=Comment rollcall.dispensation=Dispensation rollcall.status=Roll call status diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties index df6c292f579..d9d529970e4 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties +++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties @@ -362,8 +362,9 @@ results=R\u00E9sultats rollcall=Contr\u00F4le de pr\u00E9sence rollcall.absence=Absence rollcall.absence.notice=Avis d'absence -rollcall.coach.hint=<strong>Note\:</strong> Ce cours bloc a <strong>{0} le\u00E7on</strong>. Les absences sont enregistr\u00E9es pour chaque le\u00E7on. Si plus de la moiti\u00E9 d'une le\u00E7on est manqu\u00E9e, elle sera consid\u00E9r\u00E9e comme une absence. -rollcall.coach.hints=<strong>Note\:</strong> Ce cours bloc a <strong>{0} le\u00E7ons</strong>. Les absences sont enregistr\u00E9es pour chaque le\u00E7on. Si plus de la moiti\u00E9 d'une le\u00E7on est manqu\u00E9e, elle sera consid\u00E9r\u00E9e comme une absence. +rollcall.coach.hint=<strong>Note\:</strong> Ce cours bloc a <strong>{0} le\u00E7on</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hints=<strong>Note\:</strong> Ce cours bloc a <strong>{0} le\u00E7ons</strong>. $\:rollcall.coach.hint.generic +rollcall.coach.hint.generic=Les absences sont enregistr\u00E9es pour chaque le\u00E7on. Si plus de la moiti\u00E9 d'une le\u00E7on est manqu\u00E9e, elle sera consid\u00E9r\u00E9e comme une absence. rollcall.comment=Remarque rollcall.dispensation=Dispense rollcall.status=Status du cours bloc diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_it.properties index 41af924ed2b..52bc7b95808 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_it.properties +++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_it.properties @@ -355,6 +355,7 @@ results=Risultati rollcall=Controllo delle presenze rollcall.absence=Assenza rollcall.absence.notice=Avviso di assenza +rollcall.coach.hint.generic=Le assenze sono registrate per ogni lezione. Se si perde pi\u00F9 di mezza lezione, la lezione viene registrata come assenza. rollcall.comment=Commento rollcall.dispensation=Esonero rollcall.status=Status del controllo delle presenze diff --git a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_pt_BR.properties index f7f8b01b0eb..e7da122cb6c 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_pt_BR.properties +++ b/src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_pt_BR.properties @@ -355,6 +355,7 @@ results=Resultados rollcall=Chamada (Roll Call) rollcall.absence=Aus\u00EAncia rollcall.absence.notice=Aviso de aus\u00EAncia +rollcall.coach.hint.generic=As aus\u00EAncias s\u00E3o registradas por aula. Se mais da metade da li\u00E7\u00E3o for perdida, a li\u00E7\u00E3o \u00E9 inserida como uma aus\u00EAncia. rollcall.comment=Comente rollcall.dispensation=Dispensa rollcall.status=Status da chamada diff --git a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java index 803a542bf77..d6ce86735b3 100644 --- a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java +++ b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java @@ -208,7 +208,7 @@ public class LecturesBlockPDFExport extends PdfDocument implements MediaResource contentStream.beginText(); contentStream.setFont(font, footerFontSize ); contentStream.setTextMatrix(Matrix.getTranslateInstance(marginLeftRight, y + 14)); - contentStream.showText(translator.translate("rollcall.coach.hint")); + contentStream.showText(translator.translate("rollcall.coach.hint.generic")); contentStream.endText(); contentStream.beginText(); -- GitLab