From 57e6e8d82909c88b33329fd468f06b58aa7e35e2 Mon Sep 17 00:00:00 2001
From: Alexander Shursha <kekek2@ya.ru>
Date: Fri, 21 Apr 2017 08:38:23 +0300
Subject: [PATCH] Refactoring setLocale()

---
 .../controllers/OPNsense/Base/ApiControllerBase.php |  2 +-
 .../controllers/OPNsense/Base/ControllerBase.php    |  6 ++++--
 .../controllers/OPNsense/Base/ControllerRoot.php    | 13 ++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
index 56c7881ba..27702dd97 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
@@ -91,7 +91,7 @@ class ApiControllerBase extends ControllerRoot
     {
         // disable view processing
         set_error_handler(array($this, 'APIErrorHandler'));
-        self::setLocale();
+        self::setLocale(self::getLangEncode());
     }
 
     /**
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
index a88d7ed06..5dca31322 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
@@ -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;
     }
 
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerRoot.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerRoot.php
index a128e969b..b91400751 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerRoot.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerRoot.php
@@ -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 */