r79148 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79147‎ | r79148 | r79149 >
Date:01:37, 29 December 2010
Author:tomasz
Status:deferred
Tags:
Comment:
Merge up to head of trunk from r77614. Picking up more premiums changes
Modified paths:
  • /branches/fundraising/deployment/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php (added) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css (added) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg (added) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css
@@ -0,0 +1,109 @@
 2+.payflow-cc-form-section {
 3+ float: none;
 4+ margin-right: 0em;
 5+ margin-bottom: 1em;
 6+}
 7+
 8+#payflowpro_gateway-cc_form_container {
 9+ width: 100%;
 10+}
 11+
 12+#payflowpro_gateway-cc_form_form {
 13+ width: 475px;
 14+ float: right;
 15+ margin-left: 2em;
 16+ padding-left: 2em;
 17+ border-left: 1px solid #BBBBBB;
 18+}
 19+
 20+#payflowpro_gateway-cc_form_letter {
 21+ height: 100%;
 22+}
 23+
 24+#payflowpro_gateway-cc_form_letter p {
 25+ font-size: 1.125em;
 26+ margin-bottom: 1.2em;
 27+}
 28+
 29+#payflowpro_gateway-personal-info {
 30+ margin-right:0 !important;
 31+}
 32+
 33+#payflowpro_gateway-donate-addl-info-secure-logos {
 34+ float: left;
 35+ margin-right: 2em;
 36+}
 37+
 38+#payflowpro_gateway-cc_form_letter_inside {
 39+ padding-top: .5em;
 40+}
 41+
 42+#payflowpro_gateway-cc_otherways {
 43+ padding-top: .5em;
 44+ display: block;
 45+}
 46+#payflowpro_gateway-donate-addl-info {
 47+ margin-top:3em !important;
 48+ margin-bottom:1em !important;
 49+}
 50+
 51+#appeal {
 52+ background-color:transparent;
 53+ border-color:transparent;
 54+ border-style:solid;
 55+ border-width:1px 0 1px 1px;
 56+ padding:16px 24px 24px;
 57+}
 58+#appeal-head {
 59+ font-size:1.5em;
 60+ line-height:1.125em;
 61+ padding-bottom:0.5em;
 62+ padding-top:0.125em;
 63+}
 64+#appeal-body {
 65+ font-size:1.125em;
 66+ margin-bottom:1em;
 67+ padding:0.2em 0;
 68+}
 69+#donate {
 70+ background-color:#ddd;
 71+ border:1px solid black;
 72+ padding:16px 24px 24px;
 73+ width:400px;
 74+}
 75+#donate-head {
 76+ border-color:#aaa;
 77+ font-size:1.5em;
 78+ line-height:1.125em;
 79+ padding-bottom:0.5em;
 80+ padding-top:0.125em;
 81+}
 82+#donate-body {
 83+ font-size:1.125em;
 84+ margin-bottom:1em;
 85+}
 86+
 87+/* Move the form up */
 88+#mw-head-base {
 89+ height: 1em !important;
 90+}
 91+
 92+/* Hiding content border */
 93+table {
 94+ background-color: transparent;
 95+}
 96+div#content {
 97+ background-color: transparent !important;
 98+ background-image: none !important;
 99+}
 100+div#mw-head-base {
 101+ background-image: none !important;
 102+}
 103+#footer {
 104+ background-image: none !important;
 105+}
 106+
 107+/* Hiding stuff we don't need */
 108+h1#firstHeading, div#contentSub {
 109+ display: none;
 110+}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php
@@ -0,0 +1,157 @@
 2+<?php
 3+
 4+class PayflowProGateway_Form_TwoStepTwoColumnPremium extends PayflowProGateway_Form_TwoStepTwoColumn {
 5+ public function __construct( &$form_data, &$form_errors ) {
 6+ global $wgScriptPath;
 7+
 8+ // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
 9+ if ( !strlen( $this->getStylePath() ) ) {
 10+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css' );
 11+ }
 12+
 13+ parent::__construct( $form_data, $form_errors );
 14+ }
 15+
 16+ public function generateFormStart() {
 17+ global $wgOut, $wgRequest, $wgScriptPath;
 18+
 19+ $form = parent::generateBannerHeader();
 20+
 21+ $form .= Xml::openElement( 'table', array( 'width' => '100%', 'cellspacing' => 0, 'cellpadding' => 0, 'border' => 0 ) );
 22+ $form .= Xml::openElement( 'tr' );
 23+ $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
 24+
 25+ $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
 26+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
 27+ $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
 28+
 29+ $form .= Xml::closeElement( 'td' );
 30+
 31+ $form .= Xml::openElement( 'td', array( 'id' => 'donate', 'valign' => 'top' ) );
 32+
 33+ // add noscript tags for javascript disabled browsers
 34+ $form .= $this->getNoScript();
 35+
 36+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 37+
 38+ // provide a place at the top of the form for displaying general messages
 39+ if ( $this->form_errors['general'] ) {
 40+ $form .= Xml::openElement( 'div', array( 'id' => 'mw-payflow-general-error' ) );
 41+ if ( is_array( $this->form_errors['general'] ) ) {
 42+ foreach ( $this->form_errors['general'] as $this->form_errors_msg ) {
 43+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
 44+ }
 45+ } else {
 46+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
 47+ }
 48+ $form .= Xml::closeElement( 'div' ); // close div#mw-payflow-general-error
 49+ }
 50+
 51+ // Xml::element seems to convert html to htmlentities
 52+ $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
 53+ $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) );
 54+
 55+ $form .= $this->generateBillingContainer();
 56+ return $form;
 57+ }
 58+
 59+ public function generateFormEnd() {
 60+ $form = '';
 61+ $form .= $this->generateFormClose();
 62+ return $form;
 63+ }
 64+
 65+ protected function generateBillingContainer() {
 66+ $form = '';
 67+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) );
 68+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
 69+ $form .= $this->generateBillingFields();
 70+ $form .= Xml::closeElement( 'table' ); // close table#payflow-table-donor
 71+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-personal-info
 72+
 73+ return $form;
 74+ }
 75+
 76+ protected function generateBillingFields() {
 77+ global $wgScriptPath;
 78+
 79+ $form = '';
 80+
 81+ // name
 82+ $form .= $this->getNameField();
 83+
 84+ // email
 85+ $form .= $this->getEmailField();
 86+
 87+ // amount
 88+ $form .= '<tr>';
 89+ $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
 90+ $form .= '</tr>';
 91+ $form .= '<tr>';
 92+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 93+ $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
 94+ ' ' . $this->generateCurrencyDropdown() . '</td>';
 95+ $form .= '</tr>';
 96+
 97+ // card logos
 98+ if ( $this->form_data[ 'currency' ] == 'USD' ) {
 99+ $form .= '<tr id="four_cards" style="display:table-row;">';
 100+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 101+ $form .= '</tr>';
 102+ $form .= '<tr id="two_cards" style="display:none;">';
 103+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 104+ $form .= '</tr>';
 105+ } else {
 106+ $form .= '<tr id="four_cards" style="display:none;">';
 107+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 108+ $form .= '</tr>';
 109+ $form .= '<tr id="two_cards" style="display:table-row;">';
 110+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 111+ $form .= '</tr>';
 112+ }
 113+
 114+ // card number
 115+ $form .= $this->getCardNumberField();
 116+
 117+ // cvv
 118+ $form .= $this->getCvvField();
 119+
 120+ // expiry
 121+ $form .= $this->getExpiryField();
 122+
 123+ // street
 124+ $form .= $this->getStreetField();
 125+
 126+ // city
 127+ $form .= $this->getCityField();
 128+
 129+ // state
 130+ $form .= $this->getStateField();
 131+ // zip
 132+ $form .= $this->getZipField();
 133+
 134+ // country
 135+ $form .= $this->getCountryField();
 136+
 137+ return $form;
 138+ }
 139+
 140+ /**
 141+ * Generate form closing elements
 142+ */
 143+ public function generateFormClose() {
 144+ $form = '';
 145+ // add hidden fields
 146+ $hidden_fields = $this->getHiddenFields();
 147+ foreach ( $hidden_fields as $field => $value ) {
 148+ $form .= Html::hidden( $field, $value );
 149+ }
 150+
 151+ $form .= Xml::closeElement( 'form' ); // close form 'payment'
 152+ $form .= $this->generateDonationFooter();
 153+ $form .= Xml::closeElement( 'td' );
 154+ $form .= Xml::closeElement( 'tr' );
 155+ $form .= Xml::closeElement( 'table' );
 156+ return $form;
 157+ }
 158+}
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php
___________________________________________________________________
Added: svn:eol-style
1159 + native
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg
___________________________________________________________________
Added: svn:mime-type
2160 + application/octet-stream
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -202,6 +202,18 @@
203203 'payflowpro_gateway-language' => 'Language:',
204204 'payflowpro_gateway-front' => 'Front',
205205 'payflowpro_gateway-back' => 'Back',
 206+ 'payflowpro_gateway-front-of-shirt' => 'Front of shirt',
 207+ 'payflowpro_gateway-back-of-shirt' => 'Back of shirt',
 208+ 'payflowpro_gateway-select-a-size' => 'Please select a size.',
 209+ 'payflowpro_gateway-select' => 'Size:',
 210+ 'payflowpro_gateway-shipping-address' => 'Shipping address',
 211+ 'payflowpro_gateway-shipping-address-different' => 'My shipping address is different from my billing address.',
 212+ 'payflowpro_gateway-shipping-address-same' => 'Shipping address same as billing address.',
 213+ 'payflowpro_gateway-only-billing-address' => 'Shirts can only be shipped to your billing address.',
 214+ 'payflowpro_gateway-donation-must-equal' => 'Donation must equal $1 or more.',
 215+ 'payflowpro_gateway-thank-you' => 'Thank you! Your donation has been received.',
 216+ 'payflowpro_gateway-wikipedia-translation' => 'Please note: "Wikipedia" on the shirt sleeve will be the "Wikipedia 10" graphic, which is not translated.',
 217+ 'payflowpro_gateway-on-the-back' => 'With this on the back:',
206218
207219 // For more USA states, see payflowpro_gateway.us-states.i18n.php.
208220 'payflowpro_gateway-state-dropdown-YY' => 'Select a State',
@@ -312,6 +324,8 @@
313325 {{Identical|Language}}',
314326 'payflowpro_gateway-front' => 'This is a label for an image of the front of a shirt',
315327 'payflowpro_gateway-back' => 'This is a label for an image of the back of a shirt',
 328+ 'payflowpro_gateway-wikipedia-translation' => 'Do not translate the two phrases in quotes: "Wikipedia" and "Wikipedia 10"',
 329+ 'payflowpro_gateway-on-the-back' => 'Label for an image of the localized Wikipedia wordmark chosen by the donor',
316330 );
317331
318332 /** Magyar (magázó) (Magyar (magázó))
@@ -1911,7 +1925,7 @@
19121926 'payflowpro_gateway-donor-address' => 'Adreça:',
19131927 'payflowpro_gateway-donor-card' => 'Targeta de crèdit:',
19141928 'payflowpro_gateway-donor-card-num' => 'Número de targeta:',
1915 - 'payflowpro_gateway-donor-expiration' => 'Data expiració:',
 1929+ 'payflowpro_gateway-donor-expiration' => "Data d'expiració:",
19161930 'payflowpro_gateway-donor-security' => 'Codi de seguretat:',
19171931 'payflowpro_gateway-donor-submit' => 'Fes un donatiu',
19181932 'payflowpro_gateway-donor-currency-msg' => 'Aquest donatiu es fa en $1',
@@ -1977,9 +1991,9 @@
19781992 'payflowpro_gateway-make-your-donation' => 'Feu ara un donatiu',
19791993 'payflowpro_gateway-state-in-us' => 'si sou als EUA',
19801994 'payflowpro_gateway-comment' => 'Comentari',
1981 - 'payflowpro_gateway-first' => 'Primers',
 1995+ 'payflowpro_gateway-first' => 'Prenoms',
19821996 'payflowpro_gateway-middle' => 'Mig',
1983 - 'payflowpro_gateway-last' => 'Darrers',
 1997+ 'payflowpro_gateway-last' => 'Cognoms',
19841998 'payflowpro_gateway-other' => 'Altre',
19851999 'payflowpro_gateway-noscript-msg' => 'Sembla que no teniu el JavaScript activat, o que el vostre navegador no és compatible.
19862000 Per a proporcionar una experiència segura i agradable, el nostre formulari de donatius requereix JavaScript.',
@@ -2008,7 +2022,7 @@
20092023 'payflowpro_gateway-zip' => 'Codi Postal',
20102024 'payflowpro_gateway-zip-code' => 'Codi postal',
20112025 'payflowpro_gateway-zip-postal' => 'Codi Postal',
2012 - 'payflowpro_gateway-zip-postal-code' => 'Zip / Codi postal',
 2026+ 'payflowpro_gateway-zip-postal-code' => 'Codi postal / Zip',
20132027 'payflowpro_gateway-billing-code' => "Codi postal de l'adreça de facturació",
20142028 'payflowpro_gateway-country' => 'País/Estat',
20152029 'payflowpro_gateway-select-country' => 'Seleccioneu el país',
@@ -2064,6 +2078,12 @@
20652079 'payflowpro_gateway-description' => 'Descripció',
20662080 'payflowpro_gateway-donation' => 'Donatiu',
20672081 'payflowpro_gateway-email-receipt' => 'Adreça electrònica per al rebut',
 2082+ 'payflowpro_gateway-monthly-donation' => 'Feu un donatiu mensual',
 2083+ 'payflowpro_gateway-via-paypal' => '(via PayPal)',
 2084+ 'payflowpro_gateway-shirt-size' => 'Talla de la samarreta:',
 2085+ 'payflowpro_gateway-language' => 'Idioma:',
 2086+ 'payflowpro_gateway-front' => 'Davant',
 2087+ 'payflowpro_gateway-back' => 'Darrere',
20682088 'payflowpro_gateway-state-dropdown-YY' => 'Seleccioneu un estat',
20692089 'payflowpro_gateway-state-dropdown-XX' => 'No sóc als EUA',
20702090 );
@@ -2255,6 +2275,11 @@
22562276 'payflowpro_gateway-description' => 'Popis',
22572277 'payflowpro_gateway-donation' => 'Příspěvek',
22582278 'payflowpro_gateway-email-receipt' => 'E-mailové potvrzení na',
 2279+ 'payflowpro_gateway-via-paypal' => '(přes PayPal)',
 2280+ 'payflowpro_gateway-shirt-size' => 'Velikost trička:',
 2281+ 'payflowpro_gateway-language' => 'Jazyk:',
 2282+ 'payflowpro_gateway-front' => 'Zepředu',
 2283+ 'payflowpro_gateway-back' => 'Zezadu',
22592284 'payflowpro_gateway-state-dropdown-YY' => 'Vyberte stát',
22602285 'payflowpro_gateway-state-dropdown-XX' => 'Mimo USA',
22612286 );
@@ -4029,6 +4054,12 @@
40304055 'payflowpro_gateway-description' => 'Description',
40314056 'payflowpro_gateway-donation' => 'Don',
40324057 'payflowpro_gateway-email-receipt' => 'Envoyer le courriel de reçu à',
 4058+ 'payflowpro_gateway-monthly-donation' => 'Faire un don mensuel',
 4059+ 'payflowpro_gateway-via-paypal' => '(via PayPal)',
 4060+ 'payflowpro_gateway-shirt-size' => 'taille du T-shirt:',
 4061+ 'payflowpro_gateway-language' => 'Langue :',
 4062+ 'payflowpro_gateway-front' => 'Devant',
 4063+ 'payflowpro_gateway-back' => 'Derrière',
40334064 'payflowpro_gateway-state-dropdown-YY' => 'Choisir un pays',
40344065 'payflowpro_gateway-state-dropdown-XX' => 'Hors des États-Unis',
40354066 );
@@ -4803,6 +4834,7 @@
48044835 'payflowpro_gateway-question-comment' => 'Pitanja ili komentari? Kontaktirajte: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
48054836 'payflowpro_gateway-donate-click' => 'Vaša kreditna kartica biti će sigurno obrađena.',
48064837 'payflowpro_gateway-otherways' => 'Postoje <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">i drugi načini za pomoć, uključujući PayPal, ček ili poštom</a>.',
 4838+ 'payflowpro_gateway-otherways-alt' => 'Postoje <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">i drugi načini darovanja</a>, uključujući i novčane čekove.',
48074839 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Drugi načini za doniranje</a>',
48084840 'payflowpro_gateway-paypal' => 'Imate li PayPal račun? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donirajte putem PayPal-a</a>.',
48094841 'payflowpro_gateway-credit-storage-processing' => 'Mi ne pohranjujemo informacije o vašoj kreditnoj kartici, a vaši osobni podaci su zaštićeni našim <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">pravilima o privatnosti</a>.',
@@ -4850,9 +4882,14 @@
48514883 'payflowpro_gateway-confirm-email' => 'Potvrdite elektroničku poštu',
48524884 'payflowpro_gateway-phone' => 'Phone',
48534885 'payflowpro_gateway-telephone' => 'Telefon',
 4886+ 'payflowpro_gateway-telephone-home' => 'Tel. (kućni)',
 4887+ 'payflowpro_gateway-billing-phone-number' => 'Telefonski broj za račune',
48544888 'payflowpro_gateway-donation-information' => 'Informacija o darivatelju',
 4889+ 'payflowpro_gateway-cc-billing-information' => 'Podatci o kreditnoj kartici',
 4890+ 'payflowpro_gateway-pay-by-credit-card' => 'Plaćanje kreditnom karticom',
48554891 'payflowpro_gateway-which-card' => 'Koju karticu želite rabiti',
48564892 'payflowpro_gateway-choose-donation-method' => 'Odaberite način darivanja',
 4893+ 'payflowpro_gateway-cardholders-name' => 'Ime vlasnika kartice',
48574894 'payflowpro_gateway-name-on-card' => 'Ime na kartici',
48584895 'payflowpro_gateway-type-of-card' => 'Vrsta kartice',
48594896 'payflowpro_gateway-cards-accepted' => 'Kartice koje su prihvaćene',
@@ -4881,10 +4918,25 @@
48824919 'payflowpro_gateway-select-amount' => 'Odaberite iznos',
48834920 'payflowpro_gateway-amount' => 'Iznos',
48844921 'payflowpro_gateway-make-a-donation' => 'Darujte',
 4922+ 'payflowpro_gateway-enter-your-amount' => 'Ili unesite iznos u gornje polje',
 4923+ 'payflowpro_gateway-will-support-with-gift' => 'Želim podržati sa sljedećim iznosom:',
 4924+ 'payflowpro_gateway-will-make-tax-deductible-gift' => 'Želim darovati iznos oslobođen od poreza:',
 4925+ 'payflowpro_gateway-submit-my-secure-donation' => 'Pošalji moju sigurnu donaciju',
 4926+ 'payflowpro_gateway-next' => 'Sljedeće',
 4927+ 'payflowpro_gateway-continue' => 'Nastavi',
 4928+ 'payflowpro_gateway-cancel' => 'Odustani',
 4929+ 'payflowpro_gateway-payment' => 'Plaćanje',
48854930 'payflowpro_gateway-payment-type' => 'Način plaćanja',
 4931+ 'payflowpro_gateway-please-complete' => 'Molimo dovršite vaše darivanje ispod ...',
48864932 'payflowpro_gateway-description' => 'Opis',
 4933+ 'payflowpro_gateway-donation' => 'Darivanje',
 4934+ 'payflowpro_gateway-email-receipt' => 'E-mail potvrda za',
 4935+ 'payflowpro_gateway-monthly-donation' => 'Šalji mjesečnu donaciju',
48874936 'payflowpro_gateway-via-paypal' => '(putem PayPala)',
 4937+ 'payflowpro_gateway-shirt-size' => 'Veličina majice:',
48884938 'payflowpro_gateway-language' => 'Jezik:',
 4939+ 'payflowpro_gateway-front' => 'Prednja strana',
 4940+ 'payflowpro_gateway-back' => 'Stražnja strana',
48894941 'payflowpro_gateway-state-dropdown-YY' => 'Odaberite državu',
48904942 'payflowpro_gateway-state-dropdown-XX' => 'Izvan SAD-a',
48914943 );
@@ -5376,6 +5428,10 @@
53775429 'payflowpro_gateway-email-receipt' => 'Inviar quitantia in e-mail a',
53785430 'payflowpro_gateway-monthly-donation' => 'Facer un donation mensual',
53795431 'payflowpro_gateway-via-paypal' => '(via PayPal)',
 5432+ 'payflowpro_gateway-shirt-size' => 'Talia del T-shirt:',
 5433+ 'payflowpro_gateway-language' => 'Lingua:',
 5434+ 'payflowpro_gateway-front' => 'Fronte',
 5435+ 'payflowpro_gateway-back' => 'Dorso',
53805436 'payflowpro_gateway-state-dropdown-YY' => 'Selige un stato',
53815437 'payflowpro_gateway-state-dropdown-XX' => 'Extra le Statos Unite',
53825438 );
@@ -5927,6 +5983,8 @@
59285984 'payflowpro_gateway-donation' => '寄付',
59295985 'payflowpro_gateway-email-receipt' => '電子メール領収書の宛先:',
59305986 'payflowpro_gateway-language' => '言語:',
 5987+ 'payflowpro_gateway-front' => '前',
 5988+ 'payflowpro_gateway-back' => '後ろ',
59315989 'payflowpro_gateway-state-dropdown-YY' => '州を選択',
59325990 'payflowpro_gateway-state-dropdown-XX' => 'アメリカ合衆国以外',
59335991 );
@@ -7550,6 +7608,12 @@
75517609 'payflowpro_gateway-description' => 'Beschrijving',
75527610 'payflowpro_gateway-donation' => 'Donatie',
75537611 'payflowpro_gateway-email-receipt' => 'Ontvangstbevestiging e-mailen naar',
 7612+ 'payflowpro_gateway-monthly-donation' => 'Maandelijkse donatie maken',
 7613+ 'payflowpro_gateway-via-paypal' => '(via PayPal)',
 7614+ 'payflowpro_gateway-shirt-size' => 'T-shirtmaat:',
 7615+ 'payflowpro_gateway-language' => 'Taal:',
 7616+ 'payflowpro_gateway-front' => 'Voorzijde',
 7617+ 'payflowpro_gateway-back' => 'Achterzijde',
75547618 'payflowpro_gateway-state-dropdown-YY' => 'Selecteer een staat',
75557619 'payflowpro_gateway-state-dropdown-XX' => 'Buiten de VS',
75567620 );
@@ -10127,13 +10191,13 @@
1012810192 'payflowpro_gateway-response-114' => 'Tafadhali wasiliana na kampuni ya kadi yako ya malipo ili kupata maelezo zaidi.',
1012910193 'payflowpro_gateway-response-23' => 'Namba au tarehe ya kuisha kwa kadi yako ya malipo haipo sahihi.',
1013010194 'payflowpro_gateway-response-4' => 'Kiasi batili.',
10131 - 'payflowpro_gateway-response-24' => 'Ama namba ya kadi ya mkopo au tarehe yake ya kuishia haipo sahihi.',
10132 - 'payflowpro_gateway-response-112' => 'Ama anwani au namba yako ya CVV (kodi ya usalama) hayapo sahihi.',
 10195+ 'payflowpro_gateway-response-24' => 'Namba au tarehe ya kuisha kwa kadi yako ya malipo haipo sahihi.',
 10196+ 'payflowpro_gateway-response-112' => 'Anwani au namba ya CVV yako (kodi ya usalama) haipo sahihi.',
1013310197 'payflowpro_gateway-response-125' => 'Malipo yako yamekataliwa na Huduma za Kuzuia Ulaghai.',
10134 - 'payflowpro_gateway-response-125-2' => 'Kadi yako ya mkopo haikuweza kuidhinishwa. Tafadhali uhakikishe kwamba taarifa zote zilizotolewa zipo sawa na kadi, au jaribu kadi nyingine. Pia unaweza kuchangia kwa <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia nyingine</a> au unaweza kuwasiliana nasi hapo <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Asante kwa mchango wako.',
10135 - 'payflowpro_gateway-response-default' => 'Ilitokea hitilafu wakati wa kufanyika malipo.
10136 -Tafadhali jaribu baadaye tena.',
10137 - 'php-response-declined' => 'Malipo yako hayakubaliwa.',
 10198+ 'payflowpro_gateway-response-125-2' => 'Kadi yako ya malipo haikuweza kuidhinishwa. Tafadhali hakikisha kwamba taarifa zote zilizotolewa zipo sawa na maelezo ya kadi yako, au jaribu kadi nyingine. Pia unaweza kuchangia kwa <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia nyingine</a> au unaweza kuwasiliana nasi hapo <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Ahsante kwa mchango wako.',
 10199+ 'payflowpro_gateway-response-default' => 'Ilitokea hitilafu wakati wa kufanya malipo yako.
 10200+Tafadhali jaribu tena baadaye.',
 10201+ 'php-response-declined' => 'Malipo yako hayajakubaliwa.',
1013810202 'payflowpro_gateway-thankyou' => 'Ahsante kwa mchango wako!',
1013910203 'payflowpro_gateway-post-transaction' => 'Taarifa ya malipo',
1014010204 'payflowpro_gateway-submit-button' => 'Michango',
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
@@ -36,6 +36,7 @@
3737 $wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetterCA' ] = $dir . 'forms/TwoStepTwoColumnLetterCA.php';
3838 $wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter2' ] = $dir . 'forms/TwoStepTwoColumnLetter2.php';
3939 $wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter3' ] = $dir . 'forms/TwoStepTwoColumnLetter3.php';
 40+$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnPremium' ] = $dir . 'forms/TwoStepTwoColumnPremium.php';
4041 $wgAutoloadClasses[ 'PayflowProGateway_Form_RapidHtml' ] = $dir . 'forms/RapidHtml.php';
4142 $wgAutoloadClasses[ 'PayflowProGateway_Form_SingleColumn' ] = $dir . 'forms/SingleColumn.php';
4243 $wgExtensionMessagesFiles['PayflowProGateway'] = $dir . 'payflowpro_gateway.i18n.php';
Index: branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php
@@ -1152,7 +1152,7 @@
11531153 'donate_interface-comment-message' => 'Želite li nešto poručiti? Napišite poruku do 200 znakova ovdje:',
11541154 'donate_interface-comment-label' => 'Komentar:',
11551155 'donate_interface-anon-message' => 'Molim navedite moje ime (uz moj komentar) na javni popis donatora.',
1156 - 'donate_interface-email-agreement' => 'Slažem se s primanjem obavijesti potem e-pošte od Wikimedia zaklade.',
 1156+ 'donate_interface-email-agreement' => 'Slažem se s primanjem obavijesti e-poštom od Wikimedia zaklade.',
11571157 'donate_interface-comment-title' => 'Javni komentar',
11581158 'donate_interface-amount-error' => '**Molimo unesite valjani iznos**',
11591159 'donate_interface-processing-error' => 'Došlo je do pogreške u obradi vašeg zahtjeva.
@@ -2229,6 +2229,17 @@
22302230 'donate_interface-ILS' => 'ILS: Shekel (Israel)',
22312231 );
22322232
 2233+/** Quechua (Runa Simi)
 2234+ * @author AlimanRuna
 2235+ */
 2236+$messages['qu'] = array(
 2237+ 'donate_interface' => 'Wikimediata yanapay',
 2238+ 'donate_interface-amount' => "Hayk'a qarana:",
 2239+ 'donate_interface-other-amount' => 'Wakin chhika',
 2240+ 'donate_interface-currency' => 'Kañina:',
 2241+ 'donate_interface-submit-button' => 'Qarana',
 2242+);
 2243+
22332244 /** Romanian (Română)
22342245 * @author AdiJapan
22352246 * @author Firilacroco
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
22362247 Merged /trunk/extensions/DonationInterface:r78844-79147

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77614merged r77613 OWA changesnimishg23:12, 2 December 2010

Status & tagging log