refactor(languages): improve language handling functions

Author: HitaloM

locales/bot.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-04-19 19:11-0300\n"
+"POT-Creation-Date: 2025-04-19 19:18-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,7 +156,7 @@ msgid "✅ Confirm Deletion"
 msgstr ""
 
 #: src/korone/modules/filters/handlers/delall.py:24
-#: src/korone/modules/languages/handlers/select.py:38
+#: src/korone/modules/languages/handlers/select.py:51
 msgid "❌ Cancel"
 msgstr ""
 
@@ -340,48 +340,48 @@ msgstr ""
 msgid "Charging"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:22
+#: src/korone/modules/languages/handlers/apply.py:23
 msgid "Something went wrong."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:44
+#: src/korone/modules/languages/handlers/apply.py:46
 #, python-brace-format
 msgid "Language changed to {new_lang}."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:50
+#: src/korone/modules/languages/handlers/apply.py:52
 msgid ""
 "\n"
 "This is the bot's native language.\n"
 "If you find any errors, please file an issue in the GitHub Repository."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:57
+#: src/korone/modules/languages/handlers/apply.py:59
 #, python-brace-format
 msgid ""
 "\n"
 "The language is {percent}% translated."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:69
+#: src/korone/modules/languages/handlers/apply.py:71
 msgid ""
 "\n"
 "In case you find any errors, please file an issue in the GitHub "
 "Repository."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:73
+#: src/korone/modules/languages/handlers/apply.py:75
 msgid ""
 "\n"
 "Please help us translate this language by completing it on our "
 "translations platform."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:91
+#: src/korone/modules/languages/handlers/apply.py:93
 msgid "🐞 Open GitHub"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/apply.py:92
+#: src/korone/modules/languages/handlers/apply.py:94
 msgid "🌍 Open Translations"
 msgstr ""
 
@@ -391,52 +391,52 @@ msgid ""
 "/language command."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:41
+#: src/korone/modules/languages/handlers/info.py:40
 #, python-brace-format
 msgid "<b>Chat language:</b> {language}\n"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:44
+#: src/korone/modules/languages/handlers/info.py:43
 msgid "This is the bot's native language. So it is 100% translated."
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:46
+#: src/korone/modules/languages/handlers/info.py:45
 msgid ""
 "\n"
 "<b>Language Information:</b>\n"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:47
+#: src/korone/modules/languages/handlers/info.py:46
 #, python-brace-format
 msgid "Translated strings: <code>{translated}</code>\n"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:50
+#: src/korone/modules/languages/handlers/info.py:49
 #, python-brace-format
 msgid "Untranslated strings: <code>{untranslated}</code>\n"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:53
+#: src/korone/modules/languages/handlers/info.py:52
 #, python-brace-format
 msgid "Strings requiring review: <code>{fuzzy}</code>\n"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:60
+#: src/korone/modules/languages/handlers/info.py:59
 msgid "👤 Change your language"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:62
+#: src/korone/modules/languages/handlers/info.py:61
 msgid "🌍 Change group language"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/info.py:74
-#: src/korone/modules/languages/handlers/select.py:45
+#: src/korone/modules/languages/handlers/info.py:70
+#: src/korone/modules/languages/handlers/select.py:58
 #: src/korone/modules/pm_menu/handlers/about.py:55
 #: src/korone/modules/pm_menu/handlers/help.py:34
 msgid "⬅️ Back"
 msgstr ""
 
-#: src/korone/modules/languages/handlers/select.py:49
+#: src/korone/modules/languages/handlers/select.py:27
 msgid "Please select the language you want to use for the chat."
 msgstr ""
 

src/korone/modules/languages/handlers/apply.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2025 Hitalo M. <https://github.com/HitaloM>
 
+
 from hairydogm.keyboard import InlineKeyboardBuilder
 from hydrogram import Client
 from hydrogram.enums import ChatType
@@ -12,7 +13,7 @@
 from korone.modules.languages.callback_data import SetLangCallback
 from korone.modules.languages.database import set_chat_language
 from korone.utils.caching import cache
-from korone.utils.i18n import get_i18n
+from korone.utils.i18n import I18nNew, get_i18n
 from korone.utils.i18n import gettext as _
 
 
@@ -29,18 +30,19 @@ async def set_lang_callback(client: Client, callback: CallbackQuery) -> None:
     await cache.delete(f"fetch_locale:{callback.message.chat.id}")
 
     i18n = get_i18n()
-    text = build_language_changed_message(language, i18n)
+    text = _build_language_changed_message(language, i18n)
+    keyboard = _build_keyboard(language, i18n)
 
-    keyboard = build_keyboard(language, i18n)
+    if not keyboard:
+        await callback.message.edit(text, disable_web_page_preview=True)
+        return
 
     await callback.message.edit(
-        text,
-        reply_markup=keyboard.as_markup() if keyboard else None,  # type: ignore
-        disable_web_page_preview=True,
+        text, reply_markup=keyboard.as_markup(), disable_web_page_preview=True
     )
 
 
-def build_language_changed_message(language: str, i18n) -> str:
+def _build_language_changed_message(language: str, i18n: I18nNew) -> str:
     text = _("Language changed to {new_lang}.", locale=language).format(
         new_lang=i18n.locale_display(i18n.babel(language))
     )
@@ -58,12 +60,12 @@ def build_language_changed_message(language: str, i18n) -> str:
             locale=language,
         ).format(percent=stats.percent_translated)
 
-        text += get_translation_status_message(stats.percent_translated, language)
+        text += _get_translation_status_message(stats.percent_translated, language)
 
     return text
 
 
-def get_translation_status_message(percent_translated: int, language: str) -> str:
+def _get_translation_status_message(percent_translated: int, language: str) -> str:
     if percent_translated > 99:
         return _(
             "\nIn case you find any errors, please file an issue in the GitHub Repository.",
@@ -75,16 +77,16 @@ def get_translation_status_message(percent_translated: int, language: str) -> st
     )
 
 
-def build_keyboard(language: str, i18n) -> InlineKeyboardBuilder:
+def _build_keyboard(language: str, i18n: I18nNew) -> InlineKeyboardBuilder:
     keyboard = InlineKeyboardBuilder()
 
-    button_text, button_url = get_button_text_and_url(language, i18n)
+    button_text, button_url = _get_button_text_and_url(language, i18n)
     keyboard.button(text=button_text, url=button_url)
 
     return keyboard
 
 
-def get_button_text_and_url(language: str, i18n) -> tuple[str, str]:
+def _get_button_text_and_url(language: str, i18n: I18nNew) -> tuple[str, str]:
     if language == i18n.default_locale or (
         (stats := i18n.get_locale_stats(locale_code=language)) and stats.percent_translated > 99
     ):

src/korone/modules/languages/handlers/cancel.py

@@ -15,7 +15,7 @@
 
 
 @router.callback_query(LangMenuCallback.filter(F.menu == LangMenu.Cancel))
-async def language_cancel_callback(client: Client, callback: CallbackQuery):
+async def language_cancel_callback(client: Client, callback: CallbackQuery) -> None:
     message = callback.message
 
     await message.edit(
@@ -26,6 +26,7 @@ async def language_cancel_callback(client: Client, callback: CallbackQuery):
     )
 
     await asyncio.sleep(5)
+
     with suppress(MessageDeleteForbidden, BadRequest):
         await message.reply_to_message.delete()
         await message.delete()

src/korone/modules/languages/handlers/info.py

@@ -25,9 +25,8 @@ async def handle_language(client: Client, update: Message | CallbackQuery) -> No
     chat_type = update.chat.type if is_message else update.message.chat.type
 
     i18n = get_i18n()
-    text = build_language_info_text(i18n)
-
-    keyboard = build_keyboard(chat_type)
+    text = _build_language_info_text(i18n)
+    keyboard = _build_keyboard(chat_type)
 
     if is_message:
         await update.reply(text, reply_markup=keyboard.as_markup())
@@ -37,7 +36,7 @@ async def handle_language(client: Client, update: Message | CallbackQuery) -> No
         await update.message.edit(text, reply_markup=keyboard.as_markup())
 
 
-def build_language_info_text(i18n: I18nNew) -> str:
+def _build_language_info_text(i18n: I18nNew) -> str:
     text = _("<b>Chat language:</b> {language}\n").format(language=i18n.current_locale_display)
 
     if i18n.current_locale == i18n.default_locale:
@@ -55,23 +54,21 @@ def build_language_info_text(i18n: I18nNew) -> str:
     return text
 
 
-def get_button_text(chat_type: ChatType) -> str:
-    return (
+def _build_keyboard(chat_type: ChatType) -> InlineKeyboardBuilder:
+    button_text = (
         _("👤 Change your language")
         if chat_type == ChatType.PRIVATE
         else _("🌍 Change group language")
     )
 
-
-def build_keyboard(chat_type: ChatType) -> InlineKeyboardBuilder:
-    button_text = get_button_text(chat_type)
-
     keyboard = InlineKeyboardBuilder()
     keyboard.button(text=button_text, callback_data=LangMenuCallback(menu=LangMenu.Languages))
+
     if chat_type == ChatType.PRIVATE:
         keyboard.row(
             InlineKeyboardButton(
                 text=_("⬅️ Back"), callback_data=PMMenuCallback(menu=PMMenu.Start).pack()
             )
         )
+
     return keyboard

src/korone/modules/languages/handlers/select.py

@@ -22,6 +22,19 @@
 async def handle_languages(client: Client, update: Message | CallbackQuery) -> None:
     i18n = get_i18n()
     chat_type = update.chat.type if isinstance(update, Message) else update.message.chat.type
+
+    keyboard = _build_language_selection_keyboard(i18n, chat_type)
+    text = _("Please select the language you want to use for the chat.")
+
+    if isinstance(update, Message):
+        await update.reply(text, reply_markup=keyboard.as_markup())
+        return
+
+    with suppress(MessageNotModified):
+        await update.edit_message_text(text, reply_markup=keyboard.as_markup())
+
+
+def _build_language_selection_keyboard(i18n, chat_type: ChatType) -> InlineKeyboardBuilder:
     keyboard = InlineKeyboardBuilder()
 
     for language in (*i18n.available_locales, i18n.default_locale):
@@ -46,11 +59,4 @@ async def handle_languages(client: Client, update: Message | CallbackQuery) -> N
             )
         )
 
-    text = _("Please select the language you want to use for the chat.")
-
-    if isinstance(update, Message):
-        await update.reply(text, reply_markup=keyboard.as_markup())
-        return
-
-    with suppress(MessageNotModified):
-        await update.edit_message_text(text, reply_markup=keyboard.as_markup())
+    return keyboard