maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

make language strings the language the user uses

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-15 13:03:30 +01:00
parent 0fc2fbaf09
commit df5fb963c1
2 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/classes/api/abstract.ApiCommand.php
View File

@@ -13,6 +13,8 @@ abstract class ApiCommand
public function __construct($header = null, $params = null, $userinfo = null) public function __construct($header = null, $params = null, $userinfo = null)
{ {
global $lng;
$this->cmd_params = $params; $this->cmd_params = $params;
if (! empty($header)) { if (! empty($header)) {
$this->readUserData($header); $this->readUserData($header);
@@ -23,6 +25,41 @@ abstract class ApiCommand
throw new Exception("Invalid user data", 500); throw new Exception("Invalid user data", 500);
} }
$this->logger = FroxlorLogger::getInstanceOf($this->user_data); $this->logger = FroxlorLogger::getInstanceOf($this->user_data);
// query the whole table
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_LANGUAGE . "`");
$langs = array();
// presort languages
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
$langs[$row['language']][] = $row;
}
// set default language before anything else to
// ensure that we can display messages
$language = Settings::Get('panel.standardlanguage');
if (isset($this->user_data['language']) && isset($languages[$this->user_data['language']])) {
// default: use language from session, #277
$language = $this->user_data['language'];
} elseif (isset($this->user_data['def_language'])) {
$language = $this->user_data['def_language'];
}
// include every english language file we can get
foreach ($langs['English'] as $key => $value) {
include_once makeSecurePath($value['file']);
}
// now include the selected language if its not english
if ($language != 'English') {
foreach ($langs[$language] as $key => $value) {
include_once makeSecurePath($value['file']);
}
}
// last but not least include language references file
include_once makeSecurePath(FROXLOR_INSTALL_DIR . '/lng/lng_references.php');
} }
public static function getLocal($userinfo = null, $params = null) public static function getLocal($userinfo = null, $params = null)

35
lib/classes/api/api_includes.inc.php
View File

@@ -5,37 +5,4 @@ if (! defined('FROXLOR_INSTALL_DIR')) {
require_once FROXLOR_INSTALL_DIR . '/lib/functions.php'; require_once FROXLOR_INSTALL_DIR . '/lib/functions.php';
} }
// query the whole table $lng = array();
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_LANGUAGE . "`");
$langs = array();
// presort languages
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
$langs[$row['language']][] = $row;
// check for row[iso] cause older froxlor
// versions didn't have that and it will
// lead to a lot of undfined variables
// before the admin can even update
if (isset($row['iso'])) {
$iso[$row['iso']] = $row['language'];
}
}
// set default language before anything else to
// ensure that we can display messages
$language = Settings::Get('panel.standardlanguage');
// include every english language file we can get
foreach ($langs['English'] as $key => $value) {
include_once makeSecurePath($value['file']);
}
// now include the selected language if its not english
if ($language != 'English') {
foreach ($langs[$language] as $key => $value) {
include_once makeSecurePath($value['file']);
}
}
// last but not least include language references file
include_once makeSecurePath('lng/lng_references.php');