diff --git a/.gitignore b/.gitignore index 09cf1fb5..ec854b83 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ semantic/dist/themes/* !semantic/dist/*.css !semantic/dist/themes/default/ wbcore/static/semantic/dist/components/ +wbcore/locale/*/LC_MESSAGES/*.mo .vscode diff --git a/requirements.txt b/requirements.txt index 00524252..1ebb289b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,4 +38,5 @@ sshtunnel django-instagram cairosvg django-cleanup -easy-thumbnails \ No newline at end of file +easy-thumbnails +django-fixture-magic \ No newline at end of file diff --git a/wbcore/admin.py b/wbcore/admin.py index 26d81807..b4b61bd8 100644 --- a/wbcore/admin.py +++ b/wbcore/admin.py @@ -569,7 +569,7 @@ class HostAdmin(MyAdmin, ReverseModelAdmin): search_fields = ['name'] - list_display = ('name', 'slug', 'email', 'founding_date', 'address') + list_display = ('name', 'slug', 'email', 'founding_date', 'address', 'dissolved') def get_readonly_fields(self, request, obj=None): readonly_field = super().get_readonly_fields(request, obj) diff --git a/wbcore/locale/de/LC_MESSAGES/django.mo b/wbcore/locale/de/LC_MESSAGES/django.mo deleted file mode 100644 index 222206da..00000000 Binary files a/wbcore/locale/de/LC_MESSAGES/django.mo and /dev/null differ diff --git a/wbcore/locale/de/LC_MESSAGES/django.po b/wbcore/locale/de/LC_MESSAGES/django.po index 0ccb85fb..4fc608a4 100644 --- a/wbcore/locale/de/LC_MESSAGES/django.po +++ b/wbcore/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-03 18:25+0100\n" +"POT-Creation-Date: 2021-05-05 00:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: models.py:477 +#: models.py:486 msgid "Project Partner" msgstr "Projekt Partner" -#: models.py:478 +#: models.py:487 msgid "Sponsor" msgstr "Förderer" -#: models.py:479 +#: models.py:488 msgid "Patron" msgstr "Schirmherr*in" -#: models.py:480 +#: models.py:489 msgid "Network" msgstr "Netzwerk" -#: models.py:546 models.py:610 models.py:710 models.py:794 +#: models.py:555 models.py:620 models.py:720 models.py:804 msgid "photos" msgstr "Bilder" -#: models.py:1080 +#: models.py:1090 msgid "Donation" msgstr "Spende" -#: models.py:1081 +#: models.py:1091 msgid "Membership" msgstr "Mitgliedschaft" -#: models.py:1082 +#: models.py:1092 msgid "Other" msgstr "Anderer" @@ -64,8 +64,8 @@ msgstr "" #: templates/wbcore/about.html:6 templates/wbcore/dot_nav.html:32 #: templates/wbcore/dot_nav.html:41 templates/wbcore/dot_nav_columns.html:7 -#: templates/wbcore/dot_nav_columns.html:15 views.py:864 views.py:867 -#: views.py:892 +#: templates/wbcore/dot_nav_columns.html:15 views.py:868 views.py:871 +#: views.py:896 msgid "About" msgstr "Über uns" @@ -75,8 +75,8 @@ msgstr "Adresse" #: templates/wbcore/blog.html:5 templates/wbcore/dot_nav.html:22 #: templates/wbcore/dot_nav.html:25 templates/wbcore/dot_nav_columns.html:35 -#: templates/wbcore/dot_nav_columns.html:36 views.py:1411 views.py:1413 -#: views.py:1422 views.py:1443 views.py:1448 +#: templates/wbcore/dot_nav_columns.html:36 views.py:1422 views.py:1424 +#: views.py:1433 views.py:1454 views.py:1459 msgid "Blog" msgstr "Blog" @@ -87,14 +87,14 @@ msgstr "Keine Beiträge vorhanden." #: templates/wbcore/charter.html:6 templates/wbcore/dot_nav.html:58 #: templates/wbcore/dot_nav.html:66 templates/wbcore/dot_nav_columns.html:47 #: templates/wbcore/dot_nav_columns.html:53 templates/wbcore/sidebar.html:95 -#: views.py:504 views.py:509 views.py:524 +#: views.py:510 views.py:515 views.py:530 msgid "Charter" msgstr "Satzung" #: templates/wbcore/contact.html:5 templates/wbcore/dot_nav.html:38 #: templates/wbcore/dot_nav.html:47 templates/wbcore/dot_nav_columns.html:13 #: templates/wbcore/dot_nav_columns.html:21 templates/wbcore/footer.html:10 -#: templates/wbcore/footer.html:31 views.py:1685 views.py:1687 views.py:1716 +#: templates/wbcore/footer.html:31 views.py:1696 views.py:1698 views.py:1727 msgid "Contact" msgstr "Kontakt" @@ -114,45 +114,45 @@ msgstr "Abschicken" #: templates/wbcore/dot_nav.html:46 templates/wbcore/dot_nav_columns.html:12 #: templates/wbcore/dot_nav_columns.html:20 templates/wbcore/footer.html:20 #: templates/wbcore/footer.html:41 templates/wbcore/sidebar.html:65 -#: views.py:1613 views.py:1618 views.py:1636 +#: views.py:1624 views.py:1629 views.py:1647 msgid "Donate" msgstr "Spenden" #: templates/wbcore/dot_nav.html:21 templates/wbcore/dot_nav.html:24 #: templates/wbcore/dot_nav_columns.html:26 #: templates/wbcore/dot_nav_columns.html:27 templates/wbcore/home.html:30 -#: templates/wbcore/host.html:12 templates/wbcore/news.html:4 -#: templates/wbcore/sidebar.html:155 views.py:1496 views.py:1500 views.py:1509 -#: views.py:1531 views.py:1536 +#: templates/wbcore/host.html:13 templates/wbcore/news.html:4 +#: templates/wbcore/sidebar.html:155 views.py:1507 views.py:1511 views.py:1520 +#: views.py:1542 views.py:1547 msgid "News" msgstr "News" #: templates/wbcore/dot_nav.html:34 templates/wbcore/dot_nav.html:43 #: templates/wbcore/dot_nav_columns.html:9 #: templates/wbcore/dot_nav_columns.html:17 templates/wbcore/history.html:6 -#: views.py:625 views.py:630 views.py:647 +#: views.py:629 views.py:634 views.py:651 msgid "History" msgstr "Geschichte" #: templates/wbcore/dot_nav.html:35 templates/wbcore/dot_nav.html:44 #: templates/wbcore/dot_nav_columns.html:10 #: templates/wbcore/dot_nav_columns.html:18 templates/wbcore/team_list.html:7 -#: views.py:702 views.py:708 views.py:746 views.py:748 +#: views.py:706 views.py:712 views.py:750 views.py:752 msgid "Team" msgstr "Team" #: templates/wbcore/dot_nav.html:36 templates/wbcore/dot_nav.html:45 #: templates/wbcore/dot_nav_columns.html:11 #: templates/wbcore/dot_nav_columns.html:19 templates/wbcore/partners.html:5 -#: templates/wbcore/sidebar.html:111 views.py:782 views.py:785 views.py:800 -#: views.py:826 views.py:829 +#: templates/wbcore/sidebar.html:111 views.py:786 views.py:789 views.py:804 +#: views.py:830 views.py:833 msgid "Partners" msgstr "Partner" #: templates/wbcore/dot_nav.html:55 templates/wbcore/dot_nav.html:63 #: templates/wbcore/dot_nav_columns.html:45 #: templates/wbcore/dot_nav_columns.html:51 templates/wbcore/facts.html:6 -#: views.py:593 views.py:598 views.py:610 +#: views.py:597 views.py:602 views.py:614 msgid "Facts" msgstr "Fakten" @@ -160,36 +160,36 @@ msgstr "Fakten" #: templates/wbcore/dot_nav_columns.html:46 #: templates/wbcore/dot_nav_columns.html:52 templates/wbcore/footer.html:9 #: templates/wbcore/footer.html:30 templates/wbcore/transparency.html:7 -#: views.py:541 views.py:546 views.py:571 +#: views.py:547 views.py:552 views.py:577 msgid "Transparency" msgstr "Transparenz" #: templates/wbcore/dot_nav.html:59 templates/wbcore/dot_nav.html:67 #: templates/wbcore/dot_nav_columns.html:48 #: templates/wbcore/dot_nav_columns.html:54 templates/wbcore/reports.html:7 -#: views.py:468 views.py:473 views.py:489 +#: views.py:474 views.py:479 views.py:495 msgid "Reports" msgstr "Berichte" #: templates/wbcore/dot_nav.html:60 templates/wbcore/dot_nav.html:68 #: templates/wbcore/dot_nav_columns.html:49 #: templates/wbcore/dot_nav_columns.html:55 templates/wbcore/faq.html:5 -#: views.py:1767 views.py:1772 views.py:1786 +#: views.py:1778 views.py:1783 views.py:1797 msgid "FAQ" msgstr "FAQ" #: templates/wbcore/dot_nav_columns.html:8 #: templates/wbcore/dot_nav_columns.html:16 templates/wbcore/footer.html:21 #: templates/wbcore/footer.html:42 templates/wbcore/home.html:9 -#: templates/wbcore/idea.html:5 views.py:81 views.py:911 views.py:916 -#: views.py:932 +#: templates/wbcore/idea.html:5 views.py:81 views.py:915 views.py:920 +#: views.py:936 msgid "Idea" msgstr "Idee" #: templates/wbcore/dot_nav_columns.html:59 #: templates/wbcore/dot_nav_columns.html:60 templates/wbcore/events.html:5 #: templates/wbcore/home.html:17 templates/wbcore/sidebar.html:119 views.py:95 -#: views.py:1309 views.py:1315 views.py:1326 views.py:1346 views.py:1351 +#: views.py:1320 views.py:1326 views.py:1337 views.py:1357 views.py:1362 msgid "Events" msgstr "Events" @@ -210,7 +210,7 @@ msgid "Register" msgstr "Anmelden" #: templates/wbcore/footer.html:11 templates/wbcore/footer.html:32 -#: templates/wbcore/imprint.html:6 views.py:1654 views.py:1659 views.py:1667 +#: templates/wbcore/imprint.html:6 views.py:1665 views.py:1670 views.py:1678 msgid "Imprint" msgstr "Impressum" @@ -219,7 +219,7 @@ msgid "Data Protection" msgstr "Datenschutz" #: templates/wbcore/footer.html:13 templates/wbcore/footer.html:34 -#: views.py:1585 views.py:1590 views.py:1598 +#: views.py:1596 views.py:1601 views.py:1609 msgid "Sitemap" msgstr "Sitemap" @@ -230,7 +230,7 @@ msgstr "Mitglied werden" #: templates/wbcore/footer.html:22 templates/wbcore/footer.html:43 #: templates/wbcore/hosts.html:5 templates/wbcore/hosts_map.html:10 #: templates/wbcore/list_filter.html:11 views.py:109 views.py:1249 -#: views.py:1251 +#: views.py:1252 views.py:1260 msgid "Associations" msgstr "Vereine" @@ -243,7 +243,7 @@ msgid "What is Weitblick?" msgstr "Was ist Weitblick?" #: templates/wbcore/home.html:13 templates/wbcore/sidebar.html:127 views.py:88 -#: views.py:951 views.py:957 views.py:987 views.py:1191 views.py:1196 +#: views.py:955 views.py:961 views.py:991 views.py:1195 views.py:1200 msgid "Projects" msgstr "Projekte" @@ -255,7 +255,7 @@ msgstr "Wen unterstützen wir?" msgid "What do we do?" msgstr "Was machen wir?" -#: templates/wbcore/home.html:21 views.py:102 views.py:1075 views.py:1079 +#: templates/wbcore/home.html:21 views.py:102 views.py:1079 views.py:1083 msgid "Participate" msgstr "Mitmachen" @@ -263,12 +263,16 @@ msgstr "Mitmachen" msgid "Come over!" msgstr "Komm vorbei!" -#: templates/wbcore/home.html:33 templates/wbcore/host.html:15 +#: templates/wbcore/home.html:33 templates/wbcore/host.html:16 #, fuzzy #| msgid "Read more" msgid "more" msgstr "weiterlesen" +#: templates/wbcore/hosts.html:33 +msgid "Dissolved Hosts" +msgstr "Aufgelöste Vereine" + #: templates/wbcore/join.html:16 msgid "Registration Form" msgstr "Anmeldeformular" @@ -330,7 +334,7 @@ msgstr "Alle" msgid "Current" msgstr "Aktuelle" -#: templates/wbcore/list_filter.html:96 views.py:377 +#: templates/wbcore/list_filter.html:96 views.py:382 msgid "Completed" msgstr "Abgeschlossen" @@ -338,13 +342,13 @@ msgstr "Abgeschlossen" msgid "Category" msgstr "Kategorie" -#: templates/wbcore/list_filter.html:129 views.py:433 +#: templates/wbcore/list_filter.html:129 views.py:439 msgid "Former" msgstr "Ehemalige" #: templates/wbcore/list_filter.html:137 templates/wbcore/list_filter.html:138 -#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:62 -#: templates/wbcore/main_nav.html:108 views.py:1572 views.py:1573 +#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:64 +#: templates/wbcore/main_nav.html:112 views.py:1583 views.py:1584 msgid "Search" msgstr "Suche" @@ -352,7 +356,7 @@ msgstr "Suche" msgid "Read more" msgstr "weiterlesen" -#: templates/wbcore/logo.html:8 +#: templates/wbcore/logo.html:12 msgid "Education opportunities worldwide!" msgstr "Bildungschancen weltweit" @@ -444,7 +448,7 @@ msgstr "Finanzberichte" msgid "Membership Declaration" msgstr "Beitrittserklärung" -#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:720 +#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:724 msgid "Teams" msgstr "Teams" @@ -456,34 +460,34 @@ msgstr "" msgid "Details" msgstr "Details" -#: views.py:74 views.py:457 views.py:468 views.py:473 views.py:504 views.py:509 -#: views.py:541 views.py:546 views.py:593 views.py:598 views.py:625 -#: views.py:630 views.py:664 views.py:669 views.py:702 views.py:708 -#: views.py:746 views.py:748 views.py:782 views.py:785 views.py:825 -#: views.py:829 views.py:864 views.py:867 views.py:911 views.py:916 -#: views.py:949 views.py:957 views.py:1075 views.py:1079 views.py:1189 -#: views.py:1196 views.py:1251 views.py:1286 views.py:1307 views.py:1315 -#: views.py:1344 views.py:1351 views.py:1411 views.py:1413 views.py:1441 -#: views.py:1448 views.py:1496 views.py:1500 views.py:1529 views.py:1536 -#: views.py:1573 views.py:1585 views.py:1590 views.py:1613 views.py:1618 -#: views.py:1654 views.py:1659 views.py:1685 views.py:1687 views.py:1767 -#: views.py:1772 +#: views.py:74 views.py:463 views.py:474 views.py:479 views.py:510 views.py:515 +#: views.py:547 views.py:552 views.py:597 views.py:602 views.py:629 +#: views.py:634 views.py:668 views.py:673 views.py:706 views.py:712 +#: views.py:750 views.py:752 views.py:786 views.py:789 views.py:829 +#: views.py:833 views.py:868 views.py:871 views.py:915 views.py:920 +#: views.py:953 views.py:961 views.py:1079 views.py:1083 views.py:1193 +#: views.py:1200 views.py:1249 views.py:1252 views.py:1297 views.py:1318 +#: views.py:1326 views.py:1355 views.py:1362 views.py:1422 views.py:1424 +#: views.py:1452 views.py:1459 views.py:1507 views.py:1511 views.py:1540 +#: views.py:1547 views.py:1584 views.py:1596 views.py:1601 views.py:1624 +#: views.py:1629 views.py:1665 views.py:1670 views.py:1696 views.py:1698 +#: views.py:1778 views.py:1783 msgid "Home" msgstr "Home" -#: views.py:227 views.py:243 +#: views.py:233 views.py:249 msgid "Previous" msgstr "Vergangen" -#: views.py:262 views.py:263 +#: views.py:269 views.py:270 msgid "every" msgstr "jeden" -#: views.py:664 views.py:669 views.py:681 +#: views.py:668 views.py:673 views.py:685 msgid "Privacy" msgstr "Datenschutz" -#: views.py:1176 views.py:1178 +#: views.py:1180 views.py:1182 msgid "Join" msgstr "" diff --git a/wbcore/locale/de/LC_MESSAGES/djangojs.mo b/wbcore/locale/de/LC_MESSAGES/djangojs.mo deleted file mode 100644 index afb18036..00000000 Binary files a/wbcore/locale/de/LC_MESSAGES/djangojs.mo and /dev/null differ diff --git a/wbcore/locale/en/LC_MESSAGES/django.mo b/wbcore/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index 3d3350e5..00000000 Binary files a/wbcore/locale/en/LC_MESSAGES/django.mo and /dev/null differ diff --git a/wbcore/locale/en/LC_MESSAGES/django.po b/wbcore/locale/en/LC_MESSAGES/django.po index e5f30e1b..6e83ddd8 100644 --- a/wbcore/locale/en/LC_MESSAGES/django.po +++ b/wbcore/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-03 18:25+0100\n" +"POT-Creation-Date: 2021-05-05 00:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: models.py:477 +#: models.py:486 msgid "Project Partner" msgstr "" -#: models.py:478 +#: models.py:487 msgid "Sponsor" msgstr "" -#: models.py:479 +#: models.py:488 msgid "Patron" msgstr "" -#: models.py:480 +#: models.py:489 msgid "Network" msgstr "" -#: models.py:546 models.py:610 models.py:710 models.py:794 +#: models.py:555 models.py:620 models.py:720 models.py:804 msgid "photos" msgstr "" -#: models.py:1080 +#: models.py:1090 msgid "Donation" msgstr "" -#: models.py:1081 +#: models.py:1091 msgid "Membership" msgstr "" -#: models.py:1082 +#: models.py:1092 msgid "Other" msgstr "" @@ -64,8 +64,8 @@ msgstr "" #: templates/wbcore/about.html:6 templates/wbcore/dot_nav.html:32 #: templates/wbcore/dot_nav.html:41 templates/wbcore/dot_nav_columns.html:7 -#: templates/wbcore/dot_nav_columns.html:15 views.py:864 views.py:867 -#: views.py:892 +#: templates/wbcore/dot_nav_columns.html:15 views.py:868 views.py:871 +#: views.py:896 msgid "About" msgstr "" @@ -75,8 +75,8 @@ msgstr "" #: templates/wbcore/blog.html:5 templates/wbcore/dot_nav.html:22 #: templates/wbcore/dot_nav.html:25 templates/wbcore/dot_nav_columns.html:35 -#: templates/wbcore/dot_nav_columns.html:36 views.py:1411 views.py:1413 -#: views.py:1422 views.py:1443 views.py:1448 +#: templates/wbcore/dot_nav_columns.html:36 views.py:1422 views.py:1424 +#: views.py:1433 views.py:1454 views.py:1459 msgid "Blog" msgstr "" @@ -87,14 +87,14 @@ msgstr "" #: templates/wbcore/charter.html:6 templates/wbcore/dot_nav.html:58 #: templates/wbcore/dot_nav.html:66 templates/wbcore/dot_nav_columns.html:47 #: templates/wbcore/dot_nav_columns.html:53 templates/wbcore/sidebar.html:95 -#: views.py:504 views.py:509 views.py:524 +#: views.py:510 views.py:515 views.py:530 msgid "Charter" msgstr "" #: templates/wbcore/contact.html:5 templates/wbcore/dot_nav.html:38 #: templates/wbcore/dot_nav.html:47 templates/wbcore/dot_nav_columns.html:13 #: templates/wbcore/dot_nav_columns.html:21 templates/wbcore/footer.html:10 -#: templates/wbcore/footer.html:31 views.py:1685 views.py:1687 views.py:1716 +#: templates/wbcore/footer.html:31 views.py:1696 views.py:1698 views.py:1727 msgid "Contact" msgstr "" @@ -114,45 +114,45 @@ msgstr "" #: templates/wbcore/dot_nav.html:46 templates/wbcore/dot_nav_columns.html:12 #: templates/wbcore/dot_nav_columns.html:20 templates/wbcore/footer.html:20 #: templates/wbcore/footer.html:41 templates/wbcore/sidebar.html:65 -#: views.py:1613 views.py:1618 views.py:1636 +#: views.py:1624 views.py:1629 views.py:1647 msgid "Donate" msgstr "" #: templates/wbcore/dot_nav.html:21 templates/wbcore/dot_nav.html:24 #: templates/wbcore/dot_nav_columns.html:26 #: templates/wbcore/dot_nav_columns.html:27 templates/wbcore/home.html:30 -#: templates/wbcore/host.html:12 templates/wbcore/news.html:4 -#: templates/wbcore/sidebar.html:155 views.py:1496 views.py:1500 views.py:1509 -#: views.py:1531 views.py:1536 +#: templates/wbcore/host.html:13 templates/wbcore/news.html:4 +#: templates/wbcore/sidebar.html:155 views.py:1507 views.py:1511 views.py:1520 +#: views.py:1542 views.py:1547 msgid "News" msgstr "" #: templates/wbcore/dot_nav.html:34 templates/wbcore/dot_nav.html:43 #: templates/wbcore/dot_nav_columns.html:9 #: templates/wbcore/dot_nav_columns.html:17 templates/wbcore/history.html:6 -#: views.py:625 views.py:630 views.py:647 +#: views.py:629 views.py:634 views.py:651 msgid "History" msgstr "" #: templates/wbcore/dot_nav.html:35 templates/wbcore/dot_nav.html:44 #: templates/wbcore/dot_nav_columns.html:10 #: templates/wbcore/dot_nav_columns.html:18 templates/wbcore/team_list.html:7 -#: views.py:702 views.py:708 views.py:746 views.py:748 +#: views.py:706 views.py:712 views.py:750 views.py:752 msgid "Team" msgstr "" #: templates/wbcore/dot_nav.html:36 templates/wbcore/dot_nav.html:45 #: templates/wbcore/dot_nav_columns.html:11 #: templates/wbcore/dot_nav_columns.html:19 templates/wbcore/partners.html:5 -#: templates/wbcore/sidebar.html:111 views.py:782 views.py:785 views.py:800 -#: views.py:826 views.py:829 +#: templates/wbcore/sidebar.html:111 views.py:786 views.py:789 views.py:804 +#: views.py:830 views.py:833 msgid "Partners" msgstr "" #: templates/wbcore/dot_nav.html:55 templates/wbcore/dot_nav.html:63 #: templates/wbcore/dot_nav_columns.html:45 #: templates/wbcore/dot_nav_columns.html:51 templates/wbcore/facts.html:6 -#: views.py:593 views.py:598 views.py:610 +#: views.py:597 views.py:602 views.py:614 msgid "Facts" msgstr "" @@ -160,36 +160,36 @@ msgstr "" #: templates/wbcore/dot_nav_columns.html:46 #: templates/wbcore/dot_nav_columns.html:52 templates/wbcore/footer.html:9 #: templates/wbcore/footer.html:30 templates/wbcore/transparency.html:7 -#: views.py:541 views.py:546 views.py:571 +#: views.py:547 views.py:552 views.py:577 msgid "Transparency" msgstr "" #: templates/wbcore/dot_nav.html:59 templates/wbcore/dot_nav.html:67 #: templates/wbcore/dot_nav_columns.html:48 #: templates/wbcore/dot_nav_columns.html:54 templates/wbcore/reports.html:7 -#: views.py:468 views.py:473 views.py:489 +#: views.py:474 views.py:479 views.py:495 msgid "Reports" msgstr "" #: templates/wbcore/dot_nav.html:60 templates/wbcore/dot_nav.html:68 #: templates/wbcore/dot_nav_columns.html:49 #: templates/wbcore/dot_nav_columns.html:55 templates/wbcore/faq.html:5 -#: views.py:1767 views.py:1772 views.py:1786 +#: views.py:1778 views.py:1783 views.py:1797 msgid "FAQ" msgstr "" #: templates/wbcore/dot_nav_columns.html:8 #: templates/wbcore/dot_nav_columns.html:16 templates/wbcore/footer.html:21 #: templates/wbcore/footer.html:42 templates/wbcore/home.html:9 -#: templates/wbcore/idea.html:5 views.py:81 views.py:911 views.py:916 -#: views.py:932 +#: templates/wbcore/idea.html:5 views.py:81 views.py:915 views.py:920 +#: views.py:936 msgid "Idea" msgstr "" #: templates/wbcore/dot_nav_columns.html:59 #: templates/wbcore/dot_nav_columns.html:60 templates/wbcore/events.html:5 #: templates/wbcore/home.html:17 templates/wbcore/sidebar.html:119 views.py:95 -#: views.py:1309 views.py:1315 views.py:1326 views.py:1346 views.py:1351 +#: views.py:1320 views.py:1326 views.py:1337 views.py:1357 views.py:1362 msgid "Events" msgstr "" @@ -210,7 +210,7 @@ msgid "Register" msgstr "" #: templates/wbcore/footer.html:11 templates/wbcore/footer.html:32 -#: templates/wbcore/imprint.html:6 views.py:1654 views.py:1659 views.py:1667 +#: templates/wbcore/imprint.html:6 views.py:1665 views.py:1670 views.py:1678 msgid "Imprint" msgstr "" @@ -219,7 +219,7 @@ msgid "Data Protection" msgstr "Privacy" #: templates/wbcore/footer.html:13 templates/wbcore/footer.html:34 -#: views.py:1585 views.py:1590 views.py:1598 +#: views.py:1596 views.py:1601 views.py:1609 msgid "Sitemap" msgstr "" @@ -230,7 +230,7 @@ msgstr "Join" #: templates/wbcore/footer.html:22 templates/wbcore/footer.html:43 #: templates/wbcore/hosts.html:5 templates/wbcore/hosts_map.html:10 #: templates/wbcore/list_filter.html:11 views.py:109 views.py:1249 -#: views.py:1251 +#: views.py:1252 views.py:1260 msgid "Associations" msgstr "" @@ -243,7 +243,7 @@ msgid "What is Weitblick?" msgstr "" #: templates/wbcore/home.html:13 templates/wbcore/sidebar.html:127 views.py:88 -#: views.py:951 views.py:957 views.py:987 views.py:1191 views.py:1196 +#: views.py:955 views.py:961 views.py:991 views.py:1195 views.py:1200 msgid "Projects" msgstr "" @@ -255,7 +255,7 @@ msgstr "" msgid "What do we do?" msgstr "" -#: templates/wbcore/home.html:21 views.py:102 views.py:1075 views.py:1079 +#: templates/wbcore/home.html:21 views.py:102 views.py:1079 views.py:1083 msgid "Participate" msgstr "Join" @@ -263,10 +263,14 @@ msgstr "Join" msgid "Come over!" msgstr "Take part!" -#: templates/wbcore/home.html:33 templates/wbcore/host.html:15 +#: templates/wbcore/home.html:33 templates/wbcore/host.html:16 msgid "more" msgstr "" +#: templates/wbcore/hosts.html:33 +msgid "Dissolved Hosts" +msgstr "" + #: templates/wbcore/join.html:16 msgid "Registration Form" msgstr "" @@ -328,7 +332,7 @@ msgstr "" msgid "Current" msgstr "" -#: templates/wbcore/list_filter.html:96 views.py:377 +#: templates/wbcore/list_filter.html:96 views.py:382 msgid "Completed" msgstr "" @@ -336,13 +340,13 @@ msgstr "" msgid "Category" msgstr "" -#: templates/wbcore/list_filter.html:129 views.py:433 +#: templates/wbcore/list_filter.html:129 views.py:439 msgid "Former" msgstr "" #: templates/wbcore/list_filter.html:137 templates/wbcore/list_filter.html:138 -#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:62 -#: templates/wbcore/main_nav.html:108 views.py:1572 views.py:1573 +#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:64 +#: templates/wbcore/main_nav.html:112 views.py:1583 views.py:1584 msgid "Search" msgstr "" @@ -350,7 +354,7 @@ msgstr "" msgid "Read more" msgstr "" -#: templates/wbcore/logo.html:8 +#: templates/wbcore/logo.html:12 msgid "Education opportunities worldwide!" msgstr "" @@ -442,7 +446,7 @@ msgstr "" msgid "Membership Declaration" msgstr "" -#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:720 +#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:724 msgid "Teams" msgstr "" @@ -454,33 +458,33 @@ msgstr "" msgid "Details" msgstr "" -#: views.py:74 views.py:457 views.py:468 views.py:473 views.py:504 views.py:509 -#: views.py:541 views.py:546 views.py:593 views.py:598 views.py:625 -#: views.py:630 views.py:664 views.py:669 views.py:702 views.py:708 -#: views.py:746 views.py:748 views.py:782 views.py:785 views.py:825 -#: views.py:829 views.py:864 views.py:867 views.py:911 views.py:916 -#: views.py:949 views.py:957 views.py:1075 views.py:1079 views.py:1189 -#: views.py:1196 views.py:1251 views.py:1286 views.py:1307 views.py:1315 -#: views.py:1344 views.py:1351 views.py:1411 views.py:1413 views.py:1441 -#: views.py:1448 views.py:1496 views.py:1500 views.py:1529 views.py:1536 -#: views.py:1573 views.py:1585 views.py:1590 views.py:1613 views.py:1618 -#: views.py:1654 views.py:1659 views.py:1685 views.py:1687 views.py:1767 -#: views.py:1772 +#: views.py:74 views.py:463 views.py:474 views.py:479 views.py:510 views.py:515 +#: views.py:547 views.py:552 views.py:597 views.py:602 views.py:629 +#: views.py:634 views.py:668 views.py:673 views.py:706 views.py:712 +#: views.py:750 views.py:752 views.py:786 views.py:789 views.py:829 +#: views.py:833 views.py:868 views.py:871 views.py:915 views.py:920 +#: views.py:953 views.py:961 views.py:1079 views.py:1083 views.py:1193 +#: views.py:1200 views.py:1249 views.py:1252 views.py:1297 views.py:1318 +#: views.py:1326 views.py:1355 views.py:1362 views.py:1422 views.py:1424 +#: views.py:1452 views.py:1459 views.py:1507 views.py:1511 views.py:1540 +#: views.py:1547 views.py:1584 views.py:1596 views.py:1601 views.py:1624 +#: views.py:1629 views.py:1665 views.py:1670 views.py:1696 views.py:1698 +#: views.py:1778 views.py:1783 msgid "Home" msgstr "" -#: views.py:227 views.py:243 +#: views.py:233 views.py:249 msgid "Previous" msgstr "" -#: views.py:262 views.py:263 +#: views.py:269 views.py:270 msgid "every" msgstr "" -#: views.py:664 views.py:669 views.py:681 +#: views.py:668 views.py:673 views.py:685 msgid "Privacy" msgstr "" -#: views.py:1176 views.py:1178 +#: views.py:1180 views.py:1182 msgid "Join" msgstr "" diff --git a/wbcore/locale/en/LC_MESSAGES/djangojs.mo b/wbcore/locale/en/LC_MESSAGES/djangojs.mo deleted file mode 100644 index 71cbdf3e..00000000 Binary files a/wbcore/locale/en/LC_MESSAGES/djangojs.mo and /dev/null differ diff --git a/wbcore/locale/es/LC_MESSAGES/django.mo b/wbcore/locale/es/LC_MESSAGES/django.mo deleted file mode 100644 index d7e2117d..00000000 Binary files a/wbcore/locale/es/LC_MESSAGES/django.mo and /dev/null differ diff --git a/wbcore/locale/es/LC_MESSAGES/django.po b/wbcore/locale/es/LC_MESSAGES/django.po index bfdb455d..29d524b5 100644 --- a/wbcore/locale/es/LC_MESSAGES/django.po +++ b/wbcore/locale/es/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-03 18:25+0100\n" +"POT-Creation-Date: 2021-05-05 00:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ronja Fischer \n" "Language-Team: LANGUAGE \n" @@ -13,39 +13,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: models.py:477 +#: models.py:486 #, fuzzy #| msgid "Project Map" msgid "Project Partner" msgstr "Mapa de proyectos" -#: models.py:478 +#: models.py:487 msgid "Sponsor" msgstr "" -#: models.py:479 +#: models.py:488 msgid "Patron" msgstr "" -#: models.py:480 +#: models.py:489 msgid "Network" msgstr "" -#: models.py:546 models.py:610 models.py:710 models.py:794 +#: models.py:555 models.py:620 models.py:720 models.py:804 msgid "photos" msgstr "Fotos" -#: models.py:1080 +#: models.py:1090 #, fuzzy #| msgid "Donate" msgid "Donation" msgstr "Donar" -#: models.py:1081 +#: models.py:1091 msgid "Membership" msgstr "" -#: models.py:1082 +#: models.py:1092 msgid "Other" msgstr "" @@ -63,8 +63,8 @@ msgstr "Solicitud invalido!" #: templates/wbcore/about.html:6 templates/wbcore/dot_nav.html:32 #: templates/wbcore/dot_nav.html:41 templates/wbcore/dot_nav_columns.html:7 -#: templates/wbcore/dot_nav_columns.html:15 views.py:864 views.py:867 -#: views.py:892 +#: templates/wbcore/dot_nav_columns.html:15 views.py:868 views.py:871 +#: views.py:896 msgid "About" msgstr "¿Qui somos?" @@ -74,8 +74,8 @@ msgstr "Dirección" #: templates/wbcore/blog.html:5 templates/wbcore/dot_nav.html:22 #: templates/wbcore/dot_nav.html:25 templates/wbcore/dot_nav_columns.html:35 -#: templates/wbcore/dot_nav_columns.html:36 views.py:1411 views.py:1413 -#: views.py:1422 views.py:1443 views.py:1448 +#: templates/wbcore/dot_nav_columns.html:36 views.py:1422 views.py:1424 +#: views.py:1433 views.py:1454 views.py:1459 msgid "Blog" msgstr "Blog" @@ -88,14 +88,14 @@ msgstr "Ningun proyecto disponible" #: templates/wbcore/charter.html:6 templates/wbcore/dot_nav.html:58 #: templates/wbcore/dot_nav.html:66 templates/wbcore/dot_nav_columns.html:47 #: templates/wbcore/dot_nav_columns.html:53 templates/wbcore/sidebar.html:95 -#: views.py:504 views.py:509 views.py:524 +#: views.py:510 views.py:515 views.py:530 msgid "Charter" msgstr "Estatuto" #: templates/wbcore/contact.html:5 templates/wbcore/dot_nav.html:38 #: templates/wbcore/dot_nav.html:47 templates/wbcore/dot_nav_columns.html:13 #: templates/wbcore/dot_nav_columns.html:21 templates/wbcore/footer.html:10 -#: templates/wbcore/footer.html:31 views.py:1685 views.py:1687 views.py:1716 +#: templates/wbcore/footer.html:31 views.py:1696 views.py:1698 views.py:1727 msgid "Contact" msgstr "Contacto" @@ -115,38 +115,38 @@ msgstr "Enviar" #: templates/wbcore/dot_nav.html:46 templates/wbcore/dot_nav_columns.html:12 #: templates/wbcore/dot_nav_columns.html:20 templates/wbcore/footer.html:20 #: templates/wbcore/footer.html:41 templates/wbcore/sidebar.html:65 -#: views.py:1613 views.py:1618 views.py:1636 +#: views.py:1624 views.py:1629 views.py:1647 msgid "Donate" msgstr "Donar" #: templates/wbcore/dot_nav.html:21 templates/wbcore/dot_nav.html:24 #: templates/wbcore/dot_nav_columns.html:26 #: templates/wbcore/dot_nav_columns.html:27 templates/wbcore/home.html:30 -#: templates/wbcore/host.html:12 templates/wbcore/news.html:4 -#: templates/wbcore/sidebar.html:155 views.py:1496 views.py:1500 views.py:1509 -#: views.py:1531 views.py:1536 +#: templates/wbcore/host.html:13 templates/wbcore/news.html:4 +#: templates/wbcore/sidebar.html:155 views.py:1507 views.py:1511 views.py:1520 +#: views.py:1542 views.py:1547 msgid "News" msgstr "Novedades" #: templates/wbcore/dot_nav.html:34 templates/wbcore/dot_nav.html:43 #: templates/wbcore/dot_nav_columns.html:9 #: templates/wbcore/dot_nav_columns.html:17 templates/wbcore/history.html:6 -#: views.py:625 views.py:630 views.py:647 +#: views.py:629 views.py:634 views.py:651 msgid "History" msgstr "Historia" #: templates/wbcore/dot_nav.html:35 templates/wbcore/dot_nav.html:44 #: templates/wbcore/dot_nav_columns.html:10 #: templates/wbcore/dot_nav_columns.html:18 templates/wbcore/team_list.html:7 -#: views.py:702 views.py:708 views.py:746 views.py:748 +#: views.py:706 views.py:712 views.py:750 views.py:752 msgid "Team" msgstr "Equipo" #: templates/wbcore/dot_nav.html:36 templates/wbcore/dot_nav.html:45 #: templates/wbcore/dot_nav_columns.html:11 #: templates/wbcore/dot_nav_columns.html:19 templates/wbcore/partners.html:5 -#: templates/wbcore/sidebar.html:111 views.py:782 views.py:785 views.py:800 -#: views.py:826 views.py:829 +#: templates/wbcore/sidebar.html:111 views.py:786 views.py:789 views.py:804 +#: views.py:830 views.py:833 #, fuzzy #| msgid "Partner" msgid "Partners" @@ -155,7 +155,7 @@ msgstr "Socios" #: templates/wbcore/dot_nav.html:55 templates/wbcore/dot_nav.html:63 #: templates/wbcore/dot_nav_columns.html:45 #: templates/wbcore/dot_nav_columns.html:51 templates/wbcore/facts.html:6 -#: views.py:593 views.py:598 views.py:610 +#: views.py:597 views.py:602 views.py:614 msgid "Facts" msgstr "Datas" @@ -163,36 +163,36 @@ msgstr "Datas" #: templates/wbcore/dot_nav_columns.html:46 #: templates/wbcore/dot_nav_columns.html:52 templates/wbcore/footer.html:9 #: templates/wbcore/footer.html:30 templates/wbcore/transparency.html:7 -#: views.py:541 views.py:546 views.py:571 +#: views.py:547 views.py:552 views.py:577 msgid "Transparency" msgstr "Transparencia" #: templates/wbcore/dot_nav.html:59 templates/wbcore/dot_nav.html:67 #: templates/wbcore/dot_nav_columns.html:48 #: templates/wbcore/dot_nav_columns.html:54 templates/wbcore/reports.html:7 -#: views.py:468 views.py:473 views.py:489 +#: views.py:474 views.py:479 views.py:495 msgid "Reports" msgstr "Informes" #: templates/wbcore/dot_nav.html:60 templates/wbcore/dot_nav.html:68 #: templates/wbcore/dot_nav_columns.html:49 #: templates/wbcore/dot_nav_columns.html:55 templates/wbcore/faq.html:5 -#: views.py:1767 views.py:1772 views.py:1786 +#: views.py:1778 views.py:1783 views.py:1797 msgid "FAQ" msgstr "FAQ" #: templates/wbcore/dot_nav_columns.html:8 #: templates/wbcore/dot_nav_columns.html:16 templates/wbcore/footer.html:21 #: templates/wbcore/footer.html:42 templates/wbcore/home.html:9 -#: templates/wbcore/idea.html:5 views.py:81 views.py:911 views.py:916 -#: views.py:932 +#: templates/wbcore/idea.html:5 views.py:81 views.py:915 views.py:920 +#: views.py:936 msgid "Idea" msgstr "Idea" #: templates/wbcore/dot_nav_columns.html:59 #: templates/wbcore/dot_nav_columns.html:60 templates/wbcore/events.html:5 #: templates/wbcore/home.html:17 templates/wbcore/sidebar.html:119 views.py:95 -#: views.py:1309 views.py:1315 views.py:1326 views.py:1346 views.py:1351 +#: views.py:1320 views.py:1326 views.py:1337 views.py:1357 views.py:1362 msgid "Events" msgstr "Eventos" @@ -213,7 +213,7 @@ msgid "Register" msgstr "Registro" #: templates/wbcore/footer.html:11 templates/wbcore/footer.html:32 -#: templates/wbcore/imprint.html:6 views.py:1654 views.py:1659 views.py:1667 +#: templates/wbcore/imprint.html:6 views.py:1665 views.py:1670 views.py:1678 msgid "Imprint" msgstr "Imprimir" @@ -222,7 +222,7 @@ msgid "Data Protection" msgstr "Protección de datos" #: templates/wbcore/footer.html:13 templates/wbcore/footer.html:34 -#: views.py:1585 views.py:1590 views.py:1598 +#: views.py:1596 views.py:1601 views.py:1609 msgid "Sitemap" msgstr "Mapa del sitio" @@ -233,7 +233,7 @@ msgstr "Hacerte miembro" #: templates/wbcore/footer.html:22 templates/wbcore/footer.html:43 #: templates/wbcore/hosts.html:5 templates/wbcore/hosts_map.html:10 #: templates/wbcore/list_filter.html:11 views.py:109 views.py:1249 -#: views.py:1251 +#: views.py:1252 views.py:1260 msgid "Associations" msgstr "Associaciones" @@ -246,7 +246,7 @@ msgid "What is Weitblick?" msgstr "¿Qué es Weitblick?" #: templates/wbcore/home.html:13 templates/wbcore/sidebar.html:127 views.py:88 -#: views.py:951 views.py:957 views.py:987 views.py:1191 views.py:1196 +#: views.py:955 views.py:961 views.py:991 views.py:1195 views.py:1200 msgid "Projects" msgstr "Proyectos" @@ -258,7 +258,7 @@ msgstr "¿A quién apoyamos?" msgid "What do we do?" msgstr "¿Qué hacemos?" -#: templates/wbcore/home.html:21 views.py:102 views.py:1075 views.py:1079 +#: templates/wbcore/home.html:21 views.py:102 views.py:1079 views.py:1083 msgid "Participate" msgstr "Participa" @@ -266,12 +266,16 @@ msgstr "Participa" msgid "Come over!" msgstr "Venite" -#: templates/wbcore/home.html:33 templates/wbcore/host.html:15 +#: templates/wbcore/home.html:33 templates/wbcore/host.html:16 #, fuzzy #| msgid "Read more" msgid "more" msgstr "Leer más" +#: templates/wbcore/hosts.html:33 +msgid "Dissolved Hosts" +msgstr "" + #: templates/wbcore/join.html:16 msgid "Registration Form" msgstr "Formulario de inscripción" @@ -333,7 +337,7 @@ msgstr "Todo" msgid "Current" msgstr "Actual" -#: templates/wbcore/list_filter.html:96 views.py:377 +#: templates/wbcore/list_filter.html:96 views.py:382 msgid "Completed" msgstr "Completado" @@ -341,13 +345,13 @@ msgstr "Completado" msgid "Category" msgstr "" -#: templates/wbcore/list_filter.html:129 views.py:433 +#: templates/wbcore/list_filter.html:129 views.py:439 msgid "Former" msgstr "" #: templates/wbcore/list_filter.html:137 templates/wbcore/list_filter.html:138 -#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:62 -#: templates/wbcore/main_nav.html:108 views.py:1572 views.py:1573 +#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:64 +#: templates/wbcore/main_nav.html:112 views.py:1583 views.py:1584 msgid "Search" msgstr "Buscar" @@ -355,7 +359,7 @@ msgstr "Buscar" msgid "Read more" msgstr "Leer más" -#: templates/wbcore/logo.html:8 +#: templates/wbcore/logo.html:12 msgid "Education opportunities worldwide!" msgstr "¡Educación mundialmente!" @@ -447,7 +451,7 @@ msgstr "Informe financiero" msgid "Membership Declaration" msgstr "" -#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:720 +#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:724 msgid "Teams" msgstr "Equipos" @@ -459,34 +463,34 @@ msgstr "" msgid "Details" msgstr "Detalles" -#: views.py:74 views.py:457 views.py:468 views.py:473 views.py:504 views.py:509 -#: views.py:541 views.py:546 views.py:593 views.py:598 views.py:625 -#: views.py:630 views.py:664 views.py:669 views.py:702 views.py:708 -#: views.py:746 views.py:748 views.py:782 views.py:785 views.py:825 -#: views.py:829 views.py:864 views.py:867 views.py:911 views.py:916 -#: views.py:949 views.py:957 views.py:1075 views.py:1079 views.py:1189 -#: views.py:1196 views.py:1251 views.py:1286 views.py:1307 views.py:1315 -#: views.py:1344 views.py:1351 views.py:1411 views.py:1413 views.py:1441 -#: views.py:1448 views.py:1496 views.py:1500 views.py:1529 views.py:1536 -#: views.py:1573 views.py:1585 views.py:1590 views.py:1613 views.py:1618 -#: views.py:1654 views.py:1659 views.py:1685 views.py:1687 views.py:1767 -#: views.py:1772 +#: views.py:74 views.py:463 views.py:474 views.py:479 views.py:510 views.py:515 +#: views.py:547 views.py:552 views.py:597 views.py:602 views.py:629 +#: views.py:634 views.py:668 views.py:673 views.py:706 views.py:712 +#: views.py:750 views.py:752 views.py:786 views.py:789 views.py:829 +#: views.py:833 views.py:868 views.py:871 views.py:915 views.py:920 +#: views.py:953 views.py:961 views.py:1079 views.py:1083 views.py:1193 +#: views.py:1200 views.py:1249 views.py:1252 views.py:1297 views.py:1318 +#: views.py:1326 views.py:1355 views.py:1362 views.py:1422 views.py:1424 +#: views.py:1452 views.py:1459 views.py:1507 views.py:1511 views.py:1540 +#: views.py:1547 views.py:1584 views.py:1596 views.py:1601 views.py:1624 +#: views.py:1629 views.py:1665 views.py:1670 views.py:1696 views.py:1698 +#: views.py:1778 views.py:1783 msgid "Home" msgstr "Inicio" -#: views.py:227 views.py:243 +#: views.py:233 views.py:249 msgid "Previous" msgstr "" -#: views.py:262 views.py:263 +#: views.py:269 views.py:270 msgid "every" msgstr "" -#: views.py:664 views.py:669 views.py:681 +#: views.py:668 views.py:673 views.py:685 msgid "Privacy" msgstr "Privacidad" -#: views.py:1176 views.py:1178 +#: views.py:1180 views.py:1182 msgid "Join" msgstr "" diff --git a/wbcore/locale/es/LC_MESSAGES/djangojs.mo b/wbcore/locale/es/LC_MESSAGES/djangojs.mo deleted file mode 100644 index 5662109a..00000000 Binary files a/wbcore/locale/es/LC_MESSAGES/djangojs.mo and /dev/null differ diff --git a/wbcore/locale/fr/LC_MESSAGES/django.mo b/wbcore/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index ef58942b..00000000 Binary files a/wbcore/locale/fr/LC_MESSAGES/django.mo and /dev/null differ diff --git a/wbcore/locale/fr/LC_MESSAGES/django.po b/wbcore/locale/fr/LC_MESSAGES/django.po index 2a2df7b8..cdd9a6ab 100644 --- a/wbcore/locale/fr/LC_MESSAGES/django.po +++ b/wbcore/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-03 18:25+0100\n" +"POT-Creation-Date: 2021-05-05 00:04+0200\n" "PO-Revision-Date: 2020-02-14 15:57+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,39 +17,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: models.py:477 +#: models.py:486 #, fuzzy #| msgid "Project Map" msgid "Project Partner" msgstr "Carte des projets" -#: models.py:478 +#: models.py:487 msgid "Sponsor" msgstr "" -#: models.py:479 +#: models.py:488 msgid "Patron" msgstr "" -#: models.py:480 +#: models.py:489 msgid "Network" msgstr "" -#: models.py:546 models.py:610 models.py:710 models.py:794 +#: models.py:555 models.py:620 models.py:720 models.py:804 msgid "photos" msgstr "Images" -#: models.py:1080 +#: models.py:1090 #, fuzzy #| msgid "Donate" msgid "Donation" msgstr "Faire un don" -#: models.py:1081 +#: models.py:1091 msgid "Membership" msgstr "" -#: models.py:1082 +#: models.py:1092 msgid "Other" msgstr "" @@ -67,8 +67,8 @@ msgstr "Requête invalide!" #: templates/wbcore/about.html:6 templates/wbcore/dot_nav.html:32 #: templates/wbcore/dot_nav.html:41 templates/wbcore/dot_nav_columns.html:7 -#: templates/wbcore/dot_nav_columns.html:15 views.py:864 views.py:867 -#: views.py:892 +#: templates/wbcore/dot_nav_columns.html:15 views.py:868 views.py:871 +#: views.py:896 msgid "About" msgstr "À propos" @@ -78,8 +78,8 @@ msgstr "Adresse" #: templates/wbcore/blog.html:5 templates/wbcore/dot_nav.html:22 #: templates/wbcore/dot_nav.html:25 templates/wbcore/dot_nav_columns.html:35 -#: templates/wbcore/dot_nav_columns.html:36 views.py:1411 views.py:1413 -#: views.py:1422 views.py:1443 views.py:1448 +#: templates/wbcore/dot_nav_columns.html:36 views.py:1422 views.py:1424 +#: views.py:1433 views.py:1454 views.py:1459 msgid "Blog" msgstr "Blog" @@ -90,14 +90,14 @@ msgstr "Aucun message disponible." #: templates/wbcore/charter.html:6 templates/wbcore/dot_nav.html:58 #: templates/wbcore/dot_nav.html:66 templates/wbcore/dot_nav_columns.html:47 #: templates/wbcore/dot_nav_columns.html:53 templates/wbcore/sidebar.html:95 -#: views.py:504 views.py:509 views.py:524 +#: views.py:510 views.py:515 views.py:530 msgid "Charter" msgstr "Charte" #: templates/wbcore/contact.html:5 templates/wbcore/dot_nav.html:38 #: templates/wbcore/dot_nav.html:47 templates/wbcore/dot_nav_columns.html:13 #: templates/wbcore/dot_nav_columns.html:21 templates/wbcore/footer.html:10 -#: templates/wbcore/footer.html:31 views.py:1685 views.py:1687 views.py:1716 +#: templates/wbcore/footer.html:31 views.py:1696 views.py:1698 views.py:1727 msgid "Contact" msgstr "Contact" @@ -117,38 +117,38 @@ msgstr "Soumettre" #: templates/wbcore/dot_nav.html:46 templates/wbcore/dot_nav_columns.html:12 #: templates/wbcore/dot_nav_columns.html:20 templates/wbcore/footer.html:20 #: templates/wbcore/footer.html:41 templates/wbcore/sidebar.html:65 -#: views.py:1613 views.py:1618 views.py:1636 +#: views.py:1624 views.py:1629 views.py:1647 msgid "Donate" msgstr "Faire un don" #: templates/wbcore/dot_nav.html:21 templates/wbcore/dot_nav.html:24 #: templates/wbcore/dot_nav_columns.html:26 #: templates/wbcore/dot_nav_columns.html:27 templates/wbcore/home.html:30 -#: templates/wbcore/host.html:12 templates/wbcore/news.html:4 -#: templates/wbcore/sidebar.html:155 views.py:1496 views.py:1500 views.py:1509 -#: views.py:1531 views.py:1536 +#: templates/wbcore/host.html:13 templates/wbcore/news.html:4 +#: templates/wbcore/sidebar.html:155 views.py:1507 views.py:1511 views.py:1520 +#: views.py:1542 views.py:1547 msgid "News" msgstr "Actualités" #: templates/wbcore/dot_nav.html:34 templates/wbcore/dot_nav.html:43 #: templates/wbcore/dot_nav_columns.html:9 #: templates/wbcore/dot_nav_columns.html:17 templates/wbcore/history.html:6 -#: views.py:625 views.py:630 views.py:647 +#: views.py:629 views.py:634 views.py:651 msgid "History" msgstr "Histoire" #: templates/wbcore/dot_nav.html:35 templates/wbcore/dot_nav.html:44 #: templates/wbcore/dot_nav_columns.html:10 #: templates/wbcore/dot_nav_columns.html:18 templates/wbcore/team_list.html:7 -#: views.py:702 views.py:708 views.py:746 views.py:748 +#: views.py:706 views.py:712 views.py:750 views.py:752 msgid "Team" msgstr "Equipe" #: templates/wbcore/dot_nav.html:36 templates/wbcore/dot_nav.html:45 #: templates/wbcore/dot_nav_columns.html:11 #: templates/wbcore/dot_nav_columns.html:19 templates/wbcore/partners.html:5 -#: templates/wbcore/sidebar.html:111 views.py:782 views.py:785 views.py:800 -#: views.py:826 views.py:829 +#: templates/wbcore/sidebar.html:111 views.py:786 views.py:789 views.py:804 +#: views.py:830 views.py:833 #, fuzzy #| msgid "Partner" msgid "Partners" @@ -157,7 +157,7 @@ msgstr "Partenaire" #: templates/wbcore/dot_nav.html:55 templates/wbcore/dot_nav.html:63 #: templates/wbcore/dot_nav_columns.html:45 #: templates/wbcore/dot_nav_columns.html:51 templates/wbcore/facts.html:6 -#: views.py:593 views.py:598 views.py:610 +#: views.py:597 views.py:602 views.py:614 msgid "Facts" msgstr "Faits" @@ -165,36 +165,36 @@ msgstr "Faits" #: templates/wbcore/dot_nav_columns.html:46 #: templates/wbcore/dot_nav_columns.html:52 templates/wbcore/footer.html:9 #: templates/wbcore/footer.html:30 templates/wbcore/transparency.html:7 -#: views.py:541 views.py:546 views.py:571 +#: views.py:547 views.py:552 views.py:577 msgid "Transparency" msgstr "Transparence" #: templates/wbcore/dot_nav.html:59 templates/wbcore/dot_nav.html:67 #: templates/wbcore/dot_nav_columns.html:48 #: templates/wbcore/dot_nav_columns.html:54 templates/wbcore/reports.html:7 -#: views.py:468 views.py:473 views.py:489 +#: views.py:474 views.py:479 views.py:495 msgid "Reports" msgstr "Rapports" #: templates/wbcore/dot_nav.html:60 templates/wbcore/dot_nav.html:68 #: templates/wbcore/dot_nav_columns.html:49 #: templates/wbcore/dot_nav_columns.html:55 templates/wbcore/faq.html:5 -#: views.py:1767 views.py:1772 views.py:1786 +#: views.py:1778 views.py:1783 views.py:1797 msgid "FAQ" msgstr "FAQ" #: templates/wbcore/dot_nav_columns.html:8 #: templates/wbcore/dot_nav_columns.html:16 templates/wbcore/footer.html:21 #: templates/wbcore/footer.html:42 templates/wbcore/home.html:9 -#: templates/wbcore/idea.html:5 views.py:81 views.py:911 views.py:916 -#: views.py:932 +#: templates/wbcore/idea.html:5 views.py:81 views.py:915 views.py:920 +#: views.py:936 msgid "Idea" msgstr "Idée" #: templates/wbcore/dot_nav_columns.html:59 #: templates/wbcore/dot_nav_columns.html:60 templates/wbcore/events.html:5 #: templates/wbcore/home.html:17 templates/wbcore/sidebar.html:119 views.py:95 -#: views.py:1309 views.py:1315 views.py:1326 views.py:1346 views.py:1351 +#: views.py:1320 views.py:1326 views.py:1337 views.py:1357 views.py:1362 msgid "Events" msgstr "Évènements" @@ -215,7 +215,7 @@ msgid "Register" msgstr "S'inscrire" #: templates/wbcore/footer.html:11 templates/wbcore/footer.html:32 -#: templates/wbcore/imprint.html:6 views.py:1654 views.py:1659 views.py:1667 +#: templates/wbcore/imprint.html:6 views.py:1665 views.py:1670 views.py:1678 msgid "Imprint" msgstr "Empreinte" @@ -224,7 +224,7 @@ msgid "Data Protection" msgstr "Protection des données" #: templates/wbcore/footer.html:13 templates/wbcore/footer.html:34 -#: views.py:1585 views.py:1590 views.py:1598 +#: views.py:1596 views.py:1601 views.py:1609 msgid "Sitemap" msgstr "Plan de site" @@ -235,7 +235,7 @@ msgstr "Devenir membre" #: templates/wbcore/footer.html:22 templates/wbcore/footer.html:43 #: templates/wbcore/hosts.html:5 templates/wbcore/hosts_map.html:10 #: templates/wbcore/list_filter.html:11 views.py:109 views.py:1249 -#: views.py:1251 +#: views.py:1252 views.py:1260 msgid "Associations" msgstr "Associations" @@ -248,7 +248,7 @@ msgid "What is Weitblick?" msgstr "Qui est Weitblick?" #: templates/wbcore/home.html:13 templates/wbcore/sidebar.html:127 views.py:88 -#: views.py:951 views.py:957 views.py:987 views.py:1191 views.py:1196 +#: views.py:955 views.py:961 views.py:991 views.py:1195 views.py:1200 msgid "Projects" msgstr "Projets" @@ -260,7 +260,7 @@ msgstr "Qui soutenons-nous?" msgid "What do we do?" msgstr "Que faisons-nous?" -#: templates/wbcore/home.html:21 views.py:102 views.py:1075 views.py:1079 +#: templates/wbcore/home.html:21 views.py:102 views.py:1079 views.py:1083 msgid "Participate" msgstr "Participer" @@ -268,12 +268,16 @@ msgstr "Participer" msgid "Come over!" msgstr "Viens!" -#: templates/wbcore/home.html:33 templates/wbcore/host.html:15 +#: templates/wbcore/home.html:33 templates/wbcore/host.html:16 #, fuzzy #| msgid "Read more" msgid "more" msgstr "Lire plus" +#: templates/wbcore/hosts.html:33 +msgid "Dissolved Hosts" +msgstr "Associations dissoutes" + #: templates/wbcore/join.html:16 msgid "Registration Form" msgstr "Formulaire d'inscription" @@ -336,7 +340,7 @@ msgstr "Tout" msgid "Current" msgstr "Actuel" -#: templates/wbcore/list_filter.html:96 views.py:377 +#: templates/wbcore/list_filter.html:96 views.py:382 msgid "Completed" msgstr "Complété" @@ -344,13 +348,13 @@ msgstr "Complété" msgid "Category" msgstr "" -#: templates/wbcore/list_filter.html:129 views.py:433 +#: templates/wbcore/list_filter.html:129 views.py:439 msgid "Former" msgstr "" #: templates/wbcore/list_filter.html:137 templates/wbcore/list_filter.html:138 -#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:62 -#: templates/wbcore/main_nav.html:108 views.py:1572 views.py:1573 +#: templates/wbcore/main_nav.html:13 templates/wbcore/main_nav.html:64 +#: templates/wbcore/main_nav.html:112 views.py:1583 views.py:1584 msgid "Search" msgstr "Chercher" @@ -358,7 +362,7 @@ msgstr "Chercher" msgid "Read more" msgstr "Lire plus" -#: templates/wbcore/logo.html:8 +#: templates/wbcore/logo.html:12 msgid "Education opportunities worldwide!" msgstr "Perspectives d’éducation!" @@ -450,7 +454,7 @@ msgstr "Rapport financier" msgid "Membership Declaration" msgstr "" -#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:720 +#: templates/wbcore/sidebar.html:135 templates/wbcore/teams.html:5 views.py:724 msgid "Teams" msgstr "Equipes" @@ -462,35 +466,35 @@ msgstr "" msgid "Details" msgstr "Détails" -#: views.py:74 views.py:457 views.py:468 views.py:473 views.py:504 views.py:509 -#: views.py:541 views.py:546 views.py:593 views.py:598 views.py:625 -#: views.py:630 views.py:664 views.py:669 views.py:702 views.py:708 -#: views.py:746 views.py:748 views.py:782 views.py:785 views.py:825 -#: views.py:829 views.py:864 views.py:867 views.py:911 views.py:916 -#: views.py:949 views.py:957 views.py:1075 views.py:1079 views.py:1189 -#: views.py:1196 views.py:1251 views.py:1286 views.py:1307 views.py:1315 -#: views.py:1344 views.py:1351 views.py:1411 views.py:1413 views.py:1441 -#: views.py:1448 views.py:1496 views.py:1500 views.py:1529 views.py:1536 -#: views.py:1573 views.py:1585 views.py:1590 views.py:1613 views.py:1618 -#: views.py:1654 views.py:1659 views.py:1685 views.py:1687 views.py:1767 -#: views.py:1772 +#: views.py:74 views.py:463 views.py:474 views.py:479 views.py:510 views.py:515 +#: views.py:547 views.py:552 views.py:597 views.py:602 views.py:629 +#: views.py:634 views.py:668 views.py:673 views.py:706 views.py:712 +#: views.py:750 views.py:752 views.py:786 views.py:789 views.py:829 +#: views.py:833 views.py:868 views.py:871 views.py:915 views.py:920 +#: views.py:953 views.py:961 views.py:1079 views.py:1083 views.py:1193 +#: views.py:1200 views.py:1249 views.py:1252 views.py:1297 views.py:1318 +#: views.py:1326 views.py:1355 views.py:1362 views.py:1422 views.py:1424 +#: views.py:1452 views.py:1459 views.py:1507 views.py:1511 views.py:1540 +#: views.py:1547 views.py:1584 views.py:1596 views.py:1601 views.py:1624 +#: views.py:1629 views.py:1665 views.py:1670 views.py:1696 views.py:1698 +#: views.py:1778 views.py:1783 msgid "Home" msgstr "Accueil" -#: views.py:227 views.py:243 +#: views.py:233 views.py:249 msgid "Previous" msgstr "" -#: views.py:262 views.py:263 +#: views.py:269 views.py:270 msgid "every" msgstr "chaque" # Es gibt nicht unbedingt eine einzelne gute Übersetzung, meistens wird es eher umschrieben (protéger le caractère privé des données personnelles z.B.), aber wenn ein Nomen gebraucht wird, geht confidentialité -#: views.py:664 views.py:669 views.py:681 +#: views.py:668 views.py:673 views.py:685 msgid "Privacy" msgstr "Confidentialité" -#: views.py:1176 views.py:1178 +#: views.py:1180 views.py:1182 msgid "Join" msgstr "" diff --git a/wbcore/locale/fr/LC_MESSAGES/djangojs.mo b/wbcore/locale/fr/LC_MESSAGES/djangojs.mo deleted file mode 100644 index 01c64384..00000000 Binary files a/wbcore/locale/fr/LC_MESSAGES/djangojs.mo and /dev/null differ diff --git a/wbcore/management/commands/dissolve_host.py b/wbcore/management/commands/dissolve_host.py new file mode 100644 index 00000000..bdeb54af --- /dev/null +++ b/wbcore/management/commands/dissolve_host.py @@ -0,0 +1,121 @@ +from django.core.management.base import BaseCommand +from wbcore.models import Host, Photo, UserRelation +from wbcore.models import SocialMediaLink, JoinPage, Content, Event, NewsPost, BlogPost, Document, LinkedDocument, Team, Donation, ContactMessage +from fixture_magic.management.commands.dump_object import Command as DumpObjectCommand +from fixture_magic.management.commands.merge_fixtures import Command as MergeFixturesCommand +import io +import sys +import os +import shutil +import json + +class Command(BaseCommand): + """Delete a city permanently""" + + def add_arguments(self, parser): + parser.add_argument('host_slug', type=str) + + def handle(self, *args, **options): + host = Host.objects.get(slug=options["host_slug"]) + + confirm = input('Are you sure you want to dissolve the host "' + host.name + '"? This will delete a lot of data permanently! (yes/NO) ') + if confirm != 'yes': + print('abort') + return None + + models = [ + ('wbcore.host', {"pk__in": [host.slug]}), + ('wbcore.newspost', {"host__slug": host.slug}), + ('wbcore.blogpost', {"host__slug": host.slug}), + ('wbcore.project', {"hosts__slug": host.slug}), + ('wbcore.event', {"host__slug": host.slug}), + ('wbcore.document', {"host__slug": host.slug}), + ('wbcore.linkeddocument', {"host__slug": host.slug}), + ('wbcore.content', {"host__slug": host.slug}), + ('wbcore.team', {"host__slug": host.slug}), + ('wbcore.donation', {"host__slug": host.slug}), + ('wbcore.contactmessage', {"host__slug": host.slug}), + ('wbcore.userrelation', {"host__slug": host.slug}), # includes users + ('wbcore.teamuserrelation', {'team__host__slug': host.slug}), + ('wbcore.photo', {"host__slug": host.slug}), + ] + + def get_model_filename(model_name, folder=''): + return dump_folder + model_name.split('.')[-1] + '.json' + + # backup + + dump_folder = f'data/{host.slug}/' + if not os.path.exists(dump_folder): + os.makedirs(dump_folder) + + for model, query in models: + temp_stdout = io.StringIO() + sys.stdout = temp_stdout + DumpObjectCommand().handle(model=model, ids=None, query=json.dumps(query)) + with open(get_model_filename(model, folder=dump_folder), 'w') as f: + f.write(temp_stdout.getvalue()) + sys.stdout = sys.__stdout__ + + # merge fixtures + + temp_stdout = io.StringIO() + sys.stdout = temp_stdout + files = [get_model_filename(model[0], folder=dump_folder) for model in models] + MergeFixturesCommand().handle(*files) + with open(dump_folder + f'{host.slug}.json', 'w') as f: + f.write(temp_stdout.getvalue()) + sys.stdout = sys.__stdout__ + + # save documents and photos + + for document in Document.objects.filter(host__slug=host.slug): + source = document.file.path + target = f'{dump_folder}{os.path.dirname(document.file.url).strip("/")}/{os.path.basename(document.file.path)}' + os.makedirs(os.path.dirname(target), exist_ok=True) + shutil.copyfile(source, target) + + for photo in Photo.objects.filter(host__slug=host.slug): + os.makedirs(os.path.dirname(dump_folder + photo.image.url.strip('/')), exist_ok=True) + shutil.copyfile(photo.image.path, dump_folder + photo.image.url.strip('/')) + + for user_relation in UserRelation.objects.filter(host__slug=host.slug): + user = user_relation.user + try: + os.makedirs(os.path.dirname(dump_folder + user.image.url.strip('/')), exist_ok=True) + shutil.copyfile(user.image.path, dump_folder + user.image.url.strip('/')) + except ValueError: + pass + + # delete + + # keep host itself, delete related objects + # keep projects + SocialMediaLink.objects.filter(host=host).delete() + JoinPage.objects.filter(host=host).delete() + Content.objects.filter(host=host).exclude(type='welcome').delete() + Event.objects.filter(host=host).delete() + UserRelation.objects.filter(host=host).delete() + NewsPost.objects.filter(host=host).delete() + BlogPost.objects.filter(host=host).delete() + Document.objects.filter(host=host).delete() + LinkedDocument.objects.filter(host=host).delete() + Team.objects.filter(host=host).delete() + Donation.objects.filter(host=host).delete() + ContactMessage.objects.filter(host=host).delete() + Photo.objects.filter(host=host).exclude(type='project') + for partner in host.partners.all(): + if len(partner.hosts.all()) == 1 and len(partner.projects.all()) == 0: + try: + os.makedirs(os.path.dirname(dump_folder + partner.logo.url.strip('/')), exist_ok=True) + shutil.copyfile(partner.logo.path, dump_folder + partner.logo.url.strip('/')) + except (FileNotFoundError, ValueError) as e: + pass + partner.delete() + + host.dissolved = True + host.address = None + host.bank = None + host.save() + + print(host.name + ' dissolved') \ No newline at end of file diff --git a/wbcore/models.py b/wbcore/models.py index 684fd555..1bf0915b 100644 --- a/wbcore/models.py +++ b/wbcore/models.py @@ -94,6 +94,9 @@ def lng(self): def __str__(self): return self.name + " (" + self.country.name + ")" +class HostManager(models.Manager): + def get_queryset(self): + return super().get_queryset().filter(dissolved=False) class Host(RulesModel): class Meta: @@ -116,6 +119,12 @@ class Meta: location = models.OneToOneField(Location, on_delete=models.SET_NULL, null=True) partners = SortedManyToManyField('Partner', blank=True, related_name='hosts') bank = models.OneToOneField('BankAccount', on_delete=models.SET_NULL, null=True) + dissolved = models.BooleanField(default=False, null=False, blank=False) + dissolution_date = models.DateField(null=True, blank=True, help_text="Datum der Auflösung des Vereins") + + # Manager https://docs.djangoproject.com/en/3.1/topics/db/managers/ + all_objects = models.Manager() # first manager is used as default manager + objects = HostManager() # when calling Host.objects only return non-dissolved def belongs_to_host(self, host): return host == self @@ -504,7 +513,7 @@ def __str__(self): return self.name def get_hosts(self): - return Host.objects.all() + return self.hosts.all() def search_title(self): return self.name @@ -589,6 +598,7 @@ def search_image(self): def get_teaser(self): return self.short_description if self.short_description else self.description + class Event(RulesModelMixin, ScheduleEvent, metaclass=RulesModelBase): class Meta: rules_permissions = { diff --git a/wbcore/templates/wbcore/footer.html b/wbcore/templates/wbcore/footer.html index 6757ddff..95e22d39 100644 --- a/wbcore/templates/wbcore/footer.html +++ b/wbcore/templates/wbcore/footer.html @@ -2,7 +2,7 @@
@@ -149,16 +153,20 @@ {% endif %} {% endif %} {% endfor %} - - - More - + {% if dot_nav %} + + + More + + {% endif %} - + {% if dot_nav %} + + {% endif %} diff --git a/wbcore/templates/wbcore/svgs/logo.svg b/wbcore/templates/wbcore/svgs/logo.svg index a6d9b95d..c1be06aa 100644 --- a/wbcore/templates/wbcore/svgs/logo.svg +++ b/wbcore/templates/wbcore/svgs/logo.svg @@ -12,5 +12,5 @@ - + diff --git a/wbcore/templates/wbcore/svgs/puzzle-icon.svg b/wbcore/templates/wbcore/svgs/puzzle-icon.svg index 3fca0b94..891537c2 100644 --- a/wbcore/templates/wbcore/svgs/puzzle-icon.svg +++ b/wbcore/templates/wbcore/svgs/puzzle-icon.svg @@ -4,13 +4,14 @@ - +