From 0ec96127914a22127a4cb66842e3b23a6e0928b9 Mon Sep 17 00:00:00 2001 From: Made Baruna Date: Tue, 30 Mar 2021 23:41:07 +0800 Subject: [PATCH] Add some message --- src/components/WishImportModal.svelte | 7 ++++--- src/locales/en.json | 2 ++ src/locales/id.json | 6 ++++-- src/routes/settings/_deleteAccount.svelte | 1 + src/routes/settings/_resetAccount.svelte | 1 + src/routes/wish/[id].svelte | 18 ++++++++++++------ 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/components/WishImportModal.svelte b/src/components/WishImportModal.svelte index f008ebe2..7fa636fb 100644 --- a/src/components/WishImportModal.svelte +++ b/src/components/WishImportModal.svelte @@ -60,9 +60,9 @@ let url; - let processingLog = false; + let processingLog = true; let fetchingWishes = false; - let finishedProcessingLog = false; + let finishedProcessingLog = true; let calculatingPity = false; let cancelled = false; @@ -511,7 +511,8 @@ {/if}

{$t('wish.import.importNotice1')}

-

{$t('wish.import.importNotice2')}

+

{$t('wish.import.importNotice2')}

+

{$t('wish.import.importNotice3')}

{$t('wish.import.saveData')}

{:else if calculatingPity} diff --git a/src/locales/en.json b/src/locales/en.json index e7ba31e6..fd68969d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -31,6 +31,7 @@ "nonew": "No New Wishes", "importNotice1": "Imported wishes will be appended or replaced accordingly to existing data", "importNotice2": "If you don't have any data saved before, first wish will be counted as pity 1", + "importNotice3": "Please note if you are importing a different account, please make sure to separate your account on the settings page, or your data will be mixed up!", "saveData": "Save wish data?", "reCalculating": "Re-calculating pity...", "processing": "Processing", @@ -355,6 +356,7 @@ "thanks": "Thanks😁!", "modal": { "notice": "All Todo and Wish history data will be deleted", + "backup": "You can backup your wish history first by exporting it to an excel file!", "cancel": "Cancel", "delete": "Delete", "reset": "Reset" diff --git a/src/locales/id.json b/src/locales/id.json index 17549305..515e06c8 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -31,6 +31,7 @@ "nonew": "Tdk ada wish baru", "importNotice1": "Wish yang diimport akan ditambah atau dihapus sesuai dengan data yang sudah pernah diimport", "importNotice2": "Jika kamu tidak mempunyai data yang tersimpan sebelumnya, wish pertama akan dihitung sebagai pity 1.", + "importNotice3": "Harap diingat jika kamu mengimport akun yang berbeda, pastikan sudah memisahkan akun di halaman setting jika tidak ingin data mu tercampur!", "saveData": "Simpan data?", "reCalculating": "Menghitung pity...", "processing": "Memproses", @@ -355,8 +356,9 @@ "thanks": "Thanks😁!", "modal": { "notice": "Semua todo dan riwayat wish akan dihapus", - "cancel": "Cancel", - "delete": "Delete", + "backup": "Kamu bisa backup dulu riwayat history dengan mengexport nya ke file excel!", + "cancel": "Batal", + "delete": "Hapus", "reset": "Reset" } }, diff --git a/src/routes/settings/_deleteAccount.svelte b/src/routes/settings/_deleteAccount.svelte index e14b1f33..0d66a181 100644 --- a/src/routes/settings/_deleteAccount.svelte +++ b/src/routes/settings/_deleteAccount.svelte @@ -11,6 +11,7 @@

{$t('settings.modal.delete')} {account.label}?

{$t('settings.modal.notice')}

+

{$t('settings.modal.backup')}

diff --git a/src/routes/settings/_resetAccount.svelte b/src/routes/settings/_resetAccount.svelte index 48a88b53..2eb8d2e5 100644 --- a/src/routes/settings/_resetAccount.svelte +++ b/src/routes/settings/_resetAccount.svelte @@ -11,6 +11,7 @@

{$t('settings.modal.reset')} {account.label}?

{$t('settings.modal.notice')}

+

{$t('settings.modal.backup')}

diff --git a/src/routes/wish/[id].svelte b/src/routes/wish/[id].svelte index 98c9f4ed..05789d66 100644 --- a/src/routes/wish/[id].svelte +++ b/src/routes/wish/[id].svelte @@ -22,7 +22,7 @@ import { weaponList } from '../../data/weaponList'; import { getAccountPrefix } from '../../stores/account'; import { fromRemote, readSave } from '../../stores/saveManager'; - import { getTimeOffset } from '../../stores/server'; + import { getTimeOffset, server } from '../../stores/server'; import { pushToast } from '../../stores/toast'; Chart.defaults.global.defaultFontColor = '#cbd5e0'; @@ -41,7 +41,7 @@ beginners: 'beginners', }; - let errorProcessingPull = ''; + let errorProcessingPull = null; const bannerType = bannerTypes[id]; let bannerChart; @@ -141,7 +141,7 @@ if (currentBanner === undefined) { console.log('error banner here', JSON.stringify(pull)); - errorProcessingPull = JSON.stringify(pull); + errorProcessingPull = pull; pushToast($t('wish.errorBanner'), 'error'); return; } @@ -407,9 +407,15 @@
{#if loading}
{$t('wish.detail.loading')}
- {#if errorProcessingPull !== ''} - Error when getting banner for {errorProcessingPull} - {/if} +
+ {#if errorProcessingPull !== null} + Show this on Discord if still stuck:
+ Error when getting banner for
+ id: {errorProcessingPull.id}
+ time: {errorProcessingPull.time}
+ server: {$server} + {/if} +
{:else}