https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113744
Revision: 113744
Author: preilly
Date: 2012-03-13 18:31:31 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
1.19wmf: MFT r113741 - r113743
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-03-13 18:30:37 UTC (rev 113743)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-03-13 18:31:31 UTC (rev 113744)
@@ -34,6 +34,7 @@
private static $formatMobileUrl = '//%s.m.wikipedia.org/';
private static $title;
private static $isFilePage;
+ public static $isMainPage = false;
private static $acceptBilling;
private static $carrier;
private static $renderZeroRatedRedirect;
@@ -80,6 +81,10 @@
self::$acceptBilling = $wgRequest->getVal(
'acceptbilling' );
self::$title = $out->getTitle();
+ if ( self::$title->isMainPage() ) {
+ self::$isMainPage = true;
+ }
+
$carrier = $wgRequest->getHeader( 'X-CARRIER' );
if ( $carrier !== '(null)' && $carrier ) {
self::$renderZeroRatedBanner = true;
@@ -142,6 +147,10 @@
if ( $wgZeroDisableImages === 1 ) {
self::$forceClickToViewImages =
$wgZeroDisableImages;
}
+ if ( self::$isMainPage ) {
+ $redirect =
SpecialPage::getTitleFor( 'ZeroRatedMobileAccess' )->getLocalUrl();
+ $wgRequest->response()->header(
'Location: ' . $redirect );
+ }
$html = $out->getHTML();
$parsedHtml =
$this->parseLinksForZeroQueryString( $html );
$out->clearHTML();
@@ -149,7 +158,7 @@
$carrierLink = ( isset(
self::$carrier['link'] ) ) ? self::$carrier['link'] : '';
$bannerText = Html::rawElement( 'span',
array( 'id' =>
'zero-rated-banner-text' ),
- wfMsg(
'zero-rated-mobile-access-banner-text', $carrierLink ) );
+ $carrierLink );
$banner = Html::rawElement( 'div',
array( 'style' =>
'display:none;', 'id' => 'zero-rated-banner' ), $bannerText );
$output .= $banner;
@@ -446,9 +455,11 @@
}
public function createUrlCallback( $url, $name ) {
+ $carrier = strtolower( $name );
+ $linkText = wfMsg( 'zero-rated-mobile-access-banner-text-' .
$carrier, $name );
$carrierLink = Html::rawElement( 'a',
array( 'href' => $url ),
- $name );
+ $linkText );
return $carrierLink;
}
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
2012-03-13 18:30:37 UTC (rev 113743)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
2012-03-13 18:31:31 UTC (rev 113744)
@@ -23,6 +23,8 @@
'zero-rated-mobile-access-home-page-selection' => '$1 home page',
'zero-rated-mobile-access-home-page-selection-text' => 'Or go to the
home page in the following language:',
'zero-rated-mobile-access-banner-text' => 'Free {{SITENAME}} from $1',
+ 'zero-rated-mobile-access-banner-text-digi' => 'Free Access on $1 Opera
Mini',
+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'Free {{SITENAME}}
from $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Data charges
may apply if you continue: $1 or $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Yes',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'No',
@@ -370,6 +372,15 @@
'zero-rated-mobile-access-click-to-view-image' => 'Klik om de
afbeelding te zien of "$1"...',
);
+/** Polish (Polski)
+ * @author BeginaFelicysym
+ */
+$messages['pl'] = array(
+ 'zero-rated-mobile-access-search' => 'Szukaj',
+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Tak',
+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'Nie',
+);
+
/** Pashto (پښتو)
* @author Ahmed-Najib-Biabani-Ibrahimkhel
*/
@@ -403,6 +414,21 @@
'zero-rated-mobile-access-banner-text-data-charges-no' => 'Ne',
);
+/** Swedish (Svenska)
+ * @author WikiPhoenix
+ */
+$messages['sv'] = array(
+ 'zero-rated-mobile-access-search' => 'Sök',
+ 'zero-rated-mobile-access-language-selection' => 'Alla språk',
+ 'zero-rated-mobile-access-home-page-selection' => '$1 hemsida',
+ 'zero-rated-mobile-access-home-page-selection-text' => 'Eller gå till
hemsidan i följande språk:',
+ 'zero-rated-mobile-access-banner-text' => 'Gratis {{SITENAME}} från $1',
+ 'zero-rated-mobile-access-banner-text-data-charges' => 'Datakostnader
kan förekomma om du fortsätter: $1 eller $2',
+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ja',
+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'Nej',
+ 'zero-rated-mobile-access-click-to-view-image' => 'Klicka för att visa
bilden för, "$1"...',
+);
+
/** Telugu (తెలుగు)
* @author Veeven
*/
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
