IT-Naturschutz
/
konova
7
1
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 21 Wiki Activity

New Notification

Browse Source 
* adds new notification setting to user settings form
* adds translations
* adds initial creating of ENUM on setup command
pull/195/head
mpeltriaux 2 years ago
parent 00336c24b9
commit 4138481a1b
5 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File

3
konova/management/commands/setup_data.py
Unescape Escape View File

@ -28,4 +28,5 @@ USER_NOTIFICATIONS_NAMES = {
"NOTIFY_ON_SHARED_DATA_RECORDED": _("On shared data recorded"),
"NOTIFY_ON_SHARED_DATA_DELETED": _("On shared data deleted"),
"NOTIFY_ON_SHARED_DATA_CHECKED": _("On shared data checked"),
}
"NOTIFY_ON_DEDUCTION_CHANGES": _("On deduction changes"),
}

BIN
locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

82
locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-08 14:39+0200\n"
"POT-Creation-Date: 2022-08-10 08:01+0200\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"
@ -55,7 +55,7 @@ msgstr "Einträge erstellt bis..."
#: analysis/forms.py:49 compensation/forms/forms.py:77
#: compensation/templates/compensation/detail/eco_account/view.html:59
#: compensation/templates/compensation/report/eco_account/report.html:16
#: compensation/utils/quality.py:113 ema/templates/ema/detail/view.html:49
#: compensation/utils/quality.py:111 ema/templates/ema/detail/view.html:49
#: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26
#: intervention/forms/forms.py:102
#: intervention/templates/intervention/detail/view.html:56
@ -297,8 +297,8 @@ msgstr "Gesetz"
#: analysis/templates/analysis/reports/includes/old_data/amount.html:17
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:33
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
#: ema/templates/ema/detail/includes/deadlines.html:28
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:33
#: ema/templates/ema/detail/includes/deadlines.html:33
msgid "Type"
msgstr "Typ"
@ -378,10 +378,10 @@ msgstr "Kompensation XY; Flur ABC"
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39
#: compensation/templates/compensation/detail/compensation/includes/documents.html:34
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:34
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:39
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:34
#: ema/templates/ema/detail/includes/actions.html:34
#: ema/templates/ema/detail/includes/deadlines.html:34
#: ema/templates/ema/detail/includes/deadlines.html:39
#: ema/templates/ema/detail/includes/documents.html:34
#: intervention/forms/forms.py:198 intervention/forms/modalForms.py:175
#: intervention/templates/intervention/detail/includes/documents.html:34
@ -399,7 +399,7 @@ msgstr "Zusätzlicher Kommentar"
#: compensation/forms/forms.py:93
#: compensation/templates/compensation/detail/eco_account/view.html:63
#: compensation/templates/compensation/report/eco_account/report.html:20
#: compensation/utils/quality.py:115 ema/templates/ema/detail/view.html:53
#: compensation/utils/quality.py:113 ema/templates/ema/detail/view.html:53
#: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28
#: intervention/forms/forms.py:130
#: intervention/templates/intervention/detail/view.html:60
@ -485,7 +485,7 @@ msgstr "Neue Kompensation"
msgid "Edit compensation"
msgstr "Bearbeite Kompensation"
#: compensation/forms/forms.py:356 compensation/utils/quality.py:97
#: compensation/forms/forms.py:356 compensation/utils/quality.py:95
msgid "Available Surface"
msgstr "Verfügbare Fläche"
@ -495,7 +495,7 @@ msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
#: compensation/forms/forms.py:368
#: compensation/templates/compensation/detail/eco_account/view.html:67
#: compensation/utils/quality.py:85
#: compensation/utils/quality.py:83
msgid "Agreement date"
msgstr "Vereinbarungsdatum"
@ -598,8 +598,8 @@ msgstr "Fristart wählen"
#: compensation/forms/modalForms.py:345
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:36
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
#: ema/templates/ema/detail/includes/deadlines.html:31
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:36
#: ema/templates/ema/detail/includes/deadlines.html:36
#: intervention/forms/modalForms.py:149
msgid "Date"
msgstr "Datum"
@ -618,8 +618,8 @@ msgstr "Geben Sie die Daten der neuen Frist ein"
#: compensation/forms/modalForms.py:389
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:64
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57
#: ema/templates/ema/detail/includes/deadlines.html:57
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:62
#: ema/templates/ema/detail/includes/deadlines.html:62
msgid "Edit deadline"
msgstr "Frist/Termin bearbeiten"
@ -803,13 +803,13 @@ msgstr "Menge"
#: compensation/templates/compensation/detail/compensation/includes/states-after.html:41
#: compensation/templates/compensation/detail/compensation/includes/states-before.html:41
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:39
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:38
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:43
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:41
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:38
#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:41
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:41
#: ema/templates/ema/detail/includes/actions.html:38
#: ema/templates/ema/detail/includes/deadlines.html:38
#: ema/templates/ema/detail/includes/deadlines.html:43
#: ema/templates/ema/detail/includes/documents.html:38
#: ema/templates/ema/detail/includes/states-after.html:40
#: ema/templates/ema/detail/includes/states-before.html:40
@ -883,12 +883,14 @@ msgid "Add new deadline"
msgstr "Frist/Termin hinzufügen"
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:25
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:25
#: ema/templates/ema/detail/includes/deadlines.html:25
msgid "Missing finished deadline "
msgstr "Umsetzungstermin fehlt"
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:67
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:60
#: ema/templates/ema/detail/includes/deadlines.html:60
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:65
#: ema/templates/ema/detail/includes/deadlines.html:65
msgid "Remove deadline"
msgstr "Frist löschen"
@ -932,7 +934,7 @@ msgstr "Dokument löschen"
#: compensation/templates/compensation/detail/compensation/includes/states-after.html:8
#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:8
#: compensation/utils/quality.py:42
#: compensation/utils/quality.py:40
#: ema/templates/ema/detail/includes/states-after.html:8
msgid "States after"
msgstr "Zielzustand"
@ -978,7 +980,7 @@ msgstr "Zustand entfernen"
#: compensation/templates/compensation/detail/compensation/includes/states-before.html:8
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:8
#: compensation/utils/quality.py:40
#: compensation/utils/quality.py:38
#: ema/templates/ema/detail/includes/states-before.html:8
msgid "States before"
msgstr "Ausgangszustand"
@ -1188,25 +1190,25 @@ msgstr "Abbuchungen für"
msgid "None"
msgstr "-"
#: compensation/utils/quality.py:37
#: compensation/utils/quality.py:35
msgid "States unequal"
msgstr "Ungleiche Zustandsflächenmengen"
#: compensation/utils/quality.py:61
#: compensation/utils/quality.py:59
msgid "Finished deadlines"
msgstr "Umsetzungstermin"
#: compensation/utils/quality.py:87 intervention/utils/quality.py:84
#: compensation/utils/quality.py:85 intervention/utils/quality.py:84
msgid "Legal data"
msgstr "Rechtliche Daten"
#: compensation/utils/quality.py:101
#: compensation/utils/quality.py:99
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:117 ema/utils/quality.py:30
#: compensation/utils/quality.py:115 ema/utils/quality.py:30
#: intervention/utils/quality.py:55
msgid "Responsible data"
msgstr "Daten zu den verantwortlichen Stellen"
@ -1220,17 +1222,17 @@ msgid "Compensation {} edited"
msgstr "Kompensation {} bearbeitet"
#: compensation/views/compensation.py:182 compensation/views/eco_account.py:173
#: ema/views.py:240 intervention/views.py:338
#: ema/views.py:241 intervention/views.py:338
msgid "Edit {}"
msgstr "Bearbeite {}"
#: compensation/views/compensation.py:269 compensation/views/eco_account.py:359
#: ema/views.py:194 intervention/views.py:542
#: compensation/views/compensation.py:269 compensation/views/eco_account.py:360
#: ema/views.py:195 intervention/views.py:542
msgid "Log"
msgstr "Log"
#: compensation/views/compensation.py:613 compensation/views/eco_account.py:727
#: ema/views.py:558 intervention/views.py:688
#: compensation/views/compensation.py:613 compensation/views/eco_account.py:728
#: ema/views.py:559 intervention/views.py:688
msgid "Report {}"
msgstr "Bericht {}"
@ -1246,36 +1248,36 @@ msgstr "Ökokonto {} hinzugefügt"
msgid "Eco-Account {} edited"
msgstr "Ökokonto {} bearbeitet"
#: compensation/views/eco_account.py:276
#: compensation/views/eco_account.py:277
msgid "Eco-account removed"
msgstr "Ökokonto entfernt"
#: compensation/views/eco_account.py:380 ema/views.py:282
#: compensation/views/eco_account.py:381 ema/views.py:283
#: intervention/views.py:641
msgid "{} unrecorded"
msgstr "{} entzeichnet"
#: compensation/views/eco_account.py:380 ema/views.py:282
#: compensation/views/eco_account.py:381 ema/views.py:283
#: intervention/views.py:641
msgid "{} recorded"
msgstr "{} verzeichnet"
#: compensation/views/eco_account.py:804 ema/views.py:628
#: compensation/views/eco_account.py:805 ema/views.py:629
#: intervention/views.py:439
msgid "{} has already been shared with you"
msgstr "{} wurde bereits für Sie freigegeben"
#: compensation/views/eco_account.py:809 ema/views.py:633
#: compensation/views/eco_account.py:810 ema/views.py:634
#: intervention/views.py:444
msgid "{} has been shared with you"
msgstr "{} ist nun für Sie freigegeben"
#: compensation/views/eco_account.py:816 ema/views.py:640
#: compensation/views/eco_account.py:817 ema/views.py:641
#: intervention/views.py:451
msgid "Share link invalid"
msgstr "Freigabelink ungültig"
#: compensation/views/eco_account.py:839 ema/views.py:663
#: compensation/views/eco_account.py:840 ema/views.py:664
#: intervention/views.py:474
msgid "Share settings updated"
msgstr "Freigabe Einstellungen aktualisiert"
@ -1316,11 +1318,11 @@ msgstr "EMAs - Übersicht"
msgid "EMA {} added"
msgstr "EMA {} hinzugefügt"
#: ema/views.py:230
#: ema/views.py:231
msgid "EMA {} edited"
msgstr "EMA {} bearbeitet"
#: ema/views.py:263
#: ema/views.py:264
msgid "EMA removed"
msgstr "EMA entfernt"
@ -1799,6 +1801,10 @@ msgstr "Wenn meine freigegebenen Daten gelöscht wurden"
msgid "On shared data checked"
msgstr "Wenn meine freigegebenen Daten geprüft wurden"
#: konova/management/commands/setup_data.py:31
msgid "On deduction changes"
msgstr "Wenn eine Abbuchung zu meinem Ökokonto verändert oder gelöscht wird"
#: konova/models/deadline.py:18
msgid "Finished"
msgstr "Umgesetzt bis"

3
user/enums.py
Unescape Escape View File

@ -13,4 +13,5 @@ class UserNotificationEnum(BaseEnum):
NOTIFY_ON_SHARED_DATA_RECORDED = "NOTIFY_ON_SHARED_DATA_RECORDED" # notifies in case data has been "verzeichnet"
NOTIFY_ON_SHARED_DATA_DELETED = "NOTIFY_ON_SHARED_DATA_DELETED" # notifies in case data has been deleted
NOTIFY_ON_SHARED_DATA_CHECKED = "NOTIFY_ON_SHARED_DATA_CHECKED" # notifies in case shared data has been checked
NOTIFY_ON_SHARED_ACCESS_GAINED = "NOTIFY_ON_SHARED_ACCESS_GAINED" # notifies in case new access has been gained
NOTIFY_ON_SHARED_ACCESS_GAINED = "NOTIFY_ON_SHARED_ACCESS_GAINED" # notifies in case new access has been gained
NOTIFY_ON_DEDUCTION_CHANGES = "NOTIFY_ON_DEDUCTION_CHANGES" # notifies in case any changes (edit|remove) have been performed on a deduction of the user's ecoaccounts

2
user/forms.py
Unescape Escape View File

@ -7,7 +7,7 @@ Created on: 08.07.21
"""
from dal import autocomplete
from django import forms
from django.db import IntegrityError, transaction
from django.db import transaction
from django.urls import reverse, reverse_lazy
from django.utils.translation import gettext_lazy as _

Write Preview
Loading…
Cancel
Save