sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
ThinaticSystem
2022-02-02 01:35:23 +09:00
parent 804ffd2e2e 1fd6c97532
commit 79bc4defdf
139 changed files with 2052 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/init.ts
View File

@ -185,7 +185,7 @@ app.config.globalProperties = {
$store: defaultStore,
$instance: instance,
$t: i18n.t,
$ts: i18n.locale,
$ts: i18n.ts,
};
app.use(router);
@ -299,8 +299,8 @@ stream.on('_disconnected_', async () => {
reloadDialogShowing = true;
const { canceled } = await confirm({
type: 'warning',
title: i18n.locale.disconnectedFromServer,
text: i18n.locale.reloadConfirm,
title: i18n.ts.disconnectedFromServer,
text: i18n.ts.reloadConfirm,
});
reloadDialogShowing = false;
if (!canceled) {
@ -324,7 +324,7 @@ if ($i) {
if ($i.isDeleted) {
alert({
type: 'warning',
text: i18n.locale.accountDeletionInProgress,
text: i18n.ts.accountDeletionInProgress,
});
}