From 7ad96162d1a9f55334408175f604c92b741eee35 Mon Sep 17 00:00:00 2001 From: jimmitjoo Date: Sun, 13 Sep 2020 19:29:14 +0200 Subject: [PATCH 1/2] Make labels translatable in livewire views --- .../resources/views/api/api-token-manager.blade.php | 4 ++-- .../resources/views/profile/update-password-form.blade.php | 6 +++--- .../views/profile/update-profile-information-form.blade.php | 4 ++-- .../resources/views/teams/create-team-form.blade.php | 4 ++-- .../resources/views/teams/team-member-manager.blade.php | 4 ++-- .../resources/views/teams/update-team-name-form.blade.php | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stubs/livewire/resources/views/api/api-token-manager.blade.php b/stubs/livewire/resources/views/api/api-token-manager.blade.php index 57c51b248..6a8940b8f 100644 --- a/stubs/livewire/resources/views/api/api-token-manager.blade.php +++ b/stubs/livewire/resources/views/api/api-token-manager.blade.php @@ -12,7 +12,7 @@
- +
@@ -20,7 +20,7 @@ @if (Laravel\Jetstream\Jetstream::hasPermissions())
- +
@foreach (Laravel\Jetstream\Jetstream::$permissions as $permission) diff --git a/stubs/livewire/resources/views/profile/update-password-form.blade.php b/stubs/livewire/resources/views/profile/update-password-form.blade.php index 816c4ab88..b5360056a 100644 --- a/stubs/livewire/resources/views/profile/update-password-form.blade.php +++ b/stubs/livewire/resources/views/profile/update-password-form.blade.php @@ -9,19 +9,19 @@
- +
- +
- +
diff --git a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php index f815c7a06..f9e45c868 100644 --- a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php +++ b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php @@ -24,7 +24,7 @@ reader.readAsDataURL($refs.photo.files[0]); " /> - +
@@ -48,7 +48,7 @@
- +
diff --git a/stubs/livewire/resources/views/teams/create-team-form.blade.php b/stubs/livewire/resources/views/teams/create-team-form.blade.php index 72a875f2f..601823c9a 100644 --- a/stubs/livewire/resources/views/teams/create-team-form.blade.php +++ b/stubs/livewire/resources/views/teams/create-team-form.blade.php @@ -9,7 +9,7 @@
- +
{{ $this->user->name }} @@ -22,7 +22,7 @@
- +
diff --git a/stubs/livewire/resources/views/teams/team-member-manager.blade.php b/stubs/livewire/resources/views/teams/team-member-manager.blade.php index 5bd61df1b..55dc16d96 100644 --- a/stubs/livewire/resources/views/teams/team-member-manager.blade.php +++ b/stubs/livewire/resources/views/teams/team-member-manager.blade.php @@ -22,7 +22,7 @@
- +
@@ -30,7 +30,7 @@ @if (count($this->roles) > 0)
- +
diff --git a/stubs/livewire/resources/views/teams/update-team-name-form.blade.php b/stubs/livewire/resources/views/teams/update-team-name-form.blade.php index 474365958..baecd34d0 100644 --- a/stubs/livewire/resources/views/teams/update-team-name-form.blade.php +++ b/stubs/livewire/resources/views/teams/update-team-name-form.blade.php @@ -10,7 +10,7 @@
- +
{{ $team->owner->name }} @@ -24,7 +24,7 @@
- + Date: Mon, 14 Sep 2020 16:20:19 +0200 Subject: [PATCH 2/2] Make a few strings translatable --- .../resources/views/api/api-token-manager.blade.php | 2 +- stubs/resources/views/auth/forgot-password.blade.php | 2 +- stubs/resources/views/auth/login.blade.php | 4 ++-- stubs/resources/views/auth/register.blade.php | 8 ++++---- stubs/resources/views/auth/reset-password.blade.php | 6 +++--- stubs/resources/views/auth/two-factor-challenge.blade.php | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stubs/livewire/resources/views/api/api-token-manager.blade.php b/stubs/livewire/resources/views/api/api-token-manager.blade.php index 6a8940b8f..51e8b8243 100644 --- a/stubs/livewire/resources/views/api/api-token-manager.blade.php +++ b/stubs/livewire/resources/views/api/api-token-manager.blade.php @@ -71,7 +71,7 @@
@if ($token->last_used_at)
- Last used {{ $token->last_used_at->diffForHumans() }} + {{ __('Last used') }} {{ $token->last_used_at->diffForHumans() }}
@endif diff --git a/stubs/resources/views/auth/forgot-password.blade.php b/stubs/resources/views/auth/forgot-password.blade.php index ec436a377..8e5ddc2b9 100644 --- a/stubs/resources/views/auth/forgot-password.blade.php +++ b/stubs/resources/views/auth/forgot-password.blade.php @@ -20,7 +20,7 @@ @csrf
- +
diff --git a/stubs/resources/views/auth/login.blade.php b/stubs/resources/views/auth/login.blade.php index 82caa7fa9..dc813ef1a 100644 --- a/stubs/resources/views/auth/login.blade.php +++ b/stubs/resources/views/auth/login.blade.php @@ -16,12 +16,12 @@ @csrf
- +
- +
diff --git a/stubs/resources/views/auth/register.blade.php b/stubs/resources/views/auth/register.blade.php index b9e0528d0..dd60ae4d9 100644 --- a/stubs/resources/views/auth/register.blade.php +++ b/stubs/resources/views/auth/register.blade.php @@ -10,22 +10,22 @@ @csrf
- +
- +
- +
- +
diff --git a/stubs/resources/views/auth/reset-password.blade.php b/stubs/resources/views/auth/reset-password.blade.php index 599438b90..c1e351329 100644 --- a/stubs/resources/views/auth/reset-password.blade.php +++ b/stubs/resources/views/auth/reset-password.blade.php @@ -12,17 +12,17 @@
- +
- +
- +
diff --git a/stubs/resources/views/auth/two-factor-challenge.blade.php b/stubs/resources/views/auth/two-factor-challenge.blade.php index f9f014d4b..aaeaf8f45 100644 --- a/stubs/resources/views/auth/two-factor-challenge.blade.php +++ b/stubs/resources/views/auth/two-factor-challenge.blade.php @@ -19,12 +19,12 @@ @csrf
- +
- +