makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/bantu/8802' into develop-olympus

Browse source 
* ticket/bantu/8802:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
This commit is contained in:
Oleg Pudeyev 2011-03-12 23:32:43 -05:00
commit 4d231112b6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/language/en/common.php
View file

@ -190,7 +190,7 @@ $lang = array_merge($lang, array(
'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.', 'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.',
'FORUM' => 'Forum', 'FORUM' => 'Forum',
'FORUMS' => 'Forums', 'FORUMS' => 'Forums',
'FORUMS_MARKED' => 'All forums have been marked read.', 'FORUMS_MARKED' => 'The selected forums have been marked read.',
'FORUM_CAT' => 'Forum category', 'FORUM_CAT' => 'Forum category',
'FORUM_INDEX' => 'Board index', 'FORUM_INDEX' => 'Board index',
'FORUM_LINK' => 'Forum link', 'FORUM_LINK' => 'Forum link',
@ -322,6 +322,7 @@ $lang = array_merge($lang, array(
'MARK' => 'Mark', 'MARK' => 'Mark',
'MARK_ALL' => 'Mark all', 'MARK_ALL' => 'Mark all',
'MARK_FORUMS_READ' => 'Mark forums read', 'MARK_FORUMS_READ' => 'Mark forums read',
'MARK_SUBFORUMS_READ' => 'Mark subforums read',
'MB' => 'MB', 'MB' => 'MB',
'MIB' => 'MiB', 'MIB' => 'MiB',
'MCP' => 'Moderator Control Panel', 'MCP' => 'Moderator Control Panel',

2
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -28,7 +28,7 @@
<!-- IF S_HAS_SUBFORUM --> <!-- IF S_HAS_SUBFORUM -->
<!-- IF not S_IS_BOT and U_MARK_FORUMS --> <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
<ul class="linklist"> <ul class="linklist">
<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li> <li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
</ul> </ul>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE forumlist_body.html --> <!-- INCLUDE forumlist_body.html -->