makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 10:48:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
This commit is contained in:
Nils Adermann 2014-04-10 14:22:43 -07:00
commit ca56801c35
5 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/acp/acp_users.php
View file

@ -1253,17 +1253,13 @@ class acp_users
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$db->sql_query($sql); $db->sql_query($sql);
switch ($log_warnings) if ($log_warnings)
{ {
case 2: add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings);
add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings); }
break; else
case 1: {
add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']); add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
break;
default:
add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
break;
} }
} }
} }

5
phpBB/language/en/acp/common.php
View file

@ -776,7 +776,10 @@ $lang = array_merge($lang, array(
'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</strong><br />» %s', 'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</strong><br />» %s',
'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s', 'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
'LOG_WARNINGS_DELETED' => '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username' 'LOG_WARNINGS_DELETED' => array(
1 => '<strong>Deleted user warning</strong><br />» %1$s',
2 => '<strong>Deleted %2$d user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
),
'LOG_WARNINGS_DELETED_ALL' => '<strong>Deleted all user warnings</strong><br />» %s', 'LOG_WARNINGS_DELETED_ALL' => '<strong>Deleted all user warnings</strong><br />» %s',
'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s', 'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s',

22
phpBB/phpbb/log/log.php
View file

@ -490,7 +490,7 @@ class log implements \phpbb\log\log_interface
'topic_id' => (int) $row['topic_id'], 'topic_id' => (int) $row['topic_id'],
'viewforum' => ($row['forum_id'] && $this->auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}", 'f=' . $row['forum_id']) : false, 'viewforum' => ($row['forum_id'] && $this->auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}", 'f=' . $row['forum_id']) : false,
'action' => (isset($this->user->lang[$row['log_operation']])) ? $this->user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}', 'action' => (isset($this->user->lang[$row['log_operation']])) ? $row['log_operation'] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
); );
/** /**
@ -517,12 +517,26 @@ class log implements \phpbb\log\log_interface
// arguments, if there are we fill out the arguments // arguments, if there are we fill out the arguments
// array. It doesn't matter if we add more arguments than // array. It doesn't matter if we add more arguments than
// placeholders. // placeholders.
if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0) $num_args = 0;
if (!is_array($this->user->lang[$row['log_operation']]))
{ {
$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), '')); $num_args = substr_count($log[$i]['action'], '%');
}
else
{
foreach ($this->user->lang[$row['log_operation']] as $case => $plural_string)
{
$num_args = max($num_args, substr_count($plural_string, '%'));
}
} }
$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary); if (($num_args - sizeof($log_data_ary)) > 0)
{
$log_data_ary = array_merge($log_data_ary, array_fill(0, $num_args - sizeof($log_data_ary), ''));
}
$lang_arguments = array_merge(array($log[$i]['action']), $log_data_ary);
$log[$i]['action'] = call_user_func_array(array($this->user, 'lang'), $lang_arguments);
// If within the admin panel we do not censor text out // If within the admin panel we do not censor text out
if ($this->get_is_admin()) if ($this->get_is_admin())

2
tests/log/function_view_log_test.php
View file

@ -44,7 +44,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
'topic_id' => 0, 'topic_id' => 0,
'viewforum' => '', 'viewforum' => '',
'action' => 'installed: 3.1.0-dev', 'action' => 'LOG_INSTALL_INSTALLED 3.1.0-dev',
), ),
2 => array( 2 => array(
'id' => 2, 'id' => 2,

5
tests/mock/user.php
View file

@ -46,4 +46,9 @@ class phpbb_mock_user
} }
return false; return false;
} }
public function lang()
{
return implode(' ', func_get_args());
}
} }