aboutsummaryrefslogtreecommitdiff
path: root/templates/mail
diff options
context:
space:
mode:
authorAlban Gruin2017-02-21 09:23:10 +0100
committerAlban Gruin2017-02-21 09:23:10 +0100
commit7e07a6666436b351bf2d14068e152a03b5603078 (patch)
treeef1e2aeb4283e178dfb5df4d71651bacf9d0a6c3 /templates/mail
parentb687e245d351e09cdec0ffb548543ced717000e6 (diff)
parentcd004bdf1144b27bcb4de1f4ffd750b6eefcb477 (diff)
Merge branch 'master' into stable/0.6.zv0.6.3stable/0.6.z
Conflicts: templates/mail/mail_timetable.txt
Diffstat (limited to 'templates/mail')
-rw-r--r--templates/mail/mail_timetable.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt
index 06a2b1c..a14ce9a 100644
--- a/templates/mail/mail_timetable.txt
+++ b/templates/mail/mail_timetable.txt
@@ -2,5 +2,6 @@
{% for course in day %}
* {{ course.name }} ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}
Salle{% if course.rooms.all|length > 1 %}s{% endif %} {% for room in course.rooms.all %}{{ room }} {% endfor %}{% endif %}
+
{% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
{% endfor %}{% endautoescape %}