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

Change subject: Custom privacypage message for labs to point to correct policies
......................................................................


Custom privacypage message for labs to point to correct policies

Bug: T77858
Change-Id: Icef94283354dd83800c26698060feb49f38e5095
---
M WikimediaMessages.hooks.php
M i18n/wikimediaoverrides/en.json
M i18n/wikimediaoverrides/qqq.json
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 94b9f44..9f45771 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -20,7 +20,7 @@
         * @return bool
         */
        public static function onMessageCacheGet( &$lcKey ) {
-               global $wgLanguageCode;
+               global $wgLanguageCode, $wmfRealm;
 
                static $keys = array(
                        'createacct-helpusername',
@@ -37,7 +37,9 @@
                        'mwoauthserver-invalid-user',
                );
 
-               if ( in_array( $lcKey, $keys, true ) ) {
+               if ( $wmfRealm === 'labs' && $lcKey === 'privacypage' ) {
+                       $lcKey = 'wikimedia-privacypage-labs';
+               } elseif ( in_array( $lcKey, $keys, true ) ) {
                        $prefixedKey ="wikimedia-$lcKey";
 
                        // MessageCache uses ucfirst if ord( key ) is < 128, 
which is true of all
diff --git a/i18n/wikimediaoverrides/en.json b/i18n/wikimediaoverrides/en.json
index cb07130..1006bd5 100644
--- a/i18n/wikimediaoverrides/en.json
+++ b/i18n/wikimediaoverrides/en.json
@@ -2,5 +2,6 @@
        "wikimedia-createacct-helpusername": 
"[[{{MediaWiki:createacct-helpusername-url}}|(help me choose)]]",
        "wikimedia-createacct-imgcaptcha-help": "Can't see the image? 
[[{{MediaWiki:createacct-captcha-help-url}}|Request an account]]",
        "wikimedia-sidebar": "* navigation\n** 
mainpage|mainpage-description\n** portal-url|portal\n** 
currentevents-url|currentevents\n** recentchanges-url|recentchanges\n** 
randompage-url|randompage\n** helppage|help\n** sitesupport-url|sitesupport",
-       "wikimedia-privacypage": "wmf:Privacy_policy"
+       "wikimedia-privacypage": "wmf:Privacy_policy",
+       "wikimedia-privacypage-labs": "wikitech:Wikitech:Labs_Terms_of_use"
 }
diff --git a/i18n/wikimediaoverrides/qqq.json b/i18n/wikimediaoverrides/qqq.json
index 52ab2ec..e1bca07 100644
--- a/i18n/wikimediaoverrides/qqq.json
+++ b/i18n/wikimediaoverrides/qqq.json
@@ -7,5 +7,6 @@
        "wikimedia-createacct-helpusername": "Message in new create account 
form providing guidance for username.",
        "wikimedia-createacct-imgcaptcha-help": "Help text in vertical-layout 
create account form for image CAPTCHA input field when repositioned by 
JavaScript.",
        "wikimedia-sidebar": "{{notranslate}}",
-       "wikimedia-privacypage": "{{notranslate}} Default Wikimedia projects 
link to privacy policy. Should not be changed at the request of Wikimedia 
Foundation's Legal Department."
+       "wikimedia-privacypage": "{{notranslate}} Default Wikimedia projects 
link to privacy policy. Should not be changed at the request of Wikimedia 
Foundation's Legal Department.",
+       "wikimedia-privacypage-labs": "{{notranslate}} Default Wikimedia Labs 
projects link to terms of use. Should not be changed at the request of 
Wikimedia Foundation's Legal Department."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icef94283354dd83800c26698060feb49f38e5095
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Greg Grossmeier <g...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Luke081515 <luke081...@web.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
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