From 889af1df408483e341c2b90b5eb4ce6bf1ced12d Mon Sep 17 00:00:00 2001 From: Capybara-z Date: Tue, 15 Apr 2025 01:25:48 +0300 Subject: [PATCH] Fix time declination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Склоение времени. --- handlers/notifications/special_notifications.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/handlers/notifications/special_notifications.py b/handlers/notifications/special_notifications.py index 23df7227..f927d9f3 100644 --- a/handlers/notifications/special_notifications.py +++ b/handlers/notifications/special_notifications.py @@ -19,6 +19,7 @@ from handlers.buttons import MAIN_MENU from handlers.keys.key_utils import get_user_traffic from handlers.texts import TRIAL_INACTIVE_BONUS_MSG, TRIAL_INACTIVE_FIRST_MSG, ZERO_TRAFFIC_MSG from logger import logger +from handlers.utils import format_days router = Router() @@ -84,12 +85,21 @@ async def notify_inactive_trial_users(bot: Bot, conn: asyncpg.Connection): if trial_extended: total_days = NOTIFY_EXTRA_DAYS + TRIAL_TIME + trial_time_formatted = format_days(TRIAL_TIME) + extra_days_formatted = format_days(NOTIFY_EXTRA_DAYS) + total_days_formatted = format_days(total_days) message = TRIAL_INACTIVE_BONUS_MSG.format( - display_name=display_name, NOTIFY_EXTRA_DAYS=NOTIFY_EXTRA_DAYS, total_days=total_days + display_name=display_name, + extra_days_formatted=extra_days_formatted, + total_days_formatted=total_days_formatted, ) await conn.execute("UPDATE connections SET trial = -1 WHERE tg_id = $1", tg_id) else: - message = TRIAL_INACTIVE_FIRST_MSG.format(display_name=display_name, TRIAL_TIME=TRIAL_TIME) + trial_time_formatted = format_days(TRIAL_TIME) + message = TRIAL_INACTIVE_FIRST_MSG.format( + display_name=display_name, + trial_time_formatted=trial_time_formatted, + ) try: await bot.send_message(tg_id, message, reply_markup=keyboard)