Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make default notifications translatable #23885

Closed
wants to merge 1 commit into from
Closed

Make default notifications translatable #23885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Illuminate/Auth/Notifications/ResetPassword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ public function toMail($notifiable)
}

return (new MailMessage)
->line('You are receiving this email because we received a password reset request for your account.')
->action('Reset Password', url(config('app.url').route('password.reset', $this->token, false)))
->line('If you did not request a password reset, no further action is required.');
->line(__('You are receiving this email because we received a password reset request for your account.'))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel that these keys should be more succinct in their key naming and stored in the default lang file in resources/lang/en in the laravel/laravel repository

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@countnoobula Taylor mentioned that he'd accept a pull-request if the json translation features was used instead of translation keys (see laravel/ideas#409).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The auth component can't use helpers defined in the foundation package.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually tested this before submitting the PR and it does work as expected.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually tested this before submitting the PR and it does work as expected.

Did you test using the auth component outside of the framework?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This notification won't work without the rest of the framework anyway, will it? It can't be used in isolation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should work without the foundation package, such as in Lumen. If there is genuinely code in here that doesn't work, even with every illuminate package installed, then it is in the wrong place, and should be in foundation.

Copy link
Contributor Author

@dakira dakira Apr 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I'm wrong: Lumen does not use the ResetPassword notification. And if one wants to use it they need to pull in all sorts of packages anyway (that are not defined in auths composer.json).

The thing is: There should be an easy way to localize password resets. Right now there isn't. If Foundation is the one package that can't be pulled in if people want this feature, then this file really should be moved to foundation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GrahamCampbell Ahh.. I see. Foundation is not a seperate package that can be pulled in. Shame on me.

That said.. all the other password reset stuff is already in foundation.. so this should probably go there, too, right?

->action(__('Reset Password'), url(config('app.url').route('password.reset', $this->token, false)))
->line(__('If you did not request a password reset, no further action is required.'));
}

/**
Expand Down
16 changes: 11 additions & 5 deletions src/Illuminate/Notifications/resources/views/email.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# {{ $greeting }}
@else
@if ($level == 'error')
# Whoops!
# {{ __('Whoops!') }}
@else
# Hello!
# {{ __('Hello!') }}
@endif
@endif

Expand Down Expand Up @@ -45,14 +45,20 @@
@if (! empty($salutation))
{{ $salutation }}
@else
Regards,<br>{{ config('app.name') }}
{{ __('Regards') }},<br>{{ config('app.name') }}
@endif

{{-- Subcopy --}}
@isset($actionText)
@component('mail::subcopy')
If you’re having trouble clicking the "{{ $actionText }}" button, copy and paste the URL below
into your web browser: [{{ $actionUrl }}]({{ $actionUrl }})
{{ __(
'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below '.
'into your web browser: [:actionURL](:actionURL)',
[
'actionText' => $actionText,
'actionURL' => $actionUrl
]
) }}
@endcomponent
@endisset
@endcomponent