Fix default settings for i18n

README.md

@@ -11,6 +11,11 @@ Then copy and paste the settings file template located in folder `seum`:
 cd seum && cp settings.py.default settings.py
 ```
 
+In order to use correctly the internationalisation, compile the locale files:
+```
+python manage.py compilemessages
+```
+
 ## Running the server
 
 ### Developement

locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-22 14:19+0100\n"
+"POT-Creation-Date: 2017-01-22 18:05+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"
@@ -221,9 +221,9 @@ msgid ""
 msgstr ""
 
 #: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
-#: counter/views/home.py:203 counter/views/home.py:209
-#: counter/views/home.py:247 counter/views/home.py:253
-#: counter/views/home.py:285 counter/views/home.py:291
+#: counter/views/home.py:200 counter/views/home.py:206
+#: counter/views/home.py:244 counter/views/home.py:250
+#: counter/views/home.py:282 counter/views/home.py:288
 msgid "Trigram"
 msgstr ""
 
@@ -490,17 +490,17 @@ msgid ""
 "password."
 msgstr ""
 
-#: counter/templates/resetEmail.txt:3
+#: counter/templates/resetEmail.txt:2
 msgid ""
 "You have lost your password and you've got the seum. You have to follow this "
 "link (or copy-paste it in your browser) to reinitialise it:"
 msgstr ""
 
-#: counter/templates/resetEmail.txt:7
+#: counter/templates/resetEmail.txt:6
 msgid "Your login is {{ user.username }} in case you have forgotten it too."
 msgstr ""
 
-#: counter/templates/resetEmail.txt:18
+#: counter/templates/resetEmail.txt:11
 msgid ""
 "P.S.: If you don't want to receive these mails anymore, contact us at denis."
 "merigoux@gmail.com"
@@ -515,50 +515,50 @@ msgstr ""
 msgid "From %(who)s: %(reason)s"
 msgstr ""
 
-#: counter/views/home.py:161
+#: counter/views/home.py:158
 #, python-format
 msgid "%(counter)s: %(reason)s"
 msgstr ""
 
-#: counter/views/home.py:163
+#: counter/views/home.py:160
 #, python-format
 msgid "%(who)s to %(counter)s: %(reason)s"
 msgstr ""
 
-#: counter/views/home.py:167
+#: counter/views/home.py:164
 msgid "Seum"
 msgstr ""
 
-#: counter/views/home.py:184
+#: counter/views/home.py:181
 msgid "24h ago"
 msgstr ""
 
-#: counter/views/home.py:185
+#: counter/views/home.py:182
 msgid "Now"
 msgstr ""
 
-#: counter/views/home.py:203 counter/views/home.py:208
-#: counter/views/home.py:228 counter/views/home.py:233
+#: counter/views/home.py:200 counter/views/home.py:205
+#: counter/views/home.py:225 counter/views/home.py:230
 msgid "Number of seums"
 msgstr ""
 
-#: counter/views/home.py:228 counter/views/home.py:234
+#: counter/views/home.py:225 counter/views/home.py:231
 msgid "Month"
 msgstr ""
 
-#: counter/views/home.py:247 counter/views/home.py:252
+#: counter/views/home.py:244 counter/views/home.py:249
 msgid "Number of given likes"
 msgstr ""
 
-#: counter/views/home.py:266 counter/views/home.py:272
+#: counter/views/home.py:263 counter/views/home.py:269
 msgid "Hashtag"
 msgstr ""
 
-#: counter/views/home.py:266 counter/views/home.py:271
+#: counter/views/home.py:263 counter/views/home.py:268
 msgid "Number of seums containing the hashtag"
 msgstr ""
 
-#: counter/views/home.py:285 counter/views/home.py:290
+#: counter/views/home.py:282 counter/views/home.py:287
 msgid "Number of received likes"
 msgstr ""
 
@@ -574,10 +574,10 @@ msgstr ""
 msgid "Use another email address, another user has already this login."
 msgstr ""
 
-#: seum/settings.py:111
+#: seum/settings.py:109
 msgid "English"
 msgstr ""
 
-#: seum/settings.py:112
+#: seum/settings.py:110
 msgid "French"
 msgstr ""

locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-22 14:19+0100\n"
+"POT-Creation-Date: 2017-01-22 18:05+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"
@@ -229,9 +229,9 @@ msgstr ""
 "sera ton identité seumesque !"
 
 #: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
-#: counter/views/home.py:203 counter/views/home.py:209
-#: counter/views/home.py:247 counter/views/home.py:253
-#: counter/views/home.py:285 counter/views/home.py:291
+#: counter/views/home.py:200 counter/views/home.py:206
+#: counter/views/home.py:244 counter/views/home.py:250
+#: counter/views/home.py:282 counter/views/home.py:288
 msgid "Trigram"
 msgstr "Trigramme"
 
@@ -509,23 +509,27 @@ msgstr ""
 "Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton "
 "mot de passe."
 
-#: counter/templates/resetEmail.txt:3
+#: counter/templates/resetEmail.txt:2
 msgid ""
 "You have lost your password and you've got the seum. You have to follow this "
 "link (or copy-paste it in your browser) to reinitialise it:"
 msgstr ""
-"T'as perdu ton mot de passe et t'as le seum. "
-"Il te reste plus qu'à suivre le lien pour le réinitialiser :"
+"T'as perdu ton mot de passe et t'as le seum. Il te reste plus qu'à suivre le "
+"lien pour le réinitialiser :"
 
-#: counter/templates/resetEmail.txt:7
+#: counter/templates/resetEmail.txt:6
 msgid "Your login is {{ user.username }} in case you have forgotten it too."
-msgstr "Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié aussi."
+msgstr ""
+"Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié "
+"aussi."
 
-#: counter/templates/resetEmail.txt:18
+#: counter/templates/resetEmail.txt:11
 msgid ""
 "P.S.: If you don't want to receive these mails anymore, contact us at denis."
 "merigoux@gmail.com"
-msgstr "P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis.merigoux@gmail.com"
+msgstr ""
+"P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis."
+"merigoux@gmail.com"
 
 #: counter/views/counter.py:41
 msgid "unknown"
@@ -536,50 +540,50 @@ msgstr "inconnu"
 msgid "From %(who)s: %(reason)s"
 msgstr "De %(who)s : %(reason)s"
 
-#: counter/views/home.py:161
+#: counter/views/home.py:158
 #, python-format
 msgid "%(counter)s: %(reason)s"
 msgstr "%(counter)s : %(reason)s"
 
-#: counter/views/home.py:163
+#: counter/views/home.py:160
 #, python-format
 msgid "%(who)s to %(counter)s: %(reason)s"
 msgstr "%(who)s pour %(counter)s : %(reason)s"
 
-#: counter/views/home.py:167
+#: counter/views/home.py:164
 msgid "Seum"
 msgstr "Seum"
 
-#: counter/views/home.py:184
+#: counter/views/home.py:181
 msgid "24h ago"
 msgstr "il y a 24h"
 
-#: counter/views/home.py:185
+#: counter/views/home.py:182
 msgid "Now"
 msgstr "Présent"
 
-#: counter/views/home.py:203 counter/views/home.py:208
-#: counter/views/home.py:228 counter/views/home.py:233
+#: counter/views/home.py:200 counter/views/home.py:205
+#: counter/views/home.py:225 counter/views/home.py:230
 msgid "Number of seums"
 msgstr "Nombre de seums"
 
-#: counter/views/home.py:228 counter/views/home.py:234
+#: counter/views/home.py:225 counter/views/home.py:231
 msgid "Month"
 msgstr "Mois"
 
-#: counter/views/home.py:247 counter/views/home.py:252
+#: counter/views/home.py:244 counter/views/home.py:249
 msgid "Number of given likes"
 msgstr "Nombre de likes distribués"
 
-#: counter/views/home.py:266 counter/views/home.py:272
+#: counter/views/home.py:263 counter/views/home.py:269
 msgid "Hashtag"
 msgstr "Hashtag"
 
-#: counter/views/home.py:266 counter/views/home.py:271
+#: counter/views/home.py:263 counter/views/home.py:268
 msgid "Number of seums containing the hashtag"
 msgstr "Nombre de seums contenant le hashtag"
 
-#: counter/views/home.py:285 counter/views/home.py:290
+#: counter/views/home.py:282 counter/views/home.py:287
 msgid "Number of received likes"
 msgstr "Nombre de likes reçus"
 
@@ -595,10 +599,10 @@ msgstr "Un utilisateur avec cette adresse email existe déjà."
 msgid "Use another email address, another user has already this login."
 msgstr "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
 
-#: seum/settings.py:111
+#: seum/settings.py:109
 msgid "English"
 msgstr "Anglais"
 
-#: seum/settings.py:112
+#: seum/settings.py:110
 msgid "French"
 msgstr "Français"

seum/settings.py.default

@@ -105,6 +105,10 @@ LANGUAGES = [
     ('fr', _('French')),
 ]
 
+LOCALE_PATHS = [
+    os.path.join(BASE_DIR, 'locale'),
+]
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/