From 9f90ac80a03b99119b2da30662a5fef614300386 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 18 Jan 2017 10:00:42 +0100 Subject: [PATCH] Workaround to fix #378 See https://github.com/zyegfryed/django-statici18n/pull/29 for real fix --- src/Makefile | 1 + src/pretix/base/management/commands/rebuild.py | 1 + src/pretix/base/views/js_catalog.py | 6 ++---- src/pretix/locale/de/LC_MESSAGES/djangojs.po | 2 +- src/setup.py | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 508958b16..c23ec4792 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,6 +16,7 @@ compress: jsi18n: localecompile ./manage.py compilejsi18n + ./manage.py compilejsi18n -l de-informal test: py.test tests diff --git a/src/pretix/base/management/commands/rebuild.py b/src/pretix/base/management/commands/rebuild.py index 4a13aacc0..d664a22f9 100644 --- a/src/pretix/base/management/commands/rebuild.py +++ b/src/pretix/base/management/commands/rebuild.py @@ -11,5 +11,6 @@ class Command(BaseCommand): periodic_task.send(self) call_command('compilemessages', verbosity=1, interactive=False) call_command('compilejsi18n', verbosity=1, interactive=False) + call_command('compilejsi18n', locale='de-informal', verbosity=1, interactive=False) call_command('collectstatic', verbosity=1, interactive=False) call_command('compress', verbosity=1, interactive=False) diff --git a/src/pretix/base/views/js_catalog.py b/src/pretix/base/views/js_catalog.py index be5b6f1c0..b2f475a66 100644 --- a/src/pretix/base/views/js_catalog.py +++ b/src/pretix/base/views/js_catalog.py @@ -1,9 +1,7 @@ from django.utils import timezone from django.views.decorators.cache import cache_page from django.views.decorators.http import etag -from django.views.i18n import ( - get_javascript_catalog, render_javascript_catalog, to_locale, -) +from django.views.i18n import get_javascript_catalog, render_javascript_catalog # Yes, we want to regenerate this every time the module has been imported to # refresh the cache at least at every code deployment @@ -21,5 +19,5 @@ js_info_dict = { @cache_page(3600, key_prefix='js18n-%s' % import_date) def js_catalog(request, lang): packages = ['pretix'] - catalog, plural = get_javascript_catalog(to_locale(lang), 'djangojs', packages) + catalog, plural = get_javascript_catalog(lang, 'djangojs', packages) return render_javascript_catalog(catalog, plural) diff --git a/src/pretix/locale/de/LC_MESSAGES/djangojs.po b/src/pretix/locale/de/LC_MESSAGES/djangojs.po index 3c54c5e74..528dd14eb 100644 --- a/src/pretix/locale/de/LC_MESSAGES/djangojs.po +++ b/src/pretix/locale/de/LC_MESSAGES/djangojs.po @@ -92,7 +92,7 @@ msgstr "Ein Fehler ist aufgetreten. Fehlercode: {code}" #: pretix/static/pretixpresale/js/ui/asyncdownload.js:53 #: pretix/static/pretixpresale/js/ui/asynctask.js:103 msgid "We are processing your request …" -msgstr "Wir verarbeiten deine Anfrage …" +msgstr "Wir verarbeiten Ihre Anfrage …" #: pretix/static/pretixpresale/js/ui/asyncdownload.js:54 #: pretix/static/pretixpresale/js/ui/asynctask.js:104 diff --git a/src/setup.py b/src/setup.py index aa8fda48a..7953175ce 100644 --- a/src/setup.py +++ b/src/setup.py @@ -30,6 +30,7 @@ class CustomBuild(build): management.call_command('compilemessages', verbosity=1, interactive=False) management.call_command('compilejsi18n', verbosity=1, interactive=False) + management.call_command('compilejsi18n', locale='de-informal', verbosity=1, interactive=False) management.call_command('collectstatic', verbosity=1, interactive=False) management.call_command('compress', verbosity=1, interactive=False) build.run(self)