aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-25 14:16:53 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-25 14:16:53 +0200
commit5265091c83d4fc2228e1840c47e727c11d59de3c (patch)
tree82791a8ceaf1b5d96ced910c7c9ed87a6667ac6e
parentd083f292445503a13fa9e9a0f1e86eee05358c18 (diff)
parente42b316d87dcd6dade0147cd6308af5b4a5bf305 (diff)
downloadforums-5265091c83d4fc2228e1840c47e727c11d59de3c.tar
forums-5265091c83d4fc2228e1840c47e727c11d59de3c.tar.gz
forums-5265091c83d4fc2228e1840c47e727c11d59de3c.tar.bz2
forums-5265091c83d4fc2228e1840c47e727c11d59de3c.tar.xz
forums-5265091c83d4fc2228e1840c47e727c11d59de3c.zip
Merge pull request #2649 from VSEphpbb/ticket/12760
[ticket/12760] Fix wording for unapproved posts icon... * VSEphpbb/ticket/12760: [ticket/12760] Fix wording for unapproved posts icon...
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/language/en/common.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 5836d8816d..68b1356297 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -622,7 +622,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],
'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPICS_UNAPPROVED'),
- 'UNAPPROVED_POST_IMG' => $user->img('icon_topic_unapproved', 'POSTS_UNAPPROVED'),
+ 'UNAPPROVED_POST_IMG' => $user->img('icon_topic_unapproved', 'POSTS_UNAPPROVED_FORUM'),
));
if ($return_moderators)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b9eb0fd11d..61baef663b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -564,6 +564,7 @@ $lang = array_merge($lang, array(
'POSTED_ON_DATE' => 'on',
'POSTS' => 'Posts',
'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved.',
+ 'POSTS_UNAPPROVED_FORUM'=> 'At least one post in this forum has not been approved.',
'POST_BY_AUTHOR' => 'by',
'POST_BY_FOE' => '<strong>%1$s</strong>, who is currently on your ignore list, made this post.',
'POST_DISPLAY' => '%1$sDisplay this post%2$s.',