i18n_routing 0.3.6 → 0.3.7

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
-0.3.5 (June 13, 2010)
+0.3.7 (August 26, 2010)
+
+* Support Rails3 RC2 thanks to fwalch / Rails3 final will probably require a new version of i18n_routing
+* Not everything works on RC2 (nested resources), will be fixed when Rails3 will be officially released.
+
+0.3.6 (June 13, 2010)
 
 * Works even if translations are the same as the translated name
 

data/README.rdoc

@@ -6,7 +6,7 @@ All necessary informations are available on the wiki: http://wiki.github.com/kwi
 
 For any question, use the i18_routing google group: http://groups.google.com/group/i18n-routing
 
-Works with Rails 2.3 and Rails3 beta4 !
+Works with Rails 2.3 and Rails3 RC2 ! (nested resources currently do not work on Rails3 RC2, will be fixed when Rails3 is released)
 
 == TODO for next releases (written the 9th of June)
 
@@ -24,5 +24,6 @@ Furthermore, if the i18n gem is present on your system, Rails will load it and s
 * kwi (Guillaume Luccisano)
 * bigtiger (Jim Remsik)
 * mixr (Reiner Dieterich)
+* fwalch
 
 Copyright (c) 2010 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license

data/lib/i18n_routing_rails3.rb

@@ -119,6 +119,7 @@ module I18nRouting
       # Add i18n as valid conditions for Rack::Mount
       @valid_conditions = @set.instance_eval { @set }.instance_eval { @valid_conditions }
       @valid_conditions << :i18n_locale if !@valid_conditions.include?(:i18n_locale)
+      @set.valid_conditions << :i18n_locale if !@set.valid_conditions.include?(:i18n_locale)
 
       # Extends the current RouteSet in order to define localized helper for named routes
       # When calling define_url_helper, it calls define_localized_url_helper too.
@@ -146,7 +147,7 @@ module I18nRouting
     def localized(locales = I18n.available_locales, opts = {})
       # Add if not added Rails.root/config/locales/*.yml in the I18n.load_path
       if !@i18n_routing_path_set and defined?(Rails) and Rails.respond_to?(:root) and Rails.root
-        I18n.load_path = (I18n.load_path << Dir[Rails.root.join('config', 'locales', '*.yml').to_s]).uniq
+        I18n.load_path = (I18n.load_path << Dir[Rails.root.join('config', 'locales', '*.yml')]).flatten.uniq
         @i18n_routing_path_set = true
       end
       
@@ -373,4 +374,4 @@ module I18nRouting
 end
 
 ActionDispatch::Routing::Mapper.send  :include, I18nRouting::Mapper
-Rack::Mount::Route.send               :include, I18nRouting::RackMountRoute
+Rack::Mount::Route.send               :include, I18nRouting::RackMountRoute

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ else
   require 'action_controller'
   require 'action_dispatch'
   require 'rack/mount'
+  require 'active_support/core_ext/hash/slice.rb'
 end
 
 def rails3?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -07:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency