Merge "mediawiki.api.watch: Use formatversion=2 for API requests"

diff --combined resources/src/mediawiki/api/watch.js
index 92722b5,84a234f..f68697f
--- 1/resources/src/mediawiki/api/watch.js
--- 2/resources/src/mediawiki/api/watch.js
+++ b/resources/src/mediawiki/api/watch.js
@@@ -12,13 -12,13 +12,13 @@@
         * @param {string|mw.Title|string[]|mw.Title[]} pages Full page name or instance of mw.Title, or an
         *  array thereof. If an array is passed, the return value passed to the promise will also be an
         *  array of appropriate objects.
 +       * @param {Object} [addParams]
         * @return {jQuery.Promise}
         * @return {Function} return.done
         * @return {Object|Object[]} return.done.watch Object or list of objects (depends on the `pages`
         *  parameter)
         * @return {string} return.done.watch.title Full pagename
         * @return {boolean} return.done.watch.watched Whether the page is now watched or unwatched
 -       * @return {string} return.done.watch.message Parsed HTML of the confirmational interface message
         */
        function doWatchInternal( pages, addParams ) {
                // XXX: Parameter addParams is undocumented because we inherit this
@@@ -26,6 -26,7 +26,7 @@@
                var apiPromise = this.postWithToken( 'watch',
                        $.extend(
                                {
+                                       formatversion: 2,
                                        action: 'watch',
                                        titles: $.isArray( pages ) ? pages.join( '|' ) : String( pages ),
                                        uselang: mw.config.get( 'wgUserLanguage' )

diff --combined resources/src/mediawiki/page/watch.js
index f880e6a,f81882b..5dda7e0
--- 1/resources/src/mediawiki/page/watch.js
--- 2/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@@ -132,16 -132,9 +132,16 @@@
  
                        api[ action ]( title )
                                .done( function ( watchResponse ) {
 -                                      var otherAction = action === 'watch' ? 'unwatch' : 'watch';
 +                                      var mwTitle, message, otherAction = action === 'watch' ? 'unwatch' : 'watch';
  
 -                                      mw.notify( $.parseHTML( watchResponse.message ), {
 +                                      mwTitle = mw.Title.newFromText( title );
 +                                      if ( mwTitle && mwTitle.getNamespaceId() > 0 && mwTitle.getNamespaceId() % 2 === 1 ) {
 +                                              message = action === 'watch' ? 'addedwatchtext-talk' : 'removedwatchtext-talk';
 +                                      } else {
 +                                              message = action === 'watch' ? 'addedwatchtext' : 'removedwatchtext';
 +                                      }
 +
 +                                      mw.notify( mw.message( message, title ).parseDom(), {
                                                tag: 'watch-self'
                                        } );
  
@@@ -150,7 -143,7 +150,7 @@@
  
                                        // Update the "Watch this page" checkbox on action=edit when the
                                        // page is watched or unwatched via the tab (bug 12395).
-                                       $( '#wpWatchthis' ).prop( 'checked', watchResponse.watched !== undefined );
+                                       $( '#wpWatchthis' ).prop( 'checked', watchResponse.watched === true );
                                } )
                                .fail( function () {
                                        var cleanTitle, msg, link;