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

Change subject: Fix sitename use in section description
......................................................................


Fix sitename use in section description

Fixes issue described on TWN -

https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Betafeatures-section-desc/en

Thanks, siebrand!

Change-Id: Ib6db374c6b4a53e6f3670d43d68d4462b1a9bf95
---
M BetaFeatures.i18n.php
M BetaFeaturesHooks.php
2 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BetaFeatures.i18n.php b/BetaFeatures.i18n.php
index 7aca582..b783748 100644
--- a/BetaFeatures.i18n.php
+++ b/BetaFeatures.i18n.php
@@ -41,7 +41,7 @@
        'betafeatures-toplink' => 'Beta',
 
        'betafeatures-auto-enroll' => 'Automatically enable all new beta 
features',
-       'betafeatures-section-desc' => 'Here {{PLURAL:$1|is a new feature|are 
some new features}} we\'re considering for $2. Please try {{PLURAL:$1|it|them}} 
out and give us your thoughts, so we can improve {{PLURAL:$1|it|them}} based on 
your feedback.',
+       'betafeatures-section-desc' => 'Here {{PLURAL:$1|is a new feature|are 
some new features}} we\'re considering for {{SITENAME}}. Please try 
{{PLURAL:$1|it|them}} out and give us your thoughts, so we can improve 
{{PLURAL:$1|it|them}} based on your feedback.',
 
        // Test messages
        'betafeatures-test-check-field' => 'blah blah blah', # do not translate 
or duplicate this message to other languages
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index ffa0f3e..0bf4829 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -144,8 +144,6 @@
         * @throws BetaFeaturesMissingFieldException
         */
        public static function getPreferences( User $user, array &$prefs ) {
-               global $wgSitename;
-
                $betaPrefs = array();
                $depHooks = array();
 
@@ -162,7 +160,7 @@
                                Html::rawElement(
                                        'p',
                                        array(),
-                                       wfMessage( 'betafeatures-section-desc', 
count( $betaPrefs ), $wgSitename )->text()
+                                       wfMessage( 'betafeatures-section-desc', 
count( $betaPrefs ) )->text()
                                ),
 
                                Html::rawElement( 'p', array(), implode( ' | ', 
array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6db374c6b4a53e6f3670d43d68d4462b1a9bf95
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
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