Fix tests

remotes/origin/enhancement/email-actions
David Barragán Merino 2015-01-22 11:50:06 +01:00 committed by Jesús Espino
parent 97d8ee0bc5
commit 006dbd7278
7 changed files with 30 additions and 4 deletions

View File

@ -94,6 +94,11 @@ class Command(BaseCommand):
} }
email = mbuilder.export_error(test_email, context) email = mbuilder.export_error(test_email, context)
email.send() email.send()
context = {
"user": User.objects.all().order_by("?").first(),
"error_subject": "Error importing project dump",
"error_message": "Error importing project dump",
}
email = mbuilder.import_error(test_email, context) email = mbuilder.import_error(test_email, context)
email.send() email.send()

View File

@ -7,7 +7,7 @@
project=project.name|safe %} project=project.name|safe %}
<h1>{{ error_message }}</h1> <h1>{{ error_message }}</h1>
<p>Hello {{ user }},</p> <p>Hello {{ user }},</p>
<p>Your project {{ project }} has not been exported correctly </p> <p>Your project {{ project }} has not been exported correctly.</p>
<p>The Taiga system administrators have been informed.<br/> Please, try it again or contact with the support team at <p>The Taiga system administrators have been informed.<br/> Please, try it again or contact with the support team at
<a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p> <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
<p><small>The Taiga Team</small></p> <p><small>The Taiga Team</small></p>

View File

@ -5,6 +5,9 @@
Hello {{ user }}, Hello {{ user }},
{{ error_message }} {{ error_message }}
Your project {{ project }} has not been exported correctly.
The Taiga system administrators have been informed.
Please, try it again or contact with the support team at {{ support_email }} Please, try it again or contact with the support team at {{ support_email }}

View File

@ -6,7 +6,8 @@
support_email=sr("support.email") %} support_email=sr("support.email") %}
<h1>{{ error_message }}</h1> <h1>{{ error_message }}</h1>
<p>Hello {{ user }},</p> <p>Hello {{ user }},</p>
<p>Please, try it again or contact with the support team at <p>Your project has not been importer correctly.</p>
<p>The Taiga system administrators have been informed.<br/> Please, try it again or contact with the support team at
<a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p> <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
<p><small>The Taiga Team</small></p> <p><small>The Taiga Team</small></p>
{% endtrans %} {% endtrans %}

View File

@ -5,6 +5,10 @@ Hello {{ user }},
{{ error_message }} {{ error_message }}
Your project has not been importer correctly.
The Taiga system administrators have been informed.
Please, try it again or contact with the support team at {{ support_email }} Please, try it again or contact with the support team at {{ support_email }}
--- ---

View File

@ -1,7 +1,15 @@
{% extends "emails/hero-body-html.jinja" %} {% extends "emails/hero-body-html.jinja" %}
{% if membership.invited_by %}
{% set sender_full_name=membership.invited_by.get_full_name() %}
{% else %}
{% set sender_full_name=_("someone") %}
{% endif %}
{% block body %} {% block body %}
{% trans full_name=membership.invited_by.get_full_name(), project=membership.project %} {% trans full_name=sender_full_name,
project=membership.project %}
<h2>You have been invited to Taiga!</h2> <h2>You have been invited to Taiga!</h2>
<p>Hi! {{ full_name }} has sent you an invitation to join project <em>{{ project }}</em> in Taiga.</br> Taiga is a Free, open Source Agile Project Management Tool.</p> <p>Hi! {{ full_name }} has sent you an invitation to join project <em>{{ project }}</em> in Taiga.</br> Taiga is a Free, open Source Agile Project Management Tool.</p>
{% endtrans %} {% endtrans %}

View File

@ -1,4 +1,9 @@
{% trans full_name=membership.invited_by.get_full_name(), {% if membership.invited_by %}
{% set sender_full_name=membership.invited_by.get_full_name() %}
{% else %}
{% set sender_full_name=_("someone") %}
{% endif %}
{% trans full_name=sender_full_name,
project=membership.project %} project=membership.project %}
You, or someone you know, has invited you to Taiga You, or someone you know, has invited you to Taiga