diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 76f1ad70..a8ae48a5 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -49,6 +49,7 @@ } from 'mono-svelte' import { fediseer, type Data } from '$lib/fediseer/fediseer' import Fediseer from '$lib/fediseer/Fediseer.svelte' + import { t } from '$lib/translations' export let post: PostView @@ -110,7 +111,7 @@ href="/post/{getInstance()}/{post.post.id}" class="!text-inherit h-8 px-3" target={$userSettings.openLinksInNewTab ? '_blank' : ''} - title="Comments" + title={$t('post.actions.comments')} > @@ -123,7 +124,12 @@ {/await} {/if} - {/if} @@ -143,7 +149,7 @@ color="ghost" loading={saving} disabled={saving} - title={post.saved ? 'Unsave' : 'Save'} + title={post.saved ? $t('post.actions.unsave') : $t('post.actions.save')} > - - Creator + {$t('post.actions.more.creator')} {new URL(post.community.actor_id).hostname}
- Actions + {$t('post.actions.more.actions')} {#if $profile?.user && $profile?.jwt && $profile.user.local_user_view.person.id == post.creator.id} (editing = true)}> - Edit + {$t('post.actions.more.edit')} {/if} {#if $profile?.jwt} @@ -222,7 +232,9 @@ }} > - Mark as {post.read ? 'Unread' : 'Read'} + {post.read + ? $t('post.actions.more.markUnread') + : $t('post.actions.more.markRead')} {/if} - Share + {$t('post.actions.more.share')} {#if $profile?.jwt} - Crosspost + {$t('post.actions.more.crosspost')} {#if $profile.user && post.creator.id == $profile.user.local_user_view.person.id} - {post.post.deleted ? 'Restore' : 'Delete'} + {post.post.deleted + ? $t('post.actions.more.restore') + : $t('post.actions.more.delete')} {/if} {#if $profile.user?.local_user_view.person.id != post.creator.id} report(post)} color="danger-subtle"> - Report + {$t('moderation.report')} {/if} {/if} diff --git a/src/lib/components/ui/Pageination.svelte b/src/lib/components/ui/Pageination.svelte index 94e3c166..f58a7c9a 100644 --- a/src/lib/components/ui/Pageination.svelte +++ b/src/lib/components/ui/Pageination.svelte @@ -1,4 +1,5 @@ - {Intl.NumberFormat(locale, options).format(number)} + {Intl.NumberFormat(localeToUse, options).format(number)} diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 844e7021..9796c69b 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -93,7 +93,10 @@ "submit": "Submit" }, "routes": { - "frontpage": "Frontpage", + "frontpage": { + "title": "Frontpage", + "footer": "{{users:number}} active {{users; 1:user; default:users;}}" + }, "modlog": "Modlog", "instances": "Instances", "legal": "Legal" @@ -109,5 +112,31 @@ "users": "Users", "posts": "Posts", "communities": "Communities" + }, + "post": { + "actions": { + "comments": "Comments", + "save": "Save", + "unsave": "Unsave", + "more": { + "label": "More Actions", + "edit": "Edit", + "creator": "Creator", + "actions": "Actions", + "markRead": "Mark as Read", + "markUnread": "Mark as Unread", + "share": "Share", + "crosspost": "Crosspost", + "delete": "Delete", + "restore": "Restore" + } + } + }, + "moderation": { + "report": "Report" + }, + "common": { + "back": "Back", + "next": "Next" } } \ No newline at end of file diff --git a/src/lib/settings.ts b/src/lib/settings.ts index 6dc153c9..beb9a5cd 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -77,6 +77,7 @@ interface Settings { deduplicateEmbed: boolean compactFeatured: boolean } + language: string | null } export const defaultSettings: Settings = { @@ -128,12 +129,13 @@ export const defaultSettings: Settings = { }, dock: { noGap: toBool(env.PUBLIC_DOCK_PANEL) ?? null, - top: toBool(env.PUBLIC_DOCK_TOP) ?? null + top: toBool(env.PUBLIC_DOCK_TOP) ?? null, }, posts: { deduplicateEmbed: toBool(env.PUBLIC_DEDUPLICATE_EMBED) ?? true, - compactFeatured: toBool(env.PUBLIC_COMPACT_FEATURED) ?? true - } + compactFeatured: toBool(env.PUBLIC_COMPACT_FEATURED) ?? true, + }, + language: null, } export const userSettings = writable(defaultSettings) diff --git a/src/lib/translations.ts b/src/lib/translations.ts index 90f5fcbb..de9400d5 100644 --- a/src/lib/translations.ts +++ b/src/lib/translations.ts @@ -8,6 +8,7 @@ const config: Config = { loader: async () => (await import('./i18n/en.json')).default, }, ], + fallbackLocale: 'en', } export const { t, locale, locales, loading, loadTranslations } = new i18n( diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 447a691e..079bd826 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,10 +1,16 @@ import { env } from '$env/dynamic/public' +import { userSettings } from '$lib/settings.js' import { loadTranslations } from '$lib/translations.js' +import { get } from 'svelte/store' export let ssr = (env.PUBLIC_SSR_ENABLED?.toLowerCase() ?? 'false') == 'true' -export const load = async ({ url }) => { - await loadTranslations('en') +export const load = async ({}) => { + const initLocale = get(userSettings)?.language ?? navigator?.language ?? 'en' + + console.log(`Loading locale ${initLocale}`) + + await loadTranslations(initLocale) return } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 32b18f35..dc665895 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -24,7 +24,7 @@
-
{$t('routes.frontpage')}
+
{$t('routes.frontpage.title')}
@@ -45,11 +45,9 @@ > - - active users + {$t('routes.frontpage.footer', { + users: $site?.site_view.counts.users_active_day ?? '??', + })}
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 67fe6fbd..436f45cc 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -3,7 +3,14 @@ import Setting from './Setting.svelte' import MultiSelect from '$lib/components/input/Switch.svelte' import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte' - import { Disclosure, Material, Switch, TextInput, toast } from 'mono-svelte' + import { + Disclosure, + Material, + Note, + Switch, + TextInput, + toast, + } from 'mono-svelte' import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import Link from '$lib/components/input/Link.svelte' import { @@ -25,6 +32,7 @@ import { removeItem } from '$lib/util.js' import Section from './Section.svelte' import ToggleSetting from './ToggleSetting.svelte' + import { locales } from '$lib/translations' @@ -90,6 +98,22 @@ Go to themes + + Language +

+ The language used for Photon's UI. + + All languages other than US English are community translated, and may + be incomplete! + +

+ +
Post style