diff --git a/src/lib/account.js b/src/lib/account.js index 2ae96fd..3e08748 100644 --- a/src/lib/account.js +++ b/src/lib/account.js @@ -3,7 +3,7 @@ import { parseEmoji, renderEmoji } from '$lib/emoji.js'; import { get, writable } from 'svelte/store'; import Lang from '$lib/lang'; -const lang = Lang('en_GB'); +const lang = Lang(); const cache = writable({}); diff --git a/src/lib/client/server.js b/src/lib/client/server.js index c1d6426..d3f5126 100644 --- a/src/lib/client/server.js +++ b/src/lib/client/server.js @@ -4,7 +4,7 @@ import { app_name } from '$lib/config.js'; import { browser } from "$app/environment"; import Lang from '$lib/lang'; -const lang = Lang('en_GB'); +const lang = Lang(); const server_types = { UNSUPPORTED: "unsupported", diff --git a/src/lib/lang.js b/src/lib/lang.js index 66e70cc..6788c0e 100644 --- a/src/lib/lang.js +++ b/src/lib/lang.js @@ -1,25 +1,18 @@ import * as en_GB from '@cf/lang/en_GB.json'; -import * as ga_IE from '@cf/lang/ga_IE.json'; +// import * as ga_IE from '@cf/lang/ga_IE.json'; /** - * @param {string} lang IETH language tag (i.e. en_GB) * @returns Map */ -export default function init(lang) { +export default function init() { let i18n = new Object(); - let language; - // TODO: dynamic imports seem to fail here; it can't find the file. - // try { - // language = import(`../lang/${lang}.json`); - // } catch (error) { - // throw error; - // } - - language = en_GB; + // TODO: dynamic loading of language files + let language = en_GB; + let lang_code = 'en_GB'; i18n.lang = language; - i18n.lang_code = lang; + i18n.lang_code = lang_code; i18n.string = function(/* @type string */ key, ...args) { const tokens = key.split('.'); diff --git a/src/lib/sound.js b/src/lib/sound.js index 9c94547..e4e0e8e 100644 --- a/src/lib/sound.js +++ b/src/lib/sound.js @@ -1,6 +1,6 @@ import Lang from '$lib/lang'; -const lang = Lang('en_GB'); +const lang = Lang(); import sound_log from '../sound/log.ogg'; import sound_hello from '../sound/hello.ogg'; diff --git a/src/lib/time.js b/src/lib/time.js index 9accb8a..ce95fcb 100644 --- a/src/lib/time.js +++ b/src/lib/time.js @@ -1,5 +1,5 @@ import Lang from '$lib/lang'; -const lang = Lang('en_GB'); +const lang = Lang(); const denoms = [ { unit: lang.string('time.second'), min: 0 }, diff --git a/src/lib/timeline.js b/src/lib/timeline.js index 03e5052..66db44d 100644 --- a/src/lib/timeline.js +++ b/src/lib/timeline.js @@ -7,7 +7,7 @@ import Lang from '$lib/lang'; export const timeline = writable([]); -const lang = Lang('en_GB'); +const lang = Lang(); let loading = false; diff --git a/src/lib/ui/Composer.svelte b/src/lib/ui/Composer.svelte index 0317ce2..2aa3e80 100644 --- a/src/lib/ui/Composer.svelte +++ b/src/lib/ui/Composer.svelte @@ -20,7 +20,7 @@ import FollowersVisIcon from '@cf/icons/followers.svg'; import PrivateVisIcon from '@cf/icons/dm.svg'; - const lang = Lang('en_GB'); + const lang = Lang(); export let reply_id; diff --git a/src/lib/ui/LoginForm.svelte b/src/lib/ui/LoginForm.svelte index b71afdd..7bac4cf 100644 --- a/src/lib/ui/LoginForm.svelte +++ b/src/lib/ui/LoginForm.svelte @@ -7,7 +7,7 @@ import Logo from '$lib/../img/campfire-logo.svg'; - const lang = Lang('en_GB'); + const lang = Lang(); let display_error = false; let logging_in = false; diff --git a/src/lib/ui/Navigation.svelte b/src/lib/ui/Navigation.svelte index 41b2f8e..384450d 100644 --- a/src/lib/ui/Navigation.svelte +++ b/src/lib/ui/Navigation.svelte @@ -28,7 +28,7 @@ import FollowersIcon from '../../img/icons/followers.svg'; const VERSION = APP_VERSION; - const lang = Lang('en_GB'); + const lang = Lang(); const dispatch = createEventDispatcher(); diff --git a/src/lib/ui/Notification.svelte b/src/lib/ui/Notification.svelte index 984def0..e23a28d 100644 --- a/src/lib/ui/Notification.svelte +++ b/src/lib/ui/Notification.svelte @@ -11,7 +11,7 @@ import ActionBar from '$lib/ui/post/ActionBar.svelte'; import Lang from '$lib/lang'; - const lang = Lang('en_GB'); + const lang = Lang(); let mention = (accounts) => { let res = `${account.rich_name}`; diff --git a/src/lib/ui/Widgets.svelte b/src/lib/ui/Widgets.svelte index e372f33..54b4f97 100644 --- a/src/lib/ui/Widgets.svelte +++ b/src/lib/ui/Widgets.svelte @@ -1,7 +1,7 @@
diff --git a/src/lib/ui/post/ActionBar.svelte b/src/lib/ui/post/ActionBar.svelte index f00e796..52ab7eb 100644 --- a/src/lib/ui/post/ActionBar.svelte +++ b/src/lib/ui/post/ActionBar.svelte @@ -20,7 +20,7 @@ export let post; - const lang = Lang('en_GB'); + const lang = Lang(); async function toggleBoost() { if (!$app || !$app.token) return; diff --git a/src/lib/ui/post/Body.svelte b/src/lib/ui/post/Body.svelte index a54c233..d95da18 100644 --- a/src/lib/ui/post/Body.svelte +++ b/src/lib/ui/post/Body.svelte @@ -3,7 +3,7 @@ export let post; - const lang = Lang('en_GB'); + const lang = Lang(); let open = false; diff --git a/src/lib/ui/post/BoostContext.svelte b/src/lib/ui/post/BoostContext.svelte index d156d51..839cf53 100644 --- a/src/lib/ui/post/BoostContext.svelte +++ b/src/lib/ui/post/BoostContext.svelte @@ -4,7 +4,7 @@ import RepostIcon from '@cf/icons/repost.svg'; import Lang from '$lib/lang'; - const lang = Lang('en_GB'); + const lang = Lang(); export let post; diff --git a/src/lib/ui/post/Post.svelte b/src/lib/ui/post/Post.svelte index cca5aac..01554e0 100644 --- a/src/lib/ui/post/Post.svelte +++ b/src/lib/ui/post/Post.svelte @@ -15,7 +15,7 @@ export let focused = false; export let pinned = false; - const lang = Lang('en_GB'); + const lang = Lang(); let post_context = undefined; let post = post_data; @@ -54,7 +54,7 @@ {/await} {/if} {#if pinned} -

{lang.string('post.pinned')}

+

{lang.string('post.pinned')}

{/if} {#if is_boost && !post_context.text} @@ -89,9 +89,10 @@ } .pinned { - margin: 1em 1.2em -.2em 1.2em; + margin: .9em 1.2em .3em 1.2em; font-size: .8em; color: var(--accent); + background-color: inherit; } .post { diff --git a/src/lib/ui/post/PostHeader.svelte b/src/lib/ui/post/PostHeader.svelte index 9a74b5b..0337c73 100644 --- a/src/lib/ui/post/PostHeader.svelte +++ b/src/lib/ui/post/PostHeader.svelte @@ -3,7 +3,7 @@ import { server } from '$lib/client/server'; import Lang from '$lib/lang'; - const lang = Lang('en_GB'); + const lang = Lang(); export let post; export let reply = undefined; diff --git a/src/lib/ui/post/ReactionButton.svelte b/src/lib/ui/post/ReactionButton.svelte index 088d0fa..f0fadce 100644 --- a/src/lib/ui/post/ReactionButton.svelte +++ b/src/lib/ui/post/ReactionButton.svelte @@ -4,7 +4,7 @@ import Lang from '$lib/lang'; const dispatch = createEventDispatcher(); - const lang = Lang('en_GB'); + const lang = Lang(); export let type = "react"; export let label = lang.string('post.actions.react'); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 7f84883..8c957c0 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -13,7 +13,7 @@ import Composer from '@cf/ui/Composer.svelte'; import Widgets from '$lib/ui/Widgets.svelte'; - const lang = Lang('en_GB'); + const lang = Lang(); let show_composer = false; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index f59c71f..766a6a4 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -9,7 +9,7 @@ import Post from '$lib/ui/post/Post.svelte'; import PageHeader from '../lib/ui/core/PageHeader.svelte'; - const lang = Lang('en_GB'); + const lang = Lang(); account.subscribe(account => { if (account) getTimeline(); diff --git a/src/routes/[server]/[account]/+page.svelte b/src/routes/[server]/[account]/+page.svelte index 5e82dcb..dee8a97 100644 --- a/src/routes/[server]/[account]/+page.svelte +++ b/src/routes/[server]/[account]/+page.svelte @@ -18,7 +18,7 @@ export let data; - const lang = Lang('en_GB'); + const lang = Lang(); let profile_pinned_posts = writable([]); let profile_posts_max_id = null; diff --git a/src/routes/[server]/[account]/[post]/+page.svelte b/src/routes/[server]/[account]/[post]/+page.svelte index ca01a6c..f4c345c 100644 --- a/src/routes/[server]/[account]/[post]/+page.svelte +++ b/src/routes/[server]/[account]/[post]/+page.svelte @@ -12,7 +12,7 @@ export let data; - const lang = Lang('en_GB'); + const lang = Lang(); let post = fetchPost(data.post_id); let error = false; diff --git a/src/routes/callback/+page.svelte b/src/routes/callback/+page.svelte index 8d9d0f8..b52e328 100644 --- a/src/routes/callback/+page.svelte +++ b/src/routes/callback/+page.svelte @@ -12,7 +12,7 @@ export let data; - const lang = Lang('en_GB'); + const lang = Lang(); let auth_code = data.code; diff --git a/src/routes/follow-requests/+page.svelte b/src/routes/follow-requests/+page.svelte index 5ac2d9b..c6e62fb 100644 --- a/src/routes/follow-requests/+page.svelte +++ b/src/routes/follow-requests/+page.svelte @@ -11,7 +11,7 @@ import CrossIcon from '../../img/icons/cross.svg' import { get } from 'svelte/store'; - const lang = Lang('en_GB'); + const lang = Lang(); async function actionRequest(account_id, approved) { // remove item from array first - this updates the ui and diff --git a/src/routes/notifications/+page.svelte b/src/routes/notifications/+page.svelte index 901da39..128293d 100644 --- a/src/routes/notifications/+page.svelte +++ b/src/routes/notifications/+page.svelte @@ -7,7 +7,7 @@ import PageHeader from '../../lib/ui/core/PageHeader.svelte'; import Lang from '$lib/lang'; - const lang = Lang('en_GB'); + const lang = Lang(); if (!$account) goto("/");