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

2021-01-21 16:51:12 +01:00
parent 73d5b05019 7d0031a515
commit f90fa11db5
12 changed files with 84 additions and 84 deletions
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@ -7,7 +7,7 @@
  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
  = render_initial_state

-.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'

--- a/app/views/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@ -13,4 +13,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
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@ -12,4 +12,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