Merge branch 'master' into terms

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index dab156c002e9e3006f75aee83a416311f40699d2..11f86e000e7094dbaf200e3664813c95d7ca115a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,6 +89,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
   map.connect '/copyright', :controller => 'site', :action => 'copyright'
   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'
   map.connect '/history', :controller => 'changeset', :action => 'list'
   map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
   map.connect '/export', :controller => 'site', :action => 'export'