fix crash in gatsby

i18next · Jan 7, 2023 · 187f7bf · 187f7bf
1 parent 98b118b
commit 187f7bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 12.1.2
+
+- fix crash in gatsby [1594](https://github.com/i18next/react-i18next/issues/1594)
+
 ### 12.1.1
 
 - fix for node resolution [1589](https://github.com/i18next/react-i18next/issues/1589)

diff --git a/react-i18next.js b/react-i18next.js
@@ -808,7 +808,7 @@
 
     var i18n = i18nFromProps || i18nFromContext || getI18n();
 
-    var t = tFromProps || i18n.t.bind(i18n) || function (k) {
+    var t = tFromProps || i18n && i18n.t.bind(i18n) || function (k) {
       return k;
     };
 
@@ -822,7 +822,7 @@
       values: values,
       defaults: defaults,
       components: components,
-      ns: ns || t.ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS,
+      ns: ns || 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
@@ -23,7 +23,7 @@ export function Trans({
   const { i18n: i18nFromContext, defaultNS: defaultNSFromContext } = useContext(I18nContext) || {};
   const i18n = i18nFromProps || i18nFromContext || getI18n();
 
-  const t = tFromProps || i18n.t.bind(i18n) || ((k) => k);
+  const t = tFromProps || (i18n && i18n.t.bind(i18n)) || ((k) => k);
 
   return TransWithoutContext({
     children,
@@ -36,7 +36,7 @@ export function Trans({
     defaults,
     components,
     // prepare having a namespace
-    ns: ns || t.ns || defaultNSFromContext || (i18n.options && i18n.options.defaultNS),
+    ns: ns || t.ns || defaultNSFromContext || (i18n && i18n.options && i18n.options.defaultNS),
     i18n,
     t: tFromProps,
     shouldUnescape,