about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
commit0ae7d8427394d5f98fb2bd78eaae9bf848831186 (patch)
treee15a6321eedcbf9a2ae55ce24e7d8960f233b5ef /app/views
parent00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff)
parent42d9ca21de298e1d51b87723745f2b17e4169894 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
Diffstat (limited to 'app/views')
-rw-r--r--app/views/public_timelines/show.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml
index 591620f64..063089a7f 100644
--- a/app/views/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@@ -6,7 +6,11 @@
 
 .page-header
   %h1= t('about.see_whats_happening')
-  %p= t('about.browse_public_posts')
+
+  - if Setting.show_known_fediverse_at_about_page
+    %p= t('about.browse_public_posts')
+  - else
+    %p= t('about.browse_local_posts')
 
 #mastodon-timeline{ data: { props: Oj.dump(default_props) }}
 #modal-container