Camille Masset 9 роки тому
батько
комміт
3b2acf79e8

+ 1 - 5
counter/templates/passwordResetConfirm.html

18
                 <h2 class="panel-title">{% trans "Change your password of the seum!" %}</h2>
18
                 <h2 class="panel-title">{% trans "Change your password of the seum!" %}</h2>
19
             </div>
19
             </div>
20
             <div class=" panel-body">
20
             <div class=" panel-body">
21
-                <form class='' method="POST" action="{% url 'password_change' %}">
21
+                <form class='' method="POST">
22
                     {% csrf_token %}
22
                     {% csrf_token %}
23
                     <div class="form-group">
23
                     <div class="form-group">
24
-                        <label for="id_old_password">{% trans "Old password" %}</label>
25
-                        <input id="id_old_password" type="password" class="form-control" name="old_password" required />
26
-                    </div>
27
-                    <div class="form-group">
28
                         <label for="id_new_password1">{% trans "New password" %}</label>
24
                         <label for="id_new_password1">{% trans "New password" %}</label>
29
                         <input id="id_new_password1" type="password" class="form-control" name="new_password1" required />
25
                         <input id="id_new_password1" type="password" class="form-control" name="new_password1" required />
30
                     </div>
26
                     </div>

+ 1 - 1
counter/templates/resetEmail.txt

3
 {% block reset_link %}
3
 {% block reset_link %}
4
 {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
4
 {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
5
 {% endblock %}
5
 {% endblock %}
6
-{% trans "Your login is {{ user.username }} in case you have forgotten it too." %}
6
+{% blocktrans %}Your login is {{ user.username }} in case you have forgotten it too.{% endblocktrans %}
7
 
7
 
8
 --
8
 --
9
 SeumBook™ - http://seum.merigoux.ovh
9
 SeumBook™ - http://seum.merigoux.ovh

+ 12 - 12
locale/en/LC_MESSAGES/django.po

8
 msgstr ""
8
 msgstr ""
9
 "Project-Id-Version: PACKAGE VERSION\n"
9
 "Project-Id-Version: PACKAGE VERSION\n"
10
 "Report-Msgid-Bugs-To: \n"
10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2017-01-22 15:38-0500\n"
11
+"POT-Creation-Date: 2017-01-23 12:30+0000\n"
12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
 "Language-Team: LANGUAGE <LL@li.org>\n"
14
 "Language-Team: LANGUAGE <LL@li.org>\n"
259
 #: counter/templates/createUser.html:64 counter/templates/login.html:43
259
 #: counter/templates/createUser.html:64 counter/templates/login.html:43
260
 #: counter/templates/passwordChange.html:45
260
 #: counter/templates/passwordChange.html:45
261
 #: counter/templates/passwordReset.html:37
261
 #: counter/templates/passwordReset.html:37
262
-#: counter/templates/passwordResetConfirm.html:46
263
-#: counter/templates/passwordResetConfirm.html:57
262
+#: counter/templates/passwordResetConfirm.html:42
263
+#: counter/templates/passwordResetConfirm.html:53
264
 msgid "Error"
264
 msgid "Error"
265
 msgstr ""
265
 msgstr ""
266
 
266
 
369
 #: counter/templates/passwordChange.html:5
369
 #: counter/templates/passwordChange.html:5
370
 #: counter/templates/passwordChange.html:35
370
 #: counter/templates/passwordChange.html:35
371
 #: counter/templates/passwordResetConfirm.html:5
371
 #: counter/templates/passwordResetConfirm.html:5
372
-#: counter/templates/passwordResetConfirm.html:36
372
+#: counter/templates/passwordResetConfirm.html:32
373
 msgid "Change password"
373
 msgid "Change password"
374
 msgstr ""
374
 msgstr ""
375
 
375
 
431
 msgstr ""
431
 msgstr ""
432
 
432
 
433
 #: counter/templates/passwordChange.html:23
433
 #: counter/templates/passwordChange.html:23
434
-#: counter/templates/passwordResetConfirm.html:24
435
 msgid "Old password"
434
 msgid "Old password"
436
 msgstr ""
435
 msgstr ""
437
 
436
 
438
 #: counter/templates/passwordChange.html:27
437
 #: counter/templates/passwordChange.html:27
439
-#: counter/templates/passwordResetConfirm.html:28
438
+#: counter/templates/passwordResetConfirm.html:24
440
 msgid "New password"
439
 msgid "New password"
441
 msgstr ""
440
 msgstr ""
442
 
441
 
443
 #: counter/templates/passwordChange.html:31
442
 #: counter/templates/passwordChange.html:31
444
-#: counter/templates/passwordResetConfirm.html:32
443
+#: counter/templates/passwordResetConfirm.html:28
445
 msgid "Confirm new password"
444
 msgid "Confirm new password"
446
 msgstr ""
445
 msgstr ""
447
 
446
 
448
 #: counter/templates/passwordChange.html:48
447
 #: counter/templates/passwordChange.html:48
449
-#: counter/templates/passwordResetConfirm.html:49
448
+#: counter/templates/passwordResetConfirm.html:45
450
 msgid "You don't even manage to change your password, seum."
449
 msgid "You don't even manage to change your password, seum."
451
 msgstr ""
450
 msgstr ""
452
 
451
 
484
 "That's it! You have reset your password! You can reset your counter now."
483
 "That's it! You have reset your password! You can reset your counter now."
485
 msgstr ""
484
 msgstr ""
486
 
485
 
487
-#: counter/templates/passwordResetConfirm.html:60
486
+#: counter/templates/passwordResetConfirm.html:56
488
 msgid "You've got the seum, the link that we sent you has already been used."
487
 msgid "You've got the seum, the link that we sent you has already been used."
489
 msgstr ""
488
 msgstr ""
490
 
489
 
505
 msgstr ""
504
 msgstr ""
506
 
505
 
507
 #: counter/templates/resetEmail.txt:6
506
 #: counter/templates/resetEmail.txt:6
508
-msgid "Your login is {{ user.username }} in case you have forgotten it too."
507
+#, python-format
508
+msgid "Your login is %(user.username)s in case you have forgotten it too."
509
 msgstr ""
509
 msgstr ""
510
 
510
 
511
 #: counter/templates/resetEmail.txt:11
511
 #: counter/templates/resetEmail.txt:11
582
 msgid "Use another email address, another user has already this login."
582
 msgid "Use another email address, another user has already this login."
583
 msgstr ""
583
 msgstr ""
584
 
584
 
585
-#: seum/settings.py:107
585
+#: seum/settings.py:109
586
 msgid "English"
586
 msgid "English"
587
 msgstr ""
587
 msgstr ""
588
 
588
 
589
-#: seum/settings.py:108
589
+#: seum/settings.py:110
590
 msgid "French"
590
 msgid "French"
591
 msgstr ""
591
 msgstr ""

+ 13 - 12
locale/fr/LC_MESSAGES/django.po

8
 msgstr ""
8
 msgstr ""
9
 "Project-Id-Version: PACKAGE VERSION\n"
9
 "Project-Id-Version: PACKAGE VERSION\n"
10
 "Report-Msgid-Bugs-To: \n"
10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2017-01-22 15:38-0500\n"
11
+"POT-Creation-Date: 2017-01-23 12:30+0000\n"
12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
 "Language-Team: LANGUAGE <LL@li.org>\n"
14
 "Language-Team: LANGUAGE <LL@li.org>\n"
272
 #: counter/templates/createUser.html:64 counter/templates/login.html:43
272
 #: counter/templates/createUser.html:64 counter/templates/login.html:43
273
 #: counter/templates/passwordChange.html:45
273
 #: counter/templates/passwordChange.html:45
274
 #: counter/templates/passwordReset.html:37
274
 #: counter/templates/passwordReset.html:37
275
-#: counter/templates/passwordResetConfirm.html:46
276
-#: counter/templates/passwordResetConfirm.html:57
275
+#: counter/templates/passwordResetConfirm.html:42
276
+#: counter/templates/passwordResetConfirm.html:53
277
 msgid "Error"
277
 msgid "Error"
278
 msgstr "Erreur"
278
 msgstr "Erreur"
279
 
279
 
382
 #: counter/templates/passwordChange.html:5
382
 #: counter/templates/passwordChange.html:5
383
 #: counter/templates/passwordChange.html:35
383
 #: counter/templates/passwordChange.html:35
384
 #: counter/templates/passwordResetConfirm.html:5
384
 #: counter/templates/passwordResetConfirm.html:5
385
-#: counter/templates/passwordResetConfirm.html:36
385
+#: counter/templates/passwordResetConfirm.html:32
386
 msgid "Change password"
386
 msgid "Change password"
387
 msgstr "Modifier le mot de passe"
387
 msgstr "Modifier le mot de passe"
388
 
388
 
444
 msgstr "Change ton mot de passe du seum !"
444
 msgstr "Change ton mot de passe du seum !"
445
 
445
 
446
 #: counter/templates/passwordChange.html:23
446
 #: counter/templates/passwordChange.html:23
447
-#: counter/templates/passwordResetConfirm.html:24
448
 msgid "Old password"
447
 msgid "Old password"
449
 msgstr "Ancien mot de passe"
448
 msgstr "Ancien mot de passe"
450
 
449
 
451
 #: counter/templates/passwordChange.html:27
450
 #: counter/templates/passwordChange.html:27
452
-#: counter/templates/passwordResetConfirm.html:28
451
+#: counter/templates/passwordResetConfirm.html:24
453
 msgid "New password"
452
 msgid "New password"
454
 msgstr "Nouveau mot de passe"
453
 msgstr "Nouveau mot de passe"
455
 
454
 
456
 #: counter/templates/passwordChange.html:31
455
 #: counter/templates/passwordChange.html:31
457
-#: counter/templates/passwordResetConfirm.html:32
456
+#: counter/templates/passwordResetConfirm.html:28
458
 msgid "Confirm new password"
457
 msgid "Confirm new password"
459
 msgstr "Confirmer le nouveau mot de passe"
458
 msgstr "Confirmer le nouveau mot de passe"
460
 
459
 
461
 #: counter/templates/passwordChange.html:48
460
 #: counter/templates/passwordChange.html:48
462
-#: counter/templates/passwordResetConfirm.html:49
461
+#: counter/templates/passwordResetConfirm.html:45
463
 msgid "You don't even manage to change your password, seum."
462
 msgid "You don't even manage to change your password, seum."
464
 msgstr "T'arrives même pas à changer ton mot de passe, seum."
463
 msgstr "T'arrives même pas à changer ton mot de passe, seum."
465
 
464
 
499
 "Ça y est tu as réinitialisé ton mot de passe ! Du coup tu peux aller "
498
 "Ça y est tu as réinitialisé ton mot de passe ! Du coup tu peux aller "
500
 "remettre ton compteur à zéro."
499
 "remettre ton compteur à zéro."
501
 
500
 
502
-#: counter/templates/passwordResetConfirm.html:60
501
+#: counter/templates/passwordResetConfirm.html:56
503
 msgid "You've got the seum, the link that we sent you has already been used."
502
 msgid "You've got the seum, the link that we sent you has already been used."
504
 msgstr ""
503
 msgstr ""
505
 "T'as le seum, le lien qui t'as été donné pour visiter cette page est déjà "
504
 "T'as le seum, le lien qui t'as été donné pour visiter cette page est déjà "
526
 "lien pour le réinitialiser :"
525
 "lien pour le réinitialiser :"
527
 
526
 
528
 #: counter/templates/resetEmail.txt:6
527
 #: counter/templates/resetEmail.txt:6
529
-msgid "Your login is {{ user.username }} in case you have forgotten it too."
528
+#, fuzzy, python-format
529
+#| msgid "Your login is {{ user.username }} in case you have forgotten it too."
530
+msgid "Your login is %(user.username)s in case you have forgotten it too."
530
 msgstr ""
531
 msgstr ""
531
 "Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié "
532
 "Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié "
532
 "aussi."
533
 "aussi."
607
 msgid "Use another email address, another user has already this login."
608
 msgid "Use another email address, another user has already this login."
608
 msgstr "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
609
 msgstr "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
609
 
610
 
610
-#: seum/settings.py:107
611
+#: seum/settings.py:109
611
 msgid "English"
612
 msgid "English"
612
 msgstr "Anglais"
613
 msgstr "Anglais"
613
 
614
 
614
-#: seum/settings.py:108
615
+#: seum/settings.py:110
615
 msgid "French"
616
 msgid "French"
616
 msgstr "Français"
617
 msgstr "Français"