diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-20 15:16:03 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-20 15:16:03 +0000 |
| commit | c285a885ae3a45a1ccb765553cea65b15331e6f1 (patch) | |
| tree | 2f86781940a8cf5dcd71606b27883db267dc0d0f /phpBB/includes/page_header.php | |
| parent | 862f5d67003f73ed419b06bd5d59832308ed1be5 (diff) | |
| download | forums-c285a885ae3a45a1ccb765553cea65b15331e6f1.tar forums-c285a885ae3a45a1ccb765553cea65b15331e6f1.tar.gz forums-c285a885ae3a45a1ccb765553cea65b15331e6f1.tar.bz2 forums-c285a885ae3a45a1ccb765553cea65b15331e6f1.tar.xz forums-c285a885ae3a45a1ccb765553cea65b15331e6f1.zip | |
Fixed errors, non-sid-appended urls, lang switchovers, etc.
git-svn-id: file:///svn/phpbb/trunk@707 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/page_header.php')
| -rw-r--r-- | phpBB/includes/page_header.php | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index c3a50efa78..ee1c65867f 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -64,16 +64,11 @@ $template->set_filenames(array( // if($userdata['session_logged_in']) { - $logged_in_status = $lang['You_are_logged_in'] . " <b>" . $userdata["username"] . "</b>."; - $logged_in_status .= " [<a href=\"" . append_sid("login.$phpEx?submit=logout") . "\">" . $lang['Logout'] . "</a>]"; - $u_login_logout = "login.$phpEx?submit=logout"; $l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . ""; } else { - $logged_in_status = $lang['You_are_not_logged_in']; - $u_login_logout = "login.$phpEx"; $l_login_logout = $lang['Login']; } @@ -121,7 +116,7 @@ while($row = $db->sql_fetchrow($result)) $userlist = ""; for($i = 0; $i < $logged_visible_online; $i++) { - $userlist .= ($i == $logged_visible_online - 1 && $logged_visible_online > 1) ? " and " : ""; + $userlist .= ($i == $logged_visible_online - 1 && $logged_visible_online > 1) ? " " . $lang['and'] . " " : ""; $userlist .= $userlist_ary[$i]; $userlist .= ($i < $logged_visible_online - 2) ? ", " : ""; } @@ -151,17 +146,17 @@ if($userdata['session_logged_in']) { $new_messages = $pm_result['new_messages']; - $l_message_new = ($new_messages == 1) ? "message" : "messages"; - $l_privmsgs_text = "You have $new_messages new $l_message_new"; + $l_message_new = ($new_messages == 1) ? $lang['message'] : $lang['messages']; + $l_privmsgs_text = $lang['You_have'] . " $new_messages " . $lang['new'] . " $l_message_new"; } else { - $l_privmsgs_text = "You have no new messages"; + $l_privmsgs_text = $lang['No_new_pm']; } } else { - $l_privmsgs_text = "To check your private messages you must login"; + $l_privmsgs_text = $lang['Login_check_pm']; } // @@ -172,9 +167,8 @@ else $template->assign_vars(array( "SITENAME" => $board_config['sitename'], "PAGE_TITLE" => $page_title, - "LOGIN_STATUS" => $logged_in_status, "META_INFO" => $meta_tags, - "TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s and $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'], + "TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'], "LOGGED_IN_USER_LIST" => $userlist, "L_USERNAME" => $lang['Username'], @@ -199,6 +193,7 @@ $template->assign_vars(array( "L_MODERATOR" => $lang['Moderator'], "L_NONEWPOSTS" => $lang['No_new_posts'], "L_NEWPOSTS" => $lang['New_posts'], + "L_TOPIC_IS_LOCKED" => $lang['Topic_is_locked'], "L_POSTED" => $lang['Posted'], "L_JOINED" => $lang['Joined'], "L_AUTO_LOGIN" => $lang['Log_me_in'], |