Merge pull request #26213 from ankush/fix_arabic_cal
fix: calendar in Arabic
This commit is contained in:
commit
ba4ea0ed7a
1 changed files with 2 additions and 7 deletions
|
|
@ -245,18 +245,13 @@ 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;
|
||||
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",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue