about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml6
-rw-r--r--config/locales/simple_form.en.yml8
-rw-r--r--config/routes.rb7
3 files changed, 16 insertions, 5 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 684c86f4a..4cf958517 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -40,6 +40,10 @@ en:
       x_minutes: "%{count}m"
       x_months: "%{count}mo"
       x_seconds: "%{count}s"
+  follow_requests:
+    authorize: Authorize
+    reject: Reject
+    title: Follow requests
   generic:
     changes_saved_msg: Changes successfully saved!
     powered_by: powered by %{link}
@@ -70,8 +74,8 @@ en:
     click_to_show: Click to show
     favourited: favourited a post by
     is_now_following: is now following
-    sensitive_content: Sensitive content
     reblogged: boosted
+    sensitive_content: Sensitive content
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 50c0f99fd..12b717877 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -1,6 +1,9 @@
 ---
 en:
   simple_form:
+    hints:
+      defaults:
+        locked: Requires you to manually approve followers and defaults post privacy to followers-only
     labels:
       defaults:
         avatar: Avatar
@@ -11,11 +14,11 @@ en:
         email: E-mail address
         header: Header
         locale: Language
+        locked: Make account private
         new_password: New password
         note: Bio
         password: Password
         username: Username
-        locked: Make account private
       interactions:
         must_be_follower: Block notifications from non-followers
         must_be_following: Block notifications from people you don't follow
@@ -24,9 +27,6 @@ en:
         follow: Send e-mail when someone follows you
         mention: Send e-mail when someone mentions you
         reblog: Send e-mail when someone reblogs your status
-    hints:
-      defaults:
-        locked: Requires you to manually approve followers and defaults post privacy to followers-only
     'no': 'No'
     required:
       mark: "*"
diff --git a/config/routes.rb b/config/routes.rb
index fd187dc42..e8c8f619d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,13 @@ Rails.application.routes.draw do
   resources :media, only: [:show]
   resources :tags,  only: [:show]
 
+  resources :follow_requests do
+    member do
+      post :authorize
+      post :reject
+    end
+  end
+
   namespace :admin do
     resources :pubsubhubbub, only: [:index]
     resources :domain_blocks, only: [:index, :create]