Merge branch 'master' into openID

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 856dcd9f415038d84ece219794172ce5d03fcb75..9a86f920058a179eecdb1f7d3ba9183801a30287 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,6 +88,8 @@ ActionController::Routing::Routes.draw do |map|
   map.root :controller => 'site', :action => 'index'
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
+  map.connect '/copyright', :controller => 'site', :action => 'copyright'
+  map.connect '/copyright/:copyright_locale', :controller => 'site', :action => 'copyright'
   map.connect '/history', :controller => 'changeset', :action => 'list'
   map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
   map.connect '/export', :controller => 'site', :action => 'export'
@@ -156,7 +158,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/:display_name/diary/:id/hide', :controller => 'diary_entry', :action => 'hide', :id => /\d+/
   map.connect '/user/:display_name/diary/:id/hidecomment/:comment', :controller => 'diary_entry', :action => 'hidecomment', :id => /\d+/, :comment => /\d+/
   map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
-  map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home'
   map.connect '/user/:display_name/activate', :controller => 'user', :action => 'activate'
   map.connect '/user/:display_name/deactivate', :controller => 'user', :action => 'deactivate'
   map.connect '/user/:display_name/hide', :controller => 'user', :action => 'hide'