github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated

Browse source
This commit is contained in:
Roman Kelesidis 2025-08-21 10:23:43 +03:00
commit 4357df8a98
No known key found for this signature in database
GPG key ID: D8157C4D4C4C6DB4
2 changed files with 91 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
library/config.php
View file

@ -75,6 +75,7 @@ $bb_cfg['cache'] = [
'bb_login_err' => ['filecache'], 'bb_login_err' => ['filecache'],
'bb_poll_data' => ['filecache'], 'bb_poll_data' => ['filecache'],
'bb_ip2countries' => ['filecache'], 'bb_ip2countries' => ['filecache'],
'bb_lang' => ['filecache'],
], ],
]; ];

90
src/Legacy/Common/User.php
View file

@ -622,17 +622,52 @@ class User
define('LANG_DIR', DEFAULT_LANG_DIR); define('LANG_DIR', DEFAULT_LANG_DIR);
} }
/** Temporary place source language to the global */ $langKey = $this->data['user_lang'];
$cacheKey = "merged_lang_{$langKey}";
if ($cachedLang = CACHE('bb_lang')->get($cacheKey)) {
global $lang;
$lang = $cachedLang['merged'];
$source_lang = $cachedLang['source'];
} else {
$sourceCacheKey = 'source_lang';
if (!$source_lang = CACHE('bb_lang')->get($sourceCacheKey)) {
$lang = []; $lang = [];
require(SOURCE_LANG_DIR . 'main.php'); require(SOURCE_LANG_DIR . 'main.php');
$source_lang = $lang; $source_lang = $lang;
unset($lang); unset($lang);
/** Place user language to the global */ CACHE('bb_lang')->set($sourceCacheKey, $source_lang, 86400);
global $lang; }
$userLangCacheKey = "user_lang_{$langKey}";
$userLang = CACHE('bb_lang')->get($userLangCacheKey);
if (!$userLang = CACHE('bb_lang')->get($userLangCacheKey)) {
$lang = [];
require(LANG_DIR . 'main.php'); require(LANG_DIR . 'main.php');
setlocale(LC_ALL, $bb_cfg['lang'][$this->data['user_lang']]['locale'] ?? 'en_US.UTF-8'); $userLang = $lang;
$lang = array_deep_merge($source_lang, $lang); unset($lang);
CACHE('bb_lang')->set($userLangCacheKey, $userLang, 86400);
}
global $lang;
$lang = $this->arrayMergeLangs($source_lang, $userLang);
CACHE('bb_lang')->set($cacheKey, [
'merged' => $lang,
'source' => $source_lang
], 86400);
}
static $currentLocale = null;
$newLocale = $bb_cfg['lang'][$this->data['user_lang']]['locale'] ?? 'en_US.UTF-8';
if ($currentLocale !== $newLocale) {
setlocale(LC_ALL, $newLocale);
$currentLocale = $newLocale;
}
$theme = setup_style(); $theme = setup_style();
$DeltaTime = new DateDelta(); $DeltaTime = new DateDelta();
@ -645,6 +680,51 @@ class User
$this->load_opt_js(); $this->load_opt_js();
} }
public function arrayMergeLangs($base, $overlay, $cacheKey = null)
{
if ($cacheKey && function_exists('CACHE')) {
if ($cached = CACHE('bb_lang')->get($cacheKey)) {
return $cached;
}
}
if (count($overlay) <= 10) {
$result = array_replace_recursive($base, $overlay);
} else {
$result = array_deep_merge($base, $overlay);
}
if ($cacheKey && function_exists('CACHE')) {
CACHE('bb_lang')->set($cacheKey, $result, 3600);
}
return $result;
}
public function clearLanguageCache($langKey = null): void
{
if ($langKey) {
CACHE('bb_lang')->rm("merged_lang_{$langKey}");
CACHE('bb_lang')->rm("user_lang_{$langKey}");
} else {
CACHE('bb_lang')->rm('source_lang');
}
}
public function clearAllLanguageCache(): void
{
global $bb_cfg;
CACHE('bb_lang')->rm('source_lang');
if (isset($bb_cfg['lang']) && is_array($bb_cfg['lang'])) {
foreach (array_keys($bb_cfg['lang']) as $lang) {
CACHE('bb_lang')->rm("merged_lang_{$lang}");
CACHE('bb_lang')->rm("user_lang_{$lang}");
}
}
}
/** /**
* Mark read * Mark read
* *