Edit depends call in i18n
This commit is contained in:
parent
9f0ab4ae5a
commit
a13636ca49
8 changed files with 52 additions and 53 deletions
|
|
@ -11,7 +11,6 @@ from pathlib import Path
|
|||
import json
|
||||
from utils.i18n import get_translations
|
||||
from babel.support import Translations
|
||||
from fastapi import Depends
|
||||
|
||||
# Настройка логирования
|
||||
logging.basicConfig(
|
||||
|
|
@ -34,10 +33,10 @@ class WifiStorage:
|
|||
- Создаёт директорию хранения при инициализации, ведёт логирование путей.
|
||||
- Валидирует структуру при чтении и безопасно записывает JSON с Unicode и отступами.
|
||||
"""
|
||||
def __init__(self, storage_path: str = "storage/wifi/wifi.json", translations: Translations = Depends(get_translations())):
|
||||
def __init__(self, storage_path: str = "storage/wifi/wifi.json", translations: Translations = None):
|
||||
self.storage_file = Path(storage_path)
|
||||
self.storage_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
self.translations = translations
|
||||
self.translations = translations or get_translations()()
|
||||
logger.info(f"Wi-Fi storage initialized at: {self.storage_file.absolute()}")
|
||||
|
||||
def load_notes(self) -> Dict[str, Optional[str]]:
|
||||
|
|
@ -85,15 +84,15 @@ class WifiService:
|
|||
- Кэширование определения вендора.
|
||||
- Сохранение SSID даже без заметок для будущих операций.
|
||||
"""
|
||||
def __init__(self, translations: Translations = Depends(get_translations())):
|
||||
def __init__(self, translations: Translations = None):
|
||||
self.mac_lookup = MacLookup()
|
||||
self.wifi = pywifi.PyWiFi()
|
||||
self.interface = self._get_wifi_interface()
|
||||
if not hasattr(translations, 'gettext'):
|
||||
validated_translations = translations or get_translations()()
|
||||
if not hasattr(validated_translations, "gettext"):
|
||||
logger.warning("Translations object does not support gettext, using fallback")
|
||||
self.translations = Translations.load("utils/locales/en/LC_MESSAGES/services.mo")
|
||||
else:
|
||||
self.translations = translations
|
||||
validated_translations = get_translations()()
|
||||
self.translations = validated_translations
|
||||
self.storage = WifiStorage()
|
||||
|
||||
def _get_wifi_interface(self) -> Optional[object]:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue