IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases 44 Wiki Activity

#138 WIP Improvements

Browse Source 
* adds geom back writing to form field in case of invalid geometry, so the invalid geometry will be shown again
* updates tests
* fixes bug where race condition of celery workers could lead to duplicates in parcels (needs migration)
This commit is contained in:
mpeltriaux
2022-04-20 11:55:03 +02:00
parent 49c14a67b6
commit c60afb0391
12 changed files with 179 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

66
locale/de/LC_MESSAGES/django.po
View File

@@ -18,15 +18,15 @@
#: konova/filters/mixins.py:277 konova/filters/mixins.py:323
#: konova/filters/mixins.py:361 konova/filters/mixins.py:362
#: konova/filters/mixins.py:393 konova/filters/mixins.py:394
#: konova/forms.py:177 konova/forms.py:278 konova/forms.py:349
#: konova/forms.py:393 konova/forms.py:403 konova/forms.py:416
#: konova/forms.py:428 konova/forms.py:446 user/forms.py:42
#: konova/forms.py:179 konova/forms.py:281 konova/forms.py:382
#: konova/forms.py:426 konova/forms.py:436 konova/forms.py:449
#: konova/forms.py:461 konova/forms.py:479 user/forms.py:42
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-19 13:28+0200\n"
"POT-Creation-Date: 2022-04-20 09:51+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"
@@ -77,7 +77,7 @@ msgstr "Bericht generieren"
msgid "Select a timespan and the desired conservation office"
msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle"
#: analysis/forms.py:69 konova/forms.py:225
#: analysis/forms.py:69 konova/forms.py:227
msgid "Continue"
msgstr "Weiter"
@@ -342,7 +342,7 @@ msgstr "Automatisch generiert"
#: intervention/templates/intervention/detail/includes/documents.html:28
#: intervention/templates/intervention/detail/view.html:31
#: intervention/templates/intervention/report/report.html:12
#: konova/forms.py:392
#: konova/forms.py:425
msgid "Title"
msgstr "Bezeichnung"
@@ -369,7 +369,7 @@ msgstr "Kompensation XY; Flur ABC"
#: intervention/templates/intervention/detail/includes/documents.html:34
#: intervention/templates/intervention/detail/includes/payments.html:34
#: intervention/templates/intervention/detail/includes/revocation.html:38
#: konova/forms.py:427 konova/templates/konova/includes/comment_card.html:16
#: konova/forms.py:460 konova/templates/konova/includes/comment_card.html:16
msgid "Comment"
msgstr "Kommentar"
@@ -493,7 +493,7 @@ msgid "Due on which date"
msgstr "Zahlung wird an diesem Datum erwartet"
#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:359
#: intervention/forms/modalForms.py:177 konova/forms.py:429
#: intervention/forms/modalForms.py:177 konova/forms.py:462
msgid "Additional comment, maximum {} letters"
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
@@ -538,7 +538,7 @@ msgstr "Neuer Zustand"
msgid "Insert data for the new state"
msgstr "Geben Sie die Daten des neuen Zustandes ein"
#: compensation/forms/modalForms.py:217 konova/forms.py:227
#: compensation/forms/modalForms.py:217 konova/forms.py:229
msgid "Object removed"
msgstr "Objekt entfernt"
@@ -871,7 +871,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:445
#: konova/forms.py:478
msgid "Add new document"
msgstr "Neues Dokument hinzufügen"
@@ -879,7 +879,7 @@ msgstr "Neues Dokument hinzufügen"
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:31
#: ema/templates/ema/detail/includes/documents.html:31
#: intervention/templates/intervention/detail/includes/documents.html:31
#: konova/forms.py:402
#: konova/forms.py:435
msgid "Created on"
msgstr "Erstellt"
@@ -887,7 +887,7 @@ msgstr "Erstellt"
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:61
#: ema/templates/ema/detail/includes/documents.html:61
#: intervention/templates/intervention/detail/includes/documents.html:65
#: konova/forms.py:507
#: konova/forms.py:540
msgid "Edit document"
msgstr "Dokument bearbeiten"
@@ -1316,7 +1316,7 @@ msgstr "Datum Bestandskraft"
msgid "New intervention"
msgstr "Neuer Eingriff"
#: intervention/forms/forms.py:294
#: intervention/forms/forms.py:298
msgid "Edit intervention"
msgstr "Eingriff bearbeiten"
@@ -1392,7 +1392,7 @@ msgstr "Kompensationen und Zahlungen geprüft"
msgid "Run check"
msgstr "Prüfung vornehmen"
#: intervention/forms/modalForms.py:264 konova/forms.py:548
#: intervention/forms/modalForms.py:264 konova/forms.py:581
msgid ""
"I, {} {}, confirm that all necessary control steps have been performed by "
"myself."
@@ -1637,69 +1637,73 @@ msgstr "Nach Zulassungsbehörde suchen"
msgid "Search for conservation office"
msgstr "Nch Eintragungsstelle suchen"
#: konova/forms.py:39 templates/form/collapsable/form.html:62
#: konova/forms.py:41 templates/form/collapsable/form.html:62
msgid "Save"
msgstr "Speichern"
#: konova/forms.py:73
#: konova/forms.py:75
msgid "Not editable"
msgstr "Nicht editierbar"
#: konova/forms.py:176 konova/forms.py:348
#: konova/forms.py:178 konova/forms.py:381
msgid "Confirm"
msgstr "Bestätige"
#: konova/forms.py:188 konova/forms.py:357
#: konova/forms.py:190 konova/forms.py:390
msgid "Remove"
msgstr "Löschen"
#: konova/forms.py:190
#: konova/forms.py:192
msgid "You are about to remove {} {}"
msgstr "Sie sind dabei {} {} zu löschen"
#: konova/forms.py:277 konova/utils/quality.py:44 konova/utils/quality.py:46
#: konova/forms.py:280 konova/utils/quality.py:44 konova/utils/quality.py:46
#: templates/form/collapsable/form.html:45
msgid "Geometry"
msgstr "Geometrie"
#: konova/forms.py:358
#: konova/forms.py:325
msgid "Only surfaces allowed. Points or lines must be buffered."
msgstr "Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
#: konova/forms.py:391
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
#: konova/forms.py:404
#: konova/forms.py:437
msgid "When has this file been created? Important for photos."
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
#: konova/forms.py:415
#: konova/forms.py:448
#: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
msgid "File"
msgstr "Datei"
#: konova/forms.py:417
#: konova/forms.py:450
msgid "Allowed formats: pdf, jpg, png. Max size 15 MB."
msgstr "Formate: pdf, jpg, png. Maximal 15 MB."
#: konova/forms.py:482
#: konova/forms.py:515
msgid "Added document"
msgstr "Dokument hinzugefügt"
#: konova/forms.py:539
#: konova/forms.py:572
msgid "Confirm record"
msgstr "Verzeichnen bestätigen"
#: konova/forms.py:547
#: konova/forms.py:580
msgid "Record data"
msgstr "Daten verzeichnen"
#: konova/forms.py:554
#: konova/forms.py:587
msgid "Confirm unrecord"
msgstr "Entzeichnen bestätigen"
#: konova/forms.py:555
#: konova/forms.py:588
msgid "Unrecord data"
msgstr "Daten entzeichnen"
#: konova/forms.py:556
#: konova/forms.py:589
msgid "I, {} {}, confirm that this data must be unrecorded."
msgstr ""
"Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."
@@ -2066,7 +2070,7 @@ msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}"
msgid "missing"
msgstr "fehlt"
#: konova/views.py:96 templates/navbars/navbar.html:16
#: konova/views.py:99 templates/navbars/navbar.html:16
msgid "Home"
msgstr "Home"