From d80f15b4eed447170221ec39549bd132c65a75c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 29 Mar 2016 12:12:37 +0200 Subject: [PATCH] Fix transfer emails templates --- .../projects/templates/emails/transfer_accept-body-text.jinja | 1 + .../projects/templates/emails/transfer_reject-body-html.jinja | 1 - .../projects/templates/emails/transfer_reject-body-text.jinja | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/taiga/projects/templates/emails/transfer_accept-body-text.jinja b/taiga/projects/templates/emails/transfer_accept-body-text.jinja index a8034063..0fda1124 100644 --- a/taiga/projects/templates/emails/transfer_accept-body-text.jinja +++ b/taiga/projects/templates/emails/transfer_accept-body-text.jinja @@ -3,6 +3,7 @@ Hi {{old_owner_name}}, {{ new_owner_name}} has accepted your offer and will become the new project owner for "{{project_name}}". {% endtrans %} +{% if reason %} {% trans new_owner_name=new_owner.get_full_name()%}{{ new_owner_name }} says:{% endtrans %} {{reason}} {% endif %} diff --git a/taiga/projects/templates/emails/transfer_reject-body-html.jinja b/taiga/projects/templates/emails/transfer_reject-body-html.jinja index 6d54f322..982915f7 100644 --- a/taiga/projects/templates/emails/transfer_reject-body-html.jinja +++ b/taiga/projects/templates/emails/transfer_reject-body-html.jinja @@ -10,7 +10,6 @@ {% trans rejecter_name=rejecter.get_full_name()%}

{{ rejecter_name }} says:

{% endtrans %} -

{{ reason }}

{% endif %} diff --git a/taiga/projects/templates/emails/transfer_reject-body-text.jinja b/taiga/projects/templates/emails/transfer_reject-body-text.jinja index 28f31a2c..972cce54 100644 --- a/taiga/projects/templates/emails/transfer_reject-body-text.jinja +++ b/taiga/projects/templates/emails/transfer_reject-body-text.jinja @@ -4,9 +4,7 @@ Hi {{owner_name}}, {% endtrans %} {% if reason %} -{% trans rejecter_name=rejecter.get_full_name()%} -

{{ rejecter_name }} says:

-{% endtrans %} +{% trans rejecter_name=rejecter.get_full_name()%}{{ rejecter_name }} says:{% endtrans %} {{ reason }} {% endif %}