diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:35 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:36 +0400 |
commit | aca8ec33a85e0a70b818b6227145041717d7a69e (patch) | |
tree | 41377e3a9737d63222522ef93ecf8483f3faddfa /core/Translate.php | |
parent | 0a63210e3eae7562af1a3dbee340eb1ee140db3d (diff) |
Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.
Removed some deprecated code.
Diffstat (limited to 'core/Translate.php')
-rw-r--r-- | core/Translate.php | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/core/Translate.php b/core/Translate.php index fb2759b289..23b1e26371 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -8,20 +8,22 @@ * @category Piwik * @package Piwik */ +namespace Piwik; +use Exception; use Piwik\Config; use Piwik\Common; /** * @package Piwik */ -class Piwik_Translate +class Translate { static private $instance = null; static private $languageToLoad = null; private $loadedLanguage = false; /** - * @return Piwik_Translate + * @return \Piwik\Translate */ static public function getInstance() { @@ -49,7 +51,7 @@ class Piwik_Translate $this->unloadEnglishTranslation(); $this->loadEnglishTranslation(); $this->loadCoreTranslation($language); - PluginsManager::getInstance()->loadPluginTranslations($language); + \Piwik\PluginsManager::getInstance()->loadPluginTranslations($language); } /** @@ -180,40 +182,3 @@ class Piwik_Translate } } -/** - * Returns translated string or given message if translation is not found. - * - * @param string $string Translation string index - * @param array|string|int $args sprintf arguments - * @return string - */ -function Piwik_Translate($string, $args = array()) -{ - if (!is_array($args)) { - $args = array($args); - } - if (isset($GLOBALS['Piwik_translations'][$string])) { - $string = $GLOBALS['Piwik_translations'][$string]; - } - if (count($args) == 0) { - return $string; - } - return vsprintf($string, $args); -} - -/** - * Returns translated string or given message if translation is not found. - * This function does not throw any exception. Use it to translate exceptions. - * - * @param string $message Translation string index - * @param array $args sprintf arguments - * @return string - */ -function Piwik_TranslateException($message, $args = array()) -{ - try { - return Piwik_Translate($message, $args); - } catch (Exception $e) { - return $message; - } -} |