Merge pull request 'master' (#311) from master into Docker

Reviewed-on: SGD-Nord/konova#311
2023-03-13 07:00:49 +01:00 · 2023-03-13 07:00:49 +01:00 · 474fc2f71b
commit 474fc2f71b
parent 07a5d7cc3b 5fb4f61683
10 changed files with 214 additions and 119 deletions
--- a/compensation/models/compensation.py
+++ b/compensation/models/compensation.py
@ -328,6 +328,20 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
        # Compensations inherit their shared state from the interventions
        return self.intervention.is_shared_with(user)

+    def is_only_shared_with(self, user: User):
+        """ Share check
+
+        Checks whether a given user is the only one having shared access to this entry
+
+        Args:
+            user (User): The user to be checked
+
+        Returns:
+
+        """
+        # Compensations inherit their shared state from the interventions
+        return self.intervention.is_only_shared_with(user)
+
    def share_with_user(self, user: User):
        """ Adds user to list of shared access users

--- a/compensation/views/compensation/compensation.py
+++ b/compensation/views/compensation/compensation.py
@ -26,7 +26,7 @@ from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
    RECORDED_BLOCKS_EDIT, CHECKED_RECORDED_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
-    COMPENSATION_ADDED_TEMPLATE
+    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE
 from konova.utils.user_checks import in_group


@ -236,6 +236,13 @@ def detail_view(request: HttpRequest, id: str):
    if last_checked:
        last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)

+    requesting_user_is_only_shared_user = comp.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
    context = {
        "obj": comp,
        "last_checked": last_checked,
--- a/compensation/views/eco_account/eco_account.py
+++ b/compensation/views/eco_account/eco_account.py
@ -22,7 +22,7 @@ from konova.forms import SimpleGeomForm
 from konova.settings import ETS_GROUP, DEFAULT_GROUP, ZB_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
-    IDENTIFIER_REPLACED
+    IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE
 from konova.utils.user_checks import in_group


@ -213,6 +213,13 @@ def detail_view(request: HttpRequest, id: str):

    request = acc.set_status_messages(request)

+    requesting_user_is_only_shared_user = acc.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
    context = {
        "obj": acc,
        "geom_form": geom_form,
--- a/ema/views/ema.py
+++ b/ema/views/ema.py
@ -22,7 +22,8 @@ from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
+    DO_NOT_FORGET_TO_SHARE
 from konova.utils.user_checks import in_group


@ -148,6 +149,13 @@ def detail_view(request: HttpRequest, id: str):

    ema.set_status_messages(request)

+    requesting_user_is_only_shared_user = ema.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
    context = {
        "obj": ema,
        "geom_form": geom_form,
--- a/intervention/views/intervention.py
+++ b/intervention/views/intervention.py
@ -22,7 +22,7 @@ from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import DATA_CHECKED_PREVIOUSLY_TEMPLATE, RECORDED_BLOCKS_EDIT, \
-    CHECKED_RECORDED_RESET, FORM_INVALID, IDENTIFIER_REPLACED
+    CHECKED_RECORDED_RESET, FORM_INVALID, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE
 from konova.utils.user_checks import in_group


@ -167,6 +167,13 @@ def detail_view(request: HttpRequest, id: str):

    has_payment_without_document = intervention.payments.exists() and not intervention.get_documents()[1].exists()

+    requesting_user_is_only_shared_user = intervention.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
    context = {
        "obj": intervention,
        "last_checked": last_checked,
--- a/konova/models/object.py
+++ b/konova/models/object.py
@ -516,6 +516,24 @@ class ShareableObjectMixin(models.Model):
        is_shared = directly_shared or team_shared
        return is_shared

+    def is_only_shared_with(self, user):
+        """ Sharing check
+
+        Checks whether a given user is the only shared user for this object.
+        There should be no shared teams as well.
+
+        Args:
+            user ():
+
+        Returns:
+
+        """
+        has_shared_teams = self.shared_teams.exists()
+        shared_users = self.shared_users
+        is_only_shared_user = user in shared_users and shared_users.count() == 1
+
+        return not has_shared_teams and is_only_shared_user
+
    def share_with_team(self, team):
        """ Adds team to list of shared access teans

--- a/konova/settings.py
+++ b/konova/settings.py
@ -20,6 +20,8 @@ from konova.sub_settings.table_settings import *
 from konova.sub_settings.lanis_settings import *
 from konova.sub_settings.wfs_parcel_settings import *

+# Max upload size for POST forms
+DATA_UPLOAD_MAX_MEMORY_SIZE = 5242880

 # ALLOWED FILE UPLOAD DEFINITIONS
 # Default: Upload into upper folder of code
--- a/konova/utils/message_templates.py
+++ b/konova/utils/message_templates.py
@ -23,6 +23,7 @@ RECORDED_BLOCKS_EDIT = _("Entry is recorded. To edit data, the entry first needs
 DATA_UNSHARED = _("This data is not shared with you")
 DATA_UNSHARED_EXPLANATION = _("Remember: This data has not been shared with you, yet. This means you can only read but can not edit or perform any actions like running a check or recording.")
 DATA_SHARE_SET = _("Share settings updated")
+DO_NOT_FORGET_TO_SHARE = _("Do not forget to share your entry! Currently you are the only one having shared access.")

 # FILES
 FILE_TYPE_UNSUPPORTED = _("Unsupported file type")
--- a/locale/de/LC_MESSAGES/django.mo
+++ b/locale/de/LC_MESSAGES/django.mo
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-23 08:48+0100\n"
+"POT-Creation-Date: 2023-03-07 07:09+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"
@ -72,7 +72,7 @@ msgstr "Einträge erstellt bis..."
 #: analysis/forms.py:49 compensation/forms/mixins.py:21
 #: compensation/templates/compensation/detail/eco_account/view.html:59
 #: compensation/templates/compensation/report/eco_account/report.html:16
-#: compensation/utils/quality.py:111 ema/templates/ema/detail/view.html:49
+#: compensation/utils/quality.py:112 ema/templates/ema/detail/view.html:49
 #: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26
 #: intervention/forms/intervention.py:104
 #: intervention/templates/intervention/detail/view.html:56
@ -200,7 +200,7 @@ msgstr "Geprüft"
 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:23
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:19
-#: compensation/tables/compensation.py:44 compensation/tables/eco_account.py:48
+#: compensation/tables/compensation.py:44 compensation/tables/eco_account.py:49
 #: compensation/templates/compensation/detail/compensation/view.html:93
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31
 #: compensation/templates/compensation/detail/eco_account/view.html:45
@ -335,7 +335,7 @@ msgid "Intervention"
 msgstr "Eingriff"

 #: analysis/templates/analysis/reports/includes/old_data/amount.html:34
-#: compensation/tables/eco_account.py:92
+#: compensation/tables/eco_account.py:93
 #: compensation/templates/compensation/detail/eco_account/view.html:20
 #: intervention/forms/modals/deduction.py:31
 #: intervention/forms/modals/deduction.py:38
@ -357,7 +357,7 @@ msgid "Show only unrecorded"
 msgstr "Nur unverzeichnete anzeigen"

 #: compensation/forms/compensation.py:30 compensation/tables/compensation.py:23
-#: compensation/tables/eco_account.py:23 ema/tables.py:26
+#: compensation/tables/eco_account.py:24 ema/tables.py:26
 #: intervention/forms/intervention.py:29 intervention/tables.py:23
 #: intervention/templates/intervention/detail/includes/compensations.html:30
 msgid "Identifier"
@ -369,7 +369,7 @@ msgid "Generated automatically - not editable"
 msgstr "Automatisch generiert - nicht bearbeitbar"

 #: compensation/forms/compensation.py:43 compensation/tables/compensation.py:28
-#: compensation/tables/eco_account.py:28
+#: compensation/tables/eco_account.py:29
 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28
 #: compensation/templates/compensation/detail/compensation/view.html:32
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
@ -446,7 +446,7 @@ msgstr "Neue Kompensation"
 msgid "Edit compensation"
 msgstr "Bearbeite Kompensation"

-#: compensation/forms/eco_account.py:30 compensation/utils/quality.py:95
+#: compensation/forms/eco_account.py:30 compensation/utils/quality.py:96
 msgid "Available Surface"
 msgstr "Verfügbare Fläche"

@ -456,7 +456,7 @@ msgstr "Die für Abbuchungen zur Verfügung stehende Menge"

 #: compensation/forms/eco_account.py:42
 #: compensation/templates/compensation/detail/eco_account/view.html:67
-#: compensation/utils/quality.py:83
+#: compensation/utils/quality.py:84
 msgid "Agreement date"
 msgstr "Vereinbarungsdatum"

@ -486,7 +486,7 @@ msgstr ""
 #: compensation/forms/mixins.py:37
 #: compensation/templates/compensation/detail/eco_account/view.html:63
 #: compensation/templates/compensation/report/eco_account/report.html:20
-#: compensation/utils/quality.py:113 ema/templates/ema/detail/view.html:53
+#: compensation/utils/quality.py:114 ema/templates/ema/detail/view.html:53
 #: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28
 #: intervention/forms/intervention.py:132
 #: intervention/templates/intervention/detail/view.html:60
@ -759,23 +759,23 @@ msgstr ""
 "Es wurde bereits mehr Fläche abgebucht, als Sie nun als abbuchbar einstellen "
 "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!"

-#: compensation/tables/compensation.py:33 compensation/tables/eco_account.py:33
+#: compensation/tables/compensation.py:33 compensation/tables/eco_account.py:34
 #: ema/tables.py:36 intervention/tables.py:33
 #: konova/filters/mixins/geo_reference.py:42
 msgid "Parcel gmrkng"
 msgstr "Gemarkung"

-#: compensation/tables/compensation.py:50 compensation/tables/eco_account.py:54
+#: compensation/tables/compensation.py:50 compensation/tables/eco_account.py:55
 #: ema/tables.py:47 intervention/tables.py:50
 msgid "Editable"
 msgstr "Freigegeben"

-#: compensation/tables/compensation.py:56 compensation/tables/eco_account.py:60
+#: compensation/tables/compensation.py:56 compensation/tables/eco_account.py:61
 #: ema/tables.py:53 intervention/tables.py:56
 msgid "Last edit"
 msgstr "Zuletzt bearbeitet"

-#: compensation/tables/compensation.py:87 compensation/tables/eco_account.py:92
+#: compensation/tables/compensation.py:87 compensation/tables/eco_account.py:93
 #: ema/tables.py:86 intervention/tables.py:87
 msgid "Open {}"
 msgstr "Öffne {}"
@ -791,22 +791,22 @@ msgid "Not recorded yet"
 msgstr "Noch nicht verzeichnet"

 #: compensation/tables/compensation.py:144
-#: compensation/tables/eco_account.py:131 ema/tables.py:108
+#: compensation/tables/eco_account.py:133 ema/tables.py:108
 #: intervention/tables.py:142
 msgid "Recorded on {} by {}"
 msgstr "Am {} von {} verzeichnet worden"

-#: compensation/tables/eco_account.py:38
+#: compensation/tables/eco_account.py:39
 #: compensation/templates/compensation/detail/eco_account/view.html:36
 #: konova/templates/konova/widgets/progressbar.html:3
 msgid "Available"
 msgstr "Verfügbar"

-#: compensation/tables/eco_account.py:69
+#: compensation/tables/eco_account.py:70
 msgid "Eco Accounts"
 msgstr "Ökokonten"

-#: compensation/tables/eco_account.py:128
+#: compensation/tables/eco_account.py:130
 msgid "Not recorded yet. Can not be used for deductions, yet."
 msgstr ""
 "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden."
@ -1012,7 +1012,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:40
+#: compensation/utils/quality.py:41
 #: ema/templates/ema/detail/includes/states-after.html:8
 msgid "States after"
 msgstr "Zielzustand"
@ -1058,7 +1058,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:38
+#: compensation/utils/quality.py:39
 #: ema/templates/ema/detail/includes/states-before.html:8
 msgid "States before"
 msgstr "Ausgangszustand"
@ -1250,25 +1250,25 @@ msgstr "Abbuchungen für"
 msgid "None"
 msgstr "-"

-#: compensation/utils/quality.py:35
+#: compensation/utils/quality.py:36
 msgid "States unequal"
 msgstr "Ungleiche Zustandsflächenmengen"

-#: compensation/utils/quality.py:59
+#: compensation/utils/quality.py:60
 msgid "Finished deadlines"
 msgstr "Umsetzungstermin"

-#: compensation/utils/quality.py:85 intervention/utils/quality.py:97
+#: compensation/utils/quality.py:86 intervention/utils/quality.py:97
 msgid "Legal data"
 msgstr "Rechtliche Daten"

-#: compensation/utils/quality.py:99
+#: compensation/utils/quality.py:100
 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:115 ema/utils/quality.py:30
+#: compensation/utils/quality.py:116 ema/utils/quality.py:30
 #: intervention/utils/quality.py:68
 msgid "Responsible data"
 msgstr "Daten zu den verantwortlichen Stellen"
@ -1278,13 +1278,13 @@ msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"

 #: compensation/views/compensation/compensation.py:177
-#: konova/utils/message_templates.py:37
+#: konova/utils/message_templates.py:38
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"

 #: compensation/views/compensation/compensation.py:187
 #: compensation/views/eco_account/eco_account.py:161 ema/views/ema.py:212
-#: intervention/views/intervention.py:231
+#: intervention/views/intervention.py:243
 msgid "Edit {}"
 msgstr "Bearbeite {}"

@ -1653,11 +1653,11 @@ msgstr "Eingriffe - Übersicht"
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"

-#: intervention/views/intervention.py:219
+#: intervention/views/intervention.py:231
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"

-#: intervention/views/intervention.py:256
+#: intervention/views/intervention.py:268
 msgid "{} removed"
 msgstr "{} entfernt"

@ -1989,31 +1989,31 @@ msgstr "{} - Zugriff entzogen"
 msgid "{} - Shared access given"
 msgstr "{} - Zugriff freigegeben"

-#: konova/utils/mailer.py:182 konova/utils/mailer.py:346
+#: konova/utils/mailer.py:182 konova/utils/mailer.py:347
 msgid "{} - Shared data unrecorded"
 msgstr "{} - Freigegebene Daten entzeichnet"

-#: konova/utils/mailer.py:210 konova/utils/mailer.py:319
+#: konova/utils/mailer.py:210 konova/utils/mailer.py:320
 msgid "{} - Shared data recorded"
 msgstr "{} - Freigegebene Daten verzeichnet"

-#: konova/utils/mailer.py:238 konova/utils/mailer.py:400
+#: konova/utils/mailer.py:238 konova/utils/mailer.py:401
 msgid "{} - Shared data checked"
 msgstr "{} - Freigegebene Daten geprüft"

-#: konova/utils/mailer.py:265 konova/utils/mailer.py:428
+#: konova/utils/mailer.py:265 konova/utils/mailer.py:429
 msgid "{} - Deduction changed"
 msgstr "{} - Abbuchung geändert"

-#: konova/utils/mailer.py:293 konova/utils/mailer.py:373
+#: konova/utils/mailer.py:293 konova/utils/mailer.py:374
 msgid "{} - Shared data deleted"
 msgstr "{} - Freigegebene Daten gelöscht"

-#: konova/utils/mailer.py:449 templates/email/api/verify_token.html:4
+#: konova/utils/mailer.py:450 templates/email/api/verify_token.html:4
 msgid "Request for new API token"
 msgstr "Anfrage für neuen API Token"

-#: konova/utils/mailer.py:474
+#: konova/utils/mailer.py:475
 msgid "Resubmission - {}"
 msgstr "Wiedervorlage - {}"

@ -2090,15 +2090,22 @@ msgstr ""
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"

-#: konova/utils/message_templates.py:28
+#: konova/utils/message_templates.py:26
+msgid ""
+"Do not forget to share your entry! Currently you are the only one having "
+"shared access."
+msgstr ""
+"Denken Sie daran Ihren Eintrag freizugeben! Aktuell haben nur Sie eine Freigabe hierauf."
+
+#: konova/utils/message_templates.py:29
 msgid "Unsupported file type"
 msgstr "Dateiformat nicht unterstützt"

-#: konova/utils/message_templates.py:29
+#: konova/utils/message_templates.py:30
 msgid "File too large"
 msgstr "Datei zu groß"

-#: konova/utils/message_templates.py:32
+#: konova/utils/message_templates.py:33
 msgid ""
 "Action canceled. Eco account is recorded or deductions exist. Only "
 "conservation office member can perform this action."
@ -2106,136 +2113,136 @@ msgstr ""
 "Aktion abgebrochen. Ökokonto ist bereits verzeichnet oder Abbuchungen liegen "
 "vor. Nur Eintragungsstellennutzer können diese Aktion jetzt durchführen."

-#: konova/utils/message_templates.py:35
+#: konova/utils/message_templates.py:36
 msgid "Compensation {} added"
 msgstr "Kompensation {} hinzugefügt"

-#: konova/utils/message_templates.py:36
+#: konova/utils/message_templates.py:37
 msgid "Compensation {} removed"
 msgstr "Kompensation {} entfernt"

-#: konova/utils/message_templates.py:38
+#: konova/utils/message_templates.py:39
 msgid "Added compensation action"
 msgstr "Maßnahme hinzugefügt"

-#: konova/utils/message_templates.py:39
+#: konova/utils/message_templates.py:40
 msgid "Added compensation state"
 msgstr "Zustand hinzugefügt"

-#: konova/utils/message_templates.py:42
+#: konova/utils/message_templates.py:43
 msgid "State removed"
 msgstr "Zustand gelöscht"

-#: konova/utils/message_templates.py:43
+#: konova/utils/message_templates.py:44
 msgid "State edited"
 msgstr "Zustand bearbeitet"

-#: konova/utils/message_templates.py:44
+#: konova/utils/message_templates.py:45
 msgid "State added"
 msgstr "Zustand hinzugefügt"

-#: konova/utils/message_templates.py:47
+#: konova/utils/message_templates.py:48
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"

-#: konova/utils/message_templates.py:48
+#: konova/utils/message_templates.py:49
 msgid "Action edited"
 msgstr "Maßnahme bearbeitet"

-#: konova/utils/message_templates.py:49
+#: konova/utils/message_templates.py:50
 msgid "Action removed"
 msgstr "Maßnahme entfernt"

-#: konova/utils/message_templates.py:52
+#: konova/utils/message_templates.py:53
 msgid "Deduction added"
 msgstr "Abbuchung hinzugefügt"

-#: konova/utils/message_templates.py:53
+#: konova/utils/message_templates.py:54
 msgid "Deduction edited"
 msgstr "Abbuchung bearbeitet"

-#: konova/utils/message_templates.py:54
+#: konova/utils/message_templates.py:55
 msgid "Deduction removed"
 msgstr "Abbuchung entfernt"

-#: konova/utils/message_templates.py:55
+#: konova/utils/message_templates.py:56
 msgid "Unknown deduction"
 msgstr "Unbekannte Abbuchung"

-#: konova/utils/message_templates.py:58
+#: konova/utils/message_templates.py:59
 msgid "Deadline added"
 msgstr "Frist/Termin hinzugefügt"

-#: konova/utils/message_templates.py:59
+#: konova/utils/message_templates.py:60
 msgid "Deadline edited"
 msgstr "Frist/Termin bearbeitet"

-#: konova/utils/message_templates.py:60
+#: konova/utils/message_templates.py:61
 msgid "Deadline removed"
 msgstr "Frist/Termin gelöscht"

-#: konova/utils/message_templates.py:63
+#: konova/utils/message_templates.py:64
 msgid "Payment added"
 msgstr "Zahlung hinzugefügt"

-#: konova/utils/message_templates.py:64
+#: konova/utils/message_templates.py:65
 msgid "Payment edited"
 msgstr "Zahlung bearbeitet"

-#: konova/utils/message_templates.py:65
+#: konova/utils/message_templates.py:66
 msgid "Payment removed"
 msgstr "Zahlung gelöscht"

-#: konova/utils/message_templates.py:68
+#: konova/utils/message_templates.py:69
 msgid "Revocation added"
 msgstr "Widerspruch hinzugefügt"

-#: konova/utils/message_templates.py:69
+#: konova/utils/message_templates.py:70
 msgid "Revocation edited"
 msgstr "Widerspruch bearbeitet"

-#: konova/utils/message_templates.py:70
+#: konova/utils/message_templates.py:71
 msgid "Revocation removed"
 msgstr "Widerspruch entfernt"

-#: konova/utils/message_templates.py:73
+#: konova/utils/message_templates.py:74
 msgid "Document '{}' deleted"
 msgstr "Dokument '{}' gelöscht"

-#: konova/utils/message_templates.py:74
+#: konova/utils/message_templates.py:75
 msgid "Document added"
 msgstr "Dokument hinzugefügt"

-#: konova/utils/message_templates.py:75
+#: konova/utils/message_templates.py:76
 msgid "Document edited"
 msgstr "Dokument bearbeitet"

-#: konova/utils/message_templates.py:78
+#: konova/utils/message_templates.py:79
 msgid "Edited general data"
 msgstr "Allgemeine Daten bearbeitet"

-#: konova/utils/message_templates.py:79
+#: konova/utils/message_templates.py:80
 msgid "Added deadline"
 msgstr "Frist/Termin hinzugefügt"

-#: konova/utils/message_templates.py:82
+#: konova/utils/message_templates.py:83
 msgid "Geometry conflict detected with {}"
 msgstr "Geometriekonflikt mit folgenden Einträgen erkannt: {}"

-#: konova/utils/message_templates.py:85
+#: konova/utils/message_templates.py:86
 msgid "This intervention has {} revocations"
 msgstr "Dem Eingriff liegen {} Widersprüche vor"

-#: konova/utils/message_templates.py:88
+#: konova/utils/message_templates.py:89
 msgid "Checked on {} by {}"
 msgstr "Am {} von {} geprüft worden"

-#: konova/utils/message_templates.py:89
+#: konova/utils/message_templates.py:90
 msgid "Data has changed since last check on {} by {}"
 msgstr ""
 "Daten wurden nach der letzten Prüfung geändert. Letzte Prüfung am {} durch {}"

-#: konova/utils/message_templates.py:90
+#: konova/utils/message_templates.py:91
 msgid "Current data not checked yet"
 msgstr "Momentane Daten noch nicht geprüft"

@ -2263,7 +2270,7 @@ msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
 msgid "Access not granted"
 msgstr "Nicht freigegeben - Datensatz nur lesbar"

-#: konova/views/home.py:79 templates/navbars/navbar.html:16
+#: konova/views/home.py:80 templates/navbars/navbar.html:16
 msgid "Home"
 msgstr "Home"

@ -2363,21 +2370,21 @@ msgstr ""
 "Admin Backend aktiviert worden ist."

 #: templates/email/api/verify_token.html:19
-#: templates/email/checking/shared_data_checked.html:20
-#: templates/email/checking/shared_data_checked_team.html:20
-#: templates/email/deleting/shared_data_deleted.html:20
-#: templates/email/deleting/shared_data_deleted_team.html:20
+#: templates/email/checking/shared_data_checked.html:30
+#: templates/email/checking/shared_data_checked_team.html:30
+#: templates/email/deleting/shared_data_deleted.html:30
+#: templates/email/deleting/shared_data_deleted_team.html:30
 #: templates/email/other/deduction_changed.html:41
 #: templates/email/other/deduction_changed_team.html:41
-#: templates/email/recording/shared_data_recorded.html:20
-#: templates/email/recording/shared_data_recorded_team.html:20
-#: templates/email/recording/shared_data_unrecorded.html:20
-#: templates/email/recording/shared_data_unrecorded_team.html:20
-#: templates/email/resubmission/resubmission.html:21
-#: templates/email/sharing/shared_access_given.html:29
-#: templates/email/sharing/shared_access_given_team.html:21
-#: templates/email/sharing/shared_access_removed.html:21
-#: templates/email/sharing/shared_access_removed_team.html:21
+#: templates/email/recording/shared_data_recorded.html:30
+#: templates/email/recording/shared_data_recorded_team.html:30
+#: templates/email/recording/shared_data_unrecorded.html:30
+#: templates/email/recording/shared_data_unrecorded_team.html:31
+#: templates/email/resubmission/resubmission.html:31
+#: templates/email/sharing/shared_access_given.html:31
+#: templates/email/sharing/shared_access_given_team.html:32
+#: templates/email/sharing/shared_access_removed.html:31
+#: templates/email/sharing/shared_access_removed_team.html:31
 msgid "Best regards"
 msgstr "Beste Grüße"

@ -2402,8 +2409,40 @@ msgstr "Hallo "
 msgid "the following dataset has just been checked"
 msgstr "der folgende Datensatz wurde soeben geprüft "

-#: templates/email/checking/shared_data_checked.html:17
-#: templates/email/checking/shared_data_checked_team.html:17
+#: templates/email/checking/shared_data_checked.html:18
+#: templates/email/checking/shared_data_checked_team.html:18
+#: templates/email/deleting/shared_data_deleted.html:18
+#: templates/email/deleting/shared_data_deleted_team.html:18
+#: templates/email/recording/shared_data_recorded.html:18
+#: templates/email/recording/shared_data_recorded_team.html:18
+#: templates/email/recording/shared_data_unrecorded.html:18
+#: templates/email/recording/shared_data_unrecorded_team.html:18
+#: templates/email/resubmission/resubmission.html:21
+#: templates/email/sharing/shared_access_given.html:18
+#: templates/email/sharing/shared_access_given_team.html:18
+#: templates/email/sharing/shared_access_removed.html:18
+#: templates/email/sharing/shared_access_removed_team.html:18
+msgid "This entry is located in"
+msgstr "Dieser Eintrag befindet sich in"
+
+#: templates/email/checking/shared_data_checked.html:24
+#: templates/email/checking/shared_data_checked_team.html:24
+#: templates/email/deleting/shared_data_deleted.html:24
+#: templates/email/deleting/shared_data_deleted_team.html:24
+#: templates/email/recording/shared_data_recorded.html:24
+#: templates/email/recording/shared_data_recorded_team.html:24
+#: templates/email/recording/shared_data_unrecorded.html:24
+#: templates/email/recording/shared_data_unrecorded_team.html:24
+#: templates/email/resubmission/resubmission.html:27
+#: templates/email/sharing/shared_access_given.html:24
+#: templates/email/sharing/shared_access_given_team.html:25
+#: templates/email/sharing/shared_access_removed.html:24
+#: templates/email/sharing/shared_access_removed_team.html:24
+msgid "Unknown - No administrative location recognized"
+msgstr "Unbekannt - Keine administrative Verortung möglich"
+
+#: templates/email/checking/shared_data_checked.html:27
+#: templates/email/checking/shared_data_checked_team.html:27
 msgid ""
 "This means, the responsible registration office just confirmed the "
 "correctness of this dataset."
@ -2431,8 +2470,8 @@ msgstr "Freigegebene Daten gelöscht"
 msgid "the following dataset has just been deleted"
 msgstr "der folgende Datensatz wurde soeben gelöscht "

-#: templates/email/deleting/shared_data_deleted.html:17
-#: templates/email/deleting/shared_data_deleted_team.html:17
+#: templates/email/deleting/shared_data_deleted.html:27
+#: templates/email/deleting/shared_data_deleted_team.html:27
 #: templates/email/other/deduction_changed.html:38
 #: templates/email/other/deduction_changed_team.html:38
 msgid ""
@ -2483,14 +2522,14 @@ msgstr "Freigegebene Daten verzeichnet"
 msgid "the following dataset has just been recorded"
 msgstr "der folgende Datensatz wurde soeben verzeichnet "

-#: templates/email/recording/shared_data_recorded.html:17
-#: templates/email/recording/shared_data_recorded_team.html:17
+#: templates/email/recording/shared_data_recorded.html:27
+#: templates/email/recording/shared_data_recorded_team.html:27
 msgid "This means the data is now publicly available, e.g. in LANIS"
 msgstr ""
 "Das bedeutet, dass die Daten nun öffentlich verfügbar sind, z.B. im LANIS."

-#: templates/email/recording/shared_data_recorded.html:27
-#: templates/email/recording/shared_data_recorded_team.html:27
+#: templates/email/recording/shared_data_recorded.html:37
+#: templates/email/recording/shared_data_recorded_team.html:37
 msgid ""
 "Please note: Recorded intervention means the compensations are recorded as "
 "well."
@ -2508,13 +2547,13 @@ msgstr "Freigegebene Daten entzeichnet"
 msgid "the following dataset has just been unrecorded"
 msgstr "der folgende Datensatz wurde soeben entzeichnet "

-#: templates/email/recording/shared_data_unrecorded.html:17
-#: templates/email/recording/shared_data_unrecorded_team.html:17
+#: templates/email/recording/shared_data_unrecorded.html:27
+#: templates/email/recording/shared_data_unrecorded_team.html:28
 msgid "This means the data is no longer publicly available."
 msgstr "Das bedeutet, dass die Daten nicht länger öffentlich verfügbar sind."

-#: templates/email/recording/shared_data_unrecorded.html:27
-#: templates/email/recording/shared_data_unrecorded_team.html:27
+#: templates/email/recording/shared_data_unrecorded.html:37
+#: templates/email/recording/shared_data_unrecorded_team.html:38
 msgid ""
 "Please note: Unrecorded intervention means the compensations are unrecorded "
 "as well."
@ -2539,21 +2578,13 @@ msgstr "Zugriff freigegeben"
 msgid "the following dataset has just been shared with you"
 msgstr "der folgende Datensatz wurde soeben für Sie freigegeben "

-#: templates/email/sharing/shared_access_given.html:17
-msgid "This entry is located in"
-msgstr "Dieser Eintrag befindet sich in"
-
-#: templates/email/sharing/shared_access_given.html:23
-msgid "Unknown - No administrative location recognized"
-msgstr "Unbekannt - Keine administrative Verortung möglich"
-
-#: templates/email/sharing/shared_access_given.html:25
-#: templates/email/sharing/shared_access_given_team.html:17
+#: templates/email/sharing/shared_access_given.html:27
+#: templates/email/sharing/shared_access_given_team.html:28
 msgid "This means you can now edit this dataset."
 msgstr "Das bedeutet, dass Sie diesen Datensatz nun auch bearbeiten können."

-#: templates/email/sharing/shared_access_given.html:26
-#: templates/email/sharing/shared_access_given_team.html:18
+#: templates/email/sharing/shared_access_given.html:28
+#: templates/email/sharing/shared_access_given_team.html:29
 msgid ""
 "The shared dataset appears now by default on your overview for this dataset "
 "type."
@ -2561,8 +2592,8 @@ msgstr ""
 "Der freigegebene Datensatz ist nun standardmäßig in Ihrer Übersicht für den "
 "Datensatztyp im KSP gelistet."

-#: templates/email/sharing/shared_access_given.html:36
-#: templates/email/sharing/shared_access_given_team.html:28
+#: templates/email/sharing/shared_access_given.html:38
+#: templates/email/sharing/shared_access_given_team.html:39
 msgid ""
 "Please note: Shared access on an intervention means you automatically have "
 "editing access to related compensations."
@ -2587,13 +2618,13 @@ msgstr ""
 "Ihnen wurde soeben der bearbeitende Zugriff auf den folgenden Datensatz "
 "entzogen: "

-#: templates/email/sharing/shared_access_removed.html:17
-#: templates/email/sharing/shared_access_removed_team.html:17
+#: templates/email/sharing/shared_access_removed.html:27
+#: templates/email/sharing/shared_access_removed_team.html:27
 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:18
-#: templates/email/sharing/shared_access_removed_team.html:18
+#: templates/email/sharing/shared_access_removed.html:28
+#: templates/email/sharing/shared_access_removed_team.html:28
 msgid ""
 "Please use the provided search filter on the dataset`s overview pages to "
 "find them."