diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index 185a2a663..190ced1a8 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -221,14 +221,14 @@ export default class StatusContent extends React.PureComponent { return (
{mentionsPlaceholder} -
+
{!hidden && !!status.get('poll') && } @@ -238,7 +238,7 @@ export default class StatusContent extends React.PureComponent { } else if (this.props.onClick) { const output = [
-
+
{!!status.get('poll') && } @@ -254,7 +254,7 @@ export default class StatusContent extends React.PureComponent { } else { return (
-
+
{!!status.get('poll') && } 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) => (
-
+
-
+
{pair.get('verified_at') && }
@@ -340,7 +340,7 @@ class Header extends ImmutablePureComponent { {account.get('id') !== me && !suspended && } - {account.get('note').length > 0 && account.get('note') !== '

' &&
} + {account.get('note').length > 0 && account.get('note') !== '

' &&
}
{!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 (
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 94cc782b2..3d6283fba 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -8,7 +8,7 @@ = render_initial_state = javascript_pack_tag 'application', crossorigin: 'anonymous' -.app-holder#mastodon{ data: { props: Oj.dump(default_props) } } +.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } } %noscript = image_pack_tag 'logo.svg', alt: 'Mastodon' diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml index 3325be5bf..9254bd348 100644 --- a/app/views/public_timelines/show.html.haml +++ b/app/views/public_timelines/show.html.haml @@ -14,4 +14,4 @@ %p= t('about.browse_local_posts') #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }} -#modal-container +.notranslate#modal-container diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index beeeb56f2..5cd513b32 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -13,4 +13,4 @@ %p= t('about.about_hashtag_html', hashtag: @tag.name) #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }} -#modal-container +.notranslate#modal-container