refactor: capitalize locales when creating i18n config (#6048)

* refactor: capitalize locales when creating i18n config * Switch to toLocaleUpperCase method * Update packages/docusaurus/src/server/i18n.ts Co-authored-by: Joshua Chen <sidachen2003@gmail.com> Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
facebook · Dec 8, 2021 · 68b75bf · 68b75bf
1 parent 35d3c02
commit 68b75bf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
@@ -42,7 +42,6 @@ export default function LocaleDropdownNavbarItem({
       target: '_self',
       autoAddBaseUrl: false,
       className: locale === currentLocale ? 'dropdown__link--active' : '',
-      style: {textTransform: 'capitalize'},
     };
   });
 

diff --git a/packages/docusaurus/src/server/__tests__/i18n.test.ts b/packages/docusaurus/src/server/__tests__/i18n.test.ts
@@ -39,11 +39,11 @@ describe('defaultLocaleConfig', () => {
 
   test('returns correct labels', () => {
     expect(getDefaultLocaleConfig('fr')).toEqual({
-      label: canComputeLabel ? 'français' : 'fr',
+      label: canComputeLabel ? 'Français' : 'fr',
       direction: 'ltr',
     });
     expect(getDefaultLocaleConfig('fr-FR')).toEqual({
-      label: canComputeLabel ? 'français (France)' : 'fr-FR',
+      label: canComputeLabel ? 'Français (France)' : 'fr-FR',
       direction: 'ltr',
     });
     expect(getDefaultLocaleConfig('en')).toEqual({

diff --git a/packages/docusaurus/src/server/i18n.ts b/packages/docusaurus/src/server/i18n.ts
@@ -15,7 +15,13 @@ function getDefaultLocaleLabel(locale: string) {
   // Intl.DisplayNames is ES2021 - Node14+
   // https://v8.dev/features/intl-displaynames
   if (typeof Intl.DisplayNames !== 'undefined') {
-    return new Intl.DisplayNames([locale], {type: 'language'}).of(locale);
+    const languageName = new Intl.DisplayNames(locale, {type: 'language'}).of(
+      locale,
+    );
+    return (
+      languageName.charAt(0).toLocaleUpperCase(locale) +
+      languageName.substring(1)
+    );
   }
   return locale;
 }