From d05d01933d215745eb1b5d3da2013335812e2160 Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Fri, 31 Dec 2021 22:25:16 +0100 Subject: [PATCH 1/5] adjust email value to external-email as we want to use the mail attribute for postfix and dovecot it makes sense to rename the existing email attribute. The external-mail attribute can be used for communication from qzwi to members and/or others, e.g. public authorities, political contacts and so on. --- ldap_frontend/__init__.py | 2 +- ldap_frontend/templates/selfservice.html | 4 ++-- ldap_frontend/translations/de/LC_MESSAGES/messages.po | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ldap_frontend/__init__.py b/ldap_frontend/__init__.py index d5d8fa7..204c96a 100644 --- a/ldap_frontend/__init__.py +++ b/ldap_frontend/__init__.py @@ -103,7 +103,7 @@ def selfservice(ldap): request.form["givenName"], request.form["sn"], ), - "mail": request.form["mail"], + "external-mail": request.form["external-mail"], }, ) flash(gettext("user data was updated")) diff --git a/ldap_frontend/templates/selfservice.html b/ldap_frontend/templates/selfservice.html index c7d243a..e3fe419 100644 --- a/ldap_frontend/templates/selfservice.html +++ b/ldap_frontend/templates/selfservice.html @@ -37,9 +37,9 @@
- +
- +
diff --git a/ldap_frontend/translations/de/LC_MESSAGES/messages.po b/ldap_frontend/translations/de/LC_MESSAGES/messages.po index 946bcaa..6a9684c 100644 --- a/ldap_frontend/translations/de/LC_MESSAGES/messages.po +++ b/ldap_frontend/translations/de/LC_MESSAGES/messages.po @@ -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" From 52ee7464f71f78db1c56430e4019a1fa0b1ef242 Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Sun, 2 Jan 2022 23:12:28 +0100 Subject: [PATCH 2/5] adjust external-mail to new name externalMail the naming scheme complies with the ldap standards for attribute names --- ldap_frontend/__init__.py | 2 +- ldap_frontend/templates/selfservice.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ldap_frontend/__init__.py b/ldap_frontend/__init__.py index 204c96a..e901641 100644 --- a/ldap_frontend/__init__.py +++ b/ldap_frontend/__init__.py @@ -103,7 +103,7 @@ def selfservice(ldap): request.form["givenName"], request.form["sn"], ), - "external-mail": request.form["external-mail"], + "externalMail": request.form["externalMail"], }, ) flash(gettext("user data was updated")) diff --git a/ldap_frontend/templates/selfservice.html b/ldap_frontend/templates/selfservice.html index e3fe419..2a604c8 100644 --- a/ldap_frontend/templates/selfservice.html +++ b/ldap_frontend/templates/selfservice.html @@ -37,9 +37,9 @@
- +
- +
From 85c4e2628d267bb785bfa3a2a96857bbbfef8703 Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Sun, 2 Jan 2022 23:13:21 +0100 Subject: [PATCH 3/5] selfservice.html: fix external-mail vs. externalMail issue forgot to rename this occurence at first try --- ldap_frontend/templates/selfservice.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap_frontend/templates/selfservice.html b/ldap_frontend/templates/selfservice.html index 2a604c8..997a42b 100644 --- a/ldap_frontend/templates/selfservice.html +++ b/ldap_frontend/templates/selfservice.html @@ -39,7 +39,7 @@
- +
From d0f9da25cdcfe338f1973db0cc001d1cc4660d3c Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Mon, 3 Jan 2022 11:27:09 +0100 Subject: [PATCH 4/5] selfservice.html: update trans tag for externalMail --- ldap_frontend/templates/selfservice.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap_frontend/templates/selfservice.html b/ldap_frontend/templates/selfservice.html index 997a42b..49a248c 100644 --- a/ldap_frontend/templates/selfservice.html +++ b/ldap_frontend/templates/selfservice.html @@ -37,7 +37,7 @@
- +
From 9e23cea6c9fd66fd810ce1b25554e50c07d084e4 Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Mon, 3 Jan 2022 11:27:31 +0100 Subject: [PATCH 5/5] messages: update message labels and translation file --- ldap_frontend/messages.pot | 28 +++++++++---------- .../translations/de/LC_MESSAGES/messages.po | 22 +++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ldap_frontend/messages.pot b/ldap_frontend/messages.pot index 1afe15e..d88ea1e 100644 --- a/ldap_frontend/messages.pot +++ b/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 , 2021. +# FIRST AUTHOR , 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 \n" "Language-Team: LANGUAGE \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 diff --git a/ldap_frontend/translations/de/LC_MESSAGES/messages.po b/ldap_frontend/translations/de/LC_MESSAGES/messages.po index 6a9684c..1030ef8 100644 --- a/ldap_frontend/translations/de/LC_MESSAGES/messages.po +++ b/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 \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."