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

[feature/avatars] Add function for localizing errors

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2013-01-06 21:09:07 +01:00
parent 111e02395c
commit 41710c745d
5 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/acp/acp_groups.php
View File

@@ -550,22 +550,8 @@ class acp_groups
$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
/*
* Merge any avatar errors into the primary error array
* Drivers use language constants, so we need to map to the actual strings
*/
foreach ($avatar_error as $lang)
{
if (is_array($lang))
{
$key = array_shift($lang);
$error[] = vsprintf($user->lang($key), $lang);
}
else
{
$error[] = $user->lang("$lang");
}
}
// Merge any avatar errors into the primary error array
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
$back_link = request_var('back_link', '');

13
phpBB/includes/acp/acp_users.php
View File

@@ -1831,18 +1831,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
foreach ($error as $key => $lang)
{
if (is_array($lang))
{
$lang_key = array_shift($lang);
$error[$key] = vsprintf($user->lang($lang_key), $lang);
}
else
{
$error[$key] = $user->lang($lang);
}
}
$error = $phpbb_avatar_manager->localize_errors($user, $error);
$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);