Quellcode durchsuchen

Translate email template. Clean up in home view

Camille Masset vor 9 Jahren
Ursprung
Commit
56c2c804fe

+ 4 - 4
counter/templates/resetEmail.txt

@@ -1,11 +1,11 @@
1
-T'as perdu ton mot de passe et t'as le seum. Il te reste plus qu'à suivre le lien pour le réinitialiser :
1
+{% load i18n %}
2
+{% blocktrans %}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:{% endblocktrans %}
2 3
 {% block reset_link %}
3 4
 {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
4 5
 {% endblock %}
5
-
6
-Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié aussi.
6
+{% trans "Your login is {{ user.username }} in case you have forgotten it too." %}
7 7
 
8 8
 --
9 9
 SeumBook™ - http://seum.merigoux.ovh
10 10
 
11
-P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis.merigoux@gmail.com
11
+{% trans "P.S.: If you don't want to receive these mails anymore, contact us at denis.merigoux@gmail.com" %}

+ 0 - 3
counter/views/home.py

@@ -1,9 +1,6 @@
1 1
 import copy
2 2
 from datetime import datetime, timedelta
3
-import functools
4 3
 import math
5
-import random
6
-from time import clock
7 4
 
8 5
 from django import forms
9 6
 from django.contrib.auth.decorators import login_required

+ 17 - 1
locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: PACKAGE VERSION\n"
10 10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2017-01-22 14:12+0100\n"
11
+"POT-Creation-Date: 2017-01-22 14:19+0100\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -490,6 +490,22 @@ msgid ""
490 490
 "password."
491 491
 msgstr ""
492 492
 
493
+#: counter/templates/resetEmail.txt:3
494
+msgid ""
495
+"You have lost your password and you've got the seum. You have to follow this "
496
+"link (or copy-paste it in your browser) to reinitialise it:"
497
+msgstr ""
498
+
499
+#: counter/templates/resetEmail.txt:7
500
+msgid "Your login is {{ user.username }} in case you have forgotten it too."
501
+msgstr ""
502
+
503
+#: counter/templates/resetEmail.txt:18
504
+msgid ""
505
+"P.S.: If you don't want to receive these mails anymore, contact us at denis."
506
+"merigoux@gmail.com"
507
+msgstr ""
508
+
493 509
 #: counter/views/counter.py:41
494 510
 msgid "unknown"
495 511
 msgstr ""

+ 22 - 2
locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: PACKAGE VERSION\n"
10 10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2017-01-22 14:12+0100\n"
11
+"POT-Creation-Date: 2017-01-22 14:19+0100\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -493,7 +493,9 @@ msgstr ""
493 493
 
494 494
 #: counter/templates/passwordResetConfirm.html:60
495 495
 msgid "You've got the seum, the link that we sent you has already been used."
496
-msgstr "T'as le seum, le lien qui t'as été donné pour visiter cette page est déjà utilisé."
496
+msgstr ""
497
+"T'as le seum, le lien qui t'as été donné pour visiter cette page est déjà "
498
+"utilisé."
497 499
 
498 500
 #: counter/templates/passwordResetDone.html:5
499 501
 msgid "Email sent!"
@@ -507,6 +509,24 @@ msgstr ""
507 509
 "Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton "
508 510
 "mot de passe."
509 511
 
512
+#: counter/templates/resetEmail.txt:3
513
+msgid ""
514
+"You have lost your password and you've got the seum. You have to follow this "
515
+"link (or copy-paste it in your browser) to reinitialise it:"
516
+msgstr ""
517
+"T'as perdu ton mot de passe et t'as le seum. "
518
+"Il te reste plus qu'à suivre le lien pour le réinitialiser :"
519
+
520
+#: counter/templates/resetEmail.txt:7
521
+msgid "Your login is {{ user.username }} in case you have forgotten it too."
522
+msgstr "Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié aussi."
523
+
524
+#: counter/templates/resetEmail.txt:18
525
+msgid ""
526
+"P.S.: If you don't want to receive these mails anymore, contact us at denis."
527
+"merigoux@gmail.com"
528
+msgstr "P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis.merigoux@gmail.com"
529
+
510 530
 #: counter/views/counter.py:41
511 531
 msgid "unknown"
512 532
 msgstr "inconnu"