From da5c65e42ef2faae9313a133478a9229536c6ef4 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Tue, 10 Feb 2015 16:34:16 +0100 Subject: [PATCH] Fix location config bug (add check for disallowed characters) Add labels for different languages (just default to english for now) --- application/language/en/config_lang.php | 2 +- application/language/es/config_lang.php | 72 +++++++++---------- application/language/fr/config_lang.php | 72 +++++++++---------- application/language/id/config_lang.php | 72 +++++++++---------- application/language/nl-BE/config_lang.php | 30 ++++---- application/language/ru/config_lang.php | 72 +++++++++---------- application/language/th/config_lang.php | 66 ++++++++--------- application/language/tr/config_lang.php | 68 +++++++++--------- application/language/zh/config_lang.php | 72 +++++++++---------- application/views/configs/location_config.php | 10 ++- application/views/employees/form.php | 2 - application/views/partial/stock_locations.php | 2 +- translations/config_lang.csv | 72 +++++++++---------- 13 files changed, 308 insertions(+), 304 deletions(-) diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 9b2cbbd71..38d542d11 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -2,7 +2,6 @@ $lang["config_address"] = "Company Address"; $lang["config_address_required"] = "Company address is a required field"; -$lang["config_barcode_checksum"] = "Checksum"; $lang["config_barcode_company"] = "Company Name"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_width"] = "Width (px)"; @@ -86,3 +85,4 @@ $lang["config_location_info"] = "Location Configuration Information"; $lang["config_logout"] = "Don't you want to make a backup before logging out?"; $lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index c3c7d4a9a..1b316000b 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "Dirección del Comercio"; $lang["config_address_required"] = "Dirección del Comercio es requerida"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "Nombre del Comercio"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 0"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 1"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 2"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Nombre del Comercio"; $lang["config_company_required"] = "Nombre del Comercio es requerido"; $lang["config_company_website_url"] = "Sitio Web no es una URL estándard (http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Campo Libre 6"; $lang["config_custom7"] = "Campo Libre 7"; $lang["config_custom8"] = "Campo Libre 8"; $lang["config_custom9"] = "Campo Libre 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "% de Impuestos Predeterminada"; $lang["config_default_tax_rate_1"] = "Impuesto 1"; $lang["config_default_tax_rate_2"] = "Impuesto 2"; @@ -68,21 +67,22 @@ $lang["config_return_policy_required"] = "Política de Devolución es requerida" $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Configuración guardada satisfactoriamente"; $lang["config_saved_unsuccessfully"] = "Configuración no guardada"; -$lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = " "; -$lang["config_stock_location_required"] = ""; +$lang["config_stock_location"] = "Stock location"; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = "Impuestos incluidos"; $lang["config_timezone"] = "Zona Horaria"; $lang["config_website"] = "Sitio Web"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nombre del Comercio"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index 7bc03cb89..c2d098b38 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "Addresse"; $lang["config_address_required"] = "L\'adresse est requise"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "Nome de l\'Entreprise"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 2"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 3"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 4"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Nome de l\'Entreprise"; $lang["config_company_required"] = "Le nom d\'entreprise est requis"; $lang["config_company_website_url"] = "Le site web de l\'entreprise n\'est pas une URL valide (http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Champ Personnalisé 6"; $lang["config_custom7"] = "Champ Personnalisé 7"; $lang["config_custom8"] = "Champ Personnalisé 8"; $lang["config_custom9"] = "Champ Personnalisé 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "Taux d\'Imposition par Défaut"; $lang["config_default_tax_rate_1"] = "Taux d\'Imposition 1"; $lang["config_default_tax_rate_2"] = "Taux d\'Imposition 2"; @@ -68,21 +67,22 @@ $lang["config_return_policy_required"] = "Le Message est un champ requis"; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Configuration sauvegardée"; $lang["config_saved_unsuccessfully"] = "Échec de sauvegarde de configuration"; -$lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = ""; -$lang["config_stock_location_required"] = ""; +$lang["config_stock_location"] = "Stock location"; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = ""; $lang["config_timezone"] = "Fuseau Horaire"; $lang["config_website"] = "Site-web"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nome de l\'Entreprise"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index 19ec00652..798b825ed 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "Alamat Perusahaan"; $lang["config_address_required"] = "Alamat Perusahaan wajib diisi"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "Nama Perusahaan"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 7"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 8"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 9"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Nama Perusahaan"; $lang["config_company_required"] = "Nama Perusahaan wajib diisi"; $lang["config_company_website_url"] = "Situs Perusahaan bukan URL yang benar(http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Custom Field 6"; $lang["config_custom7"] = "Custom Field 7"; $lang["config_custom8"] = "Custom Field 8"; $lang["config_custom9"] = "Custom Field 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "Tarif Pajak Biasa%"; $lang["config_default_tax_rate_1"] = "Tarif Pajak 1"; $lang["config_default_tax_rate_2"] = "Tarif Pajak 2"; @@ -68,21 +67,22 @@ $lang["config_return_policy_required"] = "Kebijakan retur wajib diisi"; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Konfigurasi berhasil disimpan"; $lang["config_saved_unsuccessfully"] = "Konfigurasi tidak berhasil disimpan"; -$lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = ""; -$lang["config_stock_location_required"] = ""; +$lang["config_stock_location"] = "Stock location"; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = "Dikenakan Pajak"; $lang["config_timezone"] = "Zona Waktu"; $lang["config_website"] = "Situs Perusahaan"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nama Perusahaan"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php index 808cd6b6d..96f45c378 100755 --- a/application/language/nl-BE/config_lang.php +++ b/application/language/nl-BE/config_lang.php @@ -2,7 +2,6 @@ $lang["config_address"] = "Adres"; $lang["config_address_required"] = "Het adres van het bedrijf moet ingevuld worden"; -$lang["config_barcode_checksum"] = "Checksum"; $lang["config_barcode_company"] = "Bedrijfsnaam"; $lang["config_barcode_content"] = "Inhoud Barcode"; $lang["config_barcode_width"] = "Breedte (px)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Custom Veld 6"; $lang["config_custom7"] = "Custom Veld 7"; $lang["config_custom8"] = "Custom Veld 8"; $lang["config_custom9"] = "Custom Veld 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "Standaard VAT %"; $lang["config_default_tax_rate_1"] = "VAT 1 %"; $lang["config_default_tax_rate_2"] = "VAT 2 %"; @@ -86,3 +85,4 @@ $lang["config_location_info"] = "Instellingen Locatie"; $lang["config_logout"] = "Wilt u een backup maken alvorens uit te loggen?"; $lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "De bedrijfsnaam moet ingevuld worden"; diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php index db0831d9b..73f655f13 100644 --- a/application/language/ru/config_lang.php +++ b/application/language/ru/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "Адрес Компании"; $lang["config_address_required"] = "Адрес Компании обязательный пробел"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "Название Компании"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 4"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 5"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 6"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Название Компании"; $lang["config_company_required"] = "Имя Компании обязательный пробел"; $lang["config_company_website_url"] = "Веб-сайт Компании не является допустимым URL (http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Изготовленный пробел 6"; $lang["config_custom7"] = "Изготовленный пробел 7"; $lang["config_custom8"] = "Изготовленный пробел 8"; $lang["config_custom9"] = "Изготовленный пробел 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "Обычный ставка налога %"; $lang["config_default_tax_rate_1"] = "ставка налога 1"; $lang["config_default_tax_rate_2"] = "ставка налога 2"; @@ -68,21 +67,22 @@ $lang["config_return_policy_required"] = "Возвратний полис обя $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Конфигурация успешно сохранена"; $lang["config_saved_unsuccessfully"] = "Конфигурация сохраненная безуспешно"; -$lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = ""; -$lang["config_stock_location_required"] = ""; +$lang["config_stock_location"] = "Stock location"; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = "Tax Included"; $lang["config_timezone"] = "Часовой пояс"; $lang["config_website"] = "Веб-сайт"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Название Компании"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php index c8e8f5781..2410d3a1f 100644 --- a/application/language/th/config_lang.php +++ b/application/language/th/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "ที่อยู่"; $lang["config_address_required"] = "ที่อยู่ต้องกรอก"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "ชื่อร้านค้า"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 5"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 6"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 7"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "ชื่อร้านค้า"; $lang["config_company_required"] = "ชื่อร้านค้าต้องกรอก"; $lang["config_company_website_url"] = "เว็บไซต์ร้านค้าไม่ถูกต้อง"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "พื้นที่เพิ่มเติม 6"; $lang["config_custom7"] = "พื้นที่เพิ่มเติม 7"; $lang["config_custom8"] = "พื้นที่เพิ่มเติม 8"; $lang["config_custom9"] = "พื้นที่เพิ่มเติม 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "อัตราภาษีโดยปริยาย %"; $lang["config_default_tax_rate_1"] = "อัตราภาษี 1"; $lang["config_default_tax_rate_2"] = "อัตราภาษี 2"; @@ -74,15 +73,16 @@ $lang["config_stock_location_required"] = "จำเป็นต้องระ $lang["config_tax_included"] = "รวมภาษีแล้ว"; $lang["config_timezone"] = "โซนเวลา"; $lang["config_website"] = "เว็บไซต์"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "ชื่อร้านค้า"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php index 63af90957..a2140fb07 100644 --- a/application/language/tr/config_lang.php +++ b/application/language/tr/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "Şirket Adresi"; $lang["config_address_required"] = "Şirket Adresi zorunlu alandır"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "Şirket Adı"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 6"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 7"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 8"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Şirket Adı"; $lang["config_company_required"] = "Şirket Adı zorunlu alandır"; $lang["config_company_website_url"] = "website adresi yanlış (http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Özel Alan 6"; $lang["config_custom7"] = "Özel Alan 7"; $lang["config_custom8"] = "Özel Alan 8"; $lang["config_custom9"] = "Özel Alan 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "Varsayılan Vergi Oranı %"; $lang["config_default_tax_rate_1"] = "Vergi Oranı 1"; $lang["config_default_tax_rate_2"] = "Vergi Oranı 2"; @@ -69,20 +68,21 @@ $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Yapılandırma kaydedildi"; $lang["config_saved_unsuccessfully"] = "Yapılandırma kaydedilemedi"; $lang["config_stock_location"] = "Mağaza Yeri"; -$lang["config_stock_location_duplicate"] = ""; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_required"] = "Mağaza Yeri numarası zorunlu alandır"; $lang["config_tax_included"] = ""; $lang["config_timezone"] = "Saat Dilimi"; $lang["config_website"] = "Website"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Şirket Adı"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php index 242c9f44c..2751c451b 100755 --- a/application/language/zh/config_lang.php +++ b/application/language/zh/config_lang.php @@ -2,26 +2,25 @@ $lang["config_address"] = "公司地址"; $lang["config_address_required"] = "公司地址為必填"; -$lang["config_barcode_checksum"] = ""; $lang["config_barcode_company"] = "公司名稱"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_width"] = "Width (px)"; +$lang["config_barcode_first_row"] = "Row 3"; +$lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode Configuration Information"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Number in row"; +$lang["config_barcode_page_cellspacing"] = "Display page cellspacing"; +$lang["config_barcode_page_width"] = "Display page width"; $lang["config_barcode_price"] = "Price"; -$lang["config_barcode_height"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_quality"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_height"] = "Height (px)"; +$lang["config_barcode_second_row"] = "Row 4"; +$lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_third_row"] = "Row 5"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "公司名稱"; $lang["config_company_required"] = "公司名稱為必填"; $lang["config_company_website_url"] = "公司網址格式錯誤 (http://...)"; @@ -37,20 +36,20 @@ $lang["config_custom6"] = "Custom Field 6"; $lang["config_custom7"] = "Custom Field 7"; $lang["config_custom8"] = "Custom Field 8"; $lang["config_custom9"] = "Custom Field 9"; -$lang["config_default_barcode_width_number"] = ""; -$lang["config_default_barcode_width_required"] = ""; -$lang["config_default_barcode_font_size_number"] = ""; -$lang["config_default_barcode_font_size_required"] = ""; -$lang["config_default_barcode_num_in_row_number"] = ""; -$lang["config_default_barcode_num_in_row_required"] = ""; -$lang["config_default_barcode_page_cellspacing_number"] = ""; -$lang["config_default_barcode_page_cellspacing_required"] = ""; -$lang["config_default_barcode_page_width_number"] = ""; -$lang["config_default_barcode_page_width_required"] = ""; -$lang["config_default_barcode_height_number"] = ""; -$lang["config_default_barcode_height_required"] = ""; -$lang["config_default_barcode_quality_number"] = ""; -$lang["config_default_barcode_quality_required"] = ""; +$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; +$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; +$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; +$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; +$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; +$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number"; +$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field"; $lang["config_default_tax_rate"] = "預設稅率 %"; $lang["config_default_tax_rate_1"] = "稅率 1"; $lang["config_default_tax_rate_2"] = "稅率 2"; @@ -68,21 +67,22 @@ $lang["config_return_policy_required"] = "退換貨政策為必填"; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "組態設置儲存成功"; $lang["config_saved_unsuccessfully"] = "組態設置儲存失敗"; -$lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = ""; -$lang["config_stock_location_required"] = ""; +$lang["config_stock_location"] = "Stock location"; +$lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = "Tax Included"; $lang["config_timezone"] = "時區"; $lang["config_website"] = "網站"; -$lang["config_barcode_configuration"] = ""; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; $lang["config_barcode_id"] = "Item Id"; $lang["config_barcode_content"] = "Barcode Content"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "公司名稱"; -$lang["config_location_configuration"] = ""; -$lang["config_location_info"] = ""; -$lang["config_logout"] = ""; -$lang["config_backup_database"] = ""; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; +$lang["config_logout"] = "Don't you want to make a backup before logging out?"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_backup_button"] = "Backup"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/views/configs/location_config.php b/application/views/configs/location_config.php index c9d3211ed..44693ffc6 100644 --- a/application/views/configs/location_config.php +++ b/application/views/configs/location_config.php @@ -84,6 +84,11 @@ $(document).ready(function() }); return value_count < 2; }, "lang->line('config_stock_location_duplicate'); ?>"); + + $.validator.addMethod('valid_chars', function(value, element) + { + return value.indexOf('_') === -1; + }, "lang->line('config_stock_location_invalid_chars'); ?>"); $('#location_config_form').validate({ submitHandler:function(form) @@ -111,12 +116,13 @@ $(document).ready(function() { stock_location: { required:true, - stock_location: true + stock_location: true, + valid_chars: true } }, messages: { - stock_location:"lang->line('config_stock_location_required'); ?>" + stock_location:"lang->line('config_stock_location_required'); ?>" } }); }); diff --git a/application/views/employees/form.php b/application/views/employees/form.php index 964f1d2d0..cbb0bfb08 100644 --- a/application/views/employees/form.php +++ b/application/views/employees/form.php @@ -173,7 +173,6 @@ $(document).ready(function() { has_children = true; checked |= $(this).is(":checked"); - console.log("checking.. " + $(this).val() + " required " + checked); }); if (has_children && !checked) { @@ -181,7 +180,6 @@ $(document).ready(function() } } }); - console.log("returning " + !checked); return !checked; }, minlength: 1 diff --git a/application/views/partial/stock_locations.php b/application/views/partial/stock_locations.php index 422711df6..6530ba4e2 100644 --- a/application/views/partial/stock_locations.php +++ b/application/views/partial/stock_locations.php @@ -8,7 +8,7 @@ 'stock_location_'.$location_id, 'id'=>'stock_location_'.$location_id, - 'class'=>'stock_location required', + 'class'=>'stock_location valid_chars required', 'value'=>$location_name); $location_data['deleted'] && $form_data['disabled'] = 'disabled'; echo form_input($form_data); diff --git a/translations/config_lang.csv b/translations/config_lang.csv index e1631d3bb..ad73888a7 100644 --- a/translations/config_lang.csv +++ b/translations/config_lang.csv @@ -1,26 +1,25 @@ label,nl-BE,es,en,fr,zh,ru,th,tr,id config_address,Adres,Dirección del Comercio,Company Address,Addresse,公司地址,Адрес Компании,ที่อยู่,Şirket Adresi,Alamat Perusahaan config_address_required,Het adres van het bedrijf moet ingevuld worden,Dirección del Comercio es requerida,Company address is a required field,L\'adresse est requise,公司地址為必填,Адрес Компании обязательный пробел,ที่อยู่ต้องกรอก,Şirket Adresi zorunlu alandır,Alamat Perusahaan wajib diisi -config_barcode_checksum,Checksum,,Checksum,,,,,, config_barcode_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan config_barcode_content,Inhoud Barcode,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content -config_barcode_width,Breedte (px),,Width (px),,,,,, -config_barcode_first_row,Rij 1,,Row 1,,,,,, -config_barcode_font,Lettertype,,Font,,,,,, +config_barcode_width,Breedte (px),Width (px),Width (px),Width (px),Width (px),Width (px),Width (px),Width (px),Width (px) +config_barcode_first_row,Rij 1,Row 0,Row 1,Row 2,Row 3,Row 4,Row 5,Row 6,Row 7 +config_barcode_font,Lettertype,Font,Font,Font,Font,Font,Font,Font,Font config_barcode_id,Product id/naam,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name -config_barcode_info,Barcode instellingen,,Barcode Configuration Information,,,,,, -config_barcode_layout,Barcode Layout,,Barcode Layout,,,,,, +config_barcode_info,Barcode instellingen,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information,Barcode Configuration Information +config_barcode_layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout,Barcode Layout config_barcode_name,Productnaam,Name,Name,Name,Name,Name,Name,Name,Name config_barcode_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN -config_barcode_number_in_row,Aantal per rij,,Number in row,,,,,, -config_barcode_page_cellspacing,Toon cellspatiëring,,Display page cellspacing,,,,,, -config_barcode_page_width,Toon paginabreedte,,Display page width,,,,,, +config_barcode_number_in_row,Aantal per rij,Number in row,Number in row,Number in row,Number in row,Number in row,Number in row,Number in row,Number in row +config_barcode_page_cellspacing,Toon cellspatiëring,Display page cellspacing,Display page cellspacing,Display page cellspacing,Display page cellspacing,Display page cellspacing,Display page cellspacing,Display page cellspacing,Display page cellspacing +config_barcode_page_width,Toon paginabreedte,Display page width,Display page width,Display page width,Display page width,Display page width,Display page width,Display page width,Display page width config_barcode_price,Prijs,Price,Price,Price,Price,Price,Price,Price,Price -config_barcode_height,Hoogte (px),,Height (px),,,,,, -config_barcode_second_row,Rij 2,,Row 2,,,,,, -config_barcode_quality,Kwaliteit (1-100),,Quality (1-100),,,,,, -config_barcode_third_row,Rij 3,,Row 3,,,,,, -config_barcode_type,Barcode Type,,Barcode Type,,,,,, +config_barcode_height,Hoogte (px),Height (px),Height (px),Height (px),Height (px),Height (px),Height (px),Height (px),Height (px) +config_barcode_second_row,Rij 2,Row 1,Row 2,Row 3,Row 4,Row 5,Row 6,Row 7,Row 8 +config_barcode_quality,Kwaliteit (1-100),Quality (1-100),Quality (1-100),Quality (1-100),Quality (1-100),Quality (1-100),Quality (1-100),Quality (1-100),Quality (1-100) +config_barcode_third_row,Rij 3,Row 2,Row 3,Row 4,Row 5,Row 6,Row 7,Row 8,Row 9 +config_barcode_type,Barcode Type,Barcode Type,Barcode Type,Barcode Type,Barcode Type,Barcode Type,Barcode Type,Barcode Type,Barcode Type config_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan config_company_required,De bedrijfsnaam moet ingevuld worden,Nombre del Comercio es requerido,Company name is a required field,Le nom d\'entreprise est requis,公司名稱為必填,Имя Компании обязательный пробел,ชื่อร้านค้าต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi config_company_website_url,De website van het bedrijf is geen geldige URL (http://...),Sitio Web no es una URL estándard (http://...),Company website is not a valid URL (http://...),Le site web de l\'entreprise n\'est pas une URL valide (http://...),公司網址格式錯誤 (http://...),Веб-сайт Компании не является допустимым URL (http://...),เว็บไซต์ร้านค้าไม่ถูกต้อง,website adresi yanlış (http://...),Situs Perusahaan bukan URL yang benar(http://...) @@ -36,20 +35,20 @@ config_custom6,Custom Veld 6,Campo Libre 6,Custom Field 6,Champ Personnalisé 6, config_custom7,Custom Veld 7,Campo Libre 7,Custom Field 7,Champ Personnalisé 7,Custom Field 7,Изготовленный пробел 7,พื้นที่เพิ่มเติม 7,Özel Alan 7,Custom Field 7 config_custom8,Custom Veld 8,Campo Libre 8,Custom Field 8,Champ Personnalisé 8,Custom Field 8,Изготовленный пробел 8,พื้นที่เพิ่มเติม 8,Özel Alan 8,Custom Field 8 config_custom9,Custom Veld 9,Campo Libre 9,Custom Field 9,Champ Personnalisé 9,Custom Field 9,Изготовленный пробел 9,พื้นที่เพิ่มเติม 9,Özel Alan 9,Custom Field 9 -config_default_barcode_width_number,,,The default barcode width must be a number,,,,,, -config_default_barcode_width_required,,,The default barcode width is a required field,,,,,, -config_default_barcode_font_size_number,,,The default barcode font size must be a number,,,,,, -config_default_barcode_font_size_required,,,The default barcode font size is a required field,,,,,, -config_default_barcode_num_in_row_number,,,The default barcode num in row must be a number,,,,,, -config_default_barcode_num_in_row_required,,,The default barcode num in row is a required field,,,,,, -config_default_barcode_page_cellspacing_number,,,The default barcode page cellspacing must be a number,,,,,, -config_default_barcode_page_cellspacing_required,,,The default barcode page cellspacing is a required field,,,,,, -config_default_barcode_page_width_number,,,The default barcode page width must be a number,,,,,, -config_default_barcode_page_width_required,,,The default barcode page width is a required field,,,,,, -config_default_barcode_height_number,,,The default barcode height must be a number,,,,,, -config_default_barcode_height_required,,,The default barcode height is a required field,,,,,, -config_default_barcode_quality_number,,,The default barcode quality must be a number,,,,,, -config_default_barcode_quality_required,,,The default barcode quality is a required field,,,,,, +config_default_barcode_width_number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number,The default barcode width must be a number +config_default_barcode_width_required,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field,The default barcode width is a required field +config_default_barcode_font_size_number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number,The default barcode font size must be a number +config_default_barcode_font_size_required,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field,The default barcode font size is a required field +config_default_barcode_num_in_row_number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number,The default barcode num in row must be a number +config_default_barcode_num_in_row_required,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field,The default barcode num in row is a required field +config_default_barcode_page_cellspacing_number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number,The default barcode page cellspacing must be a number +config_default_barcode_page_cellspacing_required,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field,The default barcode page cellspacing is a required field +config_default_barcode_page_width_number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number,The default barcode page width must be a number +config_default_barcode_page_width_required,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field,The default barcode page width is a required field +config_default_barcode_height_number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number,The default barcode height must be a number +config_default_barcode_height_required,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field,The default barcode height is a required field +config_default_barcode_quality_number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number,The default barcode quality must be a number +config_default_barcode_quality_required,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field,The default barcode quality is a required field config_default_tax_rate,Standaard VAT %,% de Impuestos Predeterminada,Default Tax Rate %,Taux d\'Imposition par Défaut,預設稅率 %,Обычный ставка налога %,อัตราภาษีโดยปริยาย %,Varsayılan Vergi Oranı %,Tarif Pajak Biasa% config_default_tax_rate_1,VAT 1 %,Impuesto 1,Tax 1 Rate,Taux d\'Imposition 1,稅率 1,ставка налога 1,อัตราภาษี 1,Vergi Oranı 1,Tarif Pajak 1 config_default_tax_rate_2,VAT 2 %,Impuesto 2,Tax 2 Rate,Taux d\'Imposition 2,稅率 2,ставка налога 2,อัตราภาษี 2,Vergi Oranı 2,Tarif Pajak 2 @@ -67,21 +66,22 @@ config_return_policy_required,De retourvoorwaarden moeten ingevuld worden,Polít config_sales_invoice_format,Formaat Factuurnummer,,Sales Invoice Format,,,,รหัสใบเสร็จ,, config_saved_successfully,Configuratie werd bewaard,Configuración guardada satisfactoriamente,Configuration saved successfully,Configuration sauvegardée,組態設置儲存成功,Конфигурация успешно сохранена,องค์ประกอบร้านค้าบันทึกเรียบร้อย,Yapılandırma kaydedildi,Konfigurasi berhasil disimpan config_saved_unsuccessfully,Configuratie kon niet worden bewaard,Configuración no guardada,Configuration saved unsuccessfully,Échec de sauvegarde de configuration,組態設置儲存失敗,Конфигурация сохраненная безуспешно,องค์ประกอบร้านค้าบันทึกล้มเหลว,Yapılandırma kaydedilemedi,Konfigurasi tidak berhasil disimpan -config_stock_location,Stock locatie,,Stock location,,,,สถานที่เก็บ,Mağaza Yeri, -config_stock_location_duplicate,Vul een unieke naam in, ,Please use an unique location name,,,,,, -config_stock_location_required,Naam van de stock locatie is een verplicht veld,,Stock location number is a required field,,,,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır, +config_stock_location,Stock locatie,Stock location,Stock location,Stock location,Stock location,Stock location,สถานที่เก็บ,Mağaza Yeri,Stock location +config_stock_location_duplicate,Vul een unieke naam in,Please use an unique location name,Please use an unique location name,Please use an unique location name,Please use an unique location name,Please use an unique location name,,Please use an unique location name,Please use an unique location name +config_stock_location_required,Naam van de stock locatie is een verplicht veld,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır,Stock location number is a required field config_tax_included,VAT Ingebgrepen,Impuestos incluidos,Tax Included,,Tax Included,Tax Included,รวมภาษีแล้ว,,Dikenakan Pajak config_timezone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu config_website,Website,Sitio Web,Website,Site-web,網站,Веб-сайт,เว็บไซต์,Website,Situs Perusahaan -config_barcode_configuration,Barcode Configuratie,,Barcode Configuration,,,,,, +config_barcode_configuration,Barcode Configuratie,Barcode Configuration,Barcode Configuration,Barcode Configuration,Barcode Configuration,Barcode Configuration,Barcode Configuration,Barcode Configuration,Barcode Configuration config_barcode_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN config_barcode_id,Product id,Item Id,Item Id,Item Id,Item Id,Item Id,Item Id,Item Id,Item Id config_barcode_content,Inhoud Barcode,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content config_barcode_name,Productnaam,Name,Name,Name,Name,Name,Name,Name,Name config_barcode_price,Prijs,Price,Price,Price,Price,Price,Price,Price,Price config_barcode_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan -config_location_configuration,Stock Locaties,,Stock Locations,,,,,, -config_location_info,Instellingen Locatie,,Location Configuration Information,,,,,, -config_logout,Wilt u een backup maken alvorens uit te loggen?,,Don't you want to make a backup before logging out?,,,,,, -config_backup_database,Backup Database,,Backup Database,,,,,, +config_location_configuration,Stock Locaties,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations +config_location_info,Instellingen Locatie,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information +config_logout,Wilt u een backup maken alvorens uit te loggen?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out? +config_backup_database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database config_backup_button,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup +config_stock_location_invalid_chars,De bedrijfsnaam moet ingevuld worden,The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_'