development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Localize compare conflict window title

Browse source
This commit is contained in:
Phil Price 2017-05-23 11:55:03 -07:00
parent 61a8de29c3
commit ec7c65cdc4
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/merge-conflict/src/commandHandler.ts
View file

@ -92,14 +92,10 @@ export default class CommandHandler implements vscode.Disposable {
query: JSON.stringify(range)
});
const leftTitle = `Current changes`; // (Ln ${range.start.line}${!range.isSingleLine ? `-${range.end.line}` : ''})`;
range = conflict.incoming.content;
const rightUri = leftUri.with({ query: JSON.stringify(range) });
const rightTitle = `Incoming changes`; // (Ln${range.start.line}${!range.isSingleLine ? `-${range.end.line}` : ''})`;
const title = `${fileName}: ${leftTitle} \u2194 ${rightTitle}`;
const title = localize('compareChangesTitle', '{0}: Current changes \u2194 Incoming changes', fileName);
vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
}