diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties index 3a52673912cf..ccf14000ee11 100644 --- a/platform/platform-api/resources/messages/IdeBundle.properties +++ b/platform/platform-api/resources/messages/IdeBundle.properties @@ -3249,17 +3249,18 @@ in.product.notification.action.dismiss.button=Dismiss banner.button.close=Close -subscription.dialog.title.subscription=Your {0} subscription expired -subscription.dialog.title.evaluation=Your Trial of {0} subscription expired +subscription.dialog.title.subscription=Your {0} subscription has ended +subscription.dialog.title.evaluation=Your {0} trial has ended subscription.dialog.link=How {0} subscription helps you -subscription.dialog.activate.button=Activate a new {0} subscription +subscription.dialog.activate.button.pro=Activate a Pro subscription +subscription.dialog.activate.button.ultimate=Activate an Ultimate subscription subscription.dialog.promise.button=Promise to pay later subscription.dialog.extend.button=Extend trial for 7 days -subscription.dialog.continue.button=Continue without a subscription -subscription.dialog.activate.ok.text=Activate {0}\u2026 +subscription.dialog.continue.button=Continue for free without a subscription +subscription.dialog.activate.ok.text=Activate {0} subscription.dialog.promise.ok.text=Promise\u2026 subscription.dialog.extend.ok.text=Proceed\u2026 -subscription.dialog.continue.ok.text=Continue and Restart\u2026 +subscription.dialog.continue.ok.text=Restart to Continue for Free subscription.dialog.cancel.button=Quit {0} subscription.dialog.rd.hint=Remote Development won't be available subscription.dialog.ultimate=Ultimate diff --git a/platform/platform-impl/src/com/intellij/ide/ui/SubscriptionExpirationDialog.kt b/platform/platform-impl/src/com/intellij/ide/ui/SubscriptionExpirationDialog.kt index a7f3334a1e20..21cc59d6de8e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/SubscriptionExpirationDialog.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/SubscriptionExpirationDialog.kt @@ -87,7 +87,7 @@ class SubscriptionExpirationDialog(project: Project?, private val settings: Subs buttonsGroup { val listener = ActionListener { e -> selectionButton = when (e.actionCommand) { - IdeBundle.message("subscription.dialog.activate.button", productDescriptor.platformName) -> 0 + productDescriptor.activateButtonText -> 0 IdeBundle.message("subscription.dialog.promise.button") -> 1 IdeBundle.message("subscription.dialog.extend.button") -> 2 else -> 3 @@ -96,7 +96,7 @@ class SubscriptionExpirationDialog(project: Project?, private val settings: Subs } row { - radioButton(IdeBundle.message("subscription.dialog.activate.button", productDescriptor.platformName), 0).component.addActionListener(listener) + radioButton(productDescriptor.activateButtonText, 0).component.addActionListener(listener) } if (settings.showPromise) { row { @@ -141,11 +141,12 @@ class SubscriptionExpirationDialog(project: Project?, private val settings: Subs override fun getCancelActionText(): @Nls String = IdeBundle.message("subscription.dialog.cancel.button", productDescriptor.applicationName) } -private data class ProductDescriptor(val applicationName: String, val platformName: String, val promoUrl: String, val imagePath: String) { +private data class ProductDescriptor(val applicationName: String, val platformName: String, val activateButtonText: @Nls String, val promoUrl: String, val imagePath: String) { companion object { val idea = ProductDescriptor( applicationName = IdeBundle.message("subscription.dialog.idea"), platformName = IdeBundle.message("subscription.dialog.ultimate"), + activateButtonText = IdeBundle.message("subscription.dialog.activate.button.ultimate"), promoUrl = "https://www.jetbrains.com/products/compare/?product=idea&product=idea-ult", imagePath = "/images/IdeaBannerLogo.png", ) @@ -153,6 +154,7 @@ private data class ProductDescriptor(val applicationName: String, val platformNa val pyCharm = ProductDescriptor( applicationName = IdeBundle.message("subscription.dialog.pycharm"), platformName = IdeBundle.message("subscription.dialog.pro"), + activateButtonText = IdeBundle.message("subscription.dialog.activate.button.pro"), promoUrl = "https://www.jetbrains.com/pycharm/editions", imagePath = "/images/PyCharmBannerLogo.png", )