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

Commit 26bc3ab

Browse files
authored
Tweak video rooms copy (#8582)
* "Video room" → "New video room" * "Connect now" → "Join" * "N people connected" → "N people joined" * "Connected" → "Joined" * Fix tests
1 parent 59b9d1e commit 26bc3ab

File tree

9 files changed

+19
-20
lines changed

9 files changed

+19
-20
lines changed

src/components/structures/SpaceRoomView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const SpaceLandingAddButton = ({ space }) => {
136136
}}
137137
/>
138138
{ videoRoomsEnabled && <IconizedContextMenuOption
139-
label={_t("Video room")}
139+
label={_t("New video room")}
140140
iconClassName="mx_RoomList_iconNewVideoRoom"
141141
onClick={async (e) => {
142142
e.preventDefault();

src/components/views/context_menus/SpaceContextMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) =
182182
<IconizedContextMenuOption
183183
data-test-id='new-video-room-option'
184184
iconClassName="mx_SpacePanel_iconPlus"
185-
label={_t("Video room")}
185+
label={_t("New video room")}
186186
onClick={onNewVideoRoomClick}
187187
/>
188188
}

src/components/views/rooms/RoomList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
239239
: _t("You do not have permissions to create new rooms in this space")}
240240
/>
241241
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
242-
label={_t("Video room")}
242+
label={_t("New video room")}
243243
iconClassName="mx_RoomList_iconNewVideoRoom"
244244
onClick={(e) => {
245245
e.preventDefault();
@@ -283,7 +283,7 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
283283
}}
284284
/>
285285
{ SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
286-
label={_t("Video room")}
286+
label={_t("New video room")}
287287
iconClassName="mx_RoomList_iconNewVideoRoom"
288288
onClick={(e) => {
289289
e.preventDefault();

src/components/views/rooms/RoomListHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
222222
/>
223223
{ videoRoomsEnabled && <IconizedContextMenuOption
224224
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
225-
label={_t("Video room")}
225+
label={_t("New video room")}
226226
onClick={(e) => {
227227
e.preventDefault();
228228
e.stopPropagation();
@@ -313,7 +313,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
313313
}}
314314
/>
315315
{ videoRoomsEnabled && <IconizedContextMenuOption
316-
label={_t("Video room")}
316+
label={_t("New video room")}
317317
iconClassName="mx_RoomListHeader_iconNewVideoRoom"
318318
onClick={(e) => {
319319
e.preventDefault();

src/components/views/rooms/RoomTile.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,12 +678,12 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
678678
participantCount = this.state.videoMembers.size;
679679
break;
680680
case VideoStatus.Connecting:
681-
videoText = _t("Connecting...");
681+
videoText = _t("Joining…");
682682
videoActive = true;
683683
participantCount = this.state.videoMembers.size;
684684
break;
685685
case VideoStatus.Connected:
686-
videoText = _t("Connected");
686+
videoText = _t("Joined");
687687
videoActive = true;
688688
participantCount = this.state.jitsiParticipants.length;
689689
}

src/components/views/voip/VideoLobby.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
185185
const overflow = connectedMembers.size > shownMembers.length;
186186

187187
facePile = <div className="mx_VideoLobby_connectedMembers">
188-
{ _t("%(count)s people connected", { count: connectedMembers.size }) }
188+
{ _t("%(count)s people joined", { count: connectedMembers.size }) }
189189
<FacePile members={shownMembers} faceSize={24} overflow={overflow} />
190190
</div>;
191191
}
@@ -232,7 +232,7 @@ const VideoLobby: FC<{ room: Room }> = ({ room }) => {
232232
disabled={connecting}
233233
onClick={connect}
234234
>
235-
{ _t("Connect now") }
235+
{ _t("Join") }
236236
</AccessibleButton>
237237
</div>;
238238
};

src/i18n/strings/en_EN.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,15 +1021,15 @@
10211021
"%(peerName)s held the call": "%(peerName)s held the call",
10221022
"Connecting": "Connecting",
10231023
"Dial": "Dial",
1024-
"%(count)s people connected|other": "%(count)s people connected",
1025-
"%(count)s people connected|one": "%(count)s person connected",
1024+
"%(count)s people joined|other": "%(count)s people joined",
1025+
"%(count)s people joined|one": "%(count)s person joined",
10261026
"Audio devices": "Audio devices",
10271027
"Mute microphone": "Mute microphone",
10281028
"Unmute microphone": "Unmute microphone",
10291029
"Video devices": "Video devices",
10301030
"Turn off camera": "Turn off camera",
10311031
"Turn on camera": "Turn on camera",
1032-
"Connect now": "Connect now",
1032+
"Join": "Join",
10331033
"Dialpad": "Dialpad",
10341034
"Mute the microphone": "Mute the microphone",
10351035
"Unmute the microphone": "Unmute the microphone",
@@ -1761,7 +1761,6 @@
17611761
"Unknown": "Unknown",
17621762
"Preview": "Preview",
17631763
"View": "View",
1764-
"Join": "Join",
17651764
"%(members)s and more": "%(members)s and more",
17661765
"%(members)s and %(last)s": "%(members)s and %(last)s",
17671766
"Seen by %(count)s people|other": "Seen by %(count)s people",
@@ -1795,6 +1794,7 @@
17951794
"Explore rooms": "Explore rooms",
17961795
"New room": "New room",
17971796
"You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
1797+
"New video room": "New video room",
17981798
"Add existing room": "Add existing room",
17991799
"You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
18001800
"Explore public rooms": "Explore public rooms",
@@ -1892,8 +1892,8 @@
18921892
"Low Priority": "Low Priority",
18931893
"Copy room link": "Copy room link",
18941894
"Video": "Video",
1895-
"Connecting...": "Connecting...",
1896-
"Connected": "Connected",
1895+
"Joining…": "Joining…",
1896+
"Joined": "Joined",
18971897
"%(count)s participants|other": "%(count)s participants",
18981898
"%(count)s participants|one": "1 participant",
18991899
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -3097,7 +3097,6 @@
30973097
"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.",
30983098
"Joining": "Joining",
30993099
"You don't have permission": "You don't have permission",
3100-
"Joined": "Joined",
31013100
"This room is suggested as a good one to join": "This room is suggested as a good one to join",
31023101
"Suggested": "Suggested",
31033102
"Select a room below first": "Select a room below first",

test/components/views/rooms/RoomTile-test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ describe("RoomTile", () => {
8181

8282
act(() => { store.startConnect("!1:example.org"); });
8383
tile.update();
84-
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connecting...");
84+
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Joining…");
8585

8686
act(() => { store.connect("!1:example.org"); });
8787
tile.update();
88-
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connected");
88+
expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Joined");
8989

9090
act(() => { store.disconnect(); });
9191
tile.update();

test/components/views/voip/VideoLobby-test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe("VideoLobby", () => {
9292

9393
// Only Alice should display as connected
9494
const memberText = lobby.find(".mx_VideoLobby_connectedMembers").children().at(0).text();
95-
expect(memberText).toEqual("1 person connected");
95+
expect(memberText).toEqual("1 person joined");
9696
expect(lobby.find(FacePile).find(MemberAvatar).props().member.userId).toEqual("@alice:example.org");
9797
});
9898

0 commit comments

Comments
 (0)