wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Clean up some code in EchoEmailBatch"

Browse source
This commit is contained in:
jenkins-bot 2016-03-11 17:31:54 +00:00 committed by Gerrit Code Review
parent 933eecd2ec 210f3a1d4a
commit d796e84fa5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/EmailBatch.php
View file

@ -240,8 +240,9 @@ class MWEchoEmailBatch {
public function sendEmail() {
global $wgNotificationSender, $wgNotificationReplyName;
// @Todo - replace them with the CONSTANT in 33810 once it is merged
if ( $this->mUser->getOption( 'echo-email-frequency' ) == 7 ) {
if ( $this->mUser->getOption( 'echo-email-frequency' )
== EchoHooks::EMAIL_WEEKLY_DIGEST
) {
$frequency = 'weekly';
$emailDeliveryMode = 'weekly_digest';
} else {
@ -265,10 +266,11 @@ class MWEchoEmailBatch {
);
}
$userLangCode = $this->mUser->getOption( 'language' );
// email subject
if ( $this->count > self::$displaySize ) {
$count = wfMessage( 'echo-notification-count' )
->inLanguage( $this->mUser->getOption( 'language' ) )
->inLanguage( $userLangCode )
->params( self::$displaySize )->text();
} else {
$count = $this->count;
@ -276,7 +278,7 @@ class MWEchoEmailBatch {
// Give grep a chance to find the usages:
// echo-email-batch-subject-daily, echo-email-batch-subject-weekly
$subject = wfMessage( 'echo-email-batch-subject-' . $frequency )
->inLanguage( $this->mUser->getOption( 'language' ) )
->inLanguage( $userLangCode )
->params( $count, $this->count )->text();
$toAddress = MailAddress::newFromUser( $this->mUser );