#434

frontend/src/lib/countsDisplay.ts

@@ -1,7 +1,7 @@
 import { fieldsForCounts, orderedCountFields, selectedCountChildren,
 	 sortedCountChildren } from '@/lib/counts'
 import { countsEventTypes, countsFieldLabel } from '@/lib/countsDefinitions'
-import { translateUIMessage } from '@/lib/i18n'
+import { languageUIMessage, translateUIMessage } from '@/lib/i18n'
 import { localisedDateString, msToTime } from '@/lib/utils'
 
 import type { CountColumn, CountField, CountRecord, CountsResult,
@@ -133,15 +133,14 @@ export const countsLogicalName = (
   const code = String (value)
   if (field === 'languageCode' || field === 'scriptCode')
   {
-    if (field === 'languageCode' && ['ja', 'ain'].includes (code))
-      return translateUIMessage (`history:languageNames.${code}`, 'counts', locale)
-    const master = row[field === 'languageCode' ? 'languageName' : 'scriptName']
+    if (field === 'languageCode') return languageUIMessage (code, locale)
+    const master = row.scriptName
     if (typeof master === 'string' && master.trim () !== ''
 	&& master.toLowerCase () !== code.toLowerCase ())
       return { text: master }
     try
     {
-      const type = field === 'languageCode' ? 'language' : 'script'
+      const type = 'script'
       if (!displayNames.has (type))
 	displayNames.set (type, new Intl.DisplayNames (['ja'], { type, fallback: 'none' }))
       const text = displayNames.get (type)!.of (code)
@@ -305,9 +304,9 @@ export const countsExportLabels = (
 	`common:categories.${key}`, 'counts', locale).text
   for (const key of ['true', 'false'])
     labels[`boolean:${key}`] = translateUIMessage (`boolean.${key}`, 'counts', locale).text
-  for (const key of ['ja', 'ain'])
-    labels[`language:${key}`] = translateUIMessage (
-	`history:languageNames.${key}`, 'counts', locale).text
+  for (const key of new Set (['ja', 'ain', 'en', ...(definition?.nameColumns ?? [])
+      .map (field => field.nameLocale?.languageCode).filter (code => code != null)]))
+    labels[`language:${key}`] = languageUIMessage (key, locale).text
   labels.id = translateUIMessage ('columns.resourceId', 'counts', locale).text
   labels.name = translateUIMessage ('history:name', 'counts', locale).text
   for (const event of countsEventTypes)
@@ -403,11 +402,13 @@ export const countsSummaryValue = (
   const message = (key: string, values?: Record<string, string | number>) =>
       translateUIMessage (key, 'counts', locale, values).text
   if (value == null) return axis.field === 'user' ? message ('bot') : ''
+  if (['language_code', 'source_language_code'].includes (axis.field))
+    return languageUIMessage (String (value), locale).text
   const logical = data.axisLabels?.[`a${index}`]?.[String (value)]
   if (axis.field === 'user') return message ('actorWithId', {
       name: logical || message ('notRegistered'), id: value })
   if (logical != null) return logical
-  if (['tags', 'language_code', 'source_language_code'].includes (axis.field))
+  if (axis.field === 'tags')
     return message ('notRegistered')
   if (axis.field === 'changed_field') return message (countsFieldLabel (String (value)))
   if (axis.field === 'event_type') return message (`events.${value}`)