sunnyman's (sunnyman) wrote in changelog,
sunnyman's
sunnyman
changelog

[ljcom] r11454: LJSUP-11182: Lang variables for notifica...

Committer: vtroitsky
LJSUP-11182: Lang variables for notifications completed.
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	2012-02-08 17:00:39 UTC (rev 11453)
+++ trunk/bin/upgrading/en_LJ.dat	2012-02-08 18:15:13 UTC (rev 11454)
@@ -6739,116 +6739,256 @@
 secret.travel_wo_parents.first_place|staleness=1
 secret.travel_wo_parents.first_place=Where did you take your first trip without your parents?
 
-selfpromo.entry.notification.activate.body<<
-Dear [[owner]],
+selfpromo.community.notification.activate.body<<
+Dear [[user]]!
+ Promotion of your community [[object_url]] was enabled successfully.
+ Thank you for using the service!
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
+.
 
-Promotion of your entry at [[object_url]] was enabled successfully.
+selfpromo.community.notification.activate.subject=Community promotion enabled
 
-Thank you for using the service.
+selfpromo.community.notification.admin_cancel.body<<
+Dear [[user]]!
 
-Best!
+You have successfully cancelled the promotion of the community [[object_url]].
 
-LiveJournal team
-http://www.livejournal.com
+- LiveJournal
 .
 
-selfpromo.entry.notification.activate.subject=Entry promotion enabled
+selfpromo.community.notification.admin_cancel.subject=Community promotion cancelled
 
-selfpromo.journal.notification.activate.body<<
-Dear [[owner]]!
- Promotion of your journal [[object_url]] was enabled successfully.
+selfpromo.community.notification.deactivate.admin2.body<<
+Dear [[user]]!
+ Promotion of your community [[object_url]] has been discontinued due to a Terms of Use violation. Your community was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
+ If you think it was an error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
  Thank you for using the service!
 Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.journal.notification.activate.subject=Journal promotion enabled
+selfpromo.community.notification.deactivate.admin2.norefund.body<<
+Dear [[user]],
+ Promotion of your community [[object_url]] has been discontinued due to a Terms of Use violation. Your community was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]].
+ If you think it was an error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+ Thank you for using the service!
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
+.
 
-selfpromo.community.notification.activate.body<<
-Dear [[owner]]!
- Promotion of your community [[object_url]] was enabled successfully.
+selfpromo.community.notification.deactivate.admin2.norefund.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.admin2.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.admin3.body<<
+Dear [[user]],
+ Promotion of your community [[object_url]] has been discontinued due to a Terms of Use violation. Your community was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+ If you want to promote another community, you can purchase promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
+ If you think it was removed in error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
  Thank you for using the service!
 Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.community.notification.activate.subject=Community promotion enabled
+selfpromo.community.notification.deactivate.admin3.subject=Community promotion discontinued
 
-selfpromo.entry.notification.admin_cancel.body<<
-Dear [[admin]]!
+selfpromo.community.notification.deactivate.buyout2.body<<
+Dear [[user]],
 
-You have successfully cancelled the promotion of the entry at [[object_url]].
+Promotion of your community [[object_url]] has been discontinued because someone else bought it out. Your community was 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.
 
-- LiveJournal
+If you want to promote an community again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
+
+Thank you for using the service!
+
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
 .
 
-selfpromo.entry.notification.admin_cancel.subject=Entry SelfPromo cancelled
+selfpromo.community.notification.deactivate.buyout2.subject=Community promotion discontinued
 
-selfpromo.journal.notification.admin_cancel.body<<
-Dear [[admin]]!
+selfpromo.community.notification.deactivate.buyout3.body<<
+Dear [[user]],
 
-You have successfully cancelled the promotion of the journal [[object_url]].
+Promotion of your community [[object_url]] has been discontinued because someone else bought it out. 
 
-- LiveJournal
+The community was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+
+[refund_amount] [[?refund_amount|token|tokens|tokens]] were refunded.
+
+If you want to promote your community again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
+
+Thank you for using the service!
+
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
 .
 
-selfpromo.journal.notification.admin_cancel.subject=Journal SelfPromo cancelled
+selfpromo.community.notification.deactivate.buyout3.subject=Community promotion discontinued
 
-selfpromo.community.notification.admin_cancel.body<<
-Dear [[admin]]!
+selfpromo.community.notification.deactivate.expired.body<<
+Dear [[user]],
 
-You have successfully cancelled the promotion of the community [[object_url]].
+Promotion of your community [[object_url]] has expired.
 
-- LiveJournal
+If you want to promote your community again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
+
+Thank you for using the service!
+
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
 .
 
-selfpromo.community.notification.admin_cancel.subject=Community SelfPromo cancelled
+selfpromo.community.notification.deactivate.expired.subject=The promotion period of your community expired
 
-selfpromo.entry.notification.deactivate.admin.body<<
-Dear [[poster]],
+selfpromo.community.notification.deactivate.ineligible.community_adult_content.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has been discontinued due to a Terms of Use violation. Your entry was 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 the community [[object_url]] has been discontinued because it has been marked as containing adult content.
 
-If a promoted entry violates LiveJournal's policies, it will be removed without reimbursement. If an author repeatedly promotes entries that violate our policies, we may block that journal from further participation in the promotion feature.
+Thank you for using the service!
 
-If you think it was removed in error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+LiveJournal Team
+http://www.livejournal.com
+.
 
+selfpromo.community.notification.deactivate.ineligible.community_adult_content.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.ineligible.community_banned.body<<
+Dear [[user]],
+
+Promotion of the community [[object_url]] has been discontinued because it has been banned from using SelfPromo service.
+
 Thank you for using the service!
 
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.admin.subject=Entry promotion discontinued
+selfpromo.community.notification.deactivate.ineligible.journal_banned.subject=Community promotion discontinued
 
-selfpromo.journal.notification.deactivate.admin.body<<
-Dear [[owner]]!
- Promotion of your journal at [[object_url]] has been discontinued due to a Terms of Use violation. Your entry was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
- If you think it was an error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
- Thank you for using the service!
+selfpromo.community.notification.deactivate.ineligible.community_invisible.body<<
+Dear [[user]],
+
+Promotion of the community [[object_url]] has been discontinued because it has failed to remain visible (i. e. it was deleted or suspended).
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.community.notification.deactivate.ineligible.community_invisible.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.ineligible.no_public_entries.body<<
+Dear [[user]],
+
+Promotion of the community [[object_url]] has been discontinued because there is no any public entries available in it.
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.community.notification.deactivate.ineligible.no_public_entries.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.ineligible.not_found.body<<
+Dear [[user]],
+
+Promotion of the community [[object_url]] has been discontinued because it was deleted, suspended or privacy settings had been changed.
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.community.notification.deactivate.ineligible.not_found.subject=Community promotion discontinued
+
+selfpromo.community.notification.deactivate.owner.body<<
+Dear [[user]],
+
+Promotion of the community [[object_url]] has been discontinued by [[owner]].
+
+Thank you for using the service!
+
 Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.journal.notification.deactivate.admin.subject=Entry promotion discontinued
+selfpromo.community.notification.deactivate.owner.subject=Community promotion discontinued
 
-selfpromo.community.notification.deactivate.admin.body<<
-Dear [[owner]]!
- Promotion of your community [[object_url]] has been discontinued due to a Terms of Use violation. Your entry was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
- If you think it was an error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
- Thank you for using the service!
+selfpromo.community.notification.deactivate.withdraw.body<<
+Dear [[user]],
+
+You have successfully withdrawn promotion of the community [[object_url]], so it is no longer promoted.
+
+Thank you for using the service!
+
 Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.community.notification.deactivate.admin.subject=Community promotion discontinued
+selfpromo.community.notification.deactivate.withdraw.subject=Community promotion withdrawn
 
+selfpromo.community.shop_item.name=Promotion of the <a href="[[object_url]]">community</a>
+
+selfpromo.entry.notification.activate.body<<
+Dear [[user]],
+
+Promotion of your entry at [[object_url]] was enabled successfully.
+
+Thank you for using the service.
+
+Best!
+
+LiveJournal team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.activate.subject=Entry promotion enabled
+
+selfpromo.entry.notification.admin_cancel.body<<
+Dear [[user]]!
+
+You have successfully cancelled the promotion of the entry at [[object_url]].
+
+- LiveJournal
+.
+
+selfpromo.entry.notification.admin_cancel.subject=Entry SelfPromo cancelled
+
+selfpromo.entry.notification.deactivate.admin.body<<
+Dear [[user]],
+
+Promotion of your entry at [[object_url]] has been discontinued due to a Terms of Use violation. Your entry was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
+
+If a promoted entry violates LiveJournal's policies, it will be removed without reimbursement. If an author repeatedly promotes entries that violate our policies, we may block that journal from further participation in the promotion feature.
+
+If you think it was removed in error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+
+Thank you for using the service!
+
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.deactivate.admin.subject=Entry promotion discontinued
+
 selfpromo.entry.notification.deactivate.admin2.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_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.
 
@@ -6863,7 +7003,7 @@
 .
 
 selfpromo.entry.notification.deactivate.admin2.norefund.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_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]].
 
@@ -6882,7 +7022,7 @@
 selfpromo.entry.notification.deactivate.admin2.subject=Entry promotion discontinued
 
 selfpromo.entry.notification.deactivate.admin3.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_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]].
 
@@ -6899,7 +7039,7 @@
 selfpromo.entry.notification.deactivate.admin3.subject=Entry promotion discontinued
 
 selfpromo.entry.notification.deactivate.buyout.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_url]] has been discontinued because someone else bought it out. Your entry was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
 
@@ -6914,7 +7054,7 @@
 selfpromo.entry.notification.deactivate.buyout.subject=Entry promotion discontinued
 
 selfpromo.entry.notification.deactivate.buyout2.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_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.
 
@@ -6929,7 +7069,7 @@
 selfpromo.entry.notification.deactivate.buyout2.subject=Entry promotion discontinued
 
 selfpromo.entry.notification.deactivate.buyout3.body<<
-Dear [[poster]],
+Dear [[user]],
 
 Promotion of your entry at [[object_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]].
 
@@ -6943,152 +7083,248 @@
 
 selfpromo.entry.notification.deactivate.buyout3.subject=Entry promotion discontinued
 
+selfpromo.entry.notification.deactivate.deleted.body<<
+Dear [[user]],
 
-selfpromo.journal.notification.deactivate.buyout3.body<<
-Dear [[owner]],
+Promotion of your entry at [[object_url]] has been discontinued because it was deleted.
 
-Promotion of your journal [[object_url]] has been discontinued because someone else bought it out. Your journal was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+Thank you for using the service!
 
-[refund_amount] [[?refund_amount|token|tokens|tokens]] were refunded.
+LiveJournal Team
+http://www.livejournal.com
+.
 
-If you want to promote your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+selfpromo.entry.notification.deactivate.deleted.subject=Entry promotion discontinued
 
+selfpromo.entry.notification.deactivate.expired.body<<
+Dear [[user]],
+
+Promotion of your entry at [[object_url]] has expired.
+
+If you want to promote an entry again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml).
+
 Thank you for using the service!
 
-Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.journal.notification.deactivate.buyout3.subject=Journal promotion discontinued
+selfpromo.entry.notification.deactivate.expired.subject=Your promotion has expired and has been deactivated
 
+selfpromo.entry.notification.deactivate.ineligible.entry_adult_content.body<<
+Dear [[user]],
 
-selfpromo.community.notification.deactivate.buyout3.body<<
-Dear [[owner]],
+Promotion of your entry at [[object_url]] has been discontinued because it has been marked as containing adult content.
 
-Promotion of your community [[object_url]] has been discontinued because someone else bought it out. 
+Thank you for using the service!
 
-The community was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+LiveJournal Team
+http://www.livejournal.com
+.
 
-[refund_amount] [[?refund_amount|token|tokens|tokens]] were refunded.
+selfpromo.entry.notification.deactivate.ineligible.entry_adult_content.subject=Entry promotion discontinued
 
-If you want to promote your community again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
+selfpromo.entry.notification.deactivate.ineligible.entry_invisible.body<<
+Dear [[user]],
 
+Promotion of your entry at [[object_url]] has been discontinued because it has failed to remain visible (i. e. it was deleted or suspended).
+
 Thank you for using the service!
 
-Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.community.notification.deactivate.buyout3.subject=Community promotion discontinued
+selfpromo.entry.notification.deactivate.ineligible.entry_invisible.subject=Entry promotion discontinued
 
+selfpromo.entry.notification.deactivate.ineligible.entry_not_public.body<<
+Dear [[user]],
 
-selfpromo.entry.notification.deactivate.deleted.body<<
-Dear [[poster]],
+Promotion of your entry at [[object_url]] has been discontinued because it is no longer publicly available.
 
-Promotion of your entry at [[object_url]] has been discontinued because it was deleted.
+Thank you for using the service!
 
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.deactivate.ineligible.entry_not_public.subject=Entry promotion discontinued
+
+selfpromo.entry.notification.deactivate.ineligible.journal_adult_content.body<<
+Dear [[user]],
+
+Promotion of your entry at [[object_url]] has been discontinued because your journal has been marked as containing adult content.
+
 Thank you for using the service!
 
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.deleted.subject=Entry promotion discontinued
+selfpromo.entry.notification.deactivate.ineligible.journal_adult_content.subject=Entry promotion discontinued
 
-selfpromo.entry.notification.deactivate.expired.body<<
-Dear [[poster]],
+selfpromo.entry.notification.deactivate.ineligible.journal_invisible.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has expired.
+Promotion of your entry at [[object_url]] has been discontinued because that journal has failed to remain visible (i. e. it was deleted or suspended).
 
-If you want to promote an entry again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml).
+Thank you for using the service!
 
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.deactivate.ineligible.journal_invisible.subject=Entry promotion discontinued
+
+selfpromo.entry.notification.deactivate.ineligible.not_found.body<<
+Dear [[user]],
+
+Promotion of your entry has been discontinued because entry was deleted.
+
 Thank you for using the service!
 
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.expired.subject=Your promotion has expired and has been deactivated
+selfpromo.entry.notification.deactivate.ineligible.not_found.subject=Entry promotion discontinued
 
-selfpromo.journal.notification.deactivate.expired.body<<
-Dear [[owner]],
+selfpromo.entry.notification.deactivate.ineligible.poster_invisible.body<<
+Dear [[user]],
 
-Promotion of your journal [[object_url]] has expired.
+Promotion of your entry at [[object_url]] has been discontinued because your account has failed to remain visible (i. e. it was deleted or suspended).
 
-If you want to promote your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+Thank you for using the service!
 
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.deactivate.ineligible.poster_invisible.subject=Entry promotion discontinued
+
+selfpromo.entry.notification.deactivate.owner.body<<
+Dear [[user]],
+
+Promotion entry at [[object_url]] has been discontinued by [[owner]].
+
 Thank you for using the service!
 
-Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.journal.notification.deactivate.expired.subject=The promotion period of your jorunal expired
+selfpromo.entry.notification.deactivate.owner.subject=Entry promotion discontinued
 
-selfpromo.community.notification.deactivate.expired.body<<
-Dear [[poster]],
+selfpromo.entry.notification.deactivate.withdraw.body<<
+Dear [[user]],
 
-Promotion of your community [[object_url]] has expired.
+You have successfully withdrawn promotion of your entry at [[object_url]], so it is no longer promoted.
 
-If you want to promote your community again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=community).
-
 Thank you for using the service!
 
+LiveJournal Team
+http://www.livejournal.com
+.
+
+selfpromo.entry.notification.deactivate.withdraw.subject=Entry promotion withdrawn
+
+selfpromo.entry.shop_item.name=Promotion of the <a href="[[object_url]]">entry</a>
+
+selfpromo.journal.notification.activate.body<<
+Dear [[user]]!
+ Promotion of your journal [[object_url]] was enabled successfully.
+ Thank you for using the service!
 Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.community.notification.deactivate.expired.subject=The promotion period of your community expired
+selfpromo.journal.notification.activate.subject=Journal promotion enabled
 
+selfpromo.journal.notification.admin_cancel.body<<
+Dear [[user]]!
 
+You have successfully cancelled the promotion of the journal [[object_url]].
 
-selfpromo.entry.notification.deactivate.ineligible.entry_adult_content.body<<
-Dear [[poster]],
+- LiveJournal
+.
 
-Promotion of your entry at [[object_url]] has been discontinued because it has been marked as containing adult content.
+selfpromo.journal.notification.admin_cancel.subject=Journal SelfPromo cancelled
 
-Thank you for using the service!
+selfpromo.journal.notification.deactivate.admin2.body<<
+Dear [[user]]!
+ Promotion of your journal [[object_url]] has been discontinued due to a Terms of Use violation. Your journal was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]]. You have been granted [[refund_amount]] [[?refund_amount|token|tokens|tokens]] as a refund.
+ If you think it was an error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+ Thank you for using the service!
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
+.
 
+selfpromo.journal.notification.deactivate.admin2.norefund.body<<
+Dear [[user]],
+ Promotion of your journal [[object_url]] has been discontinued due to a Terms of Use violation. Your journal was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+ If you want to promote your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+ If you think it was removed in error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+ Thank you for using the service!
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.entry_adult_content.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.admin2.norefund.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.entry_invisible.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.admin2.subject=Journal promotion discontinued
 
-Promotion of your entry at [[object_url]] has been discontinued because it has failed to remain visible (i. e. it was deleted or suspended).
+selfpromo.journal.notification.deactivate.admin3.body<<
+Dear [[user]],
+ Promotion of your journal [[object_url]] has been discontinued due to a Terms of Use violation. Your journal was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
+ If you want to promote your journal again, you can purchase promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+ If you think it was removed in error, please contact our Support team (http://www.livejournal.com/support/) and let us know.
+ Thank you for using the service!
+Best regards,
+LiveJournal Team
+http://www.livejournal.com
+.
 
+selfpromo.journal.notification.deactivate.admin3.subject=Journal promotion discontinued
+
+selfpromo.journal.notification.deactivate.buyout2.body<<
+Dear [[user]],
+
+Promotion of your journal [[object_url]] has been discontinued because someone else bought it out. Your entry was 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 your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
 Thank you for using the service!
 
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.entry_invisible.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.buyout2.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.entry_not_public.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.buyout3.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has been discontinued because it is no longer publicly available.
+Promotion of your journal [[object_url]] has been discontinued because someone else bought it out. Your journal was promoted for [[duration_hours]] [[?duration_hours|hour|hours|hours]] [[duration_min]] [[?duration_min|minute|minutes|minutes]].
 
+[refund_amount] [[?refund_amount|token|tokens|tokens]] were refunded.
+
+If you want to promote your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+
 Thank you for using the service!
 
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.entry_not_public.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.buyout3.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.journal_adult_content.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.deleted.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has been discontinued because your journal has been marked as containing adult content.
+Promotion of your journal [[object_url]] has been discontinued because it was deleted.
 
 Thank you for using the service!
 
@@ -7096,25 +7332,28 @@
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.journal_adult_content.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.deleted.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.journal_invisible.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.expired.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has been discontinued because that journal has failed to remain visible (i. e. it was deleted or suspended).
+Promotion of your journal [[object_url]] has expired.
 
+If you want to promote your journal again, you can purchase another promotion at the promotion page (http://www.livejournal.com/shop/selfpromo.bml?type=journal).
+
 Thank you for using the service!
 
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.journal_invisible.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.expired.subject=The promotion period of your journal expired
 
-selfpromo.entry.notification.deactivate.ineligible.not_found.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.ineligible.journal_adult_content.body<<
+Dear [[user]],
 
-Promotion of your entry has been discontinued because entry was deleted.
+Promotion of your journal [[object_url]] has been discontinued because it has been marked as containing adult content.
 
 Thank you for using the service!
 
@@ -7122,25 +7361,26 @@
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.not_found.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.ineligible.journal_adult_content.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.poster_invisible.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.ineligible.journal_banned.body<<
+Dear [[user]],
 
-Promotion of your entry at [[object_url]] has been discontinued because your account has failed to remain visible (i. e. it was deleted or suspended).
+Promotion of your journal has been discontinued because your account has been banned from using SelfPromo service.
 
 Thank you for using the service!
 
+Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.poster_invisible.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.ineligible.journal_banned.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.poster.body<<
-Dear [[promoter]],
+selfpromo.journal.notification.deactivate.ineligible.journal_invisible.body<<
+Dear [[user]],
 
-Promotion entry at [[object_url]] has been discontinued by [[poster]].
+Promotion of your journal [[object_url]] has been discontinued because it has failed to remain visible (i. e. it was deleted or suspended).
 
 Thank you for using the service!
 
@@ -7148,12 +7388,12 @@
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.poster.subject=Entry promotion discontinued
+selfpromo.journal.notification.deactivate.ineligible.journal_invisible.subject=Journal promotion discontinued
 
-selfpromo.entry.notification.deactivate.withdraw.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.ineligible.no_public_entries.body<<
+Dear [[user]],
 
-You have successfully withdrawn promotion of your entry at [[object_url]], so it is no longer promoted.
+Promotion of your journal [[object_url]] has been discontinued because it is no any public entries available in it.
 
 Thank you for using the service!
 
@@ -7161,27 +7401,27 @@
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.withdraw.subject=Entry promotion withdrawn
+selfpromo.journal.notification.deactivate.ineligible.no_public_entries.subject=Journal promotion discontinued
 
-selfpromo.journal.notification.deactivate.withdraw.body<<
-Dear [[poster]],
+selfpromo.journal.notification.deactivate.ineligible.not_found.body<<
+Dear [[user]],
 
-You have successfully withdrawn promotion of your journal [[object_url]], so it is no longer promoted.
+Promotion of your journal has been discontinued because it was deleted, suspended or privacy settings had been changed.
 
 Thank you for using the service!
 
-Best regards,
 LiveJournal Team
 http://www.livejournal.com
 .
 
-selfpromo.journal.notification.deactivate.withdraw.subject=Journal promotion withdrawn
+selfpromo.journal.notification.deactivate.ineligible.not_found.subject=Journal promotion discontinued
 
-selfpromo.community.notification.deactivate.withdraw.body<<
-Dear [[poster]],
 
-You have successfully withdrawn promotion of your community [[object_url]], so it is no longer promoted.
+selfpromo.journal.notification.deactivate.withdraw.body<<
+Dear [[user]],
 
+You have successfully withdrawn promotion of your journal [[object_url]], so it is no longer promoted.
+
 Thank you for using the service!
 
 Best regards,
@@ -7189,11 +7429,9 @@
 http://www.livejournal.com
 .
 
-selfpromo.community.notification.deactivate.withdraw.subject=Community promotion withdrawn
+selfpromo.journal.notification.deactivate.withdraw.subject=Journal promotion withdrawn
 
-selfpromo.entry.shop_item.name=Promotion of the <a href="[[object_url]]">entry</a>
 selfpromo.journal.shop_item.name=Promotion of the <a href="[[object_url]]">journal</a>
-selfpromo.community.shop_item.name=Promotion of the <a href="[[object_url]]">community</a>
 
 selfpromo.shop_item.type=Self Promo service
 

Modified: trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm	2012-02-08 17:00:39 UTC (rev 11453)
+++ trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm	2012-02-08 18:15:13 UTC (rev 11454)
@@ -280,7 +280,7 @@
         unless ( LJ::u_equals($owner, $rcpt_u) ) {
             $email_body = $ml->(
                 "selfpromo.$class_type.notification.activate.body",
-                {   'owner'    => $owner->display_name,
+                {   'user'    => $owner->display_name,
                     'object_url' => $object_url,
                 },
             );
@@ -297,7 +297,7 @@
 
         $email_body = $ml->(
             "selfpromo.$class_type.notification.activate.body",
-            {   'owner'    => $rcpt_u->display_name,
+            {   'user'    => $rcpt_u->display_name,
                 'object_url' => $object_url,
             },
         );
@@ -312,7 +312,7 @@
 
         $email_body = $ml->(
             "selfpromo.$class_type.notification.admin_cancel.body",
-            {   'admin'     => $rcpt_u->display_name,
+            {   'user'     => $rcpt_u->display_name,
                 'object_url' => $promo ? $object_url : '',
             },
         );

Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-02-08 17:00:39 UTC (rev 11453)
+++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-02-08 18:15:13 UTC (rev 11454)
@@ -48,7 +48,6 @@
 sub type { 'entry' }
 sub class { 'entry' };      # TODO: remove that function from base SelfPromo class
   
-  
 sub get_class_by_type {
     my ($class, $type) = @_;
     return $classes_map{$type};
@@ -58,6 +57,7 @@
     my ($class, $type) = @_;
     return $objects_map{$type};
 }
+
 ### HIGH LEVEL INTERFACE ###
 # NOTE: ALL FUNCTIONS HERE HAVE TO PERFORM EXCLUSIVE MODE OPERATIONS !#
   
@@ -65,7 +65,7 @@
 sub buyout_cost {
     my ($class) = @_;
   
-    if ( my $promo = $class->current_promo_info( undef, 'require_db' => 1 ) ) {    # changed to  current_promo_info
+    if ( my $promo = $class->current_promo_info( undef, 'require_db' => 1 ) ) {    # changed to current_promo_info
   
         # there actually is a promoted entry right now, so let's
         # return however much its author paid for it plus the bidding step
@@ -258,6 +258,8 @@
 
     return $cart;
 }
+
+
  
 =item admin_cancel_promo
    Admin function to cancel current promo        
@@ -966,6 +968,7 @@
                 unless ( $opts{'refund_amount'} > 0 ) {
                     $ml_var .= '.norefund';
                 }
+                $ml_params{'owner'} = $opts{'owner'} ? $opts{'owner'}->display_name : '';
             }
         }
 
@@ -974,6 +977,7 @@
                 $ml_var = "selfpromo.$sp_class.notification.deactivate.buyout3";
             } else {
                 $ml_var = "selfpromo.$sp_class.notification.deactivate.buyout2";
+                $ml_params{'owner'} = $opts{'owner'} ? $opts{'owner'}->display_name : '';
             }
         }
 

Tags: dat, ljcom, pm, sunnyman, vtroitsky
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