diff --git a/extensions/kusto/src/features.ts b/extensions/kusto/src/features.ts index d100dcaa81..ffbb2420f2 100644 --- a/extensions/kusto/src/features.ts +++ b/extensions/kusto/src/features.ts @@ -3,6 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as nls from 'vscode-nls'; import { SqlOpsDataClient, SqlOpsFeature } from 'dataprotocol-client'; import { ClientCapabilities, StaticFeature, RPCMessageType, ServerCapabilities } from 'vscode-languageclient'; import { Disposable, window } from 'vscode'; @@ -11,7 +12,8 @@ import * as contracts from './contracts'; import * as azdata from 'azdata'; import * as Utils from './utils'; import * as UUID from 'vscode-languageclient/lib/utils/uuid'; -import { localize } from './localize'; + +const localize = nls.loadMessageBundle(); export class TelemetryFeature implements StaticFeature { diff --git a/extensions/kusto/src/kustoServer.ts b/extensions/kusto/src/kustoServer.ts index f1c2ff9c05..76ea5aa3cc 100644 --- a/extensions/kusto/src/kustoServer.ts +++ b/extensions/kusto/src/kustoServer.ts @@ -7,9 +7,9 @@ import { ServerProvider, IConfig, Events } from 'service-downloader'; import { ServerOptions, TransportKind } from 'vscode-languageclient'; import * as Constants from './constants'; import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; import * as path from 'path'; import { getCommonLaunchArgsAndCleanupOldLogFiles } from './utils'; -import { localize } from './localize'; import { Telemetry, LanguageClientErrorHandler } from './telemetry'; import { SqlOpsDataClient, ClientOptions } from 'dataprotocol-client'; import { TelemetryFeature, SerializationFeature, AccountFeature } from './features'; @@ -17,6 +17,8 @@ import { AppContext } from './appContext'; import { CompletionExtensionParams, CompletionExtLoadRequest } from './contracts'; import { promises as fs } from 'fs'; +const localize = nls.loadMessageBundle(); + const outputChannel = vscode.window.createOutputChannel(Constants.serviceName); const statusView = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left); diff --git a/extensions/kusto/src/localize.ts b/extensions/kusto/src/localize.ts deleted file mode 100644 index 51c7ffb2a4..0000000000 --- a/extensions/kusto/src/localize.ts +++ /dev/null @@ -1,8 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as nls from 'vscode-nls'; - -export const localize = nls.loadMessageBundle(); diff --git a/extensions/kusto/src/main.ts b/extensions/kusto/src/main.ts index cfcae1d2d7..6694752167 100644 --- a/extensions/kusto/src/main.ts +++ b/extensions/kusto/src/main.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; import * as azdata from 'azdata'; import * as path from 'path'; @@ -16,10 +17,11 @@ import { KustoObjectExplorerNodeProvider } from './objectExplorerNodeProvider/ob import { registerSearchServerCommand } from './objectExplorerNodeProvider/command'; import { KustoIconProvider } from './iconProvider'; import { createKustoApi } from './kustoApiFactory'; -import { localize } from './localize'; import { KustoServer } from './kustoServer'; import { promises as fs } from 'fs'; +const localize = nls.loadMessageBundle(); + export async function activate(context: vscode.ExtensionContext): Promise { // lets make sure we support this platform first let supported = await Utils.verifyPlatform(); diff --git a/extensions/kusto/src/telemetry.ts b/extensions/kusto/src/telemetry.ts index 92ec9dfdf8..1470b85050 100644 --- a/extensions/kusto/src/telemetry.ts +++ b/extensions/kusto/src/telemetry.ts @@ -4,12 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; import TelemetryReporter from 'vscode-extension-telemetry'; import { ErrorAction, ErrorHandler, Message, CloseAction } from 'vscode-languageclient'; import * as Utils from './utils'; import * as Constants from './constants'; -import { localize } from './localize'; + +const localize = nls.loadMessageBundle(); const packageJson = require('../package.json'); const viewKnownIssuesAction = localize('viewKnownIssuesText', "View Known Issues");