python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed the crutch with the user's language

Browse source
This commit is contained in:
Alex Root Junior 2017-06-01 22:53:29 +03:00
parent c03b836a8e
commit 93c61e9e0a
4 changed files with 13 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/types/__init__.py
View file

@ -63,6 +63,8 @@ class Deserializable:
def parent(self, value):
setattr(self, '_parent', value)
for name, attr in self.__dict__.items():
if name.startswith('_'):
continue
if hasattr(attr, 'de_json'):
attr.parent = self

9
aiogram/types/user.py
View file

@ -1,5 +1,6 @@
import babel
from . import Deserializable
from ..utils.user_language import get_language
class User(Deserializable):
@ -45,7 +46,9 @@ class User(Deserializable):
return self.full_name
@property
def language(self):
def locale(self) -> babel.core.Locale or None:
if not self.language_code:
return None
return get_language(self.language_code)
if not hasattr(self, '_locale'):
setattr(self, '_locale', babel.core.Locale.parse(self.language_code, sep='-'))
return getattr(self, '_locale')