i18n_routing 0.4.0 → 0.4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.4.1 (September 11, 2010)
+
+* Fix a Rails3 bug for named routes and prefixed path
+
 0.4.0 (September 08, 2010)
 
 * Full support for Rails 3.0.0

data/lib/i18n_routing_rails3.rb

@@ -290,7 +290,7 @@ module I18nRouting
       I18n.locale = locale
       ts = @path.gsub(/^\//, '')
       ts.gsub!('(.:format)', '')
-      @localized_path = '/' + (I18nRouting.translation_for(ts, :named_routes_path) || ts)
+      @localized_path = (@scope[:path] || '/') + (!ts.blank? ? (I18nRouting.translation_for(ts, :named_routes_path) || ts) : '')
 
       # If a translated path exists, set localized infos
       if @localized_path and @localized_path != @path

data/spec/i18n_routing/i18n_spec.rb

@@ -16,10 +16,10 @@ describe :localized_routes do
 
           map.localized(I18n.available_locales, :verbose => false) do
             map.about 'about', :controller => 'about', :action => :show
-
+            
             map.resources :users, :member => {:level => :get}, :collection => {:groups => :get}
             map.resource  :contact
-
+            
             map.resources :authors do |m|
               m.resources :books
             end
@@ -30,7 +30,7 @@ describe :localized_routes do
                 mm.resources :bars
               end
             end
-
+            
             map.resources :universes do |m|
               m.resources :galaxies do |mm|
                 mm.resources :planets do |mmm|
@@ -38,7 +38,8 @@ describe :localized_routes do
                 end
               end
             end
-
+            
+            map.localized_root '/', :controller => "about", :action => "show", :path_prefix => ':locale'
             map.resources :drones, :path_prefix => 'doubledrones/unimatrix/zero'
           end
         end
@@ -60,6 +61,10 @@ describe :localized_routes do
           localized(I18n.available_locales, :verbose => false) do
             match 'about' => "about#show", :as => :about
 
+            scope '/:locale', :constraints => { :locale => /[a-z]{2}/ } do
+              match '/' => "about#show", :as => :localized_root
+            end
+
             resources :users do
               member do
                 get :level
@@ -166,6 +171,10 @@ describe :localized_routes do
     before do
       I18n.locale = :fr
     end
+    
+    it "scope with parameters should be respected" do
+      routes.send(:localized_root_path, I18n.locale).should == "/#{I18n.locale}"
+    end
 
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency