From: Guillaume Pellerin Date: Wed, 13 Apr 2016 10:23:27 +0000 (+0200) Subject: no unicode for slugify (brakes trans), update locales X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e28a0824681b628aca8969d698607b3a2c6c6e74;p=mezzo.git no unicode for slugify (brakes trans), update locales --- diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo index 8180cebc..278d8fca 100644 Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po index 98838d70..460de6c3 100644 --- a/app/locale/fr/LC_MESSAGES/django.po +++ b/app/locale/fr/LC_MESSAGES/django.po @@ -80,11 +80,11 @@ msgstr "" #: festival/models.py:79 festival/models.py:212 msgid "events" -msgstr "" +msgstr "événements" #: festival/models.py:84 msgid "artist" -msgstr "" +msgstr "artiste" #: festival/models.py:129 msgid "media id" @@ -104,7 +104,7 @@ msgstr "" #: festival/models.py:167 festival/models.py:183 festival/models.py:202 msgid "event" -msgstr "" +msgstr "événement" #: festival/models.py:170 msgid "audio" diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py index 5c495329..abda5760 100644 --- a/app/sandbox/local_settings.py +++ b/app/sandbox/local_settings.py @@ -85,7 +85,8 @@ ADMIN_MENU_ORDER = ( (_("Site"), ("sites.Site", "redirects.Redirect", "conf.Setting")), (_("Users"), ("auth.User", "auth.Group",)), (_("Festival"), ("mezzanine_agenda.EventLocation", - "mezzanine_agenda.EventCategory", "festival.PageCategory")), + "mezzanine_agenda.EventCategory", "festival.PageCategory", + "festival.EventPrice")), ) SEARCH_MODEL_CHOICES = () @@ -104,3 +105,5 @@ EVENT_SHOP_URL = 'http://eve.ircam.fr/manifeste.php/manifestation/' EVENT_PASS_URL = 'http://eve.ircam.fr/manifeste.php/pass/' TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js" + +SLUGIFY = 'django.template.defaultfilters.slugify' diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py index 246e09f2..e6285454 100644 --- a/app/sandbox/settings.py +++ b/app/sandbox/settings.py @@ -237,7 +237,6 @@ MODELTRANSLATION_TRANSLATION_FILES = ( 'translations', ) - TEMPLATES = [{'APP_DIRS': True, 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': ('/srv/app/templates',),