mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-04 07:12:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use app language for current_lang (#4175)

Browse Source
This commit is contained in:
jekkos
2025-02-09 22:55:06 +01:00
parent d0b2b3e80b
commit 19974bc8e0
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Events/Load_config.php
View File

@@ -41,7 +41,7 @@ class Load_config
//Language
$language_exists = file_exists('../app/Language/' . current_language_code());
if(current_language_code() == null || current_language() == null || !$language_exists) //TODO: current_language() is undefined
if(current_language_code() == null || current_language() == null || !$language_exists)
{
$config->settings['language'] = 'english';
$config->settings['language_code'] = 'en';

38
app/Helpers/locale_helper.php
View File

@@ -1,54 +1,30 @@
<?php
use App\Models\Employee;
use Config\OSPOS;
use Config\Services;
/**
* Returns the currently configured language code.
*
* @param bool $load_system_language When true, the system language is returned.
* @return string Returns the default language code if a language code is not configured.
*/
function current_language_code(bool $load_system_language = false): string
function current_language_code(): string
{
$employee = model(Employee::class);
$config = config(OSPOS::class)->settings;
$config = config(OSPOS::class);
if($employee->is_logged_in() && !$load_system_language)
{
$employee_info = $employee->get_logged_in_employee_info();
if(property_exists($employee_info, 'language_code') && !empty($employee_info->language_code))
{
return $employee_info->language_code;
}
}
$language_code = $config['language_code'];
$language_code = $config->settings['language_code'];
return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code;
}
/**
* @param bool $load_system_language
* @return string
*/
function current_language(bool $load_system_language = false): string
function current_language(): string
{
$employee = model(Employee::class);
$config = config(OSPOS::class)->settings;
$config = config(OSPOS::class);
// Returns the language of the employee if set or system language if not
if($employee->is_logged_in() && !$load_system_language)
{
$employee_info = $employee->get_logged_in_employee_info();
if(property_exists($employee_info, 'language') && !empty($employee_info->language))
{
return $employee_info->language;
}
}
$language = $config['language'];
$language = $config->settings['language'];
return empty($language) ? DEFAULT_LANGUAGE : $language;
}