Revert "fix(ar): render fullcalendar in english (#26207)"

This reverts commit e4ed1b9. (cherry picked from commit 602ff82) # Conflicts: # frappe/public/js/frappe/views/calendar/calendar.js
frappe · Apr 29, 2024 · 9d7c6d8 · 9d7c6d8
1 parent 6231e1d
commit 9d7c6d8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js
@@ -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",