mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-23 00:13:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the translation issue with the installation page.

Browse source
This commit is contained in:
Alex Tselegidis 2015-11-05 20:13:44 +01:00
parent 6adf0abf8d
commit b86c850b88
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/application/controllers/installation.php
View file

@ -26,6 +26,15 @@ class Installation extends CI_Controller {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
$this->load->helper('installation'); $this->load->helper('installation');
$this->load->library('session');
// Set user's selected language.
if ($this->session->userdata('language')) {
$this->config->set_item('language', $this->session->userdata('language'));
$this->lang->load('translations', $this->session->userdata('language'));
} else {
$this->lang->load('translations', $this->config->item('language')); // default
}
} }
@ -93,9 +102,6 @@ class Installation extends CI_Controller {
)); ));
} }
} }
} }
/* End of file installation.php */ /* End of file installation.php */

2
src/assets/js/installation.js
View file

@ -28,7 +28,7 @@ $(document).ready(function() {
$('#install').click(function() { $('#install').click(function() {
if (!validate()) return; if (!validate()) return;
var postUrl = GlobalVariables.baseUrl + '/index.php/appointments/ajax_install'; var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install';
var postData = { var postData = {
'csrfToken': GlobalVariables.csrfToken, 'csrfToken': GlobalVariables.csrfToken,
'admin': JSON.stringify(getAdminData()), 'admin': JSON.stringify(getAdminData()),