Merge branch 'master' into master

This commit is contained in:
Kim Gardner
2017-10-05 16:53:52 +01:00
committed by GitHub
2 changed files with 6 additions and 3 deletions
+5 -2
View File
@@ -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
+1 -1
View File
@@ -188,7 +188,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"