Merge remote-tracking branch 'github/feat/1.1.2/ui' into feat/1.1.2/user-center

This commit is contained in:
LinkinStars 2023-05-08 15:56:20 +08:00
commit ba66ae9d4d
3 changed files with 7 additions and 2 deletions

View File

@ -404,6 +404,7 @@ ui:
achievement: Achievements
all_read: Mark all as read
show_more: Show more
someone: Someone
suspended:
title: Your Account has been Suspended
until_time: "Your account was suspended until {{ time }}."

View File

@ -384,6 +384,7 @@ ui:
achievement: 成就
all_read: 全部标记为已读
show_more: 显示更多
someone: 有人
suspended:
title: 账号已封禁
until_time: "你的账号被封禁至{{ time }}。"

View File

@ -1,5 +1,6 @@
import { ListGroup } from 'react-bootstrap';
import { Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import classNames from 'classnames';
import { isEmpty } from 'lodash';
@ -7,6 +8,7 @@ import { isEmpty } from 'lodash';
import { FormatTime, Empty } from '@/components';
const Inbox = ({ data, handleReadNotification }) => {
const { t } = useTranslation('translation', { keyPrefix: 'notifications' });
if (!data) {
return null;
}
@ -40,12 +42,13 @@ const Inbox = ({ data, handleReadNotification }) => {
!item.is_read && 'warning',
)}>
<div>
{item.user_info.status !== 'deleted' ? (
{item.user_info && item.user_info.status !== 'deleted' ? (
<Link to={`/users/${item.user_info.username}`}>
{item.user_info.display_name}{' '}
</Link>
) : (
<span>{item.user_info.display_name} </span>
// someone for anonymous user display
<span>{item.user_info?.display_name || t('someone')} </span>
)}
{item.notification_action}{' '}
<Link to={url} onClick={() => handleReadNotification(item.id)}>