From 340792cfc2fe56df2e7de641fdb29cb1a0b7ff64 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 13 Mar 2016 10:07:59 +0000 Subject: [PATCH] change "E-mail" to be "email" (#116) --- application/language/de-CH/sales_lang.php | 2 +- application/language/en/common_lang.php | 4 ++-- application/language/en/sales_lang.php | 2 +- application/language/es/common_lang.php | 4 ++-- application/language/fr/common_lang.php | 2 +- application/language/fr/sales_lang.php | 4 ++-- application/language/id/common_lang.php | 4 ++-- application/language/id/sales_lang.php | 2 +- application/language/nl-BE/sales_lang.php | 2 +- application/language/ru/sales_lang.php | 2 +- application/language/th/common_lang.php | 4 ++-- application/language/zh/common_lang.php | 4 ++-- application/language/zh/sales_lang.php | 2 +- dist/opensourcepos.js | 2 +- import_customers.csv | 2 +- js/manage_tables.js | 2 +- system/language/nl-BE/email_lang.php | 2 +- system/language/nl-BE/form_validation_lang.php | 4 ++-- system/libraries/Email.php | 4 ++-- translations/common_lang.csv | 4 ++-- translations/sales_lang.csv | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/application/language/de-CH/sales_lang.php b/application/language/de-CH/sales_lang.php index 53de8e226..ee0565003 100644 --- a/application/language/de-CH/sales_lang.php +++ b/application/language/de-CH/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Ändern"; $lang["sales_edit_item"] = "Ändere Art."; $lang["sales_edit_sale"] = "Auftrag ändern"; -$lang["sales_email_receipt"] = "Quittung per E-Mail"; +$lang["sales_email_receipt"] = "Quittung per Email"; $lang["sales_employee"] = "Mitarbeiter"; $lang["sales_error_editing_item"] = "Fehler beim Ändern des Artikels"; $lang["sales_find_or_scan_item"] = "Finde/Scanne Artikel"; diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php index dc8edcfc3..67c4428ff 100644 --- a/application/language/en/common_lang.php +++ b/application/language/en/common_lang.php @@ -12,8 +12,8 @@ $lang["common_delete"] = "Delete"; $lang["common_print"] = "Print"; $lang["common_det"] = "details"; $lang["common_edit"] = "edit"; -$lang["common_email"] = "E-Mail"; -$lang["common_email_invalid_format"] = "The e-mail address is not in the proper format"; +$lang["common_email"] = "Email"; +$lang["common_email_invalid_format"] = "The email address is not in the proper format"; $lang["common_fields_required_message"] = "Fields in red are required"; $lang["common_first_name"] = "First Name"; $lang["common_first_name_required"] = "The first name is a required field."; diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index 58fc49614..2d28ba548 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Edit"; $lang["sales_edit_item"] = "Edit Item"; $lang["sales_edit_sale"] = "Edit Sale"; -$lang["sales_email_receipt"] = "E-Mail Receipt"; +$lang["sales_email_receipt"] = "Email Receipt"; $lang["sales_employee"] = "Employee"; $lang["sales_error_editing_item"] = "Error editing item"; $lang["sales_find_or_scan_item"] = "Find/Scan Item"; diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php index 3d31a0da9..1e70c021a 100644 --- a/application/language/es/common_lang.php +++ b/application/language/es/common_lang.php @@ -12,8 +12,8 @@ $lang["common_delete"] = "Borrar"; $lang["common_print"] = "Print"; $lang["common_det"] = "detalles"; $lang["common_edit"] = "editar"; -$lang["common_email"] = "E-Mail"; -$lang["common_email_invalid_format"] = "El e-mail no está en el formato requerido"; +$lang["common_email"] = "Email"; +$lang["common_email_invalid_format"] = "El email no está en el formato requerido"; $lang["common_fields_required_message"] = "Los campos en rojo son requeridos"; $lang["common_first_name"] = "Nombre"; $lang["common_first_name_required"] = "Nombre es un campo requerido"; diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php index 142cdb416..464cf7ec9 100644 --- a/application/language/fr/common_lang.php +++ b/application/language/fr/common_lang.php @@ -12,7 +12,7 @@ $lang["common_delete"] = "Effacer"; $lang["common_print"] = "Imprimer"; $lang["common_det"] = "détails"; $lang["common_edit"] = "éditer"; -$lang["common_email"] = "E-Mail"; +$lang["common_email"] = "Email"; $lang["common_email_invalid_format"] = "Le format de l\'adresse électronique est incorrect"; $lang["common_fields_required_message"] = "Les champs en rouge sont requis"; $lang["common_first_name"] = "Prénom"; diff --git a/application/language/fr/sales_lang.php b/application/language/fr/sales_lang.php index 2755ae7ca..3b16de848 100644 --- a/application/language/fr/sales_lang.php +++ b/application/language/fr/sales_lang.php @@ -35,9 +35,9 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Éditer"; $lang["sales_edit_item"] = "Éditer Item"; $lang["sales_edit_sale"] = "Éditer Vente"; -$lang["sales_email_receipt"] = "Recu par E-Mail"; +$lang["sales_email_receipt"] = "Recu par Email"; $lang["sales_employee"] = "Employé"; -$lang["sales_error_editing_item"] = "Érreur lors de l\'édition"; +$lang["sales_error_editing_item"] = "Érreur lors de l'édition"; $lang["sales_find_or_scan_item"] = "Trouver/Scanner Item"; $lang["sales_find_or_scan_item_or_receipt"] = "Trouver/Scanner Item OU Recu"; $lang["sales_giftcard"] = "Carte Cadeau"; diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php index 6b8401901..e100fd476 100644 --- a/application/language/id/common_lang.php +++ b/application/language/id/common_lang.php @@ -12,8 +12,8 @@ $lang["common_delete"] = "Hapus"; $lang["common_print"] = "Print"; $lang["common_det"] = "Detail"; $lang["common_edit"] = "Ubah"; -$lang["common_email"] = "E-Mail"; -$lang["common_email_invalid_format"] = "Format alamat e-mail tidak benar"; +$lang["common_email"] = "Email"; +$lang["common_email_invalid_format"] = "Format alamat email tidak benar"; $lang["common_fields_required_message"] = "Bagian yang ditandai warna merah wajib diisi"; $lang["common_first_name"] = "Nama Depan"; $lang["common_first_name_required"] = "Nama depan wajib diisi."; diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php index 3eb4f1bcd..cbdc628a9 100644 --- a/application/language/id/sales_lang.php +++ b/application/language/id/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Ubah"; $lang["sales_edit_item"] = "Ubah Item"; $lang["sales_edit_sale"] = "Ubah Penjualan"; -$lang["sales_email_receipt"] = "e-Mail Faktur"; +$lang["sales_email_receipt"] = "email Faktur"; $lang["sales_employee"] = "Karyawan"; $lang["sales_error_editing_item"] = "mengubah item salah"; $lang["sales_find_or_scan_item"] = "Cari/Scan Item"; diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php index b5c3a9861..e61b2fb46 100755 --- a/application/language/nl-BE/sales_lang.php +++ b/application/language/nl-BE/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Bewerk"; $lang["sales_edit_item"] = "Bewaar"; $lang["sales_edit_sale"] = "Bewerk Ticket"; -$lang["sales_email_receipt"] = "E-Mail Ticket"; +$lang["sales_email_receipt"] = "Email Ticket"; $lang["sales_employee"] = "Werknemer"; $lang["sales_error_editing_item"] = "Fout bij bewerken"; $lang["sales_find_or_scan_item"] = "Zoek/Scan Product"; diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php index 23e1e295f..201b0377f 100644 --- a/application/language/ru/sales_lang.php +++ b/application/language/ru/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "редактировать"; $lang["sales_edit_item"] = "Редактировать Товар"; $lang["sales_edit_sale"] = "Редактировать продажи"; -$lang["sales_email_receipt"] = "послать квитанция по E-Mail"; +$lang["sales_email_receipt"] = "послать квитанция по Email"; $lang["sales_employee"] = "сотрудник"; $lang["sales_error_editing_item"] = "Ошибка редактирования товара"; $lang["sales_find_or_scan_item"] = "Найти/Сканировать Товара"; diff --git a/application/language/th/common_lang.php b/application/language/th/common_lang.php index c7e6db8bb..5f0947cc6 100644 --- a/application/language/th/common_lang.php +++ b/application/language/th/common_lang.php @@ -12,8 +12,8 @@ $lang["common_delete"] = "ลบ"; $lang["common_print"] = "พิมพ์"; $lang["common_det"] = "สรุป"; $lang["common_edit"] = "แก้ไข"; -$lang["common_email"] = "E-Mail"; -$lang["common_email_invalid_format"] = "e-mail address ไม่ถูกต้อง"; +$lang["common_email"] = "Email"; +$lang["common_email_invalid_format"] = "email address ไม่ถูกต้อง"; $lang["common_fields_required_message"] = "ช่องสีแดงต้องกรอก"; $lang["common_first_name"] = "ชื่อ"; $lang["common_first_name_required"] = "ชื่อต้องกรอก"; diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php index 5dfa70271..0cdb6d2e5 100755 --- a/application/language/zh/common_lang.php +++ b/application/language/zh/common_lang.php @@ -12,8 +12,8 @@ $lang["common_delete"] = "刪除"; $lang["common_print"] = "Print"; $lang["common_det"] = "更多"; $lang["common_edit"] = "編輯"; -$lang["common_email"] = "E-Mail"; -$lang["common_email_invalid_format"] = "E-mail格式錯誤"; +$lang["common_email"] = "Email"; +$lang["common_email_invalid_format"] = "Email格式錯誤"; $lang["common_fields_required_message"] = "紅色欄位為必填"; $lang["common_first_name"] = "名"; $lang["common_first_name_required"] = "名為必填"; diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php index 8d065adae..5863eae2c 100755 --- a/application/language/zh/sales_lang.php +++ b/application/language/zh/sales_lang.php @@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "編輯"; $lang["sales_edit_item"] = "編輯產品"; $lang["sales_edit_sale"] = "編輯銷售資料"; -$lang["sales_email_receipt"] = "E-Mail 銷售單"; +$lang["sales_email_receipt"] = "Email 銷售單"; $lang["sales_employee"] = "員工"; $lang["sales_error_editing_item"] = "編輯產品錯誤"; $lang["sales_find_or_scan_item"] = "查找/掃描商品"; diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js index 1310aee53..b87f8b6b9 100644 --- a/dist/opensourcepos.js +++ b/dist/opensourcepos.js @@ -51321,7 +51321,7 @@ function reinit_row(checkbox_id) //Re-init some stuff as we replaced row update_sortable_table(); dialog_support.init(new_row.find("a.modal-dlg")); - //re-enable e-mail + //re-enable email new_checkbox.click(checkbox_click); } diff --git a/import_customers.csv b/import_customers.csv index 41cc62e97..913a55b2c 100644 --- a/import_customers.csv +++ b/import_customers.csv @@ -1,2 +1,2 @@ -First Name,Last Name,Gender,E-Mail,Phone Number,Address 1,Address2,City,State,Zip,Country,Comments,Account Number,Taxable +First Name,Last Name,Gender,Email,Phone Number,Address 1,Address2,City,State,Zip,Country,Comments,Account Number,Taxable Bob,Smith,1,bsmith@nowhere.com,585-555-1111,123 Nowhere Street,Apt 4,Awesome,NY,11111,USA,Awesome guy,,y \ No newline at end of file diff --git a/js/manage_tables.js b/js/manage_tables.js index ad55576a2..7ddd95ab9 100644 --- a/js/manage_tables.js +++ b/js/manage_tables.js @@ -354,7 +354,7 @@ function reinit_row(checkbox_id) //Re-init some stuff as we replaced row update_sortable_table(); dialog_support.init(new_row.find("a.modal-dlg")); - //re-enable e-mail + //re-enable email new_checkbox.click(checkbox_click); } diff --git a/system/language/nl-BE/email_lang.php b/system/language/nl-BE/email_lang.php index 0f80634a1..0f8775c0b 100755 --- a/system/language/nl-BE/email_lang.php +++ b/system/language/nl-BE/email_lang.php @@ -1,6 +1,6 @@