diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index cdcc26e..ebfb1eb 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -113,6 +113,7 @@ class EditPaymentModalForm(NewPaymentForm): def __init__(self, *args, **kwargs): self.payment = kwargs.pop("payment", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit payment") form_date = { "amount": self.payment.amount, "due": str(self.payment.due_on), @@ -268,6 +269,7 @@ class EditCompensationStateModalForm(NewStateModalForm): def __init__(self, *args, **kwargs): self.state = kwargs.pop("state", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit state") form_data = { "biotope_type": self.state.biotope_type, "biotope_extra": self.state.biotope_type_details.all(), @@ -380,6 +382,7 @@ class EditDeadlineModalForm(NewDeadlineModalForm): def __init__(self, *args, **kwargs): self.deadline = kwargs.pop("deadline", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit deadline") form_data = { "type": self.deadline.type, "date": str(self.deadline.date), @@ -497,6 +500,7 @@ class EditCompensationActionModalForm(NewActionModalForm): def __init__(self, *args, **kwargs): self.action = kwargs.pop("action", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit action") form_data = { "action_type": list(self.action.action_type.values_list("id", flat=True)), "action_type_details": self.action.action_type_details.all(), diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py index 1e5febf..6a02962 100644 --- a/intervention/forms/modalForms.py +++ b/intervention/forms/modalForms.py @@ -205,6 +205,7 @@ class EditRevocationModalForm(NewRevocationModalForm): def __init__(self, *args, **kwargs): self.revocation = kwargs.pop("revocation", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit revocation") try: doc = self.revocation.document.file except ObjectDoesNotExist: @@ -477,6 +478,7 @@ class EditEcoAccountDeductionModalForm(NewDeductionModalForm): def __init__(self, *args, **kwargs): self.deduction = kwargs.pop("deduction", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit Deduction") form_data = { "account": self.deduction.account, "intervention": self.deduction.intervention, diff --git a/konova/forms.py b/konova/forms.py index 57562f7..fd359cb 100644 --- a/konova/forms.py +++ b/konova/forms.py @@ -471,6 +471,7 @@ class EditDocumentModalForm(NewDocumentModalForm): def __init__(self, *args, **kwargs): self.document = kwargs.pop("document", None) super().__init__(*args, **kwargs) + self.form_title = _("Edit document") form_data = { "title": self.document.title, "comment": self.document.comment, diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 9437cb9..d7b26eb 100644 Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 051894c..f638042 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # #: compensation/filters.py:123 compensation/forms/modalForms.py:36 #: compensation/forms/modalForms.py:47 compensation/forms/modalForms.py:63 -#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:463 +#: compensation/forms/modalForms.py:357 compensation/forms/modalForms.py:464 #: intervention/forms/forms.py:54 intervention/forms/forms.py:156 #: intervention/forms/forms.py:168 intervention/forms/modalForms.py:150 #: intervention/forms/modalForms.py:163 intervention/forms/modalForms.py:176 @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-18 14:50+0100\n" +"POT-Creation-Date: 2022-02-21 08:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,7 +96,7 @@ msgstr "" #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 #: analysis/templates/analysis/reports/includes/old_data/amount.html:3 -#: compensation/forms/modalForms.py:447 +#: compensation/forms/modalForms.py:448 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -214,14 +214,14 @@ msgstr "Abbuchungen" #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 -#: compensation/forms/modalForms.py:194 +#: compensation/forms/modalForms.py:195 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36 #: ema/templates/ema/detail/includes/states-after.html:36 #: ema/templates/ema/detail/includes/states-before.html:36 -#: intervention/forms/modalForms.py:361 +#: intervention/forms/modalForms.py:364 msgid "Surface" msgstr "Fläche" @@ -284,8 +284,8 @@ msgid "Type" msgstr "Typ" #: analysis/templates/analysis/reports/includes/old_data/amount.html:24 -#: compensation/tables.py:89 intervention/forms/modalForms.py:372 -#: intervention/forms/modalForms.py:379 intervention/tables.py:88 +#: compensation/tables.py:89 intervention/forms/modalForms.py:375 +#: intervention/forms/modalForms.py:382 intervention/tables.py:88 #: intervention/templates/intervention/detail/view.html:19 #: konova/templates/konova/includes/quickstart/interventions.html:4 #: templates/navbars/navbar.html:22 @@ -295,7 +295,7 @@ msgstr "Eingriff" #: analysis/templates/analysis/reports/includes/old_data/amount.html:34 #: compensation/tables.py:266 #: compensation/templates/compensation/detail/eco_account/view.html:20 -#: intervention/forms/modalForms.py:345 intervention/forms/modalForms.py:352 +#: intervention/forms/modalForms.py:348 intervention/forms/modalForms.py:355 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:4 #: templates/navbars/navbar.html:34 msgid "Eco-account" @@ -354,7 +354,7 @@ msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" #: compensation/forms/forms.py:57 compensation/forms/modalForms.py:62 -#: compensation/forms/modalForms.py:355 compensation/forms/modalForms.py:462 +#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:463 #: compensation/templates/compensation/detail/compensation/includes/actions.html:35 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34 @@ -372,7 +372,7 @@ msgstr "Kompensation XY; Flur ABC" msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:464 +#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:465 #: intervention/forms/forms.py:182 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" @@ -483,7 +483,7 @@ msgstr "Fällig am" msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:357 +#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:358 #: intervention/forms/modalForms.py:177 konova/forms.py:395 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -496,47 +496,52 @@ msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" msgid "If there is no date you can enter, please explain why." msgstr "Falls Sie kein Datum angeben können, erklären Sie bitte weshalb." -#: compensation/forms/modalForms.py:158 compensation/forms/modalForms.py:170 +#: compensation/forms/modalForms.py:116 +#: intervention/templates/intervention/detail/includes/payments.html:59 +msgid "Edit payment" +msgstr "Zahlung bearbeiten" + +#: compensation/forms/modalForms.py:159 compensation/forms/modalForms.py:171 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms/modalForms.py:161 +#: compensation/forms/modalForms.py:162 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:175 compensation/forms/modalForms.py:187 +#: compensation/forms/modalForms.py:176 compensation/forms/modalForms.py:188 msgid "Biotope additional type" msgstr "Zusatzbezeichnung" -#: compensation/forms/modalForms.py:178 +#: compensation/forms/modalForms.py:179 msgid "Select an additional biotope type" msgstr "Zusatzbezeichnung wählen" -#: compensation/forms/modalForms.py:197 intervention/forms/modalForms.py:363 +#: compensation/forms/modalForms.py:198 intervention/forms/modalForms.py:366 msgid "in m²" msgstr "" -#: compensation/forms/modalForms.py:208 +#: compensation/forms/modalForms.py:209 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modalForms.py:209 +#: compensation/forms/modalForms.py:210 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modalForms.py:216 konova/forms.py:193 +#: compensation/forms/modalForms.py:217 konova/forms.py:193 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:327 +#: compensation/forms/modalForms.py:328 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:330 +#: compensation/forms/modalForms.py:331 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:339 +#: compensation/forms/modalForms.py:340 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 #: ema/templates/ema/detail/includes/deadlines.html:31 @@ -544,23 +549,23 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:342 +#: compensation/forms/modalForms.py:343 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:369 +#: compensation/forms/modalForms.py:370 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:370 +#: compensation/forms/modalForms.py:371 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:410 +#: compensation/forms/modalForms.py:411 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:413 +#: compensation/forms/modalForms.py:414 msgid "" "An action can consist of multiple different action types. All the selected " "action types are expected to be performed according to the amount and unit " @@ -570,31 +575,31 @@ msgstr "" "hier gewählten Einträge sollen mit der weiter unten angegebenen Einheit und " "Menge umgesetzt werden. " -#: compensation/forms/modalForms.py:418 compensation/forms/modalForms.py:430 +#: compensation/forms/modalForms.py:419 compensation/forms/modalForms.py:431 msgid "Action Type detail" msgstr "Zusatzmerkmal" -#: compensation/forms/modalForms.py:421 +#: compensation/forms/modalForms.py:422 msgid "Select the action type detail" msgstr "Zusatzmerkmal wählen" -#: compensation/forms/modalForms.py:435 +#: compensation/forms/modalForms.py:436 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:438 +#: compensation/forms/modalForms.py:439 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:450 +#: compensation/forms/modalForms.py:451 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:475 +#: compensation/forms/modalForms.py:476 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:476 +#: compensation/forms/modalForms.py:477 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" @@ -862,7 +867,7 @@ msgstr "Erstellt" #: ema/templates/ema/detail/includes/documents.html:61 #: intervention/templates/intervention/detail/includes/documents.html:65 msgid "Edit document" -msgstr "Dokument bearbeitet" +msgstr "Dokument bearbeiten" #: compensation/templates/compensation/detail/compensation/includes/documents.html:66 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:64 @@ -1370,20 +1375,25 @@ msgstr "Muss kleiner als 15 Mb sein" msgid "Add revocation" msgstr "Widerspruch hinzufügen" -#: intervention/forms/modalForms.py:247 +#: intervention/forms/modalForms.py:208 +#: intervention/templates/intervention/detail/includes/revocation.html:69 +msgid "Edit revocation" +msgstr "Widerspruch bearbeiten" + +#: intervention/forms/modalForms.py:248 msgid "Checked intervention data" msgstr "Eingriffsdaten geprüft" -#: intervention/forms/modalForms.py:253 +#: intervention/forms/modalForms.py:254 msgid "Checked compensations data and payments" msgstr "Kompensationen und Zahlungen geprüft" -#: intervention/forms/modalForms.py:262 +#: intervention/forms/modalForms.py:263 #: intervention/templates/intervention/detail/includes/controls.html:19 msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:263 konova/forms.py:514 +#: intervention/forms/modalForms.py:264 konova/forms.py:514 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1391,23 +1401,23 @@ msgstr "" "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt " "wurden:" -#: intervention/forms/modalForms.py:347 +#: intervention/forms/modalForms.py:350 msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms/modalForms.py:374 +#: intervention/forms/modalForms.py:377 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" -#: intervention/forms/modalForms.py:387 +#: intervention/forms/modalForms.py:390 msgid "New Deduction" msgstr "Neue Abbuchung" -#: intervention/forms/modalForms.py:388 +#: intervention/forms/modalForms.py:391 msgid "Enter the information for a new deduction from a chosen eco-account" msgstr "Geben Sie die Informationen für eine neue Abbuchung ein." -#: intervention/forms/modalForms.py:431 +#: intervention/forms/modalForms.py:434 msgid "" "Eco-account {} is not recorded yet. You can only deduct from recorded " "accounts." @@ -1415,7 +1425,7 @@ msgstr "" "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von " "verzeichneten Ökokonten erfolgen." -#: intervention/forms/modalForms.py:441 +#: intervention/forms/modalForms.py:444 msgid "" "The account {} has not enough surface for a deduction of {} m². There are " "only {} m² left" @@ -1457,10 +1467,6 @@ msgctxt "money" msgid "Amount" msgstr "Betrag" -#: intervention/templates/intervention/detail/includes/payments.html:59 -msgid "Edit payment" -msgstr "Zahlung bearbeitet" - #: intervention/templates/intervention/detail/includes/payments.html:62 msgid "Remove payment" msgstr "Zahlung entfernen" @@ -1479,10 +1485,6 @@ msgstr "Vom" msgid "Revocation" msgstr "Widerspruch" -#: intervention/templates/intervention/detail/includes/revocation.html:69 -msgid "Edit revocation" -msgstr "Widerspruch bearbeiten" - #: intervention/templates/intervention/detail/includes/revocation.html:72 msgid "Remove revocation" msgstr "Widerspruch entfernen" @@ -1792,7 +1794,7 @@ msgstr "In Zwischenablage kopieren" msgid "Copied to clipboard" msgstr "In Zwischenablage kopiert" -#: konova/utils/mailer.py:68 +#: konova/utils/mailer.py:68 konova/utils/mailer.py:137 msgid "{} - Shared access removed" msgstr "{} - Zugriff entzogen" @@ -1800,23 +1802,23 @@ msgstr "{} - Zugriff entzogen" msgid "{} - Shared access given" msgstr "{} - Zugriff freigegeben" -#: konova/utils/mailer.py:137 -msgid "{} - Shared data recorded" -msgstr "{} - Freigegebene Daten verzeichnet" - -#: konova/utils/mailer.py:160 +#: konova/utils/mailer.py:160 konova/utils/mailer.py:275 msgid "{} - Shared data unrecorded" msgstr "{} - Freigegebene Daten entzeichnet" -#: konova/utils/mailer.py:183 -msgid "{} - Shared data deleted" -msgstr "{} - Freigegebene Daten gelöscht" +#: konova/utils/mailer.py:183 konova/utils/mailer.py:252 +msgid "{} - Shared data recorded" +msgstr "{} - Freigegebene Daten verzeichnet" -#: konova/utils/mailer.py:206 +#: konova/utils/mailer.py:206 konova/utils/mailer.py:321 msgid "{} - Shared data checked" msgstr "{} - Freigegebene Daten geprüft" -#: konova/utils/mailer.py:227 templates/email/api/verify_token.html:4 +#: konova/utils/mailer.py:229 konova/utils/mailer.py:298 +msgid "{} - Shared data deleted" +msgstr "{} - Freigegebene Daten gelöscht" + +#: konova/utils/mailer.py:342 templates/email/api/verify_token.html:4 msgid "Request for new API token" msgstr "Anfrage für neuen API Token" @@ -2088,9 +2090,13 @@ msgstr "" #: templates/email/api/verify_token.html:18 #: templates/email/checking/shared_data_checked.html:19 +#: templates/email/checking/shared_data_checked_team.html:19 #: templates/email/deleting/shared_data_deleted.html:19 +#: templates/email/deleting/shared_data_deleted_team.html:19 #: templates/email/recording/shared_data_recorded.html:19 +#: templates/email/recording/shared_data_recorded_team.html:19 #: templates/email/recording/shared_data_unrecorded.html:19 +#: templates/email/recording/shared_data_unrecorded_team.html:19 #: templates/email/sharing/shared_access_given.html:20 #: templates/email/sharing/shared_access_given_team.html:20 #: templates/email/sharing/shared_access_removed.html:20 @@ -2099,6 +2105,7 @@ msgid "Best regards" msgstr "Beste Grüße" #: templates/email/checking/shared_data_checked.html:4 +#: templates/email/checking/shared_data_checked_team.html:4 msgid "Shared data checked" msgstr "Freigegebene Daten geprüft" @@ -2112,10 +2119,12 @@ msgid "Hello " msgstr "Hallo " #: templates/email/checking/shared_data_checked.html:10 +#: templates/email/checking/shared_data_checked_team.html:10 msgid "the following dataset has just been checked" msgstr "der folgende Datensatz wurde soeben geprüft " #: templates/email/checking/shared_data_checked.html:16 +#: templates/email/checking/shared_data_checked_team.html:16 msgid "" "This means, the responsible registration office just confirmed the " "correctness of this dataset." @@ -2123,15 +2132,27 @@ msgstr "" "Das bedeutet, dass die zuständige Zulassungsbehörde die Korrektheit des " "Datensatzes soeben bestätigt hat." +#: templates/email/checking/shared_data_checked_team.html:8 +#: templates/email/deleting/shared_data_deleted_team.html:8 +#: templates/email/recording/shared_data_recorded_team.html:8 +#: templates/email/recording/shared_data_unrecorded_team.html:8 +#: templates/email/sharing/shared_access_given_team.html:8 +#: templates/email/sharing/shared_access_removed_team.html:8 +msgid "Hello team" +msgstr "Hallo Team" + #: templates/email/deleting/shared_data_deleted.html:4 +#: templates/email/deleting/shared_data_deleted_team.html:4 msgid "Shared data deleted" msgstr "Freigegebene Daten gelöscht" #: templates/email/deleting/shared_data_deleted.html:10 +#: templates/email/deleting/shared_data_deleted_team.html:10 msgid "the following dataset has just been deleted" msgstr "der folgende Datensatz wurde soeben gelöscht " #: templates/email/deleting/shared_data_deleted.html:16 +#: templates/email/deleting/shared_data_deleted_team.html:16 msgid "" "If this should not have been happened, please contact us. See the signature " "for details." @@ -2140,19 +2161,23 @@ msgstr "" "mail Signatur finden Sie weitere Kontaktinformationen." #: templates/email/recording/shared_data_recorded.html:4 +#: templates/email/recording/shared_data_recorded_team.html:4 msgid "Shared data recorded" msgstr "Freigegebene Daten verzeichnet" #: templates/email/recording/shared_data_recorded.html:10 +#: templates/email/recording/shared_data_recorded_team.html:10 msgid "the following dataset has just been recorded" msgstr "der folgende Datensatz wurde soeben verzeichnet " #: templates/email/recording/shared_data_recorded.html:16 +#: templates/email/recording/shared_data_recorded_team.html:16 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:26 +#: templates/email/recording/shared_data_recorded_team.html:26 msgid "" "Please note: Recorded intervention means the compensations are recorded as " "well." @@ -2161,18 +2186,22 @@ msgstr "" "zugehörigen Kompensationen automatisch verzeichnet sind." #: templates/email/recording/shared_data_unrecorded.html:4 +#: templates/email/recording/shared_data_unrecorded_team.html:4 msgid "Shared data unrecorded" msgstr "Freigegebene Daten entzeichnet" #: templates/email/recording/shared_data_unrecorded.html:10 +#: templates/email/recording/shared_data_unrecorded_team.html:10 msgid "the following dataset has just been unrecorded" msgstr "der folgende Datensatz wurde soeben entzeichnet " #: templates/email/recording/shared_data_unrecorded.html:16 +#: templates/email/recording/shared_data_unrecorded_team.html:16 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:26 +#: templates/email/recording/shared_data_unrecorded_team.html:26 msgid "" "Please note: Unrecorded intervention means the compensations are unrecorded " "as well." @@ -2213,11 +2242,6 @@ msgstr "" "Sie automatisch auch Zugriff auf die zugehörigen Kompensationen erhalten " "haben." -#: templates/email/sharing/shared_access_given_team.html:8 -#: templates/email/sharing/shared_access_removed_team.html:8 -msgid "Hello team" -msgstr "Hallo Team" - #: templates/email/sharing/shared_access_given_team.html:10 msgid "the following dataset has just been shared with your team" msgstr "der folgende Datensatz wurde soeben für Ihr Team freigegeben "