diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 7ad0fafc7d..b430bd74e1 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -93,6 +93,23 @@ $lang['No'] = "No"; $lang['Private_messaging'] = "Send a Private Message"; $lang['Click_index'] = "Click HERE to return to the index"; +$lang['You'] = "You"; // This is followed by the auth results for a given function (see below) +$lang['can'] = "can"; +$lang['cannot'] = "cannot"; +$lang['read_posts'] = "read posts in this forum"; +$lang['post_topics'] = "post new topics in this forum"; +$lang['reply_posts'] = "reply to posts in this forum"; +$lang['edit_posts'] = "edit your posts in this forum"; +$lang['delete_posts'] = "delete your posts in this forum"; +$lang['moderate_forum'] = "moderate this forum"; + +$lang['View_latest_post'] = "View latest post"; + +$lang['ICQ'] = "ICQ Number"; +$lang['AIM'] = "AIM address"; +$lang['MSNM'] = "MSN Messenger"; +$lang['YIM'] = "Yahoo Messenger"; + // // Global Header strings // @@ -145,11 +162,15 @@ $lang['Log_me_in'] = "Log me on automatically each visit"; // Index page // $lang['No_Posts'] = "No Posts"; -$lang['Forum_Index'] = "Forum Index"; +$lang['Forum_Index'] = "Forum Index"; +$lang['No_forums'] = "This board has no forums"; // // Viewforum // +$lang['Forum_not_exist'] = "The forum you selected does not exist, please go back and try again"; +$lang['Reached_on_error'] = "You have reached this page in error, please go back and try again"; + $lang['Display_topics'] = "Display Topics from previous"; $lang['Annoucement'] = "Annoucement:"; $lang['Sticky'] = "Sticky:"; @@ -157,6 +178,7 @@ $lang['Sticky'] = "Sticky:"; // // Viewtopic // +$lang['View_topic'] = "View topic"; $lang['Guest'] = 'Guest'; $lang['Post_subject'] = "Post subject"; $lang['View_next_topic'] = "View next topic"; @@ -166,6 +188,21 @@ $lang['No_newer_topics'] = "There are no newer topics in this forum"; $lang['No_older_topics'] = "There are no older topics in this forum"; $lang['Topic_post_not_exist'] = "The topic or post you requested does not exist"; +$lang['Read_profile'] = "Read profile of"; // Followed by username of poster +$lang['Send_email'] = "Send email to "; // Followed by username of poster +$lang['Visit_website'] = "Visit posters website"; +$lang['ICQ_status'] = "ICQ Status"; +$lang['Edit_delete_post'] = "Edit/Delete this post"; +$lang['Reply_with_quote'] = "Reply with quote"; +$lang['View_IP'] = "View IP of poster"; +$lang['Delete_post'] = "Delete this post"; + +$lang['Lock_topic'] = "Lock this topic"; +$lang['Unlock_topic'] = "Unlock this topic"; +$lang['Move_topic'] = "Move this topic"; +$lang['Delete_topic'] = "Delete this topic"; + + // // Posting/Replying (Not private messaging!) // diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 591d18bcf8..a59cf31268 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -24,7 +24,7 @@ include('extension.inc'); include('common.'.$phpEx); include('includes/bbcode.'.$phpEx); -$page_title = "View Topic - $topic_title"; +$page_title = $lang['View_topic'] ." - $topic_title"; $pagetype = "viewtopic"; // @@ -162,35 +162,6 @@ if(!$is_auth['auth_view'] || !$is_auth['auth_view']) // End auth check // -/* -// -// This code allows for individual topic read tracking, on small, low volume sites -// it'll probably work very well. However, for busy sites the use of a text field -// in the DB combined with the additional UPDATE's required in viewtopic may be -// unacceptable. So, by default this code is off, however you may want to play -// ... -// -// psoTFX -// -if($userdata['user_id'] != ANONYMOUS) -{ - $unread_topic_list = unserialize($userdata['user_topics_unvisited']); - - if(isset($unread_topic_list[$forum_id][$topic_id])) - { - unset($unread_topic_list[$forum_id][$topic_id]); - - $sql = "UPDATE " . USERS_TABLE . " - SET user_topics_unvisited = '" . serialize($unread_topic_list) . "' - WHERE user_id = " . $userdata['user_id']; - if(!$s_topic_times = $db->sql_query($sql)) - { - error_die(SQL_QUERY, "Could not update user topics list.", __LINE__, __FILE__); - } - } -} -*/ - // // Go ahead and pull all data for this topic // @@ -356,21 +327,21 @@ for($i = 0; $i < $total_posts; $i++) $poster_rank = $lang['Guest']; } - $profile_img = "\"$l_profileof"; + $profile_img = "\"""; $search_img = ""; $pm_img = "\"""; - $email_img = ($postrow[$i]['user_viewemail'] == 1) ? "\"$l_email" : ""; + $email_img = ($postrow[$i]['user_viewemail'] == 1) ? "\""" : ""; - $www_img = ($postrow[$i]['user_website']) ? "\"$l_viewsite\"" : ""; + $www_img = ($postrow[$i]['user_website']) ? "\""" : ""; if($postrow[$i]['user_icq']) { - $icq_status_img = "\"$l_icqstatus\""; + $icq_status_img = "\"""; - $icq_add_img = "\"$l_icq\""; + $icq_add_img = "\"""; } else { @@ -378,29 +349,22 @@ for($i = 0; $i < $total_posts; $i++) $icq_add_img = ""; } - $aim_img = ($postrow[$i]['user_aim']) ? "" : ""; + $aim_img = ($postrow[$i]['user_aim']) ? "\""" : ""; - $msn_img = ($postrow[$i]['user_msnm']) ? "" : ""; + $msn_img = ($postrow[$i]['user_msnm']) ? "\""" : ""; - $yim_img = ($postrow[$i]['user_yim']) ? "" : ""; + $yim_img = ($postrow[$i]['user_yim']) ? "\""" : ""; - if($i == 0) - { - $edit_post_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id&is_first_post=1"); - } - else - { - $edit_post_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id"); - } - $edit_img = "\"$l_editdelete\""; + $edit_post_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id"); + $edit_img = "\"""; - $quote_img = "\"$l_replyquote\""; + $quote_img = "\"""; if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) { - $ip_img = "\"$l_viewip\""; + $ip_img = "\"""; - $delpost_img = "\"$l_delete\""; + $delpost_img = "\"""; } $post_subject = ($postrow[$i]['post_subject'] != "") ? stripslashes($postrow[$i]['post_subject']) : $topic_title; @@ -476,33 +440,34 @@ for($i = 0; $i < $total_posts; $i++) ); } -$s_auth_can = "You " . (($is_auth['auth_read']) ? "can" : "cannot" ) . " read posts in this forum
"; -$s_auth_can .= "You " . (($is_auth['auth_post']) ? "can" : "cannot") . " add new topics to this forum
"; -$s_auth_can .= "You " . (($is_auth['auth_reply']) ? "can" : "cannot") . " reply to posts in this forum
"; -$s_auth_can .= "You " . (($is_auth['auth_edit']) ? "can" : "cannot") . " edit your posts in this forum
"; -$s_auth_can .= "You " . (($is_auth['auth_delete']) ? "can" : "cannot") . " delete your posts in this forum
"; +// +// User authorisation levels output +// +$s_auth_can = $lang['You'] . " " . ( ($is_auth['auth_read']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['read_posts'] . "
"; +$s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_post']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['post_topics'] . "
"; +$s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_reply']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['reply_posts'] . "
"; +$s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_edit']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['edit_posts'] . "
"; +$s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_delete']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['delete_posts'] . "
"; if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) { - $topic_mod = "  "; + $topic_mod = "\""  "; - $topic_mod .= "  "; + $topic_mod .= "\""  "; if($forum_row[0]['topic_status'] == UNLOCKED) { - $topic_mod .= "  "; + $topic_mod .= "\""  "; } else { - $topic_mod .= "  "; + $topic_mod .= "\""  "; } - $s_auth_can .= "You can moderate this forum
"; + $s_auth_can .= $lang['You'] . " " . $lang['can'] . " " . $lang['moderate_forum'] . "
"; } -$pagination = generate_pagination("viewtopic.$phpEx?".POST_TOPIC_URL."=$topic_id", $total_replies, $board_config['posts_per_page'], $start); - $template->assign_vars(array( - "PAGINATION" => $pagination, + "PAGINATION" => generate_pagination("viewtopic.$phpEx?".POST_TOPIC_URL."=$topic_id", $total_replies, $board_config['posts_per_page'], $start), "ON_PAGE" => ( floor( $start / $board_config['posts_per_page'] ) + 1 ), "TOTAL_PAGES" => ceil( $total_replies / $board_config['posts_per_page'] ),