Merge remote-tracking branch 'origin/2.x' into 2.x

laravel · Jan 6, 2021 · 88d0664 · 88d0664
2 parents 90b1cf9 + bb913ac
commit 88d0664
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/resources/views/mail/team-invitation.blade.php b/resources/views/mail/team-invitation.blade.php
@@ -4,13 +4,13 @@
 {{ __('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
+{{ __('Create Account') }}
 @endcomponent
 
 {{ __('If you already have an account, you may accept this invitation by clicking the button below:') }}
 
 @component('mail::button', ['url' => $acceptUrl])
-Accept Invitation
+{{ __('Accept Invitation') }}
 @endcomponent
 
 {{ __('If you did not expect to receive an invitation to this team, you may discard this email.') }}

diff --git a/stubs/inertia/resources/js/Pages/API/Index.vue b/stubs/inertia/resources/js/Pages/API/Index.vue
@@ -19,7 +19,6 @@
 <script>
     import ApiTokenManager from './ApiTokenManager'
     import AppLayout from '@/Layouts/AppLayout'
-    import JetSectionBorder from '@/Jetstream/SectionBorder'
 
     export default {
         props: [
@@ -31,7 +30,6 @@
         components: {
             ApiTokenManager,
             AppLayout,
-            JetSectionBorder,
         },
     }
 </script>
diff --git a/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue b/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue
@@ -38,7 +38,6 @@
 </template>
 
 <script>
-    import JetActionMessage from '@/Jetstream/ActionMessage'
     import JetButton from '@/Jetstream/Button'
     import JetFormSection from '@/Jetstream/FormSection'
     import JetInput from '@/Jetstream/Input'
@@ -47,7 +46,6 @@
 
     export default {
         components: {
-            JetActionMessage,
             JetButton,
             JetFormSection,
             JetInput,

diff --git a/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue b/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue
@@ -45,7 +45,6 @@
 
 <script>
     import JetActionSection from '@/Jetstream/ActionSection'
-    import JetButton from '@/Jetstream/Button'
     import JetConfirmationModal from '@/Jetstream/ConfirmationModal'
     import JetDangerButton from '@/Jetstream/DangerButton'
     import JetSecondaryButton from '@/Jetstream/SecondaryButton'
@@ -55,7 +54,6 @@
 
         components: {
             JetActionSection,
-            JetButton,
             JetConfirmationModal,
             JetDangerButton,
             JetSecondaryButton,

diff --git a/stubs/inertia/resources/js/Pages/Welcome.vue b/stubs/inertia/resources/js/Pages/Welcome.vue
@@ -103,7 +103,7 @@
                 </div>
 
                 <div class="ml-4 text-center text-sm text-gray-500 sm:text-right sm:ml-0">
-                    Build v{{ laravelVersion }}
+                    Laravel v{{ laravelVersion }} (PHP v{{ phpVersion }})
                 </div>
             </div>
         </div>
@@ -180,6 +180,7 @@
             canLogin: Boolean,
             canRegister: Boolean,
             laravelVersion: String,
+            phpVersion: String,
         }
     }
 </script>
diff --git a/stubs/inertia/routes/web.php b/stubs/inertia/routes/web.php
@@ -20,6 +20,7 @@
         'canLogin' => Route::has('login'),
         'canRegister' => Route::has('register'),
         'laravelVersion' => Application::VERSION,
+        'phpVersion' => PHP_VERSION,
     ]);
 });