Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions components/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ public function onSignin()
$messages['login'] = $this->loginAttribute() == UserSettings::LOGIN_USERNAME
? trans('winter.user::lang.account.invalid_username')
: trans('winter.user::lang.account.invalid_email');
$messages['login.required'] = $this->loginAttribute() == UserSettings::LOGIN_USERNAME
? trans('winter.user::lang.account.required_username')
: trans('winter.user::lang.account.required_email');

if (!array_key_exists('login', $data)) {
$data['login'] = post('username', post('email'));
Expand Down
2 changes: 2 additions & 0 deletions lang/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@
'invalid_current_pass' => 'The current password you entered was invalid.',
'invalid_username' => 'The username you have entered is invalid.',
'invalid_email' => 'The email address you have entered is invalid.',
'required_username' => 'The username field is required.',
'required_email' => 'The email address field is required.',
'success_activation' => 'Successfully activated your account.',
'success_deactivation' => 'Successfully deactivated your account. Sorry to see you go!',
'success_saved' => 'Settings successfully saved!',
Expand Down