From e7b4aeedab0a65d209c3b5b7c3183f8e40e85c01 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Wed, 2 Dec 2020 20:04:06 +0200
Subject: [PATCH] Automatically load the translations

---
 application/controllers/Appointments.php |  1 -
 application/controllers/Backend.php      | 13 -------------
 application/controllers/Backend_api.php  |  1 -
 application/controllers/Captcha.php      |  9 ---------
 application/controllers/Errors.php       | 22 ----------------------
 application/controllers/Google.php       | 12 ------------
 application/controllers/Installation.php | 16 +---------------
 application/controllers/User.php         | 22 ----------------------
 application/core/EA_Controller.php       | 24 ++++++++++++++++++++++--
 application/libraries/Google_sync.php    |  2 --
 application/libraries/Timezones.php      |  2 --
 11 files changed, 23 insertions(+), 101 deletions(-)

diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php
index 1caba10f..ef4f0dce 100755
--- a/application/controllers/Appointments.php
+++ b/application/controllers/Appointments.php
@@ -35,7 +35,6 @@ class Appointments extends EA_Controller {
         $this->load->model('customers_model');
         $this->load->model('settings_model');
 
-        $this->load->library('session');
         $this->load->library('timezones');
         $this->load->library('synchronization');
         $this->load->library('notifications');
diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php
index 3b81b1f8..b0a1b0ce 100755
--- a/application/controllers/Backend.php
+++ b/application/controllers/Backend.php
@@ -37,20 +37,7 @@ class Backend extends EA_Controller {
         $this->load->model('admins_model');
 
         $this->load->library('timezones');
-        $this->load->library('session');
         $this->load->library('migration');
-
-        if ($this->session->userdata('language'))
-        {
-            // Set user's selected language.
-            $this->config->set_item('language', $this->session->userdata('language'));
-            $this->lang->load('translations', $this->session->userdata('language'));
-        }
-        else
-        {
-            // Set the default language.
-            $this->lang->load('translations', $this->config->item('language'));
-        }
     }
 
     /**
diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php
index bae0c09c..bbd7e7e6 100755
--- a/application/controllers/Backend_api.php
+++ b/application/controllers/Backend_api.php
@@ -36,7 +36,6 @@ class Backend_api extends EA_Controller {
     {
         parent::__construct();
 
-        $this->load->library('session');
         $this->load->model('roles_model');
 
         if ($this->session->userdata('role_slug'))
diff --git a/application/controllers/Captcha.php b/application/controllers/Captcha.php
index a1b1d79f..20695c94 100644
--- a/application/controllers/Captcha.php
+++ b/application/controllers/Captcha.php
@@ -17,15 +17,6 @@
  * @package Controllers
  */
 class Captcha extends EA_Controller {
-    /**
-     * Class Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->load->library('session');
-    }
-
     /**
      * Make a request to this method to get a captcha image.
      */
diff --git a/application/controllers/Errors.php b/application/controllers/Errors.php
index 2ac03765..08535e93 100644
--- a/application/controllers/Errors.php
+++ b/application/controllers/Errors.php
@@ -17,28 +17,6 @@
  * @package Controllers
  */
 class Errors extends EA_Controller {
-    /**
-     * Class Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->library('session');
-
-        if ($this->session->userdata('language'))
-        {
-            // Set user's selected language.
-            $this->config->set_item('language', $this->session->userdata('language'));
-            $this->lang->load('translations', $this->session->userdata('language'));
-        }
-        else
-        {
-            // Set the default language.
-            $this->lang->load('translations', $this->config->item('language'));
-        }
-    }
-
     /**
      * Display the 404 error page.
      */
diff --git a/application/controllers/Google.php b/application/controllers/Google.php
index 6b217157..1af8a332 100644
--- a/application/controllers/Google.php
+++ b/application/controllers/Google.php
@@ -19,16 +19,6 @@
  * @package Controllers
  */
 class Google extends EA_Controller {
-    /**
-     * Class Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->library('session');
-    }
-
     /**
      * Authorize Google Calendar API usage for a specific provider.
      *
@@ -110,8 +100,6 @@ class Google extends EA_Controller {
             $framework = get_instance();
 
             // The user must be logged in.
-            $framework->load->library('session');
-
             if ($framework->session->userdata('user_id') == FALSE && is_cli() === FALSE)
             {
                 return;
diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php
index f7c75abc..250691a4 100644
--- a/application/controllers/Installation.php
+++ b/application/controllers/Installation.php
@@ -20,26 +20,13 @@
  */
 class Installation extends EA_Controller {
     /**
-     * Class Constructor
+     * Installation constructor.
      */
     public function __construct()
     {
         parent::__construct();
 
         $this->load->helper('installation');
-        $this->load->library('session');
-
-        if ($this->session->userdata('language'))
-        {
-            // Set user's selected language.
-            $this->config->set_item('language', $this->session->userdata('language'));
-            $this->lang->load('translations', $this->session->userdata('language'));
-        }
-        else
-        {
-            // Set the default language.
-            $this->lang->load('translations', $this->config->item('language'));
-        }
     }
 
     /**
@@ -74,7 +61,6 @@ class Installation extends EA_Controller {
             $this->load->model('settings_model');
             $this->load->model('services_model');
             $this->load->model('providers_model');
-            $this->load->library('session');
             $this->load->library('migration');
             $this->load->helper('string');
 
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 6895f5a4..b1264f19 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -21,28 +21,6 @@ use EA\Engine\Types\NonEmptyText;
  * @package Controllers
  */
 class User extends EA_Controller {
-    /**
-     * Class Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->library('session');
-
-        if ($this->session->userdata('language'))
-        {
-            // Set user's selected language.
-            $this->config->set_item('language', $this->session->userdata('language'));
-            $this->lang->load('translations', $this->session->userdata('language'));
-        }
-        else
-        {
-            // Set the default language.
-            $this->lang->load('translations', $this->config->item('language')); // default
-        }
-    }
-
     /**
      * Default Method
      *
diff --git a/application/core/EA_Controller.php b/application/core/EA_Controller.php
index 36bad2d6..074b6447 100644
--- a/application/core/EA_Controller.php
+++ b/application/core/EA_Controller.php
@@ -24,7 +24,6 @@
  * @property CI_Session $session
  * @property CI_Security $security
  * @property CI_Migration $migration
-
  * @property Admins_model $admins_model
  * @property Appointments_model $appointments_model
  * @property Consents_model $consents_model
@@ -44,5 +43,26 @@
  * @property Timezones $timezones
  */
 class EA_Controller extends CI_Controller {
-    //
+    /**
+     * EA_Controller constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->configure_language();
+    }
+
+    /**
+     * Configure the language
+     */
+    private function configure_language()
+    {
+        if ($this->session->has_userdata('language'))
+        {
+            $this->config->set_item('language');
+        }
+
+        $this->lang->load('translations');
+    }
 }
diff --git a/application/libraries/Google_sync.php b/application/libraries/Google_sync.php
index 619b9be7..504f05b4 100644
--- a/application/libraries/Google_sync.php
+++ b/application/libraries/Google_sync.php
@@ -52,8 +52,6 @@ class Google_Sync {
     {
         $this->CI =& get_instance();
 
-        $this->CI->load->library('session');
-
         // Initialize google client and calendar service.
         $this->client = new Google_Client();
 
diff --git a/application/libraries/Timezones.php b/application/libraries/Timezones.php
index b4b24166..f8e55ba0 100644
--- a/application/libraries/Timezones.php
+++ b/application/libraries/Timezones.php
@@ -472,8 +472,6 @@ class Timezones {
         $this->CI = & get_instance();
 
         $this->CI->load->model('user_model');
-
-        $this->CI->load->library('session');
     }
 
     /**