From 0dde7b0e5f7ed3880716b97939ca10a94e144f69 Mon Sep 17 00:00:00 2001 From: Kay Stenschke Date: Sat, 18 Jul 2015 11:07:42 +0200 Subject: [PATCH 1/2] installer lang: changed unnecessary double into single quotes, corrected casing and some typos, sorted labels alphabetically (per context block) for easier finding of duplicate labels --- application/language/en/pagination_lang.php | 2 +- install/language/en/install_lang.php | 169 ++++++++++---------- 2 files changed, 88 insertions(+), 83 deletions(-) diff --git a/application/language/en/pagination_lang.php b/application/language/en/pagination_lang.php index 2f7334e6..34839cf8 100644 --- a/application/language/en/pagination_lang.php +++ b/application/language/en/pagination_lang.php @@ -14,4 +14,4 @@ $lang['first_link'] = 'First page'; $lang['last_link'] = 'Last page'; $lang['next_link'] = 'Next page'; -$lang['prev_link'] = 'Previous page'; +$lang['prev_link'] = 'Previous page'; \ No newline at end of file diff --git a/install/language/en/install_lang.php b/install/language/en/install_lang.php index d4221bfe..bc76892e 100755 --- a/install/language/en/install_lang.php +++ b/install/language/en/install_lang.php @@ -1,4 +1,9 @@ = 5.3'; -$lang['php_version_found'] = 'PHP version'; -$lang['mysql_support'] = 'MySQL support'; -$lang['mysql_version_found'] = 'MySQL version'; -$lang['file_uploads'] = 'File upload'; -$lang['mcrypt'] = 'PHP Mcrypt Lib'; +$lang['config_check_errors'] = 'Some base requirement are not OK.
Please correct them to continue the installation.'; +$lang['file_uploads'] = 'File Upload'; $lang['gd_lib'] = 'PHP GD Lib'; +$lang['mcrypt'] = 'PHP Mcrypt Lib'; +$lang['mysql_support'] = 'MySQL Support'; +$lang['mysql_version_found'] = 'MySQL Version'; +$lang['php_version'] = 'PHP >= 5.3'; +$lang['php_version_found'] = 'PHP Version'; +$lang['title_files_check'] = 'These files need to be writable'; +$lang['title_folder_check'] = 'These folders need to be writable'; +$lang['welcome_text'] = '

The following steps will help you to install Ionize.

Here are the results of the basic requirements check.
If one requirement isn\'t OK, please correct it and refresh this page once it is corrected.

'; +$lang['write_check_text'] = '

The following folders and files need to be writable...

'; $lang['write_config_dir'] = '/application/config/'; $lang['write_files'] = '/files/*'; $lang['write_themes'] = '/themes/*'; -$lang['config_check_errors'] = 'Some base requirement are not OK.
Please correct them to continue the installation.'; -$lang['welcome_text'] = "

The following steps will help you to install Ionize.

Here are the results of the basic requirements check.
If one requirement isn't OK, please correct it and refresh this page once it is corrected.

"; -$lang['write_check_text'] = "

The following folders and files need to be writable...

"; -$lang['title_folder_check'] = "These folders needs to be writable"; -$lang['title_files_check'] = "These files needs to be writable"; + /* |-------------------------------------------------------------------------- | Database |-------------------------------------------------------------------------- */ -$lang['database_driver'] = 'Driver'; -$lang['database_hostname'] = 'Hostname'; -$lang['database_name'] = 'Database'; -$lang['database_username'] = 'User'; -$lang['database_password'] = 'Password'; -$lang['database_create'] = 'Create the database'; -$lang['title_database_create'] = 'Database creation'; -$lang['db_create_text'] = "

Please fill your database settings.
In case of upgrade, Ionize will detect the version you're running and upgrade the DB.

Important: If you're upgrading, please first make a backup of your DB.

"; -$lang['db_create_prerequisite'] = "The user needs to have the right to create database.
If your database already exists, don't check it."; -$lang['database_error_missing_settings'] = 'Some information is missing.
Please fill all fields !'; -$lang['database_success_install'] = 'The database was successfully installed.'; -$lang['database_success_install_no_settings_needed'] = 'Database OK.
As the database already exists, the website settings step will be skipped.'; -$lang['database_success_migrate'] = 'The database was successfully upgraded.'; -$lang['database_error_coud_not_connect'] = 'Connection to the database fails with the provided settings.'; -$lang['database_error_database_dont_exists'] = "The database doesn't exist !"; -$lang['database_error_writing_config_file'] = "Error :
The file /application/config/database.php could not be written!
Check your permissions."; -$lang['database_error_coud_not_write_database'] = "Error :
Impossible to write data in the database.
Check your DB permissions."; -$lang['database_error_coud_not_create_database'] = "The installer cannot create the database. Check your database name or your rights"; -$lang['database_error_no_ionize_tables'] = "The database you selected seems not to be an Ionize database. Please check again."; -$lang['database_error_no_users_to_migrate'] = "To user account to upgrade"; -$lang['database_migration_from'] = 'This database needs an upgrade.
Upgrade from version : '; -$lang['database_migration_text'] = "

NOTICE :
The database will now be upgraded.
Please backup your database before this upgrade.

"; +$lang['database_create'] = 'Create the database'; +$lang['database_driver'] = 'Driver'; +$lang['database_error_coud_not_connect'] = 'Connection to the database fails with the provided settings.'; +$lang['database_error_coud_not_create_database'] = 'The installer cannot create the database. Check your database name or your rights'; +$lang['database_error_coud_not_write_database'] = 'Error :
Writing data into database failed.
Check your DB permissions.'; +$lang['database_error_database_dont_exists'] = 'The database doesn\'t exist!'; +$lang['database_error_missing_settings'] = 'Some information is missing.
Please fill all fields !'; +$lang['database_error_no_ionize_tables'] = 'The database you selected seems not to be an Ionize database. Please check again.'; +$lang['database_error_no_users_to_migrate'] = 'To user account to upgrade'; +$lang['database_error_writing_config_file'] = 'Error :
The file /application/config/database.php could not be written!
Check your permissions.'; +$lang['database_hostname'] = 'Hostname'; +$lang['database_migration_from'] = 'This database needs an upgrade.
Upgrade from version : '; +$lang['database_migration_text'] = '

NOTICE :
The database will now be upgraded.
Please backup your database before this upgrade.

'; +$lang['database_name'] = 'Database'; +$lang['database_password'] = 'Password'; +$lang['database_success_install'] = 'The database was successfully installed.'; +$lang['database_success_install_no_settings_needed'] = 'Database OK.
As the database already exists, the website settings step will be skipped.'; +$lang['database_success_migrate'] = 'The database was successfully upgraded.'; +$lang['database_username'] = 'User'; +$lang['db_create_prerequisite'] = 'The user needs to have the right to create database.
If your database already exists, don\'t check it.'; +$lang['db_create_text'] = '

Please enter your database settings.
In case of upgrade, Ionize will detect the version you\'re running and upgrade the DB.

Important: If you\'re upgrading, please first make a backup of your DB.

'; +$lang['title_database_create'] = 'Database creation'; /* @@ -84,42 +89,43 @@ | Settings |-------------------------------------------------------------------------- */ -$lang['lang_code'] = 'Code (en, fr-ca)'; -$lang['lang_name'] = 'Label'; -$lang['settings_default_lang_title'] = 'Default language'; -$lang['settings_default_lang_text'] = 'Your website needs a default language.
You can visit the Wikipedia ISO 639-1 page for more information about language codes.'; -$lang['settings_error_missing_lang_code'] = "The lang code is mandatory"; -$lang['settings_error_missing_lang_name'] = "The lang name is mandatory"; -$lang['settings_error_lang_code_2_chars'] = "The lang code must be on 2 chars. Example : \"en\""; -$lang['settings_error_lang_code_8_chars'] = "The lang code must be on 8 chars max. Example : \"en-us\""; -$lang['settings_error_write_rights'] = "No write rights on /application/config/language.php. Please check the PHP rights on this file."; -$lang['settings_error_write_rights_config'] = "No write rights on /application/config/config.php. Please check the PHP rights on this file."; -$lang['settings_error_admin_url'] = "The admin URL must be an alphanumerical string, without spaces or special chars"; -$lang['settings_admin_url_title'] = 'Administration panel URL'; -$lang['settings_admin_url_text'] = 'It is strongly recommended to change the default one.'; $lang['admin_url'] = 'Admin URL'; +$lang['lang_code'] = 'Code (en, fr-ca)'; +$lang['lang_name'] = 'Label'; +$lang['settings_admin_url_text'] = 'It is strongly recommended to change the default one.'; +$lang['settings_admin_url_title'] = 'Administration panel URL'; +$lang['settings_default_lang_text'] = 'Your website needs a default language.
You can visit the Wikipedia ISO 639-1 page for more information about language codes.'; +$lang['settings_default_lang_title'] = 'Default language'; +$lang['settings_error_admin_url'] = 'The admin URL must be an alphanumerical string, without spaces or special chars'; +$lang['settings_error_lang_code_2_chars'] = 'The lang code must be on 2 chars. Example : "en"'; +$lang['settings_error_lang_code_8_chars'] = 'The lang code must be on 8 chars max. Example : "en-us"'; +$lang['settings_error_missing_lang_code'] = 'The lang code is mandatory'; +$lang['settings_error_missing_lang_name'] = 'The lang name is mandatory'; +$lang['settings_error_write_rights'] = 'No write rights on /application/config/language.php. Please check the PHP rights on this file.'; +$lang['settings_error_write_rights_config'] = 'No write rights on /application/config/config.php. Please check the PHP rights on this file.'; + /* |-------------------------------------------------------------------------- | User |-------------------------------------------------------------------------- */ -$lang['user_introduction'] = 'You will connect to the Administration panel with this login.'; -$lang['username'] = 'Login (min. 4 chars)'; -$lang['firstname'] = 'First name'; -$lang['lastname'] = 'Last name'; -$lang['screen_name'] = 'Full name'; -$lang['email'] = 'Email'; -$lang['password'] = 'Password (min. 4 chars)'; -$lang['password2'] = 'Confirm password'; -$lang['user_error_missing_settings'] = 'Please fill all fields !'; -$lang['user_error_not_enough_char'] = 'Login and Password must be at least 4 char length!'; -$lang['user_error_email_not_valid'] = 'Email seems not to be valid. Please correct.'; -$lang['user_error_passwords_not_equal'] = 'Password and confirmation password are not equal. '; -$lang['user_info_admin_exists'] = 'An administrator user already exists in the database.
You can skip this step if you wish not to create or update an Admin account.

IMPORTANT : You need to copy the encryption key from your old website to be able to login if you already have users in your DB:
See: /application/config/config.php -> $config[\'encryption_key\']'; -$lang['encryption_key'] = 'Encryption Key'; -$lang['encryption_key_text'] = "Ionize needs an 128 bits Encryption Key.
This key will encode the users account and all sensitive data.
It will be written in the /application/config/config.php file."; -$lang['no_encryption_key_found'] = "The encryption key was not found. the user account were not migrated. You must create a new Admin user."; +$lang['email'] = 'Email'; +$lang['encryption_key'] = 'Encryption Key'; +$lang['encryption_key_text'] = 'Ionize needs an 128 bits Encryption Key.
This key will encode the users account and all sensitive data.
It will be written in the /application/config/config.php file.'; +$lang['firstname'] = 'First Name'; +$lang['lastname'] = 'Last Name'; +$lang['no_encryption_key_found'] = 'The encryption key was not found. the user account were not migrated. You must create a new Admin user.'; +$lang['password'] = 'Password (min. 4 chars)'; +$lang['password2'] = 'Confirm Password'; +$lang['screen_name'] = 'Full Name'; +$lang['user_error_email_not_valid'] = 'Email seems not to be valid. Please correct.'; +$lang['user_error_missing_settings'] = 'Please fill all fields !'; +$lang['user_error_not_enough_char'] = 'Login and Password must be at least 4 char length!'; +$lang['user_error_passwords_not_equal'] = 'Password and confirmation password are not equal. '; +$lang['user_info_admin_exists'] = 'An administrator user already exists in the database.
You can skip this step if you wish not to create or update an Admin account.

IMPORTANT : You need to copy the encryption key from your old website to be able to login if you already have users in your DB:
See: /application/config/config.php -> $config[\'encryption_key\']'; +$lang['user_introduction'] = 'You will connect to the Administration panel with this login.'; +$lang['username'] = 'Login (min. 4 chars)'; /* @@ -127,10 +133,9 @@ | Data |-------------------------------------------------------------------------- */ -$lang['data_install_intro'] = "

If this is the first time you use Ionize, it's strongly recommended you install the sample website.
This website includes :

  • A complete set of data, useful to test Ionize,
  • 1 working example theme
"; -$lang['title_skip_this_step'] = "Skip this step"; - -$lang['title_finish'] = 'Installation completed'; -$lang['finish_text'] = 'IMPORTANT:
You have to delete the "/install" folder manually before accessing the website or the admin section.'; -$lang['button_go_to_admin'] = 'Go to admin'; -$lang['button_go_to_site'] = 'Go to website'; +$lang['button_go_to_admin'] = 'Go to admin'; +$lang['button_go_to_site'] = 'Go to website'; +$lang['data_install_intro'] = '

If this is the first time you use Ionize, it is strongly recommended to install the sample website.
This website includes:

  • A complete set of data, useful to test Ionize,
  • 1 working example theme
'; +$lang['finish_text'] = 'IMPORTANT:
You have to delete the "/install" folder manually before accessing the website or the administration backend.'; +$lang['title_finish'] = 'Installation completed'; +$lang['title_skip_this_step'] = 'Skip this step'; \ No newline at end of file From 85e6c77ecc01c85e58c12cc2a60aee2f21a8da97 Mon Sep 17 00:00:00 2001 From: Kay Stenschke Date: Sat, 18 Jul 2015 11:40:13 +0200 Subject: [PATCH 2/2] installer lang: removed incorrect spaces before punctuation --- install/language/en/install_lang.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/install/language/en/install_lang.php b/install/language/en/install_lang.php index bc76892e..613bf79f 100755 --- a/install/language/en/install_lang.php +++ b/install/language/en/install_lang.php @@ -13,7 +13,7 @@ |-------------------------------------------------------------------------- */ $lang['title_ionize_installation'] = 'Ionize Installation'; -$lang['title_welcome'] = 'Welcome to Ionize !'; +$lang['title_welcome'] = 'Welcome to Ionize!'; $lang['title_system_check'] = 'System check result'; $lang['title_database_settings'] = 'Database settings'; $lang['title_user_account'] = 'Admin user account'; @@ -64,15 +64,15 @@ $lang['database_driver'] = 'Driver'; $lang['database_error_coud_not_connect'] = 'Connection to the database fails with the provided settings.'; $lang['database_error_coud_not_create_database'] = 'The installer cannot create the database. Check your database name or your rights'; -$lang['database_error_coud_not_write_database'] = 'Error :
Writing data into database failed.
Check your DB permissions.'; +$lang['database_error_coud_not_write_database'] = 'Error:
Writing data into database failed.
Check your DB permissions.'; $lang['database_error_database_dont_exists'] = 'The database doesn\'t exist!'; -$lang['database_error_missing_settings'] = 'Some information is missing.
Please fill all fields !'; +$lang['database_error_missing_settings'] = 'Some information is missing.
Please fill all fields!'; $lang['database_error_no_ionize_tables'] = 'The database you selected seems not to be an Ionize database. Please check again.'; $lang['database_error_no_users_to_migrate'] = 'To user account to upgrade'; -$lang['database_error_writing_config_file'] = 'Error :
The file /application/config/database.php could not be written!
Check your permissions.'; +$lang['database_error_writing_config_file'] = 'Error:
The file /application/config/database.php could not be written!
Check your permissions.'; $lang['database_hostname'] = 'Hostname'; -$lang['database_migration_from'] = 'This database needs an upgrade.
Upgrade from version : '; -$lang['database_migration_text'] = '

NOTICE :
The database will now be upgraded.
Please backup your database before this upgrade.

'; +$lang['database_migration_from'] = 'This database needs an upgrade.
Upgrade from version: '; +$lang['database_migration_text'] = '

NOTICE:
The database will now be upgraded.
Please backup your database before this upgrade.

'; $lang['database_name'] = 'Database'; $lang['database_password'] = 'Password'; $lang['database_success_install'] = 'The database was successfully installed.'; @@ -97,8 +97,8 @@ $lang['settings_default_lang_text'] = 'Your website needs a default language.
You can visit the Wikipedia ISO 639-1 page for more information about language codes.'; $lang['settings_default_lang_title'] = 'Default language'; $lang['settings_error_admin_url'] = 'The admin URL must be an alphanumerical string, without spaces or special chars'; -$lang['settings_error_lang_code_2_chars'] = 'The lang code must be on 2 chars. Example : "en"'; -$lang['settings_error_lang_code_8_chars'] = 'The lang code must be on 8 chars max. Example : "en-us"'; +$lang['settings_error_lang_code_2_chars'] = 'The lang code must be on 2 chars. Example: "en"'; +$lang['settings_error_lang_code_8_chars'] = 'The lang code must be on 8 chars max. Example: "en-us"'; $lang['settings_error_missing_lang_code'] = 'The lang code is mandatory'; $lang['settings_error_missing_lang_name'] = 'The lang name is mandatory'; $lang['settings_error_write_rights'] = 'No write rights on /application/config/language.php. Please check the PHP rights on this file.'; @@ -120,10 +120,10 @@ $lang['password2'] = 'Confirm Password'; $lang['screen_name'] = 'Full Name'; $lang['user_error_email_not_valid'] = 'Email seems not to be valid. Please correct.'; -$lang['user_error_missing_settings'] = 'Please fill all fields !'; +$lang['user_error_missing_settings'] = 'Please fill all fields!'; $lang['user_error_not_enough_char'] = 'Login and Password must be at least 4 char length!'; $lang['user_error_passwords_not_equal'] = 'Password and confirmation password are not equal. '; -$lang['user_info_admin_exists'] = 'An administrator user already exists in the database.
You can skip this step if you wish not to create or update an Admin account.

IMPORTANT : You need to copy the encryption key from your old website to be able to login if you already have users in your DB:
See: /application/config/config.php -> $config[\'encryption_key\']'; +$lang['user_info_admin_exists'] = 'An administrator user already exists in the database.
You can skip this step if you wish not to create or update an Admin account.

IMPORTANT: You need to copy the encryption key from your old website to be able to login if you already have users in your DB:
See: /application/config/config.php -> $config[\'encryption_key\']'; $lang['user_introduction'] = 'You will connect to the Administration panel with this login.'; $lang['username'] = 'Login (min. 4 chars)'; @@ -138,4 +138,4 @@ $lang['data_install_intro'] = '

If this is the first time you use Ionize, it is strongly recommended to install the sample website.
This website includes:

  • A complete set of data, useful to test Ionize,
  • 1 working example theme
'; $lang['finish_text'] = 'IMPORTANT:
You have to delete the "/install" folder manually before accessing the website or the administration backend.'; $lang['title_finish'] = 'Installation completed'; -$lang['title_skip_this_step'] = 'Skip this step'; \ No newline at end of file +$lang['title_skip_this_step'] = 'Skip this step';