diff options
Diffstat (limited to 'modules/Translate.php')
-rw-r--r-- | modules/Translate.php | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/modules/Translate.php b/modules/Translate.php index 65abd385c9..9bb5400a3a 100644 --- a/modules/Translate.php +++ b/modules/Translate.php @@ -1,14 +1,14 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik + */ + /** * * @package Piwik @@ -49,24 +49,24 @@ class Piwik_Translate // we could check that no string overlap here $GLOBALS['Piwik_translations'] = array_merge($GLOBALS['Piwik_translations'], $translation); } -
- /**
- * Enter description here...
- *
+ + /** + * Enter description here... + * * @return string the language filename prefix, eg "en" for english - * @throws exception if the language set in the config file is not a valid filename
+ * @throws exception if the language set in the config file is not a valid filename */ public function getLanguageToLoad() { $language = Zend_Registry::get('config')->Language->current; -
+ if( Piwik_Common::isValidFilename($language)) { - return $language;
- }
- else
- {
- throw new Exception("The language selected ('$language') is not a valid language file ");
+ return $language; + } + else + { + throw new Exception("The language selected ('$language') is not a valid language file "); } } } |