PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Convert references to direct chat -> direct message (#8694)

Browse source
This commit is contained in:
James Salter 2022-05-25 15:20:46 +01:00 committed by GitHub
parent dbd9911fe7
commit 1dd0f8cd5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Rooms.ts
View file

@ -51,7 +51,7 @@ export function looksLikeDirectMessageRoom(room: Room, myUserId: string): boolea
if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) { if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) {
// Used to split rooms via tags // Used to split rooms via tags
const tagNames = Object.keys(room.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 // Show 1:1 chats in separate "Direct Messages" section as long as they haven't
// been moved to a different tag section // been moved to a different tag section
const totalMemberCount = room.currentState.getJoinedMemberCount() + const totalMemberCount = room.currentState.getJoinedMemberCount() +

6
src/actions/RoomListActions.ts
View file

@ -90,9 +90,9 @@ export default class RoomListActions {
return Rooms.guessAndSetDMRoom( return Rooms.guessAndSetDMRoom(
room, newTag === DefaultTagID.DM, room, newTag === DefaultTagID.DM,
).catch((err) => { ).catch((err) => {
logger.error("Failed to set direct chat tag " + err); logger.error("Failed to set DM tag " + err);
Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, { Modal.createTrackedDialog('Failed to set direct message tag', '', ErrorDialog, {
title: _t('Failed to set direct chat tag'), title: _t('Failed to set direct message tag'),
description: ((err && err.message) ? err.message : _t('Operation failed')), description: ((err && err.message) ? err.message : _t('Operation failed')),
}); });
}); });

2
src/i18n/strings/en_EN.json
View file

@ -3352,7 +3352,7 @@
"Indexed rooms:": "Indexed rooms:", "Indexed rooms:": "Indexed rooms:",
"%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s", "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s",
"Message downloading sleep time(ms)": "Message downloading sleep time(ms)", "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 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", "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
"Page Up": "Page Up", "Page Up": "Page Up",