diff options
author | Cesar G <prototech91@gmail.com> | 2014-03-19 03:03:20 -0700 |
---|---|---|
committer | Cesar G <prototech91@gmail.com> | 2014-03-19 03:08:34 -0700 |
commit | 7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9 (patch) | |
tree | 41ce6806f6008eb6fa0ff4b2a5e5a0d5ca208e10 /phpBB/language | |
parent | 3da1f6d989357c9076ffde532cfbbd3d6375aa3c (diff) | |
download | forums-7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9.tar forums-7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9.tar.gz forums-7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9.tar.bz2 forums-7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9.tar.xz forums-7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9.zip |
[ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
PHPBB3-11959
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/common.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 757e421759..f073954817 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -683,11 +683,8 @@ $lang = array_merge($lang, array( 'START_WATCHING_TOPIC' => 'Subscribe topic', 'STOP_WATCHING_FORUM' => 'Unsubscribe forum', 'STOP_WATCHING_TOPIC' => 'Unsubscribe topic', - 'STRING_LIST' => array( - 1 => '%1$s', - 2 => '%1$s and %2$s', - // At 3 or more, %1$s returns comma separated items. So output would be: X, Y and Z - ), + 'STRING_LIST_MULTI' => '%1$s, and %2$s', + 'STRING_LIST_SIMPLE' => '%1$s and %2$s', 'SUBFORUM' => 'Subforum', 'SUBFORUMS' => 'Subforums', 'SUBJECT' => 'Subject', |