Skip to content

Commit 1ef6797

Browse files
committed
Merge branch 'feat/1.6.1/md' into test
2 parents d04d18d + e90be51 commit 1ef6797

File tree

4 files changed

+2
-18
lines changed

4 files changed

+2
-18
lines changed

ui/src/components/QuestionList/index.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ const QuestionList: FC<Props> = ({
163163
curOrder === 'active' ? li.operated_at : li.created_at
164164
}
165165
className="text-secondary ms-1 flex-shrink-0"
166-
preFix={
167-
curOrder === 'active'
168-
? t(li.operation_type)
169-
: t('asked')
170-
}
171166
/>
172167
</div>
173168
<h5 className="text-wrap text-break">

ui/src/pages/Search/components/SearchItem/index.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,7 @@ const Index: FC<Props> = ({ data }) => {
8181
<BaseUserCard data={data.object?.user_info} showAvatar={false} />
8282

8383
<span className="split-dot" />
84-
<FormatTime
85-
time={data.object?.created_at}
86-
className="me-3"
87-
preFix={data.object_type === 'question' ? 'asked' : 'answered'}
88-
/>
84+
<FormatTime time={data.object?.created_at} className="me-3" />
8985

9086
<Counts
9187
className="my-2 my-sm-0"

ui/src/pages/Users/Personal/components/Answers/index.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import { FC, memo } from 'react';
2121
import { ListGroup, ListGroupItem } from 'react-bootstrap';
22-
import { useTranslation } from 'react-i18next';
2322
import { Link } from 'react-router-dom';
2423

2524
import { FormatTime, Tag, Counts } from '@/components';
@@ -30,7 +29,6 @@ interface Props {
3029
data: any[];
3130
}
3231
const Index: FC<Props> = ({ visible, data }) => {
33-
const { t } = useTranslation('translation', { keyPrefix: 'personal' });
3432
if (!visible || !data?.length) {
3533
return null;
3634
}
@@ -53,11 +51,7 @@ const Index: FC<Props> = ({ visible, data }) => {
5351
</Link>
5452
</h6>
5553
<div className="d-flex align-items-center small text-secondary mb-2">
56-
<FormatTime
57-
time={item.create_time}
58-
className="me-3"
59-
preFix={t('answered')}
60-
/>
54+
<FormatTime time={item.create_time} className="me-3" />
6155

6256
<Counts
6357
data={{ votes: item?.vote_count, views: 0, answers: 0 }}

ui/src/pages/Users/Personal/components/DefaultList/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ const Index: FC<Props> = ({ visible, tabName, data }) => {
7070
tabName === 'bookmarks' ? item.create_time : item.created_at
7171
}
7272
className="me-3"
73-
preFix={t('asked')}
7473
/>
7574

7675
<Counts

0 commit comments

Comments
 (0)