lib/merb_global/locale.rb in emipair-merb_global-0.0.2 vs lib/merb_global/locale.rb in emipair-merb_global-0.0.3

- old
+ new

@@ -99,9 +99,10 @@ end lang = lang.base_locale return lang if lang && Merb::Global::Locale.support?(lang) end end + return nil end # Returns current locale def self.current Thread.current.mg_locale