From 4864705b51e6d07a12826f7a6942c1f383aa81ad Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Fri, 25 Jun 2010 12:59:08 +0000
Subject: [PATCH] * Fixing unit tests that were failing since one test was
loading translation * adding svn:ignore to .htaccess files created during
install * Updating Yahoo! and Alexa icons
git-svn-id: http://dev.piwik.org/svn/trunk@2383 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/Translate.php | 6 +++++
.../images/searchEngines/search.yahoo.com.png | Bin 254 -> 232 bytes
.../images/searchEngines/www.alexa.com.png | Bin 436 -> 865 bytes
tests/core/Piwik.test.php | 21 ++++++++++++++++++
4 files changed, 27 insertions(+)
diff --git a/core/Translate.php b/core/Translate.php
index adc3379cf4..1877478679 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -38,6 +38,12 @@ class Piwik_Translate
$this->setLocale();
$this->englishLanguageLoaded = true;
}
+
+ public function unloadEnglishTranslation()
+ {
+ $GLOBALS['Piwik_translations'] = array();
+ $this->englishLanguageLoaded = false;
+ }
public function loadUserTranslation()
{
diff --git a/plugins/Referers/images/searchEngines/search.yahoo.com.png b/plugins/Referers/images/searchEngines/search.yahoo.com.png
index 20ba5ed665b6204d96209c9185ae5e8ac7e5960f..1c1d11bc91b6fee17fd65964b534a1bd0d3ab73e 100644
GIT binary patch
delta 216
zcmV;}04M+c0q6mc7=Hu<0002(-QrRJ001yhOjJbx008{{{ConOlrF5KQoOu=%-p`@
z{QCTK0*tI;yo3^*?9%LvBBY!`w9KB|Yyxb=V*Z-|0004WQchC<K<3zH0001HNkl<Z
z2$^GGzyl&zt#V~xQet3TwQAL(0H!8}s6;WNCRHX~2CtQ(>QU9rOsx#7Ry}u*_`$3S
zWULnb|ASY7!E4o0`Tw6e4HzPn(yQZDfyS`@|Ns9}0LKNOf#-j@GVmDSu@V5LiXYK%
ST5Hb$0000<MNUMnLSTYjCu45_
delta 238
zcmaFC_>XadL_G&H0|SGGE`KnPVo7)Ob!1>zf5M!#>m`scS>hT|5}cn_Ql40p%HWui
zpOmWLnVXoN8kCxtQdxL1)dr}DGr%Xr6-fUFqW}NXB~#>poN7-O$B>F!NeNEO42(w_
z^cVyjB$yZ&TNHr|o*n@PaRv?rHnj-?%<0U+Ax(k`4GvKXTn&d5#2gqJ&oXp2{7_(0
zXi#W#y4vK?z|eGy=~=U91A~)b0+SE}Ba1O}63+x)0S5t20|xB`CJqIj=}asFZ43?!
di5v_p5)6;-F)lsDc>&}O22WQ%mvv4FO#n>qKO_JE
diff --git a/plugins/Referers/images/searchEngines/www.alexa.com.png b/plugins/Referers/images/searchEngines/www.alexa.com.png
index 61855bc7709d5dfcbe57dedef97e7c4c11dc2304..da07a4398a179e40a46c84a0d807754660c39991 100644
GIT binary patch
delta 843
zcmV-R1GN0K1K|dcBYy)ZNkl<ZIE|f?TWphc7{-79_S^ccblqCEm33_c+n8;axvgVM
zhMOYElqMh;61c!aOk7M9CBYlQ<t~ZnmBDx=M1rCbb?!pQf?M#wlv6ouV+R=PdRW`F
z{h(dXpEqcRdgbr#O`iA3bMZWafAHmEw*1QF8wVfEhu_L%ihqt$NtF=fDk`*hpK>`q
z8rs!yYOP+ZJwE(-Zp-P<$A<H%!iF8*HuPEng(8$mgklQcf9J#HvEA9bx8M7=$NJz2
zgX5QGJs%t!xood7Nd2BosLI?LYZVZP>K4v?JAv6@P8>S4t97ugE}(rJTYuujk5?WB
zlZIZWj=Zu!-+vZ2wWdloHq_AW+{E<!0<pjxQbFPRt&B`r;rXf2GoNYzuK#}Xy-8oZ
zMq2re(BdR75A@R2+RPW{M)>69S0ocj2KRdjFE5h}-=?rM%IN5l=h)cH4h?{BGV(?#
z9VIq*kzgoHI+ez5wUCSp{0kX;xBQrlMuMRr(d96u=zlL1vw7~_3%?@)1eQy-Qp!(O
zSz+ed1n(Y|dH?7SB$HV>JDl`%wo@z$f&m>Xv$IglLN-DmT6AgviW+^nTFL-2>8O^N
zKf%6Nw)6Gb!??G$Fg6vSBm~ig2*q42U_c0gs+DC4pnAO_CsjG50vn**%E<5#Rc0gm
zhQ1+R5`P@r-33|=s=XfW=OL3rYjR+$tjK5pT#bf#ebcjmnOavf1JAg*aBUHb)sAa(
zGXp&>=*lG8d)w*T*#|lshQ<z>?CY*-0S+8KqTWr{?@R>3JXEuIw|jV@yOBm~4PDL#
zF5ZdY?X0KUY2*0mafG8A=W~7Zx9Z*$k9#2fdVe!IeQrW&T>9xOb#*3oZ|g!fuBRyJ
zQ51z-Dn=-<#HE=SP22YHdXMJ(k*y6c{@ujSrs5m_2<C2FxV>sj&HAvGsn{$Qj79_L
zbQ=G1j4)+XZf@fxH}{)Oa@%VyRga$7!l~(mBa+Gwk4JP*uO=TM=U0({l159uLXX)f
z(?oB{onI&G_8(}fO#Ew1e{pguzDFa(U_666uL^y+P?c(#s|fM&t1VUI|Ml~~`4dtS
VN0hYiP>BEl002ovPDHLkV1nB5r&j;~
delta 411
zcmV;M0c8H+2DAf^BYyw}VoOIv00000008+zyMF)x010qNS#tmY07w7;07w8v$!k6U
z00C4<L_t(I%cWDXYQr!PeGY~UoiZ9S7&(wNLC`fzyce=($RP06O{2(|&09!^kc4&&
zbaw~&14OfCkjc=!<O|dxShXF;ZRrCc>7Cx`ba!$nGX@q<_<wv`+TC>e0MGN#Zr=d_
ze7_4RC3d@4d&c>8P!_M(F^<P07K^2I1^_|`WLbtVoB#maI&qThK?s4A(sIRHg%C)R
zJ;HDThq9F^iUC0Dce@UPA*#sjK`=xM|3nK=SLA#?FU?JG2pO0kPZhv<1jd+sg8N%h
zzu(8{^a0=RmVaz+lZaA^UayD4;egrfu{O!>Eiq#Z=kpnH9G6OXmBh~Y{^lF&#Cby%
zsz6IbE>6?5_GZuXst*1JN@>*rLuVXWV!M3-0E|YXtI#=*pp=4Ah2Ejen9EohLI#GA
zfzeu<99nCmwKh^pYu{|1t=(z*&YWK&%YS4wA|V9602FF|resW*81n!C002ovPDHLk
FV1oG@vKs&Z
diff --git a/tests/core/Piwik.test.php b/tests/core/Piwik.test.php
index 3b60a6d291..95a2ab9ac9 100644
--- a/tests/core/Piwik.test.php
+++ b/tests/core/Piwik.test.php
@@ -44,4 +44,25 @@ class Test_Piwik extends UnitTestCase
$this->assertTrue( Piwik::secureDiv( 11.0, 'a' ) === 0 );
}
+
+ public function test_getPrettyTimeFromSeconds()
+ {
+ Piwik_Translate::getInstance()->loadEnglishTranslation();
+ $tests = array(
+ 30 => '30s',
+ 60 => '1 min 0s',
+ 100 => '1 min 40s',
+ 3600 => '1 hours 0 min',
+ 3700 => '1 hours 1 min',
+ 86400 + 3600 * 10 => '1 days 10 hours',
+ 86400 * 365 => '365 days 0 hours',
+ (86400 * (365.25 + 10)) => '1 years 10 days',
+
+ );
+ foreach($tests as $seconds => $expected)
+ {
+ $this->assertEqual( Piwik::getPrettyTimeFromSeconds($seconds), str_replace(' ',' ', $expected));
+ }
+ Piwik_Translate::getInstance()->unloadEnglishTranslation();
+ }
}
--
GitLab