Committer: nnikulochkina
LJSUP-12856: Implement Blocking base classU trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/LJ/Pay/Wallet/Error.pm
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-07-11 07:53:35 UTC (rev 12263) +++ trunk/bin/upgrading/en_LJ.dat 2012-07-11 09:09:32 UTC (rev 12264) @@ -13739,10 +13739,14 @@ wallet.error_cannot_load_cart_owner|staleness=1 wallet.error_cannot_load_cart_owner=Cannot load the owner of the cart (#[[uid]]). -wallet.error_cannot_pay_block=Blocking has been already paid +wallet.error_cannot_lock=Cannot lock blocking (#[[blid]]) -wallet.error_cannot_release_block=Blocking has been already released +wallet.error_cannot_pay_block=Blocking has been already paid (#[[blid]]) +wallet.error_cannot_release_block=Blocking has been already released (#[[blid]]) + +wallet.error_cannot_release_lock=Cannot release blocking lock (#[[blid]]) + wallet.error_cannot_save_cart|staleness=1 wallet.error_cannot_save_cart=Couldn't update the cart to indicate that you've paid for it (#[[cart]]). @@ -13762,7 +13766,7 @@ wallet.error_invalid_account=Cannot load account -wallet.error_invalid_blocking=Cannot load blocking +wallet.error_invalid_blocking=Cannot load blocking #[[blid]] wallet.error_invalid_payitem=Cannot use this method to deliver item [[piid]], for it not being LJ Tokens. Modified: trunk/cgi-bin/LJ/Pay/Wallet/Error.pm =================================================================== --- trunk/cgi-bin/LJ/Pay/Wallet/Error.pm 2012-07-11 07:53:35 UTC (rev 12263) +++ trunk/cgi-bin/LJ/Pay/Wallet/Error.pm 2012-07-11 09:09:32 UTC (rev 12264) @@ -68,6 +68,8 @@ ERROR_INVALID_BLOCKING => 200, ERROR_CANNOT_RELEASE_BLOCK => 201, ERROR_CANNOT_PAY_BLOCK => 202, + ERROR_CANNOT_RELEASE_LOCK => 203, + ERROR_CANNOT_LOCK => 204, };