Alexander Nazarov (nfokz) wrote in changelog,
Alexander Nazarov
nfokz
changelog

[ljcom] r11149: LJSUP-9901: Add ability to put entry fro...

Committer: anazarov
LJSUP-9901: Add ability to put entry from community to owner and maintainers
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm
U   trunk/cgi-bin/LJ/Pay/SelfPromo.pm
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-11-03 09:41:27 UTC (rev 11148)
+++ trunk/bin/upgrading/en_LJ.dat	2011-11-03 12:34:03 UTC (rev 11149)
@@ -6913,6 +6913,20 @@
 selfpromo.notification.deactivate.ineligible.journal_invisible.subject|staleness=1
 selfpromo.notification.deactivate.ineligible.journal_invisible.subject=Entry promotion discontinued
 
+selfpromo.notification.deactivate.ineligible.not_found.body<<
+Dear [[poster]],
+
+Promotion of your entry has been discontinued because entry was deleted.
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.notification.deactivate.ineligible.not_found.subject|staleness=1
+selfpromo.notification.deactivate.ineligible.not_found.subject=Entry promotion discontinued
+
 selfpromo.notification.deactivate.ineligible.poster_invisible.body<<
 Dear [[poster]],
 
@@ -6927,6 +6941,20 @@
 selfpromo.notification.deactivate.ineligible.poster_invisible.subject|staleness=1
 selfpromo.notification.deactivate.ineligible.poster_invisible.subject=Entry promotion discontinued
 
+selfpromo.notification.deactivate.poster.body<<
+Dear [[promoter]],
+
+Promotion entry at [[entry_url]] has been discontinued by [[poster]].
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.notification.deactivate.poster.subject|staleness=1
+selfpromo.notification.deactivate.poster.subject=Entry promotion discontinued
+
 selfpromo.notification.deactivate.withdraw.body|staleness=1
 selfpromo.notification.deactivate.withdraw.body<<
 Dear [[poster]],

Modified: trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm	2011-11-03 09:41:27 UTC (rev 11148)
+++ trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm	2011-11-03 12:34:03 UTC (rev 11149)
@@ -120,8 +120,9 @@
             my $entry_url = $promo->entry_url;
 
             my $reason_map = {
-                'buyout'       => 'buyout',
-                'admin_cancel' => 'admin',
+                'buyout'        => 'buyout',
+                'admin_cancel'  => 'admin',
+                'poster_cancel' => 'poster',
             };
 
             # email them:

Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2011-11-03 09:41:27 UTC (rev 11148)
+++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2011-11-03 12:34:03 UTC (rev 11149)
@@ -769,6 +769,11 @@
             $ml_var = 'selfpromo.notification.deactivate.withdraw';
         }
 
+        if ( $reason eq 'poster' ) {
+            $ml_var = 'selfpromo.notification.deactivate.poster';
+            $ml_params{'promoter'} = $ml_params{'poster'};
+            $ml_params{'poster'}   = $entry? $entry->poster->display_name : '';
+        }
     }
 
     my $lang = $poster->prop('browselang') || $LJ::DEFAULT_LANG;

Tags: anazarov, dat, ljcom, nfokz, 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