tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2018-12-01 21:00:16 +01:00
parent 4b85bf12ab 5648b30d6c
commit a07e37cc17
11 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/account/components/header.js
View File

@ -16,6 +16,7 @@ const messages = defineMessages({
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
});
const dateFormatOptions = {
@ -148,7 +149,7 @@ class Header extends ImmutablePureComponent {
}
if (account.get('locked')) {
lockedIcon = <i className='fa fa-lock' />;
lockedIcon = <i className='fa fa-lock' title={intl.formatMessage(messages.account_locked)} />;
}
const content = { __html: account.get('note_emojified') };