dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-03 21:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

language in webapp stored in local storage

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-11-19 10:11:24 +01:00
parent d138d3e786
commit 06f02070c7
2 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/web/src/settings/SettingsModal.svelte
View File

@@ -42,7 +42,7 @@
import { safeFormatDate } from 'dbgate-tools'; import { safeFormatDate } from 'dbgate-tools';
import FormDefaultActionField from './FormDefaultActionField.svelte'; import FormDefaultActionField from './FormDefaultActionField.svelte';
import AiSettingsTab from './AiSettingsTab.svelte'; import AiSettingsTab from './AiSettingsTab.svelte';
import { _t } from '../translations'; import { _t, setSelectedLanguage } from '../translations';
import hasPermission from '../utility/hasPermission'; import hasPermission from '../utility/hasPermission';
import ConfirmModal from '../modals/ConfirmModal.svelte'; import ConfirmModal from '../modals/ConfirmModal.svelte';
import { showModal } from '../modals/modalTools'; import { showModal } from '../modals/modalTools';
@@ -180,12 +180,14 @@ ORDER BY
defaultValue={false} defaultValue={false}
/> />
<div class="heading">{_t('settings.localization', { defaultMessage: 'Localization' })}</div> <div class="heading">{_t('settings.localization', { defaultMessage: 'Localization' })}</div>
<FormSelectField
<FormFieldTemplateLarge
label={_t('settings.localization.language', { defaultMessage: 'Language' })} label={_t('settings.localization.language', { defaultMessage: 'Language' })}
name="localization.language" type="combo"
defaultValue={getSelectedLanguage()} >
data-testid="SettingsModal_languageSelect" <SelectField
isNative isNative
data-testid="SettingsModal_languageSelect"
options={[ options={[
{ value: 'cs', label: 'Čeština' }, { value: 'cs', label: 'Čeština' },
{ value: 'de', label: 'Deutsch' }, { value: 'de', label: 'Deutsch' },
@@ -195,7 +197,10 @@ ORDER BY
{ value: 'sk', label: 'Slovenčina' }, { value: 'sk', label: 'Slovenčina' },
{ value: 'zh', label: '中文' }, { value: 'zh', label: '中文' },
]} ]}
on:change={() => { defaultValue={getSelectedLanguage()}
value={getSelectedLanguage()}
on:change={e => {
setSelectedLanguage(e.detail);
showModal(ConfirmModal, { showModal(ConfirmModal, {
message: _t('settings.localization.reloadWarning', { message: _t('settings.localization.reloadWarning', {
defaultMessage: 'Application will be reloaded to apply new language settings', defaultMessage: 'Application will be reloaded to apply new language settings',
@@ -208,6 +213,7 @@ ORDER BY
}); });
}} }}
/> />
</FormFieldTemplateLarge>
<div class="heading">{_t('settings.dataGrid.title', { defaultMessage: 'Data grid' })}</div> <div class="heading">{_t('settings.dataGrid.title', { defaultMessage: 'Data grid' })}</div>
<FormTextField <FormTextField

31
packages/web/src/translations.ts
View File

@@ -7,6 +7,8 @@ import zh from '../../../translations/zh.json';
import MessageFormat, { MessageFunction } from '@messageformat/core'; import MessageFormat, { MessageFunction } from '@messageformat/core';
import { getStringSettingsValue } from './settings/settingsTools'; import { getStringSettingsValue } from './settings/settingsTools';
import getElectron from './utility/getElectron';
import { apiCall } from './utility/api';
const translations = { const translations = {
en: {}, en: {},
@@ -28,25 +30,34 @@ let selectedLanguageCache: string | null = null;
export function getSelectedLanguage(): string { export function getSelectedLanguage(): string {
if (selectedLanguageCache) return selectedLanguageCache; if (selectedLanguageCache) return selectedLanguageCache;
const browserLanguage = getBrowserLanguage(); // const browserLanguage = getBrowserLanguage();
const selectedLanguage = getStringSettingsValue('localization.language', browserLanguage); const selectedLanguage = getElectron()
? getStringSettingsValue('localization.language', null)
: localStorage.getItem('selectedLanguage');
if (!supportedLanguages.includes(selectedLanguage)) return defaultLanguage; if (!selectedLanguage || !supportedLanguages.includes(selectedLanguage)) return defaultLanguage;
return selectedLanguage; return selectedLanguage;
} }
export async function setSelectedLanguage(language: string) {
if (getElectron()) {
await apiCall('config/update-settings', { 'localization.language': language });
} else {
localStorage.setItem('selectedLanguage', language);
}
}
export function saveSelectedLanguageToCache() { export function saveSelectedLanguageToCache() {
selectedLanguageCache = getSelectedLanguage(); selectedLanguageCache = getSelectedLanguage();
} }
export function getBrowserLanguage(): string { export function getBrowserLanguage(): string {
return 'en'; if (typeof window !== 'undefined') {
// if (typeof window !== 'undefined') { return (
// return ( (navigator.languages && navigator.languages[0]).slice(0, 2) || navigator.language.slice(0, 2) || defaultLanguage
// (navigator.languages && navigator.languages[0]).slice(0, 2) || navigator.language.slice(0, 2) || defaultLanguage );
// ); }
// } return defaultLanguage;
// return defaultLanguage;
} }
type TranslateOptions = { type TranslateOptions = {