aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorRahul R <rahulr92@gmail.com>2012-04-06 01:07:23 +0530
committerRahul R <rahulr92@gmail.com>2012-04-08 10:34:44 +0530
commitc524236ef6d84f6ef78f684aeb7bb469ca844db4 (patch)
tree8535fbc94dbd87e8492be685da808cd1ee46da81 /phpBB/language/en/acp
parent2a8481d68188480061e9769711195091f05f7134 (diff)
downloadforums-c524236ef6d84f6ef78f684aeb7bb469ca844db4.tar
forums-c524236ef6d84f6ef78f684aeb7bb469ca844db4.tar.gz
forums-c524236ef6d84f6ef78f684aeb7bb469ca844db4.tar.bz2
forums-c524236ef6d84f6ef78f684aeb7bb469ca844db4.tar.xz
forums-c524236ef6d84f6ef78f684aeb7bb469ca844db4.zip
[ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from per forum to global. Modified associated database entries. New option is available in ACP General->Board Features. Also corrected <br /> in forumlist_body.html. PHPBB3-10650
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/acp/forums.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0bb99b5449..187d823fd0 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -44,6 +44,8 @@ $lang = array_merge($lang, array(
'DEFAULT_STYLE' => 'Default style',
'DISABLE_BOARD' => 'Disable board',
'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
+ 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list',
+ 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and ones in which user doesnt have read access are not shown.',
'OVERRIDE_STYLE' => 'Override user style',
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.',
'SITE_DESC' => 'Site description',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 9141abc8eb..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,6 @@ $lang = array_merge($lang, array(
'DELETE_ALL_POSTS' => 'Delete posts',
'DELETE_SUBFORUMS' => 'Delete subforums and posts',
'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics',
- 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list',
- 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.',
'EDIT_FORUM' => 'Edit forum',