From 7cee27f51790617859da87c7aef432373b40aad4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 23 Nov 2016 22:57:57 +0100 Subject: Fix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications, skip ActionCable for follow/unfollow/block events, instead clear UI from blocked account's posts instantly if block request succeeds. Add forgotten i18n for sensitive content --- app/assets/javascripts/components/locales/en.jsx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/assets/javascripts/components/locales') diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index f3326bf90..0ea324f66 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -8,6 +8,8 @@ const en = { "status.reblog": "Reblog", "status.favourite": "Favourite", "status.reblogged_by": "{name} reblogged", + "status.sensitive_warning": "Sensitive content", + "status.sensitive_toggle": "Click to view", "video_player.toggle_sound": "Toggle sound", "account.mention": "Mention", "account.edit_profile": "Edit profile", @@ -35,6 +37,7 @@ const en = { "tabs_bar.notifications": "Notifications", "compose_form.placeholder": "What is on your mind?", "compose_form.publish": "Toot", + "compose_form.sensitive": "Mark content as sensitive", "navigation_bar.settings": "Settings", "navigation_bar.public_timeline": "Public timeline", "navigation_bar.logout": "Logout", -- cgit