From: Derick Alangi <alangiderick@gmail.com>
Date: Wed, 13 Feb 2019 11:11:46 +0000 (+0100)
Subject: i18n: Add line-break in email notificaton for minor edits
X-Git-Tag: 1.34.0-rc.0~2211^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=4ff82a335a4b11e7354101dbcd335c65c0216f26;p=lhc%2Fweb%2Fwiklou.git

i18n: Add line-break in email notificaton for minor edits

Added missing line-break in email notification specifically after
page summary or immediately before $PAGEMINOREDIT (for minor edits).
In addition, if the edit is not marked as a "minor edit", avoid the
line break.

Bug: T176595
Change-Id: I68cc249c3546eb7fed0834063f15304e3c245e55
---

diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php
index 4d1b855d78..987239be78 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -328,8 +328,9 @@ class EmailNotification {
 
 		$keys['$PAGETITLE'] = $this->title->getPrefixedText();
 		$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
-		$keys['$PAGEMINOREDIT'] = "\n" . ( $this->minorEdit ?
-			wfMessage( 'enotif_minoredit' )->inContentLanguage()->text() : '' );
+		$keys['$PAGEMINOREDIT'] = $this->minorEdit ?
+			"\n\n" . wfMessage( 'enotif_minoredit' )->inContentLanguage()->text() :
+			'';
 		$keys['$UNWATCHURL'] = $this->title->getCanonicalURL( 'action=unwatch' );
 
 		if ( $this->editor->isAnon() ) {