Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

refs #958 Fix to use same i18n instance in main process

This commit is contained in:
AkiraFukushima 2019-07-22 23:00:56 +09:00
parent 9eb839d452
commit 5def4f14d3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/index.ts
View File

@ -32,14 +32,13 @@ import Preferences from './preferences'
import Fonts from './fonts'
import Hashtags from './hashtags'
import UnreadNotification from './unreadNotification'
import i18n from '../config/i18n'
import i18n from '~/src/config/i18n'
import Language from '../constants/language'
import { LocalAccount } from '~/src/types/localAccount'
import { LocalTag } from '~/src/types/localTag'
import { UnreadNotification as UnreadNotificationConfig } from '~/src/types/unreadNotification'
import { Notify } from '~/src/types/notify'
import { StreamingError } from '~/src/errors/streamingError'
import i18next from '~/src/config/i18n'
/**
* Context menu
@ -1153,8 +1152,8 @@ const createNotification = (notification: RemoteNotification, notifyConfig: Noti
case 'favourite':
if (notifyConfig.favourite) {
return {
title: i18next.t('notification.favourite.title'),
body: i18next.t('notification.favourite.body', { username: username(notification.account) }),
title: i18n.t('notification.favourite.title'),
body: i18n.t('notification.favourite.body', { username: username(notification.account) }),
silent: false
} as NotificationConstructorOptions
}
@ -1162,8 +1161,8 @@ const createNotification = (notification: RemoteNotification, notifyConfig: Noti
case 'follow':
if (notifyConfig.follow) {
return {
title: i18next.t('notification.follow.title'),
body: i18next.t('notification.follow.body', { username: username(notification.account) }),
title: i18n.t('notification.follow.title'),
body: i18n.t('notification.follow.body', { username: username(notification.account) }),
silent: false
} as NotificationConstructorOptions
}
@ -1183,8 +1182,8 @@ const createNotification = (notification: RemoteNotification, notifyConfig: Noti
case 'reblog':
if (notifyConfig.reblog) {
return {
title: i18next.t('notification.reblog.title'),
body: i18next.t('notification.reblog.body', { username: username(notification.account) }),
title: i18n.t('notification.reblog.title'),
body: i18n.t('notification.reblog.body', { username: username(notification.account) }),
silent: false
} as NotificationConstructorOptions
}