提交 ec7c65cd 编写于 作者: P Phil Price

Localize compare conflict window title

上级 61a8de29
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册