From: Antoine Beaubien <antoine@beaubien.qc.ca>
Date: Fri, 5 Jan 2018 02:01:30 +0000 (-0500)
Subject: Merge branch 'master' into MÀJ-2018
X-Git-Url: https://git.wikimedia.ca/?p=paypal.git;a=commitdiff_plain;h=1ce80edc16e7f9a57ff8d5f7dc242e0335dbe601;hp=1e8915a4b187ffa16e6c98e8bfa0ca5ee2134544

Merge branch 'master' into MÀJ-2018
---

diff --git a/README.md b/README.md
index 1290281..595e3d8 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,9 @@ The purpose of this website is to provide an area outside the [www.wikimedia.ca]
 
 > **Note:** Dates are specified in [ISO 8601 date format](https://www.iso.org/iso-8601-date-and-time-format.html).
 
+### 2018-01-04
+* Change the form fields for 2018-2019
+
 ### 2017-10-30
 * Modify for new PayPal account (t@wm.ca)
 * Change the domain to paypal.wikimedia.ca
diff --git a/donate.html b/donate.html
index 9f052ce..0b16bbf 100644
--- a/donate.html
+++ b/donate.html
@@ -50,13 +50,13 @@
                 <ul class="flex-inner">
                   <li><div class="radio-item">
                       <input name="on0" type="hidden" value="Membership for">
-                      <input name="os0" id="2017" type="radio" value="2017" checked>
-                      <label for="2017">2017 membership <span class="break">($10.00 CAD)</span></label>
+                      <input name="os0" id="2018" type="radio" value="2018" checked>
+                      <label for="2018">2018 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="2018" type="radio" value="2017 and 2018">
-                      <label for="2018">2017 and 2018 membership <span class="break"> ($20.00 CAD)</span></label>
+                      <input name="os0" id="2018-2019" type="radio" value="2018 and 2019">
+                      <label for="2018-2019">2018 and 2019 membership <span class="break"> ($20.00 CAD)</span></label>
                     </div></li>
                   </ul>
                   </li>
diff --git a/donner.html b/donner.html
index 758e266..0a3debe 100644
--- a/donner.html
+++ b/donner.html
@@ -50,13 +50,13 @@
                 <ul class="flex-inner">
                   <li><div class="radio-item">
                       <input name="on0" type="hidden" value="Adhesion pour">
-                      <input name="os0" id="2017" type="radio" value="2017" checked>
-                      <label for="2017">Adhésion 2017 <span class="break">(10.00$ CAD)</span></label>
+                      <input name="os0" id="2018" type="radio" value="2018" checked>
+                      <label for="2018">Adhésion 2018 <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="2018" type="radio" value="2017 et 2018">
-                        <label for="2018">Adhésion 2017 et 2018 <span class="break"> (20.00$ CAD)</span></label>
+                        <input name="os0" id="2018-2019" type="radio" value="2018 et 2019">
+                        <label for="2018-2019">Adhésion 2018 et 2019 <span class="break"> (20.00$ CAD)</span></label>
                       </div></li>
                     </ul>
                   </li>