Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing.
This commit is contained in:
Colin Kuskie
commit
385931aaab
92 changed files with 1966 additions and 650 deletions
|
|
@ -1271,6 +1271,12 @@ Couldn't open %-s because %-s <br />
|
|||
context => q{Error message in Asset.pm},
|
||||
},
|
||||
|
||||
'clear package flag' => {
|
||||
message => q{Clear package flag},
|
||||
lastUpdate => 1275419384,
|
||||
context => q{Package import option in admin console},
|
||||
},
|
||||
|
||||
'need a userId parameter' => {
|
||||
message => q{need a userId parameter},
|
||||
lastUpdated => 0,
|
||||
|
|
|
|||
|
|
@ -419,6 +419,11 @@ our $I18N = {
|
|||
message => 'Search by keyword.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar searchForm_location' => {
|
||||
message => 'Search by location.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar searchForm_className' => {
|
||||
message => 'Search by class name.',
|
||||
|
|
@ -616,6 +621,12 @@ our $I18N = {
|
|||
lastUpdated => 0,
|
||||
context => "Label for the 'Keywords' input for the search form. 'Tags' is used because Keywords may be confused with the generic, all-inclusive search box.",
|
||||
},
|
||||
|
||||
'template search field location' => {
|
||||
message => "Location",
|
||||
lastUpdated => 0,
|
||||
context => "Label for the 'Location' input for the search form.",
|
||||
},
|
||||
|
||||
'template search field className' => {
|
||||
message => "Search Type",
|
||||
|
|
|
|||
|
|
@ -88,17 +88,17 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar isNewPhoto' => {
|
||||
message => 'This variable is true if the user is adding a new Photo',
|
||||
message => 'This variable is true if the user is adding a new Photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar commentForm_start' => {
|
||||
message => 'Begin the comment form',
|
||||
message => 'Begin the comment form.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar commentForm_end' => {
|
||||
message => 'End the comment form',
|
||||
message => 'End the comment form.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -108,37 +108,52 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar commentForm_submit' => {
|
||||
message => 'Submit the comment form',
|
||||
message => 'Submit the comment form.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar canComment' => {
|
||||
message => 'This is true if the current user can comment on this photo',
|
||||
message => 'This is true if the current user can comment on this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar canEdit' => {
|
||||
message => 'This is true if the current user can edit this photo',
|
||||
message => 'This is true if the current user can edit this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar fileUrl' => {
|
||||
message => 'The URL to the normal-sized photo',
|
||||
message => 'The URL to the normal-sized photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar numberOfComments' => {
|
||||
message => 'The total number of comments on this photo',
|
||||
message => 'The total number of comments on this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar ownerUsername' => {
|
||||
message => 'The username of the user who posted this photo',
|
||||
message => 'The username of the user who posted this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar ownerAlias' => {
|
||||
message => 'The alias of the user who posted this photo. Defaults to the username if not available.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar ownerId' => {
|
||||
message => 'The Id of the user who posted this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar ownerProfileUrl' => {
|
||||
message => 'The URL to the profile of the user who posted this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar thumbnailUrl' => {
|
||||
message => 'The URL to the thumbnail of this photo',
|
||||
message => 'The URL to the thumbnail of this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -148,12 +163,12 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar url_demote' => {
|
||||
message => 'The URL to demote this photo in rank. Will return the user directly to the parent GalleryAlbum edit form',
|
||||
message => 'The URL to demote this photo in rank. Will return the user directly to the parent GalleryAlbum edit form.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar url_edit' => {
|
||||
message => 'The URL to edit this photo',
|
||||
message => 'The URL to edit this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -168,12 +183,12 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar url_listFilesForOwner' => {
|
||||
message => 'The URL to list files and albums posted by the owner of this photo',
|
||||
message => 'The URL to list files and albums posted by the owner of this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar url_promote' => {
|
||||
message => 'The URL to promote this photo in rank. Will return the user directly to the parent GalleryAlbum edit form',
|
||||
message => 'The URL to promote this photo in rank. Will return the user directly to the parent GalleryAlbum edit form.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -193,22 +208,22 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar exifLoop' => {
|
||||
message => 'A loop of EXIF tags',
|
||||
message => 'A loop of EXIF tags.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar exifLoop tag' => {
|
||||
message => 'The name of the EXIF tag',
|
||||
message => 'The name of the EXIF tag.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar exifLoop value' => {
|
||||
message => 'The value of the EXIF tag',
|
||||
message => 'The value of the EXIF tag.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar url_addArchive' => {
|
||||
message => 'The URL to add an archive to the parent Album',
|
||||
message => 'The URL to add an archive to the parent Album.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -263,7 +278,7 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar commentLoop' => {
|
||||
message => 'Loop over a page of comments to this photo',
|
||||
message => 'Loop over a page of comments to this photo.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -278,12 +293,12 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar commentLoop creationDate' => {
|
||||
message => 'The creation date of the comment',
|
||||
message => 'The creation date of the comment.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'helpvar commentLoop bodyText' => {
|
||||
message => 'The body of the comment',
|
||||
message => 'The body of the comment.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -298,7 +313,7 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'helpvar commentLoop_pageBar' => {
|
||||
message => 'The bar to navigate through pages of comments',
|
||||
message => 'The bar to navigate through pages of comments.',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
|
@ -370,13 +385,13 @@ our $I18N = {
|
|||
'template view title' => {
|
||||
message => 'Photo Details',
|
||||
lastUpdated => 0,
|
||||
context => 'The title of the default view of Photo assets',
|
||||
context => 'The title of the default view of Photo assets.',
|
||||
},
|
||||
|
||||
'template view details' => {
|
||||
message => 'Details',
|
||||
lastUpdated => 0,
|
||||
context => 'List of information about the photo',
|
||||
context => 'List of information about the photo.',
|
||||
},
|
||||
|
||||
'more details' => {
|
||||
|
|
@ -492,6 +507,12 @@ our $I18N = {
|
|||
lastUpdated => 0,
|
||||
context => 'Label for photos that are not friends only',
|
||||
},
|
||||
|
||||
'template filesForUser' => {
|
||||
message => 'more photos',
|
||||
lastUpdated => 0,
|
||||
context => 'Label for the link to the users\' photos.',
|
||||
},
|
||||
|
||||
'template assetName' => {
|
||||
message => 'Photo',
|
||||
|
|
|
|||
|
|
@ -280,48 +280,48 @@ Feed Order: Items will be in the order they appeared in the feed}
|
|||
},
|
||||
|
||||
'descriptionFirst100words' => {
|
||||
message => q{The first 100 words of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 100 words of the description, with all HTML removed.},
|
||||
lastUpdated => 1274815483,
|
||||
},
|
||||
'descriptionFirst75words' => {
|
||||
message => q{The first 75 words of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 75 words of the description, with all HTML removed.},
|
||||
lastUpdated => 1274815485,
|
||||
},
|
||||
'descriptionFirst50words' => {
|
||||
message => q{The first 50 words of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 50 words of the description, with all HTML removed.},
|
||||
lastUpdated => 1274815486,
|
||||
},
|
||||
'descriptionFirst25words' => {
|
||||
message => q{The first 25 words of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 25 words of the description, with all HTML removed.},
|
||||
lastUpdated => 1274815488,
|
||||
},
|
||||
'descriptionFirst10words' => {
|
||||
message => q{The first 10 words of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 10 words of the description, with all HTML removed.},
|
||||
lastUpdated => 1274815490,
|
||||
},
|
||||
'descriptionFirst2paragraphs' => {
|
||||
message => q{The first 2 paragraphs of the description.},
|
||||
message => q{The first 2 paragraphs of the description, with all HTML removed.},
|
||||
lastUpdated => 0,
|
||||
},
|
||||
'descriptionFirstParagraph' => {
|
||||
message => q{The first paragraph of the description.},
|
||||
message => q{The first paragraph of the description, with all HTML removed.},
|
||||
lastUpdated => 0,
|
||||
},
|
||||
'descriptionFirst4sentences' => {
|
||||
message => q{The first 4 sentences of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 4 sentences of the description, with all HTML removed.},
|
||||
lastUpdated => 1274816277,
|
||||
},
|
||||
'descriptionFirst3sentences' => {
|
||||
message => q{The first 3 sentences of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 3 sentences of the description, with all HTML removed.},
|
||||
lastUpdated => 1274816276,
|
||||
},
|
||||
'descriptionFirst2sentences' => {
|
||||
message => q{The first 2 sentences of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first 2 sentences of the description, with all HTML removed.},
|
||||
lastUpdated => 1274816274,
|
||||
},
|
||||
'descriptionFirstSentence' => {
|
||||
message => q{The first sentence of the description.},
|
||||
lastUpdated => 0,
|
||||
message => q{The first sentence of the description, with all HTML removed.},
|
||||
lastUpdated => 1274816273,
|
||||
},
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,12 @@ our $I18N = { ##hashref of hashes
|
|||
message => q|The English name of the language.|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|A label of the language to use in the template|
|
||||
},
|
||||
},
|
||||
'language_isCurrent' => {
|
||||
message => q|A boolean which is true if this language is the current language.|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|A label of the language to use in the template|
|
||||
},
|
||||
'language_url' => {
|
||||
message => q|The url that sets the WebGUI language to the selected language.|,
|
||||
lastUpdated => 1131394072,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue