From 6a8b7718590f58ef40ff27c3b93e7e320c615cc7 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 13 Aug 2009 07:08:09 +0000 Subject: [PATCH] i18n several items in the Matrix, and Matrix listing. --- docs/changelog/7.x.x.txt | 1 + .../matrix-default-detailed-listing.wgpkg | Bin 0 -> 4720 bytes .../new-matrix_matrix-nav-tmpl.wgpkg | Bin 0 -> 942 bytes lib/WebGUI/Asset/MatrixListing.pm | 2 +- lib/WebGUI/Asset/Wobject/Matrix.pm | 21 +++++++--- lib/WebGUI/i18n/English/Asset_Matrix.pm | 39 +++++++++++++++++- .../i18n/English/Asset_MatrixListing.pm | 6 +++ lib/WebGUI/i18n/English/WebGUI.pm | 5 +++ 8 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 docs/upgrades/packages-7.7.17/matrix-default-detailed-listing.wgpkg create mode 100644 docs/upgrades/packages-7.7.17/new-matrix_matrix-nav-tmpl.wgpkg 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 0000000000000000000000000000000000000000..f5b9389835290609614df20fec5d6c479f3366dd GIT binary patch literal 4720 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ecd1aa28769073f653a5bd5c35b1bcba5ec45c01 GIT binary patch literal 942 zcmV;f15x}RiwFP!00000|Ls;?Z`v>v<$1p%%F`yTGzlLOtV8P7ZZNf7yTZB;HsmG- zye4*JJ5Vs-+O)TIoDJx+aI3ig<+#oQFF7dXTJ`!vl?E- z_k+3@)|x@BR&jja3;c=$N47t5ArXhvB9;((b$`5EU@q=AtINUAm(%kfw*F5howaX2 z1O3%&ReuOZA1G09*(~b5ss6PF)O@}E^&qTQ96)pXV_WsFZa?*hi16zPh|rZd%@QQ> z2uX>eX^N>7uG4nDetWL%LNbmfxV)5cmSHXl)*H1Ov-~n4Vv1vHq|tR22{jLj+L0}y>ryDaCL^F${CY3-y)a&orNMj1D zZCO-p*i&hZ$k-8B2*PM}hIkdlDWUIa#~5M7i5QifC8D#pTO8;N>5#5YXTX9{!dM2& zW>Nic%F9E!hny+L_zerKgAkjrHYAKt@1Nae`8V@CCknJLt9BI%2!s zFJxd{!kd5#;=8s=wuVcl{Ai7Ovc2p)b)dg=hwq}*t9N+f_@~} zkUg{}Nn~QuzL#y{iex8DLWoGCdz&sqD5jvx!cU1vny2UFrwPz3r=)I`Yx%e+1KH2Y z(u7u#_y3+)hB!z`r*jYH?RK|+d~~-0L>w`tYtu5;lug6|9-}-dsBe)f*Fnc@wZc}b z5e6k9a6BVQ2nWl)v#LhJIs!#PQ&|zf8sOi6X*bK}bDL*k%H}=#hVj%OSAv=X`$UE! z1N8}-k%=kRsu^M$@kJ(2Hw0da+BUmFWd9=V4YJ-SYUgi?zAa&;S*I*n+fFQo5>1N6 z*ga2ct<-y;9enyY>L1GS_^dZLvpb16UkJGQZIFS^`l;DOXkFhWZQK(4`UzSud@X?g zC!Sv_Jn$8oN0Hu9OxVw;H;BkZK9jXC(B>N#rM|r)Ly@0)GH;&TJjC<-=;INAM+6=b Q*ct-A0Um~AkpK_?05!bM+W-In literal 0 HcmV?d00001 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;