From 0f31310b6aa69e03b4eed27adcd4d1c6ed2bb4d1 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:41:15 +0800 Subject: [PATCH 01/16] Update WishImportModal.svelte --- src/components/WishImportModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/WishImportModal.svelte b/src/components/WishImportModal.svelte index 5ae1977f..b64a7b09 100644 --- a/src/components/WishImportModal.svelte +++ b/src/components/WishImportModal.svelte @@ -577,7 +577,7 @@

{$t('wish.import.processing')} {currentBanner} {$t('wish.import.banner')}

-

{$t('wish.import.page')} {currentPage}

+

{$t('wish.import.page', values: { page: currentPage } )}

From ef5b69749dd7315a4ca0e571693576ca12a27079 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:42:11 +0800 Subject: [PATCH 02/16] Update zh.json --- src/locales/zh.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/zh.json b/src/locales/zh.json index 53d546bb..070a5c02 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -155,7 +155,7 @@ "reCalculating": "重新计算保底...", "processing": "处理中", "banner": "祈愿池", - "page": "页", + "page": "第 {page} 页", "parsing": "解析中...", "save": "保存", "cancel": "取消", @@ -858,4 +858,4 @@ "save": "保存", "cancel": "取消" } -} \ No newline at end of file +} From f11bcdaf969d1b1721854898d969638d4f6bb10e Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:42:46 +0800 Subject: [PATCH 03/16] Update en.json --- src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 32dc8f79..388a9c21 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -155,7 +155,7 @@ "reCalculating": "Re-calculating pity...", "processing": "Processing", "banner": "Banner", - "page": "Page", + "page": "Page {page}", "parsing": "Parsing...", "save": "Save", "cancel": "Cancel", @@ -865,4 +865,4 @@ "save": "Save", "cancel": "Cancel" } -} \ No newline at end of file +} From 82943609a808a97cf5b3dffeef4584926aade374 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:53:48 +0800 Subject: [PATCH 04/16] Update de.json --- src/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/de.json b/src/locales/de.json index 9cdbebc1..cdc9087b 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -155,7 +155,7 @@ "reCalculating": "Rekalkulation der Garantie...", "processing": "Wird verarbeitet", "banner": "Banner", - "page": "Seite", + "page": "Seite {page}", "parsing": "Wird analysiert...", "save": "Speichern", "cancel": "Abbrechen", @@ -858,4 +858,4 @@ "save": "Speichern", "cancel": "Abbrechen" } -} \ No newline at end of file +} From d8b6aba9d45fa906921a02221741f05605c2f636 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:54:18 +0800 Subject: [PATCH 05/16] Update es.json --- src/locales/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/es.json b/src/locales/es.json index 25209111..5caf4bf8 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -155,7 +155,7 @@ "reCalculating": "Recalculando pity...", "processing": "Procesando", "banner": "Banner", - "page": "Página", + "page": "Página {page}", "parsing": "Analizando...", "save": "Guardar", "cancel": "Cancelar", @@ -858,4 +858,4 @@ "save": "Guardar", "cancel": "Cancelar" } -} \ No newline at end of file +} From 25d95a83722c860e2b9ede611c31e24d3b9b6b2a Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:54:50 +0800 Subject: [PATCH 06/16] Update id.json --- src/locales/id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/id.json b/src/locales/id.json index 5365f516..6e3f88e2 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -155,7 +155,7 @@ "reCalculating": "Menghitung pity...", "processing": "Memproses", "banner": "Banner", - "page": "Halaman", + "page": "Halaman {page}", "parsing": "Membaca...", "save": "Simpan", "cancel": "Batal", @@ -865,4 +865,4 @@ "save": "Simpan", "cancel": "Batal" } -} \ No newline at end of file +} From 4be85e31053107cbe5550c60e66e64a3e04144ba Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:55:25 +0800 Subject: [PATCH 07/16] Update ja.json --- src/locales/ja.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index ec55bcf0..a803fefc 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -155,7 +155,7 @@ "reCalculating": "天井カウントを再計算中...", "processing": "処理中", "banner": "祈願", - "page": "ページ", + "page": "ページ {page}", "parsing": "解析中...", "save": "保存", "cancel": "キャンセル", @@ -858,4 +858,4 @@ "save": "保存", "cancel": "キャンセル" } -} \ No newline at end of file +} From 4ad0f0e27be76595c0eeeeb67460e0607868981d Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:57:04 +0800 Subject: [PATCH 08/16] Update fr.json --- src/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/fr.json b/src/locales/fr.json index e4eb7b9e..b78bfe4f 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -155,7 +155,7 @@ "reCalculating": "Recalcul de la pity...", "processing": "Traitement de la", "banner": "Bannière", - "page": "Page", + "page": "Page {page}", "parsing": "Analyse...", "save": "Sauvegarder", "cancel": "Annuler", @@ -858,4 +858,4 @@ "save": "Sauvegarder", "cancel": "Annuler" } -} \ No newline at end of file +} From 64b98ae17860fada7cd9f6e43ac239232f2e87d0 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:57:37 +0800 Subject: [PATCH 09/16] Update ko.json --- src/locales/ko.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/ko.json b/src/locales/ko.json index f2ac5589..d49b5f73 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -155,7 +155,7 @@ "reCalculating": "천장 재계산 중...", "processing": "처리중", "banner": "픽업", - "page": "페이지", + "page": "페이지 {page}", "parsing": "파싱 중...", "save": "저장", "cancel": "취소", @@ -858,4 +858,4 @@ "save": "저장", "cancel": "취소" } -} \ No newline at end of file +} From 15b6a94f5ed5653d4b5a8e841df8f3a542e24fff Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:58:06 +0800 Subject: [PATCH 10/16] Update pt.json --- src/locales/pt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/pt.json b/src/locales/pt.json index ccd8e0c9..0efd995b 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -155,7 +155,7 @@ "reCalculating": "Recalculando pity...", "processing": "Processando", "banner": "Banner", - "page": "Página", + "page": "Página {page}", "parsing": "Parsing...", "save": "Salvar", "cancel": "Cancelar", @@ -858,4 +858,4 @@ "save": "Salvar", "cancel": "Cancelar" } -} \ No newline at end of file +} From 33abd55b9af4a8614af777966dd2b8098cf51355 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:58:34 +0800 Subject: [PATCH 11/16] Update ru.json --- src/locales/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/ru.json b/src/locales/ru.json index 3e1148d6..f38633da 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -155,7 +155,7 @@ "reCalculating": "Пересчитываем гаранты...", "processing": "Обработка", "banner": "Баннер", - "page": "Страница", + "page": "Страница {page}", "parsing": "Анализируем...", "save": "Сохранить", "cancel": "Отменить", @@ -858,4 +858,4 @@ "save": "Сохранить", "cancel": "Отмена" } -} \ No newline at end of file +} From 72e80227ea0955b5295c0142225e0ff7bdc76026 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:59:06 +0800 Subject: [PATCH 12/16] Update th.json --- src/locales/th.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/th.json b/src/locales/th.json index 44ca2fc4..4813fc5a 100644 --- a/src/locales/th.json +++ b/src/locales/th.json @@ -155,7 +155,7 @@ "reCalculating": "กำลังคำนวณค่า pity อีกครั้ง...", "processing": "กำลังประมวลผล", "banner": "Banner", - "page": "หน้า", + "page": "หน้า {page}", "parsing": "กำลังอ่านค่า...", "save": "บันทึก", "cancel": "ยกเลิก", @@ -858,4 +858,4 @@ "save": "บันทึก", "cancel": "ยกเลิก" } -} \ No newline at end of file +} From 6e6e2c3e85cedf845c26015944dd3f8e94b6d73f Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 17:59:59 +0800 Subject: [PATCH 13/16] Update tw.json --- src/locales/tw.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/tw.json b/src/locales/tw.json index 59aae277..7d763f6c 100644 --- a/src/locales/tw.json +++ b/src/locales/tw.json @@ -155,7 +155,7 @@ "reCalculating": "重新計算保底...", "processing": "處理中", "banner": "祈願池", - "page": "頁", + "page": "第 {page} 頁", "parsing": "解析中...", "save": "儲存", "cancel": "取消", @@ -858,4 +858,4 @@ "save": "儲存", "cancel": "取消" } -} \ No newline at end of file +} From 01079cfacb58aaa711b6adcfb1edd06eaf12dce0 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 18:00:31 +0800 Subject: [PATCH 14/16] Update vi.json --- src/locales/vi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/vi.json b/src/locales/vi.json index b20c5c67..50753f81 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -155,7 +155,7 @@ "reCalculating": "Đang tính lại bảo hiểm...", "processing": "Đang xử lý", "banner": "Banner", - "page": "Trang", + "page": "Trang {page}", "parsing": "Đang phân tích...", "save": "Lưu", "cancel": "Hủy", @@ -858,4 +858,4 @@ "save": "Lưu", "cancel": "Hủy" } -} \ No newline at end of file +} From 55d55b95bbf6e2cd5c97c00a71618b208231aad8 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 23:07:11 +0800 Subject: [PATCH 15/16] Update import.svelte --- src/routes/wish/import.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/wish/import.svelte b/src/routes/wish/import.svelte index 2aba01c3..3b47be6f 100644 --- a/src/routes/wish/import.svelte +++ b/src/routes/wish/import.svelte @@ -1257,7 +1257,7 @@ {#if !finishedProcessingLog}

{$t('wish.import.processing')} {currentBanner} {$t('wish.import.banner')}

-

{$t('wish.import.page')} {currentPage}

+

{$t('wish.import.page'), { values: { page: currentPage } }}

{/if} {#if !noNewData} From 802deba23982b61e3de0172bdf4364c971a0fa36 Mon Sep 17 00:00:00 2001 From: lakejason0 <36039861+lakejason0@users.noreply.github.com> Date: Tue, 10 May 2022 23:09:34 +0800 Subject: [PATCH 16/16] Update import.svelte --- src/routes/wish/import.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/wish/import.svelte b/src/routes/wish/import.svelte index 3b47be6f..9c6ca066 100644 --- a/src/routes/wish/import.svelte +++ b/src/routes/wish/import.svelte @@ -1257,7 +1257,7 @@ {#if !finishedProcessingLog}

{$t('wish.import.processing')} {currentBanner} {$t('wish.import.banner')}

-

{$t('wish.import.page'), { values: { page: currentPage } }}

+

{$t('wish.import.page', { values: { page: currentPage } })}

{/if} {#if !noNewData}