Fixed some unlocalized strings in installer
authorDan
Tue, 22 Jul 2008 17:04:18 -0500
changeset 656 24de7d08b7ea
parent 655 b2c51a68209b
child 657 8525475e27d5
Fixed some unlocalized strings in installer
install/includes/stages/database_post.php
install/includes/stages/finish.php
install/includes/stages/install.php
install/includes/stages/sysreqs.php
language/english/install.json
--- a/install/includes/stages/database_post.php	Tue Jul 22 17:03:53 2008 -0500
+++ b/install/includes/stages/database_post.php	Tue Jul 22 17:04:18 2008 -0500
@@ -184,7 +184,6 @@
   <form action="install.php?stage=website" method="post" name="install_db_post" onsubmit="return verify();">
   <input type="hidden" name="language" value="<?php echo $lang_id; ?>" />
   <?php
-  // FIXME: l10n
   ?>
   <h3><?php echo $lang->get('database_msg_success_title'); ?></h3>
   <p><?php echo $lang->get('database_msg_success_body'); ?></p>
@@ -201,7 +200,6 @@
 }
 else
 {
-  // FIXME: l10n
   ?>
   <form action="install.php?stage=database" method="post" name="database_info">
     <input type="hidden" name="language" value="<?php echo $lang_id; ?>" />
--- a/install/includes/stages/finish.php	Tue Jul 22 17:03:53 2008 -0500
+++ b/install/includes/stages/finish.php	Tue Jul 22 17:04:18 2008 -0500
@@ -49,7 +49,6 @@
   return true;
 }
 
-// FIXME: l10n
 start_install_table();
 
 run_installer_stage('load', $lang->get('install_stg_load_title'), 'stg_load_files', $lang->get('install_stg_load_body'), false);
--- a/install/includes/stages/install.php	Tue Jul 22 17:03:53 2008 -0500
+++ b/install/includes/stages/install.php	Tue Jul 22 17:04:18 2008 -0500
@@ -49,7 +49,7 @@
     </p>
     <p>
       <!-- FIXME: l10n -->
-      <input type="submit" name="_cont" value="Go back" />
+      <input type="submit" name="_cont" value="<?php echo $lang->get('database_btn_go_back'); ?>" />
     </p>
   </form>
   <?php
@@ -80,7 +80,6 @@
   return true;
 }
 
-// FIXME: l10n
 start_install_table();
 
 run_installer_stage('load', $lang->get('install_stg_load_title'), 'stg_load_files', $lang->get('install_stg_load_body'), false);
--- a/install/includes/stages/sysreqs.php	Tue Jul 22 17:03:53 2008 -0500
+++ b/install/includes/stages/sysreqs.php	Tue Jul 22 17:04:18 2008 -0500
@@ -81,7 +81,7 @@
 
 <?php
 run_test('return version_compare(\'5.2.0\', PHP_VERSION, \'<=\');', $lang->get('sysreqs_req_php5'), $lang->get('sysreqs_req_desc_php5'), true);
-run_test('return function_exists(\'mysql_connect\');', $lang->get('sysreqs_req_mysql'), $lang->get('sysreqs_req_desc_mysql') );
+run_test('return function_exists(\'mysql_connect\');', $lang->get('sysreqs_req_mysql'), $lang->get('sysreqs_req_desc_mysql'), true);
 run_test('return function_exists(\'pg_connect\');', $lang->get('sysreqs_req_postgres'), $lang->get('sysreqs_req_desc_postgres'), true);
 run_test('return @ini_get(\'file_uploads\');', $lang->get('sysreqs_req_uploads'), $lang->get('sysreqs_req_desc_uploads') );
 run_test('return is_apache();', $lang->get('sysreqs_req_apache'), $lang->get('sysreqs_req_desc_apache'), true);
@@ -91,8 +91,7 @@
 run_test('return is_writable(ENANO_ROOT.\'/files/\');', $lang->get('sysreqs_req_fileswriteable'), $lang->get('sysreqs_req_desc_fileswriteable'), true);
 if ( !function_exists('mysql_connect') && !function_exists('pg_connect') )
 {
-  // FIXME: l10n
-  run_test('return false;', 'No database drivers are available.', 'You need to have at least one database driver working to install Enano. See the warnings on MySQL and PostgreSQL above for more information on installing these database drivers.', false);
+  run_test('return false;', $lang->get('sysreqs_req_nodbdrivers'), $lang->get('sysreqs_req_desc_nodbdrivers'), false);
 }
 echo '</table>';
 echo '<br />';
--- a/language/english/install.json	Tue Jul 22 17:03:53 2008 -0500
+++ b/language/english/install.json	Tue Jul 22 17:04:18 2008 -0500
@@ -76,6 +76,7 @@
       req_magick: 'ImageMagick support',
       req_cachewriteable: 'Cache directory writable',
       req_fileswriteable: 'File uploads directory writable',
+      req_nodbdrivers: 'No database drivers are available.',
       
       req_desc_php: 'It seems that the version of PHP that your server is running is too old to support Enano properly. If this is your server, please upgrade to the most recent version of PHP, remembering to use the --with-mysql configure option if you compile it yourself. If this is not your server, please contact your webhost and ask them if it would be possible to upgrade PHP. If this is not possible, you will need to switch to a different webhost in order to use Enano.',
       req_desc_php5: 'Your server does not have support for PHP 5.2.0. While you may continue installing Enano, please be warned that as of December 31, 2007, all support for Enano on PHP 4 servers is discontinued. If you have at least PHP 5.0.0, support will still be available, but there are many security problems in PHP versions under 5.2.0 that Enano cannot effectively prevent.',
@@ -87,6 +88,7 @@
       req_desc_magick: 'Enano uses ImageMagick to scale images into thumbnails. Because ImageMagick was not found on your server, Enano will use the width= and height= attributes on the &lt;img&gt; tag to scale images. This can cause somewhat of a performance increase, but bandwidth usage will be higher, especially if you use high-resolution images on your site.<br /><br />If you are sure that you have ImageMagick, you can set the location of the "convert" program using the administration panel after installation is complete.',
       req_desc_cachewriteable: 'Apparently the cache/ directory is not writable. Enano will still work, but you will not be able to cache thumbnails, meaning the server will need to re-render them each time they are requested. In some cases, this can cause a significant slowdown.',
       req_desc_fileswriteable: 'It seems that the directory where uploaded files are stored (%enano_root%/files) cannot be written by the server. Enano will still function, but file uploads will not function, and will be disabled by default.',
+      req_desc_nodbdrivers: 'You need to have at least one database driver working to install Enano. See the warnings on MySQL and PostgreSQL above for more information on installing these database drivers.',
       
       summary_success_title: 'Your server meets all the requirements for running Enano.',
       summary_success_body: 'Click the button below to continue the installation.',