Merge pull request #773 from LiskHQ/767-fix-language-switching

Fix switching language in Electron - Closes #767

src/components/forging/forgingStats.js

@@ -31,7 +31,7 @@ class ForgingStats extends React.Component {
     statCardObjects[0].label = this.props.t('Last 24 hours');
     [1, 2, 3].forEach((i) => {
       statCardObjects[i].label = this.props.t(
-        'Last x days', { day: statCardObjects[i].days });
+        'Last x days', { count: statCardObjects[i].days });
     });
 
     return (

src/components/forging/forgingStats.test.js

@@ -42,14 +42,14 @@ describe('ForgingStats', () => {
   });
 
   it('should render Card component for Last 7 days', () => {
-    expect(wrapper.find('Card').at(1).text().trim()).to.equal('Last x days 32.13 LSK');
+    expect(wrapper.find('Card').at(1).text().trim()).to.equal('Last 7 days 32.13 LSK');
   });
 
   it('should render Card component for Last 30 days', () => {
-    expect(wrapper.find('Card').at(2).text().trim()).to.equal('Last x days 3,213.18 LSK');
+    expect(wrapper.find('Card').at(2).text().trim()).to.equal('Last 30 days 3,213.18 LSK');
   });
 
   it('should render Card component for Last 365 days', () => {
-    expect(wrapper.find('Card').at(3).text().trim()).to.equal('Last x days 321,317.91 LSK');
+    expect(wrapper.find('Card').at(3).text().trim()).to.equal('Last 365 days 321,317.91 LSK');
   });
 });

src/components/header/header.js

@@ -60,7 +60,7 @@ const Header = props => (
         className={`${styles.iconButton} ${offlineStyle.disableWhenOffline}`}
         icon='language' position='topRight'>
         {Object.keys(languages).map(key => (
-          <MenuItem key={key} value={key} caption={languages[key]}
+          <MenuItem key={key} value={key} caption={languages[key].name}
             onClick={() => i18n.changeLanguage(key)} />
         ))}
       </IconMenu>

src/constants/languages.js

@@ -1,6 +1,12 @@
 const languages = {
-  en: 'English',
-  de: 'Deutsch',
+  en: {
+    name: 'English',
+    common: require('../locales/en/common.json'),
+  },
+  de: {
+    name: 'Deutsch',
+    common: require('../locales/de/common.json'),
+  },
 };
 
 export default languages;

src/i18n.js

@@ -1,13 +1,20 @@
 import i18n from 'i18next';
-import XHR from 'i18next-xhr-backend';
+import languages from './constants/languages';
 // import Cache from 'i18next-localstorage-cache';
 
+const resources = Object.keys(languages).reduce((accumulator, key) => {
+  accumulator[key] = {
+    common: languages[key].common,
+  };
+  return accumulator;
+}, {});
+
 i18n
-  .use(XHR)
   // .use(Cache)
   .init({
     fallbackLng: 'en',
     lng: 'en',
+    resources,
     react: {
       // wait: true, // globally set to wait for loaded translations in translate hoc
       // exposeNamespace: true // exposes namespace on data-i18next-options to be used in eg.