Merge pull request #2374 from frappe/version-15-hotfix

frontend/package.json

@@ -14,17 +14,17 @@
 		"@ionic/vue": "^7.4.3",
 		"@ionic/vue-router": "^7.4.3",
 		"@vitejs/plugin-vue": "^4.4.0",
-		"autoprefixer": "^10.4.2",
-		"dayjs": "^1.11.7",
-		"feather-icons": "^4.28.0",
+		"autoprefixer": "^10.4.19",
+		"dayjs": "^1.11.11",
+		"feather-icons": "^4.29.1",
 		"firebase": "^10.8.0",
-		"frappe-ui": "^0.1.67",
+		"frappe-ui": "^0.1.72",
 		"postcss": "^8.4.5",
-		"tailwindcss": "^3.0.15",
-		"vite": "^5.1.4",
-		"vite-plugin-pwa": "^0.19.0",
-		"vue": "^3.2.25",
-		"vue-router": "^4.0.12",
+		"tailwindcss": "^3.4.3",
+		"vite": "^5.4.10",
+		"vite-plugin-pwa": "^0.20.5",
+		"vue": "^3.5.12",
+		"vue-router": "^4.3.2",
 		"workbox-core": "^7.0.0",
 		"workbox-precaching": "^7.0.0"
 	},

frontend/src/components/AttendanceCalendar.vue

@@ -48,7 +48,7 @@
 				<div v-for="status in summaryStatuses" class="flex flex-col gap-1">
 					<div class="flex flex-row gap-1 items-center">
 						<span class="rounded full h-3 w-3" :class="`bg-${colorMap[status]}`" />
-						<span class="text-gray-600 text-sm font-medium leading-5"> {{ status }} </span>
+						<span class="text-gray-600 text-sm font-medium leading-5"> {{ __(status) }} </span>
 					</div>
 					<span class="text-gray-800 text-base font-semibold leading-6 mx-auto">
 						{{ summary[status] || 0 }}
@@ -65,6 +65,7 @@ import { createResource } from "frappe-ui"
 
 const dayjs = inject("$dayjs")
 const employee = inject("$employee")
+const __ = inject("$translate")
 const firstOfMonth = ref(dayjs().date(1).startOf("D"))
 
 const colorMap = {
@@ -76,6 +77,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 +106,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({

frontend/src/components/AttendanceRequestItem.vue

@@ -10,15 +10,13 @@
 					<span>{{ props.doc.attendance_dates || getDates(props.doc) }}</span>
 					<span v-if="props.doc.to_date">
 						<span class="whitespace-pre"> &middot; </span>
-						<span class="whitespace-nowrap">{{
-							`${props.doc.total_attendance_days || getTotalDays(props.doc)}d`
-						}}</span>
+						<span class="whitespace-nowrap">{{ __("{0}d", [props.doc.total_attendance_days]) }}</span>
 					</span>
 				</div>
 			</div>
 		</template>
 		<template #right>
-			<Badge variant="outline" :theme="colorMap[status]" :label="status" size="md" />
+			<Badge variant="outline" :theme="colorMap[status]" :label="__(status)" size="md" />
 			<FeatherIcon name="chevron-right" class="h-5 w-5 text-gray-500" />
 		</template>
 	</ListItem>

frontend/src/components/BaseLayout.vue

@@ -6,7 +6,7 @@
 					<div class="flex flex-row justify-between items-center">
 						<div class="flex flex-row items-center gap-2">
 							<h2 class="text-xl font-bold text-gray-900">
-								{{ props.pageTitle }}
+								{{ props.pageTitle || __("Frappe HR") }}
 							</h2>
 						</div>
 						<div class="flex flex-row items-center gap-3 ml-auto">
@@ -62,7 +62,7 @@ const props = defineProps({
 	pageTitle: {
 		type: String,
 		required: false,
-		default: "Frappe HR",
+		default: "",
 	},
 })
 </script>

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",
 	},
 ]

frontend/src/components/CheckInPanel.vue

@@ -1,10 +1,12 @@
 <template>
 	<div class="flex flex-col bg-white rounded w-full py-6 px-4 border-none">
-		<h2 class="text-lg font-bold text-gray-900">Hey, {{ employee?.data?.first_name }} 👋</h2>
+		<h2 class="text-lg font-bold text-gray-900">
+			{{ __("Hey, {0} 👋", [employee?.data?.first_name]) }}
+		</h2>
 
 		<template v-if="settings.data?.allow_employee_checkin_from_mobile_app">
 			<div class="font-medium text-sm text-gray-500 mt-1.5" v-if="lastLog">
-				<span>Last {{ lastLogType }} was at {{ formatTimestamp(lastLog.time) }}</span>
+				<span>{{ __("Last {0} was at {1}", [__(lastLogType), formatTimestamp(lastLog.time)]) }}</span>
 				<span class="whitespace-pre"> &middot; </span>
 				<router-link :to="{ name: 'EmployeeCheckinListView' }" v-slot="{ navigate }">
 					<span @click="navigate" class="underline">View List</span>
@@ -68,7 +70,7 @@
 			</template>
 
 			<Button variant="solid" class="w-full py-5 text-sm" @click="submitLog(nextAction.action)">
-				Confirm {{ nextAction.label }}
+				{{ __("Confirm {0}", [nextAction.label]) }}
 			</Button>
 		</div>
 	</ion-modal>
@@ -86,6 +88,7 @@ const DOCTYPE = "Employee Checkin"
 const socket = inject("$socket")
 const employee = inject("$employee")
 const dayjs = inject("$dayjs")
+const __ = inject("$translate")
 const checkinTimestamp = ref(null)
 const latitude = ref(0)
 const longitude = ref(0)
@@ -117,18 +120,18 @@ const lastLogType = computed(() => {
 
 const nextAction = computed(() => {
 	return lastLog?.value?.log_type === "IN"
-		? { action: "OUT", label: "Check Out" }
-		: { action: "IN", label: "Check In" }
+		? { action: "OUT", label: __("Check Out") }
+		: { action: "IN", label: __("Check In") }
 })
 
 function handleLocationSuccess(position) {
 	latitude.value = position.coords.latitude
 	longitude.value = position.coords.longitude
 
-	locationStatus.value = `
-		Latitude: ${Number(latitude.value).toFixed(5)}°,
-		Longitude: ${Number(longitude.value).toFixed(5)}°
-	`
+	locationStatus.value = [
+		__("Latitude: {0}°", [Number(latitude.value).toFixed(5)]),
+		__("Longitude: {0}°", [Number(longitude.value).toFixed(5)]),
+	].join(", ")
 }
 
 function handleLocationError(error) {
@@ -138,9 +141,9 @@ function handleLocationError(error) {
 
 const fetchLocation = () => {
 	if (!navigator.geolocation) {
-		locationStatus.value = "Geolocation is not supported by your current browser"
+		locationStatus.value = __("Geolocation is not supported by your current browser")
 	} else {
-		locationStatus.value = "Locating..."
+		locationStatus.value = __("Locating...")
 		navigator.geolocation.getCurrentPosition(handleLocationSuccess, handleLocationError)
 	}
 }
@@ -154,7 +157,7 @@ const handleEmployeeCheckin = () => {
 }
 
 const submitLog = (logType) => {
-	const action = logType === "IN" ? "Check-in" : "Check-out"
+	const actionLabel = logType === "IN" ? __("Check-in") : __("Check-out")
 
 	checkins.insert.submit(
 		{
@@ -168,17 +171,17 @@ const submitLog = (logType) => {
 			onSuccess() {
 				modalController.dismiss()
 				toast({
-					title: "Success",
-					text: `${action} successful!`,
+					title: __("Success"),
+					text: __("{0} successful!", [actionLabel]),
 					icon: "check-circle",
 					position: "bottom-center",
 					iconClasses: "text-green-500",
 				})
 			},
 			onError() {
 				toast({
-					title: "Error",
-					text: `${action} failed!`,
+					title: __("Error"),
+					text: __("{0} failed!", [actionLabel]),
 					icon: "alert-circle",
 					position: "bottom-center",
 					iconClasses: "text-red-500",

frontend/src/components/EmployeeAdvanceBalance.vue

@@ -18,7 +18,7 @@
 		>
 			<div class="flex flex-col bg-white w-full py-5 px-3.5 mt-0 border-none">
 				<Button @click="navigate" variant="subtle" class="py-5 text-base">
-					Request an Advance
+					{{ __("Request an Advance") }}
 				</Button>
 			</div>
 		</router-link>

frontend/src/components/EmployeeAdvanceItem.vue

@@ -8,17 +8,18 @@
 			<EmployeeAdvanceIcon class="h-5 w-5 mt-[3px] text-gray-500" />
 			<div class="flex flex-col items-start gap-1">
 				<div v-if="props.doc.balance_amount" class="text-lg font-bold text-gray-800 leading-6">
-					{{ `${currency} ${props.doc.balance_amount} /` }}
+					{{ formatCurrency(props.doc.balance_amount, props.doc.currency) }}
+					/
 					<span class="text-gray-600">
-						{{ `${currency} ${props.doc.paid_amount}` }}
+						{{ formatCurrency(props.doc.paid_amount, props.doc.currency) }}
 					</span>
 				</div>
 				<div v-else class="text-lg font-bold text-gray-800 leading-6">
-					{{ `${currency} ${props.doc.advance_amount}` }}
+					{{ formatCurrency(props.doc.advance_amount, props.doc.currency) }}
 				</div>
 				<div class="text-xs font-normal text-gray-500">
 					<span>
-						{{ props.doc.purpose }}
+						{{ __(props.doc.purpose) }}
 					</span>
 					<span class="whitespace-pre"> &middot; </span>
 					<span class="whitespace-nowrap">
@@ -28,7 +29,7 @@
 			</div>
 		</template>
 		<template #right>
-			<Badge variant="outline" :theme="colorMap[status]" :label="status" size="md" />
+			<Badge variant="outline" :theme="colorMap[status]" :label="__(status, null, 'Employee Advance')" size="md" />
 			<FeatherIcon name="chevron-right" class="h-5 w-5 text-gray-500" />
 		</template>
 	</ListItem>
@@ -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")
 })

frontend/src/components/EmptyState.vue

@@ -5,7 +5,7 @@
 			props.isTableField ? 'border-2 border-dashed border-gray-300 mt-5' : '',
 		]"
 	>
-		{{ props.message }}
+		{{ __(props.message) }}
 	</div>
 </template>
 

frontend/src/components/ExpenseAdvancesTable.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="flex flex-row justify-between items-center">
 		<h2 class="text-base font-semibold text-gray-800">
-			Settle against Advances
+			{{ __("Settle against Advances") }}
 		</h2>
 	</div>
 
@@ -32,8 +32,10 @@
 						</div>
 						<div class="flex flex-row items-center gap-3 justify-between">
 							<div class="text-xs font-normal text-gray-500">
-								Unclaimed Amount:
-								{{ formatCurrency(advance.unclaimed_amount, currency) }}
+								{{ __("{0}: {1}", [
+									__("Unclaimed Amount"),
+									formatCurrency(advance.unclaimed_amount, currency),
+								]) }}
 							</div>
 						</div>
 					</div>

frontend/src/components/ExpenseClaimItem.vue

@@ -22,7 +22,7 @@
 			</div>
 		</template>
 		<template #right>
-			<Badge variant="outline" :theme="statusMap[status]" :label="status" size="md" />
+			<Badge variant="outline" :theme="statusMap[status]" :label="__(status, null, 'Expense Claim')" size="md" />
 			<FeatherIcon name="chevron-right" class="h-5 w-5 text-gray-500" />
 		</template>
 	</ListItem>
@@ -39,6 +39,7 @@ import { getCompanyCurrency } from "@/data/currencies"
 import { formatCurrency } from "@/utils/formatters"
 
 const dayjs = inject("$dayjs")
+const __ = inject("$translate")
 const props = defineProps({
 	doc: {
 		type: Object,
@@ -80,11 +81,10 @@ const status = computed(() => {
 })
 
 const claimTitle = computed(() => {
-	let title = props.doc.expense_type
+	let title = __(props.doc.expense_type)
 	if (props.doc.total_expenses > 1) {
-		title += ` & ${props.doc.total_expenses - 1} more`
+		title = __("{0} & {1} more", [title, props.doc.total_expenses - 1])
 	}
-
 	return title
 })