lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring setLocale()

Browse Source
This commit is contained in:
Alexander Shursha 2017-04-21 08:38:23 +03:00
parent 6573e70ae3
commit 57e6e8d829
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
View File

@ -91,7 +91,7 @@ class ApiControllerBase extends ControllerRoot
{
// disable view processing
set_error_handler(array($this, 'APIErrorHandler'));
self::setLocale();
self::setLocale(self::getLangEncode());
}
/**

6
src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
View File

@ -46,13 +46,15 @@ class ControllerBase extends ControllerRoot
*/
public function getTranslator()
{
$lang_encoding = self::getLangEncode();
$ret = new ViewTranslator(array(
'directory' => '/usr/local/share/locale',
'defaultDomain' => 'OPNsense',
'locale' => "en_US.UTF-8",
'locale' => $lang_encoding,
));
self::setLocale();
self::setLocale($lang_encoding);
return $ret;
}

13
src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerRoot.php
View File

@ -49,9 +49,9 @@ class ControllerRoot extends Controller
}
/**
* Set locale for gettext
* Get lang encoding for gettext
*/
public static function setLocale()
public static function getLangEncode()
{
$lang = 'en_US';
@ -63,7 +63,14 @@ class ControllerRoot extends Controller
}
}
$lang_encoding = $lang . '.UTF-8';
return $lang . '.UTF-8';
}
/**
* Set locale for gettext
*/
public static function setLocale($lang_encoding)
{
$textdomain = 'OPNsense';
/* this isn't being done by Phalcon */