#434

frontend/src/components/counts/CountsFieldTree.tsx

@@ -29,11 +29,11 @@ const FieldBranch = ({ field, path, enabled, selected, params, select, update }:
         <input type="checkbox" checked={checked} disabled={!enabled || (field.children != null
                 && !field.children.some (child => selected.has (`${path}.${child.key}`)))}
             onChange={event => select (path, event.target.checked)}/>
-        {label (field.label)}
+        {label (field.label, field.labelValues)}
       </label>
       {field.children != null && <button type="button" aria-expanded={open}
-          aria-controls={id} aria-label={message (field.label).text}
-          lang={message (field.label).language} onClick={() => setOpen (!open)}
+          aria-controls={id} aria-label={message (field.label, field.labelValues).text}
+          lang={message (field.label, field.labelValues).language} onClick={() => setOpen (!open)}
           className="rounded px-1 focus-visible:outline-none focus-visible:ring-2
           focus-visible:ring-blue-500 dark:focus-visible:ring-blue-400">
         <span aria-hidden className="inline-block" style={{
@@ -62,7 +62,8 @@ const FieldGroup = ({ fields, path, params, enabled, selected, select, update }:
   return <SortableList groups={{ items: ordered.map (field => field.key) }}
       fixed={path === '' ? ['thumbnail'] : []}
       name={key => message ('reorder', {
-          column: message (fields.find (field => field.key === key)!.label).text })}
+          column: message (fields.find (field => field.key === key)!.label,
+	      fields.find (field => field.key === key)!.labelValues).text })}
       renderGroup={(_, content) => content}
       onChange={groups => {
         const current = fields.map (field => `${prefix}${field.key}`)