Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/2.5.x' into saas

Browse source
This commit is contained in:
Albert Santoni 2014-09-08 20:47:38 -04:00
commit 142060d600
5 changed files with 665 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/LocaleController.php
View file

@ -12,12 +12,11 @@ class LocaleController extends Zend_Controller_Action
$this->_helper->viewRenderer->setNoRender(true);
header("Content-type: text/javascript");
$baseUrl = Application_Common_OsPath::getBaseDir();
$locale = Application_Model_Preference::GetLocale();
echo "var datatables_dict =" .
file_get_contents(Application_Common_OsPath::join(
dirname(__file__),
"../../public/js/datatables/i18n/",
$_SERVER["DOCUMENT_ROOT"],
"js/datatables/i18n/",
$locale.".txt")
);
}