{status.roomId === null && !status.isJoining && status.error === null && (
-
)}
{status.roomId !== null && (
@@ -147,8 +147,8 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
if (totalRooms.length === 0) {
updateSearchQuery({
error: inputRoomName === ''
- ? t("PublicRooms.no_public_rooms", {homeserver: inputHs})
- : t("PublicRooms.no_result_found", {homeserver: inputHs, input: inputRoomName}),
+ ? t("Organisms.PublicRooms.no_public_rooms", {homeserver: inputHs})
+ : t("Organisms.PublicRooms.no_result_found", {homeserver: inputHs, input: inputRoomName}),
alias: isInputAlias ? inputRoomName : null,
});
}
@@ -225,17 +225,17 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
return (
{
@@ -244,13 +244,13 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
? (
- {t("PublicRooms.loading", {homeserver: searchQuery.homeserver})}
+ {t("Organisms.PublicRooms.loading", {homeserver: searchQuery.homeserver})}
)
: (
- {t("PublicRooms.searching", {homeserver: searchQuery.homeserver, query: searchQuery.name})}
+ {t("Organisms.PublicRooms.searching", {homeserver: searchQuery.homeserver, query: searchQuery.name})}
)
)
@@ -258,8 +258,8 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
{
typeof searchQuery.name !== 'undefined' && !isSearching && (
searchQuery.name === ''
- ?
{t("PublicRooms.result_title", {homeserver: searchQuery.homeserver})}
- :
{t("PublicRooms.search_result_title", {homeserver: searchQuery.homeserver, query: searchQuery.name})}
+ ?
{t("Organisms.PublicRooms.result_title", {homeserver: searchQuery.homeserver})}
+ :
{t("Organisms.PublicRooms.search_result_title", {homeserver: searchQuery.homeserver, query: searchQuery.name})}
)
}
{ searchQuery.error && (
diff --git a/src/app/organisms/room/RoomSettings.jsx b/src/app/organisms/room/RoomSettings.jsx
index dbd597f1..3504aa8e 100644
--- a/src/app/organisms/room/RoomSettings.jsx
+++ b/src/app/organisms/room/RoomSettings.jsx
@@ -94,9 +94,9 @@ function GeneralSettings({ roomId }) {
variant="danger"
onClick={async () => {
const isConfirmed = await confirmDialog(
- t("RoomSettings.leave_room"),
- t("RoomSettings.leave_room_confirm_message", {room_name: room.name}),
- t("RoomSettings.leave_room_confirm_button"),
+ t("Organisms.RoomSettings.leave_room"),
+ t("Organisms.RoomSettings.leave_room_confirm_message", {room_name: room.name}),
+ t("Organisms.RoomSettings.leave_room_confirm_button"),
'danger',
);
if (!isConfirmed) return;
@@ -108,15 +108,15 @@ function GeneralSettings({ roomId }) {
- {t("RoomSettings.notification_header")}
+ {t("Organisms.RoomSettings.notification_header")}
- {t("RoomSettings.visibility_header")}
+ {t("Organisms.RoomSettings.visibility_header")}
- {t("RoomSettings.address_header")}
+ {t("Organisms.RoomSettings.address_header")}
@@ -131,11 +131,11 @@ function SecuritySettings({ roomId }) {
return (
<>
- {t("RoomSettings.encryption_header")}
+ {t("Organisms.RoomSettings.encryption_header")}
- {t("RoomSettings.message_history_header")}
+ {t("Organisms.RoomSettings.message_history_header")}
@@ -187,7 +187,7 @@ function RoomSettings({ roomId }) {
{`${room.name}`}
- — {t("RoomSettings.room_settings_subtitle")}
+ — {t("Organisms.RoomSettings.room_settings_subtitle")}
diff --git a/src/app/organisms/room/RoomViewContent.jsx b/src/app/organisms/room/RoomViewContent.jsx
index 9a5ec5c1..c856e56e 100644
--- a/src/app/organisms/room/RoomViewContent.jsx
+++ b/src/app/organisms/room/RoomViewContent.jsx
@@ -68,14 +68,14 @@ function RoomIntroContainer({ event, timeline }) {
let avatarSrc = room.getAvatarUrl(mx.baseUrl, 80, 80, 'crop');
avatarSrc = isDM ? room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 80, 80, 'crop') : avatarSrc;
- const heading = isDM ? room.name : t("RoomViewContent.welcome_to_room", {room_name: room.name});
+ const heading = isDM ? room.name : t("Organisms.RoomViewContent.welcome_to_room", {room_name: room.name});
const topic = twemojify(roomTopic || '', undefined, true);
const nameJsx = twemojify(room.name);
const desc = isDM
? (
<>
}}
/>
@@ -86,7 +86,7 @@ function RoomIntroContainer({ event, timeline }) {
: (
<>
}}
/>
@@ -112,7 +112,7 @@ function RoomIntroContainer({ event, timeline }) {
name={room.name}
heading={twemojify(heading)}
desc={desc}
- time={event ? t("RoomViewContent.created_on", {date: event.getDate(), formatParams: { date: { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'}}}) : null}
+ time={event ? t("Organisms.RoomViewContent.created_on", {date: event.getDate(), formatParams: { date: { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'}}}) : null}
/>
);
}
@@ -539,7 +539,7 @@ function RoomViewContent({ eventId, roomTimeline }) {
&& readUptoEvent.getTs() < mEvent.getTs());
if (unreadDivider) {
isNewEvent = true;
- tl.push(
);
+ tl.push(
);
itemCountIndex += 1;
if (jumpToItemIndex === -1) jumpToItemIndex = itemCountIndex;
}
diff --git a/src/app/organisms/room/RoomViewFloating.jsx b/src/app/organisms/room/RoomViewFloating.jsx
index bd8c1676..cda05fe8 100644
--- a/src/app/organisms/room/RoomViewFloating.jsx
+++ b/src/app/organisms/room/RoomViewFloating.jsx
@@ -124,17 +124,17 @@ function RoomViewFloating({
<>
0 ? ' room-view__typing--open' : ''}`}>
}}
/>
@@ -142,7 +142,7 @@ function RoomViewFloating({
diff --git a/src/app/organisms/room/RoomViewHeader.jsx b/src/app/organisms/room/RoomViewHeader.jsx
index af4ae2c2..951f1bb2 100644
--- a/src/app/organisms/room/RoomViewHeader.jsx
+++ b/src/app/organisms/room/RoomViewHeader.jsx
@@ -98,9 +98,9 @@ function RoomViewHeader({ roomId }) {
-
toggleRoomSettings(tabText.SEARCH)} tooltip={t("RoomViewHeader.search_tooltip")} src={SearchIC} />
-
- toggleRoomSettings(tabText.MEMBERS)} tooltip={t("RoomViewHeader.members_tooltip")} src={UserIC} />
+ toggleRoomSettings(tabText.SEARCH)} tooltip={t("Organisms.RoomViewHeader.search_tooltip")} src={SearchIC} />
+
+ toggleRoomSettings(tabText.MEMBERS)} tooltip={t("Organisms.RoomViewHeader.members_tooltip")} src={UserIC} />
{
tombstoneEvent
- ? tombstoneEvent.getContent()?.body ?? t("RoomViewInput.tombstone_replaced")
- : t("RoomViewInput.tombstone_permission_denied")
+ ? tombstoneEvent.getContent()?.body ?? t("Organisms.RoomViewInput.tombstone_replaced")
+ : t("Organisms.RoomViewInput.tombstone_permission_denied")
}
);
@@ -338,7 +338,7 @@ function RoomViewInput({
onChange={handleMsgTyping}
onPaste={handlePaste}
onKeyDown={handleKeyDown}
- placeholder={t("RoomViewInput.send_message_placeholder")}
+ placeholder={t("Organisms.RoomViewInput.send_message_placeholder")}
/>
@@ -352,7 +352,7 @@ function RoomViewInput({
cords.y -= 250;
openEmojiBoard(cords, addEmoji);
}}
- tooltip={t("RoomViewInput.emoji_tooltip")}
+ tooltip={t("Organisms.RoomViewInput.emoji_tooltip")}
src={EmojiIC}
/>
@@ -373,7 +373,7 @@ function RoomViewInput({