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

Merge commit '808a866c8b' into webgui8. 7.9.4 release point

Browse source 
Conflicts:
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
	docs/upgrades/upgrade_7.9.2-7.9.3.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Gallery.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	t/Asset/Asset.t
This commit is contained in:
Colin Kuskie 2010-06-25 20:08:11 -07:00
commit b30491f3a6
31 changed files with 1974 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
View file

@ -23,6 +23,18 @@ our $I18N = {
context => "Label for Save button",
},
'rotate left' => {
message => "90° CCW",
lastUpdated => 1270582436,
context => "Label for rotate left button",
},
'rotate right' => {
message => "90° CW",
lastUpdated => 1270582436,
context => "Label for rotate right button",
},
'save message' => {
message => 'Album settings saved.',
lastUpdated => 0,
@ -38,12 +50,11 @@ our $I18N = {
lastUpdated => 0,
},
'delete message' => {
message => 'Album has been deleted. <a href="%s">Return to Gallery</a>',
lastUpdated => 0,
},
'help common title' => {
message => 'Gallery Album Variables (Common)',
lastUpdated => 0,
@ -524,6 +535,18 @@ our $I18N = {
lastUpdated => 1213631346,
context => q{Description of template variable},
},
'helpvar form_rotateLeft' => {
message => q{A button to rotate the photo by 90&deg; counter clockwise.},
lastUpdated => 1270582436,
context => q{Description of template variable},
},
'helpvar form_rotateRight' => {
message => q{A button to rotate the photo by 90&deg; clockwise.},
lastUpdated => 1270582436,
context => q{Description of template variable},
},
'helpvar form_delete' => {
message => q{A button to delete the image.},

206
lib/WebGUI/i18n/English/Asset_MapPoint.pm
View file

@ -133,11 +133,217 @@ our $I18N = {
lastUpdated => 0,
context => 'Description of asset property',
},
'assetName' => {
message => "MapPoint",
lastUpdated => 0,
context => "Name of this asset",
},
'edit template' => {
message => "MapPoint Edit Point Template",
lastUpdated => 0,
context => "template variable section title",
},
'form_header' => {
message => "HTML code to start the edit form.",
lastUpdated => 0,
context => "template variable help",
},
'form_footer' => {
message => "HTML code to end the edit form.",
lastUpdated => 0,
context => "template variable help",
},
'form_submit' => {
message => "A button to submit the edit form.",
lastUpdated => 0,
context => "template variable help",
},
'form_title' => {
message => "A text form element for entering the title.",
lastUpdated => 0,
context => "template variable help",
},
'form_synopsis' => {
message => "A textarea form element for entering the synopsis.",
lastUpdated => 0,
context => "template variable help",
},
'form_storageIdPhoto' => {
message => "A file form element for uploading a photo relating to the map point.",
lastUpdated => 0,
context => "template variable help",
},
'currentPhoto' => {
message => "An image tag linking to any currently uploaded photo.",
lastUpdated => 0,
context => "template variable help",
},
'form_website' => {
message => "A text field for entering in a URL related to the map point.",
lastUpdated => 0,
context => "template variable help",
},
'form_address1' => {
message => "A text field for entering in one part of an address.",
lastUpdated => 0,
context => "template variable help",
},
'form_address2' => {
message => "A text field for entering in another part of an address.",
lastUpdated => 0,
context => "template variable help",
},
'form_address3' => {
message => "A text field for entering in the last past of an address.",
lastUpdated => 0,
context => "template variable help",
},
'form_city' => {
message => "A text field for entering in city part of the address.",
lastUpdated => 0,
context => "template variable help",
},
'form_region' => {
message => "A text field for entering in region, or state, part of the address.",
lastUpdated => 0,
context => "template variable help",
},
'form_zipCode' => {
message => "A text field for entering in the zip code part of the address.",
lastUpdated => 0,
context => "template variable help",
},
'form_country' => {
message => "A text field for entering in the country part of the address.",
lastUpdated => 0,
context => "template variable help",
},
'form_phone' => {
message => "A text field for entering in a phone number.",
lastUpdated => 0,
context => "template variable help",
},
'form_fax' => {
message => "A text field for entering in a phone number.",
lastUpdated => 0,
context => "template variable help",
},
'form_email' => {
message => "A text field for entering in an email address.",
lastUpdated => 0,
context => "template variable help",
},
'storageIdPhoto' => {
message => "The storage location for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'website' => {
message => "The website for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'address1' => {
message => "The first line of the address.",
lastUpdated => 0,
context => "template variable help",
},
'address2' => {
message => "The second line of the address.",
lastUpdated => 0,
context => "template variable help",
},
'address3' => {
message => "The third line of the address.",
lastUpdated => 0,
context => "template variable help",
},
'city' => {
message => "The city for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'region' => {
message => "The region, or state or province, for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'zipCode' => {
message => "The zip code for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'country' => {
message => "The country for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'phone' => {
message => "The phone number for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'fax' => {
message => "The fax number for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'email' => {
message => "The email address for this MapPoint.",
lastUpdated => 0,
context => "template variable help",
},
'map point asset template variables' => {
message => "Map Point Asset Template Variables",
lastUpdated => 0,
context => "template variable help",
},
'latitude' => {
message => "The latitude of the MapPoint",
lastUpdated => 0,
context => "template variable help",
},
'longitude' => {
message => "The longitude of the MapPoint",
lastUpdated => 0,
context => "template variable help",
},
};
1;

49
lib/WebGUI/i18n/English/Asset_WikiMaster.pm
View file

@ -42,6 +42,18 @@ our $I18N = {
context => q|Hover help for edit wobject screen|,
},
'top level keywords' => {
message => q|Top Level Keywords|,
lastUpdated => 0,
context => q|Label for edit wobject screen|,
},
'top level keywords description' => {
message => q|These keywords provide the root for the hierarchial keyword display.|,
lastUpdated => 0,
context => q|Hover help for edit wobject screen|,
},
'content filter' => {
message => q|Use Content Filter?|,
lastUpdated => 0,
@ -523,6 +535,43 @@ listing of pages that are related to a specific keyword?| },
lastUpdated => 0,
context => q{Label for link to unsubscribe from e-mail notifications},
},
'keywords_loop' => {
message => q{A loop containing all the top level keywords, links to their keyword pages, and all sub pages below them.},
lastUpdated => 0,
context => q{Help for template variable},
},
'keyword title' => {
message => q{The name of a keyword.},
lastUpdated => 0,
context => q{Help for template variable},
},
'keyword url' => {
message => q{The URL to the keyword page for that keyword. If no page exists, this variable will be empty.},
lastUpdated => 0,
context => q{Help for template variable},
},
'keyword level' => {
message => q{The depth of this keyword. Top-level keywords for the wiki are level 0.},
lastUpdated => 0,
context => q{Help for template variable},
},
'indent_loop' => {
message => q{A loop that runs 1 time for each level.},
lastUpdated => 0,
context => q{Help for template variable},
},
'keyword indent' => {
message => q{The loop iterator for the indent_loop.},
lastUpdated => 0,
context => q{Help for template variable},
},
};
1;

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

@ -4680,6 +4680,12 @@ Users may override this setting in their profile.
context => 'Message shown to the user when data is being loaded, typically via AJAX, like in the Survey.'
},
'Go' => {
message => 'Go',
lastUpdated => 0,
context => 'Label for buttons that take you someplace else'
},
};
1;