SWREI/switched
0
0
Fork 0
Code

fix(client): ローカリゼーション更新時にリロードが繰り返されることがあるのを修正

Browse Source
This commit is contained in:
syuilo 2023-01-22 16:52:15 +09:00
parent 26ae2dfc0f
commit 9dacf11702
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/frontend/src/config.ts
View File

@ -10,8 +10,12 @@ export const apiUrl = url + '/api';
export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming'; export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
export const lang = miLocalStorage.getItem('lang'); export const lang = miLocalStorage.getItem('lang');
export const langs = _LANGS_; export const langs = _LANGS_;
export const locale = JSON.parse(miLocalStorage.getItem('locale')); export let locale = JSON.parse(miLocalStorage.getItem('locale'));
export const version = _VERSION_; export const version = _VERSION_;
export const instanceName = siteName === 'Misskey' ? host : siteName; export const instanceName = siteName === 'Misskey' ? host : siteName;
export const ui = miLocalStorage.getItem('ui'); export const ui = miLocalStorage.getItem('ui');
export const debug = miLocalStorage.getItem('debug') === 'true'; export const debug = miLocalStorage.getItem('debug') === 'true';
export function updateLocale(newLocale) {
locale = newLocale;
}

4
packages/frontend/src/i18n.ts
View File

@ -3,3 +3,7 @@ import { locale } from '@/config';
import { I18n } from '@/scripts/i18n'; import { I18n } from '@/scripts/i18n';
export const i18n = markRaw(new I18n(locale)); export const i18n = markRaw(new I18n(locale));
export function updateI18n(newLocale) {
i18n.ts = newLocale;
}

11
packages/frontend/src/init.ts
View File

@ -25,10 +25,10 @@ import JSON5 from 'json5';
import widgets from '@/widgets'; import widgets from '@/widgets';
import directives from '@/directives'; import directives from '@/directives';
import components from '@/components'; import components from '@/components';
import { version, ui, lang, host } from '@/config'; import { version, ui, lang, host, updateLocale } from '@/config';
import { applyTheme } from '@/scripts/theme'; import { applyTheme } from '@/scripts/theme';
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode'; import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
import { i18n } from '@/i18n'; import { i18n, updateI18n } from '@/i18n';
import { confirm, alert, post, popup, toast } from '@/os'; import { confirm, alert, post, popup, toast } from '@/os';
import { stream } from '@/stream'; import { stream } from '@/stream';
import * as sound from '@/scripts/sound'; import * as sound from '@/scripts/sound';
@ -87,9 +87,12 @@ import { fetchCustomEmojis } from './custom-emojis';
if (localeOutdated) { if (localeOutdated) {
const res = await window.fetch(`/assets/locales/${lang}.${version}.json`); const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
if (res.status === 200) { if (res.status === 200) {
miLocalStorage.setItem('locale', await res.text()); const newLocale = await res.text();
const parsedNewLocale = JSON.parse(newLocale);
miLocalStorage.setItem('locale', newLocale);
miLocalStorage.setItem('localeVersion', version); miLocalStorage.setItem('localeVersion', version);
location.reload(); updateLocale(parsedNewLocale);
updateI18n(parsedNewLocale);
} }
} }
//#endregion //#endregion