Update compiler localized messages with those provided by the language service.

CyrusNajmabadi · CyrusNajmabadi · commit a14e46a5e73c · 2014-10-02T17:58:05.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -369,6 +369,7 @@ module ts {
             if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
                 return null;
             }
+
             try {
                 return JSON.parse(diagnosticMessagesJson);
             }

Original file line number	Diff line number	Diff line change
`@@ -1650,8 +1650,8 @@ module ts {`
`1650`	`1650`	`var writer: (filename: string, data: string, writeByteOrderMark: boolean) => void = undefined;`
`1651`	`1651`
`1652`	`1652`	`// Check if the localized messages json is set, otherwise query the host for it`
`1653`		`- if (!TypeScript.LocalizedDiagnosticMessages) {`
`1654`		`- TypeScript.LocalizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();`
	`1653`	`+ if (!localizedDiagnosticMessages) {`
	`1654`	`+ localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();`
`1655`	`1655`	`}`
`1656`	`1656`
`1657`	`1657`	`function getSourceFile(filename: string): SourceFile {`
Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ module ts {`
`369`	`369`	`if (diagnosticMessagesJson == null \|\| diagnosticMessagesJson == "") {`
`370`	`370`	`return null;`
`371`	`371`	`}`
	`372`	`+`
`372`	`373`	`try {`
`373`	`374`	`return JSON.parse(diagnosticMessagesJson);`
`374`	`375`	`}`