Merge remote-tracking branch 'upstream/pull/5410'

[rails.git] / lib / locale.rb

diff --git a/lib/locale.rb b/lib/locale.rb
index b0ad20fc793f4bd4332057af1002c38a39e3cfdd..5931301b5af6bf46f3291aa1b86418226b6b6857 100644 (file)
--- a/lib/locale.rb
+++ b/lib/locale.rb
@@ -10,16 +10,16 @@ class Locale < I18n::Locale::Tag::Rfc4646
       preferred.expand & self
     end
 
       preferred.expand & self
     end
 

-    def preferred(preferred)
-      candidates(preferred).first
+    def preferred(preferred, options = { :default => Locale.default })
+      candidates(preferred).first || options[:default]

     end
 
     def expand
       List.new(reverse.each_with_object([]) do |locale, expanded|
                  locale.candidates.uniq.reverse_each do |candidate|
     end
 
     def expand
       List.new(reverse.each_with_object([]) do |locale, expanded|
                  locale.candidates.uniq.reverse_each do |candidate|

-                   expanded << candidate if candidate == locale || !expanded.include?(candidate)
+                   expanded << candidate if candidate == locale || expanded.exclude?(candidate)

                  end
                  end

-               end.reverse.uniq << Locale.default)
+               end.reverse.uniq)

     end
   end
 
     end
   end