austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

chore: run lint and prettifier

Browse Source
This commit is contained in:
3252a8
2026-05-12 21:54:12 +03:00
parent f31540afdb
commit 11187487b4
174 changed files with 12383 additions and 6688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/middlewares/i18n.py
+34 -43
View File
@@ -1,18 +1,17 @@
import logging
import json
import logging
import os
from typing import Any, Awaitable, Callable, Dict, Optional
from aiogram import BaseMiddleware
from aiogram.types import User, Update
from aiogram.types import Update, User
from sqlalchemy.ext.asyncio import AsyncSession
from db.dal import user_dal
from config.settings import Settings
from db.dal import user_dal
class JsonI18n:
def __init__(self, path: str, default: str = "en", domain: str = "bot"):
self.domain = domain
self.path = path
@@ -25,8 +24,7 @@ class JsonI18n:
def _load_locales(self):
if not os.path.isdir(self.path):
logging.error(
f"Locales path not found or not a directory: {self.path}")
logging.error(f"Locales path not found or not a directory: {self.path}")
return
for item in os.listdir(self.path):
if item.endswith(".json"):
@@ -42,7 +40,8 @@ class JsonI18n:
except Exception as e_load:
logging.error(
f"Error loading locale {lang_code} from {file_path}: {e_load}",
exc_info=True)
exc_info=True,
)
def gettext(self, lang_code: Optional[str], key: str, **kwargs) -> str:
# Determine effective language with robust fallback
@@ -50,15 +49,15 @@ class JsonI18n:
effective_lang_code = lang_code
elif self.default_lang in self.locales_data:
effective_lang_code = self.default_lang
elif 'en' in self.locales_data:
effective_lang_code = 'en'
elif "en" in self.locales_data:
effective_lang_code = "en"
else:
effective_lang_code = lang_code or self.default_lang
lang_data = self.locales_data.get(effective_lang_code)
if lang_data is None:
# Try explicit fallback to English if available
fallback_data = self.locales_data.get('en')
fallback_data = self.locales_data.get("en")
if fallback_data is not None:
text = fallback_data.get(key)
if text is not None:
@@ -74,8 +73,7 @@ class JsonI18n:
text = lang_data.get(key)
if text is None:
if effective_lang_code != self.default_lang:
default_lang_data = self.locales_data.get(
self.default_lang, {})
default_lang_data = self.locales_data.get(self.default_lang, {})
text = default_lang_data.get(key)
if text is None:
@@ -93,44 +91,40 @@ class JsonI18n:
except Exception as e_general_format:
logging.error(
f"General error formatting i18n key '{key}' (lang: {effective_lang_code}): {e_general_format}. Original text: '{text}'",
exc_info=True)
exc_info=True,
)
return text
_i18n_instance_singleton: Optional[JsonI18n] = None
def get_i18n_instance(path: str = "locales",
default: str = "en",
domain: str = "bot") -> JsonI18n:
def get_i18n_instance(path: str = "locales", default: str = "en", domain: str = "bot") -> JsonI18n:
global _i18n_instance_singleton
if _i18n_instance_singleton is None:
if not os.path.exists(path) or not os.path.isdir(path):
logging.error(
f"CRITICAL: Locales directory '{path}' not found. i18n will not work correctly."
)
_i18n_instance_singleton = JsonI18n(path=path,
default=default,
domain=domain)
_i18n_instance_singleton = JsonI18n(path=path, default=default, domain=domain)
else:
_i18n_instance_singleton = JsonI18n(path=path,
default=default,
domain=domain)
_i18n_instance_singleton = JsonI18n(path=path, default=default, domain=domain)
return _i18n_instance_singleton
class I18nMiddleware(BaseMiddleware):
def __init__(self, i18n: JsonI18n, settings: Settings):
super().__init__()
self.i18n = i18n
self.settings = settings
async def __call__(self, handler: Callable[[Update, Dict[str, Any]],
Awaitable[Any]], event: Update,
data: Dict[str, Any]) -> Any:
async def __call__(
self,
handler: Callable[[Update, Dict[str, Any]], Awaitable[Any]],
event: Update,
data: Dict[str, Any],
) -> Any:
session: AsyncSession = data["session"]
event_user: Optional[User] = data.get("event_from_user")
@@ -138,33 +132,30 @@ class I18nMiddleware(BaseMiddleware):
if event_user:
try:
user_db_model = await user_dal.get_user_by_id(
session, event_user.id)
if user_db_model and user_db_model.language_code and user_db_model.language_code in self.i18n.locales_data:
user_db_model = await user_dal.get_user_by_id(session, event_user.id)
if (
user_db_model
and user_db_model.language_code
and user_db_model.language_code in self.i18n.locales_data
):
current_language = user_db_model.language_code
elif event_user.language_code:
lang_prefix = event_user.language_code.split(
'-')[0].lower()
lang_prefix = event_user.language_code.split("-")[0].lower()
if lang_prefix in self.i18n.locales_data:
current_language = lang_prefix
elif event_user.language_code.lower(
) in self.i18n.locales_data:
elif event_user.language_code.lower() in self.i18n.locales_data:
current_language = event_user.language_code.lower()
except Exception as e_db_lang:
logging.error(
f"I18nMiddleware: Error fetching user lang from DB for {event_user.id}: {e_db_lang}. Falling back.",
exc_info=True)
exc_info=True,
)
if event_user.language_code:
lang_prefix = event_user.language_code.split(
'-')[0].lower()
lang_prefix = event_user.language_code.split("-")[0].lower()
if lang_prefix in self.i18n.locales_data:
current_language = lang_prefix
elif event_user.language_code.lower(
) in self.i18n.locales_data:
elif event_user.language_code.lower() in self.i18n.locales_data:
current_language = event_user.language_code.lower()
data["i18n_data"] = {
"i18n_instance": self.i18n,
"current_language": current_language
}
data["i18n_data"] = {"i18n_instance": self.i18n, "current_language": current_language}
return await handler(event, data)