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

Merge branch 'tc/associations' into 'master'

Changed Sister Associations to Sibling Associations

Closes #763

See merge request !1063
parents fef4734c c8f7e216
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-11 19:17+0100\n"
"PO-Revision-Date: 2018-11-07 20:51+0100\n"
"POT-Creation-Date: 2018-11-14 21:52+0100\n"
"PO-Revision-Date: 2018-11-14 21:53+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -50,9 +50,9 @@ msgstr "Documenten"
msgid "Merchandise"
msgstr "Merchandise"
#: menus.py templates/singlepages/sister_associations.html
msgid "Sister Associations"
msgstr "Zusterverenigingen"
#: menus.py templates/singlepages/sibling_associations.html
msgid "Sibling Associations"
msgstr "Verwante Verenigingen"
#: menus.py
msgid "Become a Member"
......@@ -823,71 +823,75 @@ msgstr ""
"nieuwe verwerkingen op grondslag van toestemming geïntroduceerd worden zal "
"deze toestemming (opnieuw) gevraagd worden."
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Associations of the Radboud University Science Faculty"
msgstr "Bètaverenigingen van de Radboud Universiteit"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "(Medical) Biology"
msgstr "(Medische) Biologie"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Artificial Intelligence"
msgstr "Kunstmatige Intelligentie"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Mathematics"
msgstr "Wiskunde"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Science"
msgstr "Science"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Physics and Astronomy"
msgstr "Natuur- en Sterrekunde"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Science faculty umbrella association"
msgstr "Overkoepelende bètavereniging"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Molecular Sciences"
msgstr "Moleculaire Wetenschappen"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "BBB Career Event"
msgstr "Beta Bedrijven Beurs"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Sister Associations"
msgstr "Zusterverenigingen"
#: templates/singlepages/sibling_associations.html
msgid "University of Twente"
msgstr "Universiteit Twente"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Utrecht University"
msgstr "Universiteit Utrecht"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Delft University of Technology"
msgstr "Technische Universiteit Delft"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "University of Groningen"
msgstr "Rijksuniversiteit Groningen"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Leiden University"
msgstr "Universiteit Leiden"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "Eindhoven University of Technology"
msgstr "Technische Universiteit Eindhoven"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "University of Amsterdam"
msgstr "Universiteit van Amsterdam"
#: templates/singlepages/sister_associations.html
#: templates/singlepages/sibling_associations.html
msgid "VU University Amsterdam"
msgstr "Vrije Universiteit Amsterdam"
......
......@@ -24,7 +24,8 @@ MAIN_MENU = [
{'title': _('Societies'), 'name': 'activemembers:societies'},
{'title': _('Documents'), 'name': 'documents:index'},
{'title': _('Merchandise'), 'name': 'merchandise:index'},
{'title': _('Sister Associations'), 'name': 'sister-associations'},
{'title': _('Sibling Associations'),
'name': 'sibling-associations'},
{'title': _('Become a Member'), 'name': 'registrations:index'},
{'title': _('Thabloid'), 'name': 'thabloid:index'},
],
......
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Sister Associations" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Sister Associations" %} — {{ block.super }}{% endblock %}
{% block title %}{% trans "Sibling Associations" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Sibling Associations" %} — {{ block.super }}{% endblock %}
{% block body %}
<section class="page-section">
......
......@@ -85,7 +85,7 @@ urlpatterns = [ # pylint: disable=invalid-name
url(r'^', include('activemembers.urls')),
url(r'^merchandise/', include('merchandise.urls')),
url(r'^documents/', include('documents.urls')),
url(r'^sister-associations', TemplateView.as_view(template_name='singlepages/sister_associations.html'), name='sister-associations'),
url(r'^sibling-associations', TemplateView.as_view(template_name='singlepages/sibling_associations.html'), name='sibling-associations'),
url(r'^thabloid/', include('thabloid.urls')),
])),
url(r'^', include([ # 'for members' menu
......
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