diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-03 10:26:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 10:26:09 +0200 |
| commit | d2f5760ceb12ade0134be5a5fe96e677c5e6c925 (patch) | |
| tree | 64164086531e2fc9a4a4abb355add786ba79f3af /app/views | |
| parent | c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 (diff) | |
| parent | 7bf37551c8ee55d05a5dbca23db2cae7bb572789 (diff) | |
Merge pull request #1793 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/statuses/_detailed_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml index 1d0e5a38c..c67f0e4d9 100644 --- a/app/views/statuses/_detailed_status.html.haml +++ b/app/views/statuses/_detailed_status.html.haml @@ -20,7 +20,7 @@ %p< %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} %button.status__content__spoiler-link= t('statuses.show_more') - .e-content + .e-content{ :lang => status.language } = prerender_custom_emojis(status_content_format(status), status.emojis) - if status.preloadable_poll diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 6192f293a..936ecd27e 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -32,7 +32,7 @@ %p< %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} %button.status__content__spoiler-link= t('statuses.show_more') - .e-content< + .e-content{ :lang => status.language }< = prerender_custom_emojis(status_content_format(status), status.emojis) - if status.preloadable_poll |