Merge branch 'feature/email-aliases-model'

2 files changed, 4 insertions, 1 deletions

diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index fe7e824..d068e70 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -12,6 +12,7 @@ en:
   set_email_address: "Set email address"
   forward_email: "Forward email"
   email_aliases: "Email aliases"
+  add_email_alias: "Add email alias"
   user_updated_successfully: "Settings have been updated successfully."
   user_created_successfully: "Successfully created your account."
 
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 6de216f..3c5fb73 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -10,6 +10,8 @@ Rails.application.routes.draw do
   resources :sessions, :only => [:new, :create, :update, :destroy]
 
   get "signup" => "users#new", :as => "signup"
-  resources :users
+  resources :users do
+    resources :email_aliases
+  end
 
 end