diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index a99a2480a6..8329ef0ce9 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -387,10 +387,6 @@ "Failed to invite users to the room:": "Failed to invite users to the room:", "We sent the others, but the below people couldn't be invited to <RoomName/>": "We sent the others, but the below people couldn't be invited to <RoomName/>", "Some invites couldn't be sent": "Some invites couldn't be sent", - "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s", - "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others", - "%(spaceName)s and %(count)s others|zero": "%(spaceName)s", - "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other", "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", @@ -685,14 +681,18 @@ "%(num)s hours from now": "%(num)s hours from now", "about a day from now": "about a day from now", "%(num)s days from now": "%(num)s days from now", + "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s", + "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others", + "%(spaceName)s and %(count)s others|zero": "%(spaceName)s", + "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other", "%(name)s (%(userId)s)": "%(name)s (%(userId)s)", - "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", - "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile", - "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", "Unexpected server error trying to leave the room": "Unexpected server error trying to leave the room", "Can't leave Server Notices room": "Can't leave Server Notices room", "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.", "Error leaving room": "Error leaving room", + "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", + "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile", + "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", "Unrecognised address": "Unrecognised address", "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.", "User %(userId)s is already invited to the room": "User %(userId)s is already invited to the room", diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx index 1bac119dee..8eddf2ce02 100644 --- a/test/components/views/rooms/RoomTile-test.tsx +++ b/test/components/views/rooms/RoomTile-test.tsx @@ -26,8 +26,8 @@ import { mockStateEventImplementation, mkRoom, mkEvent, + stubVoiceChannelStore, } from "../../../test-utils"; -import { stubVoiceChannelStore } from "../../../test-utils/voice"; import RoomTile from "../../../../src/components/views/rooms/RoomTile"; import MemberAvatar from "../../../../src/components/views/avatars/MemberAvatar"; import SettingsStore from "../../../../src/settings/SettingsStore"; diff --git a/test/components/views/voip/VoiceChannelRadio-test.tsx b/test/components/views/voip/VoiceChannelRadio-test.tsx index 50779dd9f7..6150d251e7 100644 --- a/test/components/views/voip/VoiceChannelRadio-test.tsx +++ b/test/components/views/voip/VoiceChannelRadio-test.tsx @@ -19,8 +19,12 @@ import { mount } from "enzyme"; import { act } from "react-dom/test-utils"; import { mocked } from "jest-mock"; -import { stubClient, mkStubRoom, wrapInMatrixClientContext } from "../../../test-utils"; -import { stubVoiceChannelStore } from "../../../test-utils/voice"; +import { + stubClient, + mkStubRoom, + wrapInMatrixClientContext, + stubVoiceChannelStore, +} from "../../../test-utils"; import _VoiceChannelRadio from "../../../../src/components/views/voip/VoiceChannelRadio"; import VoiceChannelStore from "../../../../src/stores/VoiceChannelStore"; import DMRoomMap from "../../../../src/utils/DMRoomMap"; diff --git a/test/test-utils/index.ts b/test/test-utils/index.ts index 49abc51598..44069f10fc 100644 --- a/test/test-utils/index.ts +++ b/test/test-utils/index.ts @@ -3,6 +3,6 @@ export * from './client'; export * from './location'; export * from './platform'; export * from './test-utils'; -// TODO @@TR: Export voice.ts, which currently isn't exported here because it causes all tests to depend on skinning +export * from './voice'; export * from './wrappers'; export * from './utilities';