translate_routes 3.0.2 → 3.0.3

data/README.markdown

@@ -9,46 +9,51 @@ It works fine with all kind of routing definitions, including RESTful and named
 **Your current code will remain untouched**: your current routing code, helpers and links will be translated transparently - even in your tests.
 (Un)installing it is a very clean and simple process, so why don't you give it a chance? ;)
 
-Quick start
+Installation
+------------
+Add translate_routes to your `Gemfile`:
+  
+    gem 'translate_routes'
+    
+And let bundle do the rest:
+
+    bundle install
+
+Quick Start
 -----------
 
-Let's start with a tiny example. Of course you need to define your routes first, e.g:
+1) Let's imagine you have this `routes.rb` file:
 
-    YourApp::Application.routes.draw do
-      match 'contact', :to => 'contact#index', :as => 'contact'
+    TranslateRoutesApp::Application.routes.draw do
+      match 'contact' => 'contact#index'
     end
 
-1) Download the plugin to your app's `/vendor/plugins` directory.
-
-2) Write your translations on a standard YAML file (e.g: i18n-routes.yml), including the locales and it translations pairs:
+You can see the available routes with the `rake routes` task:
 
-    es:
-      contact: contacto
 
+    contact  /contact(.:format) {:controller=>"contact", :action=>"index"}
 
-3) Append a line to your routes.rb file to activate the translations. If you loaded the translations file with
-your other I18n translations files, the line will be:
+2) Now write your translations on a standard YAML file (e.g: in `/config/i18n-routes.yml`), including all the locales and their translations pairs:
 
-    ActionDispatch::Routing::Translator.i18n('es')
+    en:
+      # you can leave empty locales, for example the default one
+    es:
+      contact: contacto
 
-and if you want to keep the file separated (e.g: config/i18n-routes.yml), the line to append is:
+3) Append this line in your `routes.rb` file to activate the translations specifying the path of the translations file:
 
     ActionDispatch::Routing::Translator.translate_from_file('config','i18n-routes.yml')
 
-You can see it working by executing `rake routes` on the shell:
-
-
-    contact_es_es_path /es-ES/contacto {:locale=>"es", :controller=>"contact", :action=>"index"}
-    contact_en_us_path /contact        {:locale=>"'en'", :controller=>"contact", :action=>"index"}
-
+4) Execute `rake routes` to see the new routes:
 
-As we can see, a new spanish route has been setted up and a `locale` parameter has been added to the routes.
+    contact_es  /es/contacto(.:format) {:controller=>"contact", :action=>"index"}
+    contact_en  /contact(.:format)     {:controller=>"contact", :action=>"index"}
 
-4) Include this filter in your ApplicationController:
+5) Include this filter in your ApplicationController:
 
     before_filter :set_locale_from_url
 
-Now your application recognizes the different routes and sets the `I18n.locale` value on your controllers,
+Now your application recognizes the different routes and sets the `I18n.locale` value in your controllers,
 but what about the routes generation? As you can see on the previous `rake routes` execution, the
 `contact_es_es_path` and `contact_en_us_path` routing helpers have been generated and are
 available in your controllers and views. Additionally, a `contact_path` helper has been generated, which
@@ -56,7 +61,7 @@ generates the routes according to the current request's locale. This way your li
 
 This means that if you use named routes **you don't need to modify your application links** because the routing helpers are automatically adapted to the current locale.
 
-5) Hey, but what about my tests?
+6) Hey, but what about my tests?
 
 Of course, your functional and integration testing involves some requests.
 The plugin includes some code to add a default locale parameter so they can remain untouched.

data/lib/route_translator.rb

@@ -222,7 +222,7 @@ class RouteTranslator
       final_optional_segments = path.match(/(\(.+\))$/)[1] rescue nil   # i.e: (.:format)
       path_segments = path.gsub(final_optional_segments,'').split("/")
       new_path = path_segments.map{ |seg| translate_path_segment(seg, locale) }.join('/')
-      new_path = "/#{locale}#{new_path}" if add_prefix? locale
+      new_path = "/#{locale.downcase}#{new_path}" if add_prefix? locale
       new_path = '/' if new_path.blank?
       final_optional_segments ? new_path + final_optional_segments : new_path
     end
@@ -237,7 +237,7 @@ class RouteTranslator
 
       match = TRANSLATABLE_SEGMENT.match(segment)[1] rescue nil
 
-      translate_string(match, locale) || segment
+      (translate_string(match, locale) || segment).downcase
     end
 
     def translate_string str, locale

data/test/translate_routes_test.rb

@@ -157,6 +157,21 @@ class TranslateRoutesTest < ActionController::TestCase
     assert_equal '/es(.:format)', path_string(named_route('root_es'))
   end
   
+  def test_routes_translations_are_always_downcased
+    @routes.draw { match 'people', :to => 'people#index', :as => 'people'}
+    config_default_locale_settings 'en'
+    @route_translator.yield_dictionary { |t| t['en'] = {}; t['es'] = {'people' => 'Gente'} }
+    translate_routes
+    assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'es'
+  end
+
+  def test_routes_locale_prefixes_are_always_downcased
+    @routes.draw { match 'people', :to => 'people#index', :as => 'people'}
+    config_default_locale_settings 'en'
+    @route_translator.yield_dictionary { |t| t['en'] = {}; t['ES'] = {'people' => 'Gente'} }
+    translate_routes
+    assert_routing '/es/gente', :controller => 'people', :action => 'index', :locale => 'ES'
+  end
   
   def test_languages_load_from_file
     @routes.draw { match 'people', :to => 'people#index', :as => 'people'}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: translate_routes
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Raul Murciano
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-12-28 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -38,8 +38,8 @@ homepage: http://github.com/raul/translate_routes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement