From 2cb5e9df193cd196fa5b4702ee6ccb0600e15d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 14 May 2015 15:03:39 +0200 Subject: [PATCH] [i18n] Localized emails --- .../templates/emails/base-body-html.jinja | 4 +- .../templates/emails/hero-body-html.jinja | 4 +- .../templates/emails/updates-body-html.jinja | 4 +- .../emails/dump_project-body-html.jinja | 5 +- .../emails/dump_project-body-text.jinja | 5 +- .../emails/export_error-body-html.jinja | 5 +- .../emails/export_error-body-text.jinja | 5 +- .../emails/import_error-body-html.jinja | 4 +- .../emails/import_error-body-text.jinja | 4 +- .../emails/load_dump-body-html.jinja | 4 +- .../emails/load_dump-body-text.jinja | 4 +- taiga/locale/en/LC_MESSAGES/django.po | 736 +++++++++++++++++- .../issues/issue-change-body-html.jinja | 7 +- .../issues/issue-change-body-text.jinja | 7 +- .../emails/issues/issue-change-subject.jinja | 4 +- .../issues/issue-create-body-html.jinja | 7 +- .../issues/issue-create-body-text.jinja | 7 +- .../emails/issues/issue-create-subject.jinja | 4 +- .../issues/issue-delete-body-html.jinja | 6 +- .../issues/issue-delete-body-text.jinja | 6 +- .../emails/issues/issue-delete-subject.jinja | 4 +- .../milestone-change-body-html.jinja | 6 +- .../milestone-change-body-text.jinja | 6 +- .../milestones/milestone-change-subject.jinja | 3 +- .../milestone-create-body-html.jinja | 6 +- .../milestone-create-body-text.jinja | 6 +- .../milestones/milestone-create-subject.jinja | 3 +- .../milestone-delete-body-html.jinja | 6 +- .../milestone-delete-body-text.jinja | 5 +- .../milestones/milestone-delete-subject.jinja | 3 +- .../emails/tasks/task-change-body-html.jinja | 7 +- .../emails/tasks/task-change-body-text.jinja | 7 +- .../emails/tasks/task-change-subject.jinja | 4 +- .../emails/tasks/task-create-body-html.jinja | 7 +- .../emails/tasks/task-create-body-text.jinja | 7 +- .../emails/tasks/task-create-subject.jinja | 4 +- .../emails/tasks/task-delete-body-html.jinja | 6 +- .../emails/tasks/task-delete-body-text.jinja | 6 +- .../emails/tasks/task-delete-subject.jinja | 4 +- .../userstory-change-body-html.jinja | 7 +- .../userstory-change-body-text.jinja | 7 +- .../userstory-change-subject.jinja | 4 +- .../userstory-create-body-html.jinja | 7 +- .../userstory-create-body-text.jinja | 7 +- .../userstory-create-subject.jinja | 4 +- .../userstory-delete-body-html.jinja | 6 +- .../userstory-delete-body-text.jinja | 6 +- .../userstory-delete-subject.jinja | 4 +- .../wiki/wikipage-change-body-html.jinja | 6 +- .../wiki/wikipage-change-body-text.jinja | 6 +- .../wiki/wikipage-create-body-html.jinja | 6 +- .../wiki/wikipage-create-body-text.jinja | 6 +- .../wiki/wikipage-delete-body-html.jinja | 5 +- .../wiki/wikipage-delete-body-text.jinja | 5 +- .../membership_invitation-body-html.jinja | 3 +- .../membership_invitation-body-text.jinja | 3 +- .../membership_notification-body-html.jinja | 4 +- .../membership_notification-body-text.jinja | 4 +- .../emails/password_recovery-body-html.jinja | 3 +- 59 files changed, 757 insertions(+), 278 deletions(-) diff --git a/taiga/base/templates/emails/base-body-html.jinja b/taiga/base/templates/emails/base-body-html.jinja index 1f6c23a1..52a263f5 100644 --- a/taiga/base/templates/emails/base-body-html.jinja +++ b/taiga/base/templates/emails/base-body-html.jinja @@ -420,9 +420,7 @@ {% block footer %} - {% trans support_url=sr("support.url"), - support_email=sr("support.email"), - mailing_list_url=sr("support.mailing_list") %} + {% trans support_url=sr("support.url"), support_email=sr("support.email"), mailing_list_url=sr("support.mailing_list") %} Taiga Support: {{ support_url}}
diff --git a/taiga/base/templates/emails/hero-body-html.jinja b/taiga/base/templates/emails/hero-body-html.jinja index 4738a3e4..349c3f2e 100644 --- a/taiga/base/templates/emails/hero-body-html.jinja +++ b/taiga/base/templates/emails/hero-body-html.jinja @@ -394,9 +394,7 @@ {% block footer %} - {% trans support_url=sr("support.url"), - support_email=sr("support.email"), - mailing_list_url=sr("support.mailing_list") %} + {% trans support_url=sr("support.url"), support_email=sr("support.email"), mailing_list_url=sr("support.mailing_list") %} Taiga Support: {{ support_url}}
diff --git a/taiga/base/templates/emails/updates-body-html.jinja b/taiga/base/templates/emails/updates-body-html.jinja index ebac0678..4675b88a 100644 --- a/taiga/base/templates/emails/updates-body-html.jinja +++ b/taiga/base/templates/emails/updates-body-html.jinja @@ -456,9 +456,7 @@ {% block footer %} - {% trans support_url=sr("support.url"), - support_email=sr("support.email"), - mailing_list_url=sr("support.mailing_list") %} + {% trans support_url=sr("support.url"), support_email=sr("support.email"), mailing_list_url=sr("support.mailing_list") %} Taiga Support: {{ support_url}}
diff --git a/taiga/export_import/templates/emails/dump_project-body-html.jinja b/taiga/export_import/templates/emails/dump_project-body-html.jinja index bac303e7..86906ded 100644 --- a/taiga/export_import/templates/emails/dump_project-body-html.jinja +++ b/taiga/export_import/templates/emails/dump_project-body-html.jinja @@ -1,10 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - project=project.name|safe, - url=url, - deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %} + {% trans user=user.get_full_name()|safe, project=project.name|safe, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %}

Project dump generated

Hello {{ user }},

Your dump from project {{ project }} has been correctly generated.

diff --git a/taiga/export_import/templates/emails/dump_project-body-text.jinja b/taiga/export_import/templates/emails/dump_project-body-text.jinja index f8b94d5d..810d373d 100644 --- a/taiga/export_import/templates/emails/dump_project-body-text.jinja +++ b/taiga/export_import/templates/emails/dump_project-body-text.jinja @@ -1,7 +1,4 @@ -{% trans user=user.get_full_name()|safe, - project=project.name|safe, - url=url, - deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %} +{% trans user=user.get_full_name()|safe, project=project.name|safe, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %} Hello {{ user }}, Your dump from project {{ project }} has been correctly generated. You can download it here: diff --git a/taiga/export_import/templates/emails/export_error-body-html.jinja b/taiga/export_import/templates/emails/export_error-body-html.jinja index aacc09c0..12ab5b10 100644 --- a/taiga/export_import/templates/emails/export_error-body-html.jinja +++ b/taiga/export_import/templates/emails/export_error-body-html.jinja @@ -1,10 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - error_message=error_message, - support_email=sr("support.email"), - project=project.name|safe %} + {% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email"), project=project.name|safe %}

{{ error_message }}

Hello {{ user }},

Your project {{ project }} has not been exported correctly.

diff --git a/taiga/export_import/templates/emails/export_error-body-text.jinja b/taiga/export_import/templates/emails/export_error-body-text.jinja index 0b463d67..e9efcb16 100644 --- a/taiga/export_import/templates/emails/export_error-body-text.jinja +++ b/taiga/export_import/templates/emails/export_error-body-text.jinja @@ -1,7 +1,4 @@ -{% trans user=user.get_full_name()|safe, - error_message=error_message, - support_email=sr("support.email"), - project=project.name|safe %} +{% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email"), project=project.name|safe %} Hello {{ user }}, {{ error_message }} diff --git a/taiga/export_import/templates/emails/import_error-body-html.jinja b/taiga/export_import/templates/emails/import_error-body-html.jinja index 9f178f2a..b1a27a72 100644 --- a/taiga/export_import/templates/emails/import_error-body-html.jinja +++ b/taiga/export_import/templates/emails/import_error-body-html.jinja @@ -1,9 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - error_message=error_message, - support_email=sr("support.email") %} + {% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email") %}

{{ error_message }}

Hello {{ user }},

Your project has not been importer correctly.

diff --git a/taiga/export_import/templates/emails/import_error-body-text.jinja b/taiga/export_import/templates/emails/import_error-body-text.jinja index affc8dc9..50f1ccb4 100644 --- a/taiga/export_import/templates/emails/import_error-body-text.jinja +++ b/taiga/export_import/templates/emails/import_error-body-text.jinja @@ -1,6 +1,4 @@ - {% trans user=user.get_full_name()|safe, - error_message=error_message, - support_email=sr("support.email") %} +{% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email") %} Hello {{ user }}, {{ error_message }} diff --git a/taiga/export_import/templates/emails/load_dump-body-html.jinja b/taiga/export_import/templates/emails/load_dump-body-html.jinja index b3c64b4a..52d7fd7f 100644 --- a/taiga/export_import/templates/emails/load_dump-body-html.jinja +++ b/taiga/export_import/templates/emails/load_dump-body-html.jinja @@ -1,9 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - url=resolve_front_url("project", project.slug), - project=project.name|safe %} + {% trans user=user.get_full_name()|safe, url=resolve_front_url("project", project.slug), project=project.name|safe %}

Project dump imported

Hello {{ user }},

Your project dump has been correctly imported.

diff --git a/taiga/export_import/templates/emails/load_dump-body-text.jinja b/taiga/export_import/templates/emails/load_dump-body-text.jinja index e38c99a6..e5f0aa24 100644 --- a/taiga/export_import/templates/emails/load_dump-body-text.jinja +++ b/taiga/export_import/templates/emails/load_dump-body-text.jinja @@ -1,6 +1,4 @@ -{% trans user=user.get_full_name()|safe, - url=resolve_front_url("project", project.slug), - project=project.name|safe %} +{% trans user=user.get_full_name()|safe, url=resolve_front_url("project", project.slug), project=project.name|safe %} Hello {{ user }}, Your project dump has been correctly imported. diff --git a/taiga/locale/en/LC_MESSAGES/django.po b/taiga/locale/en/LC_MESSAGES/django.po index 49e7f447..a07d96e9 100644 --- a/taiga/locale/en/LC_MESSAGES/django.po +++ b/taiga/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: taiga-back\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-08 09:55+0200\n" +"POT-Creation-Date: 2015-05-14 15:04+0200\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n" "Last-Translator: Taiga Dev Team \n" "Language-Team: Taiga Dev Team \n" @@ -374,6 +374,33 @@ msgstr "" msgid "Taiga.io" msgstr "" +#: taiga/base/templates/emails/base-body-html.jinja:423 +#: taiga/base/templates/emails/hero-body-html.jinja:397 +#: taiga/base/templates/emails/updates-body-html.jinja:459 +#, python-format +msgid "" +"\n" +" Taiga Support:\n" +" %(support_url)s\n" +"
\n" +" Contact us:\n" +" \n" +" %(support_email)s\n" +" \n" +"
\n" +" Mailing list:\n" +" \n" +" %(mailing_list_url)s\n" +" \n" +" " +msgstr "" + #: taiga/base/templates/emails/hero-body-html.jinja:6 msgid "You have been Taigatized" msgstr "" @@ -495,8 +522,8 @@ msgstr "" #: taiga/export_import/serializers.py:466 #: taiga/projects/milestones/serializers.py:63 -#: taiga/projects/serializers.py:65 taiga/projects/serializers.py:91 -#: taiga/projects/serializers.py:121 taiga/projects/serializers.py:163 +#: taiga/projects/serializers.py:66 taiga/projects/serializers.py:92 +#: taiga/projects/serializers.py:122 taiga/projects/serializers.py:164 msgid "Name duplicated for the project" msgstr "" @@ -508,21 +535,148 @@ msgstr "" msgid "Error loading project dump" msgstr "" +#: taiga/export_import/templates/emails/dump_project-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Project dump generated

\n" +"

Hello %(user)s,

\n" +"

Your dump from project %(project)s has been correctly generated.\n" +"

You can download it here:

\n" +" Download the dump file\n" +"

This file will be deleted on %(deletion_date)s.

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/export_import/templates/emails/dump_project-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your dump from project %(project)s has been correctly generated. You can " +"download it here:\n" +"\n" +"%(url)s\n" +"\n" +"This file will be deleted on %(deletion_date)s.\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/export_import/templates/emails/dump_project-subject.jinja:1 #, python-format msgid "[%(project)s] Your project dump has been generated" msgstr "" +#: taiga/export_import/templates/emails/export_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

%(error_message)s

\n" +"

Hello %(user)s,

\n" +"

Your project %(project)s has not been exported correctly.

\n" +"

The Taiga system administrators have been informed.
Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/export_import/templates/emails/export_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"Your project %(project)s has not been exported correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/export_import/templates/emails/export_error-subject.jinja:1 #, python-format msgid "[%(project)s] %(error_subject)s" msgstr "" +#: taiga/export_import/templates/emails/import_error-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

%(error_message)s

\n" +"

Hello %(user)s,

\n" +"

Your project has not been importer correctly.

\n" +"

The Taiga system administrators have been informed.
Please, try " +"it again or contact with the support team at\n" +" %(support_email)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/export_import/templates/emails/import_error-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"%(error_message)s\n" +"\n" +"Your project has not been importer correctly.\n" +"\n" +"The Taiga system administrators have been informed.\n" +"\n" +"Please, try it again or contact with the support team at %(support_email)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/export_import/templates/emails/import_error-subject.jinja:1 #, python-format msgid "[Taiga] %(error_subject)s" msgstr "" +#: taiga/export_import/templates/emails/load_dump-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Project dump imported

\n" +"

Hello %(user)s,

\n" +"

Your project dump has been correctly imported.

\n" +" Go to %(project)s\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/export_import/templates/emails/load_dump-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Hello %(user)s,\n" +"\n" +"Your project dump has been correctly imported.\n" +"\n" +"You can see the project %(project)s here:\n" +"\n" +"%(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/export_import/templates/emails/load_dump-subject.jinja:1 #, python-format msgid "[%(project)s] Your project dump has been imported" @@ -860,7 +1014,7 @@ msgstr "" msgid "Not valid template description" msgstr "" -#: taiga/projects/api.py:469 taiga/projects/serializers.py:256 +#: taiga/projects/api.py:469 taiga/projects/serializers.py:257 msgid "At least one of the user must be an active admin" msgstr "" @@ -1433,6 +1587,402 @@ msgstr "" msgid "Notify exists for specified user and project" msgstr "" +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Issue updated

\n" +"

Hello %(user)s,
%(changer)s has updated an issue on %(project)s\n" +"

Issue #%(ref)s %(subject)s

\n" +" See issue\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Issue updated\n" +"Hello %(user)s, %(changer)s has updated an issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

New issue created

\n" +"

Hello %(user)s,
%(changer)s has created a new issue on " +"%(project)s

\n" +"

Issue #%(ref)s %(subject)s

\n" +" See issue\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New issue created\n" +"Hello %(user)s, %(changer)s has created a new issue on %(project)s\n" +"See issue #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Issue deleted

\n" +"

Hello %(user)s,
%(changer)s has deleted an issue on %(project)s\n" +"

Issue #%(ref)s %(subject)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Issue deleted\n" +"Hello %(user)s, %(changer)s has deleted an issue on %(project)s\n" +"Issue #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the issue #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Sprint updated

\n" +"

Hello %(user)s,
%(changer)s has updated an sprint on " +"%(project)s

\n" +"

Sprint %(name)s

\n" +" See sprint\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Sprint updated\n" +"Hello %(user)s, %(changer)s has updated a sprint on %(project)s\n" +"See sprint %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

New sprint created

\n" +"

Hello %(user)s,
%(changer)s has created a new sprint on " +"%(project)s

\n" +"

Sprint %(name)s

\n" +" See " +"sprint\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New sprint created\n" +"Hello %(user)s, %(changer)s has created a new sprint on %(project)s\n" +"See sprint %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Sprint deleted

\n" +"

Hello %(user)s,
%(changer)s has deleted an sprint on " +"%(project)s

\n" +"

Sprint %(name)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Sprint deleted\n" +"Hello %(user)s, %(changer)s has deleted an sprint on %(project)s\n" +"Sprint %(name)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the Sprint \"%(milestone)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Task updated

\n" +"

Hello %(user)s,
%(changer)s has updated a task on %(project)s\n" +"

Task #%(ref)s %(subject)s

\n" +" See task\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Task updated\n" +"Hello %(user)s, %(changer)s has updated a task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

New task created

\n" +"

Hello %(user)s,
%(changer)s has created a new task on " +"%(project)s

\n" +"

Task #%(ref)s %(subject)s

\n" +" See task\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New created\n" +"Hello %(user)s, %(changer)s has created a new task on %(project)s\n" +"See task #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Task deleted

\n" +"

Hello %(user)s,
%(changer)s has deleted a task on %(project)s\n" +"

Task #%(ref)s %(subject)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Task deleted\n" +"Hello %(user)s, %(changer)s has deleted a task on %(project)s\n" +"Task #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the task #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

User Story updated

\n" +"

Hello %(user)s,
%(changer)s has updated a user story on " +"%(project)s

\n" +"

User Story #%(ref)s %(subject)s

\n" +" See user story\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"User story updated\n" +"Hello %(user)s, %(changer)s has updated a user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Updated the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

New user story created

\n" +"

Hello %(user)s,
%(changer)s has created a new user story on " +"%(project)s

\n" +"

User Story #%(ref)s %(subject)s

\n" +" See user story\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New user story created\n" +"Hello %(user)s, %(changer)s has created a new user story on %(project)s\n" +"See user story #%(ref)s %(subject)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Created the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

User Story deleted

\n" +"

Hello %(user)s,
%(changer)s has deleted a user story on " +"%(project)s

\n" +"

User Story #%(ref)s %(subject)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"User Story deleted\n" +"Hello %(user)s, %(changer)s has deleted a user story on %(project)s\n" +"User Story #%(ref)s %(subject)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja:1 +#, python-format +msgid "" +"\n" +"[%(project)s] Deleted the US #%(ref)s \"%(subject)s\"\n" +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Wiki Page updated

\n" +"

Hello %(user)s,
%(changer)s has updated a wiki page on " +"%(project)s

\n" +"

Wiki page %(page)s

\n" +" See Wiki Page\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja:3 +#, python-format +msgid "" +"\n" +"Wiki Page updated\n" +"\n" +"Hello %(user)s, %(changer)s has updated a wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +msgstr "" + #: taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja:1 #, python-format msgid "" @@ -1440,6 +1990,34 @@ msgid "" "[%(project)s] Updated the Wiki Page \"%(page)s\"\n" msgstr "" +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

New wiki page created

\n" +"

Hello %(user)s,
%(changer)s has created a new wiki page on " +"%(project)s

\n" +"

Wiki page %(page)s

\n" +" See " +"wiki page\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"New wiki page created\n" +"\n" +"Hello %(user)s, %(changer)s has created a new wiki page on %(project)s\n" +"\n" +"See wiki page %(page)s at %(url)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja:1 #, python-format msgid "" @@ -1447,6 +2025,32 @@ msgid "" "[%(project)s] Created the Wiki Page \"%(page)s\"\n" msgstr "" +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Wiki page deleted

\n" +"

Hello %(user)s,
%(changer)s has deleted a wiki page on " +"%(project)s

\n" +"

Wiki page %(page)s

\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"Wiki page deleted\n" +"\n" +"Hello %(user)s, %(changer)s has deleted a wiki page on %(project)s\n" +"\n" +"Wiki page %(page)s\n" +"\n" +"---\n" +"The Taiga Team\n" +msgstr "" + #: taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja:1 #, python-format msgid "" @@ -1478,51 +2082,51 @@ msgstr "" msgid "You can't leave the project if there are no more owners" msgstr "" -#: taiga/projects/serializers.py:232 +#: taiga/projects/serializers.py:233 msgid "Email address is already taken" msgstr "" -#: taiga/projects/serializers.py:244 +#: taiga/projects/serializers.py:245 msgid "Invalid role for the project" msgstr "" -#: taiga/projects/serializers.py:342 +#: taiga/projects/serializers.py:343 msgid "Total milestones must be major or equal to zero" msgstr "" -#: taiga/projects/serializers.py:399 +#: taiga/projects/serializers.py:400 msgid "Default options" msgstr "" -#: taiga/projects/serializers.py:400 +#: taiga/projects/serializers.py:401 msgid "User story's statuses" msgstr "" -#: taiga/projects/serializers.py:401 +#: taiga/projects/serializers.py:402 msgid "Points" msgstr "" -#: taiga/projects/serializers.py:402 +#: taiga/projects/serializers.py:403 msgid "Task's statuses" msgstr "" -#: taiga/projects/serializers.py:403 +#: taiga/projects/serializers.py:404 msgid "Issue's statuses" msgstr "" -#: taiga/projects/serializers.py:404 +#: taiga/projects/serializers.py:405 msgid "Issue's types" msgstr "" -#: taiga/projects/serializers.py:405 +#: taiga/projects/serializers.py:406 msgid "Priorities" msgstr "" -#: taiga/projects/serializers.py:406 +#: taiga/projects/serializers.py:407 msgid "Severities" msgstr "" -#: taiga/projects/serializers.py:407 +#: taiga/projects/serializers.py:408 msgid "Roles" msgstr "" @@ -1560,7 +2164,18 @@ msgstr "" msgid "someone" msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:18 +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:11 +#, python-format +msgid "" +"\n" +"

You have been invited to Taiga!

\n" +"

Hi! %(full_name)s has sent you an invitation to join project " +"%(project)s in Taiga.
Taiga is a Free, open Source Agile Project " +"Management Tool.

\n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:17 #, python-format msgid "" "\n" @@ -1570,19 +2185,30 @@ msgid "" " " msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 msgid "Accept your invitation to Taiga" msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:24 msgid "Accept your invitation" msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:26 +#: taiga/projects/templates/emails/membership_invitation-body-html.jinja:25 msgid "The Taiga Team" msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:13 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:6 +#, python-format +msgid "" +"\n" +"You, or someone you know, has invited you to Taiga\n" +"\n" +"Hi! %(full_name)s has sent you an invitation to join a project called " +"%(project)s which is being managed on Taiga, a Free, open Source Agile " +"Project Management Tool.\n" +msgstr "" + +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:12 #, python-format msgid "" "\n" @@ -1593,11 +2219,11 @@ msgid "" " " msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:19 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:18 msgid "Accept your invitation to Taiga following this link:" msgstr "" -#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:21 +#: taiga/projects/templates/emails/membership_invitation-body-text.jinja:20 msgid "" "\n" "---\n" @@ -1611,6 +2237,29 @@ msgid "" "[Taiga] Invitation to join to the project '%(project)s'\n" msgstr "" +#: taiga/projects/templates/emails/membership_notification-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

You have been added to a project

\n" +"

Hello %(full_name)s,
you have been added to the project " +"%(project)s

\n" +" Go to " +"project\n" +"

The Taiga Team

\n" +" " +msgstr "" + +#: taiga/projects/templates/emails/membership_notification-body-text.jinja:1 +#, python-format +msgid "" +"\n" +"You have been added to a project\n" +"Hello %(full_name)s,you have been added to the project %(project)s\n" +"\n" +"See project at %(url)s\n" +msgstr "" + #: taiga/projects/templates/emails/membership_notification-subject.jinja:1 #, python-format msgid "" @@ -1850,7 +2499,7 @@ msgstr "" msgid "Stakeholder" msgstr "" -#: taiga/projects/userstories/api.py:172 +#: taiga/projects/userstories/api.py:173 #, python-brace-format msgid "" "Generating the user story [US #{ref} - {subject}](:us:{ref} \"US #{ref} - " @@ -1943,56 +2592,56 @@ msgstr "" msgid "Important dates" msgstr "" -#: taiga/users/api.py:105 taiga/users/api.py:112 +#: taiga/users/api.py:112 taiga/users/api.py:119 msgid "Invalid username or email" msgstr "" -#: taiga/users/api.py:121 +#: taiga/users/api.py:128 msgid "Mail sended successful!" msgstr "" -#: taiga/users/api.py:133 taiga/users/api.py:138 +#: taiga/users/api.py:140 taiga/users/api.py:145 msgid "Token is invalid" msgstr "" -#: taiga/users/api.py:159 +#: taiga/users/api.py:166 msgid "Current password parameter needed" msgstr "" -#: taiga/users/api.py:162 +#: taiga/users/api.py:169 msgid "New password parameter needed" msgstr "" -#: taiga/users/api.py:165 +#: taiga/users/api.py:172 msgid "Invalid password length at least 6 charaters needed" msgstr "" -#: taiga/users/api.py:168 +#: taiga/users/api.py:175 msgid "Invalid current password" msgstr "" -#: taiga/users/api.py:184 +#: taiga/users/api.py:191 msgid "Incomplete arguments" msgstr "" -#: taiga/users/api.py:189 +#: taiga/users/api.py:196 msgid "Invalid image format" msgstr "" -#: taiga/users/api.py:242 +#: taiga/users/api.py:249 msgid "Duplicated email" msgstr "" -#: taiga/users/api.py:244 +#: taiga/users/api.py:251 msgid "Not valid email" msgstr "" -#: taiga/users/api.py:264 taiga/users/api.py:270 +#: taiga/users/api.py:271 taiga/users/api.py:277 msgid "" "Invalid, are you sure the token is correct and you didn't use it before?" msgstr "" -#: taiga/users/api.py:297 taiga/users/api.py:305 taiga/users/api.py:308 +#: taiga/users/api.py:304 taiga/users/api.py:312 taiga/users/api.py:315 msgid "Invalid, are you sure the token is correct?" msgstr "" @@ -2108,6 +2757,19 @@ msgstr "" msgid "[Taiga] Change email" msgstr "" +#: taiga/users/templates/emails/password_recovery-body-html.jinja:4 +#, python-format +msgid "" +"\n" +"

Recover your password

\n" +"

Hello %(full_name)s,
you asked to recover your password

\n" +" Recover your password\n" +"

You can ignore this message if you did not request.

\n" +"

The Taiga Team

\n" +" " +msgstr "" + #: taiga/users/templates/emails/password_recovery-body-text.jinja:1 #, python-format msgid "" diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja index 12c1178d..c07b9a92 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/updates-body-html.jinja" %} {% block head %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("issue", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}

Issue updated

Hello {{ user }},
{{ changer }} has updated an issue on {{ project }}

Issue #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja index 98935cea..adda2149 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja @@ -1,11 +1,6 @@ {% extends "emails/updates-body-text.jinja" %} {% block head %} -{% trans user=user.get_full_name(), - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("issue", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name(), changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %} Issue updated Hello {{ user }}, {{ changer }} has updated an issue on {{ project }} See issue #{{ ref }} {{ subject }} at {{ url }} 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 ec535a22..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja index 63ae6018..8147f59c 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("issue", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}

New issue created

Hello {{ user }},
{{ changer }} has created a new issue on {{ project }}

Issue #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja index 0a64b921..5b7ff367 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja @@ -1,9 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("issue", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %} New issue created Hello {{ user }}, {{ changer }} has created a new issue on {{ project }} See issue #{{ ref }} {{ subject }} at {{ url }} 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 315ecf1f..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja index 1c832091..7b184627 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}

Issue deleted

Hello {{ user }},
{{ changer }} has deleted an issue on {{ project }}

Issue #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja index dd4d6cda..7c39fc31 100644 --- a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja @@ -1,8 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %} Issue deleted Hello {{ user }}, {{ changer }} has deleted an issue on {{ project }} Issue #{{ ref }} {{ subject }} 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 b736414e..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja index 2d96fa61..f756b38c 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/updates-body-html.jinja" %} {% block head %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - name=snapshot.name|safe, - url=resolve_front_url("taskboard", project.slug, snapshot.slug) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}

Sprint updated

Hello {{ user }},
{{ changer }} has updated an sprint on {{ project }}

Sprint {{ name }}

diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja index 26dc3849..7b87336a 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja @@ -1,10 +1,6 @@ {% extends "emails/updates-body-text.jinja" %} {% block head %} -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - name=snapshot.name|safe, - url=resolve_front_url("task", project.slug, snapshot.slug) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("task", project.slug, snapshot.slug) %} Sprint updated Hello {{ user }}, {{ changer }} has updated a sprint on {{ project }} See sprint {{ subject }} at {{ url }} 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 6a2d85e8..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,4 +1,3 @@ -{% trans project=project.name|safe, - milestone=snapshot.name|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja index 4f9b81b8..8390b282 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - name=snapshot.name|safe, - url=resolve_front_url("taskboard", project.slug, snapshot.slug) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}

New sprint created

Hello {{ user }},
{{ changer }} has created a new sprint on {{ project }}

Sprint {{ name }}

diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja index 98cb5d73..cfdedcef 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja @@ -1,8 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - name=snapshot.name|safe, - url=resolve_front_url("taskboard", project.slug, snapshot.slug) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %} New sprint created Hello {{ user }}, {{ changer }} has created a new sprint on {{ project }} See sprint {{ subject }} at {{ url }} 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 33c1aac2..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,4 +1,3 @@ -{% trans project=project.name|safe, - milestone=snapshot.name|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja index 10dbfacc..fcd2cb2d 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - name=snapshot.name|safe %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, name=snapshot.name|safe %}

Sprint deleted

Hello {{ user }},
{{ changer }} has deleted an sprint on {{ project }}

Sprint {{ name }}

diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja index 41c3b22b..2bb8bbe1 100644 --- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja @@ -1,7 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - name=snapshot.name|safe %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe %} Sprint deleted Hello {{ user }}, {{ changer }} has deleted an sprint on {{ project }} Sprint {{ name }} 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 496f517a..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,4 +1,3 @@ -{% trans project=project.name|safe, - milestone=snapshot.name|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja index 790cd752..024a41f2 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/updates-body-html.jinja" %} {% block head %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("task", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}

Task updated

Hello {{ user }},
{{ changer }} has updated a task on {{ project }}

Task #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja index 52d7d258..f34a7d96 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja @@ -1,11 +1,6 @@ {% extends "emails/updates-body-text.jinja" %} {% block head %} -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("task", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %} Task updated Hello {{ user }}, {{ changer }} has updated a task on {{ project }} See task #{{ ref }} {{ subject }} at {{ url }} 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 ced8c417..1e4d7c16 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja @@ -1,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja index 969ee9e0..bd0e796e 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("task", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}

New task created

Hello {{ user }},
{{ changer }} has created a new task on {{ project }}

Task #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja index 88ed278f..6eb2613d 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja @@ -1,9 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("task", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %} New created Hello {{ user }}, {{ changer }} has created a new task on {{ project }} See task #{{ ref }} {{ subject }} at {{ url }} 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 6931764f..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja index 05d1f493..d10551cd 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}

Task deleted

Hello {{ user }},
{{ changer }} has deleted a task on {{ project }}

Task #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja index acf9bfc3..d2c11cdf 100644 --- a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja @@ -1,8 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %} Task deleted Hello {{ user }}, {{ changer }} has deleted a task on {{ project }} Task #{{ ref }} {{ subject }} 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 1807e6a5..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja index 756a8260..8cecace4 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/updates-body-html.jinja" %} {% block head %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("userstory", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}

User Story updated

Hello {{ user }},
{{ changer }} has updated a user story on {{ project }}

User Story #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja index 79eaa5fa..68719440 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja @@ -1,11 +1,6 @@ {% extends "emails/updates-body-text.jinja" %} {% block head %} -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("userstory", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe,ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %} User story updated Hello {{ user }}, {{ changer }} has updated a user story on {{ project }} See user story #{{ ref }} {{ subject }} at {{ url }} 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 a362b076..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja index 1735950e..dc35ed3d 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja @@ -1,12 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("userstory", project.slug, snapshot.ref) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}

New user story created

Hello {{ user }},
{{ changer }} has created a new user story on {{ project }}

User Story #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja index 3d5aa92f..8bcd625c 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja @@ -1,9 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe, - url=resolve_front_url("userstory", project.slug, snapshot.ref) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %} New user story created Hello {{ user }}, {{ changer }} has created a new user story on {{ project }} See user story #{{ ref }} {{ subject }} at {{ url }} 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 549a6129..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja index 24aadddc..8decb3ef 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}

User Story deleted

Hello {{ user }},
{{ changer }} has deleted a user story on {{ project }}

User Story #{{ ref }} {{ subject }}

diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja index 22a67c97..0158a1b8 100644 --- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja @@ -1,8 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %} User Story deleted Hello {{ user }}, {{ changer }} has deleted a user story on {{ project }} User Story #{{ ref }} {{ subject }} 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 3c2d6ed9..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,5 +1,3 @@ -{% trans project=project.name|safe, - ref=snapshot.ref, - subject=snapshot.subject|safe %} +{% 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-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja index 65f4aa1c..550c7ebe 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/updates-body-html.jinja" %} {% block head %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug, - url=resolve_front_url("wiki", project.slug, snapshot.slug) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}

Wiki Page updated

Hello {{ user }},
{{ changer }} has updated a wiki page on {{ project }}

Wiki page {{ page }}

diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja index 9d284cc8..31f5884a 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja @@ -1,10 +1,6 @@ {% extends "emails/updates-body-text.jinja" %} {% block head %} -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug, - url=resolve_front_url("wiki", project.slug, snapshot.slug) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %} Wiki Page updated Hello {{ user }}, {{ changer }} has updated a wiki page on {{ project }} diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja index f9642cb9..7627ef2b 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja @@ -1,11 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug, - url=resolve_front_url("wiki", project.slug, snapshot.slug) %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}

New wiki page created

Hello {{ user }},
{{ changer }} has created a new wiki page on {{ project }}

Wiki page {{ page }}

diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja index 89177038..29d5e375 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja @@ -1,8 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug, - url=resolve_front_url("wiki", project.slug, snapshot.slug) %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %} New wiki page created Hello {{ user }}, {{ changer }} has created a new wiki page on {{ project }} diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja index b8f07630..212441cf 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja @@ -1,10 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug %} + {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug %}

Wiki page deleted

Hello {{ user }},
{{ changer }} has deleted a wiki page on {{ project }}

Wiki page {{ page }}

diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja index 46f5fb2e..a53b87a5 100644 --- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja +++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja @@ -1,7 +1,4 @@ -{% trans user=user.get_full_name()|safe, - changer=changer.get_full_name()|safe, - project=project.name|safe, - page=snapshot.slug %} +{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug %} Wiki page deleted Hello {{ user }}, {{ changer }} has deleted a wiki page on {{ project }} diff --git a/taiga/projects/templates/emails/membership_invitation-body-html.jinja b/taiga/projects/templates/emails/membership_invitation-body-html.jinja index a3efbc1f..a7cafb8b 100644 --- a/taiga/projects/templates/emails/membership_invitation-body-html.jinja +++ b/taiga/projects/templates/emails/membership_invitation-body-html.jinja @@ -8,8 +8,7 @@ {% block body %} - {% trans full_name=sender_full_name, - project=membership.project %} + {% trans full_name=sender_full_name, project=membership.project %}

You have been invited to Taiga!

Hi! {{ full_name }} has sent you an invitation to join project {{ project }} in Taiga.
Taiga is a Free, open Source Agile Project Management Tool.

{% endtrans %} diff --git a/taiga/projects/templates/emails/membership_invitation-body-text.jinja b/taiga/projects/templates/emails/membership_invitation-body-text.jinja index c8fbe7f1..70d8f51c 100644 --- a/taiga/projects/templates/emails/membership_invitation-body-text.jinja +++ b/taiga/projects/templates/emails/membership_invitation-body-text.jinja @@ -3,8 +3,7 @@ {% else %} {% set sender_full_name=_("someone") %} {% endif %} -{% trans full_name=sender_full_name, - project=membership.project %} +{% trans full_name=sender_full_name, project=membership.project %} You, or someone you know, has invited you to Taiga Hi! {{ full_name }} has sent you an invitation to join a project called {{ project }} which is being managed on Taiga, a Free, open Source Agile Project Management Tool. diff --git a/taiga/projects/templates/emails/membership_notification-body-html.jinja b/taiga/projects/templates/emails/membership_notification-body-html.jinja index db777193..03866fa8 100644 --- a/taiga/projects/templates/emails/membership_notification-body-html.jinja +++ b/taiga/projects/templates/emails/membership_notification-body-html.jinja @@ -1,9 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans url=resolve_front_url("project", membership.project.slug), - full_name=membership.user.get_full_name(), - project=membership.project %} + {% trans url=resolve_front_url("project", membership.project.slug), full_name=membership.user.get_full_name(), project=membership.project %}

You have been added to a project

Hello {{ full_name }},
you have been added to the project {{ project }}

Go to project diff --git a/taiga/projects/templates/emails/membership_notification-body-text.jinja b/taiga/projects/templates/emails/membership_notification-body-text.jinja index c9d94d67..7c3cba5d 100644 --- a/taiga/projects/templates/emails/membership_notification-body-text.jinja +++ b/taiga/projects/templates/emails/membership_notification-body-text.jinja @@ -1,6 +1,4 @@ -{% trans url=resolve_front_url("project", membership.project.slug), - full_name=membership.user.get_full_name(), - project=membership.project %} +{% trans url=resolve_front_url("project", membership.project.slug), full_name=membership.user.get_full_name(), project=membership.project %} You have been added to a project Hello {{ full_name }},you have been added to the project {{ project }} diff --git a/taiga/users/templates/emails/password_recovery-body-html.jinja b/taiga/users/templates/emails/password_recovery-body-html.jinja index 46450731..bab36a4f 100644 --- a/taiga/users/templates/emails/password_recovery-body-html.jinja +++ b/taiga/users/templates/emails/password_recovery-body-html.jinja @@ -1,8 +1,7 @@ {% extends "emails/base-body-html.jinja" %} {% block body %} - {% trans full_name=user.get_full_name(), - url=resolve_front_url("change-password", user.token) %} + {% trans full_name=user.get_full_name(), url=resolve_front_url("change-password", user.token) %}

Recover your password

Hello {{ full_name }},
you asked to recover your password

Recover your password