Skip to content

Commit

Permalink
Fix email syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalbaljet committed Jul 11, 2023
1 parent ae2634f commit 4d56c8b
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 36 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
resources/views/emails/**/*.blade.php
resources/views/tasks/**/*.blade.php
resources/views/vendor/**/*.blade.php
resources/views/components/server/**/*.blade.php
Expand Down
46 changes: 24 additions & 22 deletions resources/views/emails/server-provisioned.blade.php
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
@component('mail::message')
{{ __('Your server \':server\' has been provisioned and is ready to use.', ['server' => $server->name]) }}

{{ __('You can access your server by clicking the button below.') }}
{{ __('Your server \':server\' has been provisioned and is ready to use.', ['server' => $server->name]) }}

@component('mail::button', ['url' => route('servers.show', $server)])
{{ __('View Server') }}
@endcomponent
{{ __('You can access your server by clicking the button below.') }}

{{ __('Instead of accessing your server through the web interface, you can also connect to it using the following command:') }}
@component('mail::button', ['url' => route('servers.show', $server)])
{{ __('View Server') }}
@endcomponent

{{ __('Instead of accessing your server through the web interface, you can also connect to it using the following command:') }}

@component('mail::panel')
`ssh {{ $server->username.'@'.$server->public_ipv4 }}`
@endcomponent

{{ __('Below you will find the details of your server.') }}

@component('mail::panel')
`ssh {{ $server->username.'@'.$server->public_ipv4 }}`
@endcomponent
@component('mail::panel')
{{ __('Username') }}: `{{ $server->username }}`

{{ __('Below you will find the details of your server.') }}
{{ __('Password') }}: `{{ $server->password }}`

{{ __('IP Address') }}: `{{ $server->public_ipv4 }}`

{{ __('Database Username') }}: `{{ config('eddy.server_defaults.database_name') }}`

{{ __('Database Password') }}: `{{ $server->database_password }}`
@endcomponent

@component('mail::panel')
{{ __('Username') }}: `{{ $server->username }}`
<br />
{{ __('Password') }}: `{{ $server->password }}`
<br />
{{ __('IP Address') }}: `{{ $server->public_ipv4 }}`
<br />
{{ __('Database Username') }}: `{{ config('eddy.server_defaults.database_name') }}`
<br />
{{ __('Database Password') }}: `{{ $server->database_password }}`
@endcomponent
{{ __('Good luck with your new server!') }}

{{ __('Good luck with your new server!') }}
@endcomponent
30 changes: 16 additions & 14 deletions resources/views/emails/team-invitation.blade.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
@component('mail::message')
{{ __('You have been invited to join the :team team!', ['team' => $invitation->team->name]) }}
{{ __('You have been invited to join the :team team!', ['team' => $invitation->team->name]) }}

@if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::registration()))
{{ __('If you do not have an account, you may create one by clicking the button below. After creating an account, you may click the invitation acceptance button in this email to accept the team invitation:') }}
@if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::registration()))
{{ __('If you do not have an account, you may create one by clicking the button below. After creating an account, you may click the invitation acceptance button in this email to accept the team invitation:') }}

@component('mail::button', ['url' => route('register')])
{{ __('Create Account') }}
@endcomponent
@component('mail::button', ['url' => route('register')])
{{ __('Create Account') }}
@endcomponent

{{ __('If you already have an account, you may accept this invitation by clicking the button below:') }}

{{ __('If you already have an account, you may accept this invitation by clicking the button below:') }}
@else
{{ __('You may accept this invitation by clicking the button below:') }}
@endif
@else
{{ __('You may accept this invitation by clicking the button below:') }}
@endif

@component('mail::button', ['url' => $acceptUrl])
{{ __('Accept Invitation') }}
@endcomponent

{{ __('If you did not expect to receive an invitation to this team, you may discard this email.') }}
@component('mail::button', ['url' => $acceptUrl])
{{ __('Accept Invitation') }}
@endcomponent

{{ __('If you did not expect to receive an invitation to this team, you may discard this email.') }}
@endcomponent

0 comments on commit 4d56c8b

Please sign in to comment.