puniko/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix loading crash on emoji reacts

Browse source
This commit is contained in:
Absturztaube 2022-06-11 11:21:48 +02:00
parent 65b13849b9
commit d237c3cc6d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/react_button/react_button.js
View file

@ -62,8 +62,7 @@ const ReactButton = {
return orderedEmojiList.flat() return orderedEmojiList.flat()
} }
return [ return [
...this.$store.state.instance.emoji, ...this.$store.state.instance.emoji
...this.$store.state.instance.customEmoji
] || [] ] || []
}, },
mergedConfig () { mergedConfig () {

2
src/services/locale/locale.service.js
View file

@ -3,6 +3,7 @@ import ISO6391 from 'iso-639-1'
import _ from 'lodash' import _ from 'lodash'
const specialLanguageCodes = { const specialLanguageCodes = {
'en_nyan': 'en-NYAN',
'ja_easy': 'ja', 'ja_easy': 'ja',
'zh_Hant': 'zh-HANT', 'zh_Hant': 'zh-HANT',
'zh': 'zh-Hans' 'zh': 'zh-Hans'
@ -14,6 +15,7 @@ const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_
const getLanguageName = (code) => { const getLanguageName = (code) => {
const specialLanguageNames = { const specialLanguageNames = {
'en_nyan': 'English (Nyan)',
'ja_easy': 'やさしいにほんご', 'ja_easy': 'やさしいにほんご',
'zh': '简体中文', 'zh': '简体中文',
'zh_Hant': '繁體中文' 'zh_Hant': '繁體中文'