diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-01 22:43:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-01 22:43:30 +0200 |
| commit | f471831916fc14afcce81fef70db2037717dccd8 (patch) | |
| tree | b209fea28220ec77746e454d056bb4eb641039bf /phpBB | |
| parent | 668f248c4d88b066a559e23d53d57e7170570c4c (diff) | |
| download | forums-f471831916fc14afcce81fef70db2037717dccd8.tar forums-f471831916fc14afcce81fef70db2037717dccd8.tar.gz forums-f471831916fc14afcce81fef70db2037717dccd8.tar.bz2 forums-f471831916fc14afcce81fef70db2037717dccd8.tar.xz forums-f471831916fc14afcce81fef70db2037717dccd8.zip | |
[ticket/12113] Correctly use plurals when deleting user warnings
PHPBB3-12113
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 16 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 5 |
2 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 1f61010d62..120a3529ee 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1253,17 +1253,13 @@ class acp_users WHERE user_id = $user_id"; $db->sql_query($sql); - switch ($log_warnings) + if ($log_warnings) { - case 2: - add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings); - break; - case 1: - add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']); - break; - default: - add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']); - break; + add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings); + } + else + { + add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']); } } } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index cf32c7c225..a99d0e7fed 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -775,7 +775,10 @@ $lang = array_merge($lang, array( 'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</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_WORD_ADD' => '<strong>Added word censor</strong><br />» %s', |