X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Flayout%2Fjavascript_setup.js;h=2b03f4a2d8ab29f6260edd77788607d2c59c0018;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=c8c9e81fcd2d35cbd9f8adce3a97e5464c5ca688;hpb=6acdad62e7a4e11c8929e7ab00ce1bac511ed883;p=kivitendo-erp.git

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index c8c9e81fc..2b03f4a2d 100644
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,13 +1,11 @@
-[%- USE T8 %]
+[%- USE LxERP %]
 [%- USE JavaScript %]
+[%- USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];
 $(function() {
-[% IF datefmt %]
-  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[kivi.myconfig.countrycode], {
+      dateFormat: kivi.myconfig.dateformat.replace(/d+/gi, 'dd').replace(/m+/gi, 'mm').replace(/y+/gi, 'yy'),
       showOn: "button",
       showButtonPanel: true,
       changeMonth: true,
@@ -17,14 +15,14 @@ $(function() {
   }));
 
   kivi.setup_formats({
-    numbers: '[% JavaScript.escape(MYCONFIG.numberformat) %]',
-    dates:   '[% JavaScript.escape(MYCONFIG.dateformat) %]'
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat,
+    times:   kivi.myconfig.timeformat
   });
 
   kivi.reinit_widgets();
-[% END %]
 
-[% IF ajax_spinner %]
+[%- IF ajax_spinner %]
   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {