Merge pull request #14 from denismerigoux/multi-seum

Allow multi-seum from Telegram bot

.gitignore

 python3/
 seum/settings.py
 seum.json
+environment.yaml

bot/models.py

     telegram_user_id = models.BigIntegerField(_('telegram_user_id'), unique=True)
 
     class Meta:
+        app_label = 'bot'
         verbose_name = _('telegram_user')
         verbose_name_plural = _('telegram_users')
 
     verif_key = models.TextField(_('verify_key'), unique=True)
 
     class Meta:
+        app_label = 'bot'
         verbose_name = _('telegram_user_check')
         verbose_name_plural = _('telegram_user_checks')
 
     telegram_chat_id = models.BigIntegerField(_('telegram_chat_id'))
 
     class Meta:
+        app_label = 'bot'
         verbose_name = _('telegram_user_chat')
         verbose_name_plural = _('telegram_user_chats')
         unique_together = ('telegram_user_id', 'telegram_chat_id')
     notify_only_members = models.BooleanField(_('notify_only_members'))
 
     class Meta:
+        app_label = 'bot'
         verbose_name = _('telegram_chat')
         verbose_name_plural = _('telegram_chats')
 

bot/views/telegram.py

             # it's a /seum cmd
             m = re.sub(seum_cmd, r"\3", text)
             maybe_counter = m.split(' ')[0]
-            try:
-                yes_counter = Counter.objects.get(trigramme=maybe_counter)
+            # allow multiple seums: /seum ABC+DEF Message
+            counters = [maybe_counter[i:i+3] for i in range(0, len(maybe_counter), 4)]
+            yes_counters = Counter.objects.filter(trigramme__in=counters)
+            seums_to_throw = []
+            user_counter = telegram_user.counter
+            if len(yes_counters):
                 seum_message = ' '.join(m.split(' ')[1:])
-            except Counter.DoesNotExist:
-                yes_counter = telegram_user.counter
-                seum_message = m
+                for counter in yes_counters:
+                    seums_to_throw.append((user_counter, counter, seum_message))
+                # for non existing trigrams, we throw the seum to the seum giver
+                for not_a_counter in set(counters) - set([c.trigramme for c in yes_counters]):
+                    seums_to_throw.append((user_counter, user_counter,
+                                           f"Trigramme {not_a_counter} qui n'existe pas du seum"))
+            else:
+                seums_to_throw.append((user_counter, user_counter, m))
 
-            perform_reset(telegram_user.counter, yes_counter, seum_message)
+            for (who, counter, message) in seums_to_throw:
+                perform_reset(who, counter, message)
     except TelegramUser.DoesNotExist:
         print('in that case we send a link to the user')
         if chat['type'] == 'private' and chat['id'] == telegram_user_id:

counter/migrations/0009_auto_20200413_0902.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2020-04-13 09:02
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('counter', '0008_auto_20170122_1732'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='counter',
+            name='trigramme',
+            field=models.CharField(max_length=3, validators=[django.core.validators.RegexValidator(regex='^\\S{3}$')], verbose_name='trigram'),
+        ),
+    ]

counter/models.py

 from datetime import datetime
 
 from django.contrib.auth.models import User
+from django.core.validators import RegexValidator
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language
 
 class Counter(models.Model):
     name = models.CharField(_('name'), max_length=60)
     email = models.EmailField(_('email'), max_length=264, default='null@localhost')
-    trigramme = models.CharField(_('trigram'), max_length=3)
+    trigramme = models.CharField(
+        _('trigram'),
+        max_length=3,
+        validators=[RegexValidator(regex='^\S{3}$', message=_('Trigram must be 3 characters long.'))]
+    )
     user = models.ForeignKey(User, blank=True, null=True, verbose_name=_('associated user'))
     email_notifications = models.BooleanField(_('email notifications'), default=False)
     sort_by_score = models.BooleanField(_('sort by SeumScore'), default=True)
     class Meta:
         verbose_name = _('counter')
 
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        super(Counter, self).save(*args, **kwargs)
+
 
 class Reset(models.Model):
     timestamp = models.DateTimeField(_('datetime'), auto_now_add=True)

counter/templates/createUser.html

                             {% trans "Email notifications" %}
                         </label>
                     </div>
-                    <p>{% trans "Other users will see your nickname and your trigram only, it will be your seum identity!" %}</p>
+                    <p>
+                        {% trans "Other users will see your nickname and your trigram only, it will be your seum identity!" %}
+                        {% trans "This trigram must be 3 characters long exactly." %}
+                    </p>
                     <div class="form-group">
                         <label for="id_trigramme">{% trans "Trigram" %}</label>
-                        <input id="id_trigramme" maxlength="3" type="text" class="form-control text-uppercase" name="trigramme" onkeyup="this.value=this.value.toUpperCase();" required />
+                        <input id="id_trigramme" minlength="3" maxlength="3" type="text" class="form-control text-uppercase" name="trigramme" onkeyup="this.value=this.value.toUpperCase();" required />
                     </div>
                     <div class="form-group">
                         <label for="id_nick">{% trans "Nick" %}</label>

counter/views/user.py

         password2 = data['password2'][0]
         email_notifications = 'email_notifications' in data.keys()
 
+        if len(trigramme) != 3:
+            error = _("Trigram must be 3 characters long.")
+            return render(request, 'createUser.html', {'error': error})
+
         if password1 != password2:
             error = _("Passwords do not match.")
             return render(request, 'createUser.html', {'error': error})

locale/en/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-23 15:08+0000\n"
+"POT-Creation-Date: 2020-04-13 09:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: counter/models.py:12
-msgid "name"
+#: bot/models.py:12 counter/models.py:28
+msgid "counter"
+msgstr ""
+
+#: bot/models.py:13 bot/models.py:30 bot/models.py:43
+msgid "telegram_user_id"
+msgstr ""
+
+#: bot/models.py:17
+msgid "telegram_user"
+msgstr ""
+
+#: bot/models.py:18
+msgid "telegram_users"
+msgstr ""
+
+#: bot/models.py:21
+#, python-format
+msgid "%(counter)s is %(telegram_user_id)d"
+msgstr ""
+
+#: bot/models.py:31
+msgid "verify_key"
+msgstr ""
+
+#: bot/models.py:35
+msgid "telegram_user_check"
+msgstr ""
+
+#: bot/models.py:36
+msgid "telegram_user_checks"
+msgstr ""
+
+#: bot/models.py:39
+#, python-format
+msgid "%(telegram_user_id)d has verif key %(verif_key)s"
+msgstr ""
+
+#: bot/models.py:44 bot/models.py:57
+msgid "telegram_chat_id"
+msgstr ""
+
+#: bot/models.py:48
+msgid "telegram_user_chat"
+msgstr ""
+
+#: bot/models.py:49
+msgid "telegram_user_chats"
+msgstr ""
+
+#: bot/models.py:53
+#, python-format
+msgid "%(telegram_user_id)d is in the chat %(telegram_chat)d"
+msgstr ""
+
+#: bot/models.py:61
+msgid "notify_only_members"
+msgstr ""
+
+#: bot/models.py:65
+msgid "telegram_chat"
+msgstr ""
+
+#: bot/models.py:66
+msgid "telegram_chats"
+msgstr ""
+
+#: bot/models.py:69
+#, python-format
+msgid ""
+"%(chat_id)d is a telegram chat, with option notify_only_members to "
+"%(notify_only_members)s"
 msgstr ""
 
 #: counter/models.py:13
-msgid "email"
+msgid "name"
 msgstr ""
 
 #: counter/models.py:14
+msgid "email"
+msgstr ""
+
+#: counter/models.py:16
 msgid "trigram"
 msgstr ""
 
-#: counter/models.py:15
+#: counter/models.py:18 counter/views/user.py:22
+msgid "Trigram must be 3 characters long."
+msgstr ""
+
+#: counter/models.py:20
 msgid "associated user"
 msgstr ""
 
-#: counter/models.py:16
+#: counter/models.py:21
 msgid "email notifications"
 msgstr ""
 
-#: counter/models.py:17
+#: counter/models.py:22
 msgid "sort by SeumScore"
 msgstr ""
 
-#: counter/models.py:20
+#: counter/models.py:25
 #, python-format
 msgid "%(trigram)s (%(name)s)"
 msgstr ""
 
-#: counter/models.py:23
-msgid "counter"
-msgstr ""
-
-#: counter/models.py:27 counter/models.py:55
+#: counter/models.py:36 counter/models.py:64
 msgid "datetime"
 msgstr ""
 
-#: counter/models.py:28
+#: counter/models.py:37
 msgid "reason"
 msgstr ""
 
-#: counter/models.py:29
+#: counter/models.py:38
 msgid "victim"
 msgstr ""
 
-#: counter/models.py:30
+#: counter/models.py:39
 msgid "seum giver"
 msgstr ""
 
-#: counter/models.py:34
+#: counter/models.py:43
 #, python-format
 msgid "%(counter)s: %(datetime)s (%(reason)s)"
 msgstr ""
 
-#: counter/models.py:48 counter/models.py:79
+#: counter/models.py:57 counter/models.py:88
 msgid "reset"
 msgstr ""
 
-#: counter/models.py:49
+#: counter/models.py:58
 msgid "resets"
 msgstr ""
 
-#: counter/models.py:53
+#: counter/models.py:62
 msgid "liker"
 msgstr ""
 
-#: counter/models.py:54
+#: counter/models.py:63
 msgid "seum"
 msgstr ""
 
-#: counter/models.py:58
+#: counter/models.py:67
 msgid "like"
 msgstr ""
 
-#: counter/models.py:59
+#: counter/models.py:68
 msgid "likes"
 msgstr ""
 
-#: counter/models.py:63
+#: counter/models.py:72
 #, python-format
 msgid "%(liker)s likes %(reset)s"
 msgstr ""
 
-#: counter/models.py:70
+#: counter/models.py:79
 msgid "keyword"
 msgstr ""
 
-#: counter/models.py:71
+#: counter/models.py:80
 msgid "keywords"
 msgstr ""
 
-#: counter/models.py:78 counter/models.py:82
+#: counter/models.py:87 counter/models.py:91
 msgid "hashtag"
 msgstr ""
 
-#: counter/models.py:83
+#: counter/models.py:92
 msgid "hashtags"
 msgstr ""
 
-#: counter/models.py:86
+#: counter/models.py:95
 #, python-format
 msgid "%(keyword)s for %(who)s"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:47
-#: counter/templates/homeTemplate.html:32
+#: counter/templates/counterTemplate.html:48
+#: counter/templates/homeTemplate.html:25
 msgid "No seum yet"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:51
-#: counter/templates/homeTemplate.html:138
+#: counter/templates/counterTemplate.html:52
+#: counter/templates/homeTemplate.html:129
 msgid "Got the seum"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:52
-#: counter/templates/homeTemplate.html:139
+#: counter/templates/counterTemplate.html:53
+#: counter/templates/homeTemplate.html:130
 #, python-format
 msgid "Seum thrown by %(trigram)s %(time_ago)s."
 msgstr ""
 
-#: counter/templates/counterTemplate.html:60
-#: counter/templates/homeTemplate.html:45
+#: counter/templates/counterTemplate.html:61
+#: counter/templates/homeTemplate.html:36
 msgid "Reset the counter"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:66
+#: counter/templates/counterTemplate.html:67
 msgid "Motive for the seum:"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:73
-#: counter/templates/homeTemplate.html:89
+#: counter/templates/counterTemplate.html:74
+#: counter/templates/homeTemplate.html:80
 msgid "Throw the seum"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:82
+#: counter/templates/counterTemplate.html:84
 msgid "Timeline of the seum"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:87
+#: counter/templates/counterTemplate.html:89
 msgid "No timeline of the seum yet..."
 msgstr ""
 
-#: counter/templates/counterTemplate.html:101
+#: counter/templates/counterTemplate.html:103
 msgid "Seum history"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:109
+#: counter/templates/counterTemplate.html:111
 #: counter/templates/hashtagTemplate.html:26
 msgid "Date"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:110
+#: counter/templates/counterTemplate.html:112
 #: counter/templates/hashtagTemplate.html:27
-#: counter/templates/homeTemplate.html:82
+#: counter/templates/homeTemplate.html:73
 msgid "Motive"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:111
+#: counter/templates/counterTemplate.html:113
 #: counter/templates/hashtagTemplate.html:29
 msgid "Seum thrower"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:112
+#: counter/templates/counterTemplate.html:114
 #: counter/templates/hashtagTemplate.html:30
 msgid "Number of likes"
 msgstr ""
 
-#: counter/templates/counterTemplate.html:137
+#: counter/templates/counterTemplate.html:139
 #: counter/templates/hashtagTemplate.html:56
 msgid "Back to counters list"
 msgstr ""
 msgid "Email notifications"
 msgstr ""
 
-#: counter/templates/createUser.html:34
+#: counter/templates/createUser.html:35
 msgid ""
 "Other users will see your nickname and your trigram only, it will be your "
 "seum identity!"
 msgstr ""
 
-#: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
+#: counter/templates/createUser.html:36
+msgid "This trigram must be 3 characters long exactly."
+msgstr ""
+
+#: counter/templates/createUser.html:39 counter/templates/homeTemplate.html:67
 #: 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 ""
 
-#: counter/templates/createUser.html:40
+#: counter/templates/createUser.html:43
 msgid "Nick"
 msgstr ""
 
-#: counter/templates/createUser.html:43
+#: counter/templates/createUser.html:46
 msgid ""
 "I could have required 10 characters with one digit, an emoji, three "
 "uppercase letters and two lowercase ones to throw you the seum, but actually "
 "you can choose whatever you want."
 msgstr ""
 
-#: counter/templates/createUser.html:45 counter/templates/login.html:27
+#: counter/templates/createUser.html:48 counter/templates/login.html:27
 msgid "Password"
 msgstr ""
 
-#: counter/templates/createUser.html:49
+#: counter/templates/createUser.html:52
 msgid "Confirm password"
 msgstr ""
 
-#: counter/templates/createUser.html:52
+#: counter/templates/createUser.html:55
 msgid ""
 "If this form has given you the seum, do not forget to reset your counter "
 "once you are logged in!"
 msgstr ""
 
-#: counter/templates/createUser.html:54
+#: counter/templates/createUser.html:57
 msgid "Create the counter"
 msgstr ""
 
-#: counter/templates/createUser.html:64 counter/templates/login.html:43
+#: counter/templates/createUser.html:67 counter/templates/login.html:43
 #: counter/templates/passwordChange.html:45
 #: counter/templates/passwordReset.html:37
 #: counter/templates/passwordResetConfirm.html:42
 msgid "Victim"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:6
+#: counter/templates/homeTemplate.html:1
 msgid "Counters"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:36
+#: counter/templates/homeTemplate.html:28
 msgid "I got the seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:38
+#: counter/templates/homeTemplate.html:30
 msgid "threw me the seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:52
+#: counter/templates/homeTemplate.html:43
 msgid "Motive of the seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:59
+#: counter/templates/homeTemplate.html:50
 msgid "I've got the seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:70
+#: counter/templates/homeTemplate.html:61
 msgid "Break the seum wall"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:134
+#: counter/templates/homeTemplate.html:126
 msgid "Has not got the seum yet"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:154
+#: counter/templates/homeTemplate.html:145
 msgid "Timeline of the 24h of the seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:159
+#: counter/templates/homeTemplate.html:150
 msgid "No seum in the last past 24h..."
 msgstr ""
 
-#: counter/templates/homeTemplate.html:172
+#: counter/templates/homeTemplate.html:161
 msgid "Best seumers"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:177
-#: counter/templates/homeTemplate.html:249
+#: counter/templates/homeTemplate.html:166
+#: counter/templates/homeTemplate.html:230
 msgid "Nobody got the seum..."
 msgstr ""
 
-#: counter/templates/homeTemplate.html:190
+#: counter/templates/homeTemplate.html:177
 msgid "Most liked seumers"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:195
-#: counter/templates/homeTemplate.html:231
+#: counter/templates/homeTemplate.html:182
+#: counter/templates/homeTemplate.html:214
 msgid "Nobody liked..."
 msgstr ""
 
-#: counter/templates/homeTemplate.html:208
+#: counter/templates/homeTemplate.html:193
 msgid "Most popular hashtags"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:213
+#: counter/templates/homeTemplate.html:198
 msgid "Nobody used any hashtag..."
 msgstr ""
 
-#: counter/templates/homeTemplate.html:226
+#: counter/templates/homeTemplate.html:209
 msgid "Best likers of seum"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:244
+#: counter/templates/homeTemplate.html:225
 msgid "Seum activity"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:260
+#: counter/templates/homeTemplate.html:239
 msgid "Logout"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:261
+#: counter/templates/homeTemplate.html:240
 #: counter/templates/passwordChange.html:5
 #: counter/templates/passwordChange.html:35
 #: counter/templates/passwordResetConfirm.html:5
 msgid "Change password"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:264
+#: counter/templates/homeTemplate.html:243
 msgid "Deactivate email notifications"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:266
+#: counter/templates/homeTemplate.html:245
 msgid "Activate email notifications"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:271
+#: counter/templates/homeTemplate.html:250
 msgid "Sort seums by date"
 msgstr ""
 
-#: counter/templates/homeTemplate.html:273
+#: counter/templates/homeTemplate.html:252
 msgid "Sort seums by score"
 msgstr ""
 
 msgid "Number of received likes"
 msgstr ""
 
-#: counter/views/user.py:22
+#: counter/views/user.py:26
 msgid "Passwords do not match."
 msgstr ""
 
-#: counter/views/user.py:27
+#: counter/views/user.py:31
 msgid "A user with this email address already exists."
 msgstr ""
 
-#: counter/views/user.py:33
+#: counter/views/user.py:37
 msgid "Use another email address, another user has already this login."
 msgstr ""
 
-#: seum/settings.py:109
+#: seum/settings.py:105
 msgid "English"
 msgstr ""
 
-#: seum/settings.py:110
+#: seum/settings.py:106
 msgid "French"
 msgstr ""

locale/fr/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-23 15:08+0000\n"
+"POT-Creation-Date: 2020-04-13 09:40+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: counter/models.py:12
+#: bot/models.py:12 counter/models.py:28
+msgid "counter"
+msgstr "Compteur"
+
+#: bot/models.py:13 bot/models.py:30 bot/models.py:43
+msgid "telegram_user_id"
+msgstr ""
+
+#: bot/models.py:17
+msgid "telegram_user"
+msgstr ""
+
+#: bot/models.py:18
+msgid "telegram_users"
+msgstr ""
+
+#: bot/models.py:21
+#, fuzzy, python-format
+#| msgid "%(counter)s: %(reason)s"
+msgid "%(counter)s is %(telegram_user_id)d"
+msgstr "%(counter)s : %(reason)s"
+
+#: bot/models.py:31
+msgid "verify_key"
+msgstr ""
+
+#: bot/models.py:35
+msgid "telegram_user_check"
+msgstr ""
+
+#: bot/models.py:36
+msgid "telegram_user_checks"
+msgstr ""
+
+#: bot/models.py:39
+#, python-format
+msgid "%(telegram_user_id)d has verif key %(verif_key)s"
+msgstr ""
+
+#: bot/models.py:44 bot/models.py:57
+msgid "telegram_chat_id"
+msgstr ""
+
+#: bot/models.py:48
+msgid "telegram_user_chat"
+msgstr ""
+
+#: bot/models.py:49
+msgid "telegram_user_chats"
+msgstr ""
+
+#: bot/models.py:53
+#, python-format
+msgid "%(telegram_user_id)d is in the chat %(telegram_chat)d"
+msgstr ""
+
+#: bot/models.py:61
+msgid "notify_only_members"
+msgstr ""
+
+#: bot/models.py:65
+msgid "telegram_chat"
+msgstr ""
+
+#: bot/models.py:66
+msgid "telegram_chats"
+msgstr ""
+
+#: bot/models.py:69
+#, python-format
+msgid ""
+"%(chat_id)d is a telegram chat, with option notify_only_members to "
+"%(notify_only_members)s"
+msgstr ""
+
+#: counter/models.py:13
 msgid "name"
 msgstr "Nom d'utilisateur"
 
-#: counter/models.py:13
+#: counter/models.py:14
 msgid "email"
 msgstr "email"
 
-#: counter/models.py:14
+#: counter/models.py:16
 msgid "trigram"
 msgstr "Trigramme"
 
-#: counter/models.py:15
+#: counter/models.py:18 counter/views/user.py:22
+msgid "Trigram must be 3 characters long."
+msgstr "Le trigramme doit contenir exactement 3 caractères."
+
+#: counter/models.py:20
 msgid "associated user"
 msgstr "utilisateur associé"
 
-#: counter/models.py:16
+#: counter/models.py:21
 msgid "email notifications"
 msgstr "Notifications par email"
 
-#: counter/models.py:17
+#: counter/models.py:22
 msgid "sort by SeumScore"
 msgstr "Trier les seums par score"
 
-#: counter/models.py:20
+#: counter/models.py:25
 #, 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
+#: counter/models.py:36 counter/models.py:64
 msgid "datetime"
 msgstr "date et heure"
 
-#: counter/models.py:28
+#: counter/models.py:37
 msgid "reason"
 msgstr "raison"
 
-#: counter/models.py:29
+#: counter/models.py:38
 msgid "victim"
 msgstr "Victime"
 
-#: counter/models.py:30
+#: counter/models.py:39
 msgid "seum giver"
 msgstr "fouteur de seum"
 
-#: counter/models.py:34
+#: counter/models.py:43
 #, python-format
 msgid "%(counter)s: %(datetime)s (%(reason)s)"
 msgstr "%(counter)s : %(datetime)s %(reason)s"
 
-#: counter/models.py:48 counter/models.py:79
+#: counter/models.py:57 counter/models.py:88
 msgid "reset"
 msgstr "Remise à zéro"
 
-#: counter/models.py:49
+#: counter/models.py:58
 msgid "resets"
 msgstr "Remises à zéro"
 
-#: counter/models.py:53
+#: counter/models.py:62
 msgid "liker"
 msgstr "liker"
 
-#: counter/models.py:54
+#: counter/models.py:63
 msgid "seum"
 msgstr "seum"
 
-#: counter/models.py:58
+#: counter/models.py:67
 msgid "like"
 msgstr "like"
 
-#: counter/models.py:59
+#: counter/models.py:68
 msgid "likes"
 msgstr "likes"
 
-#: counter/models.py:63
+#: counter/models.py:72
 #, python-format
 msgid "%(liker)s likes %(reset)s"
 msgstr "%(liker)s likes %(reset)s"
 
-#: counter/models.py:70
+#: counter/models.py:79
 msgid "keyword"
 msgstr "mot-clé"
 
-#: counter/models.py:71
+#: counter/models.py:80
 msgid "keywords"
 msgstr "mots-clé"
 
-#: counter/models.py:78 counter/models.py:82
+#: counter/models.py:87 counter/models.py:91
 msgid "hashtag"
 msgstr "Hashtag"
 
-#: counter/models.py:83
+#: counter/models.py:92
 msgid "hashtags"
 msgstr "Hashtags"
 
-#: counter/models.py:86
+#: counter/models.py:95
 #, 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/counterTemplate.html:48
+#: counter/templates/homeTemplate.html:25
 msgid "No seum yet"
 msgstr "Pas encore de seum"
 
-#: counter/templates/counterTemplate.html:51
-#: counter/templates/homeTemplate.html:138
+#: counter/templates/counterTemplate.html:52
+#: counter/templates/homeTemplate.html:129
 msgid "Got the seum"
 msgstr "A eu le seum"
 
-#: counter/templates/counterTemplate.html:52
-#: counter/templates/homeTemplate.html:139
+#: counter/templates/counterTemplate.html:53
+#: counter/templates/homeTemplate.html:130
 #, python-format
 msgid "Seum thrown by %(trigram)s %(time_ago)s."
 msgstr "%(trigram)s lui a foutu le seum %(time_ago)s"
 
-#: counter/templates/counterTemplate.html:60
-#: counter/templates/homeTemplate.html:45
+#: counter/templates/counterTemplate.html:61
+#: counter/templates/homeTemplate.html:36
 msgid "Reset the counter"
 msgstr "Remettre à zéro"
 
-#: counter/templates/counterTemplate.html:66
+#: counter/templates/counterTemplate.html:67
 msgid "Motive for the seum:"
 msgstr "Motif du seum :"
 
-#: counter/templates/counterTemplate.html:73
-#: counter/templates/homeTemplate.html:89
+#: counter/templates/counterTemplate.html:74
+#: counter/templates/homeTemplate.html:80
 msgid "Throw the seum"
 msgstr "Foutre le seum"
 
-#: counter/templates/counterTemplate.html:82
+#: counter/templates/counterTemplate.html:84
 msgid "Timeline of the seum"
 msgstr "Timeline du seum"
 
-#: counter/templates/counterTemplate.html:87
+#: counter/templates/counterTemplate.html:89
 msgid "No timeline of the seum yet..."
 msgstr "Pas encore de timeline du seum..."
 
-#: counter/templates/counterTemplate.html:101
+#: counter/templates/counterTemplate.html:103
 msgid "Seum history"
 msgstr "Historique du seum"
 
-#: counter/templates/counterTemplate.html:109
+#: counter/templates/counterTemplate.html:111
 #: counter/templates/hashtagTemplate.html:26
 msgid "Date"
 msgstr "Date"
 
-#: counter/templates/counterTemplate.html:110
+#: counter/templates/counterTemplate.html:112
 #: counter/templates/hashtagTemplate.html:27
-#: counter/templates/homeTemplate.html:82
+#: counter/templates/homeTemplate.html:73
 msgid "Motive"
 msgstr "Motif"
 
-#: counter/templates/counterTemplate.html:111
+#: counter/templates/counterTemplate.html:113
 #: counter/templates/hashtagTemplate.html:29
 msgid "Seum thrower"
 msgstr "Fouteur de seum"
 
-#: counter/templates/counterTemplate.html:112
+#: counter/templates/counterTemplate.html:114
 #: counter/templates/hashtagTemplate.html:30
 msgid "Number of likes"
 msgstr "Nombre de likes"
 
-#: counter/templates/counterTemplate.html:137
+#: counter/templates/counterTemplate.html:139
 #: counter/templates/hashtagTemplate.html:56
 msgid "Back to counters list"
 msgstr "Retour à la liste des compteurs"
 msgid "Email notifications"
 msgstr "Notifications par email"
 
-#: counter/templates/createUser.html:34
+#: counter/templates/createUser.html:35
 msgid ""
 "Other users will see your nickname and your trigram only, it will be your "
 "seum identity!"
 "Les autres utilisateurs ne pourront voir que ton pseudo et ton trigramme, ce "
 "sera ton identité seumesque !"
 
-#: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
+#: counter/templates/createUser.html:36
+msgid "This trigram must be 3 characters long exactly."
+msgstr "Ce trigramme doit comporter exactement 3 caractères."
+
+#: counter/templates/createUser.html:39 counter/templates/homeTemplate.html:67
 #: 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"
 
-#: counter/templates/createUser.html:40
+#: counter/templates/createUser.html:43
 msgid "Nick"
 msgstr "Pseudo"
 
-#: counter/templates/createUser.html:43
+#: counter/templates/createUser.html:46
 msgid ""
 "I could have required 10 characters with one digit, an emoji, three "
 "uppercase letters and two lowercase ones to throw you the seum, but actually "
 "2 minuscules pour te foutre le seum mais en fait tu peux mettre ce que tu "
 "veux."
 
-#: counter/templates/createUser.html:45 counter/templates/login.html:27
+#: counter/templates/createUser.html:48 counter/templates/login.html:27
 msgid "Password"
 msgstr "Mot de passe"
 
-#: counter/templates/createUser.html:49
+#: counter/templates/createUser.html:52
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: counter/templates/createUser.html:52
+#: counter/templates/createUser.html:55
 msgid ""
 "If this form has given you the seum, do not forget to reset your counter "
 "once you are logged in!"
 "Si ce formulaire t'as foutu le seum, n'oublie pas de remettre ton compteur à "
 "zéro en arrivant sur le site."
 
-#: counter/templates/createUser.html:54
+#: counter/templates/createUser.html:57
 msgid "Create the counter"
 msgstr "Créer le compteur"
 
-#: counter/templates/createUser.html:64 counter/templates/login.html:43
+#: counter/templates/createUser.html:67 counter/templates/login.html:43
 #: counter/templates/passwordChange.html:45
 #: counter/templates/passwordReset.html:37
 #: counter/templates/passwordResetConfirm.html:42
 msgid "Victim"
 msgstr "Victime"
 
-#: counter/templates/homeTemplate.html:6
+#: counter/templates/homeTemplate.html:1
 msgid "Counters"
 msgstr "Compteurs"
 
-#: counter/templates/homeTemplate.html:36
+#: counter/templates/homeTemplate.html:28
 msgid "I got the seum"
 msgstr "J'ai eu le seum"
 
-#: counter/templates/homeTemplate.html:38
+#: counter/templates/homeTemplate.html:30
 msgid "threw me the seum"
 msgstr "m'a foutu le seum"
 
-#: counter/templates/homeTemplate.html:52
+#: counter/templates/homeTemplate.html:43
 msgid "Motive of the seum"
 msgstr "Motif du seum"
 
-#: counter/templates/homeTemplate.html:59
+#: counter/templates/homeTemplate.html:50
 msgid "I've got the seum"
 msgstr "J'ai le seum"
 
-#: counter/templates/homeTemplate.html:70
+#: counter/templates/homeTemplate.html:61
 msgid "Break the seum wall"
 msgstr "Brise le mur du seum"
 
-#: counter/templates/homeTemplate.html:134
+#: counter/templates/homeTemplate.html:126
 msgid "Has not got the seum yet"
 msgstr "N'a pas encore eu le seum"
 
-#: counter/templates/homeTemplate.html:154
+#: counter/templates/homeTemplate.html:145
 msgid "Timeline of the 24h of the seum"
 msgstr "Timeline des 24 heures du seum"
 
-#: counter/templates/homeTemplate.html:159
+#: counter/templates/homeTemplate.html:150
 msgid "No seum in the last past 24h..."
 msgstr "Pas de seum durant les dernières 24h..."
 
-#: counter/templates/homeTemplate.html:172
+#: counter/templates/homeTemplate.html:161
 msgid "Best seumers"
 msgstr "Meilleurs seumers"
 
-#: counter/templates/homeTemplate.html:177
-#: counter/templates/homeTemplate.html:249
+#: counter/templates/homeTemplate.html:166
+#: counter/templates/homeTemplate.html:230
 msgid "Nobody got the seum..."
 msgstr "Personne n'a eu le seum..."
 
-#: counter/templates/homeTemplate.html:190
+#: counter/templates/homeTemplate.html:177
 msgid "Most liked seumers"
 msgstr "Seumers les plus likés"
 
-#: counter/templates/homeTemplate.html:195
-#: counter/templates/homeTemplate.html:231
+#: counter/templates/homeTemplate.html:182
+#: counter/templates/homeTemplate.html:214
 msgid "Nobody liked..."
 msgstr "Personne n'a aimé..."
 
-#: counter/templates/homeTemplate.html:208
+#: counter/templates/homeTemplate.html:193
 msgid "Most popular hashtags"
 msgstr "Hashtags les plus populaires"
 
-#: counter/templates/homeTemplate.html:213
+#: counter/templates/homeTemplate.html:198
 msgid "Nobody used any hashtag..."
 msgstr "Personne n'a utilisé de hashtag..."
 
-#: counter/templates/homeTemplate.html:226
+#: counter/templates/homeTemplate.html:209
 msgid "Best likers of seum"
 msgstr "Meilleurs likeurs de seum"
 
-#: counter/templates/homeTemplate.html:244
+#: counter/templates/homeTemplate.html:225
 msgid "Seum activity"
 msgstr "Activité seumesque"
 
-#: counter/templates/homeTemplate.html:260
+#: counter/templates/homeTemplate.html:239
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: counter/templates/homeTemplate.html:261
+#: counter/templates/homeTemplate.html:240
 #: counter/templates/passwordChange.html:5
 #: counter/templates/passwordChange.html:35
 #: counter/templates/passwordResetConfirm.html:5
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: counter/templates/homeTemplate.html:264
+#: counter/templates/homeTemplate.html:243
 msgid "Deactivate email notifications"
 msgstr "Désactiver les notifications par email"
 
-#: counter/templates/homeTemplate.html:266
+#: counter/templates/homeTemplate.html:245
 msgid "Activate email notifications"
 msgstr "Activer les notifications par email"
 
-#: counter/templates/homeTemplate.html:271
+#: counter/templates/homeTemplate.html:250
 msgid "Sort seums by date"
 msgstr "Trier les seums par ancienneté"
 
-#: counter/templates/homeTemplate.html:273
+#: counter/templates/homeTemplate.html:252
 msgid "Sort seums by score"
 msgstr "Trier les seums par score"
 
 "lien pour le réinitialiser :"
 
 #: counter/templates/resetEmail.txt:6
+#, python-format
 msgid "Your login is %(login)s in case you have forgotten it too."
 msgstr "Ton login c'est %(login)s, au cas où tu l'aurais oublié aussi."
 
 msgid "Number of received likes"
 msgstr "Nombre de likes reçus"
 
-#: counter/views/user.py:22
+#: counter/views/user.py:26
 msgid "Passwords do not match."
 msgstr "Les mots de passe sont différents."
 
-#: counter/views/user.py:27
+#: counter/views/user.py:31
 msgid "A user with this email address already exists."
 msgstr "Un utilisateur avec cette adresse email existe déjà."
 
-#: counter/views/user.py:33
+#: counter/views/user.py:37
 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
+#: seum/settings.py:105
 msgid "English"
 msgstr "Anglais"
 
-#: seum/settings.py:110
+#: seum/settings.py:106
 msgid "French"
 msgstr "Français"