[MERGE] forward port branch 11.0 up to f96a797fe62

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js
index a0f6515b98c..fac6845a31f 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -382,8 +382,8 @@ return AbstractModel.extend({
             allDayText: _t("All day"),
             views: {
                 week: {
-                    columnFormat: 'ddd ' + time.strftime_to_moment_format(_t.database.parameters.date_format),
-                    titleFormat: time.strftime_to_moment_format(_t.database.parameters.time_format),
+                    columnFormat: 'ddd ' + time.getLangDateFormat(),
+                    titleFormat: time.getLangTimeFormat(),
                 }
             },
             monthNames: moment.months(),
diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js
index 414e51b31b4..178d3ef3bd5 100644
--- a/addons/web/static/src/js/views/graph/graph_renderer.js
+++ b/addons/web/static/src/js/views/graph/graph_renderer.js
@@ -80,7 +80,7 @@ return AbstractRenderer.extend({
             setTimeout(function () {
                 self.$el.empty();
                 var chart = self['_render' + _.str.capitalize(self.state.mode) + 'Chart']();
-                if (chart) {
+                if (chart && chart.tooltip.chartContainer) {
                     self.to_remove = chart.update;
                     nv.utils.onWindowResize(chart.update);
                     chart.tooltip.chartContainer(self.el);