Skip to content

fix(tenants): use nameEn for English locale on platform admin list #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abdout wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tenants): use nameEn for English locale on platform admin list #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/components/saas-dashboard/tenants/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ async function getTenants(searchParams: Props["searchParams"], lang: Locale) {
select: {
id: true,
name: true,
nameEn: true,
domain: true,
isActive: true,
planType: true,
Expand All @@ -81,15 +82,21 @@ async function getTenants(searchParams: Props["searchParams"], lang: Locale) {
db.school.count({ where }),
])

// Prefer pre-translated nameEn for English locale to skip the translation API
// (canonical pattern from (school-dashboard)/layout.tsx:67-76).
// Fall back to on-demand translation only when nameEn is not set.
const translatedNames = await Promise.all(
tenants.map((tenant) =>
getDisplayText(
tenants.map((tenant) => {
if (lang === "en" && tenant.nameEn) {
return Promise.resolve(tenant.nameEn)
}
return getDisplayText(
tenant.name,
(tenant.preferredLanguage ?? "ar") as "en" | "ar",
lang,
tenant.id
)
)
})
)

const rows: TenantRow[] = tenants.map((tenant, i) => ({
Expand Down
Loading