Skip to content

Commit 8fad62b

Browse files
cogkmergify[bot]
authored andcommitted
fix(Leave Balance): Add context to translation for "Left" (Employee) (#1683)
(cherry picked from commit 97f393e) # Conflicts: # hrms/hr/report/employee_leave_balance/employee_leave_balance.js
1 parent 749ce70 commit 8fad62b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

hrms/hr/report/employee_leave_balance/employee_leave_balance.js

+7
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,17 @@ frappe.query_reports["Employee Leave Balance"] = {
4343
fieldtype: "Select",
4444
options: [
4545
"",
46+
<<<<<<< HEAD
4647
{ "value": "Active", "label": __("Active") },
4748
{ "value": "Inactive", "label": __("Inactive") },
4849
{ "value": "Suspended", "label": __("Suspended") },
4950
{ "value": "Left", "label": __("Left") },
51+
=======
52+
{ value: "Active", label: __("Active") },
53+
{ value: "Inactive", label: __("Inactive") },
54+
{ value: "Suspended", label: __("Suspended") },
55+
{ value: "Left", label: __("Left", null, "Employee") },
56+
>>>>>>> 97f393e8b (fix(Leave Balance): Add context to translation for "Left" (Employee) (#1683))
5057
],
5158
default: "Active",
5259
},

0 commit comments

Comments
 (0)