Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make MacOS.language less opinionated and add language stanza. #906

Merged
merged 15 commits into from
Oct 3, 2016
Merged

Make MacOS.language less opinionated and add language stanza. #906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1a25f1e
Make `MacOS.language` less opinionated.
reitermarkus Sep 10, 2016
929c594
Add test for `MacOS.languages`.
reitermarkus Sep 10, 2016
f52116c
Add `language` stanza to cask DSL.
reitermarkus Sep 14, 2016
65fdfef
Add `language_eval` method.
reitermarkus Sep 18, 2016
87299af
Add test for `language` stanza.
reitermarkus Sep 21, 2016
1e86c7d
Always fall back to `language :default`.
reitermarkus Sep 21, 2016
b703c81
Stub `MacOS.languages` instead of setting HOMEBREW_LANGUAGES.
reitermarkus Sep 21, 2016
546a91f
Add `—language` option.
reitermarkus Sep 25, 2016
bc2d676
Refactor logic to always choose first matched language.
reitermarkus Sep 25, 2016
bc143bb
Support `audit` for multilingual casks.
reitermarkus Sep 25, 2016
b5531e8
Add Locale class to enable easier matching of locales.
reitermarkus Sep 27, 2016
013f33b
Change language DSL to only allow strings.
reitermarkus Sep 27, 2016
b104e6f
Raise error if more than one default language if specified.
reitermarkus Sep 27, 2016
ef26bf1
Refactor audit for changed DSL.
reitermarkus Sep 28, 2016
e2b3753
Style changes in `language_eval`.
reitermarkus Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stub MacOS.languages instead of setting HOMEBREW_LANGUAGES.
  • Loading branch information
@reitermarkus
reitermarkus committed Oct 3, 2016
commit b703c81ca6640ee2ff3d0489462c672a2aa18c0f
10 changes: 3 additions & 7 deletions Library/Homebrew/cask/test/cask/dsl_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@
end

describe "language stanza" do
after(:each) do
ENV["HOMEBREW_LANGUAGES"] = nil
end

it "allows multilingual casks" do
cask = lambda {
Hbc::Cask.new("cask-with-apps") do
Expand All @@ -144,13 +140,13 @@
end
}

ENV["HOMEBREW_LANGUAGES"] = "FIRST_LANGUAGE"
MacOS.stubs(languages: ["FIRST_LANGUAGE"])
cask.call.language.must_equal :first

ENV["HOMEBREW_LANGUAGES"] = "SECOND_LANGUAGE"
MacOS.stubs(languages: ["SECOND_LANGUAGE"])
cask.call.language.must_equal :second

ENV["HOMEBREW_LANGUAGES"] = "THIRD_LANGUAGE"
MacOS.stubs(languages: ["THIRD_LANGUAGE"])
cask.call.language.must_equal :default
end
end
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/os/mac.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def cat
end

def languages
if ENV["HOMEBREW_LANGUAGES"]
@languages ||= if ENV["HOMEBREW_LANGUAGES"]
ENV["HOMEBREW_LANGUAGES"].split(",")
else
@languages ||= Utils.popen_read("defaults", "read", ".GlobalPreferences", "AppleLanguages").scan(/[^ \n"(),]+/)
Utils.popen_read("defaults", "read", ".GlobalPreferences", "AppleLanguages").scan(/[^ \n"(),]+/)
end
end

Expand Down