From 2a06e088f8de0ebed7d3324899b9229d15197df4 Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Mon, 24 Nov 2008 17:42:41 +0000 Subject: [PATCH] Added some Matrix international, fixed some bugs --- .../matrix-default-detailed-listing.wgpkg | Bin 1670 -> 1704 bytes .../matrix-default-view-template.wgpkg | Bin 2153 -> 1993 bytes lib/WebGUI/Asset/MatrixListing.pm | 10 ++- lib/WebGUI/Asset/Wobject/Matrix.pm | 8 +- lib/WebGUI/i18n/English/Asset_Matrix.pm | 77 ++++++++++++++++++ 5 files changed, 87 insertions(+), 8 deletions(-) diff --git a/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg index 8342baef63fc6ae76c8f998ef9aab5070539a7d9..97bbf93af3b699e2ee13b606a96bab5d68aa1b91 100644 GIT binary patch literal 1704 zcmV;Z23PqXiwFP!000001ML`TZ`(H1pZ6;W4_jKGv3$gF;(7tv^$L)58Ja9Ryalw# zSZrugASpX;(f_{pNXb%cr>l!(1BM8&E%V)v?;;zu`+u6vX0O|=)tb##uiL8CI=%3a z#nY^{;AwYv0o19HR{PN;FIuCQ+eV_YqpA?%6KPP=&; zTu`xaY;=|$vX@LaPt|Id>>LNx3bzeV&kJ!$EVou@)tFM#pll-4PwHT3hHB^r=|R8( z5Q(*NMoW7zh*A$9L^+3m4HScl40~&T7}k*`S8iA*BW)Nr zu+)ST5ftzrqz16R#_4mBWe)uXL45+IXV7P~VeFFfYK)??VU#PCa?`4-Lefq_9& zqJjvTi-{IH`C0X++`!Ikr2IlI&|*w)CU8Pkc1dHG8E!Tb`vpF$^8OOXRq@}_3Fgs; z?!)>?vXo(U-N>4S6OqGNU~qwKHuI(r4ZBwIO3*Dt2BOUbO$DEAD#z1oCMMRClp4ON zq=IZSVHVmVS2odZy}aA9cj3qi1CYEnbRu6`iW2m>Y6MkrE`9B!@f9{0#kONDwdq?S zA=REj&VR2)Hif$QWkoG-J&c2%BE<^4C}>a-#yHCO*`o*oNXZF!D(AHT!A@i_05)Q(aC-8b2nq2)1_?HI=#F`tD?^F{ZUZK} z1K1d(BQ6n;w4uE=F!ypEUWps=wTOU1?z0pc<}?^V7EqY>xME;^t`b?N1`VWzCOM~7 zWy*LbH-jB!?sa?_m)!A!?F;|!vs}rlo#g~7R03TcM~7ENPfnnosxYQjCRhpCl%E~y zeuQ3gnk+f`SrR*>pLWmr==IrQzwgJje*d%>cyAsXeoUwu-*)CW)=XT&budG;5Bd?4t7aFmJA(|L2{eTZG2~K?+ zj}Q51?|@kpkisCoR#XBRW)d#buizKj6|p7;6;^eh(?sjYe{aJ<3hq3XlzUI7H1NPN zISQ{ntq1?Wn(0XdpSxzur;ve>|GsP1v?nXqpfgAZ3XPDJU@y>6A?t)#8e8l=i zE}_3~TS$aH*-x*Z;@T(tYGC?2*Vh4U=w^bsqz@J9yAlWX6=iwONK>Y?ut$&uMdi71 zpCN2sMwZjuUv%UZ%ft5fd;9y{Ub|8X44(=-@4P4u_pNqbw|1+-Phfm2Dr>6*z?eBZ zRA_uC3l)%p!iq=nYK@6Poh#|Nip@NACk5+@VvdgUyOGxPdej@qcyHgn9vz>a{Pyc! zPyJjn5%%5O!Ue^$`QEg`W7Yd1D4hOwXkF>_mr6JM(Sj1b(`k41N{KkltK#bBhzb26 yK0J%Xc{X*O-?tU*p3mxdbM@()Pj_)K_Q2!80}mc}@WB7v1AhZvMJ^ox8~^|}SV++T literal 1670 zcmV;126_1(iwFP!000001MOICZ`(Ey_UHWy!o!vpXe__PapQUc+Vw3!(q(9}V4Jsq z7HNwOO$sDs$1VEbcSlN=Vmn=3B-@t=uq~6kci!DYHfs0(G@H#{w_B?IS#lLa?s^5i#Pv1cj)~(Zq zPI#U4$)A5c@k6Q6DK}1Vi=%!Su8a+*jS#$vPpm zmb;v2N}UncZkkHJ=fhXUq|8XqJgnPgd`vUx;MY+hIoky@oKTZeU18q}#<*HFL)cTJ zopy^fxS(R;#ON$NVy~ERo~qR@**OlX6>b|O?ZW};dO4$pIN>Be97HfUG(%N<29Ay- zCou%W{xqz|S~;%VuuewWFm7O|34dZPrA=uJy2D6!Sob^z&IDd=;24=vDJBZ0olf%w zLpJ~_MFfLkuspsJoWa~+lsTsrLGxfH{Dbkok3hOn)CsMqe6*7Y#z{d(aw17bT<$#C zd5&?pJn<3PdHie;h54XagmOWSAyJ_s6SJTQbr3{Y%q^-C!FaJGa;$j0%^)!87LVnW zxWItl8Ax9<2wDcQ!f~?6h~uz1f-RsJvcL}|TE!Ba2dwBtja_EA z*-GqJ_^itNYaCZy|Bg;Em$q~t7Ce%r49nqG)-0Wf9L@uSOJuX1H~rSI8zrx8x~0fK zw4I=t;PY+ec$)3R#Cn=i!?%@GkZmW-LLcMGCfaS5cU$%@9a&)jk~eOh$d{I)1bwL* zK~-ExUpr}hg&je$-B?R)`c_CtwP%p?KdO;Up)P)1QNunV#)NUuQ>0jdmjw-K!g?vI zEZn%GR{T+^#6yQgrszu*K6$;aR&7`r`K4kU)WOz;^y>;?>w;22rc}U-fNsCFUO_AH z0tY7YJv73q53qq0ZV$dD6WkN%>($OR<<c7n zA|&h&GDxtwLwC&ET*-~Y+6F+eLkJAg5tj%^+R$Dbn0q-71VK0V*P7htDKyMkFoG;+ z0iJQi!1`PzvPlgZNDEDJPV35)`<>iW20-#AzKl!mc)|9i|Mx|%WZljZG76PIS4ZgZ z+UV&i)Ke93Wd(9d$fg|Z*FEOlaQrJddMt?@(!~e!k)-*u&Ww;_U5o!IMtr4<7Y=&s0u2{`m1;d<;B0or7+v z4|G3B4=?N%H~0H*&rXilou0sH=Y`bql_wrRfUk-?iu`fNMvF`Uq!yAzzOrILjl43p z9B9NAKr}I2dVmit365zTj}JMtcfc$PivkeeC@O&rGYOaJH}DJXidYka3hTNrXrguG zzjvoX!6n6tav$i71|A5Lqwwm}dhjo-nVv@Qxoft31{oOn@4IGQ26Fj!HzLXaZslLZ zFzY+TJHHXS3wAm33F{XbLx113kO+NpkX}E-vCsI`!1Q^cufwvTn+xWWK2)e5$~6#I zl;t@iO_@T%9zzxsmFLCd}+LcmZ_)Oq==VfskZ?*Hf zwOMVYfKdCTuIMWY!<0IEm&6+b99nlW-PcI zA7B3R^!IV+q%B{)d3X9cnfzKZ5%&GU!i~bJ`QEg`W7P{CD4hN}XH)6)w?H@i(du-1 zd!2UYX(IfTx2uX`D0hn?!~;0S52S4`+OHSSr0rOJn-Ow2M;`W QU>gto1JRpu1DqU zx{2w=UfJHJDdM}|jJ?lfH$b82bRvjA?Row@GagUdjobfpyWP=n*l2XS-e~AG8vT*` zknGcKc<|{B9}a-DLA^$)>ZI-&`L!2_JOQ{d;psKa|s2>*e3x zBm4he`-7I^J6Qq}AHsRooWD01_Set9Kj=Sf5J2R756+z6>Q&#oe=V0Yj0h&T+hZOAfX zft+5Jf;k>Gxs_X@;@n~(t|ELu?@F4GqY>F#MWQ|6B0sXK*4 z+r%jFBp{bG6C>#4|eu3w$5JJsM@*zc+zqEiLG$_(>3mHa6)sxJ?6{%~q?w|tC-N$Fce-J_pi0RlF>^*7prqdXqPdjJ6*~u1^261P zDt~?kX|h)VlH0A9P7`NcfZoIvb_I|IU++qqOkBT|vl$Bx)7XYOHmUHF27x=&mt140 z*Le(d1WFl!@`hyFTwjl^$Tbb+@8-LB}lj8&bT8k&SB zw$kP@z-k9&3DRo#@B;o)^wyC26Im;P+N;WZgv7B_BI35b0T3tPTk%LPkQ+jB;I6-~ zL?z>@1SZ@425d4JTj8j*LBiQ0B>HJYg@RfnTlj=KM`q*6P z*k&Yefbus(UE8C%VdREAPu{gai4z7c?Tv)osB>wX<(kZzc5tn}72-Z&Kfo3>kNskS zz;|E<0NRuOb;WJVOBmk4HEld<-8b;$hi4hnbxk}{5t@n^Sh&!#MsMhL*X9_et zpV#c@ZlpVX(L_uH<;t_!A}2KID`i{PFm<6&dZ$lfcBM)?-kIATJGoRWM;U-0O)G++SSMKIm4`vq(k zOvJ}HANst0^fa~uwpNh z<$DrJ|H3j)Ghbfp6A6m2|sbhqGNS$R7d7Ns0h>R(_K ziJ%47m{j9mp6=tH#OVlz6i{5o{pc!LX)WY+Ybvi=U^ni#_cE>|1laZ1zq`eu5+}TrOPswg=fqcXiFa7yO|J6{H#;T(w+miQ zLjaR_8B}w|XLB>o7o0aZ;$zJjJ$7$* zceJ}Z9Q6wMt=J{Uf$~!vW!DuTm|%l5X^AWh$n{(<4+Rb`UEUYAu>Xf=m|rX$xjRhw zY89Ecsmy{!hR%}l{O^}xJo5ht&f^c)*S-G5h3fOy`?(OVk5(GSCX#`sGRm_eWyh%Ye&k|M0};@8V0-|EneF@ZGYBzdZSL=hOH2 b-ONuJKN0wez)u8j6M=sLzOLb903rYYtjFPr literal 2153 zcmV-v2$uIBiwFP!000001MOMsPg^$>&*%LWUZ#moBJX5@G(#%%6^XWNfgx?I$hp@^ zJZ|hO+n115{oi+veV@rqSZUdZsi}ZsAD_qXJnVC*S04Y}T6X5uBx4X^%t!}5+Uh{va+wD{cp!xWp$MS#u@m2pC56|Po0RZEN;0oCTkT__doKC@>;6a?uu zWSO!2t6?+=xSlgVJ1f}ok_%rhEz@SUp;tnNns2g`OTpBIW@_ZGE5h!KqOTeC&*^OQ zAk~_g_|SqH#qZ1_3~bE1Z>>yvqyo#_(bar5rBPsNx123&hQTp3DYcO6*WCA+Shs=e zGbN2QtI*k>GjFD36ps8CJ~#GMtDUh+1t88tRPvfniDp`JDeAXW)v3SW;+;6UQdi>2 z48tQw1zW_E!YCQ&qhTYo`@=@e!TmOG=ZFnA0Ru`{w5)(#D$i%yQ#>>vGm+!-TjGJY z^)FY|DaaW!W4M^#YTNXhvIFmPHFbVAWXLni?vOYWOFaEG$=<5e{k=G^ey zc_EfIGzu*7$t?}|Ou!iE4Q{g(Kf^Z*>cybX^#eiZsiHwngps!%V z{RZprN5U{AD8fL4CwuV;5|amX!h*g1y=NF(*Kcf8?fvw0*l_!?u_zEEDAI5XDMm53 zmr^Za(nLv%NyGRhCR)nWU118+OwrY`yi3fTZ0IhiQgTVmoDl~o*{*(GT}tMPO#zk6 zxtdYs&95O%j!HmsyW6?b*jN{!4>5(^0i^!to023G*QateWB$m+HdL`;iIvp%ol8%- z#z0T(JqfsXL*`5|Vk7}7LJ1Ty0>ur<>ca*-B4+`knh_xlP|c|!D;Yt22LYMj0wZ!d zZt*Diyh5ECgwU8xn=6hz~`n?ve>>1`9N^ zK#!(YHUxSM*o~7!2~>JN^2|N~cDN0B0mwq_ClM4_D;<|n1C#_Z5?zaGX5hW2Pk{7B zieUBAQwR-rX&__jc`_2lVxy(i$b)6YW`G(919()5U>yFg^rZoxl(ZybER{{G;p8ax z5gEgEgMRQdWMMvxODoJoDxWEc?Pjia;Ek0OH7qkI2O1#kHk9t*;f_Qt+Zk zO(+Cb4n+_6&ZJsxK$t!v7YtsPjaD<2xjmDAQph6H{L22p26_cxnHuQdywp; z7YUj0i=|+4boS!y^U>Q^TkZUHa7Rd>|_IO1SR z?}7ODL|#FQm=tcb&QLDdpDXc4D}1FLyb?MWSnAPGS~2Q(o@abnmBA@eZAuqBSPiIxX80+tf5LC|{Di4M zuR-;}VQ4JvZXRyVk@zSUnu#cGLw}c7>%n5`+3YD{Xy;mk?!k{a`-;Nr@%Sb=F`?cK zMv?GqaGgjs_~H38{1+P?!qfqZ#-J14#VfUi{7{?7yBg??JFc_Em6#x1fI-({pk=^) zfQjByg1I@;e-QWwQ3w!t03rYY9}6u1 diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index dae42184c..e1578e01b 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -534,7 +534,8 @@ sub view { if ($var->{screenshots}) { my $file = WebGUI::Form::File->new($self->session,{ value=>$var->{screenshots} }); my $storage = $file->getStorageLocation; - my @files = @{ $storage->getFiles } if (defined $storage); + my @files; + @files = @{ $storage->getFiles } if (defined $storage); $var->{screenshots} = qq| @@ -711,10 +712,10 @@ sub www_click { $self->incrementCounter('clicks'); if ($session->form->process("manufacturer")) { - $session->http->setRedirect( $self->get('manufacturerUrl') ); + $session->http->setRedirect( $self->get('manufacturerURL') ); } else { - $session->http->setRedirect( $self->get('productUrl') ); + $session->http->setRedirect( $self->get('productURL') ); } return undef; } @@ -826,7 +827,8 @@ sub www_getScreenshots { my $fileObject = WebGUI::Form::File->new($self->session,{ value=>$self->get('screenshots') }); my $storage = $fileObject->getStorageLocation; my $path = $storage->getPath; - my @files = @{ $storage->getFiles } if (defined $storage); + my @files; + @files = @{ $storage->getFiles } if (defined $storage); foreach my $file (@files) { unless ($file =~ m/^thumb-/){ my $thumb = 'thumb-'.$file; diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 31222048b..b97d4924c 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -1,6 +1,7 @@ package WebGUI::Asset::Wobject::Matrix; -$VERSION = "2.0.0"; +use strict; +our $VERSION = "2.0.0"; #------------------------------------------------------------------- # WebGUI is Copyright 2001-2008 Plain Black Corporation. @@ -12,7 +13,6 @@ $VERSION = "2.0.0"; # http://www.plainblack.com info@plainblack.com #------------------------------------------------------------------- -use strict; use Tie::IxHash; use JSON; use WebGUI::International; @@ -485,7 +485,7 @@ sub view { returnObjects => 1, }) }; $var->{bestCompares_url} = $bestCompares_listing->getUrl; - $var->{bestCompares_count} = $bestCompares_listing->get('views'); + $var->{bestCompares_count} = $bestCompares_listing->get('compares'); $var->{bestCompares_name} = $bestCompares_listing->get('title'); $var->{bestCompares_sortButton} = "
"; @@ -498,7 +498,7 @@ sub view { returnObjects => 1, }) }; $var->{bestClicks_url} = $bestClicks_listing->getUrl; - $var->{bestClicks_count} = $bestClicks_listing->get('views'); + $var->{bestClicks_count} = $bestClicks_listing->get('clicks'); $var->{bestClicks_name} = $bestClicks_listing->get('title'); $var->{bestClicks_sortButton} = "
"; diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index 28e4d3bef..5062b2d8b 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -183,6 +183,83 @@ our $I18N = { lastUpdated => 0, }, + 'listing statistics label' => { + message => q|Listing Statistics|, + lastUpdated => 0, + }, + + 'most clicks label' => { + message => q|Most clicks|, + lastUpdated => 0, + }, + + 'most views label' => { + message => q|Most views|, + lastUpdated => 0, + }, + + 'most compares label' => { + message => q|Most compares|, + lastUpdated => 0, + }, + + 'most recently updated label' => { + message => q|Most recently updated|, + lastUpdated => 0, + }, + + 'best rated label' => { + message => q|Best Rated By Users|, + lastUpdated => 0, + }, + + 'worst rated label' => { + message => q|Worst Rated by Users|, + lastUpdated => 0, + }, + + 'site statistics label' => { + message => q|Site Statistics|, + lastUpdated => 0, + }, + + 'listing count label' => { + message => q|Listing Count|, + lastUpdated => 0, + }, + + 'pending listings label' => { + message => q|Pending Listings|, + lastUpdated => 0, + }, + + 'add new listing label' => { + message => q|Click here to add a new listing.|, + lastUpdated => 0, + }, + + 'add new listing text' => { + message => q|Please note that you will be the official maintainer of the listing, and will be responsible +for keeping it up to date.|, + lastUpdated => 0, + }, + + 'create account part1 text' => { + message => q|If you are the maker of a product, or are an expert user and are willing to maintain the +listing,|, + lastUpdated => 0, + }, + + 'create account label' => { + message => q|create an account|, + lastUpdated => 0, + }, + + 'create account part2 text' => { + message => q|so you can register your listing.|, + lastUpdated => 0, + }, + 'isLoggedIn' => { message => q|A condition indicating whether the current user is logged in to the site.|, lastUpdated => 0,