From caaa0c0e2acdb756a2c25780a84a3c9ec4af3d01 Mon Sep 17 00:00:00 2001
From: Lucas Bickel <hairmare@rabe.ch>
Date: Thu, 23 Mar 2017 23:01:20 +0100
Subject: [PATCH] Fix locale generation for js dicts

---
 .../application/controllers/LocaleController.php       | 10 ++--------
 .../controllers/plugins/PageLayoutInitPlugin.php       |  1 -
 airtime_mvc/application/models/Locale.php              |  2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php
index 482e3ec35..4dfb73e69 100644
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/airtime_mvc/application/controllers/LocaleController.php
@@ -1,12 +1,7 @@
 <?php
 
-class LocaleController extends Zend_Controller_Action
+final class LocaleController extends Zend_Controller_Action
 {
-
-    public function init()
-    {
-    }
-    
     public function datatablesTranslationTableAction()
     {
         $this->view->layout()->disableLayout();
@@ -443,7 +438,6 @@ class LocaleController extends Zend_Controller_Action
         $this->view->layout()->disableLayout();
         $this->_helper->viewRenderer->setNoRender(true);
         header("Content-type: text/javascript");
-        echo "var general_dict=".json_encode($translations);
-
+        echo "var general_dict=".$this->_helper->json->encodeJson($translations);
     }
 }
diff --git a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
index 4d325a809..05447c8f6 100644
--- a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
+++ b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
@@ -32,7 +32,6 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
             "api",
             "auth",
             "error",
-            "locale",
             "upgrade",
             'whmcs-login',
             "provisioning",
diff --git a/airtime_mvc/application/models/Locale.php b/airtime_mvc/application/models/Locale.php
index d123039c2..7d6567ba8 100644
--- a/airtime_mvc/application/models/Locale.php
+++ b/airtime_mvc/application/models/Locale.php
@@ -1,6 +1,6 @@
 <?php
 
-class Application_Model_Locale
+final class Application_Model_Locale
 {
     private static $domains = array(
         'airtime',