[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.40,1.41

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17029

Modified Files:
	viewonline.php 
Log Message:
Fixed 'bug' #495108, introduced a further string for fields with plural and singular entries, copes with zero conditions.

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** viewonline.php	2001/12/17 00:39:47	1.40
--- viewonline.php	2001/12/24 16:34:27	1.41
***************
*** 232,238 ****
  	}
  
! 	$l_r_user_s = ( $registered_users == 1 ) ? $lang['Reg_user_online'] : $lang['Reg_users_online'];
! 	$l_h_user_s = ( $hidden_users == 1 ) ? $lang['Hidden_user_online'] : $lang['Hidden_users_online'];
  
  	$template->assign_vars(array(
  		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users))
--- 232,261 ----
  	}
  
! 	if( $registered_users == 0 )
! 	{
! 		$l_r_user_s = $lang['Reg_users_zero_online'];
! 	}
! 	else if( $registered_users == 1 )
! 	{
! 		$l_r_user_s = $lang['Reg_user_online'];
! 	}
! 	else
! 	{
! 		$l_r_user_s = $lang['Reg_users_online'];
! 	}
  
+ 	if( $hidden_users == 0 )
+ 	{
+ 		$l_h_user_s = $lang['Hidden_users_zero_online'];
+ 	}
+ 	else if( $hidden_users == 1 )
+ 	{
+ 		$l_h_user_s = $lang['Hidden_user_online'];
+ 	}
+ 	else
+ 	{
+ 		$l_h_user_s = $lang['Hidden_users_online'];
+ 	}
+ 
  	$template->assign_vars(array(
  		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users))
***************
*** 325,329 ****
  	}
  
! 	$l_g_user_s = ( $guest_users == 1 ) ? $lang['Guest_user_online'] : $lang['Guest_users_online'];
  
  	$template->assign_vars(array(
--- 348,363 ----
  	}
  
! 	if( $guest_users == 0 )
! 	{
! 		$l_g_user_s = $lang['Guest_users_zero_online'];
! 	}
! 	else if( $guest_users == 1 )
! 	{
! 		$l_g_user_s = $lang['Guest_user_online'];
! 	}
! 	else
! 	{
! 		$l_g_user_s = $lang['Guest_users_online'];
! 	}
  
  	$template->assign_vars(array(