diff options
| author | azul <azul@riseup.net> | 2013-12-22 06:39:37 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-12-22 06:39:37 -0800 |
| commit | 4c5851dfac51453571427535419469fe1b73a81d (patch) | |
| tree | bc5356220eaca2465bd135f45edf8000d6c254be /help | |
| parent | 5bf1462140a7aa17ea815ccc5105ace6fa878d83 (diff) | |
| parent | 665964bcbba69829a4ff1e7d7bd936f90d49b3f7 (diff) | |
Merge pull request #131 from elijh/feature/locale-routes
locale prefix support
Diffstat (limited to 'help')
| -rw-r--r-- | help/app/views/tickets/new.html.haml | 2 | ||||
| -rw-r--r-- | help/config/routes.rb | 6 | ||||
| -rw-r--r-- | help/test/functional/tickets_controller_test.rb | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml index 393e5d6..8f217a5 100644 --- a/help/app/views/tickets/new.html.haml +++ b/help/app/views/tickets/new.html.haml @@ -27,4 +27,4 @@ - if logged_in? = link_to t(:cancel), auto_tickets_path, :class => :btn - else - = link_to t(:cancel), root_path, :class => 'btn'
\ No newline at end of file + = link_to t(:cancel), home_path, :class => 'btn'
\ No newline at end of file diff --git a/help/config/routes.rb b/help/config/routes.rb index 8f3241c..23e0c11 100644 --- a/help/config/routes.rb +++ b/help/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do - resources :tickets, :except => :edit - resources :users do + scope "(:locale)", :locale => MATCH_LOCALE do resources :tickets, :except => :edit + resources :users do + resources :tickets, :except => :edit + end end end diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb index 0f56e6e..2b30f66 100644 --- a/help/test/functional/tickets_controller_test.rb +++ b/help/test/functional/tickets_controller_test.rb @@ -49,7 +49,7 @@ class TicketsControllerTest < ActionController::TestCase login get :show, :id => ticket.id assert_response :redirect - assert_redirected_to root_url + assert_redirected_to home_url end test "should create unauthenticated ticket" do |