Skip to content

Commit

Permalink
handle translation string that is embedded in livesettings
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeGermuska committed Apr 24, 2013
1 parent 68990fa commit cd24449
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 16 deletions.
Binary file modified locale/de/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 11 additions & 7 deletions locale/de/LC_MESSAGES/django.po
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PANDA Project (server-side)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-22 19:53+0000\n"
"POT-Creation-Date: 2013-04-24 16:13+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -199,6 +199,10 @@ msgstr "Wichtige Daten [Kontext: Kalenderdaten?]"
msgid "Add %s"
msgstr "%s hinzufügen"

#: panda/config.py:6 templates/livesettings/site_settings.html:55
msgid "Site settings"
msgstr "Seiten-Einstellungen"

#: panda/tasks/export_csv.py:43
msgid "Preparing to export"
msgstr "Export wird vorbereitet"
Expand Down Expand Up @@ -318,7 +322,7 @@ msgstr "Abbrechen"

#: panda/templates/admin/panda/taskstatus/change_form.html:43
#: panda/templates/admin/panda/userproxy/add_form.html:44
#: templates/livesettings/site_settings.html:65
#: templates/livesettings/site_settings.html:68
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Bitte korrigieren Sie den unten stehenden Fehler."
Expand Down Expand Up @@ -711,25 +715,25 @@ msgstr "Abmelden"
msgid "Edit Site Settings"
msgstr "Seiten-Einstellungen bearbeiten"

#: templates/livesettings/site_settings.html:58
#: templates/livesettings/site_settings.html:61
msgid "Livesettings are disabled for this site."
msgstr "Live-Einstellungen [?] sind für diese Seite deaktiviert."

#: templates/livesettings/site_settings.html:59
#: templates/livesettings/site_settings.html:62
msgid "All configuration options must be edited in the site settings.py file"
msgstr ""
"Alle Konfigurations-Optionen müssen in der Datei settings.py dieser Seite "
"bearbeitet werden."

#: templates/livesettings/site_settings.html:81
#: templates/livesettings/site_settings.html:84
#, python-format
msgid "Group settings: %(name)s"
msgstr "Gruppen-Einstellungen: %(name)s"

#: templates/livesettings/site_settings.html:108
#: templates/livesettings/site_settings.html:111
msgid "Update Settings"
msgstr "Einstellungen aktualisieren"

#: templates/livesettings/site_settings.html:114
#: templates/livesettings/site_settings.html:117
msgid "You don't have permission to edit values."
msgstr "Sie haben nicht die Berechtigung, Werte zu bearbeiten."
Binary file modified locale/de/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion locale/de/LC_MESSAGES/djangojs.po
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PANDA Project (client-side)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-22 19:53+0000\n"
"POT-Creation-Date: 2013-04-24 16:13+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
Binary file modified locale/es/LC_MESSAGES/django.mo
Binary file not shown.
19 changes: 12 additions & 7 deletions locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-22 19:53+0000\n"
"POT-Creation-Date: 2013-04-24 16:13+0000\n"
"Content-Type: text/plain; charset=UTF-8\n"

#: client/templates/dashboard.html:5
Expand Down Expand Up @@ -191,6 +191,11 @@ msgstr "Fechas importantes"
msgid "Add %s"
msgstr "Añadir %s"

#: panda/config.py:6 templates/livesettings/site_settings.html:55
#, fuzzy
msgid "Site settings"
msgstr "Editar configuración"

#: panda/tasks/export_csv.py:43
msgid "Preparing to export"
msgstr "Preparando para exportar"
Expand Down Expand Up @@ -310,7 +315,7 @@ msgstr "Abortar"

#: panda/templates/admin/panda/taskstatus/change_form.html:43
#: panda/templates/admin/panda/userproxy/add_form.html:44
#: templates/livesettings/site_settings.html:65
#: templates/livesettings/site_settings.html:68
#, fuzzy
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
Expand Down Expand Up @@ -702,25 +707,25 @@ msgstr "Salir"
msgid "Edit Site Settings"
msgstr "Editar configuración"

#: templates/livesettings/site_settings.html:58
#: templates/livesettings/site_settings.html:61
msgid "Livesettings are disabled for this site."
msgstr "Los ajustes en vivo están desabilitados en éste sitio"

#: templates/livesettings/site_settings.html:59
#: templates/livesettings/site_settings.html:62
msgid "All configuration options must be edited in the site settings.py file"
msgstr ""
"Todas las opciones de configuración deben ser editadas en el fichero "
"settings.py del sitio"

#: templates/livesettings/site_settings.html:81
#: templates/livesettings/site_settings.html:84
#, python-format
msgid "Group settings: %(name)s"
msgstr "Ajustes de grupo: %(name)s"

#: templates/livesettings/site_settings.html:108
#: templates/livesettings/site_settings.html:111
msgid "Update Settings"
msgstr "Actualizar configuración"

#: templates/livesettings/site_settings.html:114
#: templates/livesettings/site_settings.html:117
msgid "You don't have permission to edit values."
msgstr "No tienes permiso para editar valores"
Binary file modified locale/es/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion locale/es/LC_MESSAGES/djangojs.po
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-22 19:53+0000\n"
"POT-Creation-Date: 2013-04-24 16:13+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"
Expand Down
3 changes: 3 additions & 0 deletions templates/livesettings/site_settings.html
Expand Up @@ -51,6 +51,9 @@
{% trans "Edit Site Settings" %}
</div>
{% endif %}{% endblock %}
<!-- 'title' value set dynamically by livesettings library. using this commented string to seed the text for makemessages {% trans 'Site settings' %} -->
{% block content_title %}<h1></h1>{% if title %}<h1>{% trans title %}</h1>{% endif %}{% endblock %}

{% block content %}
<span style="clear: both;"></span>
<div id="content-main">
Expand Down

0 comments on commit cd24449

Please sign in to comment.