Merge branch 'master' of github.com:denismerigoux/seum-counter

README.md

 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

 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"
 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 ""
 
 "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"
 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 ""
 
 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

 "sera ton identité seumesque !"
 
 #: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
+#: 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"
 
 "Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton "
 "mot de passe."
 
-#~ msgid "name"
-#~ msgstr "nom"
-
-#~ msgid "email"
-#~ msgstr "email"
-
-#~ msgid "trigram"
-#~ msgstr "trigramme"
-
-#~ msgid "associated user"
-#~ msgstr "utilisateur associé"
-
-#~ msgid "email notifications"
-#~ msgstr "notifications par email"
-
-#~ msgid "sort by SeumScore"
-#~ msgstr "trier par SeumScore"
-
-#~ msgid "%(trigram)s (%(name)s)"
-#~ msgstr "%(trigram)s (%(name)s)"
-
-#~ msgid "counter"
-#~ msgstr "compteur"
-
-#~ msgid "datetime"
-#~ msgstr "date et heure"
-
-#~ msgid "reason"
-#~ msgstr "raison"
-
-#~ msgid "victim"
-#~ msgstr "victime"
-
-#~ msgid "seum giver"
-#~ msgstr "fouteur de seum"
-
-#~ msgid "%(counter)s: %(datetime)s (%(reason)s)"
-#~ msgstr "%(counter)s : %(datetime)s (%(reason)s)"
-
-#~ msgid "reset"
-#~ msgstr "remise à zéro"
-
-#~ msgid "resets"
-#~ msgstr "remises à zéro"
-
-#~ msgid "liker"
-#~ msgstr "likeur"
-
-#~ msgid "seum"
-#~ msgstr "seum"
-
-#~ msgid "like"
-#~ msgstr "like"
-
-#~ msgid "likes"
-#~ msgstr "likes"
-
-#~ msgid "%(liker)s likes %(reset)s"
-#~ msgstr "%(liker)s aime %(reset)s"
-
-#~ msgid "keyword"
-#~ msgstr "mot-clé"
-
-#~ msgid "keywords"
-#~ msgstr "mots-clés"
-
-#~ msgid "hashtag"
-#~ msgstr "hashtag"
-
-#~ msgid "hashtags"
-#~ msgstr "hashtags"
-
-#~ msgid "%(keyword)s for %(who)s"
-#~ msgstr "%(keyword)s pour %(who)s"
-
-#~ 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 :"
-
-#~ 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."
-
-#~ 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"
-
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
-#~ msgid "From %(who)s: %(reason)s"
-#~ msgstr "De %(who)s : %(reason)s"
-
-#~ msgid "%(counter)s: %(reason)s"
-#~ msgstr "%(counter)s : %(reason)s"
-
-#~ msgid "%(who)s to %(counter)s: %(reason)s"
-#~ msgstr "%(who)s pour %(counter)s : %(reason)s"
-
-#~ msgid "Seum"
-#~ msgstr "Seum"
-
-#~ msgid "24h ago"
-#~ msgstr "il y a 24h"
-
-#~ msgid "Now"
-#~ msgstr "Présent"
-
-#~ msgid "Number of seums"
-#~ msgstr "Nombre de seums"
-
-#~ msgid "Month"
-#~ msgstr "Mois"
-
-#~ msgid "Number of given likes"
-#~ msgstr "Nombre de likes distribués"
-
-#~ msgid "Hashtag"
-#~ msgstr "Hashtag"
-
-#~ msgid "Number of seums containing the hashtag"
-#~ msgstr "Nombre de seums contenant le hashtag"
-
-#~ msgid "Number of received likes"
-#~ msgstr "Nombre de likes reçus"
-
-#~ msgid "Passwords do not match."
-#~ msgstr "Les mots de passe sont différents."
-
-#~ msgid "A user with this email address already exists."
-#~ 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."
+#: 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 :"
 
-#~ msgid "English"
-#~ msgstr "Anglais"
+#: 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."
 
-#~ msgid "French"
-#~ msgstr "Français"
+#: 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"
+
+#: counter/views/counter.py:41
+msgid "unknown"
+msgstr "inconnu"
+
+#: counter/views/counter.py:81
+#, python-format
+msgid "From %(who)s: %(reason)s"
+msgstr "De %(who)s : %(reason)s"
+
+#: counter/views/home.py:158
+#, python-format
+msgid "%(counter)s: %(reason)s"
+msgstr "%(counter)s : %(reason)s"
+
+#: 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:164
+msgid "Seum"
+msgstr "Seum"
+
+#: counter/views/home.py:181
+msgid "24h ago"
+msgstr "il y a 24h"
+
+#: counter/views/home.py:182
+msgid "Now"
+msgstr "Présent"
+
+#: 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:225 counter/views/home.py:231
+msgid "Month"
+msgstr "Mois"
+
+#: 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:263 counter/views/home.py:269
+msgid "Hashtag"
+msgstr "Hashtag"
+
+#: 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:282 counter/views/home.py:287
+msgid "Number of received likes"
+msgstr "Nombre de likes reçus"
+
+#: counter/views/user.py:22
+msgid "Passwords do not match."
+msgstr "Les mots de passe sont différents."
+
+#: counter/views/user.py:27
+msgid "A user with this email address already exists."
+msgstr "Un utilisateur avec cette adresse email existe déjà."
+
+#: counter/views/user.py:33
+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:109
+msgid "English"
+msgstr "Anglais"
+
+#: seum/settings.py:110
+msgid "French"
+msgstr "Français"