josevalim-localized_templates 0.2.1 → 0.3

data/README

@@ -2,7 +2,7 @@ Copyright (c) 2008 José Valim (jose.valim@gmail.com)
 http://www.pagestacker.com/
 http://josevalim.blogspot.com/
 License: MIT
-Version: 0.2.1
+Version: 0.3
 
 LocalizedTemplates
 ==================
@@ -13,17 +13,12 @@ You can localize your views using the following naming convention:
   <tt>pt-BR/projects/index.html.erb</tt>
   <tt>en-US/projects/edit.rss.builder</tt>
   
-  OR:
-
-  <tt>projects/pt-BR/index.html.erb</tt>
-  <tt>projects/en-US/index.html.erb</tt>
-
 And you can also localize rescue files:
 
   <tt>public/pt-BR/404.html</tt>
   <tt>public/en-US/404.html</tt>
 
-If you don't want to localize a file (like a xml file), simply don't change it and it will be
+If you don't want to localize a file (like a xml file), simply don't move it and it will be
 rendered as default to all languages.
 
 Installation

data/lib/localized_templates.rb

@@ -1,17 +1,17 @@
 # = Localized templates
 # 
 # This feature extends Rails template handling and allows the use of localized
-# templates like <code>projects/pt-BR/index.html.erb</code> or
-# <code>pt-BR/projects/index.html.erb</code>. The plugin will pick the
-# template matching the currently used locale (<code>I18n#locale</code>).
+# templates on the root of your views folder like <code>pt-BR/projects/index.html.erb</code>.
+# The plugin will pick the template matching the currently used locale
+# (<code>I18n#locale</code>).
 #
-# If the localized template isn't found, the plugin will try to render
-# <code>prjects/index.html.erb</code>. If <code>index.html.erb</code> doesn't
+# If the localized template isn't found, the plugin will try to render the default
+# <code>projects/index.html.erb</code>. If <code>index.html.erb</code> doesn't
 # exist, a 404 will be raised.
 #
 # If you have a template that is the same for all languages (like a xml file)
 # just keep it without localization: <code>index.xml.builder</code>.
-
+#
 # Theoretically, we just need to overwrite _pick_template and _pick_partial_template
 # methods in order to have LocalizedTemplates, but memoize doesn't help
 # since it doesn't see locale changes and would memoize values for only one locale.

data/lib/localized_templates/actionview/base.rb

@@ -46,9 +46,6 @@ module ActionView
         # Try to render locale/controller/action
         if locale && template = _template_view_path_check("#{locale}/#{template_file_name}")
           template
-        # Try to render controller/locale/action
-        elsif locale && template = _template_view_path_check(template_file_name.gsub(/\//, "/#{locale}/"))
-          template
         # Try to render controller/action
         elsif template = _template_view_path_check(template_file_name)
           template

data/lib/localized_templates/actionview/partials.rb

@@ -10,7 +10,7 @@ module ActionView
           if options.has_key?(:collection)
             render_partial_collection(options)
           else
-            _pick_partial_template(partial_path).render_partial(self, options[:object], local_assigns)
+            _pick_partial_template(partial_path, I18n.locale).render_partial(self, options[:object], local_assigns)
           end
         when ActionView::Helpers::FormBuilder
           builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-localized_templates
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: "0.3"
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-29 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -69,8 +69,8 @@ test_files:
 - test/fixtures/layouts/default.html.erb
 - test/fixtures/projects/index.html.erb
 - test/fixtures/projects/index.rss.builder
-- test/fixtures/projects/en-US/index.rss.builder
-- test/fixtures/projects/pt-BR/index.html.erb
+- test/fixtures/en-US/projects/index.rss.builder
+- test/fixtures/pt-BR/projects/index.html.erb
 - test/fixtures/pt-BR/layouts/default.html.erb
 - test/fixtures/public/500.html
 - test/fixtures/public/en-US/404.html