From 24e0c26649c5303dd6cd9bc437dcd3952bfcaa1c Mon Sep 17 00:00:00 2001 From: Lei Shi Date: Wed, 5 Oct 2022 17:43:39 +0200 Subject: [PATCH 1/8] i18n for Wish Counter page --- src/routes/wish/_counter.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/wish/_counter.svelte b/src/routes/wish/_counter.svelte index 012ba907..1534d6ae 100644 --- a/src/routes/wish/_counter.svelte +++ b/src/routes/wish/_counter.svelte @@ -461,7 +461,7 @@ : characters[pull.id].rarity === 4 ? 'text-rare-from' : 'text-primary' - }`}>{characters[pull.id].name}{$t(characters[pull.id].name)} {:else if pull.type === 'weapon'} {weaponList[pull.id].name}{$t(weaponList[pull.id].name)} {:else if pull.type === 'unknown_3_star'} Unknown From e77b9c9e4d3976c27e127fc06075a5fd11eeccb1 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Sun, 2 Oct 2022 15:04:41 +0800 Subject: [PATCH 2/8] i18n for Calendar --- src/routes/calendar/index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/calendar/index.svelte b/src/routes/calendar/index.svelte index 21d58f6a..76b27c99 100644 --- a/src/routes/calendar/index.svelte +++ b/src/routes/calendar/index.svelte @@ -504,11 +504,11 @@ + - + {#each sortedRare as [char, val]} goToBannerTime(lastBannerStart[char])}> From 720cc302fe6db891c763d22f079bfc6012b166f1 Mon Sep 17 00:00:00 2001 From: Suzuka Asagiri Date: Thu, 3 Nov 2022 21:02:47 +0900 Subject: [PATCH 3/8] more i18n support for calculator --- src/routes/calculator/_character.svelte | 2 +- src/routes/calculator/_fateCount.svelte | 4 ++-- src/routes/calculator/_weapon.svelte | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/calculator/_character.svelte b/src/routes/calculator/_character.svelte index 8fe3593b..319de02f 100644 --- a/src/routes/calculator/_character.svelte +++ b/src/routes/calculator/_character.svelte @@ -669,7 +669,7 @@ {item.name} - {item.name} + {$t(item.name)} diff --git a/src/routes/calculator/_fateCount.svelte b/src/routes/calculator/_fateCount.svelte index c9abaf8e..c6d3c55c 100644 --- a/src/routes/calculator/_fateCount.svelte +++ b/src/routes/calculator/_fateCount.svelte @@ -94,7 +94,7 @@
{value.name} -

{value.name}

+

{$t(value.name)}

@@ -155,7 +155,7 @@
From 8a48f016972f795973bc09c680329cb6318730e8 Mon Sep 17 00:00:00 2001 From: Suzuka Asagiri Date: Thu, 3 Nov 2022 21:05:32 +0900 Subject: [PATCH 4/8] more i18n support for TodoDeleteModal --- src/components/TodoDeleteModal.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/TodoDeleteModal.svelte b/src/components/TodoDeleteModal.svelte index 2d828fb3..d75856ac 100644 --- a/src/components/TodoDeleteModal.svelte +++ b/src/components/TodoDeleteModal.svelte @@ -17,7 +17,7 @@ src={`/images/weapons/${todo.weapon ? todo.weapon.id : 'any_weapon_1'}.png`} alt={todo.weapon ? todo.weapon.name : `Weapon Level ${todo.level.from}-${todo.level.to}`} />
-

{todo.weapon ? todo.weapon.name : 'Weapon'}

+

{todo.weapon ? $t(todo.weapon.name) : 'Weapon'}

Level {`${todo.level.from}-${todo.level.to}`}

{:else if todo.type === 'character'} @@ -26,7 +26,7 @@ src={`/images/characters/${todo.character ? todo.character.id : 'characters'}.png`} alt={todo.character ? todo.character.name : `Character Level ${todo.level.from}-${todo.level.to}`} />
-

{todo.character ? todo.character.name : 'Character'}

+

{todo.character ? $t(todo.character.name) : 'Character'}

Level {`${todo.level.from}-${todo.level.to}`}

{/if} From 1aff83353c148e0c1a590f1b756224572da8b3e5 Mon Sep 17 00:00:00 2001 From: Suzuka Asagiri Date: Thu, 3 Nov 2022 21:08:30 +0900 Subject: [PATCH 5/8] more i18n support for todo --- src/routes/todo.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/todo.svelte b/src/routes/todo.svelte index e4091631..bf70cdb1 100644 --- a/src/routes/todo.svelte +++ b/src/routes/todo.svelte @@ -322,7 +322,7 @@ alt={itemList[id].name} /> - {itemList[id].name} + {$t(itemList[id].name)} @@ -362,7 +362,7 @@ alt={itemList[id].name} /> - {itemGroup[id].name} + {$t(itemGroup[id].name)} @@ -401,7 +401,7 @@ alt={itemList[id].name} /> - {itemList[id].name} + {$t(itemList[id].name)} {#if id === 'mora'} From c31ef3bde3a07b29dabbf372c572d37720e662f7 Mon Sep 17 00:00:00 2001 From: Suzuka Asagiri Date: Thu, 3 Nov 2022 21:19:32 +0900 Subject: [PATCH 7/8] i18n support for calculator character and weapon resource names --- src/routes/calculator/_character.svelte | 4 ++-- src/routes/calculator/_weapon.svelte | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/calculator/_character.svelte b/src/routes/calculator/_character.svelte index 319de02f..2e4d580f 100644 --- a/src/routes/calculator/_character.svelte +++ b/src/routes/calculator/_character.svelte @@ -542,7 +542,7 @@ {res.label} {/if} - {res.label} + {$t(res.label)} @@ -649,7 +649,7 @@ {res.label} {/if} - {res.label} + {$t(res.label)} diff --git a/src/routes/calculator/_weapon.svelte b/src/routes/calculator/_weapon.svelte index cc7b3164..66eba3f2 100644 --- a/src/routes/calculator/_weapon.svelte +++ b/src/routes/calculator/_weapon.svelte @@ -412,7 +412,7 @@ {res.label} {/if} - {res.label} + {$t(res.label)} @@ -457,7 +457,7 @@ {res.label} {/if} - {res.label} + {$t(res.label)} From 5cc477ad2ba7e22f19780767e4643445de86dc21 Mon Sep 17 00:00:00 2001 From: Suzuka Asagiri Date: Thu, 3 Nov 2022 21:36:09 +0900 Subject: [PATCH 8/8] revert fateCount --- src/routes/calculator/_fateCount.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/calculator/_fateCount.svelte b/src/routes/calculator/_fateCount.svelte index c6d3c55c..c9abaf8e 100644 --- a/src/routes/calculator/_fateCount.svelte +++ b/src/routes/calculator/_fateCount.svelte @@ -94,7 +94,7 @@
{value.name} -

{$t(value.name)}

+

{value.name}

@@ -155,7 +155,7 @@
- Name{$t('wish.detail.name')} - Banner + {$t('wish.detail.banner')} Time{$t('wish.detail.time')}
{#if res.image !== null}{res.name}{/if} -

{res.name}

+

{$t(res.name)}

diff --git a/src/routes/calculator/_weapon.svelte b/src/routes/calculator/_weapon.svelte index 578a7824..cc7b3164 100644 --- a/src/routes/calculator/_weapon.svelte +++ b/src/routes/calculator/_weapon.svelte @@ -477,7 +477,7 @@ {item.name} - {item.name} + {$t(item.name)}
{#if res.image !== null}{res.name}{/if} -

{$t(res.name)}

+

{res.name}