Davte/davtelepot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass format kwargs to get_message

Browse Source
This commit is contained in:
Davte 2018-11-25 01:07:24 +01:00
parent 39147326d1
commit 787fa7d164
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
davtelepot/__init__.py
View File

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

24
davtelepot/admin_tools.py
View File

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