wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-03 14:03:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-12 15:58:12 -07:00
parent 85d67dba19
commit 9703bc8645
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/i18n.js
+3 -3
View File
@@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
const debug = require('debug')('talk:services:i18n');
const accepts = require('accepts');
const { get, has } = require('lodash');
const { get, has, merge } = require('lodash');
const yaml = require('yamljs');
const plugins = require('./plugins');
const { DEFAULT_LANG } = require('../config');
@@ -27,7 +27,7 @@ let translations = fs
.reduce((packs, contents) => {
const pack = yaml.parse(contents);
return _.merge(packs, pack);
return merge(packs, pack);
}, {});
// Create a list of all supported translations.
@@ -55,7 +55,7 @@ const loadPluginTranslations = () => {
const pack = yaml.parse(fs.readFileSync(filename, 'utf8'));
translations = _.merge(translations, pack);
translations = merge(translations, pack);
});
loadedPluginTranslations = true;