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

[lhc/web/wiklou.git] / resources / src / mediawiki / page / watch.js

diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki/page/watch.js
index f81882b..5dda7e0 100644 (file)
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -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'
                                        } );