diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-02-28 22:27:16 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-02-28 22:27:16 +0100 |
| commit | 5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28 (patch) | |
| tree | 22d0489be9a0d18b3214f8b79e8bac658d37fc64 | |
| parent | 50d234b9af81dadfe64efb826b34c5c7dd45b4f2 (diff) | |
| parent | 5924bc1d027b427e4bc5df78bbac617e006d3633 (diff) | |
| download | forums-5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28.tar forums-5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28.tar.gz forums-5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28.tar.bz2 forums-5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28.tar.xz forums-5ee1bcd2e4d86b1b38947b25237a2abdf5c81d28.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10672' into develop
* nickvergessen/ticket/10672:
[ticket/10672] Fix total post count language string in statistics and feed
| -rw-r--r-- | phpBB/feed.php | 2 | ||||
| -rw-r--r-- | phpBB/index.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 00247c1958..fcf42a83ae 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -1106,7 +1106,7 @@ class phpbb_feed_forums extends phpbb_feed_base global $user; $item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics']) - . ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_OTHER', (int) $row['forum_posts']); + . ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']); } } } diff --git a/phpBB/index.php b/phpBB/index.php index 5f2254ac7f..f1243bb336 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -114,7 +114,7 @@ if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets(' // Assign index specific vars $template->assign_vars(array( - 'TOTAL_POSTS' => $user->lang('TOTAL_POSTS', (int) $config['num_posts']), + 'TOTAL_POSTS' => $user->lang('TOTAL_POSTS_COUNT', (int) $config['num_posts']), 'TOTAL_TOPICS' => $user->lang('TOTAL_TOPICS', (int) $config['num_topics']), 'TOTAL_USERS' => $user->lang('TOTAL_USERS', (int) $config['num_users']), 'NEWEST_USER' => $user->lang('NEWEST_USER', get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), |