prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log json decoding errors in translation loading

Browse source
This commit is contained in:
maxpozdeev 2022-11-14 19:51:39 +03:00
parent c833fe4828
commit 59d69c2708
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/includes/class.lang.php
View file

@ -61,6 +61,7 @@ class Lang
$this->code = $code;
$json = json_decode($jsonString, true);
if ($json === null) {
error_log("Failed to decode translation JSON, language '$code': ". json_last_error_msg());
$json = array();
}
@ -82,7 +83,7 @@ class Lang
$defStr = file_get_contents($this->langDir(). "{$this->default}.json");
$this->strings = json_decode($defStr, true);
if ($this->strings === null) {
die("Invalid JSON in default language file (". htmlspecialchars($this->default). ".json)");
die("Invalid JSON in default language file (". htmlspecialchars($this->default). ".json): ". json_last_error_msg());
}
}
@ -177,10 +178,18 @@ class Lang
return null;
}
$langStr = file_get_contents($langDir. $this->code. '.json');
$lang = json_decode($langStr, true) ?? [];
$lang = json_decode($langStr, true);
if ($lang === null) {
error_log("Failed to decode translation JSON of extension '$ext', language '{$this->code}': ". json_last_error_msg());
$lang = [];
}
}
$defStr = file_get_contents($langDir. 'en.json');
$def = json_decode($defStr, true) ?? [];
$def = json_decode($defStr, true);
if ($def === null) {
error_log("Failed to decode translation JSON of extension '$ext', language 'en': ". json_last_error_msg());
$def = [];
}
$lang = array_replace($def, $lang);
return $lang;
}