Fix subject in rb occurrence emails

indico · May 30, 2023 · aadcb07 · aadcb07
1 parent 9e98187
commit aadcb07
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,7 @@ Bugfixes
 ^^^^^^^^
 
 - Fix width of time column in PDF timetable when using 12-hour time format (:pr:`5788`)
+- Fix wrong date in email subject for room booking occurrence cancellations (:pr:`5790`)
 
 Internal Changes
 ^^^^^^^^^^^^^^^^

diff --git a/indico/modules/rb/templates/emails/reservations/occurrence_cancellation_email_to_manager.txt b/indico/modules/rb/templates/emails/reservations/occurrence_cancellation_email_to_manager.txt
@@ -1,11 +1,11 @@
 {% extends 'rb/emails/reservations/base_email_to_manager.txt' %}
 {% block subject_prefix %}{% endblock %}
-{% block subject -%}{% trans room=reservation.room.full_name, start=reservation.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
-    [{{ room }}] Booking cancelled on ({{ start }}) (SINGLE OCCURRENCE)
+{% block subject -%}{% trans room=reservation.room.full_name, start=occurrence.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
+    [{{ room }}] Booking cancelled ({{ start }}) (SINGLE OCCURRENCE)
 {%- endtrans %}{%- endblock %}
 
 {% block email_body -%}
-    {% trans date=reservation.start_dt | format_date('EEEE dd/MM/yyyy', locale='en_GB') -%}
+    {% trans date=occurrence.start_dt | format_date('EEEE dd/MM/yyyy', locale='en_GB') -%}
         The date {{ date }} from a booking that concerns one of your rooms has been CANCELLED by the user.
     {%- endtrans %}
 {%- endblock %}
diff --git a/indico/modules/rb/templates/emails/reservations/occurrence_cancellation_email_to_user.txt b/indico/modules/rb/templates/emails/reservations/occurrence_cancellation_email_to_user.txt
@@ -1,6 +1,6 @@
 {% extends 'rb/emails/reservations/base_email_to_user.txt' %}
 {% block subject_prefix %}{% endblock %}
-{% block subject -%}{% trans room=reservation.room.full_name, start=reservation.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
+{% block subject -%}{% trans room=reservation.room.full_name, start=occurrence.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
     [{{ room }}] Booking cancelled ({{ start }}) (SINGLE OCCURRENCE)
 {%- endtrans %}{%- endblock %}
 

diff --git a/indico/modules/rb/templates/emails/reservations/occurrence_rejection_email_to_manager.txt b/indico/modules/rb/templates/emails/reservations/occurrence_rejection_email_to_manager.txt
@@ -1,7 +1,7 @@
 {% extends 'rb/emails/reservations/base_email_to_manager.txt' %}
 {% block subject_prefix %}{% endblock %}
-{% block subject -%}{% trans room=reservation.room.full_name, start=reservation.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
-    [{{ room }}] Booking rejected on ({{ start }}) (SINGLE OCCURRENCE)
+{% block subject -%}{% trans room=reservation.room.full_name, start=occurrence.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
+    [{{ room }}] Booking rejected ({{ start }}) (SINGLE OCCURRENCE)
 {%- endtrans %}{%- endblock %}
 
 {% block email_body -%}

diff --git a/indico/modules/rb/templates/emails/reservations/occurrence_rejection_email_to_user.txt b/indico/modules/rb/templates/emails/reservations/occurrence_rejection_email_to_user.txt
@@ -1,7 +1,7 @@
 {% extends 'rb/emails/reservations/base_email_to_user.txt' %}
 {% block subject_prefix %}{% endblock %}
-{% block subject -%}{% trans room=reservation.room.full_name, start=reservation.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
-    [{{ room }}] Booking rejected on ({{ start }}) (SINGLE OCCURRENCE)
+{% block subject -%}{% trans room=reservation.room.full_name, start=occurrence.start_dt|format_datetime('dd/MM/yyyy HH:mm', locale='en_GB') -%}
+    [{{ room }}] Booking rejected ({{ start }}) (SINGLE OCCURRENCE)
 {%- endtrans %}{%- endblock %}
 
 {% block email_body -%}

diff --git a/.../templates/emails/reservations/tests/occurrence_cancellation_email_to_manager.subject.txt b/.../templates/emails/reservations/tests/occurrence_cancellation_email_to_manager.subject.txt
@@ -1 +1 @@
- [1/2-3] Booking cancelled on (11/11/2022 13:37) (SINGLE OCCURRENCE)
+ [1/2-3] Booking cancelled (11/11/2022 13:37) (SINGLE OCCURRENCE)
diff --git a/.../rb/templates/emails/reservations/tests/occurrence_rejection_email_to_manager.subject.txt b/.../rb/templates/emails/reservations/tests/occurrence_rejection_email_to_manager.subject.txt
@@ -1 +1 @@
- [1/2-3] Booking rejected on (11/11/2022 13:37) (SINGLE OCCURRENCE)
+ [1/2-3] Booking rejected (11/11/2022 13:37) (SINGLE OCCURRENCE)
diff --git a/...les/rb/templates/emails/reservations/tests/occurrence_rejection_email_to_user.subject.txt b/...les/rb/templates/emails/reservations/tests/occurrence_rejection_email_to_user.subject.txt
@@ -1 +1 @@
- [1/2-3] Booking rejected on (11/11/2022 13:37) (SINGLE OCCURRENCE)
+ [1/2-3] Booking rejected (11/11/2022 13:37) (SINGLE OCCURRENCE)