diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php index 269c75f40..e99bbdff9 100644 --- a/application/hooks/load_config.php +++ b/application/hooks/load_config.php @@ -16,7 +16,7 @@ function load_config() if (!file_exists('../application/language/' . current_language_code())) { $CI->config->set_item('language', 'english'); - $CI->config->set_item('language_code', 'en'); + $CI->config->set_item('language_code', 'en-US'); } load_language_files('../vendor/codeigniter/framework/system/language', current_language()); diff --git a/application/language/en/bootstrap_tables_lang.php b/application/language/en/bootstrap_tables_lang.php deleted file mode 100644 index 1f671c6eb..000000000 --- a/application/language/en/bootstrap_tables_lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/en/item_kits_lang.php b/application/language/en/item_kits_lang.php deleted file mode 100644 index dee476c45..000000000 --- a/application/language/en/item_kits_lang.php +++ /dev/null @@ -1,31 +0,0 @@ -lang->line('config_language'), 'language', array('class' => 'control-label col-xs-2')); ?>
'English', + 'en-US:english' => 'American English', + 'en-GB:english' => 'British English', 'es:spanish' => 'Spanish', 'nl-BE:dutch' => 'Dutch (Belgium)', 'de:german' => 'German (Germany)', diff --git a/database/3.0.2_to_3.1.0.sql b/database/3.0.2_to_3.1.0.sql index ecb816eb3..9c8830e1c 100644 --- a/database/3.0.2_to_3.1.0.sql +++ b/database/3.0.2_to_3.1.0.sql @@ -417,3 +417,7 @@ ALTER TABLE ospos_items MODIFY custom8 VARCHAR(255) DEFAULT NULL, MODIFY custom9 VARCHAR(255) DEFAULT NULL, MODIFY custom10 VARCHAR(255) DEFAULT NULL; + +-- Change language code en to be en-US + +UPDATE `ospos_app_config` SET `language_code` = 'en-US' WHERE `language_code` = 'en'; diff --git a/database/database.sql b/database/database.sql index 6f30b169d..ad706468b 100644 --- a/database/database.sql +++ b/database/database.sql @@ -98,7 +98,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('customer_sales_tax_support', '0'), ('statistics', '1'), ('language', 'english'), -('language_code', 'en'), +('language_code', 'en-US'), ('date_or_time_format', ''), ('dinner_table_enable', '0'), ('customer_reward_enable', '0'), diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index 72cda9d20..5c782e9ba 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -98,7 +98,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('customer_sales_tax_support', '0'), ('statistics', '1'), ('language', 'english'), -('language_code', 'en'), +('language_code', 'en-US'), ('date_or_time_format', ''), ('dinner_table_enable', '0'), ('customer_reward_enable', '0'), diff --git a/database/tables.sql b/database/tables.sql index 43acceb87..1c47f83ec 100644 --- a/database/tables.sql +++ b/database/tables.sql @@ -98,7 +98,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('customer_sales_tax_support', '0'), ('statistics', '1'), ('language', 'english'), -('language_code', 'en'), +('language_code', 'en-US'), ('date_or_time_format', ''), ('dinner_table_enable', '0'), ('customer_reward_enable', '0'),