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.

Sign up for GitHub

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(Leave Type): translatability of tour step #1371

Merged
merged 3 commits into from
Feb 2, 2024
+9 −4
Merged

fix(Leave Type): translatability of tour step #1371

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c45085
fix(Leave Type): translatability of tour step
barredterra Feb 1, 2024
9fbf957
fix(Leave Applications): make role and settings translatable
barredterra Feb 1, 2024
b78991f
chore: fix tour messages
ruchamahabal Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hrms/hr/doctype/leave_application/leave_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ def validate_dates(self):
if not allowed_role:
frappe.throw(
_("Backdated Leave Application is restricted. Please set the {} in {}").format(
frappe.bold("Role Allowed to Create Backdated Leave Application"),
get_link_to_form("HR Settings", "HR Settings"),
frappe.bold(_("Role Allowed to Create Backdated Leave Application")),
get_link_to_form("HR Settings", "HR Settings", _("HR Settings")),
)
)

if allowed_role and allowed_role not in user_roles:
frappe.throw(
_("Only users with the {0} role can create backdated leave applications").format(
allowed_role
_(allowed_role)
)
)

Expand Down
7 changes: 6 additions & 1 deletion hrms/hr/doctype/leave_type/leave_type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ frappe.tour["Leave Type"] = [
{
fieldname: "is_compensatory",
title: "Is Compensatory Leave",
description: __("Leaves you can avail against a holiday you worked on. You can claim Compensatory Off Leave using Compensatory Leave request. Click") + " <a href='https://docs.erpnext.com/docs/v13/user/manual/en/human-resources/compensatory-leave-request' target='_blank'>here</a> " + __('to know more')
description: __(
"Leaves you can avail against a holiday you worked on. You can claim Compensatory Off Leave using Compensatory Leave request. Click {0} to know more",
[
`<a href='https://docs.erpnext.com/docs/v13/user/manual/en/human-resources/compensatory-leave-request' target='_blank'>${__("here")}</a>`
]
)
},
{
fieldname: "allow_encashment",
Expand Down