Skip to content

Commit

Permalink
Change "Logout" text to "Log out" and "Login" to "Log in" (#677)
Browse files Browse the repository at this point in the history
  • Loading branch information
growno1127 committed Feb 16, 2021
1 parent faea59b commit 49d0227
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class OtherBrowserSessionsController extends Controller
{
/**
* Logout from other browser sessions.
* Log out from other browser sessions.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Contracts\Auth\StatefulGuard $guard
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Livewire/LogoutOtherBrowserSessionsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class LogoutOtherBrowserSessionsForm extends Component
public $password = '';

/**
* Confirm that the user would like to logout from other browser sessions.
* Confirm that the user would like to log out from other browser sessions.
*
* @return void
*/
Expand All @@ -42,7 +42,7 @@ public function confirmLogout()
}

/**
* Logout from other browser sessions.
* Log out from other browser sessions.
*
* @param \Illuminate\Contracts\Auth\StatefulGuard $guard
* @return void
Expand Down
4 changes: 2 additions & 2 deletions stubs/inertia/resources/js/Layouts/AppLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<!-- Authentication -->
<form @submit.prevent="logout">
<jet-dropdown-link as="button">
Logout
Log Out
</jet-dropdown-link>
</form>
</template>
Expand Down Expand Up @@ -170,7 +170,7 @@
<!-- Authentication -->
<form method="POST" @submit.prevent="logout">
<jet-responsive-nav-link as="button">
Logout
Log Out
</jet-responsive-nav-link>
</form>

Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Auth/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</inertia-link>

<jet-button class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Login
Log in
</jet-button>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</button>

<jet-button class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Login
Log in
</jet-button>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Auth/VerifyEmail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Resend Verification Email
</jet-button>

<inertia-link :href="route('logout')" method="post" as="button" class="underline text-sm text-gray-600 hover:text-gray-900">Logout</inertia-link>
<inertia-link :href="route('logout')" method="post" as="button" class="underline text-sm text-gray-600 hover:text-gray-900">Log Out</inertia-link>
</div>
</form>
</jet-authentication-card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</template>

<template #description>
Manage and logout your active sessions on other browsers and devices.
Manage and log out your active sessions on other browsers and devices.
</template>

<template #content>
<div class="max-w-xl text-sm text-gray-600">
If necessary, you may logout of all of your other browser sessions across all of your devices. Some of your recent sessions are listed below; however, this list may not be exhaustive. If you feel your account has been compromised, you should also update your password.
If necessary, you may log out of all of your other browser sessions across all of your devices. Some of your recent sessions are listed below; however, this list may not be exhaustive. If you feel your account has been compromised, you should also update your password.
</div>

<!-- Other Browser Sessions -->
Expand Down Expand Up @@ -45,22 +45,22 @@

<div class="flex items-center mt-5">
<jet-button @click.native="confirmLogout">
Logout Other Browser Sessions
Log Out Other Browser Sessions
</jet-button>

<jet-action-message :on="form.recentlySuccessful" class="ml-3">
Done.
</jet-action-message>
</div>

<!-- Logout Other Devices Confirmation Modal -->
<!-- Log Out Other Devices Confirmation Modal -->
<jet-dialog-modal :show="confirmingLogout" @close="closeModal">
<template #title>
Logout Other Browser Sessions
Log Out Other Browser Sessions
</template>

<template #content>
Please enter your password to confirm you would like to logout of your other browser sessions across all of your devices.
Please enter your password to confirm you would like to log out of your other browser sessions across all of your devices.

<div class="mt-4">
<jet-input type="password" class="mt-1 block w-3/4" placeholder="Password"
Expand All @@ -78,7 +78,7 @@
</jet-secondary-button>

<jet-button class="ml-2" @click.native="logoutOtherBrowserSessions" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Logout Other Browser Sessions
Log Out Other Browser Sessions
</jet-button>
</template>
</jet-dialog-modal>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Welcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<template v-else>
<inertia-link :href="route('login')" class="text-sm text-gray-700 underline">
Login
Log in
</inertia-link>

<inertia-link v-if="canRegister" :href="route('register')" class="ml-4 text-sm text-gray-700 underline">
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@endif

<x-jet-button class="ml-4">
{{ __('Login') }}
{{ __('Log in') }}
</x-jet-button>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</button>

<x-jet-button class="ml-4">
{{ __('Login') }}
{{ __('Log in') }}
</x-jet-button>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/resources/views/auth/verify-email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@csrf

<button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900">
{{ __('Logout') }}
{{ __('Log Out') }}
</button>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions stubs/livewire/resources/views/navigation-menu.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<x-jet-dropdown-link href="{{ route('logout') }}"
onclick="event.preventDefault();
this.closest('form').submit();">
{{ __('Logout') }}
{{ __('Log Out') }}
</x-jet-dropdown-link>
</form>
</x-slot>
Expand Down Expand Up @@ -177,7 +177,7 @@
<x-jet-responsive-nav-link href="{{ route('logout') }}"
onclick="event.preventDefault();
this.closest('form').submit();">
{{ __('Logout') }}
{{ __('Log Out') }}
</x-jet-responsive-nav-link>
</form>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
</x-slot>

<x-slot name="description">
{{ __('Manage and logout your active sessions on other browsers and devices.') }}
{{ __('Manage and log out your active sessions on other browsers and devices.') }}
</x-slot>

<x-slot name="content">
<div class="max-w-xl text-sm text-gray-600">
{{ __('If necessary, you may logout of all of your other browser sessions across all of your devices. Some of your recent sessions are listed below; however, this list may not be exhaustive. If you feel your account has been compromised, you should also update your password.') }}
{{ __('If necessary, you may log out of all of your other browser sessions across all of your devices. Some of your recent sessions are listed below; however, this list may not be exhaustive. If you feel your account has been compromised, you should also update your password.') }}
</div>

@if (count($this->sessions) > 0)
Expand Down Expand Up @@ -53,22 +53,22 @@

<div class="flex items-center mt-5">
<x-jet-button wire:click="confirmLogout" wire:loading.attr="disabled">
{{ __('Logout Other Browser Sessions') }}
{{ __('Log Out Other Browser Sessions') }}
</x-jet-button>

<x-jet-action-message class="ml-3" on="loggedOut">
{{ __('Done.') }}
</x-jet-action-message>
</div>

<!-- Logout Other Devices Confirmation Modal -->
<!-- Log Out Other Devices Confirmation Modal -->
<x-jet-dialog-modal wire:model="confirmingLogout">
<x-slot name="title">
{{ __('Logout Other Browser Sessions') }}
{{ __('Log Out Other Browser Sessions') }}
</x-slot>

<x-slot name="content">
{{ __('Please enter your password to confirm you would like to logout of your other browser sessions across all of your devices.') }}
{{ __('Please enter your password to confirm you would like to log out of your other browser sessions across all of your devices.') }}

<div class="mt-4" x-data="{}" x-on:confirming-logout-other-browser-sessions.window="setTimeout(() => $refs.password.focus(), 250)">
<x-jet-input type="password" class="mt-1 block w-3/4"
Expand All @@ -89,7 +89,7 @@
<x-jet-button class="ml-2"
wire:click="logoutOtherBrowserSessions"
wire:loading.attr="disabled">
{{ __('Logout Other Browser Sessions') }}
{{ __('Log Out Other Browser Sessions') }}
</x-jet-button>
</x-slot>
</x-jet-dialog-modal>
Expand Down

0 comments on commit 49d0227

Please sign in to comment.