Fix issue #145: syntax errors in translation commands in deletion templates. Thanks to william88 for the bug report.

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.

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 <public@openinformation.org>\n"
 "Language-Team: German Language <DE@li.org>\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 ""
+msgid "No, Don't Delete It"
-"<p><a href='../'>No, Don't Delete It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Yes - Delete "
+#: templates/helpdesk/confirm_delete_saved_query.html:17
-"It' /></form>\n"
+#: templates/helpdesk/delete_ticket.html:13
+msgid "Yes - Delete It"
 msgstr ""
-"<p><a href='../'>Nein, nicht löschen</a></p>\n"
-"\n"
-"<form method='post' action='./'><input type='submit' value='ja, löschen'/></"
-"form>\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.</p>\n"
 
 #: templates/helpdesk/email_ignore_del.html:11
-msgid ""
+msgid "Keep Ignoring It"
-"<p><a href='../../'>Keep Ignoring It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Stop Ignoring "
+#: templates/helpdesk/email_ignore_del.html:13
-"It' /></form>\n"
+msgid "Stop Ignoring It"
 msgstr ""
-"<p><a href='../../'>Weiter ignorieren</a></p>\n"
-"\n"
-"<form method='post' action='./'><input type='submit' value='Wieder "
-"berücksichtigen' /></form>\n"
 
 #: templates/helpdesk/email_ignore_list.html:3
 #: templates/helpdesk/email_ignore_list.html:12
@@ -1750,16 +1743,14 @@ msgstr ""
 "Aktualisierungsbenachrichtigungen mehr erhalten.</p>\n"
 
 #: templates/helpdesk/ticket_cc_del.html:11
-msgid ""
+#, fuzzy
-"<p><a href='../../'>Don't Delete</a></p>\n"
+msgid "Don't Delete"
-"\n"
+msgstr "Löschen"
-"<form method='post' action='./'><input type='submit' value='Yes, Delete' /></"
+
-"form>\n"
+#: templates/helpdesk/ticket_cc_del.html:13
-msgstr ""
+#, fuzzy
-"<p><a href='../../'>Nicht löschen</a></p>\n"
+msgid "Yes, Delete"
-"\n"
+msgstr "Löschen"
-"<form method='post' action='./'><input type='submit' value='Ja, löschen' /></"
-"form>\n"
 
 #: 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 ""
+#~ "<p><a href='../'>No, Don't Delete It</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Yes - Delete "
+#~ "It' /></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../'>Nein, nicht löschen</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='ja, löschen'/"
+#~ "></form>\n"
+
+#~ msgid ""
+#~ "<p><a href='../../'>Keep Ignoring It</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Stop Ignoring "
+#~ "It' /></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../../'>Weiter ignorieren</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Wieder "
+#~ "berücksichtigen' /></form>\n"
+
+#~ msgid ""
+#~ "<p><a href='../../'>Don't Delete</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Yes, Delete' /"
+#~ "></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../../'>Nicht löschen</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Ja, löschen' /"
+#~ "></form>\n"

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
+msgid "No, Don't Delete It"
-"<p><a href='../'>No, Don't Delete It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Yes - Delete "
+#: templates/helpdesk/confirm_delete_saved_query.html:17
-"It' /></form>\n"
+#: 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 ""
+msgid "Keep Ignoring It"
-"<p><a href='../../'>Keep Ignoring It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Stop Ignoring "
+#: templates/helpdesk/email_ignore_del.html:13
-"It' /></form>\n"
+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 ""
+msgid "Don't Delete"
-"<p><a href='../../'>Don't Delete</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Yes, Delete' /></"
+#: templates/helpdesk/ticket_cc_del.html:13
-"form>\n"
+msgid "Yes, Delete"
 msgstr ""
 
 #: templates/helpdesk/ticket_cc_list.html:3

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 <ayakovlev@rambler.ru>\n"
 "Language-Team: Russian Language <RU@li.org>\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 ""
+msgid "No, Don't Delete It"
-"<p><a href='../'>No, Don't Delete It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Yes - Delete "
+#: templates/helpdesk/confirm_delete_saved_query.html:17
-"It' /></form>\n"
+#: templates/helpdesk/delete_ticket.html:13
+msgid "Yes - Delete It"
 msgstr ""
-"<p><a href='../'>Нет, Не Удалять</a></p>\n"
-"\n"
-"<form method='post' action='./'><input type='submit' value='Да - Удалить' /"
-"></form>\n"
 
 #: templates/helpdesk/create_ticket.html:3
 msgid "Create Ticket"
@@ -1145,16 +1142,12 @@ msgstr ""
 "mail в список.<?p>\n"
 
 #: templates/helpdesk/email_ignore_del.html:11
-msgid ""
+msgid "Keep Ignoring It"
-"<p><a href='../../'>Keep Ignoring It</a></p>\n"
+msgstr ""
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Stop Ignoring "
+#: templates/helpdesk/email_ignore_del.html:13
-"It' /></form>\n"
+msgid "Stop Ignoring It"
 msgstr ""
-"<p><a href='../'>Продолжить игнорировать</a></p>\n"
-"\n"
-"<form method='post' action='./'><input type='submit' value='Перестать "
-"игнорировать' /></form>\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 ""
+msgid "Don't Delete"
-"<p><a href='../../'>Don't Delete</a></p>\n"
+msgstr "Удалить"
-"\n"
+
-"<form method='post' action='./'><input type='submit' value='Yes, Delete' /></"
+#: templates/helpdesk/ticket_cc_del.html:13
-"form>\n"
+#, fuzzy
-msgstr ""
+msgid "Yes, Delete"
-"<p><a href='../'>Нет, Не Удалять</a></p>\n"
+msgstr "Удалить"
-"\n"
-"<form method='post' action='./'><input type='submit' value='Да - Удалить' /"
-"></form>\n"
 
 #: templates/helpdesk/ticket_cc_list.html:3
 #, fuzzy
@@ -2056,6 +2046,40 @@ msgstr "Удержание талона снято"
 msgid "Ticket placed on hold"
 msgstr "Талон удерживается"
 
+#~ msgid ""
+#~ "<p><a href='../'>No, Don't Delete It</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Yes - Delete "
+#~ "It' /></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../'>Нет, Не Удалять</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Да - "
+#~ "Удалить' /></form>\n"
+
+#~ msgid ""
+#~ "<p><a href='../../'>Keep Ignoring It</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Stop Ignoring "
+#~ "It' /></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../'>Продолжить игнорировать</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Перестать "
+#~ "игнорировать' /></form>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><a href='../../'>Don't Delete</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Yes, Delete' /"
+#~ "></form>\n"
+#~ msgstr ""
+#~ "<p><a href='../'>Нет, Не Удалять</a></p>\n"
+#~ "\n"
+#~ "<form method='post' action='./'><input type='submit' value='Да - "
+#~ "Удалить' /></form>\n"
+
 #~ msgid ""
 #~ "Changed %(change.field)s from %(change.old_value)s to %(change.new_value)"
 #~ "s."

templates/helpdesk/confirm_delete_saved_query.html

@@ -12,7 +12,7 @@
 <p>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.</p>
 {% endblocktrans %}{% endif %}
 
-{% blocktrans %}<p><a href='../'>No, Don't Delete It</a></p>
+<p><a href='../'>{% trans "No, Don't Delete It" %}</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes - Delete It' />{% csrf_token %}</form>
+<form method='post' action='./'><input type='submit' value='{% trans "Yes - Delete It" %}' />{% csrf_token %}</form>
-{% endblocktrans %}{% endblock %}
+{% endblock %}

templates/helpdesk/delete_ticket.html

@@ -8,7 +8,7 @@
 <p>Are you sure you want to delete this ticket (<em>{{ ticket_title }}</em>)? All traces of the ticket, including followups, attachments, and updates will be irreversably removed.</p>
 {% endblocktrans %}
 
-{% blocktrans %}<p><a href='../'>No, Don't Delete It</a></p>
+<p><a href='../'>{% trans "No, Don't Delete It" %}</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes - Delete It' />{% csrf_token %}</form>
+<form method='post' action='./'><input type='submit' value='{% trans "Yes - Delete It" %}' />{% csrf_token %}</form>
-{% endblocktrans %}{% endblock %}
+{% endblock %}

templates/helpdesk/email_ignore_del.html

@@ -8,7 +8,7 @@
 <p>Are you sure you wish to stop removing this email address (<em>{{ email_address }}</em>) and allow their e-mails to automatically create tickets in your system? You can re-add this e-mail address at any time.</p>
 {% endblocktrans %}
 
-{% blocktrans %}<p><a href='../../'>Keep Ignoring It</a></p>
+<p><a href='../../'>{% trans "Keep Ignoring It" %}</a></p>
 
-<form method='post' action='./'><input type='submit' value='Stop Ignoring It' />{% csrf_token %}</form>
+<form method='post' action='./'><input type='submit' value='{% trans "Stop Ignoring It" %}' />{% csrf_token %}</form>
-{% endblocktrans %}{% endblock %}
+{% endblock %}

templates/helpdesk/ticket_cc_del.html

@@ -8,7 +8,7 @@
 <p>Are you sure you wish to delete this email address (<em>{{ email_address }}</em>) from the CC list for this ticket? They will stop receiving updates.</p>
 {% endblocktrans %}
 
-{% blocktrans %}<p><a href='../../'>Don't Delete</a></p>
+<p><a href='../../'>{% trans "Don't Delete" %}</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes, Delete' />{% csrf_token %}</form>
+<form method='post' action='./'><input type='submit' value='{% trans "Yes, Delete" %}' />{% csrf_token %}</form>
-{% endblocktrans %}{% endblock %}
+{% endblock %}