[Phpbb-checkins] CVS: phpBB2 index.php,1.84,1.85 viewforum.php,1.114,1.115

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

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

Modified Files:
	index.php viewforum.php 
Log Message:
Changed way moderator lang is output on viewforum and index

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** index.php	2001/12/15 16:40:35	1.84
--- index.php	2001/12/16 18:53:44	1.85
***************
*** 252,255 ****
--- 252,256 ----
  		"FORUM_LOCKED_IMG" => $images['forum_locked'],
  
+ 		"L_MODERATOR" => $lang['Moderators'], 
  		"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
  		"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'], 
***************
*** 380,388 ****
  				}
  
! 				if($moderators_links == "")
  				{
  					$moderators_links = " ";
  				}
  
  				$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
--- 381,398 ----
  				}
  
! 				if( $moderators_links == "" )
  				{
  					$moderators_links = " ";
  				}
  
+ 				if( $mods > 0 )
+ 				{
+ 					$l_moderators = ( $mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
+ 				}
+ 				else
+ 				{
+ 					$l_moderators = " ";
+ 				}
+ 
  				$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
***************
*** 398,401 ****
--- 408,413 ----
  					"LAST_POST" => $last_post,
  					"MODERATORS" => $moderators_links,
+ 
+ 					"L_MODERATOR" => $l_moderators, 
  
  					"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** viewforum.php	2001/12/16 13:47:16	1.114
--- viewforum.php	2001/12/16 18:53:44	1.115
***************
*** 372,375 ****
--- 372,376 ----
  	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
  
+ 	"L_MODERATOR" => ( $total_mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'], 
  	"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'], 
  	"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],