Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62527
Change subject: Bug 44436.
......................................................................
Bug 44436.
* The language dropdown list on Special:ZeroRatedMobile Access
currently sends a user to the language code subdomain of
zero.wikipedia.org if the user is already on a subdomain of
zero.wikipedia.org.
* If a Wikipedia Zero partner carrier has not whitelisted a
language selected from the dropdown list, the user is presented
with a warning that Wikipedia Zero is not supported by the
carrier. Users may currently believe no further access is possible.
* This change provides the user the opportunity to visit Wikipedia
Zero in a non-whitelisted language, but with notification that
standard data charges may apply. The user will have the option
of not continuing with access to the non-whitelisted version of
Wikipedia.
Change-Id: Ifb7d1af237d08a8b12bb5e8ed5d82c93f32b0d06
---
M ZeroRatedMobileAccess.body.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/27/62527/1
diff --git a/ZeroRatedMobileAccess.body.php b/ZeroRatedMobileAccess.body.php
index 2d415b9..a970a7b 100644
--- a/ZeroRatedMobileAccess.body.php
+++ b/ZeroRatedMobileAccess.body.php
@@ -301,6 +301,7 @@
$carrierName = strtoupper(
self::$carrier['name'] );
$languageOptionsForCarrier = ( isset(
$languageOptionsForCarriers[$carrierName] ) ) ?
$languageOptionsForCarriers[$carrierName] : null;
+ $carrierWhitelistedLanguages = array();
if ( is_array( $languageOptionsForCarrier ) ) {
$sizeOfLanguagesForCountry = sizeof(
$languageOptionsForCarrier );
@@ -314,6 +315,7 @@
wfMessage(
'zero-rated-mobile-access-home-page-selection',
ucfirst(
$languageName ) )->inLanguage( $languageCode )
);
+ $carrierWhitelistedLanguages[]
= $languageCode;
if ( $wgZeroDisableImages === 1 ) {
$languageLink =
str_replace( '.m.wikipedia.org', '.zero.wikipedia.org', $languageLink );
} else {
@@ -337,8 +339,15 @@
foreach ( $languageNames as $languageCode =>
$languageName ) {
$languageUrl = sprintf(
self::$formatMobileUrl, $languageCode );
if ( $wgZeroDisableImages === 1 ) {
+ if ( in_array( $languageCode,
$carrierWhitelistedLanguages ) ) {
$languageUrl =
str_replace( '.m.wikipedia.org', '.zero.wikipedia.org', $languageUrl );
} else {
+ $urlAfterInterstitial =
str_replace( '.zero.wikipedia.org', '.m.wikipedia.org', $languageUrl );
+ $languageUrl =
$wgRequest->appendQuery(
+
'renderZeroRatedBanner=true&renderwarning=yes&returnto=' . urlencode(
$urlAfterInterstitial )
+ );
+ }
+ } else {
$languageUrl =
str_replace( '.zero.wikipedia.org', '.m.wikipedia.org', $languageUrl );
}
$output .= Html::element( 'option',
--
To view, visit https://gerrit.wikimedia.org/r/62527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb7d1af237d08a8b12bb5e8ed5d82c93f32b0d06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: production
Gerrit-Owner: Dr0ptp4kt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
