Skip to content

Commit ba66ae9

Browse files
committed
Merge remote-tracking branch 'github/feat/1.1.2/ui' into feat/1.1.2/user-center
2 parents efb7812 + 016fd7b commit ba66ae9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

i18n/en_US.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ ui:
404404
achievement: Achievements
405405
all_read: Mark all as read
406406
show_more: Show more
407+
someone: Someone
407408
suspended:
408409
title: Your Account has been Suspended
409410
until_time: "Your account was suspended until {{ time }}."

i18n/zh_CN.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ ui:
384384
achievement: 成就
385385
all_read: 全部标记为已读
386386
show_more: 显示更多
387+
someone: 有人
387388
suspended:
388389
title: 账号已封禁
389390
until_time: "你的账号被封禁至{{ time }}。"

ui/src/pages/Users/Notifications/components/Inbox/index.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { ListGroup } from 'react-bootstrap';
22
import { Link } from 'react-router-dom';
3+
import { useTranslation } from 'react-i18next';
34

45
import classNames from 'classnames';
56
import { isEmpty } from 'lodash';
67

78
import { FormatTime, Empty } from '@/components';
89

910
const Inbox = ({ data, handleReadNotification }) => {
11+
const { t } = useTranslation('translation', { keyPrefix: 'notifications' });
1012
if (!data) {
1113
return null;
1214
}
@@ -40,12 +42,13 @@ const Inbox = ({ data, handleReadNotification }) => {
4042
!item.is_read && 'warning',
4143
)}>
4244
<div>
43-
{item.user_info.status !== 'deleted' ? (
45+
{item.user_info && item.user_info.status !== 'deleted' ? (
4446
<Link to={`/users/${item.user_info.username}`}>
4547
{item.user_info.display_name}{' '}
4648
</Link>
4749
) : (
48-
<span>{item.user_info.display_name} </span>
50+
// someone for anonymous user display
51+
<span>{item.user_info?.display_name || t('someone')} </span>
4952
)}
5053
{item.notification_action}{' '}
5154
<Link to={url} onClick={() => handleReadNotification(item.id)}>

0 commit comments

Comments
 (0)