Skip to content
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.

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

fix: add client validation and find similar language from browser config if exact match is not available #6412

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Changes from all commits
Commits
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
42 changes: 37 additions & 5 deletions packages/i18n/src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,41 @@ export class TranslationStore {

/** Checks if the language is valid based on the supported languages */
private isValidLanguage(lang: string | null): lang is TLanguage {
return lang !== null && SUPPORTED_LANGUAGES.some((l) => l.value === lang);
return lang !== null && this.availableLanguages.some((l) => l.value === lang);
}

/** Checks if a language code is similar to any supported language */
private findSimilarLanguage(lang: string): TLanguage | null {
// Convert to lowercase for case-insensitive comparison
const normalizedLang = lang.toLowerCase();

// Find a supported language that includes or is included in the browser language
const similarLang = this.availableLanguages.find(
(l) => normalizedLang.includes(l.value.toLowerCase()) || l.value.toLowerCase().includes(normalizedLang)
);

return similarLang ? similarLang.value : null;
}

/** Gets the browser language based on the navigator.language */
private getBrowserLanguage(): TLanguage {
const browserLang = navigator.language.split("-")[0];
return this.isValidLanguage(browserLang) ? browserLang : FALLBACK_LANGUAGE;
const browserLang = navigator.language;

// Check exact match first
if (this.isValidLanguage(browserLang)) {
return browserLang;
}

// Check base language without region code
const baseLang = browserLang.split("-")[0];
if (this.isValidLanguage(baseLang)) {
return baseLang as TLanguage;
}

// Try to find a similar language
const similarLang = this.findSimilarLanguage(browserLang) || this.findSimilarLanguage(baseLang);

return similarLang || FALLBACK_LANGUAGE;
}

/**
Expand Down Expand Up @@ -151,10 +179,14 @@ export class TranslationStore {
throw new Error(`Invalid language: ${lng}`);
}

localStorage.setItem(STORAGE_KEY, lng);
if (typeof window !== "undefined") {
localStorage.setItem(STORAGE_KEY, lng);
}
this.currentLocale = lng;
this.messageCache.clear(); // Clear cache when language changes
document.documentElement.lang = lng;
if (typeof window !== "undefined") {
document.documentElement.lang = lng;
}
} catch (error) {
console.error("Failed to set language:", error);
}
Expand Down
Loading