i18n_routing 0.3.1 → 0.3.2

data/README.rdoc

@@ -6,6 +6,12 @@ All necessary informations are available on the wiki : http://wiki.github.com/kw
 
 Works with Rails 2.3 and Rails3 !
 
+== I18n gem version warning
+
+Be careful when running Rails 2.3 with the shipped i18n gem: this is an old i18n version and i18_routing will install the latest i18n version as a gem.
+This latest version may be incompatible with some old usages.
+Furthermore, if the i18n gem is present on your system, Rails will load it and skip the shipped version; Keep that in mind.
+
 == Contributors
 
 * kwi (Guillaume Luccisano)

data/lib/i18n_routing_rails3.rb

@@ -136,6 +136,13 @@ module I18nRouting
     # end
     #
     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')]).uniq
+        @i18n_routing_path_set = true
+      end
+      
+      
       old_value = @locales
       @locales = locales
       @i18n_verbose ||= opts.delete(:verbose)
@@ -358,4 +365,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/i18n_routing/i18n_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe :localized_routes do
 
-  @@r = nil # Global routes in order to speed up testing
+  $r = nil # Global routes in order to speed up testing
   
   before(:all) do
 
-    if !@@r
+    if !$r
       if !rails3?
         ActionController::Routing::Routes.clear!
         ActionController::Routing::Routes.draw do |map|
@@ -34,7 +34,7 @@ describe :localized_routes do
           end
         end
       
-        @@r = ActionController::Routing::Routes
+        $r = ActionController::Routing::Routes
       
         class UrlTester
           include ActionController::UrlWriter
@@ -42,8 +42,8 @@ describe :localized_routes do
 
       else
 
-        @@r = ActionDispatch::Routing::RouteSet.new
-        @@r.draw do
+        $r = ActionDispatch::Routing::RouteSet.new
+        $r.draw do
           match 'not_about' => "not_about#show", :as => :not_about
           resources :not_users
           resource  :not_contact
@@ -77,18 +77,18 @@ describe :localized_routes do
         end
            
         class UrlTester; end
-        UrlTester.send :include, @@r.url_helpers
+        UrlTester.send :include, $r.url_helpers
 
       end
     end
 
   end
 
-  let(:nested_routes) { @@r.named_routes.instance_eval { routes } }
+  let(:nested_routes) { $r.named_routes.instance_eval { routes } }
   let(:routes) { UrlTester.new }
 
   def url_for(opts)
-    @@r.generate_extras(opts).first
+    $r.generate_extras(opts).first
   end
 
   context "do not break existing behavior" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +02:00
+date: 2010-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
@@ -63,6 +64,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -70,6 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -81,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !