fix crash in gatsby

i18next · Jan 7, 2023 · 5774599 · 5774599
1 parent 799701d
commit 5774599
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 12.1.4
+
+- fix crash in gatsby [1594](https://github.com/i18next/react-i18next/issues/1594)
+
 ### 12.1.3
 
 - fix fallback of t function in Trans component

diff --git a/react-i18next.js b/react-i18next.js
@@ -818,7 +818,7 @@
       values: values,
       defaults: defaults,
       components: components,
-      ns: ns || t.ns || defaultNSFromContext || i18n && i18n.options && i18n.options.defaultNS,
+      ns: ns || t && t.ns || defaultNSFromContext || i18n && i18n.options && i18n.options.defaultNS,
       i18n: i18n,
       t: tFromProps,
       shouldUnescape: shouldUnescape

diff --git a/react-i18next.min.js b/react-i18next.min.js
diff --git a/src/Trans.js b/src/Trans.js
@@ -36,7 +36,8 @@ export function Trans({
     defaults,
     components,
     // prepare having a namespace
-    ns: ns || t.ns || defaultNSFromContext || (i18n && i18n.options && i18n.options.defaultNS),
+    ns:
+      ns || (t && t.ns) || defaultNSFromContext || (i18n && i18n.options && i18n.options.defaultNS),
     i18n,
     t: tFromProps,
     shouldUnescape,