diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx index 9424b23b068..98e356be2c0 100644 --- a/src/components/structures/UploadBar.tsx +++ b/src/components/structures/UploadBar.tsx @@ -107,11 +107,18 @@ export default class UploadBar extends React.PureComponent { return null; } - // MUST use var name 'count' for pluralization to kick in - const uploadText = _t("Uploading %(filename)s and %(count)s others", { - filename: this.state.currentFile, - count: this.state.countFiles - 1, - }); + let uploadText: string; + if (this.state.countFiles > 1) { + // MUST use var name 'count' for pluralization to kick in + uploadText = _t("Uploading %(filename)s and %(count)s others", { + filename: this.state.currentFile, + count: this.state.countFiles - 1, + }); + } else { + uploadText = _t("Uploading %(filename)s", { + filename: this.state.currentFile, + }); + } const uploadSize = fileSize(this.state.currentTotal!); return ( diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx index cbb0f3c0a6a..d7a2ad253d2 100644 --- a/src/components/views/dialogs/devtools/RoomNotifications.tsx +++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx @@ -76,16 +76,26 @@ export default function RoomNotifications({ onBack }: IDevtoolsProps): JSX.Eleme

{_t("Room status")}