Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ar): render fullcalendar in english (backport #26207) #26209

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

It doesn't work in arabic - doesn't show anything.

Looks like upstream bug, best we can try for now is to render it in
English instead.


This is an automatic backport of pull request #26207 done by [Mergify](https://mergify.com).

It doesn't work in arabic - doesn't show anything.

Looks like upstream bug, best we can try for now is to render it in
English instead.

(cherry picked from commit e4ed1b9)

# Conflicts:
#	frappe/public/js/frappe/views/calendar/calendar.js
@mergify mergify bot requested a review from a team April 29, 2024 13:13
@mergify mergify bot added the conflicts label Apr 29, 2024
@mergify mergify bot requested review from ankush and removed request for a team April 29, 2024 13:13
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of e4ed1b9 has failed:

On branch mergify/bp/version-14-hotfix/pr-26207
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit e4ed1b98e4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/public/js/frappe/views/calendar/calendar.js

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ankush Apr 29, 2024
@ankush ankush closed this Apr 29, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-26207 branch April 29, 2024 13:48
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant