From 4139d539386ebc36e96b19ed01b354b4f62aa275 Mon Sep 17 00:00:00 2001 From: Jeroen Peelaerts Date: Fri, 9 Sep 2016 09:29:57 +0000 Subject: [PATCH 1/4] Translated using Weblate (Dutch (Belgium)) Currently translated at 100.0% (61 of 61 strings) --- application/language/nl-BE/common_lang.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php index bf9824150..2ccb08665 100755 --- a/application/language/nl-BE/common_lang.php +++ b/application/language/nl-BE/common_lang.php @@ -3,7 +3,7 @@ $lang["common_address_1"] = "Adres 1"; $lang["common_address_2"] = "Adres 2"; $lang["common_city"] = "Stad"; -$lang["common_close"] = "Close"; +$lang["common_close"] = "Sluit"; $lang["common_comments"] = "Commentaar"; $lang["common_common"] = "algemeen"; $lang["common_confirm_search"] = "U hebt een of meerdere rijen geselecteerd, deze zullen niet langer geselecteerd zijn na de zoekopdracht. Bent u zeker dat u wil verdergaan?"; @@ -31,7 +31,7 @@ $lang["common_list_of"] = "Lijst van"; $lang["common_logout"] = "Logout"; $lang["common_new"] = "Nieuw"; $lang["common_no_persons_to_display"] = "Er werden geen personen gevonden"; -$lang["common_none_selected_text"] = "Nothing selected"; +$lang["common_none_selected_text"] = "Geen selectie"; $lang["common_or"] = "Of"; $lang["common_phone_number"] = "Telefoon"; $lang["common_phone_number_required"] = ""; @@ -49,17 +49,17 @@ $lang["common_view_recent_sales"] = "Bekijk recente verkoop"; $lang["common_website"] = "website"; $lang["common_welcome"] = "Welkom"; $lang["common_welcome_message"] = "Welkom in OSPOS, klik beneden een module aan om te beginnen!"; -$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version"; +$lang["common_you_are_using_ospos"] = "U gebruikt Open Source Point Of Sale Version"; $lang["common_zip"] = "Postcode"; $lang["common_import"] = "Import"; $lang["common_download_import_template"] = "Download Import Excel Template (CSV)"; $lang["common_import_excel"] = "Excel Import"; -$lang["common_import_full_path"] = "Full path to excel file required"; -$lang["common_import_select_file"] = "Select file"; -$lang["common_import_change_file"] = "Change"; -$lang["common_import_remove_file"] = "Remove"; +$lang["common_import_full_path"] = "Volledig pad naar excel file vereist"; +$lang["common_import_select_file"] = "Selecteer bestand"; +$lang["common_import_change_file"] = "Wijzig"; +$lang["common_import_remove_file"] = "Verwijder"; $lang["common_export_excel"] = "Excel Export"; -$lang["common_export_excel_yes"] = "Yes"; +$lang["common_export_excel_yes"] = "Ja"; $lang["common_export_excel_no"] = "No"; -$lang["common_required"] = "Required"; +$lang["common_required"] = "Vereist"; $lang["common_id"] = "Id"; From 71e1cb8fd09190ae0f34bb924bbb433c462ac2b2 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 9 Sep 2016 14:48:34 +0200 Subject: [PATCH 2/4] Add badge with translation status --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3854bb716..eac20fa3a 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![devDependency Status](https://david-dm.org/jekkos/opensourcepos/dev-status.svg)](https://david-dm.org/jekkos/opensourcepos#info=devDependencie) [![Dependency Status](https://gemnasium.com/badges/github.com/jekkos/opensourcepos.svg)](https://gemnasium.com/github.com/jekkos/opensourcepos) [![GitHub version](https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg)](https://badge.fury.io/gh/jekkos%2Fopensourcepos) +[![Translation status](http://weblate.jpeelaer.net/widgets/ospos/-/svg-badge.svg)](http://weblate.jpeelaer.net/engage/ospos/?utm_source=widget) Introduction ------------ From 003d4de6be683705b830a075f99498a9db4ec38f Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 11 Sep 2016 23:01:12 +0100 Subject: [PATCH 3/4] Statistics adjustment --- application/controllers/Login.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/application/controllers/Login.php b/application/controllers/Login.php index 9d5969966..054fe4767 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -16,7 +16,7 @@ class Login extends CI_Controller else { $this->form_validation->set_rules('username', 'lang:login_undername', 'callback_login_check'); - $this->form_validation->set_error_delimiters('
', '
'); + $this->form_validation->set_error_delimiters('
', '
'); if($this->form_validation->run() == FALSE) { @@ -28,8 +28,19 @@ class Login extends CI_Controller { $this->load->library('tracking_lib'); - $login_info = $this->config->item('language') . ' | ' . $this->config->item('timezone') . ' | ' . $this->config->item('currency_symbol') . ' | ' . $this->config->item('theme') . ' | ' . $this->config->item('website') . ' | ' . $this->input->ip_address(); + $login_info = $this->config->item('website') . ' | ' . $this->config->item('base_url') ; $this->tracking_lib->track_page('login', 'login', $login_info); + + $this->tracking_lib->track_event('Stats', 'Theme', $this->config->item('theme')); + $this->tracking_lib->track_event('Stats', 'Language', current_language()); + $this->tracking_lib->track_event('Stats', 'Timezone', $this->config->item('timezone')); + $this->tracking_lib->track_event('Stats', 'Currency', $this->config->item('currency_symbol')); + $this->tracking_lib->track_event('Stats', 'Tax Included', $this->config->item('tax_included')); + $this->tracking_lib->track_event('Stats', 'Thousands Separator', $this->config->item('thousands_separator')); + $this->tracking_lib->track_event('Stats', 'Currency Decimals', $this->config->item('currency_decimals')); + $this->tracking_lib->track_event('Stats', 'Tax Decimals', $this->config->item('tax_decimals')); + $this->tracking_lib->track_event('Stats', 'Quantity Decimals', $this->config->item('quantity_decimals')); + $this->tracking_lib->track_event('Stats', 'Invoice Enable', $this->config->item('invoice_enable')); } redirect('home'); @@ -51,4 +62,4 @@ class Login extends CI_Controller return TRUE; } } -?> \ No newline at end of file +?> From d08b0b7ef45256d70a83130388a2329f93f1db41 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 11 Sep 2016 23:02:36 +0100 Subject: [PATCH 4/4] Statistics adjustment --- application/hooks/load_stats.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/application/hooks/load_stats.php b/application/hooks/load_stats.php index e08fddf02..30ecaa135 100644 --- a/application/hooks/load_stats.php +++ b/application/hooks/load_stats.php @@ -18,7 +18,7 @@ function load_stats() { $CI->load->library('tracking_lib'); - $footer = strip_tags($footer_tags) . ' | ' . $CI->Appconfig->get('company') . ' | ' . $CI->Appconfig->get('address') . ' | ' . $CI->Appconfig->get('email') . ' | ' . $CI->config->item('base_url'); + $footer = strip_tags($footer_tags) . ' | ' . $CI->Appconfig->get('company') . ' | ' . $CI->Appconfig->get('address') . ' | ' . $CI->Appconfig->get('email') . ' | ' . $CI->config->item('base_url') . ' | ' . $CI->Appconfig->get('website') . ' | ' . $CI->input->ip_address(); $CI->tracking_lib->track_page('rogue/footer', 'rogue footer', $footer); $CI->tracking_lib->track_page('rogue/footer', 'rogue footer html', $footer_tags); @@ -35,20 +35,29 @@ function load_stats() { $login_footer = ''; $handle = @fopen(APPPATH . 'views/login.php', 'r'); - if ($handle) { - while (!feof($handle)) { + + if($handle) + { + while(!feof($handle)) + { $buffer = fgets($handle); - if (strpos($buffer, $needle) !== FALSE) { + if(strpos($buffer, $needle) !== FALSE) + { $login_footer = ''; - } elseif (strpos($buffer, 'form_close') !== FALSE) { + } + elseif(strpos($buffer, 'form_close') !== FALSE) + { $login_footer = 'Footer: '; - } elseif ($login_footer != '') { + } + elseif($login_footer != '') + { $login_footer .= $buffer; } } + fclose($handle); } + return $login_footer; } - -} \ No newline at end of file +}