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

Localization for codelens and warning messages.

Browse Source
This commit is contained in:
Phil Price
2017-05-22 14:21:36 -07:00
parent a8fe17a808
commit fd94a29f3a
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/merge-conflict/src/codelensProvider.ts
View File

@@ -5,6 +5,8 @@
import * as vscode from 'vscode';
import * as interfaces from './interfaces';
import { loadMessageBundle } from 'vscode-nls';
const localize = loadMessageBundle();
export default class MergeConflictCodeLensProvider implements vscode.CodeLensProvider, vscode.Disposable {
@@ -47,25 +49,25 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
conflicts.forEach(conflict => {
let acceptCurrentCommand: vscode.Command = {
command: 'merge-conflict.accept.current',
title: `Accept current change`,
title: localize('acceptCurrentChange', 'Accept current change'),
arguments: ['known-conflict', conflict]
};
let acceptIncomingCommand: vscode.Command = {
command: 'merge-conflict.accept.incoming',
title: `Accept incoming change`,
title: localize('acceptIncomingChange', 'Accept incoming change'),
arguments: ['known-conflict', conflict]
};
let acceptBothCommand: vscode.Command = {
command: 'merge-conflict.accept.both',
title: `Accept both changes`,
title: localize('acceptBothChanges', 'Accept both changes'),
arguments: ['known-conflict', conflict]
};
let diffCommand: vscode.Command = {
command: 'git.merge.compare',
title: `Compare changes`,
title: localize('compareChanges', 'Compare changes'),
arguments: [conflict]
};