Commit a44b84f

author

Alberto Iannaccone

authored

set the current language on the localization provider (#957)

1 parent a3640cf commit a44b84fCopy full SHA for a44b84f

File tree

-6

lines changed

arduino-ide-extension/src
- browser/dialogs/settings
  - settings.tsx
- node
  - arduino-daemon-impl.ts

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,9 @@ export class SettingsService {`
`278`	`278`	`// after saving all the settings, if we need to change the language we need to perform a reload`
`279`	`279`	// Only reload if the language differs from the current locale. `nls.locale === undefined` signals english as well
`280`	`280`	`if (`
`281`		`- currentLanguage !== nls.locale &&`
`282`		`- !(currentLanguage === 'en' && nls.locale === undefined)`
	`281`	`+ currentLanguage !== (await this.localizationProvider.getCurrentLanguage())`
`283`	`282`	`) {`
	`283`	`+ await this.localizationProvider.setCurrentLanguage(currentLanguage);`
`284`	`284`	`if (currentLanguage === 'en') {`
`285`	`285`	`window.localStorage.removeItem(nls.localeId);`
`286`	`286`	`} else {`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import { Event, Emitter } from '@theia/core/lib/common/event';`
`12`	`12`	`import { environment } from '@theia/application-package/lib/environment';`
`13`	`13`	`import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';`
`14`	`14`	`import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';`
`15`		`-import { LocalizationProvider } from '@theia/core/lib/node/i18n/localization-provider';`
`16`	`15`	`import { ArduinoDaemon, NotificationServiceServer } from '../common/protocol';`
`17`	`16`	`import { DaemonLog } from './daemon-log';`
`18`	`17`	`import { CLI_CONFIG } from './cli-config';`
`@@ -32,9 +31,6 @@ export class ArduinoDaemonImpl`
`32`	`31`	`@inject(NotificationServiceServer)`
`33`	`32`	`protected readonly notificationService: NotificationServiceServer;`
`34`	`33`
`35`		`- @inject(LocalizationProvider)`
`36`		`- protected readonly localizationProvider: LocalizationProvider;`
`37`		`-`
`38`	`34`	`protected readonly toDispose = new DisposableCollection();`
`39`	`35`	`protected readonly onDaemonStartedEmitter = new Emitter<void>();`
`40`	`36`	`protected readonly onDaemonStoppedEmitter = new Emitter<void>();`

Comments

(0)