diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /app/views/statuses/_simple_status.html.haml | |
parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/statuses/_simple_status.html.haml')
-rw-r--r-- | app/views/statuses/_simple_status.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 1e37b6cf3..ecbabf34c 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -27,12 +27,12 @@ %span.display-name__account = acct(status.account) = fa_icon('lock') if status.account.locked? - .status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }< + .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }< - if status.spoiler_text? %p< %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} %button.status__content__spoiler-link= t('statuses.show_more') - .e-content{ :lang => status.language }< + .e-content{ lang: status.language }< = prerender_custom_emojis(status_content_format(status), status.emojis) - if status.preloadable_poll |