Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
bf90425e
Commit
bf90425e
authored
9 years ago
by
Rodrigo Nascimento
Browse files
Options
Downloads
Patches
Plain Diff
Show error if email already exists in signup
parent
1df22f9a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
client/views/login/form.coffee
+9
-1
9 additions, 1 deletion
client/views/login/form.coffee
i18n/en.i18n.json
+1
-0
1 addition, 0 deletions
i18n/en.i18n.json
i18n/pt.i18n.json
+1
-0
1 addition, 0 deletions
i18n/pt.i18n.json
with
11 additions
and
1 deletion
client/views/login/form.coffee
+
9
−
1
View file @
bf90425e
...
@@ -61,8 +61,16 @@ Template.loginForm.events
...
@@ -61,8 +61,16 @@ Template.loginForm.events
return
return
if
instance
.
state
.
get
()
is
'register'
if
instance
.
state
.
get
()
is
'register'
Meteor
.
call
'registerUser'
,
formData
,
(
err
,
result
)
->
Meteor
.
call
'registerUser'
,
formData
,
(
err
or
,
result
)
->
RocketChat
.
Button
.
reset
(
button
)
RocketChat
.
Button
.
reset
(
button
)
if
error
?
if
error
.
error
is
'Email already exists.'
toastr
.
error
t
'Email_already_exists'
else
toastr
.
error
error
.
reason
return
Meteor
.
loginWithPassword
formData
.
email
,
formData
.
pass
,
(
error
)
->
Meteor
.
loginWithPassword
formData
.
email
,
formData
.
pass
,
(
error
)
->
if
error
?
.
error
is
'no-valid-email'
if
error
?
.
error
is
'no-valid-email'
toastr
.
success
t
(
'We_have_sent_registration_email'
)
toastr
.
success
t
(
'We_have_sent_registration_email'
)
...
...
This diff is collapsed.
Click to expand it.
i18n/en.i18n.json
+
1
−
0
View file @
bf90425e
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
"edited"
:
"edited"
,
"edited"
:
"edited"
,
"Email_or_username"
:
"Email or username"
,
"Email_or_username"
:
"Email or username"
,
"Email_verified"
:
"Email verified"
,
"Email_verified"
:
"Email verified"
,
"Email_already_exists"
:
"Email already exists"
,
"Enter_info"
:
"Enter your login information"
,
"Enter_info"
:
"Enter your login information"
,
"Error_changing_password"
:
"Password changed"
,
"Error_changing_password"
:
"Password changed"
,
"Favorites"
:
"Favorites"
,
"Favorites"
:
"Favorites"
,
...
...
This diff is collapsed.
Click to expand it.
i18n/pt.i18n.json
+
1
−
0
View file @
bf90425e
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
"edited"
:
"editado"
,
"edited"
:
"editado"
,
"Email_or_username"
:
"Email ou nome de usuário"
,
"Email_or_username"
:
"Email ou nome de usuário"
,
"Email_verified"
:
"Email verificado"
,
"Email_verified"
:
"Email verificado"
,
"Email_already_exists"
:
"Email já cadastrado"
,
"Enter_info"
:
"Entre com seus dados de login"
,
"Enter_info"
:
"Entre com seus dados de login"
,
"Error_changing_password"
:
"Senha alterada"
,
"Error_changing_password"
:
"Senha alterada"
,
"Favorites"
:
"Favoritos"
,
"Favorites"
:
"Favoritos"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment