From e28a0824681b628aca8969d698607b3a2c6c6e74 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 12:23:27 +0200
Subject: [PATCH] no unicode for slugify (brakes trans), update locales

---
 app/locale/fr/LC_MESSAGES/django.mo | Bin 2943 -> 3052 bytes
 app/locale/fr/LC_MESSAGES/django.po |   6 +++---
 app/sandbox/local_settings.py       |   5 ++++-
 app/sandbox/settings.py             |   1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index 8180cebc56f9a0fec0d8a168d5af902195927408..278d8fcaa7a6dc7cf0535a8d539f763f0f2d882d 100644
GIT binary patch
delta 1294
zcmYk+OGs2v9LMqh*fgb6sgpXXWs_<7$lhbM2*O3^M(9nu9GJ|h92qC02<|3=sGtxb
za1{|Wi$HNx5g55CdJrKLMG_=M5!EIt3hev4bA%4}e?RA(d(XN5bMD-ksrVB0rXs;1
zqii9T5|aV54!k&r6J;c5wh%{gK91u&eCT}ce1(Pdzrz@Q#t??*=Ep^_ly)_)#1`Zh
z&vsGK!2Qlc`3si9BKp&~2v0lDV=?Wks6=kM{t;B7<IbnfH>gBDq2~FHN@NC0c)pc#
zRX5af(!`Cfy$yBa4qT4AaWQ7F2G3yxZ=e=%8?{3Zki#BxQi3l~*I%O+G>tslzF~;x
z+Yc&ih5dB~7^RhjP&byL6036kO{fXCy6bJuc4P|c#1yY_A1dMdWTnI=oo|s#_5nRj
z^p#2&f8i<&(zyVe(SH!93fgVB2@j$sxP(e@$T{r#uc3A(hf4e&YWx#aLhq5oeipL-
zT4{iNDaT^efO^yfapbUe*WQD=?=Y6(8Pr5qT>mgCu~B#Z4lben4E5lTxD5YbHCBe%
ze+`JUd=_upQSF_s-HF_52V6UW9CnnGcIYH(%g>@-;RRIUmr*-&9ZN8W`tjXGE%*^?
z+)Iy&Zk$3rcp7<ie$i*5Y;~h1QN{(tW}=Z;M`(;n6`=%X3)A@XwxAZKAFN7c9{+V{
zVcvR9`tJ2!R}jihTc#2vnh9;Swz-wi>hx92mRc%$B`R8>ie6!zU(0X1{#%*|eMQ<e
zmDL1)F|D@2Z{|<>@u|d!jjB-A5Di4V8kDs}eC$N9uAsrXGTEN~Y`-OX(%qS^z9XkB
saV*^(>r1OMIgsql`scA*p}oPu-$gaiiQK?Mt~YsHSN^LHmWNaS0FTFXcK`qY

delta 1178
zcmXxjPe@cj9Ki8$-B#Ca&8&8FtIf1O_TMZDqDw(UhY}Co47vm%2nIoRT8Y5uR4h{D
zC5j*@uo6L{TZg*TrAv0OLnmV|9`X<i_5H5%hWC4)_vX!;`OVCGwc@`*WvMeg9VjP=
z?Zk(s5H8?IGbhSKI)psl##Wrd7JLwW9DRye>R)0vzQYWDL*M&>8}S$R;veLwgsydK
zFP5Wy$b&F|ZFmaX@mzEWH*kLyO=LXQPoRlTMW>_B(L~;&{Vbq~e8LXK4~wzEZ?xl;
zc;CcZHf+V6Si((s8q0VYJ8=x1`6N2i`)Fd-SU-bK<OMphH_>^_Gk$o_1!IQKXaZk-
zfJ<n{wfKBBT1SqMVw6#~D~l#}lhIA!Ui2ZF$P=`mXPCp+xEB|&vYv~du|W+B+^^zs
z%=4BVoJAA77#)oD!{`cJK@%TG-=9PidW0O|6(=V&k6Z8~+I}(1`rE-W6)sU7y>H>h
zh9%sL{m7$mKGqMSiCv4&$8an6chG@na0kxfHvEFNUq<E@R-%8~SbwfVGwb4mc64cr
z=w6l4gnH2xIEfv22K|^Wp)(sn-y22S-9QJth3rt{JMs^6tQ4__I7ImUg(7i)umfj(
zj4+v`_$Tfsx(T<di|8Z#T@Mm|oNkvh-%T)PqnOAM!WGy@n7E~XjmFvW8#8r3dI)D_
z<}SPcX;R!*i`(Fe_y?4T!^AFPfUx*sCB-eUxI%7EQjR7UA<WIDds5Z!nc`eMGnB3l
L=L*%kx$FM{T7p$K

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',),
-- 
2.39.5