{
@@ -244,13 +243,13 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
? (
)
)
@@ -258,8 +257,8 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
{
typeof searchQuery.name !== 'undefined' && !isSearching && (
searchQuery.name === ''
- ?
)
}
{ searchQuery.error && (
@@ -279,7 +278,7 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
{ publicRooms.length !== 0 && publicRooms.length % SEARCH_LIMIT === 0 && (
diff --git a/src/app/organisms/room/PeopleDrawer.jsx b/src/app/organisms/room/PeopleDrawer.jsx
index 10e0d5e8..a8476a3f 100644
--- a/src/app/organisms/room/PeopleDrawer.jsx
+++ b/src/app/organisms/room/PeopleDrawer.jsx
@@ -4,6 +4,7 @@ import React, {
import PropTypes from 'prop-types';
import './PeopleDrawer.scss';
+import { useTranslation } from 'react-i18next';
import initMatrix from '../../../client/initMatrix';
import { getPowerLabel, getUsernameOfRoomMember } from '../../../util/matrixUtil';
import colorMXID from '../../../util/colorMXID';
@@ -25,8 +26,7 @@ import AddUserIC from '../../../../public/res/ic/outlined/add-user.svg';
import SearchIC from '../../../../public/res/ic/outlined/search.svg';
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
-import '../../i18n.jsx'
-import { useTranslation } from 'react-i18next';
+import '../../i18n';
function simplyfiMembers(members) {
const mx = initMatrix.matrixClient;
@@ -134,11 +134,11 @@ function PeopleDrawer({ roomId }) {
@@ -155,7 +155,7 @@ function PeopleDrawer({ roomId }) {
return getSegmentIndex[membership];
})()
}
- segments={[{ text: t("Organisms.PeopleDrawer.joined")}, { text: t("Organisms.PeopleDrawer.invited") }, { text: t("Organisms.PeopleDrawer.banned") }]}
+ segments={[{ text: t('Organisms.PeopleDrawer.joined') }, { text: t('Organisms.PeopleDrawer.invited') }, { text: t('Organisms.PeopleDrawer.banned') }]}
onSelect={(index) => {
const selectSegment = [
() => setMembership('join'),
@@ -181,7 +181,7 @@ function PeopleDrawer({ roomId }) {
(searchedMembers?.data.length === 0 || memberList.length === 0)
&& (
- {t("Organisms.PeopleDrawer.search_no_results")}
+ {t('Organisms.PeopleDrawer.search_no_results')}
)
}
@@ -191,7 +191,7 @@ function PeopleDrawer({ roomId }) {
&& memberList.length > itemCount
&& searchedMembers === null
&& (
-
+
)
}
@@ -201,7 +201,7 @@ function PeopleDrawer({ roomId }) {
- {t("Organisms.RoomSettings.notification_header")}
+ {t('Organisms.RoomSettings.notification_header')}
- {t("Organisms.RoomSettings.visibility_header")}
+ {t('Organisms.RoomSettings.visibility_header')}
- {t("Organisms.RoomSettings.address_header")}
+ {t('Organisms.RoomSettings.address_header')}
@@ -128,14 +127,15 @@ GeneralSettings.propTypes = {
};
function SecuritySettings({ roomId }) {
+ const { t } = useTranslation();
return (
<>
- {t("Organisms.RoomSettings.encryption_header")}
+ {t('Organisms.RoomSettings.encryption_header')}
- {t("Organisms.RoomSettings.message_history_header")}
+ {t('Organisms.RoomSettings.message_history_header')}
@@ -149,6 +149,7 @@ function RoomSettings({ roomId }) {
const [, forceUpdate] = useForceUpdate();
const [selectedTab, setSelectedTab] = useState(tabItems[0]);
const room = initMatrix.matrixClient.getRoom(roomId);
+ const { t } = useTranslation();
const handleTabChange = (tabItem) => {
setSelectedTab(tabItem);
@@ -187,7 +188,12 @@ function RoomSettings({ roomId }) {
{`${room.name}`}
- — {t("Organisms.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 c856e56e..507c0448 100644
--- a/src/app/organisms/room/RoomViewContent.jsx
+++ b/src/app/organisms/room/RoomViewContent.jsx
@@ -8,6 +8,7 @@ import PropTypes from 'prop-types';
import './RoomViewContent.scss';
import dateFormat from 'dateformat';
+import { useTranslation, Trans } from 'react-i18next';
import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
@@ -29,9 +30,7 @@ import { parseTimelineChange } from './common';
import TimelineScroll from './TimelineScroll';
import EventLimit from './EventLimit';
-import '../../i18n.jsx'
-import { useTranslation } from 'react-i18next';
-import { Trans } from 'react-i18next';
+import '../../i18n';
const PAG_LIMIT = 30;
const MAX_MSG_DIFF_MINUTES = 5;
@@ -68,30 +67,30 @@ 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("Organisms.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
? (
<>
-
}}
+
}}
/>
- {topic == "" ? "" : " - "}
+ {topic == '' ? '' : ' - '}
{topic }
)
: (
<>
-
}}
- />
+
}}
+ />
- {topic == "" ? "" : " - "}
+ {topic == '' ? '' : ' - '}
{topic}
);
@@ -112,7 +111,14 @@ function RoomIntroContainer({ event, timeline }) {
name={room.name}
heading={twemojify(heading)}
desc={desc}
- time={event ? t("Organisms.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 +545,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 b6d6ebaa..4adec02d 100644
--- a/src/app/organisms/room/RoomViewFloating.jsx
+++ b/src/app/organisms/room/RoomViewFloating.jsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './RoomViewFloating.scss';
+import { useTranslation, Trans } from 'react-i18next';
import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
@@ -18,11 +19,7 @@ import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
import { getUsername, getUsernameOfRoomMember } from '../../../util/matrixUtil';
-import { getUsersActionJsx } from './common';
-
-import '../../i18n.jsx'
-import { useTranslation } from 'react-i18next';
-import { Trans } from 'react-i18next';
+import '../../i18n';
function useJumpToEvent(roomTimeline) {
const [eventId, setEventId] = useState(null);
@@ -94,14 +91,13 @@ function useScrollToBottom(roomTimeline) {
function RoomViewFloating({
roomId, roomTimeline,
}) {
-
const { t } = useTranslation();
const [isJumpToEvent, jumpToEvent, cancelJumpToEvent] = useJumpToEvent(roomTimeline);
const [typingMembers] = useTypingMembers(roomTimeline);
const [isAtBottom, setIsAtBottom] = useScrollToBottom(roomTimeline);
- const room = initMatrix.matrixClient.getRoom(roomId)
+ const room = initMatrix.matrixClient.getRoom(roomId);
const getUserDisplayName = (userId) => {
if (room?.getMember(userId)) return getUsernameOfRoomMember(room.getMember(userId));
@@ -113,41 +109,41 @@ function RoomViewFloating({
setIsAtBottom(true);
};
- console.log(typingMembers)
+ console.log(typingMembers);
- let typingMemberValues = [...typingMembers];
+ const typingMemberValues = [...typingMembers];
- console.log(typingMemberValues)
+ console.log(typingMemberValues);
return (
<>
0 ? ' room-view__typing--open' : ''}`}>
-
-
+ }}
- />
+ components={{ bold: }}
+ />
diff --git a/src/app/organisms/room/RoomViewHeader.jsx b/src/app/organisms/room/RoomViewHeader.jsx
index 951f1bb2..7dd68429 100644
--- a/src/app/organisms/room/RoomViewHeader.jsx
+++ b/src/app/organisms/room/RoomViewHeader.jsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef } from 'react';
import PropTypes from 'prop-types';
import './RoomViewHeader.scss';
+import { useTranslation } from 'react-i18next';
import { twemojify } from '../../../util/twemojify';
import { blurOnBubbling } from '../../atoms/button/script';
@@ -29,8 +30,7 @@ import BackArrowIC from '../../../../public/res/ic/outlined/chevron-left.svg';
import { useForceUpdate } from '../../hooks/useForceUpdate';
-import '../../i18n.jsx'
-import { useTranslation } from 'react-i18next';
+import '../../i18n';
function RoomViewHeader({ roomId }) {
const [, forceUpdate] = useForceUpdate();
@@ -98,12 +98,12 @@ function RoomViewHeader({ roomId }) {
-
toggleRoomSettings(tabText.SEARCH)} tooltip={t("Organisms.RoomViewHeader.search_tooltip")} src={SearchIC} />
-
- toggleRoomSettings(tabText.MEMBERS)} tooltip={t("Organisms.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} />
diff --git a/src/app/organisms/room/RoomViewInput.jsx b/src/app/organisms/room/RoomViewInput.jsx
index 8d6a6896..f19bdef7 100644
--- a/src/app/organisms/room/RoomViewInput.jsx
+++ b/src/app/organisms/room/RoomViewInput.jsx
@@ -5,6 +5,7 @@ import './RoomViewInput.scss';
import TextareaAutosize from 'react-autosize-textarea';
+import { useTranslation } from 'react-i18next';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import settings from '../../../client/state/settings';
@@ -30,8 +31,7 @@ import MarkdownIC from '../../../../public/res/ic/outlined/markdown.svg';
import FileIC from '../../../../public/res/ic/outlined/file.svg';
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
-import '../../i18n.jsx'
-import { useTranslation } from 'react-i18next';
+import '../../i18n';
const CMD_REGEX = /(^\/|:|@)(\S*)$/;
let isTyping = false;
@@ -86,7 +86,7 @@ function RoomViewInput({
function uploadingProgress(myRoomId, { loaded, total }) {
if (myRoomId !== roomId) return;
const progressPer = Math.round((loaded * 100) / total);
- uploadProgressRef.current.textContent = t("Organisms.RoomViewInput.upload_progress", {progress: bytesToSize(loaded), total:bytesToSize(total), percent: progressPer});
+ uploadProgressRef.current.textContent = t('Organisms.RoomViewInput.upload_progress', { progress: bytesToSize(loaded), total: bytesToSize(total), percent: progressPer });
inputBaseRef.current.style.backgroundImage = `linear-gradient(90deg, var(--bg-surface-hover) ${progressPer}%, var(--bg-surface-low) ${progressPer}%)`;
}
function clearAttachment(myRoomId) {
@@ -133,9 +133,7 @@ function RoomViewInput({
}
function firedCmd(cmdData) {
const msg = textAreaRef.current.value;
- textAreaRef.current.value = replaceCmdWith(
- msg, cmdCursorPos, typeof cmdData?.replace !== 'undefined' ? cmdData.replace : '',
- );
+ textAreaRef.current.value = replaceCmdWith(msg, cmdCursorPos, typeof cmdData?.replace !== 'undefined' ? cmdData.replace : '');
deactivateCmd();
}
@@ -316,8 +314,8 @@ function RoomViewInput({
{
tombstoneEvent
- ? tombstoneEvent.getContent()?.body ?? t("Organisms.RoomViewInput.tombstone_replaced")
- : t("Organisms.RoomViewInput.tombstone_permission_denied")
+ ? tombstoneEvent.getContent()?.body ?? t('Organisms.RoomViewInput.tombstone_replaced')
+ : t('Organisms.RoomViewInput.tombstone_permission_denied')
}
);
@@ -338,7 +336,7 @@ function RoomViewInput({
onChange={handleMsgTyping}
onPaste={handlePaste}
onKeyDown={handleKeyDown}
- placeholder={t("Organisms.RoomViewInput.send_message_placeholder")}
+ placeholder={t('Organisms.RoomViewInput.send_message_placeholder')}
/>
@@ -352,10 +350,10 @@ function RoomViewInput({
cords.y -= 250;
openEmojiBoard(cords, addEmoji);
}}
- tooltip={t("Organisms.RoomViewInput.emoji_tooltip")}
+ tooltip={t('Organisms.RoomViewInput.emoji_tooltip')}
src={EmojiIC}
/>
-
+