-
+
{onlineStatus}
{description && (
@@ -226,7 +226,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
- - about + {t('about')} | @@ -258,7 +258,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role {downloadAppLink && (
- - download app + {t('download_app')} | diff --git a/src/views/subplebbits/subplebbits.module.css b/src/views/subplebbits/subplebbits.module.css index 61874305..14167fc6 100644 --- a/src/views/subplebbits/subplebbits.module.css +++ b/src/views/subplebbits/subplebbits.module.css @@ -68,6 +68,18 @@ color: var(--icon); } +.avatar { + float: left; + margin-right: 5px; + margin-top: 5px; +} + +.avatar img { + object-fit: cover; + width: 70px; + max-height: 70px; +} + .entry { overflow: hidden; opacity: 1; diff --git a/src/views/subplebbits/subplebbits.tsx b/src/views/subplebbits/subplebbits.tsx index 4a5e6e83..331fa43f 100644 --- a/src/views/subplebbits/subplebbits.tsx +++ b/src/views/subplebbits/subplebbits.tsx @@ -1,6 +1,6 @@ import { useEffect, useMemo } from 'react'; import { Link, useLocation } from 'react-router-dom'; -import { useTranslation } from 'react-i18next'; +import { Trans, useTranslation } from 'react-i18next'; import { Subplebbit as SubplebbitType, useAccount, useAccountSubplebbits, useSubplebbits, useSubplebbitStats } from '@plebbit/plebbit-react-hooks'; import styles from './subplebbits.module.css'; import Sidebar from '../../components/sidebar'; @@ -30,7 +30,7 @@ const Tabs = () => { return (
- subscriber
+ {t('subscriber')}
|
{
className={isInSubplebbitsMineContributorView ? styles.selected : styles.choice}
onClick={(e) => e.preventDefault()} // TODO: enable after approving user is implemented in the API
>
- approved user
+ {t('approved_user')}
|
@@ -60,17 +60,13 @@ const Infobar = () => {
const infobarText = useMemo(() => {
if (isInSubplebbitsMineSubscriberView) {
- return subscriptions.length === 0 ? 'you are not subscribed to any community.' : 'below are communities you have subscribed to.';
+ return subscriptions.length === 0 ? t('not_subscribed') : t('below_subscribed');
} else if (isInSubplebbitsMineContributorView) {
- return 'below are the communities that you are an approved user on.';
+ return t('below_approved_user');
} else if (isInSubplebbitsMineModeratorView) {
- return Object.keys(accountSubplebbits).length > 0 ? 'below are the communities that you have moderator access to.' : 'you are not a moderator on any community.';
+ return Object.keys(accountSubplebbits).length > 0 ? t('below_moderator_access') : t('not_moderator');
} else {
- return (
- <>
- click the
+ {suggested?.avatarUrl && (
+ {t('join')} or {t('leave')} buttons to choose which communities appear on the home feed.
-
- );
+ return
+
+ 
+
+
+ )}
-
+
diff --git a/yarn.lock b/yarn.lock
index bff2f365..0a4da917 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10843,6 +10843,14 @@ mdast-util-mdxjs-esm@^2.0.0:
mdast-util-from-markdown "^2.0.0"
mdast-util-to-markdown "^2.0.0"
+mdast-util-newline-to-break@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/mdast-util-newline-to-break/-/mdast-util-newline-to-break-2.0.0.tgz#4e73ef621b6b1a590240336cfe6c29915e198df0"
+ integrity sha512-MbgeFca0hLYIEx/2zGsszCSEJJ1JSCdiY5xQxRcLDDGa8EPvlLPupJ4DSajbMPAnC0je8jfb9TiUATnxxrHUog==
+ dependencies:
+ "@types/mdast" "^4.0.0"
+ mdast-util-find-and-replace "^3.0.0"
+
mdast-util-phrasing@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-4.0.0.tgz#468cbbb277375523de807248b8ad969feb02a5c7"
@@ -13580,6 +13588,15 @@ relateurl@^0.2.7:
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
+remark-breaks@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/remark-breaks/-/remark-breaks-4.0.0.tgz#dcc19a2891733906f3b97eaa8acb8621e8da8852"
+ integrity sha512-IjEjJOkH4FuJvHZVIW0QCDWxcG96kCq7An/KVH2NfJe6rKZU2AsHeB3OEjPNRxi4QC34Xdx7I2KGYn6IpT7gxQ==
+ dependencies:
+ "@types/mdast" "^4.0.0"
+ mdast-util-newline-to-break "^2.0.0"
+ unified "^11.0.0"
+
remark-gfm@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-4.0.0.tgz#aea777f0744701aa288b67d28c43565c7e8c35de"
@@ -130,13 +133,13 @@ const Subplebbit = ({ subplebbit }: SubplebbitProps) => {
{isOnline ? (
<>
{t('members_count', { count: allActiveUserCount })}, {t('community_for', { date: getFormattedTimeDuration(createdAt) })}
-
- {t('settings')}
-
) : (
offlineNotice
)}
+
+ {t('settings')}
+