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

Remove ActiveSupport String inflections

Browse Source
This commit is contained in:
Douglas Eichelberger 2023-03-07 10:16:52 -08:00
parent 6ffda80a8a
commit 7aab1c2a38
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/kernel.rb
View File

@ -199,13 +199,13 @@ module Kernel
if s > 59 if s > 59
m = s / 60 m = s / 60
s %= 60 s %= 60
res = +"#{m} #{"minute".pluralize(m)}" res = +"#{m} #{Utils.pluralize("minute", m)}"
return res.freeze if s.zero? return res.freeze if s.zero?
res << " " res << " "
end end
res << "#{s} #{"second".pluralize(s)}" res << "#{s} #{Utils.pluralize("second", s)}"
res.freeze res.freeze
end end

9
Library/Homebrew/global.rb
View File

@ -16,7 +16,8 @@ require "active_support/core_ext/object/blank"
require "active_support/core_ext/string/filters" require "active_support/core_ext/string/filters"
require "active_support/core_ext/object/try" require "active_support/core_ext/object/try"
require "active_support/core_ext/array/access" require "active_support/core_ext/array/access"
require "active_support/core_ext/string/inflections" require "i18n"
require "active_support/core_ext/hash/except"
require "active_support/core_ext/kernel/reporting" require "active_support/core_ext/kernel/reporting"
require "active_support/core_ext/hash/keys" require "active_support/core_ext/hash/keys"
require "active_support/core_ext/hash/deep_merge" require "active_support/core_ext/hash/deep_merge"
@ -28,12 +29,6 @@ require "active_support/core_ext/string/indent"
I18n.backend.available_locales # Initialize locales so they can be overwritten. I18n.backend.available_locales # Initialize locales so they can be overwritten.
I18n.backend.store_translations :en, support: { array: { last_word_connector: " and " } } I18n.backend.store_translations :en, support: { array: { last_word_connector: " and " } }
ActiveSupport::Inflector.inflections(:en) do |inflect|
inflect.irregular "formula", "formulae"
inflect.irregular "is", "are"
inflect.irregular "it", "they"
end
HOMEBREW_API_DEFAULT_DOMAIN = ENV.fetch("HOMEBREW_API_DEFAULT_DOMAIN").freeze HOMEBREW_API_DEFAULT_DOMAIN = ENV.fetch("HOMEBREW_API_DEFAULT_DOMAIN").freeze
HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV.fetch("HOMEBREW_BOTTLE_DEFAULT_DOMAIN").freeze HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV.fetch("HOMEBREW_BOTTLE_DEFAULT_DOMAIN").freeze
HOMEBREW_BREW_DEFAULT_GIT_REMOTE = ENV.fetch("HOMEBREW_BREW_DEFAULT_GIT_REMOTE").freeze HOMEBREW_BREW_DEFAULT_GIT_REMOTE = ENV.fetch("HOMEBREW_BREW_DEFAULT_GIT_REMOTE").freeze