makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 10:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17191] Add language helper function to get composer.json content

Browse source 
PHPBB3-17191
This commit is contained in:
Christian Schnegelberger 2023-09-21 16:32:59 +02:00 • committed by Marc Alexander
parent 1cc6a479a1
commit 06f38a5646
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/functions.php
View file

@ -3826,8 +3826,11 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
// Send a proper content-language to the output // Send a proper content-language to the output
$language_file_helper = $phpbb_container->get('language.helper.language_file'); $language_file_helper = $phpbb_container->get('language.helper.language_file');
$available_languages = $language_file_helper->get_available_languages(); // Grab the users lang direction and store it for later use
$user_lang = $available_languages[0]['user_lang']; $direction = $language_file_helper->get_lang_key_value('direction');
// Get the user_lang string
$user_lang = $language_file_helper->get_lang_key_value('user_lang');
if (strpos($user_lang, '-x-') !== false) if (strpos($user_lang, '-x-') !== false)
{ {
$user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-'));
@ -3883,10 +3886,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
$s_login_redirect = build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url()))); $s_login_redirect = build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url())));
// Grab the users lang direction and store it for later use
$available_languages = $language_file_helper->get_available_languages();
$direction = $available_languages[0]['direction'];
// Add form token for login box, in case page is presenting a login form. // Add form token for login box, in case page is presenting a login form.
add_form_key('login', '_LOGIN'); add_form_key('login', '_LOGIN');

12
phpBB/phpbb/language/language_file_helper.php
View file

@ -67,6 +67,18 @@ class language_file_helper
return $available_languages; return $available_languages;
} }
/**
* Return by given lang key its composer.json value
*
* @return string
*
*/
public function get_lang_key_value($lang_key) : string
{
$available_languages = $this->get_available_languages();
return $available_languages[0][$lang_key];
}
/** /**
* Collect some data from the composer.json file * Collect some data from the composer.json file
* *