From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 24 Jul 2017 15:44:30 +0000 (+0000)
Subject: Merge "Show legend of Special:SpecialPages more gradually"
X-Git-Tag: 1.31.0-rc.0~2622
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=a8dcb178c7e347ef56bef1e36bb4a26a61a1d82b;hp=f38d3d348ff10654d2c6eec1d6f904fb051bf54d;p=lhc%2Fweb%2Fwiklou.git

Merge "Show legend of Special:SpecialPages more gradually"
---

diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index 451669ce61..4f29082227 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -130,9 +130,29 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 			);
 		}
 
-		if ( $includesRestrictedPages || $includesCachedPages ) {
-			$out->wrapWikiMsg( "<h2 class=\"mw-specialpages-note-top\">$1</h2>", 'specialpages-note-top' );
-			$out->wrapWikiMsg( "<div class=\"mw-specialpages-notes\">\n$1\n</div>", 'specialpages-note' );
+		// add legend
+		$notes = [];
+		if ( $includesRestrictedPages ) {
+			$restricedMsg = $this->msg( 'specialpages-note-restricted' );
+			if ( !$restricedMsg->isDisabled() ) {
+				$notes[] = $restricedMsg->plain();
+			}
+		}
+		if ( $includesCachedPages ) {
+			$cachedMsg = $this->msg( 'specialpages-note-cached' );
+			if ( !$cachedMsg->isDisabled() ) {
+				$notes[] = $cachedMsg->plain();
+			}
+		}
+		if ( $notes !== [] ) {
+			$out->wrapWikiMsg(
+				"<h2 class=\"mw-specialpages-note-top\">$1</h2>", 'specialpages-note-top'
+			);
+			$out->addWikiText(
+				"<div class=\"mw-specialpages-notes\">\n" .
+				implode( "\n", $notes ) .
+				"\n</div>"
+			);
 		}
 	}
 }
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 929042f216..85dd4932d5 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3781,7 +3781,8 @@
 	"specialpages": "Special pages",
 	"specialpages-summary": "",
 	"specialpages-note-top": "Legend",
-	"specialpages-note": "* Normal special pages.\n* <span class=\"mw-specialpagerestricted\">Restricted special pages.</span>",
+	"specialpages-note-restricted": "* Normal special pages.\n* <span class=\"mw-specialpagerestricted\">Restricted special pages.</span>",
+	"specialpages-note-cached": "-",
 	"specialpages-group-maintenance": "Maintenance reports",
 	"specialpages-group-other": "Other special pages",
 	"specialpages-group-login": "Login / create account",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 719f413b25..699ac96b5c 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -3971,7 +3971,8 @@
 	"specialpages": "{{doc-special|SpecialPages|unlisted=1}}\nDisplay name of link to [[Special:SpecialPages]] shown on all pages in the toolbox.\n\nSee also:\n* {{msg-mw|Specialpages}}\n* {{msg-mw|Accesskey-t-specialpages}}\n* {{msg-mw|Tooltip-t-specialpages}}\n{{Identical|Special page}}",
 	"specialpages-summary": "{{doc-specialpagesummary|specialpages}}",
 	"specialpages-note-top": "Heading for {{msg-mw|specialpages-note}}.\n{{Identical|Legend}}",
-	"specialpages-note": "Footer note for the [[Special:SpecialPages]] page",
+	"specialpages-note-restricted": "Footer note for the [[Special:SpecialPages]] page",
+	"specialpages-note-cached": "{{ignore}}\nFooter note for the [[Special:SpecialPages]] page",
 	"specialpages-group-maintenance": "{{doc-special-group|like=[[Special:DoubleRedirects]], [[Special:LonelyPages]] and [[Special:WantedPages]]}}",
 	"specialpages-group-other": "{{doc-special-group|like=[[Special:AdminLinks]] and [[Special:BookSources]]}}",
 	"specialpages-group-login": "{{doc-special-group|like=[[Special:UserLogin]]}}",