jenkins-bot has submitted this change and it was merged.

Change subject: Add badges intro to Special:SetSiteLink only when badges are 
available
......................................................................


Add badges intro to Special:SetSiteLink only when badges are available

Change-Id: Ifac17ad8647cd64d04711a2ffb7a1a7583b20cdd
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialSetSiteLink.php
3 files changed, 15 insertions(+), 6 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Bene: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 34bb535..4010e75 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -156,7 +156,8 @@
        "wikibase-setaliases-warning-remove": "Do you really want to remove all 
aliases of [[$1]]?",
        "special-setsitelink": "Set a site link",
        "wikibase-setsitelink-introfull": "You are setting the site link of $2 
for [[$1]].",
-       "wikibase-setsitelink-intro": "This form allows you to set the site 
link of an item. You need to provide the id of the item (e.g. Q23), a site id 
(e.g. \"enwiki\") and the site link to set to. Additionally you can set various 
badges for this site link which are listed below.",
+       "wikibase-setsitelink-intro": "This form allows you to set the site 
link of an item. You need to provide the id of the item (e.g. Q23), a site id 
(e.g. \"enwiki\") and the site link to set to.",
+       "wikibase-setsitelink-intro-badges": "Additionally you can set various 
badges for this site link which are listed below.",
        "wikibase-setsitelink-site": "Site id:",
        "wikibase-setsitelink-label": "Site link:",
        "wikibase-setsitelink-badges": "Badges:",
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index 75fc0a3..bbdfdba 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -5,6 +5,7 @@
                        "Adam Shorland",
                        "Amire80",
                        "Aude",
+                       "Bene*",
                        "Beta16",
                        "Daniel Werner",
                        "DavidL",
@@ -13,8 +14,11 @@
                        "Jeblad",
                        "Kaganer",
                        "Kghbln",
+                       "Liuxinyu970226",
                        "Lokal Profil",
                        "Ltrlg",
+                       "Mar(c)",
+                       "Matěj Suchánek",
                        "McDutchie",
                        "Metalhead64",
                        "Minh Nguyen",
@@ -29,10 +33,7 @@
                        "Siebrand",
                        "Stryn",
                        "ZxxZxxZ",
-                       "아라",
-                       "Matěj Suchánek",
-                       "Mar(c)",
-                       "Liuxinyu970226"
+                       "아라"
                ]
        },
        "wikibase-desc": 
"{{desc|name=Wikibase|url=http://www.mediawiki.org/wiki/Extension:Wikibase}}\nSee
 also [[d:Wikidata:Glossary#Wikidata|Wikidata]].",
@@ -179,6 +180,7 @@
        "special-setsitelink": "{{doc-special|SetSiteLink}}\nThe special page 
allows the user to set a site link for an item.",
        "wikibase-setsitelink-introfull": "Intro text when a site link is to be 
set. Parameters:\n* $1 - the ID that links to the item\n* $2 - the site id the 
site link is to be set to",
        "wikibase-setsitelink-intro": "A short text at the top of the page that 
allows users to set the site link of an item, explaining the form.",
+       "wikibase-setsitelink-intro-badges": "An addition to the the text at 
the top of the page that allows users to set the site link of an item, 
explaining the badges input.",
        "wikibase-setsitelink-site": "Label for the input field to type the 
site id to set the site link to.",
        "wikibase-setsitelink-label": "Label for the input field to type the 
site link to set the item to.",
        "wikibase-setsitelink-badges": "Label for the input field to type the 
badges to set the item to.\n{{Identical|Badge}}",
diff --git a/repo/includes/specials/SpecialSetSiteLink.php 
b/repo/includes/specials/SpecialSetSiteLink.php
index 7d199ff..629fe6b 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -279,10 +279,16 @@
                        . $pageinput;
                }
                else {
+                       $intro = $this->msg( 'wikibase-setsitelink-intro' 
)->text();
+
+                       if ( !empty( $this->badgeItems ) ) {
+                               $intro .= $this->msg( 'word-separator' 
)->text() . $this->msg( 'wikibase-setsitelink-intro-badges' )->text();
+                       }
+
                        return Html::element(
                                'p',
                                array(),
-                               $this->msg( 'wikibase-setsitelink-intro' 
)->parse()
+                               $intro
                        )
                        . parent::getFormElements( $entity )
                        . Html::element(

-- 
To view, visit https://gerrit.wikimedia.org/r/150632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifac17ad8647cd64d04711a2ffb7a1a7583b20cdd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to