rebuild with reodered i18n resolving

i18next · Feb 9, 2018 · 959270c · 959270c
1 parent 66b564c
commit 959270c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 7.3.5
+- reorder selection of i18n in I18n render prop
+
 ### 7.3.4
 - more save access to options in general
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-i18next",
-  "version": "7.3.4",
+  "version": "7.3.5",
   "description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
   "main": "dist/commonjs/index.js",
   "jsnext:main": "dist/es/index.js",

diff --git a/react-i18next.js b/react-i18next.js
@@ -441,7 +441,7 @@ var I18n = function (_Component) {
 
     var _this = possibleConstructorReturn(this, (I18n.__proto__ || Object.getPrototypeOf(I18n)).call(this, props, context));
 
-    _this.i18n = context.i18n || props.i18n || getI18n();
+    _this.i18n = props.i18n || context.i18n || getI18n();
     _this.namespaces = _this.props.ns || _this.i18n.options && _this.i18n.options.defaultNS;
     if (typeof _this.namespaces === 'string') _this.namespaces = [_this.namespaces];
 

diff --git a/react-i18next.min.js b/react-i18next.min.js
diff --git a/src/I18n.js b/src/I18n.js
@@ -8,7 +8,7 @@ export default class I18n extends Component {
   constructor(props, context) {
     super(props, context);
 
-    this.i18n = context.i18n || props.i18n || getI18n();
+    this.i18n = props.i18n || context.i18n || getI18n();
     this.namespaces = this.props.ns || (this.i18n.options && this.i18n.options.defaultNS);
     if (typeof this.namespaces === 'string') this.namespaces = [this.namespaces];