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

Merge branch 'master' into 8-merge

Browse source 
Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
This commit is contained in:
Doug Bell 2010-07-14 17:06:19 -05:00
commit cd1e450c32
1229 changed files with 499 additions and 313891 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/i18n/English/Asset_Carousel.pm
View file

@ -33,12 +33,30 @@ our $I18N = {
context => q|Description of the carousel template field, used as hover help.|
},
'carousel slideHeight label' => {
message => q|Carousel slide height|,
lastUpdated => 0,
context => q|Slide, one "frame" or "page" in the Carousel.|
},
'carousel slideHeight description' => {
message => q|Height in pixels. The Carousel will not automatically resize itself for content of various widths. Setting this width will help it render properly. If left with the default, 0, then the width of the Carousel is set by the width of the first element.|,
lastUpdated => 0,
context => q|Description of the carousel template field, used as hover help.|
},
'slideWidth' => {
message => q|The width set for each slide in the Carousel|,
lastUpdated => 0,
context => q|Description of the carousel template field, used as hover help.|
},
'slideHeight' => {
message => q|The height set for each slide in the Carousel|,
lastUpdated => 0,
context => q|Description of the carousel template field, used as hover help.|
},
'items label' => {
message => q|Items|,
lastUpdated => 0,

2
lib/WebGUI/i18n/English/Shop.pm
View file

@ -1978,7 +1978,7 @@ our $I18N = {
},
'loginFormButton help' => {
message => q|The end of the form to help a user log in. This variable will only be populated if the current user is Visitor.|,
message => q|A button to submit the login form. This variable will only be populated if the current user is Visitor.|,
lastUpdated => 0,
context => q|Template variable help|
},