From b2f76f3fe6a91853ed869caeb25547f93293f593 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Thu, 26 Feb 2015 21:55:55 +0100 Subject: [PATCH] Improve thai translation (Merge Pull Request #20) Improve login screen --- application/language/en/common_lang.php | 14 +- application/language/en/config_lang.php | 105 ++++---- application/language/en/customers_lang.php | 2 +- application/language/en/giftcards_lang.php | 1 + application/language/en/items_lang.php | 7 +- application/language/en/receivings_lang.php | 4 +- application/language/en/sales_lang.php | 39 ++- application/language/es/common_lang.php | 14 +- application/language/es/config_lang.php | 105 ++++---- application/language/es/customers_lang.php | 2 +- application/language/es/giftcards_lang.php | 1 + application/language/es/items_lang.php | 7 +- application/language/es/receivings_lang.php | 4 +- application/language/es/sales_lang.php | 39 ++- application/language/fr/common_lang.php | 14 +- application/language/fr/config_lang.php | 105 ++++---- application/language/fr/customers_lang.php | 2 +- application/language/fr/giftcards_lang.php | 1 + application/language/fr/items_lang.php | 7 +- application/language/fr/receivings_lang.php | 4 +- application/language/fr/sales_lang.php | 39 ++- application/language/id/common_lang.php | 14 +- application/language/id/config_lang.php | 105 ++++---- application/language/id/customers_lang.php | 2 +- application/language/id/giftcards_lang.php | 1 + application/language/id/items_lang.php | 7 +- application/language/id/receivings_lang.php | 4 +- application/language/id/sales_lang.php | 39 ++- application/language/nl-BE/common_lang.php | 14 +- application/language/nl-BE/config_lang.php | 105 ++++---- application/language/nl-BE/customers_lang.php | 2 +- application/language/nl-BE/giftcards_lang.php | 1 + application/language/nl-BE/items_lang.php | 7 +- .../language/nl-BE/receivings_lang.php | 4 +- application/language/nl-BE/sales_lang.php | 39 ++- application/language/ru/common_lang.php | 14 +- application/language/ru/config_lang.php | 105 ++++---- application/language/ru/customers_lang.php | 2 +- application/language/ru/giftcards_lang.php | 1 + application/language/ru/items_lang.php | 7 +- application/language/ru/receivings_lang.php | 4 +- application/language/ru/sales_lang.php | 39 ++- application/language/th/common_lang.php | 46 ++-- application/language/th/config_lang.php | 139 +++++----- application/language/th/customers_lang.php | 2 +- application/language/th/employees_lang.php | 34 +-- .../language/th/form_validation_lang.php | 29 +++ application/language/th/giftcards_lang.php | 59 ++--- application/language/th/items_lang.php | 13 +- application/language/th/receivings_lang.php | 22 +- application/language/th/sales_lang.php | 43 ++-- application/language/tr/common_lang.php | 14 +- application/language/tr/config_lang.php | 105 ++++---- application/language/tr/customers_lang.php | 2 +- application/language/tr/giftcards_lang.php | 1 + application/language/tr/items_lang.php | 7 +- application/language/tr/receivings_lang.php | 4 +- application/language/tr/sales_lang.php | 39 ++- application/language/zh/common_lang.php | 14 +- application/language/zh/config_lang.php | 105 ++++---- application/language/zh/customers_lang.php | 2 +- application/language/zh/giftcards_lang.php | 1 + application/language/zh/items_lang.php | 7 +- application/language/zh/receivings_lang.php | 4 +- application/language/zh/sales_lang.php | 39 ++- application/views/login.php | 25 +- css/login.css | 133 +++++----- images/logo.gif | Bin 0 -> 1273 bytes system/core/Input.php | 2 +- translations/common_lang.csv | 96 +++---- translations/config_lang.csv | 237 +++++++++--------- translations/customers_lang.csv | 32 +-- translations/employees_lang.csv | 34 +-- translations/form_validation_lang.csv | 32 +-- translations/giftcards_lang.csv | 137 +++++----- translations/items_lang.csv | 167 ++++++------ translations/receivings_lang.csv | 100 ++++---- translations/reports_lang.csv | 4 +- translations/sales_lang.csv | 221 ++++++++-------- 79 files changed, 1492 insertions(+), 1491 deletions(-) create mode 100644 application/language/th/form_validation_lang.php create mode 100644 images/logo.gif diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php index 3affb78cf..af9ad4069 100644 --- a/application/language/en/common_lang.php +++ b/application/language/en/common_lang.php @@ -7,6 +7,7 @@ $lang["common_comments"] = "Comments"; $lang["common_common"] = "common"; $lang["common_confirm_search"] = "You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?"; $lang["common_country"] = "Country"; +$lang["common_date"] = "Date"; $lang["common_delete"] = "Delete"; $lang["common_det"] = "details"; $lang["common_edit"] = "edit"; @@ -15,9 +16,14 @@ $lang["common_email_invalid_format"] = "The e-mail address is not in the proper $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."; +$lang["common_first_page"] = "First"; +$lang["common_gender"] = "Gender"; +$lang["common_gender_female"] = "F"; +$lang["common_gender_male"] = "M"; $lang["common_inv"] = "inv"; $lang["common_last_name"] = "Last Name"; $lang["common_last_name_required"] = "The last name is a required field"; +$lang["common_last_page"] = "Last"; $lang["common_learn_about_project"] = "to learn the lastest information about the project"; $lang["common_list_of"] = "List of"; $lang["common_logout"] = "Logout"; @@ -31,6 +37,7 @@ $lang["common_price"] = "Price"; $lang["common_remove"] = "Remove"; $lang["common_return_policy"] = "Return Policy"; $lang["common_search"] = "Search"; +$lang["common_search_options"] = "Search options"; $lang["common_searched_for"] = "Searched for"; $lang["common_state"] = "State"; $lang["common_submit"] = "Submit"; @@ -40,10 +47,3 @@ $lang["common_welcome"] = "Welcome"; $lang["common_welcome_message"] = "Welcome to Open Source Point Of Sale, click a module below to get started!"; $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version"; $lang["common_zip"] = "Zip"; -$lang["common_gender"] = "Gender"; -$lang["common_gender_male"] = "M"; -$lang["common_gender_female"] = "F"; -$lang["common_date"] = "Date"; -$lang["common_search_options"] = "Search options"; -$lang["common_first_page"] = "First"; -$lang["common_last_page"] = "Last"; diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index f7e944a80..3f1f1dba4 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -2,11 +2,14 @@ $lang["config_address"] = "Company Address"; $lang["config_address_required"] = "Company address is a required field"; +$lang["config_backup_button"] = "Backup"; +$lang["config_backup_database"] = "Backup Database"; $lang["config_barcode_company"] = "Company Name"; +$lang["config_barcode_configuration"] = "Barcode Configuration"; $lang["config_barcode_content"] = "Barcode Content"; -$lang["config_barcode_width"] = "Width (px)"; $lang["config_barcode_first_row"] = "Row 1"; $lang["config_barcode_font"] = "Font"; +$lang["config_barcode_height"] = "Height (px)"; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = "Barcode Configuration Information"; $lang["config_barcode_layout"] = "Barcode Layout"; @@ -16,12 +19,13 @@ $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"] = "Height (px)"; -$lang["config_barcode_second_row"] = "Row 2"; $lang["config_barcode_quality"] = "Quality (1-100)"; +$lang["config_barcode_second_row"] = "Row 2"; $lang["config_barcode_third_row"] = "Row 3"; $lang["config_barcode_type"] = "Barcode Type"; +$lang["config_barcode_width"] = "Width (px)"; $lang["config_company"] = "Company Name"; +$lang["config_company_logo"] = "Company Logo"; $lang["config_company_required"] = "Company name is a required field"; $lang["config_company_website_url"] = "Company website is not a valid URL (http://...)"; $lang["config_currency_side"] = "Right side"; @@ -36,20 +40,24 @@ $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"] = "The default barcode width must be a number"; -$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_decimal_point"] = "Decimal Point"; $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_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_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_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_sales_discount"] = "Default Sales Discount %"; +$lang["config_default_sales_discount_number"] = "The default sales discount must be a number"; +$lang["config_default_sales_discount_required"] = "The default sales discount is a required field"; $lang["config_default_tax_rate"] = "Default Tax Rate %"; $lang["config_default_tax_rate_1"] = "Tax 1 Rate"; $lang["config_default_tax_rate_2"] = "Tax 2 Rate"; @@ -58,9 +66,41 @@ $lang["config_default_tax_rate_required"] = "The default tax rate is a required $lang["config_fax"] = "Fax"; $lang["config_general_configuration"] = "General Configuration"; $lang["config_info"] = "Store Configuration Information"; +$lang["config_invoice_default_comments"] = "Default Invoice Comments"; +$lang["config_invoice_email_message"] = "Invoice Email Template"; +$lang["config_invoice_printer"] = "Invoice Printer"; +$lang["config_jsprintsetup_required"] = "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?"; $lang["config_language"] = "Language"; +$lang["config_lines_per_page"] = "Lines Per Page"; +$lang["config_lines_per_page_number"] = ""; +$lang["config_lines_per_page_required"] = "The lines per page is a required field"; +$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? Click [OK] to backup, [Cancel] to logout"; +$lang["config_number_format"] = "Number Format"; $lang["config_phone"] = "Company Phone"; $lang["config_phone_required"] = "Company phone is a required field"; +$lang["config_print_after_sale"] = ""; +$lang["config_print_bottom_margin"] = "Margin Bottom"; +$lang["config_print_bottom_margin_number"] = "The default bottom margin must be a number"; +$lang["config_print_bottom_margin_required"] = "The default bottom margin is a required field"; +$lang["config_print_footer"] = "Print Browser Footer"; +$lang["config_print_header"] = "Print Browser Header"; +$lang["config_print_left_margin"] = "Margin Left"; +$lang["config_print_left_margin_number"] = "The default left margin must be a number"; +$lang["config_print_left_margin_required"] = "The default left margin is a required field"; +$lang["config_print_right_margin"] = "Margin Right"; +$lang["config_print_right_margin_number"] = "The default right margin must be a number"; +$lang["config_print_right_margin_required"] = "The default right margin is a required field"; +$lang["config_print_silently"] = "Show Print Dialog"; +$lang["config_print_top_margin"] = "Margin Top"; +$lang["config_print_top_margin_number"] = "The default top margin must be a number"; +$lang["config_print_top_margin_required"] = "The default top margin is a required field"; +$lang["config_receipt_configuration"] = "Print Settings"; +$lang["config_receipt_info"] = "Receipt Configuration Information"; +$lang["config_receipt_printer"] = "Ticket Printer"; +$lang["config_receipt_show_taxes"] = "Show Taxes"; +$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)"; $lang["config_recv_invoice_format"] = "Receivings Invoice Format"; $lang["config_return_policy_required"] = "Return policy is a required field"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; @@ -68,55 +108,10 @@ $lang["config_saved_successfully"] = "Configuration saved successfully"; $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; +$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; $lang["config_stock_location_required"] = "Stock location number is a required field"; $lang["config_tax_included"] = "Tax Included"; -$lang["config_timezone"] = "Timezone"; -$lang["config_website"] = "Website"; -$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"] = "Company Name"; -$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? Click [OK] to backup, [Cancel] to logout"; -$lang["config_backup_database"] = "Backup Database"; -$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)"; -$lang["config_number_format"] = "Number Format"; $lang["config_thousands_separator"] = "Thousands Separator"; -$lang["config_decimal_point"] = "Decimal Point"; -$lang["config_backup_button"] = "Backup"; -$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; -$lang["config_company_logo"] = "Company Logo"; -$lang["config_invoice_printer"] = "Invoice Printer"; -$lang["config_receipt_printer"] = "Ticket Printer"; -$lang["config_receipt_show_taxes"] = "Show Taxes"; -$lang["config_receipt_info"] = "Receipt Configuration Information"; -$lang["config_receipt_configuration"] = "Print Settings"; -$lang["config_print_footer"] = "Print Browser Footer"; -$lang["config_print_header"] = "Print Browser Header"; -$lang["config_print_silently"] = "Show Print Dialog"; -$lang["config_print_top_margin"] = "Margin Top"; -$lang["config_print_left_margin"] = "Margin Left"; -$lang["config_print_bottom_margin"] = "Margin Bottom"; -$lang["config_print_right_margin"] = "Margin Right"; -$lang["config_print_top_margin_required"] = "The default top margin is a required field"; -$lang["config_print_top_margin_number"] = "The default top margin must be a number"; -$lang["config_print_left_margin_required"] = "The default left margin is a required field"; -$lang["config_print_left_margin_number"] = "The default left margin must be a number"; -$lang["config_print_bottom_margin_required"] = "The default bottom margin is a required field"; -$lang["config_print_bottom_margin_number"] = "The default bottom margin must be a number"; -$lang["config_print_right_margin_required"] = "The default right margin is a required field"; -$lang["config_print_right_margin_number"] = "The default right margin must be a number"; -$lang["config_jsprintsetup_required"] = "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?"; +$lang["config_timezone"] = "Timezone"; $lang["config_use_invoice_template"] = "Use invoice template"; -$lang["config_invoice_email_message"] = "Invoice Email Template"; -$lang["config_invoice_default_comments"] = "Default Invoice Comments"; -$lang["config_lines_per_page"] = "Lines Per Page"; -$lang["config_lines_per_page_required"] = "The lines per page is a required field"; -$lang["config_lines_per_page_number"] = ""; -$lang["config_default_sales_discount"] = "Default Sales Discount %"; -$lang["config_default_sales_discount_required"] = "The default sales discount is a required field"; -$lang["config_default_sales_discount_number"] = "The default sales discount must be a number"; +$lang["config_website"] = "Website"; diff --git a/application/language/en/customers_lang.php b/application/language/en/customers_lang.php index e6c55d4e3..9dcaff553 100644 --- a/application/language/en/customers_lang.php +++ b/application/language/en/customers_lang.php @@ -1,6 +1,7 @@ Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?> + + + -

Open Source Point Of Sale config->item('application_version'); ?>

+ +
/images/logo.gif> + +
+ +
+ +
-
- lang->line('login_login'); ?> -
+
-
- lang->line('login_welcome_message'); ?> -
+
lang->line('login_username'); ?>:
@@ -45,8 +51,11 @@ $(document).ready(function()
+ +
+
- +

Open Source Point Of Sale config->item('application_version'); ?>

diff --git a/css/login.css b/css/login.css index 30809f1cf..f81e49db2 100644 --- a/css/login.css +++ b/css/login.css @@ -1,84 +1,87 @@ -body -{ - text-align:center; -} -#container -{ - position:relative; - margin-left:auto; - margin-right:auto; - margin-top:20px; - width:360px; +@import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,700); +*{margin:0;padding:0;} + +body{ + background:#567; + font-family:'Open Sans',sans-serif; } -#top -{ - position:relative; - width:100%; - height:20px; - padding:2px; - background-color:#005B7F; - text-align:center; - font-family:Verdana; - color:white; - font-size:12pt; +.button{ + width:100px; + background:#3399cc; + display:block; + margin:0 auto; + margin-top:1%; + padding:10px; + text-align:center; + text-decoration:none; + color:#fff; + cursor:pointer; + transition:background .3s; + -webkit-transition:background .3s; } -#login_form -{ - position:relative; - width:100%; - height:230px; - padding:2px; - font-family:Verdana; - color:white; - font-size:10pt; - background-color:#A7A7A7; +.button:hover{ + background:#2288bb; } -#welcome_message -{ - text-align:center; - margin-top:10px; - margin-bottom:20px; +#login{ + width:400px; + margin:0 auto; + margin-top:8px; + margin-bottom:2%; + transition:opacity 1s; + -webkit-transition:opacity 1s; } -.error -{ - margin:0 auto; - border:3px solid #d3153b; - background-color:#fbe6f2; - padding:5px; - width:80%; - text-align:center; - font-size:18px; - margin-bottom:20px; - +#triangle{ + width:0; + border-top:12x solid transparent; + border-right:12px solid transparent; + border-bottom:12px solid #3399cc; + border-left:12px solid transparent; + margin:0 auto; } -.form_field_label -{ - float:left; - margin-left:20px; - width:30%; +#login h1{ + background:#3399cc; + padding:20px 0; + font-size:140%; + font-weight:300; + text-align:center; + color:#fff; } -.form_field -{ - float:left; - width:30%; +form{ + background:#f0f0f0; + padding:6% 4%; } -#submit_button -{ - position:absolute; - bottom:60px; - right:60px; +input[type="text"],input[type="password"]{ + width:92%; + background:#fff; + margin-bottom:4%; + border:1px solid #ccc; + padding:4%; + font-family:'Open Sans',sans-serif; + font-size:95%; + color:#555; } -input -{ - font-family:Arial; +input[type="submit"]{ + width:100%; + background:#3399cc; + border:0; + padding:4%; + font-family:'Open Sans',sans-serif; + font-size:100%; + color:#fff; + cursor:pointer; + transition:background .3s; + -webkit-transition:background .3s; } +input[type="submit"]:hover{ + background:#2288bb; +} \ No newline at end of file diff --git a/images/logo.gif b/images/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..3e60ef4110ec14af61909cf19e7918e30bb13262 GIT binary patch literal 1273 zcmVoSgr7csdXe<=@}1pPxq{ zAoB0;d|+UskB?O_Fxbz}y|1rtP*DE>0EuvL|F5tA4-fx8KmYIV|4&c<-{1dVU;od~ z{~sU!zrSKZLH{o=A^8LV00000EC2ui09pWA000I5ARvxpX`X1Ru59bRa4gSsZQppV z?|kq7z@TtQEE$ z0YK2e929+l8nzQL;6ND&rF_|Qf-wNX6bcdl1ZV&NSOfkVVP>&wyOht9bgHnfq=)5BTJr4xv~HV!{lk+ z%(=7Y&!9threHxr1q>T{P{44yK$HTe4QMc(T1N&67-YMCa-o8S5xsvWfPmmKi7{U^ zEg;aqDgXl#P9$h9V)=*%hXi1OMc^o|;sTtjpdewlh}jpqc2sakmV=J~0w_3OsW5;J zxN8F-aKK}L3Ht>w!T^GpqQC?Tl+h9Y1BV6B(E;M20Nn*7kk^4FU?ixWNgQ<}9~%O| zR00JYNMJz*07NhV8{aG^AV-26AmSaLj1fSFYPHylGhpWWm5_YBz~Y0 zH7gwnBLD<)#E%H?)bqk^8j!#N2T%eQ0Ry3YQ3x0u2ABeD7vwk*PNm?YfFMx&DPz%)D*=&$o8m|%2mo*jEtXIU0}U`Rt|K?*P-ZJ4P}Be}1kgcBag8K^ z>QN?i*9ZX{`y>Ehnm9IbfRuE%M#K%=VpBF>&LiJ^bO;QkA{}+p3Vi^Mkf4JfCNQ79 zBy1YNObR5OF3J-P?GXT>Y;2Rdz8s<^rSo)S2`{B&H!zJ8Eta)(WhCQ>FN8D<2^*zA zKu*3wWfdMz0Z<&k12%Wtu+1ezFeL+-@O=UVr_9q#Aq^vDk~INDU~UOziV#Z1b?0r* z-U9