Commit 7a75101d authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'Events-not-allowed-banner' into 'master'

Added a banner for members who are banned from certain or all events.

Closes #987

See merge request !1494
parents d8ed1dfc d895ccb2
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-01-30 12:24+0100\n" "POT-Creation-Date: 2020-02-19 21:24+0100\n"
"PO-Revision-Date: 2020-01-30 12:26+0100\n" "PO-Revision-Date: 2020-02-19 21:25+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n" "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -16,7 +16,7 @@ msgstr "" ...@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2.4\n" "X-Generator: Poedit 2.0.6\n"
#: admin.py #: admin.py
msgid "Thalia administration" msgid "Thalia administration"
...@@ -91,8 +91,8 @@ msgid "Become Active" ...@@ -91,8 +91,8 @@ msgid "Become Active"
msgstr "Actief Worden" msgstr "Actief Worden"
#: menus.py #: menus.py
msgid "Nextcloud" msgid "G Suite Knowledge Base"
msgstr "Nextcloud" msgstr "G Suite Knowledge Base"
#: menus.py #: menus.py
msgid "Calendar" msgid "Calendar"
...@@ -177,6 +177,15 @@ msgstr "" ...@@ -177,6 +177,15 @@ msgstr ""
"Je bent op dit moment geen lid van Thalia. Vernieuw je lidmaatschap om " "Je bent op dit moment geen lid van Thalia. Vernieuw je lidmaatschap om "
"toegang te krijgen tot de gehele website." "toegang te krijgen tot de gehele website."
#: templates/base.html
msgid ""
"You're currently not allowed to go to certain events. Please contact "
"Thalia's <a href=\"mailto:treasurer@thalia.nu\">treasurer</a> for more "
"information."
msgstr ""
"Je mag momenteel niet naar sommige evenementen. Contacteer Thalia's <a href="
"\"mailto:treasurer@thalia.nu\">penningmeester</a> voor meer informatie."
#: templates/base.html #: templates/base.html
msgid "edit profile" msgid "edit profile"
msgstr "bewerk profiel" msgstr "bewerk profiel"
......
...@@ -58,6 +58,15 @@ ...@@ -58,6 +58,15 @@
</a> </a>
</p> </p>
</div> </div>
{% elif self.profile.event_permissions != "all" %}
<div class="announcement">
<p>
{% blocktrans trimmed %}
You're currently not allowed to go to certain events. Please contact Thalia's
<a href="mailto:treasurer@thalia.nu">treasurer</a> for more information.
{% endblocktrans %}
</p>
</div>
{% endif %} {% endif %}
{% include "announcements/announcement.html" with announcements=announcements %} {% include "announcements/announcement.html" with announcements=announcements %}
</section> </section>
...@@ -75,8 +84,8 @@ ...@@ -75,8 +84,8 @@
</a> </a>
<div class="flex-grow-1"></div> <div class="flex-grow-1"></div>
<div class="navbar-user order-1 d-flex"> <div class="navbar-user order-1 d-flex">
<a href="#lang" <a href="#lang"
class="btn btn-link" class="btn btn-link"
id="language-switcher"> id="language-switcher">
{% if LANGUAGE_CODE == 'nl' %} {% if LANGUAGE_CODE == 'nl' %}
<img src="{% static 'img/flags/en.svg' %}"/> <img src="{% static 'img/flags/en.svg' %}"/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment