From 5e76488ae71521b3cf4345a04c6643db971994f2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Dec 2015 08:40:58 +0100
Subject: [PATCH] Better localisation in charts.

---
 app/Http/Controllers/Controller.php |  3 ++-
 public/js/charts.js                 | 10 +++++-----
 resources/twig/layout/default.twig  |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index d733973e30..dcbb6cf7be 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -34,7 +34,7 @@ abstract class Controller extends BaseController
         View::share('hideTags', false);
 
         if (Auth::check()) {
-            $pref                    = Preferences::get('language',env('DEFAULT_LANGUAGE','en_US'));
+            $pref                    = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'));
             $lang                    = $pref->data;
             $this->monthFormat       = Config::get('firefly.month.' . $lang);
             $this->monthAndDayFormat = Config::get('firefly.monthAndDay.' . $lang);
@@ -42,6 +42,7 @@ abstract class Controller extends BaseController
             View::share('monthFormat', $this->monthFormat);
             View::share('monthAndDayFormat', $this->monthAndDayFormat);
             View::share('language', $lang);
+            View::share('localeconv', localeconv());
         }
     }
 }
diff --git a/public/js/charts.js b/public/js/charts.js
index 17d70962c0..dc6227c8f4 100644
--- a/public/js/charts.js
+++ b/public/js/charts.js
@@ -1,4 +1,4 @@
-/* globals $, Chart, currencySymbol */
+/* globals $, Chart, currencySymbol,mon_decimal_point ,accounting, mon_thousands_sep, frac_digits */
 
 /*
  Make some colours:
@@ -29,16 +29,16 @@ accounting.settings = {
     currency: {
         symbol : currencySymbol,   // default currency symbol is '$'
         format: "%s %v", // controls output: %s = symbol, %v = value/number (can be object: see below)
-        decimal : ",",  // decimal point separator
-        thousand: ".",  // thousands separator
-        precision : 2   // decimal places
+        decimal : mon_decimal_point,  // decimal point separator
+        thousand: mon_thousands_sep,  // thousands separator
+        precision : frac_digits   // decimal places
     },
     number: {
         precision : 0,  // default precision on numbers is 0
         thousand: ",",
         decimal : "."
     }
-}
+};
 
 
 var fillColors = [];
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index 30c21850fb..6599dde596 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -184,6 +184,10 @@
     var language = "{{ language }}";
     var currencyCode = '{{ getCurrencyCode() }}';
     var currencySymbol = '{{ getCurrencySymbol()|raw }}';
+    var mon_decimal_point = "{{ localeconv.mon_decimal_point  }}";
+    var mon_thousands_sep = "{{ localeconv.mon_thousands_sep }}";
+    var frac_digits = {{ localeconv.frac_digits }};
+
 
 </script>