Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2025-10-15 16:35:37 +02:00
commit ef413ef713
50 files changed
+320 -212

No files matched your search

@@ -93,14 +93,16 @@ class CompareHistoryModal extends PureComponent {
<ul>
{currentVersion.getIn(['poll', 'options']).map(option => (
<li key={option.get('title')}>
<span className='poll__input disabled' />
<EmojiHTML
as="span"
className='poll__option__text translate'
htmlString={emojify(escapeTextContentForBrowser(option.get('title')), emojiMap)}
lang={language}
/>
<label className='poll__option editable'>
{/* FIXME: does not support multiple choice, #35632 */}
<span className='poll__input' />
<EmojiHTML
as="span"
className='poll__option__text translate'
htmlString={emojify(escapeTextContentForBrowser(option.get('title')), emojiMap)}
lang={language}
/>
</label>
</li>
))}
</ul>