globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Merge branch 'hotfix_site_url_error' into 'main'

Browse source 
replaces http://127.0.0.1:5000 by {{ site_url }}

See merge request yaal/canaille!192
This commit is contained in:
Éloi Rivard 2024-11-26 12:52:24 +00:00
commit 8a8f2299e7
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canaille/core/templates/mails/compromised_password_check_failure.html
View file

@ -54,7 +54,7 @@
<tr style="margin: 0; border-radius: 0; text-align:center; border-left: 1px solid #d4d4d5; border-right: 1px solid #d4d4d5; border-bottom: 1px solid #d4d4d5;">
<td colspan="2" style="background: #2185d0; width:50%; border-radius: 0 0 .3rem 0;">
<a href="http://127.0.0.1:5000/profile/{{ user_name }}/settings" style="width: 100%; display: inline-block; vertical-align: middle; padding: .8em 0; font-weight: 700; line-height: 1em; text-align: center; text-decoration: none; font-size: 1rem; color: #fff; margin: 0; border-radius: 0; box-shadow: 0 0 0 1px transparent inset,0 0 0 0 rgba(34,36,38,.15) inset;">{% trans %} Reset {{ user_name }}'s password {% endtrans %}</a>
<a href="{{ site_url }}/profile/{{ user_name }}/settings" style="width: 100%; display: inline-block; vertical-align: middle; padding: .8em 0; font-weight: 700; line-height: 1em; text-align: center; text-decoration: none; font-size: 1rem; color: #fff; margin: 0; border-radius: 0; box-shadow: 0 0 0 1px transparent inset,0 0 0 0 rgba(34,36,38,.15) inset;">{% trans %} Reset {{ user_name }}'s password {% endtrans %}</a>
</td>
</tr>

4
canaille/core/templates/mails/compromised_password_check_failure.txt
View file

@ -1,13 +1,13 @@
# {% trans %}Compromised password check failure{% endtrans %}
{% trans %}Our services were unable to verify if the http://127.0.0.1:5000/profile/{{ user_name }}/settings's password is compromised.{% endtrans %}
{% trans %}Our services were unable to verify if the {{ site_url }}/profile/{{ user_name }}/settings's password is compromised.{% endtrans %}
{% trans %}You have to check manually if the new password of the user {{ user_name }} is compromised.{% endtrans %}
{% trans %}Follow this steps : {% endtrans %}
{% trans %}1. click on the link above "Check if password is compromised".{% endtrans %}
{% trans %}2. in the page that will open, search the following hashed password in the page : {{ hashed_password }}{% endtrans %}
{% trans %}3. if the password is in the list :{% endtrans %}
{% trans %}3.1. open this link http://127.0.0.1:5000/profile/{{ user_name }}/settings and reset user's password.{% endtrans %}
{% trans %}3.1. open this link {{ site_url }}/profile/{{ user_name }}/settings and reset user's password.{% endtrans %}
{% trans %}3.2. send an email to the user to explain the situation : {{ user_email }}.{% endtrans %}
{% trans %}Check if password is compromised{% endtrans %}: {{ check_password_url }}

15
canaille/translations/messages.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-11-20 23:42+0100\n"
"POT-Creation-Date: 2024-11-26 13:31+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"
@ -41,15 +41,15 @@ msgstr ""
msgid "Field cannot be longer than {maximum_password_length} characters."
msgstr ""
#: canaille/app/forms.py:117
#: canaille/app/forms.py:120
msgid "This password appears on public compromission databases and is not secure."
msgstr ""
#: canaille/app/forms.py:281
#: canaille/app/forms.py:285
msgid "The page number is not valid"
msgstr ""
#: canaille/app/forms.py:309
#: canaille/app/forms.py:313
msgid "Not a valid datetime value."
msgstr ""
@ -1238,15 +1238,14 @@ msgstr ""
#, python-format
msgid ""
"Our services were unable to verify if the "
"http://127.0.0.1:5000/profile/%(user_name)s/settings's password is "
"compromised."
"%(site_url)s/profile/%(user_name)s/settings's password is compromised."
msgstr ""
#: canaille/core/templates/mails/compromised_password_check_failure.txt:10
#, python-format
msgid ""
"3.1. open this link http://127.0.0.1:5000/profile/%(user_name)s/settings "
"and reset user's password."
"3.1. open this link %(site_url)s/profile/%(user_name)s/settings and reset"
" user's password."
msgstr ""
#: canaille/core/templates/mails/compromised_password_check_failure.txt:11