aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-11-16 17:39:33 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-11-16 17:39:33 +0000
commit4f310f8777338db610968099367768d3518e551b (patch)
treec817b0068e86e63c50625c5126a1f594f6bb2aaa
parentd895171404491f480638a9ffc567b32d2d651e0c (diff)
downloadforums-4f310f8777338db610968099367768d3518e551b.tar
forums-4f310f8777338db610968099367768d3518e551b.tar.gz
forums-4f310f8777338db610968099367768d3518e551b.tar.bz2
forums-4f310f8777338db610968099367768d3518e551b.tar.xz
forums-4f310f8777338db610968099367768d3518e551b.zip
Mainly language updates but some bug fixes too
git-svn-id: file:///svn/phpbb/trunk@1334 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/language/lang_english/lang_main.php1
-rw-r--r--phpBB/viewforum.php4
-rw-r--r--phpBB/viewtopic.php9
3 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index ae07bcc379..be4ae7587e 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -48,6 +48,7 @@ $lang['Reply'] = "Reply";
$lang['Replies'] = "Replies";
$lang['Views'] = "Views";
$lang['Post'] = "Post";
+$lang['Posts'] = "Posts";
$lang['Posted'] = "Posted";
$lang['Username'] = "Username";
$lang['Password'] = "Password";
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index d874b53f53..b70b82c6f0 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -374,10 +374,10 @@ $template->assign_vars(array(
"FORUM_ID" => $forum_id,
"FORUM_NAME" => $forum_row['forum_name'],
"MODERATORS" => $forum_moderators,
- "IMG_POST" => ($forum_row['forum_status'] == FORUM_LOCKED) ? $images['post_locked'] : $images['post_new'],
+ "IMG_POST" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'],
- "L_POST_NEW_TOPIC" => $lang['Post_new_topic'],
+ "L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;mark=topics"),
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index df3a4d5640..f882777d31 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -474,8 +474,10 @@ $view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"
$view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=previous");
$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=next");
-$reply_img = ($forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED) ? $images['reply_locked'] : $images['reply_new'];
-$post_img = ($forum_row['forum_status'] == FORUM_LOCKED) ? $images['post_locked'] : $images['post_new'];
+$reply_img = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
+$reply_alt = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
+$post_img = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
+$post_alt = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
//
// Censor topic title
@@ -524,6 +526,9 @@ $template->assign_vars(array(
"L_VIEW_NEXT_TOPIC" => $lang['View_next_topic'],
"L_VIEW_PREVIOUS_TOPIC" => $lang['View_previous_topic'],
+ "L_POST_NEW_TOPIC" => $post_alt,
+ "L_POST_REPLY_TOPIC" => $reply_alt,
+
"IMG_POST" => $post_img,
"IMG_REPLY" => $reply_img,