Pass format kwargs to get_message

davtelepot/__init__.py

@@ -7,7 +7,7 @@ __author__ = "Davide Testa"
 __email__ = "davte@libero.it"
 __credits__ = "Marco Origlia"
 __license__ = "GNU General Public License v3.0"
-__version__ = "1.4.12"
+__version__ = "1.4.13"
 __maintainer__ = "Davide Testa"
 __contact__ = "t.me/davte"
 

davtelepot/admin_tools.py

@@ -165,11 +165,10 @@ def get_talk_panel(text, bot, update):
             bot.get_message(
                 'talk',
                 'help_text',
-                update=update
-            )
-        ).format(
-            q=escape_html_chars(
-                remove_html_tags(text)
+                update=update,
+                q=escape_html_chars(
+                    remove_html_tags(text)
+                )
             )
         )
         reply_markup = make_inline_keyboard(
@@ -190,11 +189,10 @@ def get_talk_panel(text, bot, update):
             bot.get_message(
                 'talk',
                 'user_not_found',
-                update=update
-            )
-        ).format(
-            q=escape_html_chars(
-                remove_html_tags(text)
+                update=update,
+                q=escape_html_chars(
+                    remove_html_tags(text)
+                )
             )
         )
         reply_markup = make_inline_keyboard(
@@ -310,8 +308,7 @@ async def _talk_button(update, bot):
                 chat_id=user_record['telegram_id'],
                 text=bot.get_message(
                     'talk', 'user_warning',
-                    update=update
-                ).format(
+                    update=update,
                     u=get_user(admin_record)
                 )
             )
@@ -319,8 +316,7 @@ async def _talk_button(update, bot):
                 chat_id=admin_record['telegram_id'],
                 text=bot.get_message(
                     'talk', 'admin_warning',
-                    update=update
-                ).format(
+                    update=update,
                     u=get_user(user_record)
                 ),
                 reply_markup=make_inline_keyboard(