resolves microsoft#91431

sbatten · sbatten · commit a69a45943e85 · 2020-02-28T12:04:27.000-08:00
diff --git a/src/vs/workbench/services/dialogs/browser/dialogService.ts b/src/vs/workbench/services/dialogs/browser/dialogService.ts
@@ -18,6 +18,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { fromNow } from 'vs/base/common/date';
 
 export class DialogService implements IDialogService {
 
@@ -121,18 +122,24 @@ export class DialogService implements IDialogService {
 	}
 
 	async about(): Promise<void> {
-		const detail = nls.localize('aboutDetail',
-			"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
-			this.productService.version || 'Unknown',
-			this.productService.commit || 'Unknown',
-			this.productService.date || 'Unknown',
-			navigator.userAgent
-		);
+		const detailString = (useAgo: boolean): string => {
+			return nls.localize('aboutDetail',
+				"Version: {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',
+				navigator.userAgent
+			);
+		};
+
+		const detail = detailString(true);
+		const detailToCopy = detailString(false);
+
 
 		const { choice } = await this.show(Severity.Info, this.productService.nameLong, [nls.localize('copy', "Copy"), nls.localize('ok', "OK")], { detail, cancelId: 1 });
 
 		if (choice === 0) {
-			this.clipboardService.writeText(detail);
+			this.clipboardService.writeText(detailToCopy);
 		}
 	}
 }
diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
@@ -23,6 +23,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IElectronService } from 'vs/platform/electron/node/electron';
 import { MessageBoxOptions } from 'electron';
+import { fromNow } from 'vs/base/common/date';
 
 interface IMassagedMessageBoxOptions {
 
@@ -216,17 +217,23 @@ class NativeDialogService implements IDialogService {
 		}
 
 		const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION;
-		const detail = nls.localize('aboutDetail',
-			"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}",
-			version,
-			product.commit || 'Unknown',
-			product.date || 'Unknown',
-			process.versions['electron'],
-			process.versions['chrome'],
-			process.versions['node'],
-			process.versions['v8'],
-			`${os.type()} ${os.arch()} ${os.release()}${isSnap ? ' snap' : ''}`
-		);
+
+		const detailString = (useAgo: boolean): string => {
+			return nls.localize('aboutDetail',
+				"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}",
+				version,
+				product.commit || 'Unknown',
+				product.date ? `${product.date}${useAgo ? ' (' + fromNow(new Date(product.date), true) + ')' : ''}` : 'Unknown',
+				process.versions['electron'],
+				process.versions['chrome'],
+				process.versions['node'],
+				process.versions['v8'],
+				`${os.type()} ${os.arch()} ${os.release()}${isSnap ? ' snap' : ''}`
+			);
+		};
+
+		const detail = detailString(true);
+		const detailToCopy = detailString(false);
 
 		const ok = nls.localize('okButton', "OK");
 		const copy = mnemonicButtonLabel(nls.localize({ key: 'copy', comment: ['&& denotes a mnemonic'] }, "&&Copy"));
@@ -249,7 +256,7 @@ class NativeDialogService implements IDialogService {
 		});
 
 		if (buttons[result.response] === copy) {
-			this.clipboardService.writeText(detail);
+			this.clipboardService.writeText(detailToCopy);
 		}
 	}
 }
