From 50cd73e5d7e39600203c9c3f591f04289f41e297 Mon Sep 17 00:00:00 2001 From: Sasha Sorokin Date: Wed, 29 Jan 2020 11:35:54 -0500 Subject: Add "Show thread" button to public profiles (#13000) This adds "Show thread" button to the status view which is used in profiles. The logic to display the button is mimicking logic in web app available at app/javascript/mastodon/components/status.js#L439. * The little change in components CSS required to remove enforced underline for all links on public pages on our button. --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'config/locales') diff --git a/config/locales/en.yml b/config/locales/en.yml index 44900d426..b1586ade5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1088,6 +1088,7 @@ en: other: "%{count} votes" vote: Vote show_more: Show more + show_thread: Show thread sign_in_to_participate: Sign in to participate in the conversation title: '%{name}: "%{quote}"' visibilities: -- cgit From 0fd2d2eee2bf2271c7dc4bc322287bd4cbba4a39 Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 29 Jan 2020 18:39:44 +0100 Subject: Fix english wording (#13003) --- config/locales/simple_form.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/locales') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f050ec8a3..37d5a82f5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -93,7 +93,7 @@ en: all_day: All-day event ends_at: End of event scheduled_at: Schedule publication - starts_at: Begin of event + starts_at: Start of event text: Announcement defaults: autofollow: Invite to follow your account -- cgit