From 3dc039e956d801f66b70ffa9f42c233dc4c0acab Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Mon, 11 Apr 2016 10:01:12 -0700
Subject: [PATCH] Fix plurals.

---
 .../src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt  | 2 +-
 .../src/main/kotlin/com/beust/kobalt/misc/Strings.kt          | 4 ++--
 src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt  | 4 ++--
 .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt   | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
index 84aaf274..f86176ea 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
@@ -69,7 +69,7 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
                 log(2, "Marking project ${project.name} as skipped")
                 failedProjects.add(project.name)
                 kobaltError("Not building project ${project.name} since it depends on failed "
-                        + Strings.pluralize("project", fp.size)
+                        + Strings.pluralize(fp.size, "project")
                         + " " + fp.joinToString(","))
             } else {
                 val projectName = project.name
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
index 8f79128b..26d4d576 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
@@ -4,8 +4,8 @@ import com.google.common.base.CharMatcher
 
 class Strings {
     companion object {
-        fun pluralize(s: String, n: Int) = s + (if (n != 1) "s" else "")
-        fun pluralizeAll(s: String, n: Int) = "$n " + pluralize(s, n)
+        fun pluralize(n:Int, s: String, plural: String = s) = plural + (if (n != 1) "s" else "")
+        fun pluralizeAll(n:Int, s: String, plural: String = s) = "$n " + pluralize(n, s, plural)
     }
 
 }
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
index 860a6ea0..f3436ca4 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
@@ -57,7 +57,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
                     command = "javac " + allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")
                     log(2, "Launching\n$command")
 
-                    log(1, "  Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
+                    log(1, "  Java compiling " + Strings.pluralizeAll(info.sourceFiles.size, "file"))
                     val result = task.call()
                     errorMessage = dc.diagnostics.joinToString("\n")
                     result
@@ -78,7 +78,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
                     val pb = ProcessBuilder(allArgs)
                     pb.inheritIO()
                     val line = allArgs.joinToString(" ")
-                    log(1, "  Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
+                    log(1, "  Java compiling " + Strings.pluralizeAll(info.sourceFiles.size, "file"))
                     log(2, "  Java compiling $line")
 
                     command = allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
index 3eb13c37..8e16021a 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
@@ -39,7 +39,8 @@ class KotlinCompiler @Inject constructor(
     val compilerAction = object: ICompilerAction {
         override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {
             val version = settings.kobaltCompilerVersion
-            log(1, "  Kotlin $version compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
+            log(1, "  Kotlin $version compiling "
+                    + Strings.pluralizeAll(info.sourceFiles.size, "directory", "directories" ))
             val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
             val infoDir = info.directory
             val outputDir = if (infoDir != null) {