Merge branch 'develop' into feature/messages_api

Conflicts:
	users/config/locales/en.yml

1 files changed, 9 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index b3e24b9..f8bb8fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,5 +6,14 @@ LeapWeb::Application.routes.draw do
   root :to => "home#index"
   get '(:locale)' => 'home#index', :locale => MATCH_LOCALE, :as => 'home'
 
+  scope "(:locale)", :locale => MATCH_LOCALE, :controller => 'pages', :action => 'show' do
+    get 'privacy-policy', :as => 'privacy_policy'
+    get 'terms-of-service', :as => 'terms_of_service'
+    get 'about', :as => 'about'
+    get 'contact', :as => 'contact'
+    get 'pricing', :as => 'pricing'
+    get 'bye', :as => 'bye'
+  end
+
   get '/provider.json' => 'static_config#provider'
 end