[ljcom] r12948: LJSUP-14336: New text variable for recor...
Committer: vtroitsky
LJSUP-14336: New text variable for record in history.bml?tab=tokensU trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat 2012-11-27 07:16:16 UTC (rev 12947)
+++ trunk/bin/upgrading/en_LJ.dat 2012-11-27 07:50:25 UTC (rev 12948)
@@ -17496,7 +17496,7 @@
wallet.widget.history.des.donate=Tokens for an <a href="[[url]]">entry</a>
wallet.widget.history.des.journals=Journal promo LJTokens
-wallet.widget.history.des.journals.income=LJ Tokens for promotion <a href="[[entry_url]]">Entry</a> from [[buyer]]
+wallet.widget.history.des.journals.income=LJ Tokens for promotion <a href="[[entry_url]]">Entry</a> in [[journal]] from [[buyer]]
wallet.widget.history.des.journals.refund=Promo refund from [[buyer]] for an <a href="[[entry_url]]">entry</a> on [[journal]]
wallet.widget.history.des.journals.remainder=Journal promo remainder from [[buyer]]
Modified: trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm 2012-11-27 07:16:16 UTC (rev 12947)
+++ trunk/cgi-bin/LJ/Pay/Payment/PayItem/SelfPromo.pm 2012-11-27 07:50:25 UTC (rev 12948)
@@ -160,6 +160,7 @@
'wallet.widget.history.des.journals.income',
{ 'buyer' => $buyer->ljuser_display(),
'entry_url' => $promo->object_url(),
+ 'journal' => $promo->slot->journal()->ljuser_display(),
}
);
} elsif ( $misc & LJ::Pay::Wallet::Log::MASK_REMAINDER() ) {
