Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Tweak video rooms copy (#8582)
Browse files Browse the repository at this point in the history
* "Video room" → "New video room"

* "Connect now" → "Join"

* "N people connected" → "N people joined"

* "Connected" → "Joined"

* Fix tests
  • Loading branch information
robintown committed May 13, 2022
1 parent 59b9d1e commit 26bc3ab
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/components/structures/SpaceRoomView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const SpaceLandingAddButton = ({ space }) => {
}}
/>
{ videoRoomsEnabled && <IconizedContextMenuOption
label={_t("Video room")}
label={_t("New video room")}
iconClassName="mx_RoomList_iconNewVideoRoom"
onClick={async (e) => {
e.preventDefault();
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/context_menus/SpaceContextMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) =
<IconizedContextMenuOption
data-test-id='new-video-room-option'
iconClassName="mx_SpacePanel_iconPlus"
label={_t("Video room")}
label={_t("New video room")}
onClick={onNewVideoRoomClick}
/>
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/rooms/RoomList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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") && <IconizedContextMenuOption
label={_t("Video room")}
label={_t("New video room")}
iconClassName="mx_RoomList_iconNewVideoRoom"
onClick={(e) => {
e.preventDefault();
Expand Down Expand Up @@ -283,7 +283,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
}}
/>
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
label={_t("Video room")}
label={_t("New video room")}
iconClassName="mx_RoomList_iconNewVideoRoom"
onClick={(e) => {
e.preventDefault();
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/rooms/RoomListHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
/>
{ videoRoomsEnabled && <IconizedContextMenuOption
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
label={_t("Video room")}
label={_t("New video room")}
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
Expand Down Expand Up @@ -313,7 +313,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
}}
/>
{ videoRoomsEnabled && <IconizedContextMenuOption
label={_t("Video room")}
label={_t("New video room")}
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
onClick={(e) => {
e.preventDefault();
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/rooms/RoomTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,12 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/voip/VideoLobby.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
const overflow = connectedMembers.size > shownMembers.length;

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} />
</div>;
}
Expand Down Expand Up @@ -232,7 +232,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
disabled={connecting}
onClick={connect}
>
{ _t("Connect now") }
{ _t("Join") }
</AccessibleButton>
</div>;
};
Expand Down
13 changes: 6 additions & 7 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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.",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions test/components/views/rooms/RoomTile-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/components/views/voip/VideoLobby-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});

Expand Down

0 comments on commit 26bc3ab

Please sign in to comment.