wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-11 12:51:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor-configure

Browse Source 
Conflicts:
	client/coral-admin/src/routes/Configure/components/Configure.css
	client/coral-admin/src/routes/Moderation/components/Moderation.js
This commit is contained in:
Chi Vinh Le
2017-10-11 14:17:36 +07:00
parent 61604a7d07 3adc3e87cd
commit 7b76450eb5
26 changed files with 829 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/i18n.js
+3 -2
View File
@@ -3,6 +3,7 @@ const get = require('lodash/get');
const yaml = require('yamljs');
const da = yaml.load('./locales/da.yml');
const es = yaml.load('./locales/es.yml');
const en = yaml.load('./locales/en.yml');
const fr = yaml.load('./locales/fr.yml');
@@ -13,9 +14,9 @@ const accepts = require('accepts');
// default language
let defaultLanguage = 'en';
let language = defaultLanguage;
const languages = ['en', 'es', 'fr', 'pt_BR'];
const languages = ['en', 'da', 'es', 'fr', 'pt_BR'];
const translations = Object.assign(en, es, fr, pt_BR);
const translations = Object.assign(en, es, fr, pt_BR, da);
/**
* Exposes a service object to allow translations.