From ef020a257424ae9be06201dafe4bf5db66c8c5f5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Tue, 10 Mar 2015 17:30:14 +0100
Subject: [PATCH] [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
---
 addons/web_calendar/static/src/js/web_calendar.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index a27e587d98e..f92e6e2262a 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -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.