mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix language fallback (#2148)

Browse Source
This commit is contained in:
jekkos
2018-09-23 02:01:39 +02:00
parent c3ba10f2e5
commit 2cc58ad546
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/hooks/load_config.php
View File

@@ -11,21 +11,18 @@ function load_config()
{
$CI->config->set_item($CI->security->xss_clean($app_config->key), $CI->security->xss_clean($app_config->value));
}
//Loads all the language files from the language directory
if(!empty(current_language()))
{
// fallback to English if language folder does not exist
if(!file_exists('../application/language/' . current_language_code()))
{
$CI->config->set_item('language', 'english');
$CI->config->set_item('language_code', 'en-US');
}
_load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language());
_load_language_files($CI, '../application/language', current_language_code());
// fallback to English if language settings are not correct
$file_exists = !file_exists('../application/language/' . current_language_code());
if(current_language_code() == null || current_language() == null || $file_exists)
{
$CI->config->set_item('language', 'english');
$CI->config->set_item('language_code', 'en-US');
}
_load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language());
_load_language_files($CI, '../application/language', current_language_code());
//Set timezone from config database
if($CI->config->item('timezone'))
{

2
application/migrations/sqlscripts/3.0.2_to_3.1.1.sql
View File

@@ -417,5 +417,3 @@ ALTER TABLE ospos_items
UPDATE `ospos_app_config` SET `value` = 'en-US' WHERE `key` = 'language_code' AND `value` = 'en';
-- Delete any configured specific locale as folders were moved in this version
DELETE FROM `ospos_app_config` WHERE `key` = 'language_code' and `value` LIKE '%_%';