From 48ddcb53515e6f98d4b5afb0a5be3909fbe96aa1 Mon Sep 17 00:00:00 2001
From: Bram in 't Zandt <b.z@posteo.nl>
Date: Fri, 15 Sep 2017 23:48:05 +0200
Subject: [PATCH 1/3] views.py now uses the new payment field instead of the
 old paid field

---
 website/events/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/website/events/views.py b/website/events/views.py
index 851f1a56..4c4c9400 100644
--- a/website/events/views.py
+++ b/website/events/views.py
@@ -120,7 +120,10 @@ def export(request, event_id):
             'date cancelled': cancelled,
         }
         if event.price > 0:
-            data['paid'] = _('Yes') if registration.paid else ''
+            if (registration.payment != 'no_payment'):
+                data['paid'] = _('Yes')
+            else:
+                data['paid'] = ''
 
         data.update({field['field'].name: field['value'] for field in
                      registration.registration_information()})
-- 
GitLab


From 130dca866526d88e95ceed3b1b7de4f3be516d69 Mon Sep 17 00:00:00 2001
From: Bram in 't Zandt <b.z@posteo.nl>
Date: Sun, 17 Sep 2017 12:19:00 +0200
Subject: [PATCH 2/3] Paid field now displays payment method

---
 .../events/locale/nl/LC_MESSAGES/django.mo    | Bin 11225 -> 10448 bytes
 .../events/locale/nl/LC_MESSAGES/django.po    |  55 +++++++++++++-----
 website/events/views.py                       |   8 ++-
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/website/events/locale/nl/LC_MESSAGES/django.mo b/website/events/locale/nl/LC_MESSAGES/django.mo
index 4d8482240938fca4d195745f5a97af4fad33d155..d1ab4052a896e493e1da0c0e2d084d90728ebfee 100644
GIT binary patch
delta 3153
zcmY+`eN0tl0LSr%BXBQ5sF*K=C|5<u5S0W90nL|ue<MOPOsTG7B8CFKWE|9#%$Ldw
z_F|jPRmN)By44?%Ywo7j8fLX-Mr&zv)1~FgxkYJxfA>CY^~@ii^Bm53&hvJToLhKi
zf%{`pbgQB4A%n=%(Z+m&SG@e7T#7d)2QQ;e4N8cZjv3UmF&4|PFD}7dSc^1eZldmU
zZZoDI#$!7AFxwc{OyfWoG++_Bs0NRr8u%1__&N5(UoaVOU~lZ5Xv{G5p&Fiwx8o|z
z#U|{9AL3LziF!@~CkuJLnaM#tCz{cNH*pij(0U9uA<r^9(7_f|M_$B%co;SEc1*=D
zu|Hl#-5=e@7@lc*T9dH{^-LVV^Gy~9ci<G%Oe{r>unLoKD{5q|I1bxU559)OF^-Eg
z1KFsKmf#3nh9%gHTB`3+GwRS=ErkbN+Aygc6yj)X#cCXn4)dsv6eFihIch1YQ61Qe
z8u1ZS$4{U}b{f@zuaRe(KXC>o@YDh<Lr$3&`Z537bZ>BCFov)gFJK<}m`62Oj;xBQ
zKy|npxx_T0M%;pNco@}@w^4iO1MA1Ak%z3GA^X{M^k@Ec!#R851=QMJwq8fw_>VPu
zKx8fBQ0E6C8{DMY`bg_&RJ-F)BP~J=qy#n4GSrgRyBw&Y1E?DgA^%JpKeTy{qegbh
z`jxd4wOKEsI&jt2yHNKztdH*VqGloqHLzsV3=T)lpqs}58`aE4^>hhpt=HNMcA(bq
zReSy@YRyBa5u8Vj$iqfS!4aq>nS>h9eAMn=gz7*Qs)Oqyx@IE>8i|W_QS4S6P5p0P
z3EhxIs~SN*j>2M8!`0S$+)lj_)lM`UO21D)b-W+y?Z`y6I~&#RW-QkG-^_s?a1u3T
z9Y|Z|EUM>!phoC0Y@PR^UZ*0=LO-%S%s$M+He?LuC!C92I1gvgi0Uun3cQ3Kz5nxv
z7!$y9)YM!-?atp(o8}g3jh(c}-spwuNCpnY$*475jvB}Y)cr2%t=WZY=KyLZ4kFvc
zgwWN9J2{|}<|68b9=zlnn!Y#@$03to>QN8gXY22vI`##sBj2GP|3b}7B_}nYy{Ns_
zg6e1+7GwKR=Koy|x;T-KZ_z#ZGwOzv;gKGXL3N-M*%qc2wZ^;A!B!lJFQFa~!ddt&
z=AbV<^1&)a?fTWIO}{POjqKtUPK@QmN2nROf?E3<sHuz@5vlh<)zeTN$U<G8YwHs*
zmilz-JdB}UhMK7g)O{;a?W}d}iAHNP>W1f0YqlRX6R%)29!2&1ebjD0fx5oK*1thr
z--){a8fr6M$9pl6ovU`HqdMfy;Xv>EVpPv+P(533-G<r|&)MG}M2+}OTYnGLfp%1b
z$L;yksO!$!^XF0R{A#_0%&=<`Gb2-*idwrY)P=>U56N8gVg+jCepJH^_IwlS!8`5w
z{iyf;kgW$%9Xy7bkq~<E6h`U&S7Td9DOp7{UA1HdQPDowNz`a};a>AVcLmpyi6ocI
zA?)A(m1b%hoIX5!FwHvh3<-}&qn)M-Wm3Qw*Vom{@npEpA7s|0IFD$*Yk@pOrH(X`
zZDbdjK^7CXez@p;(VkxvsfPb!o@tNuxtdFgh~5)h-0+7|m6hG6a5@=Jw2d~BO++tc
zEctJ_hsqS9#p*5#IoN6|JMiJ|Us$WKjBFs=wJ2Iq?bCFkU7*j?a-wo4$tGE<Q1+1f
z!bg1FQD1`jWER;>RMJQj(GF12XH2D>tR|0<YH~mE^Zf81S`hxSt3H_2lTk$FA)-&!
z-DEu(LsXt1L&;QCDEg|XJWd`YPm#OG8nT4c5WRoeqLoCYVt2&w&jI|LK)hr@_>3__
zuz?iVdI?S@6+~};26>eD$RnhXEF;g7!1?%Oa<fO}x~kw02`8e0YkHrF3KS*<oRu}f
zj-=PTp8T}2IR#_$0~=C&-N(U0DIO<wO-)^8O<nNy)Ze0l@xB<x@%sab!w%@iBg1mM
F{{rH+9R2_R

delta 3971
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

diff --git a/website/events/locale/nl/LC_MESSAGES/django.po b/website/events/locale/nl/LC_MESSAGES/django.po
index 360dc1c5..310d2856 100644
--- a/website/events/locale/nl/LC_MESSAGES/django.po
+++ b/website/events/locale/nl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-11 09:23+0200\n"
-"PO-Revision-Date: 2017-09-11 09:24+0200\n"
+"POT-Creation-Date: 2017-09-17 12:17+0200\n"
+"PO-Revision-Date: 2017-09-17 12:17+0200\n"
 "Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -429,7 +429,23 @@ msgid "Not registered for this event"
 msgstr "Niet aangemeld voor dit evenement."
 
 #: templates/events/email.txt:1
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "Hi %(name)s,\n"
+#| "\n"
+#| "You registered for the event '%(event_title)s' on %(registration_date)s "
+#| "and unfortunately you were placed on the waiting list.\n"
+#| "However someone just unregistered and we would like to let you know that "
+#| "you'll be able to attend now!\n"
+#| "\n"
+#| "You can find more information about the event on the website: "
+#| "%(event_url)s\n"
+#| "\n"
+#| "We're assuming that you'll be there, but you're still able to unregister "
+#| "until %(cancel_deadline)s.\n"
+#| "\n"
+#| "Best regards,\n"
+#| "Study Association Thalia"
 msgid ""
 "Hi %(name)s,\n"
 "\n"
@@ -438,7 +454,8 @@ msgid ""
 "However someone just unregistered and we would like to let you know that "
 "you'll be able to attend now!\n"
 "\n"
-"You can find more information about the event on the website: %(event_url)s\n"
+"You can find more information about the event on the website: %(baseurl)s"
+"%(event_url)s\n"
 "\n"
 "We're assuming that you'll be there, but you're still able to unregister "
 "until %(cancel_deadline)s.\n"
@@ -611,7 +628,7 @@ msgctxt "registration status"
 msgid "registered"
 msgstr "aangemeld"
 
-#: views.py:101 views.py:136
+#: views.py:101 views.py:141
 msgctxt "registration status"
 msgid "late cancellation"
 msgstr "te laat afgemeld"
@@ -626,36 +643,48 @@ msgctxt "registration status"
 msgid "waiting"
 msgstr "wachtend"
 
-#: views.py:112 views.py:123
+#: views.py:112
 msgid "Yes"
 msgstr "Ja"
 
-#: views.py:238
+#: views.py:124
+msgid "Cash"
+msgstr "Contant"
+
+#: views.py:126
+msgid "Pin"
+msgstr "Pin"
+
+#: views.py:128
+msgid "No"
+msgstr "Nee"
+
+#: views.py:246
 msgid "[THALIA] Notification about your registration for '{}'"
 msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’"
 
-#: views.py:283 views.py:294 views.py:307
+#: views.py:291 views.py:302 views.py:315
 msgid "Registration successful."
 msgstr "Je aanmelding was succesvol."
 
-#: views.py:289
+#: views.py:297
 msgid ""
 "You cannot re-register anymore since you've cancelled after the deadline."
 msgstr ""
 "Je kunt je niet opnieuw aanmelden omdat je je hebt afgemeld na de deadline."
 
-#: views.py:302
+#: views.py:310
 msgid "You may not register"
 msgstr "Je mag niet je aanmelden"
 
-#: views.py:310
+#: views.py:318
 msgid "You were already registered."
 msgstr "Je bent al aangemeld."
 
-#: views.py:319 views.py:327
+#: views.py:327 views.py:335
 msgid "You are not registered for this event."
 msgstr "Je bent niet aangemeld voor dit evenement."
 
-#: views.py:339
+#: views.py:347
 msgid "Registration successfully cancelled."
 msgstr "Je afmelding was succesvol."
diff --git a/website/events/views.py b/website/events/views.py
index 4c4c9400..874e8dbc 100644
--- a/website/events/views.py
+++ b/website/events/views.py
@@ -120,10 +120,12 @@ def export(request, event_id):
             'date cancelled': cancelled,
         }
         if event.price > 0:
-            if (registration.payment != 'no_payment'):
-                data['paid'] = _('Yes')
+            if (registration.payment == 'cash_payment'):
+                data['paid'] = _('Cash')
+            elif (registration.payment == 'pin_payment'):
+                data['paid'] = _('Pin')
             else:
-                data['paid'] = ''
+                data['paid'] = _('No')
 
         data.update({field['field'].name: field['value'] for field in
                      registration.registration_information()})
-- 
GitLab


From c4875180c53657ea786f5f5391f8b16c6dd6019c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= <se_bastiaan@outlook.com>
Date: Sun, 17 Sep 2017 15:52:21 +0200
Subject: [PATCH 3/3] Fix fuzzy translation and redundant parentheses

---
 .../events/locale/nl/LC_MESSAGES/django.mo    | Bin 10448 -> 11328 bytes
 .../events/locale/nl/LC_MESSAGES/django.po    |  26 ++++--------------
 website/events/views.py                       |   4 +--
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/website/events/locale/nl/LC_MESSAGES/django.mo b/website/events/locale/nl/LC_MESSAGES/django.mo
index d1ab4052a896e493e1da0c0e2d084d90728ebfee..222caebe4690edea8c51fe6d176fd907c50bdbba 100644
GIT binary patch
delta 4050
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
X8t5h1Fi5MAw)IshrDGQs{4VitY{OUm

delta 3177
zcmY+^drXyO0LSsi!$A;FDw-Eklw({>xk)I6fFznXR3suaNGb7xM~JJJjF-GX=A}}w
zi)}jps9Y^uRDVRy9HF&_-Bwm^Ep2YPw7GI_Sz6!Ud7rc8Gk<*E=kdJH``q65ld`WC
zJ3kNgb{fiVGKOsP8gm>kNAibqaiB37cnQ@s#^;)VNz_xZKbGP!tiYXEhje9bqVDtD
zVa#wGhzaP&RAU@7n+yG*8FSG=b$ATb!KdiQ&oK&r!x+4dLvY9-W9~*js^eLBC$7aQ
z*ouSkL!5;tQP1(wn8WkUJT97OXvYY=iJLH--ovpKd6sEI4|bpi@)C~1!>E~eV=R7&
zBk&69es8ofJkvy3V=#>R1RTlpO)?jE;Y`#@EJMw3H4eossF`(QCU&D9d==wy06)?S
zq@o5|jET4$i?JQGRX?Ft)Wc}C6%pvrhl%AP2h*?<12_#mtfK~!hcuZo)K&yg1K5L_
z@f)at_o8NY8a04#kY}2|a4!0IYBrW4P3FbntiKN3>oknT9?Zk@I2HY@qdF`@cEyyV
z1{^?sVp>o$?!W<f7&VZ$QD^7_>&K{>_gFte&a>$o!TRflAMFp%qxSZa^&0BNf34n;
z?p_W+wU0s$xQVs(iPkh!znQ3+=AtH2jGAaEYD=3OF4WNh)D4G_f942(ba+mnW_HT@
zwe>9OuwFn7;EJu^K;7qIe{^3YY9)rECKiKQ!FbdPI#apepqfI|NGni#U2lKThT6l|
zZ2M8vp7)?;a1J%22oB0<Ohj$T4Ag{*P^W(hY5=QI18i`0%tkIW69*gnaau8r`air9
zx*?ffHG?cn!8}yQ0c#U(r{03<$IF4z|NBq_AC7uECZPH)MD@EF^Ys3=bD;;EL@ik#
z(w8}d8u_278G4wu+Wn~4DHoHm3OOETFHXfH$Q;ZsxDapPBAiPns=tD(@FGU&{Vy74
z%swnbEzM=r>HGtAXl|kQ*c0cTjlrmaB;j~0K<(*D)I>I*?srgc%}!K52T&_<5IH8M
z2OZ7$EEf#YTtM9r#!Jqn8HV|oi7bL?LOpn|t-pgB*cYgQ{D4*XH)>@nY1D-Fpw3nY
zYM@6j54*>+{_k>egN7`8i{Z&%Q8$c^cSoF#8bAqhEKD70k9VO5J8>eujCw#1&d2XC
z1N{l^2de~i>erzT{niA>J;fa~Os3%@)QVh2?frGsQidnG^=MQ*4mE&e)bFR*`gH71
zeU5bzhEp#^tyDSczBQ<R>K)tAVr@s=@B(Vj_M=wfRrKOf)X3jQo%UYT@B3{1Th#B*
zqVB(nI*ixwejLQfRX=l319BE{q4#|$YGgI2k*&9GMV*P~?f)M{&G=1Qe-AZ)Zd8XS
zZ2M`{@6OovbEtlPx86cl*fE19xJw(0+Ph@b5A#qTl7$$F<*1ogp*n81?X9Q>@38Ir
zQSbdBTkk>*@EB@EdN2}CVL!e9>g*X(Le>&3R~=bJRCEq@5Oo?V+-n{RRj{7qlPP2Y
z;r!lK+No)B`tb0<G!5igqUQ%^J6jdX442#f>Q#BlwrsO5!$m}=U)vQyR2oSO*-Cbj
zxnwEfMF<wXJ$eI{xK*R`XXe?8zFrGSF41cfDrxp&O{f9qkZDARY9rZ1^osT;|1bAZ
znMt&Dq4Ee9Til9c+PHWu^gq_sSV}gK?L_;lQ=33^CiJmdNmTA3sU%qy%5L&N@QQCe
z>bp=x=9A4tC62U`u;BW0p|6@s8CgeGkN|m*RFO=gqVK%6Y%FOaDMaN_q7T=-WIahI
zDo>K}WR@xvePdLr$;0GnbvB9Ak_u8o^g4!<N}{sMCHQwFf2Wg3vN+gc%s6Z&*|uJc
z1*DwlTaZMaAb#>V$sx<hb7Wt%FQzNn*X!vzI>a~7n~^;^Yv1wF@ddh=l%A2E9#vS`
z(3nzEUs=--sBEmQ&yJf{TiehWSG=aWrmDFrup%y}S`GQZzxAQk)S5uoq%p_Bx~l!(
GNBsx!(;wFW

diff --git a/website/events/locale/nl/LC_MESSAGES/django.po b/website/events/locale/nl/LC_MESSAGES/django.po
index 310d2856..f31d884e 100644
--- a/website/events/locale/nl/LC_MESSAGES/django.po
+++ b/website/events/locale/nl/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-17 12:17+0200\n"
-"PO-Revision-Date: 2017-09-17 12:17+0200\n"
-"Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
+"POT-Creation-Date: 2017-09-17 15:50+0200\n"
+"PO-Revision-Date: 2017-09-17 15:51+0200\n"
+"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -429,23 +429,7 @@ msgid "Not registered for this event"
 msgstr "Niet aangemeld voor dit evenement."
 
 #: templates/events/email.txt:1
-#, fuzzy, python-format
-#| msgid ""
-#| "Hi %(name)s,\n"
-#| "\n"
-#| "You registered for the event '%(event_title)s' on %(registration_date)s "
-#| "and unfortunately you were placed on the waiting list.\n"
-#| "However someone just unregistered and we would like to let you know that "
-#| "you'll be able to attend now!\n"
-#| "\n"
-#| "You can find more information about the event on the website: "
-#| "%(event_url)s\n"
-#| "\n"
-#| "We're assuming that you'll be there, but you're still able to unregister "
-#| "until %(cancel_deadline)s.\n"
-#| "\n"
-#| "Best regards,\n"
-#| "Study Association Thalia"
+#, python-format
 msgid ""
 "Hi %(name)s,\n"
 "\n"
@@ -469,7 +453,7 @@ msgstr ""
 "'%(event_title)s’. Toen kwam je op de wachtlijst terecht, maar inmiddels is "
 "er plaats!\n"
 "\n"
-"Je kunt het evenement terugvinden op de website: %(event_url)s\n"
+"Je kunt het evenement terugvinden op de website: %(baseurl)s%(event_url)s\n"
 "\n"
 "We gaan ervan uit dat je erbij bent, maar tot %(cancel_deadline)s kan je je "
 "nog afmelden.\n"
diff --git a/website/events/views.py b/website/events/views.py
index 874e8dbc..72693966 100644
--- a/website/events/views.py
+++ b/website/events/views.py
@@ -120,9 +120,9 @@ def export(request, event_id):
             'date cancelled': cancelled,
         }
         if event.price > 0:
-            if (registration.payment == 'cash_payment'):
+            if registration.payment == 'cash_payment':
                 data['paid'] = _('Cash')
-            elif (registration.payment == 'pin_payment'):
+            elif registration.payment == 'pin_payment':
                 data['paid'] = _('Pin')
             else:
                 data['paid'] = _('No')
-- 
GitLab