MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-6103 parameterize third.party.plugins.privacy.note.text with short company name

Browse Source 
GitOrigin-RevId: 4dd0db4233fc904797054cc096b6ad5bcb88f5f3
This commit is contained in:
Vadim Salavatov
2024-05-29 16:43:09 +02:00
committed by intellij-monorepo-bot
parent c0c5ea2ec7
commit a99c43e690
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/core-api/resources/messages/CoreBundle.properties
View File

@@ -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=<html><body>The following plugins aren''t coming from JetBrains:<br><br>\
third.party.plugins.privacy.note.text=<html><body>The following plugins aren''t coming from {1}:<br><br>\
{0}<br><br>\
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.<br>\
You are also advised to check the plugin vendor\u2019s documentation for details on how the vendor can process your personal data.<br><br>\
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.\
</body></html>
third.party.plugins.privacy.note.accept=Accept
third.party.plugins.privacy.note.disable=Disable Plugins

3
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt
View File

@@ -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<IdeaPluginDescriptorImpl>): Boolean {
val title = CoreBundle.message("third.party.plugins.privacy.note.title")
val pluginList = descriptors.joinToString(separator = "<br>") { "&nbsp;&nbsp;&nbsp;${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,

3
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
View File

@@ -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 -> "&nbsp;&nbsp;&nbsp;" + PluginManagerCore.getPluginNameAndVendor(descriptor))
.collect(Collectors.joining("<br>"));
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) {