Disroot
/
Mangane
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix poll overriding content when collapse

This commit is contained in:
unknown 2023-08-15 17:48:16 +02:00
parent f0dc509a63
commit cc282a5c6c
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/soapbox/components/status_content.tsx
View File

@ -294,29 +294,29 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
{
// actual content
!isHidden && (
<div
tabIndex={!isHidden ? 0 : undefined}
className={classNames('min-h-0 overflow-hidden text-ellipsis status__content__text', {
'status__content__text--visible': !isHidden,
})}
style={directionStyle}
dangerouslySetInnerHTML={content}
lang={status.language || undefined}
/>
)
}
{
// post folded because too long
collapsed && onClick && (
<div>
<ReadMoreButton onClick={onClick} key='read-more' />
</div>
)
}
{
// post has a poll
status.poll && typeof status.poll === 'string' && (
<Poll id={status.poll} key='poll' status={status.url} />
<>
<div
tabIndex={!isHidden ? 0 : undefined}
className={classNames('min-h-0 overflow-hidden text-ellipsis status__content__text status__content__text--visible')}
style={directionStyle}
dangerouslySetInnerHTML={content}
lang={status.language || undefined}
/>
{
// post folded because too long
collapsed && onClick && (
<div>
<ReadMoreButton onClick={onClick} key='read-more' />
</div>
)
}
{
// post has a poll
!collapsed && status.poll && typeof status.poll === 'string' && (
<Poll id={status.poll} key='poll' status={status.url} />
)
}
</>
)
}
</div>

2
app/soapbox/locales/fr.json
View File

@ -813,7 +813,7 @@
"patron.title": "Funding Goal",
"pinned_accounts.title": "{name}’s choices",
"pinned_statuses.none": "Aucun statut épinglé.",
"poll.chooseMultiple": "Choose as many as you'd like.",
"poll.chooseMultiple": "Choisissez autant d'options que vous voulez.",
"poll.closed": "Fermé",
"poll.non_anonymous": "Public poll",
"poll.non_anonymous.label": "Other instances may display the options you voted for",