oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'v7.10.17' into 8

Browse source 
Conflicts:
	docs/upgrades/upgrade_7.9.13-7.10.0.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/AssetReport.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Form/Captcha.pm
	lib/WebGUI/Macro/AdminBar.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/PayDriver.pm
	lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Workflow/Instance.pm
	lib/WebGUI/Workflow/Spectre.pm
	lib/WebGUI/i18n/English/PayDriver.pm
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Wobject/Thingy.t
This commit is contained in:
Doug Bell 2011-06-17 20:13:41 -05:00
commit 795d88e7e5
69 changed files with 972 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/i18n/English/Asset_Map.pm
View file

@ -242,8 +242,8 @@ our $I18N = {
},
'templateIdEditPoint' => {
message => "The GUID of the template for addding or editing a point.",
lastUpdated => 0,
message => "The GUID of the template for adding or editing a point.",
lastUpdated => 1304717948,
context => "template variable help",
},

18
lib/WebGUI/i18n/English/Macro_RenderThingData.pm Normal file
View file

@ -0,0 +1,18 @@
package WebGUI::i18n::English::Macro_RenderThingData;
use strict;
our $I18N = {
'bad tags' => {
message => q||,
lastUpdated => 1306275259,
},
'no template' => {
message => q|RenderThingData: Please specify a template.|,
lastUpdated => 1149177662,
},
};
1;

6
lib/WebGUI/i18n/English/PayDriver.pm
View file

@ -124,6 +124,12 @@ our $I18N = {
context => q|Name of the base Payment Driver|,
},
'unable to finish transaction' => {
message => q|We are unable to lookup the transaction to finish checking out.|,
lastUpdated => 0,
context => q|Error message when the transaction cannot be looked up.|,
},
};
1;

17
lib/WebGUI/i18n/English/PayDriver_ExpressCheckout.pm
View file

@ -43,7 +43,7 @@ our $I18N = {
context => q{The name of the payment driver},
},
'password' => {
message => q{Password},
message => q{API Password},
lastUpdated => 1247254156,
},
'password help' => {
@ -88,7 +88,7 @@ our $I18N = {
lastUpdated => 1247253981,
},
'user' => {
message => q{Username},
message => q{API Username},
lastUpdated => 1247254097,
},
'user help' => {
@ -104,20 +104,9 @@ our $I18N = {
'summary template help' => {
message => q|Pick a template to display the screen where the user confirms the cart summary info and agrees to pay.|,
lastUpdated => 0,
context => q|Hover help for the summary template field in the configuration form of the Cash module.|
context => q|Hover help for the summary template field in the configuration form.|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password help' => {
message => q|The password for your ITransact account.|,
lastUpdated => 0,
context => q|Hover help for the password field in the configuration form of the iTransact module.|
},
'Pay' => {
message => q|Pay|,
lastUpdated => 0,