From d0a6418e45731cf7d83268a8cea39567552f4f2d Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Fri, 12 Jul 2024 10:33:26 +0200 Subject: [PATCH] IJPL-157611 New import setting: language is not imported GitOrigin-RevId: 623d9fbc7e96ab5b0c730fbd0719ca940148588c --- .../ide/startup/importSettings/jb/JbImportServiceImpl.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt index fd7d46da3eeb..d0bf9061a983 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt @@ -9,6 +9,7 @@ import com.intellij.ide.startup.importSettings.StartupImportIcons import com.intellij.ide.startup.importSettings.data.* import com.intellij.ide.startup.importSettings.statistics.ImportSettingsEventsCollector import com.intellij.ide.startup.importSettings.transfer.TransferSettingsProgress +import com.intellij.l10n.LocalizationStateService import com.intellij.openapi.application.* import com.intellij.openapi.application.ex.ApplicationManagerEx import com.intellij.openapi.components.Service @@ -464,6 +465,12 @@ class JbImportServiceImpl(private val coroutineScope: CoroutineScope) : JbServic if (importer.importOptions(progressIndicator, filteredCategories)) { restartRequired = true } + else if (!restartRequired) { + val localizationService = LocalizationStateService.getInstance() + if (localizationService != null && localizationService.getLastSelectedLocale() != localizationService.getSelectedLocale()) { + restartRequired = true + } + } (System.currentTimeMillis() - optionsStartTime).let { LOG.info("Options migrated in $it ms.") ImportSettingsEventsCollector.jbOptionsImportTimeSpent(it)