From d6db437f98a20d19e99675681eca8d22ff0fcc1b Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Fri, 19 Aug 2022 07:21:33 -0500 Subject: Extracted all strings from the register/login page to en.json --- src/components/RegisterOrLogin.svelte | 31 ++++++++++++++++--------------- src/locales/en.json | 11 +++++++++++ src/routes/login/+page.svelte | 2 +- src/routes/register/+page.svelte | 2 +- 4 files changed, 29 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index eade96d8..6fb76899 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -4,8 +4,9 @@ import { user, token } from '$lib/store'; import { auth } from '$lib/socket'; import { goto } from '$app/navigation'; + import { _ } from 'svelte-i18n'; - export let page; + export let pageID; let username = 'bob', password = 'pw'; @@ -13,9 +14,9 @@ let revealPassword = false; let url = { - Register: '/register', - 'Sign in': '/login' - }[page]; + register: '/register', + signIn: '/login' + }[pageID]; let submit = async () => { try { @@ -24,7 +25,7 @@ $token = r.token; auth(); } catch (e) { - if (!e.message) e.message = 'Login failed'; + if (!e.message) e.message = $_('login.failed'); failure(e.message); } }; @@ -41,11 +42,11 @@
-

{page}

+

{$_('login.' + pageID)}

- +
- + {#if revealPassword}
- {#if page === 'Register'} + {#if pageID === 'register'}

- We recommend a long, random password generated with a password manager. + {$_('login.passwordRecommendation')}

{:else}
Forgot Password?{$_('login.forgotPassword')}
{/if}

- {page === 'Register' ? 'Already have an account?' : "Don't have an account?"} + {pageID === 'register' ? $_('login.haveAccount') : $_('login.noAccount')} - {page === 'Register' ? 'Sign in' : 'Register'} + {pageID === 'register' ? $_('login.signIn') : $_('login.register')}

diff --git a/src/locales/en.json b/src/locales/en.json index c8d90970..e62c722d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -80,6 +80,17 @@ "title": "Brand it your way!", "description": "Customize your point of sale look and feel, or keep it on default - totally up to you." } + }, + "login": { + "username": "Username", + "password": "Password", + "passwordRecommendation": "We recommend a long, random password generated with a password manager.", + "forgotPassword": "Forgot Password?", + "haveAccount": "Already have an account?", + "noAccount": "Don't have an account?", + "register": "Register", + "signIn": "Sign In", + "failed": "Login failed" }, "nav": { "startInSeconds": "Start in Seconds", diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index c61269c1..9fd6438d 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -2,4 +2,4 @@ import { RegisterOrLogin } from '$comp'; - + diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 69ec5fd2..82acb53b 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -2,4 +2,4 @@ import { RegisterOrLogin } from '$comp'; - + -- cgit v1.2.3