HybrydMain/gonets
3
2
Fork 0
Code Issues 5 Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

Edit depends call in i18n

Browse source
This commit is contained in:
Галанский Сергей Александрович 2025-11-17 12:05:43 +05:00
parent 9f0ab4ae5a
commit a13636ca49
8 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

51
SRV/utils/i18n.py
View file

@ -16,40 +16,49 @@
региональных суффиксов) для упрощения.
- Модуль ведёт отладочное логирование выбора и загрузки локали.
"""
from fastapi import Request, Depends
from fastapi import Request, WebSocket
from babel.support import Translations
import logging
from typing import Optional, Union
from pathlib import Path
logger = logging.getLogger(__name__)
LOCALES_DIR = Path(__file__).resolve().parent.parent / "locales"
def _load_translations(locale: str) -> Translations:
"""Подгружает словарь переводов с fallback на ru."""
try:
translations = Translations.load(str(LOCALES_DIR), [locale], "messages")
if not translations._catalog:
logger.warning(f"Translations for locale {locale} not found, falling back to ru")
translations = Translations.load(str(LOCALES_DIR), ["ru"], "messages")
return translations
except Exception as e: # pragma: no cover - логируем и возвращаем ru
logger.error(f"Failed to load translations for locale {locale}: {str(e)}")
return Translations.load(str(LOCALES_DIR), ["ru"], "messages")
def get_translations() -> callable:
"""
Создаёт зависимость для загрузки переводов на основе заголовка Accept-Language
или параметра запроса 'locale'. По умолчанию используется русский язык.
"""
def translations_dependency(request: Request) -> Translations:
def translations_dependency(request: Optional[Union[Request, WebSocket]] = None) -> Translations:
if request is None:
logger.warning("Translations dependency called without request/websocket; fallback to ru")
return _load_translations("ru")
# Проверяем параметр запроса 'locale', если он есть
locale = request.query_params.get("locale")
if not locale:
# Если параметр отсутствует, проверяем куку 'locale'
locale = None
if hasattr(request, "query_params"):
locale = request.query_params.get("locale")
if not locale and hasattr(request, "cookies"):
locale = request.cookies.get("locale")
if not locale:
# Если куки нет, используем заголовок Accept-Language
if not locale and hasattr(request, "headers"):
locale = request.headers.get("Accept-Language", "ru").split(",")[0].split("-")[0]
locale = locale or "ru"
logger.debug(f"Determined locale: {locale}")
try:
translations = Translations.load("locales", [locale], "messages")
if not translations._catalog:
logger.warning(f"Translations for locale {locale} not found, falling back to ru")
translations = Translations.load("locales", ["ru"], "messages")
logger.debug(f"Loaded translations for locale {locale}, catalog size: {len(translations._catalog)}")
return translations
except Exception as e:
logger.error(f"Failed to load translations for locale {locale}: {str(e)}")
# Fallback на русский
logger.debug("Falling back to ru translations")
return Translations.load("locales", ["ru"], "messages")
return _load_translations(locale)
return translations_dependency
@ -66,9 +75,9 @@ def _(msgid: str, request: Request = None) -> str:
"""
if request is None:
# Язык, который будет отображаться по умолчанию
translations = Translations.load("locales", ["ru"], "messages")
translations = _load_translations("ru")
logger.debug(f"Using default ru translations for msgid: {msgid}")
else:
translations = get_translations()(request)
logger.debug(f"Using translations for locale {request.cookies.get('locale', 'ru')} for msgid: {msgid}")
return translations.gettext(msgid)
return translations.gettext(msgid)