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

Merge branch 'master' into survey

Browse source 
* master: (121 commits)
  Fix a POD typo.
  correct inbox message from user preface
  Fix a typo in the Default gallery view template
  Documentation bug in buildArrayRefOfHashRefs
  changed screenshots in Matrix Listing view to popup
  matrix privileging fixes
  Fix an i18n typo in the Post user defined variables.
  Remove debugging code.
  approval workflow fix
  matrix upgrade and privileging fixes
  fixed: Template parser cannot be set
  forward porting gallery bug fixes
  preparing for 7.7.0 dev
  parser should be a selectbox, not a selectlist.
  labeling survey as beta
  fixeding my borkes to the changelog
  fixed #9852: Users can accept private messages from Visitor, but Visitor cannot send messages
  preparing for 7.6.14 release
  fix AdSpace, Ad tests
  Restore the original properties for the profile category that was modified for test.
  ...

Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.6.10-7.6.11.pl
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
This commit is contained in:
Patrick Donelan 2009-03-11 15:26:07 +11:00
commit 7ec5cab126
713 changed files with 4994 additions and 3058 deletions
Download patch file Download diff file Expand all files Collapse all files

185
lib/WebGUI/i18n/English/Account_Inbox.pm
View file

@ -23,7 +23,7 @@ our $I18N = {
message => q|Edit Layout Template|,
lastUpdated => 1119068809
},
'inbox layout template hoverHelp' => {
message => q{Choose a layout from the list to display the various account pluggins that are editable by the current user as well as the contents of the one currently chosen},
lastUpdated => 1119068809
@ -194,7 +194,7 @@ our $I18N = {
message => q|Subject|,
lastUpdated => 1119068809
},
'status label' => {
message => q{Status},
lastUpdated => 1119068809
@ -214,7 +214,7 @@ our $I18N = {
message => q{Add Recipients},
lastUpdated => 1119068809
},
'from label' => {
message => q{From},
lastUpdated => 1119068809
@ -224,7 +224,7 @@ our $I18N = {
message => q{To},
lastUpdated => 1119068809
},
'member since' => {
message => q{Member Since },
lastUpdated => 1119068809
@ -234,7 +234,7 @@ our $I18N = {
message => q{Delete},
lastUpdated => 1119068809
},
'view my profile' => {
message => q{view my profile as others see it},
lastUpdated => 1119068809
@ -546,6 +546,181 @@ our $I18N = {
lastUpdated => 0,
context => "Description of Inbox setting",
},
'subject_url' => {
message => q{The URL to sort the inbox by subject.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'status_url' => {
message => q{The URL to sort the inbox by status.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'from_url' => {
message => q{The URL to sort the inbox by who sent the messages.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'dateStamp_url' => {
message => q{The URL to sort the inbox by when the message was sent.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'rpp_url' => {
message => q{The current URL with sort, sort direction and user filtering params added.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'has_messages' => {
message => q{A boolean which is true if the user has messages.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'message_total' => {
message => q{The total number of messages the user has in their inbox.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'new_message_url' => {
message => q{The URL to take the user to the screen where they can send new messages to other users.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'canSendMessages' => {
message => q{A boolean which is true if the user has friends that he can send messages to.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'message_loop' => {
message => q{A loop containing all messages, as determined by the sorting and number of messages per page options.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'view inbox template' => {
message => q{View Inbox Template},
lastUpdated => 1235421123,
context => "The template that allows you to view the contents of the Inbox",
},
'message_rpp' => {
message => q{A select box that allows the user to change the number of messages displayed per page},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'form_header' => {
message => q{HTML elements to begin the form on this page},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'form_footer' => {
message => q{HTML elements to end the form on this page},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'message_id' => {
message => q{The unique identifier for this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'message_url' => {
message => q{The URL to view the contents of this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'subject' => {
message => q{The subject of this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'status' => {
message => q{The status of this message, internationalized.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'status_class' => {
message => q{The status of this message, raw.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'isRead' => {
message => q{A boolean which will be true if this message has been read.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'isReplied' => {
message => q{A boolean which will be true if this message has been replied to.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'isPending' => {
message => q{A boolean which will be true if this message represents an action by the user that is pending.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'isCompleted' => {
message => q{A boolean which will be true if this message represents an action by the user that has been completed.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'from_id' => {
message => q{The userId of the person who sent this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'from_url' => {
message => q{The URL to view the profile of the user who sent this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'from' => {
message => q{The name of the person who sent this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'dateStamp' => {
message => q{The date the message was sent, as an epoch.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'dateStamp_formatted' => {
message => q{The date the message was sent, using the user's preferred date and time format.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
'inbox_form_delete' => {
message => q{A little checkbox for the user to check if they want to delete this message.},
lastUpdated => 1235421123,
context => "template variable for view inbox template",
},
};
1;

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

@ -225,7 +225,7 @@ our $I18N = {
lastUpdated => 0,
},
'helpvar file_' => {
'helpvar file_*' => {
message => 'The current file being viewed in the thumbnails page. All the
common variables for this file are available by prefixing "file_".',
lastUpdated => 0,
@ -490,6 +490,12 @@ our $I18N = {
context => q{Description of template variable},
},
'helpvar gallery_displayTitle' => {
message => q{Whether the Gallery containing this File is set to display its title, or not.},
lastUpdated => 0,
context => q{Description of template variable},
},
'helpvar isPending' => {
message => q{A flag to set if the GalleryAlbum is not yet approved. Users who can edit the GalleryAlbum are allowed to see them before they are approved.},
lastUpdated => 0,

44
lib/WebGUI/i18n/English/Asset_Matrix.pm
View file

@ -372,6 +372,11 @@ listing,|,
lastUpdated => 0,
},
'group to add description' => {
message => q|Select the group that is allowed to add listings to this matrix.|,
lastUpdated => 0,
},
'ratings duration description' => {
message => q|Select the interval after which old ratings are cleaned out.|,
lastUpdated => 0,
@ -418,8 +423,8 @@ listing,|,
},
'max comparisons privileged description' => {
message => q|Specifies how many comparisons are allowed in searches and comparisons for users in the privileged group.|,
lastUpdated => 0,
message => q|Specifies how many comparisons are allowed in searches and comparisons for users who have accounts on the site.|,
lastUpdated => 1235681965,
},
'rating timeout description' => {
@ -476,6 +481,16 @@ listing,|,
message => q|Select a template to be used to show the listing edit screen.|,
lastUpdated => 0,
},
'screenshots template description' => {
message => q|Select a template to be used to show a listing's screenshots.|,
lastUpdated => 0,
},
'screenshots config template description' => {
message => q|Select a template for a listing's screenshots configuration.|,
lastUpdated => 0,
},
'categories label' => {
message => q|Categories|,
@ -487,6 +502,11 @@ listing,|,
lastUpdated => 0,
},
'group to add label' => {
message => q|Group To Add|,
lastUpdated => 0,
},
'ratings duration label' => {
message => q|Ratings Duration|,
lastUpdated => 0,
@ -548,8 +568,8 @@ listing,|,
},
'max comparisons privileged label' => {
message => q|Maximum Comparisons (For Privileged Users)|,
lastUpdated => 0,
message => q|Maximum Comparisons (For Registered Users)|,
lastUpdated => 1235681967,
},
'rating timeout' => {
@ -602,6 +622,16 @@ listing,|,
lastUpdated => 0,
},
'screenshots template label' => {
message => q|Listing Screenshots Template|,
lastUpdated => 0,
},
'screenshots config template label' => {
message => q|Listing Screenshots Config Template|,
lastUpdated => 0,
},
'edit listing template label' => {
message => q|Edit Listing Template|,
lastUpdated => 0,
@ -750,6 +780,12 @@ selectBox.</p>|
message => q|Hide/show stickied|,
},
'approve or deny label' => {
lastUpdated => 0,
message => q|Approve/Deny|,
context => q|Label for the approve or deny link on the matrix listing detail screen.|,
},
'matrix asset template variables title' => {
lastUpdated => 0,
message => q|Matrix Asset Template Variables|,

29
lib/WebGUI/i18n/English/Asset_MatrixListing.pm
View file

@ -44,6 +44,11 @@ fields below.|,
lastUpdated => 0,
},
'edit label' => {
message => q|Edit|,
lastUpdated => 0,
},
'version description' => {
message => q|Enter the version/edition/model number for the product.|,
lastUpdated => 0,
@ -221,6 +226,30 @@ it would be best to make sure the names are the same.|,
context => q|Description of the form tmpl_var for the template help.|,
},
'canEdit' => {
message => q|A boolean indicating whether the user can edit this listing.|,
lastUpdated => 0,
context => q|Description of the screenshots tmpl_var for the template help.|,
},
'editUrl' => {
message => q|The url to this listing's edit screen.|,
lastUpdated => 0,
context => q|Description of the screenshots tmpl_var for the template help.|,
},
'canApprove' => {
message => q|A boolean indicating whether the user can approve or deny this listing.|,
lastUpdated => 0,
context => q|Description of the screenshots tmpl_var for the template help.|,
},
'approveOrDenyUrl' => {
message => q|The url to this listing's approve or deny screen.|,
lastUpdated => 0,
context => q|Description of the screenshots tmpl_var for the template help.|,
},
'screenshots' => {
message => q|This listings screenshots displayed using the ukplayer.|,
lastUpdated => 0,

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

@ -487,8 +487,8 @@ editing an existing Post, and a thread containing the Post exists.|,
},
'userDefined3' => {
message => q|The value contained in the first user defined variable.|,
lastUpdated => 1150167057,
message => q|The value contained in the third user defined variable.|,
lastUpdated => 1236354498,
},
'userDefined4' => {

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

@ -161,12 +161,14 @@ our $I18N = { ##hashref of hashes
'no results' => {
message => q|No results were found.|,
context => q|An internationalized label for telling the user that no results were found.|,
lastUpdated => 1170549113,
},
'no_results' => {
message => q|An internationalized label for telling the user that no results were found.|,
lastUpdated => 1170549119,
context => q|Template variable in the view method.|,
lastUpdated => 1236101532,
},
};

114
lib/WebGUI/i18n/English/Asset_Survey.pm
View file

@ -4,8 +4,8 @@ use strict;
our $I18N = {
'assetName' => {
message => q|Survey|,
lastUpdated => 1224686319
message => q|Survey (beta)|,
lastUpdated => 1236187015
},
'edit survey' => {
message => q|Edit Survey|,
@ -625,6 +625,116 @@ the time limit for completing the survey. This message is in the 'take survey' t
lastUpdated => 0,
},
'Max user responses' => {
message => q|Max user responses|,
context => q|The maximum number of times a user may take this survey.|,
lastUpdated => 0
},
'Max user responses help' => {
message => q|The maximum number of times a user may take this survey.|,
lastUpdated => 0
},
'Survey Overview Template' => {
message => q|Survey Overview Template|,
context => q|The template that provides an overview of the survey.|,
lastUpdated => 0
},
'Survey Overview Template help' => {
message => q|The template that provides an overview of the survey.|,
lastUpdated => 0
},
'Gradebook Template' => {
message => q|Gradebook Template|,
context => q|The template for displaying the gradebook.|,
lastUpdated => 0
},
'Gradebook Template help' => {
message => q|The template for displaying the gradebook.|,
lastUpdated => 0
},
'Response Template' => {
message => q|Response Template|,
context => q|The template for displaying responses to the survey.|,
lastUpdated => 0
},
'Response Template help' => {
message => q|The template for displaying responses to the survey.|,
lastUpdated => 0
},
'Edit Survey Template' => {
message => q|Edit Survey Template|,
context => q|The template for displaying the screen for editing the survey.|,
lastUpdated => 0
},
'Edit Survey Template help' => {
message => q|The template for displaying the screen for editing the survey.|,
lastUpdated => 0
},
'Take Survey Template' => {
message => q|Take Survey Template|,
context => q|The template for displaying the screen where a user takes the survey.|,
lastUpdated => 0
},
'Take Survey Template help' => {
message => q|The template for displaying the screen where a user takes the survey.|,
lastUpdated => 0
},
'Questions Template' => {
message => q|Questions Template|,
context => q|The template for rendering questions in the survey.|,
lastUpdated => 0
},
'Questions Template help' => {
message => q|The template for rendering questions in the survey.|,
lastUpdated => 0
},
'Section Edit Template' => {
message => q|Section Edit Template|,
context => q|The template for adding or editing sections.|,
lastUpdated => 0
},
'Section Edit Template help' => {
message => q|The template for adding or editing sections.|,
lastUpdated => 0
},
'Question Edit Template' => {
message => q|Question Edit Template|,
context => q|The template for adding or editing questions.|,
lastUpdated => 0
},
'Question Edit Template help' => {
message => q|The template for adding or editing questions.|,
lastUpdated => 0
},
'Answer Edit Template' => {
message => q|Answer Edit Template|,
context => q|The template for adding or editing answers.|,
lastUpdated => 0
},
'Answer Edit Template help' => {
message => q|The template for adding or editing answers.|,
lastUpdated => 0
},
'percentage label' => {
message => q|Percentage|,
context => q|Label for the Percentage column on the gradebook screen.|,

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

@ -13,6 +13,14 @@ our $I18N = {
lastUpdated => 1131394072,
},
'captcha failure' => {
message => q|You need to type in the six characters you see in the image to prove that you are human.|,
},
'recaptcha failure' => {
message => q|You need to correctly enter the words you see in the image to prove that you are human.|,
},
};
1;

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

@ -4,7 +4,7 @@ use strict;
our $I18N = {
'from user preface' => {
message => q|You were sent a message from |,
message => q|You were sent a message from %s|,
lastUpdated => 0
},
};

5
lib/WebGUI/i18n/English/PayDriver_ITransact.pm
View file

@ -292,6 +292,11 @@ our $I18N = {
lastUpdated => 0,
context => q|The default description of purchase of users.|
},
'template gone' => {
message => q|The template for entering in credentials has been deleted. Please notify the site administrator.|,
lastUpdated => 0,
context => q|Error message when the getCredentials template cannot be accessed.|
},
'show terminal' => {
message => q|Click here to use your virtual terminal.|,
lastUpdated => 0,

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

@ -2873,8 +2873,8 @@ or are under your current version tag.</p>
},
'318' => {
message => q|<a href="http://www.aol.com/aim/homenew.adp">AIM</a> Id|,
lastUpdated => 1031514049
message => q|<a href="http://www.aim.com/">AIM</a> Id|,
lastUpdated => 1234829971,
},
'972' => {
@ -4325,6 +4325,19 @@ Users may override this setting in their profile.
lastUpdated => 1230930518,
},
'use recaptcha' => {
message => q{Use reCAPTCHA?}
},
'use recaptcha description' => {
message => q{reCAPTCHA is a free CAPTCHA service that helps to digitize books. It requires a key set generated for your domain, available from <a href="http://recaptcha.net/">http://recaptcha.net/</a>.}
},
'recaptcha private key' => {
message => 'reCAPTCHA Private Key'
},
'recaptcha public key' => {
message => 'reCAPTCHA Public Key'
},
};
1;