From 96d773f43acf670a7d51505dcd270268ee05d768 Mon Sep 17 00:00:00 2001
From: tommy <tommy.lu@2fi-solutions.com.hk>
Date: Mon, 8 Jun 2026 11:38:25 +0800
Subject: [PATCH] translateee

---
 src/components/Jodetail/FInishedJobOrderRecord.tsx  | 2 +-
 src/components/PickOrderSearch/AssignAndRelease.tsx | 6 +++---
 src/components/PickOrderSearch/PickOrders.tsx       | 4 ++--
 src/i18n/en/jo.json                                 | 6 +++++-
 src/i18n/en/pickOrder.json                          | 5 ++++-
 src/i18n/zh/jo.json                                 | 6 +++++-
 src/i18n/zh/pickOrder.json                          | 3 +++
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/Jodetail/FInishedJobOrderRecord.tsx b/src/components/Jodetail/FInishedJobOrderRecord.tsx
index 5f5a0a8..cab5cae 100644
--- a/src/components/Jodetail/FInishedJobOrderRecord.tsx
+++ b/src/components/Jodetail/FInishedJobOrderRecord.tsx
@@ -504,7 +504,7 @@ const FInishedJobOrderRecord: React.FC<Props> = ({ filterArgs }) => {
                         </Box>
                         <Box>
                           <Chip 
-                            label={jobOrderPickOrder.pickOrderStatus} 
+                            label={t(jobOrderPickOrder.pickOrderStatus)}
                             color={jobOrderPickOrder.pickOrderStatus === 'completed' ? 'success' : 'default'}
                             size="small"
                             sx={{ mb: 1 }}
diff --git a/src/components/PickOrderSearch/AssignAndRelease.tsx b/src/components/PickOrderSearch/AssignAndRelease.tsx
index 33752b1..30cf3be 100644
--- a/src/components/PickOrderSearch/AssignAndRelease.tsx
+++ b/src/components/PickOrderSearch/AssignAndRelease.tsx
@@ -30,7 +30,7 @@ import {
 } from "@/app/api/pickOrder/actions";
 import { fetchNameList, NameList ,fetchNewNameList, NewNameList} from "@/app/api/user/actions";
 import { FormProvider, useForm } from "react-hook-form";
-import { isEmpty, sortBy, uniqBy, upperFirst, groupBy } from "lodash";
+import { isEmpty, sortBy, uniqBy, groupBy } from "lodash";
 import { OUTPUT_DATE_FORMAT, arrayToDayjs } from "@/app/utils/formatUtil";
 import useUploadContext from "../UploadProvider/useUploadContext";
 import dayjs from "dayjs";
@@ -236,7 +236,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => {
           uniqBy(
             originalItemData.map((item) => ({
               value: item.status,
-              label: t(upperFirst(item.status)),
+              label: t(item.status),
             })),
             "value",
           ),
@@ -507,7 +507,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => {
                       
                       {/* Pick Order Status - 只在第一个项目显示 */}
                       <TableCell>
-                        {index === 0 ? upperFirst(item.status) : null}
+                        {index === 0 ? t(item.status) : null}
                       </TableCell>
                     </TableRow>
                   ))
diff --git a/src/components/PickOrderSearch/PickOrders.tsx b/src/components/PickOrderSearch/PickOrders.tsx
index 5fb16f9..db62433 100644
--- a/src/components/PickOrderSearch/PickOrders.tsx
+++ b/src/components/PickOrderSearch/PickOrders.tsx
@@ -3,7 +3,7 @@ import SearchResults, { Column } from "../SearchResults/SearchResults";
 import { PickOrderResult } from "@/app/api/pickOrder";
 import { useTranslation } from "react-i18next";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { isEmpty, upperCase, upperFirst } from "lodash";
+import { isEmpty, upperCase } from "lodash";
 import { arrayToDateString, OUTPUT_DATE_FORMAT } from "@/app/utils/formatUtil";
 import {
   consolidatePickOrder,
@@ -127,7 +127,7 @@ const PickOrders: React.FC<Props> = ({ filteredPickOrders, filterArgs }) => {
         name: "status",
         label: t("Status"),
         renderCell: (params) => {
-          return upperFirst(params.status);
+          return t(params.status);
         },
       },
     ],
diff --git a/src/i18n/en/jo.json b/src/i18n/en/jo.json
index 0d94138..cafb644 100644
--- a/src/i18n/en/jo.json
+++ b/src/i18n/en/jo.json
@@ -562,7 +562,11 @@
   "cancel": "cancel",
   "cancelled": "cancelled",
   "complete jo": "complete jo",
-  "completed": "completed",
+  "completed": "Completed",
+  "consolidated": "Consolidated",
+  "assigned": "Assigned",
+  "released": "Released",
+  "picking": "Picking",
   "completed Job Order pick orders with Matching": "completed Job Order pick orders with Matching",
   "completed Job Order pick orders with matching": "completed Job Order pick orders with matching",
   "consumables": "consumables",
diff --git a/src/i18n/en/pickOrder.json b/src/i18n/en/pickOrder.json
index 4e6026c..dc4874b 100644
--- a/src/i18n/en/pickOrder.json
+++ b/src/i18n/en/pickOrder.json
@@ -9,7 +9,10 @@
   "Status": "Status",
   "N/A": "N/A",
   "Release Pick Orders": "Release Pick Orders",
-  "released": "released",
+  "released": "Released",
+  "consolidated": "Consolidated",
+  "assigned": "Assigned",
+  "picking": "Picking",
   "Loading...": "Loading...",
   "Suggestion success": "Suggestion success",
   "Scan pick success": "Scan pick success",
diff --git a/src/i18n/zh/jo.json b/src/i18n/zh/jo.json
index 4a2e6e0..584d6d2 100644
--- a/src/i18n/zh/jo.json
+++ b/src/i18n/zh/jo.json
@@ -562,7 +562,11 @@
   "cancel": "已取消",
   "cancelled": "已取消",
   "complete jo": "完成工單",
-  "completed": "完成",
+  "completed": "已完成",
+  "consolidated": "已合併",
+  "assigned": "已分派",
+  "released": "已放單",
+  "picking": "提料中",
   "completed Job Order pick orders with Matching": "工單已完成提料和對料",
   "completed Job Order pick orders with matching": "工單已完成提料和對料",
   "consumables": "消耗品",
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index 846ddbd..5d1e83b 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -10,6 +10,9 @@
   "N/A": "不適用",
   "Release Pick Orders": "放單",
   "released": "已放單",
+  "consolidated": "已合併",
+  "assigned": "已分派",
+  "picking": "提料中",
   "Loading...": "加載中",
   "Suggestion success": "建議成功",
   "Scan pick success": "掃描提料成功",