Merge remote-tracking branch 'upstream/master' into build_config_and_…

…optimizations
i18next · Jul 16, 2024 · 6ecee8d · 6ecee8d
2 parents 8fb11dc + 34aa20d
commit 6ecee8d
Show file tree

Hide file tree

Showing 10 changed files with 4,058 additions and 6,803 deletions.
diff --git a/example/react-component-lib/README.md b/example/react-component-lib/README.md
@@ -1166,7 +1166,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/example/react-localstorage/README.md b/example/react-localstorage/README.md
@@ -1166,7 +1166,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/example/react/README.md b/example/react/README.md
@@ -1166,7 +1166,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/example/v9.x.x/react-fluent/README.md b/example/v9.x.x/react-fluent/README.md
@@ -1149,7 +1149,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/example/v9.x.x/react-icu/README.md b/example/v9.x.x/react-icu/README.md
@@ -1149,7 +1149,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/example/v9.x.x/react/README.md b/example/v9.x.x/react/README.md
@@ -1149,7 +1149,7 @@ Note that the server will use a self-signed certificate, so your web browser wil
 Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
 
 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta property="og:title" content="__OG_TITLE__" />

diff --git a/icu.macro.d.ts b/icu.macro.d.ts
@@ -33,11 +33,11 @@ declare module 'react-i18next/icu.macro' {
       ? // support the standard properties of Plural
         PluralSubProps<Key, Ns>[P]
       : // this supports infinite $0={..} or $123={..}
-      // technically it also supports $-1={..} and $2.3={..} but we don't need to
-      // worry since that's invalid syntax.
-      P extends `$${number}`
-      ? string | ReactElement
-      : never;
+        // technically it also supports $-1={..} and $2.3={..} but we don't need to
+        // worry since that's invalid syntax.
+        P extends `$${number}`
+        ? string | ReactElement
+        : never;
   };
 
   interface SelectSubProps {

diff --git a/index.d.ts b/index.d.ts
@@ -95,8 +95,8 @@ export type UseTranslationResponse<Ns extends Namespace, KPrefix> = [
 export type FallbackNs<Ns> = Ns extends undefined
   ? _DefaultNamespace
   : Ns extends Namespace
-  ? Ns
-  : _DefaultNamespace;
+    ? Ns
+    : _DefaultNamespace;
 
 export function useTranslation<
   Ns extends FlatNamespace | $Tuple<FlatNamespace> | undefined = undefined,