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

Fix merge conflicts on master

Browse Source
This commit is contained in:
Kim Gardner
2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-framework/services/i18n.js
+7 -3
View File
@@ -8,6 +8,7 @@ import esTA from 'timeago.js/locales/es';
import frTA from 'timeago.js/locales/fr';
import pt_BRTA from 'timeago.js/locales/pt_BR';
import zh_CNTA from 'timeago.js/locales/zh_CN';
import zh_TWTA from 'timeago.js/locales/zh_TW';
import en from '../../../locales/en.yml';
import da from '../../../locales/da.yml';
@@ -15,11 +16,10 @@ import es from '../../../locales/es.yml';
import fr from '../../../locales/fr.yml';
import pt_BR from '../../../locales/pt_BR.yml';
import zh_CN from '../../../locales/zh_CN.yml';
// Translations are happening at https://translate.lingohub.com/the-coral-project/dashboard
import zh_TW from '../../../locales/zh_TW.yml';
const defaultLanguage = process.env.TALK_DEFAULT_LANG;
const translations = {...en, ...da, ...es, ...fr, ...pt_BR, ...zh_CN};
const translations = {...en, ...da, ...es, ...fr, ...pt_BR, ...zh_CN, ...zh_TW};
let lang;
let timeagoInstance;
@@ -52,7 +52,11 @@ function init() {
ta.register('da', daTA);
ta.register('fr', frTA);
ta.register('pt_BR', pt_BRTA);
<<<<<<< HEAD
ta.register('zh_CN', zh_CNTA);
=======
ta.register('zh_TW', zh_TWTA);
>>>>>>> 1125351cd1e39fefd7160930896c4f7118a611c6
timeagoInstance = ta();
}