[fix] Data Type of i18n text joining

kaiyuanshe · Jul 12, 2023 · 63de96a · 63de96a · github-actions · Jul 12, 2023
1 parent 9ebee3f
commit 63de96a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/components/Activity/ActivityEntry.tsx b/components/Activity/ActivityEntry.tsx
@@ -1,3 +1,4 @@
+import { FC } from 'react';
 import { Button } from 'react-bootstrap';
 import { diffTime } from 'web-utility';
 
@@ -7,7 +8,7 @@ import { TimeUnit } from '../../utils/time';
 
 const { t } = i18n;
 
-export type ActivityStatusTextProps = Pick<
+export type ActivityStatusMeta = Pick<
   Activity,
   | 'status'
   | 'enrollmentStartedAt'
@@ -26,7 +27,7 @@ export const getActivityStatusText = ({
   eventEndedAt,
   judgeStartedAt,
   judgeEndedAt,
-}: ActivityStatusTextProps) => {
+}: ActivityStatusMeta) => {
   const now = Date.now(),
     isOnline = status === 'online',
     enrollmentStart = new Date(enrollmentStartedAt),
@@ -53,11 +54,12 @@ export const getActivityStatusText = ({
     ? t('judges_review')
     : t('activity_ended');
 };
-export interface ActivityEntryProps extends ActivityStatusTextProps {
+
+export interface ActivityEntryProps extends ActivityStatusMeta {
   href: string;
 }
 
-export function ActivityEntry({
+export const ActivityEntry: FC<ActivityEntryProps> = ({
   status,
   enrollmentStartedAt,
   enrollmentEndedAt,
@@ -66,7 +68,7 @@ export function ActivityEntry({
   judgeStartedAt,
   judgeEndedAt,
   href,
-}: ActivityEntryProps) {
+}) => {
   const now = Date.now(),
     isOnline = status === 'online',
     enrollmentStart = new Date(enrollmentStartedAt),
@@ -91,4 +93,4 @@ export function ActivityEntry({
       })}
     </Button>
   );
-}
+};
diff --git a/translation/en-US.ts b/translation/en-US.ts
@@ -1,4 +1,5 @@
 import { textJoin } from 'mobx-i18n';
+import { diffTime } from 'web-utility';
 
 export default {
   home_page: 'Home page',
@@ -12,8 +13,8 @@ export default {
   idea2app_scaffolding: 'idea2app Scaffolding',
   registration_period: 'Registration Period',
   activity_period: 'Activity Period',
-  register_after: ({ distance, unit }: Record<'distance' | 'unit', string>) =>
-    textJoin('Registration after', distance, unit),
+  register_after: ({ distance, unit }: ReturnType<typeof diffTime>) =>
+    textJoin('Registration after', distance + '', unit),
   accepting_applications: 'Accepting Applications',
   activity_ended: 'Activity ended',
   my_team: 'My Team',

diff --git a/translation/zh-CN.ts b/translation/zh-CN.ts
@@ -1,4 +1,5 @@
 import { textJoin } from 'mobx-i18n';
+import { diffTime } from 'web-utility';
 
 export default {
   home_page: '主页',
@@ -12,8 +13,8 @@ export default {
   idea2app_scaffolding: 'idea2app 脚手架强力驱动',
   registration_period: '报名时段',
   activity_period: '活动时段',
-  register_after: ({ distance, unit }: Record<'distance' | 'unit', string>) =>
-    textJoin(distance, unit, '后开始报名'),
+  register_after: ({ distance, unit }: ReturnType<typeof diffTime>) =>
+    textJoin(distance + '', unit, '后开始报名'),
   accepting_applications: '正在报名',
   activity_ended: '比赛结束',
   my_team: '我的团队',

diff --git a/translation/zh-TW.ts b/translation/zh-TW.ts
@@ -1,4 +1,5 @@
 import { textJoin } from 'mobx-i18n';
+import { diffTime } from 'web-utility';
 
 export default {
   home_page: '主頁',
@@ -12,8 +13,8 @@ export default {
   idea2app_scaffolding: 'idea2app 腳手架強力驅動',
   registration_period: '報名時段',
   activity_period: '活動時段',
-  register_after: ({ distance, unit }: Record<'distance' | 'unit', string>) =>
-    textJoin(distance, unit, '後開始報名'),
+  register_after: ({ distance, unit }: ReturnType<typeof diffTime>) =>
+    textJoin(distance + '', unit, '後開始報名'),
   accepting_applications: '正在報名',
   activity_ended: '比賽結束',
   my_team: '我的團隊',