Committer: slobin
https://jira.sup.com/browse/LJSUP-9213M bin/upgrading/en.dat
M cgi-bin/LJ/Event/UserMessageRecvd.pm
U trunk/bin/upgrading/en.dat U trunk/cgi-bin/LJ/Event/UserMessageRecvd.pm
Modified: trunk/bin/upgrading/en.dat =================================================================== --- trunk/bin/upgrading/en.dat 2011-08-04 06:26:13 UTC (rev 19589) +++ trunk/bin/upgrading/en.dat 2011-08-04 06:33:26 UTC (rev 19590) @@ -2984,7 +2984,12 @@ notification.sms.userexpunged=[[journal]] has been purged. -notification.sms.usermessagerecvd=You've received a new message "[[subject]]" from [[user]] +notification.sms.usermessagerecvd<< +[[user]] sent you a message on LiveJournal: [[subject]] +[[body]] +------ +To respond, send your reply to the number this message was sent from. LiveJournal will automatically forward it to [[user]]. +. notification.sms.usermessagesent=message sent to [[user]]. @@ -2998,6 +3003,8 @@ sms.unsubscribesuccesseful=You have successful unsubscribed from LiveJournal sms notification. +sms.messagesent=Your message is sent. + number.million|staleness=1 number.million=[[number]] million Modified: trunk/cgi-bin/LJ/Event/UserMessageRecvd.pm =================================================================== --- trunk/cgi-bin/LJ/Event/UserMessageRecvd.pm 2011-08-04 06:26:13 UTC (rev 19589) +++ trunk/cgi-bin/LJ/Event/UserMessageRecvd.pm 2011-08-04 06:33:26 UTC (rev 19590) @@ -145,12 +145,20 @@ my $subject = $self->load_message->subject; my $other_u = $self->load_message->other_u; + my $body = $self->load_message->body; -# You've received a new message "[[subject]]" from [[user]] - return LJ::Lang::get_text($lang, 'notification.sms.usermessagerecvd', undef, { + # %usename% sent you a message on LiveJournal: %Message_Subject% + # %Message_Body% + # ------ + # To respond, send your reply to the number this message was sent from. LiveJournal will automatically forward it to %usename%. + # + my $text = LJ::Lang::get_text($lang, 'notification.sms.usermessagerecvd', undef, { subject => $subject, + body => $body, user => $other_u->user, }); + + return $text; } sub as_alert {