X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/38e2876fa8ab04fe1ee78aeaa415aa6e71c0f524..f8ec31c6cf80a50a5b9ee29bd5847c47d5114bbf:/templates/webpages/layout/javascript_setup.js?ds=inline

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index 2746ed737..40424452b 100644
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,13 +1,13 @@
 [%- USE T8 %]
-[%- USE JSON %]
+[%- USE JavaScript %]
 $(function() {
 [% IF datefmt %]
-  setupPoints([% JSON.json(MYCONFIG.numberformat) %], '[% 'wrongformat' | $T8 %]');
-  setupDateFormat([% JSON.json(MYCONFIG.dateformat) %], '[% 'Falsches Datumsformat!' | $T8 %]');
+  setupPoints('[% JavaScript.escape(MYCONFIG.numberformat) %]', '[% 'wrongformat' | $T8 %]');
+  setupDateFormat('[% JavaScript.escape(MYCONFIG.dateformat) %]', '[% 'Falsches Datumsformat!' | $T8 %]');
 
   $.datepicker.setDefaults(
-    $.extend({}, $.datepicker.regional["[% MYCONFIG.countrycode %]"], {
-      dateFormat: "[% datefmt %]",
+    $.extend({}, $.datepicker.regional['[% JavaScript.escape(MYCONFIG.countrycode) %]'], {
+      dateFormat: '[% JavaScript.escape(datefmt) %]',
       showOn: "button",
       showButtonPanel: true,
       changeMonth: true,
@@ -16,6 +16,11 @@ $(function() {
       buttonImageOnly: true
   }));
 
+  kivi.setup_formats({
+    numbers: '[% JavaScript.escape(MYCONFIG.numberformat) %]',
+    dates:   '[% JavaScript.escape(MYCONFIG.dateformat) %]'
+  });
+
   kivi.reinit_widgets();
 [% END %]