[refs #257] Change error messages logic. Fix avatar ru translation
This commit is contained in:
parent
637edabb4c
commit
de6490346b
|
@ -1,5 +1,9 @@
|
|||
// PUT custom styles here ONLY
|
||||
|
||||
span.error {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a#manage-labels {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
|
|
@ -49,6 +49,7 @@ class UsersController < ApplicationController
|
|||
redirect_to edit_user_path(@user)
|
||||
else
|
||||
flash[:error] = t('flash.user.save_error')
|
||||
flash[:warning] = @user.errors.full_messages.join('. ')
|
||||
render(:action => :edit)
|
||||
end
|
||||
end
|
||||
|
@ -60,6 +61,7 @@ class UsersController < ApplicationController
|
|||
redirect_to user_private_settings_path(@user)
|
||||
else
|
||||
flash[:error] = t('flash.user.save_error')
|
||||
flash[:warning] = @user.errors.full_messages.join('. ')
|
||||
render(:action => :private)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -43,4 +43,5 @@ ru:
|
|||
site: Вэб-сайт
|
||||
location: Местонахождение
|
||||
company: Компания
|
||||
avatar: Аватар
|
||||
|
||||
|
|
Loading…
Reference in New Issue