diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 14:02:25 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 14:02:25 +0000 |
commit | 939e9855710b3b00604398d547d756fcaec1e2c5 (patch) | |
tree | 21d55bb1fecce565c31a9d0a146d1d3147043180 | |
parent | bfa98e0e3a56f75425c8348fbbd37208dfdefe60 (diff) | |
download | forums-939e9855710b3b00604398d547d756fcaec1e2c5.tar forums-939e9855710b3b00604398d547d756fcaec1e2c5.tar.gz forums-939e9855710b3b00604398d547d756fcaec1e2c5.tar.bz2 forums-939e9855710b3b00604398d547d756fcaec1e2c5.tar.xz forums-939e9855710b3b00604398d547d756fcaec1e2c5.zip |
More lang related cleanups
git-svn-id: file:///svn/phpbb/trunk@1355 89ea8834-ac86-4346-8a33-228a782c2dd0
31 files changed, 75 insertions, 84 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index aff336e932..37af7c5fd6 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -202,7 +202,7 @@ $template->assign_vars(array( "L_PASSWORD" => $lang['Password'], "L_LOGIN" => $lang['Login'], "L_LOG_ME_IN" => $lang['Log_me_in'], - "L_INDEX" => $lang['Forum_Index'], + "L_INDEX" => sprintf($lang['Forum_Index'], $board_config['sitename']), "L_REGISTER" => $lang['Register'], "L_PROFILE" => $lang['Profile'], "L_SEARCH" => $lang['Search'], @@ -234,6 +234,7 @@ $template->assign_vars(array( "L_BY" => $lang['by'], "L_LOGIN_LOGOUT" => $l_login_logout, "L_SEARCH_UNANSWERED" => $lang['Search_unanswered'], + "L_SEARCH_SELF" => $lang['Search_your_posts'], "U_INDEX" => append_sid("index.".$phpEx), "U_REGISTER" => append_sid("profile.".$phpEx."?mode=register"), @@ -247,7 +248,7 @@ $template->assign_vars(array( "U_MEMBERSLIST" => append_sid("memberlist.".$phpEx), "U_GROUP_CP" => append_sid("groupcp.".$phpEx), "U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"), - + "U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch"), "S_CONTENT_DIRECTION" => $lang['DIRECTION'], "S_CONTENT_ENCODING" => $lang['ENCODING'], @@ -308,15 +309,6 @@ if( !$userdata['session_logged_in'] ) else { $template->assign_block_vars("switch_user_logged_in", array()); - // - // Bart's quick ego search - // - $template->assign_block_vars("egosearch", array( - "L_SEARCH_SELF" => $lang['Search_your_posts'], - "U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch")) - ); - - } header ("Cache-Control: no-store, no-cache, must-revalidate"); diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php index e1a4b9eb0c..5c24707bac 100644 --- a/phpBB/language/lang_english/lang_main.php +++ b/phpBB/language/lang_english/lang_main.php @@ -31,8 +31,8 @@ // varies ... give it your best guess! // -setlocale(LC_ALL, "en"); -$lang['ENCODING'] = "iso-8859-1"; +//setlocale(LC_ALL, "en"); +$lang['ENCODING'] = "utf-8"; $lang['DIRECTION'] = "LTR"; $lang['LEFT'] = "LEFT"; $lang['RIGHT'] = "RIGHT"; @@ -59,6 +59,7 @@ $lang['Author'] = "Author"; $lang['Time'] = "Time"; $lang['Hours'] = "Hours"; $lang['Message'] = "Message"; + $lang['1_Day'] = "1 Day"; $lang['7_Days'] = "7 Days"; $lang['2_Weeks'] = "2 Weeks"; @@ -99,6 +100,13 @@ $lang['Post_new_topic'] = "Post new topic"; $lang['Reply_to_topic'] = "Reply to topic"; $lang['Reply_with_quote'] = "Reply with quote"; +$lang['Click_return_topic'] = "Click %sHere%s to return to the topic"; // %s's here are for uris, do not remove! +$lang['Click_return_login'] = "Click %sHere%s to try again"; +$lang['Click_return_forum'] = "Click %sHere%s to return to the forum"; +$lang['Click_view_message'] = "Click %sHere%s to view your message"; +$lang['Click_return_modcp'] = "Click %sHere%s to return to the Moderator Control Panel"; +$lang['Click_return_group'] = "Click %sHere%s to return to group information"; + $lang['Admin_panel'] = "Go to Administration Panel"; @@ -163,7 +171,7 @@ $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'] = "%s Forum Index"; // eg. sitename Forum Index, %s can be removed if you prefer $lang['No_forums'] = "This board has no forums"; $lang['Private_Message'] = "Private Message"; @@ -229,14 +237,18 @@ $lang['Oldest_First'] = "Oldest First"; $lang['Return_to_top'] = "Return to top"; -$lang['Read_profile'] = "Read profile users profile"; // Followed by username of poster -$lang['Send_email'] = "Send email to user"; // Followed by username of poster +$lang['Read_profile'] = "View users profile"; +$lang['Send_email'] = "Send email to user"; $lang['Visit_website'] = "Visit posters website"; $lang['ICQ_status'] = "ICQ Status"; $lang['Edit_delete_post'] = "Edit/Delete this post"; $lang['View_IP'] = "View IP of poster"; $lang['Delete_post'] = "Delete this post"; +$lang['wrote'] = "wrote"; // proceeds the username and is followed by the quoted text +$lang['Quote'] = "Quote"; // comes before bbcode quote output. +$lang['Code'] = "Code"; // comes before bbcode code output. + $lang['Edited_time_total'] = "Last edited by %s on %s, edited %d time in total"; // Last edited by me on 12 Oct 2001, edited 1 time in total $lang['Edited_times_total'] = "Last edited by %s on %s, edited %d times in total"; // Last edited by me on 12 Oct 2001, edited 2 times in total @@ -324,22 +336,11 @@ $lang['Attach_signature'] = "Attach signature (signatures can be changed in prof $lang['Notify'] = "Notify me when a reply is posted"; $lang['Delete_post'] = "Delete this post"; -$lang['wrote'] = "wrote"; // proceeds the username and is followed by the quoted text -$lang['Quote'] = "Quote"; // comes before bbcode quote output. -$lang['Code'] = "Code"; // comes before bbcode code output. - $lang['Stored'] = "Your message has been entered successfully"; $lang['Deleted'] = "Your message has been deleted successfully"; $lang['Poll_delete'] = "Your poll has been deleted successfully"; $lang['Vote_cast'] = "Your vote has been cast"; -$lang['Click_return_topic'] = "Click %sHere%s to return to the topic"; // %s's here are for uris, do not remove! -$lang['Click_return_login'] = "Click %sHere%s to try again"; -$lang['Click_return_forum'] = "Click %sHere%s to return to the forum"; -$lang['Click_view_message'] = "Click %sHere%s to view your message"; -$lang['Click_return_modcp'] = "Click %sHere%s to return to the Moderator Control Panel"; -$lang['Click_return_group'] = "Click %sHere%s to return to group information"; - $lang['Topic_reply_notification'] = "Topic Reply Notification"; @@ -355,8 +356,8 @@ $lang['No_new_pm'] = "You have no new messages"; $lang['Inbox'] = "Inbox"; $lang['Outbox'] = "Outbox"; -$lang['Savedbox'] = "Saved box"; -$lang['Sentbox'] = "Sent box"; +$lang['Savebox'] = "Savebox"; +$lang['Sentbox'] = "Sentbox"; $lang['Flag'] = "Flag"; $lang['Subject'] = "Subject"; $lang['From'] = "From"; diff --git a/phpBB/login.php b/phpBB/login.php index 1da008be77..7aa59468df 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -53,9 +53,9 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ if( count($rowresult) ) { - if( (md5($password) == $rowresult['user_password']) && $rowresult['user_active'] != 0 ) + if( md5($password) == $rowresult['user_password'] && $rowresult['user_active'] ) { - $autologin = (isset($HTTP_POST_VARS['autologin'])) ? TRUE : 0; + $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; $session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin); @@ -189,6 +189,7 @@ else $template->assign_vars(array( "USERNAME" => $username, + "L_ENTER_PASSWORD" => $lang['Enter_password'], "L_SEND_PASSWORD" => $lang['Forgotten_password'], "U_SEND_PASSWORD" => append_sid("profile.$phpEx?mode=sendpassword"), diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index d3c54be750..aad23921fe 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -106,11 +106,11 @@ $inbox_url = ($folder != "inbox" || $mode != "") ? '<a href="' . append_sid("pri $outbox_img = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '"><img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" /></a>' : '<img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" />'; $outbox_url = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '">' . $lang['Outbox'] . '</a>' : $lang['Outbox']; -$sentbox_img = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '"><img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sent'] . '" /></a>' : '<img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sent'] . '" />'; -$sentbox_url = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '">' . $lang['Sent'] . '</a>' : $lang['Sent']; +$sentbox_img = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '"><img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" /></a>' : '<img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" />'; +$sentbox_url = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '">' . $lang['Sentbox'] . '</a>' : $lang['Sentbox']; -$savebox_img = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '"><img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" /></a>' : '<img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Saved'] . '" />'; -$savebox_url = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '">' . $lang['Saved'] . '</a>' : $lang['Saved']; +$savebox_img = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '"><img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" /></a>' : '<img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" />'; +$savebox_url = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '">' . $lang['Savebox'] . '</a>' : $lang['Savebox']; // ---------- // Start main diff --git a/phpBB/templates/subSilver/agreement.tpl b/phpBB/templates/subSilver/agreement.tpl index d548aff360..f20b44a461 100644 --- a/phpBB/templates/subSilver/agreement.tpl +++ b/phpBB/templates/subSilver/agreement.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> <table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline"> diff --git a/phpBB/templates/subSilver/faq_body.tpl b/phpBB/templates/subSilver/faq_body.tpl index c946027a42..7b28714aec 100755 --- a/phpBB/templates/subSilver/faq_body.tpl +++ b/phpBB/templates/subSilver/faq_body.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> - <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/groupcp_info_body.tpl b/phpBB/templates/subSilver/groupcp_info_body.tpl index bdbb1dcc09..4ecf7b8d37 100644 --- a/phpBB/templates/subSilver/groupcp_info_body.tpl +++ b/phpBB/templates/subSilver/groupcp_info_body.tpl @@ -2,7 +2,7 @@ <form method="post" action="{S_GROUPCP_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/groupcp_user_body.tpl b/phpBB/templates/subSilver/groupcp_user_body.tpl index 94976321fa..b2076f4361 100644 --- a/phpBB/templates/subSilver/groupcp_user_body.tpl +++ b/phpBB/templates/subSilver/groupcp_user_body.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl index f7af4abc03..55d2fe0bcf 100644 --- a/phpBB/templates/subSilver/index_body.tpl +++ b/phpBB/templates/subSilver/index_body.tpl @@ -1,11 +1,11 @@ <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left" valign="bottom"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="right" class="gensmall"> - <!-- BEGIN egosearch --> - <a href="{egosearch.U_SEARCH_SELF}" class="gensmall">{egosearch.L_SEARCH_SELF}</a><br /> - <!-- END egosearch --> + <!-- BEGIN switch_user_logged_in --> + <a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br /> + <!-- END switch_user_logged_in --> <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br /> <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br />{LAST_VISIT_DATE}</td> </tr> diff --git a/phpBB/templates/subSilver/login_body.tpl b/phpBB/templates/subSilver/login_body.tpl index f77ebeede3..22bf345ef7 100644 --- a/phpBB/templates/subSilver/login_body.tpl +++ b/phpBB/templates/subSilver/login_body.tpl @@ -1,18 +1,18 @@ +<form action="{S_LOGIN_ACTION}" method="post"> + <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> + <td align="left" class="nav"><a href="{U_INDEX}" class="nav"{{L_INDEX}</a></td> </tr> </table> -<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> + +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> - <th height="25" class="thHead">Please enter your username and password - to login</th> + <th height="25" class="thHead">{L_ENTER_PASSWORD}</th> </tr> <tr> - <td class="row1"> - <form action="{S_LOGIN_ACTION}" method="post"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> + <td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr> <td colspan="2" align="center"> </td> </tr> @@ -29,9 +29,7 @@ </td> </tr> <tr align="center"> - <td colspan="2"><span class="gen">{L_AUTO_LOGIN}: - <input type="checkbox" name="autologin" /> - </span> </td> + <td colspan="2"><span class="gen">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" /></span></td> </tr> <tr align="center"> <td colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" /></td> @@ -39,9 +37,8 @@ <tr align="center"> <td colspan="2"><span class="gensmall"><a href="{U_SEND_PASSWORD}" class="gensmall">{L_SEND_PASSWORD}</a></span></td> </tr> - </table> - </form> - </td> + </table></td> </tr> </table> -<br /> + +</form> diff --git a/phpBB/templates/subSilver/memberlist_body.tpl b/phpBB/templates/subSilver/memberlist_body.tpl index 5b7a1f4b7b..bf60119cad 100644 --- a/phpBB/templates/subSilver/memberlist_body.tpl +++ b/phpBB/templates/subSilver/memberlist_body.tpl @@ -2,7 +2,7 @@ <form method="post" action="{S_MODE_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="right" nowrap="nowrap"><span class="genmed">{L_SELECT_SORT_METHOD}: {S_MODE_SELECT} {L_ORDER} {S_ORDER_SELECT} <input type="submit" name="submit" value="{L_SUBMIT}" class="liteoption" /> </span></td> diff --git a/phpBB/templates/subSilver/message_body.tpl b/phpBB/templates/subSilver/message_body.tpl index 10da9d7734..c74b04fb93 100644 --- a/phpBB/templates/subSilver/message_body.tpl +++ b/phpBB/templates/subSilver/message_body.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> + <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td> </tr> </table> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> diff --git a/phpBB/templates/subSilver/modcp_body.tpl b/phpBB/templates/subSilver/modcp_body.tpl index a1bf4fba8e..265c896aee 100644 --- a/phpBB/templates/subSilver/modcp_body.tpl +++ b/phpBB/templates/subSilver/modcp_body.tpl @@ -2,7 +2,7 @@ <form method="post" action="{S_MODCP_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/modcp_move.tpl b/phpBB/templates/subSilver/modcp_move.tpl index 9c595c71c4..515d08accb 100644 --- a/phpBB/templates/subSilver/modcp_move.tpl +++ b/phpBB/templates/subSilver/modcp_move.tpl @@ -2,7 +2,7 @@ <form action="{S_MODCP_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> + <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td> </tr> </table> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> diff --git a/phpBB/templates/subSilver/modcp_split.tpl b/phpBB/templates/subSilver/modcp_split.tpl index 13a2a1a0e4..b61505e65c 100644 --- a/phpBB/templates/subSilver/modcp_split.tpl +++ b/phpBB/templates/subSilver/modcp_split.tpl @@ -2,7 +2,7 @@ <form method="post" action="{S_SPLIT_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a><span class="nav"> + <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><span class="nav"> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/modcp_viewip.tpl b/phpBB/templates/subSilver/modcp_viewip.tpl index da97a7d256..de645b58a2 100644 --- a/phpBB/templates/subSilver/modcp_viewip.tpl +++ b/phpBB/templates/subSilver/modcp_viewip.tpl @@ -1,9 +1,10 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> + <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> <tr> <th height="25" class="thHead">{L_IP_INFO}</th> @@ -43,15 +44,15 @@ </tr> <!-- BEGIN iprow --> <tr> - <td class="{iprow.ROW_CLASS}"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <td class="{iprow.ROW_CLASS}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td> <span class="gen">{iprow.IP}</span></td> <td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> ] </span></td> </tr> - </table> - </td> + </table></td> </tr> <!-- END iprow --> </table> + +<br clear="all" /> diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl index 0e6b413cb9..6d74912e45 100644 --- a/phpBB/templates/subSilver/posting_body.tpl +++ b/phpBB/templates/subSilver/posting_body.tpl @@ -192,7 +192,7 @@ function bbstyle(formObj, bbnumber) { <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/privmsgs_body.tpl b/phpBB/templates/subSilver/privmsgs_body.tpl index 7d5942cba6..7bbe87d04b 100644 --- a/phpBB/templates/subSilver/privmsgs_body.tpl +++ b/phpBB/templates/subSilver/privmsgs_body.tpl @@ -60,7 +60,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left" valign="middle">{POST_PM_IMG}</td> - <td align="left" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}: <select name="msgdays">{S_MSG_DAYS_OPTIONS} </select> diff --git a/phpBB/templates/subSilver/privmsgs_read_body.tpl b/phpBB/templates/subSilver/privmsgs_read_body.tpl index edf7dc534e..48fa70c3cc 100644 --- a/phpBB/templates/subSilver/privmsgs_read_body.tpl +++ b/phpBB/templates/subSilver/privmsgs_read_body.tpl @@ -18,7 +18,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td valign="middle">{REPLY_PM_IMG}</td> - <td width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl index 119e3326cf..7c842f1532 100644 --- a/phpBB/templates/subSilver/profile_add_body.tpl +++ b/phpBB/templates/subSilver/profile_add_body.tpl @@ -4,7 +4,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/profile_avatar_gallery.tpl b/phpBB/templates/subSilver/profile_avatar_gallery.tpl index b8f8fd9c8d..7868f803f9 100644 --- a/phpBB/templates/subSilver/profile_avatar_gallery.tpl +++ b/phpBB/templates/subSilver/profile_avatar_gallery.tpl @@ -2,7 +2,7 @@ <form action="{S_PROFILE_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/profile_send_email.tpl b/phpBB/templates/subSilver/profile_send_email.tpl index 21d56f99ea..9e5a0d37c9 100644 --- a/phpBB/templates/subSilver/profile_send_email.tpl +++ b/phpBB/templates/subSilver/profile_send_email.tpl @@ -33,7 +33,7 @@ function checkForm(formObj) { <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/profile_send_pass.tpl b/phpBB/templates/subSilver/profile_send_pass.tpl index 2469a49649..8d31aa4ebb 100644 --- a/phpBB/templates/subSilver/profile_send_pass.tpl +++ b/phpBB/templates/subSilver/profile_send_pass.tpl @@ -2,7 +2,7 @@ <form action="{S_PROFILE_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> diff --git a/phpBB/templates/subSilver/profile_view_body.tpl b/phpBB/templates/subSilver/profile_view_body.tpl index f96236ad65..a08dde1543 100644 --- a/phpBB/templates/subSilver/profile_view_body.tpl +++ b/phpBB/templates/subSilver/profile_view_body.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> @@ -47,8 +47,7 @@ </td> </tr> <tr> - <td class="catLeft" align="center" height="28"><b><span class="gen">{L_CONTACT} - {USERNAME} </span></b></td> + <td class="catLeft" align="center" height="28"><b><span class="gen">{L_CONTACT} {USERNAME} </span></b></td> </tr> <tr> <td class="row1" valign="top"> diff --git a/phpBB/templates/subSilver/search_body.tpl b/phpBB/templates/subSilver/search_body.tpl index f142d92340..0b3830c7d7 100644 --- a/phpBB/templates/subSilver/search_body.tpl +++ b/phpBB/templates/subSilver/search_body.tpl @@ -1,7 +1,7 @@ <form action="{S_SEARCH_ACTION}" method="POST"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> diff --git a/phpBB/templates/subSilver/search_results_posts.tpl b/phpBB/templates/subSilver/search_results_posts.tpl index 0a500cdba8..bcf3f86c5c 100644 --- a/phpBB/templates/subSilver/search_results_posts.tpl +++ b/phpBB/templates/subSilver/search_results_posts.tpl @@ -8,7 +8,7 @@ </table> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> diff --git a/phpBB/templates/subSilver/search_results_topics.tpl b/phpBB/templates/subSilver/search_results_topics.tpl index b1df6c5240..b8f42c056f 100644 --- a/phpBB/templates/subSilver/search_results_topics.tpl +++ b/phpBB/templates/subSilver/search_results_topics.tpl @@ -8,7 +8,7 @@ </table> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> diff --git a/phpBB/templates/subSilver/viewforum_body.tpl b/phpBB/templates/subSilver/viewforum_body.tpl index 56cc72b99a..5090a86078 100644 --- a/phpBB/templates/subSilver/viewforum_body.tpl +++ b/phpBB/templates/subSilver/viewforum_body.tpl @@ -9,7 +9,7 @@ </tr> <tr> <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" width="82" height="25" /></a></td> - <td align="left" valign="middle" class="nav" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> {FORUM_NAME}</span></td> + <td align="left" valign="middle" class="nav" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> {FORUM_NAME}</span></td> <td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/viewonline_body.tpl b/phpBB/templates/subSilver/viewonline_body.tpl index 7bc60355c2..108b113cbf 100644 --- a/phpBB/templates/subSilver/viewonline_body.tpl +++ b/phpBB/templates/subSilver/viewonline_body.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/viewtopic_body.tpl b/phpBB/templates/subSilver/viewtopic_body.tpl index 7a1bbdf93f..1792ee0838 100644 --- a/phpBB/templates/subSilver/viewtopic_body.tpl +++ b/phpBB/templates/subSilver/viewtopic_body.tpl @@ -9,7 +9,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" width="82" height="25" /></a></span></td> - <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> + <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index b70b82c6f0..40d061b3ce 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -231,7 +231,7 @@ else // handle pagination) and alter the main query // $previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); -$previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); +$previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); if( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) ) { |