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

Allow language-labelled commands

Browse Source
This commit is contained in:
Davte
2020-05-14 15:32:06 +02:00
parent 2d40903069
commit c583c3c3b0
4 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
davtelepot/languages.py
View File

@@ -140,26 +140,9 @@ class MultiLanguageObject(object):
result = messages or self.messages
for field in fields:
if field not in result:
logging.debug(
"Please define self.message{f}".format(
f=''.join(
'[\'{field}\']'.format(
field=field
)
for field in fields
)
)
)
return default_message or self.missing_message
result = result[field]
if language not in result:
# For specific languages, try generic ones
language = language.partition('-')[0]
if language not in result:
language = 'en'
if language not in result:
if not default_message:
logging.debug(
"Please define self.message{f}['en']".format(
"Please define self.message{f}".format(
f=''.join(
'[\'{field}\']'.format(
field=field
@@ -168,6 +151,25 @@ class MultiLanguageObject(object):
)
)
)
return default_message or self.missing_message
result = result[field]
if language not in result:
# For specific languages, try generic ones
language = language.partition('-')[0]
if language not in result:
language = 'en'
if language not in result:
if not default_message:
logging.debug(
"Please define self.message{f}['en']".format(
f=''.join(
'[\'{field}\']'.format(
field=field
)
for field in fields
)
)
)
return default_message or self.missing_message
if type(result) is str:
return result