[FIX] web_calendar: conversion of moment format strings to fullcalendar

AM/PM format specifier wasn't correctly converted, and was thus displayed as a literal A/a in fullcalendar
2015-03-10 17:31:08 +01:00
parent ddab9f8125
commit ef020a2574
1 changed files with 7 additions and 1 deletions
@@ -20,7 +20,13 @@ openerp.web_calendar = function(instance) {
    }

    function get_fc_defaultOptions() {
-        shortTimeformat = moment._locale._longDateFormat.LT;
+        var converter = {
+            A: 'TT',
+            a: 'tt',
+        };
+        var shortTimeformat = moment._locale._longDateFormat.LT.replace(/([a-zA-Z])\1*/g, function (s) {
+            return converter[s] || s;
+        });
        var dateFormat = instance.web.normalize_format(_t.database.parameters.date_format);

        // adapt format for fullcalendar v1.