diff --git a/frontend/src/components/AttendanceCalendar.vue b/frontend/src/components/AttendanceCalendar.vue index e8222f200d..cc725044f1 100644 --- a/frontend/src/components/AttendanceCalendar.vue +++ b/frontend/src/components/AttendanceCalendar.vue @@ -48,7 +48,7 @@
- {{ status }} + {{ __(status) }}
{{ summary[status] || 0 }} @@ -76,6 +76,7 @@ const colorMap = { Holiday: "gray-100", } +// __("Present"), __("Half Day"), __("Absent"), __("On Leave"), __("Work From Home") const summaryStatuses = ["Present", "Half Day", "Absent", "On Leave"] const summary = computed(() => { @@ -104,7 +105,17 @@ const getEventOnDate = (date) => { return calendarEvents.data[firstOfMonth.value.date(date).format("YYYY-MM-DD")] } -const DAYS = ["S", "M", "T", "W", "T", "F", "S"] +const getFirstLetter = (s) => Array.from(s.trim())[0] // Unicode + +const DAYS = [ + getFirstLetter(__("Sunday")), + getFirstLetter(__("Monday")), + getFirstLetter(__("Tuesday")), + getFirstLetter(__("Wednesday")), + getFirstLetter(__("Thursday")), + getFirstLetter(__("Friday")), + getFirstLetter(__("Saturday")), +] //resources const calendarEvents = createResource({ diff --git a/frontend/src/components/AttendanceRequestItem.vue b/frontend/src/components/AttendanceRequestItem.vue index 363fda46b3..c6c7d09930 100644 --- a/frontend/src/components/AttendanceRequestItem.vue +++ b/frontend/src/components/AttendanceRequestItem.vue @@ -10,15 +10,13 @@ {{ props.doc.attendance_dates || getDates(props.doc) }} · - {{ - `${props.doc.total_attendance_days || getTotalDays(props.doc)}d` - }} + {{ __("{0}d", [props.doc.total_attendance_days]) }}
diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index 24f2dd5555..89f2bc669e 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -6,7 +6,7 @@

- {{ props.pageTitle }} + {{ props.pageTitle || __("Frappe HR") }}

@@ -62,7 +62,7 @@ const props = defineProps({ pageTitle: { type: String, required: false, - default: "Frappe HR", + default: "", }, }) diff --git a/frontend/src/components/BottomTabs.vue b/frontend/src/components/BottomTabs.vue index 804aa30468..416dd787f4 100644 --- a/frontend/src/components/BottomTabs.vue +++ b/frontend/src/components/BottomTabs.vue @@ -31,33 +31,36 @@ import LeaveIcon from "@/components/icons/LeaveIcon.vue" import ExpenseIcon from "@/components/icons/ExpenseIcon.vue" import SalaryIcon from "@/components/icons/SalaryIcon.vue" import AttendanceIcon from "@/components/icons/AttendanceIcon.vue" +import { inject } from "vue" + +const __ = inject("$translate") const route = useRoute() const tabItems = [ { icon: HomeIcon, - title: "Home", + title: __("Home"), route: "/home", }, { icon: AttendanceIcon, - title: "Attendance", + title: __("Attendance"), route: "/dashboard/attendance", }, { icon: LeaveIcon, - title: "Leaves", + title: __("Leaves"), route: "/dashboard/leaves", }, { icon: ExpenseIcon, - title: "Expenses", + title: __("Expenses"), route: "/dashboard/expense-claims", }, { icon: SalaryIcon, - title: "Salary", + title: __("Salary"), route: "/dashboard/salary-slips", }, ] diff --git a/frontend/src/components/CheckInPanel.vue b/frontend/src/components/CheckInPanel.vue index db748ebfab..2282ae40a7 100644 --- a/frontend/src/components/CheckInPanel.vue +++ b/frontend/src/components/CheckInPanel.vue @@ -1,10 +1,12 @@ @@ -38,10 +39,9 @@ import { FeatherIcon, Badge } from "frappe-ui" import { computed, inject } from "vue" -import { getCurrencySymbol } from "@/data/currencies" - import ListItem from "@/components/ListItem.vue" import EmployeeAdvanceIcon from "@/components/icons/EmployeeAdvanceIcon.vue" +import { formatCurrency } from "@/utils/formatters"; const dayjs = inject("$dayjs") const props = defineProps({ @@ -66,8 +66,6 @@ const colorMap = { "Partly Claimed and Returned": "orange", } -const currency = computed(() => getCurrencySymbol(props.doc.currency)) - const postingDate = computed(() => { return dayjs(props.doc.posting_date).format("D MMM") }) diff --git a/frontend/src/components/ExpenseAdvancesTable.vue b/frontend/src/components/ExpenseAdvancesTable.vue index 06c17da7f7..5babbaba80 100644 --- a/frontend/src/components/ExpenseAdvancesTable.vue +++ b/frontend/src/components/ExpenseAdvancesTable.vue @@ -1,7 +1,7 @@ diff --git a/frontend/src/components/ExpenseTaxesTable.vue b/frontend/src/components/ExpenseTaxesTable.vue index 4c93951027..984cbd56c5 100644 --- a/frontend/src/components/ExpenseTaxesTable.vue +++ b/frontend/src/components/ExpenseTaxesTable.vue @@ -1,7 +1,7 @@