mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Add language in cache as well.
This commit is contained in:
parent
6e4991a34b
commit
0715b7406e
@ -91,13 +91,14 @@ class Help implements HelpInterface
|
||||
/**
|
||||
*
|
||||
* @param string $route
|
||||
* @param string $language
|
||||
* @param array $content
|
||||
*
|
||||
* @internal param $title
|
||||
*/
|
||||
public function putInCache(string $route, array $content)
|
||||
public function putInCache(string $route, string $language, array $content)
|
||||
{
|
||||
Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
|
||||
Cache::put('help.' . $route . '.title', $content['title'], 10080);
|
||||
Cache::put('help.' . $route . '.text.' . $language, $content['text'], 10080); // a week.
|
||||
Cache::put('help.' . $route . '.title.' . $language, $content['title'], 10080);
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +41,8 @@ interface HelpInterface
|
||||
|
||||
/**
|
||||
* @param string $route
|
||||
* @param string $language
|
||||
* @param array $content
|
||||
*/
|
||||
public function putInCache(string $route, array $content);
|
||||
public function putInCache(string $route, string $language, array $content);
|
||||
}
|
||||
|
@ -28,7 +28,8 @@ class HelpController extends Controller
|
||||
*/
|
||||
public function show(HelpInterface $help, string $route)
|
||||
{
|
||||
$content = [
|
||||
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
|
||||
$content = [
|
||||
'text' => '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>',
|
||||
'title' => 'Help',
|
||||
];
|
||||
@ -41,17 +42,17 @@ class HelpController extends Controller
|
||||
|
||||
if ($help->inCache($route)) {
|
||||
$content = [
|
||||
'text' => $help->getFromCache('help.' . $route . '.text'),
|
||||
'title' => $help->getFromCache('help.' . $route . '.title'),
|
||||
'text' => $help->getFromCache('help.' . $route . '.text.' . $language),
|
||||
'title' => $help->getFromCache('help.' . $route . '.title.' . $language),
|
||||
];
|
||||
|
||||
return Response::json($content);
|
||||
}
|
||||
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
|
||||
|
||||
Log::debug('Will get help from Github for language "' . $language . '" and route "' . $route . '".');
|
||||
$content = $help->getFromGithub($language, $route);
|
||||
|
||||
$help->putInCache($route, $content);
|
||||
$help->putInCache($route, $language, $content);
|
||||
|
||||
return Response::json($content);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user