diff options
Diffstat (limited to 'src/client/scripts')
| -rw-r--r-- | src/client/scripts/compose-notification.ts | 3 | ||||
| -rw-r--r-- | src/client/scripts/set-i18n-contexts.ts | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/client/scripts/compose-notification.ts b/src/client/scripts/compose-notification.ts index 29eb515bfe..c3281955e4 100644 --- a/src/client/scripts/compose-notification.ts +++ b/src/client/scripts/compose-notification.ts @@ -1,13 +1,12 @@ import getNoteSummary from '../../misc/get-note-summary'; import getUserName from '../../misc/get-user-name'; import { clientDb, get, bulkGet } from '../db'; -import { fromEntries } from '../../prelude/array'; const getTranslation = (text: string): Promise<string> => get(text, clientDb.i18n); export default async function(type, data): Promise<[string, NotificationOptions]> { const contexts = ['deletedNote', 'invisibleNote', 'withNFiles', '_cw.poll']; - const locale = fromEntries(await bulkGet(contexts, clientDb.i18n) as [string, string][]); + const locale = Object.fromEntries(await bulkGet(contexts, clientDb.i18n) as [string, string][]); switch (type) { case 'driveFileCreated': // TODO (Server Side) diff --git a/src/client/scripts/set-i18n-contexts.ts b/src/client/scripts/set-i18n-contexts.ts index 2eb76047f1..872153e0bd 100644 --- a/src/client/scripts/set-i18n-contexts.ts +++ b/src/client/scripts/set-i18n-contexts.ts @@ -1,7 +1,6 @@ import VueI18n from 'vue-i18n'; import { clientDb, clear, bulkSet } from '../db'; import { deepEntries, delimitEntry } from 'deep-entries'; -import { fromEntries } from '../../prelude/array'; export function setI18nContexts(lang: string, version: string, i18n: VueI18n, cleardb = false) { return Promise.all([ @@ -13,6 +12,6 @@ export function setI18nContexts(lang: string, version: string, i18n: VueI18n, cl const flatLocaleEntries = deepEntries(locale, delimitEntry) as [string, string][]; bulkSet(flatLocaleEntries, clientDb.i18n); i18n.locale = lang; - i18n.setLocaleMessage(lang, fromEntries(flatLocaleEntries)); + i18n.setLocaleMessage(lang, Object.fromEntries(flatLocaleEntries)); }); } |