Pagination verbessern #297

This commit is contained in:
Daniel Grams 2021-09-08 17:34:06 +02:00
parent 4f7edd2378
commit 396fcd1fed
8 changed files with 194 additions and 138 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"POT-Creation-Date: 2021-09-08 17:31+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"
@ -191,7 +191,7 @@ msgstr ""
msgid "Legal notice"
msgstr ""
#: project/forms/admin.py:12 project/templates/_macros.html:1358
#: project/forms/admin.py:12 project/templates/_macros.html:1368
#: project/templates/layout.html:313
#: project/templates/widget/event_suggestion/create.html:204
#: project/views/admin_unit.py:36 project/views/root.py:58
@ -283,8 +283,7 @@ msgstr ""
#: project/forms/event_place.py:25 project/forms/event_place.py:50
#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
#: project/forms/organizer.py:25 project/forms/organizer.py:52
#: project/forms/reference.py:40 project/forms/reference_request.py:23
#: project/templates/_macros.html:135
#: project/forms/reference_request.py:23 project/templates/_macros.html:135
#: project/templates/admin/admin_units.html:19
#: project/templates/event_place/list.html:19
#: project/templates/oauth2_client/list.html:25
@ -300,7 +299,7 @@ msgstr ""
msgid "The short name is used to create a unique identifier for your events"
msgstr ""
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1494
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1504
msgid "Short name must contain only letters numbers or underscore"
msgstr ""
@ -314,7 +313,7 @@ msgstr ""
#: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
#: project/forms/event.py:58 project/forms/event_suggestion.py:38
#: project/forms/organizer.py:27 project/templates/_macros.html:262
#: project/templates/_macros.html:1454 project/templates/admin/users.html:19
#: project/templates/_macros.html:1464 project/templates/admin/users.html:19
msgid "Email"
msgstr ""
@ -647,11 +646,11 @@ msgid ""
" course it works without it."
msgstr ""
#: project/forms/event.py:204 project/templates/_macros.html:1229
#: project/forms/event.py:204 project/templates/_macros.html:1239
msgid "The start must be before the end."
msgstr ""
#: project/forms/event.py:210 project/templates/_macros.html:1246
#: project/forms/event.py:210 project/templates/_macros.html:1256
msgid "An event can last a maximum of 14 days."
msgstr ""
@ -806,7 +805,7 @@ msgstr ""
msgid "Update event"
msgstr ""
#: project/forms/event.py:374 project/templates/_macros.html:1201
#: project/forms/event.py:374 project/templates/_macros.html:1211
#: project/templates/event/actions.html:47
#: project/templates/event/delete.html:6
msgid "Delete event"
@ -1008,7 +1007,7 @@ msgstr ""
msgid "Delete request"
msgstr ""
#: project/forms/reference_request.py:28 project/templates/_macros.html:1370
#: project/forms/reference_request.py:28 project/templates/_macros.html:1380
#: project/templates/event_suggestion/review_status.html:18
#: project/templates/reference_request/review_status.html:12
msgid "Review status"
@ -1075,7 +1074,7 @@ msgid "This field is required."
msgstr ""
#: project/templates/_macros.html:134 project/templates/_macros.html:415
#: project/templates/_macros.html:422 project/templates/_macros.html:897
#: project/templates/_macros.html:422 project/templates/_macros.html:907
msgid "Date"
msgstr ""
@ -1120,7 +1119,6 @@ msgstr ""
#: project/templates/event/create.html:235
#: project/templates/event/delete.html:13
#: project/templates/event/update.html:126
#: project/templates/reference/delete.html:13
#: project/templates/widget/event_suggestion/create.html:229
msgid "Event"
msgstr ""
@ -1131,12 +1129,12 @@ msgid "%(count)d event dates"
msgstr ""
#: project/templates/_macros.html:451 project/templates/_macros.html:607
#: project/templates/_macros.html:1439 project/templates/event/actions.html:32
#: project/templates/_macros.html:1449 project/templates/event/actions.html:32
msgid "Share"
msgstr ""
#: project/templates/_macros.html:455 project/templates/_macros.html:611
#: project/templates/_macros.html:1469
#: project/templates/_macros.html:1479
msgid "Add to calendar"
msgstr ""
@ -1158,7 +1156,7 @@ msgid "The event takes place both offline and online."
msgstr ""
#: project/templates/_macros.html:713 project/templates/event_date/list.html:5
#: project/templates/event_date/list.html:278
#: project/templates/event_date/list.html:292
#: project/templates/event_date/search.html:3
#: project/templates/reference_request/review.html:32
msgid "Event Dates"
@ -1169,7 +1167,12 @@ msgid "Search location on Google"
msgstr ""
#: project/templates/_macros.html:847 project/templates/_macros.html:849
#: project/templates/event_date/list.html:299
#: project/templates/event_date/list.html:313
msgid "First"
msgstr ""
#: project/templates/_macros.html:852 project/templates/_macros.html:854
#: project/templates/event_date/list.html:314
#: project/templates/widget/event_suggestion/create.html:193
#: project/templates/widget/event_suggestion/create.html:218
#: project/templates/widget/event_suggestion/create.html:246
@ -1179,13 +1182,13 @@ msgstr ""
msgid "Previous"
msgstr ""
#: project/templates/_macros.html:851
#: project/templates/_macros.html:856
#, python-format
msgid "Page %(page)d of %(pages)d (%(total)d total)"
msgstr ""
#: project/templates/_macros.html:853 project/templates/_macros.html:855
#: project/templates/event_date/list.html:301
#: project/templates/_macros.html:858 project/templates/_macros.html:860
#: project/templates/event_date/list.html:316
#: project/templates/widget/event_suggestion/create.html:194
#: project/templates/widget/event_suggestion/create.html:219
#: project/templates/widget/event_suggestion/create.html:247
@ -1194,68 +1197,73 @@ msgstr ""
msgid "Next"
msgstr ""
#: project/templates/_macros.html:920
#: project/templates/_macros.html:863 project/templates/_macros.html:865
#: project/templates/event_date/list.html:317
msgid "Last"
msgstr ""
#: project/templates/_macros.html:930
msgid "Radius"
msgstr ""
#: project/templates/_macros.html:1130
#: project/templates/_macros.html:1140
msgid "Edit image"
msgstr ""
#: project/templates/_macros.html:1151
#: project/templates/_macros.html:1161
msgid "Close"
msgstr ""
#: project/templates/_macros.html:1152
#: project/templates/_macros.html:1162
msgid "Okay"
msgstr ""
#: project/templates/_macros.html:1164
#: project/templates/_macros.html:1174
msgid "Choose image file"
msgstr ""
#: project/templates/_macros.html:1200 project/templates/event/actions.html:46
#: project/templates/_macros.html:1210 project/templates/event/actions.html:46
msgid "Edit event"
msgstr ""
#: project/templates/_macros.html:1203 project/templates/manage/events.html:40
#: project/templates/_macros.html:1213 project/templates/manage/events.html:40
msgid "More"
msgstr ""
#: project/templates/_macros.html:1250
#: project/templates/_macros.html:1260
msgid "Please enter a valid time, between 00:00 and 23:59."
msgstr ""
#: project/templates/_macros.html:1278
#: project/templates/_macros.html:1288
#, python-format
msgid "Just use %(term)s"
msgstr ""
#: project/templates/_macros.html:1330
#: project/templates/_macros.html:1340
msgid "Event suggestion"
msgstr ""
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Link copied"
msgstr ""
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Copy link"
msgstr ""
#: project/templates/_macros.html:1477
#: project/templates/_macros.html:1487
msgid "Google calendar"
msgstr ""
#: project/templates/_macros.html:1478
#: project/templates/_macros.html:1488
msgid "Apple calendar"
msgstr ""
#: project/templates/_macros.html:1479
#: project/templates/_macros.html:1489
msgid "Yahoo calendar"
msgstr ""
#: project/templates/_macros.html:1480
#: project/templates/_macros.html:1490
msgid "Other calendar"
msgstr ""
@ -1880,7 +1888,7 @@ msgstr ""
msgid "Event successfully updated"
msgstr ""
#: project/views/event.py:246 project/views/reference.py:162
#: project/views/event.py:246
msgid "Entered name does not match event name"
msgstr ""
@ -1973,15 +1981,15 @@ msgstr ""
msgid "Organizer successfully deleted"
msgstr ""
#: project/views/reference.py:77
#: project/views/reference.py:72
msgid "Event successfully referenced"
msgstr ""
#: project/views/reference.py:101
#: project/views/reference.py:96
msgid "Reference successfully updated"
msgstr ""
#: project/views/reference.py:167
#: project/views/reference.py:159
msgid "Reference successfully deleted"
msgstr ""
@ -2025,16 +2033,16 @@ msgid ""
"not allowed."
msgstr ""
#: project/views/utils.py:101
#: project/views/utils.py:105
#, python-format
msgid "Error in the %s field - %s"
msgstr ""
#: project/views/utils.py:108
#: project/views/utils.py:112
msgid "Show"
msgstr ""
#: project/views/utils.py:115
#: project/views/utils.py:119
msgid "You do not have permission for this action"
msgstr ""

View File

@ -843,16 +843,26 @@
{% if pagination['prev_url'] or pagination['next_url'] %}
<nav aria-label="Page navigation">
<ul class="pagination">
{% if pagination['prev_url'] %}
<li class="page-item"> <a class="page-link" href="{{ pagination['prev_url'] }}">{{ _('Previous') }}</a></li>
{% if pagination['first_url'] %}
<li class="page-item"> <a class="page-link" href="{{ pagination['first_url'] }}" title="{{ _('First') }}"><i class="fa fa-angle-double-left"></i></a></li>
{% else %}
<li class="page-item disabled"><a class="page-link" href="#">{{ _('Previous') }}</a></li>
<li class="page-item disabled"><a class="page-link" href="#" title="{{ _('First') }}"><i class="fa fa-angle-double-left"></i></a></li>
{% endif %}
{% if pagination['prev_url'] %}
<li class="page-item"> <a class="page-link" href="{{ pagination['prev_url'] }}" title="{{ _('Previous') }}"><i class="fa fa-angle-left"></i></a></li>
{% else %}
<li class="page-item disabled"><a class="page-link" href="#" title="{{ _('Previous') }}"><i class="fa fa-angle-left"></i></a></li>
{% endif %}
<li class="page-item disabled d-none d-sm-inline"><span class="page-link">{{ _('Page %(page)d of %(pages)d (%(total)d total)', page=pagination["page"], pages=pagination["pages"], total=pagination["total"]) }}</span></li>
{% if pagination['next_url'] %}
<li class="page-item"> <a class="page-link" href="{{ pagination['next_url'] }}">{{ _('Next') }}</a></li>
<li class="page-item"> <a class="page-link" href="{{ pagination['next_url'] }}" title="{{ _('Next') }}"><i class="fa fa-angle-right"></i></a></li>
{% else %}
<li class="page-item disabled"><a class="page-link" href="#">{{ _('Next') }}</a></li>
<li class="page-item disabled"><a class="page-link" href="#" title="{{ _('Next') }}"><i class="fa fa-angle-right"></i></a></li>
{% endif %}
{% if pagination['last_url'] %}
<li class="page-item"> <a class="page-link" href="{{ pagination['last_url'] }}" title="{{ _('Last') }}"><i class="fa fa-angle-double-right"></i></a></li>
{% else %}
<li class="page-item disabled"><a class="page-link" href="#" title="{{ _('Last') }}"><i class="fa fa-angle-double-right"></i></a></li>
{% endif %}
</ul>
</nav>

View File

@ -32,6 +32,7 @@
var leaflet_map = null;
var map_cluster_group = null;
var event_dates = null;
var current_data = null;
var arrayOfMarkers = [];
function init_leaflet_map() {
@ -161,6 +162,7 @@
success: function (data) {
var content = '';
current_data = data;
event_dates = data.items;
var event_date_count = event_dates.length;
var cols = 3;
@ -217,15 +219,15 @@
result_list.append(content);
if (data.has_prev) {
$('#prev_item').removeClass('disabled');
$('#first_item,#prev_item').removeClass('disabled');
} else {
$('#prev_item').addClass('disabled');
$('#first_item,#prev_item').addClass('disabled');
}
if (data.has_next) {
$('#next_item').removeClass('disabled');
$('#last_item,#next_item').removeClass('disabled');
} else {
$('#next_item').addClass('disabled');
$('#last_item,#next_item').addClass('disabled');
}
if (data.has_prev || data.has_next) {
@ -252,6 +254,12 @@
return false;
});
$("#first_link").click(function(){
page = 1;
start_request();
return false;
});
$("#prev_link").click(function(){
if (page > 1) {
page--;
@ -266,6 +274,12 @@
return false;
});
$("#last_link").click(function(){
page = current_data.pages;
start_request();
return false;
});
$('#map').hide();
$("#filter_form").submit();
});
@ -296,9 +310,11 @@
</div>
<nav aria-label="Page navigation">
<ul class="pagination">
<li class="page-item disabled" id="prev_item"><a class="page-link" id="prev_link" href="#">{{ _('Previous') }}</a></li>
<li class="page-item disabled" id="first_item"><a class="page-link" id="first_link" href="#" title="{{ _('First') }}"><i class="fa fa-angle-double-left"></i></a></li>
<li class="page-item disabled" id="prev_item"><a class="page-link" id="prev_link" href="#" title="{{ _('Previous') }}"><i class="fa fa-angle-left"></i></a></li>
<li class="page-item disabled d-none" id="page_info"><span class="page-link" id="page_info_text"></span></li>
<li class="page-item disabled" id="next_item"><a class="page-link" id="next_link" href="#">{{ _('Next') }}</a></li>
<li class="page-item disabled" id="next_item"><a class="page-link" id="next_link" href="#" title="{{ _('Next') }}"><i class="fa fa-angle-right"></i></a></li>
<li class="page-item disabled" id="last_item"><a class="page-link" id="last_link" href="#" title="{{ _('Last') }}"><i class="fa fa-angle-double-right"></i></a></li>
</ul>
</nav>
</div>

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"POT-Creation-Date: 2021-09-08 17:31+0200\n"
"PO-Revision-Date: 2020-06-07 18:51+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@ -192,7 +192,7 @@ msgstr "Nutzungsbedingungen"
msgid "Legal notice"
msgstr "Impressum"
#: project/forms/admin.py:12 project/templates/_macros.html:1358
#: project/forms/admin.py:12 project/templates/_macros.html:1368
#: project/templates/layout.html:313
#: project/templates/widget/event_suggestion/create.html:204
#: project/views/admin_unit.py:36 project/views/root.py:58
@ -244,7 +244,9 @@ msgstr "Andere Organisationen erstellen"
#: project/forms/admin.py:38
msgid "If set, members of the organization can create other organizations."
msgstr "Wenn gesetzt, können Mitglieder der Organisation andere Organisationen erstellen."
msgstr ""
"Wenn gesetzt, können Mitglieder der Organisation andere Organisationen "
"erstellen."
#: project/forms/admin.py:43 project/templates/admin/update_admin_unit.html:4
#: project/templates/admin/update_admin_unit.html:8
@ -286,8 +288,7 @@ msgstr "Längengrad"
#: project/forms/event_place.py:25 project/forms/event_place.py:50
#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
#: project/forms/organizer.py:25 project/forms/organizer.py:52
#: project/forms/reference.py:40 project/forms/reference_request.py:23
#: project/templates/_macros.html:135
#: project/forms/reference_request.py:23 project/templates/_macros.html:135
#: project/templates/admin/admin_units.html:19
#: project/templates/event_place/list.html:19
#: project/templates/oauth2_client/list.html:25
@ -306,7 +307,7 @@ msgstr ""
"eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern "
"und Unterstriche enthalten."
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1494
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1504
msgid "Short name must contain only letters numbers or underscore"
msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten"
@ -320,7 +321,7 @@ msgstr "Link URL"
#: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
#: project/forms/event.py:58 project/forms/event_suggestion.py:38
#: project/forms/organizer.py:27 project/templates/_macros.html:262
#: project/templates/_macros.html:1454 project/templates/admin/users.html:19
#: project/templates/_macros.html:1464 project/templates/admin/users.html:19
msgid "Email"
msgstr "Email"
@ -669,11 +670,11 @@ msgstr ""
"Wir empfehlen dir, ein Foto für die Veranstaltung hochzuladen. Es macht "
"schon deutlich mehr her, aber es geht natürlich auch ohne."
#: project/forms/event.py:204 project/templates/_macros.html:1229
#: project/forms/event.py:204 project/templates/_macros.html:1239
msgid "The start must be before the end."
msgstr "Der Start muss vor dem Ende sein."
#: project/forms/event.py:210 project/templates/_macros.html:1246
#: project/forms/event.py:210 project/templates/_macros.html:1256
msgid "An event can last a maximum of 14 days."
msgstr "Eine Veranstaltung darf maximal 14 Tage dauern."
@ -836,7 +837,7 @@ msgstr "Wähle den öffentlichen Status der Veranstaltung."
msgid "Update event"
msgstr "Veranstaltung aktualisieren"
#: project/forms/event.py:374 project/templates/_macros.html:1201
#: project/forms/event.py:374 project/templates/_macros.html:1211
#: project/templates/event/actions.html:47
#: project/templates/event/delete.html:6
msgid "Delete event"
@ -1042,7 +1043,7 @@ msgstr "Anfrage speichern"
msgid "Delete request"
msgstr "Anfrage löschen"
#: project/forms/reference_request.py:28 project/templates/_macros.html:1370
#: project/forms/reference_request.py:28 project/templates/_macros.html:1380
#: project/templates/event_suggestion/review_status.html:18
#: project/templates/reference_request/review_status.html:12
msgid "Review status"
@ -1109,7 +1110,7 @@ msgid "This field is required."
msgstr "Dieses Feld ist erforderlich."
#: project/templates/_macros.html:134 project/templates/_macros.html:415
#: project/templates/_macros.html:422 project/templates/_macros.html:897
#: project/templates/_macros.html:422 project/templates/_macros.html:907
msgid "Date"
msgstr "Datum"
@ -1154,7 +1155,6 @@ msgstr "Zuletzt aktualisiert am %(updated_at)s."
#: project/templates/event/create.html:235
#: project/templates/event/delete.html:13
#: project/templates/event/update.html:126
#: project/templates/reference/delete.html:13
#: project/templates/widget/event_suggestion/create.html:229
msgid "Event"
msgstr "Veranstaltung"
@ -1165,12 +1165,12 @@ msgid "%(count)d event dates"
msgstr "%(count)d Termine"
#: project/templates/_macros.html:451 project/templates/_macros.html:607
#: project/templates/_macros.html:1439 project/templates/event/actions.html:32
#: project/templates/_macros.html:1449 project/templates/event/actions.html:32
msgid "Share"
msgstr "Teilen"
#: project/templates/_macros.html:455 project/templates/_macros.html:611
#: project/templates/_macros.html:1469
#: project/templates/_macros.html:1479
msgid "Add to calendar"
msgstr "Zum Kalender"
@ -1194,7 +1194,7 @@ msgstr ""
"statt."
#: project/templates/_macros.html:713 project/templates/event_date/list.html:5
#: project/templates/event_date/list.html:278
#: project/templates/event_date/list.html:292
#: project/templates/event_date/search.html:3
#: project/templates/reference_request/review.html:32
msgid "Event Dates"
@ -1205,7 +1205,12 @@ msgid "Search location on Google"
msgstr "Ort bei Google suchen"
#: project/templates/_macros.html:847 project/templates/_macros.html:849
#: project/templates/event_date/list.html:299
#: project/templates/event_date/list.html:313
msgid "First"
msgstr "Letzte"
#: project/templates/_macros.html:852 project/templates/_macros.html:854
#: project/templates/event_date/list.html:314
#: project/templates/widget/event_suggestion/create.html:193
#: project/templates/widget/event_suggestion/create.html:218
#: project/templates/widget/event_suggestion/create.html:246
@ -1215,13 +1220,13 @@ msgstr "Ort bei Google suchen"
msgid "Previous"
msgstr "Zurück"
#: project/templates/_macros.html:851
#: project/templates/_macros.html:856
#, 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:853 project/templates/_macros.html:855
#: project/templates/event_date/list.html:301
#: project/templates/_macros.html:858 project/templates/_macros.html:860
#: project/templates/event_date/list.html:316
#: project/templates/widget/event_suggestion/create.html:194
#: project/templates/widget/event_suggestion/create.html:219
#: project/templates/widget/event_suggestion/create.html:247
@ -1230,68 +1235,73 @@ msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)"
msgid "Next"
msgstr "Weiter"
#: project/templates/_macros.html:920
#: project/templates/_macros.html:863 project/templates/_macros.html:865
#: project/templates/event_date/list.html:317
msgid "Last"
msgstr "Erste"
#: project/templates/_macros.html:930
msgid "Radius"
msgstr "Umkreis"
#: project/templates/_macros.html:1130
#: project/templates/_macros.html:1140
msgid "Edit image"
msgstr "Bild bearbeiten"
#: project/templates/_macros.html:1151
#: project/templates/_macros.html:1161
msgid "Close"
msgstr "Schließen"
#: project/templates/_macros.html:1152
#: project/templates/_macros.html:1162
msgid "Okay"
msgstr "OK"
#: project/templates/_macros.html:1164
#: project/templates/_macros.html:1174
msgid "Choose image file"
msgstr "Bild-Datei auswählen"
#: project/templates/_macros.html:1200 project/templates/event/actions.html:46
#: project/templates/_macros.html:1210 project/templates/event/actions.html:46
msgid "Edit event"
msgstr "Veranstaltung bearbeiten"
#: project/templates/_macros.html:1203 project/templates/manage/events.html:40
#: project/templates/_macros.html:1213 project/templates/manage/events.html:40
msgid "More"
msgstr "Mehr"
#: project/templates/_macros.html:1250
#: project/templates/_macros.html:1260
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:1278
#: project/templates/_macros.html:1288
#, python-format
msgid "Just use %(term)s"
msgstr "Verwende einfach %(term)s"
#: project/templates/_macros.html:1330
#: project/templates/_macros.html:1340
msgid "Event suggestion"
msgstr "Veranstaltungsvorschlag"
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Link copied"
msgstr "Link kopiert"
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Copy link"
msgstr "Link kopieren"
#: project/templates/_macros.html:1477
#: project/templates/_macros.html:1487
msgid "Google calendar"
msgstr "Google Kalender"
#: project/templates/_macros.html:1478
#: project/templates/_macros.html:1488
msgid "Apple calendar"
msgstr "Apple Kalender"
#: project/templates/_macros.html:1479
#: project/templates/_macros.html:1489
msgid "Yahoo calendar"
msgstr "Yahoo Kalender"
#: project/templates/_macros.html:1480
#: project/templates/_macros.html:1490
msgid "Other calendar"
msgstr "Anderer Kalender"
@ -1921,7 +1931,7 @@ msgstr "Entwurf erfolgreich gespeichert"
msgid "Event successfully updated"
msgstr "Veranstaltung erfolgreich aktualisiert"
#: project/views/event.py:246 project/views/reference.py:162
#: project/views/event.py:246
msgid "Entered name does not match event name"
msgstr "Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
@ -2014,15 +2024,15 @@ msgstr "Der eingegebene Name entspricht nicht dem Namen des Veranstalters"
msgid "Organizer successfully deleted"
msgstr "Veranstalter erfolgreich gelöscht"
#: project/views/reference.py:77
#: project/views/reference.py:72
msgid "Event successfully referenced"
msgstr "Veranstaltung erfolgreich empfohlen"
#: project/views/reference.py:101
#: project/views/reference.py:96
msgid "Reference successfully updated"
msgstr "Empfehlung erfolgreich empfohlen"
#: project/views/reference.py:167
#: project/views/reference.py:159
msgid "Reference successfully deleted"
msgstr "Empfehlung erfolgreich gelöscht"
@ -2072,16 +2082,16 @@ msgstr ""
"Ein Eintrag mit den eingegebenen Werten existiert bereits. Doppelte "
"Einträge sind nicht erlaubt."
#: project/views/utils.py:101
#: project/views/utils.py:105
#, python-format
msgid "Error in the %s field - %s"
msgstr "Fehler im Feld %s: %s"
#: project/views/utils.py:108
#: project/views/utils.py:112
msgid "Show"
msgstr "Anzeigen"
#: project/views/utils.py:115
#: project/views/utils.py:119
msgid "You do not have permission for this action"
msgstr "Du hast keine Berechtigung für diese Aktion"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"POT-Creation-Date: 2021-09-08 17:31+0200\n"
"PO-Revision-Date: 2021-04-30 15:04+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@ -192,7 +192,7 @@ msgstr ""
msgid "Legal notice"
msgstr ""
#: project/forms/admin.py:12 project/templates/_macros.html:1358
#: project/forms/admin.py:12 project/templates/_macros.html:1368
#: project/templates/layout.html:313
#: project/templates/widget/event_suggestion/create.html:204
#: project/views/admin_unit.py:36 project/views/root.py:58
@ -284,8 +284,7 @@ msgstr ""
#: project/forms/event_place.py:25 project/forms/event_place.py:50
#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
#: project/forms/organizer.py:25 project/forms/organizer.py:52
#: project/forms/reference.py:40 project/forms/reference_request.py:23
#: project/templates/_macros.html:135
#: project/forms/reference_request.py:23 project/templates/_macros.html:135
#: project/templates/admin/admin_units.html:19
#: project/templates/event_place/list.html:19
#: project/templates/oauth2_client/list.html:25
@ -301,7 +300,7 @@ msgstr ""
msgid "The short name is used to create a unique identifier for your events"
msgstr ""
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1494
#: project/forms/admin_unit.py:40 project/templates/_macros.html:1504
msgid "Short name must contain only letters numbers or underscore"
msgstr ""
@ -315,7 +314,7 @@ msgstr ""
#: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
#: project/forms/event.py:58 project/forms/event_suggestion.py:38
#: project/forms/organizer.py:27 project/templates/_macros.html:262
#: project/templates/_macros.html:1454 project/templates/admin/users.html:19
#: project/templates/_macros.html:1464 project/templates/admin/users.html:19
msgid "Email"
msgstr ""
@ -648,11 +647,11 @@ msgid ""
" course it works without it."
msgstr ""
#: project/forms/event.py:204 project/templates/_macros.html:1229
#: project/forms/event.py:204 project/templates/_macros.html:1239
msgid "The start must be before the end."
msgstr ""
#: project/forms/event.py:210 project/templates/_macros.html:1246
#: project/forms/event.py:210 project/templates/_macros.html:1256
msgid "An event can last a maximum of 14 days."
msgstr ""
@ -807,7 +806,7 @@ msgstr ""
msgid "Update event"
msgstr ""
#: project/forms/event.py:374 project/templates/_macros.html:1201
#: project/forms/event.py:374 project/templates/_macros.html:1211
#: project/templates/event/actions.html:47
#: project/templates/event/delete.html:6
msgid "Delete event"
@ -1009,7 +1008,7 @@ msgstr ""
msgid "Delete request"
msgstr ""
#: project/forms/reference_request.py:28 project/templates/_macros.html:1370
#: project/forms/reference_request.py:28 project/templates/_macros.html:1380
#: project/templates/event_suggestion/review_status.html:18
#: project/templates/reference_request/review_status.html:12
msgid "Review status"
@ -1076,7 +1075,7 @@ msgid "This field is required."
msgstr ""
#: project/templates/_macros.html:134 project/templates/_macros.html:415
#: project/templates/_macros.html:422 project/templates/_macros.html:897
#: project/templates/_macros.html:422 project/templates/_macros.html:907
msgid "Date"
msgstr ""
@ -1121,7 +1120,6 @@ msgstr ""
#: project/templates/event/create.html:235
#: project/templates/event/delete.html:13
#: project/templates/event/update.html:126
#: project/templates/reference/delete.html:13
#: project/templates/widget/event_suggestion/create.html:229
msgid "Event"
msgstr ""
@ -1132,12 +1130,12 @@ msgid "%(count)d event dates"
msgstr ""
#: project/templates/_macros.html:451 project/templates/_macros.html:607
#: project/templates/_macros.html:1439 project/templates/event/actions.html:32
#: project/templates/_macros.html:1449 project/templates/event/actions.html:32
msgid "Share"
msgstr ""
#: project/templates/_macros.html:455 project/templates/_macros.html:611
#: project/templates/_macros.html:1469
#: project/templates/_macros.html:1479
msgid "Add to calendar"
msgstr ""
@ -1159,7 +1157,7 @@ msgid "The event takes place both offline and online."
msgstr ""
#: project/templates/_macros.html:713 project/templates/event_date/list.html:5
#: project/templates/event_date/list.html:278
#: project/templates/event_date/list.html:292
#: project/templates/event_date/search.html:3
#: project/templates/reference_request/review.html:32
msgid "Event Dates"
@ -1170,7 +1168,12 @@ msgid "Search location on Google"
msgstr ""
#: project/templates/_macros.html:847 project/templates/_macros.html:849
#: project/templates/event_date/list.html:299
#: project/templates/event_date/list.html:313
msgid "First"
msgstr ""
#: project/templates/_macros.html:852 project/templates/_macros.html:854
#: project/templates/event_date/list.html:314
#: project/templates/widget/event_suggestion/create.html:193
#: project/templates/widget/event_suggestion/create.html:218
#: project/templates/widget/event_suggestion/create.html:246
@ -1180,13 +1183,13 @@ msgstr ""
msgid "Previous"
msgstr ""
#: project/templates/_macros.html:851
#: project/templates/_macros.html:856
#, python-format
msgid "Page %(page)d of %(pages)d (%(total)d total)"
msgstr ""
#: project/templates/_macros.html:853 project/templates/_macros.html:855
#: project/templates/event_date/list.html:301
#: project/templates/_macros.html:858 project/templates/_macros.html:860
#: project/templates/event_date/list.html:316
#: project/templates/widget/event_suggestion/create.html:194
#: project/templates/widget/event_suggestion/create.html:219
#: project/templates/widget/event_suggestion/create.html:247
@ -1195,68 +1198,73 @@ msgstr ""
msgid "Next"
msgstr ""
#: project/templates/_macros.html:920
#: project/templates/_macros.html:863 project/templates/_macros.html:865
#: project/templates/event_date/list.html:317
msgid "Last"
msgstr ""
#: project/templates/_macros.html:930
msgid "Radius"
msgstr ""
#: project/templates/_macros.html:1130
#: project/templates/_macros.html:1140
msgid "Edit image"
msgstr ""
#: project/templates/_macros.html:1151
#: project/templates/_macros.html:1161
msgid "Close"
msgstr ""
#: project/templates/_macros.html:1152
#: project/templates/_macros.html:1162
msgid "Okay"
msgstr ""
#: project/templates/_macros.html:1164
#: project/templates/_macros.html:1174
msgid "Choose image file"
msgstr ""
#: project/templates/_macros.html:1200 project/templates/event/actions.html:46
#: project/templates/_macros.html:1210 project/templates/event/actions.html:46
msgid "Edit event"
msgstr ""
#: project/templates/_macros.html:1203 project/templates/manage/events.html:40
#: project/templates/_macros.html:1213 project/templates/manage/events.html:40
msgid "More"
msgstr ""
#: project/templates/_macros.html:1250
#: project/templates/_macros.html:1260
msgid "Please enter a valid time, between 00:00 and 23:59."
msgstr ""
#: project/templates/_macros.html:1278
#: project/templates/_macros.html:1288
#, python-format
msgid "Just use %(term)s"
msgstr ""
#: project/templates/_macros.html:1330
#: project/templates/_macros.html:1340
msgid "Event suggestion"
msgstr ""
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Link copied"
msgstr ""
#: project/templates/_macros.html:1448
#: project/templates/_macros.html:1458
msgid "Copy link"
msgstr ""
#: project/templates/_macros.html:1477
#: project/templates/_macros.html:1487
msgid "Google calendar"
msgstr ""
#: project/templates/_macros.html:1478
#: project/templates/_macros.html:1488
msgid "Apple calendar"
msgstr ""
#: project/templates/_macros.html:1479
#: project/templates/_macros.html:1489
msgid "Yahoo calendar"
msgstr ""
#: project/templates/_macros.html:1480
#: project/templates/_macros.html:1490
msgid "Other calendar"
msgstr ""
@ -1881,7 +1889,7 @@ msgstr ""
msgid "Event successfully updated"
msgstr ""
#: project/views/event.py:246 project/views/reference.py:162
#: project/views/event.py:246
msgid "Entered name does not match event name"
msgstr ""
@ -1974,15 +1982,15 @@ msgstr ""
msgid "Organizer successfully deleted"
msgstr ""
#: project/views/reference.py:77
#: project/views/reference.py:72
msgid "Event successfully referenced"
msgstr ""
#: project/views/reference.py:101
#: project/views/reference.py:96
msgid "Reference successfully updated"
msgstr ""
#: project/views/reference.py:167
#: project/views/reference.py:159
msgid "Reference successfully deleted"
msgstr ""
@ -2026,16 +2034,16 @@ msgid ""
"not allowed."
msgstr ""
#: project/views/utils.py:101
#: project/views/utils.py:105
#, python-format
msgid "Error in the %s field - %s"
msgstr ""
#: project/views/utils.py:108
#: project/views/utils.py:112
msgid "Show"
msgstr ""
#: project/views/utils.py:115
#: project/views/utils.py:119
msgid "You do not have permission for this action"
msgstr ""

View File

@ -74,12 +74,16 @@ def get_pagination_urls(pagination, **kwargs):
args.update(kwargs)
args["page"] = pagination.prev_num
result["prev_url"] = url_for(request.endpoint, **args)
args["page"] = 1
result["first_url"] = url_for(request.endpoint, **args)
if pagination.has_next:
args = request.args.copy()
args.update(kwargs)
args["page"] = pagination.next_num
result["next_url"] = url_for(request.endpoint, **args)
args["page"] = pagination.pages
result["last_url"] = url_for(request.endpoint, **args)
return result