refactor: address code review feedback - extract resolve helper, add comment, clean up ternary

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/i18n/src/useObjectLabel.ts

@@ -31,39 +31,33 @@ import { useObjectTranslation } from './provider';
 export function useObjectLabel() {
   const { t } = useObjectTranslation();
 
+  /** Check whether a translation lookup returned a valid translated string. */
+  const resolve = (key: string, fallback: string): string => {
+    const translated = t(key, { defaultValue: '' });
+    return (translated && translated !== key && translated !== '')
+      ? translated
+      : fallback;
+  };
+
   return {
     /**
      * Resolve translated object label, falling back to objectDef.label.
      */
-    objectLabel: (objectDef: { name: string; label: string }) => {
-      const key = `crm.objects.${objectDef.name}.label`;
-      const translated = t(key, { defaultValue: '' });
-      return (translated && translated !== key && translated !== '')
-        ? translated
-        : objectDef.label;
-    },
+    objectLabel: (objectDef: { name: string; label: string }) =>
+      resolve(`crm.objects.${objectDef.name}.label`, objectDef.label),
 
     /**
      * Resolve translated object description, falling back to objectDef.description.
      */
     objectDescription: (objectDef: { name: string; description?: string }) => {
       if (!objectDef.description) return undefined;
-      const key = `crm.objects.${objectDef.name}.description`;
-      const translated = t(key, { defaultValue: '' });
-      return (translated && translated !== key && translated !== '')
-        ? translated
-        : objectDef.description;
+      return resolve(`crm.objects.${objectDef.name}.description`, objectDef.description);
     },
 
     /**
      * Resolve translated field label, falling back to the provided fallback string.
      */
-    fieldLabel: (objectName: string, fieldName: string, fallback: string) => {
-      const key = `crm.fields.${objectName}.${fieldName}`;
-      const translated = t(key, { defaultValue: '' });
-      return (translated && translated !== key && translated !== '')
-        ? translated
-        : fallback;
-    },
+    fieldLabel: (objectName: string, fieldName: string, fallback: string) =>
+      resolve(`crm.fields.${objectName}.${fieldName}`, fallback),
   };
 }

packages/layout/src/NavigationRenderer.tsx

@@ -185,6 +185,8 @@ function resolveItemLabel(
   resolver?: (objectName: string, fallbackLabel: string) => string,
 ): string {
   const base = resolveLabel(item.label);
+  // Only apply convention-based resolution for object-type items with plain string labels.
+  // I18nLabel objects (with explicit key/defaultValue) already have their own translation keys.
   if (resolver && item.type === 'object' && item.objectName && typeof item.label === 'string') {
     return resolver(item.objectName, base);
   }

packages/plugin-grid/src/ObjectGrid.tsx

@@ -861,7 +861,7 @@ export const ObjectGrid: React.FC<ObjectGridProps> = ({
       const CellRenderer = getCellRenderer(field.type);
       const numericTypes = ['number', 'currency', 'percent'];
       generatedColumns.push({
-        header: schema.objectName ? resolveFieldLabel(schema.objectName, fieldName, field.label || fieldName) : (field.label || fieldName),
+        header: schema.objectName ? resolveFieldLabel(schema.objectName, fieldName, field.label || fieldName) : field.label || fieldName,
         accessorKey: fieldName,
         ...(numericTypes.includes(field.type) && { align: 'right' }),
         cell: (value: any) => <CellRenderer value={value} field={field} />,