diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
| commit | 497d81af68b4e224ec5a7fe9429e391f8087aaef (patch) | |
| tree | 9d9ceb853515afff314e1e94b74cf4937567c87f /phpBB/language/en/acp | |
| parent | 90ebd49a2b64b731c037dceb5c85d3d81b152947 (diff) | |
| parent | 2fcfca73696bd7cc24dbadee147ee7a72526b3b7 (diff) | |
| download | forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.gz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.bz2 forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.xz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
[ticket/12113] Fix view_log() tests
[ticket/12113] Correctly use plurals when deleting user warnings
[ticket/12113] Allow log entries to use plurals
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 2dc58d8361..5794a7c833 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -776,7 +776,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', |