diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb4dc756..e2ee06e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.7.2' + rev: 'v0.7.4' hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/canaille/core/templates/mails/admin.html b/canaille/core/templates/mails/admin.html index a3a4797e..c628689e 100644 --- a/canaille/core/templates/mails/admin.html +++ b/canaille/core/templates/mails/admin.html @@ -38,21 +38,33 @@ -
- {% trans %} - This form will send a dummy email to the address you want. - This should be used for testing mail configuration. - {% endtrans %} -
+ {% if features.has_smtp %} - {% call fui.render_form(form) %} - {{ fui.render_field(form.email) }} -
-
- -
+
+ {% trans %} + This form will send a dummy email to the address you want. + This should be used for testing mail configuration. + {% endtrans %}
- {% endcall %} + + {% call fui.render_form(form) %} + {{ fui.render_field(form.email) }} +
+
+ +
+
+ {% endcall %} + + {% else %} + +
+ {% trans %} + No mail server has been configured. The mail sending test is disabled. + {% endtrans %} +
+ + {% endif %}
diff --git a/canaille/translations/br/LC_MESSAGES/messages.po b/canaille/translations/br/LC_MESSAGES/messages.po index ba0b94f1..914b4184 100644 --- a/canaille/translations/br/LC_MESSAGES/messages.po +++ b/canaille/translations/br/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-28 11:57+0100\n" +"POT-Creation-Date: 2024-11-13 10:57+0100\n" "PO-Revision-Date: 2024-08-08 19:09+0000\n" "Last-Translator: Moha684 \n" "Language-Team: Breton \n" "Language-Team: German \n" "Language-Team: Spanish \n" @@ -18,38 +18,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.8.2-dev\n" +"X-Generator: Weblate 5.9-dev\n" "Generated-By: Babel 2.12.1\n" -#: canaille/app/flask.py:100 +#: canaille/app/flask.py:53 msgid "No SMTP server has been configured" msgstr "No se ha configurado un servidor SMTP" -#: canaille/app/forms.py:27 +#: canaille/app/forms.py:26 msgid "This is not a valid URL" msgstr "No es una dirección URL válida" -#: canaille/app/forms.py:34 canaille/app/forms.py:35 +#: canaille/app/forms.py:33 canaille/app/forms.py:34 msgid "This value is a duplicate" msgstr "Este valor está duplicado" -#: canaille/app/forms.py:47 +#: canaille/app/forms.py:46 msgid "Not a valid phone number" msgstr "Número de teléfono no válido" -#: canaille/app/forms.py:55 +#: canaille/app/forms.py:54 msgid "Field must be at least {minimum_password_length} characters long." msgstr "El campo debe tener al menos {minimum_password_length} caracteres." -#: canaille/app/forms.py:67 +#: canaille/app/forms.py:66 msgid "Field cannot be longer than {maximum_password_length} characters." msgstr "El campo no puede tener más de {maximum_password_length} caracteres." -#: canaille/app/forms.py:240 +#: canaille/app/forms.py:244 msgid "The page number is not valid" msgstr "El número de página no es válido" -#: canaille/app/forms.py:268 +#: canaille/app/forms.py:272 msgid "Not a valid datetime value." msgstr "No es una fecha u hora válida." @@ -703,7 +703,7 @@ msgid "Send again" msgstr "Enviar otra vez" #: canaille/core/templates/forgotten-password.html:48 -#: canaille/core/templates/mails/admin.html:52 +#: canaille/core/templates/mails/admin.html:54 msgid "Send" msgstr "Enviar" @@ -1052,7 +1052,7 @@ msgid "The user will not be able to authenticate unless the password is set" msgstr "" "El usuario no podrá iniciar sesión a menos que se establezca una contraeña" -#: canaille/core/templates/mails/admin.html:97 +#: canaille/core/templates/mails/admin.html:109 #: canaille/core/templates/mails/reset.html:19 #: canaille/core/templates/profile_settings.html:116 #: canaille/core/templates/reset-password.html:12 @@ -1169,7 +1169,7 @@ msgstr "Códigos" msgid "Mail sending test" msgstr "Prueba de envío de emails" -#: canaille/core/templates/mails/admin.html:42 +#: canaille/core/templates/mails/admin.html:44 msgid "" "This form will send a dummy email to the address you want. This should be " "used for testing mail configuration." @@ -1177,32 +1177,38 @@ msgstr "" "Este formulario enviará un correo electrónico ficticio a la dirección que " "desee. Debe utilizarse para probar la configuración del correo." -#: canaille/core/templates/mails/admin.html:61 +#: canaille/core/templates/mails/admin.html:62 +msgid "No mail server has been configured. The mail sending test is disabled." +msgstr "" +"No se ha configurado ningún servidor de correo. La prueba de envío de correo " +"está desactivada." + +#: canaille/core/templates/mails/admin.html:73 msgid "Email preview" msgstr "Previsualización del email" -#: canaille/core/templates/mails/admin.html:73 +#: canaille/core/templates/mails/admin.html:85 #: canaille/core/templates/mails/test.html:19 #: canaille/core/templates/mails/test.txt:1 msgid "Connectivity test" msgstr "Prueba de conectividad" -#: canaille/core/templates/mails/admin.html:85 +#: canaille/core/templates/mails/admin.html:97 #: canaille/core/templates/mails/firstlogin.html:19 #: canaille/core/templates/mails/reset.txt:1 msgid "Password initialization" msgstr "Inicialización de contraseña" -#: canaille/core/templates/mails/admin.html:109 +#: canaille/core/templates/mails/admin.html:121 #: canaille/core/templates/mails/email-confirmation.txt:1 msgid "Email verification" msgstr "Verificación del correo electrónico" -#: canaille/core/templates/mails/admin.html:121 +#: canaille/core/templates/mails/admin.html:133 msgid "Invitation" msgstr "Invitación" -#: canaille/core/templates/mails/admin.html:133 +#: canaille/core/templates/mails/admin.html:145 #: canaille/core/templates/mails/registration.html:19 #: canaille/core/templates/mails/registration.txt:1 msgid "Registration" diff --git a/canaille/translations/fr/LC_MESSAGES/messages.po b/canaille/translations/fr/LC_MESSAGES/messages.po index 9d0478a0..e8a2e78d 100644 --- a/canaille/translations/fr/LC_MESSAGES/messages.po +++ b/canaille/translations/fr/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: contact@yaal.coop\n" -"POT-Creation-Date: 2024-10-28 11:57+0100\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2024-11-13 10:57+0100\n" "PO-Revision-Date: 2024-11-01 09:00+0000\n" "Last-Translator: sebastien yaal \n" "Language-Team: French \n" "Language-Team: Galician \n" "Language-Team: LANGUAGE \n" @@ -21,35 +21,31 @@ msgstr "" msgid "No SMTP server has been configured" msgstr "" -#: canaille/app/forms.py:29 +#: canaille/app/forms.py:26 msgid "This is not a valid URL" msgstr "" -#: canaille/app/forms.py:36 canaille/app/forms.py:37 +#: canaille/app/forms.py:33 canaille/app/forms.py:34 msgid "This value is a duplicate" msgstr "" -#: canaille/app/forms.py:49 +#: canaille/app/forms.py:46 msgid "Not a valid phone number" msgstr "" -#: canaille/app/forms.py:57 +#: canaille/app/forms.py:54 msgid "Field must be at least {minimum_password_length} characters long." msgstr "" -#: canaille/app/forms.py:69 +#: canaille/app/forms.py:66 msgid "Field cannot be longer than {maximum_password_length} characters." msgstr "" -#: canaille/app/forms.py:111 -msgid "This password appears on public compromission databases and is not secure." -msgstr "" - -#: canaille/app/forms.py:276 +#: canaille/app/forms.py:244 msgid "The page number is not valid" msgstr "" -#: canaille/app/forms.py:304 +#: canaille/app/forms.py:272 msgid "Not a valid datetime value." msgstr "" @@ -693,7 +689,7 @@ msgid "Send again" msgstr "" #: canaille/core/templates/forgotten-password.html:48 -#: canaille/core/templates/mails/admin.html:52 +#: canaille/core/templates/mails/admin.html:54 msgid "Send" msgstr "" @@ -1014,7 +1010,7 @@ msgstr "" msgid "The user will not be able to authenticate unless the password is set" msgstr "" -#: canaille/core/templates/mails/admin.html:97 +#: canaille/core/templates/mails/admin.html:109 #: canaille/core/templates/mails/reset.html:19 #: canaille/core/templates/profile_settings.html:116 #: canaille/core/templates/reset-password.html:12 @@ -1129,38 +1125,42 @@ msgstr "" msgid "Mail sending test" msgstr "" -#: canaille/core/templates/mails/admin.html:42 +#: canaille/core/templates/mails/admin.html:44 msgid "" "This form will send a dummy email to the address you want. This should be" " used for testing mail configuration." msgstr "" -#: canaille/core/templates/mails/admin.html:61 -msgid "Email preview" +#: canaille/core/templates/mails/admin.html:62 +msgid "No mail server has been configured. The mail sending test is disabled." msgstr "" #: canaille/core/templates/mails/admin.html:73 +msgid "Email preview" +msgstr "" + +#: canaille/core/templates/mails/admin.html:85 #: canaille/core/templates/mails/test.html:19 #: canaille/core/templates/mails/test.txt:1 msgid "Connectivity test" msgstr "" -#: canaille/core/templates/mails/admin.html:85 +#: canaille/core/templates/mails/admin.html:97 #: canaille/core/templates/mails/firstlogin.html:19 #: canaille/core/templates/mails/reset.txt:1 msgid "Password initialization" msgstr "" -#: canaille/core/templates/mails/admin.html:109 +#: canaille/core/templates/mails/admin.html:121 #: canaille/core/templates/mails/email-confirmation.txt:1 msgid "Email verification" msgstr "" -#: canaille/core/templates/mails/admin.html:121 +#: canaille/core/templates/mails/admin.html:133 msgid "Invitation" msgstr "" -#: canaille/core/templates/mails/admin.html:133 +#: canaille/core/templates/mails/admin.html:145 #: canaille/core/templates/mails/registration.html:19 #: canaille/core/templates/mails/registration.txt:1 msgid "Registration" diff --git a/canaille/translations/nb_NO/LC_MESSAGES/messages.po b/canaille/translations/nb_NO/LC_MESSAGES/messages.po index 159bc96b..2d0a6c0f 100644 --- a/canaille/translations/nb_NO/LC_MESSAGES/messages.po +++ b/canaille/translations/nb_NO/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-28 11:57+0100\n" +"POT-Creation-Date: 2024-11-13 10:57+0100\n" "PO-Revision-Date: 2023-03-24 22:36+0000\n" "Last-Translator: Sofi \n" "Language-Team: Norwegian Bokmål