From 3b59b0385e11eff3428c8ebabc8b44bf161f3888 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 15 Mar 2020 20:54:59 +0800
Subject: [PATCH 1/2] Fix invalid password label

---
 resources/views/users/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 1493cf0..e97e847 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -95,7 +95,7 @@
                 <div class="panel-heading"><h3 class="panel-title">{{ trans('app.login_account') }}</h3></div>
                 <div class="panel-body">
                     {!! FormField::email('email', ['label' => trans('auth.email'), 'placeholder' => trans('app.example').' nama@mail.com']) !!}
-                    {!! FormField::password('password', ['label' => trans('auth.old_password'), 'placeholder' => '******', 'value' => '']) !!}
+                    {!! FormField::password('password', ['label' => trans('auth.password'), 'placeholder' => '******', 'value' => '']) !!}
                 </div>
             </div>
             <div class="text-right">
@@ -133,7 +133,7 @@
 @endsection
 
 @section('script')
-<script src="{{ asset('js/plugins/jquery.datetimepicker.js') }}"></script>jQuery('#datetimepicker').datetimepicker();
+<script src="{{ asset('js/plugins/jquery.datetimepicker.js') }}"></script>
 <script>
     (function() {
         $('#dob,#dod').datetimepicker({

From 48404aff9d2dfcb6e87c78664e12bee1ec4f3809 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 15 Mar 2020 20:57:15 +0800
Subject: [PATCH 2/2] Change trans() helper to __() helper

---
 resources/views/users/edit.blade.php | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index e97e847..ad39939 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -52,55 +52,55 @@
     @endcan
 @else
     <div class="pull-right">
-        {{ link_to_route('users.show', trans('app.show_profile').' '.$user->name, [$user->id], ['class' => 'btn btn-default']) }}
+        {{ link_to_route('users.show', __('app.show_profile').' '.$user->name, [$user->id], ['class' => 'btn btn-default']) }}
     </div>
     <h2 class="page-header">
-        {{ trans('user.edit') }} {{ $user->profileLink() }}
+        {{ __('user.edit') }} {{ $user->profileLink() }}
     </h2>
     <div class="row">
         {{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }}
         <div class="col-md-4">
             <div class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title">{{ trans('user.edit') }}</h3></div>
+                <div class="panel-heading"><h3 class="panel-title">{{ __('user.edit') }}</h3></div>
                 <div class="panel-body">
-                    {!! FormField::text('name', ['label' => trans('user.name')]) !!}
-                    {!! FormField::text('nickname', ['label' => trans('user.nickname')]) !!}
+                    {!! FormField::text('name', ['label' => __('user.name')]) !!}
+                    {!! FormField::text('nickname', ['label' => __('user.nickname')]) !!}
                     <div class="row">
-                        <div class="col-md-6">{!! FormField::radios('gender_id', [1 => trans('app.male_code'), trans('app.female_code')], ['label' => trans('user.gender')]) !!}</div>
+                        <div class="col-md-6">{!! FormField::radios('gender_id', [1 => __('app.male_code'), __('app.female_code')], ['label' => __('user.gender')]) !!}</div>
                         <div class="col-md-4">
-                            {!! FormField::text('birth_order', ['label' => trans('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
+                            {!! FormField::text('birth_order', ['label' => __('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-6">{!! FormField::text('yob', ['label' => trans('user.yob'), 'placeholder' => trans('app.example').' 1959']) !!}</div>
-                        <div class="col-md-6">{!! FormField::text('dob', ['label' => trans('user.dob'), 'placeholder' => trans('app.example').' 1959-07-20']) !!}</div>
+                        <div class="col-md-6">{!! FormField::text('yob', ['label' => __('user.yob'), 'placeholder' => __('app.example').' 1959']) !!}</div>
+                        <div class="col-md-6">{!! FormField::text('dob', ['label' => __('user.dob'), 'placeholder' => __('app.example').' 1959-07-20']) !!}</div>
                     </div>
                     <div class="row">
-                        <div class="col-md-6">{!! FormField::text('yod', ['label' => trans('user.yod'), 'placeholder' => trans('app.example').' 2003']) !!}</div>
-                        <div class="col-md-6">{!! FormField::text('dod', ['label' => trans('user.dod'), 'placeholder' => trans('app.example').' 2003-10-17']) !!}</div>
+                        <div class="col-md-6">{!! FormField::text('yod', ['label' => __('user.yod'), 'placeholder' => __('app.example').' 2003']) !!}</div>
+                        <div class="col-md-6">{!! FormField::text('dod', ['label' => __('user.dod'), 'placeholder' => __('app.example').' 2003-10-17']) !!}</div>
                     </div>
                 </div>
             </div>
         </div>
         <div class="col-md-4">
             <div class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title">{{ trans('app.address') }} &amp; {{ trans('app.contact') }}</h3></div>
+                <div class="panel-heading"><h3 class="panel-title">{{ __('app.address') }} &amp; {{ __('app.contact') }}</h3></div>
                 <div class="panel-body">
-                    {!! FormField::textarea('address', ['label' => trans('app.address')]) !!}
-                    {!! FormField::text('city', ['label' => trans('app.city'), 'placeholder' => trans('app.example').' Jakarta']) !!}
-                    {!! FormField::text('phone', ['label' => trans('app.phone'), 'placeholder' => trans('app.example').' 081234567890']) !!}
+                    {!! FormField::textarea('address', ['label' => __('app.address')]) !!}
+                    {!! FormField::text('city', ['label' => __('app.city'), 'placeholder' => __('app.example').' Jakarta']) !!}
+                    {!! FormField::text('phone', ['label' => __('app.phone'), 'placeholder' => __('app.example').' 081234567890']) !!}
                 </div>
             </div>
             <div class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title">{{ trans('app.login_account') }}</h3></div>
+                <div class="panel-heading"><h3 class="panel-title">{{ __('app.login_account') }}</h3></div>
                 <div class="panel-body">
-                    {!! FormField::email('email', ['label' => trans('auth.email'), 'placeholder' => trans('app.example').' nama@mail.com']) !!}
-                    {!! FormField::password('password', ['label' => trans('auth.password'), 'placeholder' => '******', 'value' => '']) !!}
+                    {!! FormField::email('email', ['label' => __('auth.email'), 'placeholder' => __('app.example').' nama@mail.com']) !!}
+                    {!! FormField::password('password', ['label' => __('auth.password'), 'placeholder' => '******', 'value' => '']) !!}
                 </div>
             </div>
             <div class="text-right">
-                {{ Form::submit(trans('app.update'), ['class' => 'btn btn-primary']) }}
-                {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default']) }}
+                {{ Form::submit(__('app.update'), ['class' => 'btn btn-primary']) }}
+                {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default']) }}
             </div>
         </div>
         {{ Form::close() }}
@@ -116,7 +116,7 @@
                 </div>
                 <div class="panel-footer">
                     {!! Form::submit(__('user.update_photo'), ['class' => 'btn btn-success']) !!}
-                    {{ link_to_route('users.show', trans('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
+                    {{ link_to_route('users.show', __('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
                 </div>
                 {{ Form::close() }}
             </div>