From 58eefbdbe65fe65397adc65574a452689e19ed3e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 27 Sep 2021 11:12:40 +0200 Subject: [PATCH] #7 New forms * fixes bug in case of unset dates for intervention * adds missing template formater * adds/updates translations --- intervention/forms.py | 11 +- intervention/views.py | 20 +-- konova/forms.py | 4 +- locale/de/LC_MESSAGES/django.mo | Bin 20256 -> 20656 bytes locale/de/LC_MESSAGES/django.po | 290 +++++++++++++++++--------------- 5 files changed, 172 insertions(+), 153 deletions(-) diff --git a/intervention/forms.py b/intervention/forms.py index adb9c689..326986df 100644 --- a/intervention/forms.py +++ b/intervention/forms.py @@ -265,6 +265,13 @@ class EditInterventionForm(NewInterventionForm): self.form_title = _("Edit intervention") self.form_caption = "" + reg_date = self.instance.legal.registration_date + bind_date = self.instance.legal.binding_date + if reg_date is not None: + reg_date = reg_date.isoformat() + if bind_date is not None: + bind_date = bind_date.isoformat() + # Initialize form data form_data = { "identifier": self.instance.identifier, @@ -276,8 +283,8 @@ class EditInterventionForm(NewInterventionForm): "registration_file_number": self.instance.responsible.registration_file_number, "conservation_office": self.instance.responsible.conservation_office, "conservation_file_number": self.instance.responsible.conservation_file_number, - "registration_date": self.instance.legal.registration_date.isoformat(), - "binding_date": self.instance.legal.binding_date.isoformat(), + "registration_date": reg_date, + "binding_date": bind_date, "comment": self.instance.comment, } disabled_fields = [ diff --git a/intervention/views.py b/intervention/views.py index c16f77a9..fb40c98e 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -13,7 +13,7 @@ from konova.decorators import * from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm from konova.sub_settings.django_settings import DEFAULT_DATE_FORMAT from konova.utils.documents import remove_document, get_document -from konova.utils.message_templates import FORM_INVALID, INTERVENTION_INVALID +from konova.utils.message_templates import INTERVENTION_INVALID from konova.utils.user_checks import in_group @@ -68,7 +68,10 @@ def new_view(request: HttpRequest): if generated_identifier != intervention.identifier: messages.info( request, - _("The identifier '{}' had to be changed to '{}' since another entry has been added in the meanwhile, which uses this identifier") + _("The identifier '{}' had to be changed to '{}' since another entry has been added in the meanwhile, which uses this identifier").format( + generated_identifier, + intervention.identifier + ) ) messages.success(request, _("Intervention {} added").format(intervention.identifier)) return redirect("intervention:index") @@ -221,20 +224,17 @@ def edit_view(request: HttpRequest, id: str): """ template = "intervention/new/view.html" + # Get object from db intervention = get_object_or_404(Intervention, id=id) + # Create forms, initialize with values from db/from POST request data_form = EditInterventionForm(request.POST or None, instance=intervention) geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention) if request.method == "POST": if data_form.is_valid() and geom_form.is_valid(): - generated_identifier = data_form.cleaned_data.get("identifier", None) + # The data form takes the geom form for processing, as well as the performing user intervention = data_form.save(request.user, geom_form) - if generated_identifier != intervention.identifier: - messages.info( - request, - _("The identifier '{}' had to be changed to '{}' since another entry has been added in the meanwhile, which uses this identifier") - ) - messages.success(request, _("Intervention {} added").format(intervention.identifier)) - return redirect("intervention:index") + messages.success(request, _("Intervention {} edited").format(intervention.identifier)) + return redirect("intervention:open", id=intervention.id) else: messages.error(request, _("Invalid input")) else: diff --git a/konova/forms.py b/konova/forms.py index e33afa50..e09b0669 100644 --- a/konova/forms.py +++ b/konova/forms.py @@ -276,9 +276,9 @@ class SimpleGeomForm(BaseForm): geom = Polygon.from_bbox([0, 0, 0, 0]) # Zoom out to a very high level, so the user can see directly that there is no geometry for this entry self.fields["geom"].widget.attrs["default_zoom"] = 1 + self.initialize_form_field("geom", geom) + self.area = geom.area if read_only: - self.initialize_form_field("geom", geom) - self.area = geom.area self.fields["geom"].disabled = True def save(self, action: UserActionLogEntry): diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 65c85dc8ebfc24cbd3b9c1f27228d5a472f57b99..d41cf9b8b898705590e393f95033bd0655d577e1 100644 GIT binary patch delta 6575 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 KW^Vaj8~z8@Vsl{t diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f153a720..bbd163c0 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -4,20 +4,20 @@ # FIRST AUTHOR , YEAR. # #: compensation/filters.py:71 compensation/forms.py:47 compensation/forms.py:52 -#: compensation/forms.py:67 compensation/forms.py:264 compensation/forms.py:345 +#: compensation/forms.py:67 compensation/forms.py:267 compensation/forms.py:348 #: intervention/filters.py:26 intervention/filters.py:40 #: intervention/filters.py:47 intervention/filters.py:48 -#: intervention/forms.py:56 intervention/forms.py:151 intervention/forms.py:162 -#: intervention/forms.py:422 intervention/forms.py:434 -#: intervention/forms.py:447 konova/forms.py:140 konova/forms.py:250 -#: konova/forms.py:296 konova/forms.py:331 konova/forms.py:336 -#: konova/forms.py:348 konova/forms.py:360 konova/forms.py:380 user/forms.py:38 +#: intervention/forms.py:51 intervention/forms.py:146 intervention/forms.py:157 +#: intervention/forms.py:465 intervention/forms.py:477 +#: intervention/forms.py:490 konova/forms.py:146 konova/forms.py:250 +#: konova/forms.py:300 konova/forms.py:327 konova/forms.py:332 +#: konova/forms.py:344 konova/forms.py:356 konova/forms.py:379 user/forms.py:38 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-23 12:46+0200\n" +"POT-Creation-Date: 2021-09-27 11:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ msgstr "Fällig am" msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms.py:66 compensation/forms.py:263 compensation/forms.py:344 +#: compensation/forms.py:66 compensation/forms.py:266 compensation/forms.py:347 #: compensation/templates/compensation/detail/compensation/includes/actions.html:34 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:31 @@ -54,115 +54,115 @@ msgstr "Zahlung wird an diesem Datum erwartet" #: ema/templates/ema/detail/includes/actions.html:34 #: ema/templates/ema/detail/includes/deadlines.html:34 #: ema/templates/ema/detail/includes/documents.html:31 -#: intervention/forms.py:446 +#: intervention/forms.py:168 intervention/forms.py:489 #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 -#: konova/forms.py:359 +#: konova/forms.py:355 msgid "Comment" msgstr "Kommentar" -#: compensation/forms.py:68 compensation/forms.py:265 compensation/forms.py:346 -#: intervention/forms.py:448 konova/forms.py:361 +#: compensation/forms.py:68 compensation/forms.py:268 compensation/forms.py:349 +#: intervention/forms.py:491 konova/forms.py:357 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" -#: compensation/forms.py:80 +#: compensation/forms.py:83 msgid "Payment" msgstr "Zahlung" -#: compensation/forms.py:81 +#: compensation/forms.py:84 msgid "Add a payment for intervention '{}'" msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" -#: compensation/forms.py:102 +#: compensation/forms.py:105 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.py:116 +#: compensation/forms.py:119 msgid "Added payment" msgstr "Zahlung hinzufügen" -#: compensation/forms.py:133 compensation/forms.py:145 +#: compensation/forms.py:136 compensation/forms.py:148 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms.py:136 +#: compensation/forms.py:139 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms.py:152 +#: compensation/forms.py:155 #: 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.py:587 +#: intervention/forms.py:633 msgid "Surface" msgstr "Fläche" -#: compensation/forms.py:155 intervention/forms.py:589 +#: compensation/forms.py:158 intervention/forms.py:635 msgid "in m²" msgstr "" -#: compensation/forms.py:160 +#: compensation/forms.py:163 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms.py:161 +#: compensation/forms.py:164 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms.py:169 +#: compensation/forms.py:172 msgid "Added state" msgstr "Zustand hinzugefügt" -#: compensation/forms.py:185 konova/forms.py:199 +#: compensation/forms.py:188 konova/forms.py:199 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms.py:236 +#: compensation/forms.py:239 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms.py:239 +#: compensation/forms.py:242 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms.py:248 +#: compensation/forms.py:251 #: 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 -#: intervention/forms.py:421 +#: intervention/forms.py:464 msgid "Date" msgstr "Datum" -#: compensation/forms.py:251 +#: compensation/forms.py:254 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms.py:276 +#: compensation/forms.py:279 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms.py:277 +#: compensation/forms.py:280 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms.py:294 +#: compensation/forms.py:297 msgid "Added deadline" msgstr "Frist/Termin hinzugefügt" -#: compensation/forms.py:305 +#: compensation/forms.py:308 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms.py:308 +#: compensation/forms.py:311 msgid "Select the action type" msgstr "Maßnahmentyp wählen" -#: compensation/forms.py:317 +#: compensation/forms.py:320 #: compensation/templates/compensation/detail/compensation/includes/actions.html:37 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:37 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34 @@ -188,33 +188,33 @@ msgstr "Maßnahmentyp wählen" msgid "Action" msgstr "Aktionen" -#: compensation/forms.py:322 +#: compensation/forms.py:325 msgid "Unit" msgstr "Einheit" -#: compensation/forms.py:325 +#: compensation/forms.py:328 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms.py:334 +#: compensation/forms.py:337 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" msgstr "Menge" -#: compensation/forms.py:337 +#: compensation/forms.py:340 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms.py:357 +#: compensation/forms.py:360 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms.py:358 +#: compensation/forms.py:361 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" -#: compensation/forms.py:377 +#: compensation/forms.py:380 msgid "Added action" msgstr "Maßnahme hinzugefügt" @@ -258,7 +258,7 @@ msgstr "" "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!" #: compensation/tables.py:24 compensation/tables.py:164 ema/tables.py:28 -#: intervention/forms.py:37 intervention/tables.py:23 +#: intervention/forms.py:32 intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" msgstr "Kennung" @@ -269,11 +269,11 @@ msgstr "Kennung" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28 #: compensation/templates/compensation/detail/eco_account/view.html:31 #: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28 -#: ema/templates/ema/detail/view.html:24 intervention/forms.py:43 +#: ema/templates/ema/detail/view.html:24 intervention/forms.py:38 #: intervention/tables.py:28 #: intervention/templates/intervention/detail/includes/compensations.html:33 #: intervention/templates/intervention/detail/includes/documents.html:28 -#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:330 +#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:326 msgid "Title" msgstr "Bezeichnung" @@ -332,13 +332,13 @@ msgstr "Am {} von {} geprüft worden" #: compensation/templates/compensation/detail/compensation/view.html:60 #: compensation/templates/compensation/detail/eco_account/view.html:47 #: ema/tables.py:101 ema/templates/ema/detail/view.html:31 -#: intervention/models.py:352 intervention/tables.py:131 +#: intervention/models.py:379 intervention/tables.py:131 #: intervention/templates/intervention/detail/view.html:85 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" #: compensation/tables.py:133 compensation/tables.py:260 ema/tables.py:106 -#: intervention/models.py:357 intervention/tables.py:136 +#: intervention/models.py:384 intervention/tables.py:136 msgid "Recorded on {} by {}" msgstr "Am {} von {} verzeichnet worden" @@ -364,7 +364,7 @@ msgstr "Ökokonten" #: compensation/tables.py:222 #: compensation/templates/compensation/detail/eco_account/view.html:19 -#: intervention/forms.py:571 intervention/forms.py:578 +#: intervention/forms.py:617 intervention/forms.py:624 #: konova/templates/konova/home.html:88 templates/navbar.html:34 msgid "Eco-account" msgstr "Ökokonto" @@ -477,7 +477,7 @@ msgstr "Dokumente" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:14 #: ema/templates/ema/detail/includes/documents.html:14 #: intervention/templates/intervention/detail/includes/documents.html:14 -#: konova/forms.py:379 +#: konova/forms.py:378 msgid "Add new document" msgstr "Neues Dokument hinzufügen" @@ -582,7 +582,7 @@ msgstr "Zuletzt bearbeitet" #: compensation/templates/compensation/detail/compensation/view.html:92 #: compensation/templates/compensation/detail/eco_account/view.html:91 -#: ema/templates/ema/detail/view.html:82 intervention/forms.py:355 +#: ema/templates/ema/detail/view.html:82 intervention/forms.py:398 #: intervention/templates/intervention/detail/view.html:116 msgid "Shared with" msgstr "Freigegeben für" @@ -643,19 +643,19 @@ msgid "Missing" msgstr "Fehlt" #: compensation/templates/compensation/detail/eco_account/view.html:58 -#: ema/templates/ema/detail/view.html:42 intervention/forms.py:101 +#: ema/templates/ema/detail/view.html:42 intervention/forms.py:96 #: intervention/templates/intervention/detail/view.html:56 msgid "Conservation office" msgstr "Eintragungsstelle" #: compensation/templates/compensation/detail/eco_account/view.html:62 -#: ema/templates/ema/detail/view.html:46 intervention/forms.py:127 +#: ema/templates/ema/detail/view.html:46 intervention/forms.py:122 #: intervention/templates/intervention/detail/view.html:60 msgid "Conservation office file number" msgstr "Aktenzeichen Eintragungsstelle" #: compensation/templates/compensation/detail/eco_account/view.html:66 -#: ema/templates/ema/detail/view.html:50 intervention/forms.py:138 +#: ema/templates/ema/detail/view.html:50 intervention/forms.py:133 #: intervention/templates/intervention/detail/view.html:64 msgid "Intervention handler" msgstr "Eingriffsverursacher" @@ -667,7 +667,7 @@ msgstr "" #: compensation/views/compensation_views.py:123 #: compensation/views/eco_account_views.py:190 ema/views.py:128 -#: intervention/views.py:393 +#: intervention/views.py:409 msgid "Log" msgstr "Log" @@ -677,7 +677,7 @@ msgstr "Kompensation entfernt" #: compensation/views/compensation_views.py:163 #: compensation/views/eco_account_views.py:289 ema/views.py:250 -#: intervention/views.py:96 +#: intervention/views.py:105 msgid "Document added" msgstr "Dokument hinzugefügt" @@ -713,16 +713,16 @@ msgid "Deduction removed" msgstr "Abbuchung entfernt" #: compensation/views/eco_account_views.py:210 ema/views.py:171 -#: intervention/views.py:433 +#: intervention/views.py:449 msgid "{} unrecorded" msgstr "{} entzeichnet" #: compensation/views/eco_account_views.py:210 ema/views.py:171 -#: intervention/views.py:433 +#: intervention/views.py:449 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account_views.py:346 intervention/views.py:415 +#: compensation/views/eco_account_views.py:346 intervention/views.py:431 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" @@ -774,129 +774,133 @@ msgstr "Gemarkung" msgid "Search for district" msgstr "Nach Gemarkung suchen" -#: intervention/forms.py:40 +#: intervention/forms.py:35 msgid "Generated automatically" msgstr "Automatisch generiert" -#: intervention/forms.py:45 +#: intervention/forms.py:40 msgid "An explanatory name" msgstr "Aussagekräftiger Titel" -#: intervention/forms.py:49 +#: intervention/forms.py:44 msgid "Construction XY; Location ABC" msgstr "Bauvorhaben XY; Flur ABC" -#: intervention/forms.py:54 +#: intervention/forms.py:49 #: intervention/templates/intervention/detail/view.html:35 msgid "Process type" msgstr "Verfahrenstyp" -#: intervention/forms.py:70 +#: intervention/forms.py:65 #: intervention/templates/intervention/detail/view.html:39 msgid "Law" msgstr "Gesetz" -#: intervention/forms.py:72 +#: intervention/forms.py:67 msgid "Multiple selection possible" msgstr "Mehrfachauswahl möglich" -#: intervention/forms.py:86 +#: intervention/forms.py:81 #: intervention/templates/intervention/detail/view.html:48 msgid "Registration office" msgstr "Zulassungsbehörde" -#: intervention/forms.py:116 +#: intervention/forms.py:111 #: intervention/templates/intervention/detail/view.html:52 msgid "Registration office file number" msgstr "Aktenzeichen Zulassungsbehörde" -#: intervention/forms.py:122 +#: intervention/forms.py:117 msgid "ZB-123/ABC.456" msgstr "" -#: intervention/forms.py:133 +#: intervention/forms.py:128 msgid "ETS-123/ABC.456" msgstr "" -#: intervention/forms.py:142 +#: intervention/forms.py:137 msgid "Who performs the intervention" msgstr "Wer führt den Eingriff durch" -#: intervention/forms.py:145 +#: intervention/forms.py:140 msgid "Company Mustermann" msgstr "Firma Mustermann" -#: intervention/forms.py:150 +#: intervention/forms.py:145 #: intervention/templates/intervention/detail/view.html:96 msgid "Registration date" msgstr "Datum Zulassung bzw. Satzungsbeschluss" -#: intervention/forms.py:161 +#: intervention/forms.py:156 #: intervention/templates/intervention/detail/view.html:100 msgid "Binding on" msgstr "Datum Bestandskraft" -#: intervention/forms.py:174 +#: intervention/forms.py:170 +msgid "Additional comment" +msgstr "Zusätzlicher Kommentar" + +#: intervention/forms.py:184 msgid "New intervention" msgstr "Neuer Eingriff" -#: intervention/forms.py:248 +#: intervention/forms.py:265 msgid "Edit intervention" msgstr "Eingriff bearbeiten" -#: intervention/forms.py:344 +#: intervention/forms.py:387 msgid "Share link" msgstr "Freigabelink" -#: intervention/forms.py:346 +#: intervention/forms.py:389 msgid "Send this link to users who you want to have writing access on the data" msgstr "Andere Nutzer erhalten über diesen Link Zugriff auf die Daten" -#: intervention/forms.py:358 +#: intervention/forms.py:401 msgid "Remove check to remove access for this user" msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen" -#: intervention/forms.py:369 +#: intervention/forms.py:412 #: intervention/templates/intervention/detail/includes/controls.html:15 msgid "Share" msgstr "Freigabe" -#: intervention/forms.py:370 +#: intervention/forms.py:413 msgid "Share settings for {}" msgstr "Freigabe Einstellungen für {}" -#: intervention/forms.py:423 +#: intervention/forms.py:466 msgid "Date of revocation" msgstr "Datum des Widerspruchs" -#: intervention/forms.py:433 +#: intervention/forms.py:476 #: intervention/templates/intervention/detail/includes/revocation.html:35 msgid "Document" msgstr "Dokument" -#: intervention/forms.py:436 konova/forms.py:349 +#: intervention/forms.py:479 konova/forms.py:345 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" -#: intervention/forms.py:459 +#: intervention/forms.py:505 #: intervention/templates/intervention/detail/includes/revocation.html:18 msgid "Add revocation" msgstr "Widerspruch hinzufügen" -#: intervention/forms.py:499 +#: intervention/forms.py:545 msgid "Checked intervention data" msgstr "Eingriffsdaten geprüft" -#: intervention/forms.py:505 +#: intervention/forms.py:551 msgid "Checked compensations data and payments" msgstr "Kompensationen und Zahlungen geprüft" -#: intervention/forms.py:513 +#: intervention/forms.py:559 #: intervention/templates/intervention/detail/includes/controls.html:19 msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms.py:514 konova/forms.py:433 +#: intervention/forms.py:560 konova/forms.py:432 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -904,30 +908,30 @@ msgstr "" "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt " "wurden:" -#: intervention/forms.py:573 +#: intervention/forms.py:619 msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms.py:592 intervention/forms.py:599 +#: intervention/forms.py:638 intervention/forms.py:645 #: intervention/tables.py:88 #: intervention/templates/intervention/detail/view.html:19 #: konova/templates/konova/home.html:11 templates/navbar.html:22 msgid "Intervention" msgstr "Eingriff" -#: intervention/forms.py:594 +#: intervention/forms.py:640 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" -#: intervention/forms.py:607 +#: intervention/forms.py:656 msgid "New Deduction" msgstr "Neue Abbuchung" -#: intervention/forms.py:608 +#: intervention/forms.py:657 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.py:644 +#: intervention/forms.py:693 msgid "" "Eco-account {} is not recorded yet. You can only deduct from recorded " "accounts." @@ -935,7 +939,7 @@ msgstr "" "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von " "verzeichneten Ökokonten erfolgen." -#: intervention/forms.py:657 +#: intervention/forms.py:706 msgid "" "The account {} has not enough surface for a deduction of {} m². There are " "only {} m² left" @@ -943,31 +947,31 @@ msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " "Restfläche. Es stehen noch {} m² zur Verfügung." -#: intervention/models.py:298 +#: intervention/models.py:325 msgid "Registration office file number missing" msgstr "Aktenzeichen Zulassungsbehörde fehlt" -#: intervention/models.py:301 +#: intervention/models.py:328 msgid "Conservation office file number missing" msgstr "Aktenzeichen Naturschutzbehörde fehlt" -#: intervention/models.py:304 +#: intervention/models.py:331 msgid "Responsible data missing" msgstr "Daten zu Verantwortlichen fehlen" -#: intervention/models.py:318 +#: intervention/models.py:345 msgid "Revocation exists" msgstr "Widerspruch liegt vor" -#: intervention/models.py:321 +#: intervention/models.py:348 msgid "Registration date missing" msgstr "Datum Zulassung bzw. Satzungsbeschluss fehlt" -#: intervention/models.py:324 +#: intervention/models.py:351 msgid "Binding on missing" msgstr "Datum Bestandskraft fehlt" -#: intervention/models.py:326 +#: intervention/models.py:353 msgid "Legal data missing" msgstr "Rechtliche Daten fehlen" @@ -1040,19 +1044,27 @@ msgstr "Widerspruch entfernen" msgid "Exists" msgstr "vorhanden" -#: intervention/views.py:67 +#: intervention/views.py:71 +msgid "" +"The identifier '{}' had to be changed to '{}' since another entry has been " +"added in the meanwhile, which uses this identifier" +msgstr "" +"Die Kennung '{}' musste zu '{}' geändert werden, da ein anderer Eintrag in der Zwischenzeit angelegt wurde, " +"welcher diese Kennung nun bereits verwendet" + +#: intervention/views.py:76 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:70 intervention/views.py:226 +#: intervention/views.py:79 intervention/views.py:239 msgid "Invalid input" msgstr "Eingabe fehlerhaft" -#: intervention/views.py:184 +#: intervention/views.py:193 msgid "This intervention has a revocation from {}" msgstr "Es existiert ein Widerspruch vom {}" -#: intervention/views.py:200 +#: intervention/views.py:209 msgid "" "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 " @@ -1062,43 +1074,43 @@ msgstr "" "bedeutet, dass Sie nur lesenden Zugriff hierauf haben und weder bearbeiten, " "noch Prüfungen durchführen oder verzeichnen können." -#: intervention/views.py:223 -msgid "{} edited" -msgstr "{} bearbeitet" +#: intervention/views.py:236 +msgid "Intervention {} edited" +msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:252 +#: intervention/views.py:268 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:273 +#: intervention/views.py:289 msgid "Revocation removed" msgstr "Widerspruch entfernt" -#: intervention/views.py:299 +#: intervention/views.py:315 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: intervention/views.py:304 +#: intervention/views.py:320 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: intervention/views.py:311 +#: intervention/views.py:327 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: intervention/views.py:332 +#: intervention/views.py:348 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" -#: intervention/views.py:351 +#: intervention/views.py:367 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:371 +#: intervention/views.py:387 msgid "Revocation added" msgstr "Widerspruch hinzugefügt" -#: intervention/views.py:438 +#: intervention/views.py:454 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" @@ -1123,19 +1135,19 @@ msgstr "" msgid "You need to be part of another user group." msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!" -#: konova/forms.py:69 +#: konova/forms.py:75 msgid "Not editable" msgstr "Nicht editierbar" -#: konova/forms.py:139 konova/forms.py:295 +#: konova/forms.py:145 konova/forms.py:299 msgid "Confirm" msgstr "Bestätige" -#: konova/forms.py:151 konova/forms.py:304 +#: konova/forms.py:157 konova/forms.py:308 msgid "Remove" msgstr "Löschen" -#: konova/forms.py:153 +#: konova/forms.py:159 msgid "You are about to remove {} {}" msgstr "Sie sind dabei {} {} zu löschen" @@ -1143,44 +1155,44 @@ msgstr "Sie sind dabei {} {} zu löschen" msgid "Geometry" msgstr "Geometrie" -#: konova/forms.py:305 +#: konova/forms.py:309 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:335 +#: konova/forms.py:331 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:337 +#: konova/forms.py:333 msgid "When has this file been created? Important for photos." msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?" -#: konova/forms.py:347 +#: konova/forms.py:343 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:410 +#: konova/forms.py:409 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:424 +#: konova/forms.py:423 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:432 +#: konova/forms.py:431 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:439 +#: konova/forms.py:438 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:440 +#: konova/forms.py:439 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:441 +#: konova/forms.py:440 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1209,19 +1221,19 @@ msgstr "Wenn meine freigegebenen Daten gelöscht wurden" msgid "On registered data edited" msgstr "Wenn meine freigegebenen Daten bearbeitet wurden" -#: konova/models.py:190 +#: konova/models.py:204 msgid "Finished" msgstr "Umgesetzt bis" -#: konova/models.py:191 +#: konova/models.py:205 msgid "Maintain" msgstr "Unterhaltung bis" -#: konova/models.py:192 +#: konova/models.py:206 msgid "Control" msgstr "Kontrolle am" -#: konova/models.py:193 +#: konova/models.py:207 msgid "Other" msgstr "Sonstige" @@ -2720,6 +2732,9 @@ msgstr "" msgid "A fontawesome icon field" msgstr "" +#~ msgid "{} edited" +#~ msgstr "{} bearbeitet" + #~ msgid "Map" #~ msgstr "Karte" @@ -2771,9 +2786,6 @@ msgstr "" #~ msgid "Actions" #~ msgstr "Aktionen" -#~ msgid "Additional comment" -#~ msgstr "Zusätzlicher Kommentar" - #~ msgid "Missing surfaces: " #~ msgstr "Fehlende Flächen: "