i18n_routing 0.4.2 → 0.4.3

data/README.rdoc

@@ -27,5 +27,6 @@ Furthermore, if the i18n gem is present on your system, Rails will load it and s
 * mixr (Reiner Dieterich)
 * fwalch
 * doubledrones: h13ronim (Marcin Michałowski)
+* rudionrails (Rudolf Schmidt)
 
 Copyright (c) 2010 Guillaume Luccisano - g-mai|: guillaume.luccisano, released under the MIT license

data/lib/i18n_routing_rails2.rb

@@ -99,7 +99,8 @@ module ActionController
           @locales.each do |l|
             I18n.locale = l
             nt = "#{l}_#{name}"
-            if nt != name and (t = I18nRouting.translation_for(path, :named_routes_path))
+            t = I18nRouting.translation_for(name, :named_routes) || I18nRouting.translation_for(path, :named_routes_path)
+            if nt != name and t
               gl_add_named_route(nt, t, options.merge(:glang => l))
               puts("[I18n] > localize %-10s: %40s (%s) => %s" % ['route', name, l, t]) if @i18n_verbose
             end

data/lib/i18n_routing_rails3.rb

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

data/spec/i18n_routing/i18n_spec.rb

@@ -16,6 +16,7 @@ describe :localized_routes do
 
           map.localized(I18n.available_locales, :verbose => false) do
             map.about 'about', :controller => 'about', :action => :show
+            map.welcome 'welcome/to/our/page', :controller => :welcome, :action => :index
             
             map.resources :users, :member => {:level => :get, :one => :get, :two => :get}, :collection => {:groups => :get}
             map.resource  :contact
@@ -60,6 +61,7 @@ describe :localized_routes do
 
           localized(I18n.available_locales, :verbose => false) do
             match 'about' => "about#show", :as => :about
+            match 'welcome/to/our/page' => "welcome#index", :as => :welcome
 
             scope '/:locale', :constraints => { :locale => /[a-z]{2}/ } do
               match '/' => "about#show", :as => :localized_root
@@ -137,6 +139,7 @@ describe :localized_routes do
 
     it "named_route uses default values" do
       routes.send(:about_path).should == "/about"
+      routes.send(:welcome_path).should == '/welcome/to/our/page'
     end
 
     it "resource generates routes using default values" do
@@ -180,6 +183,16 @@ describe :localized_routes do
     it "named_route generates route using localized values" do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
     end
+    
+    it "named_route generated route from actual route name" do
+      I18n.locale = :en
+      routes.send(:welcome_path).should == "/#{I18n.t :welcome, :scope => :named_routes}"        
+      I18n.locale = :fr
+    end
+    
+    it "named_route generates route from route path when route name  not available" do
+      routes.send(:welcome_path).should == "/#{I18n.t 'welcome/to/our/page', :scope => :named_routes_path}"
+    end 
 
     it "named_route generates route using localized values and I18n.locale as a string" do
       o = I18n.locale

data/spec/locales/en.yml

@@ -11,3 +11,5 @@ en:
     contact: 'contact-us'
   named_routes_path:
     about: 'about-our-company'
+  named_routes:
+    welcome: 'welcome-to-our-page'

data/spec/locales/fr.yml

@@ -27,6 +27,7 @@ fr:
     contact: 'contactez-nous'
   named_routes_path:
     about: 'a-propos'
+    'welcome/to/our/page': 'bienvenue/sur/notre/site' # no idea about french translation ;-) --R
   path_names:
     new: 'nouveau'
     edit: 'edition'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +02:00
+date: 2010-10-11 00:00:00 -07: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 !