From 514f37bcb89dfc2c2043fbd5a34cfb2e0cfabe1a Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Sat, 4 Sep 2010 06:57:28 +0000 Subject: [PATCH] Fix issue #145: syntax errors in translation commands in deletion templates. Thanks to william88 for the bug report. --- CHANGELOG | 2 + locale/de/LC_MESSAGES/django.po | 98 ++++++++++++------- locale/en/LC_MESSAGES/django.po | 49 +++++----- locale/ru/LC_MESSAGES/django.po | 98 ++++++++++++------- .../helpdesk/confirm_delete_saved_query.html | 6 +- templates/helpdesk/delete_ticket.html | 6 +- templates/helpdesk/email_ignore_del.html | 6 +- templates/helpdesk/ticket_cc_del.html | 6 +- 8 files changed, 161 insertions(+), 110 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 941da04d..e42063fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -58,3 +58,5 @@ pagination issues. Thanks to Walter Doekes for the patches. 'litchfield4' for the patch. 2010-09-04 r159 Error when updating multiple tickets. Issue #135. + +2010-09-04 r160 Fix translation blocks in deletion templates. Some translation strings will need to be updated. diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 85f0875f..645ccb29 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: jutda-helpdesk svn revision 148\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-20 07:46+0000\n" +"POT-Creation-Date: 2010-09-04 06:55+0000\n" "PO-Revision-Date: 2010-01-18 22:28+0100\n" "Last-Translator: Gregor Geiermann \n" "Language-Team: German Language \n" @@ -830,40 +830,40 @@ msgstr "" msgid "Ticket escalated after %s days" msgstr "Ticket nach %s Tagen eskaliert" -#: management/commands/get_email.py:148 +#: management/commands/get_email.py:147 msgid "Created from e-mail" msgstr "Aus E-mail erstellt" -#: management/commands/get_email.py:152 +#: management/commands/get_email.py:151 msgid "Unknown Sender" msgstr "Unbekannter Absender" -#: management/commands/get_email.py:204 +#: management/commands/get_email.py:203 msgid "" "No plain-text email body available. Please see attachment email_html_body." "html." msgstr "" "E-mail nicht als einfacher Text verfügbar. Siehe Anhang email_html_body.html." -#: management/commands/get_email.py:208 +#: management/commands/get_email.py:207 msgid "email_html_body.html" msgstr "email_html_body.html" -#: management/commands/get_email.py:285 +#: management/commands/get_email.py:284 #, fuzzy msgid " (Reopened" msgstr "Wieder geöffnet" -#: management/commands/get_email.py:287 +#: management/commands/get_email.py:286 msgid " (Updated)" msgstr "Aktualisiert" -#: management/commands/get_email.py:309 +#: management/commands/get_email.py:308 #, python-format msgid "E-Mail Received from %(sender_email)s" msgstr "E-mail empfangen von %(sender_email)s" -#: management/commands/get_email.py:317 +#: management/commands/get_email.py:316 #, python-format msgid "Ticket Re-Opened by E-Mail Received from %(sender_email)s" msgstr "Ticket wiede geöffnet durch empfangene E-mail von %(sender_email)s" @@ -981,16 +981,13 @@ msgstr "" #: templates/helpdesk/confirm_delete_saved_query.html:15 #: templates/helpdesk/delete_ticket.html:11 -msgid "" -"

No, Don't Delete It

\n" -"\n" -"
\n" +msgid "No, Don't Delete It" +msgstr "" + +#: templates/helpdesk/confirm_delete_saved_query.html:17 +#: templates/helpdesk/delete_ticket.html:13 +msgid "Yes - Delete It" msgstr "" -"

Nein, nicht löschen

\n" -"\n" -"
\n" #: templates/helpdesk/create_ticket.html:3 msgid "Create Ticket" @@ -1159,16 +1156,12 @@ msgstr "" "System zu erstellen? Sie können sie jederzeit wieder hinzufügen.

\n" #: templates/helpdesk/email_ignore_del.html:11 -msgid "" -"

Keep Ignoring It

\n" -"\n" -"
\n" +msgid "Keep Ignoring It" +msgstr "" + +#: templates/helpdesk/email_ignore_del.html:13 +msgid "Stop Ignoring It" msgstr "" -"

Weiter ignorieren

\n" -"\n" -"
\n" #: templates/helpdesk/email_ignore_list.html:3 #: templates/helpdesk/email_ignore_list.html:12 @@ -1750,16 +1743,14 @@ msgstr "" "Aktualisierungsbenachrichtigungen mehr erhalten.

\n" #: templates/helpdesk/ticket_cc_del.html:11 -msgid "" -"

Don't Delete

\n" -"\n" -"
\n" -msgstr "" -"

Nicht löschen

\n" -"\n" -"\n" +#, fuzzy +msgid "Don't Delete" +msgstr "Löschen" + +#: templates/helpdesk/ticket_cc_del.html:13 +#, fuzzy +msgid "Yes, Delete" +msgstr "Löschen" #: templates/helpdesk/ticket_cc_list.html:3 msgid "Ticket CC Settings" @@ -2091,3 +2082,36 @@ msgstr "Ticket wieder freigegeben" #: views/staff.py:675 msgid "Ticket placed on hold" msgstr "Ticket zurückgehalten" + +#~ msgid "" +#~ "

No, Don't Delete It

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Nein, nicht löschen

\n" +#~ "\n" +#~ "
\n" + +#~ msgid "" +#~ "

Keep Ignoring It

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Weiter ignorieren

\n" +#~ "\n" +#~ "
\n" + +#~ msgid "" +#~ "

Don't Delete

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Nicht löschen

\n" +#~ "\n" +#~ "
\n" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index caf229f4..9c12c219 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-20 07:46+0000\n" +"POT-Creation-Date: 2010-09-04 06:55+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -749,38 +749,38 @@ msgstr "" msgid "Ticket escalated after %s days" msgstr "" -#: management/commands/get_email.py:148 +#: management/commands/get_email.py:147 msgid "Created from e-mail" msgstr "" -#: management/commands/get_email.py:152 +#: management/commands/get_email.py:151 msgid "Unknown Sender" msgstr "" -#: management/commands/get_email.py:204 +#: management/commands/get_email.py:203 msgid "" "No plain-text email body available. Please see attachment email_html_body." "html." msgstr "" -#: management/commands/get_email.py:208 +#: management/commands/get_email.py:207 msgid "email_html_body.html" msgstr "" -#: management/commands/get_email.py:285 +#: management/commands/get_email.py:284 msgid " (Reopened" msgstr "" -#: management/commands/get_email.py:287 +#: management/commands/get_email.py:286 msgid " (Updated)" msgstr "" -#: management/commands/get_email.py:309 +#: management/commands/get_email.py:308 #, python-format msgid "E-Mail Received from %(sender_email)s" msgstr "" -#: management/commands/get_email.py:317 +#: management/commands/get_email.py:316 #, python-format msgid "Ticket Re-Opened by E-Mail Received from %(sender_email)s" msgstr "" @@ -887,11 +887,12 @@ msgstr "" #: templates/helpdesk/confirm_delete_saved_query.html:15 #: templates/helpdesk/delete_ticket.html:11 -msgid "" -"

No, Don't Delete It

\n" -"\n" -"
\n" +msgid "No, Don't Delete It" +msgstr "" + +#: templates/helpdesk/confirm_delete_saved_query.html:17 +#: templates/helpdesk/delete_ticket.html:13 +msgid "Yes - Delete It" msgstr "" #: templates/helpdesk/create_ticket.html:3 @@ -1028,11 +1029,11 @@ msgid "" msgstr "" #: templates/helpdesk/email_ignore_del.html:11 -msgid "" -"

Keep Ignoring It

\n" -"\n" -"
\n" +msgid "Keep Ignoring It" +msgstr "" + +#: templates/helpdesk/email_ignore_del.html:13 +msgid "Stop Ignoring It" msgstr "" #: templates/helpdesk/email_ignore_list.html:3 @@ -1523,11 +1524,11 @@ msgid "" msgstr "" #: templates/helpdesk/ticket_cc_del.html:11 -msgid "" -"

Don't Delete

\n" -"\n" -"
\n" +msgid "Don't Delete" +msgstr "" + +#: templates/helpdesk/ticket_cc_del.html:13 +msgid "Yes, Delete" msgstr "" #: templates/helpdesk/ticket_cc_list.html:3 diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index b5024188..31d73a45 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: jutda-helpdesk svn revision 143\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-20 07:46+0000\n" +"POT-Creation-Date: 2010-09-04 06:55+0000\n" "PO-Revision-Date: 2009-10-15 00:01+0300\n" "Last-Translator: Alexander Yakovlev \n" "Language-Team: Russian Language \n" @@ -822,39 +822,39 @@ msgstr "" msgid "Ticket escalated after %s days" msgstr "Талон поднят после %s дней" -#: management/commands/get_email.py:148 +#: management/commands/get_email.py:147 msgid "Created from e-mail" msgstr "Созданый из электронной почты" -#: management/commands/get_email.py:152 +#: management/commands/get_email.py:151 msgid "Unknown Sender" msgstr "Неизвестный Отправитель" -#: management/commands/get_email.py:204 +#: management/commands/get_email.py:203 msgid "" "No plain-text email body available. Please see attachment email_html_body." "html." msgstr "" -#: management/commands/get_email.py:208 +#: management/commands/get_email.py:207 msgid "email_html_body.html" msgstr "" -#: management/commands/get_email.py:285 +#: management/commands/get_email.py:284 #, fuzzy msgid " (Reopened" msgstr "Переоткрытый" -#: management/commands/get_email.py:287 +#: management/commands/get_email.py:286 msgid " (Updated)" msgstr "(Обновлено)" -#: management/commands/get_email.py:309 +#: management/commands/get_email.py:308 #, python-format msgid "E-Mail Received from %(sender_email)s" msgstr "Электронное послание полученное от %(sender_email)s" -#: management/commands/get_email.py:317 +#: management/commands/get_email.py:316 #, fuzzy, python-format msgid "Ticket Re-Opened by E-Mail Received from %(sender_email)s" msgstr "Электронное послание полученное от %(sender_email)s" @@ -972,16 +972,13 @@ msgstr "" #: templates/helpdesk/confirm_delete_saved_query.html:15 #: templates/helpdesk/delete_ticket.html:11 -msgid "" -"

No, Don't Delete It

\n" -"\n" -"\n" +msgid "No, Don't Delete It" +msgstr "" + +#: templates/helpdesk/confirm_delete_saved_query.html:17 +#: templates/helpdesk/delete_ticket.html:13 +msgid "Yes - Delete It" msgstr "" -"

Нет, Не Удалять

\n" -"\n" -"
\n" #: templates/helpdesk/create_ticket.html:3 msgid "Create Ticket" @@ -1145,16 +1142,12 @@ msgstr "" "mail в список.\n" #: templates/helpdesk/email_ignore_del.html:11 -msgid "" -"

Keep Ignoring It

\n" -"\n" -"
\n" +msgid "Keep Ignoring It" +msgstr "" + +#: templates/helpdesk/email_ignore_del.html:13 +msgid "Stop Ignoring It" msgstr "" -"

Продолжить игнорировать

\n" -"\n" -"
\n" #: templates/helpdesk/email_ignore_list.html:3 #: templates/helpdesk/email_ignore_list.html:12 @@ -1723,16 +1716,13 @@ msgstr "" #: templates/helpdesk/ticket_cc_del.html:11 #, fuzzy -msgid "" -"

Don't Delete

\n" -"\n" -"
\n" -msgstr "" -"

Нет, Не Удалять

\n" -"\n" -"
\n" +msgid "Don't Delete" +msgstr "Удалить" + +#: templates/helpdesk/ticket_cc_del.html:13 +#, fuzzy +msgid "Yes, Delete" +msgstr "Удалить" #: templates/helpdesk/ticket_cc_list.html:3 #, fuzzy @@ -2056,6 +2046,40 @@ msgstr "Удержание талона снято" msgid "Ticket placed on hold" msgstr "Талон удерживается" +#~ msgid "" +#~ "

No, Don't Delete It

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Нет, Не Удалять

\n" +#~ "\n" +#~ "
\n" + +#~ msgid "" +#~ "

Keep Ignoring It

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Продолжить игнорировать

\n" +#~ "\n" +#~ "
\n" + +#, fuzzy +#~ msgid "" +#~ "

Don't Delete

\n" +#~ "\n" +#~ "
\n" +#~ msgstr "" +#~ "

Нет, Не Удалять

\n" +#~ "\n" +#~ "
\n" + #~ msgid "" #~ "Changed %(change.field)s from %(change.old_value)s to %(change.new_value)" #~ "s." diff --git a/templates/helpdesk/confirm_delete_saved_query.html b/templates/helpdesk/confirm_delete_saved_query.html index f2da0e9a..ffd33d5b 100644 --- a/templates/helpdesk/confirm_delete_saved_query.html +++ b/templates/helpdesk/confirm_delete_saved_query.html @@ -12,7 +12,7 @@

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 %} -{% blocktrans %}

No, Don't Delete It

+

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

-
{% csrf_token %}
-{% endblocktrans %}{% endblock %} +
{% csrf_token %}
+{% endblock %} diff --git a/templates/helpdesk/delete_ticket.html b/templates/helpdesk/delete_ticket.html index a854d59f..9b3ccd34 100644 --- a/templates/helpdesk/delete_ticket.html +++ b/templates/helpdesk/delete_ticket.html @@ -8,7 +8,7 @@

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 %}

No, Don't Delete It

+

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

-
{% csrf_token %}
-{% endblocktrans %}{% endblock %} +
{% csrf_token %}
+{% endblock %} diff --git a/templates/helpdesk/email_ignore_del.html b/templates/helpdesk/email_ignore_del.html index 61484dc9..2bb15e50 100644 --- a/templates/helpdesk/email_ignore_del.html +++ b/templates/helpdesk/email_ignore_del.html @@ -8,7 +8,7 @@

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 %}

Keep Ignoring It

+

{% trans "Keep Ignoring It" %}

-
{% csrf_token %}
-{% endblocktrans %}{% endblock %} +
{% csrf_token %}
+{% endblock %} diff --git a/templates/helpdesk/ticket_cc_del.html b/templates/helpdesk/ticket_cc_del.html index 56965822..85cfc322 100644 --- a/templates/helpdesk/ticket_cc_del.html +++ b/templates/helpdesk/ticket_cc_del.html @@ -8,7 +8,7 @@

Are you sure you wish to delete this email address ({{ email_address }}) from the CC list for this ticket? They will stop receiving updates.

{% endblocktrans %} -{% blocktrans %}

Don't Delete

+

{% trans "Don't Delete" %}

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