diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-12 08:36:46 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-12 08:36:46 +0000 |
| commit | 7707457145442d6177ce57c956dbe09af65df1b4 (patch) | |
| tree | 2278f27bf20e08bb2f92e42ab728b4427cce6f07 /config | |
| parent | 847c7367b429e8df0e0fa1dbf3e415e37dd82bf1 (diff) | |
| download | redmine-7707457145442d6177ce57c956dbe09af65df1b4.tar.gz redmine-7707457145442d6177ce57c956dbe09af65df1b4.zip | |
User groups branch merged.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2869 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index f77079e3d..93733e425 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -683,6 +683,9 @@ en: label_date_from_to: From {{start}} to {{end}} label_wiki_content_added: Wiki page added label_wiki_content_updated: Wiki page updated + label_group: Group + label_group_plural: Groups + label_group_new: New group button_login: Login button_submit: Submit diff --git a/config/routes.rb b/config/routes.rb index ded3435ba..5357fc30f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -229,7 +229,8 @@ ActionController::Routing::Routes.draw do |map| map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/ map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/ - + map.resources :groups + #left old routes at the bottom for backwards compat map.connect 'projects/:project_id/issues/:action', :controller => 'issues' map.connect 'projects/:project_id/documents/:action', :controller => 'documents' |