autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable custom emojis in profiles (notes, field values, display names) (#7374)

Browse Source 
Follow-up to #6124
This commit is contained in:
Eugen Rochko
2018-05-06 11:48:51 +02:00
committed by GitHub
parent bd10a7e480
commit 61a9018607
17 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/stream_entries/_detailed_status.html.haml
View File

@ -4,7 +4,7 @@
.avatar
= image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo'
%span.display-name
%strong.p-name.emojify= display_name(status.account)
%strong.p-name.emojify= display_name(status.account, custom_emojify: true)
%span= acct(status.account)
- if embedded_view?

2
app/views/stream_entries/_simple_status.html.haml
View File

@ -10,7 +10,7 @@
%div
= image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo'
%span.display-name
%strong.p-name.emojify= display_name(status.account)
%strong.p-name.emojify= display_name(status.account, custom_emojify: true)
%span= acct(status.account)
.status__content.p-name.emojify<

2
app/views/stream_entries/_status.html.haml
View File

@ -28,7 +28,7 @@
= fa_icon('retweet fw')
%span
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
%strong.emojify= display_name(status.account)
%strong.emojify= display_name(status.account, custom_emojify: true)
= t('stream_entries.reblogged')
- elsif pinned
.pre-header