Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4152: use nls.localize in errors/warnings messages

Browse Source
This commit is contained in:
Alex Dima
2016-03-15 12:47:36 +01:00
parent 405fc91c56
commit 646469dc35
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/node/extensionHostMain.ts
View File

@@ -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;
});

11
src/vs/workbench/node/extensionPoints.ts
View File

@@ -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)) {