diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 12734d9a8c1..ff77789802f 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -136,7 +136,7 @@ const SpaceLandingAddButton = ({ space }) => { }} /> { videoRoomsEnabled && { e.preventDefault(); diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx index 5d045900453..f4f6f0eb6f1 100644 --- a/src/components/views/context_menus/SpaceContextMenu.tsx +++ b/src/components/views/context_menus/SpaceContextMenu.tsx @@ -182,7 +182,7 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) = } diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx index e534b713f8d..a0632d763e1 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -239,7 +239,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => { : _t("You do not have permissions to create new rooms in this space")} /> { SettingsStore.getValue("feature_video_rooms") && { e.preventDefault(); @@ -283,7 +283,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => { }} /> { SettingsStore.getValue("feature_video_rooms") && { e.preventDefault(); diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx index 036902d12b4..b9a33e1f44e 100644 --- a/src/components/views/rooms/RoomListHeader.tsx +++ b/src/components/views/rooms/RoomListHeader.tsx @@ -222,7 +222,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => { /> { videoRoomsEnabled && { e.preventDefault(); e.stopPropagation(); @@ -313,7 +313,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => { }} /> { videoRoomsEnabled && { e.preventDefault(); diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx index bd772401ede..c7be65779f7 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx @@ -678,12 +678,12 @@ export default class RoomTile extends React.PureComponent { participantCount = this.state.videoMembers.size; break; case VideoStatus.Connecting: - videoText = _t("Connecting..."); + videoText = _t("Joining…"); videoActive = true; participantCount = this.state.videoMembers.size; break; case VideoStatus.Connected: - videoText = _t("Connected"); + videoText = _t("Joined"); videoActive = true; participantCount = this.state.jitsiParticipants.length; } diff --git a/src/components/views/voip/VideoLobby.tsx b/src/components/views/voip/VideoLobby.tsx index 862e58fe630..08de1e1f49b 100644 --- a/src/components/views/voip/VideoLobby.tsx +++ b/src/components/views/voip/VideoLobby.tsx @@ -185,7 +185,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => { const overflow = connectedMembers.size > shownMembers.length; facePile =
- { _t("%(count)s people connected", { count: connectedMembers.size }) } + { _t("%(count)s people joined", { count: connectedMembers.size }) }
; } @@ -232,7 +232,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => { disabled={connecting} onClick={connect} > - { _t("Connect now") } + { _t("Join") } ; }; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 15df64eeec8..d3f1935d4d2 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1021,15 +1021,15 @@ "%(peerName)s held the call": "%(peerName)s held the call", "Connecting": "Connecting", "Dial": "Dial", - "%(count)s people connected|other": "%(count)s people connected", - "%(count)s people connected|one": "%(count)s person connected", + "%(count)s people joined|other": "%(count)s people joined", + "%(count)s people joined|one": "%(count)s person joined", "Audio devices": "Audio devices", "Mute microphone": "Mute microphone", "Unmute microphone": "Unmute microphone", "Video devices": "Video devices", "Turn off camera": "Turn off camera", "Turn on camera": "Turn on camera", - "Connect now": "Connect now", + "Join": "Join", "Dialpad": "Dialpad", "Mute the microphone": "Mute the microphone", "Unmute the microphone": "Unmute the microphone", @@ -1761,7 +1761,6 @@ "Unknown": "Unknown", "Preview": "Preview", "View": "View", - "Join": "Join", "%(members)s and more": "%(members)s and more", "%(members)s and %(last)s": "%(members)s and %(last)s", "Seen by %(count)s people|other": "Seen by %(count)s people", @@ -1795,6 +1794,7 @@ "Explore rooms": "Explore rooms", "New room": "New room", "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space", + "New video room": "New video room", "Add existing room": "Add existing room", "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space", "Explore public rooms": "Explore public rooms", @@ -1892,8 +1892,8 @@ "Low Priority": "Low Priority", "Copy room link": "Copy room link", "Video": "Video", - "Connecting...": "Connecting...", - "Connected": "Connected", + "Joining…": "Joining…", + "Joined": "Joined", "%(count)s participants|other": "%(count)s participants", "%(count)s participants|one": "1 participant", "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.", @@ -3097,7 +3097,6 @@ "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.", "Joining": "Joining", "You don't have permission": "You don't have permission", - "Joined": "Joined", "This room is suggested as a good one to join": "This room is suggested as a good one to join", "Suggested": "Suggested", "Select a room below first": "Select a room below first", diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx index d07360f6d4f..7b4f712c6a9 100644 --- a/test/components/views/rooms/RoomTile-test.tsx +++ b/test/components/views/rooms/RoomTile-test.tsx @@ -81,11 +81,11 @@ describe("RoomTile", () => { act(() => { store.startConnect("!1:example.org"); }); tile.update(); - expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connecting..."); + expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Joining…"); act(() => { store.connect("!1:example.org"); }); tile.update(); - expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connected"); + expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Joined"); act(() => { store.disconnect(); }); tile.update(); diff --git a/test/components/views/voip/VideoLobby-test.tsx b/test/components/views/voip/VideoLobby-test.tsx index 2d69709dc76..bf3a4a5d598 100644 --- a/test/components/views/voip/VideoLobby-test.tsx +++ b/test/components/views/voip/VideoLobby-test.tsx @@ -92,7 +92,7 @@ describe("VideoLobby", () => { // Only Alice should display as connected const memberText = lobby.find(".mx_VideoLobby_connectedMembers").children().at(0).text(); - expect(memberText).toEqual("1 person connected"); + expect(memberText).toEqual("1 person joined"); expect(lobby.find(FacePile).find(MemberAvatar).props().member.userId).toEqual("@alice:example.org"); });