[livejournal] r20848: LJSUP-10876 (Comments notifications - ti...

U   trunk/bin/upgrading/en.dat
U   trunk/cgi-bin/LJ/Event/JournalNewComment.pm

Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-12-22 21:34:08 UTC (rev 20847)
+++ trunk/bin/upgrading/en.dat	2011-12-23 08:35:16 UTC (rev 20848)
@@ -2164,6 +2164,8 @@
 esn.mail_comments.subject.edit_reply_to_your_entry|staleness=1
 esn.mail_comments.subject.edit_reply_to_your_entry=Edited reply to your entry...
 
+esn.mail_comments.subject.entry_subject=Reply to "[[subject]]"...
+
 esn.mail_comments.subject.reply_to_an_entry|staleness=1
 esn.mail_comments.subject.reply_to_an_entry=Reply to an entry...
 

Modified: trunk/cgi-bin/LJ/Event/JournalNewComment.pm
===================================================================
--- trunk/cgi-bin/LJ/Event/JournalNewComment.pm	2011-12-22 21:34:08 UTC (rev 20847)
+++ trunk/cgi-bin/LJ/Event/JournalNewComment.pm	2011-12-23 08:35:16 UTC (rev 20848)
@@ -112,8 +112,15 @@
     }
 
     my $key = 'esn.mail_comments.subject.';
-    if ($self->comment->subject_orig) {
-        return LJ::strip_html($self->comment->subject_orig);
+    if ( my $comment_subject = $self->comment->subject_orig ) {
+        return LJ::strip_html($comment_subject);
+    } elsif ( my $entry_subject = $self->comment->entry->subject_raw ) {
+        return LJ::Lang::get_text(
+            $lang,
+            'esn.mail_comments.subject.entry_subject',
+            undef,
+            { 'subject' => LJ::strip_html($entry_subject) },
+        );
     } elsif (LJ::u_equals($self->comment->poster, $u)) {
         $key .= $edited ? 'comment_you_edited' : 'comment_you_posted';
     } elsif ($self->comment->parent) {