diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-09 09:56:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-09 09:56:53 +0200 |
commit | f2404de871f0bdfda5c9aeeeb4c6c4d10a8da8ab (patch) | |
tree | f45577d1fe26ea56f7323b940f506f8875d7344e /config | |
parent | 80176a3814abad7f5c9023f97b5d4d82b73c089d (diff) |
Public profile endorsements (accounts picked by profile owner) (#8146)
Diffstat (limited to 'config')
-rw-r--r-- | config/locales/en.yml | 3 | ||||
-rw-r--r-- | config/routes.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 4693fe1ba..ef5b2c93b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,6 +39,7 @@ en: user_count_before: Home to what_is_mastodon: What is Mastodon? accounts: + choices_html: "%{name}'s choices:" follow: Follow followers: Followers following: Following @@ -49,6 +50,8 @@ en: nothing_here: There is nothing here! people_followed_by: People whom %{name} follows people_who_follow: People who follow %{name} + pin_errors: + following: You must be already following the person you want to endorse posts: Toots posts_with_replies: Toots and replies reserved_username: The username is reserved diff --git a/config/routes.rb b/config/routes.rb index 1c97f5a82..2983011d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -309,6 +309,9 @@ Rails.application.routes.draw do post :mute post :unmute end + + resource :pin, only: :create, controller: 'accounts/pins' + post :unpin, to: 'accounts/pins#destroy' end resources :lists, only: [:index, :create, :show, :update, :destroy] do |