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

Add the LANG environment variable for the web version. #1266

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-11-24 14:26:25 +01:00
parent 19f2aa2997
commit 80ca2e5215
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/src/controllers/config.js
View File

@@ -121,6 +121,7 @@ module.exports = {
allowPrivateCloud: platformInfo.isElectron || !!process.env.ALLOW_DBGATE_PRIVATE_CLOUD, allowPrivateCloud: platformInfo.isElectron || !!process.env.ALLOW_DBGATE_PRIVATE_CLOUD,
...currentVersion, ...currentVersion,
redirectToDbGateCloudLogin: !!process.env.REDIRECT_TO_DBGATE_CLOUD_LOGIN, redirectToDbGateCloudLogin: !!process.env.REDIRECT_TO_DBGATE_CLOUD_LOGIN,
preferrendLanguage: adminConfig?.preferredLanguage || process.env.LANGUAGE || null,
}; };
return configResult; return configResult;

2
packages/web/src/App.svelte
View File

@@ -61,7 +61,7 @@
initializeAppUpdates(); initializeAppUpdates();
installCloudListeners(); installCloudListeners();
refreshPublicCloudFiles(); refreshPublicCloudFiles();
saveSelectedLanguageToCache(); saveSelectedLanguageToCache(config.preferrendLanguage);
const electron = getElectron(); const electron = getElectron();
if (electron) { if (electron) {

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

@@ -31,13 +31,13 @@ const defaultLanguage = 'en';
let selectedLanguageCache: string | null = null; let selectedLanguageCache: string | null = null;
export function getSelectedLanguage(): string { export function getSelectedLanguage(preferrendLanguage?: string): string {
if (selectedLanguageCache) return selectedLanguageCache; if (selectedLanguageCache) return selectedLanguageCache;
// const browserLanguage = getBrowserLanguage(); // const browserLanguage = getBrowserLanguage();
const selectedLanguage = getElectron() const selectedLanguage = getElectron()
? getStringSettingsValue('localization.language', null) ? getStringSettingsValue('localization.language', preferrendLanguage)
: localStorage.getItem('selectedLanguage'); : localStorage.getItem('selectedLanguage') ?? preferrendLanguage;
if (!selectedLanguage || !supportedLanguages.includes(selectedLanguage)) return defaultLanguage; if (!selectedLanguage || !supportedLanguages.includes(selectedLanguage)) return defaultLanguage;
return selectedLanguage; return selectedLanguage;
@@ -51,8 +51,8 @@ export async function setSelectedLanguage(language: string) {
} }
} }
export function saveSelectedLanguageToCache() { export function saveSelectedLanguageToCache(preferrendLanguage?: string) {
selectedLanguageCache = getSelectedLanguage(); selectedLanguageCache = getSelectedLanguage(preferrendLanguage);
} }
export function getBrowserLanguage(): string { export function getBrowserLanguage(): string {