makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2025-06-15 09:10:57 +02:00
commit d017eff8f1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/installer_header.html
View file

@ -20,7 +20,7 @@
<form method="post" action="#" id="language_selector"> <form method="post" action="#" id="language_selector">
<fieldset class="nobg"> <fieldset class="nobg">
<label for="language">{L_SELECT_LANG}{L_COLON}</label> <label for="language">{L_SELECT_LANG}{L_COLON}</label>
<select id="language" name="language"> <select id="language" name="language">
<!-- BEGIN language_select_item --> <!-- BEGIN language_select_item -->
<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option> <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
<!-- END language_select_item --> <!-- END language_select_item -->

8
phpBB/phpbb/install/controller/helper.php
View file

@ -339,6 +339,14 @@ class helper
protected function render_language_select($selected_language = null) protected function render_language_select($selected_language = null)
{ {
$langs = $this->lang_helper->get_available_languages(); $langs = $this->lang_helper->get_available_languages();
// The first language will be selected by default. Unless a user has consciously included
// other languages in the installation process, it will be British English anyway.
if ($selected_language === null && count($langs))
{
$selected_language = $langs[0]['iso'];
}
foreach ($langs as $lang) foreach ($langs as $lang)
{ {
$this->template->assign_block_vars('language_select_item', array( $this->template->assign_block_vars('language_select_item', array(

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

@ -65,6 +65,8 @@ class language_file_helper
$available_languages[] = $this->get_language_data_from_json($data); $available_languages[] = $this->get_language_data_from_json($data);
} }
usort($available_languages, [$this, 'sort_by_local_name']);
return $available_languages; return $available_languages;
} }
@ -123,4 +125,14 @@ class language_file_helper
'turnstile_lang' => $data['extra']['turnstile-lang'] ?? '', 'turnstile_lang' => $data['extra']['turnstile-lang'] ?? '',
]; ];
} }
/**
* Sorts the languages by their name instead of iso code
*
* @return array
*/
private static function sort_by_local_name($a, $b)
{
return $a['local_name'] > $b['local_name'];
}
} }