Translate counter creation view

counter/templates/createUser.html

@@ -1,4 +1,10 @@
-{% extends 'baseTemplate.html' %} {% block title %}Changement du mot de passe{% endblock %}{% block content %}
+{% extends 'baseTemplate.html' %}
+
+{% block title %}Changement du mot de passe{% endblock %}
+
+{% block content %}
+{% load i18n %}
+
 <div class="container">
     <div class="row">
         <div class="text-center">
@@ -8,44 +14,44 @@
     <div class="row">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h2 class="panel-title">Créé ton compteur de seum !</h2>
+                <h2 class="panel-title">{% trans "Create your seum counter!" %}</h2>
             </div>
             <div class=" panel-body">
                 <form method="POST">
                     {% csrf_token %}
-                    <p>L'adresse e-mail sera utilisée pour la réinitialisation de ton mot de passe. Ton login sur le site sera la première partie de cette adresse (avant le @).</p>
+                    <p>{% trans "The email address will be used for password reinitialisation. Your login on this website will be the first part of this address (before the @)." %}</p>
                     <div class="form-group">
-                        <label for="id_email">Adresse email</label>
+                        <label for="id_email">{% trans "Email address" %}</label>
                         <input id="id_email" type="email" class="form-control" name="email" required />
                     </div>
-                    <p>Si tu coches la case en dessous, tu recevras un mail de <tt>seum@merigoux.ovh</tt> à chaque fois que quelqu'un aura le seum sur le site. Spammatoire mais jouissif, peut-être désactivé ou réactivé par la suite.</p>
+                    <p>{% trans "If you check the box below, you will receive an email from <tt>seum@merigoux.ovh</tt> each time someone get the seum on the site. Spamming but so enjoyable, can be deactivated and reactivated later." %}
                     <div class="form-check">
                         <input type="checkbox" class="form-check-input" name="email_notifications">
                         <label class="form-check-label">
-                            Notifications par email
+                            {% trans "Email notifications" %}
                         </label>
                     </div>
-                    <p>Les autres utilisateurs ne pourront voir que ton pseudo et ton trigramme, ce sera ton identité seumesque !</p>
+                    <p>{% trans "Other users will see your nickname and your trigram only, it will be your seum identity!" %}</p>
                     <div class="form-group">
-                        <label for="id_trigramme">Trigramme</label>
+                        <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 />
                     </div>
                     <div class="form-group">
-                        <label for="id_nick">Pseudo</label>
+                        <label for="id_nick">{% trans "Nick" %}</label>
                         <input id="id_nick" type="text" class="form-control" name="nick" required />
                     </div>
-                    <p>J'aurais pu exiger 10 caractères dont un chiffre, une lettre et un tilde avec 3 majuscules et 2 minuscules pour te foutre le seum mais en fait tu peux mettre ce que tu veux.</p>
+                    <p>{% trans "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." %}</p>
                     <div class="form-group">
-                        <label for="id_password1">Mot de passe</label>
+                        <label for="id_password1">{% trans "Password" %}</label>
                         <input id="id_password1" type="password" class="form-control" name="password1" required />
                     </div>
                     <div class="form-group">
-                        <label for="id_password2">Confirmer le mot de passe</label>
+                        <label for="id_password2">{% trans "Confirm password" %}</label>
                         <input id="id_password2" type="password" class="form-control" name="password2" required />
                     </div>
-                    <p>Si ce formulaire t'as foutu le seum, n'oublie pas de remettre ton compteur à zéro en arrivant sur le site.</p>
+                    <p>{% trans "If this form has given you the seum, do not forget to reset your counter once you are logged in!" %}</p>
                     <div class="text-center">
-                        <button type="submit" class="btn btn-default btn-success">Créer le compteur</button>
+                        <button type="submit" class="btn btn-default btn-success">{% trans "Create the counter" %}</button>
                     </div>
                 </form>
             </div>
@@ -55,7 +61,7 @@
     <div class="row">
         <div class="panel panel-danger">
             <div class="panel-heading">
-                <h2 class="panel-title">Erreur</h2>
+                <h2 class="panel-title">{% trans "Error" %}</h2>
             </div>
             <div class=" panel-body">
                 <p>{{error}}</p>

counter/templates/createUserDone.html

@@ -1,4 +1,10 @@
-{% extends 'baseTemplate.html' %} {% block title %}Mot de passe changé !{% endblock %}{% block content %}
+{% extends 'baseTemplate.html' %}
+
+{% load i81n %}
+
+{% block title %}{% trans "Password successfully changed!" %}{% endblock %}
+
+{% block content %}
 <div class="container">
     <div class="row">
         <div class="text-center">
@@ -8,12 +14,12 @@
     <div class="row">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h2 class="panel-title">Victoire !</h2>
+                <h2 class="panel-title">{% trans "Victory!" %}</h2>
             </div>
             <div class=" panel-body">
-                <p>Tu as créé ton compteur ! Ton login est <b>{{login}}</b>.</p>
+                <p>{% trans "You have created your counter! Your login is " %} <b>{{ login }}</p>.</p>
                 <div class="text-center">
-                    <a href="{% url 'login' %}" type="submit" class="btn btn-default btn-success">Connecte-toi pour accéder au site !</a>
+                    <a href="{% url 'login' %}" type="submit" class="btn btn-default btn-success">{% trans "Login to access the website!" %}</a>
                 </div>
             </div>
         </div>

counter/urls.py

@@ -3,20 +3,24 @@ from counter.rss import SeumFeed
 from django.contrib.auth import views as auth_views
 from django.views.generic.base import RedirectView
 
-from .views import views, hashtag, counter
+from .views import views, hashtag, counter, user
 
 urlpatterns = [
     url(r'^$', views.home, name='home'),
     url(r'^reset-counter/$', counter.reset_counter, name='reset-counter'),
     url(r'^counter/(?P<id_counter>\d+)/$', counter.get, name='counter'),
     url(r'^hashtag/(?P<keyword>.+)/$', hashtag.get, name='hashtag'),
-    url(r'^rss/$', SeumFeed()),
-    url(r'^create_user/$', views.createUser, name='create_user'),
+
     url(r'^like/$', views.like, name='like'),
     url(r'^toggle-notif/$', views.toggleEmailNotifications,
         name='toggle_email_notifications'),
     url(r'^toggle-sort-score/$', views.toggleScoreSorting,
         name='toggle_sort_score'),
+
+    url(r'^create_user/$', user.create, name='create_user'),
+
+    url(r'^rss/$', SeumFeed()),
+
     url(r'^login/$', auth_views.login,
         {'template_name': 'login.html'},
         name='login'),

counter/views/user.py

@@ -0,0 +1,39 @@
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.shortcuts import render
+from django.utils.translation import ugettext as _
+
+from counter.models import Counter
+
+
+def create(request):
+    if (request.method == 'POST'):
+        # create a form instance and populate it with data from the request:
+        data = dict(request.POST)
+        email = data['email'][0]
+        username = email.split('@')[0]
+        trigramme = data['trigramme'][0]
+        nick = data['nick'][0]
+        password1 = data['password1'][0]
+        password2 = data['password2'][0]
+        email_notifications = 'email_notifications' in data.keys()
+
+        if password1 != password2:
+            error = _("Passwords do not match.")
+            return render(request, 'createUser.html', {'error': error})
+
+        try:
+            test_user = User.objects.get(email=email)
+            error = _("A user with this email address already exists.")
+            return render(request, 'createUser.html', {'error': error})
+        except User.DoesNotExist:
+            try:
+                user = User.objects.create_user(username, email, password1)
+            except IntegrityError:
+                error = _("Use another email address, another user has already this login.")
+                return render(request, 'createUser.html', {'error': error})
+
+            counter = Counter.objects.create(name=nick, email=email, trigramme=trigramme, user=user, email_notifications=email_notifications)
+            return render(request, 'createUserDone.html', {'login': username})
+    else:
+        return render(request, 'createUser.html', {'error': None})

counter/views/views.py

@@ -296,42 +296,7 @@ def home(request):
 
 
 
-def createUser(request):
-    if (request.method == 'POST'):
-        # create a form instance and populate it with data from the request:
-        data = dict(request.POST)
-        email = data['email'][0]
-        username = email.split('@')[0]
-        trigramme = data['trigramme'][0]
-        nick = data['nick'][0]
-        password1 = data['password1'][0]
-        password2 = data['password2'][0]
-        email_notifications = ('email_notifications' in data.keys())
 
-        if password1 != password2:
-            error = "Les deux mots de passe sont différents."
-            return render(request, 'createUser.html', {'error': error})
-        try:
-            test_user = User.objects.get(email=email)
-            error = "Un utilisateur avec cette adresse email existe déjà !"
-            return render(request, 'createUser.html', {'error': error})
-        except User.DoesNotExist:
-            try:
-                user = User.objects.create_user(username, email, password1)
-            except IntegrityError:
-                error = "Utilise une autre adresse email, un autre utilisateur \
-                 a le même login que toi."
-                return render(request, 'createUser.html', {'error': error})
-            counter = Counter()
-            counter.name = nick
-            counter.email = email
-            counter.trigramme = trigramme
-            counter.user = user
-            counter.email_notifications = False
-            counter.save()
-            return render(request, 'createUserDone.html', {'login': username})
-    else:
-        return render(request, 'createUser.html', {'error': None})
 
 
 @login_required

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-21 15:44+0100\n"
+"POT-Creation-Date: 2017-01-21 17:37+0100\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"
@@ -182,6 +182,90 @@ msgstr ""
 msgid "Back to counters list"
 msgstr ""
 
+#: counter/templates/createUser.html:17
+msgid "Create your seum counter!"
+msgstr ""
+
+#: counter/templates/createUser.html:22
+msgid ""
+"The email address will be used for password reinitialisation. Your login on "
+"this website will be the first part of this address (before the @)."
+msgstr ""
+
+#: counter/templates/createUser.html:24
+msgid "Email address"
+msgstr ""
+
+#: counter/templates/createUser.html:27
+msgid ""
+"If you check the box below, you will receive an email from <tt>seum@merigoux."
+"ovh</tt> each time someone get the seum on the site. Spamming but so "
+"enjoyable, can be deactivated and reactivated later."
+msgstr ""
+
+#: counter/templates/createUser.html:31
+msgid "Email notifications"
+msgstr ""
+
+#: counter/templates/createUser.html:34
+msgid ""
+"Other users will see your nickname and your trigram only, it will be your "
+"seum identity!"
+msgstr ""
+
+#: counter/templates/createUser.html:36
+msgid "Trigram"
+msgstr ""
+
+#: counter/templates/createUser.html:40
+msgid "Nick"
+msgstr ""
+
+#: counter/templates/createUser.html:43
+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
+msgid "Password"
+msgstr ""
+
+#: counter/templates/createUser.html:49
+msgid "Confirm password"
+msgstr ""
+
+#: counter/templates/createUser.html:52
+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
+msgid "Create the counter"
+msgstr ""
+
+#: counter/templates/createUser.html:64
+msgid "Error"
+msgstr ""
+
+#: counter/templates/createUserDone.html:5
+msgid "Password successfully changed!"
+msgstr ""
+
+#: counter/templates/createUserDone.html:17
+msgid "Victory!"
+msgstr ""
+
+#: counter/templates/createUserDone.html:20
+msgid "You have created your counter! Your login is "
+msgstr ""
+
+#: counter/templates/createUserDone.html:22
+msgid "Login to access the website!"
+msgstr ""
+
 #: counter/templates/hashtagTemplate.html:20
 msgid "Seums containing"
 msgstr ""
@@ -190,15 +274,27 @@ msgstr ""
 msgid "Victim"
 msgstr ""
 
-#: counter/views/counter.py:34
+#: counter/views/counter.py:41
 msgid "unknown"
 msgstr ""
 
-#: counter/views/counter.py:75
+#: counter/views/counter.py:81
 #, python-format
 msgid "From %(who)s: %(reason)s"
 msgstr ""
 
+#: counter/views/user.py:22
+msgid "Passwords do not match."
+msgstr ""
+
+#: counter/views/user.py:27
+msgid "A user with this email address already exists."
+msgstr ""
+
+#: counter/views/user.py:33
+msgid "Use another email address, another user has already this login."
+msgstr ""
+
 #: seum/settings.py:111
 msgid "English"
 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-21 15:44+0100\n"
+"POT-Creation-Date: 2017-01-21 17:37+0100\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"
@@ -189,6 +189,106 @@ msgstr "Nombre de likes"
 msgid "Back to counters list"
 msgstr "Retour à la liste des compteurs"
 
+#: counter/templates/createUser.html:17
+msgid "Create your seum counter!"
+msgstr "Crée ton compteur de seum !"
+
+#: counter/templates/createUser.html:22
+msgid ""
+"The email address will be used for password reinitialisation. Your login on "
+"this website will be the first part of this address (before the @)."
+msgstr ""
+"L'adresse e-mail sera utilisée pour la réinitialisation de ton mot de passe. "
+"Ton login sur le site sera la première partie de cette adresse (avant le @)."
+
+#: counter/templates/createUser.html:24
+msgid "Email address"
+msgstr "Adresse email"
+
+#: counter/templates/createUser.html:27
+msgid ""
+"If you check the box below, you will receive an email from <tt>seum@merigoux."
+"ovh</tt> each time someone get the seum on the site. Spamming but so "
+"enjoyable, can be deactivated and reactivated later."
+msgstr ""
+"Si tu coches la case en dessous, tu recevras un mail de <tt>seum@merigoux."
+"ovh</tt> à chaque fois que quelqu'un aura le seum sur le site. Spammatoire "
+"mais jouissif, peut-être désactivé ou réactivé par la suite."
+
+#: counter/templates/createUser.html:31
+#, fuzzy
+#| msgid "email notifications"
+msgid "Email notifications"
+msgstr "Notifications par email"
+
+#: counter/templates/createUser.html:34
+msgid ""
+"Other users will see your nickname and your trigram only, it will be your "
+"seum identity!"
+msgstr ""
+"Les autres utilisateurs ne pourront voir que ton pseudo et ton trigramme, ce "
+"sera ton identité seumesque !"
+
+#: counter/templates/createUser.html:36
+#, fuzzy
+#| msgid "trigram"
+msgid "Trigram"
+msgstr "Trigramme"
+
+#: counter/templates/createUser.html:40
+msgid "Nick"
+msgstr "Pseudo"
+
+#: counter/templates/createUser.html:43
+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 ""
+"J'aurais pu exiger 10 caractères dont un chiffre, un emoji, 3 majuscules et "
+"2 minuscules pour te foutre le seum mais en fait tu peux mettre ce que tu "
+"veux."
+
+#: counter/templates/createUser.html:45
+msgid "Password"
+msgstr "Mot de passe"
+
+#: counter/templates/createUser.html:49
+msgid "Confirm password"
+msgstr "Confirmer le mot de passe"
+
+#: counter/templates/createUser.html:52
+msgid ""
+"If this form has given you the seum, do not forget to reset your counter "
+"once you are logged in!"
+msgstr ""
+"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
+msgid "Create the counter"
+msgstr "Créer le compteur"
+
+#: counter/templates/createUser.html:64
+msgid "Error"
+msgstr "Erreur"
+
+#: counter/templates/createUserDone.html:5
+msgid "Password successfully changed!"
+msgstr "Mot de passe changé !"
+
+#: counter/templates/createUserDone.html:17
+msgid "Victory!"
+msgstr "Victoire !"
+
+#: counter/templates/createUserDone.html:20
+msgid "You have created your counter! Your login is "
+msgstr "Tu as créé ton compteur ! Ton login est "
+
+#: counter/templates/createUserDone.html:22
+msgid "Login to access the website!"
+msgstr "Connecte-toi pour accéder au site !"
+
 #: counter/templates/hashtagTemplate.html:20
 msgid "Seums containing"
 msgstr "Liste des seums contenant"
@@ -197,15 +297,27 @@ msgstr "Liste des seums contenant"
 msgid "Victim"
 msgstr "Victime"
 
-#: counter/views/counter.py:34
+#: counter/views/counter.py:41
 msgid "unknown"
 msgstr "inconnu"
 
-#: counter/views/counter.py:75
+#: counter/views/counter.py:81
 #, python-format
 msgid "From %(who)s: %(reason)s"
 msgstr "De %(who)s : %(reason)s"
 
+#: 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"