imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate conjugation i18n strings (#11660)

Browse source
This commit is contained in:
Michael Telatynski 2023-09-25 12:18:15 +01:00 • committed by GitHub
parent f841757906
commit 0f59298f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 371 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/utils/i18n-helpers.ts
View file

@ -19,6 +19,7 @@ import { Room } from "matrix-js-sdk/src/matrix";
import SpaceStore from "../stores/spaces/SpaceStore";
import { _t } from "../languageHandler";
import DMRoomMap from "./DMRoomMap";
import { formatList } from "./FormattingUtils";
export interface RoomContextDetails {
details: string | null;
@ -39,7 +40,7 @@ export function roomContextDetails(room: Room): RoomContextDetails | null {
const space1Name = room.client.getRoom(parent)?.name;
const space2Name = room.client.getRoom(secondParent)?.name;
return {
details: _t("%(space1Name)s and %(space2Name)s", { space1Name, space2Name }),
details: formatList([space1Name ?? "", space2Name ?? ""]),
ariaLabel: _t("in_space1_and_space2", { space1Name, space2Name }),
};
} else if (parent) {
@ -47,7 +48,7 @@ export function roomContextDetails(room: Room): RoomContextDetails | null {
const count = otherParents.length;
if (count > 0) {
return {
details: _t("%(spaceName)s and %(count)s others", { spaceName, count }),
details: formatList([spaceName, ...otherParents], 1),
ariaLabel: _t("in_space_and_n_other_spaces", { spaceName, count }),
};
}