From 1dd0f8cd5ec24b5fa4a518a032420da1bdb89da8 Mon Sep 17 00:00:00 2001 From: James Salter Date: Wed, 25 May 2022 15:20:46 +0100 Subject: [PATCH] Convert references to direct chat -> direct message (#8694) --- src/Rooms.ts | 2 +- src/actions/RoomListActions.ts | 6 +++--- src/i18n/strings/en_EN.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Rooms.ts b/src/Rooms.ts index b7b2f64a779..707b44305be 100644 --- a/src/Rooms.ts +++ b/src/Rooms.ts @@ -51,7 +51,7 @@ export function looksLikeDirectMessageRoom(room: Room, myUserId: string): boolea if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) { // Used to split rooms via tags const tagNames = Object.keys(room.tags); - // Used for 1:1 direct chats + // Used for 1:1 direct messages // Show 1:1 chats in separate "Direct Messages" section as long as they haven't // been moved to a different tag section const totalMemberCount = room.currentState.getJoinedMemberCount() + diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts index 7860e1b2eee..696403aca82 100644 --- a/src/actions/RoomListActions.ts +++ b/src/actions/RoomListActions.ts @@ -90,9 +90,9 @@ export default class RoomListActions { return Rooms.guessAndSetDMRoom( room, newTag === DefaultTagID.DM, ).catch((err) => { - logger.error("Failed to set direct chat tag " + err); - Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, { - title: _t('Failed to set direct chat tag'), + logger.error("Failed to set DM tag " + err); + Modal.createTrackedDialog('Failed to set direct message tag', '', ErrorDialog, { + title: _t('Failed to set direct message tag'), description: ((err && err.message) ? err.message : _t('Operation failed')), }); }); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 86917dbb866..7fbcac9569a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -3352,7 +3352,7 @@ "Indexed rooms:": "Indexed rooms:", "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s", "Message downloading sleep time(ms)": "Message downloading sleep time(ms)", - "Failed to set direct chat tag": "Failed to set direct chat tag", + "Failed to set direct message tag": "Failed to set direct message tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", "Page Up": "Page Up",