Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@greeeen-dev
greeeen-dev committed Oct 4, 2024
1 parent 0d27aae commit b76f9ef
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 39 deletions.
45 changes: 22 additions & 23 deletions cogs/sysmgr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1225,9 +1225,9 @@ async def extensions(self, ctx, *, extension=None):
cog = self.bot.cogs[list(self.bot.cogs)[x]]
ext = list(self.bot.extensions)[x]
if text == '':
text = f'- {cog.qualified_name} (`{ext}`)'
text = f'- {selector.rawget('name', f'{ext.replace('cogs.','',1)}.cogmeta',default='') or cog.qualified_name} (`{ext}`)'
else:
text = f'{text}\n- {cog.qualified_name} (`{ext}`)'
text = f'{text}\n- {selector.rawget('name', f'{ext.replace('cogs.','',1)}.cogmeta',default='') or cog.qualified_name} (`{ext}`)'
embed.description = text
embed.set_footer(text=selector.fget('page',values={'page':page + 1}))
return await ctx.send(embed=embed)
Expand All @@ -1243,8 +1243,8 @@ async def extensions(self, ctx, *, extension=None):
else:
return await ctx.send(selector.get('notfound'))
embed = nextcord.Embed(
title=ext_info.qualified_name,
description=ext_info.description,
title=selector.rawget('name', f'{extension}.cogmeta',default='') or ext_info.qualified_name,
description=selector.rawget('description', f'{extension}.cogmeta',default='') or ext_info.description,
color=self.bot.colors.unifier
)
if (extension == 'cogs.sysmgr' or extension == 'cogs.lockdown' or
Expand Down Expand Up @@ -2573,12 +2573,11 @@ async def help(self,ctx,query=None):
description = selector.get("no_desc")
else:
split = False
description = cog.description

try:
description = selector.rawget('description', f'{extname}.cogmeta')
description = selector.rawget('description', f'{extname}.cogmeta',default='') or cog.description
except:
pass
description = cog.description

if '\n' in cog.description:
description = description.split('\n',1)[0]
Expand All @@ -2588,14 +2587,9 @@ async def help(self,ctx,query=None):
elif split:
description = description + '\n...'

name = cog.qualified_name
localized_name = selector.rawget('name', f'{extname}.cogmeta',default='') or cog.qualified_name

try:
name = selector.rawget('name', f'{extname}.cogmeta')
except:
pass

parts = name.split(' ')
parts = localized_name.split(' ')
offset = 0
for i in range(len(parts)):
index = i - offset
Expand All @@ -2610,7 +2604,7 @@ async def help(self,ctx,query=None):
name = ' '.join(parts)

embed.add_field(
name=f'{cog.qualified_name} (`{ext}`)',
name=f'{localized_name} (`{ext}`)',
value=description,
inline=False
)
Expand Down Expand Up @@ -2690,8 +2684,10 @@ def search_filter(query, query_cmd):
cmds.pop(index-offset)
offset += 1

localized_cogname = selector.get("search_nav") if cogname == 'search' else cogname

embed.title = (
f'{self.bot.ui_emojis.command} {helptext} / {cogname}' if not cogname == '' else
f'{self.bot.ui_emojis.command} {helptext} / {localized_cogname}' if not cogname == '' else
f'{self.bot.ui_emojis.command} {helptext} / {selector.get("all")}'
)
embed.description = selector.get("choose_cmd")
Expand Down Expand Up @@ -2731,12 +2727,15 @@ def search_filter(query, query_cmd):
break
cmd = cmds[index]

cmddesc = cmd.description if cmd.description else selector.get("no_desc")

try:
cmddesc = selector.desc_from_all(cmd.qualified_name)
except:
pass
cmddesc = (
selector.rawget('description', f'{cogname.replace('cogs.', '', 1)}.{cmd.qualified_name}', default='')
or
selector.desc_from_all(cmd.qualified_name)
or
cmd.description or selector.get("no_desc")
)
print(cmddesc)
print(f'{cogname.replace('cogs.', '', 1)}.{cmd.qualified_name}')

embed.add_field(
name=f'`{cmd.qualified_name}`',
Expand Down Expand Up @@ -2933,7 +2932,7 @@ def check(interaction):
elif interaction.type==nextcord.InteractionType.modal_submit:
panel = 1
page = 0
cogname = selector.get('search_nav')
cogname = 'search'
query = interaction.data['components'][0]['components'][0]['value']
namematch = True
descmatch = True
Expand Down
41 changes: 25 additions & 16 deletions utils/langmgr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,16 @@ def get_language_meta(self, language):
def desc(self, parent):
return self.get('description',parent)

def desc_from_all(self, command):
for key in self.__language_base.keys():
if command in self.__language_base[key].keys():
return self.get("description", f"{key}.{command}")
def desc_from_all(self, command, language=None):
try:
base = self.__language_custom[language]['strings']
except:
base = self.__language_base['strings']
for key in base.keys():
if key == "commons":
continue
if command in base[key].keys():
return self.get("description", f"{key}.{command}", language=language)
return None

def get(self, string, parent: Union[commands.Context, str], default="[unknown string]", language=None):
Expand Down Expand Up @@ -137,7 +143,7 @@ def get(self, string, parent: Union[commands.Context, str], default="[unknown st
def get_formatted(self,
string,
parent: Union[commands.Context, str],
default=None,
default="[unknown string]",
values: dict = None,
language=None):
if not self.__loaded:
Expand All @@ -153,7 +159,7 @@ def get_formatted(self,
def fget(self,
string,
parent: Union[commands.Context, str],
default=None,
default="[unknown string]",
values: dict = None,
language=None):
"""Alias for get_formatted"""
Expand Down Expand Up @@ -201,23 +207,26 @@ def extname(self):
def cmdname(self):
return self.__cmdname

def rawget(self, string, parent: Union[commands.Context, str]):
return self.__parent.get(string, parent, language=self.__language_set)
def rawget(self, string, parent: Union[commands.Context, str], default="[unknown string]"):
return self.__parent.get(string, parent, language=self.__language_set, default=default)

def rawget_formatted(self, string, parent: Union[commands.Context, str], values: dict = None):
return self.__parent.get_formatted(string, parent, language=self.__language_set, values=values)
def rawget_formatted(self, string, parent: Union[commands.Context, str], values: dict = None, default="[unknown string]"):
return self.__parent.get_formatted(string, parent, language=self.__language_set, values=values, default=default)

def rawfget(self, string, parent: Union[commands.Context, str], values: dict = None):
return self.__parent.get_formatted(string, parent, language=self.__language_set, values=values)
def rawfget(self, string, parent: Union[commands.Context, str], values: dict = None, default="[unknown string]"):
return self.__parent.get_formatted(string, parent, language=self.__language_set, values=values, default=default)

def get(self, string):
return self.__parent.get(string, f"{self.__extname}.{self.__cmdname}", language=self.__language_set)
def get(self, string, default="[unknown string]"):
return self.__parent.get(string, f"{self.__extname}.{self.__cmdname}", language=self.__language_set, default=default)

def get_formatted(self, string, values):
def get_formatted(self, string, values, default="[unknown string]"):
return self.__parent.get_formatted(
string, f"{self.__extname}.{self.__cmdname}", values=values, language=self.__language_set
string, f"{self.__extname}.{self.__cmdname}", values=values, language=self.__language_set, default=default
)

def desc_from_all(self, string):
return self.__parent.desc_from_all(string, self.__language_set)

def fget(self, string, values):
"""Alias for get_formatted"""
return self.__parent.get_formatted(
Expand Down

0 comments on commit b76f9ef

Please sign in to comment.