Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r10980: LJSUP-9732 (Need to decrease SelfPromo p...

Committer: ailyin
LJSUP-9732 (Need to decrease SelfPromo periods)
U   trunk/bin/upgrading/deadphrases-local.dat
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Pay/SelfPromo.pm
Modified: trunk/bin/upgrading/deadphrases-local.dat
===================================================================
--- trunk/bin/upgrading/deadphrases-local.dat	2011-09-08 05:27:53 UTC (rev 10979)
+++ trunk/bin/upgrading/deadphrases-local.dat	2011-09-08 06:25:02 UTC (rev 10980)
@@ -655,3 +655,8 @@
 general horizon.footer.safetytips
 general horizon.footer.tos
 general horizon.footer.tour
+
+general selfpromo.notification.deactivate.admin.body
+general selfpromo.notification.deactivate.admin.subject
+general selfpromo.notification.deactivate.buyout.body
+general selfpromo.notification.deactivate.buyout.subject

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-09-08 05:27:53 UTC (rev 10979)
+++ trunk/bin/upgrading/en_LJ.dat	2011-09-08 06:25:02 UTC (rev 10980)
@@ -5506,10 +5506,10 @@
 
 selfpromo.notification.admin_cancel.subject=SelfPromo cancelled
 
-selfpromo.notification.deactivate.admin.body<<
+selfpromo.notification.deactivate.admin2.body<<
 Dear [[poster]],
 
-Promotion of your entry at [[entry_url]] has been discontinued due to a Terms of Use violation. Your entry stayed promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
+Promotion of your entry at [[entry_url]] has been discontinued due to a Terms of Use violation. Your entry stayed promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
 
 If you want to promote an entry again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml).
 
@@ -5521,12 +5521,12 @@
 http://www.livejournal.com
 .
 
-selfpromo.notification.deactivate.admin.subject=Entry promotion discontinued
+selfpromo.notification.deactivate.admin2.subject=Entry promotion discontinued
 
-selfpromo.notification.deactivate.buyout.body<<
+selfpromo.notification.deactivate.buyout2.body<<
 Dear [[poster]],
 
-Promotion of your entry at [[entry_url]] has been discontinued because someone else bought it out. Your entry stayed promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
+Promotion of your entry at [[entry_url]] has been discontinued because someone else bought it out. Your entry stayed promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
 
 If you want to promote an entry again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml).
 
@@ -5536,7 +5536,7 @@
 http://www.livejournal.com
 .
 
-selfpromo.notification.deactivate.buyout.subject=Entry promotion discontinued
+selfpromo.notification.deactivate.buyout2.subject=Entry promotion discontinued
 
 selfpromo.notification.deactivate.deleted.body<<
 Dear [[poster]],
@@ -5689,9 +5689,6 @@
 setting.sg.invitations.optional=optional
 setting.sg.invitations.cancel=Cancel
 
-setting.hidefriendsreposts.option.comm=Hide
-setting.hidefriendsreposts.label=Hide reposts in friends list
-
 setting.adcategories.emailoffers|staleness=1
 setting.adcategories.emailoffers=It's OK to occasionally email me promotional offers from advertisers in the categories I have checked. I understand that LiveJournal will not share or sell my email address with any advertiser.
 

Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2011-09-08 05:27:53 UTC (rev 10979)
+++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2011-09-08 06:25:02 UTC (rev 10980)
@@ -540,15 +540,16 @@
             'refund_amount'  => $opts{'refund_amount'},
             'entry_url'      => $opts{'entry_url'},
             'duration_hours' => int( $opts{'duration'} / 3600 ),
+            'duration_min'   => int( ( $opts{'duration'} % 3600 ) / 600 ) * 10,
             'poster'         => $poster->display_name,
         );
 
         if ( $reason eq 'admin' ) {
-            $ml_var = 'selfpromo.notification.deactivate.admin';
+            $ml_var = 'selfpromo.notification.deactivate.admin2';
         }
 
         if ( $reason eq 'buyout' ) {
-            $ml_var = 'selfpromo.notification.deactivate.buyout';
+            $ml_var = 'selfpromo.notification.deactivate.buyout2';
         }
 
         if ( $reason eq 'deleted' ) {

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