tabs->spaces in PayPal i18n file (was inconsistant) and a couple of doc changes per colin's suggestions.
This commit is contained in:
Paul Driver
parent
2adb08c79c
commit
fa23a75c39
4 changed files with 106 additions and 91 deletions
|
|
@ -3,7 +3,8 @@
|
|||
- fixed #10626: Carriage returns stripped from Wiki comments
|
||||
- fixed #10572: CDN / CloudFront breaks 7.7.11 upgrade
|
||||
- fixed #10630: If macro says that 0 is true
|
||||
- PayDriver::PayPal replaced. The old one fought the Shop API and
|
||||
- WebGUI::Shop::PayDriver::PayPal::PayPalStd replaced by
|
||||
WebGUI::Shop::PayDriver::PayPal. PayPalStd fought the Shop API and
|
||||
didn't work.
|
||||
|
||||
7.7.14
|
||||
|
|
|
|||
|
|
@ -9,10 +9,12 @@ save you many hours of grief.
|
|||
|
||||
7.7.15
|
||||
--------------------------------------------------------------------
|
||||
* PayDriver::PayPal has been replaced with an entirely different
|
||||
module. If you had the old one working, the new one very likely
|
||||
will not work (the old one did some very un-Shop things, which
|
||||
is why it was replaced). Please test the new one with your setup.
|
||||
* WebGUI::Shop::PayDriver::PayPal::PayPalStd has been replaced by
|
||||
WebGUI::Shop::PayDriver::PayPal. The old module by that name (a base
|
||||
class for PayPalStd) has been removed. If you had the PayPalStd working,
|
||||
the new module very likely will not work (the old one did some very
|
||||
un-Shop things, which is why it was replaced). Please test the new one
|
||||
with your setup.
|
||||
|
||||
7.7.13
|
||||
--------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -192,7 +192,9 @@ sub processPayment {
|
|||
}
|
||||
|
||||
my $status = $params->{PAYMENTSTATUS};
|
||||
my $message = "Payment Status: $status";
|
||||
|
||||
my $i18n = WebGUI::International->new( $self->session, $I18N );
|
||||
my $message = sprintf $i18n->get('payment status'), $status;
|
||||
return ( 1, $params->{TRANSACTIONID}, $status, $message );
|
||||
}
|
||||
|
||||
|
|
@ -278,7 +280,7 @@ sub www_sendToPayPal {
|
|||
unless ( $params->{ACK} =~ /^Success/ ) {
|
||||
my $log = sprintf "Paypal error: Request/response below: %s\n%s\n", Dumper($form), Dumper($params);
|
||||
$session->log->error($log);
|
||||
$error = 'Internal Paypal Error';
|
||||
$error = $i18n->get('internal paypal error');
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -3,91 +3,101 @@ package WebGUI::i18n::English::PayDriver_PayPal;
|
|||
use strict;
|
||||
|
||||
our $I18N = {
|
||||
'api' => {
|
||||
message => q{API URL},
|
||||
lastUpdated => 1247254043,
|
||||
},
|
||||
'api error' => {
|
||||
message => q{Error communicating with PayPal API: %s},
|
||||
lastUpdated => 1247496228,
|
||||
'api' => {
|
||||
message => q{API URL},
|
||||
lastUpdated => 1247254043,
|
||||
},
|
||||
'api error' => {
|
||||
message => q{Error communicating with PayPal API: %s},
|
||||
lastUpdated => 1247496228,
|
||||
context => q{Error message to display on internal error talking to paypal},
|
||||
},
|
||||
'api help' => {
|
||||
message => q{Base URL for PayPal's NVP api},
|
||||
lastUpdated => 1247254068,
|
||||
},
|
||||
'apiSandbox' => {
|
||||
message => q{API Sandbox URL},
|
||||
lastUpdated => 1247499398,
|
||||
},
|
||||
'apiSandbox help' => {
|
||||
message => q{URL for Paypal API in test mode},
|
||||
lastUpdated => 1247499415,
|
||||
},
|
||||
'currency' => {
|
||||
message => q{Currency Code},
|
||||
lastUpdated => 1247253894,
|
||||
},
|
||||
'currency help' => {
|
||||
message => q{Paypal currency code to use (e.g. USD)},
|
||||
lastUpdated => 1247253924,
|
||||
},
|
||||
'label' => {
|
||||
message => q{NewPal},
|
||||
lastUpdated => 1247256659,
|
||||
},
|
||||
'name' => {
|
||||
message => q{NewPal},
|
||||
lastUpdated => 1247256412,
|
||||
},
|
||||
'password' => {
|
||||
message => q{Password},
|
||||
lastUpdated => 1247254156,
|
||||
},
|
||||
'password help' => {
|
||||
message => q{Password from PayPal credentials},
|
||||
lastUpdated => 1247254172,
|
||||
},
|
||||
'paypal' => {
|
||||
message => q{Paypal URL},
|
||||
lastUpdated => 1247498678,
|
||||
},
|
||||
'paypal help' => {
|
||||
message => q{URL to use when redirecting to paypal},
|
||||
lastUpdated => 1247498700,
|
||||
},
|
||||
'sandbox' => {
|
||||
message => q{Sandbox URL},
|
||||
lastUpdated => 1247498780,
|
||||
},
|
||||
'sandbox help' => {
|
||||
message => q{URL to use for redirecting to paypal in test mode},
|
||||
lastUpdated => 1247498766,
|
||||
},
|
||||
'signature' => {
|
||||
message => q{Signature},
|
||||
lastUpdated => 1247254180,
|
||||
},
|
||||
'signature help' => {
|
||||
message => q{Signature from PayPal credentials},
|
||||
lastUpdated => 1247254195,
|
||||
},
|
||||
'testMode' => {
|
||||
message => q{Test Mode},
|
||||
lastUpdated => 1247253942,
|
||||
},
|
||||
'testMode help' => {
|
||||
message => q{Whether to use PayPal's sandbox},
|
||||
lastUpdated => 1247253981,
|
||||
},
|
||||
'user' => {
|
||||
message => q{Username},
|
||||
lastUpdated => 1247254097,
|
||||
},
|
||||
'user help' => {
|
||||
message => q{Username from Paypal credentials},
|
||||
lastUpdated => 1247254128,
|
||||
},
|
||||
},
|
||||
'api help' => {
|
||||
message => q{Base URL for PayPal's NVP api},
|
||||
lastUpdated => 1247254068,
|
||||
},
|
||||
'apiSandbox' => {
|
||||
message => q{API Sandbox URL},
|
||||
lastUpdated => 1247499398,
|
||||
},
|
||||
'apiSandbox help' => {
|
||||
message => q{URL for Paypal API in test mode},
|
||||
lastUpdated => 1247499415,
|
||||
},
|
||||
'currency' => {
|
||||
message => q{Currency Code},
|
||||
lastUpdated => 1247253894,
|
||||
},
|
||||
'currency help' => {
|
||||
message => q{Paypal currency code to use (e.g. USD)},
|
||||
lastUpdated => 1247253924,
|
||||
},
|
||||
'internal paypal error' => {
|
||||
message => q{Internal PayPal Error},
|
||||
lastUpdated => 1247524131,
|
||||
context => q{Message to display when something goes wrong talking to PayPal},
|
||||
},
|
||||
'label' => {
|
||||
message => q{NewPal},
|
||||
lastUpdated => 1247256659,
|
||||
},
|
||||
'name' => {
|
||||
message => q{NewPal},
|
||||
lastUpdated => 1247256412,
|
||||
},
|
||||
'password' => {
|
||||
message => q{Password},
|
||||
lastUpdated => 1247254156,
|
||||
},
|
||||
'password help' => {
|
||||
message => q{Password from PayPal credentials},
|
||||
lastUpdated => 1247254172,
|
||||
},
|
||||
'payment status' => {
|
||||
message => q{Payment Status: %s},
|
||||
lastUpdated => 1247524208,
|
||||
context => q{Message to be used in receipt page as gateway message. Placeholder is for the actual status.},
|
||||
},
|
||||
'paypal' => {
|
||||
message => q{Paypal URL},
|
||||
lastUpdated => 1247498678,
|
||||
},
|
||||
'paypal help' => {
|
||||
message => q{URL to use when redirecting to paypal},
|
||||
lastUpdated => 1247498700,
|
||||
},
|
||||
'sandbox' => {
|
||||
message => q{Sandbox URL},
|
||||
lastUpdated => 1247498780,
|
||||
},
|
||||
'sandbox help' => {
|
||||
message => q{URL to use for redirecting to paypal in test mode},
|
||||
lastUpdated => 1247498766,
|
||||
},
|
||||
'signature' => {
|
||||
message => q{Signature},
|
||||
lastUpdated => 1247254180,
|
||||
},
|
||||
'signature help' => {
|
||||
message => q{Signature from PayPal credentials},
|
||||
lastUpdated => 1247254195,
|
||||
},
|
||||
'testMode' => {
|
||||
message => q{Test Mode},
|
||||
lastUpdated => 1247253942,
|
||||
},
|
||||
'testMode help' => {
|
||||
message => q{Whether to use PayPal's sandbox},
|
||||
lastUpdated => 1247253981,
|
||||
},
|
||||
'user' => {
|
||||
message => q{Username},
|
||||
lastUpdated => 1247254097,
|
||||
},
|
||||
'user help' => {
|
||||
message => q{Username from Paypal credentials},
|
||||
lastUpdated => 1247254128,
|
||||
},
|
||||
};
|
||||
|
||||
1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue