From 06479906cb18c609e250033b361627aec412ae23 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 26 Sep 2019 23:15:25 +1000
Subject: [PATCH] Fixes for lang

---
 resources/views/auth/login.blade.php          | 16 +++----
 .../views/auth/passwords/email.blade.php      |  6 +--
 .../views/auth/passwords/reset.blade.php      | 10 ++--
 .../client/partial/client_details.blade.php   | 26 +++++-----
 .../client/partial/client_location.blade.php  | 48 +++++++++----------
 .../client/partial/client_settings.blade.php  | 14 +++---
 .../client/partial/contact_details.blade.php  | 24 +++++-----
 resources/views/email/auth/verify.blade.php   |  4 +-
 resources/views/header.blade.php              |  6 +--
 .../views/portal/default/auth/login.blade.php | 14 +++---
 .../default/auth/passwords/email.blade.php    |  6 +--
 .../default/auth/passwords/reset.blade.php    | 10 ++--
 .../views/portal/default/header.blade.php     | 12 ++---
 .../settings/partial/localization.blade.php   |  4 +-
 resources/views/sidebar.blade.php             | 24 +++++-----
 resources/views/signup/index.blade.php        | 16 +++----
 .../views/vendor/mail/html/message.blade.php  |  2 +-
 .../vendor/mail/markdown/message.blade.php    |  2 +-
 .../views/vendor/mail/text/message.blade.php  |  2 +-
 .../vendor/notifications/email.blade.php      |  8 ++--
 20 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index ab39ed8b8322..6b4da45785d5 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -10,7 +10,7 @@
                         <div class="card-body">
                             <form method="POST" action="{{ route('login') }}">
                                 @csrf
-                                <h1>@lang::get('texts.account_login')</h1>
+                                <h1>@lang('texts.account_login')</h1>
                                     @if (Session::has('error'))
                                         <div class="alert alert-danger">
                                             <li>{!! Session::get('error') !!}</li>
@@ -23,7 +23,7 @@
                                           <i class="icon-user"></i>
                                         </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang('texts.email')" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -38,7 +38,7 @@
                                           <i class="icon-lock"></i>
                                         </span>
                                     </div>
-                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang::get('texts.password')" required>
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang('texts.password')" required>
 
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" role="alert">
@@ -49,11 +49,11 @@
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang::get('texts.login')</button>
+                                        <button class="btn btn-primary px-4" type="submit">@lang('texts.login')</button>
                                     </div>
                                     <div class="col-6 text-right">
                                         <a class="btn btn-link" href="{{ route('password.request') }}">
-                                            @lang::get('texts.forgot_password')
+                                            @lang('texts.forgot_password')
                                         </a>
                                     </div>
                                 </div>
@@ -91,9 +91,9 @@
                     <div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
                         <div class="card-body text-center">
                             <div>
-                                <h2>@lang::get('texts.sign_up_now')</h2>
-                                <p>@lang::get('texts.not_a_member_yet')</p>
-                                <a class="btn btn-primary active mt-3" href="{{route('signup') }}">@lang::get('texts.login_create_an_account')</a>
+                                <h2>@lang('texts.sign_up_now')</h2>
+                                <p>@lang('texts.not_a_member_yet')</p>
+                                <a class="btn btn-primary active mt-3" href="{{route('signup') }}">@lang('texts.login_create_an_account')</a>
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index dddd0ce6fdb6..5cebb9178e1a 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -16,7 +16,7 @@
                             @endif
                             <form method="POST" action="{{ route('password.email') }}">
                                 @csrf
-                                <h1>@lang::get('texts.password_recovery')</h1>
+                                <h1>trans('texts.password_recovery')</h1>
                                 <p class="text-muted"></p>
                                 <div class="input-group mb-3">
                                     <div class="input-group-prepend">
@@ -24,7 +24,7 @@
                                       <i class="icon-user"></i>
                                     </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="trans('texts.email')" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -36,7 +36,7 @@
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang::get('texts.send_email')</button>
+                                        <button class="btn btn-primary px-4" type="submit">trans('texts.send_email')</button>
                                     </div>
                                 </div>
                             </form>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 460a59a6f0b8..5c8eb14e55e2 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -12,7 +12,7 @@
                                 <form method="POST" action="{{ route('password.update') }}">
                                 @csrf
                                         <input type="hidden" name="token" value="{{ $token }}">
-                                <h1>@lang::get('texts.change_password')</h1>
+                                <h1>trans('texts.change_password')</h1>
                                 <p class="text-muted"></p>
                                 <div class="input-group mb-3">
                                     <div class="input-group-prepend">
@@ -20,7 +20,7 @@
                                       <i class="icon-user"></i>
                                     </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="trans('texts.email')" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -36,7 +36,7 @@
                                       <i class="icon-lock"></i>
                                     </span>
                                     </div>
-                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang::get('texts.password')" required>
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="trans('texts.password')" required>
 
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" role="alert">
@@ -51,12 +51,12 @@
                                       <i class="icon-lock"></i>
                                     </span>
                                     </div>
-                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="@lang::get('texts.confirm_password')" required>
+                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="trans('texts.confirm_password')" required>
                                 </div>
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang::get('texts.change_password')</button>
+                                        <button class="btn btn-primary px-4" type="submit">trans('texts.change_password')</button>
                                     </div>
                                 </div>
                             </form>
diff --git a/resources/views/client/partial/client_details.blade.php b/resources/views/client/partial/client_details.blade.php
index 4a095dff62cd..5aeae3032cfa 100644
--- a/resources/views/client/partial/client_details.blade.php
+++ b/resources/views/client/partial/client_details.blade.php
@@ -1,50 +1,50 @@
 <div class="card">
-    <div class="card-header bg-primary2">@lang::get('texts.edit_client')</div>
+    <div class="card-header bg-primary2">trans('texts.edit_client')</div>
     <div class="card-body">
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.client_name')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.client_name')</label>
             <div class="col-sm-9">
-                <input name="name" placeholder="@lang::get('texts.name')" class="form-control" v-model="form.name">
+                <input name="name" placeholder="trans('texts.name')" class="form-control" v-model="form.name">
                 <div v-if="form.errors.has('name')" class="text-danger" v-text="form.errors.get('name')"></div>
             </div>
         </div>
 
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.id_number')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.id_number')</label>
             <div class="col-sm-9">
-                <input name="id_number" placeholder="@lang::get('texts.id_number')" class="form-control" v-model="form.id_number">
+                <input name="id_number" placeholder="trans('texts.id_number')" class="form-control" v-model="form.id_number">
                 <div v-if="form.errors.has('id_number')" class="text-danger" v-text="form.errors.get('id_number')"></div>
             </div>
         </div>
 
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.vat_number')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.vat_number')</label>
             <div class="col-sm-9">
-                <input name="vat_number" placeholder="@lang::get('texts.vat_number')" class="form-control" v-model="form.vat_number">
+                <input name="vat_number" placeholder="trans('texts.vat_number')" class="form-control" v-model="form.vat_number">
                 <div v-if="form.errors.has('vat_number')" class="text-danger" v-text="form.errors.get('vat_number')"></div>
             </div>
         </div>
 
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.website')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.website')</label>
             <div class="col-sm-9">
-                <input name="website" placeholder="@lang::get('texts.website')" class="form-control" v-model="form.website">
+                <input name="website" placeholder="trans('texts.website')" class="form-control" v-model="form.website">
                 <div v-if="form.errors.has('website')" class="text-danger" v-text="form.errors.get('website')"></div>
             </div>
         </div>
 
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value1')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value1')</label>
             <div class="col-sm-9">
-                <input name="custom_value1" placeholder="@lang::get('texts.custom_value1')" class="form-control" v-model="form.custom_value1">
+                <input name="custom_value1" placeholder="trans('texts.custom_value1')" class="form-control" v-model="form.custom_value1">
                 <div v-if="form.errors.has('custom_value1')" class="text-danger" v-text="form.errors.get('custom_value1')"></div>
             </div>
         </div>
 
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value2')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value2')</label>
             <div class="col-sm-9">
-                <input name="custom_value2" placeholder="@lang::get('texts.custom_value2')" class="form-control" v-model="form.custom_value2">
+                <input name="custom_value2" placeholder="trans('texts.custom_value2')" class="form-control" v-model="form.custom_value2">
                 <div v-if="form.errors.has('custom_value2')" class="text-danger" v-text="form.errors.get('custom_value2')"></div>
             </div>
         </div>
diff --git a/resources/views/client/partial/client_location.blade.php b/resources/views/client/partial/client_location.blade.php
index 23af5e98bc55..50ed78bb440e 100644
--- a/resources/views/client/partial/client_location.blade.php
+++ b/resources/views/client/partial/client_location.blade.php
@@ -14,46 +14,46 @@
                 <button type="button" class="btn btn-sm btn-light" @click="copy('copy_shipping')"> {{ trans('texts.copy_shipping') }}</button>
                 <div class="card-body">
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.address1')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.address1')</label>
                         <div class="col-lg-9">
-                            <input name="address1" placeholder="@lang::get('texts.address1')" class="form-control" v-model="form.address1">
+                            <input name="address1" placeholder="trans('texts.address1')" class="form-control" v-model="form.address1">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.address2')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.address2')</label>
                         <div class="col-lg-9">
-                            <input name="address2" placeholder="@lang::get('texts.address2')" class="form-control" v-model="form.address2" id="address2">
+                            <input name="address2" placeholder="trans('texts.address2')" class="form-control" v-model="form.address2" id="address2">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.city')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.city')</label>
                         <div class="col-lg-9">
-                            <input name="city" placeholder="@lang::get('texts.city')" class="form-control" v-model="form.city" id="city">
+                            <input name="city" placeholder="trans('texts.city')" class="form-control" v-model="form.city" id="city">
                         </div>
                     </div>
 
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.state')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.state')</label>
                         <div class="col-lg-9">
-                            <input name="state" placeholder="@lang::get('texts.state')" class="form-control" v-model="form.state" id="state">
+                            <input name="state" placeholder="trans('texts.state')" class="form-control" v-model="form.state" id="state">
                         </div>
                     </div>
 
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.postal_code')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.postal_code')</label>
                         <div class="col-lg-9">
-                            <input name="postal_code" placeholder="@lang::get('texts.postal_code')" class="form-control" v-model="form.postal_code" id="postal_code">
+                            <input name="postal_code" placeholder="trans('texts.postal_code')" class="form-control" v-model="form.postal_code" id="postal_code">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.country')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.country')</label>
                         <div class="col-lg-9">
-                            <input name="country_id" placeholder="@lang::get('texts.country')" class="form-control" v-model="form.country_id" id="country">
+                            <input name="country_id" placeholder="trans('texts.country')" class="form-control" v-model="form.country_id" id="country">
                         </div>
                     </div>
                 </div>
@@ -62,46 +62,46 @@
                 <button type="button" class="btn btn-sm btn-light" @click="copy('copy_billing')"> {{ trans('texts.copy_billing') }}</button>
                 <div class="card-body">
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.address1')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.address1')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_address1" placeholder="@lang::get('texts.address1')" class="form-control" v-model="form.shipping_address1">
+                            <input name="shipping_address1" placeholder="trans('texts.address1')" class="form-control" v-model="form.shipping_address1">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.address2')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.address2')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_address2" placeholder="@lang::get('texts.address2')" class="form-control" v-model="form.shipping_address2" id="address2">
+                            <input name="shipping_address2" placeholder="trans('texts.address2')" class="form-control" v-model="form.shipping_address2" id="address2">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.city')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.city')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_city" placeholder="@lang::get('texts.city')" class="form-control" v-model="form.shipping_city" id="city">
+                            <input name="shipping_city" placeholder="trans('texts.city')" class="form-control" v-model="form.shipping_city" id="city">
                         </div>
                     </div>
 
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.state')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.state')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_state" placeholder="@lang::get('texts.state')" class="form-control" v-model="form.shipping_state" id="state">
+                            <input name="shipping_state" placeholder="trans('texts.state')" class="form-control" v-model="form.shipping_state" id="state">
                         </div>
                     </div>
 
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.postal_code')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.postal_code')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_postal_code" placeholder="@lang::get('texts.postal_code')" class="form-control" v-model="form.shipping_postal_code" id="postal_code">
+                            <input name="shipping_postal_code" placeholder="trans('texts.postal_code')" class="form-control" v-model="form.shipping_postal_code" id="postal_code">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="name" class="col-lg-3 col-form-label text-right">@lang::get('texts.country')</label>
+                        <label for="name" class="col-lg-3 col-form-label text-right">trans('texts.country')</label>
                         <div class="col-lg-9">
-                            <input name="shipping_country_id" placeholder="@lang::get('texts.country')" class="form-control" v-model="form.shipping_country_id" id="country">
+                            <input name="shipping_country_id" placeholder="trans('texts.country')" class="form-control" v-model="form.shipping_country_id" id="country">
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/client/partial/client_settings.blade.php b/resources/views/client/partial/client_settings.blade.php
index 439ffc28c4c9..259f394fda90 100644
--- a/resources/views/client/partial/client_settings.blade.php
+++ b/resources/views/client/partial/client_settings.blade.php
@@ -1,6 +1,6 @@
 <div class="col-lg-5">
     <div class="card">
-        <div class="card-header bg-primary">@lang::get('texts.settings')</div>
+        <div class="card-header bg-primary">trans('texts.settings')</div>
 
         <div class="card-body">
 
@@ -20,42 +20,42 @@
 
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.currency')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.currency')</label>
                 <div class="col-sm-9">
                     {{ html()->input('name')->placeholder(__('texts.client_name'))->value($client->present()->name)->class('form-control')->id('name') }}
                 </div>
             </div>
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.id_number')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.id_number')</label>
                 <div class="col-sm-9">
                     {{ html()->input('id_number')->placeholder(__('texts.id_number'))->value($client->id_number)->class('form-control')->id('id_number') }}
                 </div>
             </div>
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.vat_number')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.vat_number')</label>
                 <div class="col-sm-9">
                     {{ html()->input('vat_number')->placeholder(__('texts.vat_number'))->value($client->vat_number)->class('form-control')->id('vat_number') }}
                 </div>
             </div>
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.website')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.website')</label>
                 <div class="col-sm-9">
                     {{ html()->input('website')->placeholder(__('texts.website'))->value($client->website)->class('form-control')->id('website') }}
                 </div>
             </div>
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value1')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value1')</label>
                 <div class="col-sm-9">
                     {{ html()->input('custom_value1')->placeholder(__('texts.custom_value1'))->value($client->custom_value1)->class('form-control')->id('custom_value1') }}
                 </div>
             </div>
 
             <div class="form-group row">
-                <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value2')</label>
+                <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value2')</label>
                 <div class="col-sm-9">
                     {{ html()->input('custom_value2')->placeholder(__('texts.custom_value2'))->value($client->custom_value2)->class('form-control')->id('custom_value2') }}
                 </div>
diff --git a/resources/views/client/partial/contact_details.blade.php b/resources/views/client/partial/contact_details.blade.php
index da2346411931..bd21ddd0ecf8 100644
--- a/resources/views/client/partial/contact_details.blade.php
+++ b/resources/views/client/partial/contact_details.blade.php
@@ -1,49 +1,49 @@
 <div class="card-body">
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.first_name')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.first_name')</label>
         <div class="col-sm-9">
             <input name="id" type="hidden" v-model="contact.client_id" value="{{ $client->present()->id ?: -1}}">
-            <input ref="first_name" name="first_name" placeholder="@lang::get('texts.first_name')" class="form-control" v-model="contact.first_name">
+            <input ref="first_name" name="first_name" placeholder="trans('texts.first_name')" class="form-control" v-model="contact.first_name">
             <div v-if="form.errors.has('contacts.'+key+'.first_name')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.first_name')"></div>
         </div>
     </div>
 
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.last_name')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.last_name')</label>
         <div class="col-sm-9">
-            <input name="last_name" placeholder="@lang::get('texts.last_name')" class="form-control" v-model="contact.last_name">
+            <input name="last_name" placeholder="trans('texts.last_name')" class="form-control" v-model="contact.last_name">
             <div v-if="form.errors.has('contacts.'+key+'.last_name')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.last_name')"></div>
         </div>
     </div>
 
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.email')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.email')</label>
         <div class="col-sm-9">
-            <input name="email" placeholder="@lang::get('texts.email')" class="form-control" v-model="contact.email">
+            <input name="email" placeholder="trans('texts.email')" class="form-control" v-model="contact.email">
             <div v-if="form.errors.has('contacts.'+key+'.email')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.email')"></div>
         </div>
     </div>
 
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.phone')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.phone')</label>
         <div class="col-sm-9">
-            <input name="phone" placeholder="@lang::get('texts.phone')" class="form-control" v-model="contact.phone">
+            <input name="phone" placeholder="trans('texts.phone')" class="form-control" v-model="contact.phone">
             <div v-if="form.errors.has('contacts.'+key+'.phone')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.phone')"></div>
         </div>
     </div>
 
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value1')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value1')</label>
         <div class="col-sm-9">
-            <input name="custom_value1" placeholder="@lang::get('texts.custom_value1')" class="form-control" v-model="contact.custom_value1">
+            <input name="custom_value1" placeholder="trans('texts.custom_value1')" class="form-control" v-model="contact.custom_value1">
             <div v-if="form.errors.has('contacts.'+key+'.custom_value1')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.custom_value1')"></div>
         </div>
     </div>
 
     <div class="form-group row">
-        <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.custom_value2')</label>
+        <label for="name" class="col-sm-3 col-form-label text-right">trans('texts.custom_value2')</label>
         <div class="col-sm-9">
-            <input name="custom_value2" placeholder="@lang::get('texts.custom_value2')" class="form-control" v-model="contact.custom_value2">
+            <input name="custom_value2" placeholder="trans('texts.custom_value2')" class="form-control" v-model="contact.custom_value2">
             <div v-if="form.errors.has('contacts.'+key+'.custom_value2')" class="text-danger" v-text="form.errors.get('contacts.'+key+'.custom_value2')"></div>
         </div>
     </div>
diff --git a/resources/views/email/auth/verify.blade.php b/resources/views/email/auth/verify.blade.php
index dc956d1ac535..c61fb0198fe5 100644
--- a/resources/views/email/auth/verify.blade.php
+++ b/resources/views/email/auth/verify.blade.php
@@ -9,10 +9,10 @@ Header Title
 
 {{-- Body --}}
 {{ $user }}
-@lang::get('texts.confirmation_message')
+trans('texts.confirmation_message')
 
 @component('mail::button', ['url' => url("/user/confirm/{$user->confirmation_code}")])
-@lang::get('texts.confirm')
+trans('texts.confirm')
 @endcomponent
 
 {{-- Subcopy --}}
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 79b84913ef98..f584d1bee202 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -83,7 +83,7 @@
             </a>
             <div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
                 <div class="dropdown-header text-center">
-                    <strong>@lang::get('texts.manage_companies')</strong>
+                    <strong>trans('texts.manage_companies')</strong>
                 </div>
 
                 @foreach($companies as $company) <!-- List all remaining companies here-->
@@ -103,7 +103,7 @@
                 <!-- Add Company-->
                 @if(count($companies) < 5)
                 <a class="dropdown-item" href="{{ route('user.logout') }}">
-                    <i class="fa fa-plus"></i> @lang::get('texts.add_company')</a>
+                    <i class="fa fa-plus"></i> trans('texts.add_company')</a>
                 @endif
             </div>
         </li>
@@ -119,7 +119,7 @@
                 <a class="dropdown-item" href="#">
                     <i class="fa fa-user"></i> Profile</a>
                 <a class="dropdown-item" href="{{  route('user.settings') }}">
-                    <i class="fa fa-wrench"></i> @lang::get('texts.settings')</a>
+                    <i class="fa fa-wrench"></i> trans('texts.settings')</a>
 
                 <div class="dropdown-divider"></div>
                 <a class="dropdown-item" href="{{ route('user.logout') }}">
diff --git a/resources/views/portal/default/auth/login.blade.php b/resources/views/portal/default/auth/login.blade.php
index f2df501edee8..ffb599486077 100644
--- a/resources/views/portal/default/auth/login.blade.php
+++ b/resources/views/portal/default/auth/login.blade.php
@@ -29,7 +29,7 @@
                             @endif
                             <form method="POST" action="{{ route('client.login') }}">
                                 @csrf
-                                <h1>{{ ('texts.account_login') }}</h1>
+                                <h1>{{ trans('texts.account_login') }}</h1>
                                     @if (Session::has('error'))
                                         <div class="alert alert-danger">
                                             <li>{!! Session::get('error') !!}</li>
@@ -42,7 +42,7 @@
                                           <i class="icon-user"></i>
                                         </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ ('texts.email') }}" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ trans('texts.email') }}" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -57,7 +57,7 @@
                                           <i class="icon-lock"></i>
                                         </span>
                                     </div>
-                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ ('texts.password') }}" required>
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ trans('texts.password') }}" required>
 
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" role="alert">
@@ -72,7 +72,7 @@
                                     </div>
                                     <div class="col-6 text-right">
                                         <a class="btn btn-link" href="{{ route('client.password.request') }}">
-                                            @lang::get('texts.forgot_password')
+                                            {{trans('texts.forgot_password')}}
                                         </a>
                                     </div>
                                 </div>
@@ -85,9 +85,9 @@
                     <!--<div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
                         <div class="card-body text-center">
                             <div>
-                                <h2>@lang::get('texts.sign_up_now')</h2>
-                                <p>@lang::get('texts.not_a_member_yet')</p>
-                                <a class="btn btn-primary active mt-3" href="{{route('signup') }}">@lang::get('texts.login_create_an_account')</a>
+                                <h2>trans('texts.sign_up_now')</h2>
+                                <p>trans('texts.not_a_member_yet')</p>
+                                <a class="btn btn-primary active mt-3" href="{{route('signup') }}">trans('texts.login_create_an_account')</a>
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/portal/default/auth/passwords/email.blade.php b/resources/views/portal/default/auth/passwords/email.blade.php
index 3094ee684d03..7959f71e990d 100644
--- a/resources/views/portal/default/auth/passwords/email.blade.php
+++ b/resources/views/portal/default/auth/passwords/email.blade.php
@@ -15,7 +15,7 @@
                             @endif
                             <form method="POST" action="{{ route($passwordEmailRoute) }}">
                                 @csrf
-                                <h1>@lang::get('texts.password_recovery')</h1>
+                                <h1>trans('texts.password_recovery')</h1>
                                 <p class="text-muted"></p>
                                 <div class="input-group mb-3">
                                     <div class="input-group-prepend">
@@ -23,7 +23,7 @@
                                       <i class="icon-user"></i>
                                     </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="trans('texts.email')" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -35,7 +35,7 @@
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang::get('texts.send_email')</button>
+                                        <button class="btn btn-primary px-4" type="submit">trans('texts.send_email')</button>
                                     </div>
                                 </div>
                             </form>
diff --git a/resources/views/portal/default/auth/passwords/reset.blade.php b/resources/views/portal/default/auth/passwords/reset.blade.php
index 0e0cf11563d3..c6b594b0f1d9 100644
--- a/resources/views/portal/default/auth/passwords/reset.blade.php
+++ b/resources/views/portal/default/auth/passwords/reset.blade.php
@@ -12,7 +12,7 @@
                                 <form method="POST" action="{{ route('client.password.update') }}">
                                 @csrf
                                         <input type="hidden" name="token" value="{{ $token }}">
-                                <h1>@lang::get('texts.change_password')</h1>
+                                <h1>@lang('texts.change_password')</h1>
                                 <p class="text-muted"></p>
                                 <div class="input-group mb-3">
                                     <div class="input-group-prepend">
@@ -20,7 +20,7 @@
                                       <i class="icon-user"></i>
                                     </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang('texts.email')" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -36,7 +36,7 @@
                                       <i class="icon-lock"></i>
                                     </span>
                                     </div>
-                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang::get('texts.password')" required>
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang('texts.password')" required>
 
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" role="alert">
@@ -51,12 +51,12 @@
                                       <i class="icon-lock"></i>
                                     </span>
                                     </div>
-                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="@lang::get('texts.confirm_password')" required>
+                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="@lang('texts.confirm_password')" required>
                                 </div>
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang::get('texts.change_password')</button>
+                                        <button class="btn btn-primary px-4" type="submit">@lang('texts.change_password')</button>
                                     </div>
                                 </div>
                             </form>
diff --git a/resources/views/portal/default/header.blade.php b/resources/views/portal/default/header.blade.php
index 84885083ff73..5c32d8e7b304 100644
--- a/resources/views/portal/default/header.blade.php
+++ b/resources/views/portal/default/header.blade.php
@@ -19,7 +19,7 @@
             </a>
             <div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
                 <div class="dropdown-header text-center">
-                    <strong>{{ ('texts.notifications')}}</strong>
+                    <strong>{{ trans('texts.notifications')}}</strong>
                 </div>
                 <a class="dropdown-item" href="#">
                     <div class="small mb-1">Mr Miyagi todos
@@ -32,7 +32,7 @@
                         </span>
                 </a>
                 <a class="dropdown-item text-center" href="#">
-                    <strong>{{ ('texts.more')}}</strong>
+                    <strong>{{ trans('texts.more')}}</strong>
                 </a>
             </div>
         </li>
@@ -47,14 +47,14 @@
             </a>
             <div class="dropdown-menu dropdown-menu-sm">
                 <div class="dropdown-header text-center">
-                    <strong>{{ ('texts.settings')}} </strong>
+                    <strong>{{ trans('texts.settings')}} </strong>
                 </div>
-                <a class="dropdown-item" href="{{ route('client.profile.edit', ['id' => auth()->user()->hashed_id])}}">
-                    <i class="fa fa-user"></i> @lang::get('texts.profile')</a>
+                <a class="dropdown-item" href="{{ route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id])}}">
+                    <i class="fa fa-user"></i> @lang('texts.profile')</a>
 
                 <div class="dropdown-divider"></div>
                 <a class="dropdown-item" href="{{ route('client.logout') }}">
-                    <i class="fa fa-lock"></i> @lang::get('texts.logout')</a>
+                    <i class="fa fa-lock"></i> @lang('texts.logout')</a>
             </div>
         </li>
     </ul>
diff --git a/resources/views/settings/partial/localization.blade.php b/resources/views/settings/partial/localization.blade.php
index 027c02ba117e..e147c90d3534 100644
--- a/resources/views/settings/partial/localization.blade.php
+++ b/resources/views/settings/partial/localization.blade.php
@@ -1,8 +1,8 @@
 <div class="card" id="localization">
-    <div class="card-header bg-primary2">@lang::get('texts.localization')</div>
+    <div class="card-header bg-primary2">@lang('texts.localization')</div>
     <div class="card-body">
         <div class="form-group row">
-            <label for="name" class="col-sm-3 col-form-label text-right">@lang::get('texts.client_name')</label>
+            <label for="name" class="col-sm-3 col-form-label text-right">@lang('texts.client_name')</label>
             <div class="col-sm-9">
                 <v-select v-model="selected" :options="options"></v-select>
                 <div v-if="form.errors.has('name')" class="text-danger" v-text="form.errors.get('name')"></div>
diff --git a/resources/views/sidebar.blade.php b/resources/views/sidebar.blade.php
index 41a085c3e2ae..d9f9cc8e62df 100644
--- a/resources/views/sidebar.blade.php
+++ b/resources/views/sidebar.blade.php
@@ -4,63 +4,63 @@
 
             <li class="nav-item ">
                 <a class="nav-link" href="{{ route('dashboard.index') }}">
-                    <i class="nav-icon icon-speedometer"></i> @lang::get('texts.dashboard')
+                    <i class="nav-icon icon-speedometer"></i> @lang('texts.dashboard')
                 </a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="/clients">
-                    <i class="nav-icon icon-user"></i> @lang::get('texts.clients')</a>
+                    <i class="nav-icon icon-user"></i> @lang('texts.clients')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="{{ route('invoices.index') }}">
-                    <i class="nav-icon icon-notebook"></i> @lang::get('texts.invoices')</a>
+                    <i class="nav-icon icon-notebook"></i> @lang('texts.invoices')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-wallet"></i> @lang::get('texts.payments')</a>
+                    <i class="nav-icon icon-wallet"></i> @lang('texts.payments')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-docs"></i> @lang::get('texts.recurring')</a>
+                    <i class="nav-icon icon-docs"></i> @lang('texts.recurring')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-badge"></i> @lang::get('texts.credits')</a>
+                    <i class="nav-icon icon-badge"></i> @lang('texts.credits')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-vector"></i> @lang::get('texts.quotes')</a>
+                    <i class="nav-icon icon-vector"></i> @lang('texts.quotes')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-wrench"></i> @lang::get('texts.projects')</a>
+                    <i class="nav-icon icon-wrench"></i> @lang('texts.projects')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-grid"></i> @lang::get('texts.tasks')</a>
+                    <i class="nav-icon icon-grid"></i> @lang('texts.tasks')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-envelope-open"></i> @lang::get('texts.expenses')</a>
+                    <i class="nav-icon icon-envelope-open"></i> @lang('texts.expenses')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-bell"></i> @lang::get('texts.vendors')</a>
+                    <i class="nav-icon icon-bell"></i> @lang('texts.vendors')</a>
             </li>
 
             <li class="nav-item">
                 <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-printer"></i> @lang::get('texts.reports')</a>
+                    <i class="nav-icon icon-printer"></i> @lang('texts.reports')</a>
             </li>
         </ul>
     </nav>
diff --git a/resources/views/signup/index.blade.php b/resources/views/signup/index.blade.php
index 818d7878efc5..75dab2d8ad1c 100644
--- a/resources/views/signup/index.blade.php
+++ b/resources/views/signup/index.blade.php
@@ -12,7 +12,7 @@
                         <span class="align-items-center" style="width:100%; display: block; text-align: center; padding:30px;">
                             <img src="images/logo.png" width="100px" height="100px">
                         </span>
-                        <h1 style="text-align: center;">@lang::get('texts.login_create_an_account')</h1>
+                        <h1 style="text-align: center;">@lang('texts.login_create_an_account')</h1>
                         <p class="text-muted"></p>
 
                             <form method="POST" action="{{ route('signup.submit')}}">
@@ -23,7 +23,7 @@
                                     <i class="icon-user"></i>
                                 </span>
                             </div>
-                            <input id="first_name" type="text" class="form-control{{ $errors->has('first_name') ? ' is-invalid' : '' }}" name="first_name" value="{{ old('first_name') }}" placeholder="@lang::get('texts.first_name')" required autofocus>
+                            <input id="first_name" type="text" class="form-control{{ $errors->has('first_name') ? ' is-invalid' : '' }}" name="first_name" value="{{ old('first_name') }}" placeholder="@lang('texts.first_name')" required autofocus>
                             @if ($errors->has('first_name'))
                                 <span class="invalid-feedback" role="alert">
                                     <strong>{{ $errors->first('first_name') }}</strong>
@@ -38,7 +38,7 @@
                                     <i class="icon-user"></i>
                                 </span>
                             </div>
-                            <input id="last_name" type="text" class="form-control{{ $errors->has('last_name') ? ' is-invalid' : '' }}" name="last_name" value="{{ old('last_name') }}" placeholder="@lang::get('texts.last_name')" required autofocus>
+                            <input id="last_name" type="text" class="form-control{{ $errors->has('last_name') ? ' is-invalid' : '' }}" name="last_name" value="{{ old('last_name') }}" placeholder="@lang('texts.last_name')" required autofocus>
                             @if ($errors->has('last_name'))
                                 <span class="invalid-feedback" role="alert">
                                     <strong>{{ $errors->first('last_name') }}</strong>
@@ -51,7 +51,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text">@</span>
                             </div>
-                            <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang::get('texts.email')" required autofocus>
+                            <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang('texts.email')" required autofocus>
                             @if ($errors->has('email'))
                                 <span class="invalid-feedback" role="alert">
                                     <strong>{{ $errors->first('email') }}</strong>
@@ -70,7 +70,7 @@
                                 <i class="icon-lock"></i>
                               </span>
                             </div>
-                            <input id="password" type="password" class="form-control" {{ $errors->has('password') ? ' is-invalid' : '' }} name="password" placeholder="@lang::get('texts.password')" required>
+                            <input id="password" type="password" class="form-control" {{ $errors->has('password') ? ' is-invalid' : '' }} name="password" placeholder="@lang('texts.password')" required>
 
                             @if ($errors->has('password'))
                                 <span class="invalid-feedback" role="alert">
@@ -82,7 +82,7 @@
                         <div class="form-check" style="margin-top:10px; margin-bottom: 10px;">
                             <input class="form-check-input" type="checkbox" id="terms_of_service" name="terms_of_service" value="1" v-model="checked1" {{(old('terms_of_service') == "1") ? 'checked': ''}}>
                             <label class="form-check-label" for="terms_of_service">
-                                @lang::get('texts.agree_to_terms', ['terms' => ''])<a href=" {{config('ninja.terms_of_service_url.' . config('ninja.environment')) }}" target="_blank">@lang::get('texts.terms_of_service')</a>
+                                @lang('texts.agree_to_terms', ['terms' => ''])<a href=" {{config('ninja.terms_of_service_url.' . config('ninja.environment')) }}" target="_blank">@lang('texts.terms_of_service')</a>
 
                             </label>
                         </div>
@@ -90,12 +90,12 @@
                         <div class="form-check" style="margin-top:10px; margin-bottom: 10px;">
                             <input class="form-check-input" type="checkbox" id="privacy_policy" name="privacy_policy" value="1" v-model="checked2" {{(old('privacy_policy') == "1") ? 'checked': ''}}>
                             <label class="form-check-label" for="privacy_policy">
-                                @lang::get('texts.agree_to_terms', ['terms' => ''])<a href=" {{config('ninja.privacy_policy_url.' . config('ninja.environment')) }}" target="_blank">@lang::get('texts.privacy_policy')</a>
+                                @lang('texts.agree_to_terms', ['terms' => ''])<a href=" {{config('ninja.privacy_policy_url.' . config('ninja.environment')) }}" target="_blank">@lang('texts.privacy_policy')</a>
 
                             </label>
                         </div>
 
-                        <button class="btn btn-block btn-success" type="submit" :disabled="!isDisabled">@lang::get('texts.create_account')</button>
+                        <button class="btn btn-block btn-success" type="submit" :disabled="!isDisabled">@lang('texts.create_account')</button>
                     </div>
 
                     </form>
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index c58193e5603a..1ae9ed8f1bf6 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang::get('All rights reserved.')
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index c58193e5603a..1ae9ed8f1bf6 100644
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang::get('All rights reserved.')
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
index c58193e5603a..1ae9ed8f1bf6 100644
--- a/resources/views/vendor/mail/text/message.blade.php
+++ b/resources/views/vendor/mail/text/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang::get('All rights reserved.')
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 03a8df89b352..befcc0f88ed8 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -4,9 +4,9 @@
 # {{ $greeting }}
 @else
 @if ($level === 'error')
-# @lang::get('Whoops!')
+# @lang('Whoops!')
 @else
-# @lang::get('Hello!')
+# @lang('Hello!')
 @endif
 @endif
 
@@ -43,13 +43,13 @@
 @if (! empty($salutation))
 {{ $salutation }}
 @else
-@lang::get('Regards'),<br>{{ config('app.name') }}
+@lang('Regards'),<br>{{ config('app.name') }}
 @endif
 
 {{-- Subcopy --}}
 @isset($actionText)
 @slot('subcopy')
-@lang::get(
+@lang(
     "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
     'into your web browser: [:actionURL](:actionURL)',
     [