mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/11150] Better pre/post action handling, restore ext.json in case of err

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2015-09-14 16:20:33 +02:00
committed by Tristan Darricau
parent 51916def9c
commit d6618397bf
5 changed files with 243 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
phpBB/phpbb/composer/io/translate_composer_trait.php
View File

@@ -38,9 +38,21 @@ trait translate_composer_trait
foreach ($messages as $message)
{
$lang_key = $message;
$parameters = [];
$level = 0;
if (is_array($message))
{
$lang_key = $message[0];
$parameters = $message[1];
if (count($message) > 2)
{
$level = $message[2];
}
}
else
{
$lang_key = $message;
$parameters = [];
}
$message = trim($this->strip_format($message), "\n\r");
@@ -50,10 +62,6 @@ trait translate_composer_trait
$lang_key = 'COMPOSER_DELETING';
$parameters = [$elements[1]];
}
else
{
dump('WRITE | ' . $message);
}
//$translated_message = $this->language->lang_array($lang_key, $parameters);
$translated_message = call_user_func_array([$this->language, 'lang'], array_merge((array)$lang_key, $parameters));
@@ -90,9 +98,21 @@ trait translate_composer_trait
foreach ($messages as $message)
{
$lang_key = $message;
$parameters = [];
$level = 0;
if (is_array($message))
{
$lang_key = $message[0];
$parameters = $message[1];
if (count($message) > 2)
{
$level = $message[2];
}
}
else
{
$lang_key = $message;
$parameters = [];
}
$message = trim($this->strip_format($message), "\n\r");
@@ -165,13 +185,8 @@ trait translate_composer_trait
{
continue;
}
else
{
dump('WRITE ERROR | ' . $message);
}
//$translated_message = $this->language->lang_array($lang_key, $parameters);
$translated_message = call_user_func_array([$this->language, 'lang'], array_merge((array)$lang_key, $parameters));
$translated_message = $this->language->lang_array($lang_key, $parameters);
switch ($level)
{