Skip to content

Commit

Permalink
Extract translation lines
Browse files Browse the repository at this point in the history
  • Loading branch information
cretueusebiu committed May 17, 2019
1 parent 899b6c1 commit d09ce49
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
4 changes: 1 addition & 3 deletions app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ protected function registered(Request $request, User $user)
if ($user instanceof MustVerifyEmail) {
$user->sendEmailVerificationNotification();

return response()->json([
'status' => __('We have e-mailed your verification link!'),
]);
return response()->json(['status' => trans('verification.sent')]);
}

return response()->json($user);
Expand Down
14 changes: 6 additions & 8 deletions app/Http/Controllers/Auth/VerificationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ public function verify(Request $request, User $user)
{
if (! URL::hasValidSignature($request)) {
return response()->json([
'status' => __('The verification link is invalid.'),
'status' => trans('verification.invalid'),
], 400);
}

if ($user->hasVerifiedEmail()) {
return response()->json([
'status' => __('The email is already verified.'),
'status' => trans('verification.already_verified'),
], 400);
}

Expand All @@ -47,7 +47,7 @@ public function verify(Request $request, User $user)
event(new Verified($user));

return response()->json([
'status' => __('Your email has been verified!'),
'status' => trans('verification.verified'),
]);
}

Expand All @@ -65,20 +65,18 @@ public function resend(Request $request)

if (is_null($user)) {
throw ValidationException::withMessages([
'email' => [__('We can\'t find a user with that e-mail address.')],
'email' => [trans('verification.user')],
]);
}

if ($user->hasVerifiedEmail()) {
throw ValidationException::withMessages([
'email' => [__('The email is already verified.')],
'email' => [trans('verification.already_verified')],
]);
}

$user->sendEmailVerificationNotification();

return response()->json([
'status' => __('We have e-mailed your verification link!'),
]);
return response()->json(['status' => trans('verification.sent')]);
}
}
11 changes: 11 additions & 0 deletions resources/lang/en/verification.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

return [

'verified' => 'Your email has been verified!',
'invalid' => 'The verification link is invalid.',
'already_verified' => 'The email is already verified.',
'user' => 'We can\'t find a user with that e-mail address.',
'sent' => 'We have e-mailed your verification link!',

];

0 comments on commit d09ce49

Please sign in to comment.