Merge branch 'master' into max-resize-other-box

This commit is contained in:
Belén Curcio
2017-10-05 07:25:09 -03:00
committed by GitHub
3 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ import pt_BR from '../../../locales/pt_BR.yml';
// Translations are happening at https://translate.lingohub.com/the-coral-project/dashboard
const defaultLanguage = 'en';
const defaultLanguage = process.env.TALK_DEFAULT_LANG;
const translations = {...en, ...es, ...fr, ...pt_BR};
let lang;
+5 -1
View File
@@ -24,6 +24,10 @@ otherwise the application will fail to start.
Configure the duration for which comment counts are cached for, parsed by
[ms](https://www.npmjs.com/package/ms){:target="_blank"}. (Default `1hr`)
## TALK_DEFAULT_LANG
Specify the default translation language. (Default `en`)
## TALK_DEFAULT_STREAM_TAB
Specify the default stream tab in the admin. (Default `all`)
@@ -439,4 +443,4 @@ Could be read as:
again, then they must have two of their comments approved in order to get
added back to the queue.
- At the moment of writing, behavior is not attached to the flagging
reliability, but it is recorded.
reliability, but it is recorded.
+2 -1
View File
@@ -111,7 +111,8 @@ const config = {
new webpack.EnvironmentPlugin({
'TALK_PLUGINS_JSON': '{}',
'TALK_THREADING_LEVEL': '3',
'TALK_DEFAULT_STREAM_TAB': 'all'
'TALK_DEFAULT_STREAM_TAB': 'all',
'TALK_DEFAULT_LANG': 'en'
})
],
resolveLoader: {