Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert loading lang on mount #301

Merged
merged 1 commit into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/lib/Drawer/SettingsButton.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,38 @@
import { openModal } from 'svelte-modals';
import Icon from '@iconify/svelte';
import Ripple from 'svelte-ripple';
import { base } from '$app/paths';

export let data: any;

let languages: {
id: string;
label: string;
}[];

/**
* Gets languages and opens modal
*/
async function handleClick() {
openModal(() => import('$lib/Settings/Index.svelte'), { data });
const getIntlName = (code: string, displayLanguage = code) => {
const name = new Intl.DisplayNames([displayLanguage], { type: 'language' }).of(code);
return (name || code).charAt(0).toUpperCase() + (name || code).slice(1);
};
try {
const response = await fetch(`${base}/_api/list_languages`);
const data = await response.json();
if (response.ok) {
languages = data.map((code: string) => ({
id: code,
label: getIntlName(code)
}));
} else {
throw new Error(`${response.status}, ${data.message}`);
}
} catch (error) {
console.error(error);
}
openModal(() => import('$lib/Settings/Index.svelte'), { data, languages });
}

/**
Expand Down
7 changes: 6 additions & 1 deletion src/lib/Settings/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
export let data: any;
export let isOpen: boolean;

export let languages: {
id: string;
label: string;
}[];

let formElement: HTMLFormElement;
let timeout: ReturnType<typeof setTimeout> | null;
let responseCode: number | undefined;
Expand Down Expand Up @@ -101,7 +106,7 @@
<h1 slot="title">{$lang('settings')}</h1>

<form id="settings" name="settings" bind:this={formElement}>
<Language />
<Language {languages} />

<Addons {data} />

Expand Down
31 changes: 2 additions & 29 deletions src/lib/Settings/Language.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,12 @@
import { base } from '$app/paths';
import { translation, selectedLanguage, lang } from '$lib/Stores';
import Select from '$lib/Components/Select.svelte';
import { onMount } from 'svelte';

let languages: {
export let languages: {
id: string;
label: string;
}[];

/**
* Get languages
*/
onMount(async () => {
const getIntlName = (code: string, displayLanguage = code) => {
const name = new Intl.DisplayNames([displayLanguage], { type: 'language' }).of(code);
return (name || code).charAt(0).toUpperCase() + (name || code).slice(1);
};

try {
const response = await fetch(`${base}/_api/list_languages`);
const data = await response.json();

if (response.ok) {
languages = data.map((code: string) => ({
id: code,
label: getIntlName(code)
}));
} else {
throw new Error(`${response.status}, ${data.message}`);
}
} catch (error) {
console.error(error);
}
});

async function loadSelectedLang(value: string) {
$selectedLanguage = value;

Expand Down Expand Up @@ -67,7 +40,7 @@
<a {href} target="blank">{href}</a>
</p>

{#if languages}
{#if languages.length !== 0}
<Select
options={languages}
placeholder={$lang('language')}
Expand Down