makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12113] Correctly use plurals when deleting user warnings

Browse source 
PHPBB3-12113
This commit is contained in:
Joas Schilling 2014-04-01 22:43:30 +02:00
parent 668f248c4d
commit f471831916
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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; }
case 1: else
add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']); {
break;
default:
add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']); add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
break;
} }
} }
} }

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

@ -775,7 +775,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',