Skip to content

Commit 978620e

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request #29 from jeremykenedy/lang-fix
Lang fix
2 parents c60100c + 2ad93f2 commit 978620e

File tree

6 files changed

+63
-55
lines changed

6 files changed

+63
-55
lines changed

‎.env.travis‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ LARAVEL_LOGGER_ROLES_ENABLED=false
4040
LARAVEL_LOGGER_ROLES_MIDDLWARE=role:admin
4141
LARAVEL_LOGGER_ROLE_MODEL=jeremykenedy\LaravelRoles\Models\Role
4242
LARAVEL_LOGGER_MIDDLEWARE_ENABLED=true
43+
LARAVEL_LOGGER_MIDDLEWARE_EXCEPT=ignore1pattern1,ignorepattern2
4344
LARAVEL_LOGGER_USER_MODEL=App\Models\User
4445
LARAVEL_LOGGER_PAGINATION_ENABLED=true
4546
LARAVEL_LOGGER_PAGINATION_PER_PAGE=25
@@ -59,3 +60,6 @@ LARAVEL_LOGGER_FONT_AWESOME_CDN_URL=https://maxcdn.bootstrapcdn.com/font-awesome
5960
LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
6061
LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
6162
LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js
63+
LARAVEL_LOGGER_BLADE_PLACEMENT=yield
64+
LARAVEL_LOGGER_BLADE_PLACEMENT_CSS=template_linked_css
65+
LARAVEL_LOGGER_BLADE_PLACEMENT_JS=footer_scripts

‎src/.env.example‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ LARAVEL_LOGGER_ROLES_ENABLED=true
44
LARAVEL_LOGGER_ROLES_MIDDLWARE=role:admin
55
LARAVEL_LOGGER_ROLE_MODEL=jeremykenedy\LaravelRoles\Models\Role
66
LARAVEL_LOGGER_MIDDLEWARE_ENABLED=true
7+
LARAVEL_LOGGER_MIDDLEWARE_EXCEPT=ignore1pattern1,ignorepattern2
78
LARAVEL_LOGGER_USER_MODEL=App\Models\User
89
LARAVEL_LOGGER_PAGINATION_ENABLED=true
910
LARAVEL_LOGGER_PAGINATION_PER_PAGE=25
@@ -23,3 +24,6 @@ LARAVEL_LOGGER_FONT_AWESOME_CDN_URL=https://maxcdn.bootstrapcdn.com/font-awesome
2324
LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
2425
LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
2526
LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js
27+
LARAVEL_LOGGER_BLADE_PLACEMENT=yield
28+
LARAVEL_LOGGER_BLADE_PLACEMENT_CSS=template_linked_css
29+
LARAVEL_LOGGER_BLADE_PLACEMENT_JS=footer_scripts

‎src/resources/views/logger/activity-log-cleared.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838

3939
@section('template_title')
40-
@lang('LaravelLogger::laravel-logger.dashboardCleared.title')
40+
{{ trans('LaravelLogger::laravel-logger.dashboardCleared.title') }}
4141
@endsection
4242

4343
@php
@@ -70,24 +70,24 @@
7070
<div class="{{ $containerHeaderClass }}">
7171
<div style="display: flex; justify-content: space-between; align-items: center;">
7272
<span>
73-
@lang('LaravelLogger::laravel-logger.dashboardCleared.title')
73+
{!! trans('LaravelLogger::laravel-logger.dashboardCleared.title') !!}
7474
<sup class="label">
75-
{{ $totalActivities }} @lang('LaravelLogger::laravel-logger.dashboardCleared.subtitle')
75+
{{ $totalActivities }} {!! trans('LaravelLogger::laravel-logger.dashboardCleared.subtitle') !!}
7676
</sup>
7777
</span>
7878
<div class="btn-group pull-right btn-group-xs">
7979
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
8080
<i class="fa fa-ellipsis-v fa-fw" aria-hidden="true"></i>
8181
<span class="sr-only">
82-
@lang('LaravelLogger::laravel-logger.dashboard.menu.alt')
82+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.alt') !!}
8383
</span>
8484
</button>
8585
@if(config('LaravelLogger.bootstapVersion') == '4')
8686
<div class="dropdown-menu dropdown-menu-right">
8787
<a href="{{route('activity')}}" class="dropdown-item">
8888
<span class="text-primary">
8989
<i class="fa fa-fw fa-mail-reply" aria-hidden="true"></i>
90-
@lang('LaravelLogger::laravel-logger.dashboard.menu.back')
90+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.back') !!}
9191
</span>
9292
</a>
9393
@if($totalActivities)
@@ -101,7 +101,7 @@
101101
<a href="{{route('activity')}}">
102102
<span class="text-primary">
103103
<i class="fa fa-fw fa-mail-reply" aria-hidden="true"></i>
104-
@lang('LaravelLogger::laravel-logger.dashboard.menu.back')
104+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.back') !!}
105105
</span>
106106
</a>
107107
</li>
@@ -129,4 +129,4 @@
129129
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmDelete', 'modalClass' => 'danger', 'actionBtnIcon' => 'fa-trash-o'])
130130
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmRestore', 'modalClass' => 'success', 'actionBtnIcon' => 'fa-check'])
131131

132-
@endsection
132+
@endsection

‎src/resources/views/logger/activity-log-item.blade.php‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@endif
3030

3131
@section('template_title')
32-
@lang('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id])
32+
{{ trans('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id]) }}
3333
@endsection
3434

3535
@php
@@ -162,10 +162,10 @@
162162
<div class="panel @if($isClearedEntry) panel-danger @else panel-default @endif">
163163
<div class="{{ $containerClass }} @if($isClearedEntry) panel-danger @else panel-default @endif">
164164
<div class="{{ $containerHeaderClass }} @if($isClearedEntry) bg-danger text-white @else @endif" >
165-
@lang('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id])
165+
{!! trans('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id]) !!}
166166
<a href="@if($isClearedEntry) {{route('cleared')}} @else {{route('activity')}} @endif" class="btn @if($isClearedEntry) btn-default @else btn-info @endif btn-sm pull-right">
167167
<i class="fa fa-fw fa-mail-reply" aria-hidden="true"></i>
168-
@lang('LaravelLogger::laravel-logger.drilldown.buttons.back')
168+
{!! trans('LaravelLogger::laravel-logger.drilldown.buttons.back') !!}
169169
</a>
170170
</div>
171171
<div class="{{ $containerBodyClass }}">
@@ -176,24 +176,24 @@
176176
<div class="col-md-6 col-lg-4">
177177
<ul class="list-group">
178178
<li class="list-group-item @if($isClearedEntry) list-group-item-danger @else active @endif">
179-
@lang('LaravelLogger::laravel-logger.drilldown.title-details')
179+
{!! trans('LaravelLogger::laravel-logger.drilldown.title-details') !!}
180180
</li>
181181
<li class="list-group-item">
182182
<dl class="dl-horizontal">
183-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.id')</dt>
183+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.id') !!}</dt>
184184
<dd>{{$activity->id}}</dd>
185185

186-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.description')</dt>
186+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.description') !!}</dt>
187187
<dd>{{$activity->description}}</dd>
188188

189-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.route')</dt>
189+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.route') !!}</dt>
190190
<dd>
191191
<a href="@if($activity->route != '/')/@endif{{$activity->route}}">
192192
{{$activity->route}}
193193
</a>
194194
</dd>
195195

196-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.agent')</dt>
196+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.agent') !!}</dt>
197197
<dd>
198198
<i class="fa {{ $platformIcon }} fa-fw" aria-hidden="true">
199199
<span class="sr-only">
@@ -212,29 +212,29 @@
212212
</sup>
213213
</dd>
214214

215-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.locale')</dt>
215+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.locale') !!}</dt>
216216
<dd>
217217
{{ $langDetails }}
218218
</dd>
219219

220-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.referer')</dt>
220+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.referer') !!}</dt>
221221
<dd>
222222
<a href="{{ $activity->referer }}">
223223
{{ $activity->referer }}
224224
</a>
225225
</dd>
226226

227-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.methodType')</dt>
227+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.methodType') !!}</dt>
228228
<dd>
229229
<span class="badge badge-{{$methodClass}}">
230230
{{ $activity->methodType }}
231231
</span>
232232
</dd>
233233

234-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.timePassed')</dt>
234+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.timePassed') !!}</dt>
235235
<dd>{{$timePassed}}</dd>
236236

237-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.createdAt')</dt>
237+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.createdAt') !!}</dt>
238238
<dd>{{$activity->created_at}}</dd>
239239

240240
</dl>
@@ -246,11 +246,11 @@
246246
<div class="col-md-6 col-lg-4">
247247
<ul class="list-group">
248248
<li class="list-group-item @if($isClearedEntry) list-group-item-danger @else active @endif">
249-
@lang('LaravelLogger::laravel-logger.drilldown.title-ip-details')
249+
{!! trans('LaravelLogger::laravel-logger.drilldown.title-ip-details') !!}
250250
</li>
251251
<li class="list-group-item">
252252
<dl class="dl-horizontal">
253-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.ip')</dt>
253+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.ip') !!}</dt>
254254
<dd>{{$activity->ipAddress}}</dd>
255255
@if($ipAddressDetails)
256256
@foreach($ipAddressDetails as $ipAddressDetailKey => $ipAddressDetailValue)
@@ -273,11 +273,11 @@
273273
<div class="col-md-12 col-lg-4">
274274
<ul class="list-group">
275275
<li class="list-group-item @if($isClearedEntry) list-group-item-danger @else active @endif">
276-
@lang('LaravelLogger::laravel-logger.drilldown.title-user-details')
276+
{!! trans('LaravelLogger::laravel-logger.drilldown.title-user-details') !!}
277277
</li>
278278
<li class="list-group-item">
279279
<dl class="dl-horizontal">
280-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userType')</dt>
280+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userType') !!}</dt>
281281
<dd>
282282
<span class="badge badge-{{$userTypeClass}}">
283283
{{$activity->userType}}
@@ -286,12 +286,12 @@
286286

287287
@if($userDetails)
288288

289-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userId')</dt>
289+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userId') !!}</dt>
290290
<dd>{{$userDetails->id}}</dd>
291291

292292
@if(config('LaravelLogger.rolesEnabled'))
293293

294-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.labels.userRoles')</dt>
294+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.labels.userRoles') !!}</dt>
295295

296296
@foreach ($userDetails->roles as $user_role)
297297

@@ -311,7 +311,7 @@
311311

312312
<dd>
313313
<span class="badge badge-{{$labelClass}}">
314-
{{ $user_role->name }} - @lang('LaravelLogger::laravel-logger.drilldown.labels.userLevel') {{ $user_role->level }}
314+
{{ $user_role->name }} - {!! trans('LaravelLogger::laravel-logger.drilldown.labels.userLevel') !!} {{ $user_role->level }}
315315
</span>
316316
</dd>
317317

@@ -320,30 +320,30 @@
320320
@endif
321321

322322

323-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userName')</dt>
323+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userName') !!}</dt>
324324
<dd>{{$userDetails->name}}</dd>
325325

326-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userEmail')</dt>
326+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userEmail') !!}</dt>
327327
<dd>
328328
<a href="mailto:{{$userDetails->email}}">
329329
{{$userDetails->email}}
330330
</a>
331331
</dd>
332332

333333
@if($userDetails->last_name || $userDetails->first_name)
334-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userFulltName')</dt>
334+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userFulltName') !!}</dt>
335335
<dd>{{$userDetails->last_name}}, {{$userDetails->first_name}}</dd>
336336
@endif
337337

338338
@if($userDetails->signup_ip_address)
339-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userSignupIp')</dt>
339+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userSignupIp') !!}</dt>
340340
<dd>{{$userDetails->signup_ip_address}}</dd>
341341
@endif
342342

343-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userCreatedAt')</dt>
343+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userCreatedAt') !!}</dt>
344344
<dd>{{$userDetails->created_at}}</dd>
345345

346-
<dt>@lang('LaravelLogger::laravel-logger.drilldown.list-group.labels.userUpdatedAt')</dt>
346+
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userUpdatedAt') !!}</dt>
347347
<dd>{{$userDetails->updated_at}}</dd>
348348

349349
@endif
@@ -364,9 +364,9 @@
364364
<div class="col-xs-12 col-12">
365365
<ul class="list-group">
366366
<li class="list-group-item list-group-item-info">
367-
@lang('LaravelLogger::laravel-logger.drilldown.title-user-activity')
367+
{!! trans('LaravelLogger::laravel-logger.drilldown.title-user-activity') !!}
368368
<span class="badge">
369-
{{ $totalUserActivities }} @lang('LaravelLogger::laravel-logger.dashboard.subtitle')
369+
{{ $totalUserActivities }} {!! trans('LaravelLogger::laravel-logger.dashboard.subtitle') !!}
370370
</span>
371371
</li>
372372
<li class="list-group-item">
@@ -381,4 +381,4 @@
381381
</div>
382382
</div>
383383
</div>
384-
@endsection
384+
@endsection

0 commit comments

Comments
 (0)