From 37a2e6a9f29b5b4fafd8e77227b0f34835b84438 Mon Sep 17 00:00:00 2001 From: Davte Date: Sun, 21 Jul 2019 15:56:30 +0200 Subject: [PATCH] Use `default_message` argument of `get_message` method --- davtelepot/languages.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/davtelepot/languages.py b/davtelepot/languages.py index 4bcf8ef..8a221a1 100644 --- a/davtelepot/languages.py +++ b/davtelepot/languages.py @@ -265,33 +265,21 @@ def init( language_command_name = bot.get_message( 'language', 'language_command', 'name', - language=language + language=language, default_message='/language' ) - if language_command_name == bot.missing_message: - language_command_name = '/language' - language_command_alias = bot.get_message( 'language', 'language_command', 'alias', - language=language + language=language, default_message=None ) - if language_command_alias == bot.missing_message: + if language_command_alias is None: aliases = [] else: aliases = [language_command_alias] language_command_description = bot.get_message( 'language', 'language_command', 'description', - language=language + language=language, default_message='' ) - if language_command_description == bot.missing_message: - language_command_description = '' - - language_button_description = bot.get_message( - 'language', 'language_button', 'description', - language=language - ) - if language_button_description == bot.missing_message: - language_button_description = '' @bot.command( command=language_command_name, aliases=aliases, @@ -302,6 +290,11 @@ def init( async def language_command(bot, update, user_record): return await _language_command(bot, update, user_record) + language_button_description = bot.get_message( + 'language', 'language_button', 'description', + language=language, default_message='' + ) + @bot.button( prefix='lang:///', separator='|',