diff -r c671f3bb8aed -r a7d0f2711df1 includes/template.php --- a/includes/template.php Tue Nov 06 16:22:43 2007 -0500 +++ b/includes/template.php Wed Nov 07 00:34:22 2007 -0500 @@ -1894,13 +1894,14 @@ { global $sideinfo; global $this_page; + global $lang; global $db, $session, $paths, $template, $plugins; // Common objects $tplvars = $this->extract_vars('elements.tpl'); $tb = ''; // Get the "article" button text (depends on namespace) - if(defined('IN_ENANO_INSTALL')) $ns = 'installation page'; + if(defined('IN_ENANO_INSTALL')) $ns = $lang->get('meta_btn_article'); else $ns = 'system error page'; - $t = str_replace('{FLAGS}', 'onclick="if ( !KILL_SWITCH ) { return false; }" title="Hey! A button that doesn\'t do anything. Clever..." accesskey="a"', $tplvars['toolbar_button']); + $t = str_replace('{FLAGS}', 'onclick="return false;" title="Hey! A button that doesn\'t do anything. Clever..." accesskey="a"', $tplvars['toolbar_button']); $t = str_replace('{HREF}', '#', $t); $t = str_replace('{TEXT}', $ns, $t); $tb .= $t; @@ -1923,22 +1924,28 @@ $title = ( is_object($paths) ) ? $paths->page : 'Critical error'; + $headers = ''; + if ( defined('IN_ENANO_INSTALL') ) + { + $headers .= ''; + } + // The rewritten template engine will process all required vars during the load_template stage instead of (cough) re-processing everything each time around. $tpl_strings = Array( 'PAGE_NAME'=>$this_page, 'PAGE_URLNAME'=>'Null', - 'SITE_NAME'=>'Enano Installation', + 'SITE_NAME'=>$lang->get('meta_site_name'), 'USERNAME'=>'admin', - 'SITE_DESC'=>'Install Enano on your server.', + 'SITE_DESC'=>$lang->get('meta_site_desc'), 'TOOLBAR'=>$tb, 'SCRIPTPATH'=>scriptPath, 'CONTENTPATH'=>contentPath, 'ADMIN_SID_QUES'=>$asq, 'ADMIN_SID_AMP'=>$asa, 'ADMIN_SID_AMP_HTML'=>'', - 'ADDITIONAL_HEADERS'=>'', + 'ADDITIONAL_HEADERS'=>$headers, 'SIDEBAR_EXTRA'=>'', - 'COPYRIGHT'=>'Enano and all of its code, graphics, and more code is copyright © 2006 Dan Fuhry.
This program is Free Software; see the file "GPL" included with this package for details.', + 'COPYRIGHT'=>$lang->get('meta_enano_copyright'), 'TOOLBAR_EXTRAS'=>'', 'REQUEST_URI'=>( isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '' ).$_SERVER['REQUEST_URI'], 'STYLE_LINK'=>$slink, @@ -1947,7 +1954,7 @@ 'TEMPLATE_DIR'=>scriptPath.'/themes/'.$this->theme, 'THEME_ID'=>$this->theme, 'STYLE_ID'=>$this->style, - 'JS_DYNAMIC_VARS'=>'', + 'JS_DYNAMIC_VARS'=>'', 'SIDEBAR_RIGHT'=>'', ); $this->tpl_strings = array_merge($tpl_strings, $this->tpl_strings); @@ -1964,7 +1971,7 @@ } $p = $this->makeParserText($tplvars['sidebar_section']); $p->assign_vars(Array( - 'TITLE'=>'Installation progress', + 'TITLE'=>$lang->get('meta_sidebar_heading'), 'CONTENT'=>$sidebar, )); $sidebar = $p->run();