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

feat: add a display name for email notifications #1849

Merged
merged 4 commits into from
Sep 28, 2018
Merged

feat: add a display name for email notifications #1849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ab6020
feat: add a display name for email notifications
asbiin Sep 26, 2018
c0cafbe
Fix message
asbiin Sep 27, 2018
1b44ecc
Merge branch 'master' into feat/add-display-name
asbiin Sep 28, 2018
3bbce0c
update changelog
asbiin Sep 28, 2018
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
11 changes: 11 additions & 0 deletions config/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@

'name' => env('APP_NAME', 'Monica'),

/*
|--------------------------------------------------------------------------
| Application Display Name
|--------------------------------------------------------------------------
|
| This value is the name of your application displayed in email notifications.
Copy link
Member

Choose a reason for hiding this comment

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

This is the name of the application that will be displayed in the notification emails.

|
*/

'display_name' => env('APP_DISPLAY_NAME', env('APP_NAME', 'Monica')),

/*
|--------------------------------------------------------------------------
| Application Environment
Expand Down
4 changes: 2 additions & 2 deletions resources/views/vendor/mail/html/message.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ config('app.name') }}
{{ config('app.display_name') }}
@endcomponent
@endslot

Expand All @@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. @lang('mail.notifications_rights').
© {{ date('Y') }} {{ config('app.display_name') }}. @lang('mail.notifications_rights').
@endcomponent
@endslot
@endcomponent
4 changes: 2 additions & 2 deletions resources/views/vendor/mail/markdown/message.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ config('app.name') }}
{{ config('app.display_name') }}
@endcomponent
@endslot

Expand All @@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. @lang('mail.notifications_rights').
© {{ date('Y') }} {{ config('app.display_name') }}. @lang('mail.notifications_rights').
@endcomponent
@endslot
@endcomponent
2 changes: 1 addition & 1 deletion resources/views/vendor/notifications/email.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@if (! empty($salutation))
{{ $salutation }}
@else
@lang('mail.notifications_regards'),<br>{{ config('app.name') }}
@lang('mail.notifications_regards'),<br>{{ config('app.display_name') }}
@endif

{{-- Subcopy --}}
Expand Down