From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 6 Feb 2005 14:16:19 +0000 (+0000)
Subject: Prune some unnecessarily long and invalid-html-ful messages
X-Git-Tag: 1.5.0alpha1~768
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=d94ac0eb9a80c38035bd574e7b5d63c2eb471d04;p=lhc%2Fweb%2Fwiklou.git

Prune some unnecessarily long and invalid-html-ful messages
---

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 8b9f7dbca0..5f3f2be535 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -39,7 +39,18 @@ function wfSpecialWatchlist() {
 	$remove = $wgRequest->getVal( 'remove' );
 	$id = $wgRequest->getArray( 'id' );
 
-	$wgOut->addWikiText( wfMsg( 'email_notification_infotext' ) );
+	if( $wgUser->getOption( 'enotifwatchlistpages' ) ) {
+		$wgOut->addHTML( "<div class='enotifinfo'>\n" );
+		
+		$wgOut->addWikiText( wfMsg( 'email_notification_infotext' ) );
+
+		$wgOut->addHTML( '<form action="' .
+			$specialTitle->escapeLocalUrl( 'action=submit&magic=yes' ) .
+			'" method="post"><input type="submit" name="dummy" value="' .
+			htmlspecialchars( wfMsg( 'email_notification_reset' ) ) .
+			'" /><input type="hidden" name="reset" value="all" /></form>' .
+			"</div>\n\n" );
+	}
 
 	if( $wgRequest->getVal( 'reset' ) == 'all' ) {
 		$wgUser->clearAllNotifications( $uid );
diff --git a/languages/Language.php b/languages/Language.php
index 5dbca75139..0f9ea88e81 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1234,18 +1234,9 @@ at the bottom of the screen (deleting a content page also deletes the accompanyi
 'updatedmarker'		=> '<span class=\'updatedmarker\'>&nbsp;updated (since my last visit)&nbsp;</span>',
 
 'email_notification_mailer' 		=> '{{SITENAME}} Notification Mailer',
-'email_notification_infotext' 		=> '
-<strong>Email Notification</strong><p>
-<form action=\'{{localurl:Special:Watchlist|action=submit&magic=yes}}\' method=\'post\'>
-<ul>
-<li>You will be notified by email when someone changes a page which is listed in your watchlist.</li>
-<li>A flag is set so that you receive only one email on the first change.</li>
-<li>Your own edits do <b>not</b> trigger the sending of notifications.</li>
-<li>{{MediaWiki:updatedmarker}} means that the <b><i>page has changed since your last visit and that a notification mail has been sent to you.</i></b>.</li>
-<li>The flag is automatically cleared when you visit such pages.</li>
-<li> Alternatively, you can reset all flags at once by clicking on&nbsp; <input type="submit" name="dummy" value=\'Reset all notification flags (set their status to "visited")\'><input type="hidden" name="reset" value="all"></form></li>
-</ul>
-<hr>',
+'email_notification_infotext' 		=> "'''Email notification is on.'''
+You will be notified by email when someone changes a page which is listed in your watchlist.",
+'email_notification_reset'			=> 'Reset all notification flags (set their status to "visited")',
 'email_notification_newpagetext'=> 'This is a new page.',
 'email_notification_to' 	=> '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
 'email_notification_subject' 	=> '{{SITENAME}} page $PAGETITLE_QP has been changed by $PAGEEDITOR_QP',