From 91b14874a51aaee45af7953e39535b7d70242347 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Wed, 25 May 2022 16:23:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=82=80=E8=AF=B7=E7=A0=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A0=87=E8=AE=B0=E5=B7=B2=E8=BF=87=E5=8E=BB=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/i18n/langs/en-US/translation.json | 1 + shared/i18n/langs/zh-CN/translation.json | 1 + web/src/components/modals/GroupDetail/Invite.tsx | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/shared/i18n/langs/en-US/translation.json b/shared/i18n/langs/en-US/translation.json index 5e073454..49c0c303 100644 --- a/shared/i18n/langs/en-US/translation.json +++ b/shared/i18n/langs/en-US/translation.json @@ -235,6 +235,7 @@ "kf3fa6059": "You can use the complete <1>nickname#identifier to add friends", "kf4567a1": "Copy the invitation link", "kf48ae58": "Group information not found", + "kf5543e44": "Expired", "kf5861d84": "No friend requests have been sent yet", "kf5d66247": "Panel Name", "kf6d7f23d": "Connecting to chat server...", diff --git a/shared/i18n/langs/zh-CN/translation.json b/shared/i18n/langs/zh-CN/translation.json index 0be09eaf..116aef33 100644 --- a/shared/i18n/langs/zh-CN/translation.json +++ b/shared/i18n/langs/zh-CN/translation.json @@ -235,6 +235,7 @@ "kf3fa6059": "您可以使用完整的 <1>用户昵称#标识 来添加好友", "kf4567a1": "复制邀请链接", "kf48ae58": "找不到群组信息", + "kf5543e44": "已过期", "kf5861d84": "暂无已发送的好友请求", "kf5d66247": "面板名", "kf6d7f23d": "正在连接到聊天服务器...", diff --git a/web/src/components/modals/GroupDetail/Invite.tsx b/web/src/components/modals/GroupDetail/Invite.tsx index 4a2bdd63..a422073d 100644 --- a/web/src/components/modals/GroupDetail/Invite.tsx +++ b/web/src/components/modals/GroupDetail/Invite.tsx @@ -78,6 +78,10 @@ export const GroupInvite: React.FC<{ return t('永不过期'); } + if (new Date(date).valueOf() < Date.now()) { + return t('已过期'); + } + return ( {datetimeFromNow(date)}