From: Pierre Choffet <peuc@wanadoo.fr>
Date: Mon, 1 Mar 2021 22:38:47 +0000 (-0500)
Subject: Fix membership forms
X-Git-Url: https://git.wikimedia.ca/?p=paypal.git;a=commitdiff_plain;h=ac334397b4af010fb5cfc59746130ef9ab5fa7b8;ds=sidebyside

Fix membership forms

Due to changes in Paypal hosted button, values modified upstream have been updated here.
French and english versions now use the same (english) form.
Yearly update of dates is a pure matter of display, now: it won't break anymore.
---

diff --git a/donate.html b/donate.html
index abd2668..c6c7e72 100644
--- a/donate.html
+++ b/donate.html
@@ -34,7 +34,7 @@
 							<input name="hosted_button_id" type="hidden" value="JKADVHJDS6RJC">
 							<ul class="flex-outer">
 								<li>
-									<input name="on1" aria-labelledby="mtype" type="hidden" value="New membership or renewal">
+									<input name="on1" aria-labelledby="mtype" type="hidden" value="PaiementType">
 									<label for="mtype">New membership<br/> or renewal:</span></label>
 									<select name="os1" id="mtype">
 										<option value="New membership">New membership</option>
@@ -45,16 +45,16 @@
 									<ul class="flex-inner">
 										<li>
 											<div class="radio-item">
-												<input name="on0" type="hidden" value="Membership for">
-												<input name="os0" id="2021" type="radio" value="2021" checked>
-												<label for="2021">2021 membership <span class="break">($10.00 CAD)</span></label>
+												<input name="on0" type="hidden" value="PaiementAnnees">
+												<input name="os0" id="an1" type="radio" value="Membership for current" checked>
+												<label for="an1">2021 membership <span class="break">($10.00 CAD)</span></label>
 											</div>
 										</li>
 										<li>
 											<div class="radio-item">
-												<input name="on0" type="hidden" value="Membership for">
-												<input name="os0" id="2021-2022" type="radio" value="2021 and 2022">
-												<label for="2021-2022">2021 and 2022 membership <span class="break"> ($20.00 CAD)</span></label>
+												<input name="on0" type="hidden" value="PaiementAnnees">
+												<input name="os0" id="an2" type="radio" value="Membership for current and next year">
+												<label for="an2">2021 and 2022 membership <span class="break"> ($20.00 CAD)</span></label>
 											</div>
 										</li>
 									</ul>
diff --git a/donner.html b/donner.html
index 73921da..53157bd 100644
--- a/donner.html
+++ b/donner.html
@@ -31,41 +31,41 @@
 
 						<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 							<input name="cmd" type="hidden" value="_s-xclick">
-							<input name="hosted_button_id" type="hidden" value="D3HSWCRN6C2WN">
+							<input name="hosted_button_id" type="hidden" value="JKADVHJDS6RJC">
 							<ul class="flex-outer">
 								<li>
-									<input name="on1" aria-labelledby="mtype" type="hidden" value="Nouveau membre ou renouvellement">
+									<input name="on1" aria-labelledby="mtype" type="hidden" value="PaiementType">
 									<label for="mtype">Nouveau membre ou renouvellement&nbsp;:</label>
 									<select name="os1" id="mtype">
-										<option value="Nouveau membre">Nouveau membre</option>
-										<option value="Renouvellement">Renouvellement</option>
+										<option value="New membership">Nouveau membre</option>
+										<option value="Renewal of membership">Renouvellement</option>
 									</select>
 								</li>
 								<li><p>Année d'adhésion&nbsp;:</p>
 									<ul class="flex-inner">
 										<li>
 											<div class="radio-item">
-												<input name="on0" type="hidden" value="Adhesion pour">
-												<input name="os0" id="2021" type="radio" value="2021" checked>
-												<label for="2021">Adhésion 2021 <span class="break">(10.00$ CAD)</span></label>
+												<input name="on0" type="hidden" value="PaiementAnnees">
+												<input name="os0" id="an1" type="radio" value="Membership for current" checked>
+												<label for="an1">Adhésion 2021 <span class="break">(10.00$ CAD)</span></label>
 											</div>
 										</li>
 										<li>
 											<div class="radio-item">
-												<input name="on0" type="hidden" value="Adhesion pour">
-												<input name="os0" id="2021-2022" type="radio" value="2021 et 2022">
-												<label for="2021-2022">Adhésion 2021 et 2022 <span class="break"> (20.00$ CAD)</span></label>
+												<input name="on0" type="hidden" value="PaiementAnnees">
+												<input name="os0" id="an2" type="radio" value="Membership for current and next year">
+												<label for="an2">Adhésion 2021 et 2022 <span class="break"> (20.00$ CAD)</span></label>
 											</div>
 										</li>
 									</ul>
 								</li>
 								<li>
-									<input name="on2" type="hidden" value="Nom reel complet">
+									<input name="on2" type="hidden" value="Real full name">
 									<label for="rfname">Nom réel complet&nbsp;:</label>
 									<input placeholder="Entrez le nom réel" name="os2" id="rfname" aria-label="Nom réel complet" type="text">
 								</li>
 								<li>
-									<input name="on3" type="hidden" value="Nom d'utilisateur Wikipedia">
+									<input name="on3" type="hidden" value="Wikipedia username">
 									<label for="wuname">Nom d'utilisateur Wikipedia&nbsp;:</label>
 									<input placeholder="Entrez votre nom d'utilisateur Wikipedia" name="os3" id="wuname" aria-label="Nom d'utilisateur Wikipedia" type="text">
 								</li>