Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix locale generation for js dicts

This commit is contained in:
Lucas Bickel 2017-03-23 23:01:20 +01:00
parent 559fdd0659
commit caaa0c0e2a
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/controllers/LocaleController.php
View File

@ -1,12 +1,7 @@
<?php <?php
class LocaleController extends Zend_Controller_Action final class LocaleController extends Zend_Controller_Action
{ {
public function init()
{
}
public function datatablesTranslationTableAction() public function datatablesTranslationTableAction()
{ {
$this->view->layout()->disableLayout(); $this->view->layout()->disableLayout();
@ -443,7 +438,6 @@ class LocaleController extends Zend_Controller_Action
$this->view->layout()->disableLayout(); $this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true); $this->_helper->viewRenderer->setNoRender(true);
header("Content-type: text/javascript"); header("Content-type: text/javascript");
echo "var general_dict=".json_encode($translations); echo "var general_dict=".$this->_helper->json->encodeJson($translations);
} }
} }

1
airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
View File

@ -32,7 +32,6 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
"api", "api",
"auth", "auth",
"error", "error",
"locale",
"upgrade", "upgrade",
'whmcs-login', 'whmcs-login',
"provisioning", "provisioning",

2
airtime_mvc/application/models/Locale.php
View File

@ -1,6 +1,6 @@
<?php <?php
class Application_Model_Locale final class Application_Model_Locale
{ {
private static $domains = array( private static $domains = array(
'airtime', 'airtime',