refs #2960

git-svn-id: http://dev.piwik.org/svn/trunk@5871 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 7 insertions, 17 deletions

diff --git a/core/Translate.php b/core/Translate.php
index e94e8dd0ee..22fc65239d 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -101,26 +101,16 @@ class Piwik_Translate
 	 */
 	public function getLanguageToLoad()
 	{
-		if(!is_null(self::$languageToLoad))
+		if(is_null(self::$languageToLoad))
 		{
-			return self::$languageToLoad;
-		}
+			$lang = Piwik_Common::getRequestVar('language', '', 'string');
 
-		Piwik_PostEvent('Translate.getLanguageToLoad', self::$languageToLoad);
-		
-		self::$languageToLoad = Piwik_Common::getRequestVar('language', is_null(self::$languageToLoad) ? '' : self::$languageToLoad, 'string');
-		if(empty(self::$languageToLoad))
-		{
-			self::$languageToLoad = $this->getLanguageDefault();
-		}
-		if( Piwik_Common::isValidFilename(self::$languageToLoad))
-		{
-			return self::$languageToLoad;
-		}
-		else
-		{
-			throw new Exception("The language selected ('".self::$languageToLoad."') is not a valid language file ");
+			Piwik_PostEvent('Translate.getLanguageToLoad', $lang);
+
+			self::$languageToLoad = $lang;
 		}
+
+		return self::$languageToLoad;
 	}
 	
 	/** Reset the cached language to load. Used in tests. */