Merge branch 'master' into slackbot

README.md

@@ -1,11 +1,14 @@
 # Talk [![CircleCI](https://circleci.com/gh/coralproject/talk.svg?style=svg)](https://circleci.com/gh/coralproject/talk)
+
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?template=https%3A%2F%2Fgithub.com%2Fcoralproject%2Ftalk&env[TALK_FACEBOOK_APP_ID]=ignore&env[TALK_FACEBOOK_APP_SECRET]=ignore)
 
 Online comments are broken. Our open-source Talk tool rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. [Read more about Talk here](https://coralproject.net/products/talk.html).
 
-## Documentation
+Built with <3 by The Coral Project & Mozilla.
 
-Developer Documentation & Setup Guides https://coralproject.github.io/talk/.
+## Getting Started
+
+Check out our Docs: https://coralproject.github.io/talk/
 
 ## Relevant Links
 

client/coral-embed-stream/style/default.css

@@ -270,6 +270,7 @@ button.comment__action-button[disabled],
   width: 75%;
   font-size: 16px;
   border: 1px solid #ccc;
+  max-width: calc(100% - 40px);
 }
 
 /* Close comments */

client/coral-framework/services/i18n.js

@@ -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;

docs/_docs/running-advanced-configuration.md

@@ -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.

locales/en.yml

@@ -186,7 +186,7 @@ en:
   embedlink:
     copy: "Copy to Clipboard"
   error:
-    COMMENT_TOO_SHORT: "Your comment must have something in it"
+    COMMENT_TOO_SHORT: "Comments should be more than one character, please revise your comment and try again."
     NOT_AUTHORIZED: "You are not authorized to perform this action."
     NO_SPECIAL_CHARACTERS: "Usernames can contain letters numbers and _ only"
     PASSWORD_LENGTH: "Password is too short"

webpack.config.js

@@ -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: {