https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115013
Revision: 115013
Author: preilly
Date: 2012-04-23 16:12:40 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
1.19wmf: MFG Change-Id: If963bab623da57529644b32dac6f29d7747cbe5b
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-04-23 13:38:11 UTC (rev 115012)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-04-23 16:12:40 UTC (rev 115013)
@@ -42,10 +42,11 @@
private static $renderZeroRatedRedirect;
private static $forceClickToViewImages;
public static $useFormat;
+ public static $renderWarning = false;
- public static function onBeforePageDisplay( &$out, &$text ) {
+ public static function onBeforePageDisplay( &$out, &$options ) {
$ext = new ExtZeroRatedMobileAccess();
- return $ext->beforePageDisplayHTML( $out, $text );
+ return $ext->beforePageDisplayHTML( $out, $options );
}
public static function getMobileUrl( &$subdomainTokenReplacement ) {
@@ -64,7 +65,7 @@
* @param $text String
* @return bool
*/
- public function beforePageDisplayHTML( &$out, &$text ) {
+ public function beforePageDisplayHTML( &$out, &$options ) {
global $wgRequest, $wgConf,
$wgEnableZeroRatedMobileAccessTesting, $wgZeroDisableImages;
wfProfileIn( __METHOD__ );
@@ -124,7 +125,23 @@
}
}
- if ( self::$isFilePage && self::$acceptBilling !==
'yes' && self::$renderZeroRatedBanner === true ) {
+ if ( self::$isFilePage ) {
+ self::$renderWarning = true;
+ } else {
+ $renderWarningFlag = $wgRequest->getVal(
'renderwarning' );
+ if ( $renderWarningFlag === 'yes' ) {
+ self::$renderWarning = true;
+ }
+ }
+
+ if ( self::$renderZeroRatedBanner === true ) {
+ self::$carrier = $this->lookupCarrier( $carrier
);
+ $options = array();
+ $options['toggle_view_desktop'] =
'&renderZeroRatedBanner=true&renderwarning=yes&returnto=';
+ $options['supported_languages'] = isset(
self::$carrier['languages'] ) ? self::$carrier['languages'] : '';
+ }
+
+ if ( self::$renderWarning && self::$acceptBilling !==
'yes' && self::$renderZeroRatedBanner === true ) {
$referrer = $wgRequest->getHeader( 'referer' );
$acceptBillingYes = Html::rawElement( 'a',
array( 'href' => str_replace(
'.wikipedia.org/', '.m.wikipedia.org/', wfExpandUrl( $wgRequest->appendQuery(
'acceptbilling=yes' ), PROTO_CURRENT ) ) ),
@@ -158,7 +175,6 @@
$out->clearHTML();
$out->setPageTitle( null );
} elseif ( self::$renderZeroRatedBanner === true ) {
- self::$carrier = $this->lookupCarrier( $carrier
);
if ( isset( self::$carrier['name'] ) ) {
if ( $wgZeroDisableImages === 1 ) {
self::$forceClickToViewImages =
$wgZeroDisableImages;
@@ -175,7 +191,9 @@
array( 'id' =>
'zero-rated-banner-text' ),
$carrierLink );
$banner = Html::rawElement( 'div',
- array( 'style' =>
'display:none;', 'id' => 'zero-rated-banner' ), $bannerText );
+ array( 'style' =>
'display:none;', 'id' => 'zero-rated-banner' ),
+ '<span
class="notify-close"><a id="dismiss-notification" title="' .
+ wfMsg(
'zero-rated-mobile-access-dismiss-notification' ) . '">×</a></span>' .
$bannerText );
$output .= $banner;
}
}
@@ -246,6 +264,30 @@
return true;
}
+ private function mergeCarrierData() {
+ $allCarrierLinkData = $this->createCarrierOptionsFromWikiText();
+ $allCarrierSupportedLanguageData =
$this->getLanguageOptionForWikiFromWikiText();
+
+ if ( is_array( $allCarrierLinkData ) && is_array(
$allCarrierSupportedLanguageData ) ) {
+ foreach ( $allCarrierLinkData as $key => $value ) {
+ if ( is_array( $value ) && array_key_exists(
'partnerId', $value ) ) {
+ foreach ( $value as $subKey =>
$subValue ) {
+ if ( $subKey === 'partnerId' ) {
+ if ( isset(
$allCarrierSupportedLanguageData[$subValue][0] ) &&
+ is_array(
$allCarrierSupportedLanguageData[$subValue][0] ) ) {
+
$allCarrierLinkData[$key]['languages'] =
$allCarrierSupportedLanguageData[$subValue][0];
+ } else {
+
$allCarrierLinkData[$key]['languages'] = 'all';
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return $allCarrierLinkData;
+ }
+
/**
* Returns information about carrier
*
@@ -257,7 +299,7 @@
$carrierLinkData = array();
$carrier = strtoupper( $carrier );
- $allCarrierLinkData = $this->createCarrierOptionsFromWikiText();
+ $allCarrierLinkData = $this->mergeCarrierData();
if ( is_array( $allCarrierLinkData ) ) {
if ( isset( $allCarrierLinkData[$carrier] ) ) {
@@ -354,7 +396,11 @@
wfProfileIn( __METHOD__ );
$data = explode( PHP_EOL, $wikiText );
if ( $nChild ) {
+ $arrayKeys = array_keys( $formatter );
+ $keyCount = count( $arrayKeys );
+ $index = 0;
foreach ( $data as $key => $rawData ) {
+ $index = ( intval( $key ) % $keyCount === 0 ) ?
0 : $index + 1;
if ( strpos( $rawData, '*' ) === 0 && strpos(
$rawData, '**' ) !== 0 && $key >= 0 ) {
$data = trim( str_replace( '*', '',
$rawData ) );
$prefixName = strtoupper( $data );
@@ -365,10 +411,10 @@
$options[$prefixName][] = $data;
continue;
}
- if ( !isset( $formatter[0]['callback']
) ) {
+ if ( !isset(
$formatter[$index]['callback'] ) ) {
continue;
}
- $callback = $formatter[0]['callback'];
+ $callback =
$formatter[$index]['callback'];
if ( method_exists( $this, $callback )
) {
$data = $this->$callback( $data
);
if ( $data ) {
@@ -428,7 +474,12 @@
return $options;
}
+ public function commaSeparatedCallback( $data ) {
+ return explode( ',', str_replace( ' ', '', $data ) );
+ }
+
public function createUrlCallback( $url, $name ) {
+ global $wgRequest;
$carrier = strtolower( $name );
$posSpace = strpos( $carrier, ' ' );
if ( $posSpace === false ) {
@@ -443,8 +494,9 @@
}
$linkText = wfMsg( 'zero-rated-mobile-access-banner-text-' .
$carrier, $name );
+ $billingURL = $wgRequest->appendQuery(
'renderZeroRatedBanner=true&renderwarning=yes&returnto=' . urlencode( $url ) );
$carrierLink = Html::rawElement( 'a',
- array( 'href' => $url ),
+ array( 'href' => $billingURL ),
$linkText );
return $carrierLink;
}
@@ -595,6 +647,40 @@
return $languageOptions;
}
+ private function getLanguageOptionForWikiFromWikiText() {
+ global $wgMemc;
+ wfProfileIn( __METHOD__ );
+ $languageOptionsWikiPage = wfMsgForContent(
'zero-rated-mobile-access-carrier-options-supported-wikis-wiki-page' );
+
+ list( $revId, $rev ) = self::getOptionsFromForeignWiki(
$languageOptionsWikiPage );
+
+ if ( $rev ) {
+ $key = wfMemcKey(
'zero-rated-mobile-access-carrier-options-supported-wikis-wiki-page', $revId );
+ $languageOptions = $wgMemc->get( $key );
+ } else {
+ $languageOptions = null;
+ }
+
+ if ( !$languageOptions ) {
+ $languageOptions = array();
+ $lines = array();
+ if ( $rev ) {
+ $formatter = array(
+ 0 => array( 'name' => 'partnerId',
+ 'callback' =>
'intValCallback'
+ ),
+ 1 => array( 'name' => 'languages',
+ 'callback' =>
'commaSeparatedCallback'
+ ),
+ );
+ $languageOptions = $this->parseWikiTextToArray(
$formatter, $rev, true );
+ }
+ $wgMemc->set( $key, $languageOptions, self::getMaxAge()
);
+ }
+ wfProfileOut( __METHOD__ );
+ return $languageOptions;
+ }
+
/**
* Returns the Unix timestamp of current day's first second
*
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
2012-04-23 13:38:11 UTC (rev 115012)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
2012-04-23 16:12:40 UTC (rev 115013)
@@ -20,6 +20,7 @@
'zero-rated-mobile-access-search' => 'Search',
'zero-rated-mobile-access-language-options-wiki-page' =>
'zero-rated-mobile-access-language-options',
'zero-rated-mobile-access-carrier-options-wiki-page' =>
'zero-rated-mobile-access-carrier-options',
+ 'zero-rated-mobile-access-carrier-options-supported-wikis-wiki-page' =>
'zero-rated-mobile-access-carrier-options-supported-wikis',
'zero-rated-mobile-access-language-selection' => 'All languages',
'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:',
@@ -28,11 +29,14 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' =>
'{{SITENAME}} access offered by $1',
'zero-rated-mobile-access-banner-text-orange-uganda' => '{{SITENAME}}
access offered by $1',
'zero-rated-mobile-access-banner-text-orange-tunisia' => '{{SITENAME}}
access offered by $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => '{{SITENAME}}
access offered by $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => '{{SITENAME}}
access offered by $1',
'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',
'zero-rated-mobile-access-click-to-view-image' => 'Click to view image
of, "$1"...',
+ 'zero-rated-mobile-access-dismiss-notification' => 'dismiss this
notification',
);
/** Message documentation (Message documentation)
@@ -63,6 +67,7 @@
{{Identical|No}}',
'zero-rated-mobile-access-click-to-view-image' => 'Text for viewing an
image link. Parameters:
* $1 is the alt text of the image that can be viewed.',
+ 'zero-rated-mobile-access-dismiss-notification' => 'Text for dismissing
banner on top of screen',
);
/** Ṫuroyo (Ṫuroyo)
@@ -81,6 +86,8 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' =>
'تصفحوموسعة ويكيبيديا مجانا $1 مع',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'تصفحوموسعة
ويكيبيديا مجانا $1 مع',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'تصفحوموسعة
ويكيبيديا مجانا $1 مع',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'تصفحوموسعة
ويكيبيديا مجانا $1 مع',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'تصفحوموسعة
ويكيبيديا مجانا $1 مع',
'zero-rated-mobile-access-banner-text-data-charges' => 'الرابط الموالى
ليس مجانى، هل تريد المواصلة؟ $1 / $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'نعم',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'لا',
@@ -90,16 +97,25 @@
* @author Xuacu
*/
$messages['ast'] = array(
+ 'zeroratedmobileaccess' => 'Accesu móvil ensin cargu',
'zero-rated-mobile-access-desc' => 'Ufre carauterístiques pa los
fornidores de servicios móviles que dan accesu de baldre',
'zero-rated-mobile-access-search' => 'Guetar',
'zero-rated-mobile-access-language-selection' => 'Toles llingües',
'zero-rated-mobile-access-home-page-selection' => 'Páxina principal en
$1',
'zero-rated-mobile-access-home-page-selection-text' => 'O dir a la
páxina principal na llingua siguiente:',
'zero-rated-mobile-access-banner-text' => '{{SITENAME}} de baldre dende
$1',
+ 'zero-rated-mobile-access-banner-text-digi' => 'Accesu de baldre con $1
Opera Mini',
+ 'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Accesu a
{{SITENAME}} ufríu por $1',
+ 'zero-rated-mobile-access-banner-text-orange-uganda' => 'Accesu a
{{SITENAME}} ufríu por $1',
+ 'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Accesu a
{{SITENAME}} ufríu por $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Accesu a
{{SITENAME}} ufríu por $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Accesu a
{{SITENAME}} ufríu por $1',
+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} de
baldre dende $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Si sigues puen
aplicase tarifes de datos: $1 o $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Sí',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'Non',
'zero-rated-mobile-access-click-to-view-image' => 'Calca pa ver esta
imaxe, "$1"...',
+ 'zero-rated-mobile-access-dismiss-notification' => 'anubrir esta
notificación',
);
/** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
@@ -150,11 +166,14 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Von $1
angebotener Zugriff auf {{SITENAME}}',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Von $1
angebotener Zugriff auf {{SITENAME}}',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Von $1
angebotener Zugriff auf {{SITENAME}}',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Von $1
angebotener Zugriff auf {{SITENAME}}',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Von $1
angebotener Zugriff auf {{SITENAME}}',
'zero-rated-mobile-access-banner-text-wikimedia' => 'Kostenfreier
Zugriff auf {{SITENAME}} über $1',
'zero-rated-mobile-access-banner-text-data-charges' =>
'Datenübertragungsgebühren können anwendbar sein: $1 oder $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ja',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'Nein',
'zero-rated-mobile-access-click-to-view-image' => 'Hier klicken, um das
Bild von „$1“ zu sehen …',
+ 'zero-rated-mobile-access-dismiss-notification' => 'Diese
Benachrichtigung schließen',
);
/** German (formal address) (Deutsch (Sie-Form))
@@ -206,6 +225,7 @@
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Sí',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'No',
'zero-rated-mobile-access-click-to-view-image' => 'Haga clic para ver
la imagen de, "$1"...',
+ 'zero-rated-mobile-access-dismiss-notification' => 'Rechazar esta
notificación',
);
/** Persian (فارسی)
@@ -244,6 +264,8 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Accès à
Wikipedia offert par $1',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Accès à
Wikipedia offert par $1',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Accès à
Wikipedia offert par $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Accès à
Wikipedia offert par $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Accès à
Wikipedia offert par $1',
'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} libre
depuis $1',
'zero-rated-mobile-access-banner-text-data-charges' => "Des frais de
connexions peuvent s'appliquer, continuez? $1 / $2",
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Oui',
@@ -307,6 +329,8 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Přistup
na {{GRAMMAR:akuzatiw|{{STENAME}}}} poskićeny wot $1',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Přistup na
{{GRAMMAR:akuzatiw|{{STENAME}}}} poskićeny wot $1',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Přistup na
{{GRAMMAR:akuzatiw|{{STENAME}}}} poskićeny wot $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Přistup na
{{GRAMMAR:akuzatiw|{{STENAME}}}} poskićeny wot $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Přistup na
{{GRAMMAR:akuzatiw|{{STENAME}}}} poskićeny wot $1',
'zero-rated-mobile-access-banner-text-wikimedia' => 'Swobodna
{{SITENAME}} wot $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Při přenjesenju
datow móža so popłatki zběrać: $1 abo $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Haj',
@@ -329,11 +353,14 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Accesso a
{{SITENAME}} offerite per $1',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Accesso a
{{SITENAME}} offerite per $1',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Accesso a
{{SITENAME}} offerite per $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Accesso a
{{SITENAME}} offerite per $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Accesso a
{{SITENAME}} offerite per $1',
'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}}
gratuite de $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Costos de datos
pote esser applicate. Continuar ($1 o $2)?',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Si',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'No',
'zero-rated-mobile-access-click-to-view-image' => 'Clicca pro vider le
imagine de "$1"...',
+ 'zero-rated-mobile-access-dismiss-notification' => 'clauder iste
notification',
);
/** Indonesian (Bahasa Indonesia)
@@ -341,6 +368,10 @@
*/
$messages['id'] = array(
'zero-rated-mobile-access-banner-text-digi' => 'Akses Gratis dengan $1
Opera Mini',
+ 'zero-rated-mobile-access-banner-text-data-charges' => 'Biaya data akan
dikenakan untuk melanjutkan : $1 atau $2',
+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'ya',
+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'tidak',
+ 'zero-rated-mobile-access-click-to-view-image' => 'Klik untuk
menampilkan gambar "$"...',
);
/** Icelandic (Íslenska)
@@ -375,10 +406,15 @@
/** Japanese (日本語)
* @author Patrick Reilly
+ * @author Shirayuki
*/
$messages['ja'] = array(
'zero-rated-mobile-access-desc' => 'ゼロ格モバイルアクセス',
'zero-rated-mobile-access-search' => '検索する',
+ 'zero-rated-mobile-access-language-selection' => 'すべての言語',
+ 'zero-rated-mobile-access-home-page-selection' => '$1 ホームページ',
+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'はい',
+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'いいえ',
);
/** Kannada (ಕನ್ನಡ)
@@ -431,17 +467,21 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Пристапот
до {{SITENAME}} го овозможува $1',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Пристапот до
{{SITENAME}} го овозможува $1',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Пристапот до
{{SITENAME}} го овозможува $1',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Пристапот до
{{SITENAME}} го овозможува $1',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Пристапот до
{{SITENAME}} го овозможува $1',
'zero-rated-mobile-access-banner-text-wikimedia' => 'Бесплатна
{{SITENAME}} од $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Може да ви биде
побарана доплата за податоците. Сакате да продолжите? $1 / $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Да',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'Не',
'zero-rated-mobile-access-click-to-view-image' => 'Стиснете за да ја
погледате сликата на „$1“...',
+ 'zero-rated-mobile-access-dismiss-notification' => 'отстрани го
известувањето',
);
/** Malayalam (മലയാളം)
* @author Praveenp
*/
$messages['ml'] = array(
+ 'zeroratedmobileaccess' => 'മൊബൈൽ വഴിയുള്ള സൗജന്യ ലഭ്യത',
'zero-rated-mobile-access-desc' => 'മൊബൈൽ സേവനദാതാക്കൾക്ക് സൗജന്യ ലഭ്യത
നൽകുന്ന സവിശേഷതകൾ നൽകുന്നു',
'zero-rated-mobile-access-search' => 'തിരയുക',
'zero-rated-mobile-access-language-selection' => 'എല്ലാ ഭാഷകളും',
@@ -449,6 +489,9 @@
'zero-rated-mobile-access-home-page-selection-text' => 'അഥവാ
താഴെക്കൊടുക്കുന്ന ഭാഷയിലെ പ്രധാന താളിലേയ്ക്ക് പോവുക:',
'zero-rated-mobile-access-banner-text' => '$1 നൽകുന്ന സൗജന്യ
{{SITENAME}}',
'zero-rated-mobile-access-banner-text-digi' => '$1 ഓപ്പറ മിനിയിൽ സൗജന്യ
ലഭ്യത',
+ 'zero-rated-mobile-access-banner-text-orange-ivory-coast' =>
'{{SITENAME}} ലഭ്യത നൽകുന്നത്: $1',
+ 'zero-rated-mobile-access-banner-text-orange-uganda' => '{{SITENAME}}
ലഭ്യത നൽകുന്നത്: $1',
+ 'zero-rated-mobile-access-banner-text-orange-tunisia' => '{{SITENAME}}
ലഭ്യത നൽകുന്നത്: $1',
'zero-rated-mobile-access-banner-text-wikimedia' => '$1 നൽകുന്ന സൗജന്യ
{{SITENAME}}',
'zero-rated-mobile-access-banner-text-data-charges' => 'തുടരുകയാണെങ്കിൽ
ഡേറ്റ ചാർജുകൾ ഈടാക്കപ്പെട്ടേക്കാം: $1 അഥവാ $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'ശരി',
@@ -468,6 +511,9 @@
'zero-rated-mobile-access-home-page-selection-text' => 'Atau pergi ke
laman utama dalam bahasa yang berikut:',
'zero-rated-mobile-access-banner-text' => '{{SITENAME}} percuma
daripada $1',
'zero-rated-mobile-access-banner-text-digi' => 'Akses percuma di $1
Opera Mini',
+ 'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Akses
{{SITENAME}} ditawarkan oleh $1',
+ 'zero-rated-mobile-access-banner-text-orange-uganda' => 'Akses
{{SITENAME}} ditawarkan oleh $1',
+ 'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Akses
{{SITENAME}} ditawarkan oleh $1',
'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}}
percuma daripada $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Tertakluk
kepada caj data, sambung? $1 atau $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ya',
@@ -493,9 +539,11 @@
);
/** Dutch (Nederlands)
+ * @author SPQRobin
* @author Siebrand
*/
$messages['nl'] = array(
+ 'zeroratedmobileaccess' => 'Gratis toegang via mobiele data',
'zero-rated-mobile-access-desc' => 'Biedt functies om mobiele providers
vrije toegang te laden aanbieden',
'zero-rated-mobile-access-search' => 'Zoeken',
'zero-rated-mobile-access-language-selection' => 'Alle talen',
@@ -503,6 +551,9 @@
'zero-rated-mobile-access-home-page-selection-text' => 'Of ga naar de
startpagina in de volgende taal:',
'zero-rated-mobile-access-banner-text' => 'Gratis {{SITENAME}} van $1',
'zero-rated-mobile-access-banner-text-digi' => 'Gratis toegang tot $1
Opera Mini',
+ 'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Toegang
tot {{SITENAME}} aangeboden door $1',
+ 'zero-rated-mobile-access-banner-text-orange-uganda' => 'Toegang tot
{{SITENAME}} aangeboden door $1',
+ 'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Toegang tot
{{SITENAME}} aangeboden door $1',
'zero-rated-mobile-access-banner-text-wikimedia' => 'Gratis
{{SITENAME}} van $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'U moet mogelijk
datakosten betalen als u doorgaat: $1 of $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ja',
@@ -592,11 +643,14 @@
'zero-rated-mobile-access-banner-text-orange-ivory-coast' => 'Truy cập
{{SITENAME}} do $1 cung cấp',
'zero-rated-mobile-access-banner-text-orange-uganda' => 'Truy cập
{{SITENAME}} do $1 cung cấp',
'zero-rated-mobile-access-banner-text-orange-tunisia' => 'Truy cập
{{SITENAME}} do $1 cung cấp',
+ 'zero-rated-mobile-access-banner-text-orange-niger' => 'Truy cập
{{SITENAME}} do $1 cung cấp',
+ 'zero-rated-mobile-access-banner-text-orange-cameroon' => 'Truy cập
{{SITENAME}} do $1 cung cấp',
'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} miễn
phí từ $1',
'zero-rated-mobile-access-banner-text-data-charges' => 'Các chi phí dữ
liệu có thể được áp dụng nếu bạn tiếp tục: $1 hoặc $2',
'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Có',
'zero-rated-mobile-access-banner-text-data-charges-no' => 'Không',
'zero-rated-mobile-access-click-to-view-image' => 'Bấm để xem hình
“$1”…',
+ 'zero-rated-mobile-access-dismiss-notification' => 'bỏ qua thông báo
này',
);
/** Yiddish (ייִדיש)
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php
2012-04-23 13:38:11 UTC (rev 115012)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php
2012-04-23 16:12:40 UTC (rev 115013)
@@ -42,7 +42,7 @@
$wgEnableZeroRatedMobileAccessTesting = false;
-$wgHooks['BeforePageDisplay'][] =
'ExtZeroRatedMobileAccess::onBeforePageDisplay';
+$wgHooks['BeforePageDisplayMobile'][] =
'ExtZeroRatedMobileAccess::onBeforePageDisplay';
$wgHooks['GetMobileUrl'][] = 'ExtZeroRatedMobileAccess::getMobileUrl';
$wgSpecialPages['ZeroRatedMobileAccess'] = 'ZeroRatedMobileAccess';
$wgSpecialPageGroups['ZeroRatedMobileAccess'] = 'other';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
