diff --git a/evibes/locale/ru_RU/LC_MESSAGES/django.mo b/evibes/locale/ru_RU/LC_MESSAGES/django.mo index 4568ee84..f415534c 100644 Binary files a/evibes/locale/ru_RU/LC_MESSAGES/django.mo and b/evibes/locale/ru_RU/LC_MESSAGES/django.mo differ diff --git a/evibes/locale/ru_RU/LC_MESSAGES/django.po b/evibes/locale/ru_RU/LC_MESSAGES/django.po index 27509191..75d99626 100644 --- a/evibes/locale/ru_RU/LC_MESSAGES/django.po +++ b/evibes/locale/ru_RU/LC_MESSAGES/django.po @@ -235,7 +235,7 @@ msgstr "Меню" #: evibes/settings/unfold.py:67 msgid "Dashboard" -msgstr "Приборная панель" +msgstr "Панель" #: evibes/settings/unfold.py:72 msgid "Health" @@ -255,7 +255,7 @@ msgstr "Группы" #: evibes/settings/unfold.py:92 msgid "Products" -msgstr "Продукция" +msgstr "Товары" #: evibes/settings/unfold.py:97 msgid "Categories" @@ -267,15 +267,15 @@ msgstr "Бренды" #: evibes/settings/unfold.py:107 msgid "Blogposts" -msgstr "Записи в блогах" +msgstr "Посты" #: evibes/settings/unfold.py:112 msgid "Periodic Tasks" -msgstr "Периодические задания" +msgstr "Периодические задачи" #: evibes/settings/unfold.py:137 msgid "Taskboard" -msgstr "Доска задач" +msgstr "Канбан" #: evibes/settings/unfold.py:142 msgid "Support" diff --git a/evibes/middleware.py b/evibes/middleware.py index ea82a981..59b40f57 100644 --- a/evibes/middleware.py +++ b/evibes/middleware.py @@ -31,10 +31,10 @@ class CustomLocaleMiddleware(LocaleMiddleware): parts = lang.replace("_", "-").split("-") if len(parts) == 2: lang_code = parts[0].lower() - region = parts[1].upper() + region = parts[1].lower() normalized = f"{lang_code}-{region}" else: - normalized = lang + normalized = lang.lower() translation.activate(normalized) request.LANGUAGE_CODE = normalized diff --git a/evibes/settings/base.py b/evibes/settings/base.py index fbe8be79..ac687ea4 100644 --- a/evibes/settings/base.py +++ b/evibes/settings/base.py @@ -211,6 +211,14 @@ TEMPLATES: list[dict[str, str | list[str | Path] | dict[str, str | list[str]] | USE_I18N: bool = True +LOCALE_PATHS: tuple[Path, ...] = ( + (BASE_DIR / "evibes/locale"), + (BASE_DIR / "engine/blog/locale"), + (BASE_DIR / "engine/core/locale"), + (BASE_DIR / "engine/payments/locale"), + (BASE_DIR / "engine/vibes_auth/locale"), +) + LANGUAGES: tuple[tuple[str, str], ...] = ( ("ar-ar", "العربية"), ("cs-cz", "Česky"), @@ -301,6 +309,8 @@ CURRENCIES_WITH_SYMBOLS: tuple[tuple[str, str], ...] = ( ("VND", "₫"), ) +LANGUAGE_URL_OVERRIDES: dict[str, str] = {code.split("-")[0]: code for code, _ in LANGUAGES if "-" in code} + CURRENCY_CODE: str = dict(CURRENCIES_BY_LANGUAGES).get(LANGUAGE_CODE) # type: ignore[assignment] MODELTRANSLATION_FALLBACK_LANGUAGES: tuple[str, ...] = (LANGUAGE_CODE, "en-us", "de-de")