Merge branch 'master' of github.com:i18next/react-i18next

example/nextjs/pages/_app.js

@@ -31,8 +31,16 @@ if (enableSubpaths) {
 // Warning: Did not expect server HTML to contain a <h1> in <div>.
 // not sure - did neither find something wrong - nor seems the warning to make sense
 export default class MyApp extends App {
+
+  static async getInitialProps({ ctx }) {
+    return {
+      initialLanguage: ctx.req.language ?
+        ctx.req.language : translation.defaultLanguage
+    };
+  };
+
   render() {
-    const { Component, pageProps } = this.props;
+    const { Component, pageProps, initialLanguage } = this.props;
 
     return (
       <Container>
@@ -41,6 +49,7 @@ export default class MyApp extends App {
           ns="common"
           i18n={(pageProps && pageProps.i18n) || i18n}
           wait={process.browser}
+          initialLanguage={initialLanguage}
         >
           {t => (
             <React.Fragment>

example/nextjs/pages/index.js

@@ -22,5 +22,9 @@ export default withI18next(['home', 'common'])(({ t, initialI18nStore, ...rest }
     <Link href="/page2">
       <a>{t('link.gotoPage2')}</a>
     </Link>
+    <br />
+    <Link href="/page3">
+      <a>{t('link.gotoPage3')}</a>
+    </Link>
   </div>
 ));

example/nextjs/pages/page3.js

@@ -0,0 +1,12 @@
+// a page not using i18next - no hoc - not t function
+import React from 'react';
+import Link from 'next/link';
+
+export default () => (
+  <div>
+    <h1>Hello Page 3</h1>
+    <Link href="/">
+      <a>back</a>
+    </Link>
+  </div>
+);