From d8b42b4541a647c5b4111df609c5b4080c64d291 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 20 Feb 2013 11:31:52 +0100 Subject: [PATCH] fix titles in message (autoescape off) --- teleforma/templates/teleforma/messages/answer_rejected.txt | 4 ++-- teleforma/templates/teleforma/messages/seminar_validated.txt | 4 ++-- teleforma/views/pro.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/teleforma/templates/teleforma/messages/answer_rejected.txt b/teleforma/templates/teleforma/messages/answer_rejected.txt index 3324d5c1..e08e1f33 100644 --- a/teleforma/templates/teleforma/messages/answer_rejected.txt +++ b/teleforma/templates/teleforma/messages/answer_rejected.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ gender }} {{ last_name }}, +{% load i18n %}{% autoescape off %}{% blocktrans %}{{ gender }} {{ last_name }}, We are sorry we cannot validate your answer n°{{ rank }} of the e-learning seminar " {{ title }} ". @@ -9,4 +9,4 @@ http://{{ domain }}{{ path }} We remind you that you absolutely need to terminate your training before {{ date }}. The team of the {{ organization }} thank you for your confidence and we remain at your disposal for further information. -{% endblocktrans %} \ No newline at end of file +{% endblocktrans %}{% endautoescape %} \ No newline at end of file diff --git a/teleforma/templates/teleforma/messages/seminar_validated.txt b/teleforma/templates/teleforma/messages/seminar_validated.txt index 0ee5cc8b..5168f29e 100644 --- a/teleforma/templates/teleforma/messages/seminar_validated.txt +++ b/teleforma/templates/teleforma/messages/seminar_validated.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ gender }} {{ last_name }}, +{% load i18n %}{% autoescape off %}{% blocktrans %}{{ gender }} {{ last_name }}, Your answer to the question n°{{ rank }} of the e-learning seminar " {{ title }} " has been validated. @@ -11,4 +11,4 @@ http://{{ domain }}{{ path }} We remind you that you absolutely need to terminate all steps of your training before {{ date }}. The team of the {{ organization }} thank you for your confidence and we remain at your disposal for further information. -{% endblocktrans %} +{% endblocktrans %}{% endautoescape %} diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 6b4210f6..ab3bbc8c 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -357,7 +357,7 @@ class AnswersView(ListView): 'pk': answer.question.pk}) if seminar.sub_title: - title = unicode(seminar.sub_title) + ' : ' + seminar.title + title = seminar.sub_title + ' : ' + seminar.title else: title = seminar.title @@ -404,7 +404,7 @@ class AnswerDetailViewTest(DetailView): organization = seminar.course.department.name if answer.question.seminar.sub_title: - title = unicode(seminar.sub_title) + ' : ' + seminar.title + title = seminar.sub_title + ' : ' + seminar.title else: title = seminar.title -- 2.39.5