AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid creating multiple instances of Translator

This commit is contained in:
Frederic Guillot 2015-05-24 16:30:40 -04:00
parent eeac2329ba
commit 03fc8a1bce
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Core/Translator.php
View File

@ -26,6 +26,31 @@ class Translator
*/
private static $locales = array();
/**
* Instance
*
* @static
* @access private
* @var Translator
*/
private static $instance = null;
/**
* Get instance
*
* @static
* @access public
* @return Translator
*/
public static function getInstance()
{
if (self::$instance === null) {
self::$instance = new self;
}
return self::$instance;
}
/**
* Get a translation
*

25
app/functions.php
View File

@ -9,8 +9,7 @@ use Core\Translator;
*/
function t()
{
$t = new Translator;
return call_user_func_array(array($t, 'translate'), func_get_args());
return call_user_func_array(array(Translator::getInstance(), 'translate'), func_get_args());
}
/**
@ -20,19 +19,7 @@ function t()
*/
function e()
{
$t = new Translator;
return call_user_func_array(array($t, 'translateNoEscaping'), func_get_args());
}
/**
* Translate a currency
*
* @return string
*/
function c($value)
{
$t = new Translator;
return $t->currency($value);
return call_user_func_array(array(Translator::getInstance(), 'translateNoEscaping'), func_get_args());
}
/**
@ -42,8 +29,7 @@ function c($value)
*/
function n($value)
{
$t = new Translator;
return $t->number($value);
return Translator::getInstance()->number($value);
}
/**
@ -53,8 +39,7 @@ function n($value)
*/
function dt($format, $timestamp)
{
$t = new Translator;
return $t->datetime($format, $timestamp);
return Translator::getInstance()->datetime($format, $timestamp);
}
/**
@ -67,5 +52,3 @@ function p($value, $t1, $t2)
{
return $value > 1 ? $t2 : $t1;
}