jenkins-bot has submitted this change and it was merged.
Change subject: Clean up some code in EchoEmailBatch
......................................................................
Clean up some code in EchoEmailBatch
* Address TODO to use a constant instead of hardcoding
* Only call User::getOption() once
Change-Id: I52d8c3698f8d915ec9d96de0976d242009b3df39
---
M includes/EmailBatch.php
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index 8dd895a..55a3dd2 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -240,8 +240,9 @@
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 @@
);
}
+ $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 @@
// 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 );
--
To view, visit https://gerrit.wikimedia.org/r/276044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52d8c3698f8d915ec9d96de0976d242009b3df39
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
