mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/rxu/9867' into develop

Browse Source 
* ticket/rxu/9867:
  [ticket/9867] Adjust the implementation of error messages localization.
This commit is contained in:
Andreas Fischer 2010-10-30 12:43:08 +02:00
commit 36820a4f4f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,7 +921,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
if ($user_id == $user->data['user_id'])
@ -1405,7 +1405,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>';
@ -1588,7 +1588,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$dateformat_options = '';
@ -1714,7 +1714,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
if (!$config['allow_avatar'] && $user_row['user_avatar_type'])
@ -1857,7 +1857,7 @@ class acp_users
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$signature_preview = '';

4
phpBB/includes/ucp/ucp_prefs.php
View File

@ -105,7 +105,7 @@ class ucp_prefs
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$dateformat_options = '';
@ -227,7 +227,7 @@ class ucp_prefs
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);

8
phpBB/includes/ucp/ucp_profile.php
View File

@ -239,7 +239,7 @@ class ucp_profile
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$template->assign_vars(array(
@ -386,7 +386,7 @@ class ucp_profile
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
if ($config['allow_birthdays'])
@ -511,7 +511,7 @@ class ucp_profile
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
$signature_preview = '';
@ -582,7 +582,7 @@ class ucp_profile
$error[] = 'FORM_INVALID';
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
}
if (!$config['allow_avatar'] && $user->data['user_avatar_type'])

2
phpBB/includes/ucp/ucp_register.php
View File

@ -220,7 +220,7 @@ class ucp_register
}
// Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
$error = array_map(array($user, 'lang'), $error);
if ($config['enable_confirm'])
{