juks (juks) wrote in changelog,
juks
juks
changelog

[livejournal] r18219: LJSUP-7866 ML-variables for deleting com...

Committer: iaskarov
LJSUP-7866 ML-variables for deleting comment bubble
U   trunk/bin/upgrading/en.dat
U   trunk/cgi-bin/LJ/S2/EntryPage.pm
U   trunk/htdocs/talkread.bml
Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-02-04 12:00:29 UTC (rev 18218)
+++ trunk/bin/upgrading/en.dat	2011-02-07 04:45:04 UTC (rev 18219)
@@ -39,13 +39,14 @@
 cleanhtml.suspend_msg_with_supportid=This is a suspended entry. <a [[aopts]]>An unsuspension request</a> has been opened, and your entry will be reviewed soon.
 
 comment.delete.q=Delete comment?
-comment.cancel=Delete
 comment.delete=Delete
 comment.delete.all=Delete all %username% comments in this post
 comment.delete.all.sub=Delete thread (all subcomments)
+comment.delete.no.options=Shift+click to delete without options
+comment.cancel=Cancel
 comment.ban.user=Ban %username% from commenting
 comment.mark.spam=Mark this comment as spam
-comment.delete=Delete comment? 
+ 
 
 contentflag.viewingconcepts|staleness=1
 contentflag.viewingconcepts=You are about to view content that may not be appropriate for minors.
@@ -3416,21 +3417,6 @@
 [[shortsite]] Team
 .
 
-poll.election.not.need.subject=Supermaintainer choosen
-
-poll.election.not.need.html<<
-Dear [[username]],<br><br> 
-
-You are receiving this email because you are a maintainer of the community [[communityname]]. <br><br> 
-
-According to the history for this community, you has been designated as the owner of this community.<br><br> 
-
-You can read more about this role here: [[faqlink]]<br><br> 
-
-Regards,<br> 
-[[shortsite]] Team
-.
-
 poll.election.end.email<<
 Dear [[username]],
 
@@ -7216,4 +7202,4 @@
 widget.vgifts.title=Virtual Gifts
 
 widget.vgifts.viewall|staleness=1
-widget.vgifts.viewall=more
+widget.vgifts.viewall=more
\ No newline at end of file

Modified: trunk/cgi-bin/LJ/S2/EntryPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/EntryPage.pm	2011-02-04 12:00:29 UTC (rev 18218)
+++ trunk/cgi-bin/LJ/S2/EntryPage.pm	2011-02-07 04:45:04 UTC (rev 18219)
@@ -73,14 +73,16 @@
                     ));
 
     if($remote) {
-        LJ::need_string(qw/ comment.delete.q
+        LJ::need_string(qw/ 
                             comment.cancel
                             comment.delete
+                            comment.delete.q
                             comment.delete.all
                             comment.delete.all.sub
+                            comment.delete.no.options
                             comment.ban.user
                             comment.mark.spam
-                            comment.delete/);
+                            comment.delete/)
     }
 
     $p->{'entry'} = $s2entry;

Modified: trunk/htdocs/talkread.bml
===================================================================
--- trunk/htdocs/talkread.bml	2011-02-04 12:00:29 UTC (rev 18218)
+++ trunk/htdocs/talkread.bml	2011-02-07 04:45:04 UTC (rev 18219)
@@ -223,11 +223,13 @@
     }
     
     if($remote) {
-        LJ::need_string(qw/ comment.delete.q
+        LJ::need_string(qw/ 
                             comment.cancel
                             comment.delete
+                            comment.delete.q
                             comment.delete.all
                             comment.delete.all.sub
+                            comment.delete.no.options
                             comment.ban.user
                             comment.mark.spam
                             comment.delete/);

Tags: bml, dat, juks, livejournal, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments