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

Merge commit 'v7.10.19' into WebGUI8

Browse source
This commit is contained in:
Colin Kuskie 2011-10-25 20:31:50 -07:00
commit 4fea10a1f5
52 changed files with 490 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/i18n/English/Asset_Calendar.pm
View file

@ -954,13 +954,13 @@ our $I18N = {
},
'pageNextUrl monthVar' => {
message => q|A URL to the next month in the calendar.|,
lastUpdated => 1269839944,
message => q|A URL to the next year in the calendar.|,
lastUpdated => 1309212604,
},
'pagePrevUrl monthVar' => {
message => q|A URL to the previous month in the calendar.|,
lastUpdated => 1269839951,
message => q|A URL to the previous year in the calendar.|,
lastUpdated => 1309212606,
},
'pageNextYear' => {

30
lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
View file

@ -2277,6 +2277,36 @@ normal templates.|,
# },
'help badgeMeta' => {
message => 'Add a metadata value to the template by adding the name after "badgeMeta_". ex: badgeMeta_department',
lastUpdated => 0,
context => 'help text for template variable',
},
'help ticketMeta' => {
message => 'Add a metadata value to the template by adding the name after "ticketMeta_". ex: ticketMeta_department',
lastUpdated => 0,
context => 'help text for template variable',
},
'badge group ticketsPerBadge' => {
message => 'Tickets Per Badge',
lastUpdated => 0,
context => 'Label for badge group property',
},
'badge group ticketsPerBadge help' => {
message => "The number of tickets each badge in this group is allowed to purchase",
lastUpdated => 0,
context => 'Help text for badge group property',
},
'error badge group ticket limit' => {
message => q{Cannot add %s because ticket limit reached},
lastUpdated => 0,
context => q{Error message when trying to add too many tickets to a badge},
},
};
1;

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

@ -1162,6 +1162,12 @@ below/after the form element.|,
context => q|Hoverhelp for edit field screen|,
},
'callerAssetId' => {
message => q|When passed into the www_viewThingData, provides the assetId of the caller asset. Used by RenderThingMacro. See POD.|,
lastUpdated => 0,
context => q|Template variable help for www_viewThingData|,
},
};
1;