From d36e7e7eaa92ea6ce9884c6725f66dc493fbe622 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 29 Oct 2014 11:11:05 +0100 Subject: [PATCH] Fixing invitation tests --- .../emails/membership_invitation-body-html.jinja | 12 ++++++------ .../emails/membership_invitation-body-text.jinja | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/taiga/projects/templates/emails/membership_invitation-body-html.jinja b/taiga/projects/templates/emails/membership_invitation-body-html.jinja index f388d2bc..55bc69eb 100644 --- a/taiga/projects/templates/emails/membership_invitation-body-html.jinja +++ b/taiga/projects/templates/emails/membership_invitation-body-html.jinja @@ -7,18 +7,18 @@
-

Hi,

-

you have been invited to the project '{{ membership.project }}'.

-

If you want to join to this project go to this link - for accept this invitation.

+

The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to {{ membership.email}} and delights in the pleasure of welcoming you to join {{ membership.invited_by.full_name }} and others in the team as a new and right honorable member in good standing of the project titled: '{{ membership.project }}'.

+

You may indicate your humble desire to accept this invitation by gently clicking here: {{ final_url }}

{% if membership.invitation_extra_text %}

- Some words from your Taiga Ambassador:
+ And now some words from the jolly good fellow or sistren who thought so kindly as to invite you:
{{ membership.invitation_extra_text }}

{% endif %} +

Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie.

+
@@ -26,6 +26,6 @@ {% block footer %}

- More info at: {{ final_url_name }} + Further details: {{ final_url_name }}

{% endblock %} diff --git a/taiga/projects/templates/emails/membership_invitation-body-text.jinja b/taiga/projects/templates/emails/membership_invitation-body-text.jinja index c08ae538..b96f4025 100644 --- a/taiga/projects/templates/emails/membership_invitation-body-text.jinja +++ b/taiga/projects/templates/emails/membership_invitation-body-text.jinja @@ -1,18 +1,18 @@ {% set final_url = resolve_front_url("invitation", membership.token) %} {% set final_url_name = "Taiga - Invitation to join on {0} project.".format(membership.project) %} -Hi, +The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to {{ membership.email}} and delights in the pleasure of welcoming you to join {{ membership.invited_by.full_name }} and others in the team as a new and right honorable member in good standing of the project titled: '{{ membership.project }}'. -you have been invited to the project '{{ membership.project }}'. - -If you want to join to this project go to {{ final_url }} for accept this invitation. +You may indicate your humble desire to accept this invitation by gently clicking here: {{ final_url }} {% if membership.invitation_extra_text %} -Some words from your Taiga Ambassador: +And now some words from the jolly good fellow or sistren who thought so kindly as to invite you: {{ membership.invitation_extra_text }} {% endif %} -** More info at ({{ final_url }}) ** +Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie. + +Further details: ({{ final_url }})