|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:27:40
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv25429/includes
Modified Files:
functions.php page_header.php
Log Message:
Mainly language updates but some bug fixes too
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** functions.php 2001/11/13 17:26:36 1.80
--- functions.php 2001/11/16 17:27:36 1.81
***************
*** 164,171 ****
}
}
- else
- {
- $boxstring .= '<option value="-1">-- ! No Forums ! --</option>';
- }
}
$boxstring .= '</select>';
--- 164,167 ----
***************
*** 173,177 ****
else
{
! $boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>';
}
--- 169,173 ----
else
{
! $boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
}
***************
*** 274,277 ****
--- 270,285 ----
{
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);
+ }
}
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** page_header.php 2001/11/14 06:37:05 1.60
--- page_header.php 2001/11/16 17:27:36 1.61
***************
*** 147,151 ****
$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);
//
--- 147,154 ----
$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);
//
***************
*** 194,198 ****
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => $s_last_visit,
"L_USERNAME" => $lang['Username'],
--- 197,201 ----
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
"L_USERNAME" => $lang['Username'],
***************
*** 231,235 ****
"L_BY" => $lang['by'],
"L_LOGIN_LOGOUT" => $l_login_logout,
- "L_LAST_VISIT" => $lang['You_last_visit'],
"L_SEARCH_UNANSWERED" => $lang['Search_unanswered'],
--- 234,237 ----
|