Add `Formatter::pluralize`.

6 files changed, 11 insertions, 11 deletions

diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index b06d99466..b7de0005c 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -43,7 +43,7 @@ module Homebrew
     if ARGV.named.empty?
       if HOMEBREW_CELLAR.exist?
         count = Formula.racks.length
-        puts "#{count} keg#{plural(count)}, #{HOMEBREW_CELLAR.abv}"
+        puts "#{Formatter.pluralize(count, "keg")}, #{HOMEBREW_CELLAR.abv}"
       end
     else
       ARGV.named.each_with_index do |f, i|
diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index 7dd1a6b93..8713b609e 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -67,7 +67,7 @@ module Homebrew
     if link_count.zero?
       puts "No apps linked to #{target_dir}" if ARGV.verbose?
     else
-      puts "Linked #{link_count} app#{plural(link_count)} to #{target_dir}"
+      puts "Linked #{Formatter.pluralize(link_count, "app")} to #{target_dir}"
     end
   end
 
diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb
index 225b70097..b710fcf55 100644
--- a/Library/Homebrew/cmd/tap-info.rb
+++ b/Library/Homebrew/cmd/tap-info.rb
@@ -50,11 +50,11 @@ module Homebrew
         pinned_count += 1 if tap.pinned?
         private_count += 1 if tap.private?
       end
-      info = "#{tap_count} tap#{plural(tap_count)}"
+      info = Formatter.pluralize(tap_count, "tap").to_s
       info += ", #{pinned_count} pinned"
       info += ", #{private_count} private"
-      info += ", #{formula_count} formula#{plural(formula_count, "e")}"
-      info += ", #{command_count} command#{plural(command_count)}"
+      info += ", #{Formatter.pluralize(formula_count, "formula")}"
+      info += ", #{Formatter.pluralize(command_count, "command")}"
       info += ", #{Tap::TAP_DIRECTORY.abv}" if Tap::TAP_DIRECTORY.directory?
       puts info
     else
@@ -65,10 +65,10 @@ module Homebrew
           info += tap.pinned? ? "pinned" : "unpinned"
           info += ", private" if tap.private?
           if (formula_count = tap.formula_files.size) > 0
-            info += ", #{formula_count} formula#{plural(formula_count, "e")}"
+            info += ", #{Formatter.pluralize(formula_count, "formula")}"
           end
           if (command_count = tap.command_files.size) > 0
-            info += ", #{command_count} command#{plural(command_count)}"
+            info += ", #{Formatter.pluralize(command_count, "command")}"
           end
           info += ", no formulae/commands" if (formula_count + command_count).zero?
           info += "\n#{tap.path} (#{tap.path.abv})"
diff --git a/Library/Homebrew/cmd/unlinkapps.rb b/Library/Homebrew/cmd/unlinkapps.rb
index b2ba458bf..7cae97e27 100644
--- a/Library/Homebrew/cmd/unlinkapps.rb
+++ b/Library/Homebrew/cmd/unlinkapps.rb
@@ -65,7 +65,7 @@ module Homebrew
       puts "No apps unlinked from #{target_dir}" if ARGV.verbose?
     else
       n = ObserverPathnameExtension.total
-      puts "Unlinked #{n} app#{plural(n)} from #{target_dir}"
+      puts "Unlinked #{Formatter.pluralize(n, "app")} from #{target_dir}"
     end
   end
 
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 361e0ffc1..c13d82090 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -80,7 +80,7 @@ module Homebrew
 
     unless updated_taps.empty?
       update_preinstall_header
-      puts "Updated #{updated_taps.size} tap#{plural(updated_taps.size)} " \
+      puts "Updated #{Formatter.pluralize(updated_taps.size, "tap")} " \
            "(#{updated_taps.join(", ")})."
       updated = true
     end
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index ce892f85c..cea77ad29 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -66,12 +66,12 @@ module Homebrew
     if formulae_to_install.empty?
       oh1 "No packages to upgrade"
     else
-      oh1 "Upgrading #{formulae_to_install.length} outdated package#{plural(formulae_to_install.length)}, with result:"
+      oh1 "Upgrading #{Formatter.pluralize(formulae_to_install.length, "outdated package")}, with result:"
       puts formulae_to_install.map { |f| "#{f.full_specified_name} #{f.pkg_version}" } * ", "
     end
 
     unless upgrade_pinned? || pinned.empty?
-      oh1 "Not upgrading #{pinned.length} pinned package#{plural(pinned.length)}:"
+      oh1 "Not upgrading #{Formatter.pluralize(pinned.length, "pinned package")}:"
       puts pinned.map { |f| "#{f.full_specified_name} #{f.pkg_version}" } * ", "
     end