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 8180cebc56f9a0fec0d8a168d5af902195927408..278d8fcaa7a6dc7cf0535a8d539f763f0f2d882d 100644 (file)
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 98838d7061ab4e8382f2bb9a6fe845b1b6669297..460de6c39f4a4f9e4952a79068788cd4acf03eeb 100644 (file)
--- 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 5c4953295582c6b6107480a60ce457af8ec7e71b..abda5760d9b7a44660bc5f96b74970054aa35f0f 100644 (file)
--- 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 246e09f293841aed37c5f3371ea51ed4c6dbcfcc..e62854546e518c2e5bb0bc1afedd82604b674c3d 100644 (file)
--- 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',),