Merge "mediawiki.language: Deprecate mw.language.specialCharacters"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 8a02056..be9dc17 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -279,6 +279,9 @@ because of Phabricator reports.
   use the new extension registration key 'QUnitTestModule'.
 * (T213426) The jquery.throttle-debounce module has been deprecated. JavaScript
   code that needs this behaviour should use OO.ui.debounce/throttle.
+* The mw.language.specialCharacters property from the
+  'mediawiki.language.specialCharacters' module has been deprecated.
+  Use require( 'mediawiki.language.specialCharacters' ) instead.
 
 === Other changes in 1.33 ===
 * (T208871) The hard-coded Google search form on the database error page was

diff --git a/resources/src/mediawiki.language/mediawiki.language.js b/resources/src/mediawiki.language/mediawiki.language.js
index 8fed695..277034b 100644 (file)
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -158,10 +158,6 @@
                        return text;
                },
 
-               setSpecialCharacters: function ( data ) {
-                       this.specialCharacters = data;
-               },
-
                /**
                 * Formats language tags according the BCP 47 standard.
                 * See LanguageCode::bcp47 for the PHP implementation.

diff --git a/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js b/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
index ba8a233..6674adb 100644 (file)
--- a/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
+++ b/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
@@ -1,5 +1,9 @@
 ( function () {
        var specialCharacters = require( './specialcharacters.json' );
-       mw.language.setSpecialCharacters( specialCharacters );
+       // Deprecated since 1.33
+       mw.log.deprecate( mw.language, 'specialCharacters', specialCharacters,
+               'Use require( \'mediawiki.language.specialCharacters\' ) instead',
+               'mw.language.specialCharacters'
+       );
        module.exports = specialCharacters;
 }() );