DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #15357 from snipe/tighten_category_view_translations

Browse source 
Fixed #15330 - Cleaned up category title
This commit is contained in:
snipe 2024-08-21 10:41:17 +01:00 committed by GitHub
parent d0acf5b8a6 26b3c62ab8
commit 7e475a0786
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en-US/general.php
View file

@ -559,7 +559,6 @@ return [
'expires' => 'Expires', 'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field', 'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining', 'remaining_var' => ':count Remaining',
'assets_in_var' => 'Assets in :name :type',
'label' => 'Label', 'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.', 'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',

19
resources/views/categories/view.blade.php
View file

@ -3,7 +3,7 @@
{{-- Page title --}} {{-- Page title --}}
@section('title') @section('title')
{{ trans('general.assets_in_var', ['name'=> $category->name, 'type' => trans('general.category')]) }} {{ $category->name }}
@parent @parent
@stop @stop
@ -36,7 +36,19 @@
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"> <li class="active">
<a href="#items" data-toggle="tab" title="{{ trans('general.items') }}"> {{ ucwords($category_type_route) }} <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}">
@if ($category->category_type=='asset')
{{ trans('general.assets') }}
@elseif ($category->category_type=='accessory')
{{ trans('general.accessories') }}
@elseif ($category->category_type=='license')
{{ trans('general.licenses') }}
@elseif ($category->category_type=='consumable')
{{ trans('general.consumables') }}
@elseif ($category->category_type=='component')
{{ trans('general.components') }}
@endif
@if ($category->category_type=='asset') @if ($category->category_type=='asset')
<badge class="badge badge-secondary"> {{ $category->showableAssets()->count() }}</badge> <badge class="badge badge-secondary"> {{ $category->showableAssets()->count() }}</badge>
@endif @endif
@ -44,7 +56,8 @@
</li> </li>
@if ($category->category_type=='asset') @if ($category->category_type=='asset')
<li> <li>
<a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }} <a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">
{{ trans('general.asset_models') }}
<badge class="badge badge-secondary"> {{ $category->models->count()}}</badge> <badge class="badge badge-secondary"> {{ $category->models->count()}}</badge>
</a> </a>
</li> </li>