Merge "resourceloader: Set value for getStoreKey in server-side"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index d708dd6..3223948 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -260,6 +260,9 @@ because of Phabricator reports.
   removed.
 * The JavaScript global variable wgLoadScript has been removed. Use
   mw.util.wikiScript( 'load' ) instead.
+* ResourceLoader no longer creates the 'mw.legacy' placeholder object. It has
+  been unused since 1.16 and was deprecated in 1.22. To deprecate a property
+  in JavaScript, use mw.log.deprecate() instead.
 * …
 
 === Deprecations in 1.34 ===

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index e33e9bd..0da5c5f 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4197,7 +4197,7 @@
        "edit-error-short": "Error: $1",
        "edit-error-long": "Errors:\n\n$1",
        "specialmute": "Mute",
-       "specialmute-success": "Your mute preferences have been successfully updated. See all muted users in [[Special:Preferences]].",
+       "specialmute-success": "Your mute preferences have been updated. See all muted users in [[Special:Preferences|your preferences]].",
        "specialmute-submit": "Confirm",
        "specialmute-label-mute-email": "Mute emails from this user",
        "specialmute-header": "Please select your mute preferences for {{BIDI:[[User:$1]]}}.",

diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index e77555c..dbb32e5 100644 (file)
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -444,19 +444,6 @@
                 */
                libs: {},
 
-               /**
-                * Access container for deprecated functionality that can be moved from
-                * from their legacy location and attached to this object (e.g. a global
-                * function that is deprecated and as stop-gap can be exposed through here).
-                *
-                * This was reserved for future use but never ended up being used.
-                *
-                * @deprecated since 1.22 Let deprecated identifiers keep their original name
-                *  and use mw.log#deprecate to create an access container for tracking.
-                * @property
-                */
-               legacy: {},
-
                /**
                 * Store for messages.
                 *