Skip to content

Commit

Permalink
Revert "fix(ar): render fullcalendar in english (#26207)"
Browse files Browse the repository at this point in the history
This reverts commit e4ed1b9.

(cherry picked from commit 602ff82)

# Conflicts:
#	frappe/public/js/frappe/views/calendar/calendar.js
  • Loading branch information
ankush authored and mergify[bot] committed Apr 29, 2024
1 parent 6231e1d commit 9d7c6d8
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions frappe/public/js/frappe/views/calendar/calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ frappe.views.Calendar = class Calendar {
var me = this;
defaults.meridiem = "false";
this.cal_options = {
<<<<<<< HEAD
locale: frappe.boot.user.language || "en",
=======
locale: frappe.boot.lang,
>>>>>>> 602ff8273f (Revert "fix(ar): render fullcalendar in english (#26207)")
header: {
left: "prev, title, next",
right: "today, month, agendaWeek, agendaDay",
Expand Down

0 comments on commit 9d7c6d8

Please sign in to comment.