diff --git a/app/Http/Livewire/Common/Notifications/Exports.php b/app/Http/Livewire/Common/Notifications/Exports.php index 7f457c082..9b19b8f9c 100644 --- a/app/Http/Livewire/Common/Notifications/Exports.php +++ b/app/Http/Livewire/Common/Notifications/Exports.php @@ -23,9 +23,11 @@ class Exports extends Component $notification->markAsRead(); + $type = isset($data['file_name']) ?: trans('general.export'); + $this->dispatchBrowserEvent('mark-read', [ 'type' => 'export', - 'message' => trans('notifications.messages.mark_read', ['type' => $data['file_name']]), + 'message' => trans('notifications.messages.mark_read', ['type' => $type]), ]); } diff --git a/app/Http/Livewire/Common/Notifications/Imports.php b/app/Http/Livewire/Common/Notifications/Imports.php index 6d86bafdc..885754465 100644 --- a/app/Http/Livewire/Common/Notifications/Imports.php +++ b/app/Http/Livewire/Common/Notifications/Imports.php @@ -23,9 +23,11 @@ class Imports extends Component $notification->markAsRead(); + $type = isset($data['translation']) ?: trans('import.import'); + $this->dispatchBrowserEvent('mark-read', [ 'type' => 'import', - 'message' => trans('notifications.messages.mark_read', ['type' => $data['translation']]), + 'message' => trans('notifications.messages.mark_read', ['type' => $type]), ]); } diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php index 4234a7d4d..e623cff15 100644 --- a/resources/views/auth/login/create.blade.php +++ b/resources/views/auth/login/create.blade.php @@ -20,7 +20,7 @@ {{ Form::emailGroup('email', false, 'envelope', ['placeholder' => trans('general.email')], null, 'has-feedback', 'input-group-alternative') }} - {{ Form::passwordGroup('password', false, 'unlock-alt', ['placeholder' => trans('auth.password.current')], 'has-feedback', 'input-group-alternative') }} + {{ Form::passwordGroup('password', false, 'unlock-alt', ['placeholder' => trans('install.database.password')], 'has-feedback', 'input-group-alternative') }}