From e2b3753fd91c47beeb3227a1c0df4c0dfa6026fc Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 3 Oct 2016 02:34:32 +0200 Subject: [PATCH] Style changes in `language_eval`. --- Library/Homebrew/cask/lib/hbc/dsl.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/lib/hbc/dsl.rb index a1129a21aeeb1..8e0a7715af427 100644 --- a/Library/Homebrew/cask/lib/hbc/dsl.rb +++ b/Library/Homebrew/cask/lib/hbc/dsl.rb @@ -114,22 +114,25 @@ def language(*args, default: false, &block) @language_blocks.default = block else language_eval - @language end end def language_eval - return if instance_variable_defined?(:@language) + return @language if instance_variable_defined?(:@language) - return unless instance_variable_defined?(:@language_blocks) + if @language_blocks.nil? || @language_blocks.empty? + return @language = nil + end - MacOS.languages.map(&Locale.method(:parse)).any? { |locale| + MacOS.languages.map(&Locale.method(:parse)).each do |locale| key = @language_blocks.keys.detect { |strings| strings.any? { |string| locale.include?(string) } } - return @language = @language_blocks[key].call unless key.nil? - } + next if key.nil? + + return @language = @language_blocks[key].call + end @language = @language_blocks.default.call end