diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index 94b19e385d0..ac9da614f25 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -168,14 +168,14 @@ export class ExtensionHostMain { }); userExtensions.forEach((userExtension) => { if (result.hasOwnProperty(userExtension.id)) { - collector.warn(userExtension.extensionFolderPath, 'Overwriting extension ' + result[userExtension.id].extensionFolderPath + ' with ' + userExtension.extensionFolderPath); + collector.warn(userExtension.extensionFolderPath, nls.localize('overwritingExtension', "Overwriting extesion {0} with {1}.", result[userExtension.id].extensionFolderPath, userExtension.extensionFolderPath)); } result[userExtension.id] = userExtension; }); developedExtensions.forEach(developedExtension => { - collector.info('', 'Loading development extension at ' + developedExtension.extensionFolderPath); + collector.info('', nls.localize('extensionUnderDevelopment', "Loading development extension at {0}", developedExtension.extensionFolderPath)); if (result.hasOwnProperty(developedExtension.id)) { - collector.warn(developedExtension.extensionFolderPath, 'Overwriting extension ' + result[developedExtension.id].extensionFolderPath + ' with ' + developedExtension.extensionFolderPath); + collector.warn(developedExtension.extensionFolderPath, nls.localize('overwritingExtension', "Overwriting extesion {0} with {1}.", result[developedExtension.id].extensionFolderPath, developedExtension.extensionFolderPath)); } result[developedExtension.id] = developedExtension; }); diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts index d59e2f6bf37..b39b8a658aa 100644 --- a/src/vs/workbench/node/extensionPoints.ts +++ b/src/vs/workbench/node/extensionPoints.ts @@ -5,6 +5,7 @@ 'use strict'; +import * as nls from 'vs/nls'; import pfs = require('vs/base/node/pfs'); import {IExtensionDescription, IMessage} from 'vs/platform/extensions/common/extensions'; import Severity from 'vs/base/common/severity'; @@ -93,13 +94,13 @@ class ExtensionManifestParser extends ExtensionManifestHandler { let extensionDescription: IExtensionDescription = json.parse(manifestContents.toString(), errors); if (errors.length > 0) { errors.forEach((error) => { - this._collector.error(this._absoluteFolderPath, 'Failed to parse ' + this._absoluteManifestPath + ': ' + error); + this._collector.error(this._absoluteFolderPath, nls.localize('jsonParseFail', "Failed to parse {0}: {1}.", this._absoluteManifestPath, error)); }); return null; } return extensionDescription; }, (err) => { - this._collector.error(this._absoluteFolderPath, 'Cannot read file ' + this._absoluteManifestPath + ': ' + err.message); + this._collector.error(this._absoluteFolderPath, nls.localize('fileReadFail', "Cannot read file {0}: {1}.", this._absoluteManifestPath, err.message)); return null; }); } @@ -124,14 +125,14 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler { let messages: { [key: string]: string; } = json.parse(messageBundleContent.toString(), errors); if (errors.length > 0) { errors.forEach((error) => { - this._collector.error(this._absoluteFolderPath, 'Failed to parse ' + messageBundle + ': ' + error); + this._collector.error(this._absoluteFolderPath, nls.localize('jsonParseFail', "Failed to parse {0}: {1}.", messageBundle, error)); }); return extensionDescription; } ExtensionManifestNLSReplacer._replaceNLStrings(extensionDescription, messages, this._collector, this._absoluteFolderPath); return extensionDescription; }, (err) => { - this._collector.error(this._absoluteFolderPath, 'Cannot read file ' + messageBundle + ': ' + err.message); + this._collector.error(this._absoluteFolderPath, nls.localize('fileReadFail', "Cannot read file {0}: {1}.", messageBundle, err.message)); return null; }); }); @@ -186,7 +187,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler { } literal[key] = message; } else { - collector.warn(messageScope, `Couldn't find message for key ${messageKey}.`); + collector.warn(messageScope, nls.localize('missingNLSKey', "Couldn't find message for key {0}.", messageKey)); } } } else if (Types.isObject(value)) {