#434

frontend/src/components/counts/CountsNestedTable.tsx

@@ -4,7 +4,7 @@ import CountsSortHeader from '@/components/counts/CountsSortHeader'
 import CountsSelectableTable from '@/components/counts/CountsSelectableTable'
 import { changeCountSort, readCountSort, selectedCountChildren,
 	 writeCountSort, orderedCountFields } from '@/lib/counts'
-import { countsLogicalName, countsNestedClipboardTable, countsNestedExport,
+import { countsFieldValue, countsLogicalName, countsNestedClipboardTable, countsNestedExport,
 	 countsNestedOrder, countsNestedText, countsNestedIsScalar, countsNestedScalarText }
     from '@/lib/countsDisplay'
 import { useLocale } from '@/lib/useLocale'
@@ -33,7 +33,7 @@ const CountsNestedTable = (
       .map (sort => ({ ...sort, key: sort.key.slice (path.length + 1) }))
   const ordered = countsNestedOrder (rows, path, params, locale)
   const scalar = (row: CountRecord, field: string) => {
-    const value = row[field]
+    const value = countsFieldValue (row, field)
     if (value == null) return null
     if (field === 'tagId' || field === 'tagGroupId')
       return <PrefetchLink to={field === 'tagId'
@@ -47,6 +47,9 @@ const CountsNestedTable = (
 	{String (value)}</PrefetchLink>
     }
     const display = countsLogicalName (row, field, locale)
+    const nameLocale = fields.find (item => item.key === field)?.nameLocale
+    if (nameLocale != null)
+      return <LocalisedText language={nameLocale.languageCode}>{display.text}</LocalisedText>
     if (typeof value === 'boolean')
       return <span aria-label={display.text} lang={display.language}>{value ? '✓' : '✗'}</span>
     if (display.language != null)
@@ -75,7 +78,7 @@ const CountsNestedTable = (
 		    dark:bg-background dark:text-foreground"><tr>
 		  {columns.map (field => (
 		      <CountsSortHeader key={field.key} field={field.key}
-			  label={message (field.label)}
+			  label={message (field.label, field.labelValues)}
 			  sorts={sorts} structured={field.children != null}
 			  change={(key, additive) => {
 			    const next = changeCountSort (sorts, key, additive)
@@ -101,7 +104,8 @@ const CountsNestedTable = (
 			     ? <CountsNestedTable rows={row[field.key] as CountRecord[] ?? []}
 				 fields={field.children} path={`${path}.${field.key}`}
 				 resource={resource}
-				 title={message (field.label)} params={params} update={update}/>
+				 title={message (field.label, field.labelValues)}
+				 params={params} update={update}/>
 			     : scalar (row, field.key)}
 			  </td>))}
 		    </tr>))}</tbody>