mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-02-27 02:42 am

[dw-free] full text of PMs in email

[commit: http://hg.dwscoalition.org/dw-free/rev/092af917c214]

http://bugs.dwscoalition.org/show_bug.cgi?id=345

Send full content of PM in email.

Patch by phoenixdreaming <caerdia.phoenix+zilla@gmail.com>.

--------------------------------------------------------------------------------
diff -r b3655b5867fb -r 092af917c214 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Fri Feb 27 02:32:07 2009 +0000
+++ b/bin/upgrading/en.dat	Fri Feb 27 02:42:00 2009 +0000
@@ -1477,10 +1477,13 @@ esn.edit_groups=[[openlink]]Edit Filters
 
 esn.email.pm.subject=[[sender]] sent you a message
 
-esn.email.pm_without_body<<
+esn.email.pm_with_body<<
 Hi [[user]],
 
-[[sender]] sent you a message on [[sitenameshort]]: [[subject]].
+[[sender]] sent you a message on [[sitenameshort]].
+
+The message is: [[subject]]
+[[body]]
 
 Go to [[inbox]] to view your new messages.
 
diff -r b3655b5867fb -r 092af917c214 cgi-bin/LJ/Event/UserMessageRecvd.pm
--- a/cgi-bin/LJ/Event/UserMessageRecvd.pm	Fri Feb 27 02:32:07 2009 +0000
+++ b/cgi-bin/LJ/Event/UserMessageRecvd.pm	Fri Feb 27 02:42:00 2009 +0000
@@ -48,7 +48,7 @@ sub _as_email {
         inbox           => $inbox,
     };
 
-    my $body = LJ::Lang::get_text($lang, 'esn.email.pm_without_body', undef, $vars) .
+    my $body = LJ::Lang::get_text($lang, 'esn.email.pm_with_body', undef, $vars) .
         $self->format_options($is_html, $lang, $vars,
         {
             'esn.view_profile'    => [ 1, $other_u->profile_url ],
--------------------------------------------------------------------------------