diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-10 00:28:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 00:28:54 +0200 |
| commit | 34142ab29c33104793afe3199f102d84b83b9b57 (patch) | |
| tree | afba23a3f169d7445f80ffe555985a295c98f6e1 /app/views/shared | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | 5d8052e7156c913a551b923c51d508b1ea8837b3 (diff) | |
Merge pull request #472 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_landing_strip.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml index ae26fc1ff..78f5ed4bc 100644 --- a/app/views/shared/_landing_strip.html.haml +++ b/app/views/shared/_landing_strip.html.haml @@ -2,7 +2,7 @@ = image_tag asset_pack_path('logo.svg'), class: 'logo' %div - = t('landing_strip_html', name: content_tag(:span, display_name(account), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) + = t('landing_strip_html', name: content_tag(:span, display_name(account, custom_emojify: true), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) - if open_registrations? = t('landing_strip_signup_html', sign_up_path: new_user_registration_path) |