Merge "RCFilters: Add missing jQueryMsg dependency"

diff --combined resources/Resources.php
index 35cd405,13b3078..e139c3a
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -29,18 -29,18 +29,18 @@@ return 
        /**
         * Special modules who have their own classes
         */
 -      'startup' => [ 'class' => 'ResourceLoaderStartUpModule' ],
 +      'startup' => [ 'class' => ResourceLoaderStartUpModule::class ],
  
        // Scripts managed by the local wiki (stored in the MediaWiki namespace)
 -      'site' => [ 'class' => 'ResourceLoaderSiteModule' ],
 -      'site.styles' => [ 'class' => 'ResourceLoaderSiteStylesModule' ],
 +      'site' => [ 'class' => ResourceLoaderSiteModule::class ],
 +      'site.styles' => [ 'class' => ResourceLoaderSiteStylesModule::class ],
        'noscript' => [
 -              'class' => 'ResourceLoaderWikiModule',
 +              'class' => ResourceLoaderWikiModule::class,
                'styles' => [ 'MediaWiki:Noscript.css' ],
                'group' => 'noscript',
        ],
        'filepage' => [
 -              'class' => 'ResourceLoaderWikiModule',
 +              'class' => ResourceLoaderWikiModule::class,
                'styles' => [ 'MediaWiki:Filepage.css' ],
        ],
        'user.groups' => [
@@@ -50,16 -50,16 +50,16 @@@
        ],
  
        // Scripts managed by the current user (stored in their user space)
 -      'user' => [ 'class' => 'ResourceLoaderUserModule' ],
 -      'user.styles' => [ 'class' => 'ResourceLoaderUserStylesModule' ],
 +      'user' => [ 'class' => ResourceLoaderUserModule::class ],
 +      'user.styles' => [ 'class' => ResourceLoaderUserStylesModule::class ],
  
        // Populate mediawiki.user placeholders with information about the current user
 -      'user.defaults' => [ 'class' => 'ResourceLoaderUserDefaultsModule' ],
 -      'user.options' => [ 'class' => 'ResourceLoaderUserOptionsModule' ],
 -      'user.tokens' => [ 'class' => 'ResourceLoaderUserTokensModule' ],
 +      'user.defaults' => [ 'class' => ResourceLoaderUserDefaultsModule::class ],
 +      'user.options' => [ 'class' => ResourceLoaderUserOptionsModule::class ],
 +      'user.tokens' => [ 'class' => ResourceLoaderUserTokensModule::class ],
  
        // Scripts for the dynamic language specific data, like grammar forms.
 -      'mediawiki.language.data' => [ 'class' => 'ResourceLoaderLanguageDataModule' ],
 +      'mediawiki.language.data' => [ 'class' => ResourceLoaderLanguageDataModule::class ],
  
        /* MediaWiki base skinning modules */
  
@@@ -105,7 -105,7 +105,7 @@@
        ],
        // Used in the web installer. Test it after modifying this definition!
        'mediawiki.skinning.interface' => [
 -              'class' => 'ResourceLoaderSkinModule',
 +              'class' => ResourceLoaderSkinModule::class,
                'styles' => [
                        'resources/src/mediawiki.skinning/elements.css' => [ 'media' => 'screen' ],
                        'resources/src/mediawiki.skinning/content.css' => [ 'media' => 'screen' ],
@@@ -832,7 -832,7 +832,7 @@@
        /* MediaWiki */
  
        'mediawiki' => [
 -              'class' => 'ResourceLoaderRawFileModule',
 +              'class' => ResourceLoaderRawFileModule::class,
                // Keep in sync with maintenance/jsduck/eg-iframe.html
                'scripts' => [
                        'resources/src/mediawiki/mediawiki.js',
@@@ -886,6 -886,7 +886,6 @@@
                'scripts' => 'resources/src/mediawiki/api/edit.js',
                'dependencies' => [
                        'mediawiki.api',
 -                      'mediawiki.Title',
                        'mediawiki.user',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@@ -1016,7 -1017,7 +1016,7 @@@
        ],
        'mediawiki.ForeignApi' => [
                'targets' => [ 'desktop', 'mobile' ],
 -              'class' => 'ResourceLoaderForeignApiModule',
 +              'class' => ResourceLoaderForeignApiModule::class,
                // Additional dependencies generated dynamically
                'dependencies' => 'mediawiki.ForeignApi.core',
        ],
@@@ -1226,7 -1227,7 +1226,7 @@@
                ]
        ],
        'mediawiki.ForeignStructuredUpload.config' => [
 -              'class' => 'ResourceLoaderUploadDialogModule',
 +              'class' => ResourceLoaderUploadDialogModule::class,
        ],
        'mediawiki.ForeignStructuredUpload' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
@@@ -1365,7 -1366,7 +1365,7 @@@
                ]
        ],
        'mediawiki.util' => [
 -              'class' => 'ResourceLoaderMediaWikiUtilModule',
 +              'class' => ResourceLoaderMediaWikiUtilModule::class,
                'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
                'dependencies' => [
                        'jquery.accessKeyLabel',
@@@ -1390,7 -1391,7 +1390,7 @@@
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.toolbar' => [
 -              'class' => 'ResourceLoaderEditToolbarModule',
 +              'class' => ResourceLoaderEditToolbarModule::class,
                'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
                'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
                'dependencies' => 'jquery.textSelection',
@@@ -1441,6 -1442,7 +1441,6 @@@
        'mediawiki.action.edit.preview' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.js',
                'dependencies' => [
 -                      'jquery.form',
                        'jquery.spinner',
                        'jquery.textSelection',
                        'mediawiki.api',
@@@ -1472,6 -1474,16 +1472,6 @@@
        'mediawiki.action.history.styles' => [
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
        ],
 -      // using this module is deprecated, for diff styles use mediawiki.diff.styles instead
 -      'mediawiki.action.history.diff' => [
 -              'styles' => [
 -                      'resources/src/mediawiki/mediawiki.diff.styles.css',
 -                      'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
 -                              'media' => 'print'
 -                      ],
 -              ],
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
        'mediawiki.action.view.dblClickEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
                'dependencies' => [
@@@ -1506,7 -1518,6 +1506,7 @@@
                        'postedit-confirmation-created',
                        'postedit-confirmation-restored',
                        'postedit-confirmation-saved',
 +                      'postedit-confirmation-published',
                ],
        ],
        'mediawiki.action.view.redirect' => [
@@@ -1595,7 -1606,7 +1595,7 @@@
  
        'mediawiki.jqueryMsg' => [
                // Add data for mediawiki.jqueryMsg, such as allowed tags
 -              'class' => 'ResourceLoaderJqueryMsgModule',
 +              'class' => ResourceLoaderJqueryMsgModule::class,
                'scripts' => 'resources/src/mediawiki/mediawiki.jqueryMsg.js',
                'dependencies' => [
                        'mediawiki.util',
@@@ -1615,10 -1626,10 +1615,10 @@@
                )
        ],
  
 -      'mediawiki.language.names' => [ 'class' => 'ResourceLoaderLanguageNamesModule' ],
 +      'mediawiki.language.names' => [ 'class' => ResourceLoaderLanguageNamesModule::class ],
  
        'mediawiki.language.specialCharacters' => [
 -              'class' => 'ResourceLoaderSpecialCharacterDataModule'
 +              'class' => ResourceLoaderSpecialCharacterDataModule::class
        ],
  
        /* MediaWiki Libs */
@@@ -1765,9 -1776,14 +1765,14 @@@
                        'oojs',
                        'mediawiki.api',
                        'mediawiki.api.options',
+                       'mediawiki.jqueryMsg',
                        'mediawiki.Uri',
                        'mediawiki.user',
                ],
+               'messages' => [
+                       'quotation-marks',
+                       'rcfilters-filterlist-title',
+               ],
        ],
        'mediawiki.rcfilters.filters.ui' => [
                'scripts' => [
@@@ -1923,6 -1939,7 +1928,7 @@@
                'dependencies' => [
                        'oojs-ui-widgets',
                        'jquery.makeCollapsible',
+                       'mediawiki.jqueryMsg',
                        'mediawiki.language',
                        'mediawiki.user',
                        'mediawiki.util',
@@@ -2105,7 -2122,6 +2111,7 @@@
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ],
        'mediawiki.special.preferences' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
                        'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
@@@ -2126,7 -2142,6 +2132,7 @@@
                ],
        ],
        'mediawiki.special.preferences.styles' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
        'mediawiki.special.recentchanges' => [
@@@ -2209,7 -2224,6 +2215,7 @@@
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
 +                      'mediawiki.api.parse',
                        'mediawiki.libs.jpegmeta',
                        'mediawiki.Title',
                        'mediawiki.util',
@@@ -2723,7 -2737,7 +2729,7 @@@
  
        // The core JavaScript library.
        'oojs-ui-core' => [
 -              'class' => 'ResourceLoaderOOUIFileModule',
 +              'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => [
                        'resources/lib/oojs-ui/oojs-ui-core.js',
                        'resources/src/oojs-ui-local.js',
@@@ -2743,7 -2757,7 +2749,7 @@@
        ],
        // This contains only the styles required by core widgets.
        'oojs-ui-core.styles' => [
 -              'class' => 'ResourceLoaderOOUIFileModule',
 +              'class' => ResourceLoaderOOUIFileModule::class,
                'styles' => [
                        'resources/lib/oojs-ui/wikimedia-ui-base.less', // Providing Wikimedia UI LESS variables to all
                        'resources/src/oojs-ui-local.css', // HACK, see inside the file
@@@ -2753,7 -2767,7 +2759,7 @@@
        ],
        // Additional widgets and layouts module.
        'oojs-ui-widgets' => [
 -              'class' => 'ResourceLoaderOOUIFileModule',
 +              'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
                'themeStyles' => 'widgets',
                'dependencies' => [
@@@ -2778,7 -2792,7 +2784,7 @@@
        ],
        // Toolbar and tools module.
        'oojs-ui-toolbars' => [
 -              'class' => 'ResourceLoaderOOUIFileModule',
 +              'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-toolbars.js',
                'themeStyles' => 'toolbars',
                'dependencies' => [
@@@ -2794,7 -2808,7 +2800,7 @@@
        ],
        // Windows and dialogs module.
        'oojs-ui-windows' => [
 -              'class' => 'ResourceLoaderOOUIFileModule',
 +              'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-windows.js',
                'themeStyles' => 'windows',
                'dependencies' => [
@@@ -2813,71 -2827,71 +2819,71 @@@
        ],
  
        'oojs-ui.styles.indicators' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'indicators',
        ],
        'oojs-ui.styles.textures' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'textures',
        ],
        'oojs-ui.styles.icons-accessibility' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-accessibility',
        ],
        'oojs-ui.styles.icons-alerts' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-alerts',
        ],
        'oojs-ui.styles.icons-content' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-content',
        ],
        'oojs-ui.styles.icons-editing-advanced' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-advanced',
        ],
        'oojs-ui.styles.icons-editing-core' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-core',
        ],
        'oojs-ui.styles.icons-editing-list' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-list',
        ],
        'oojs-ui.styles.icons-editing-styling' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-styling',
        ],
        'oojs-ui.styles.icons-interactions' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-interactions',
        ],
        'oojs-ui.styles.icons-layout' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-layout',
        ],
        'oojs-ui.styles.icons-location' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-location',
        ],
        'oojs-ui.styles.icons-media' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-media',
        ],
        'oojs-ui.styles.icons-moderation' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-moderation',
        ],
        'oojs-ui.styles.icons-movement' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-movement',
        ],
        'oojs-ui.styles.icons-user' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-user',
        ],
        'oojs-ui.styles.icons-wikimedia' => [
 -              'class' => 'ResourceLoaderOOUIImageModule',
 +              'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-wikimedia',
        ],
  ];