Browse Source

Merge pull request 'adjust email value to external-email' (#1) from adjust_mail into main

Reviewed-on: https://git.franzi.business/qzwi/ldap-frontend/pulls/1
main
Rico 3 weeks ago
parent
commit
ba5b75e45c
  1. 2
      ldap_frontend/__init__.py
  2. 28
      ldap_frontend/messages.pot
  3. 4
      ldap_frontend/templates/selfservice.html
  4. 26
      ldap_frontend/translations/de/LC_MESSAGES/messages.po

2
ldap_frontend/__init__.py

@ -103,7 +103,7 @@ def selfservice(ldap):
request.form["givenName"],
request.form["sn"],
),
"mail": request.form["mail"],
"externalMail": request.form["externalMail"],
},
)
flash(gettext("user data was updated"))

28
ldap_frontend/messages.pot

@ -1,14 +1,14 @@
# Translations template for PROJECT.
# Copyright (C) 2021 ORGANIZATION
# Copyright (C) 2022 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-12-23 09:11+0100\n"
"POT-Creation-Date: 2022-01-03 11:26+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"
@ -21,44 +21,44 @@ msgstr ""
msgid "CRSF validation error. For your own safety, you have been logged out."
msgstr ""
#: __init__.py:69
#: __init__.py:70
msgid "logged in"
msgstr ""
#: __init__.py:73
#: __init__.py:74
msgid "username or password is wrong"
msgstr ""
#: __init__.py:84
#: __init__.py:85
msgid "you have been logged out"
msgstr ""
#: __init__.py:108
#: __init__.py:109
msgid "user data was updated"
msgstr ""
#: __init__.py:125
#: __init__.py:126
msgid "current password does not match the one stored"
msgstr ""
#: __init__.py:129
#: __init__.py:130
msgid "new passwords do not match"
msgstr ""
#: __init__.py:133
#: __init__.py:134
msgid "new password must be atleast 12 characters long"
msgstr ""
#: __init__.py:143
#: __init__.py:144
msgid "your password was changed"
msgstr ""
#: __init__.py:196
#: __init__.py:198
#, python-format
msgid "%(user)s was removed from %(ou)s"
msgstr ""
#: __init__.py:211
#: __init__.py:219
#, python-format
msgid "%(user)s was added to %(ou)s"
msgstr ""
@ -108,7 +108,7 @@ msgid "given name"
msgstr ""
#: templates/selfservice.html:40
msgid "e-mail address"
msgid "external e-mail address"
msgstr ""
#: templates/selfservice.html:46

4
ldap_frontend/templates/selfservice.html

@ -37,9 +37,9 @@
</div>
<div class="row mb-3">
<label for="mail" class="form-label col-sm-2">{% trans email %}e-mail address{% endtrans %}</label>
<label for="externalMail" class="form-label col-sm-2">{% trans externalMail %}external e-mail address{% endtrans %}</label>
<div class="col-sm-10">
<input type="email" name="mail" id="mail" value="{{ CURRENT_USER["mail"]|e }}" required class="form-control">
<input type="email" name="externalMail" id="externalMail" value="{{ CURRENT_USER["externalMail"]|e }}" required class="form-control">
</div>
</div>

26
ldap_frontend/translations/de/LC_MESSAGES/messages.po

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: qzwi-ldap-frontend\n"
"Report-Msgid-Bugs-To: qzwi@kunsmann.eu\n"
"POT-Creation-Date: 2021-12-23 09:11+0100\n"
"POT-Creation-Date: 2022-01-03 11:26+0100\n"
"PO-Revision-Date: 2021-12-23 08:41+0100\n"
"Last-Translator: Franziska Kunsmann <qzwi@kunsmann.eu>\n"
"Language: de\n"
@ -22,44 +22,44 @@ msgstr ""
"Formularvalidierung fehlgeschlagen. Zu deiner Sicherheit wurdest du "
"abgemeldet."
#: __init__.py:69
#: __init__.py:70
msgid "logged in"
msgstr "Erfolgreich angemeldet"
#: __init__.py:73
#: __init__.py:74
msgid "username or password is wrong"
msgstr "Der eingegebene Benutzername existiert nicht oder das Passwort ist falsch."
#: __init__.py:84
#: __init__.py:85
msgid "you have been logged out"
msgstr "Du wurdest abgemeldet."
#: __init__.py:108
#: __init__.py:109
msgid "user data was updated"
msgstr "Die Benutzerdaten wurden geändert."
#: __init__.py:125
#: __init__.py:126
msgid "current password does not match the one stored"
msgstr "Das eingegebene Passwort stimmt nicht mit dem bisherigen überein."
#: __init__.py:129
#: __init__.py:130
msgid "new passwords do not match"
msgstr "Das neue Passwort stimmt nicht mit der Wiederholung überein."
#: __init__.py:133
#: __init__.py:134
msgid "new password must be atleast 12 characters long"
msgstr "Dein neues Passwort muss mindestens 12 Zeichen lang sein."
#: __init__.py:143
#: __init__.py:144
msgid "your password was changed"
msgstr "Dein Passwort wurde geändert."
#: __init__.py:196
#: __init__.py:198
#, python-format
msgid "%(user)s was removed from %(ou)s"
msgstr "%(user)s wurde aus %(ou)s entfernt."
#: __init__.py:211
#: __init__.py:219
#, python-format
msgid "%(user)s was added to %(ou)s"
msgstr "%(user)s wurde zu %(ou)s hinzugefügt."
@ -109,8 +109,8 @@ msgid "given name"
msgstr "Vorname"
#: templates/selfservice.html:40
msgid "e-mail address"
msgstr "E-Mail-Adresse"
msgid "external e-mail address"
msgstr "Externe E-Mail-Adresse"
#: templates/selfservice.html:46
msgid "Update"

Loading…
Cancel
Save