diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index 6f7840170f8b..d8b2c083616b 100644
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -82,14 +82,19 @@
@if ($asset->depreciation)
@lang('admin/hardware/form.depreciation'):
{{ $asset->depreciation->name }}
- ({{ $asset->depreciation->months }} months)
+ ({{ $asset->depreciation->months }}
+ @lang('admin/hardware/form.months')
+ )
@lang('admin/hardware/form.depreciates_on'):
{{ $asset->depreciated_date() }}
@lang('admin/hardware/form.fully_depreciated'):
{{ $asset->months_until_depreciated()->m }}
- @lang('admin/hardware/form.months'),
- {{ $asset->months_until_depreciated()->y }}
- @lang('admin/hardware/form.years')
+ @lang('admin/hardware/form.months')
+ @if ($asset->months_until_depreciated()->y > 0)
+ , {{ $asset->months_until_depreciated()->y }}
+ @lang('admin/hardware/form.years')
+ @endif
+
@endif
@if ($asset->model->eol)
@@ -99,8 +104,15 @@
@lang('admin/hardware/form.eol_date'):
{{ $asset->eol_date() }}
@if ($asset->months_until_eol())
- ({{ $asset->months_until_eol()->y }} years,
- {{ $asset->months_until_eol()->m }} months)
+ (
+ @if ($asset->months_until_eol()->y > 0)
+ {{ $asset->months_until_eol()->y }}
+ @lang('admin/hardware/form.years'),
+ @endif
+
+ {{ $asset->months_until_eol()->m }}
+ @lang('admin/hardware/form.months')
+ )
@endif
@endif