jenkins-bot has submitted this change and it was merged.
Change subject: Make interstitial title customizable
......................................................................
Make interstitial title customizable
The title of the exit warning interstitial should be customizable
per-partner like the message and quota button.
Bug: T115580
Change-Id: I1a6e9e967cbecfa40e5858d84782390f8bcb4eea
---
M includes/PageRendering.php
M includes/ZeroConfig.php
M modules/zerobanner.interstitial/ZeroOverlay.js
3 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 0de689d..f7442f6 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -139,6 +139,11 @@
$lang = $ctxSrc->getLanguage();
$cfg['name'] = self::pickLocalizedString(
$config->name(), $lang ) ?: '?';
+ $exitTitle = self::pickLocalizedString(
$config->exitTitles(), $lang );
+ if ( $exitTitle ) {
+ $cfg['exitTitle'] = $exitTitle;
+ }
+
$exitWarnings = $config->exitWarnings();
if ( array_key_exists( $lang->getCode(), $exitWarnings
) ) {
$cfg['exitWarning'] =
$exitWarnings[$lang->getCode()];
diff --git a/includes/ZeroConfig.php b/includes/ZeroConfig.php
index 07da756..7abe637 100644
--- a/includes/ZeroConfig.php
+++ b/includes/ZeroConfig.php
@@ -127,6 +127,10 @@
return $this->getDataWithDefaults()->partnerInfoUrl;
}
+ public function exitTitles() {
+ return $this->getDataWithDefaults()->exitTitles;
+ }
+
public function exitWarnings() {
return $this->getDataWithDefaults()->exitWarnings;
}
@@ -234,6 +238,8 @@
$this->test( 'name', self::getLangToStrValidator() );
// Map of localized banner texts with {{PARTNER}} placeholder
$this->test( 'banner', self::getLangToStrValidator() );
+ // Map of localized exit interstitial titles
+ $this->test( 'exitTitles', self::getLangToStrValidator() );
// Map of localized exit interstitial warning texts
$this->test( 'exitWarnings', self::getLangToStrValidator() );
// Map of localized exit interstitial custom url button text
diff --git a/modules/zerobanner.interstitial/ZeroOverlay.js
b/modules/zerobanner.interstitial/ZeroOverlay.js
index d04901c..40d80c3 100644
--- a/modules/zerobanner.interstitial/ZeroOverlay.js
+++ b/modules/zerobanner.interstitial/ZeroOverlay.js
@@ -29,6 +29,9 @@
'click .zero-button-cancel': 'onCancelButtonClick'
},
initialize: function ( options ) {
+ if ( cfg && cfg.exitTitle ) {
+ options.heading = cfg.exitTitle;
+ }
options.warning = cfg && cfg.exitWarning ?
cfg.exitWarning :
mw.msg( options.image ? 'zero-file-auth' :
'zero-charge-auth' );
ContentOverlay.prototype.initialize.call( this, options
);
--
To view, visit https://gerrit.wikimedia.org/r/246676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a6e9e967cbecfa40e5858d84782390f8bcb4eea
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Jhobs <jhob...@wikimedia.org>
Gerrit-Reviewer: Jhobs <jhob...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
