diff -r 0b7ff06aad13 -r f3a5a276208c language/english/install.json --- a/language/english/install.json Fri Mar 06 11:19:55 2009 -0500 +++ b/language/english/install.json Sat Mar 14 14:06:02 2009 -0400 @@ -87,6 +87,7 @@ req_postgresql: 'PostgreSQL database support', req_safemode: 'Safe Mode', req_uploads: 'PHP file upload support', + req_ctype: 'PHP ctype_* validation functions', req_config_writable: 'Configuration file: config.new.php', req_htaccess_writable: 'Apache rewrite rules: .htaccess.new', req_files_writable: 'File storage directory: files/', @@ -182,7 +183,9 @@ table_title: 'Database information', field_hostname_title: 'Database hostname', - field_hostname_body: 'This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost".', + field_hostname_body: 'This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost". To connect through a Unix socket, use the format ":/path/to/mysql.sock".', + field_port_title: 'Database port', + field_port_body: 'The TCP port Enano will use to connect to MySQL. This is 3306 on the vast majority of servers. This isn\'t relevant if you use a socket file.', field_dbname_title: 'Database name', field_dbname_body: 'The name of the actual database. If you don\'t already have a database, you can create one here, if you have the username and password of a MySQL user with administrative rights.', field_dbauth_title: 'Database login', @@ -218,6 +221,8 @@ field_hostname_title: 'Database hostname', field_hostname_body: 'This is the hostname (or sometimes the IP address) of your PostgreSQL server. In many cases, this is "localhost".', + field_port_title: 'Database port', + field_port_body: 'The TCP port Enano will use to connect to PostgreSQL. This is 5432 on the vast majority of servers.', field_dbname_title: 'Database name', field_dbname_body: 'The name of the actual database. If you don\'t already have a database, you can create one here, if you have the username and password of a PostgreSQL user with administrative rights.', field_dbauth_title: 'Database login', @@ -438,6 +443,7 @@ prompt_dbdriver: 'Database type (mysql or postgresql)', prompt_dbhost: 'Hostname of database server', + prompt_dbport: 'Database server port', prompt_dbuser: 'Database username', prompt_dbpasswd: 'Database password', prompt_dbname: 'Database name', @@ -461,9 +467,11 @@ stage_sysreqs: 'Checking system.\n', test_pass: 'PASS', - test_warn: 'FAIL', + test_vwarn: 'WARNING', + test_warn: 'FAIL (optional)', test_fail: 'FAIL', + msg_test_warnings: 'The following warnings were generated during the check:', msg_tests_passed: 'All tests passed. Installing Enano.\n', msg_installing_db_stage1: 'Installing database, stage 1...', msg_parsing_schema: 'Preparing installation payload...',