From 0f7e25b87016b2d6088bfdaa38c3c54a6dee005d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Tue, 7 Jun 2016 09:33:21 +0200
Subject: [PATCH] [Backport] Marking as "html" safe email subjects

---
 .../export_import/templates/emails/dump_project-subject.jinja | 2 +-
 .../export_import/templates/emails/export_error-subject.jinja | 2 +-
 .../export_import/templates/emails/import_error-subject.jinja | 2 +-
 taiga/export_import/templates/emails/load_dump-subject.jinja  | 2 +-
 .../templates/emails/feedback_notification-subject.jinja      | 2 +-
 .../templates/emails/issues/issue-change-subject.jinja        | 2 +-
 .../templates/emails/issues/issue-create-subject.jinja        | 2 +-
 .../templates/emails/issues/issue-delete-subject.jinja        | 2 +-
 .../emails/milestones/milestone-change-subject.jinja          | 2 +-
 .../emails/milestones/milestone-create-subject.jinja          | 2 +-
 .../emails/milestones/milestone-delete-subject.jinja          | 2 +-
 .../templates/emails/tasks/task-change-subject.jinja          | 4 ++--
 .../templates/emails/tasks/task-create-subject.jinja          | 2 +-
 .../templates/emails/tasks/task-delete-subject.jinja          | 2 +-
 .../emails/userstories/userstory-change-subject.jinja         | 2 +-
 .../emails/userstories/userstory-create-subject.jinja         | 2 +-
 .../emails/userstories/userstory-delete-subject.jinja         | 2 +-
 .../templates/emails/wiki/wikipage-change-subject.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-create-subject.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-delete-subject.jinja       | 2 +-
 .../templates/emails/membership_invitation-subject.jinja      | 2 +-
 .../templates/emails/membership_notification-subject.jinja    | 2 +-
 taiga/projects/templates/emails/transfer_accept-subject.jinja | 2 +-
 taiga/projects/templates/emails/transfer_reject-subject.jinja | 2 +-
 .../projects/templates/emails/transfer_request-subject.jinja  | 2 +-
 taiga/projects/templates/emails/transfer_start-subject.jinja  | 2 +-
 26 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/taiga/export_import/templates/emails/dump_project-subject.jinja b/taiga/export_import/templates/emails/dump_project-subject.jinja
index f723a922..7ad0ef61 100644
--- a/taiga/export_import/templates/emails/dump_project-subject.jinja
+++ b/taiga/export_import/templates/emails/dump_project-subject.jinja
@@ -1 +1 @@
-{% trans project=project.name %}[{{ project }}] Your project dump has been generated{% endtrans %}
+{% trans project=project.name|safe %}[{{ project }}] Your project dump has been generated{% endtrans %}
diff --git a/taiga/export_import/templates/emails/export_error-subject.jinja b/taiga/export_import/templates/emails/export_error-subject.jinja
index e5d020cf..741bf6d8 100644
--- a/taiga/export_import/templates/emails/export_error-subject.jinja
+++ b/taiga/export_import/templates/emails/export_error-subject.jinja
@@ -1 +1 @@
-{% trans error_subject=error_subject, project=project.name %}[{{ project }}] {{ error_subject }}{% endtrans %}
+{% trans error_subject=error_subject|safe, project=project.name|safe %}[{{ project }}] {{ error_subject }}{% endtrans %}
diff --git a/taiga/export_import/templates/emails/import_error-subject.jinja b/taiga/export_import/templates/emails/import_error-subject.jinja
index 44506406..329983d4 100644
--- a/taiga/export_import/templates/emails/import_error-subject.jinja
+++ b/taiga/export_import/templates/emails/import_error-subject.jinja
@@ -1 +1 @@
-{% trans error_subject=error_subject %}[Taiga] {{ error_subject }}{% endtrans %}
+{% trans error_subject=error_subject|safe %}[Taiga] {{ error_subject }}{% endtrans %}
diff --git a/taiga/export_import/templates/emails/load_dump-subject.jinja b/taiga/export_import/templates/emails/load_dump-subject.jinja
index 6ef621c4..a258d42e 100644
--- a/taiga/export_import/templates/emails/load_dump-subject.jinja
+++ b/taiga/export_import/templates/emails/load_dump-subject.jinja
@@ -1 +1 @@
-{% trans project=project.name %}[{{ project }}] Your project dump has been imported{% endtrans %}
+{% trans project=project.name|safe %}[{{ project }}] Your project dump has been imported{% endtrans %}
diff --git a/taiga/feedback/templates/emails/feedback_notification-subject.jinja b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
index a5fe9c3f..6cc87701 100644
--- a/taiga/feedback/templates/emails/feedback_notification-subject.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
@@ -1,3 +1,3 @@
-{% trans full_name=feedback_entry.full_name, email=feedback_entry.email %}
+{% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email|safe %}
 [Taiga] Feedback from {{ full_name }} <{{ email }}>
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
index 5cee74b7..707e2703 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Updated the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
index cde770ce..7e4cf6bd 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Created the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
index c5773908..bf297fa4 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Deleted the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
index 1891a893..400bf944 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, milestone=snapshot.name %}
+{% trans project=project.name|safe, milestone=snapshot.name|safe %}
 [{{ project }}] Updated the sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
index 700faac0..10656b83 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, milestone=snapshot.name %}
+{% trans project=project.name|safe, milestone=snapshot.name|safe %}
 [{{ project }}] Created the sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
index 242f1326..11404786 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, milestone=snapshot.name %}
+{% trans project=project.name|safe, milestone=snapshot.name|safe %}
 [{{ project }}] Deleted the Sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
index 6275e839..44fde7e5 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
-[{{ project }}] Updated the task #{{ ref }} "{{ subject  }}"
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+[{{ project }}] Updated the task #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
index 27dabde4..d107e855 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Created the task #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
index 8522f00c..e80e164f 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Deleted the task #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
index 3ed70685..e116e403 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Updated the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
index 1e166e57..124e3060 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Created the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
index 3a48058e..f7843217 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
+{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
 [{{ project }}] Deleted the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
index 73912cb6..14bab7d5 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, page=snapshot.slug %}
+{% trans project=project.name|safe, page=snapshot.slug|safe %}
 [{{ project }}] Updated the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
index 6b7d1adf..92560812 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, page=snapshot.slug %}
+{% trans project=project.name|safe, page=snapshot.slug|safe %}
 [{{ project }}] Created the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
index a807f6f3..244410fc 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name, page=snapshot.slug %}
+{% trans project=project.name|safe, page=snapshot.slug|safe %}
 [{{ project }}] Deleted the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_invitation-subject.jinja b/taiga/projects/templates/emails/membership_invitation-subject.jinja
index 8e620317..0b5206ef 100644
--- a/taiga/projects/templates/emails/membership_invitation-subject.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=membership.project %}
+{% trans project=membership.project|safe %}
 [Taiga] Invitation to join to the project '{{ project }}'
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_notification-subject.jinja b/taiga/projects/templates/emails/membership_notification-subject.jinja
index c6bdd588..57d60ac6 100644
--- a/taiga/projects/templates/emails/membership_notification-subject.jinja
+++ b/taiga/projects/templates/emails/membership_notification-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=membership.project %}
+{% trans project=membership.project|safe %}
 [Taiga] Added to the project '{{ project }}'
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/transfer_accept-subject.jinja b/taiga/projects/templates/emails/transfer_accept-subject.jinja
index 6b7c84d5..75380521 100644
--- a/taiga/projects/templates/emails/transfer_accept-subject.jinja
+++ b/taiga/projects/templates/emails/transfer_accept-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name %}
+{% trans project=project.name|safe %}
 [{{project}}] Project ownership transfer offer accepted!
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/transfer_reject-subject.jinja b/taiga/projects/templates/emails/transfer_reject-subject.jinja
index e6eaa127..345ae940 100644
--- a/taiga/projects/templates/emails/transfer_reject-subject.jinja
+++ b/taiga/projects/templates/emails/transfer_reject-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name %}
+{% trans project=project.name|safe %}
 [{{project}}] Project ownership transfer declined
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/transfer_request-subject.jinja b/taiga/projects/templates/emails/transfer_request-subject.jinja
index 1f6ff81c..ea4efbbb 100644
--- a/taiga/projects/templates/emails/transfer_request-subject.jinja
+++ b/taiga/projects/templates/emails/transfer_request-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name %}
+{% trans project=project.name|safe %}
 [{{project}}] Project ownership transfer request
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/transfer_start-subject.jinja b/taiga/projects/templates/emails/transfer_start-subject.jinja
index d0e34d3a..c2791053 100644
--- a/taiga/projects/templates/emails/transfer_start-subject.jinja
+++ b/taiga/projects/templates/emails/transfer_start-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name %}
+{% trans project=project.name|safe %}
 [{{project}}] Project ownership transfer offer
 {% endtrans %}