r79281 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79280‎ | r79281 | r79282 >
Date:18:23, 30 December 2010
Author:kaldari
Status:deferred (Comments)
Tags:
Comment:
premiums stuff
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css
@@ -1,13 +1,20 @@
22 #premium-confirmation {
33 text-align: center;
44 }
5 -#premium-values {
 5+#premium-header {
66 font-size: 1.2em;
77 font-weight: bold;
 8+ margin: 0.2em 0 0.8em 0;
89 }
 10+#premium-values {
 11+ font-size: 1.2em;
 12+}
913 #premium-size {
1014 margin: 0.2em 0;
1115 }
 16+#premium-size #size-display {
 17+ font-weight: bold;
 18+}
1219 #premium-language {
1320 text-align: center;
1421 background-color: #162b46;
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php
@@ -22,10 +22,12 @@
2323 $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
2424
2525 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
 26+ $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), "Your t-shirt will be shipped in the size and language below:" );
2627 $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) ) . "<br/>";
2728 $form .= Xml::openElement( 'div', array( 'id' => 'premium-values' ) );
2829 $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' ) );
29 - $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $wgRequest->getText( 'size' ) );
 30+ $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 'size' ).'</span>';
 31+ $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $sizeDisplay );
3032 $form .= Xml::closeElement( 'div' ); // close div#premium-size
3133 $form .= wfMsg( 'payflowpro_gateway-on-the-back' ) . "<br/>";
3234 $form .= Xml::openElement( 'div', array( 'id' => 'premium-language' ) );
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -50,7 +50,10 @@
5151 'payflowpro_gateway-error-msg-js' => 'Please enter your',
5252 'payflowpro_gateway-error-msg-invalid-amount' => '**Please enter a valid amount**',
5353 'payflowpro_gateway-error-msg-email' => '**Please enter a valid e-mail address**',
54 - 'payflowpro_gateway-error-msg-card-num' => '**Please enter a valid credit card number for one of the accepted credit card types**',
 54+ 'payflowpro_gateway-error-msg-amex' => '**Please enter a correct card number for American Express.**',
 55+ 'payflowpro_gateway-error-msg-mc' => '**Please enter a correct card number for MasterCard.**',
 56+ 'payflowpro_gateway-error-msg-visa' => '**Please enter a correct card number for Visa.**',
 57+ 'payflowpro_gateway-error-msg-discover' => '**Please enter a correct card number for Discover.**',
5558 'payflowpro_gateway-error-msg-amount' => 'donation amount',
5659 'payflowpro_gateway-error-msg-emailAdd' => 'e-mail address',
5760 'payflowpro_gateway-error-msg-fname' => 'first name',
@@ -2685,22 +2688,9 @@
26862689 'payflowpro_gateway-monthly-donation' => 'Monatlich spenden',
26872690 'payflowpro_gateway-via-paypal' => '(per PayPal)',
26882691 'payflowpro_gateway-shirt-size' => 'T-Shirt-Größe:',
2689 - 'payflowpro_gateway-shirt-size-2' => 'T-Shirt-Größe: $1',
26902692 'payflowpro_gateway-language' => 'Sprache:',
26912693 'payflowpro_gateway-front' => 'Vorderseite',
26922694 'payflowpro_gateway-back' => 'Rückseite',
2693 - 'payflowpro_gateway-front-of-shirt' => 'Vorderseite',
2694 - 'payflowpro_gateway-back-of-shirt' => 'Rückseite',
2695 - 'payflowpro_gateway-select-a-size' => 'Bitte wähle eine Größe.',
2696 - 'payflowpro_gateway-select' => 'Größe:',
2697 - 'payflowpro_gateway-shipping-address' => 'Lieferadresse',
2698 - 'payflowpro_gateway-shipping-address-different' => 'Meine Lieferadresse unterscheidet sich von der Rechnungsadresse.',
2699 - 'payflowpro_gateway-shipping-address-same' => 'Lieferadresse entspricht der Rechnungsadresse.',
2700 - 'payflowpro_gateway-only-billing-address' => 'Shirts können nur an deine Rechnungsadresse versandt werden.',
2701 - 'payflowpro_gateway-donation-must-equal' => 'Die Spende muss $1 oder mehr betragen.',
2702 - 'payflowpro_gateway-thank-you' => 'Vielen Dank! Deine Spende ist eingegangen.',
2703 - 'payflowpro_gateway-wikipedia-translation' => 'Hinweis: „Wikipedia“ auf dem Ärmel ist das „Wikipedia 10“-Logo, das nicht übersetzt ist.',
2704 - 'payflowpro_gateway-on-the-back' => 'Auf der Rückseite:',
27052695 'payflowpro_gateway-state-dropdown-YY' => 'Wähle ein Land',
27062696 'payflowpro_gateway-state-dropdown-XX' => 'Außerhalb der Vereinigten Staaten',
27072697 );
@@ -11524,23 +11514,10 @@
1152511515 'payflowpro_gateway-email-receipt' => 'Gửi thư điện tử biên lai tới',
1152611516 'payflowpro_gateway-monthly-donation' => 'Quyên góp hàng tháng',
1152711517 'payflowpro_gateway-via-paypal' => '(qua PayPal)',
11528 - 'payflowpro_gateway-shirt-size' => 'Cỡ áo thun:',
11529 - 'payflowpro_gateway-shirt-size-2' => 'Cỡ áo thun: $1',
 11518+ 'payflowpro_gateway-shirt-size' => 'Cỡ áo phông:',
1153011519 'payflowpro_gateway-language' => 'Ngôn ngữ:',
1153111520 'payflowpro_gateway-front' => 'Mặt trước',
1153211521 'payflowpro_gateway-back' => 'Mặt sau',
11533 - 'payflowpro_gateway-front-of-shirt' => 'Mặt trước',
11534 - 'payflowpro_gateway-back-of-shirt' => 'Mặt sau',
11535 - 'payflowpro_gateway-select-a-size' => 'Xin hãy chọn cỡ áo.',
11536 - 'payflowpro_gateway-select' => 'Cỡ áo:',
11537 - 'payflowpro_gateway-shipping-address' => 'Địa chỉ gửi hàng',
11538 - 'payflowpro_gateway-shipping-address-different' => 'Địa chỉ gửi hàng của tôi khác với địa chỉ thanh toán.',
11539 - 'payflowpro_gateway-shipping-address-same' => 'Địa chỉ gửi hàng giống địa chỉ thanh toán.',
11540 - 'payflowpro_gateway-only-billing-address' => 'Chỉ có thể gửi áo tới địa chỉ thanh toán.',
11541 - 'payflowpro_gateway-donation-must-equal' => 'Chỉ được quyên góp 1 USD trở lên.',
11542 - 'payflowpro_gateway-thank-you' => 'Cám ơn! Chúng tôi đã nhận quyên góp của bạn.',
11543 - 'payflowpro_gateway-wikipedia-translation' => 'Tay áo sẽ có hình “Wikipedia 10”.',
11544 - 'payflowpro_gateway-on-the-back' => 'Mặt sau có:',
1154511522 'payflowpro_gateway-state-dropdown-YY' => 'Chọn tiểu bang',
1154611523 'payflowpro_gateway-state-dropdown-XX' => 'Bên ngoài Hoa Kỳ',
1154711524 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r79282Merging from r79271 through r79281 of trunkawjrichards18:26, 30 December 2010
r79286Reverting r79281 for payflowpro_gateway.i18n.php due to botched merge conflic...awjrichards19:29, 30 December 2010

Comments

#Comment by Raymond (talk | contribs)   19:06, 30 December 2010

It looks like you reverted translations from yesterday and a message change in English.

#Comment by Kaldari (talk | contribs)   00:39, 31 December 2010

fixed in r79298 and r79299

Status & tagging log