diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 74097dc19..742dd605c 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.7.17 + - fixed #10731: i18n Translation for js-based items in Matrix - fixed #10762: testCodebase only runs properly from within the bin directory - fixed #10765: Matrix displays all products when searching - fixed #10764: Matrix i18n: hitting compare button says I have 1 item selected. diff --git a/docs/upgrades/packages-7.7.17/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.7.17/matrix-default-detailed-listing.wgpkg new file mode 100644 index 000000000..f5b938983 Binary files /dev/null and b/docs/upgrades/packages-7.7.17/matrix-default-detailed-listing.wgpkg differ diff --git a/docs/upgrades/packages-7.7.17/new-matrix_matrix-nav-tmpl.wgpkg b/docs/upgrades/packages-7.7.17/new-matrix_matrix-nav-tmpl.wgpkg new file mode 100644 index 000000000..ecd1aa287 Binary files /dev/null and b/docs/upgrades/packages-7.7.17/new-matrix_matrix-nav-tmpl.wgpkg differ diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index 18f09ef73..e03827da9 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -644,7 +644,7 @@ A boolean indicating if the user has rated this listing. =head3 emailSent -A boolean indicating if an email to the listing maintianer was sent. +A boolean indicating if an email to the listing maintainer was sent. =cut diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 2538539a3..e1ffd21a9 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -622,6 +622,7 @@ sub view { my $self = shift; my $session = $self->session; my $db = $session->db; + my $i18n = WebGUI::International->new($session, 'Asset_Matrix'); # javascript and css files for compare form datatable $self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), @@ -695,7 +696,9 @@ sub view { $varStatistics = JSON->new->decode($varStatisticsEncoded); } else{ - $varStatistics->{alphanumeric_sortButton} = "
"; + $varStatistics->{alphanumeric_sortButton} = "
"; # Get the MatrixListing with the most views as an object using getLineage. my ($bestViews_listing) = @{ $self->getLineage(['descendants'], { @@ -709,7 +712,9 @@ sub view { $varStatistics->{bestViews_url} = $bestViews_listing->getUrl; $varStatistics->{bestViews_count} = $bestViews_listing->get('views'); $varStatistics->{bestViews_name} = $bestViews_listing->get('title'); - $varStatistics->{bestViews_sortButton} = "
"; + $varStatistics->{bestViews_sortButton} = "
"; } # Get the MatrixListing with the most compares as an object using getLineage. @@ -725,7 +730,9 @@ sub view { $varStatistics->{bestCompares_url} = $bestCompares_listing->getUrl; $varStatistics->{bestCompares_count} = $bestCompares_listing->get('compares'); $varStatistics->{bestCompares_name} = $bestCompares_listing->get('title'); - $varStatistics->{bestCompares_sortButton} = "
"; + $varStatistics->{bestCompares_sortButton} = "
"; } # Get the MatrixListing with the most clicks as an object using getLineage. @@ -740,7 +747,9 @@ sub view { $varStatistics->{bestClicks_url} = $bestClicks_listing->getUrl; $varStatistics->{bestClicks_count} = $bestClicks_listing->get('clicks'); $varStatistics->{bestClicks_name} = $bestClicks_listing->get('title'); - $varStatistics->{bestClicks_sortButton} = "
"; + $varStatistics->{bestClicks_sortButton} = "
"; } # Get the 5 MatrixListings that were last updated as objects using getLineage. @@ -759,7 +768,9 @@ sub view { lastUpdated => $self->session->datetime->epochToHuman($lastUpdatedListing->get('lastUpdated'),"%z") }); } - $varStatistics->{lastUpdated_sortButton} = "
"; + $varStatistics->{lastUpdated_sortButton} = "
"; # For each category, get the MatrixListings with the best ratings. diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index 8638fddd5..deba76033 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -867,7 +867,44 @@ selectBox.

| lastUpdated => 1250141046, message => q|To compare, at least two listing must be selected. If you want to view just one listing, click on its name.|, context => q|A message shown to the user when they have selected only one listing to compare.|, - } + }, + + 'Sort by name' => { + lastUpdated => 1250146133, + message => q|Sort by name|, + context => q|To order a list of items by name|, + }, + + 'Sort by views' => { + lastUpdated => 1250146133, + message => q|Sort by views|, + context => q|To order a list of items by the number of times it has been viewed|, + }, + + 'Sort by compares' => { + lastUpdated => 1250146133, + message => q|Sort by compares|, + context => q|To order a list of items by the number of times it has been compared|, + }, + + 'Sort by clicks' => { + lastUpdated => 1250146133, + message => q|Sort by clicks|, + context => q|To order a list of items by the number of times it has been clicked|, + }, + + 'Sort by updated' => { + lastUpdated => 1250146133, + message => q|Sort by updated|, + context => q|To order a list of items by the number of times it was last updated|, + }, + + 'Return to Matrix' => { + lastUpdated => 1250146133, + message => q|Return to Matrix|, + context => q|To go back to the Matrix main screen.|, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_MatrixListing.pm b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm index 17ae29de9..3f1bfc692 100644 --- a/lib/WebGUI/i18n/English/Asset_MatrixListing.pm +++ b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm @@ -413,6 +413,12 @@ it would be best to make sure the names are the same.|, context => q|i18n label for template.|, }, + 'Send Creator a Message' => { + lastUpdated => 1250146133, + message => q|Send Creator a Message|, + context => q|Creator, the person who created this listing|, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 3084eb60d..b0d6553c8 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -4622,6 +4622,11 @@ Users may override this setting in their profile. context => 'To empty or wipe-out, similar to erase.', }, + 'Comments' => { + message => 'Comments', + lastUpdated => 0, + }, + }; 1;