diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 96630a50d..6dc037439 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,7 @@ - fixed #9349: CS archival broken after update (Bernd Kalbfuß-Zimmermann) - fixed Display of Interval form control in Thingy and User profiling did not show units, only seconds. - fixed #9374: Subscription Asset: Redeem subscription template not documented, or user selectable + - fixed #9366: Gallery: Missing i18n 7.6.7 - fixed #9263: Thingy possibleValues processing, and List type autodetection. diff --git a/docs/upgrades/packages-7.6.8/dashboard-default-view-template.wgpkg b/docs/upgrades/packages-7.6.8/dashboard-default-view-template.wgpkg index ce25f1de5..d514652aa 100644 Binary files a/docs/upgrades/packages-7.6.8/dashboard-default-view-template.wgpkg and b/docs/upgrades/packages-7.6.8/dashboard-default-view-template.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-add-archive.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-add-archive.wgpkg new file mode 100644 index 000000000..7fd1b457a Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-add-archive.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-album-rss.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-album-rss.wgpkg new file mode 100644 index 000000000..9729cb4c4 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-album-rss.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-album.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-album.wgpkg index 81af3713f..3e8705c4d 100644 Binary files a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-album.wgpkg and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-album.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-file.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-file.wgpkg index 861b45782..12afdecc3 100644 Binary files a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-file.wgpkg and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-delete-file.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-album.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-album.wgpkg new file mode 100644 index 000000000..f564a615b Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-album.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-comment.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-comment.wgpkg new file mode 100644 index 000000000..44740a568 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-comment.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-photo.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-photo.wgpkg new file mode 100644 index 000000000..cf9b23eca Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-edit-photo.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-rss.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-rss.wgpkg new file mode 100644 index 000000000..e67e68991 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-rss.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg new file mode 100644 index 000000000..5156873ce Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user-rss.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user-rss.wgpkg new file mode 100644 index 000000000..918827670 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user-rss.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg new file mode 100644 index 000000000..284ac5198 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg new file mode 100644 index 000000000..21af16cc0 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-search.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-search.wgpkg new file mode 100644 index 000000000..352a40d68 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-search.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-slideshow.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-slideshow.wgpkg new file mode 100644 index 000000000..ebedcfe85 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-slideshow.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg index 61e4cc8ca..4ef084219 100644 Binary files a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album.wgpkg new file mode 100644 index 000000000..ca987c8da Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-album.wgpkg differ diff --git a/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-photo.wgpkg b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-photo.wgpkg new file mode 100644 index 000000000..d87510ca2 Binary files /dev/null and b/docs/upgrades/packages-7.6.8/root_import_gallery-templates_default-gallery-view-photo.wgpkg differ diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm index f5033cc63..a3595b696 100644 --- a/lib/WebGUI/Asset/File/GalleryFile.pm +++ b/lib/WebGUI/Asset/File/GalleryFile.pm @@ -141,10 +141,11 @@ sub appendTemplateVarsCommentForm { value => $comment->{ bodyText }, }); + my $i18n = WebGUI::International->new($session, 'Asset_Photo'); $var->{ commentForm_submit } = WebGUI::Form::submit( $session, { name => "submit", - value => "Save Comment", + value => $i18n->get('form comment save comment'), }); return $var; diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm index 1402968bd..ac991cb50 100644 --- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm +++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm @@ -881,6 +881,8 @@ sub www_addArchive { my $form = $self->session->form; my $var = $self->getTemplateVars; + my $i18n = WebGUI::International->new($session); + $var->{ error } = $params->{ error }; $var->{ form_start } @@ -893,7 +895,7 @@ sub www_addArchive { $var->{ form_submit } = WebGUI::Form::submit( $session, { name => "submit", - value => "Submit", + value => $i18n->get("submit",'WebGUI'), }); $var->{ form_archive } diff --git a/lib/WebGUI/i18n/English/Asset_Gallery.pm b/lib/WebGUI/i18n/English/Asset_Gallery.pm index f90d59844..12601186f 100644 --- a/lib/WebGUI/i18n/English/Asset_Gallery.pm +++ b/lib/WebGUI/i18n/English/Asset_Gallery.pm @@ -671,11 +671,17 @@ our $I18N = { }, 'template listFilesForUser albums title' => { - message => q{Albums}, - lastUpdated => 0, + message => q{My Albums}, + lastUpdated => 1230576660, context => q{Title for list of user's Albums}, }, + 'template listFilesForUser pictures title' => { + message => q{My Pictures}, + lastUpdated => 1230576660, + context => q{Title for list of user's Pictures}, + }, + 'template listFilesForUser albums files' => { message => q{files}, lastUpdated => 0, diff --git a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm index a4818f8cb..4b77c4eab 100644 --- a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm +++ b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm @@ -366,15 +366,15 @@ our $I18N = { }, 'template add' => { - message => "Add", - lastUpdated => 0, - context => 'Verb shown in title when adding a new Album', + message => "Add Album", + lastUpdated => 1230581051, + context => 'To add a new album', }, 'template edit' => { - message => "Edit", - lastUpdated => 0, - context => 'Verb shown in title when editing an existing Album', + message => "Edit Album", + lastUpdated => 1230581053, + context => 'To edit an existing album', }, 'template assetName' => { @@ -562,6 +562,12 @@ our $I18N = { context => q{Description of asset property to allow people besides the owner to add files to the album}, }, + 'template use as thumbnail' => { + message => q{Use as Album Thumbnail}, + lastUpdated => 0, + context => q{template label in the Edit Album template. To pick a thumbnail to use to represent the Album.}, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_Photo.pm b/lib/WebGUI/i18n/English/Asset_Photo.pm index 74650e902..44b584af0 100644 --- a/lib/WebGUI/i18n/English/Asset_Photo.pm +++ b/lib/WebGUI/i18n/English/Asset_Photo.pm @@ -312,7 +312,31 @@ our $I18N = { lastUpdated => 0, context => 'The title of the default view of Photo assets', }, - + + 'template view details' => { + message => 'Details', + lastUpdated => 0, + context => 'List of information about the photo', + }, + + 'more details' => { + message => 'More Details', + lastUpdated => 0, + context => 'List of more information about the photo', + }, + + 'hide' => { + message => 'Hide', + lastUpdated => 0, + context => 'To make hidden', + }, + + 'template view available resolutions' => { + message => 'Available Resolutions', + lastUpdated => 0, + context => 'List of resolutions, in pixels, that this photo is available in', + }, + 'template url_edit' => { message => 'Edit Photo', lastUpdated => 0, @@ -510,7 +534,7 @@ our $I18N = { lastUpdated => 0, context => q{Error message for Photo comments}, }, - + 'helpvar keywords' => { message => q{A loop over the keywords associated with this photo}, lastUpdated => 0, @@ -667,6 +691,18 @@ our $I18N = { context => q{Title for the edit comment screen.}, }, + 'template comment edit comment' => { + message => q{Edit Comment}, + lastUpdated => 0, + context => q{Title for the edit comment screen.}, + }, + + 'form comment save comment' => { + message => q{Save Comment.}, + lastUpdated => 0, + context => q{Title for the edit comment screen.}, + }, + }; 1;