Merge branch 'develop'

antwebes · Mar 20, 2015 · 3af3e91 · 3af3e91
2 parents d95c9b2 + 4c2d40f
commit 3af3e91
Show file tree

Hide file tree

Showing 12 changed files with 637 additions and 126 deletions.
diff --git a/CHANGELOG-0.1.md b/CHANGELOG-0.1.md
@@ -16,3 +16,12 @@ To get the diff between two versions, go to https://github.com/antwebes/ChateaCl
 
 * 0.1.4 (2015-03-19)
  * translate errors in reset password
+
+* 0.1.5 (2015-03-19)
+ * translate errors in change email
+ * the ircChannel also can contain the ñ char
+ * fixed some translations spanish
+ * traslated pending server errors
+ * Restyle nick suggestions, in one file
+ * Separate template register in two templates ( _register_body.html.twig )
+
diff --git a/Controller/UserController.php b/Controller/UserController.php
@@ -265,6 +265,8 @@ private function translateServerError($errorMessage)
 
         if(isset($errorMapping[$errorMessage])){
             return $translator->trans($errorMapping[$errorMessage], array(), 'UserChange');
+        }else if(preg_match("/The email '(.+)' is not a valid email/", $errorMessage, $matches)){;
+            return $translator->trans('form.email_not_valid_server', array('%email%' => $matches[1]), 'UserChange');
         }
 
         return $errorMessage;