From 5147ca6b86559cbaa9b985d98f19555fbd898899 Mon Sep 17 00:00:00 2001 From: Lance Ruegger Date: Wed, 4 Oct 2017 11:04:47 -0700 Subject: [PATCH 1/6] Add a max-width to the flag-reason text box to prevent cutoff --- client/coral-embed-stream/style/default.css | 1 + 1 file changed, 1 insertion(+) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index a20c94d1a..0dcbf856e 100644 --- a/client/coral-embed-stream/style/default.css +++ b/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 */ From 841ab53ea7cde647f69b2f47901fffec01483548 Mon Sep 17 00:00:00 2001 From: PepeFranco Date: Wed, 4 Oct 2017 15:42:02 -0500 Subject: [PATCH 2/6] Added env variable TALK_DEFAULT_LAN --- client/coral-framework/services/i18n.js | 2 +- webpack.config.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js index 1a4910b21..c25a58769 100644 --- a/client/coral-framework/services/i18n.js +++ b/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_LAN; const translations = {...en, ...es, ...fr, ...pt_BR}; let lang; diff --git a/webpack.config.js b/webpack.config.js index c555333bc..6e9917afc 100644 --- a/webpack.config.js +++ b/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_LAN': 'en' }) ], resolveLoader: { From 8d6f79ab7944b7e16208ecff674924e2c18a41b3 Mon Sep 17 00:00:00 2001 From: PepeFranco Date: Wed, 4 Oct 2017 16:16:07 -0500 Subject: [PATCH 3/6] Fixed typo from LAN to LANG --- client/coral-framework/services/i18n.js | 2 +- webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js index c25a58769..87e375853 100644 --- a/client/coral-framework/services/i18n.js +++ b/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 = process.env.TALK_DEFAULT_LAN; +const defaultLanguage = process.env.TALK_DEFAULT_LANG; const translations = {...en, ...es, ...fr, ...pt_BR}; let lang; diff --git a/webpack.config.js b/webpack.config.js index 6e9917afc..d9c8ba4a0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -112,7 +112,7 @@ const config = { 'TALK_PLUGINS_JSON': '{}', 'TALK_THREADING_LEVEL': '3', 'TALK_DEFAULT_STREAM_TAB': 'all', - 'TALK_DEFAULT_LAN': 'en' + 'TALK_DEFAULT_LANG': 'en' }) ], resolveLoader: { From 551ac9dd90a2b8be8a1649a1b1271d1f8ddbec59 Mon Sep 17 00:00:00 2001 From: Jose Franco Date: Wed, 4 Oct 2017 17:31:48 -0500 Subject: [PATCH 4/6] Update running-advanced-configuration.md --- docs/_docs/running-advanced-configuration.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/_docs/running-advanced-configuration.md b/docs/_docs/running-advanced-configuration.md index 5512f60cb..7db27fb1c 100644 --- a/docs/_docs/running-advanced-configuration.md +++ b/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. \ No newline at end of file + reliability, but it is recorded. From f330c385e552a33cfd19d22d6ec7c22d1ffbb68f Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Thu, 5 Oct 2017 12:29:27 +0100 Subject: [PATCH 5/6] Clean up README --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 919093750..057b29cf1 100644 --- a/README.md +++ b/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 From 1510ade47a484ab81144129fa0fcc6c26e6f0ccd Mon Sep 17 00:00:00 2001 From: Dusty Williams Date: Thu, 5 Oct 2017 08:33:29 -0400 Subject: [PATCH 6/6] revised error message for comments less than two characters in length - dmw --- locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index a979739b5..397acdde6 100644 --- a/locales/en.yml +++ b/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"