You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by ro...@apache.org on 2024/08/21 08:02:03 UTC
(incubator-answer) 08/17: fix: add link url path
This is an automated email from the ASF dual-hosted git repository.
robin0716 pushed a commit to branch develop/robin
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 0c8b3cb3b06fad027192e3d8745b74cb57e0fea5
Author: shuai <li...@sifou.com>
AuthorDate: Wed Aug 14 11:23:57 2024 +0800
fix: add link url path
---
ui/src/pages/Badges/Detail/index.tsx | 18 +++++++++++++++---
ui/src/utils/localize.ts | 4 +---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ui/src/pages/Badges/Detail/index.tsx b/ui/src/pages/Badges/Detail/index.tsx
index 42487db3..a388d496 100644
--- a/ui/src/pages/Badges/Detail/index.tsx
+++ b/ui/src/pages/Badges/Detail/index.tsx
@@ -71,6 +71,16 @@ const Index = () => {
<Loader />
) : (
badges?.list?.map((item) => {
+ const linkUrl =
+ item.object_type === 'question'
+ ? `/question/${item.question_id}`
+ : item.object_type === 'answer'
+ ? `/question/${item.question_id}/${item.answer_id}`
+ : item.object_type === 'comment' && item.answer_id
+ ? `/question/${item.question_id}/${item.answer_id}?commentId=${item.comment_id}`
+ : item.object_type === 'comment'
+ ? `/question/${item.question_id}?commentId=${item.comment_id}`
+ : '';
return (
<Col sm={12} md={6} lg={3} key={item.object_id} className="mb-4">
<FormatTime
@@ -79,9 +89,11 @@ const Index = () => {
className="small mb-1 d-block"
/>
<UserCard data={item.author_user_info} />
- <Link to="/question" className="mt-1 d-block">
- {item.url_title}
- </Link>
+ {item.url_title && (
+ <Link to={linkUrl} className="mt-1 d-block">
+ {item.url_title}
+ </Link>
+ )}
</Col>
);
})
diff --git a/ui/src/utils/localize.ts b/ui/src/utils/localize.ts
index b64473a9..eea132a8 100644
--- a/ui/src/utils/localize.ts
+++ b/ui/src/utils/localize.ts
@@ -133,9 +133,7 @@ const localeDayjs = (langName) => {
export const setupAppLanguage = async () => {
const lang = getCurrentLang();
- if (!i18next.getDataByLanguage(lang)?.translation) {
- await addI18nResource(lang);
- }
+ await addI18nResource(lang);
localeDayjs(lang);
i18next.changeLanguage(lang);
};