admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cask --language: have specific match always trump general

Browse Source
This commit is contained in:
Vítor Galvão 2018-05-28 15:01:58 +01:00
parent e954bedc5f
commit dc1edf6bfc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/lib/hbc/dsl.rb
View File

@ -134,9 +134,7 @@ module Hbc
end end
MacOS.languages.map(&Locale.method(:parse)).each do |locale| MacOS.languages.map(&Locale.method(:parse)).each do |locale|
key = @language_blocks.keys.detect do |strings| key = locale.detect(@language_blocks.keys)
strings.any? { |string| locale.include?(string) }
end
next if key.nil? next if key.nil?

5
Library/Homebrew/locale.rb
View File

@ -68,6 +68,11 @@ class Locale
end end
alias == eql? 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 def to_s
[@language, @region, @script].compact.join("-") [@language, @region, @script].compact.join("-")
end end