diff --git a/platform/core-api/resources/messages/CoreBundle.properties b/platform/core-api/resources/messages/CoreBundle.properties index 0568f5dcd41e..5afa1806e8b6 100644 --- a/platform/core-api/resources/messages/CoreBundle.properties +++ b/platform/core-api/resources/messages/CoreBundle.properties @@ -86,12 +86,12 @@ plugin.name.and.vendor={0} ({1}) plugin.name.and.unknown.vendor={0} (unknown vendor) third.party.plugins.privacy.note.title=Third-Party Plugins Notice -third.party.plugins.privacy.note.text=The following plugins aren''t coming from JetBrains:

\ +third.party.plugins.privacy.note.text=The following plugins aren''t coming from {1}:

\ {0}

\ Installing plugins is similar to installing and running applications. Plugins get the same permissions as the IDE process itself. \ Only proceed if you trust the plugins.
\ You are also advised to check the plugin vendor\u2019s documentation for details on how the vendor can process your personal data.

\ - JetBrains is not responsible for any behavior of any third-party plugins and their vendors, including processing of your personal data.\ + {1} is not responsible for any behavior of any third-party plugins and their vendors, including processing of your personal data.\ third.party.plugins.privacy.note.accept=Accept third.party.plugins.privacy.note.disable=Disable Plugins diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt index f94a87184d39..e1f026a5db2a 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt @@ -10,6 +10,7 @@ import com.intellij.diagnostic.CoroutineTracerShim import com.intellij.diagnostic.LoadingState import com.intellij.ide.plugins.DisabledPluginsState.Companion.invalidate import com.intellij.ide.plugins.cl.PluginClassLoader +import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.application.PathManager import com.intellij.openapi.application.impl.ApplicationInfoImpl import com.intellij.openapi.diagnostic.Logger @@ -813,7 +814,7 @@ object PluginManagerCore { private fun ask3rdPartyPluginsPrivacyConsent(descriptors: List): Boolean { val title = CoreBundle.message("third.party.plugins.privacy.note.title") val pluginList = descriptors.joinToString(separator = "
") { "   ${getPluginNameAndVendor(it)}" } - val text = CoreBundle.message("third.party.plugins.privacy.note.text", pluginList) + val text = CoreBundle.message("third.party.plugins.privacy.note.text", pluginList, ApplicationInfo.getInstance().shortCompanyName) val buttons = arrayOf(CoreBundle.message("third.party.plugins.privacy.note.accept"), CoreBundle.message("third.party.plugins.privacy.note.disable")) val choice = JOptionPane.showOptionDialog(null, text, title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index cd587ad5ce1c..0e78ad529671 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -12,6 +12,7 @@ import com.intellij.notification.Notification; import com.intellij.notification.NotificationAction; import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ModalityState; @@ -366,7 +367,7 @@ public final class PluginManagerMain { var pluginList = aliens.stream() .map(descriptor -> "   " + PluginManagerCore.getPluginNameAndVendor(descriptor)) .collect(Collectors.joining("
")); - var message = CoreBundle.message("third.party.plugins.privacy.note.text", pluginList); + var message = CoreBundle.message("third.party.plugins.privacy.note.text", pluginList, ApplicationInfo.getInstance().getShortCompanyName()); var yesText = CoreBundle.message("third.party.plugins.privacy.note.accept"); var noText = CommonBundle.getCancelButtonText(); if (Messages.showYesNoDialog(message, title, yesText, noText, Messages.getWarningIcon()) == Messages.YES) {