From f4287f62adde617c687b1ca6981b28554f9069c8 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Mateusz=20Dro=C5=BCd=C5=BCy=C5=84ski?= Date: Wed, 18 Mar 2009 11:36:13 +0100 Subject: [PATCH] Add support for multipart extensions with locale, e.g. template.en.text.plain.erb --- actionpack/lib/action_view/template.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index c339c8a..57de172 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -231,7 +231,11 @@ module ActionView #:nodoc: extension = nil if m = extensions.split(".") - if valid_locale?(m[0]) && m[1] && valid_extension?(m[2]) # All three + if valid_locale?(m[0]) && m[1] && m[2] && valid_extension?(m[3]) # Locale, multipart format and extension + locale = m[0] + format = "#{m[1]}.#{m[2]}" + extenstion = m[3] + elsif valid_locale?(m[0]) && m[1] && valid_extension?(m[2]) # Locale, format and extenstion locale = m[0] format = m[1] extension = m[2] -- 1.6.0.2