Merge branch 'master' of github.com:coralproject/talk into design-pass-adm

client/coral-admin/src/translations.json

@@ -48,7 +48,7 @@
       "include-text": "Include your text here.",
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
-      "banned-word-header": "Write the bannned words list",
+      "banned-word-header": "Write the banned words list",
       "suspect-word-header": "Write the suspect words list",
       "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",

client/coral-framework/actions/auth.js

@@ -82,7 +82,9 @@ export const fetchSignUp = formData => (dispatch) => {
         dispatch(changeView('SIGNIN'));
       }, 3000);
     })
-    .catch(() => dispatch(signUpFailure(lang.t('error.emailInUse')))); // We need to inprove error handling. TODO (bc)
+    .catch(error => {
+      dispatch(signUpFailure(lang.t(`error.${error.message}`)));
+    });
 };
 
 // Forgot Password Actions

client/coral-framework/helpers/response.js

@@ -37,7 +37,13 @@ const handleResp = res => {
   if (res.status === 401) {
     throw new Error('Not Authorized to make this request');
   } else if (res.status > 399) {
-    throw new Error('Error! Status ', res.status);
+    return res.json().then(err => {
+      let message = err.message || res.status;
+      if (err.error && err.error.translation_key) {
+        message = err.error.translation_key;
+      }
+      throw new Error(message);
+    });
   } else if (res.status === 204) {
     return res.text();
   } else {

client/coral-framework/helpers/validate.js

@@ -2,5 +2,5 @@ export default {
   email: email => (/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(email)),
   password: pass => (/^(?=.{8,}).*$/.test(pass)),
   confirmPassword: () => true,
-  displayName: displayName => (/^(?=.{3,}).*$/.test(displayName))
+  displayName: displayName => (/^[a-z0-9_]+$/.test(displayName))
 };

client/coral-framework/translations.json

@@ -7,10 +7,16 @@
     "error": {
       "email": "Not a valid E-Mail",
       "password": "Password must be at least 8 characters",
-      "displayName": "Display name is too short",
-      "confirmPassword": "Passwords don`t match. Please, check again",
+      "displayName": "Display names can contain letters, numbers and _ only",
+      "confirmPassword": "Passwords don't match. Please, check again",
       "emailPasswordError": "Email and/or password combination incorrect.",
-      "emailInUse": "Email address already in use"
+      "EMAIL_REQUIRED": "An email address is required",
+      "PASSWORD_REQUIRED": "Must input a password",
+      "PASSWORD_LENGTH": "Password is too short",
+      "EMAIL_IN_USE": "Email address already in use",
+      "DISPLAY_NAME_REQUIRED": "Must input a display name",
+      "NO_SPECIAL_CHARACTERS": "Display names can contain letters, numbers and _ only",
+      "PROFANITY_ERROR": "Display names must not contain profanity. Please contact the administrator if you believe this to be in error."
     }
   },
   "es": {
@@ -21,10 +27,16 @@
     "error": {
       "email": "No es un email válido",
       "password": "La contraseña debe tener por lo menos 8 caracteres",
-      "displayName": "El nombre es muy corto",
+      "displayName": "Los nombres pueden contener letras, números y _",
       "confirmPassword": "Las contraseñas no coinciden",
       "emailPasswordError": "Email y/o contraseña incorrecta.",
-      "emailInUse": "Email address already in use"
+      "EMAIL_REQUIRED": "Se requiere una dirección de correo electrónico",
+      "PASSWORD_REQUIRED": "Debe ingresar una contraseña",
+      "PASSWORD_LENGTH": "La contraseña es muy corta",
+      "EMAIL_IN_USE": "La dirección de correo electrónico se encuentra en uso",
+      "DISPLAY_NAME_REQUIRED": "Debe ingresar un nombre",
+      "NO_SPECIAL_CHARACTERS": "Los nombres pueden contener letras, números y _",
+      "PROFANITY_ERROR": "Los nombres no pueden contener blasfemias. Por favor contacte al administrador si cree que esto es un error"
     }
   }
 }

client/coral-plugin-flags/FlagButton.js

@@ -47,7 +47,7 @@ class FlagButton extends Component {
       case 'comments':
         item_id = id;
         break;
-      case 'user':
+      case 'users':
         item_id = author_id;
         break;
       }
@@ -72,7 +72,7 @@ class FlagButton extends Component {
   onPopupOptionClick = (sets) => (e) => {
 
     // If flagging a user, indicate that this is referencing the username rather than the bio
-    if(sets === 'itemType' && e.target.value === 'user') {
+    if(sets === 'itemType' && e.target.value === 'users') {
       this.setState({field: 'username'});
     }
 

client/coral-plugin-flags/FlagComment.js

@@ -10,7 +10,7 @@ const getPopupMenu = [
     return {
       header: lang.t('step-1-header'),
       options: [
-        {val: 'user', text: lang.t('flag-username')},
+        {val: 'users', text: lang.t('flag-username')},
         {val: 'comments', text: lang.t('flag-comment')}
       ],
       button: lang.t('continue'),

client/coral-sign-in/translations.js

@@ -21,6 +21,7 @@ export default {
       emailInUse: 'Email address already in use',
       requiredField: 'This field is required',
       passwordsDontMatch: 'Passwords don\'t match.',
+      specialCharacters: 'Display names can contain letters, numbers and _ only',
       checkTheForm: 'Invalid Form. Please, check the fields'
     }
   },
@@ -46,6 +47,7 @@ export default {
       emailInUse: 'Este email se encuentra en uso',
       requiredField: 'Este campo es requerido',
       passwordsDontMatch: 'Las contraseñas no coinciden',
+      specialCharacters: 'Los nombres pueden contener letras, números y _',
       checkTheForm: 'Formulario Inválido. Por favor, completa los campos'
     }
   }