From 2bc8f46e8d45ffed67eed621955084ae754076e1 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:31:47 +0530 Subject: [PATCH 1/2] fix(Job Applicant): Translate dialog label (backport #1682) (#1687) * fix(Job Applicant): Translate dialog label (#1682) (cherry picked from commit 0906abb30b6733f4caf30f7cad235e276307d1c2) # Conflicts: # hrms/hr/doctype/job_applicant/job_applicant.js * chore: fix conflicts --------- Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com> Co-authored-by: Rucha Mahabal --- hrms/hr/doctype/job_applicant/job_applicant.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hrms/hr/doctype/job_applicant/job_applicant.js b/hrms/hr/doctype/job_applicant/job_applicant.js index b916028b05..259392fb0d 100644 --- a/hrms/hr/doctype/job_applicant/job_applicant.js +++ b/hrms/hr/doctype/job_applicant/job_applicant.js @@ -80,7 +80,7 @@ frappe.ui.form.on("Job Applicant", { options: 'Interview Round' }, ], - primary_action_label: 'Create Interview', + primary_action_label: __("Create Interview"), primary_action(values) { frm.events.create_interview(frm, values); d.hide(); From 7bedf5fb85a7e990a6c3c796256f344097b8227e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:36:26 +0530 Subject: [PATCH 2/2] fix(Leave Balance): Add context to translation for "Left" (Employee) (backport #1683) (#1685) * fix(Leave Balance): Add context to translation for "Left" (Employee) (#1683) (cherry picked from commit 97f393e8b4359e3386ac44ae5d88c0a3dcf5bc68) # Conflicts: # hrms/hr/report/employee_leave_balance/employee_leave_balance.js * chore: fix conflicts --------- Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com> Co-authored-by: Rucha Mahabal --- .../employee_leave_balance/employee_leave_balance.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hrms/hr/report/employee_leave_balance/employee_leave_balance.js b/hrms/hr/report/employee_leave_balance/employee_leave_balance.js index 091aa87250..317fdd5dc2 100644 --- a/hrms/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/hrms/hr/report/employee_leave_balance/employee_leave_balance.js @@ -43,10 +43,10 @@ frappe.query_reports["Employee Leave Balance"] = { fieldtype: "Select", options: [ "", - { "value": "Active", "label": __("Active") }, - { "value": "Inactive", "label": __("Inactive") }, - { "value": "Suspended", "label": __("Suspended") }, - { "value": "Left", "label": __("Left") }, + { value: "Active", label: __("Active") }, + { value: "Inactive", label: __("Inactive") }, + { value: "Suspended", label: __("Suspended") }, + { value: "Left", label: __("Left", null, "Employee") }, ], default: "Active", },