diff --git a/messages.pot b/messages.pot index 35f58c2..8176cbe 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-07-13 15:39+0200\n" +"POT-Creation-Date: 2023-08-14 18:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -201,7 +201,7 @@ msgstr "" msgid "message" msgstr "" -#: project/api/organization/resources.py:645 +#: project/api/organization/resources.py:647 #: project/views/admin_unit_member_invitation.py:89 msgid "You have received an invitation" msgstr "" @@ -216,7 +216,7 @@ msgstr "" msgid "Legal notice" msgstr "" -#: project/forms/admin.py:13 project/templates/_macros.html:1480 +#: project/forms/admin.py:13 project/templates/_macros.html:1483 #: project/templates/layout.html:346 #: project/templates/widget/event_suggestion/create.html:204 #: project/views/admin_unit.py:84 project/views/root.py:75 @@ -264,7 +264,7 @@ msgstr "" #: project/forms/admin_unit_member.py:30 project/forms/event.py:112 #: project/forms/event_suggestion.py:38 project/forms/organizer.py:33 #: project/forms/user.py:18 project/forms/user.py:23 -#: project/templates/_macros.html:246 project/templates/_macros.html:1576 +#: project/templates/_macros.html:246 project/templates/_macros.html:1579 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 #: project/templates/manage/organizers.html:21 @@ -411,7 +411,7 @@ msgstr "" msgid "The short name is used to create a unique identifier for your events" msgstr "" -#: project/forms/admin_unit.py:46 project/templates/_macros.html:1618 +#: project/forms/admin_unit.py:46 project/templates/_macros.html:1621 msgid "Short name must contain only letters numbers or underscore" msgstr "" @@ -661,17 +661,17 @@ msgstr "" msgid "All-day" msgstr "" -#: project/forms/event.py:59 project/templates/_macros.html:945 -#: project/templates/_macros.html:1788 +#: project/forms/event.py:59 project/templates/_macros.html:948 +#: project/templates/_macros.html:1791 #: project/templates/widget/event_suggestion/create.html:240 msgid "Recurring event" msgstr "" -#: project/forms/event.py:66 project/templates/_macros.html:1337 +#: project/forms/event.py:66 project/templates/_macros.html:1340 msgid "The start must be before the end." msgstr "" -#: project/forms/event.py:72 project/templates/_macros.html:1354 +#: project/forms/event.py:72 project/templates/_macros.html:1357 msgid "An event can last a maximum of 14 days." msgstr "" @@ -904,7 +904,7 @@ msgstr "" #: project/forms/event.py:390 project/forms/event.py:456 #: project/forms/event_date.py:40 project/forms/event_suggestion.py:60 #: project/templates/_macros.html:501 project/templates/_macros.html:673 -#: project/templates/_macros.html:948 project/templates/event/create.html:257 +#: project/templates/_macros.html:951 project/templates/event/create.html:257 #: project/templates/event/update.html:160 #: project/templates/manage/events.html:104 #: project/templates/organizer/create.html:27 @@ -1018,7 +1018,7 @@ msgstr "" msgid "Update event" msgstr "" -#: project/forms/event.py:440 project/templates/_macros.html:1294 +#: project/forms/event.py:440 project/templates/_macros.html:1297 #: project/templates/event/actions.html:66 #: project/templates/event/delete.html:6 msgid "Delete event" @@ -1072,7 +1072,7 @@ msgstr "" #: project/forms/event_date.py:35 project/forms/reference.py:11 #: project/forms/reference_request.py:16 project/templates/_macros.html:517 -#: project/templates/_macros.html:690 project/templates/_macros.html:947 +#: project/templates/_macros.html:690 project/templates/_macros.html:950 #: project/templates/admin/delete_admin_unit.html:13 #: project/templates/admin_unit/cancel_deletion.html:13 #: project/templates/admin_unit/create.html:27 @@ -1251,7 +1251,7 @@ msgid "Delete request" msgstr "" #: project/forms/reference_request.py:28 -#: project/forms/verification_request.py:24 project/templates/_macros.html:1492 +#: project/forms/verification_request.py:24 project/templates/_macros.html:1495 #: project/templates/event_suggestion/review_status.html:18 #: project/templates/reference_request/review_status.html:12 #: project/templates/verification_request/review_status.html:4 @@ -1427,17 +1427,17 @@ msgstr "" msgid "Event" msgstr "" -#: project/templates/_macros.html:419 project/templates/_macros.html:1018 +#: project/templates/_macros.html:419 project/templates/_macros.html:1021 msgid "Date" msgstr "" #: project/templates/_macros.html:446 project/templates/_macros.html:605 -#: project/templates/_macros.html:1561 project/templates/event/actions.html:51 +#: project/templates/_macros.html:1564 project/templates/event/actions.html:51 msgid "Share" msgstr "" #: project/templates/_macros.html:450 project/templates/_macros.html:609 -#: project/templates/_macros.html:1591 +#: project/templates/_macros.html:1594 msgid "Add to calendar" msgstr "" @@ -1481,7 +1481,7 @@ msgstr "" msgid "Referenced by" msgstr "" -#: project/templates/_macros.html:729 project/templates/_macros.html:1304 +#: project/templates/_macros.html:729 project/templates/_macros.html:1307 #: project/templates/event/actions.html:38 #: project/templates/event_date/list.html:251 #: project/templates/manage/events.html:125 @@ -1489,7 +1489,7 @@ msgstr "" msgid "Reference event" msgstr "" -#: project/templates/_macros.html:749 project/templates/_macros.html:1301 +#: project/templates/_macros.html:749 project/templates/_macros.html:1304 #: project/templates/event/actions.html:32 #: project/templates/manage/events.html:123 msgid "Request reference" @@ -1505,17 +1505,17 @@ msgstr "" msgid "Search location on Google" msgstr "" -#: project/templates/_macros.html:922 +#: project/templates/_macros.html:925 #, python-format msgid "%(count)d event dates" msgstr "" -#: project/templates/_macros.html:958 project/templates/_macros.html:960 +#: project/templates/_macros.html:961 project/templates/_macros.html:963 #: project/templates/event_date/list.html:510 msgid "First" msgstr "" -#: project/templates/_macros.html:963 project/templates/_macros.html:965 +#: project/templates/_macros.html:966 project/templates/_macros.html:968 #: project/templates/event_date/list.html:511 #: project/templates/widget/event_suggestion/create.html:193 #: project/templates/widget/event_suggestion/create.html:218 @@ -1526,12 +1526,12 @@ msgstr "" msgid "Previous" msgstr "" -#: project/templates/_macros.html:967 +#: project/templates/_macros.html:970 #, python-format msgid "Page %(page)d of %(pages)d (%(total)d total)" msgstr "" -#: project/templates/_macros.html:969 project/templates/_macros.html:971 +#: project/templates/_macros.html:972 project/templates/_macros.html:974 #: project/templates/event_date/list.html:513 #: project/templates/widget/event_suggestion/create.html:194 #: project/templates/widget/event_suggestion/create.html:219 @@ -1541,98 +1541,98 @@ msgstr "" msgid "Next" msgstr "" -#: project/templates/_macros.html:974 project/templates/_macros.html:976 +#: project/templates/_macros.html:977 project/templates/_macros.html:979 #: project/templates/event_date/list.html:514 msgid "Last" msgstr "" -#: project/templates/_macros.html:1041 +#: project/templates/_macros.html:1044 msgid "Radius" msgstr "" -#: project/templates/_macros.html:1223 +#: project/templates/_macros.html:1226 msgid "Edit image" msgstr "" -#: project/templates/_macros.html:1244 project/templates/planning/list.html:97 +#: project/templates/_macros.html:1247 project/templates/planning/list.html:97 msgid "Close" msgstr "" -#: project/templates/_macros.html:1245 +#: project/templates/_macros.html:1248 msgid "Okay" msgstr "" -#: project/templates/_macros.html:1257 +#: project/templates/_macros.html:1260 msgid "Choose image file" msgstr "" -#: project/templates/_macros.html:1293 project/templates/event/actions.html:65 +#: project/templates/_macros.html:1296 project/templates/event/actions.html:65 #: project/templates/event/delete.html:12 msgid "Edit event" msgstr "" -#: project/templates/_macros.html:1297 project/templates/event/actions.html:58 +#: project/templates/_macros.html:1300 project/templates/event/actions.html:58 msgid "Duplicate event" msgstr "" -#: project/templates/_macros.html:1308 project/templates/event/actions.html:44 +#: project/templates/_macros.html:1311 project/templates/event/actions.html:44 #: project/templates/manage/events.html:129 msgid "Add to list" msgstr "" -#: project/templates/_macros.html:1311 project/templates/manage/events.html:132 +#: project/templates/_macros.html:1314 project/templates/manage/events.html:132 msgid "More" msgstr "" -#: project/templates/_macros.html:1358 +#: project/templates/_macros.html:1361 msgid "Please enter a valid time, between 00:00 and 23:59." msgstr "" -#: project/templates/_macros.html:1386 +#: project/templates/_macros.html:1389 #, python-format msgid "Just use %(term)s" msgstr "" -#: project/templates/_macros.html:1452 +#: project/templates/_macros.html:1455 msgid "Event suggestion" msgstr "" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Link copied" msgstr "" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Copy link" msgstr "" -#: project/templates/_macros.html:1600 +#: project/templates/_macros.html:1603 msgid "Google calendar" msgstr "" -#: project/templates/_macros.html:1602 +#: project/templates/_macros.html:1605 msgid "Apple calendar" msgstr "" -#: project/templates/_macros.html:1603 +#: project/templates/_macros.html:1606 msgid "Yahoo calendar" msgstr "" -#: project/templates/_macros.html:1604 +#: project/templates/_macros.html:1607 msgid "Other calendar" msgstr "" -#: project/templates/_macros.html:1789 +#: project/templates/_macros.html:1792 msgid "Remove event date" msgstr "" -#: project/templates/_macros.html:1822 project/templates/event/create.html:180 +#: project/templates/_macros.html:1825 project/templates/event/create.html:180 #: project/templates/event/update.html:103 #: project/templates/event_date/list.html:446 #: project/templates/widget/event_suggestion/create.html:129 msgid "Enter organizer" msgstr "" -#: project/templates/_macros.html:1850 +#: project/templates/_macros.html:1853 msgid "Enter list name" msgstr "" @@ -2268,8 +2268,10 @@ msgstr "" #: project/templates/event_suggestion/review.html:28 #: project/templates/event_suggestion/review_status.html:24 +#: project/templates/manage/reference_requests_incoming.html:20 #: project/templates/reference/read.html:22 #: project/templates/reference_request/review_status.html:17 +#: project/views/reference_request_review.py:42 msgid "View event" msgstr "" @@ -2379,6 +2381,11 @@ msgstr "" msgid "Reviews" msgstr "" +#: project/templates/manage/verification_requests_incoming.html:19 +#: project/views/verification_request_review.py:36 +msgid "View organization" +msgstr "" + #: project/templates/manage/verification_requests_outgoing_create.html:5 #: project/templates/manage/verification_requests_outgoing_create.html:9 #, python-format @@ -2699,7 +2706,7 @@ msgid "Event suggestion successfully rejected" msgstr "" #: project/views/event_suggestion.py:87 -#: project/views/reference_request_review.py:129 +#: project/views/reference_request_review.py:139 msgid "Event review status updated" msgstr "" @@ -2803,20 +2810,20 @@ msgstr "" msgid "New reference automatically verified" msgstr "" -#: project/views/reference_request_review.py:34 +#: project/views/reference_request_review.py:40 msgid "Request already verified" msgstr "" -#: project/views/reference_request_review.py:51 +#: project/views/reference_request_review.py:61 msgid "Reference successfully created" msgstr "" -#: project/views/reference_request_review.py:59 +#: project/views/reference_request_review.py:69 msgid "Request successfully updated" msgstr "" -#: project/views/reference_request_review.py:82 -#: project/views/verification_request_review.py:73 +#: project/views/reference_request_review.py:92 +#: project/views/verification_request_review.py:83 #, python-format msgid "" "If all upcoming reference requests of %(admin_unit_name)s should be " @@ -2876,19 +2883,19 @@ msgstr "" msgid "New verification request" msgstr "" -#: project/views/verification_request_review.py:28 +#: project/views/verification_request_review.py:34 msgid "Verification request already verified" msgstr "" -#: project/views/verification_request_review.py:54 +#: project/views/verification_request_review.py:64 msgid "Organization successfully verified" msgstr "" -#: project/views/verification_request_review.py:56 +#: project/views/verification_request_review.py:66 msgid "Verification request successfully updated" msgstr "" -#: project/views/verification_request_review.py:109 +#: project/views/verification_request_review.py:119 msgid "Verification request review status updated" msgstr "" diff --git a/project/static/site.css b/project/static/site.css index 47e3968..75a73fe 100644 --- a/project/static/site.css +++ b/project/static/site.css @@ -111,3 +111,8 @@ tr.table-line-through td { .dropzone-wrapper.dragover { background: #ecf0f5; } + +button.dropdown-toggle { + white-space: normal; + text-align: inherit; +} diff --git a/project/templates/manage/reference_requests_incoming.html b/project/templates/manage/reference_requests_incoming.html index 1c481af..8a75db9 100644 --- a/project/templates/manage/reference_requests_incoming.html +++ b/project/templates/manage/reference_requests_incoming.html @@ -17,6 +17,7 @@
{{ _('Review request') }}… + {{ _('View event') }}
{{ render_reference_request_review_status_pill(request) }} diff --git a/project/templates/manage/verification_requests_incoming.html b/project/templates/manage/verification_requests_incoming.html index d93408b..d12927b 100644 --- a/project/templates/manage/verification_requests_incoming.html +++ b/project/templates/manage/verification_requests_incoming.html @@ -16,6 +16,7 @@
{{ _('Show review status') }} {{ _('Review request') }}… + {{ _('View organization') }}…
{{ render_verification_request_review_status_pill(request) }} diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo index fd62890..9a9d9b6 100644 Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po index 25c6b36..ec68068 100644 --- a/project/translations/de/LC_MESSAGES/messages.po +++ b/project/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-07-13 15:39+0200\n" +"POT-Creation-Date: 2023-08-14 18:27+0200\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -202,7 +202,7 @@ msgstr "." msgid "message" msgstr "message" -#: project/api/organization/resources.py:645 +#: project/api/organization/resources.py:647 #: project/views/admin_unit_member_invitation.py:89 msgid "You have received an invitation" msgstr "Du hast eine Einladung erhalten" @@ -217,7 +217,7 @@ msgstr "Nutzungsbedingungen" msgid "Legal notice" msgstr "Impressum" -#: project/forms/admin.py:13 project/templates/_macros.html:1480 +#: project/forms/admin.py:13 project/templates/_macros.html:1483 #: project/templates/layout.html:346 #: project/templates/widget/event_suggestion/create.html:204 #: project/views/admin_unit.py:84 project/views/root.py:75 @@ -265,7 +265,7 @@ msgstr "Nutzer löschen" #: project/forms/admin_unit_member.py:30 project/forms/event.py:112 #: project/forms/event_suggestion.py:38 project/forms/organizer.py:33 #: project/forms/user.py:18 project/forms/user.py:23 -#: project/templates/_macros.html:246 project/templates/_macros.html:1576 +#: project/templates/_macros.html:246 project/templates/_macros.html:1579 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 #: project/templates/manage/organizers.html:21 @@ -423,7 +423,7 @@ msgstr "" "eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern " "und Unterstriche enthalten." -#: project/forms/admin_unit.py:46 project/templates/_macros.html:1618 +#: project/forms/admin_unit.py:46 project/templates/_macros.html:1621 msgid "Short name must contain only letters numbers or underscore" msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten" @@ -686,17 +686,17 @@ msgstr "Gib an, wann der Termin endet. Ein Termin darf maximal 14 Tage dauern." msgid "All-day" msgstr "Ganztägig" -#: project/forms/event.py:59 project/templates/_macros.html:945 -#: project/templates/_macros.html:1788 +#: project/forms/event.py:59 project/templates/_macros.html:948 +#: project/templates/_macros.html:1791 #: project/templates/widget/event_suggestion/create.html:240 msgid "Recurring event" msgstr "Serientermin" -#: project/forms/event.py:66 project/templates/_macros.html:1337 +#: project/forms/event.py:66 project/templates/_macros.html:1340 msgid "The start must be before the end." msgstr "Der Start muss vor dem Ende sein." -#: project/forms/event.py:72 project/templates/_macros.html:1354 +#: project/forms/event.py:72 project/templates/_macros.html:1357 msgid "An event can last a maximum of 14 days." msgstr "Eine Veranstaltung darf maximal 14 Tage dauern." @@ -946,7 +946,7 @@ msgstr "Neuen Ort eingeben" #: project/forms/event.py:390 project/forms/event.py:456 #: project/forms/event_date.py:40 project/forms/event_suggestion.py:60 #: project/templates/_macros.html:501 project/templates/_macros.html:673 -#: project/templates/_macros.html:948 project/templates/event/create.html:257 +#: project/templates/_macros.html:951 project/templates/event/create.html:257 #: project/templates/event/update.html:160 #: project/templates/manage/events.html:104 #: project/templates/organizer/create.html:27 @@ -1066,7 +1066,7 @@ msgstr "" msgid "Update event" msgstr "Veranstaltung aktualisieren" -#: project/forms/event.py:440 project/templates/_macros.html:1294 +#: project/forms/event.py:440 project/templates/_macros.html:1297 #: project/templates/event/actions.html:66 #: project/templates/event/delete.html:6 msgid "Delete event" @@ -1120,7 +1120,7 @@ msgstr "Veranstaltungen finden" #: project/forms/event_date.py:35 project/forms/reference.py:11 #: project/forms/reference_request.py:16 project/templates/_macros.html:517 -#: project/templates/_macros.html:690 project/templates/_macros.html:947 +#: project/templates/_macros.html:690 project/templates/_macros.html:950 #: project/templates/admin/delete_admin_unit.html:13 #: project/templates/admin_unit/cancel_deletion.html:13 #: project/templates/admin_unit/create.html:27 @@ -1303,7 +1303,7 @@ msgid "Delete request" msgstr "Anfrage löschen" #: project/forms/reference_request.py:28 -#: project/forms/verification_request.py:24 project/templates/_macros.html:1492 +#: project/forms/verification_request.py:24 project/templates/_macros.html:1495 #: project/templates/event_suggestion/review_status.html:18 #: project/templates/reference_request/review_status.html:12 #: project/templates/verification_request/review_status.html:4 @@ -1486,17 +1486,17 @@ msgstr "Zuletzt aktualisiert am %(updated_at)s." msgid "Event" msgstr "Veranstaltung" -#: project/templates/_macros.html:419 project/templates/_macros.html:1018 +#: project/templates/_macros.html:419 project/templates/_macros.html:1021 msgid "Date" msgstr "Datum" #: project/templates/_macros.html:446 project/templates/_macros.html:605 -#: project/templates/_macros.html:1561 project/templates/event/actions.html:51 +#: project/templates/_macros.html:1564 project/templates/event/actions.html:51 msgid "Share" msgstr "Teilen" #: project/templates/_macros.html:450 project/templates/_macros.html:609 -#: project/templates/_macros.html:1591 +#: project/templates/_macros.html:1594 msgid "Add to calendar" msgstr "Zum Kalender" @@ -1542,7 +1542,7 @@ msgstr "Bearbeiten" msgid "Referenced by" msgstr "Empfohlen von" -#: project/templates/_macros.html:729 project/templates/_macros.html:1304 +#: project/templates/_macros.html:729 project/templates/_macros.html:1307 #: project/templates/event/actions.html:38 #: project/templates/event_date/list.html:251 #: project/templates/manage/events.html:125 @@ -1550,7 +1550,7 @@ msgstr "Empfohlen von" msgid "Reference event" msgstr "Veranstaltung empfehlen" -#: project/templates/_macros.html:749 project/templates/_macros.html:1301 +#: project/templates/_macros.html:749 project/templates/_macros.html:1304 #: project/templates/event/actions.html:32 #: project/templates/manage/events.html:123 msgid "Request reference" @@ -1566,17 +1566,17 @@ msgstr "Termine" msgid "Search location on Google" msgstr "Ort bei Google suchen" -#: project/templates/_macros.html:922 +#: project/templates/_macros.html:925 #, python-format msgid "%(count)d event dates" msgstr "%(count)d Termine" -#: project/templates/_macros.html:958 project/templates/_macros.html:960 +#: project/templates/_macros.html:961 project/templates/_macros.html:963 #: project/templates/event_date/list.html:510 msgid "First" msgstr "Erste" -#: project/templates/_macros.html:963 project/templates/_macros.html:965 +#: project/templates/_macros.html:966 project/templates/_macros.html:968 #: project/templates/event_date/list.html:511 #: project/templates/widget/event_suggestion/create.html:193 #: project/templates/widget/event_suggestion/create.html:218 @@ -1587,12 +1587,12 @@ msgstr "Erste" msgid "Previous" msgstr "Zurück" -#: project/templates/_macros.html:967 +#: project/templates/_macros.html:970 #, python-format msgid "Page %(page)d of %(pages)d (%(total)d total)" msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)" -#: project/templates/_macros.html:969 project/templates/_macros.html:971 +#: project/templates/_macros.html:972 project/templates/_macros.html:974 #: project/templates/event_date/list.html:513 #: project/templates/widget/event_suggestion/create.html:194 #: project/templates/widget/event_suggestion/create.html:219 @@ -1602,98 +1602,98 @@ msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)" msgid "Next" msgstr "Weiter" -#: project/templates/_macros.html:974 project/templates/_macros.html:976 +#: project/templates/_macros.html:977 project/templates/_macros.html:979 #: project/templates/event_date/list.html:514 msgid "Last" msgstr "Letzte" -#: project/templates/_macros.html:1041 +#: project/templates/_macros.html:1044 msgid "Radius" msgstr "Umkreis" -#: project/templates/_macros.html:1223 +#: project/templates/_macros.html:1226 msgid "Edit image" msgstr "Bild bearbeiten" -#: project/templates/_macros.html:1244 project/templates/planning/list.html:97 +#: project/templates/_macros.html:1247 project/templates/planning/list.html:97 msgid "Close" msgstr "Schließen" -#: project/templates/_macros.html:1245 +#: project/templates/_macros.html:1248 msgid "Okay" msgstr "OK" -#: project/templates/_macros.html:1257 +#: project/templates/_macros.html:1260 msgid "Choose image file" msgstr "Bild-Datei auswählen" -#: project/templates/_macros.html:1293 project/templates/event/actions.html:65 +#: project/templates/_macros.html:1296 project/templates/event/actions.html:65 #: project/templates/event/delete.html:12 msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: project/templates/_macros.html:1297 project/templates/event/actions.html:58 +#: project/templates/_macros.html:1300 project/templates/event/actions.html:58 msgid "Duplicate event" msgstr "Veranstaltung duplizieren" -#: project/templates/_macros.html:1308 project/templates/event/actions.html:44 +#: project/templates/_macros.html:1311 project/templates/event/actions.html:44 #: project/templates/manage/events.html:129 msgid "Add to list" msgstr "Zu Liste hinzufügen" -#: project/templates/_macros.html:1311 project/templates/manage/events.html:132 +#: project/templates/_macros.html:1314 project/templates/manage/events.html:132 msgid "More" msgstr "Mehr" -#: project/templates/_macros.html:1358 +#: project/templates/_macros.html:1361 msgid "Please enter a valid time, between 00:00 and 23:59." msgstr "Bitte gib eine gültige Uhrzeit zwischen 00:00 und 23:59 ein." -#: project/templates/_macros.html:1386 +#: project/templates/_macros.html:1389 #, python-format msgid "Just use %(term)s" msgstr "Verwende einfach %(term)s" -#: project/templates/_macros.html:1452 +#: project/templates/_macros.html:1455 msgid "Event suggestion" msgstr "Veranstaltungsvorschlag" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Link copied" msgstr "Link kopiert" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Copy link" msgstr "Link kopieren" -#: project/templates/_macros.html:1600 +#: project/templates/_macros.html:1603 msgid "Google calendar" msgstr "Google Kalender" -#: project/templates/_macros.html:1602 +#: project/templates/_macros.html:1605 msgid "Apple calendar" msgstr "Apple Kalender" -#: project/templates/_macros.html:1603 +#: project/templates/_macros.html:1606 msgid "Yahoo calendar" msgstr "Yahoo Kalender" -#: project/templates/_macros.html:1604 +#: project/templates/_macros.html:1607 msgid "Other calendar" msgstr "Anderer Kalender" -#: project/templates/_macros.html:1789 +#: project/templates/_macros.html:1792 msgid "Remove event date" msgstr "Termin entfernen" -#: project/templates/_macros.html:1822 project/templates/event/create.html:180 +#: project/templates/_macros.html:1825 project/templates/event/create.html:180 #: project/templates/event/update.html:103 #: project/templates/event_date/list.html:446 #: project/templates/widget/event_suggestion/create.html:129 msgid "Enter organizer" msgstr "Veranstalter eingeben" -#: project/templates/_macros.html:1850 +#: project/templates/_macros.html:1853 msgid "Enter list name" msgstr "Listenname eingeben" @@ -2340,8 +2340,10 @@ msgstr "Veranstaltungsvorschlag prüfen" #: project/templates/event_suggestion/review.html:28 #: project/templates/event_suggestion/review_status.html:24 +#: project/templates/manage/reference_requests_incoming.html:20 #: project/templates/reference/read.html:22 #: project/templates/reference_request/review_status.html:17 +#: project/views/reference_request_review.py:42 msgid "View event" msgstr "Veranstaltung anzeigen" @@ -2453,6 +2455,11 @@ msgstr "Prüfungsstatus anzeigen" msgid "Reviews" msgstr "Prüfungen" +#: project/templates/manage/verification_requests_incoming.html:19 +#: project/views/verification_request_review.py:36 +msgid "View organization" +msgstr "Organisation anzeigen" + #: project/templates/manage/verification_requests_outgoing_create.html:5 #: project/templates/manage/verification_requests_outgoing_create.html:9 #, python-format @@ -2780,7 +2787,7 @@ msgid "Event suggestion successfully rejected" msgstr "Veranstaltungsvorschlag erfolgreich abgelehnt" #: project/views/event_suggestion.py:87 -#: project/views/reference_request_review.py:129 +#: project/views/reference_request_review.py:139 msgid "Event review status updated" msgstr "Prüfungsstatus aktualisiert" @@ -2889,20 +2896,20 @@ msgstr "Neue Empfehlungsanfrage" msgid "New reference automatically verified" msgstr "Neue automatisch verifizierte Empfehlung" -#: project/views/reference_request_review.py:34 +#: project/views/reference_request_review.py:40 msgid "Request already verified" msgstr "Empfehlungsanfrage ist bereits verifiziert" -#: project/views/reference_request_review.py:51 +#: project/views/reference_request_review.py:61 msgid "Reference successfully created" msgstr "Empfehlung erfolgreich erstellt" -#: project/views/reference_request_review.py:59 +#: project/views/reference_request_review.py:69 msgid "Request successfully updated" msgstr "Empfehlungsanfrage erfolgreich aktualisiert" -#: project/views/reference_request_review.py:82 -#: project/views/verification_request_review.py:73 +#: project/views/reference_request_review.py:92 +#: project/views/verification_request_review.py:83 #, python-format msgid "" "If all upcoming reference requests of %(admin_unit_name)s should be " @@ -2972,19 +2979,19 @@ msgstr "Verifizierungsanfrage erfolgreich gelöscht" msgid "New verification request" msgstr "Neue Verifizierungsanfrage" -#: project/views/verification_request_review.py:28 +#: project/views/verification_request_review.py:34 msgid "Verification request already verified" msgstr "Verifizierungsanfrage ist bereits verifiziert" -#: project/views/verification_request_review.py:54 +#: project/views/verification_request_review.py:64 msgid "Organization successfully verified" msgstr "Organisation erfolgreich verifiziert" -#: project/views/verification_request_review.py:56 +#: project/views/verification_request_review.py:66 msgid "Verification request successfully updated" msgstr "Verifizierungsanfrage erfolgreich aktualisiert" -#: project/views/verification_request_review.py:109 +#: project/views/verification_request_review.py:119 msgid "Verification request review status updated" msgstr "Prüfungsstatus der Verifizierungsanfrage aktualisiert" diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo index 61ad21b..538937e 100644 Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po index 86ab62e..7d07b25 100644 --- a/project/translations/en/LC_MESSAGES/messages.po +++ b/project/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-07-13 15:39+0200\n" +"POT-Creation-Date: 2023-08-14 18:27+0200\n" "PO-Revision-Date: 2021-04-30 15:04+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -202,7 +202,7 @@ msgstr "" msgid "message" msgstr "" -#: project/api/organization/resources.py:645 +#: project/api/organization/resources.py:647 #: project/views/admin_unit_member_invitation.py:89 msgid "You have received an invitation" msgstr "" @@ -217,7 +217,7 @@ msgstr "" msgid "Legal notice" msgstr "" -#: project/forms/admin.py:13 project/templates/_macros.html:1480 +#: project/forms/admin.py:13 project/templates/_macros.html:1483 #: project/templates/layout.html:346 #: project/templates/widget/event_suggestion/create.html:204 #: project/views/admin_unit.py:84 project/views/root.py:75 @@ -265,7 +265,7 @@ msgstr "" #: project/forms/admin_unit_member.py:30 project/forms/event.py:112 #: project/forms/event_suggestion.py:38 project/forms/organizer.py:33 #: project/forms/user.py:18 project/forms/user.py:23 -#: project/templates/_macros.html:246 project/templates/_macros.html:1576 +#: project/templates/_macros.html:246 project/templates/_macros.html:1579 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 #: project/templates/manage/organizers.html:21 @@ -412,7 +412,7 @@ msgstr "" msgid "The short name is used to create a unique identifier for your events" msgstr "" -#: project/forms/admin_unit.py:46 project/templates/_macros.html:1618 +#: project/forms/admin_unit.py:46 project/templates/_macros.html:1621 msgid "Short name must contain only letters numbers or underscore" msgstr "" @@ -662,17 +662,17 @@ msgstr "" msgid "All-day" msgstr "" -#: project/forms/event.py:59 project/templates/_macros.html:945 -#: project/templates/_macros.html:1788 +#: project/forms/event.py:59 project/templates/_macros.html:948 +#: project/templates/_macros.html:1791 #: project/templates/widget/event_suggestion/create.html:240 msgid "Recurring event" msgstr "" -#: project/forms/event.py:66 project/templates/_macros.html:1337 +#: project/forms/event.py:66 project/templates/_macros.html:1340 msgid "The start must be before the end." msgstr "" -#: project/forms/event.py:72 project/templates/_macros.html:1354 +#: project/forms/event.py:72 project/templates/_macros.html:1357 msgid "An event can last a maximum of 14 days." msgstr "" @@ -905,7 +905,7 @@ msgstr "" #: project/forms/event.py:390 project/forms/event.py:456 #: project/forms/event_date.py:40 project/forms/event_suggestion.py:60 #: project/templates/_macros.html:501 project/templates/_macros.html:673 -#: project/templates/_macros.html:948 project/templates/event/create.html:257 +#: project/templates/_macros.html:951 project/templates/event/create.html:257 #: project/templates/event/update.html:160 #: project/templates/manage/events.html:104 #: project/templates/organizer/create.html:27 @@ -1019,7 +1019,7 @@ msgstr "" msgid "Update event" msgstr "" -#: project/forms/event.py:440 project/templates/_macros.html:1294 +#: project/forms/event.py:440 project/templates/_macros.html:1297 #: project/templates/event/actions.html:66 #: project/templates/event/delete.html:6 msgid "Delete event" @@ -1073,7 +1073,7 @@ msgstr "" #: project/forms/event_date.py:35 project/forms/reference.py:11 #: project/forms/reference_request.py:16 project/templates/_macros.html:517 -#: project/templates/_macros.html:690 project/templates/_macros.html:947 +#: project/templates/_macros.html:690 project/templates/_macros.html:950 #: project/templates/admin/delete_admin_unit.html:13 #: project/templates/admin_unit/cancel_deletion.html:13 #: project/templates/admin_unit/create.html:27 @@ -1252,7 +1252,7 @@ msgid "Delete request" msgstr "" #: project/forms/reference_request.py:28 -#: project/forms/verification_request.py:24 project/templates/_macros.html:1492 +#: project/forms/verification_request.py:24 project/templates/_macros.html:1495 #: project/templates/event_suggestion/review_status.html:18 #: project/templates/reference_request/review_status.html:12 #: project/templates/verification_request/review_status.html:4 @@ -1435,17 +1435,17 @@ msgstr "" msgid "Event" msgstr "" -#: project/templates/_macros.html:419 project/templates/_macros.html:1018 +#: project/templates/_macros.html:419 project/templates/_macros.html:1021 msgid "Date" msgstr "" #: project/templates/_macros.html:446 project/templates/_macros.html:605 -#: project/templates/_macros.html:1561 project/templates/event/actions.html:51 +#: project/templates/_macros.html:1564 project/templates/event/actions.html:51 msgid "Share" msgstr "" #: project/templates/_macros.html:450 project/templates/_macros.html:609 -#: project/templates/_macros.html:1591 +#: project/templates/_macros.html:1594 msgid "Add to calendar" msgstr "" @@ -1489,7 +1489,7 @@ msgstr "" msgid "Referenced by" msgstr "" -#: project/templates/_macros.html:729 project/templates/_macros.html:1304 +#: project/templates/_macros.html:729 project/templates/_macros.html:1307 #: project/templates/event/actions.html:38 #: project/templates/event_date/list.html:251 #: project/templates/manage/events.html:125 @@ -1497,7 +1497,7 @@ msgstr "" msgid "Reference event" msgstr "" -#: project/templates/_macros.html:749 project/templates/_macros.html:1301 +#: project/templates/_macros.html:749 project/templates/_macros.html:1304 #: project/templates/event/actions.html:32 #: project/templates/manage/events.html:123 msgid "Request reference" @@ -1513,17 +1513,17 @@ msgstr "" msgid "Search location on Google" msgstr "" -#: project/templates/_macros.html:922 +#: project/templates/_macros.html:925 #, python-format msgid "%(count)d event dates" msgstr "" -#: project/templates/_macros.html:958 project/templates/_macros.html:960 +#: project/templates/_macros.html:961 project/templates/_macros.html:963 #: project/templates/event_date/list.html:510 msgid "First" msgstr "" -#: project/templates/_macros.html:963 project/templates/_macros.html:965 +#: project/templates/_macros.html:966 project/templates/_macros.html:968 #: project/templates/event_date/list.html:511 #: project/templates/widget/event_suggestion/create.html:193 #: project/templates/widget/event_suggestion/create.html:218 @@ -1534,12 +1534,12 @@ msgstr "" msgid "Previous" msgstr "" -#: project/templates/_macros.html:967 +#: project/templates/_macros.html:970 #, python-format msgid "Page %(page)d of %(pages)d (%(total)d total)" msgstr "" -#: project/templates/_macros.html:969 project/templates/_macros.html:971 +#: project/templates/_macros.html:972 project/templates/_macros.html:974 #: project/templates/event_date/list.html:513 #: project/templates/widget/event_suggestion/create.html:194 #: project/templates/widget/event_suggestion/create.html:219 @@ -1549,98 +1549,98 @@ msgstr "" msgid "Next" msgstr "" -#: project/templates/_macros.html:974 project/templates/_macros.html:976 +#: project/templates/_macros.html:977 project/templates/_macros.html:979 #: project/templates/event_date/list.html:514 msgid "Last" msgstr "" -#: project/templates/_macros.html:1041 +#: project/templates/_macros.html:1044 msgid "Radius" msgstr "" -#: project/templates/_macros.html:1223 +#: project/templates/_macros.html:1226 msgid "Edit image" msgstr "" -#: project/templates/_macros.html:1244 project/templates/planning/list.html:97 +#: project/templates/_macros.html:1247 project/templates/planning/list.html:97 msgid "Close" msgstr "" -#: project/templates/_macros.html:1245 +#: project/templates/_macros.html:1248 msgid "Okay" msgstr "" -#: project/templates/_macros.html:1257 +#: project/templates/_macros.html:1260 msgid "Choose image file" msgstr "" -#: project/templates/_macros.html:1293 project/templates/event/actions.html:65 +#: project/templates/_macros.html:1296 project/templates/event/actions.html:65 #: project/templates/event/delete.html:12 msgid "Edit event" msgstr "" -#: project/templates/_macros.html:1297 project/templates/event/actions.html:58 +#: project/templates/_macros.html:1300 project/templates/event/actions.html:58 msgid "Duplicate event" msgstr "" -#: project/templates/_macros.html:1308 project/templates/event/actions.html:44 +#: project/templates/_macros.html:1311 project/templates/event/actions.html:44 #: project/templates/manage/events.html:129 msgid "Add to list" msgstr "" -#: project/templates/_macros.html:1311 project/templates/manage/events.html:132 +#: project/templates/_macros.html:1314 project/templates/manage/events.html:132 msgid "More" msgstr "" -#: project/templates/_macros.html:1358 +#: project/templates/_macros.html:1361 msgid "Please enter a valid time, between 00:00 and 23:59." msgstr "" -#: project/templates/_macros.html:1386 +#: project/templates/_macros.html:1389 #, python-format msgid "Just use %(term)s" msgstr "" -#: project/templates/_macros.html:1452 +#: project/templates/_macros.html:1455 msgid "Event suggestion" msgstr "" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Link copied" msgstr "" -#: project/templates/_macros.html:1570 +#: project/templates/_macros.html:1573 msgid "Copy link" msgstr "" -#: project/templates/_macros.html:1600 +#: project/templates/_macros.html:1603 msgid "Google calendar" msgstr "" -#: project/templates/_macros.html:1602 +#: project/templates/_macros.html:1605 msgid "Apple calendar" msgstr "" -#: project/templates/_macros.html:1603 +#: project/templates/_macros.html:1606 msgid "Yahoo calendar" msgstr "" -#: project/templates/_macros.html:1604 +#: project/templates/_macros.html:1607 msgid "Other calendar" msgstr "" -#: project/templates/_macros.html:1789 +#: project/templates/_macros.html:1792 msgid "Remove event date" msgstr "" -#: project/templates/_macros.html:1822 project/templates/event/create.html:180 +#: project/templates/_macros.html:1825 project/templates/event/create.html:180 #: project/templates/event/update.html:103 #: project/templates/event_date/list.html:446 #: project/templates/widget/event_suggestion/create.html:129 msgid "Enter organizer" msgstr "" -#: project/templates/_macros.html:1850 +#: project/templates/_macros.html:1853 msgid "Enter list name" msgstr "" @@ -2276,8 +2276,10 @@ msgstr "" #: project/templates/event_suggestion/review.html:28 #: project/templates/event_suggestion/review_status.html:24 +#: project/templates/manage/reference_requests_incoming.html:20 #: project/templates/reference/read.html:22 #: project/templates/reference_request/review_status.html:17 +#: project/views/reference_request_review.py:42 msgid "View event" msgstr "" @@ -2387,6 +2389,11 @@ msgstr "" msgid "Reviews" msgstr "" +#: project/templates/manage/verification_requests_incoming.html:19 +#: project/views/verification_request_review.py:36 +msgid "View organization" +msgstr "" + #: project/templates/manage/verification_requests_outgoing_create.html:5 #: project/templates/manage/verification_requests_outgoing_create.html:9 #, python-format @@ -2707,7 +2714,7 @@ msgid "Event suggestion successfully rejected" msgstr "" #: project/views/event_suggestion.py:87 -#: project/views/reference_request_review.py:129 +#: project/views/reference_request_review.py:139 msgid "Event review status updated" msgstr "" @@ -2811,20 +2818,20 @@ msgstr "" msgid "New reference automatically verified" msgstr "" -#: project/views/reference_request_review.py:34 +#: project/views/reference_request_review.py:40 msgid "Request already verified" msgstr "" -#: project/views/reference_request_review.py:51 +#: project/views/reference_request_review.py:61 msgid "Reference successfully created" msgstr "" -#: project/views/reference_request_review.py:59 +#: project/views/reference_request_review.py:69 msgid "Request successfully updated" msgstr "" -#: project/views/reference_request_review.py:82 -#: project/views/verification_request_review.py:73 +#: project/views/reference_request_review.py:92 +#: project/views/verification_request_review.py:83 #, python-format msgid "" "If all upcoming reference requests of %(admin_unit_name)s should be " @@ -2884,19 +2891,19 @@ msgstr "" msgid "New verification request" msgstr "" -#: project/views/verification_request_review.py:28 +#: project/views/verification_request_review.py:34 msgid "Verification request already verified" msgstr "" -#: project/views/verification_request_review.py:54 +#: project/views/verification_request_review.py:64 msgid "Organization successfully verified" msgstr "" -#: project/views/verification_request_review.py:56 +#: project/views/verification_request_review.py:66 msgid "Verification request successfully updated" msgstr "" -#: project/views/verification_request_review.py:109 +#: project/views/verification_request_review.py:119 msgid "Verification request review status updated" msgstr "" diff --git a/project/views/reference_request_review.py b/project/views/reference_request_review.py index dd58390..7c295a1 100644 --- a/project/views/reference_request_review.py +++ b/project/views/reference_request_review.py @@ -21,7 +21,12 @@ from project.services.admin_unit import ( upsert_admin_unit_relation, ) from project.services.reference import create_event_reference_for_request -from project.views.utils import flash_errors, handleSqlError, send_mails_async +from project.views.utils import ( + flash_errors, + flash_message, + handleSqlError, + send_mails_async, +) @app.route("/reference_request//review", methods=("GET", "POST")) @@ -31,7 +36,12 @@ def event_reference_request_review(id): access_or_401(request.admin_unit, "reference_request:verify") if request.review_status == EventReferenceRequestReviewStatus.verified: - flash(gettext("Request already verified"), "danger") + flash_message( + gettext("Request already verified"), + url_for("event", event_id=request.event_id), + gettext("View event"), + "danger", + ) return redirect( url_for( "manage_admin_unit_reference_requests_incoming", diff --git a/project/views/verification_request_review.py b/project/views/verification_request_review.py index 8741d78..cc7f82e 100644 --- a/project/views/verification_request_review.py +++ b/project/views/verification_request_review.py @@ -15,7 +15,12 @@ from project.models import ( AdminUnitVerificationRequestReviewStatus, ) from project.services.admin_unit import upsert_admin_unit_relation -from project.views.utils import flash_errors, handleSqlError, send_mails_async +from project.views.utils import ( + flash_errors, + flash_message, + handleSqlError, + send_mails_async, +) @app.route("/verification_request//review", methods=("GET", "POST")) @@ -25,7 +30,12 @@ def admin_unit_verification_request_review(id): access_or_401(request.target_admin_unit, "verification_request:verify") if request.review_status == AdminUnitVerificationRequestReviewStatus.verified: - flash(gettext("Verification request already verified"), "danger") + flash_message( + gettext("Verification request already verified"), + url_for("organizations", path=request.source_admin_unit_id), + gettext("View organization"), + "danger", + ) return redirect( url_for( "manage_admin_unit_verification_requests_incoming",