Sweetbread/natsuko
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]: Fix argument

Browse Source
This commit is contained in:
Sweetbread 2023-05-15 23:22:19 +03:00
parent c0f11b96e6
commit d905aca2fe
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cogs/economic.py
View File

@ -1,3 +1,5 @@
from utils.translate import get_text
from time import time from time import time
import typing import typing
@ -11,7 +13,6 @@ from random import randint as rint
from discord import app_commands from discord import app_commands
from discord.ext import commands, tasks from discord.ext import commands, tasks
from discord.app_commands import Choice from discord.app_commands import Choice
from discord.app_commands import TranslationContextLocation as trans_loc
from datetime import datetime from datetime import datetime
from matplotlib import ticker from matplotlib import ticker
from matplotlib import pyplot as plt from matplotlib import pyplot as plt
@ -242,25 +243,12 @@ class Economic(commands.Cog, name="Экономика"):
}) })
logger.debug(m["guild_stat"][str(guild.id)]["exp"]) logger.debug(m["guild_stat"][str(guild.id)]["exp"])
async def get_text(self, inter, location, string):
data = await self.bot.tree.translator.translate(
app_commands.locale_str(string),
inter.locale,
app_commands.TranslationContext(
trans_loc.other,
location
)
)
if data is None: return string
return data
@app_commands.command(description="View balance and level") @app_commands.command(description="View balance and level")
async def rank(self, inter: discord.Interaction, user: discord.Member = None): async def rank(self, inter: discord.Interaction, user: discord.Member = None):
if user is None: user = inter.user if user is None: user = inter.user
if self.bot.get_user(user.id).bot: if self.bot.get_user(user.id).bot:
await inter.response.send_message(await self.get_text(inter, "rank", "Bot hasn't experience")) await inter.response.send_message(await get_text(inter, "rank", "Bot hasn't experience"))
return return
user_data = db.members.find_one({"id": user.id}) user_data = db.members.find_one({"id": user.id})
@ -312,27 +300,27 @@ class Economic(commands.Cog, name="Экономика"):
else: last_day = "???" else: last_day = "???"
description = f"{await self.get_text(inter, 'rank', 'Money')}: {user_data['money']}{chocolate}\n\n" \ description = f"{await get_text(inter, 'rank', 'Money')}: {user_data['money']}{chocolate}\n\n" \
f"__{await self.get_text(inter, 'rank', 'Global stats')}:__\n" \ f"__{await get_text(inter, 'rank', 'Global stats')}:__\n" \
f"{await self.get_text(inter, 'rank', 'Level')}: {user_data['level']}\n" \ f"{await get_text(inter, 'rank', 'Level')}: {user_data['level']}\n" \
f"{await self.get_text(inter, 'rank', 'Exp')}: {user_data['exp']} / {user_data['level'] ** 2 * 50 + 5}" \ f"{await get_text(inter, 'rank', 'Exp')}: {user_data['exp']} / {user_data['level'] ** 2 * 50 + 5}" \
f" ({(user_data['level'] ** 2 * 50 + 5) - user_data['exp']})\n" \ f" ({(user_data['level'] ** 2 * 50 + 5) - user_data['exp']})\n" \
f"{await self.get_text(inter, 'rank', 'Per hour')}: {per_hour}, {await self.get_text(inter, 'rank', 'per the past hour')}: {last_hour}\n" \ f"{await get_text(inter, 'rank', 'Per hour')}: {per_hour}, {await get_text(inter, 'rank', 'per the past hour')}: {last_hour}\n" \
f"{await self.get_text(inter, 'rank', 'Per day')}: {per_day}, {await self.get_text(inter, 'rank', 'per the past day')}: {last_day}\n" f"{await get_text(inter, 'rank', 'Per day')}: {per_day}, {await get_text(inter, 'rank', 'per the past day')}: {last_day}\n"
secs = user_data['guild_stat'][str(inter.guild.id)]['secs_in_voice'] secs = user_data['guild_stat'][str(inter.guild.id)]['secs_in_voice']
if "guild_stat" in list(user_data.keys()): if "guild_stat" in list(user_data.keys()):
if inter.guild is not None and str(inter.guild.id) in list(user_data['guild_stat'].keys()): if inter.guild is not None and str(inter.guild.id) in list(user_data['guild_stat'].keys()):
description += f"\n__{await self.get_text(inter, 'rank', 'On this guild')}:__\n" \ description += f"\n__{await get_text(inter, 'rank', 'On this guild')}:__\n" \
f"{await self.get_text(inter, 'rank', 'Level')}: {user_data['guild_stat'][str(inter.guild.id)]['level']}\n" \ f"{await get_text(inter, 'rank', 'Level')}: {user_data['guild_stat'][str(inter.guild.id)]['level']}\n" \
f"{await self.get_text(inter, 'rank', 'Exp')}: {user_data['guild_stat'][str(inter.guild.id)]['exp']} / " \ f"{await get_text(inter, 'rank', 'Exp')}: {user_data['guild_stat'][str(inter.guild.id)]['exp']} / " \
f"{user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5}" \ f"{user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5}" \
f" ({(user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5) - user_data['guild_stat'][str(inter.guild.id)]['exp']})\n" \ f" ({(user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5) - user_data['guild_stat'][str(inter.guild.id)]['exp']})\n" \
f"{await self.get_text(inter, 'rank', 'Time in voice channels')}: {self.time_translation(secs)}" f"{await get_text(inter, 'rank', 'Time in voice channels')}: {self.time_translation(secs)}"
e = discord.Embed(title=f"{await self.get_text(inter, 'rank', 'Info about')} {self.bot.get_user(user.id).name}", e = discord.Embed(title=f"{await get_text(inter, 'rank', 'Info about')} {self.bot.get_user(user.id).name}",
description=description, description=description,
color=color) color=color)
await inter.response.send_message(embed=e) await inter.response.send_message(embed=e)

4
cogs/translator.py
View File

@ -15,8 +15,7 @@ class MeowTranslator(app_commands.Translator):
async def unload(self): pass async def unload(self): pass
async def translate(self, string: app_commands.locale_str, locale: discord.Locale, context: app_commands.TranslationContext) -> Optional[str]: async def translate(self, string: app_commands.locale_str, locale: discord.Locale, context: app_commands.TranslationContext) -> Optional[str]:
logger.debug(f"{locale}\t{string.message}") logger.debug(f"{locale}\t{string.message}")
if str(locale) == "uk": locale = "ru" if str(locale) == "ua": locale = "ru" # TODO: make translation for Ukranian
if str(locale) not in self.translations.keys(): return if str(locale) not in self.translations.keys(): return
if context.location is trans_context.other: if context.location is trans_context.other:
if f"{context.data}.{string.message}" in self.translations[str(locale)].keys(): if f"{context.data}.{string.message}" in self.translations[str(locale)].keys():
@ -27,6 +26,7 @@ class MeowTranslator(app_commands.Translator):
if string.message not in self.translations[str(locale)].keys(): return if string.message not in self.translations[str(locale)].keys(): return
return self.translations[str(locale)][string.message] return self.translations[str(locale)][string.message]
async def setup(bot): async def setup(bot):
await bot.tree.set_translator(MeowTranslator()) await bot.tree.set_translator(MeowTranslator())

16
utils/translate.py
View File

@ -1,5 +1,6 @@
from bot import db from bot import db
from discord.app_commands import TranslationContextLocation as trans_loc
from discord import app_commands
def region_to_str(region): def region_to_str(region):
# if region == discord.VoiceRegion.russia: # if region == discord.VoiceRegion.russia:
@ -28,3 +29,16 @@ def translate(string, region):
return pack return pack
else: else:
return string return string
async def get_text(inter, location, string):
data = await inter.translate(
app_commands.locale_str(string),
locale=inter.locale,
data=app_commands.TranslationContext(
trans_loc.other,
location
)
)
return data or string