[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.24,1.25 search.php,1.31,1.32

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

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

Modified Files:
	groupcp.php search.php 
Log Message:
More language updates

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** groupcp.php	2001/11/18 18:11:42	1.24
--- groupcp.php	2001/11/19 14:12:08	1.25
***************
*** 690,694 ****
  		"L_EMAIL" => $lang['Email'],
  		"L_WEBSITE" => $lang['Website'],
! 		"L_FROM" => $lang['From'],
  		"L_ORDER" => $lang['Order'],
  		"L_SORT" => $lang['Sort'],
--- 690,694 ----
  		"L_EMAIL" => $lang['Email'],
  		"L_WEBSITE" => $lang['Website'],
! 		"L_FROM" => $lang['Location'],
  		"L_ORDER" => $lang['Order'],
  		"L_SORT" => $lang['Sort'],

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** search.php	2001/11/17 17:44:31	1.31
--- search.php	2001/11/19 14:12:08	1.32
***************
*** 739,747 ****
  		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
  
! 		$template->assign_vars(array(
! 			"SEARCH_MATCHES" => $total_match_count, 
  
! 			"L_FOUND" => $lang['found'], 
! 			"L_MATCHES" => (count($searchset) == 1) ? $lang['match'] : $lang['matches'], 
  			"L_TOPIC" => $lang['Topic'])
  		);
--- 739,746 ----
  		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
  
! 		$l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count);
  
! 		$template->assign_vars(array(
! 			"L_SEARCH_MATCHES" => $l_search_matches, 
  			"L_TOPIC" => $lang['Topic'])
  		);
***************
*** 959,962 ****
--- 958,964 ----
  					$topic_type = $lang['Topic_Moved'] . " ";
  					$topic_id = $searchset[$i]['topic_moved_id'];
+ 
+ 					$folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ 					$newest_post_img = "";
  				}
  				else
***************
*** 994,997 ****
--- 996,1001 ----
  					{
  						$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
+ 
+ 						$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
  					}
  					else
***************
*** 999,1019 ****
  						if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
  						{
! 							$folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
  						}
  						else
  						{
! 							$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
  							$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
  						}
  					}
- 				}
- 
- 				if( $searchset[$i]['post_time'] >= $userdata['session_last_visit'] )
- 				{
- 					$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
- 				}
- 				else
- 				{
- 					$newest_post_img = "";
  				}
  
--- 1003,1026 ----
  						if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
  						{
! 							if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) 
! 							{
! 								$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
! 
! 								$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
! 							}
! 							else
! 							{
! 								$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! 								$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
! 								$newest_post_img = "";
! 							}
  						}
  						else
  						{
! 							$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
  							$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
+ 							$newest_post_img = "";
  						}
  					}
  				}