* adds EditEcoAccountForm
* adds placeholders for some form fields
* changes comment card in detail view into rlp-grayish
* adds eco account detail view comment box
* removes unnecessary loading of dal scripts in view.html
* refactors generated identifier for data objects (10 digits to 6 uppercase letter-digit combination)
* improves generate_random_string() method by adding more options for generation of strings
* adds/updates translations
This commit is contained in:
mipel
2021-10-06 13:10:10 +02:00
parent ac665c9268
commit 98f8a222dc
20 changed files with 305 additions and 166 deletions

Binary file not shown.

View File

@@ -4,22 +4,22 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#: compensation/filters.py:71 compensation/forms/modalForms.py:35
#: compensation/forms/modalForms.py:45 compensation/forms/modalForms.py:61
#: compensation/forms/modalForms.py:273 compensation/forms/modalForms.py:367
#: compensation/forms/modalForms.py:46 compensation/forms/modalForms.py:62
#: compensation/forms/modalForms.py:273 compensation/forms/modalForms.py:368
#: intervention/filters.py:26 intervention/filters.py:40
#: intervention/filters.py:47 intervention/filters.py:48
#: intervention/forms/forms.py:53 intervention/forms/forms.py:151
#: intervention/forms/forms.py:163 intervention/forms/modalForms.py:107
#: intervention/forms/forms.py:53 intervention/forms/forms.py:155
#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:107
#: intervention/forms/modalForms.py:120 intervention/forms/modalForms.py:133
#: konova/forms.py:140 konova/forms.py:244 konova/forms.py:311
#: konova/forms.py:338 konova/forms.py:348 konova/forms.py:361
#: konova/forms.py:373 konova/forms.py:394 user/forms.py:38
#: konova/forms.py:140 konova/forms.py:244 konova/forms.py:310
#: konova/forms.py:337 konova/forms.py:347 konova/forms.py:360
#: konova/forms.py:372 konova/forms.py:393 user/forms.py:38
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-05 15:19+0200\n"
"POT-Creation-Date: 2021-10-06 13:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Automatisch generiert"
#: 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:337
#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:336
msgid "Title"
msgstr "Bezeichnung"
@@ -75,32 +75,36 @@ msgstr "Förderungen"
msgid "Select fundings for this compensation"
msgstr "Wählen Sie ggf. Fördermittelprojekte"
#: compensation/forms/forms.py:67
msgid "Funding by..."
msgstr "Gefördert mit..."
#: compensation/forms/forms.py:67 compensation/forms/forms.py:104
#: compensation/forms/forms.py:239 intervention/forms/forms.py:63
#: intervention/forms/forms.py:80 intervention/forms/forms.py:96
#: intervention/forms/forms.py:112
msgid "Click for selection"
msgstr "Auswählen..."
#: compensation/forms/forms.py:73 compensation/forms/modalForms.py:60
#: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:366
#: compensation/forms/forms.py:73 compensation/forms/modalForms.py:61
#: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:367
#: compensation/templates/compensation/detail/compensation/includes/actions.html:34
#: compensation/templates/compensation/detail/compensation/includes/comment.html:11
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34
#: compensation/templates/compensation/detail/compensation/includes/documents.html:31
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:34
#: compensation/templates/compensation/detail/eco_account/includes/comment.html:11
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:31
#: 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/forms.py:175 intervention/forms/modalForms.py:132
#: intervention/forms/forms.py:179 intervention/forms/modalForms.py:132
#: intervention/templates/intervention/detail/includes/comment.html:11
#: 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:372
#: konova/forms.py:371
msgid "Comment"
msgstr "Kommentar"
#: compensation/forms/forms.py:75 intervention/forms/forms.py:177
#: compensation/forms/forms.py:75 intervention/forms/forms.py:181
msgid "Additional comment"
msgstr "Zusätzlicher Kommentar"
@@ -113,13 +117,6 @@ msgstr "kompensiert Eingriff"
msgid "Select the intervention for which this compensation compensates"
msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
#: compensation/forms/forms.py:104 intervention/forms/modalForms.py:284
#: intervention/forms/modalForms.py:291 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"
#: compensation/forms/forms.py:122
msgid "New compensation"
msgstr "Neue Kompensation"
@@ -130,7 +127,7 @@ msgstr "Bearbeite Kompensation"
#: compensation/forms/forms.py:228
#: compensation/templates/compensation/detail/eco_account/view.html:58
#: ema/templates/ema/detail/view.html:42 intervention/forms/forms.py:98
#: ema/templates/ema/detail/view.html:42 intervention/forms/forms.py:101
#: intervention/templates/intervention/detail/view.html:56
msgid "Conservation office"
msgstr "Eintragungsstelle"
@@ -139,69 +136,73 @@ msgstr "Eintragungsstelle"
msgid "Select the responsible office"
msgstr "Verantwortliche Stelle"
#: compensation/forms/forms.py:243
#: compensation/forms/forms.py:244
#: compensation/templates/compensation/detail/eco_account/view.html:62
#: ema/templates/ema/detail/view.html:46 intervention/forms/forms.py:125
#: ema/templates/ema/detail/view.html:46 intervention/forms/forms.py:129
#: intervention/templates/intervention/detail/view.html:60
msgid "Conservation office file number"
msgstr "Aktenzeichen Eintragungsstelle"
#: compensation/forms/forms.py:249 intervention/forms/forms.py:131
#: compensation/forms/forms.py:250 intervention/forms/forms.py:135
msgid "ETS-123/ABC.456"
msgstr ""
#: compensation/forms/forms.py:255
#: compensation/forms/forms.py:256
msgid "Eco-account handler"
msgstr "Maßnahmenträger"
#: compensation/forms/forms.py:259
#: compensation/forms/forms.py:260
msgid "Who handles the eco-account"
msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist"
#: compensation/forms/forms.py:262 intervention/forms/forms.py:144
#: compensation/forms/forms.py:263 intervention/forms/forms.py:148
msgid "Company Mustermann"
msgstr "Firma Mustermann"
#: compensation/forms/forms.py:270
msgid "Available Surface"
msgstr "Verfügbare Fläche"
#: compensation/forms/forms.py:272
msgid "The amount that can be used for deductions"
msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
#: compensation/forms/forms.py:292
#: compensation/forms/forms.py:280
msgid "New Eco-Account"
msgstr "Neues Ökokonto"
#: compensation/forms/forms.py:301
#: compensation/forms/forms.py:289
msgid "Eco-Account XY; Location ABC"
msgstr "Ökokonto XY; Flur ABC"
#: compensation/forms/forms.py:338
msgid "Available Surface"
msgstr "Verfügbare Fläche"
#: compensation/forms/forms.py:341
msgid "The amount that can be used for deductions"
msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
#: compensation/forms/forms.py:362
msgid "Edit Eco-Account"
msgstr "Ökokonto bearbeiten"
#: compensation/forms/modalForms.py:36
msgid "in Euro"
msgstr "in Euro"
#: compensation/forms/modalForms.py:44
#: compensation/forms/modalForms.py:45
#: intervention/templates/intervention/detail/includes/payments.html:31
msgid "Due on"
msgstr "Fällig am"
#: compensation/forms/modalForms.py:47
#: compensation/forms/modalForms.py:48
msgid "Due on which date"
msgstr "Zahlung wird an diesem Datum erwartet"
#: compensation/forms/modalForms.py:62 compensation/forms/modalForms.py:274
#: compensation/forms/modalForms.py:368 intervention/forms/modalForms.py:134
#: konova/forms.py:374
#: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274
#: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:134
#: konova/forms.py:373
msgid "Additional comment, maximum {} letters"
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
#: compensation/forms/modalForms.py:74
#: compensation/forms/modalForms.py:75
msgid "Payment"
msgstr "Zahlung"
#: compensation/forms/modalForms.py:75
#: compensation/forms/modalForms.py:76
msgid "Add a payment for intervention '{}'"
msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen"
@@ -236,11 +237,11 @@ msgstr "Fläche"
msgid "in m²"
msgstr ""
#: compensation/forms/modalForms.py:165
#: compensation/forms/modalForms.py:166
msgid "New state"
msgstr "Neuer Zustand"
#: compensation/forms/modalForms.py:166
#: compensation/forms/modalForms.py:167
msgid "Insert data for the new state"
msgstr "Geben Sie die Daten des neuen Zustandes ein"
@@ -336,11 +337,11 @@ msgstr "Menge"
msgid "Insert the amount"
msgstr "Menge eingeben"
#: compensation/forms/modalForms.py:379
#: compensation/forms/modalForms.py:380
msgid "New action"
msgstr "Neue Maßnahme"
#: compensation/forms/modalForms.py:380
#: compensation/forms/modalForms.py:381
msgid "Insert data for the new action"
msgstr "Geben Sie die Daten der neuen Maßnahme ein"
@@ -587,7 +588,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:393
#: konova/forms.py:392
msgid "Add new document"
msgstr "Neues Dokument hinzufügen"
@@ -736,6 +737,10 @@ msgstr "Erstellt"
msgid "Remove Deduction"
msgstr "Abbuchung entfernen"
#: compensation/templates/compensation/detail/eco_account/view.html:34
msgid "No surface deductable"
msgstr "Keine Flächenmenge für Abbuchungen eingegeben. Bitte bearbeiten."
#: compensation/templates/compensation/detail/eco_account/view.html:57
#: compensation/templates/compensation/detail/eco_account/view.html:61
#: compensation/templates/compensation/detail/eco_account/view.html:65
@@ -755,7 +760,7 @@ msgid "Missing"
msgstr "Fehlt"
#: compensation/templates/compensation/detail/eco_account/view.html:66
#: ema/templates/ema/detail/view.html:50 intervention/forms/forms.py:137
#: ema/templates/ema/detail/view.html:50 intervention/forms/forms.py:141
#: intervention/templates/intervention/detail/view.html:64
msgid "Intervention handler"
msgstr "Eingriffsverursacher"
@@ -769,7 +774,7 @@ msgid "Compensation {} edited"
msgstr "Kompensation {} bearbeitet"
#: compensation/views/compensation_views.py:211
#: compensation/views/eco_account_views.py:248 ema/views.py:128
#: compensation/views/eco_account_views.py:278 ema/views.py:128
#: intervention/views.py:428
msgid "Log"
msgstr "Log"
@@ -779,23 +784,23 @@ msgid "Compensation removed"
msgstr "Kompensation entfernt"
#: compensation/views/compensation_views.py:251
#: compensation/views/eco_account_views.py:347 ema/views.py:250
#: compensation/views/eco_account_views.py:377 ema/views.py:250
#: intervention/views.py:124
msgid "Document added"
msgstr "Dokument hinzugefügt"
#: compensation/views/compensation_views.py:307
#: compensation/views/eco_account_views.py:291 ema/views.py:194
#: compensation/views/eco_account_views.py:321 ema/views.py:194
msgid "State added"
msgstr "Zustand hinzugefügt"
#: compensation/views/compensation_views.py:326
#: compensation/views/eco_account_views.py:310 ema/views.py:213
#: compensation/views/eco_account_views.py:340 ema/views.py:213
msgid "Action added"
msgstr "Maßnahme hinzugefügt"
#: compensation/views/compensation_views.py:345
#: compensation/views/eco_account_views.py:329 ema/views.py:232
#: compensation/views/eco_account_views.py:359 ema/views.py:232
msgid "Deadline added"
msgstr "Frist/Termin hinzugefügt"
@@ -807,29 +812,33 @@ msgstr "Zustand gelöscht"
msgid "Action removed"
msgstr "Maßnahme entfernt"
#: compensation/views/eco_account_views.py:87
#: compensation/views/eco_account_views.py:86
msgid "Eco-Account {} added"
msgstr "Ökokonto {} hinzugefügt"
#: compensation/views/eco_account_views.py:198
#: compensation/views/eco_account_views.py:142
msgid "Eco-Account {} edited"
msgstr "Ökokonto {} bearbeitet"
#: compensation/views/eco_account_views.py:228
msgid "Eco-account removed"
msgstr "Ökokonto entfernt"
#: compensation/views/eco_account_views.py:225
#: compensation/views/eco_account_views.py:255
msgid "Deduction removed"
msgstr "Abbuchung entfernt"
#: compensation/views/eco_account_views.py:268 ema/views.py:171
#: compensation/views/eco_account_views.py:298 ema/views.py:171
#: intervention/views.py:468
msgid "{} unrecorded"
msgstr "{} entzeichnet"
#: compensation/views/eco_account_views.py:268 ema/views.py:171
#: compensation/views/eco_account_views.py:298 ema/views.py:171
#: intervention/views.py:468
msgid "{} recorded"
msgstr "{} verzeichnet"
#: compensation/views/eco_account_views.py:404 intervention/views.py:450
#: compensation/views/eco_account_views.py:434 intervention/views.py:450
msgid "Deduction added"
msgstr "Abbuchung hinzugefügt"
@@ -890,48 +899,48 @@ msgstr "Bauvorhaben XY; Flur ABC"
msgid "Process type"
msgstr "Verfahrenstyp"
#: intervention/forms/forms.py:67
#: intervention/forms/forms.py:68
#: intervention/templates/intervention/detail/view.html:39
msgid "Law"
msgstr "Gesetz"
#: intervention/forms/forms.py:69
#: intervention/forms/forms.py:70
msgid "Multiple selection possible"
msgstr "Mehrfachauswahl möglich"
#: intervention/forms/forms.py:83
#: intervention/forms/forms.py:85
#: intervention/templates/intervention/detail/view.html:48
msgid "Registration office"
msgstr "Zulassungsbehörde"
#: intervention/forms/forms.py:113
#: intervention/forms/forms.py:117
#: intervention/templates/intervention/detail/view.html:52
msgid "Registration office file number"
msgstr "Aktenzeichen Zulassungsbehörde"
#: intervention/forms/forms.py:119
#: intervention/forms/forms.py:123
msgid "ZB-123/ABC.456"
msgstr ""
#: intervention/forms/forms.py:141
#: intervention/forms/forms.py:145
msgid "Who performs the intervention"
msgstr "Wer führt den Eingriff durch"
#: intervention/forms/forms.py:150
#: intervention/forms/forms.py:154
#: intervention/templates/intervention/detail/view.html:96
msgid "Registration date"
msgstr "Datum Zulassung bzw. Satzungsbeschluss"
#: intervention/forms/forms.py:162
#: intervention/forms/forms.py:166
#: intervention/templates/intervention/detail/view.html:100
msgid "Binding on"
msgstr "Datum Bestandskraft"
#: intervention/forms/forms.py:188
#: intervention/forms/forms.py:192
msgid "New intervention"
msgstr "Neuer Eingriff"
#: intervention/forms/forms.py:269
#: intervention/forms/forms.py:273
msgid "Edit intervention"
msgstr "Eingriff bearbeiten"
@@ -965,7 +974,7 @@ msgstr "Datum des Widerspruchs"
msgid "Document"
msgstr "Dokument"
#: intervention/forms/modalForms.py:122 konova/forms.py:362
#: intervention/forms/modalForms.py:122 konova/forms.py:361
msgid "Must be smaller than 15 Mb"
msgstr "Muss kleiner als 15 Mb sein"
@@ -987,7 +996,7 @@ msgstr "Kompensationen und Zahlungen geprüft"
msgid "Run check"
msgstr "Prüfung vornehmen"
#: intervention/forms/modalForms.py:201 konova/forms.py:447
#: intervention/forms/modalForms.py:201 konova/forms.py:446
msgid ""
"I, {} {}, confirm that all necessary control steps have been performed by "
"myself."
@@ -999,19 +1008,26 @@ msgstr ""
msgid "Only recorded accounts can be selected for deductions"
msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
#: intervention/forms/modalForms.py:286
#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292
#: 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/modalForms.py:287
msgid "Only shared interventions can be selected"
msgstr "Nur freigegebene Eingriffe können gewählt werden"
#: intervention/forms/modalForms.py:299
#: intervention/forms/modalForms.py:300
msgid "New Deduction"
msgstr "Neue Abbuchung"
#: intervention/forms/modalForms.py:300
#: intervention/forms/modalForms.py:301
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:336
#: intervention/forms/modalForms.py:334
msgid ""
"Eco-account {} is not recorded yet. You can only deduct from recorded "
"accounts."
@@ -1019,7 +1035,7 @@ msgstr ""
"Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
"verzeichneten Ökokonten erfolgen."
#: intervention/forms/modalForms.py:349
#: intervention/forms/modalForms.py:347
msgid ""
"The account {} has not enough surface for a deduction of {} m². There are "
"only {} m² left"
@@ -1203,11 +1219,11 @@ msgstr ""
msgid "Not editable"
msgstr "Nicht editierbar"
#: konova/forms.py:139 konova/forms.py:310
#: konova/forms.py:139 konova/forms.py:309
msgid "Confirm"
msgstr "Bestätige"
#: konova/forms.py:151 konova/forms.py:319
#: konova/forms.py:151 konova/forms.py:318
msgid "Remove"
msgstr "Löschen"
@@ -1219,44 +1235,44 @@ msgstr "Sie sind dabei {} {} zu löschen"
msgid "Geometry"
msgstr "Geometrie"
#: konova/forms.py:320
#: konova/forms.py:319
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
#: konova/forms.py:347
#: konova/forms.py:346
msgid "Created on"
msgstr "Erstellt"
#: konova/forms.py:349
#: konova/forms.py:348
msgid "When has this file been created? Important for photos."
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
#: konova/forms.py:360
#: konova/forms.py:359
#: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
msgid "File"
msgstr "Datei"
#: konova/forms.py:424
#: konova/forms.py:423
msgid "Added document"
msgstr "Dokument hinzugefügt"
#: konova/forms.py:438
#: konova/forms.py:437
msgid "Confirm record"
msgstr "Verzeichnen bestätigen"
#: konova/forms.py:446
#: konova/forms.py:445
msgid "Record data"
msgstr "Daten verzeichnen"
#: konova/forms.py:453
#: konova/forms.py:452
msgid "Confirm unrecord"
msgstr "Entzeichnen bestätigen"
#: konova/forms.py:454
#: konova/forms.py:453
msgid "Unrecord data"
msgstr "Daten entzeichnen"
#: konova/forms.py:455
#: konova/forms.py:454
msgid "I, {} {}, confirm that this data must be unrecorded."
msgstr ""
"Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."
@@ -1285,19 +1301,19 @@ msgstr "Wenn meine freigegebenen Daten gelöscht wurden"
msgid "On registered data edited"
msgstr "Wenn meine freigegebenen Daten bearbeitet wurden"
#: konova/models.py:204
#: konova/models.py:206
msgid "Finished"
msgstr "Umgesetzt bis"
#: konova/models.py:205
#: konova/models.py:207
msgid "Maintain"
msgstr "Unterhaltung bis"
#: konova/models.py:206
#: konova/models.py:208
msgid "Control"
msgstr "Kontrolle am"
#: konova/models.py:207
#: konova/models.py:209
msgid "Other"
msgstr "Sonstige"
@@ -2816,6 +2832,9 @@ msgstr ""
msgid "A fontawesome icon field"
msgstr ""
#~ msgid "Funding by..."
#~ msgstr "Gefördert mit..."
#~ msgid "Invalid input"
#~ msgstr "Eingabe fehlerhaft"
@@ -2894,9 +2913,6 @@ msgstr ""
#~ msgid "Add new eco account"
#~ msgstr "Neues Ökokonto hinzufügen"
#~ msgid "Edit eco account"
#~ msgstr "Ökokonto bearbeiten"
#~ msgid "Add new EMA"
#~ msgstr "Neue EMA hinzufügen"