summaryrefslogtreecommitdiff
path: root/lib/mail.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-20 12:06:54 +0200
committerBrion Vibber <brion@pobox.com>2010-04-20 13:49:29 +0200
commitc48caa85e12063c2df9913957dbd11af6b5e3ea6 (patch)
treea17c3f1cba59c49de4f1810cf2ce26ccae6b0738 /lib/mail.php
parent0e1be7e01b00a9ad5201845b96f9f5634ab10236 (diff)
Fix email notifications for @-replies that come via OStatus.
* Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it. * Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues. * Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update
Diffstat (limited to 'lib/mail.php')
-rw-r--r--lib/mail.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mail.php b/lib/mail.php
index 807b6a363..d73603694 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -620,7 +620,7 @@ function mail_notify_attn($user, $notice)
$bestname = $sender->getBestName();
- common_init_locale($user->language);
+ common_switch_locale($user->language);
if ($notice->conversation != $notice->id) {
$conversationEmailText = "The full conversation can be read here:\n\n".
@@ -662,7 +662,7 @@ function mail_notify_attn($user, $notice)
$headers = _mail_prepare_headers('mention', $user->nickname, $sender->nickname);
- common_init_locale();
+ common_switch_locale();
mail_to_user($user, $subject, $body, $headers);
}