From f2278fbfb48887edc0f19b02e8753a72cab7e3a2 Mon Sep 17 00:00:00 2001 From: Pavel Nikolaev Date: Thu, 13 Jul 2023 17:59:35 +0300 Subject: [PATCH 1/2] bugfix/12709 Added localization for some phrases --- packages/debug/src/browser/debug-session-connection.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/debug/src/browser/debug-session-connection.ts b/packages/debug/src/browser/debug-session-connection.ts index e8ca6c9ec7123..3d09381531be7 100644 --- a/packages/debug/src/browser/debug-session-connection.ts +++ b/packages/debug/src/browser/debug-session-connection.ts @@ -18,7 +18,7 @@ import { DebugProtocol } from '@vscode/debugprotocol'; import { Deferred } from '@theia/core/lib/common/promise-util'; -import { Event, Emitter, DisposableCollection, Disposable, MaybePromise } from '@theia/core'; +import { Event, Emitter, DisposableCollection, Disposable, MaybePromise, nls } from '@theia/core'; import { OutputChannel } from '@theia/output/lib/browser/output-channel'; import { DebugChannel } from '../common/debug-service'; @@ -153,7 +153,7 @@ export class DebugSessionConnection implements Disposable { protected checkDisposed(): void { if (this.disposed) { - throw new Error('the debug session connection is disposed, id: ' + this.sessionId); + throw new Error(nls.localize('theia/debug/isDisposed', 'the debug session connection is disposed, id: {0}', this.sessionId)); } } @@ -197,7 +197,7 @@ export class DebugSessionConnection implements Disposable { protected cancelPendingRequests(): void { this.pendingRequests.forEach((deferred, requestId) => { - deferred.reject(new Error(`Request ${requestId} cancelled on connection close`)); + deferred.reject(new Error(nls.localize('theia/debug/requestCanceled', 'Request {0} cancelled on connection close', requestId))); }); } @@ -205,7 +205,7 @@ export class DebugSessionConnection implements Disposable { const result = new Deferred(); if (this.isClosed) { - result.reject(new Error('Connection is closed')); + result.reject(new Error(nls.localize('theia/debug/connectionClosed', 'Connection is closed'))); } else { const request: DebugProtocol.Request = { seq: this.sequence++, From b2f9bda8c88dbf6d7c4b56b4fb552cb0c2f63f4e Mon Sep 17 00:00:00 2001 From: Pavel Nikolaev Date: Tue, 26 Sep 2023 16:44:17 +0300 Subject: [PATCH 2/2] bugfix/12709 Changed error notification messages --- packages/debug/src/browser/debug-session-connection.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/debug/src/browser/debug-session-connection.ts b/packages/debug/src/browser/debug-session-connection.ts index 3d09381531be7..9717c49c98e78 100644 --- a/packages/debug/src/browser/debug-session-connection.ts +++ b/packages/debug/src/browser/debug-session-connection.ts @@ -153,7 +153,7 @@ export class DebugSessionConnection implements Disposable { protected checkDisposed(): void { if (this.disposed) { - throw new Error(nls.localize('theia/debug/isDisposed', 'the debug session connection is disposed, id: {0}', this.sessionId)); + throw new Error(nls.localize('theia/debug/connectionClosed', 'Debug connection unexpectedly closed')); } } @@ -197,7 +197,7 @@ export class DebugSessionConnection implements Disposable { protected cancelPendingRequests(): void { this.pendingRequests.forEach((deferred, requestId) => { - deferred.reject(new Error(nls.localize('theia/debug/requestCanceled', 'Request {0} cancelled on connection close', requestId))); + deferred.reject(new Error(nls.localize('theia/debug/connectionClosed', 'Debug connection unexpectedly closed'))); }); } @@ -205,7 +205,7 @@ export class DebugSessionConnection implements Disposable { const result = new Deferred(); if (this.isClosed) { - result.reject(new Error(nls.localize('theia/debug/connectionClosed', 'Connection is closed'))); + result.reject(new Error(nls.localize('theia/debug/connectionClosed', 'Debug connection unexpectedly closed'))); } else { const request: DebugProtocol.Request = { seq: this.sequence++,