Merge pull request #19384 from mozilla/language-fx

fix(locale): Small fix for language selector

Author: vbudhram

packages/fxa-settings/src/models/hooks.test.ts

@@ -410,12 +410,12 @@ describe('useCmsInfoState', () => {
   });
 
   it('should fetch when l10nEnabled is false but browser language is English', async () => {
-    // Mock English browser language but non-English selected locale
+    // Mock English browser language and English selected locale
     Object.defineProperty(navigator, 'language', {
       writable: true,
       value: 'en-GB',
     });
-    require('../contexts/DynamicLocalizationContext').useDynamicLocalization.mockReturnValue({ currentLocale: 'fr-FR' });
+    require('../contexts/DynamicLocalizationContext').useDynamicLocalization.mockReturnValue({ currentLocale: 'en-US' });
 
     mockUrlQueryData.get.mockImplementation((key: string) => {
       if (key === 'client_id') return '1234567890abcdef';

packages/fxa-settings/src/models/hooks.ts

@@ -252,10 +252,14 @@ export function useCmsInfoState() {
 
       // If l10nEnabled is false, only fetch for English locales
       // Check both browser language and user's selected locale
-      const isEnglishBrowser = navigator.language.startsWith('en');
-      const isEnglishSelected = currentLocale.startsWith('en');
+      let isEnglish = false;
+      if (currentLocale) {
+        isEnglish = currentLocale.startsWith('en');
+      } else if (navigator.language) {
+        isEnglish = navigator.language.startsWith('en');
+      }
 
-      return isEnglishBrowser || isEnglishSelected;
+      return isEnglish;
     }
 
     if (