forked from GNUsocial/gnu-social
send all emails in the destination's language.
darcs-hash:20081204212455-099f7-a3a325852f55b94e4b81c84dbb301ae2eebf48b4.gz
This commit is contained in:
parent
9c3c1e0272
commit
e508fd5b5e
38
lib/mail.php
38
lib/mail.php
@ -81,31 +81,17 @@ function mail_to_user(&$user, $subject, $body, $address=NULL) {
|
||||
}
|
||||
|
||||
# For confirming a Jabber address
|
||||
# XXX: change to use mail_to_user() above
|
||||
|
||||
function mail_confirm_address($code, $nickname, $address) {
|
||||
$recipients = $address;
|
||||
$headers['From'] = mail_notify_from();
|
||||
$headers['To'] = $nickname . ' <' . $address . '>';
|
||||
$headers['Subject'] = _('Email address confirmation');
|
||||
$user = common_current_user();
|
||||
$subject = _('Email address confirmation');
|
||||
|
||||
$body = "Hey, $nickname.";
|
||||
$body .= "\n\n";
|
||||
$body .= 'Someone just entered this email address on ' . common_config('site', 'name') . '.';
|
||||
$body .= "\n\n";
|
||||
$body .= 'If it was you, and you want to confirm your entry, use the URL below:';
|
||||
$body .= "\n\n";
|
||||
$body .= "\t".common_local_url('confirmaddress',
|
||||
array('code' => $code));
|
||||
$body .= "\n\n";
|
||||
$body .= 'If not, just ignore this message.';
|
||||
$body .= "\n\n";
|
||||
$body .= 'Thanks for your time, ';
|
||||
$body .= "\n";
|
||||
$body .= common_config('site', 'name');
|
||||
$body .= "\n";
|
||||
|
||||
mail_send($recipients, $headers, $body);
|
||||
$body = sprintf(_("Hey, %s.\n\nSomeone just entered this email address on %s.\n\n" .
|
||||
"If it was you, and you want to confirm your entry, use the URL below:\n\n\t%s\n\n" .
|
||||
"If not, just ignore this message.\n\nThanks for your time, \n%s\n")
|
||||
, $nickname, common_config('site', 'name')
|
||||
, common_local_url('confirmaddress', array('code' => $code)), common_config('site', 'name'));
|
||||
return mail_to_user($user, $subject, $body, $address);
|
||||
}
|
||||
|
||||
function mail_subscribe_notify($listenee, $listener) {
|
||||
@ -239,7 +225,7 @@ function mail_confirm_sms($code, $nickname, $address) {
|
||||
|
||||
|
||||
function mail_notify_nudge($from, $to) {
|
||||
|
||||
common_init_locale($to->language);
|
||||
$subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
|
||||
|
||||
$from_profile = $from->getProfile();
|
||||
@ -254,7 +240,7 @@ function mail_notify_nudge($from, $to) {
|
||||
$from->nickname,
|
||||
common_local_url('all', array('nickname' => $to->nickname)),
|
||||
common_config('site', 'name'));
|
||||
|
||||
common_init_locale();
|
||||
return mail_to_user($to, $subject, $body);
|
||||
}
|
||||
|
||||
@ -274,6 +260,7 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
|
||||
return true;
|
||||
}
|
||||
|
||||
common_init_locale($to->language);
|
||||
$subject = sprintf(_('New private message from %s'), $from->nickname);
|
||||
|
||||
$from_profile = $from->getProfile();
|
||||
@ -293,6 +280,7 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
|
||||
common_local_url('newmessage', array('to' => $from->id)),
|
||||
common_config('site', 'name'));
|
||||
|
||||
common_init_locale();
|
||||
return mail_to_user($to, $subject, $body);
|
||||
}
|
||||
|
||||
@ -300,6 +288,7 @@ function mail_notify_fave($other, $user, $notice) {
|
||||
|
||||
$profile = $user->getProfile();
|
||||
$bestname = $profile->getBestName();
|
||||
common_init_locale($other->language);
|
||||
$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
|
||||
$body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
|
||||
"In case you forgot, you can see the text of your notice here:\n\n" .
|
||||
@ -314,5 +303,6 @@ function mail_notify_fave($other, $user, $notice) {
|
||||
common_local_url('showfavorites', array('nickname' => $user->nickname)),
|
||||
common_config('site', 'name'));
|
||||
|
||||
common_init_locale();
|
||||
mail_to_user($other, $subject, $body);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user