From 42ff0ec5e78c1bbf2215a588ab79a34a3eb418d6 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 11 Mar 2021 11:06:05 -0700 Subject: [PATCH] fix(lib/vscode): update dialogHandler Looks like a minor update to the localization for the detailString which I believe shows up when you go to Help:About. --- .../vs/workbench/browser/parts/dialogs/dialogHandler.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts index ea265e790..3a4682136 100644 --- a/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts +++ b/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts @@ -121,13 +121,8 @@ export class BrowserDialogHandler implements IDialogHandler { async about(): Promise { const detailString = (useAgo: boolean): string => { -<<<<<<< HEAD - return nls.localize('aboutDetail', - "code-server: v{4}\n VS Code: v{0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", -======= return localize('aboutDetail', - "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", ->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384 + "code-server: v{4}\n VS Code: v{0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", this.productService.version || 'Unknown', this.productService.commit || 'Unknown', this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',