Merge pull request #476 from jsconfjp/fix/duration-formatting

残り時間表示の改善
jsconfjp · Oct 31, 2024 · 2573f07 · 2573f07
2 parents 530c381 + afbeb0b
commit 2573f07
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/2024/src/components/HeroCountdown.tsx b/2024/src/components/HeroCountdown.tsx
@@ -21,14 +21,17 @@ export const HeroCountdown = () => {
   if (duration.sign != 1) {
     return <></>
   }
+  const f = (time: number, unit: string) =>
+    `${time}${t(time === 1 ? `time.${unit}` : `time.${unit}s`)}`
   return (
     <Paragraph>
       {t("time.in")}
-      {duration.weeks ? `${duration.weeks}${t("time.weeks")}` : ""}
-      {duration.days ? `${duration.days}${t("time.days")}` : ""}
-      {duration.hours ? `${duration.hours}${t("time.hours")}` : ""}
-      {duration.minutes}
-      {t("time.minutes")}
+      {duration.weeks ? f(duration.weeks, "week") : ""}
+      {duration.weeks || duration.days ? f(duration.days, "day") : ""}
+      {duration.weeks || duration.days || duration.hours
+        ? f(duration.hours, "hour")
+        : ""}
+      {f(duration.minutes, "minute")}
     </Paragraph>
   )
 }
diff --git a/2024/src/i18n/en.ts b/2024/src/i18n/en.ts
@@ -76,8 +76,12 @@ export const en = {
     "talk.sponsor": "Sponsor Talks",
     "time.in": "in ",
     "time.weeks": " weeks ",
+    "time.week": " week ",
     "time.days": " days ",
+    "time.day": " day ",
     "time.hours": " hours ",
+    "time.hour": " hour ",
     "time.minutes": " minutes",
+    "time.minute": " minute",
   },
 }
diff --git a/2024/src/i18n/ja.ts b/2024/src/i18n/ja.ts
@@ -63,8 +63,11 @@ export const ja: {
     "talk.sponsor": "スポンサートーク",
     "time.in": "残り",
     "time.weeks": "週",
+    "time.week": "週",
     "time.days": "日",
+    "time.day": "日",
     "time.hours": "時",
+    "time.hour": "時",
     "time.minutes": "分",
   },
 }