Message Fixes

telegram_bot_project/bot/buttons.py

@@ -112,7 +112,7 @@ def routine_menu_keyboard() -> InlineKeyboardMarkup:
     return routine_markup
 
 def morning_routine_keyboard() -> ReplyKeyboardMarkup:
-    add_btn = KeyboardButton(text=MORNINGG_ROUTINE_ADD_BTN)
+    add_btn = KeyboardButton(text=MORNING_ROUTINE_ADD_BTN)
     edit_btn = KeyboardButton(text=MORNING_ROUTINE_EDIT_BTN)
     drop_btn = KeyboardButton(text=MORNING_ROUTINE_DELETE_BTN)
     all_btn = KeyboardButton(text=MY_MORNING_ROUTINE_BTN)

telegram_bot_project/bot/commands.py

@@ -264,7 +264,7 @@ async def set_wake_time_command(message: types.Message, state: FSMContext):
     if not user_find:
         await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
     else:
-        await message.answer(MESSAGES[language]['SET_WAKE_TIME_MSG'])
+        await message.answer(MESSAGES[language]['SET_TIME_MSG'])
         await state.set_state(DialogStates.set_wake_time)
 
 
@@ -277,7 +277,7 @@ async def set_sleep_time_command(message: types.Message, state: FSMContext):
     if not user_find:
         await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
     else:
-        await message.answer(MESSAGES[language]['SET_SLEEP_TIME_MSG'])
+        await message.answer(MESSAGES[language]['SET_TIME_MSG'])
         await state.set_state(DialogStates.set_sleep_time)
 
 

telegram_bot_project/bot/handlers.py

@@ -318,7 +318,7 @@ async def process_set_wake_time(message: Message, state: FSMContext):
     new_wake_time = message.text.strip()
     if not new_wake_time or not check_valid_time(new_wake_time):
         await message.answer(
-            MESSAGES["ENGLISH"]['WAKE_TIME_INVALID'],
+            MESSAGES["ENGLISH"]['TIMER_INVALID'],
             reply_markup=routine_time_keyboard()
         )
         return
@@ -327,15 +327,15 @@ async def process_set_wake_time(message: Message, state: FSMContext):
         time_obj = datetime.strptime(new_wake_time, "%H:%M").time()
     except ValueError:
         await message.answer(
-            MESSAGES["ENGLISH"]['WAKE_TIME_INVALID'],
+            MESSAGES["ENGLISH"]['TIMER_INVALID'],
             reply_markup=routine_time_keyboard()
         )
         return
 
     print(f"--User with id: {user_id} set wake time to: {new_wake_time}")
     await UserService.update_wake_time(user_id, time_obj)
     await message.answer(
-        MESSAGES[language]['WAKE_TIME_SET'].format(new_wake_time),
+        MESSAGES[language]['TIMER_SET'].format(new_wake_time),
         reply_markup=routine_time_keyboard()
     )
     await state.clear()
@@ -353,7 +353,7 @@ async def process_set_sleep_time(message: Message, state: FSMContext):
     new_sleep_time = message.text.strip()
     if not new_sleep_time or not check_valid_time(new_sleep_time):
         await message.answer(
-            MESSAGES["ENGLISH"]['SLEEP_TIME_INVALID'],
+            MESSAGES["ENGLISH"]['TIMER_INVALID'],
             reply_markup=routine_time_keyboard()
         )
         return
@@ -362,15 +362,15 @@ async def process_set_sleep_time(message: Message, state: FSMContext):
         time_obj = datetime.strptime(new_sleep_time, "%H:%M").time()
     except ValueError:
         await message.answer(
-            MESSAGES["ENGLISH"]['SLEEP_TIME_INVALID'],
+            MESSAGES["ENGLISH"]['TIMER_INVALID'],
             reply_markup=routine_time_keyboard()
         )
         return
 
     print(f"--User with id: {user_id} set sleep time to: {new_sleep_time}")
     await UserService.update_sleep_time(user_id, time_obj)
     await message.answer(
-        MESSAGES[language]['SLEEP_TIME_SET'].format(new_sleep_time),
+        MESSAGES[language]['TIMER_SET'].format(new_sleep_time),
         reply_markup=routine_time_keyboard()
     )
     await state.clear()

telegram_bot_project/main.py

@@ -103,13 +103,13 @@ async def set_waketime(message: Message, state: FSMContext):
 async def routine(message: Message):
     await routine_menu_command(message)
 
-@dp.message(lambda m: m.text == MORNINGG_ROUTINE_ADD_BTN)
+@dp.message(lambda m: m.text == MORNING_ROUTINE_ADD_BTN)
 async def morning_add(message: Message, state: FSMContext):
     await state.set_state(DialogStates.add_morning_routine)
     await state.update_data(routine_type="morning")
     await set_morning_routine(message, state)
 
-@dp.message(Command("morning_routines"))
+@dp.message(Command("morning_routine"))
 @dp.message(lambda m: m.text == ROUTINE_MORNING_VIEW)
 @dp.message(lambda m: m.text == MY_MORNING_ROUTINE_BTN)
 async def morning_routines(message: Message):
@@ -145,7 +145,7 @@ async def evening_routines_edit(message: types.Message, state: FSMContext):
     await state.update_data(routine_type="evening")
     await update_morning_routine(message, state, type="evening")
 
-@dp.message(Command("evening_routines"))
+@dp.message(Command("evening_routine"))
 @dp.message(lambda m: m.text == ROUTINE_EVENING_VIEW)
 @dp.message(lambda m: m.text == MY_EVENING_ROUTINE_BTN)
 async def morning_routines(message: Message):