Merge branch 'release/0.14.2' into npm

Author: mashpie

i18n.js

@@ -1025,7 +1025,7 @@ const i18n = function I18n(_OPTS = false) {
               ' retrying in ' +
               defaultLocale
           )
-          mutator(translate(defaultLocale, singular, plural))
+          mutator(translate(defaultLocale, singular, plural, true))
         } else {
           mutator({
             one: defaultSingular || singular,
@@ -1047,7 +1047,7 @@ const i18n = function I18n(_OPTS = false) {
             ' retrying in ' +
             defaultLocale
         )
-        mutator(translate(defaultLocale, singular, plural))
+        mutator(translate(defaultLocale, singular, plural, true))
       } else {
         mutator(defaultSingular || singular)
       }

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "i18n",
   "description": "lightweight translation module with dynamic json storage",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "homepage": "http://github.com/mashpie/i18n-node",
   "repository": {
     "type": "git",

package.json

@@ -0,0 +1,101 @@
+const { I18n } = require('..')
+const should = require('should')
+const fs = require('fs')
+
+describe('retryInDefaultLocaleWithSync', () => {
+  const DIRECTORY = './locales_in_sync'
+  const CONFIG = {
+    locales: ['en', 'de'],
+    directory: DIRECTORY,
+    defaultLocale: 'en',
+    retryInDefaultLocale: true,
+    syncFiles: true
+  }
+
+  const readJson = (locale) => {
+    return JSON.parse(fs.readFileSync(`${DIRECTORY}/${locale}.json`))
+  }
+
+  const writeJson = (locale, data) => {
+    fs.writeFileSync(
+      `${DIRECTORY}/${locale}.json`,
+      JSON.stringify(data, null, '\t')
+    )
+  }
+
+  describe('writing', () => {
+    const i18n = new I18n(CONFIG)
+    const req = {}
+    i18n.init(req)
+    after(() => {
+      try {
+        fs.unlinkSync(`${DIRECTORY}/de.json`)
+        fs.unlinkSync(`${DIRECTORY}/en.json`)
+        fs.rmdirSync(DIRECTORY)
+      } catch (e) {}
+    })
+
+    it('should not throw', () => {
+      req.setLocale('en')
+      should.equal(req.__('test'), 'test')
+
+      req.setLocale('de')
+      should.equal(req.__('test'), 'test')
+
+      req.setLocale('fr')
+      should.equal(req.__('test'), 'test')
+    })
+
+    it('should have written all files', () => {
+      const statsen = fs.lstatSync(`${DIRECTORY}/en.json`)
+      const statsde = fs.lstatSync(`${DIRECTORY}/de.json`)
+      should.exist(statsen)
+      should.exist(statsde)
+    })
+
+    it('should not have written unsupported locale files', () => {
+      let statsfr
+      try {
+        statsfr = fs.lstatSync(`${DIRECTORY}/fr.json`)
+      } catch (e) {
+        should.equal(e.code, 'ENOENT')
+      }
+      should.not.exist(statsfr)
+    })
+
+    it('should have written same data to all files', () => {
+      const dataEn = readJson('en')
+      const dataDe = readJson('de')
+      should.deepEqual(dataEn, dataDe)
+    })
+  })
+
+  describe('reading', () => {
+    writeJson('en', { test: 'test', welcome: 'welcome' })
+    writeJson('de', { test: 'test', welcome: 'Willkommen' })
+    const i18n = new I18n(CONFIG)
+    const req = {}
+    i18n.init(req)
+    after(() => {
+      try {
+        fs.unlinkSync(`${DIRECTORY}/de.json`)
+        fs.unlinkSync(`${DIRECTORY}/en.json`)
+        fs.rmdirSync(DIRECTORY)
+      } catch (e) {}
+    })
+
+    it('should still return default locales value', () => {
+      req.setLocale('en')
+      should.equal(req.__('test'), 'test')
+      should.equal(req.__('welcome'), 'welcome')
+
+      req.setLocale('de')
+      should.equal(req.__('test'), 'test')
+      should.equal(req.__('welcome'), 'Willkommen')
+
+      req.setLocale('fr')
+      should.equal(req.__('test'), 'test')
+      should.equal(req.__('welcome'), 'welcome')
+    })
+  })
+})