Merge pull request #3195 from reitermarkus/fix-language_eval
Fail if no default language is specified.
This commit is contained in:
commit
22e329fb02
@ -105,7 +105,9 @@ module Hbc
|
|||||||
end
|
end
|
||||||
|
|
||||||
def language(*args, default: false, &block)
|
def language(*args, default: false, &block)
|
||||||
if !args.empty? && block_given?
|
if args.empty?
|
||||||
|
language_eval
|
||||||
|
elsif block_given?
|
||||||
@language_blocks ||= {}
|
@language_blocks ||= {}
|
||||||
@language_blocks[args] = block
|
@language_blocks[args] = block
|
||||||
|
|
||||||
@ -117,7 +119,7 @@ module Hbc
|
|||||||
|
|
||||||
@language_blocks.default = block
|
@language_blocks.default = block
|
||||||
else
|
else
|
||||||
language_eval
|
raise CaskInvalidError.new(cask, "No block given to language stanza.")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -126,6 +128,10 @@ module Hbc
|
|||||||
|
|
||||||
return @language = nil if @language_blocks.nil? || @language_blocks.empty?
|
return @language = nil if @language_blocks.nil? || @language_blocks.empty?
|
||||||
|
|
||||||
|
if @language_blocks.default.nil?
|
||||||
|
raise CaskInvalidError.new(cask, "No default language specified.")
|
||||||
|
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 = @language_blocks.keys.detect do |strings|
|
||||||
strings.any? { |string| locale.include?(string) }
|
strings.any? { |string| locale.include?(string) }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user