test/views/respond_to/all_types_with_layout.html.erb test/views/respond_to/all_types_with_layout.js.rjs test/views/respond_to/using_defaults.html.en.erb test/views/respond_to/using_defaults.html.erb test/views/respond_to/using_defaults.html.fr.erb test/views/respond_to/using_defaults.js.en.rjs test/views/respond_to/using_defaults.js.fr.rjs test/views/respond_to/using_defaults.js.rjs test/views/respond_to/using_defaults.xml.builder test/views/respond_to/using_defaults.xml.en.builder test/views/respond_to/using_defaults.xml.fr.builder test/views/respond_to/using_defaults_with_type_list.html.en.erb test/views/respond_to/using_defaults_with_type_list.html.erb test/views/respond_to/using_defaults_with_type_list.html.fr.erb test/views/respond_to/using_defaults_with_type_list.js.en.rjs test/views/respond_to/using_defaults_with_type_list.js.fr.rjs test/views/respond_to/using_defaults_with_type_list.js.rjs test/views/respond_to/using_defaults_with_type_list.xml.builder test/views/respond_to/using_defaults_with_type_list.xml.en.builder test/views/respond_to/using_defaults_with_type_list.xml.fr.builder @@ -5,7 +5,7 @@ module ActionView # :nodoc: all # Name of file extensions which are handled internally in rails. Other types # like liquid has to register through register_handler. - @@re_extension = /\.(rjs|rhtml|rxml)$/ + @@re_extension = /\.(erb|rjs|builder)$/ @@globalize_path_cache = {} @@ -36,9 +36,8 @@ module ActionView # :nodoc: all cached = @@globalize_path_cache[cache_key] return cached if cached - if use_full_path - template_path_without_extension, template_extension = path_and_extension(template_path) - + template_path_without_extension, template_extension = path_and_extension(template_path) + if use_full_path if template_extension template_file_name = full_template_path(template_path_without_extension, template_extension) else @@ -47,7 +46,7 @@ module ActionView # :nodoc: all raise ActionViewError, "No #{template_handler_preferences.to_sentence} template found for #{template_path} in #{view_paths.inspect}" end template_file_name = full_template_path(template_path, template_extension) - template_extension = template_extension.gsub(/^\w+\./, '') # strip off any formats + template_extension = template_extension.gsub(/^.+\./, '') # strip off any formats end else template_file_name = template_path lib/globalize/rails/action_view.rb test/views/respond_to/all_types_with_layout.rhtml test/views/respond_to/all_types_with_layout.rjs test/views/respond_to/using_defaults.en.rhtml test/views/respond_to/using_defaults.en.rjs test/views/respond_to/using_defaults.en.rxml test/views/respond_to/using_defaults.fr.rhtml test/views/respond_to/using_defaults.fr.rjs test/views/respond_to/using_defaults.fr.rxml test/views/respond_to/using_defaults.rhtml test/views/respond_to/using_defaults.rjs test/views/respond_to/using_defaults.rxml test/views/respond_to/using_defaults_with_type_list.en.rhtml test/views/respond_to/using_defaults_with_type_list.en.rjs test/views/respond_to/using_defaults_with_type_list.en.rxml test/views/respond_to/using_defaults_with_type_list.fr.rhtml test/views/respond_to/using_defaults_with_type_list.fr.rjs test/views/respond_to/using_defaults_with_type_list.fr.rxml test/views/respond_to/using_defaults_with_type_list.rhtml test/views/respond_to/using_defaults_with_type_list.rjs test/views/respond_to/using_defaults_with_type_list.rxml df8aec5e4ccddb9f5cbee41f0c83d9c131fb93dd Yann Lugrin yann.lugrin@sans-savoir.net http://github.com/yannlugrin/globalize/commit/5ef08e8fc190c49a73a0eb246255b454a8a0f56b 5ef08e8fc190c49a73a0eb246255b454a8a0f56b 2007-12-17T08:38:44-08:00 2007-12-17T08:38:44-08:00 tests pass with Rails 2.0.2 (change yours views extenstion, exemple: *.html.en.erb or *.xml.en.builder) 484648391ddb654603bbe340c0d9fac31450296d Yann Lugrin yann.lugrin@sans-savoir.net