From bdd22527b527b760fe8f59e9a2316963cb84c3b1 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Wed, 30 Aug 2023 19:42:08 +0200 Subject: [PATCH 1/2] Existing place and organizer hint #538 --- messages.pot | 290 +++++++++--------- project/static/site.js | 4 + project/templates/_macros.html | 65 ++++ project/templates/event/create.html | 24 ++ project/templates/event_place/create.html | 5 +- project/templates/event_place/update.html | 5 +- project/templates/organizer/create.html | 5 +- project/templates/organizer/update.html | 5 +- .../translations/de/LC_MESSAGES/messages.mo | Bin 46411 -> 46623 bytes .../translations/de/LC_MESSAGES/messages.po | 290 +++++++++--------- .../translations/en/LC_MESSAGES/messages.mo | Bin 4214 -> 4214 bytes .../translations/en/LC_MESSAGES/messages.po | 290 +++++++++--------- project/views/js.py | 59 +++- tests/views/test_js.py | 98 +++++- 14 files changed, 697 insertions(+), 443 deletions(-) diff --git a/messages.pot b/messages.pot index f5ee70b..a99da5f 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-08-17 14:09+0200\n" +"POT-Creation-Date: 2023-08-29 23:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -206,24 +206,24 @@ msgstr "" msgid "You have received an invitation" msgstr "" -#: project/forms/admin.py:11 project/templates/layout.html:337 +#: project/forms/admin.py:11 project/templates/layout.html:342 #: project/views/root.py:55 msgid "Terms of service" msgstr "" -#: project/forms/admin.py:12 project/templates/layout.html:342 +#: project/forms/admin.py:12 project/templates/layout.html:347 #: project/views/root.py:67 msgid "Legal notice" msgstr "" -#: project/forms/admin.py:13 project/templates/_macros.html:1487 -#: project/templates/layout.html:346 +#: project/forms/admin.py:13 project/templates/_macros.html:1490 +#: project/templates/layout.html:351 #: project/templates/widget/event_suggestion/create.html:204 #: project/views/admin_unit.py:84 project/views/root.py:75 msgid "Contact" msgstr "" -#: project/forms/admin.py:14 project/templates/layout.html:350 +#: project/forms/admin.py:14 project/templates/layout.html:355 #: project/views/root.py:83 msgid "Privacy" msgstr "" @@ -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:1583 +#: project/templates/_macros.html:246 project/templates/_macros.html:1586 #: 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:1625 +#: project/forms/admin_unit.py:46 project/templates/_macros.html:1690 msgid "Short name must contain only letters numbers or underscore" msgstr "" @@ -523,7 +523,7 @@ msgstr "" msgid "Cancel deletion" msgstr "" -#: project/forms/admin_unit.py:156 project/templates/layout.html:308 +#: project/forms/admin_unit.py:156 project/templates/layout.html:313 #: project/templates/manage/delete_membership.html:6 msgid "Leave organization" msgstr "" @@ -661,17 +661,17 @@ msgstr "" msgid "All-day" msgstr "" -#: project/forms/event.py:59 project/templates/_macros.html:948 -#: project/templates/_macros.html:1795 +#: project/forms/event.py:59 project/templates/_macros.html:951 +#: project/templates/_macros.html:1860 #: project/templates/widget/event_suggestion/create.html:240 msgid "Recurring event" msgstr "" -#: project/forms/event.py:66 project/templates/_macros.html:1344 +#: project/forms/event.py:66 project/templates/_macros.html:1347 msgid "The start must be before the end." msgstr "" -#: project/forms/event.py:72 project/templates/_macros.html:1361 +#: project/forms/event.py:72 project/templates/_macros.html:1364 msgid "An event can last a maximum of 14 days." msgstr "" @@ -752,7 +752,7 @@ msgid "If the participants needs to register for the event." msgstr "" #: project/forms/event.py:175 project/templates/_macros.html:260 -#: project/templates/layout.html:118 +#: project/templates/layout.html:123 msgid "Booked up" msgstr "" @@ -808,11 +808,11 @@ msgstr "" msgid "EventAttendanceMode.offline" msgstr "" -#: project/forms/event.py:222 project/templates/layout.html:106 +#: project/forms/event.py:222 project/templates/layout.html:111 msgid "EventAttendanceMode.online" msgstr "" -#: project/forms/event.py:224 project/templates/layout.html:109 +#: project/forms/event.py:224 project/templates/layout.html:114 msgid "EventAttendanceMode.mixed" msgstr "" @@ -854,7 +854,7 @@ msgstr "" #: project/forms/event.py:260 project/forms/reference.py:14 #: project/forms/reference.py:27 project/forms/reference_request.py:76 -#: project/templates/event/create.html:363 +#: project/templates/event/create.html:387 #: project/templates/event/update.html:220 msgid "Rating" msgstr "" @@ -883,11 +883,11 @@ msgstr "" #: project/forms/event.py:291 project/forms/event.py:300 #: project/forms/event.py:382 project/forms/event.py:459 #: project/forms/event_suggestion.py:50 project/templates/_macros.html:464 -#: project/templates/_macros.html:630 project/templates/event/create.html:288 +#: project/templates/_macros.html:630 project/templates/event/create.html:312 #: project/templates/event/update.html:170 -#: project/templates/event_place/create.html:31 +#: project/templates/event_place/create.html:32 #: project/templates/event_place/delete.html:13 -#: project/templates/event_place/update.html:31 +#: project/templates/event_place/update.html:32 #: project/templates/manage/events.html:109 msgid "Place" msgstr "" @@ -904,12 +904,12 @@ 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:951 project/templates/event/create.html:257 +#: project/templates/_macros.html:954 project/templates/event/create.html:281 #: project/templates/event/update.html:160 #: project/templates/manage/events.html:108 -#: project/templates/organizer/create.html:27 +#: project/templates/organizer/create.html:28 #: project/templates/organizer/delete.html:13 -#: project/templates/organizer/update.html:27 +#: project/templates/organizer/update.html:28 msgid "Organizer" msgstr "" @@ -922,7 +922,7 @@ msgid "Enter new organizer" msgstr "" #: project/forms/event.py:323 project/templates/_macros.html:738 -#: project/templates/event/create.html:374 +#: project/templates/event/create.html:398 #: project/templates/manage/reference_requests_incoming.html:5 #: project/templates/manage/reference_requests_outgoing.html:5 msgid "Reference requests" @@ -969,23 +969,23 @@ msgstr "" msgid "EventStatus.scheduled" msgstr "" -#: project/forms/event.py:403 project/templates/layout.html:72 -#: project/templates/layout.html:87 +#: project/forms/event.py:403 project/templates/layout.html:77 +#: project/templates/layout.html:92 msgid "EventStatus.cancelled" msgstr "" -#: project/forms/event.py:404 project/templates/layout.html:75 -#: project/templates/layout.html:90 +#: project/forms/event.py:404 project/templates/layout.html:80 +#: project/templates/layout.html:95 msgid "EventStatus.movedOnline" msgstr "" -#: project/forms/event.py:405 project/templates/layout.html:78 -#: project/templates/layout.html:93 +#: project/forms/event.py:405 project/templates/layout.html:83 +#: project/templates/layout.html:98 msgid "EventStatus.postponed" msgstr "" -#: project/forms/event.py:406 project/templates/layout.html:81 -#: project/templates/layout.html:96 +#: project/forms/event.py:406 project/templates/layout.html:86 +#: project/templates/layout.html:101 msgid "EventStatus.rescheduled" msgstr "" @@ -1009,7 +1009,7 @@ msgstr "" msgid "PublicStatus.draft" msgstr "" -#: project/forms/event.py:419 project/templates/event/create.html:386 +#: project/forms/event.py:419 project/templates/event/create.html:410 msgid "Planned events appear in the scheduling view, but not on public calendars." msgstr "" @@ -1018,7 +1018,7 @@ msgstr "" msgid "Update event" msgstr "" -#: project/forms/event.py:440 project/templates/_macros.html:1301 +#: project/forms/event.py:440 project/templates/_macros.html:1304 #: project/templates/event/actions.html:66 #: project/templates/event/delete.html:6 msgid "Delete event" @@ -1049,12 +1049,12 @@ msgstr "" #: project/forms/planning.py:27 project/templates/_macros.html:324 #: project/templates/admin_unit/create.html:38 #: project/templates/admin_unit/update.html:47 -#: project/templates/event_place/create.html:40 -#: project/templates/event_place/update.html:40 +#: project/templates/event_place/create.html:41 +#: project/templates/event_place/update.html:41 #: project/templates/manage/organizers.html:19 #: project/templates/manage/places.html:19 -#: project/templates/organizer/create.html:36 -#: project/templates/organizer/update.html:36 +#: project/templates/organizer/create.html:37 +#: project/templates/organizer/update.html:37 msgid "Location" msgstr "" @@ -1090,13 +1090,13 @@ 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:950 +#: project/templates/_macros.html:690 project/templates/_macros.html:953 #: project/templates/admin/delete_admin_unit.html:13 #: project/templates/admin_unit/cancel_deletion.html:13 #: project/templates/admin_unit/create.html:27 #: project/templates/admin_unit/request_deletion.html:15 #: project/templates/admin_unit/update.html:36 -#: project/templates/layout.html:260 +#: project/templates/layout.html:265 #: project/templates/manage/delete_membership.html:13 #: project/templates/verification_request/delete.html:13 #: project/templates/verification_request/review.html:28 @@ -1113,14 +1113,14 @@ msgid "Find" msgstr "" #: project/forms/event_place.py:47 project/templates/event_place/create.html:5 -#: project/templates/event_place/create.html:21 +#: project/templates/event_place/create.html:22 #: project/templates/event_place/list.html:11 #: project/templates/manage/places.html:11 msgid "Create place" msgstr "" #: project/forms/event_place.py:51 project/templates/event_place/update.html:5 -#: project/templates/event_place/update.html:21 +#: project/templates/event_place/update.html:22 msgid "Update place" msgstr "" @@ -1148,13 +1148,13 @@ msgstr "" msgid "I would like to be notified by email after the review" msgstr "" -#: project/forms/event_suggestion.py:52 project/templates/event/create.html:293 +#: project/forms/event_suggestion.py:52 project/templates/event/create.html:317 msgid "" "Choose where the event takes place. If the venue is not yet in the list, " "just enter it." msgstr "" -#: project/forms/event_suggestion.py:62 project/templates/event/create.html:261 +#: project/forms/event_suggestion.py:62 project/templates/event/create.html:285 msgid "" "Select the organizer. If the organizer is not yet on the list, just enter" " it." @@ -1219,12 +1219,12 @@ msgstr "" #: project/forms/organizer.py:49 project/templates/manage/organizers.html:11 #: project/templates/organizer/create.html:5 -#: project/templates/organizer/create.html:21 +#: project/templates/organizer/create.html:22 msgid "Create organizer" msgstr "" #: project/forms/organizer.py:53 project/templates/organizer/update.html:5 -#: project/templates/organizer/update.html:21 +#: project/templates/organizer/update.html:22 msgid "Update organizer" msgstr "" @@ -1269,7 +1269,7 @@ msgid "Delete request" msgstr "" #: project/forms/reference_request.py:28 -#: project/forms/verification_request.py:24 project/templates/_macros.html:1499 +#: project/forms/verification_request.py:24 project/templates/_macros.html:1502 #: project/templates/event_suggestion/review_status.html:18 #: project/templates/reference_request/review_status.html:12 #: project/templates/verification_request/review_status.html:4 @@ -1438,24 +1438,24 @@ msgstr "" #: project/templates/_macros.html:413 project/templates/_macros.html:583 #: project/templates/event/actions.html:25 -#: project/templates/event/create.html:234 +#: project/templates/event/create.html:258 #: project/templates/event/update.html:126 #: project/templates/manage/events.html:107 #: project/templates/widget/event_suggestion/create.html:229 msgid "Event" msgstr "" -#: project/templates/_macros.html:419 project/templates/_macros.html:1020 +#: project/templates/_macros.html:419 project/templates/_macros.html:1023 msgid "Date" msgstr "" #: project/templates/_macros.html:446 project/templates/_macros.html:605 -#: project/templates/_macros.html:1568 project/templates/event/actions.html:51 +#: project/templates/_macros.html:1571 project/templates/event/actions.html:51 msgid "Share" msgstr "" #: project/templates/_macros.html:450 project/templates/_macros.html:609 -#: project/templates/_macros.html:1598 +#: project/templates/_macros.html:1601 msgid "Add to calendar" msgstr "" @@ -1476,7 +1476,7 @@ msgstr "" msgid "The event takes place both offline and online." msgstr "" -#: project/templates/_macros.html:613 project/templates/layout.html:186 +#: project/templates/_macros.html:613 project/templates/layout.html:191 #: project/templates/user/favorite_events.html:4 msgid "Favorite events" msgstr "" @@ -1499,7 +1499,7 @@ msgstr "" msgid "Referenced by" msgstr "" -#: project/templates/_macros.html:729 project/templates/_macros.html:1311 +#: project/templates/_macros.html:729 project/templates/_macros.html:1314 #: project/templates/event/actions.html:38 #: project/templates/event_date/list.html:251 #: project/templates/manage/events.html:129 @@ -1507,34 +1507,34 @@ msgstr "" msgid "Reference event" msgstr "" -#: project/templates/_macros.html:749 project/templates/_macros.html:1308 +#: project/templates/_macros.html:749 project/templates/_macros.html:1311 #: project/templates/event/actions.html:32 #: project/templates/manage/events.html:127 msgid "Request reference" msgstr "" #: project/templates/_macros.html:757 project/templates/event_date/list.html:6 -#: project/templates/event_date/list.html:461 +#: project/templates/event_date/list.html:463 #: project/templates/reference_request/review.html:32 msgid "Event Dates" msgstr "" -#: project/templates/_macros.html:855 +#: project/templates/_macros.html:858 msgid "Search location on Google" msgstr "" -#: project/templates/_macros.html:925 +#: project/templates/_macros.html:928 #, python-format msgid "%(count)d event dates" msgstr "" -#: project/templates/_macros.html:961 project/templates/_macros.html:963 -#: project/templates/event_date/list.html:515 +#: project/templates/_macros.html:964 project/templates/_macros.html:966 +#: project/templates/event_date/list.html:516 msgid "First" msgstr "" -#: project/templates/_macros.html:966 project/templates/_macros.html:968 -#: project/templates/event_date/list.html:516 +#: project/templates/_macros.html:969 project/templates/_macros.html:971 +#: project/templates/event_date/list.html:517 #: project/templates/widget/event_suggestion/create.html:193 #: project/templates/widget/event_suggestion/create.html:218 #: project/templates/widget/event_suggestion/create.html:247 @@ -1544,13 +1544,13 @@ msgstr "" msgid "Previous" msgstr "" -#: project/templates/_macros.html:970 +#: project/templates/_macros.html:973 #, python-format msgid "Page %(page)d of %(pages)d (%(total)d total)" msgstr "" -#: project/templates/_macros.html:972 project/templates/_macros.html:974 -#: project/templates/event_date/list.html:518 +#: project/templates/_macros.html:975 project/templates/_macros.html:977 +#: project/templates/event_date/list.html:519 #: project/templates/widget/event_suggestion/create.html:194 #: project/templates/widget/event_suggestion/create.html:219 #: project/templates/widget/event_suggestion/create.html:248 @@ -1559,98 +1559,98 @@ msgstr "" msgid "Next" msgstr "" -#: project/templates/_macros.html:977 project/templates/_macros.html:979 -#: project/templates/event_date/list.html:519 +#: project/templates/_macros.html:980 project/templates/_macros.html:982 +#: project/templates/event_date/list.html:520 msgid "Last" msgstr "" -#: project/templates/_macros.html:1048 +#: project/templates/_macros.html:1051 msgid "Radius" msgstr "" -#: project/templates/_macros.html:1230 +#: project/templates/_macros.html:1233 msgid "Edit image" msgstr "" -#: project/templates/_macros.html:1251 project/templates/planning/list.html:97 +#: project/templates/_macros.html:1254 project/templates/planning/list.html:97 msgid "Close" msgstr "" -#: project/templates/_macros.html:1252 +#: project/templates/_macros.html:1255 msgid "Okay" msgstr "" -#: project/templates/_macros.html:1264 +#: project/templates/_macros.html:1267 msgid "Choose image file" msgstr "" -#: project/templates/_macros.html:1300 project/templates/event/actions.html:65 +#: project/templates/_macros.html:1303 project/templates/event/actions.html:65 #: project/templates/event/delete.html:12 msgid "Edit event" msgstr "" -#: project/templates/_macros.html:1304 project/templates/event/actions.html:58 +#: project/templates/_macros.html:1307 project/templates/event/actions.html:58 msgid "Duplicate event" msgstr "" -#: project/templates/_macros.html:1315 project/templates/event/actions.html:44 +#: project/templates/_macros.html:1318 project/templates/event/actions.html:44 #: project/templates/manage/events.html:133 msgid "Add to list" msgstr "" -#: project/templates/_macros.html:1318 project/templates/manage/events.html:136 +#: project/templates/_macros.html:1321 project/templates/manage/events.html:136 msgid "More" msgstr "" -#: project/templates/_macros.html:1365 +#: project/templates/_macros.html:1368 msgid "Please enter a valid time, between 00:00 and 23:59." msgstr "" -#: project/templates/_macros.html:1393 +#: project/templates/_macros.html:1396 #, python-format msgid "Just use %(term)s" msgstr "" -#: project/templates/_macros.html:1459 +#: project/templates/_macros.html:1462 msgid "Event suggestion" msgstr "" -#: project/templates/_macros.html:1577 +#: project/templates/_macros.html:1580 msgid "Link copied" msgstr "" -#: project/templates/_macros.html:1577 +#: project/templates/_macros.html:1580 msgid "Copy link" msgstr "" -#: project/templates/_macros.html:1607 +#: project/templates/_macros.html:1610 msgid "Google calendar" msgstr "" -#: project/templates/_macros.html:1609 +#: project/templates/_macros.html:1612 msgid "Apple calendar" msgstr "" -#: project/templates/_macros.html:1610 +#: project/templates/_macros.html:1613 msgid "Yahoo calendar" msgstr "" -#: project/templates/_macros.html:1611 +#: project/templates/_macros.html:1614 msgid "Other calendar" msgstr "" -#: project/templates/_macros.html:1796 +#: project/templates/_macros.html:1861 msgid "Remove event date" msgstr "" -#: project/templates/_macros.html:1829 project/templates/event/create.html:180 +#: project/templates/_macros.html:1894 project/templates/event/create.html:204 #: project/templates/event/update.html:103 -#: project/templates/event_date/list.html:446 +#: project/templates/event_date/list.html:448 #: project/templates/widget/event_suggestion/create.html:129 msgid "Enter organizer" msgstr "" -#: project/templates/_macros.html:1857 +#: project/templates/_macros.html:1922 msgid "Enter list name" msgstr "" @@ -1658,7 +1658,7 @@ msgstr "" msgid "Manage" msgstr "" -#: project/templates/home.html:37 project/templates/layout.html:176 +#: project/templates/home.html:37 project/templates/layout.html:181 #: project/templates/manage/admin_units.html:28 #: project/templates/manage/verification_requests_outgoing.html:13 #: project/templates/manage/verification_requests_outgoing_create_select.html:13 @@ -1672,7 +1672,7 @@ msgstr "" msgid "Features" msgstr "" -#: project/templates/layout.html:170 project/templates/layout.html:218 +#: project/templates/layout.html:175 project/templates/layout.html:223 #: project/templates/manage/events.html:6 #: project/templates/manage/events.html:54 #: project/templates/manage/events_vue.html:4 @@ -1682,18 +1682,18 @@ msgstr "" #: project/templates/admin/admin.html:19 #: project/templates/admin/admin_units.html:4 #: project/templates/admin/admin_units.html:11 -#: project/templates/layout.html:171 project/templates/layout.html:184 +#: project/templates/layout.html:176 project/templates/layout.html:189 #: project/templates/manage/admin_units.html:3 #: project/templates/manage/admin_units.html:26 #: project/templates/organization/main.html:4 msgid "Organizations" msgstr "" -#: project/templates/layout.html:172 +#: project/templates/layout.html:177 msgid "Planning" msgstr "" -#: project/templates/layout.html:185 project/templates/layout.html:297 +#: project/templates/layout.html:190 project/templates/layout.html:302 #: project/templates/oauth2_client/list.html:10 #: project/templates/oauth2_client/read.html:10 #: project/templates/oauth2_token/list.html:10 project/templates/profile.html:4 @@ -1706,100 +1706,100 @@ msgstr "" #: project/templates/admin/email.html:65 #: project/templates/admin/newsletter.html:92 #: project/templates/admin/settings.html:10 -#: project/templates/admin/users.html:10 project/templates/layout.html:189 +#: project/templates/admin/users.html:10 project/templates/layout.html:194 msgid "Admin" msgstr "" -#: project/templates/layout.html:193 +#: project/templates/layout.html:198 msgid "Logout" msgstr "" -#: project/templates/layout.html:224 +#: project/templates/layout.html:229 msgid "Show events" msgstr "" #: project/templates/event/create.html:5 -#: project/templates/event/create.html:225 project/templates/layout.html:225 +#: project/templates/event/create.html:249 project/templates/layout.html:230 #: project/templates/manage/events.html:55 #: project/templates/manage/organizers.html:38 msgid "Create event" msgstr "" -#: project/templates/layout.html:226 +#: project/templates/layout.html:231 msgid "Import event" msgstr "" -#: project/templates/layout.html:228 +#: project/templates/layout.html:233 #: project/templates/manage/event_lists.html:4 msgid "Event lists" msgstr "" -#: project/templates/layout.html:231 +#: project/templates/layout.html:236 msgid "Review suggestions" msgstr "" -#: project/templates/layout.html:241 +#: project/templates/layout.html:246 #: project/templates/manage/references_incoming.html:5 #: project/templates/manage/references_outgoing.html:5 msgid "References" msgstr "" -#: project/templates/layout.html:247 +#: project/templates/layout.html:252 #: project/templates/manage/references_incoming.html:9 msgid "Incoming references" msgstr "" -#: project/templates/layout.html:248 +#: project/templates/layout.html:253 #: project/templates/manage/references_outgoing.html:9 msgid "Outgoing references" msgstr "" -#: project/templates/layout.html:250 +#: project/templates/layout.html:255 #: project/templates/manage/reference_requests_incoming.html:9 msgid "Incoming reference requests" msgstr "" -#: project/templates/layout.html:255 +#: project/templates/layout.html:260 #: project/templates/manage/reference_requests_outgoing.html:9 msgid "Outgoing reference requests" msgstr "" -#: project/templates/layout.html:267 +#: project/templates/layout.html:272 #: project/templates/manage/verification_requests_outgoing.html:5 #: project/templates/manage/verification_requests_outgoing.html:10 msgid "Outgoing verification requests" msgstr "" -#: project/templates/layout.html:271 project/templates/manage/organizers.html:5 +#: project/templates/layout.html:276 project/templates/manage/organizers.html:5 #: project/templates/manage/organizers.html:10 #: project/templates/organizer/main.html:4 msgid "Organizers" msgstr "" #: project/templates/event_place/list.html:3 -#: project/templates/event_place/list.html:7 project/templates/layout.html:272 +#: project/templates/event_place/list.html:7 project/templates/layout.html:277 #: project/templates/manage/places.html:5 #: project/templates/manage/places.html:10 msgid "Places" msgstr "" -#: project/templates/layout.html:274 project/templates/manage/members.html:5 +#: project/templates/layout.html:279 project/templates/manage/members.html:5 #: project/templates/manage/members.html:28 #: project/templates/verification_request/review.html:54 msgid "Members" msgstr "" -#: project/templates/layout.html:275 project/templates/manage/relations.html:4 +#: project/templates/layout.html:280 project/templates/manage/relations.html:4 msgid "Relations" msgstr "" -#: project/templates/layout.html:279 +#: project/templates/layout.html:284 #: project/templates/manage/verification_requests_incoming.html:5 #: project/templates/manage/verification_requests_incoming.html:9 msgid "Incoming verification requests" msgstr "" -#: project/templates/layout.html:287 +#: project/templates/layout.html:292 #: project/templates/manage/admin_units.html:17 #: project/templates/manage/organization_invitations.html:4 #: project/templates/user/organization_invitations.html:4 @@ -1811,33 +1811,33 @@ msgstr "" #: project/templates/admin/settings.html:11 #: project/templates/admin_unit/update.html:6 #: project/templates/admin_unit/update.html:30 -#: project/templates/layout.html:291 project/templates/manage/widgets.html:11 +#: project/templates/layout.html:296 project/templates/manage/widgets.html:11 #: project/templates/manage/widgets.html:15 project/templates/profile.html:32 msgid "Settings" msgstr "" -#: project/templates/layout.html:292 project/templates/manage/export.html:3 +#: project/templates/layout.html:297 project/templates/manage/export.html:3 #: project/templates/manage/export.html:63 msgid "Export" msgstr "" -#: project/templates/layout.html:294 +#: project/templates/layout.html:299 #: project/templates/manage/custom_widgets.html:13 msgid "Custom widgets" msgstr "" -#: project/templates/layout.html:295 project/templates/manage/reviews.html:10 +#: project/templates/layout.html:300 project/templates/manage/reviews.html:10 #: project/templates/manage/widgets.html:5 #: project/templates/manage/widgets.html:9 msgid "Widgets" msgstr "" -#: project/templates/layout.html:307 +#: project/templates/layout.html:312 msgid "Switch organization" msgstr "" #: project/templates/developer/read.html:4 -#: project/templates/developer/read.html:8 project/templates/layout.html:354 +#: project/templates/developer/read.html:8 project/templates/layout.html:359 #: project/templates/profile.html:45 msgid "Developer" msgstr "" @@ -1925,12 +1925,12 @@ msgstr "" #: project/templates/admin_unit/create.html:51 #: project/templates/admin_unit/update.html:67 -#: project/templates/event/create.html:351 +#: project/templates/event/create.html:375 #: project/templates/event/update.html:208 -#: project/templates/event_place/create.html:57 -#: project/templates/event_place/update.html:57 -#: project/templates/organizer/create.html:56 -#: project/templates/organizer/update.html:56 +#: project/templates/event_place/create.html:58 +#: project/templates/event_place/update.html:58 +#: project/templates/organizer/create.html:57 +#: project/templates/organizer/update.html:57 msgid "Additional information" msgstr "" @@ -2191,45 +2191,45 @@ msgstr "" msgid "Add event to list" msgstr "" -#: project/templates/event/create.html:90 +#: project/templates/event/create.html:114 #: project/templates/event/update.html:76 #: project/templates/widget/event_suggestion/create.html:104 msgid "Enter place or address" msgstr "" -#: project/templates/event/create.html:244 +#: project/templates/event/create.html:268 #: project/templates/event/update.html:136 msgid "Event dates" msgstr "" -#: project/templates/event/create.html:251 +#: project/templates/event/create.html:275 #: project/templates/event/update.html:143 msgid "Add event date" msgstr "" -#: project/templates/event/create.html:278 +#: project/templates/event/create.html:302 msgid "Switch to organizer search" msgstr "" -#: project/templates/event/create.html:313 +#: project/templates/event/create.html:337 msgid "Switch to place search" msgstr "" -#: project/templates/event/create.html:324 +#: project/templates/event/create.html:348 #: project/templates/event/update.html:181 msgid "Access" msgstr "" -#: project/templates/event/create.html:338 +#: project/templates/event/create.html:362 #: project/templates/event/update.html:195 msgid "Target group" msgstr "" -#: project/templates/event/create.html:378 +#: project/templates/event/create.html:402 msgid "References are important for the visibility of your events." msgstr "" -#: project/templates/event/create.html:379 +#: project/templates/event/create.html:403 msgid "Select organizations to display your event on their calendars." msgstr "" @@ -2245,7 +2245,7 @@ msgid "Reference event \"%(name)s\"" msgstr "" #: project/templates/event/reference_request.html:47 -#: project/templates/event_date/list.html:416 +#: project/templates/event_date/list.html:418 msgid "Enter organization" msgstr "" @@ -2270,17 +2270,17 @@ msgstr "" msgid "Referenced" msgstr "" -#: project/templates/event_date/list.html:483 +#: project/templates/event_date/list.html:485 #: project/templates/manage/events.html:87 msgid "Created at" msgstr "" -#: project/templates/event_date/list.html:497 +#: project/templates/event_date/list.html:498 #: project/templates/manage/events.html:97 msgid "More filters" msgstr "" -#: project/templates/event_date/list.html:498 +#: project/templates/event_date/list.html:499 msgid "Map view" msgstr "" @@ -2733,23 +2733,31 @@ msgstr "" msgid "Event review status updated" msgstr "" -#: project/views/js.py:30 +#: project/views/js.py:33 msgid "Short name is already taken" msgstr "" -#: project/views/js.py:47 +#: project/views/js.py:52 msgid "Name is already taken" msgstr "" -#: project/views/js.py:61 +#: project/views/js.py:76 +msgid "A place already exists with this name." +msgstr "" + +#: project/views/js.py:100 +msgid "An organizer already exists with this name." +msgstr "" + +#: project/views/js.py:114 msgid "An account already exists with this email." msgstr "" -#: project/views/js.py:105 +#: project/views/js.py:158 msgid "Places of organization" msgstr "" -#: project/views/js.py:113 +#: project/views/js.py:166 msgid "Places of Google Maps" msgstr "" diff --git a/project/static/site.js b/project/static/site.js index 6740952..98300de 100644 --- a/project/static/site.js +++ b/project/static/site.js @@ -314,6 +314,10 @@ function fill_place_form_with_gmaps_place( if (!location_only) { $("#" + prefix + "name").val(place.name); + if ($.isFunction($("#" + prefix + "name").valid)) { + $("#" + prefix + "name").valid(); + } + if (place.website) { $("#" + prefix + "url").val(place.website); } diff --git a/project/templates/_macros.html b/project/templates/_macros.html index cabb8a1..5457357 100644 --- a/project/templates/_macros.html +++ b/project/templates/_macros.html @@ -824,6 +824,9 @@ } else { reset_place_form(); $('#place-name').val(data.main_text); + if ($('#place-name').length > 0 && $.isFunction($('#place-name').valid)) { + $('#place-name').valid(); + } } get_gmaps_place_details(data.gmaps_id, location_only); @@ -1616,6 +1619,68 @@ $('#allday').on('change', function() { {% endmacro %} +{% macro render_event_place_form_script(admin_unit, event_place=None) %} + +{% endmacro %} + +{% macro render_organizer_form_script(admin_unit, organizer=None) %} + +{% endmacro %} + {% macro render_admin_unit_form_script(admin_unit=None) %}