From fc732b5e19faf83ce6163f5420042ae7cb7be8ff Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Tue, 22 Jan 2008 22:33:17 +0000
Subject: [PATCH] Fixed i18n and all help for Gallery / Album / Photo assets

---
 lib/WebGUI/Help/Asset_Photo.pm                |   8 +-
 lib/WebGUI/i18n/English/Asset_Gallery.pm      |  91 ++++++------
 lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm | 132 +++++++++---------
 lib/WebGUI/i18n/English/Asset_Photo.pm        |  60 ++++----
 4 files changed, 149 insertions(+), 142 deletions(-)

diff --git a/lib/WebGUI/Help/Asset_Photo.pm b/lib/WebGUI/Help/Asset_Photo.pm
index 7943361f8..0d09dbd45 100644
--- a/lib/WebGUI/Help/Asset_Photo.pm
+++ b/lib/WebGUI/Help/Asset_Photo.pm
@@ -101,8 +101,8 @@ our $HELP = {
                 ],
             },
             {
-                name        => 'exif_*',
-                description => 'helpvar exif_*',
+                name        => 'exif_',
+                description => 'helpvar exif_',
             },
             {
                 name        => 'exifLoop',
@@ -140,7 +140,7 @@ our $HELP = {
     
     'help edit' => {
         title       => 'help edit title',
-        body        => 'htlp edit body',
+        body        => 'help edit body',
         variables => [
             {
                 name        => 'url_addArchive',
@@ -189,7 +189,7 @@ our $HELP = {
     
     'help makeShortcut' => {
         title       => 'help makeShortcut title',
-        body        => 'htlp makeShortcut body',
+        body        => 'help makeShortcut body',
         variables => [
             {
                 name        => 'form_start',
diff --git a/lib/WebGUI/i18n/English/Asset_Gallery.pm b/lib/WebGUI/i18n/English/Asset_Gallery.pm
index a93676cf9..7ad690e72 100644
--- a/lib/WebGUI/i18n/English/Asset_Gallery.pm
+++ b/lib/WebGUI/i18n/English/Asset_Gallery.pm
@@ -359,197 +359,206 @@ our $I18N = {
     },
 
     'helpvar searchForm_start' => {
-        message     => '',
+        message     => 'Begin the form to search the Gallery.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_end' => {
-        message     => '',
+        message     => 'End the form to search the Gallery.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_basicSearch' => {
-        message     => '',
+        message     => 'The basic search input box. Will search the title, 
+                        description, keywords, and user defined fields.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_title' => {
-        message     => '',
+        message     => 'Search by title.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_description' => {
-        message     => '',
+        message     => 'Search by description.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_keywords' => {
-        message     => '',
+        message     => 'Search by keyword.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_className' => {
-        message     => '',
+        message     => 'Search by class name.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_creationDate_after' => {
-        message     => '',
+        message     => 'Limit search to assets created after this date-time.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_creationDate_before' => {
-        message     => '',
+        message     => 'Limit search to assets created before this date-time.',
         lastUpdated => 0,
     },
 
     'helpvar searchForm_submit' => {
-        message     => '',
+        message     => 'Submit the search form.',
         lastUpdated => 0,
     },
 
     'helpvar url_addAlbum' => {
-        message     => '',
+        message     => 'URL to add an album to the gallery.',
         lastUpdated => 0,
     },
 
     'helpvar url_listAlbums' => {
-        message     => '',
+        message     => 'URL to list the albums in the gallery.',
         lastUpdated => 0,
     },
 
     'helpvar url_listAlbumsRss' => {
-        message     => '',
+        message     => 'URL to the RSS feed for the list of albums.',
         lastUpdated => 0,
     },
 
     'helpvar url_listFilesForCurrentUser' => {
-        message     => '',
+        message     => 'URL to list albums and files for the current user.',
         lastUpdated => 0,
     },
 
     'helpvar url_search' => {
-        message     => '',
+        message     => 'URL to the search page.',
         lastUpdated => 0,
     },
 
     'helpvar canEdit' => {
-        message     => '',
+        message     => 'This var is true if the user can edit the gallery.',
         lastUpdated => 0,
     },
 
     'helpvar canAddFile' => {
-        message     => '',
+        message     => 'This var is true if the user can add albums and files to the gallery.',
         lastUpdated => 0,
     },
 
     'helpvar albums' => {
-        message     => '',
+        message     => 'This is the loop over the albums being currently displayed.',
         lastUpdated => 0,
     },
 
     'helpvar albums rss' => {
-        message     => '',
+        message     => 'This is the loop over the albums being currently displayed.',
         lastUpdated => 0,
     },
 
     'helpvar rssDate' => {
-        message     => '',
+        message     => 'This is the RFC2822-compatible date that RSS feeds need for the pubDate field',
         lastUpdated => 0,
     },
 
     'helpvar search_results' => {
-        message     => '',
+        message     => 'This is the loop over the search results.',
         lastUpdated => 0,
     },
 
     'helpvar user_albums' => {
-        message     => '',
+        message     => q{This is the loop over the user's albums. All the user's albums will be
+                    in this loop.},
         lastUpdated => 0,
     },
 
     'helpvar user_files' => {
-        message     => '',
+        message     => q{This is the loop over the user's files. Only the files on this page of 
+                    the results will be shown.},
         lastUpdated => 0,
     },
 
     'helpvar userId' => {
-        message     => '',
+        message     => 'The ID of the user currently being shown in the listFilesForUser page',
         lastUpdated => 0,
     },
 
     'helpvar url_rss' => {
-        message     => '',
+        message     => q{The URL to the RSS feed for this user's files and albums},
         lastUpdated => 0,
     },
 
     'helpvar username' => {
-        message     => '',
+        message     => 'The username of the user currently shown on the listFilesForUser page',
         lastUpdated => 0,
     },
     
     'help searchForm title' => {
-        message     => '',
+        message     => 'Gallery Search Form Variables',
         lastUpdated => 0,
     },
 
     'help searchForm body' => {
-        message     => '',
+        message     => 'These variables are available from all Gallery views and allow you to
+                        create a form to search the Gallery.',
         lastUpdated => 0,
     },
 
     'help common title' => {
-        message     => '',
+        message     => 'Gallery Variables (Common)',
         lastUpdated => 0,
     },
 
     'help common body' => {
-        message     => '',
+        message     => 'These variables are common to all Gallery views.',
         lastUpdated => 0,
     },
 
     'help listAlbums title' => {
-        message     => '',
+        message     => 'Gallery List Albums Variables',
         lastUpdated => 0,
     },
 
     'help listAlbums body' => {
-        message     => '',
+        message     => 'These variables are available on the listAlbums view of the Gallery',
         lastUpdated => 0,
     },
 
     'help listAlbumsRss title' => {
-        message     => '',
+        message     => 'Gallery List Albums RSS Variables',
         lastUpdated => 0,
     },
-
-    'help search body' => {
-        message     => '',
+    
+    'help listAlbumsRss body' => {
+        message     => 'These variables are available on the listAlbums RSS feed.',
         lastUpdated => 0,
     },
 
     'help search title' => {
-        message     => '',
+        message     => 'Gallery Search Results Variables',
+        lastUpdated => 0,
+    },
+
+    'help search body' => {
+        message     => 'These variables are available from the search results screen of the gallery.',
         lastUpdated => 0,
     },
 
     'help listFilesForUser title' => {
-        message     => '',
+        message     => 'Gallery List Files For User Variables',
         lastUpdated => 0,
     },
 
     'help listFilesForUser body' => {
-        message     => '',
+        message     => 'These variables are available from the listFilesForUser screen of the Gallery.',
         lastUpdated => 0,
     },
 
     'help listFilesForUserRss title' => {
-        message     => '',
+        message     => 'Gallery List Files For User RSS Variables',
         lastUpdated => 0,
     },
 
     'help listFilesForUserRss body' => {
-        message     => '',
+        message     => 'These variables are available for the listFilesForUser RSS feed.',
         lastUpdated => 0,
     },
 
diff --git a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
index c6419d22b..aaf7aaf35 100644
--- a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
+++ b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
@@ -5,296 +5,294 @@ our $I18N = {
         message     => 'Your files have been submitted for approval and commit. <a href="%s">Return to Album</a>',
         lastUpdated => 0,
     },
+    
     'assetName' => {
         message     => 'Gallery Album',
         lastUpdated => 1131394072,
     },
+    
     'cancel'    => {
         message     => "Cancel",
         lastUpdated => 0,
         context     => "Label for Cancel button",
     },
+    
     'save'      => {
         message     => "Save",
         lastUpdated => 0,
         context     => "Label for Save button",
     },
+    
     'save message' => {
         message     => 'Album settings saved. <a href="%s">Return to Album</a>',
         lastUpdated => 0,
     },
+
     'delete message' => {
         message     => 'Album has been deleted. <a href="%s">Return to Gallery</a>',
         lastUpdated => 0,
     },
 
     'help common title' => {
-        message     => '',
+        message     => 'Gallery Album Variables (Common)',
         lastUpdated => 0,
     },
 
     'help common body' => {
-        message     => '',
+        message     => 'These variables are common to all views of Album assets.',
         lastUpdated => 0,
     },
 
     'help fileLoop title' => {
-        message     => '',
+        message     => 'Gallery Album File Loop Variables',
         lastUpdated => 0,
     },
 
     'help fileLoop body' => {
-        message     => '',
+        message     => 'These variables are common to all views that loop over files.',
         lastUpdated => 0,
     },
 
     'help view title' => {
-        message     => '',
+        message     => 'Gallery Album View Variables',
         lastUpdated => 0,
     },
 
     'help view body' => {
-        message     => '',
+        message     => 'These variables are on the Album View of Album assets',
         lastUpdated => 0,
     },
 
     'help slideshow title' => {
-        message     => '',
+        message     => 'Gallery Album Slideshow Variables',
         lastUpdated => 0,
     },
 
     'help slideshow body' => {
-        message     => '',
+        message     => 'These variables are available from the slideshow view of the Album',
         lastUpdated => 0,
     },
 
     'help thumbnails title' => {
-        message     => '',
+        message     => 'Gallery Album Thumbnail Variables',
         lastUpdated => 0,
     },
 
     'help thumbnails body' => {
-        message     => '',
+        message     => 'These variables are available from the slideshow view of the Album',
         lastUpdated => 0,
     },
 
     'help addArchive title' => {
-        message     => '',
+        message     => 'Gallery Album Add Archive Variables',
         lastUpdated => 0,
     },
 
     'help addArchive body' => {
-        message     => '',
+        message     => 'These variables are available from the add archive view of the Album',
         lastUpdated => 0,
     },
 
     'help delete title' => {
-        message     => '',
+        message     => 'Gallery Album Delete Variables',
         lastUpdated => 0,
     },
     
     'help delete body' => {
-        message     => '',
+        message     => 'These variables are available from the delete view of the Album',
         lastUpdated => 0,
     },
 
     'help edit title' => {
-        message     => '',
+        message     => 'Gallery Album Edit Variables',
+        lastUpdated => 0,
+    },
+    
+    'help edit body' => {
+        message     => 'These variables are available from the edit view of the Album',
         lastUpdated => 0,
     },
 
     'help viewRss title' => {
-        message     => '',
+        message     => 'Gallery Album RSS Feed Variables',
         lastUpdated => 0,
     },
 
     'help viewRss body' => {
-        message     => '',
+        message     => 'These variables are available from the RSS feed of the Album',
         lastUpdated => 0,
     },
 
     'helpvar canAddFile' => {
-        message     => '',
+        message     => 'This variable is true if the user can add files to this Album.',
         lastUpdated => 0,
     },
 
     'helpvar canEdit' => {
-        message     => '',
+        message     => 'This variable is true if the user can edit this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_listAlbums' => {
-        message     => '',
+        message     => 'The URL to the list albums view of the parent Gallery',
         lastUpdated => 0,
     },
 
     'helpvar url_listAlbumsRss' => {
-        message     => '',
+        message     => 'The URL to the list albums view of the parent Gallery',
         lastUpdated => 0,
     },
 
     'helpvar url_listFilesForCurrentUser' => {
-        message     => '',
+        message     => 'The URL to list files for the current user, part of the parent Gallery',
         lastUpdated => 0,
     },
 
     'helpvar url_search' => {
-        message     => '',
+        message     => 'The URL to the search view of the parent Gallery.',
         lastUpdated => 0,
     },
 
     'helpvar url_addArchive' => {
-        message     => '',
+        message     => 'The URL to add an archive of files to this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_addPhoto' => {
-        message     => '',
+        message     => 'The URL to add a Photo asset to this Album',
         lastUpdated => 0,
     },
 
     'helpvar url_addNoClass' => {
-        message     => '',
+        message     => 'The URL to add something to the Album. You must add 
+                        the ";class=Class::Name" to the end of it.',
         lastUpdated => 0,
     },
 
     'helpvar url_delete' => {
-        message     => '',
+        message     => 'The URL to delete this Album',
         lastUpdated => 0,
     },
 
     'helpvar url_edit' => {
-        message     => '',
+        message     => 'The URL to edit this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_listFilesForOwner' => {
-        message     => '',
+        message     => 'The URL to the listFilesForUser screen for the owner of this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_viewRss' => {
-        message     => '',
+        message     => 'The URL to the RSS feed for this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_slideshow' => {
-        message     => '',
+        message     => 'The URL to the slideshow view of this Album.',
         lastUpdated => 0,
     },
 
     'helpvar url_thumbnails' => {
-        message     => '',
+        message     => 'The URL to the thumbnails view of this Album.',
         lastUpdated => 0,
     },
 
     'helpvar fileCount' => {
-        message     => '',
+        message     => 'The number of files in this Album.',
         lastUpdated => 0,
     },
 
     'helpvar ownerUsername' => {
-        message     => '',
+        message     => 'The username of the owner of this Album.',
         lastUpdated => 0,
     },
 
     'helpvar thumbnailUrl' => {
-        message     => '',
+        message     => q{The URL for the thumbnail of the file selected as this Album's
+                        thumbnail.},
         lastUpdated => 0,
     },
 
     'helpvar file_loop' => {
-        message     => '',
+        message     => 'The loop of files on this page.',
         lastUpdated => 0,
     },
 
-    'helpvar file_*' => {
-        message     => '',
+    '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,
     },
 
     'helpvar form_start' => {
-        message     => '',
+        message     => 'Start of the form',
         lastUpdated => 0,
     },
 
     'helpvar form_end' => {
-        message     => '',
+        message     => 'End of the form',
         lastUpdated => 0,
     },
 
     'helpvar form_submit' => {
-        message     => '',
+        message     => 'Submit the form',
         lastUpdated => 0,
     },
 
     'helpvar form_archive' => {
-        message     => '',
+        message     => 'The archive to upload. A WebGUI::Form::File control.',
         lastUpdated => 0,
     },
 
     'helpvar form_keywords' => {
-        message     => '',
+        message     => 'The keywords for the files being uploaded.',
         lastUpdated => 0,
     },
 
     'helpvar form_friendsOnly' => {
-        message     => '',
+        message     => 'Should the file be friends only?',
         lastUpdated => 0,
     },
 
     'helpvar url_yes' => {
-        message     => '',
-        lastUpdated => 0,
-    },
-
-    'helpvar form_start' => {
-        message     => '',
-        lastUpdated => 0,
-    },
-
-    'helpvar form_end' => {
-        message     => '',
+        message     => 'Confirm the delete of this Album.',
         lastUpdated => 0,
     },
 
     'helpvar form_cancel' => {
-        message     => '',
-        lastUpdated => 0,
-    },
-
-    'helpvar form_submit' => {
-        message     => '',
+        message     => 'Cancel the form.',
         lastUpdated => 0,
     },
 
     'helpvar form_title' => {
-        message     => '',
+        message     => 'The title of the Album.',
         lastUpdated => 0,
     },
 
     'helpvar form_description' => {
-        message     => '',
+        message     => 'The description of the Album.',
         lastUpdated => 0,
     },
 
     'helpvar file_loop edit' => {
-        message     => '',
+        message     => 'This is a loop over the files for editing multiple files in the Edit Album screen',
         lastUpdated => 0,
     },
 
     'helpvar isAlbumThumbnail' => {
-        message     => '',
+        message     => 'This is true if the file is the current album thumbnail.',
         lastUpdated => 0,
     },
 
     'helpvar file_loop viewRss' => {
-        message     => '',
+        message     => 'This is the loop over the files for the RSS feed that includes extra vars.',
         lastUpdated => 0,
     },
 
     'helpvar rssDate' => {
-        message     => '',
+        message     => 'The RFC2822-compliant date for the RSS feed.',
         lastUpdated => 0,
     },
 
diff --git a/lib/WebGUI/i18n/English/Asset_Photo.pm b/lib/WebGUI/i18n/English/Asset_Photo.pm
index e5a7bf11b..c10877d80 100644
--- a/lib/WebGUI/i18n/English/Asset_Photo.pm
+++ b/lib/WebGUI/i18n/English/Asset_Photo.pm
@@ -51,6 +51,16 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'help delete title' => {
+        message     => 'Photo -- Delete Form',
+        lastUpdated => 0,
+    },
+
+    'help delete body' => {
+        message     => 'Confirm the delete of a Photo asset.',
+        lastUpdated => 0,
+    },
+
     'help makeShortcut title' => {
         message     => 'Photo -- Make Shortcut Form',
         lastUpdated => 0,
@@ -166,7 +176,7 @@ our $I18N = {
         lastUpdated => 0,
     },
 
-    'helpvar exif_*' => {
+    'helpvar exif_' => {
         message     => 'Each EXIF tag can be referenced by name.',
         lastUpdated => 0,
     },
@@ -187,107 +197,97 @@ our $I18N = {
     },
 
     'helpvar url_addArchive' => {
-        message     => '',
+        message     => 'The URL to add an archive to the parent Album',
         lastUpdated => 0,
     },
 
     'helpvar form_start' => {
-        message     => '',
+        message     => 'Start the form.',
         lastUpdated => 0,
     },
 
     'helpvar form_end' => {
-        message     => '',
+        message     => 'End the form.',
         lastUpdated => 0,
     },
 
     'helpvar form_submit' => {
-        message     => '',
+        message     => 'Submit the form.',
         lastUpdated => 0,
     },
 
     'helpvar form_title' => {
-        message     => '',
+        message     => 'The title of the Photo.',
         lastUpdated => 0,
     },
 
     'helpvar form_synopsis' => {
-        message     => '',
+        message     => 'The caption for the Photo.',
         lastUpdated => 0,
     },
 
     'helpvar form_photo' => {
-        message     => '',
+        message     => 'The photo to upload.',
         lastUpdated => 0,
     },
 
     'helpvar form_keywords' => {
-        message     => '',
+        message     => 'The keywords for the Photo.',
         lastUpdated => 0,
     },
 
     'helpvar form_location' => {
-        message     => '',
+        message     => 'The location the photo was taken.',
         lastUpdated => 0,
     },
 
     'helpvar form_friendsOnly' => {
-        message     => '',
-        lastUpdated => 0,
-    },
-
-    'helpvar form_start' => {
-        message     => '',
-        lastUpdated => 0,
-    },
-
-    'helpvar form_end' => {
-        message     => '',
+        message     => 'Make this photo friends only?',
         lastUpdated => 0,
     },
 
     'helpvar form_parentId' => {
-        message     => '',
+        message     => 'Select which Album the shortcut should be made in.',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop' => {
-        message     => '',
+        message     => 'Loop over a page of comments to this photo',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop userId' => {
-        message     => '',
+        message     => 'The userId of the user who made the comment.',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop visitorIp' => {
-        message     => '',
+        message     => 'If the user is a visitor, the IP address of the user.',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop creationDate' => {
-        message     => '',
+        message     => 'The creation date of the comment',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop bodyText' => {
-        message     => '',
+        message     => 'The body of the comment',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop username' => {
-        message     => '',
+        message     => 'The username of the user who made the comment.',
         lastUpdated => 0,
     },
 
     'helpvar commentLoop_pageBar' => {
-        message     => '',
+        message     => 'The bar to navigate through pages of comments',
         lastUpdated => 0,
     },
 
     'helpvar url_yes' => {
-        message     => '',
+        message     => 'Confirm the deleting of this Photo.',
         lastUpdated => 0,
     },