From ac541948c95b778e0da6945d2cec86bb9fba557d Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 23 May 2016 17:06:48 -0700
Subject: [PATCH] Fixed diagnostic message wording

---
 src/compiler/diagnosticMessages.json | 2 +-
 src/compiler/program.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index efc90dbdc48..9d8e7c7afda 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2756,7 +2756,7 @@
         "category": "Message",
         "code": 6131
     },
-    "No types specified in 'package.json' and is 'allowJs' set. Returning package 'main' value of '{0}' for module": {
+    "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'": {
         "category": "Message",
         "code": 6132
     },
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 68ea6e71e41..49762cf22b4 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -180,7 +180,7 @@ namespace ts {
         // Use the main module for inferring types if no types package specified and the allowJs is set
         if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
             if (state.traceEnabled) {
-                trace(state.host, Diagnostics.No_types_specified_in_package_json_and_is_allowJs_set_Returning_package_main_value_of_0_for_module, jsonContent.main);
+                trace(state.host, Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
             }
             const mainFilePath = normalizePath(combinePaths(baseDirectory, jsonContent.main));
             return mainFilePath;