r103869 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103868‎ | r103869 | r103870 >
Date:23:41, 21 November 2011
Author:khorn
Status:ok
Tags:
Comment:
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras/custom_filters/custom_filters.body.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/DonationData.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/us-states.i18n.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/TwoStepAmount.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.alias.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.i18n.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/tests (modified) (history)

Diff [purge]

Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/tests
___________________________________________________________________
Modified: svn:mergeinfo
11 Merged /trunk/extensions/DonationInterface/tests:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php
___________________________________________________________________
Modified: svn:mergeinfo
22 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms
___________________________________________________________________
Modified: svn:mergeinfo
33 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms:r103837,103863,103866
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -1071,7 +1071,7 @@
10721072 * @author Kwj2772
10731073 */
10741074 $messages['ko'] = array(
1075 - 'payflowprogateway' => '위키미디어를 지지해주세요',
 1075+ 'payflowprogateway' => '지금 기부해주세요',
10761076 'payflowpro_gateway-desc' => 'PayPal Payflow Pro 신용 카드 처리 시스템',
10771077 'payflowpro_gateway-response-0' => '거래가 승인되었습니다.
10781078 당신의 기부에 감사드립니다!',
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
10791079 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway
___________________________________________________________________
Modified: svn:mergeinfo
10801080 Merged /trunk/extensions/DonationInterface/payflowpro_gateway:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras/custom_filters/custom_filters.body.php
___________________________________________________________________
Modified: svn:mergeinfo
10811081 Merged /trunk/extensions/DonationInterface/extras/custom_filters/custom_filters.body.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras
___________________________________________________________________
Modified: svn:mergeinfo
10821082 Merged /trunk/extensions/DonationInterface/extras:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms
___________________________________________________________________
Modified: svn:mergeinfo
10831083 Merged /trunk/extensions/DonationInterface/gateway_forms:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.alias.php
___________________________________________________________________
Modified: svn:mergeinfo
10841084 Merged /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.alias.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/TwoStepAmount.php
___________________________________________________________________
Modified: svn:mergeinfo
10851085 Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms/TwoStepAmount.php:r103837,103863,103866
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
@@ -290,6 +290,7 @@
291291 'CURRENCYCODE' => 'currency_code',
292292 'CVV' => 'cvv',
293293 'DATECOLLECT' => 'date_collect',
 294+ 'DESCRIPTOR' => 'descriptor', // eWallets
294295 'DIRECTDEBITTEXT' => 'direct_debit_text',
295296 'DOMICILIO' => 'domicilio', // dd:ES
296297 'EFFORTID' => 'effort_id',
@@ -607,6 +608,14 @@
608609 //'forms' => array( 'Gateway_Form_TwoStepAmount', ),
609610 );
610611
 612+ // eWallets
 613+ $this->payment_methods['ew'] = array(
 614+ 'label' => 'eWallets',
 615+ 'types' => array( 'ew_cashu', 'ew_moneybookers', 'ew_paypal', 'ew_webmoney', ),
 616+ 'validation' => array( 'address' => false, 'creditCard' => false, )
 617+ //'forms' => array( 'Gateway_Form_TwoStepAmount', ),
 618+ );
 619+
611620 // Bank Transfers
612621 $this->payment_methods['obt'] = array(
613622 'label' => 'Online bank transfer',
@@ -835,6 +844,55 @@
836845 );
837846
838847 /*
 848+ * eWallets
 849+ */
 850+
 851+ // eWallets PayPal
 852+ $this->payment_submethods['ew_paypal'] = array(
 853+ 'paymentproductid' => 840,
 854+ 'label' => 'eWallets: PayPal',
 855+ 'group' => 'ew',
 856+ 'validation' => array(),
 857+ 'keys' => array(),
 858+ );
 859+
 860+ // eWallets PayPal
 861+ $this->payment_submethods['ew_paypal'] = array(
 862+ 'paymentproductid' => 840,
 863+ 'label' => 'eWallets: PayPal',
 864+ 'group' => 'ew',
 865+ 'validation' => array(),
 866+ 'keys' => array(),
 867+ );
 868+
 869+ // eWallets WebMoney
 870+ $this->payment_submethods['ew_webmoney'] = array(
 871+ 'paymentproductid' => 841,
 872+ 'label' => 'eWallets: WebMoney',
 873+ 'group' => 'ew',
 874+ 'validation' => array(),
 875+ 'keys' => array(),
 876+ );
 877+
 878+ // eWallets Moneybookers
 879+ $this->payment_submethods['ew_moneybookers'] = array(
 880+ 'paymentproductid' => 843,
 881+ 'label' => 'eWallets: Moneybookers',
 882+ 'group' => 'ew',
 883+ 'validation' => array(),
 884+ 'keys' => array(),
 885+ );
 886+
 887+ // eWallets cashU
 888+ $this->payment_submethods['ew_cashu'] = array(
 889+ 'paymentproductid' => 845,
 890+ 'label' => 'eWallets: cashU',
 891+ 'group' => 'ew',
 892+ 'validation' => array(),
 893+ 'keys' => array(),
 894+ );
 895+
 896+ /*
839897 * Online bank transfers
840898 */
841899
@@ -1666,16 +1724,27 @@
16671725 );
16681726 return $languages;
16691727 }
1670 -
 1728+
16711729 /**
16721730 * Stage: amount
16731731 *
 1732+ * For example: JPY 1000.05 get changed to 100005. This need to be 100000.
 1733+ * For example: JPY 1000.95 get changed to 100095. This need to be 100000.
 1734+ *
16741735 * @param string $type request|response
16751736 */
16761737 protected function stage_amount( $type = 'request' ) {
16771738 switch ( $type ) {
16781739 case 'request':
 1740+
 1741+ // JPY cannot have cents.
 1742+ $floorCurrencies = array ( 'JPY' );
 1743+ if ( in_array( $this->staged_data['currency_code'], $floorCurrencies ) ) {
 1744+ $this->staged_data['amount'] = floor( $this->staged_data['amount'] );
 1745+ }
 1746+
16791747 $this->staged_data['amount'] = $this->staged_data['amount'] * 100;
 1748+
16801749 break;
16811750 case 'response':
16821751 $this->staged_data['amount'] = $this->staged_data['amount'] / 100;
@@ -1753,6 +1822,28 @@
17541823 // Direct debit has different required fields for each paymentproductid.
17551824 $this->addKeysToTransactionForSubmethod( $payment_submethod );
17561825 }
 1826+
 1827+ /**
 1828+ * Stage: setupStagePaymentMethodForEWallets
 1829+ *
 1830+ * @param string $payment_submethod
 1831+ * @param string $type request|response
 1832+ */
 1833+ protected function setupStagePaymentMethodForEWallets( $payment_submethod, $type = 'request' ) {
 1834+
 1835+ // DESCRIPTOR is required on WebMoney, assuming it is required for all.
 1836+ $this->addKeyToTransaction('DESCRIPTOR');
 1837+
 1838+ $this->staged_data['descriptor'] = 'Wikimedia Foundation/Wikipedia';
 1839+
 1840+ $this->var_map['PAYMENTPRODUCTID'] = 'payment_product';
 1841+ $this->var_map['COUNTRYCODEBANK'] = 'country';
 1842+
 1843+ $this->staged_data['payment_product'] = $this->payment_submethods[ $payment_submethod ]['paymentproductid'];
 1844+
 1845+ // eWallets custom keys
 1846+ $this->addKeysToTransactionForSubmethod( $payment_submethod );
 1847+ }
17571848
17581849 /**
17591850 * Stage: payment_method
@@ -1835,12 +1926,19 @@
18361927 $this->setupStagePaymentMethodForDirectDebit( $payment_submethod, $type);
18371928 break;
18381929
 1930+ /* eWallets */
 1931+ case 'ew_cashu':
 1932+ case 'ew_moneybookers':
 1933+ case 'ew_paypal':
 1934+ case 'ew_webmoney':
 1935+ $this->setupStagePaymentMethodForEWallets( $payment_submethod, $type);
 1936+ break;
 1937+
18391938 /* Online bank transfer */
18401939 case 'bpay':
18411940 $this->staged_data['payment_product'] = $this->payment_submethods[ $payment_submethod ]['paymentproductid'];
18421941 $this->var_map['PAYMENTPRODUCTID'] = 'payment_product';
18431942 break;
1844 -
18451943
18461944 /* Real time bank transfer */
18471945 case 'rtbt_nordea_sweden':
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
___________________________________________________________________
Added: svn:mergeinfo
18481946 Merged /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,99570-101026,101056,101060,101063-101064,101071-101074,101076,101099,101109,101112,101163,101180,101192,101200,101205,101207,101217,101230,101232,101236,101335,101382,101399,101441,101501-101504,101512,101541,101547,101549,101553-101555,101557,101559,101561,101563,101576,101578-101579,101631,101633,101638,101669,101676,101679,101689,101700,101706,101719,101740,101747,101757,101764,101778-101779,101781,101785-101789,101798,101823,101826,101837,101846,101852,101870-101872,101878,101882,101890,101892,101910,101917,101929,101947,101949-101951,101955-101960,101962,101964-101966,101996,102003,102011-102012,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102123-102127,102130,102134,102140,102147,102151-102152,102155-102156,102186,102188-102242,102252,102258-102261,102263,102267,102269,102307-102309,102313,102318,102332,102338,102341-102342,102345,102364,102419,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102681-102682,102685,102689,102698,102700-102703,102707,102711-102712,102714,102729,102733,102736,102740,102752,102763,102805,102807,102809-102810,102812,102819-102824,102826,102828-102833,102835-102836,102841,102872,102878,102915,102921-102923,102926-102928,102932,102936,102938,102942-102943,102946,102953,102960-102961,103009,103023-103024,103026-103027,103032,103036-103038,103040,103044,103050,103058,103067,103077,103080,103130,103219,103223,103229,103235,103237-103239,103243-103247,103253,103255,103259,103261-103262,103264,103275,103278,103284,103289-103291,103325,103371,103397,103399,103401,103411,103413,103415,103421,103434-103435,103481,103500,103503,103514-103515,103519,103537,103541,103548,103591,103607-103608,103633,103680,103775,103784,103837,103839,103863,103866
18491947 Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php:r99568
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.i18n.php
@@ -367,6 +367,15 @@
368368 'globalcollect_gateway-response-default' => '取引の処理中にエラーが起こりました。後でもう一度お試しください。',
369369 );
370370
 371+/** Korean (한국어)
 372+ * @author Kwj2772
 373+ */
 374+$messages['ko'] = array(
 375+ 'globalcollectgateway' => '지금 기부해주세요',
 376+ 'globalcollect_gateway-response-21000150' => '잘못된 은행 계좌 번호.',
 377+ 'globalcollect_gateway-response-21000155' => '은행 코드가 잘못되었습니다.',
 378+);
 379+
371380 /** Luxembourgish (Lëtzebuergesch)
372381 * @author Robby
373382 */
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
374383 Merged /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.i18n.php:r103837,103863,103866
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php
@@ -7635,6 +7635,7 @@
76367636 'donate_interface-error-msg-nopaypal' => 'En raison d’un problème technique, nous ne pouvons pas envoyer votre requête à PayPal. Veuillez essayer notre formulaire classique de don par carte bancaire ou de crédit.',
76377637 'donate_interface-error-msg' => 'Veuillez entrer votre $1',
76387638 'donate_interface-error-msg-js' => 'Veuillez entrer votre',
 7639+ 'donate_interface-error-msg-validation' => 'Veuillez corriger les erreurs dans le formulaire.',
76397640 'donate_interface-error-msg-invalid-amount' => 'Veuillez entrer un montant valide',
76407641 'donate_interface-error-msg-email' => 'Veuillez entrer une adresse de courriel valide',
76417642 'donate_interface-error-msg-card-num' => 'Veuillez entrer un numéro de carte bancaire ou de crédit valide pour l’un des types de cartes acceptées',
@@ -7659,6 +7660,7 @@
76607661 'donate_interface-error-msg-captcha' => 'La valeur de CAPTCHA que vous avez entrée est incorrecte. Veuillez réessayer.',
76617662 'donate_interface-error-msg-captcha-please' => 'Pour la sécurité de votre carte bancaire ou de crédit, veuillez saisir les caractères affichés ci-dessus.',
76627663 'donate_interface-error-msg-cookies' => 'Veuillez activer les cookies dans votre navigateur.',
 7664+ 'donate_interface-error-msg-genaricrequired' => 'Ce champ est obligatoire',
76637665 'php-response-declined' => 'Votre transaction n’a pu être acceptée.',
76647666 'donate_interface-thankyou' => 'Merci pour votre don !',
76657667 'donate_interface-post-transaction' => 'Détails de la transaction',
@@ -8650,6 +8652,7 @@
86518653 'donate_interface-error-msg-captcha' => 'Dr Bstetigungscode, wu yygee woren isch, isch falsch. Bitte versuech s nomol.',
86528654 'donate_interface-error-msg-captcha-please' => 'Bitte gib dr Bstetigungscode yy zum Bstetige, ass Du ne Mänsch un kei Bot bisch.',
86538655 'donate_interface-error-msg-cookies' => 'Bitte due in dynem Browser Cookies aktiviere.',
 8656+ 'donate_interface-error-msg-genaricrequired' => 'Des isch e Pflichtfäld.',
86548657 'php-response-declined' => 'Dyy Transaktion het nit chenne akzäptiert wäre.',
86558658 'donate_interface-thankyou' => 'Dankschen fir Dyyni Spände!',
86568659 'donate_interface-post-transaction' => 'Transaktions-Detail',
@@ -11992,14 +11995,14 @@
1199311996 'donate_interface-desc' => '게이트웨이 확장 기능을 통합하고 있는 기부 방문 문서',
1199411997 'donate_interface-langonly-desc' => '기부 화면의 시스템 메시지만 표시',
1199511998 'donate_interface-intro' => '결제 방법, 기부 금액, 통화 종류를 선택해주세요.',
11996 - 'donate_interface-amount' => '기부 금액:',
 11999+ 'donate_interface-amount' => '금액',
1199712000 'donate_interface-other-amount' => '기타 금액',
1199812001 'donate_interface-currency' => '화폐 종류:',
1199912002 'donate_interface-gateway' => '지불 방법:',
1200012003 'donate_interface-submit-button' => '기부',
1200112004 'donate_interface-comment-message' => '다른 사람들에게 전달하고 싶은 말을 입력해주시요. 200자까지 가능합니다.',
1200212005 'donate_interface-comment-label' => '내용:',
12003 - 'donate_interface-anon-message' => '자신의 이름을 공개 기부자 명단에서 표시하도록 합니다. (메시지 옆에 표시됩니다.)',
 12006+ 'donate_interface-anon-message' => '자신의 이름을 공개 기부자 명단에서 표시하도록 합니다.',
1200412007 'donate_interface-email-agreement' => '위키미디어 재단의 새로운 소식을 가끔 이메일로 받는 데 동의합니다.',
1200512008 'donate_interface-comment-title' => '공개 메시지',
1200612009 'donate_interface-amount-error' => '금액을 올바르게 입력해주세요',
@@ -12012,18 +12015,28 @@
1201312016 'donate_interface-BBD' => '바르바디언 달러',
1201412017 'donate_interface-BDT' => '방글라데시 타카',
1201512018 'donate_interface-BGN' => '불가리안 레브',
 12019+ 'donate_interface-BHD' => '바레인 디나르',
 12020+ 'donate_interface-BMD' => '버뮤다 달러',
1201612021 'donate_interface-BND' => '브루나이 달러',
 12022+ 'donate_interface-BOB' => '볼리비아 볼리비아노',
1201712023 'donate_interface-BRL' => '브라질 레알',
 12024+ 'donate_interface-BSD' => '바하마 달러',
1201812025 'donate_interface-BZD' => '벨리즈 달러',
1201912026 'donate_interface-CAD' => '캐나다 달러',
1202012027 'donate_interface-CHF' => '스위스 프랑',
1202112028 'donate_interface-CLP' => '칠레 페소',
1202212029 'donate_interface-CNY' => '중국 위안 인민폐',
 12030+ 'donate_interface-COP' => '콜롬비아 페소',
1202312031 'donate_interface-CRC' => '코스타리카 콜론',
1202412032 'donate_interface-CZK' => '체코 코루나',
1202512033 'donate_interface-DKK' => '덴마크 크로네',
 12034+ 'donate_interface-DOP' => '도미니카 페소',
 12035+ 'donate_interface-DZD' => '알제리 디나르',
 12036+ 'donate_interface-EEK' => '에스토니아 크룬',
 12037+ 'donate_interface-EGP' => '이집트 파운드',
1202612038 'donate_interface-EUR' => '유로',
1202712039 'donate_interface-GBP' => '영국 파운드',
 12040+ 'donate_interface-GTQ' => '과테말라 케찰',
1202812041 'donate_interface-HKD' => '홍콩 달러',
1202912042 'donate_interface-HUF' => '헝가리 포린트',
1203012043 'donate_interface-ILS' => '이스라엘 셰켈',
@@ -12039,6 +12052,7 @@
1204012053 'donate_interface-accessible' => '이 페이지는 기부 페이지에서만 접근 가능합니다.',
1204112054 'donate_interface-paypal-button' => '페이팔을 통해 기부',
1204212055 'donate_interface-cc-button' => '신용 카드로 기부',
 12056+ 'donate_interface-ewallet-button' => '$1을 통해 기부하기',
1204312057 'donate_interface-donor-legend' => '기부자 정보',
1204412058 'donate_interface-card-legend' => '신용 카드 정보',
1204512059 'donate_interface-amount-legend' => '기부 금액',
@@ -12072,6 +12086,7 @@
1207312087 'donate_interface-error-msg-nopaypal' => '기술적인 오류가 발생하여 요청하신 내용을 페이팔로 보낼 수 없습니다. 신용카드 기부 양식을 사용하여 다시 시도해 주시기 바랍니다.',
1207412088 'donate_interface-error-msg' => '다음 사항을 입력해 주십시오: $1',
1207512089 'donate_interface-error-msg-js' => '다음 사항을 입력해 주십시오:',
 12090+ 'donate_interface-error-msg-validation' => '양식의 오류를 수정해주십시오.',
1207612091 'donate_interface-error-msg-invalid-amount' => '올바른 금액을 입력해 주십시오',
1207712092 'donate_interface-error-msg-email' => '올바른 이메일 주소를 입력해 주십시오',
1207812093 'donate_interface-error-msg-card-num' => '본 사이트에서 사용 가능한 신용카드 인지 확인하시고, 신용카드 번호역시 확인해 보시기 바랍니다.',
@@ -12095,6 +12110,8 @@
1209612111 'donate_interface-error-msg-cvv' => '카드 뒷면의 CVV',
1209712112 'donate_interface-error-msg-captcha' => '당신이 입력한 Captcha 값이 잘못되었습니다. 다시 시도해주십시오.',
1209812113 'donate_interface-error-msg-captcha-please' => '당신의 신용 카드 보안을 위해 위에 보이는 문자를 입력해주십시오.',
 12114+ 'donate_interface-error-msg-cookies' => '브라우저에서 쿠키를 활성화시키십시오.',
 12115+ 'donate_interface-error-msg-genaricrequired' => '이 칸은 반드시 입력해야 합니다.',
1209912116 'php-response-declined' => '거래가 거부되었습니다.',
1210012117 'donate_interface-thankyou' => '당신의 기부에 감사드립니다!',
1210112118 'donate_interface-post-transaction' => '거래 세부 사항',
@@ -12105,7 +12122,7 @@
1210612123 <h4>아메리칸 엑스프레스</h4>
1210712124 <p>코드는 <i>항상</i> 카드 앞면에 양각된 카드 번호 <i>위에</i> 위치하고 있습니다.
1210812125 어떤 경우에는 코드가 카드 왼쪽에 있을 수는 있지만 항상 카드 번호 위에 위치해 있습니다.</p><br />',
12109 - 'donate_interface-question-comment' => '위키백과는 위키미디어 재단의 프로젝트 중 하나입니다. 질문이나 의견이 있으신가요? 위키미디어 재단에 문의해주세요: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
 12126+ 'donate_interface-question-comment' => '질문이나 의견이 있으신가요? 연락처: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
1211012127 'donate_interface-easydonate' => '모든 국가에서 쉽게 기부를 하실 수 있도록 하기 위해 노력하고 있습니다. 귀하의 경우 더 쉽게 하실 수 있는 방법이 있으시다면 알려주시기 바랍니다. 제안을 다음 주소로 보내주세요: problemsdonating@wikimedia.org.',
1211112128 'donate_interface-donate-click' => '상위 버튼을 클릭하면, 당신의 신용 카드 정보가 안전하게 처리될 것입니다.',
1211212129 'donate_interface-otherways' => ' <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">페이팔, 수표 그리고 우편</a>을 통해서도 기부하실 수 있습니다.',
@@ -12114,6 +12131,10 @@
1211512132 'donate_interface-paypal' => '페이팔 계정을 가지고 계십니까?<a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=ko&utm_source=$3&utm_medium=$4&utm_campaign=$5">페이팔을 통해서 기부하실 수 있습니다</a>.',
1211612133 'donate_interface-credit-storage-processing' => '우리는 신용 카드 정보를 저장하지 않습니다. 입력하신 개인 정보는 <a href="http://wikimediafoundation.org/wiki/Donor_policy">개인정보 보호정책</a>에 따라 관리됩니다.',
1211712134 'donate_interface-token-mismatch' => '귀하의 세션이 만료 되었습니다. 양식의 내용을 다시 기입하여 제출해 주시기 바랍니다.',
 12135+ 'donate_interface-next' => '다음',
 12136+ 'donate_interface-continue' => '계속',
 12137+ 'donate_interface-cancel' => '취소',
 12138+ 'donate_interface-language' => '언어:',
1211812139 'donate_interface-monthlybox-amount' => '기부 금액:',
1211912140 'donate_interface-monthlybox-yes' => '물론입니다, 매달 하겠습니다.',
1212012141 'donate_interface-monthlybox-no' => '아니오, 한 번만 기부 할 것 입니다.',
@@ -12701,6 +12722,8 @@
1270212723 'donate_interface-bt-finished' => 'Fäerdeg',
1270312724 'donate_interface-obt-biller_id' => "Code vun deem deen d'Rechnung ausstellt",
1270412725 'donate_interface-obt-customer_payment_reference' => 'Referenznummer',
 12726+ 'donate_interface-obt-information' => 'Informatiounen iwwer Online Bankiwwerweisungen',
 12727+ 'donate_interface-online_bank_transfer_message' => 'Telefon & Internet-Banking - BPAY®',
1270512728 'donate_interface-rtbt-issuer_id' => 'Bank',
1270612729 'donate_interface-rtbt-issuer_id-longlist' => 'Aner Banken',
1270712730 'donate_interface-dd-account_name' => 'Numm vum Kont',
@@ -15146,6 +15169,7 @@
1514715170 * @author McDutchie
1514815171 * @author Microcell
1514915172 * @author Mihxil
 15173+ * @author Romaine
1515015174 * @author SPQRobin
1515115175 * @author Siebrand
1515215176 * @author Tjcool007
@@ -15491,7 +15515,7 @@
1549215516 'donate_interface-email-unsub-fail' => 'Er is een fout opgetreden tijdens de verwerking. Neem alstublieft contact op met <donations@wikimedia.org>.',
1549315517 'donate_interface-faqs' => 'Veel gestelde vragen',
1549415518 'donate_interface-tax-info' => 'Fiscale aftrekbaarheid',
15495 - 'donate_interface-informationsharing' => 'Door te doneren, deelt u uw gegevens met de Wikimedia Foundation, de non-profitorganisatie die Wikipedia en andere Wikimediaprojecten host, en haar dienstverleners in de Verenigde Staten en elders, in overeenstemming met ons privacybeleid voor donateurs. Wij verkopen of verhandelen uw gegevens niet. Meer informatie is na te lenzen in ons <a href="http://wikimediafoundation.org/wiki/Donor_policy/nl">donateursbeleid</a>.',
 15519+ 'donate_interface-informationsharing' => 'Door te doneren, deelt u uw gegevens met de Wikimedia Foundation, de non-profitorganisatie die Wikipedia en andere Wikimediaprojecten host, en haar dienstverleners in de Verenigde Staten en elders, in overeenstemming met ons privacybeleid voor donateurs. Wij verkopen of verhandelen uw gegevens niet. Meer informatie is na te lezen in ons <a href="http://wikimediafoundation.org/wiki/Donor_policy/nl">donateursbeleid</a>.',
1549615520 'donate_interface-currency-change' => 'Wijzigen?',
1549715521 'donate_interface-bank_transfer_message' => 'Bij uw overschrijvingsgegevens wordt "Global Collect" aangegeven als ontvanger van uw overschrijving. Global Collect mag namens de Wikimedia Foundation betalingen autoriseren en verwerken. Neem alstublieft het referentienummer dat hier wordt genoemd op in uw overschrijving. Als u vragen of zorgen hebt, neem dan alstublieft per e-mail contact met ons op via donations@wikimedia.org.',
1549815522 'donate_interface-taxded-link-int' => 'Belastingen en andere juridische informatie',
@@ -15729,11 +15753,13 @@
1573015754 'donate_interface-ZAR' => 'Sørafrikansk rand',
1573115755 'donate_interface-accessible' => 'Denne siden er bare tilgjengelig fra giversiden.',
1573215756 'donate_interface-paypal-button' => 'Doner med PayPal',
 15757+ 'donate_interface-paypal-redirect' => 'Omdirigerer til PayPal…',
1573315758 'donate_interface-cc-button' => 'Doner med kredittkort',
1573415759 'donate_interface-ccdc-button' => 'Doner med kreditt- eller debetkort',
1573515760 'donate_interface-dd-button' => 'Doner med AvtaleGiro',
1573615761 'donate_interface-bt-button' => 'Doner med bankoverføring',
1573715762 'donate_interface-rt-button' => 'Doner via banken $1',
 15763+ 'donate_interface-ewallet-button' => 'Doner via $1',
1573815764 'donate_interface-donor-legend' => 'Giverinformasjon',
1573915765 'donate_interface-card-legend' => 'Kredittkortinformasjon',
1574015766 'donate_interface-amount-legend' => 'Gavebeløp',
@@ -15767,6 +15793,7 @@
1576815794 'donate_interface-error-msg-nopaypal' => 'På grunn av en teknisk feil kan vi ikke sende din forespørsel til PayPal. Prøv å bruke vårt vanlige kredittkort-donasjonsskjema.',
1576915795 'donate_interface-error-msg' => 'Dette feltet må fylles ut: $1',
1577015796 'donate_interface-error-msg-js' => 'Dette feltet må fylles ut',
 15797+ 'donate_interface-error-msg-validation' => 'Vennligst rett feilene i skjemaet.',
1577115798 'donate_interface-error-msg-invalid-amount' => 'Vennligst oppgi et gyldig beløp',
1577215799 'donate_interface-error-msg-email' => 'Vennligst oppgi en gyldig e-postadresse',
1577315800 'donate_interface-error-msg-card-num' => 'Skriv inn et gyldig kredittkortnummer for en av de aksepterte kredittkorttypene',
@@ -15790,6 +15817,8 @@
1579115818 'donate_interface-error-msg-cvv' => 'CVV fra baksiden av kortet ditt',
1579215819 'donate_interface-error-msg-captcha' => 'Capcha-verdien du skrev inn er feil. Prøv igjen.',
1579315820 'donate_interface-error-msg-captcha-please' => 'For ditt kredittkorts sikkerhet, skriv inn tegnene du ser over.',
 15821+ 'donate_interface-error-msg-cookies' => 'Slå på informasjonskapsler i nettleseren din.',
 15822+ 'donate_interface-error-msg-genaricrequired' => 'Dette feltet er obligatorisk',
1579415823 'php-response-declined' => 'Din transaksjon kunne ikke aksepteres.',
1579515824 'donate_interface-thankyou' => 'Takk for din donasjon!',
1579615825 'donate_interface-post-transaction' => 'Transaksjonsdetaljer.',
@@ -15924,6 +15953,7 @@
1592515954 'donate_interface-donation-tshirt' => 'Donasjon (t-skjorte-tilbud)',
1592615955 'donate_interface-change' => 'Endre',
1592715956 'donate_interface-select-credit-card' => 'Velg kredittkort',
 15957+ 'donate_interface-optional' => 'valgfritt',
1592815958 'donate_interface-state-dropdown-YY' => 'Velg delstat',
1592915959 'donate_interface-state-dropdown-XX' => 'Utenfor USA',
1593015960 'donate_interface-bt-account_holder' => 'Kontoinnehaver',
@@ -15944,7 +15974,7 @@
1594515975 'donate_interface-dd-account_number' => 'Kontonummer',
1594615976 'donate_interface-dd-authorization_id' => 'Autoriserings-ID',
1594715977 'donate_interface-dd-bank_check_digit' => 'Sjekksiffer',
15948 - 'donate_interface-dd-bank_code' => 'Bankkode',
 15978+ 'donate_interface-dd-bank_code' => 'Sorteringskode',
1594915979 'donate_interface-dd-bank_name' => 'Banknavn',
1595015980 'donate_interface-dd-branch_code' => 'Avdelingskode',
1595115981 'donate_interface-dd-direct_debit_text' => 'Direct Debit-tekst',
@@ -16487,7 +16517,7 @@
1648816518 'donate_interface-error-msg-cvv' => 'kod CVV umieszczony z tyłu karty',
1648916519 'donate_interface-error-msg-captcha' => 'Przepisana przez Ciebie zawartość captcha jest nieprawidłowa. Spróbuj jeszcze raz.',
1649016520 'donate_interface-error-msg-captcha-please' => 'Proszę wypełnić formularz captcha aby udowodnić, że nie jesteś botem.',
16491 - 'donate_interface-error-msg-cookies' => 'Włącz pliki cookie w przeglądarce',
 16521+ 'donate_interface-error-msg-cookies' => 'Włącz ciasteczka w przeglądarce',
1649216522 'php-response-declined' => 'Transakcja została odrzucona.',
1649316523 'donate_interface-thankyou' => 'Dziękujemy za wsparcie!',
1649416524 'donate_interface-post-transaction' => 'Szczegóły transakcji',
@@ -18039,7 +18069,7 @@
1804018070 'donate_interface-rt-button' => 'Donație prin intermediul băncii $1',
1804118071 'donate_interface-donor-legend' => 'Informații despre donator',
1804218072 'donate_interface-card-legend' => 'Informații despre cardul de credit',
18043 - 'donate_interface-amount-legend' => 'Suma donată în',
 18073+ 'donate_interface-amount-legend' => 'Suma donată:',
1804418074 'donate_interface-cvv-link' => 'Cum aflu?',
1804518075 'donate_interface-donor-amount' => 'Sumă',
1804618076 'donate_interface-donor-currency-label' => 'Monedă',
@@ -19849,7 +19879,7 @@
1985019880 * @author Yerpo
1985119881 */
1985219882 $messages['sl'] = array(
19853 - 'donate_interface' => 'Podprite Wikimedijo!',
 19883+ 'donate_interface' => 'Podprite Wikimedijo',
1985419884 'donate_interface-desc' => 'Ciljna donatorska stran, ki združuje prehodne razširitve',
1985519885 'donate_interface-langonly-desc' => 'Izpostavi samo sistemska sporočila VmesnikaZaPrispevke',
1985619886 'donate_interface-intro' => 'Prosimo, izberite način plačila, znesek in valuto.',
@@ -19892,7 +19922,7 @@
1989319923 'donate_interface-DZD' => 'alžirski dinar',
1989419924 'donate_interface-EEK' => 'estonska krona',
1989519925 'donate_interface-EGP' => 'egiptovski funt',
19896 - 'donate_interface-EUR' => 'euro',
 19926+ 'donate_interface-EUR' => 'evro',
1989719927 'donate_interface-GBP' => 'britanski funt',
1989819928 'donate_interface-GTQ' => 'kecal Gvatemale',
1989919929 'donate_interface-HKD' => 'hongkonški dolar',
@@ -20318,11 +20348,13 @@
2031920349 'donate_interface-currency-display' => '$1 ($2)',
2032020350 'donate_interface-accessible' => 'Ова страница је доступна само са странице за новчане прилоге.',
2032120351 'donate_interface-paypal-button' => 'Приложи преко Пејпала',
 20352+ 'donate_interface-paypal-redirect' => 'Преусмеравам на Пејпал…',
2032220353 'donate_interface-cc-button' => 'Приложи преко кредитне картице',
2032320354 'donate_interface-ccdc-button' => 'Приложи преко кредитне/дебитне картице',
2032420355 'donate_interface-dd-button' => 'Приложи директно са рачуна',
2032520356 'donate_interface-bt-button' => 'Приложи преносом из банкарског рачуна',
2032620357 'donate_interface-rt-button' => 'Приложи преко банке $1',
 20358+ 'donate_interface-ewallet-button' => 'Дајте прилог преко $1',
2032720359 'donate_interface-donor-legend' => 'Подаци о даваоцу',
2032820360 'donate_interface-card-legend' => 'Подаци о кредитној картици',
2032920361 'donate_interface-amount-legend' => 'Износ прилога',
@@ -20356,6 +20388,7 @@
2035720389 'donate_interface-error-msg-nopaypal' => 'Због техничке грешке, не можемо да пошаљемо ваш захтев Пејпалу. Послужите се обрасцем за даривање путем кредитне картице.',
2035820390 'donate_interface-error-msg' => 'Унесите $1',
2035920391 'donate_interface-error-msg-js' => 'Унесите',
 20392+ 'donate_interface-error-msg-validation' => 'Исправите грешке у обрасцу.',
2036020393 'donate_interface-error-msg-invalid-amount' => 'Унесите исправан износ',
2036120394 'donate_interface-error-msg-email' => 'Унесите исправну е-адресу',
2036220395 'donate_interface-error-msg-card-num' => 'Унесите исправан број кредитне картице од прихваћених врста',
@@ -20380,6 +20413,7 @@
2038120414 'donate_interface-error-msg-captcha' => 'Унета вредност потврдног кода је неисправна. Покушајте поново.',
2038220415 'donate_interface-error-msg-captcha-please' => 'Унесите знакове које видите изнад да докажете да нисте бот.',
2038320416 'donate_interface-error-msg-cookies' => 'Омогућите колачиће на прегледачу.',
 20417+ 'donate_interface-error-msg-genaricrequired' => 'Ово поље је обавезно',
2038420418 'php-response-declined' => 'Плаћање није прихваћено.',
2038520419 'donate_interface-thankyou' => 'Хвала вам на прилогу!',
2038620420 'donate_interface-post-transaction' => 'Подаци о плаћању',
@@ -20679,11 +20713,13 @@
2068020714 'donate_interface-currency-display' => '$1 ($2)',
2068120715 'donate_interface-accessible' => 'Ova stranica je dostupna samo sa stranice za novčane priloge.',
2068220716 'donate_interface-paypal-button' => 'Priloži preko Pejpala',
 20717+ 'donate_interface-paypal-redirect' => 'Preusmeravam na Pejpal…',
2068320718 'donate_interface-cc-button' => 'Priloži preko kreditne kartice',
2068420719 'donate_interface-ccdc-button' => 'Priloži preko kreditne/debitne kartice',
2068520720 'donate_interface-dd-button' => 'Priloži direktno sa računa',
2068620721 'donate_interface-bt-button' => 'Priloži prenosom iz bankarskog računa',
2068720722 'donate_interface-rt-button' => 'Priloži preko banke $1',
 20723+ 'donate_interface-ewallet-button' => 'Dajte prilog preko $1',
2068820724 'donate_interface-donor-legend' => 'Podaci o davaocu',
2068920725 'donate_interface-card-legend' => 'Podaci o kreditnoj kartici',
2069020726 'donate_interface-amount-legend' => 'Iznos priloga',
@@ -20717,6 +20753,7 @@
2071820754 'donate_interface-error-msg-nopaypal' => 'Zbog tehničke greške, ne možemo da pošaljemo vaš zahtev Pejpalu. Poslužite se obrascem za darivanje putem kreditne kartice.',
2071920755 'donate_interface-error-msg' => 'Unesite $1',
2072020756 'donate_interface-error-msg-js' => 'Unesite',
 20757+ 'donate_interface-error-msg-validation' => 'Ispravite greške u obrascu.',
2072120758 'donate_interface-error-msg-invalid-amount' => 'Unesite ispravan iznos',
2072220759 'donate_interface-error-msg-email' => 'Unesite ispravnu e-adresu',
2072320760 'donate_interface-error-msg-card-num' => 'Unesite ispravan broj kreditne kartice od prihvaćenih vrsta',
@@ -20741,6 +20778,7 @@
2074220779 'donate_interface-error-msg-captcha' => 'Uneta vrednost potvrdnog koda je neispravna. Pokušajte ponovo.',
2074320780 'donate_interface-error-msg-captcha-please' => 'Unesite znakove koje vidite iznad da dokažete da niste bot.',
2074420781 'donate_interface-error-msg-cookies' => 'Omogućite kolačiće na pregledaču.',
 20782+ 'donate_interface-error-msg-genaricrequired' => 'Ovo polje je obavezno',
2074520783 'php-response-declined' => 'Plaćanje nije prihvaćeno.',
2074620784 'donate_interface-thankyou' => 'Hvala vam na prilogu!',
2074720785 'donate_interface-post-transaction' => 'Podaci o plaćanju',
@@ -21910,11 +21948,13 @@
2191121949 'donate_interface-error-msg-zip' => 'తపాలా కోడు',
2191221950 'donate_interface-error-msg-postal' => 'తపాలా సంకేతం',
2191321951 'donate_interface-error-msg-country' => 'దేశం',
 21952+ 'donate_interface-error-msg-card_type' => 'క్రెడిట్ కార్డు రకం',
2191421953 'donate_interface-error-msg-card_num' => 'క్రెడిట్ కార్డు నెంబరు',
2191521954 'donate_interface-error-msg-expiration' => 'కార్డు యొక్క కాలపరిమితి తేదీ',
2191621955 'donate_interface-error-msg-cvv' => 'మీ కార్డు వెనక వైపు నుండి CVV',
2191721956 'donate_interface-error-msg-captcha' => 'మీరు ఇచ్చిన ఆమకవేప విలువ సరైనదికాదు. దయచేసి మళ్ళీ ప్రయత్నించండి.',
2191821957 'donate_interface-error-msg-captcha-please' => 'మీ క్రెడిట్ కార్డు భద్రత కోసం, పైన మీకు కనిపించే అక్షరాలను టైపుచెయ్యండి.',
 21958+ 'donate_interface-error-msg-genaricrequired' => 'ఈ ఖాళీ తప్పనిసరి',
2191921959 'php-response-declined' => 'మీ లావాదేవీని అంగీకరించలేక పోయారు.',
2192021960 'donate_interface-thankyou' => 'మీ విరాళానికి కృతజ్ఞతలు!',
2192121961 'donate_interface-post-transaction' => 'లావాదేవీ వివరాలు',
@@ -21931,6 +21971,7 @@
2193221972 'donate_interface-state-in-us' => 'అమెరికాలో ఉంటే',
2193321973 'donate_interface-comment' => 'వ్యాఖ్య',
2193421974 'donate_interface-first' => 'మొదటి',
 21975+ 'donate_interface-middle' => 'మధ్య',
2193521976 'donate_interface-last' => 'చివరి',
2193621977 'donate_interface-other' => 'ఇతర',
2193721978 'donate_interface-donate-wikipedia' => 'వికీపీడియాలో విరాళమివ్వండి',
@@ -22006,12 +22047,16 @@
2200722048 'donate_interface-select' => 'పరిమాణం:',
2200822049 'donate_interface-change' => 'మార్చు',
2200922050 'donate_interface-state-dropdown-XX' => 'అమెరికా బయట',
 22051+ 'donate_interface-bt-country_description' => 'దేశపు వివరణ',
 22052+ 'donate_interface-rtbt-issuer_id-longlist' => 'ఇతర బ్యాంకులు',
2201022053 'donate_interface-dd-account_name' => 'ఖాతా పేరు',
2201122054 'donate_interface-dd-account_number' => 'ఖాతా సంఖ్య',
2201222055 'donate_interface-dd-bank_name' => 'బ్యాంకు పేరు',
2201322056 'donate_interface-translate-redlink1' => 'ఈ పుటను అనువదించడానికి సహాయపడండి.',
2201422057 'donate_interface-email-unsub-button' => 'చందావిరమించు',
2201522058 'donate_interface-faqs' => 'తరచూ అడిగే ప్రశ్నలు',
 22059+ 'donate_interface-tax-info' => 'పన్ను తగ్గింపు సమాచారం',
 22060+ 'donate_interface-currency-change' => 'మార్చాలా?',
2201622061 'donate_interface-taxded-link-int' => 'పన్ను మరియు ఇతర చట్టపరమైన సమాచారం',
2201722062 'donate_interface-taxded-link-us' => 'పన్ను తగ్గింపు సమాచారం',
2201822063 'donate_interface-monthlybox-amount' => 'విరాళపు మొత్తం:',
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
2201922064 Merged /trunk/extensions/DonationInterface/gateway_common/interface.i18n.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/DonationData.php
___________________________________________________________________
Modified: svn:mergeinfo
2202022065 Merged /trunk/extensions/DonationInterface/gateway_common/DonationData.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/us-states.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
2202122066 Merged /trunk/extensions/DonationInterface/gateway_common/us-states.i18n.php:r103837,103863,103866
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
2202222067 Merged /trunk/extensions/DonationInterface:r103837,103863,103866

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r103415Added eWallets: cashU, Moneybookers, PayPal and WebMoney.jpostlethwaite23:35, 16 November 2011
r103514Fixing issue with currency JPY. The amount is floored for the last two digits.jpostlethwaite22:15, 17 November 2011
r103837Localisation updates for core and extension messages from translatewiki.netraymond21:20, 21 November 2011
r103854adding webmoney logosjamesur22:51, 21 November 2011
r103863Simplifying process of flooring yen currency. See r103514.jpostlethwaite23:09, 21 November 2011
r103866Removing unnecessary multiplication by 100.. See r103863..jpostlethwaite23:17, 21 November 2011

Status & tagging log