| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/donationinterface.php |
| — | — | @@ -621,6 +621,7 @@ |
| 622 | 622 | 'donate_interface-donor-country', |
| 623 | 623 | 'donate_interface-donor-emailAdd', |
| 624 | 624 | 'donate_interface-state-province', |
| | 625 | + 'donate_interface-cvv-explain', |
| 625 | 626 | ) |
| 626 | 627 | ); |
| 627 | 628 | |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt.html |
| — | — | @@ -102,7 +102,6 @@ |
| 103 | 103 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 104 | 104 | <!-- new required fields --> |
| 105 | 105 | <input type="hidden" value="@gateway" name="gateway"/> |
| 106 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 107 | 106 | <!-- required fields for bt and dd --> |
| 108 | 107 | <input type="hidden" value="bt" name="payment_method"/> |
| 109 | 108 | <input type="hidden" value="bt" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-CA.html |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | |
| 77 | 77 | <input type="hidden" value="@amount" name="amount" /> |
| 78 | 78 | <input type="hidden" value="CA" name="country" id="country" /> |
| 79 | | - <input type="hidden" value="@currency_code" name="currency_code" /> |
| | 79 | + <input type="hidden" value="CAD" name="currency_code" /> |
| 80 | 80 | <input type="hidden" value="@utm_source" name="utm_source"/> |
| 81 | 81 | <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| 82 | 82 | <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| — | — | @@ -93,7 +93,6 @@ |
| 94 | 94 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 95 | 95 | <!-- new required fields --> |
| 96 | 96 | <input type="hidden" value="@gateway" name="gateway"/> |
| 97 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 98 | 97 | <!-- required fields for bt and dd --> |
| 99 | 98 | <input type="hidden" value="bt" name="payment_method"/> |
| 100 | 99 | <input type="hidden" value="bt" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-AU.html |
| — | — | @@ -0,0 +1,139 @@ |
| | 2 | +<script type="text/javascript"> |
| | 3 | + mw.loader.load('gc.form.rapidhtml.webitects.bt'); |
| | 4 | + // these must go through RapidHTML and thus are inline |
| | 5 | + var amountErrors = ["#general|escape",'#retryMsg|escape','#amount|escape']; |
| | 6 | + var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape']; |
| | 7 | + var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape']; |
| | 8 | + var actionURL = "@action"; |
| | 9 | + var scriptPath = "@script_path"; |
| | 10 | +</script> |
| | 11 | +<!--[if lt IE 7]> |
| | 12 | +<script type="text/javascript"> |
| | 13 | + mw.loader.load('gc.form.rapidhtml.webitects.ie6'); |
| | 14 | +</script> |
| | 15 | +<style type="text/css"> |
| | 16 | + body{ |
| | 17 | + behavior: url("@script_path/skins/vector/csshover.min.htc"); |
| | 18 | + } |
| | 19 | +</style><![endif]--> |
| | 20 | +<!--[if IE 7]> |
| | 21 | +<style> |
| | 22 | + .gainlayout { |
| | 23 | + zoom: 1; |
| | 24 | + height: 1%; |
| | 25 | + } |
| | 26 | +</style> |
| | 27 | +<![endif]--> |
| | 28 | + |
| | 29 | +<div class="ltr"> |
| | 30 | + <table id="layouttable"> |
| | 31 | + <tr> |
| | 32 | + <td> |
| | 33 | + <div id="appeal"> |
| | 34 | + <div id="appeal-content"> |
| | 35 | + <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal/title|@language}}</span></h2> |
| | 36 | + <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal/text|@language}}</div> |
| | 37 | + </div> |
| | 38 | + </div> |
| | 39 | + </td> |
| | 40 | + <td> |
| | 41 | + <div id="donate"> |
| | 42 | + <div id="donate-content"> |
| | 43 | + <div id="donate-body" style="padding: 0 1em;"> |
| | 44 | + <form method="post" name="paypalcontribution"> |
| | 45 | + <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">@amount @currency_code</span></h3></div> |
| | 46 | + <div id="amtErrorMessages" class="small"></div> |
| | 47 | + <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> |
| | 48 | + <div id="step2wrapper"> |
| | 49 | + <div id="billing-content" class="gainlayout"> |
| | 50 | + <div id="billingErrorMessages" class="small"></div> |
| | 51 | + <div id="paymentErrorMessages" class="small"></div> |
| | 52 | + <div class="name-fields"> |
| | 53 | + <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span> |
| | 54 | + <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span> |
| | 55 | + </div> |
| | 56 | + <div class="loc-fields"> |
| | 57 | + <!-- TODO: add locality to translation --> |
| | 58 | + <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span> |
| | 59 | + <span class="loc-city"><input class="txt" id="city" name="city" title="Locality" value="@city" placeholder="Locality"/></span> |
| | 60 | + <span class="loc-state"> |
| | 61 | + <select id="state" name="state" class="txt" value="@state" > |
| | 62 | + <option value="">%donate_interface-donor-state%</option> |
| | 63 | + <option value="ACT">ACT</option> |
| | 64 | + <option value="JBT">JBT</option> |
| | 65 | + <option value="NSW">NSW</option> |
| | 66 | + <option value="NT">NT</option> |
| | 67 | + <option value="QLD">QLD</option> |
| | 68 | + <option value="SA">SA</option> |
| | 69 | + <option value="TAS">TAS</option> |
| | 70 | + <option value="VIC">VIC</option> |
| | 71 | + <option value="WA">WA</option> |
| | 72 | + </select> |
| | 73 | + </span> |
| | 74 | + <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span> |
| | 75 | + </div> |
| | 76 | + <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p> |
| | 77 | + <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 78 | + </div> |
| | 79 | + </div> |
| | 80 | + |
| | 81 | + |
| | 82 | + |
| | 83 | + <input type="hidden" name="returnto" value="Thank_You/en" /> |
| | 84 | + <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect"> |
| | 85 | + |
| | 86 | + <input type="hidden" value="@amount" name="amount" /> |
| | 87 | + <input type="hidden" value="AU" name="country" id="country" /> |
| | 88 | + <input type="hidden" value="AUD" name="currency_code" /> |
| | 89 | + <input type="hidden" value="@utm_source" name="utm_source"/> |
| | 90 | + <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| | 91 | + <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| | 92 | + <input type="hidden" value="@language" name="language"/> |
| | 93 | + <input type="hidden" value="@referrer" name="referrer"/> |
| | 94 | + <input type="hidden" value="@comment" name="comment"/> |
| | 95 | + <input type="hidden" value="@comment-option" name="comment-option"/> |
| | 96 | + <input type="hidden" value="1" name="email-opt"/> |
| | 97 | + <input type="hidden" value="@token" name="token"/> |
| | 98 | + <input type="hidden" value="@order_id" name="order_id"/> |
| | 99 | + <input type="hidden" value="@numAttempt" name="numAttempt"/> |
| | 100 | + <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/> |
| | 101 | + <input type="hidden" value="@data_hash" name="data_hash"/> |
| | 102 | + <input type="hidden" value="@owa_session" name="owa_session"/> |
| | 103 | + <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| | 104 | + <!-- new required fields --> |
| | 105 | + <input type="hidden" value="@gateway" name="gateway"/> |
| | 106 | + <!-- required fields for bt and dd --> |
| | 107 | + <input type="hidden" value="bt" name="payment_method"/> |
| | 108 | + <input type="hidden" value="bt" name="payment_submethod"/> |
| | 109 | + </form> |
| | 110 | + <div id="where-content"> |
| | 111 | + {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}} |
| | 112 | + </div> |
| | 113 | + </div> |
| | 114 | + </div> |
| | 115 | + <p id="informationsharing">%donate_interface-informationsharing|url%</p> |
| | 116 | + <table> |
| | 117 | + <tr> |
| | 118 | + <td> |
| | 119 | + <ul id="moreinfolinks"> |
| | 120 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li> |
| | 121 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li> |
| | 122 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li> |
| | 123 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li> |
| | 124 | + </ul> |
| | 125 | + </td> |
| | 126 | + <td>@verisign_logo</td> |
| | 127 | + </tr> |
| | 128 | + </table> |
| | 129 | + </div> |
| | 130 | + </td> |
| | 131 | + </tr> |
| | 132 | + </table> |
| | 133 | + |
| | 134 | + |
| | 135 | + |
| | 136 | +</div> |
| | 137 | + |
| | 138 | +<!-- Wikimedia Project logo |
| | 139 | +<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li> |
| | 140 | + --> |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-AU.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 141 | + native |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-US.html |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | |
| 77 | 77 | <input type="hidden" value="@amount" name="amount" /> |
| 78 | 78 | <input type="hidden" value="US" name="country" id="country" /> |
| 79 | | - <input type="hidden" value="@currency_code" name="currency_code" /> |
| | 79 | + <input type="hidden" value="USD" name="currency_code" /> |
| 80 | 80 | <input type="hidden" value="@utm_source" name="utm_source"/> |
| 81 | 81 | <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| 82 | 82 | <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| — | — | @@ -93,7 +93,6 @@ |
| 94 | 94 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 95 | 95 | <!-- new required fields --> |
| 96 | 96 | <input type="hidden" value="@gateway" name="gateway"/> |
| 97 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 98 | 97 | <!-- required fields for bt and dd --> |
| 99 | 98 | <input type="hidden" value="bt" name="payment_method"/> |
| 100 | 99 | <input type="hidden" value="bt" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html |
| — | — | @@ -120,7 +120,6 @@ |
| 121 | 121 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 122 | 122 | <!-- new required fields --> |
| 123 | 123 | <input type="hidden" value="@gateway" name="gateway"/> |
| 124 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 125 | 124 | <!-- required fields for bt and dd --> |
| 126 | 125 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 127 | 126 | <input type="hidden" value="rtbt_sofortuberweisung" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | |
| 101 | 101 | <div id="bt-continue" style="margin-top: 15px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div> |
| 102 | 102 | </td><td> |
| 103 | | - <img style="margin-left: 25px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/eps-logo-square.gif" alt="eps"> |
| | 103 | + <img style="margin-left: 5px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/eps-logo-square.gif" alt="eps"> |
| 104 | 104 | </td></tr> |
| 105 | 105 | </table> |
| 106 | 106 | </div> |
| — | — | @@ -129,7 +129,6 @@ |
| 130 | 130 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 131 | 131 | <!-- new required fields --> |
| 132 | 132 | <input type="hidden" value="@gateway" name="gateway"/> |
| 133 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 134 | 133 | <!-- required fields for bt and dd --> |
| 135 | 134 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 136 | 135 | <input type="hidden" value="rtbt_eps" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html |
| — | — | @@ -120,7 +120,6 @@ |
| 121 | 121 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 122 | 122 | <!-- new required fields --> |
| 123 | 123 | <input type="hidden" value="@gateway" name="gateway"/> |
| 124 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 125 | 124 | <!-- required fields for bt and dd --> |
| 126 | 125 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 127 | 126 | <input type="hidden" value="rtbt_sofortuberweisung" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html |
| — | — | @@ -109,7 +109,6 @@ |
| 110 | 110 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 111 | 111 | <!-- new required fields --> |
| 112 | 112 | <input type="hidden" value="@gateway" name="gateway"/> |
| 113 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 114 | 113 | <!-- required fields for bt and dd --> |
| 115 | 114 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 116 | 115 | <input type="hidden" value="rtbt_enets" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html |
| — | — | @@ -133,7 +133,6 @@ |
| 134 | 134 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 135 | 135 | <!-- new required fields --> |
| 136 | 136 | <input type="hidden" value="@gateway" name="gateway"/> |
| 137 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 138 | 137 | <!-- required fields for bt and dd --> |
| 139 | 138 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 140 | 139 | <input type="hidden" value="rtbt_ideal" name="payment_submethod"/> |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html |
| — | — | @@ -123,7 +123,6 @@ |
| 124 | 124 | <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| 125 | 125 | <!-- new required fields --> |
| 126 | 126 | <input type="hidden" value="@gateway" name="gateway"/> |
| 127 | | - <input type="hidden" value="@payment_method" name="payment_method"/> |
| 128 | 127 | <!-- required fields for bt and dd --> |
| 129 | 128 | <input type="hidden" value="rtbt" name="payment_method"/> |
| 130 | 129 | <input type="hidden" value="rtbt_ideal" name="payment_submethod"/> |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 131 | 130 | + native |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/modules/validate_input.js |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | |
| 215 | 215 | window.PopupCVV = function() { |
| 216 | 216 | cvv = window.open("", 'cvvhelp','scrollbars=yes,resizable=yes,width=600,height=400,left=200,top=100'); |
| 217 | | - cvv.document.write( payflowproGatewayCVVExplain ); |
| | 217 | + cvv.document.write( mw.msg( 'donate_interface-cvv-explain' ) ); |
| 218 | 218 | cvv.focus(); |
| 219 | 219 | }; |
| 220 | 220 | |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| — | — | @@ -324,6 +324,7 @@ |
| 325 | 325 | 'donate_interface-donation-tshirt' => 'Donation (t-shirt offer)', |
| 326 | 326 | 'donate_interface-change' => 'Change', |
| 327 | 327 | 'donate_interface-select-credit-card' => 'Select credit card', |
| | 328 | + 'donate_interface-optional' => 'optional', |
| 328 | 329 | |
| 329 | 330 | // For more USA states, see us-states.i18n.php. |
| 330 | 331 | 'donate_interface-state-dropdown-YY' => 'Select a state', |
| — | — | @@ -768,6 +769,7 @@ |
| 769 | 770 | 'donate_interface-monthlybox-bottom' => 'Message in the bottom of the monthly donation box ensuring donors that their donation will be processed securely.', |
| 770 | 771 | 'donate_interface-securelogo-title' => "Link 'title' that is shown to donors when they hover over the Verisign secure site logo that appears on donation forms", |
| 771 | 772 | 'donate_interface-secureLogo-text' => 'Text shown to donors for a link explaining more about SSL secure site certificates', |
| | 773 | + 'donate_interface-optional' => 'used to mark a field that is not required to be filled out', |
| 772 | 774 | ); |
| 773 | 775 | |
| 774 | 776 | /** Magyar (magázó) (Magyar (magázó)) |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 775 | 777 | Merged /trunk/extensions/DonationInterface/gateway_common/interface.i18n.php:r102921-102923,102926-102928 |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 776 | 778 | Merged /trunk/extensions/DonationInterface:r102878,102915,102921-102923,102926-102928 |