diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-03 15:39:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-03 15:39:06 -0500 |
| commit | 6027541dc7c8164db2391564f1c71146ada6c813 (patch) | |
| tree | 028886e686d4bebfd3292c7232b462f81ca971a7 /phpBB/feed.php | |
| parent | 5e225d5d7ab3890a6a06791742d1b2d97d9f40e1 (diff) | |
| parent | c1311faebf01db1cd0f27420af31c326b0270d37 (diff) | |
| download | forums-6027541dc7c8164db2391564f1c71146ada6c813.tar forums-6027541dc7c8164db2391564f1c71146ada6c813.tar.gz forums-6027541dc7c8164db2391564f1c71146ada6c813.tar.bz2 forums-6027541dc7c8164db2391564f1c71146ada6c813.tar.xz forums-6027541dc7c8164db2391564f1c71146ada6c813.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop
* nickvergessen/ticket/develop/10345: (21 commits)
[ticket/10345] Check directly whether the key to use exists
[ticket/10345] Return the language key when the key has an empty array
[ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
[ticket/10345] Remove doubled check for valid plural rule
[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
[ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
[ticket/10345] Fix parsing error in language/en/viewtopic.php
[ticket/10345] Move rule determination code into a new function
[ticket/10345] Fix little type in unit test
[ticket/10345] Remove more useless 0-cases
[ticket/10345] Make the use of the 0-case optional
[ticket/10345] Remove some unused 0 cases
[ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
[ticket/10345] Add tests for array() as first parameter on call to $user->lang()
[ticket/10345] Fix some documentation issues.
[ticket/10345] Allow float as array key and add some tests
[ticket/10345] Use the plural function in some more places.
[ticket/10345] Make use of the plural function in some basic places
[ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
[ticket/10345] Fix documentation on the new function and the switch
...
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index b8c0c370f9..e490363594 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -1106,8 +1106,8 @@ class phpbb_feed_forums extends phpbb_feed_base { global $user; - $item_row['statistics'] = sprintf($user->lang['TOTAL_TOPICS_OTHER'], $row['forum_topics']) - . ' ' . $this->separator_stats . ' ' . sprintf($user->lang['TOTAL_POSTS_OTHER'], $row['forum_posts']); + $item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics']) + . ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_OTHER', (int) $row['forum_posts']); } } } |