Fixing bugs tied to internationalization

counter/migrations/0008_auto_20170122_1732.py

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-22 17:32
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('counter', '0007_auto_20170113_1603'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='counter',
+            options={'verbose_name': 'counter'},
+        ),
+        migrations.AlterModelOptions(
+            name='hashtag',
+            options={'verbose_name': 'hashtag', 'verbose_name_plural': 'hashtags'},
+        ),
+        migrations.AlterModelOptions(
+            name='keyword',
+            options={'verbose_name': 'keyword', 'verbose_name_plural': 'keywords'},
+        ),
+        migrations.AlterModelOptions(
+            name='reset',
+            options={'verbose_name': 'reset', 'verbose_name_plural': 'resets'},
+        ),
+        migrations.AlterField(
+            model_name='counter',
+            name='email_notifications',
+            field=models.BooleanField(default=False, verbose_name='email notifications'),
+        ),
+        migrations.AlterField(
+            model_name='counter',
+            name='name',
+            field=models.CharField(max_length=60, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='counter',
+            name='sort_by_score',
+            field=models.BooleanField(default=True, verbose_name='sort by SeumScore'),
+        ),
+        migrations.AlterField(
+            model_name='counter',
+            name='trigramme',
+            field=models.CharField(max_length=3, verbose_name='trigram'),
+        ),
+        migrations.AlterField(
+            model_name='counter',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='associated user'),
+        ),
+        migrations.AlterField(
+            model_name='hashtag',
+            name='keyword',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hashtags', to='counter.Keyword', verbose_name='hashtag'),
+        ),
+        migrations.AlterField(
+            model_name='hashtag',
+            name='reset',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hashtags', to='counter.Reset', verbose_name='reset'),
+        ),
+        migrations.AlterField(
+            model_name='like',
+            name='liker',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='likes', to='counter.Counter', verbose_name='liker'),
+        ),
+        migrations.AlterField(
+            model_name='like',
+            name='reset',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='likes', to='counter.Reset', verbose_name='seum'),
+        ),
+        migrations.AlterField(
+            model_name='like',
+            name='timestamp',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='datetime'),
+        ),
+        migrations.AlterField(
+            model_name='reset',
+            name='counter',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='resets', to='counter.Counter', verbose_name='victim'),
+        ),
+        migrations.AlterField(
+            model_name='reset',
+            name='reason',
+            field=models.TextField(verbose_name='reason'),
+        ),
+        migrations.AlterField(
+            model_name='reset',
+            name='timestamp',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='datetime'),
+        ),
+        migrations.AlterField(
+            model_name='reset',
+            name='who',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='who', to='counter.Counter', verbose_name='seum giver'),
+        ),
+    ]

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 13:09-0500\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"
@@ -18,110 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: counter/models.py:12
-msgid "name"
-msgstr "nom"
-
-#: counter/models.py:13
-msgid "email"
-msgstr "email"
-
-#: counter/models.py:14
-msgid "trigram"
-msgstr "trigramme"
-
-#: counter/models.py:15
-msgid "associated user"
-msgstr "utilisateur associé"
-
-#: counter/models.py:16
-msgid "email notifications"
-msgstr "notifications par email"
-
-#: counter/models.py:17
-msgid "sort by SeumScore"
-msgstr "trier par SeumScore"
-
-#: counter/models.py:20
-#, python-format
-msgid "%(trigram)s (%(name)s)"
-msgstr "%(trigram)s (%(name)s)"
-
-#: counter/models.py:23
-msgid "counter"
-msgstr "compteur"
-
-#: counter/models.py:27 counter/models.py:55
-msgid "datetime"
-msgstr "date et heure"
-
-#: counter/models.py:28
-msgid "reason"
-msgstr "raison"
-
-#: counter/models.py:29
-msgid "victim"
-msgstr "victime"
-
-#: counter/models.py:30
-msgid "seum giver"
-msgstr "fouteur de seum"
-
-#: counter/models.py:34
-#, python-format
-msgid "%(counter)s: %(datetime)s (%(reason)s)"
-msgstr "%(counter)s : %(datetime)s (%(reason)s)"
-
-#: counter/models.py:48 counter/models.py:79
-msgid "reset"
-msgstr "remise à zéro"
-
-#: counter/models.py:49
-msgid "resets"
-msgstr "remises à zéro"
-
-#: counter/models.py:53
-msgid "liker"
-msgstr "likeur"
-
-#: counter/models.py:54
-msgid "seum"
-msgstr "seum"
-
-#: counter/models.py:58
-msgid "like"
-msgstr "like"
-
-#: counter/models.py:59
-msgid "likes"
-msgstr "likes"
-
-#: counter/models.py:63
-#, python-format
-msgid "%(liker)s likes %(reset)s"
-msgstr "%(liker)s aime %(reset)s"
-
-#: counter/models.py:70
-msgid "keyword"
-msgstr "mot-clé"
-
-#: counter/models.py:71
-msgid "keywords"
-msgstr "mots-clés"
-
-#: counter/models.py:78 counter/models.py:82
-msgid "hashtag"
-msgstr "hashtag"
-
-#: counter/models.py:83
-msgid "hashtags"
-msgstr "hashtags"
-
-#: counter/models.py:86
-#, python-format
-msgid "%(keyword)s for %(who)s"
-msgstr "%(keyword)s pour %(who)s"
-
 #: counter/templates/counterTemplate.html:47
 #: counter/templates/homeTemplate.html:32
 #: counter/templates/homeTemplate.html:134
@@ -229,9 +125,6 @@ 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
 msgid "Trigram"
 msgstr "Trigramme"
 
@@ -509,96 +402,151 @@ msgstr ""
 "Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton "
 "mot de passe."
 
-#: counter/templates/resetEmail.txt:3
-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 "name"
+#~ msgstr "nom"
 
-#: counter/templates/resetEmail.txt:7
-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 "email"
+#~ msgstr "email"
 
-#: counter/templates/resetEmail.txt:18
-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:161
-#, python-format
-msgid "%(counter)s: %(reason)s"
-msgstr "%(counter)s : %(reason)s"
-
-#: counter/views/home.py:163
-#, python-format
-msgid "%(who)s to %(counter)s: %(reason)s"
-msgstr "%(who)s pour %(counter)s : %(reason)s"
-
-#: counter/views/home.py:167
-msgid "Seum"
-msgstr "Seum"
-
-#: counter/views/home.py:184
-msgid "24h ago"
-msgstr "il y a 24h"
-
-#: counter/views/home.py:185
-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
-msgid "Number of seums"
-msgstr "Nombre de seums"
-
-#: counter/views/home.py:228 counter/views/home.py:234
-msgid "Month"
-msgstr "Mois"
-
-#: counter/views/home.py:247 counter/views/home.py:252
-msgid "Number of given likes"
-msgstr "Nombre de likes distribués"
-
-#: counter/views/home.py:266 counter/views/home.py:272
-msgid "Hashtag"
-msgstr "Hashtag"
-
-#: counter/views/home.py:266 counter/views/home.py:271
-msgid "Number of seums containing the hashtag"
-msgstr "Nombre de seums contenant le hashtag"
-
-#: counter/views/home.py:285 counter/views/home.py:290
-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:111
-msgid "English"
-msgstr "Anglais"
-
-#: seum/settings.py:112
-msgid "French"
-msgstr "Français"
+#~ 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."
+
+#~ msgid "English"
+#~ msgstr "Anglais"
+
+#~ 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/

seum/urls.py

@@ -19,14 +19,14 @@ from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.views.generic.base import RedirectView
 
-urlpatterns = [url(r'^i18n/', include('django.conf.urls.i18n'), name='set_language'), ]
+urlpatterns = [
+    url(r'^i18n/', include('django.conf.urls.i18n'), name='set_language'),]
 
-urlpatterns += i18n_patterns(
+urlpatterns += [
     url(r'^admin/', admin.site.urls),
-
     url(r'^favicon\.ico$', RedirectView.as_view(url='/static/favicon.ico')),
     url(r'^robots\.txt$', RedirectView.as_view(url='/static/robots.txt')),
-)
+]
 
 if settings.DEBUG:
     import debug_toolbar
@@ -34,4 +34,6 @@ if settings.DEBUG:
         url(r'^__debug__/', include(debug_toolbar.urls)),
     )
 
-urlpatterns += i18n_patterns(url(r'^', include('counter.urls')), )
+urlpatterns += i18n_patterns(
+    url(r'^', include('counter.urls')),
+)