diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-02 16:24:43 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-01-02 16:24:43 +0000 |
| commit | 1ffa6e2f0ba31e8237a73d074b3a240f7c84fca3 (patch) | |
| tree | d2d6b46229fc817fc840ca37818891a0befa89ff /src/components/emoji_picker/emoji_picker.js | |
| parent | da7d24b5c2838da6f97bc02efb823df2c5d2d04d (diff) | |
| parent | 876e51603a03dab45b5572bb014f2135bd4ad3e1 (diff) | |
Merge branch 'tusooa/unpacked-emoji' into 'develop'
Include unpacked emojis in emoji picker
Closes #1230
See merge request pleroma/pleroma-fe!1736
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.js')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index dd5e5217..2838e102 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -287,7 +287,11 @@ const EmojiPicker = { return 0 }, allCustomGroups () { - return this.$store.getters.groupedCustomEmojis + const emojis = this.$store.getters.groupedCustomEmojis + if (emojis.unpacked) { + emojis.unpacked.text = this.$t('emoji.unpacked') + } + return emojis }, defaultGroup () { return Object.keys(this.allCustomGroups)[0] |