i18n_routing 0.3.5 → 0.3.6

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.3.5 (June 13, 2010)
+
+* Works even if translations are the same as the translated name
+
 0.3.5 (June 9, 2010)
 
 * Clean up some .to_sym in order to avoid unnecessary symbols during runtime

data/README.rdoc

@@ -6,13 +6,11 @@ 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 beta3 !
+Works with Rails 2.3 and Rails3 beta4 !
 
 == TODO for next releases (written the 9th of June)
 
 * Handle multiple translations for same resources name (Example: nested and not nested resources)
-* Find a way to force translation when the translation is the same
-* Do the translation if only the path names are translated and not the path
 * Handle namespace translation
 
 == I18n gem version warning

data/lib/i18n_routing_common.rb

@@ -7,16 +7,19 @@ module I18nRouting
 
     # First, if an option is given, try to get the translation in the routes scope
     if option
-      t = I18n.t(option, :scope => "routes.#{name}.#{type}", :default => option.to_s)
-
-      return (t || name)
+      default = "{option}Noi18nRoutingTranslation"
+      t = I18n.t(option, :scope => "routes.#{name}.#{type}", :default => default)
+      return (t == default ? nil : t)
     else
+      default = "{name}Noi18nRoutingTranslation"
+
       # Try to get the translation in routes namescope first      
-      t = I18n.t(:as, :scope => "routes.#{name}", :default => name.to_s)
-      
-      return t if t and t != name.to_s
+      t = I18n.t(:as, :scope => "routes.#{name}", :default => default)
+
+      return t if t and t != default
 
-      I18n.t(name.to_s, :scope => type, :default => name.to_s)      
+      t = I18n.t(name.to_s, :scope => type, :default => default)
+      return (t == default ? nil : t)
     end
   end
 

data/lib/i18n_routing_rails2.rb

@@ -99,7 +99,7 @@ module ActionController
           @locales.each do |l|
             I18n.locale = l
             nt = "#{l}_#{name}"
-            if nt != name and ((t = I18nRouting.translation_for(path, :named_routes_path)) != path)
+            if nt != name and (t = I18nRouting.translation_for(path, :named_routes_path))
               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
@@ -169,7 +169,7 @@ module ActionController
           locales.each do |l|
             I18n.locale = l
             nt = "#{l}_#{name}"
-            if nt != name and ((t = I18nRouting.translation_for(name, namespace)) != name)
+            if nt != name and (t = I18nRouting.translation_for(name, namespace))
               nt = "#{l}_#{name}"
               opts[:as] = t
               opts[:glang] = l

data/lib/i18n_routing_rails3.rb

@@ -36,7 +36,7 @@ module I18nRouting
           localized_path = I18nRouting.translation_for(resource.name, type)
 
           # A translated route exists :
-          if localized_path and localized_path != resource.name.to_s and String === localized_path
+          if localized_path and String === localized_path
             puts("[I18n] > localize %-10s: %40s (%s) => /%s" % [type, resource.name, locale, localized_path]) if @i18n_verbose
             opts = options.dup
             opts[:path] = localized_path
@@ -279,7 +279,7 @@ module I18nRouting
       # try to get translated path :
       I18n.locale = locale
       ts = @path.gsub(/^\//, '')
-      @localized_path = '/' + I18nRouting.translation_for(ts, :named_routes_path)
+      @localized_path = '/' + (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

@@ -193,7 +193,7 @@ describe :localized_routes do
       routes.send(:author_books_path, 1).should == "/#{I18n.t :authors, :scope => :resources}/1/#{I18n.t :books, :scope => :resources}"
     end
 
-    it "deep nested resources generate routes using localized values" do
+    it "deep nested resources generate routes using localized values and translate routes even translated name is the same" do
       routes.send(:universes_path).should == "/#{I18n.t :universes, :scope => :resources}"
       routes.send(:universe_galaxies_path, 1).should == "/#{I18n.t :universes, :scope => :resources}/1/#{I18n.t :galaxies, :scope => :resources}"
       routes.send(:universe_galaxy_planets_path, 1, 1).should == "/#{I18n.t :universes, :scope => :resources}/1/#{I18n.t :galaxies, :scope => :resources}/1/#{I18n.t :planets, :scope => :resources}"
@@ -211,7 +211,7 @@ describe :localized_routes do
         routes.send(:new_user_path).should == "/#{I18n.t :users, :scope => :resources}/#{I18n.t :new, :scope => :'routes.users.path_names'}"
         routes.send(:edit_user_path, 42).should == "/#{I18n.t :users, :scope => :resources}/42/#{I18n.t :edit, :scope => :'routes.users.path_names'}"
       end
-
+      
     end
     
     context "with member and collection" do

data/spec/locales/fr.yml

@@ -11,7 +11,7 @@ fr:
     users: utilisateurs
     authors: 'auteurs'
     books: 'livres'
-    galaxies: 'galaxies-en-francais'
+    galaxies: 'galaxies'
     planets: 'planetes'
     universes: 'univers'
     countries: 'pays'
@@ -24,4 +24,4 @@ fr:
     about: 'a-propos'
   path_names:
     new: 'nouveau'
-    edit: 'edition'  
+    edit: 'edition'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-13 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 
@@ -64,7 +63,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -72,7 +70,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 +81,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 !