From 210f3a1d4a44dd82b6d192cfb156e32b27e583ba Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 8 Mar 2016 15:32:27 -0800 Subject: [PATCH] Clean up some code in EchoEmailBatch * Address TODO to use a constant instead of hardcoding * Only call User::getOption() once Change-Id: I52d8c3698f8d915ec9d96de0976d242009b3df39 --- includes/EmailBatch.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php index 8dd895a93..55a3dd25d 100644 --- a/includes/EmailBatch.php +++ b/includes/EmailBatch.php @@ -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 );