Verified Commit db1897a0 authored by Marco Marinello's avatar Marco Marinello
Browse files

Admins mail refs #2


Signed-off-by: Marco Marinello's avatarMarco Marinello <me@marcomarinello.it>
parent 527f40e0
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-13 19:32+0200\n" "POT-Creation-Date: 2019-10-13 19:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Hannes Rantzsch <hannesrantzsch@gmx.de>\n" "Last-Translator: Hannes Rantzsch <hannesrantzsch@gmx.de>\n"
"Language-Team: DE <hannesrantzsch@gmx.de>\n" "Language-Team: DE <hannesrantzsch@gmx.de>\n"
...@@ -77,7 +77,13 @@ msgstr "" ...@@ -77,7 +77,13 @@ msgstr ""
msgid "Dear %(full_name)s (%(username)s)," msgid "Dear %(full_name)s (%(username)s),"
msgstr "Sehr geehrte(r) %(username)s" msgstr "Sehr geehrte(r) %(username)s"
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:4
#, python-format
msgid ""
"An administrator on <i>%(domain)s</i> sent you this password recovery email."
msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:6
#, fuzzy, python-format #, fuzzy, python-format
#| msgid "" #| msgid ""
#| "You -- or someone pretending to be you -- has requested a password reset " #| "You -- or someone pretending to be you -- has requested a password reset "
...@@ -89,13 +95,13 @@ msgstr "" ...@@ -89,13 +95,13 @@ msgstr ""
"Sie -- oder jemand, der vorgibt Sie zu sein -- haben angefordert, Ihr " "Sie -- oder jemand, der vorgibt Sie zu sein -- haben angefordert, Ihr "
"Passwort auf %(domain)s zurückzusetzen." "Passwort auf %(domain)s zurückzusetzen."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9
msgid "You can set your new password by following this link:" msgid "You can set your new password by following this link:"
msgstr "Folgen Sie diesem Link, um ein neues Passwort festzulegen:" msgstr "Folgen Sie diesem Link, um ein neues Passwort festzulegen:"
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:13
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:13
msgid "" msgid ""
"If you don't want to reset your password, simply ignore this email and it " "If you don't want to reset your password, simply ignore this email and it "
"will stay unchanged." "will stay unchanged."
...@@ -103,12 +109,17 @@ msgstr "" ...@@ -103,12 +109,17 @@ msgstr ""
"Sollten Sie nicht angefordert haben, Ihr Passwort zurückzusetzen, ignorieren " "Sollten Sie nicht angefordert haben, Ihr Passwort zurückzusetzen, ignorieren "
"Sie einfach diese E-Mail und Ihr Passwort bleibt unverändert." "Sie einfach diese E-Mail und Ihr Passwort bleibt unverändert."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:15
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:15
msgid "Greetings," msgid "Greetings,"
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:4
#, python-format
msgid "An administrator on %(domain)s sent you this password recovery email."
msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:6
#, python-format #, python-format
msgid "" msgid ""
"You -- or someone pretending to be you -- has requested a password reset on " "You -- or someone pretending to be you -- has requested a password reset on "
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-13 19:32+0200\n" "POT-Creation-Date: 2019-10-13 19:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -75,31 +75,42 @@ msgstr "" ...@@ -75,31 +75,42 @@ msgstr ""
msgid "Dear %(full_name)s (%(username)s)," msgid "Dear %(full_name)s (%(username)s),"
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:4
#, python-format
msgid ""
"An administrator on <i>%(domain)s</i> sent you this password recovery email."
msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:6
#, python-format #, python-format
msgid "" msgid ""
"You -- <em>or someone pretending to be you</em> -- has requested a password " "You -- <em>or someone pretending to be you</em> -- has requested a password "
"reset on <i>%(domain)s</i>." "reset on <i>%(domain)s</i>."
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9
msgid "You can set your new password by following this link:" msgid "You can set your new password by following this link:"
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:13
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:13
msgid "" msgid ""
"If you don't want to reset your password, simply ignore this email and it " "If you don't want to reset your password, simply ignore this email and it "
"will stay unchanged." "will stay unchanged."
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:15
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:15
msgid "Greetings," msgid "Greetings,"
msgstr "" msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:4
#, python-format
msgid "An administrator on %(domain)s sent you this password recovery email."
msgstr ""
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:6
#, python-format #, python-format
msgid "" msgid ""
"You -- or someone pretending to be you -- has requested a password reset on " "You -- or someone pretending to be you -- has requested a password reset on "
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-13 19:32+0200\n" "POT-Creation-Date: 2019-10-13 19:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -78,7 +78,15 @@ msgstr "" ...@@ -78,7 +78,15 @@ msgstr ""
msgid "Dear %(full_name)s (%(username)s)," msgid "Dear %(full_name)s (%(username)s),"
msgstr "Gentile %(full_name)s (%(username)s)," msgstr "Gentile %(full_name)s (%(username)s),"
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:4
#, python-format
msgid ""
"An administrator on <i>%(domain)s</i> sent you this password recovery email."
msgstr ""
"Un amministratore su <i>%(domain)s</i> le ha inviato questa mail per il "
"recupero della password."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:6
#, python-format #, python-format
msgid "" msgid ""
"You -- <em>or someone pretending to be you</em> -- has requested a password " "You -- <em>or someone pretending to be you</em> -- has requested a password "
...@@ -87,13 +95,13 @@ msgstr "" ...@@ -87,13 +95,13 @@ msgstr ""
"Lei -- <em>o qualcuno che pretende di essere lei</em> -- ha richiesto un " "Lei -- <em>o qualcuno che pretende di essere lei</em> -- ha richiesto un "
"cambio password su <i>%(domain)s</i>." "cambio password su <i>%(domain)s</i>."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:5 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9
msgid "You can set your new password by following this link:" msgid "You can set your new password by following this link:"
msgstr "Può impostare la Sua password a questo link:" msgstr "Può impostare la Sua password a questo link:"
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:13
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:9 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:13
msgid "" msgid ""
"If you don't want to reset your password, simply ignore this email and it " "If you don't want to reset your password, simply ignore this email and it "
"will stay unchanged." "will stay unchanged."
...@@ -101,12 +109,19 @@ msgstr "" ...@@ -101,12 +109,19 @@ msgstr ""
"Se non desidera modificare la Sua password può semplicemente ignorare questa " "Se non desidera modificare la Sua password può semplicemente ignorare questa "
"e-mail e rimarrà invariata." "e-mail e rimarrà invariata."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.html:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.html:15
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:11 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:15
msgid "Greetings," msgid "Greetings,"
msgstr "Cordialmente," msgstr "Cordialmente,"
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:3 #: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:4
#, python-format
msgid "An administrator on %(domain)s sent you this password recovery email."
msgstr ""
"Un amministratore su %(domain)s le ha inviato questa mail per il recupero "
"della password."
#: django_password_reset/password_reset/templates/password_reset/recovery_email.txt:6
#, python-format #, python-format
msgid "" msgid ""
"You -- or someone pretending to be you -- has requested a password reset on " "You -- or someone pretending to be you -- has requested a password reset on "
......
{% load i18n %}{% blocktrans %}Dear {{ full_name }} ({{ username }}),{% endblocktrans %} {% load i18n %}{% blocktrans %}Dear {{ full_name }} ({{ username }}),{% endblocktrans %}
<br><br> <br><br>
{% if admin %}
{% blocktrans with domain=site.domain %}An administrator on <i>{{ domain }}</i> sent you this password recovery email.{% endblocktrans %}
{% else %}
{% blocktrans with domain=site.domain %}You -- <em>or someone pretending to be you</em> -- has requested a password reset on <i>{{ domain }}</i>.{% endblocktrans %} {% blocktrans with domain=site.domain %}You -- <em>or someone pretending to be you</em> -- has requested a password reset on <i>{{ domain }}</i>.{% endblocktrans %}
{% endif %}
<br> <br>
{% trans "You can set your new password by following this link:" %} {% trans "You can set your new password by following this link:" %}
<br> <br>
......
{% load i18n %}{% blocktrans %}Dear {{ full_name }} ({{ username }}),{% endblocktrans %} {% load i18n %}{% blocktrans %}Dear {{ full_name }} ({{ username }}),{% endblocktrans %}
{% if admin %}
{% blocktrans with domain=site.domain %}An administrator on {{ domain }} sent you this password recovery email.{% endblocktrans %}
{% else %}
{% blocktrans with domain=site.domain %}You -- or someone pretending to be you -- has requested a password reset on {{ domain }}.{% endblocktrans %} {% blocktrans with domain=site.domain %}You -- or someone pretending to be you -- has requested a password reset on {{ domain }}.{% endblocktrans %}
{% endif %}
{% trans "You can set your new password by following this link:" %} {% trans "You can set your new password by following this link:" %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment