mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Mainly language updates but some bug fixes too

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1332 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-11-16 17:31:49 +00:00
parent 40ddc64afe
commit cac4518b39
22 changed files with 766 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/functions.php
View File

@@ -163,16 +163,12 @@ function make_jumpbox($match_forum_id = 0)
}
}
}
else
{
$boxstring .= '<option value="-1">-- ! No Forums ! --</option>';
}
}
$boxstring .= '</select>';
}
else
{
$boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>';
$boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
}
if( isset($SID) )
@@ -275,6 +271,18 @@ function init_userprefs($userdata)
include($phpbb_root_path . 'language/lang_english/lang_main.' . $phpEx);
}
if( defined("IN_ADMIN") )
{
if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
{
include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
}
else
{
include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx);
}
}
return;
}

8
phpBB/includes/page_header.php
View File

@@ -146,7 +146,10 @@ $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
$l_online_users = ( $total_online_users == 1 ) ? sprintf($lang['Online_user'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online) : sprintf($lang['Online_users'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online);
$l_online_users = ( $total_online_users == 1 ) ? sprintf($lang['Online_user_total'], $total_online_users) : sprintf($lang['Online_users'], $total_online_users);
$l_online_users .= ( $logged_visible_online == 1 ) ? sprintf($lang['Reg_user_total'], $logged_visible_online) : sprintf($lang['Reg_users_total'], $logged_visible_online);
$l_online_users .= ( $logged_hidden_online == 1 ) ? sprintf($lang['Hidden_user_total'], $logged_hidden_online) : sprintf($lang['Hidden_user_total'], $logged_hidden_online);
$l_online_users .= ( $guests_online == 1 ) ? sprintf($lang['Guest_user_total'], $guests_online) : sprintf($lang['Guest_user_total'], $guests_online);
//
// Obtain number of new private messages
@@ -193,7 +196,7 @@ $template->assign_vars(array(
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
"LAST_VISIT_DATE" => $s_last_visit,
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
"L_USERNAME" => $lang['Username'],
"L_PASSWORD" => $lang['Password'],
@@ -230,7 +233,6 @@ $template->assign_vars(array(
"L_MESSAGE" => $lang['Message'],
"L_BY" => $lang['by'],
"L_LOGIN_LOGOUT" => $l_login_logout,
"L_LAST_VISIT" => $lang['You_last_visit'],
"L_SEARCH_UNANSWERED" => $lang['Search_unanswered'],
"U_INDEX" => append_sid("index.".$phpEx),