* 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

@@ -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()
 	{

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();
+    }
 }