diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
| commit | f90fa11db5935521f662ce0d9c608a1037e40da8 (patch) | |
| tree | 9a5bb397170bb5880934f5695854865935c6e9c9 /app/javascript/mastodon/features | |
| parent | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (diff) | |
| parent | 7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/features')
| -rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 6 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/getting_started/components/announcements.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index b47ebed62..0b4431d62 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -328,9 +328,9 @@ class Header extends ImmutablePureComponent { ))} {fields.map((pair, i) => ( <dl key={i}> - <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} /> + <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} className='translate' /> - <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')}> + <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')} className='translate'> {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> </dl> @@ -340,7 +340,7 @@ class Header extends ImmutablePureComponent { {account.get('id') !== me && !suspended && <AccountNoteContainer account={account} />} - {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} />} + {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} className='translate' />} </div> {!suspended && ( diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js index 5bc3abac6..4534f7121 100644 --- a/app/javascript/mastodon/features/getting_started/components/announcements.js +++ b/app/javascript/mastodon/features/getting_started/components/announcements.js @@ -145,7 +145,7 @@ class Content extends ImmutablePureComponent { return ( <div - className='announcements__item__content' + className='announcements__item__content translate' ref={this.setRef} dangerouslySetInnerHTML={{ __html: announcement.get('contentHtml') }} /> |