mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/10824] Make languages use composer.json

Browse Source 
PHPBB3-10824
This commit is contained in:
Joas Schilling
2015-09-05 19:20:15 +02:00
committed by Marc Alexander
parent a200446646
commit 8244aff9cb
4 changed files with 88 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/includes/acp/acp_language.php
View File

@@ -265,20 +265,21 @@ class acp_language
$lang_iso = $request->variable('iso', '');
$lang_iso = basename($lang_iso);
if (!$lang_iso || !file_exists("{$phpbb_root_path}language/$lang_iso/iso.txt"))
if (!$lang_iso || !file_exists("{$phpbb_root_path}language/$lang_iso/composer.json"))
{
trigger_error($user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
}
$file = file("{$phpbb_root_path}language/$lang_iso/iso.txt");
$lang_pack = array(
'iso' => $lang_iso,
'name' => trim(htmlspecialchars($file[0], ENT_COMPAT)),
'local_name'=> trim(htmlspecialchars($file[1], ENT_COMPAT, 'UTF-8')),
'author' => trim(htmlspecialchars($file[2], ENT_COMPAT, 'UTF-8'))
);
unset($file);
/** @var \phpbb\language\language_file_helper $language_helper */
$language_helper = $phpbb_container->get('language.helper.language_file');
try
{
$lang_pack = $language_helper->get_language_data_from_composer_file("{$phpbb_root_path}language/$lang_iso/composer.json");
}
catch (\DomainException $e)
{
trigger_error($user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
}
$sql = 'SELECT lang_iso
FROM ' . LANG_TABLE . "