From c77fa6e5c4067b02836fbc070fa8705229c8a9d6 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sat, 9 Apr 2016 23:37:34 +0100 Subject: [PATCH] Fixed various issues preventing all languages to work fine in all views (#470) --- application/language/id/datepicker_lang.php | 2 +- application/language/pt-BR/reports_lang.php | 2 +- application/language/ru/datepicker_lang.php | 2 +- application/language/th/datepicker_lang.php | 2 +- application/language/tr/datepicker_lang.php | 2 +- application/language/zh/datepicker_lang.php | 2 +- application/views/giftcards/manage.php | 4 ++-- application/views/item_kits/manage.php | 6 +++--- application/views/items/manage.php | 10 +++++----- application/views/people/manage.php | 4 ++-- application/views/sales/manage.php | 4 ++-- application/views/suppliers/manage.php | 4 ++-- translations/datepicker_lang.csv | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/application/language/id/datepicker_lang.php b/application/language/id/datepicker_lang.php index 1c19d8e8e..fc835fa39 100644 --- a/application/language/id/datepicker_lang.php +++ b/application/language/id/datepicker_lang.php @@ -1,7 +1,7 @@ ', - confirm_message: 'lang->line("common_confirm_search")?>'}); - enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); + confirm_message: "lang->line("common_confirm_search")?>"}); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); }); function init_table_sorting() diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php index bd96fa50c..98cbe243a 100644 --- a/application/views/item_kits/manage.php +++ b/application/views/item_kits/manage.php @@ -8,15 +8,15 @@ $(document).ready(function() enable_checkboxes(); enable_row_selection(); enable_search({suggest_url: '', - confirm_message: 'lang->line("common_confirm_search")?>'}); - enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); + confirm_message: "lang->line("common_confirm_search")?>"}); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); $('#generate_barcodes').click(function() { var selected = get_selected_values(); if (selected.length == 0) { - alert('lang->line('items_must_select_item_for_barcode'); ?>'); + alert("lang->line('items_must_select_item_for_barcode'); ?>"); return false; } diff --git a/application/views/items/manage.php b/application/views/items/manage.php index bbf3c7d17..24c21f34d 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -8,8 +8,8 @@ $(document).ready(function() enable_checkboxes(); enable_row_selection(); - enable_search({suggest_url: '', - confirm_search_message: 'lang->line("common_confirm_search")?>', + enable_search({suggest_url: "", + confirm_search_message: "lang->line("common_confirm_search")?>", extra_params: { 'is_deleted' : function () { // the comparison is split in two parts: find the index of the selected and check the index against the index in the listed strings of the multiselect menu @@ -18,15 +18,15 @@ $(document).ready(function() } }); - enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); - enable_bulk_edit('lang->line($controller_name."_none_selected")?>'); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); + enable_bulk_edit("lang->line($controller_name."_none_selected")?>"); $('#generate_barcodes').click(function() { var selected = get_selected_values(); if (selected.length == 0) { - alert('lang->line('items_must_select_item_for_barcode'); ?>'); + alert("lang->line("items_must_select_item_for_barcode"); ?>"); return false; } diff --git a/application/views/people/manage.php b/application/views/people/manage.php index 62ffe9674..f7d199613 100644 --- a/application/views/people/manage.php +++ b/application/views/people/manage.php @@ -7,9 +7,9 @@ $(document).ready(function() enable_select_all(); enable_row_selection(); enable_search({suggest_url: '', - confirm_search_message: 'lang->line("common_confirm_search")?>'}); + confirm_search_message: "lang->line("common_confirm_search")?>"}); enable_email(''); - enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); }); function init_table_sorting() diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php index 9ec5fb2ae..723dc6483 100755 --- a/application/views/sales/manage.php +++ b/application/views/sales/manage.php @@ -15,9 +15,9 @@ $(document).ready(function() // hook the ajax connectors on search actions, hook a on_complete action (refresh payment summaries at page bottom) enable_search({suggest_url: '', - confirm_search_message: 'lang->line("common_confirm_search"); ?>', + confirm_search_message: "lang->line("common_confirm_search"); ?>", on_complete: on_complete}); - enable_delete('lang->line($controller_name."_confirm_delete"); ?>', 'lang->line($controller_name."_none_selected"); ?>'); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); // when any filter is clicked and the dropdown window is closed $('#filters').on('hidden.bs.select', function(e) diff --git a/application/views/suppliers/manage.php b/application/views/suppliers/manage.php index ff669041f..1bc7e9145 100644 --- a/application/views/suppliers/manage.php +++ b/application/views/suppliers/manage.php @@ -7,9 +7,9 @@ $(document).ready(function() enable_select_all(); enable_row_selection(); enable_search({suggest_url: '', - confirm_search_message: 'lang->line("common_confirm_search")?>'}); + confirm_search_message: "lang->line("common_confirm_search")?>"}); enable_email(''); - enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); + enable_delete("lang->line($controller_name."_confirm_delete")?>","lang->line($controller_name."_none_selected")?>"); }); function init_table_sorting() diff --git a/translations/datepicker_lang.csv b/translations/datepicker_lang.csv index 77dbdc643..6a48fe8b0 100644 --- a/translations/datepicker_lang.csv +++ b/translations/datepicker_lang.csv @@ -1,6 +1,6 @@ label,hu-HU,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id,pt-BR datepicker_today,Ma,Heute,Vandaag,Hoy,Today,Aujourd'hui,今天,сегодня,วันนี้,Bugün,Hari ini,Hoje -datepicker_weekstart,1,1,0,0,0,1,,,,,,0 +datepicker_weekstart,1,1,0,0,0,1,0,0,0,0,0,0 datepicker_all_time,Kezdetektől,Von Beginn weg,Alle,Todos,All Time,Depuis le début,全部,за все время,เวลาทั้งหมด,Tüm Zamanlar,Semua Waktu,Todos datepicker_last_7,Utolsó 7 nap,Letzte 7 Tage,Vorige 7 Dagen,Últimos 7 Días,Last 7 Days,Ces 7 derniers jours,過去七天,Последние 7 дней,7 วันสุดท้าย,Son 7 Gün,7 Hari Terakhir,Últimos 7 Dias datepicker_last_30,Utolsó 30 nap,Letzte 30 Tage,Vorige 30 Dagen,Últimos 30 Días,Last 30 Days,Ces 30 derniers jours,過去七天,Последние 30 дней,30 วันสุดท้าย,Son 30 Gün,30 Hari Terakhir,Últimos 30 Dias