mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Make valid-i18n-keys rule strict and fix most exceptions

Browse source
This commit is contained in:
Jamie Kyle 2023-03-29 10:15:54 -07:00 • committed by GitHub
parent 18a6da310f
commit 11cfcb4e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 796 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/components/Intl.tsx
View file

@ -71,24 +71,29 @@ export class Intl extends React.Component<Props> {
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
public override render() {
const { components, id, i18n, renderText = defaultRenderText } = this.props;
const {
components,
id,
// Indirection for linter/migration tooling
i18n: localizer,
renderText = defaultRenderText,
} = this.props;
if (!id) {
log.error('Error: Intl id prop not provided');
return null;
}
if (!i18n.isLegacyFormat(id)) {
if (!localizer.isLegacyFormat(id)) {
strictAssert(
!Array.isArray(components),
`components cannot be an array for ICU message ${id}`
);
const intl = i18n.getIntl();
const intl = localizer.getIntl();
return intl.formatMessage({ id }, components);
}
// eslint-disable-next-line local-rules/valid-i18n-keys
const text = i18n(id);
const text = localizer(id);
const results: Array<
string | JSX.Element | Array<string | JSX.Element> | null
> = [];