# HG changeset patch # User Dan # Date 1194745925 18000 # Node ID 2b48ca9ce4d3dbf0c2aac2e2cb744a8c85a326c8 # Parent da982928e56a6a0e0e2b1507c32896e6676402e1 Forgot a couple of strings in the installer diff -r da982928e56a -r 2b48ca9ce4d3 install.php --- a/install.php Sat Nov 10 20:35:52 2007 -0500 +++ b/install.php Sat Nov 10 20:52:05 2007 -0500 @@ -126,7 +126,7 @@ function start_install_table() { - echo '' . "\n"; + echo '
' . "\n"; ob_start(); } @@ -148,6 +148,7 @@ function echo_stage_failure($stage_id, $stage_name, $failure_explanation, $resume_stack) { global $neutral_color; + global $lang; $neutral_color = ( $neutral_color == 'A' ) ? 'C' : 'A'; echo '' . "\n"; @@ -165,11 +166,11 @@ echo ' ' . $post_data . ' -

Enano installation failed.

+

' . $lang->get('meta_msg_err_stagefailed_title') . '

' . $failure_explanation . '

- ' . ( !empty($mysql_error) ? "

The error returned from MySQL was: $mysql_error

" : '' ) . ' -

When you have corrected the error, click the button below to attempt to continue the installation.

-

+ ' . ( !empty($mysql_error) ? "

" . $lang->get('meta_msg_err_stagefailed_mysqlerror') . " $mysql_error

" : '' ) . ' +

' . $lang->get('meta_msg_err_stagefailed_body') . '

+

'; global $template, $template_bak; if ( is_object($template_bak) ) diff -r da982928e56a -r 2b48ca9ce4d3 language/english/install.json --- a/language/english/install.json Sat Nov 10 20:35:52 2007 -0500 +++ b/language/english/install.json Sat Nov 10 20:52:05 2007 -0500 @@ -29,6 +29,10 @@ msg_err_verification: 'One or more of the form fields is incorrect. Please correct any information in the form that has an "X" next to it.', + msg_err_stagefailed_title: 'Enano installation failed.', + msg_err_stagefailed_body: 'When you have corrected the error, click the button below to attempt to continue the installation.', + msg_err_stagefailed_mysqlerror: 'The error returned from MySQL was:', + btn_retry_installation: 'Retry installation', }, welcome: { modetitle: 'Welcome',
' . htmlspecialchars($stage_name) . 'Failed