From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Thu, 29 Mar 2012 08:57:00 +0000 (+0200)
Subject: Use local context to get messages
X-Git-Tag: 1.31.0-rc.0~24098^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=5513102df76697e1f84feb8c5ccdfebac1ffef40;p=lhc%2Fweb%2Fwiklou.git

Use local context to get messages

Change-Id: I9bad983b6deffa1f79770663010252730d1b1eb5
---

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 63d9b1517b..e2636452d5 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -31,7 +31,7 @@ class WatchAction extends FormAction {
 	}
 
 	protected function getDescription() {
-		return wfMsgHtml( 'addwatch' );
+		return $this->msg( 'addwatch' )->escaped();
 	}
 
 	/**
@@ -136,11 +136,11 @@ class WatchAction extends FormAction {
 	}
 
 	protected function alterForm( HTMLForm $form ) {
-		$form->setSubmitText( wfMsg( 'confirm-watch-button' ) );
+		$form->setSubmitTextMsg( 'confirm-watch-button' );
 	}
 
 	protected function preText() {
-		return wfMessage( 'confirm-watch-top' )->parse();
+		return $this->msg( 'confirm-watch-top' )->parse();
 	}
 
 	public function onSuccess() {
@@ -155,7 +155,7 @@ class UnwatchAction extends WatchAction {
 	}
 
 	protected function getDescription() {
-		return wfMsg( 'removewatch' );
+		return $this->msg( 'removewatch' )->escaped();
 	}
 
 	public function onSubmit( $data ) {
@@ -166,11 +166,11 @@ class UnwatchAction extends WatchAction {
 	}
 
 	protected function alterForm( HTMLForm $form ) {
-		$form->setSubmitText( wfMsg( 'confirm-unwatch-button' ) );
+		$form->setSubmitTextMsg( 'confirm-unwatch-button' );
 	}
 
 	protected function preText() {
-		return wfMessage( 'confirm-unwatch-top' )->parse();
+		return $this->msg( 'confirm-unwatch-top' )->parse();
 	}
 
 	public function onSuccess() {