Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't display the `@mention` message if disabled

This commit is contained in:
Robin Ward 2018-01-02 14:12:18 -05:00
parent a0b2b3c8a7
commit 891f0cfe52
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -7,9 +7,11 @@
{{d-icon "pencil"}} {{/link-to}} {{d-icon "pencil"}} {{/link-to}}
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> {{#if siteSettings.enable_mentions}}
{{{i18n 'user.username.short_instructions' username=model.username}}} <div class='instructions'>
</div> {{{i18n 'user.username.short_instructions' username=model.username}}}
</div>
{{/if}}
</div> </div>
{{#if canEditName}} {{#if canEditName}}