mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-22 06:56:35 +00:00
Maurice
bee500880e
Finishes the plural work the previous wip commit started. t() picks a count string's form by the language's own Intl.PluralRules, and every locale now spells out the forms its language reaches with whole numbers, about 160 count strings in all: one, few and many in Russian, Ukrainian and Polish, one and few in Czech and Slovak, five forms in Arabic, one in the others, none in Japanese, Korean, Chinese, Thai, Vietnamese and Indonesian. Each language was translated and then reviewed on its own. English no longer reads "1 files", "1 updates available" or "photo(s)". Count labels shown next to a number now take that number too: the atlas and admin statistics, the trip cards, journey and shared trip pills, packing templates, receipts, storage usage, the Studio export note. A heading that shared its key with a counted label keeps a key of its own (the boarding pass heading, the Bookings tab), so languages that put a noun after a number in the singular keep a plural heading. The plugin hosts chip passed its count through .replace() after t() and never got a form; three toasts sent the count as text. Mail and push texts for shared photos and suppressed storage failures pick their form in code through pluralForm. A whole number sent as text counts too, which is how in-app notification params arrive, and the plural rule follows the language of the strings on screen while another one still loads. The parity check knows which forms each language needs and refuses missing and impossible ones. It also reads keys that contain a colon now: it skipped them, which hid 58 missing plugin permission texts in Catalan and 35 in Vietnamese, both translated. The client parity test covers every language of the registry instead of a hand-kept list of 19, and the placeholder spec lets a form spell its number out only where its category is that one number. Brazilian Portuguese error screens were in Breton, and an Arabic dashboard label held Hebrew text.
36 lines
1.4 KiB
TypeScript
36 lines
1.4 KiB
TypeScript
import en from '@trek/shared/i18n/en'
|
|
import { resolvePluralKey } from '@trek/shared'
|
|
import type { TranslationStrings } from '@trek/shared/i18n'
|
|
|
|
/**
|
|
* The template a key reads as. A numeric `count` (or `n`) picks the plural
|
|
* form the language's own rule selects (see `@trek/shared` plural helpers):
|
|
* `places.count.one`, `.few`, ... and the key itself as the general form.
|
|
* The active locale is asked with its rule first; English, with English's,
|
|
* only when the locale has none of the key's forms. A count that arrives as
|
|
* text (in-app notification params are strings) counts when it is a plain
|
|
* whole number.
|
|
*/
|
|
export function resolveTemplate(
|
|
strings: TranslationStrings,
|
|
intlLanguage: string,
|
|
key: string,
|
|
params?: Record<string, string | number>,
|
|
): string {
|
|
const count = asCount(params?.count ?? params?.n)
|
|
if (count !== undefined) {
|
|
const own = resolvePluralKey(strings, key, count, intlLanguage)
|
|
if (own) return strings[own] as string
|
|
const fallback = resolvePluralKey(en, key, count, 'en')
|
|
if (fallback) return en[fallback] as string
|
|
return key
|
|
}
|
|
return (strings[key] ?? en[key] ?? key) as string
|
|
}
|
|
|
|
function asCount(raw: string | number | undefined): number | undefined {
|
|
if (typeof raw === 'number') return Number.isFinite(raw) ? raw : undefined
|
|
if (typeof raw === 'string' && /^\d+$/.test(raw)) return Number(raw)
|
|
return undefined
|
|
}
|