From ec7c65cdc491fe921d55530153edd7e4b7b6181c Mon Sep 17 00:00:00 2001 From: Phil Price Date: Tue, 23 May 2017 11:55:03 -0700 Subject: [PATCH] Localize compare conflict window title --- extensions/merge-conflict/src/commandHandler.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts index 7a017e6ed3c..e8441f9221d 100644 --- a/extensions/merge-conflict/src/commandHandler.ts +++ b/extensions/merge-conflict/src/commandHandler.ts @@ -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); }