fix(i18n): convert remaining $t() to server-side _() and fix store dashboard language
Some checks failed
Some checks failed
- Convert storefront enrollment $t() calls to server-side _() to silence dev-toolbar warnings (welcome bonus + join button) - Fix store base template I18n.init() to use current_language (from middleware) instead of dashboard_language (hardcoded store config) so language changes take effect immediately - Switch admin loyalty routes to use get_admin_context() for proper i18n support - Switch store loyalty routes to use core get_store_context() from page_context - Pass program object to storefront enrollment context for server-side rendering - Add LANG-011 architecture rule: enforce $t()/_() over I18n.t() in templates - Fix duplicate file_pattern key in LANG-004 rule (YAML validation error) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -111,11 +111,9 @@ language_rules:
|
|||||||
function languageSelector(currentLang, enabledLanguages) { ... }
|
function languageSelector(currentLang, enabledLanguages) { ... }
|
||||||
window.languageSelector = languageSelector;
|
window.languageSelector = languageSelector;
|
||||||
pattern:
|
pattern:
|
||||||
file_pattern: "static/shop/js/shop-layout.js"
|
file_patterns:
|
||||||
required_patterns:
|
- "static/shop/js/shop-layout.js"
|
||||||
- "function languageSelector"
|
- "static/vendor/js/init-alpine.js"
|
||||||
- "window.languageSelector"
|
|
||||||
file_pattern: "static/vendor/js/init-alpine.js"
|
|
||||||
required_patterns:
|
required_patterns:
|
||||||
- "function languageSelector"
|
- "function languageSelector"
|
||||||
- "window.languageSelector"
|
- "window.languageSelector"
|
||||||
@@ -247,3 +245,26 @@ language_rules:
|
|||||||
pattern:
|
pattern:
|
||||||
file_pattern: "static/locales/*.json"
|
file_pattern: "static/locales/*.json"
|
||||||
check: "valid_json"
|
check: "valid_json"
|
||||||
|
|
||||||
|
- id: "LANG-011"
|
||||||
|
name: "Use $t() not I18n.t() in HTML templates"
|
||||||
|
severity: "error"
|
||||||
|
description: |
|
||||||
|
In HTML templates, never use I18n.t() directly. It evaluates once
|
||||||
|
and does NOT re-evaluate when translations finish loading async.
|
||||||
|
|
||||||
|
WRONG (non-reactive, shows raw key then updates):
|
||||||
|
<span x-text="I18n.t('module.key')"></span>
|
||||||
|
|
||||||
|
RIGHT (reactive, updates when translations load):
|
||||||
|
<span x-text="$t('module.key')"></span>
|
||||||
|
|
||||||
|
BEST (server-side, zero flash):
|
||||||
|
<span>{{ _('module.key') }}</span>
|
||||||
|
|
||||||
|
Note: I18n.t() is fine in .js files where it's called inside
|
||||||
|
async callbacks after I18n.init() has completed.
|
||||||
|
pattern:
|
||||||
|
file_pattern: "**/*.html"
|
||||||
|
anti_patterns:
|
||||||
|
- "I18n.t("
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ from fastapi.responses import HTMLResponse
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.api.deps import get_db, require_menu_access
|
from app.api.deps import get_db, require_menu_access
|
||||||
|
from app.modules.core.utils.page_context import get_admin_context
|
||||||
from app.modules.enums import FrontendType
|
from app.modules.enums import FrontendType
|
||||||
from app.modules.tenancy.models import User
|
from app.modules.tenancy.models import User
|
||||||
from app.templates_config import templates
|
from app.templates_config import templates
|
||||||
@@ -43,10 +44,7 @@ async def admin_loyalty_programs(
|
|||||||
"""
|
"""
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/admin/programs.html",
|
"loyalty/admin/programs.html",
|
||||||
{
|
get_admin_context(request, db, current_user),
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -62,10 +60,7 @@ async def admin_loyalty_analytics(
|
|||||||
"""
|
"""
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/admin/analytics.html",
|
"loyalty/admin/analytics.html",
|
||||||
{
|
get_admin_context(request, db, current_user),
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -91,11 +86,7 @@ async def admin_loyalty_merchant_detail(
|
|||||||
"""
|
"""
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/admin/merchant-detail.html",
|
"loyalty/admin/merchant-detail.html",
|
||||||
{
|
get_admin_context(request, db, current_user, merchant_id=merchant_id),
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
"merchant_id": merchant_id,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -116,11 +107,7 @@ async def admin_loyalty_program_edit(
|
|||||||
"""
|
"""
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/admin/program-edit.html",
|
"loyalty/admin/program-edit.html",
|
||||||
{
|
get_admin_context(request, db, current_user, merchant_id=merchant_id),
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
"merchant_id": merchant_id,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -141,9 +128,5 @@ async def admin_loyalty_merchant_settings(
|
|||||||
"""
|
"""
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/admin/merchant-settings.html",
|
"loyalty/admin/merchant-settings.html",
|
||||||
{
|
get_admin_context(request, db, current_user, merchant_id=merchant_id),
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
"merchant_id": merchant_id,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -24,10 +24,8 @@ from app.api.deps import (
|
|||||||
get_db,
|
get_db,
|
||||||
get_resolved_store_code,
|
get_resolved_store_code,
|
||||||
)
|
)
|
||||||
from app.modules.core.services.platform_settings_service import (
|
from app.modules.core.utils.page_context import get_store_context
|
||||||
platform_settings_service,
|
from app.modules.tenancy.models import User
|
||||||
)
|
|
||||||
from app.modules.tenancy.models import Store, User
|
|
||||||
from app.templates_config import templates
|
from app.templates_config import templates
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -42,49 +40,6 @@ ROUTE_CONFIG = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# HELPER: Build Store Context
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
def get_store_context(
|
|
||||||
request: Request,
|
|
||||||
db: Session,
|
|
||||||
current_user: User,
|
|
||||||
store_code: str,
|
|
||||||
**extra_context,
|
|
||||||
) -> dict:
|
|
||||||
"""Build template context for store loyalty pages."""
|
|
||||||
# Load store from database
|
|
||||||
store = db.query(Store).filter(Store.subdomain == store_code).first()
|
|
||||||
|
|
||||||
# Get platform defaults
|
|
||||||
platform_config = platform_settings_service.get_storefront_config(db)
|
|
||||||
|
|
||||||
# Resolve with store override
|
|
||||||
storefront_locale = platform_config["locale"]
|
|
||||||
storefront_currency = platform_config["currency"]
|
|
||||||
|
|
||||||
if store and store.storefront_locale:
|
|
||||||
storefront_locale = store.storefront_locale
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"request": request,
|
|
||||||
"user": current_user,
|
|
||||||
"store": store,
|
|
||||||
"store_code": store_code,
|
|
||||||
"storefront_locale": storefront_locale,
|
|
||||||
"storefront_currency": storefront_currency,
|
|
||||||
"dashboard_language": store.dashboard_language if store else "en",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add any extra context
|
|
||||||
if extra_context:
|
|
||||||
context.update(extra_context)
|
|
||||||
|
|
||||||
return context
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# LOYALTY ROOT (Redirect to Terminal)
|
# LOYALTY ROOT (Redirect to Terminal)
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ from sqlalchemy.orm import Session
|
|||||||
from app.api.deps import get_current_customer_from_cookie_or_header, get_db
|
from app.api.deps import get_current_customer_from_cookie_or_header, get_db
|
||||||
from app.modules.core.utils.page_context import get_storefront_context
|
from app.modules.core.utils.page_context import get_storefront_context
|
||||||
from app.modules.customers.models import Customer
|
from app.modules.customers.models import Customer
|
||||||
|
from app.modules.loyalty.services import program_service
|
||||||
from app.templates_config import templates
|
from app.templates_config import templates
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -114,7 +115,10 @@ async def loyalty_self_enrollment(
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
context = get_storefront_context(request, db=db)
|
store = request.state.store
|
||||||
|
program = program_service.get_active_program_by_store(db, store.id) if store else None
|
||||||
|
|
||||||
|
context = get_storefront_context(request, db=db, program=program)
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
"loyalty/storefront/enroll.html",
|
"loyalty/storefront/enroll.html",
|
||||||
context,
|
context,
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<img src="{{ store.logo_url }}" alt="{{ store.name }}" class="h-16 w-auto mx-auto mb-4">
|
<img src="{{ store.logo_url }}" alt="{{ store.name }}" class="h-16 w-auto mx-auto mb-4">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ _('loyalty.enrollment.title') }}</h1>
|
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ _('loyalty.enrollment.title') }}</h1>
|
||||||
<p class="mt-2 text-gray-600 dark:text-gray-400" x-text="I18n.t('loyalty.enrollment.subtitle', {points: program?.points_per_euro || 1})"></p>
|
<p class="mt-2 text-gray-600 dark:text-gray-400">{{ _('loyalty.enrollment.subtitle', points=program.points_per_euro if program else 1) }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Loading -->
|
<!-- Loading -->
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
class="p-4 text-center text-white"
|
class="p-4 text-center text-white"
|
||||||
:style="'background-color: ' + (program?.card_color || 'var(--color-primary)')">
|
:style="'background-color: ' + (program?.card_color || 'var(--color-primary)')">
|
||||||
<span x-html="$icon('gift', 'w-6 h-6 inline mr-2')"></span>
|
<span x-html="$icon('gift', 'w-6 h-6 inline mr-2')"></span>
|
||||||
<span class="font-semibold" x-text="I18n.t('loyalty.enrollment.welcome_bonus', {points: program?.welcome_bonus_points})"></span>
|
<span class="font-semibold">{{ _('loyalty.enrollment.welcome_bonus', points=program.welcome_bonus_points if program else 0) }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form @submit.prevent="submitEnrollment" class="p-6 space-y-4">
|
<form @submit.prevent="submitEnrollment" class="p-6 space-y-4">
|
||||||
@@ -119,7 +119,7 @@
|
|||||||
class="w-full py-3 px-4 text-white font-semibold rounded-lg transition-colors disabled:opacity-50"
|
class="w-full py-3 px-4 text-white font-semibold rounded-lg transition-colors disabled:opacity-50"
|
||||||
:style="'background-color: ' + (program?.card_color || 'var(--color-primary)')">
|
:style="'background-color: ' + (program?.card_color || 'var(--color-primary)')">
|
||||||
<span x-show="enrolling" x-html="$icon('spinner', 'w-5 h-5 inline animate-spin mr-2')"></span>
|
<span x-show="enrolling" x-html="$icon('spinner', 'w-5 h-5 inline animate-spin mr-2')"></span>
|
||||||
<span x-text="enrolling ? I18n.t('loyalty.enrollment.form.joining') : I18n.t('loyalty.enrollment.form.join_button', {points: program?.welcome_bonus_points || 0})"></span>
|
<span x-text="enrolling ? '{{ _('loyalty.enrollment.form.joining') }}' : '{{ _('loyalty.enrollment.form.join_button', points=program.welcome_bonus_points if program else 0) }}'"></span>
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@
|
|||||||
// Wrapped in DOMContentLoaded so deferred i18n.js has loaded
|
// Wrapped in DOMContentLoaded so deferred i18n.js has loaded
|
||||||
document.addEventListener('DOMContentLoaded', async function() {
|
document.addEventListener('DOMContentLoaded', async function() {
|
||||||
const modules = {% block i18n_modules %}[]{% endblock %};
|
const modules = {% block i18n_modules %}[]{% endblock %};
|
||||||
await I18n.init('{{ dashboard_language | default("en") }}', modules);
|
await I18n.init('{{ current_language | default("en") }}', modules);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3758,6 +3758,19 @@ class ArchitectureValidator:
|
|||||||
context=line.strip()[:80],
|
context=line.strip()[:80],
|
||||||
suggestion="Use single quotes: x-data='func({{ data|tojson }})'",
|
suggestion="Use single quotes: x-data='func({{ data|tojson }})'",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# LANG-011: I18n.t() in templates (should use $t() or server-side _())
|
||||||
|
if "I18n.t(" in line:
|
||||||
|
self._add_violation(
|
||||||
|
rule_id="LANG-011",
|
||||||
|
rule_name="Use $t() not I18n.t() in HTML templates",
|
||||||
|
severity=Severity.ERROR,
|
||||||
|
file_path=file_path,
|
||||||
|
line_number=i,
|
||||||
|
message="I18n.t() is non-reactive in templates. Use $t() (reactive) or _() (server-side)",
|
||||||
|
context=line.strip()[:80],
|
||||||
|
suggestion="Replace I18n.t('key') with $t('key') or {{ _('key') }}",
|
||||||
|
)
|
||||||
except Exception:
|
except Exception:
|
||||||
pass # Skip files that can't be read
|
pass # Skip files that can't be read
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user