Tweak video rooms copy (#8582)
* "Video room" → "New video room" * "Connect now" → "Join" * "N people connected" → "N people joined" * "Connected" → "Joined" * Fix tests
This commit is contained in:
parent
59b9d1e818
commit
26bc3ab0aa
9 changed files with 19 additions and 20 deletions
|
@ -136,7 +136,7 @@ const SpaceLandingAddButton = ({ space }) => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{ videoRoomsEnabled && <IconizedContextMenuOption
|
{ videoRoomsEnabled && <IconizedContextMenuOption
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
iconClassName="mx_RoomList_iconNewVideoRoom"
|
iconClassName="mx_RoomList_iconNewVideoRoom"
|
||||||
onClick={async (e) => {
|
onClick={async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
|
@ -182,7 +182,7 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) =
|
||||||
<IconizedContextMenuOption
|
<IconizedContextMenuOption
|
||||||
data-test-id='new-video-room-option'
|
data-test-id='new-video-room-option'
|
||||||
iconClassName="mx_SpacePanel_iconPlus"
|
iconClassName="mx_SpacePanel_iconPlus"
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
onClick={onNewVideoRoomClick}
|
onClick={onNewVideoRoomClick}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
|
||||||
: _t("You do not have permissions to create new rooms in this space")}
|
: _t("You do not have permissions to create new rooms in this space")}
|
||||||
/>
|
/>
|
||||||
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
|
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
iconClassName="mx_RoomList_iconNewVideoRoom"
|
iconClassName="mx_RoomList_iconNewVideoRoom"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
@ -283,7 +283,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
|
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
iconClassName="mx_RoomList_iconNewVideoRoom"
|
iconClassName="mx_RoomList_iconNewVideoRoom"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
|
@ -222,7 +222,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
|
||||||
/>
|
/>
|
||||||
{ videoRoomsEnabled && <IconizedContextMenuOption
|
{ videoRoomsEnabled && <IconizedContextMenuOption
|
||||||
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
|
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
@ -313,7 +313,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{ videoRoomsEnabled && <IconizedContextMenuOption
|
{ videoRoomsEnabled && <IconizedContextMenuOption
|
||||||
label={_t("Video room")}
|
label={_t("New video room")}
|
||||||
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
|
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
|
@ -678,12 +678,12 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
|
||||||
participantCount = this.state.videoMembers.size;
|
participantCount = this.state.videoMembers.size;
|
||||||
break;
|
break;
|
||||||
case VideoStatus.Connecting:
|
case VideoStatus.Connecting:
|
||||||
videoText = _t("Connecting...");
|
videoText = _t("Joining…");
|
||||||
videoActive = true;
|
videoActive = true;
|
||||||
participantCount = this.state.videoMembers.size;
|
participantCount = this.state.videoMembers.size;
|
||||||
break;
|
break;
|
||||||
case VideoStatus.Connected:
|
case VideoStatus.Connected:
|
||||||
videoText = _t("Connected");
|
videoText = _t("Joined");
|
||||||
videoActive = true;
|
videoActive = true;
|
||||||
participantCount = this.state.jitsiParticipants.length;
|
participantCount = this.state.jitsiParticipants.length;
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,7 +185,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
|
||||||
const overflow = connectedMembers.size > shownMembers.length;
|
const overflow = connectedMembers.size > shownMembers.length;
|
||||||
|
|
||||||
facePile = <div className="mx_VideoLobby_connectedMembers">
|
facePile = <div className="mx_VideoLobby_connectedMembers">
|
||||||
{ _t("%(count)s people connected", { count: connectedMembers.size }) }
|
{ _t("%(count)s people joined", { count: connectedMembers.size }) }
|
||||||
<FacePile members={shownMembers} faceSize={24} overflow={overflow} />
|
<FacePile members={shownMembers} faceSize={24} overflow={overflow} />
|
||||||
</div>;
|
</div>;
|
||||||
}
|
}
|
||||||
|
@ -232,7 +232,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
|
||||||
disabled={connecting}
|
disabled={connecting}
|
||||||
onClick={connect}
|
onClick={connect}
|
||||||
>
|
>
|
||||||
{ _t("Connect now") }
|
{ _t("Join") }
|
||||||
</AccessibleButton>
|
</AccessibleButton>
|
||||||
</div>;
|
</div>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1021,15 +1021,15 @@
|
||||||
"%(peerName)s held the call": "%(peerName)s held the call",
|
"%(peerName)s held the call": "%(peerName)s held the call",
|
||||||
"Connecting": "Connecting",
|
"Connecting": "Connecting",
|
||||||
"Dial": "Dial",
|
"Dial": "Dial",
|
||||||
"%(count)s people connected|other": "%(count)s people connected",
|
"%(count)s people joined|other": "%(count)s people joined",
|
||||||
"%(count)s people connected|one": "%(count)s person connected",
|
"%(count)s people joined|one": "%(count)s person joined",
|
||||||
"Audio devices": "Audio devices",
|
"Audio devices": "Audio devices",
|
||||||
"Mute microphone": "Mute microphone",
|
"Mute microphone": "Mute microphone",
|
||||||
"Unmute microphone": "Unmute microphone",
|
"Unmute microphone": "Unmute microphone",
|
||||||
"Video devices": "Video devices",
|
"Video devices": "Video devices",
|
||||||
"Turn off camera": "Turn off camera",
|
"Turn off camera": "Turn off camera",
|
||||||
"Turn on camera": "Turn on camera",
|
"Turn on camera": "Turn on camera",
|
||||||
"Connect now": "Connect now",
|
"Join": "Join",
|
||||||
"Dialpad": "Dialpad",
|
"Dialpad": "Dialpad",
|
||||||
"Mute the microphone": "Mute the microphone",
|
"Mute the microphone": "Mute the microphone",
|
||||||
"Unmute the microphone": "Unmute the microphone",
|
"Unmute the microphone": "Unmute the microphone",
|
||||||
|
@ -1761,7 +1761,6 @@
|
||||||
"Unknown": "Unknown",
|
"Unknown": "Unknown",
|
||||||
"Preview": "Preview",
|
"Preview": "Preview",
|
||||||
"View": "View",
|
"View": "View",
|
||||||
"Join": "Join",
|
|
||||||
"%(members)s and more": "%(members)s and more",
|
"%(members)s and more": "%(members)s and more",
|
||||||
"%(members)s and %(last)s": "%(members)s and %(last)s",
|
"%(members)s and %(last)s": "%(members)s and %(last)s",
|
||||||
"Seen by %(count)s people|other": "Seen by %(count)s people",
|
"Seen by %(count)s people|other": "Seen by %(count)s people",
|
||||||
|
@ -1795,6 +1794,7 @@
|
||||||
"Explore rooms": "Explore rooms",
|
"Explore rooms": "Explore rooms",
|
||||||
"New room": "New room",
|
"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",
|
"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",
|
"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",
|
"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",
|
"Explore public rooms": "Explore public rooms",
|
||||||
|
@ -1892,8 +1892,8 @@
|
||||||
"Low Priority": "Low Priority",
|
"Low Priority": "Low Priority",
|
||||||
"Copy room link": "Copy room link",
|
"Copy room link": "Copy room link",
|
||||||
"Video": "Video",
|
"Video": "Video",
|
||||||
"Connecting...": "Connecting...",
|
"Joining…": "Joining…",
|
||||||
"Connected": "Connected",
|
"Joined": "Joined",
|
||||||
"%(count)s participants|other": "%(count)s participants",
|
"%(count)s participants|other": "%(count)s participants",
|
||||||
"%(count)s participants|one": "1 participant",
|
"%(count)s participants|one": "1 participant",
|
||||||
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
|
"%(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.",
|
"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",
|
"Joining": "Joining",
|
||||||
"You don't have permission": "You don't have permission",
|
"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",
|
"This room is suggested as a good one to join": "This room is suggested as a good one to join",
|
||||||
"Suggested": "Suggested",
|
"Suggested": "Suggested",
|
||||||
"Select a room below first": "Select a room below first",
|
"Select a room below first": "Select a room below first",
|
||||||
|
|
|
@ -81,11 +81,11 @@ describe("RoomTile", () => {
|
||||||
|
|
||||||
act(() => { store.startConnect("!1:example.org"); });
|
act(() => { store.startConnect("!1:example.org"); });
|
||||||
tile.update();
|
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"); });
|
act(() => { store.connect("!1:example.org"); });
|
||||||
tile.update();
|
tile.update();
|
||||||
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connected");
|
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Joined");
|
||||||
|
|
||||||
act(() => { store.disconnect(); });
|
act(() => { store.disconnect(); });
|
||||||
tile.update();
|
tile.update();
|
||||||
|
|
|
@ -92,7 +92,7 @@ describe("VideoLobby", () => {
|
||||||
|
|
||||||
// Only Alice should display as connected
|
// Only Alice should display as connected
|
||||||
const memberText = lobby.find(".mx_VideoLobby_connectedMembers").children().at(0).text();
|
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");
|
expect(lobby.find(FacePile).find(MemberAvatar).props().member.userId).toEqual("@alice:example.org");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue