From ee36c8c2dfe2e279c4b58af4d47fdf6fc85bb9f5 Mon Sep 17 00:00:00 2001
From: gjsjohnmurray <johnm@georgejames.com>
Date: Wed, 6 Mar 2024 16:21:58 +0000
Subject: [PATCH] Use ILocalizedString correctly

---
 src/vs/platform/log/common/log.ts                    | 12 ++++++------
 .../contrib/output/browser/output.contribution.ts    |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index b0342da2653..28fc419bbaf 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -749,12 +749,12 @@ export function LogLevelToString(logLevel: LogLevel): string {
 
 export function LogLevelToLocalizedString(logLevel: LogLevel): ILocalizedString {
 	switch (logLevel) {
-		case LogLevel.Trace: return { original: 'trace', value: nls.localize('trace', "Trace") };
-		case LogLevel.Debug: return { original: 'debug', value: nls.localize('debug', "Debug") };
-		case LogLevel.Info: return { original: 'info', value: nls.localize('info', "Info") };
-		case LogLevel.Warning: return { original: 'warn', value: nls.localize('warn', "Warning") };
-		case LogLevel.Error: return { original: 'error', value: nls.localize('error', "Error") };
-		case LogLevel.Off: return { original: 'off', value: nls.localize('off', "Off") };
+		case LogLevel.Trace: return { original: 'Trace', value: nls.localize('trace', "Trace") };
+		case LogLevel.Debug: return { original: 'Debug', value: nls.localize('debug', "Debug") };
+		case LogLevel.Info: return { original: 'Info', value: nls.localize('info', "Info") };
+		case LogLevel.Warning: return { original: 'Warning', value: nls.localize('warn', "Warning") };
+		case LogLevel.Error: return { original: 'Error', value: nls.localize('error', "Error") };
+		case LogLevel.Off: return { original: 'Off', value: nls.localize('off', "Off") };
 	}
 }
 
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 01fdffa1233..6d3f4d9ad31 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -30,7 +30,7 @@ import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { ILoggerService, LogLevel, LogLevelToLocalizedString } from 'vs/platform/log/common/log';
+import { ILoggerService, LogLevel, LogLevelToLocalizedString, LogLevelToString } from 'vs/platform/log/common/log';
 import { IDefaultLogLevelsService } from 'vs/workbench/contrib/logs/common/defaultLogLevels';
 
 // Register Service
@@ -351,13 +351,12 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
 
 		let order = 0;
 		const registerLogLevel = (logLevel: LogLevel) => {
-			const { original, value } = LogLevelToLocalizedString(logLevel);
 			this._register(registerAction2(class extends Action2 {
 				constructor() {
 					super({
 						id: `workbench.action.output.activeOutputLogLevel.${logLevel}`,
-						title: value,
-						toggled: CONTEXT_ACTIVE_OUTPUT_LEVEL.isEqualTo(original),
+						title: LogLevelToLocalizedString(logLevel).value,
+						toggled: CONTEXT_ACTIVE_OUTPUT_LEVEL.isEqualTo(LogLevelToString(logLevel)),
 						menu: {
 							id: logLevelMenu,
 							order: order++,