From 5e1616d83a61e36323461569f9186bb91a8af85c Mon Sep 17 00:00:00 2001 From: Stefano Brentegani Date: Wed, 30 Jul 2014 10:40:13 +0200 Subject: [PATCH] split blocktrans in templates --- .../helpdesk/confirm_delete_saved_query.html | 13 ++++++------- helpdesk/templates/helpdesk/create_ticket.html | 8 ++++---- helpdesk/templates/helpdesk/delete_ticket.html | 7 +++---- helpdesk/templates/helpdesk/edit_ticket.html | 6 +++--- helpdesk/templates/helpdesk/email_ignore_add.html | 8 ++++---- helpdesk/templates/helpdesk/email_ignore_del.html | 7 +++---- helpdesk/templates/helpdesk/public_homepage.html | 2 +- helpdesk/templates/helpdesk/public_spam.html | 13 ++++--------- helpdesk/templates/helpdesk/system_settings.html | 6 +++--- helpdesk/templates/helpdesk/user_settings.html | 8 +++----- 10 files changed, 34 insertions(+), 44 deletions(-) diff --git a/helpdesk/templates/helpdesk/confirm_delete_saved_query.html b/helpdesk/templates/helpdesk/confirm_delete_saved_query.html index 4b2b5787..6ba9b732 100644 --- a/helpdesk/templates/helpdesk/confirm_delete_saved_query.html +++ b/helpdesk/templates/helpdesk/confirm_delete_saved_query.html @@ -2,15 +2,14 @@ {% block helpdesk_title %}{% trans "Delete Saved Query" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans with query.title as query_title %} -

Delete Query

+{% block helpdesk_body %} +

{% trans "Delete Query" %}

-

Are you sure you want to delete this saved filter ({{ query_title }})? To re-create it, you will need to manually re-filter your ticket listing.

-{% endblocktrans %} +

{% blocktrans with query.title as query_title %}Are you sure you want to delete this saved filter ({{ query_title }})? To re-create it, you will need to manually re-filter your ticket listing.{% endblocktrans %}

-{% if query.shared %}{% blocktrans %} -

You have shared this query, so other users may be using it. If you delete it, they will have to manually create their own query.

-{% endblocktrans %}{% endif %} +{% if query.shared %} +

{% blocktrans %}You have shared this query, so other users may be using it. If you delete it, they will have to manually create their own query.{% endblocktrans %}

+{% endif %}

{% trans "No, Don't Delete It" %}

diff --git a/helpdesk/templates/helpdesk/create_ticket.html b/helpdesk/templates/helpdesk/create_ticket.html index f3caf81c..fbf63de1 100644 --- a/helpdesk/templates/helpdesk/create_ticket.html +++ b/helpdesk/templates/helpdesk/create_ticket.html @@ -6,9 +6,9 @@
-
{% blocktrans %}

Submit a Ticket

- -

Unless otherwise stated, all fields are required. Please provide as descriptive a title and description as possible.

{% endblocktrans %} +
+

{% trans "Submit a Ticket" %}

+

{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}

@@ -24,7 +24,7 @@ {% endif %} {% endfor %} {% endcomment %} - +
diff --git a/helpdesk/templates/helpdesk/delete_ticket.html b/helpdesk/templates/helpdesk/delete_ticket.html index c801f714..93209ad5 100644 --- a/helpdesk/templates/helpdesk/delete_ticket.html +++ b/helpdesk/templates/helpdesk/delete_ticket.html @@ -2,11 +2,10 @@ {% block helpdesk_title %}{% trans "Delete Ticket" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans with ticket.title as ticket_title %} -

Delete Ticket

+{% block helpdesk_body %} +

{% trans "Delete Ticket" %}

-

Are you sure you want to delete this ticket ({{ ticket_title }})? All traces of the ticket, including followups, attachments, and updates will be irreversably removed.

-{% endblocktrans %} +

{% blocktrans with ticket.title as ticket_title %}Are you sure you want to delete this ticket ({{ ticket_title }})? All traces of the ticket, including followups, attachments, and updates will be irreversibly removed.{% endblocktrans %}

{% trans "No, Don't Delete It" %}

diff --git a/helpdesk/templates/helpdesk/edit_ticket.html b/helpdesk/templates/helpdesk/edit_ticket.html index 0639df22..a3087c99 100644 --- a/helpdesk/templates/helpdesk/edit_ticket.html +++ b/helpdesk/templates/helpdesk/edit_ticket.html @@ -6,11 +6,11 @@
-
{% blocktrans %}

Edit a Ticket

+

{% trans "Edit a Ticket" %}

-

Unless otherwise stated, all fields are required. Please provide as descriptive a title and description as possible.

+

{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}

-

Note: Editing a ticket does not send an e-mail to the ticket owner or submitter. No new details should be entered, this form should only be used to fix incorrect details or clean up the submission.

{% endblocktrans %} +

{% trans "Note" %}: {% blocktrans %}Editing a ticket does not send an e-mail to the ticket owner or submitter. No new details should be entered, this form should only be used to fix incorrect details or clean up the submission.{% endblocktrans %}

diff --git a/helpdesk/templates/helpdesk/email_ignore_add.html b/helpdesk/templates/helpdesk/email_ignore_add.html index 68d94adc..f9865398 100644 --- a/helpdesk/templates/helpdesk/email_ignore_add.html +++ b/helpdesk/templates/helpdesk/email_ignore_add.html @@ -2,12 +2,12 @@ {% block helpdesk_title %}{% trans "Ignore E-Mail Address" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans %} -

Ignore E-Mail Address

+{% block helpdesk_body %} +

{% trans "Ignore E-Mail Address" %}

-

To ignore an e-mail address and prevent any emails from that address creating tickets automatically, enter the e-mail address below.

+

{% blocktrans %}To ignore an e-mail address and prevent any emails from that address creating tickets automatically, enter the e-mail address below.{% endblocktrans %}

-

You can either enter a whole e-mail address such as email@domain.com or a portion of an e-mail address with a wildcard, such as *@domain.com or user@*.

{% endblocktrans %} +

{% blocktrans %}You can either enter a whole e-mail address such as email@domain.com or a portion of an e-mail address with a wildcard, such as *@domain.com or user@*.{% endblocktrans %}

diff --git a/helpdesk/templates/helpdesk/email_ignore_del.html b/helpdesk/templates/helpdesk/email_ignore_del.html index 9f3fb0d5..a1ca4b33 100644 --- a/helpdesk/templates/helpdesk/email_ignore_del.html +++ b/helpdesk/templates/helpdesk/email_ignore_del.html @@ -2,11 +2,10 @@ {% block helpdesk_title %}{% trans "Delete Ignored E-Mail Address" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans with ignore.email_address as email_address %} -

Un-Ignore E-Mail Address

+{% block helpdesk_body %} +

{% trans "Un-Ignore E-Mail Address" %}

-

Are you sure you wish to stop removing this email address ({{ email_address }}) and allow their e-mails to automatically create tickets in your system? You can re-add this e-mail address at any time.

-{% endblocktrans %} +

{% blocktrans with ignore.email_address as email_address %}Are you sure you wish to stop removing this email address ({{ email_address }}) and allow their e-mails to automatically create tickets in your system? You can re-add this e-mail address at any time.{% endblocktrans %}

{% trans "Keep Ignoring It" %}

diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html index 3cf00b03..d991f0f4 100644 --- a/helpdesk/templates/helpdesk/public_homepage.html +++ b/helpdesk/templates/helpdesk/public_homepage.html @@ -25,7 +25,7 @@

{% trans "Submit a Ticket" %}

-

{% trans "All fields are required. Please provide as descriptive a title and description as possible." %}

+

{% trans "All fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}

diff --git a/helpdesk/templates/helpdesk/public_spam.html b/helpdesk/templates/helpdesk/public_spam.html index ed05434c..0a83fb53 100644 --- a/helpdesk/templates/helpdesk/public_spam.html +++ b/helpdesk/templates/helpdesk/public_spam.html @@ -2,12 +2,7 @@ {% block helpdesk_body %}

{% trans "Unable To Open Ticket" %}

- -{% blocktrans %}

Sorry, but there has been an error trying to submit your ticket.

- -

Our system has marked your submission as spam, so we are unable to save it. If this is not spam, please press back and re-type your message. Be careful to avoid sounding 'spammy', and if you have heaps of links please try removing them if possible.

- -

We are sorry for any inconvenience, however this check is required to avoid our helpdesk resources being overloaded by spammers.

-{% endblocktrans %} - -{% endblock %} +

{% trans "Sorry, but there has been an error trying to submit your ticket." %}

+

{% blocktrans %}Our system has marked your submission as spam, so we are unable to save it. If this is not spam, please press back and re-type your message. Be careful to avoid sounding 'spammy', and if you have heaps of links please try removing them if possible.{% endblocktrans %}

+

{% blocktrans %}We are sorry for any inconvenience, however this check is required to avoid our helpdesk resources being overloaded by spammers.{% endblocktrans %}

+{% endblock helpdesk_body %} diff --git a/helpdesk/templates/helpdesk/system_settings.html b/helpdesk/templates/helpdesk/system_settings.html index f2c2c1cb..bead3bdb 100644 --- a/helpdesk/templates/helpdesk/system_settings.html +++ b/helpdesk/templates/helpdesk/system_settings.html @@ -2,10 +2,10 @@ {% block helpdesk_title %}{% trans "Change System Settings" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans %} -

System Settings

+{% block helpdesk_body %} +

{% trans "System Settings" %}

-

The following items can be maintained by you or other superusers:

{% endblocktrans %} +

{% blocktrans %}The following items can be maintained by you or other superusers:{% endblocktrans %}

  • {% trans "E-Mail Ignore list" %}
    • diff --git a/helpdesk/templates/helpdesk/user_settings.html b/helpdesk/templates/helpdesk/user_settings.html index 843cae55..50424995 100644 --- a/helpdesk/templates/helpdesk/user_settings.html +++ b/helpdesk/templates/helpdesk/user_settings.html @@ -3,11 +3,9 @@ {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %} {% block helpdesk_body %} -{% blocktrans %} -

    User Settings

    +

    {% trans "User Settings" %}

    -

    Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.

    -{% endblocktrans %} +

    {% blocktrans %}Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.{% endblocktrans %}

    {% csrf_token %} @@ -17,4 +15,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %}