From 28544ae4ebaf7d8b73b8105c24687d6378ed5ab3 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 29 Nov 2020 20:16:43 +0800 Subject: [PATCH] Change trans helper to __() --- resources/views/bank-accounts/forms.blade.php | 56 +++++++++++----------- resources/views/customers/edit.blade.php | 12 ++--- resources/views/customers/index.blade.php | 26 +++++----- .../views/invoices/partials/item-list.blade.php | 10 ++-- resources/views/options/index.blade.php | 16 +++---- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/resources/views/bank-accounts/forms.blade.php b/resources/views/bank-accounts/forms.blade.php index e9552f5..83b5753 100644 --- a/resources/views/bank-accounts/forms.blade.php +++ b/resources/views/bank-accounts/forms.blade.php @@ -1,66 +1,66 @@ -@if (Request::get('action') == 'create') +@if (request('action') == 'create')
-

{{ trans('bank_account.create') }}

+

{{ __('bank_account.create') }}

{!! Form::open(['route' => 'bank-accounts.store']) !!}
- {!! FormField::text('name', ['required' => true, 'label' => trans('bank_account.name')]) !!} - {!! FormField::text('number', ['required' => true, 'label' => trans('bank_account.number')]) !!} - {!! FormField::text('account_name', ['required' => true, 'label' => trans('bank_account.account_name')]) !!} - {!! FormField::textarea('description', ['label' => trans('bank_account.description')]) !!} + {!! FormField::text('name', ['required' => true, 'label' => __('bank_account.name')]) !!} + {!! FormField::text('number', ['required' => true, 'label' => __('bank_account.number')]) !!} + {!! FormField::text('account_name', ['required' => true, 'label' => __('bank_account.account_name')]) !!} + {!! FormField::textarea('description', ['label' => __('bank_account.description')]) !!}
- {!! Form::submit(trans('bank_account.create'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('bank-accounts.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} + {!! Form::submit(__('bank_account.create'), ['class' => 'btn btn-success']) !!} + {{ link_to_route('bank-accounts.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
{!! Form::close() !!}
@endif -@if (Request::get('action') == 'edit' && $editableBankAccount) +@if (request('action') == 'edit' && $editableBankAccount)
-

{{ trans('bank_account.edit') }}

- {!! Form::model($editableBankAccount, ['route' => ['bank-accounts.update', request('id')], 'method' => 'patch']) !!} +

{{ __('bank_account.edit') }}

+ {!! Form::model($editableBankAccount, ['route' => ['bank-accounts.update', $editableBankAccount->id], 'method' => 'patch']) !!}
- {!! FormField::text('name', ['required' => true, 'label' => trans('bank_account.name')]) !!} - {!! FormField::text('number', ['required' => true, 'label' => trans('bank_account.number')]) !!} - {!! FormField::text('account_name', ['required' => true, 'label' => trans('bank_account.account_name')]) !!} - {!! FormField::textarea('description', ['label' => trans('bank_account.description')]) !!} + {!! FormField::text('name', ['required' => true, 'label' => __('bank_account.name')]) !!} + {!! FormField::text('number', ['required' => true, 'label' => __('bank_account.number')]) !!} + {!! FormField::text('account_name', ['required' => true, 'label' => __('bank_account.account_name')]) !!} + {!! FormField::textarea('description', ['label' => __('bank_account.description')]) !!} {!! FormField::radios('is_active', [__('app.in_active'), __('app.active')], ['label' => __('app.status')]) !!}
- {!! Form::submit(trans('bank_account.update'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('bank-accounts.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} + {!! Form::submit(__('bank_account.update'), ['class' => 'btn btn-success']) !!} + {{ link_to_route('bank-accounts.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
{!! Form::close() !!}
@endif -@if (Request::get('action') == 'delete' && $editableBankAccount) +@if (request('action') == 'delete' && $editableBankAccount)
-

{{ trans('bank_account.delete') }}

+

{{ __('bank_account.delete') }}

- +

{{ $editableBankAccount->name }}

- +

{{ $editableBankAccount->number }}

- +

{{ $editableBankAccount->account_name }}

- +

{{ $editableBankAccount->description }}

{!! $errors->first('bank_account_id', ':message') !!}
-
{{ trans('app.delete_confirm') }}
+
{{ __('app.delete_confirm') }}
{!! FormField::delete( - ['route'=>['bank-accounts.destroy', request('id')]], - trans('app.delete_confirm_button'), + ['route'=>['bank-accounts.destroy', $editableBankAccount->id]], + __('app.delete_confirm_button'), ['class'=>'btn btn-danger'], [ - 'bank_account_id' => request('id'), + 'bank_account_id' => $editableBankAccount->id, 'page' => request('page'), 'q' => request('q'), ] ) !!} - {{ link_to_route('bank-accounts.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} + {{ link_to_route('bank-accounts.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
@endif diff --git a/resources/views/customers/edit.blade.php b/resources/views/customers/edit.blade.php index 87c5c8c..3603355 100644 --- a/resources/views/customers/edit.blade.php +++ b/resources/views/customers/edit.blade.php @@ -1,13 +1,13 @@ @extends('layouts.app') -@section('title', trans('customer.edit').' '.$customer->name) +@section('title', __('customer.edit').' '.$customer->name) @section('content')

- {{ link_to_route('customers.show', trans('customer.back_to_show'), [$customer->id], ['class' => 'btn btn-default']) }} + {{ link_to_route('customers.show', __('customer.back_to_show'), [$customer->id], ['class' => 'btn btn-default']) }}
- {{ $customer->name }} {{ trans('customer.edit') }} + {{ $customer->name }} {{ __('customer.edit') }}

@if (Request::has('action')) @@ -40,9 +40,9 @@
- {!! Form::submit(trans('customer.update'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('customers.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} - {!! link_to_route('customers.edit', trans('app.delete'), [$customer->id, 'action' => 'delete'], [ + {!! Form::submit(__('customer.update'), ['class' => 'btn btn-success']) !!} + {{ link_to_route('customers.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }} + {!! link_to_route('customers.edit', __('app.delete'), [$customer->id, 'action' => 'delete'], [ 'id' => 'del-customer-'.$customer->id, 'class' => 'btn btn-link pull-right' ] ) !!} diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php index 277f52b..927bea4 100644 --- a/resources/views/customers/index.blade.php +++ b/resources/views/customers/index.blade.php @@ -1,33 +1,33 @@ @extends('layouts.app') -@section('title', trans('customer.list')) +@section('title', __('customer.list')) @section('content')

- {{ link_to_route('customers.create', trans('customer.create'), [], ['class' => 'btn btn-success']) }} + {{ link_to_route('customers.create', __('customer.create'), [], ['class' => 'btn btn-success']) }}
- {{ trans('customer.list') }} - {{ trans('app.total') }} : {{ $customers->total() }} {{ trans('customer.customer') }} + {{ __('customer.list') }} + {{ __('app.total') }} : {{ $customers->total() }} {{ __('customer.customer') }}

{{ Form::open(['method' => 'get', 'class' => 'form-inline']) }} - {!! FormField::text('q', ['value' => request('q'), 'label' => trans('customer.search'), 'class' => 'input-sm']) !!} - {{ Form::submit(trans('customer.search'), ['class' => 'btn btn-sm']) }} - {{ link_to_route('customers.index', trans('app.reset')) }} + {!! FormField::text('q', ['value' => request('q'), 'label' => __('customer.search'), 'class' => 'input-sm']) !!} + {{ Form::submit(__('customer.search'), ['class' => 'btn btn-sm']) }} + {{ link_to_route('customers.index', __('app.reset')) }} {{ Form::close() }}
- - - - - - + + + + + + diff --git a/resources/views/invoices/partials/item-list.blade.php b/resources/views/invoices/partials/item-list.blade.php index 8678b82..f71f340 100644 --- a/resources/views/invoices/partials/item-list.blade.php +++ b/resources/views/invoices/partials/item-list.blade.php @@ -1,7 +1,7 @@

- {{ trans('invoice.items') }} + {{ __('invoice.items') }}

{{ trans('app.table_no') }}{{ trans('customer.name') }}{{ trans('contact.email') }}{{ trans('contact.phone') }}{{ trans('customer.projects_count') }}{{ trans('app.status') }}{{ __('app.table_no') }}{{ __('customer.name') }}{{ __('contact.email') }}{{ __('contact.phone') }}{{ __('customer.projects_count') }}{{ __('app.status') }}
@@ -56,7 +56,7 @@ {{ Form::close() }} - + diff --git a/resources/views/options/index.blade.php b/resources/views/options/index.blade.php index 9e18e63..7759b25 100755 --- a/resources/views/options/index.blade.php +++ b/resources/views/options/index.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') -

{{ trans('option.list') }}

+

{{ __('option.list') }}

@@ -24,7 +24,7 @@
{!! FormField::textarea( 'new_item_description', - ['id' => 'new_item_description', 'label' => false, 'placeholder' => trans('invoice.item_description')] + ['id' => 'new_item_description', 'label' => false, 'placeholder' => __('invoice.item_description')] ) !!} @@ -65,18 +65,18 @@ [ 'id' => 'new_item_amount', 'label' => false, - 'placeholder' => trans('invoice.item_amount'), + 'placeholder' => __('invoice.item_amount'), 'currency' => Option::get('money_sign', 'Rp') ] ) !!} - {{ Form::submit(trans('invoice.add_item'), ['class' => 'btn btn-primary btn-block']) }} + {{ Form::submit(__('invoice.add_item'), ['class' => 'btn btn-primary btn-block']) }}
{{ trans('invoice.amount') }} :{{ __('invoice.amount') }} : {{ format_money(collect($invoice->items)->sum('amount')) }}
- {!! Form::submit(trans('app.update'), ['class' => 'btn btn-warning']) !!} + {!! Form::submit(__('app.update'), ['class' => 'btn btn-warning']) !!}
{!! Form::close() !!}
@@ -32,9 +32,9 @@
@if (Request::get('action') == 'del' && $editableOption)
-

{{ trans('option.delete') }}

+

{{ __('option.delete') }}

-

{{ trans('app.delete_confirm') }}

+

{{ __('app.delete_confirm') }}

@@ -42,20 +42,20 @@
{{ str_split_ucwords($editableOption->key) }}{{ $editableOption->value }}
- {!! FormField::delete(['route' => ['options.destroy',$editableOption->id]], trans('app.delete'), ['class' => 'btn btn-danger'], ['option_id' => $option->id]) !!} - {{ link_to_route('options.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} + {!! FormField::delete(['route' => ['options.destroy',$editableOption->id]], __('app.delete'), ['class' => 'btn btn-danger'], ['option_id' => $option->id]) !!} + {{ link_to_route('options.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
@endif {!! Form::open(['route' => 'options.store']) !!}
-

{{ trans('option.create') }}

+

{{ __('option.create') }}

{!! FormField::text('key') !!} {!! FormField::textarea('value') !!}
- {!! Form::submit(trans('app.add'), ['class' => 'btn btn-primary']) !!} + {!! Form::submit(__('app.add'), ['class' => 'btn btn-primary']) !!}
{!! Form::close() !!}