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

get_message method now supports a default_message optional kwarg

Browse Source
This commit is contained in:
Davte 2019-07-21 15:39:59 +02:00
parent 6e95de61e9
commit fba4e4c143
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
davtelepot/languages.py
View File

@ -112,7 +112,7 @@ class MultiLanguageObject(object):
return language or self.default_language return language or self.default_language
def get_message(self, *fields, update=dict(), user_record=dict(), def get_message(self, *fields, update=dict(), user_record=dict(),
language=None, **format_kwargs): default_message=None, language=None, **format_kwargs):
"""Given a list of strings (`fields`), return proper message. """Given a list of strings (`fields`), return proper message.
Language will be determined by `get_language` method. Language will be determined by `get_language` method.
@ -138,7 +138,7 @@ class MultiLanguageObject(object):
) )
) )
) )
return self.missing_message return default_message or self.missing_message
result = result[field] result = result[field]
if language not in result: if language not in result:
# For specific languages, try generic ones # For specific languages, try generic ones
@ -156,7 +156,7 @@ class MultiLanguageObject(object):
) )
) )
) )
return self.missing_message return default_message or self.missing_message
return result[language].format( return result[language].format(
**format_kwargs **format_kwargs
) )