From a14e46a5e73c6e9694782a4c41ece0cce07e40e2 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 2 Oct 2014 17:58:05 -0700
Subject: [PATCH] Update compiler localized messages with those provided by the
 language service.

---
 src/compiler/core.ts                | 8 +++-----
 src/services/core/diagnosticCore.ts | 2 --
 src/services/services.ts            | 4 ++--
 src/services/shims.ts               | 1 +
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index fb2bde52453..123bde2e719 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -209,11 +209,9 @@ module ts {
     export var localizedDiagnosticMessages: Map<string> = undefined;
 
     export function getLocaleSpecificMessage(message: string) {
-        if (ts.localizedDiagnosticMessages) {
-            message = localizedDiagnosticMessages[message];
-        }
-
-        return message;
+        return localizedDiagnosticMessages && localizedDiagnosticMessages[message]
+            ? localizedDiagnosticMessages[message]
+            : message;
     }
 
     export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage, ...args: any[]): Diagnostic;
diff --git a/src/services/core/diagnosticCore.ts b/src/services/core/diagnosticCore.ts
index b4d95a1c60b..369b8114eac 100644
--- a/src/services/core/diagnosticCore.ts
+++ b/src/services/core/diagnosticCore.ts
@@ -1,8 +1,6 @@
 ///<reference path='references.ts' />
 
 module TypeScript {
-    export var LocalizedDiagnosticMessages: ts.Map<any> = null;
-
     export class Location {
         private _fileName: string;
         private _lineMap: LineMap;
diff --git a/src/services/services.ts b/src/services/services.ts
index 7463acc6c68..88efbaf2a2a 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1650,8 +1650,8 @@ module ts {
         var writer: (filename: string, data: string, writeByteOrderMark: boolean) => void = undefined;
 
         // Check if the localized messages json is set, otherwise query the host for it
-        if (!TypeScript.LocalizedDiagnosticMessages) {
-            TypeScript.LocalizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
+        if (!localizedDiagnosticMessages) {
+            localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
         }
 
         function getSourceFile(filename: string): SourceFile {
diff --git a/src/services/shims.ts b/src/services/shims.ts
index a1e616f6c77..f2b259ffa93 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -369,6 +369,7 @@ module ts {
             if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
                 return null;
             }
+
             try {
                 return JSON.parse(diagnosticMessagesJson);
             }