[livejournal] r20420: LJSUP-10102: Warning about delayed entri...

U   trunk/bin/upgrading/en.dat
U   trunk/htdocs/community/members.bml

Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-10-24 11:41:00 UTC (rev 20419)
+++ trunk/bin/upgrading/en.dat	2011-10-24 12:12:09 UTC (rev 20420)
@@ -122,6 +122,8 @@
 [[sitename]] Team<br/>[[siteroot]]</p>
 .
 
+community.members.maintainer.remove.delayed.email_html=All delayed entries will be deleted on publication date.
+
 community.members.maintainer.remove.email_plain|staleness=1
 community.members.maintainer.remove.email_plain<<
 Dear [[sitenameshort]] user [[user]],
@@ -131,6 +133,8 @@
 [[siteroot]]
 .
 
+community.members.maintainer.remove.delayed.email_plain=All delayed entries will be deleted on publication date.
+
 community.members.maintainer.remove.email_subject|staleness=1
 community.members.maintainer.remove.email_subject=Maintainership removal: [[mailusercname]]
 

Modified: trunk/htdocs/community/members.bml
===================================================================
--- trunk/htdocs/community/members.bml	2011-10-24 11:41:00 UTC (rev 20419)
+++ trunk/htdocs/community/members.bml	2011-10-24 12:12:09 UTC (rev 20420)
@@ -397,6 +397,11 @@
                             sitename        => $LJ::SITENAME,
                             siteroot        => $LJ::SITEROOT,
                         });
+    
+            if (LJ::DelayedEntry::entries_exists($cu, $remote)) {
+                $html .=  LJ::Lang::get_text($lang, 'community.members.maintainer.remove.delayed.email_html', undef);
+            }
+
             my $plain = LJ::Lang::get_text($lang, 'community.members.maintainer.remove.email_plain', undef, {
                             sitenameshort   => $LJ::SITENAMESHORT,
                             user            => $mailusername,
@@ -407,10 +412,14 @@
                             siteroot        => $LJ::SITEROOT,
                         });
 
+            if (LJ::DelayedEntry::entries_exists($cu, $remote)) {
+                $plain .=  LJ::Lang::get_text($lang, 'community.members.maintainer.remove.delayed.email_plain', undef);
+            }
+
             my $subject = LJ::Lang::get_text($lang, 'community.members.maintainer.remove.email_subject', undef,
                             { mailusercname => $mailusercname }
-                        );
-            $sendmail->($delmaintu, $html, $plain, $subject);
+                            );
+                $sendmail->($delmaintu, $html, $plain, $subject);
         }
 
         # delete other rel edges