diff --git a/bot/handlers/user/trial_handler.py b/bot/handlers/user/trial_handler.py index 34d2e4f..b03966c 100644 --- a/bot/handlers/user/trial_handler.py +++ b/bot/handlers/user/trial_handler.py @@ -11,6 +11,7 @@ from bot.services.notification_service import NotificationService from bot.keyboards.inline.user_keyboards import ( get_trial_confirmation_keyboard, get_main_menu_inline_keyboard, + get_connect_and_main_keyboard, ) from bot.middlewares.i18n import JsonI18n from .start import send_main_menu @@ -75,6 +76,7 @@ async def request_trial_confirmation_handler( final_message_text_in_chat = "" show_trial_button_after_action = False + config_link_for_trial = None if activation_result and activation_result.get("activated"): try: @@ -130,13 +132,21 @@ async def request_trial_confirmation_handler( ): show_trial_button_after_action = True + reply_markup = ( + get_connect_and_main_keyboard( + current_lang, i18n, settings, config_link_for_trial + ) + if activation_result and activation_result.get("activated") + else get_main_menu_inline_keyboard( + current_lang, i18n, settings, show_trial_button_after_action + ) + ) + try: await callback.message.edit_text( final_message_text_in_chat, parse_mode="HTML", - reply_markup=get_main_menu_inline_keyboard( - current_lang, i18n, settings, show_trial_button_after_action - ), + reply_markup=reply_markup, disable_web_page_preview=True, ) except Exception as e_edit: @@ -148,9 +158,7 @@ async def request_trial_confirmation_handler( await callback.message.answer( final_message_text_in_chat, parse_mode="HTML", - reply_markup=get_main_menu_inline_keyboard( - current_lang, i18n, settings, show_trial_button_after_action - ), + reply_markup=reply_markup, disable_web_page_preview=True, ) @@ -205,6 +213,7 @@ async def confirm_activate_trial_handler( final_message_text_in_chat = "" show_trial_button_after_action = False + config_link_for_trial = None if activation_result and activation_result.get("activated"): try: @@ -256,13 +265,21 @@ async def confirm_activate_trial_handler( ): show_trial_button_after_action = True + reply_markup = ( + get_connect_and_main_keyboard( + current_lang, i18n, settings, config_link_for_trial + ) + if activation_result and activation_result.get("activated") + else get_main_menu_inline_keyboard( + current_lang, i18n, settings, show_trial_button_after_action + ) + ) + try: await callback.message.edit_text( final_message_text_in_chat, parse_mode="HTML", - reply_markup=get_main_menu_inline_keyboard( - current_lang, i18n, settings, show_trial_button_after_action - ), + reply_markup=reply_markup, disable_web_page_preview=True, ) except Exception as e_edit: @@ -274,9 +291,7 @@ async def confirm_activate_trial_handler( await callback.message.answer( final_message_text_in_chat, parse_mode="HTML", - reply_markup=get_main_menu_inline_keyboard( - current_lang, i18n, settings, show_trial_button_after_action - ), + reply_markup=reply_markup, disable_web_page_preview=True, ) diff --git a/locales/en.json b/locales/en.json index c62ee3b..9e511fe 100644 --- a/locales/en.json +++ b/locales/en.json @@ -52,7 +52,7 @@ "trial_already_had_subscription_or_trial": "You have already used a free trial or had a paid subscription. Free trial is available only once for new users.", "trial_confirm_activate_button": "✅ Activate!", "trial_activated_alert": "Trial activated!", - "trial_activated_details_message": "🚀 Your {days}-day free trial is activated!\n\nValid until: {end_date}\nTraffic: {traffic_gb} GB\n\nYour configuration link:\n{config_link}", + "trial_activated_details_message": "✅ Trial activated!\nYour {days}-day trial is active until {end_date}.\n\nConnection key:\n{config_link}\n\nTo connect, open the link and follow the instructions 👇", "yes_button": "Yes", "no_button": "No", "referral_program_info_new": "🎁 Referral Program\n\n📊 Your stats:\n👥 Friends invited: {invited_count}\n💳 Purchased subscription: {purchased_count}\n\n🔗 Your link:\n{referral_link}\n\n💰 Invitation bonuses:\n{bonus_details}\n\n📢 Share the link with friends and get bonuses!", diff --git a/locales/ru.json b/locales/ru.json index 2ab89f3..b58b394 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -52,7 +52,7 @@ "trial_already_had_subscription_or_trial": "Вы уже использовали пробный период или у вас была платная подписка. Пробный период доступен только один раз для новых пользователей.", "trial_confirm_activate_button": "✅ Активировать!", "trial_activated_alert": "Пробный период активирован!", - "trial_activated_details_message": "🚀 Ваш пробный период на {days} дней активирован!\n\nДействует до: {end_date}\nТрафик: {traffic_gb} GB\n\nВаша ссылка на конфигурацию:\n{config_link}", + "trial_activated_details_message": "✅ Пробный доступ активирован!\nВаш триал на {days} дн. действует до {end_date}.\n\nКлюч подключения:\n{config_link}\n\nЧтобы подключиться, перейдите по ссылке и следуйте инструкции 👇", "yes_button": "Да", "no_button": "Нет", "referral_program_info_new": "🎁 Реферальная программа\n\n📊 Твоя статистика:\n👥 Приглашено друзей: {invited_count}\n💳 Купили подписку: {purchased_count}\n\n🔗 Твоя ссылка:\n{referral_link}\n\n💰 Бонусы за приглашения:\n{bonus_details}\n\n📢 Поделись ссылкой с друзьями и получай бонусы!",