vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work on lang #332

Browse Source
This commit is contained in:
Jokob-sk
2023-08-10 07:13:04 +10:00
parent a0d02b2aa5
commit 320660945c
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
front/js/pialert_common.js
View File

@@ -193,6 +193,11 @@ function getString (key) {
}
result = getCache(`pia_lang_${key}_${lang_code}`, true);
if(isEmpty(result))
{
result = getCache(`pia_lang_${key}_en_us`, true);
}
return result;
}
@@ -476,6 +481,12 @@ function navigateToDeviceWithIp (ip) {
});
}
// -----------------------------------------------------------------------------
function isEmpty(value)
{
return emptyArr.includes(value)
}
// initialize
cacheSettings()
cacheStrings()

15
front/php/templates/language/lang.php
View File

@@ -73,9 +73,20 @@ function lang($key)
// Merge JSON data with SQL data
$mergedLanguageData = mergeLanguageData($languageData, $sqlLanguageData);
$result = $mergedLanguageData[$pia_lang_selected][$key] ?? "String Not found for key ".$key;
// Check if the key exists in the selected language
if (isset($mergedLanguageData[$pia_lang_selected][$key])) {
$result = $mergedLanguageData[$pia_lang_selected][$key];
} else {
// If key not found in selected language, use "en_us" as fallback
if (isset($mergedLanguageData['en_us'][$key])) {
$result = $mergedLanguageData['en_us'][$key];
} else {
// If key not found in "en_us" either, use a default string
$result = "String Not found for key " . $key;
}
}
return $result;
};
}