a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Joe Previte 2021-03-11 11:06:05 -07:00
parent d1ad3fad5e
commit 42ff0ec5e7
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
View File

@ -121,13 +121,8 @@ export class BrowserDialogHandler implements IDialogHandler {
async about(): Promise<void> { async about(): Promise<void> {
const detailString = (useAgo: boolean): string => { 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', return localize('aboutDetail',
"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}", "code-server: v{4}\n VS Code: v{0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
this.productService.version || 'Unknown', this.productService.version || 'Unknown',
this.productService.commit || 'Unknown', this.productService.commit || 'Unknown',
this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown', this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',