IJPL-157611 New import setting: language is not imported

GitOrigin-RevId: 623d9fbc7e96ab5b0c730fbd0719ca940148588c
This commit is contained in:
Alexander Lobas
2024-07-12 10:33:26 +02:00
committed by intellij-monorepo-bot
parent 35cad1a68c
commit d0a6418e45

View File

@@ -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)