Merge branch 'dev-2.x'

aiogram/contrib/fsm_storage/memory.py

@@ -105,6 +105,7 @@ class MemoryStorage(BaseStorage):
         self.data[chat][user]['bucket'].update(bucket, **kwargs)
 
     def _cleanup(self, chat, user):
+        chat, user = self.resolve_address(chat=chat, user=user)
         if self.data[chat][user] == {'state': None, 'data': {}, 'bucket': {}}:
             del self.data[chat][user]
         if not self.data[chat]:

aiogram/contrib/middlewares/i18n.py

@@ -132,11 +132,11 @@ class I18nMiddleware(BaseMiddleware):
         user: Optional[types.User] = types.User.get_current()
         locale: Optional[Locale] = user.locale if user else None
 
-        if locale:
+        if locale and locale.language in self.locales:
             *_, data = args
             language = data['locale'] = locale.language
             return language
-        return None
+        return self.default
 
     async def trigger(self, action, args):
         """