From dee31c72f64be2031ce4c23e1d630f0f0fa9f89c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 30 May 2013 19:01:02 +0200 Subject: [PATCH] fix email site url, fix testimonial.user --- teleforma/templates/postman/email_user.txt | 2 +- teleforma/templates/teleforma/seminar_testimonial.html | 6 +++--- teleforma/views/pro.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt index 84537f35..3abdf32d 100644 --- a/teleforma/templates/postman/email_user.txt +++ b/teleforma/templates/postman/email_user.txt @@ -13,7 +13,7 @@ {% else %}{% blocktrans with object.sender.first_name as first_name and object.sender.last_name as last_name %}You have received a message from {{ first_name }} {{ last_name }}.{% endblocktrans %} {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %} -http://{{ site.name }}/messages/inbox/ +http://{{ site.domain }}/messages/inbox/ {# 'acceptance' #} {% trans "Thank you again for your interest in our services." %} diff --git a/teleforma/templates/teleforma/seminar_testimonial.html b/teleforma/templates/teleforma/seminar_testimonial.html index 128dfd22..4190b622 100644 --- a/teleforma/templates/teleforma/seminar_testimonial.html +++ b/teleforma/templates/teleforma/seminar_testimonial.html @@ -31,9 +31,9 @@
- - - + + + diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index ad54e06a..4765cb2d 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -333,7 +333,7 @@ class AnswersView(ListView): v = _('validated') subject = '%s : %s - %s %s' % (seminar.title, a, str(context['rank']), v) - mess = Message(sender=sender, recipient=user, subject=subject[:120], body=text) + mess = Message(sender=sender, recipient=user, subject=subject[:119], body=text) mess.moderation_status = 'a' mess.save() notify_user(mess, 'acceptance') -- 2.39.5
{% trans "Last name" %} : {{ user.last_name|upper }}
{% trans "First name" %} : {{ user.first_name|upper }}
{% trans "Address" %} : {{ user.auditor.all.0.address }} {{ user.auditor.all.0.postal_code }} {{ user.auditor.all.0.city }}
{% trans "Last name" %} : {{ testimonial.user.last_name|upper }}
{% trans "First name" %} : {{ testimonial.user.first_name|upper }}
{% trans "Address" %} : {{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}
{% trans "Sujet" %} : {{ seminar.title }}
{% trans "Course" %} : {{ seminar.course }}
{% trans "Training type" %} : E-learning