Compare commits

...

2 commits

2 changed files with 5 additions and 3 deletions

View file

@ -11,6 +11,7 @@ import re
from word2number import w2n from word2number import w2n
from function.convert import Converter from function.convert import Converter
from function.format_number import format_number
config = yaml.safe_load(open("config.yaml")) config = yaml.safe_load(open("config.yaml"))
dp = Dispatcher() dp = Dispatcher()
@ -69,7 +70,7 @@ async def message_conv(message: types.Message):
conv.conv_currency = target_currency_code.upper() conv.conv_currency = target_currency_code.upper()
conv.convert() conv.convert()
result = f'{conv.amount} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}' result = f'{format_number(conv.amount)} {conv.from_currency} = {conv.conv_amount} {conv.conv_currency}'
await message.reply(result) await message.reply(result)
@ -117,7 +118,7 @@ async def currency(inline_query: types.InlineQuery) -> None:
conv.convert() conv.convert()
result = ( result = (
f'{conv.amount} {conv.from_currency} = ' f'{format_number(conv.amount)} {conv.from_currency} = '
f'{conv.conv_amount} {conv.conv_currency}' f'{conv.conv_amount} {conv.conv_currency}'
) )

View file

@ -1,4 +1,5 @@
aiohttp~=3.9.5 aiohttp~=3.9.5
requests~=2.32.3 requests~=2.32.3
PyYAML~=6.0.1 PyYAML~=6.0.1
aiogram~=3.7.0 aiogram~=3.7.0
word2number~=1.1