makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed paths for language

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1170 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-10-11 12:18:37 +00:00
parent bb6c0fe235
commit 5ed2aa7590
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/faq.php
View file

@ -34,7 +34,7 @@ init_userprefs($userdata);
// //
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
include($phpbb_root_path . 'language/faq_' . $board_config['default_lang'] . '.' . $phpEx); include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_faq.' . $phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "faq_body.tpl") "body" => "faq_body.tpl")

2
phpBB/includes/emailer.php
View file

@ -89,7 +89,7 @@ class emailer
global $board_config; global $board_config;
$phpbb_root_path = "./"; $phpbb_root_path = "./";
$template_file = $phpbb_root_path . "language/email/" . $template_file . "_" . $board_config['default_lang'] . ".tpl"; $template_file = $phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/email/" . $template_file . ".tpl";
if (!file_exists($template_file)) if (!file_exists($template_file))
{ {
message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__); message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);

19
phpBB/includes/functions.php
View file

@ -268,13 +268,13 @@ function init_userprefs($userdata)
} }
} }
if(file_exists("language/lang_".$board_config['default_lang'].".".$phpEx) ) if(file_exists("language/lang_".$board_config['default_lang']."/lang_main.".$phpEx) )
{ {
include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'.'.$phpEx); include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'/lang_main.'.$phpEx);
} }
else else
{ {
include($phpbb_root_path . 'language/lang_english.'.$phpEx); include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
} }
return; return;
@ -333,7 +333,7 @@ function generate_activation_key()
$act_key = ''; $act_key = '';
for($i = 0; $i < 8; $i++) for($i = 0; $i < 8; $i++)
{ {
$act_key .= $chars[rand(0,$max_elements)]; $act_key .= $chars[rand(0, $max_elements)];
} }
$act_key_md = md5($act_key); $act_key_md = md5($act_key);
@ -709,10 +709,11 @@ function language_select($default, $select_name = "language", $dirname="language
if (ereg("^lang_", $file)) if (ereg("^lang_", $file))
{ {
$filename = str_replace("lang_", "", $file); $filename = str_replace("lang_", "", $file);
$filename = str_replace(".$phpEx", "", $filename);
$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename); $displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : ""; $selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
$lang_select .= "<option value=\"$filename\"$selected>".ucwords($displayname)."</option>"; $lang_select .= "<option value=\"$filename\"$selected>" . ucwords($displayname) . "</option>";
} }
} }
$lang_select .= "</select>"; $lang_select .= "</select>";
@ -1048,11 +1049,11 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
{ {
if( !empty($board_config['default_lang']) ) if( !empty($board_config['default_lang']) )
{ {
include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx); include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
} }
else else
{ {
include($phpbb_root_path . 'language/lang_english.'.$phpEx); include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
} }
} }
@ -1111,7 +1112,7 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
// Critical errors mean we cannot rely on _ANY_ DB information being // Critical errors mean we cannot rely on _ANY_ DB information being
// available so we're going to dump out a simple echo'd statement // available so we're going to dump out a simple echo'd statement
// //
include($phpbb_root_path . 'language/lang_english.'.$phpEx); include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
if($msg_text == "") if($msg_text == "")
{ {

3
phpBB/install.php
View file

@ -160,7 +160,7 @@ include($phpbb_root_path.'includes/sessions.'.$phpEx);
// //
// Import language file, setup template ... // Import language file, setup template ...
// //
include($phpbb_root_path.'language/lang_' . $language . '.'.$phpEx); include($phpbb_root_path.'language/lang_' . $language . '/lang_main.'.$phpEx);
$template = new Template($phpbb_root_path . "templates/" . $default_template); $template = new Template($phpbb_root_path . "templates/" . $default_template);
@ -507,4 +507,5 @@ else
exit(); exit();
} }
} }
?> ?>