i18n_routing 0.3.4 → 0.3.5

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+0.3.5 (June 9, 2010)
+
+* Clean up some .to_sym in order to avoid unnecessary symbols during runtime
+* Works with both I18n.locale as string or as symbol
+* Try to fix a Pathname instead of string issue
+
 0.3.4 (June 3, 2010)
 
 * Fix Rails3 issue with nested single resource again and pluralize controller name as it should be

data/README.rdoc

@@ -2,9 +2,18 @@
 
 I18n_routing is a plugin for Ruby on Rails that lets you easily translate your routes trough the I18n api included in Rails since version 2.2
 
-All necessary informations are available on the wiki : http://wiki.github.com/kwi/i18n_routing
+All necessary informations are available on the wiki: http://wiki.github.com/kwi/i18n_routing
 
-Works with Rails 2.3 and Rails3 !
+For any question, use the i18_routing google group: http://groups.google.com/group/i18n-routing
+
+Works with Rails 2.3 and Rails3 beta3 !
+
+== 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,12 +7,12 @@ module I18nRouting
 
     # First, if an option is given, try to get the translation in the routes scope
     if option
-      t = I18n.t(option.to_sym, :scope => "routes.#{name}.#{type}".to_sym, :default => option.to_s)
+      t = I18n.t(option, :scope => "routes.#{name}.#{type}", :default => option.to_s)
 
       return (t || name)
     else
       # Try to get the translation in routes namescope first      
-      t = I18n.t(:as, :scope => "routes.#{name}".to_sym, :default => name.to_s)
+      t = I18n.t(:as, :scope => "routes.#{name}", :default => name.to_s)
       
       return t if t and t != name.to_s
 

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 == :#{@glang}"
+            r << " and I18n.locale.to_sym == :#{@glang}"
           end
 
           return r

data/lib/i18n_routing_rails3.rb

@@ -39,7 +39,7 @@ module I18nRouting
           if localized_path and localized_path != resource.name.to_s 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.to_sym
+            opts[:path] = localized_path
             opts[:controller] ||= r.to_s.pluralize
 
             res = ["#{locale}_#{r}".to_sym, opts]
@@ -146,7 +146,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')]).uniq
+        I18n.load_path = (I18n.load_path << Dir[Rails.root.join('config', 'locales', '*.yml').to_s]).uniq
         @i18n_routing_path_set = true
       end
       
@@ -284,7 +284,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]}".to_sym
+        @options[:as] = "#{locale}_#{@options[:as]}"
         @path = @localized_path
         @options[:constraints] = @options[:constraints] ? @options[:constraints].dup : {}
         @options[:constraints][:i18n_locale] = locale.to_s
@@ -365,7 +365,7 @@ module I18nRouting
     # If a @locale is present and if this locale is not the current one
     #  => return nil and refuse to generate the route
     def generate_with_i18n_routing(method, params = {}, recall = {}, options = {})
-      return nil if @locale and @locale != I18n.locale
+      return nil if @locale and @locale != I18n.locale.to_sym
       generate_without_i18n_routing(method, params, recall, options)
     end
 

data/spec/i18n_routing/i18n_spec.rb

@@ -169,6 +169,13 @@ describe :localized_routes do
       routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
     end
 
+    it "named_route generates route using localized values and I18n.locale as a string" do
+      o = I18n.locale
+      I18n.locale = "fr"
+      routes.send(:about_path).should == "/#{I18n.t :about, :scope => :named_routes_path}"
+      I18n.locale = o
+    end
+
     it "resource generates routes using localized values" do
       routes.send(:contact_path).should == "/#{I18n.t :contact, :scope => :resource}"
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency