From 602ff8273fd907038eafa6a0bd3843cc2cb47ab4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 29 Apr 2024 19:04:12 +0530 Subject: [PATCH 1/2] Revert "fix(ar): render fullcalendar in english (#26207)" This reverts commit e4ed1b98e44d0a128d893ad5c85f9ca202a603bc. --- frappe/public/js/frappe/views/calendar/calendar.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index ffbc2d00b8..4dde6f92f3 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -250,13 +250,8 @@ frappe.views.Calendar = class Calendar { setup_options(defaults) { var me = this; defaults.meridiem = "false"; - let lang = frappe.boot.lang; - if (lang == "ar") { - // arabic doesn't work with fullcalendar - doesn't show anything. - lang = "en"; - } this.cal_options = { - locale: lang, + locale: frappe.boot.lang, header: { left: "prev, title, next", right: "today, month, agendaWeek, agendaDay", From 72d81afc726547360ff338c2cba7ab79270e8dee Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 29 Apr 2024 19:15:56 +0530 Subject: [PATCH 2/2] fix(calendar): always use english dates for API calls --- frappe/public/js/frappe/views/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index 4dde6f92f3..cd0402eda1 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -245,7 +245,7 @@ frappe.views.Calendar = class Calendar { get_system_datetime(date) { date._offset = moment(date).tz(frappe.sys_defaults.time_zone)._offset; - return frappe.datetime.convert_to_system_tz(date); + return frappe.datetime.convert_to_system_tz(moment(date).locale("en")); } setup_options(defaults) { var me = this;