From 3e0c9e79937a3d8da23d7e43743a7810485e3c6f Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sun, 17 Mar 2024 05:25:40 -0700 Subject: fix(umamusume): null-check birthdays --- src/lib/Tools/UmaMusumeBirthdays.svelte | 91 +++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 39 deletions(-) (limited to 'src/lib/Tools/UmaMusumeBirthdays.svelte') diff --git a/src/lib/Tools/UmaMusumeBirthdays.svelte b/src/lib/Tools/UmaMusumeBirthdays.svelte index d941cabe..8a8e33db 100644 --- a/src/lib/Tools/UmaMusumeBirthdays.svelte +++ b/src/lib/Tools/UmaMusumeBirthdays.svelte @@ -8,6 +8,7 @@ import Message from '$lib/Loading/Message.svelte'; import tooltip from '$lib/Tooltip/tooltip'; import settings from '$stores/settings'; + import locale from '$stores/locale'; interface Birthday { birth_day: number; @@ -51,50 +52,62 @@ {:then birthdays} - {@const todaysBirthdays = birthdays.filter( - (birthday) => birthday.birth_month === month && birthday.birth_day === day - )} + {#if birthdays} + {@const todaysBirthdays = birthdays.filter( + (birthday) => birthday.birth_month === month && birthday.birth_day === day + )} -

- +

+ - -

+ +

- {#if todaysBirthdays.length === 0} - + {#if todaysBirthdays.length === 0} + + {:else} +
+ {#each todaysBirthdays as birthday} + {@const name = $settings.displayLanguage === 'en' ? birthday.name_en : birthday.name_jp} + {@const nameOther = + $settings.displayLanguage === 'ja' ? birthday.name_en : birthday.name_jp} + + + {/each} +
+ {/if} {:else} -
- {#each todaysBirthdays as birthday} - {@const name = $settings.displayLanguage === 'en' ? birthday.name_en : birthday.name_jp} - {@const nameOther = - $settings.displayLanguage === 'ja' ? birthday.name_en : birthday.name_jp} + - - {/each} -
+ {/if} {:catch} -- cgit v1.2.3