[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.72,1.73 emailer.php,1.6,1.7

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

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

Modified Files:
	functions.php emailer.php 
Log Message:
Changed paths for language

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** functions.php	2001/10/06 17:50:28	1.72
--- functions.php	2001/10/11 12:17:15	1.73
***************
*** 269,279 ****
  	}
  
! 	if(file_exists("language/lang_".$board_config['default_lang'].".".$phpEx) )
  	{
! 		include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'.'.$phpEx);
  	}
  	else
  	{
! 		include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  	}
  
--- 269,279 ----
  	}
  
! 	if(file_exists("language/lang_".$board_config['default_lang']."/lang_main.".$phpEx) )
  	{
! 		include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'/lang_main.'.$phpEx);
  	}
  	else
  	{
! 		include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  	}
  
***************
*** 334,338 ****
  	for($i = 0; $i < 8; $i++)
  	{
! 		$act_key .= $chars[rand(0,$max_elements)];
  	}
  	$act_key_md = md5($act_key);
--- 334,338 ----
  	for($i = 0; $i < 8; $i++)
  	{
! 		$act_key .= $chars[rand(0, $max_elements)];
  	}
  	$act_key_md = md5($act_key);
***************
*** 710,717 ****
  		{
  			$filename = str_replace("lang_", "", $file);
! 			$filename = str_replace(".$phpEx", "", $filename);
  			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
  			$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
! 			$lang_select .= "<option value=\"$filename\"$selected>".ucwords($displayname)."</option>";
  		}
  	}
--- 710,718 ----
  		{
  			$filename = str_replace("lang_", "", $file);
! 
  			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
+ 
  			$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
! 			$lang_select .= "<option value=\"$filename\"$selected>" . ucwords($displayname) . "</option>";
  		}
  	}
***************
*** 1049,1057 ****
  			if( !empty($board_config['default_lang']) )
  			{
! 				include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx);
  			}
  			else
  			{
! 				include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  			}
  		}
--- 1050,1058 ----
  			if( !empty($board_config['default_lang']) )
  			{
! 				include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
  			}
  			else
  			{
! 				include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  			}
  		}
***************
*** 1112,1116 ****
  			// available so we're going to dump out a simple echo'd statement
  			//
! 			include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  
  			if($msg_text == "")
--- 1113,1117 ----
  			// available so we're going to dump out a simple echo'd statement
  			//
! 			include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  
  			if($msg_text == "")

Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** emailer.php	2001/09/25 18:18:47	1.6
--- emailer.php	2001/10/11 12:17:15	1.7
***************
*** 90,94 ****
  
  		$phpbb_root_path = "./";
! 		$template_file = $phpbb_root_path . "language/email/" . $template_file . "_" . $board_config['default_lang'] . ".tpl";
  		if (!file_exists($template_file))
  		{
--- 90,94 ----
  
  		$phpbb_root_path = "./";
! 		$template_file = $phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/email/" . $template_file . ".tpl";
  		if (!file_exists($template_file))
  		{