cask --language: have specific match always trump general
This commit is contained in:
parent
e954bedc5f
commit
dc1edf6bfc
@ -134,9 +134,7 @@ module Hbc
|
||||
end
|
||||
|
||||
MacOS.languages.map(&Locale.method(:parse)).each do |locale|
|
||||
key = @language_blocks.keys.detect do |strings|
|
||||
strings.any? { |string| locale.include?(string) }
|
||||
end
|
||||
key = locale.detect(@language_blocks.keys)
|
||||
|
||||
next if key.nil?
|
||||
|
||||
|
@ -68,6 +68,11 @@ class Locale
|
||||
end
|
||||
alias == eql?
|
||||
|
||||
def detect(locale_groups)
|
||||
locale_groups.detect { |locales| locales.any? { |locale| eql?(locale) } } ||
|
||||
locale_groups.detect { |locales| locales.any? { |locale| include?(locale) } }
|
||||
end
|
||||
|
||||
def to_s
|
||||
[@language, @region, @script].compact.join("-")
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user