Skip to content
GitLab
Commit 0e5c4580 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'new-location-board-room' into 'master' 

Update texts to new location board room

Closes #563

See merge request !683
parents 0805173b c5046801
Expand all Hide whitespace changes
Inline Side-by-side
website/merchandise/locale/nl/LC_MESSAGES/django.po
View file @ 0e5c4580
......@@ -7,34 +7,35 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-26 20:26+0200\n"
"PO-Revision-Date: 2016-08-06 15:06+0100\n"
"Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
"POT-Creation-Date: 2018-01-22 17:45+0100\n"
"PO-Revision-Date: 2018-01-22 17:49+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
"X-Generator: Poedit 2.0.4\n"
#: merchandise/templates/merchandise/index.html:5
#: merchandise/templates/merchandise/index.html:6
#: merchandise/templates/merchandise/index.html:9
msgid "Merchandise"
msgstr "Merchandise\t"
msgstr "Merchandise"
#: merchandise/templates/merchandise/index.html:8
#: merchandise/templates/merchandise/index.html:11
msgid ""
"Below you can find all the merchandise Thalia has available. During every "
"lunch break, the merchandise is for sale in the board room (HG00.150). "
"lunch break, the merchandise is for sale in the board room (M1.0.08). "
"Outside those hours, please make an appointment or approach the board over "
"drinks."
msgstr ""
"Hieronder kun je zien welke merchandise er te koop is bij Thalia. Elke pauze "
"zijn de spullen te koop bij de bestuurskamer (HG00.150), daarbuiten zijn ze "
"zijn de spullen te koop bij de bestuurskamer (M1.0.08), daarbuiten zijn ze "
"op afspraak te verkrijgen of tijdens borrels bij het bestuur."
#: merchandise/templates/merchandise/index.html:22
#, fuzzy, python-format
#| msgid "Price: € %(item.price)s"
#: merchandise/templates/merchandise/index.html:25
#, python-format
msgid "Price: € %(price)s"
msgstr "Prijs: € %(item.price)s"
msgstr "Prijs: € %(price)s"
website/merchandise/templates/merchandise/index.html
View file @ 0e5c4580
......@@ -8,7 +8,7 @@
{% block body %}
<h1>{% trans "Merchandise" %}</h1>
<p class="text-center">{% trans "Below you can find all the merchandise Thalia has available. During every lunch break, the merchandise is for sale in the board room (HG00.150). Outside those hours, please make an appointment or approach the board over drinks." %}</p
<p class="text-center">{% trans "Below you can find all the merchandise Thalia has available. During every lunch break, the merchandise is for sale in the board room (M1.0.08). Outside those hours, please make an appointment or approach the board over drinks." %}</p
{% for item in items %}
......
website/newsletters/templates/newsletters/email.html
View file @ 0e5c4580
......@@ -194,7 +194,7 @@
</td>
<td style="text-align: right; valign: middle; ">
<p style="font-size: 18px; color: white; font-family: 'Calibri', 'Trebuchet MS', sans-serif;">
HG00.150<br>
M1.0.08<br>
<a href="https://www.thalia.nu" style="text-decoration:none;"><span style="color: white; font-family: Calibri, 'Trebuchet MS', sans-serif">WWW.<span style="color: black">THALIA</span>.NU</span></a><br>
<a href="mailto:info@thalia.nu" style="text-decoration:none;"><span style="color: white; font-family: Calibri, 'Trebuchet MS', sans-serif">INFO@<span style="color: black">THALIA</span>.NU</span></a>
</p>
......
website/newsletters/templates/newsletters/email.txt
View file @ 0e5c4580
......@@ -21,7 +21,7 @@
{% endif %}
{% endfor %}
{% trans "room"|capfirst %}: HG00.150
{% trans "room"|capfirst %}: M1.0.08
{% trans "website"|capfirst %}: www.thalia.nu
{% trans "email"|capfirst %}: info@thalia.nu
......
website/registrations/templates/registrations/become_a_member.html
View file @ 0e5c4580
......@@ -17,7 +17,7 @@
<h4>{% trans "I'm not a Computing Science and Information Sciences student at the Radboud University, but I do want to attend your events. Now what?" %}</h4>
<p>{% blocktrans %}It is still possible to be associated with Thalia, even if you do not study Computing Science or Information Sciences (anymore): You can become a supporter. For at least € {{ year_fees }} per year, you too can enjoy everything Thalia has to offer. If you are not a former Thalia member, ICIS staff member or alumni, you must submit a written along with two signatures of current Thalia members. You can fill all of this in on the supporter form, which you can get at the board room (HG00.150, above the north kanteen in the Huygens building).{% endblocktrans %}</p>
<p>{% blocktrans %}It is still possible to be associated with Thalia, even if you do not study Computing Science or Information Sciences (anymore): You can become a supporter. For at least € {{ year_fees }} per year, you too can enjoy everything Thalia has to offer. If you are not a former Thalia member, ICIS staff member or alumni, you must submit a written along with two signatures of current Thalia members. You can fill all of this in on the supporter form, which you can get at the board room (M1.0.08, ground floor of Mercator 1).{% endblocktrans %}</p>
<p>{% blocktrans %}Payment can be made both in cash or by card. If you have any other questions about Thalia and/or your membership, feel free to email <a href="mailto:info@thalia.nu" target="_blank">info@thalia.nu</a>!{% endblocktrans %}</p>
{% endblock %}
website/registrations/templates/registrations/email/registration_accepted.txt
View file @ 0e5c4580
......@@ -7,7 +7,7 @@ you get access to everything Thalia has to offer: paying your membership fees.
The membership fees are €{{ fees }} and can be paid using cash or a debit card.
Please visit us during lunch break (12:30-13:30) in HG00.150 so that we can
Please visit us during lunch break (12:30-13:30) in M1.0.08 so that we can
make sure your registration is completed.
If you have any questions, then don't hesitate and send an email to info@thalia.nu.
......
website/registrations/templates/registrations/email/renewal_accepted.txt
View file @ 0e5c4580
......@@ -7,7 +7,7 @@ you get access to everything Thalia has to offer once again: paying your members
The membership fees are €{{ fees }} and can be paid using cash or a debit card.
Please visit us during lunch break (12:30-13:30) in HG00.150 so that we can
Please visit us during lunch break (12:30-13:30) in M1.0.08 so that we can
make sure your membership renewal is completed.
If you have any questions, then don't hesitate and send an email to info@thalia.nu.
......
website/thaliawebsite/locale/nl/LC_MESSAGES/django.po
View file @ 0e5c4580
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-14 13:32+0200\n"
"PO-Revision-Date: 2017-10-14 13:32+0200\n"
"POT-Creation-Date: 2018-01-22 21:03+0100\n"
"PO-Revision-Date: 2018-01-22 21:03+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -57,9 +57,7 @@ msgstr "Merchandise"
msgid "Sister Associations"
msgstr "Zusterverenigingen"
#: menus.py:11 templates/singlepages/become_a_member.html:4
#: templates/singlepages/become_a_member.html:5
#: templates/singlepages/become_a_member.html:8
#: menus.py:11
msgid "Become a Member"
msgstr "Lid Worden"
......@@ -144,11 +142,11 @@ msgstr "Samenvatting Insturen"
msgid "Contact"
msgstr "Contact"
#: settings/settings.py:192
#: settings/settings.py:194
msgid "English"
msgstr "Engels"
#: settings/settings.py:193
#: settings/settings.py:195
msgid "Dutch"
msgstr "Nederlands"
......@@ -261,86 +259,6 @@ msgstr ""
"vooral niet om te reageren en mail <a href=\"mailto:info@thalia.nu\">Thalia</"
"a>!"
#: templates/singlepages/become_a_member.html:10
msgid ""
"Thalia is the study association for Computing Science and Information "
"Sciences students at the Radboud University in Nijmegen. Thalia organises a "
"wide variety of activities, such as bowling events, go cart racing, lunch "
"lectures, drinks and much more! Furthermore, members get access to our tests "
"and summaries database, as well as discounts on books. There's no reason not "
"to become a member!"
msgstr ""
"Thalia is de studievereniging voor Informatica en Informatiekunde studenten "
"van de Radboud Universiteit te Nijmegen. Thalia organiseert diverse "
"activiteiten, zoals bowlen, karten, lunchlezingen, borrels en nog veel meer! "
"Verder krijg je als lid toegang tot onze tentamen- en samenvattingendatabase "
"en kun je met korting je studieboeken bestellen. Kortom, geen reden om niet "
"lid te worden!"
#: templates/singlepages/become_a_member.html:12
msgid "How do I become a member?"
msgstr "Hoe kan ik lid worden?"
#: templates/singlepages/become_a_member.html:14
msgid ""
"You can become a member of Thalia at any time during the year. Membership "
"costs € 7.50 per year, or € 30 for your entire study duration. To become a "
"member, please fill out the membership form. You can get the form at the "
"board room (HG00.150, above the north kanteen in the Huygens building), or "
"download it below. After signing the form, return it to the board room. "
"Note: Only Computing Science and Information Sciences students at the "
"Radboud University can become a member."
msgstr ""
"Je kunt op elk moment van het collegejaar lid worden van Thalia. Een "
"lidmaatschap kost € 7,50 per jaar, of € 30 voor je hele studieperiode. Om "
"lid te worden dien je het lidmaatschapsformulier in te vullen. Dit formulier "
"kun je bij de bestuurskamer (HG00.150, boven de Noordkantine van het "
"Huygensgebouw) ophalen of downloaden via de website en ondertekend inleveren "
"bij bestuurskamer Let wel op: Je kunt alleen lid worden wanneer je "
"informatica of informatiekunde studeert aan de Radboud Universiteit."
#: templates/singlepages/become_a_member.html:16
msgid ""
"I'm not a Computing Science and Information Sciences student at the Radboud "
"University, but I do want to attend your events. Now what?"
msgstr ""
"Ik studeer geen Informatica of Informatiekunde (aan de Radboud "
"Universiteit), maar ik wil wel naar jullie activiteiten gaan. Wat nu?"
#: templates/singlepages/become_a_member.html:18
msgid ""
"It is still possible to be associated with Thalia, even if you do not study "
"Computing Science or Information Sciences (anymore): You can become a "
"supporter. For at least € 7.50 per year, you too can enjoy everything Thalia "
"has to offer. If you are not a former Thalia member, ICIS staff member or "
"alumni, you must submit a written along with two signatures of current "
"Thalia members. You can fill all of this in on the supporter form, which you "
"can get at the board room (HG00.150, above the north kanteen in the Huygens "
"building), or download below."
msgstr ""
"Mocht je nu geen Informatica of Informatiekunde (meer) studeren, maar toch "
"verbonden willen zijn, dan kan dat ook. Hiervoor kun je begunstiger van "
"Thalia worden. Voor minimaal € 7,50 per jaar kun je ook genieten van alles "
"wat Thalia je te bieden heeft. Ben je geen oud-Thaliaan, ex-Informaticus of -"
"Informatiekundige, dan dien je twee handtekeningen van leden van Thalia "
"samen met een motivatie waarom je begunstiger wil worden af te geven. Dit "
"kun je allemaal invullen op het begunstigerformulier, dat af te halen is in "
"de bestuurskamer of hieronder te downloaden is."
#: templates/singlepages/become_a_member.html:20
msgid ""
"Payment for membership or sponsorship can be made both in cash or by "
"authorised direct debit. To authorise direct debit, use the form that is "
"also available below. If you have any other questions about Thalia and/or "
"your membership, feel free to email <a href=\"mailto:info@thalia.nu\" target="
"\"_blank\">info@thalia.nu</a>!"
msgstr ""
"Betalen voor je lidmaatschap / begunstigerschap kan zowel contant als met "
"een machtiging. Voor machtigingen gebruiken we een machtigingsformulier, dat "
"hieronder te downloaden is. Mocht je nog verdere vragen hebben over Thalia "
"en/of je lidmaatschap dan kun je altijd mailen naar <a href=\"mailto:"
"info@thalia.nu\" target=\"_blank\">info@thalia.nu</a>!"
#: templates/singlepages/become_active.html:4
#: templates/singlepages/become_active.html:5
#: templates/singlepages/become_active.html:8
......@@ -410,8 +328,8 @@ msgid "Address:"
msgstr "Adres:"
#: templates/singlepages/contact.html:21
msgid "Board room: HG00.150 (above the north-canteen)"
msgstr "Bestuurskamer: HG00.150 (boven de noordkantine)"
msgid "Board room: M1.0.08 (ground floor)"
msgstr "Bestuurskamer: M1.0.08 (begane grond)"
#: templates/singlepages/contact.html:24
msgid "Postal address:"
......
website/thaliawebsite/templates/singlepages/become_a_member.html deleted 100644 → 0
View file @ 0805173b
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Become a Member" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Become a Member" %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Become a Member" %}</h1>
<p>{% trans "Thalia is the study association for Computing Science and Information Sciences students at the Radboud University in Nijmegen. Thalia organises a wide variety of activities, such as bowling events, go cart racing, lunch lectures, drinks and much more! Furthermore, members get access to our tests and summaries database, as well as discounts on books. There's no reason not to become a member!" %}</p>
<h4>{% trans "How do I become a member?" %}</h4>
<p>{% trans "You can become a member of Thalia at any time during the year. Membership costs € 7.50 per year, or € 30 for your entire study duration. To become a member, please fill out the membership form. You can get the form at the board room (HG00.150, above the north kanteen in the Huygens building), or download it below. After signing the form, return it to the board room. Note: Only Computing Science and Information Sciences students at the Radboud University can become a member." %}</p>
<h4>{% trans "I'm not a Computing Science and Information Sciences student at the Radboud University, but I do want to attend your events. Now what?" %}</h4>
<p>{% trans "It is still possible to be associated with Thalia, even if you do not study Computing Science or Information Sciences (anymore): You can become a supporter. For at least € 7.50 per year, you too can enjoy everything Thalia has to offer. If you are not a former Thalia member, ICIS staff member or alumni, you must submit a written along with two signatures of current Thalia members. You can fill all of this in on the supporter form, which you can get at the board room (HG00.150, above the north kanteen in the Huygens building), or download below." %}</p>
<p>{% blocktrans %}Payment for membership or sponsorship can be made both in cash or by authorised direct debit. To authorise direct debit, use the form that is also available below. If you have any other questions about Thalia and/or your membership, feel free to email <a href="mailto:info@thalia.nu" target="_blank">info@thalia.nu</a>!{% endblocktrans %}</p>
{% endblock %}
website/thaliawebsite/templates/singlepages/contact.html
View file @ 0e5c4580
......@@ -14,11 +14,11 @@
</tr>
<tr>
<td>{% trans "Room:" %}</td>
<td>HG00.150</td>
<td>M1.0.08</td>
</tr>
<tr>
<td valign="top">{% trans "Address:" %}</td>
<td>Heyendaalseweg 135<br>6525 AJ Nijmegen<br>{% trans "Board room: HG00.150 (above the north-canteen)" %}</td>
<td>Toernooiveld 212<br>6525 EC Nijmegen<br>{% trans "Board room: M1.0.08 (ground floor)" %}</td>
</tr>
<tr>
<td valign="top">{% trans "Postal address:" %}</td>
......@@ -26,11 +26,11 @@
</tr>
<tr>
<td>{% trans "Telephone:" %}</td>
<td>024 - 3652079</td>
<td>+31 (0)24 3653498</td>
</tr>
<tr>
<td>{% trans "Voicemailbox:" %}</td>
<td>084 - 8339677</td>
<td>+31 (0)84 8339677</td>
</tr>
<tr>
<td valign="top">{% trans "Email:" %}</td>
......
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