i18n_routing 0.4.3 → 0.4.4

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+0.4.4 (November 03, 2010)
+
+* Fix bug with locale with a dash like pt-br
+
+0.4.3 (October 10, 2010)
+
+* Named route can be translated by name or by path
+
 0.4.2 (September 20, 2010)
 
 * Fix a Rails3 bug, enabling again to do things like that: get :one, :two, :three

data/lib/i18n_routing_common.rb

@@ -2,6 +2,10 @@
 
 # I18nRouting module for common usage methods
 module I18nRouting
+  def self.locale_escaped(locale)
+    locale.to_s.downcase.gsub('-', '_')
+  end
+  
   # Return the correct translation for given values
   def self.translation_for(name, type = :resources, option = nil)
 

data/lib/i18n_routing_rails2.rb

@@ -21,7 +21,7 @@ module ActionController
         def generation_requirements
           r = mkd_generation_requirements
           if @glang and !r.blank?
-            r << " and I18n.locale.to_sym == :#{@glang}"
+            r << " and I18n.locale.to_sym == :'#{@glang}'"
           end
 
           return r
@@ -73,7 +73,7 @@ module ActionController
               alias_method :gl#{selector}, :#{selector}
 
               def #{selector}(*args)
-                selector_g = '#{rlang}'.gsub('glang', I18n.locale.to_s).to_sym
+                selector_g = '#{rlang}'.gsub('glang', I18nRouting.locale_escaped(I18n.locale)).to_sym
 
                 #logger.debug "Call routes : #{selector} => \#{selector_g} (#{rlang}) "
                 #puts "Call routes : #{selector} => \#{selector_g} (#{rlang}) Found:\#{respond_to? selector_g and selector_g != :#{selector}}"
@@ -98,7 +98,7 @@ module ActionController
 
           @locales.each do |l|
             I18n.locale = l
-            nt = "#{l}_#{name}"
+            nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
             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))
@@ -169,9 +169,8 @@ module ActionController
         localized(nil) do
           locales.each do |l|
             I18n.locale = l
-            nt = "#{l}_#{name}"
+            nt = "#{I18nRouting.locale_escaped(l)}_#{name}"
             if nt != name and (t = I18nRouting.translation_for(name, namespace))
-              nt = "#{l}_#{name}"
               opts[:as] = t
               opts[:glang] = l
               opts[:controller] ||= name.to_s.pluralize

data/lib/i18n_routing_rails3.rb

@@ -44,7 +44,7 @@ module I18nRouting
             
             resource = resource_from_params(type, r, opts.dup)
 
-            res = ["#{locale}_#{r}".to_sym, opts]
+            res = ["#{I18nRouting.locale_escaped(locale)}_#{r}".to_sym, opts]
 
             constraints = opts[:constraints] ? opts[:constraints].dup : {}
             constraints[:i18n_locale] = locale.to_s
@@ -304,7 +304,7 @@ module I18nRouting
       # If a translated path exists, set localized infos
       if @localized_path and @localized_path != @path
         #@options[:controller] ||= @options[:as]
-        @options[:as] = "#{locale}_#{@options[:as]}"
+        @options[:as] = "#{I18nRouting.locale_escaped(locale)}_#{@options[:as]}"
         @path = @localized_path
         @options[:constraints] = @options[:constraints] ? @options[:constraints].dup : {}
         @options[:constraints][:i18n_locale] = locale.to_s
@@ -348,7 +348,7 @@ module I18nRouting
           alias_method :localized_#{selector}, :#{selector}
 
           def #{selector}(*args)
-            selector_g = '#{rlang}'.gsub('glang', I18n.locale.to_s).to_sym
+            selector_g = '#{rlang}'.gsub('glang', I18nRouting.locale_escaped(I18n.locale.to_s)).to_sym
 
             #puts "Call routes : #{selector} => \#{selector_g} (\#{I18n.locale}) "
             if respond_to? selector_g and selector_g != :#{selector}

data/spec/i18n_routing/i18n_spec.rb

@@ -325,6 +325,30 @@ describe :localized_routes do
 
   end
 
+  context 'locale with a dash (pt-br)' do
+
+    before do
+      I18n.locale = 'pt-BR'
+    end
+
+    it 'users resources' do
+      routes.send(:users_path).should == "/#{I18n.t :users, :scope => :'resources'}"
+    end
+    
+    it "routes for the singleton resource alone should be translated correctly" do
+      routes.send(:foo_path).should == "/#{I18n.t :foo, :scope => :resource}"
+    end
+    
+    it "named_route generates route using localized values" do
+      routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+    end
+    
+    it "custom translated path names" do
+      routes.send(:new_user_path).should == "/#{I18n.t :users, :scope => :resources}/#{I18n.t :new, :scope => :'path_names'}"
+    end
+    
+  end
+
   # context "just output" do
   #   it "output all routes properly" do
   #     nested_routes.keys.collect(&:to_s).sort.each do |k|

data/spec/locales/pt-br.yml

@@ -0,0 +1,9 @@
+pt-BR:
+  resources:
+    users: users-pt-br
+  resource:
+    foo: foo_fr-pt-br
+  named_routes_path:
+    about: 'a-propos-pt-br'
+  path_names:
+    new: 'nouveau-pt-br'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2010-11-03 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 
@@ -48,6 +47,7 @@ files:
 - spec/i18n_routing/i18n_spec.rb
 - spec/locales/en.yml
 - spec/locales/fr.yml
+- spec/locales/pt-br.yml
 - spec/spec_helper.rb
 - CHANGELOG.rdoc
 - MIT-LICENSE
@@ -64,7 +64,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -72,7 +71,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -84,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: i18n_routing
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: I18n routing module for Rails 2.3.x and Rails 3. Translate your routes with ease !