moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix action bar emoji labels

This commit is contained in:
Alex Gleason 2022-04-10 16:07:23 -05:00
parent 1466a08193
commit ae48c6e619
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/actions/soapbox.js
View File

@ -30,7 +30,7 @@ export const getSoapboxConfig = createSelector([
// If RGI reacts aren't supported, strip VS16s // If RGI reacts aren't supported, strip VS16s
// // https://git.pleroma.social/pleroma/pleroma/-/issues/2355 // // https://git.pleroma.social/pleroma/pleroma/-/issues/2355
if (!features.emojiReactsRGI) { if (!features.emojiReactsRGI) {
soapboxConfig.set('allowedEmoji', soapboxConfig.allowedEmoji.map(emoji => removeVS16s(emoji))); soapboxConfig.set('allowedEmoji', soapboxConfig.allowedEmoji.map(removeVS16s));
} }
}); });
}); });

3
app/soapbox/components/status_action_bar.tsx
View File

@ -578,9 +578,10 @@ class StatusActionBar extends ImmutablePureComponent<IStatusActionBar, IStatusAc
'😮': messages.reactionOpenMouth, '😮': messages.reactionOpenMouth,
'😢': messages.reactionCry, '😢': messages.reactionCry,
'😩': messages.reactionWeary, '😩': messages.reactionWeary,
'': messages.favourite,
}; };
const meEmojiTitle = intl.formatMessage(meEmojiReact ? reactMessages[meEmojiReact] : messages.favourite); const meEmojiTitle = intl.formatMessage(reactMessages[meEmojiReact || ''] || messages.favourite);
const menu = this._makeMenu(publicStatus); const menu = this._makeMenu(publicStatus);
let reblogIcon = require('@tabler/icons/icons/repeat.svg'); let reblogIcon = require('@tabler/icons/icons/repeat.svg');

3
app/soapbox/features/status/components/action-bar.tsx
View File

@ -355,9 +355,10 @@ class ActionBar extends React.PureComponent<IActionBar, IActionBarState> {
'😮': messages.reactionOpenMouth, '😮': messages.reactionOpenMouth,
'😢': messages.reactionCry, '😢': messages.reactionCry,
'😩': messages.reactionWeary, '😩': messages.reactionWeary,
'': messages.favourite,
}; };
const meEmojiTitle = intl.formatMessage(meEmojiReact ? reactMessages[meEmojiReact] : messages.favourite); const meEmojiTitle = intl.formatMessage(reactMessages[meEmojiReact || ''] || messages.favourite);
const menu: Menu = []; const menu: Menu = [];