From 665964bcbba69829a4ff1e7d7bd936f90d49b3f7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 22 Dec 2013 01:45:41 -0800
Subject: locale prefix support: * set locale based on request header * enforce
locale path prefix when current locale is not the default * note: don't use
root_path anymore, instead use home_path
---
help/app/views/tickets/new.html.haml | 2 +-
help/config/routes.rb | 6 ++++--
help/test/functional/tickets_controller_test.rb | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'help')
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
--
cgit v1.2.3