diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-10 03:48:11 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:23 -0500 |
| commit | 3b06175e8f5cb9d688e8ec376dbfd88abf5f3278 (patch) | |
| tree | 160a6f6c97777ca022326bb93701f358fe689c99 /app/javascript | |
| parent | 5c59d1837f2d3152342ef45bf7827495183e62dd (diff) | |
Moderation: add `force sensitive` and `force unlisted` actions. Accounts: add federatable `adult content` tag. Handle from remote accounts as well.
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account/components/header.js | 7 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 43c4f0d32..ef5915382 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -189,7 +189,8 @@ class Header extends ImmutablePureComponent { const content = { __html: account.get('note_emojified') }; const displayNameHtml = { __html: account.get('display_name_html') }; const fields = account.get('fields'); - const badge = account.get('bot') ? (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div>) : null; + const badge_bot = account.get('bot') ? (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div>) : null; + const badge_ao = account.get('adults_only') ? (<div className='account-role adults-only'><FormattedMessage id='account.badges.adults_only' defaultMessage="🔞 Adult content" /></div>) : null; const acct = account.get('acct').indexOf('@') === -1 && domain ? `${account.get('acct')}@${domain}` : account.get('acct'); return ( @@ -219,7 +220,7 @@ class Header extends ImmutablePureComponent { <div className='account__header__tabs__name'> <h1> - <span dangerouslySetInnerHTML={displayNameHtml} /> {badge} + <span dangerouslySetInnerHTML={displayNameHtml} /> {badge_ao}{badge_bot} <small>@{acct} {lockedIcon}</small> </h1> </div> @@ -243,7 +244,7 @@ class Header extends ImmutablePureComponent { {fields.map((pair, i) => ( <dl key={i}> <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} /> - + <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')}> {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><Icon id='check' className='verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} /> </dd> diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index d85322223..d61dc27ad 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1,6 +1,7 @@ { "account.add_or_remove_from_list": "Add or Remove from lists", "account.badges.bot": "Bot", + "account.badges.adults_only": "🔞 Adult content", "account.block": "Block @{name}", "account.block_domain": "Hide {domain}", "account.blocked": "Blocked", |