From 84e62b52935a8e149e025bba9fefb62a1264c6d3 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 15 Nov 2021 22:08:51 +0000 Subject: [PATCH 1/3] Issue 10983: Use the user's settings for the help language --- src/Module/Help.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Module/Help.php b/src/Module/Help.php index 219adc797..f85fd10a7 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -39,10 +39,10 @@ class Help extends BaseModule $text = ''; $filename = ''; - $a = DI::app(); $config = DI::config(); - $lang = $config->get('system', 'language'); - + $lang = DI::session()->get('language'); + $lang = $lang ?? $config->get('system', 'language'); + // @TODO: Replace with parameter from router if (DI::args()->getArgc() > 1) { $path = ''; From ba031e4534795ffb13ccaf15869b3f41ae65669e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 16 Nov 2021 07:36:20 +0100 Subject: [PATCH 2/3] Update src/Module/Help.php Co-authored-by: Hypolite Petovan --- src/Module/Help.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Module/Help.php b/src/Module/Help.php index f85fd10a7..05cce5cc5 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -40,8 +40,7 @@ class Help extends BaseModule $filename = ''; $config = DI::config(); - $lang = DI::session()->get('language'); - $lang = $lang ?? $config->get('system', 'language'); + $lang = DI::session()->get('language', $config->get('system', 'language')); // @TODO: Replace with parameter from router if (DI::args()->getArgc() > 1) { From 59787d718d8736fa80b07b2f018d377382616962 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 16 Nov 2021 07:04:39 +0000 Subject: [PATCH 3/3] Remove spaces --- src/Module/Help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Help.php b/src/Module/Help.php index 05cce5cc5..7e84af1d6 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -41,7 +41,7 @@ class Help extends BaseModule $config = DI::config(); $lang = DI::session()->get('language', $config->get('system', 'language')); - + // @TODO: Replace with parameter from router if (DI::args()->getArgc() > 1) { $path = '';