From 35319970804daf8ec5d9b946f868114757ae5c2b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 12 Jan 2022 14:17:12 +0100 Subject: [PATCH] # 63 Mail shared access revoked * adds mail support for revoking shared access * adds/updates translations --- konova/sub_settings/django_settings.py | 10 ++- konova/utils/mailer.py | 6 +- locale/de/LC_MESSAGES/django.mo | Bin 29910 -> 30761 bytes locale/de/LC_MESSAGES/django.po | 83 +++++++++++++----- .../email/sharing/shared_access_removed.html | 27 ++++++ templates/email/signature.html | 10 +++ 6 files changed, 109 insertions(+), 27 deletions(-) create mode 100644 templates/email/signature.html diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py index 199ab17a..bc1a7511 100644 --- a/konova/sub_settings/django_settings.py +++ b/konova/sub_settings/django_settings.py @@ -204,9 +204,15 @@ DEBUG_TOOLBAR_CONFIG = { } # EMAIL (see https://docs.djangoproject.com/en/dev/topics/email/) -DEFAULT_FROM_EMAIL = "bot@arneo.de" # The default email address for the 'from' element + +# CHANGE_ME !!! ONLY FOR DEVELOPMENT !!! +EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' +EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location + +DEFAULT_FROM_EMAIL = "service@ksp.de" # The default email address for the 'from' element EMAIL_HOST = "localhost" -EMAIL_PORT = "1025" +EMAIL_REPLY_TO = "ksp-servicestelle@sgdnord.rlp.de" +EMAIL_PORT = "25" #EMAIL_HOST_USER = "" #EMAIL_HOST_PASSWORD = "" EMAIL_USE_TLS = False diff --git a/konova/utils/mailer.py b/konova/utils/mailer.py index cc25f660..ab2ddcaf 100644 --- a/konova/utils/mailer.py +++ b/konova/utils/mailer.py @@ -11,7 +11,7 @@ from django.core.mail import send_mail from django.template.loader import render_to_string from django.utils.translation import gettext_lazy as _ -from konova.sub_settings.django_settings import DEFAULT_FROM_EMAIL +from konova.sub_settings.django_settings import DEFAULT_FROM_EMAIL, EMAIL_REPLY_TO logger = logging.getLogger(__name__) @@ -40,7 +40,8 @@ class Mailer: """ return send_mail( subject=subject, - message=msg, + message=None, + html_message=msg, from_email=self.from_mail, recipient_list=recipient_list, fail_silently=self.fail_silently, @@ -60,6 +61,7 @@ class Mailer: context = { "user": user, "obj": obj, + "EMAIL_REPLY_TO": EMAIL_REPLY_TO, } msg = render_to_string("email/sharing/shared_access_removed.html", context) user_mail_address = [user.email] diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 37299851a48bd993a37c2dea089bb4b52d56c980..3143958dea20cdf80285e35243f4906d9e3b0fd0 100644 GIT binary patch delta 10133 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 KSCd|`;eP?5b0SCp delta 9196 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\n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "Bis" #: analysis/forms.py:47 compensation/forms/forms.py:77 #: compensation/templates/compensation/detail/eco_account/view.html:58 #: compensation/templates/compensation/report/eco_account/report.html:16 -#: compensation/utils/quality.py:112 ema/templates/ema/detail/view.html:49 +#: compensation/utils/quality.py:100 ema/templates/ema/detail/view.html:49 #: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26 #: intervention/forms/forms.py:100 #: intervention/templates/intervention/detail/view.html:56 @@ -140,7 +140,7 @@ msgstr "Zuständigkeitsbereich" #: compensation/templates/compensation/detail/compensation/view.html:63 #: intervention/tables.py:33 #: intervention/templates/intervention/detail/view.html:68 -#: user/models/user_action.py:19 +#: user/models/user_action.py:18 msgid "Checked" msgstr "Geprüft" @@ -159,7 +159,7 @@ msgstr "Geprüft" #: ema/tables.py:38 ema/templates/ema/detail/view.html:35 #: intervention/tables.py:39 #: intervention/templates/intervention/detail/view.html:82 -#: user/models/user_action.py:20 +#: user/models/user_action.py:19 msgid "Recorded" msgstr "Verzeichnet" @@ -374,7 +374,7 @@ msgstr "Zusätzlicher Kommentar" #: compensation/forms/forms.py:93 #: compensation/templates/compensation/detail/eco_account/view.html:62 #: compensation/templates/compensation/report/eco_account/report.html:20 -#: compensation/utils/quality.py:114 ema/templates/ema/detail/view.html:53 +#: compensation/utils/quality.py:102 ema/templates/ema/detail/view.html:53 #: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28 #: intervention/forms/forms.py:128 #: intervention/templates/intervention/detail/view.html:60 @@ -434,7 +434,7 @@ msgstr "Neue Kompensation" msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:302 compensation/utils/quality.py:96 +#: compensation/forms/forms.py:302 compensation/utils/quality.py:84 msgid "Available Surface" msgstr "Verfügbare Fläche" @@ -444,7 +444,7 @@ msgstr "Die für Abbuchungen zur Verfügung stehende Menge" #: compensation/forms/forms.py:314 #: compensation/templates/compensation/detail/eco_account/view.html:66 -#: compensation/utils/quality.py:84 +#: compensation/utils/quality.py:72 msgid "Agreement date" msgstr "Vereinbarungsdatum" @@ -962,7 +962,7 @@ msgstr "Eingriffskennung" #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:37 #: intervention/templates/intervention/detail/includes/deductions.html:34 -#: user/models/user_action.py:22 +#: user/models/user_action.py:21 msgid "Created" msgstr "Erstellt" @@ -1040,21 +1040,17 @@ msgstr "-" msgid "States unequal" msgstr "Ungleiche Zustandsflächenmengen" -#: compensation/utils/quality.py:72 -msgid "Not recorded" -msgstr "Noch nicht verzeichnet" - -#: compensation/utils/quality.py:86 intervention/utils/quality.py:84 +#: compensation/utils/quality.py:74 intervention/utils/quality.py:84 msgid "Legal data" msgstr "Rechtliche Daten" -#: compensation/utils/quality.py:100 +#: compensation/utils/quality.py:88 msgid "Deductable surface can not be larger than state surface" msgstr "" "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht " "überschreiten" -#: compensation/utils/quality.py:116 ema/utils/quality.py:30 +#: compensation/utils/quality.py:104 ema/utils/quality.py:30 #: intervention/utils/quality.py:55 msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" @@ -1757,6 +1753,10 @@ msgstr "In Zwischenablage kopiert" msgid "Document '{}' deleted" msgstr "Dokument '{}' gelöscht" +#: konova/utils/mailer.py:70 +msgid "{} - Shared access removed" +msgstr "{} - Zugriff entzogen" + #: konova/utils/message_templates.py:11 msgid "There was an error on this form." msgstr "Es gab einen Fehler im Formular." @@ -1871,6 +1871,40 @@ msgstr "Alle" msgid "News" msgstr "Neuigkeiten" +#: templates/email/sharing/shared_access_removed.html:2 +msgid "Shared access removed" +msgstr "Freigegebener Zugriff entzogen" + +#: templates/email/sharing/shared_access_removed.html:6 +msgid "Hello " +msgstr "Hallo " + +#: templates/email/sharing/shared_access_removed.html:8 +msgid "" +"your shared access, including editing, has been revoked for the dataset " +msgstr "" +"Ihnen wurde soeben der bearbeitende Zugriff auf den folgenden Datensatz entzogen: " + +#: templates/email/sharing/shared_access_removed.html:13 +msgid "However, you are still able to view the dataset content." +msgstr "Sie können den Datensatz aber immer noch im KSP einsehen." + +#: templates/email/sharing/shared_access_removed.html:14 +msgid "Please use the provided search filter on the dataset`s overview pages to find them." +msgstr "Nutzen Sie hierzu einfach die entsprechenden Suchfilter auf den Übersichtsseiten" + +#: templates/email/sharing/shared_access_removed.html:18 +msgid "Best regards" +msgstr "Beste Grüße" + +#: templates/email/signature.html:6 +msgid "Please do not reply on this mail." +msgstr "Bitte antworten Sie nicht auf diese Mail." + +#: templates/email/signature.html:8 +msgid "If needed, please contact " +msgstr "Bei Rückfragen, wenden Sie sich bitte an " + #: templates/footer.html:6 msgid "Help" msgstr "Hilfe" @@ -2026,31 +2060,31 @@ msgstr "Wann wollen Sie per E-Mail benachrichtigt werden?" msgid "Edit notifications" msgstr "Benachrichtigungen bearbeiten" -#: user/forms.py:76 user/templates/user/index.html:9 +#: user/forms.py:72 user/templates/user/index.html:9 msgid "Username" msgstr "Nutzername" -#: user/forms.py:87 +#: user/forms.py:83 msgid "Person name" msgstr "Name" -#: user/forms.py:98 user/templates/user/index.html:17 +#: user/forms.py:94 user/templates/user/index.html:17 msgid "E-Mail" msgstr "" -#: user/forms.py:112 +#: user/forms.py:108 msgid "User contact data" msgstr "Kontaktdaten" -#: user/models/user_action.py:21 +#: user/models/user_action.py:20 msgid "Unrecorded" msgstr "Entzeichnet" -#: user/models/user_action.py:23 +#: user/models/user_action.py:22 msgid "Edited" msgstr "Bearbeitet" -#: user/models/user_action.py:24 +#: user/models/user_action.py:23 msgid "Deleted" msgstr "Gelöscht" @@ -2095,7 +2129,7 @@ msgstr "Benachrichtigungseinstellungen ändern" msgid "Notification settings" msgstr "Benachrichtigungen" -#: user/views.py:56 +#: user/views.py:52 msgid "Notifications edited" msgstr "Benachrichtigungen bearbeitet" @@ -3602,6 +3636,9 @@ msgstr "" msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" +#~ msgid "Not recorded" +#~ msgstr "Noch nicht verzeichnet" + #~ msgid "On new related data" #~ msgstr "Wenn neue Daten für mich angelegt werden" diff --git a/templates/email/sharing/shared_access_removed.html b/templates/email/sharing/shared_access_removed.html index e69de29b..529252c3 100644 --- a/templates/email/sharing/shared_access_removed.html +++ b/templates/email/sharing/shared_access_removed.html @@ -0,0 +1,27 @@ +{% load i18n %} + +
+

{% trans 'Shared access removed' %}

+

{{obj.identifier}}

+
+
+ {% trans 'Hello ' %} {{user.username}}, +
+ {% trans 'your shared access, including editing, has been revoked for the dataset ' %} +
+ '{{obj.identifier}}' +
+ {% trans 'However, you are still able to view the dataset content.' %} + {% trans 'Please use the provided search filter on the dataset`s overview pages to find them.' %} +
+
+ {% trans 'Best regards' %} +
+ KSP +
+
+
+ {% include 'email/signature.html' %} +
+
+ diff --git a/templates/email/signature.html b/templates/email/signature.html new file mode 100644 index 00000000..48f09095 --- /dev/null +++ b/templates/email/signature.html @@ -0,0 +1,10 @@ +{% load i18n %} + +
+
+ + {% trans 'Please do not reply on this mail.' %} +
+ {% trans 'If needed, please contact ' %} {{EMAIL_REPLY_TO}}. + +
\ No newline at end of file