From 0ebb60f986682ad8d3538c2fd1d708a861e0b1fb Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 22 Aug 2022 15:49:08 -0700 Subject: migrate to sveltekit-i18n --- src/routes/+error.svelte | 6 +-- src/routes/+layout.svelte | 15 ++----- src/routes/+page.svelte | 22 +++++----- src/routes/[username]/+page.svelte | 8 ++-- src/routes/[username]/dashboard/+page.svelte | 22 +++++----- src/routes/[username]/receive/+page.svelte | 8 ++-- src/routes/[username]/settings/+page.svelte | 54 ++++++++++++------------- src/routes/[username]/support/+page.svelte | 12 +++--- src/routes/[username]/transactions/+page.svelte | 14 +++---- src/routes/invoice/[id]/+page.svelte | 10 ++--- src/routes/jobs/+page.svelte | 14 +++---- 11 files changed, 88 insertions(+), 97 deletions(-) (limited to 'src/routes') diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 2bacc8a6..d3b9306d 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,7 +1,7 @@ {#if $page.error.message.includes('not found') || $page.status === 404} @@ -15,9 +15,9 @@ -

{($_('error.header'), { default: 'Error' })}

+

{($t('error.header'), { default: 'Error' })}

{$page.error.message.toUpperCase()}

-

{($_('error.message'), { default: 'Please try again or contact support.' })}

+

{($t('error.message'), { default: 'Please try again or contact support.' })}

{/if} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 1de48b9e..dfe52894 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,7 +1,5 @@ -{#if ready && !$isLoading} +{#if ready} {:else} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index bb5df050..cb49dbe4 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -10,7 +10,7 @@ Footer } from '$comp'; - import { _ } from 'svelte-i18n'; + import { t } from '$lib/translations'; let howItWorks; let faq; @@ -34,32 +34,32 @@ - - {$_('landing.info2.description1')} + + {$t('landing.info2.description1')}

- {$_('landing.info2.description2')} + {$t('landing.info2.description2')}

- {@html $_('landing.info2.description3')} + {@html $t('landing.info2.description3')}
-

{$_('howItWorks.header')}

+

{$t('howItWorks.header')}

@@ -73,7 +73,7 @@
-

{$_('faq.header')}

+

{$t('faq.header')}

{#each faqIDs as faqID} {/each} diff --git a/src/routes/[username]/+page.svelte b/src/routes/[username]/+page.svelte index ed428d46..f2117be2 100644 --- a/src/routes/[username]/+page.svelte +++ b/src/routes/[username]/+page.svelte @@ -4,7 +4,7 @@ import { AppHeader, Icon, PageNotFound } from '$comp'; import { user } from '$lib/store'; import { copy } from '$lib/utils'; - import { _ } from 'svelte-i18n'; + import { t } from '$lib/translations'; export let data; let lightningAddress = `${data?.username}@coinos.io`; @@ -43,7 +43,7 @@

{data.username}

-

{$_('user.addressGoesHere')}

+

{$t('user.addressGoesHere')}

@@ -62,7 +62,7 @@ class="w-[292px] md:w-[342px] h-[342px] border border-lightgrey rounded-3xl flex p-5 justify-center items-center relative" /> -

{$_('user.scanToPayBTC')}

+

{$t('user.scanToPayBTC')}

{$user.username}

- {$_('user.addressGoesHere')} + {$t('user.addressGoesHere')}
@@ -58,28 +58,28 @@ {#if !withdrawing} {$_('user.dashboard.bitcoinPrice')} + >{$t('user.dashboard.bitcoinPrice')} {$selectedRate ? btcPrice : $_('user.dashboard.fetchingRate')}{$selectedRate ? btcPrice : $t('user.dashboard.fetchingRate')} - {@html $_('user.dashboard.dataFromBinance')} + {@html $t('user.dashboard.dataFromBinance')}

- {$_('user.dashboard.ACCOUNT_BALANCE')} + {$t('user.dashboard.ACCOUNT_BALANCE')}

{$selectedRate ? accountBalanceFiat : $_('user.dashboard.fetchingRate')}{$selectedRate ? accountBalanceFiat : $t('user.dashboard.fetchingRate')} {accountBalanceSats} SAT {$t('user.dashboard.withdraw')} -

{$_('user.dashboard.conversionFeeWarning')}

+

{$t('user.dashboard.conversionFeeWarning')}

{:else}