fix loading crash on emoji reacts
This commit is contained in:
parent
65b13849b9
commit
d237c3cc6d
2 changed files with 3 additions and 2 deletions
|
@ -62,8 +62,7 @@ const ReactButton = {
|
|||
return orderedEmojiList.flat()
|
||||
}
|
||||
return [
|
||||
...this.$store.state.instance.emoji,
|
||||
...this.$store.state.instance.customEmoji
|
||||
...this.$store.state.instance.emoji
|
||||
] || []
|
||||
},
|
||||
mergedConfig () {
|
||||
|
|
|
@ -3,6 +3,7 @@ import ISO6391 from 'iso-639-1'
|
|||
import _ from 'lodash'
|
||||
|
||||
const specialLanguageCodes = {
|
||||
'en_nyan': 'en-NYAN',
|
||||
'ja_easy': 'ja',
|
||||
'zh_Hant': 'zh-HANT',
|
||||
'zh': 'zh-Hans'
|
||||
|
@ -14,6 +15,7 @@ const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_
|
|||
|
||||
const getLanguageName = (code) => {
|
||||
const specialLanguageNames = {
|
||||
'en_nyan': 'English (Nyan)',
|
||||
'ja_easy': 'やさしいにほんご',
|
||||
'zh': '简体中文',
|
||||
'zh_Hant': '繁體中文'
|
||||
|
|
Loading…
Reference in a new issue