qzwi/ldap-frontend
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

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

Browse source 
This reverts commit ba5b75e45c, reversing
changes made to c12c58e4dc.
This commit is contained in:
Franzi 2022-02-25 15:25:13 +01:00
parent ba5b75e45c
commit 712dc16447
Signed by: kunsi
GPG key ID: 12E3D2136B818350
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ldap_frontend/__init__.py
View file

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

28
ldap_frontend/messages.pot
View file

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

4
ldap_frontend/templates/selfservice.html
View file

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

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

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