From 74653d34802d2ff45489c6bcdf55c167f85a6144 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 9 Jun 2014 19:56:47 -0400 Subject: [PATCH] More refactoring of language structure, language strings per #151 --- app/lang/en/admin/models/message.php | 1 + app/lang/en/admin/models/table.php | 2 ++ app/lang/en/admin/statuslabels/message.php | 1 + app/lang/en/general.php | 7 ++++++- app/views/backend/licenses/view.blade.php | 2 +- app/views/backend/models/edit.blade.php | 10 ++++----- app/views/backend/models/index.blade.php | 17 ++++++++------- app/views/backend/models/view.blade.php | 24 ++++++++++++++-------- app/views/backend/reports/index.blade.php | 2 +- 9 files changed, 42 insertions(+), 24 deletions(-) diff --git a/app/lang/en/admin/models/message.php b/app/lang/en/admin/models/message.php index 3b87420f8e2e..5944ea0aab8b 100755 --- a/app/lang/en/admin/models/message.php +++ b/app/lang/en/admin/models/message.php @@ -17,6 +17,7 @@ ), 'delete' => array( + 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', 'success' => 'The model was deleted successfully.' ) diff --git a/app/lang/en/admin/models/table.php b/app/lang/en/admin/models/table.php index 1ff40785be40..e19866d6c620 100755 --- a/app/lang/en/admin/models/table.php +++ b/app/lang/en/admin/models/table.php @@ -10,4 +10,6 @@ 'numassets' => 'Assets', 'title' => 'Asset Models', 'update' => 'Update Asset Model', + 'view' => 'View Asset Model', + 'update' => 'Update Model', ); diff --git a/app/lang/en/admin/statuslabels/message.php b/app/lang/en/admin/statuslabels/message.php index 626fb6bbfb10..c2b35e1fea3b 100755 --- a/app/lang/en/admin/statuslabels/message.php +++ b/app/lang/en/admin/statuslabels/message.php @@ -17,6 +17,7 @@ ), 'delete' => array( + 'confirm' => 'Are you sure you wish to delete this status label?', 'error' => 'There was an issue deleting the location. Please try again.', 'success' => 'The location was deleted successfully.' ) diff --git a/app/lang/en/general.php b/app/lang/en/general.php index 4cb8fd02f2fd..376ff8ad4471 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -13,6 +13,7 @@ 'back' => 'Back', 'cancel' => 'Cancel', 'categories' => 'Categories', + 'category' => 'Category', 'checkin' => 'Checkin', 'checkout' => 'Checkout', 'city' => 'City', @@ -24,11 +25,12 @@ 'date' => 'Date', 'delete' => 'Delete', 'deployed' => 'Deployed', - 'depreciation' => 'Depreciation', + 'depreciation_report' => 'Depreciation Report', 'depreciation' => 'Depreciation', 'eol' => 'EOL', 'first_name' => 'First Name', 'groups' => 'Groups', + 'history_for' => 'History for', 'id' => 'ID', 'last_name' => 'Last Name', 'license' => 'License', @@ -38,10 +40,13 @@ 'locations' => 'Locations', 'logout' => 'Logout', 'manufacturers' => 'Manufacturers', + 'manufacturer' => 'Manufacturer', + 'model_no' => 'Model No.', 'months' => 'months', 'moreinfo' => 'More Info', 'name' => 'Name', 'no_results' => 'No Results.', + 'no_depreciation' => 'No Derepciation', 'no' => 'No', 'pending' => 'Pending', 'people' => 'People', diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index 9a32cfd2f64c..868e59787963 100644 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -12,7 +12,7 @@
@lang('admin/licenses/form.update') -

@lang('admin/licenses/general.history_for') {{ $license->name }}

+

@lang('general.history_for') {{ $license->name }}

diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index 67a79fbecf8e..233f5953f104 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -45,7 +45,7 @@
- +
{{ $errors->first('modelno', ' :message') }} @@ -53,7 +53,7 @@
- +
{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ $errors->first('manufacturer_id', ' :message') }} @@ -62,7 +62,7 @@
- +
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ $errors->first('depreciation_id', ' :message') }} @@ -71,7 +71,7 @@
- +
{{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ $errors->first('category_id', ' :message') }} @@ -97,7 +97,7 @@
- Cancel + @lang('general.cancel')
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index b0a5a7d305cc..0467cbedff0c 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -12,7 +12,7 @@
@lang('general.create') -

Asset Models

+

@lang('admin/models/table.title')

@@ -23,9 +23,9 @@ @lang('admin/models/table.title') @lang('admin/models/table.modelnumber') @lang('admin/models/table.numassets') - Depreciation - Category - EOL + @lang('general.depreciation') + @lang('general.category') + @lang('general.eol') @lang('table.actions') @@ -41,7 +41,7 @@ {{ $model->depreciation->name }} ({{ $model->depreciation->months }} months) @else - No Depreciation + @lang('general.no_depreciation') @endif @@ -54,7 +54,8 @@ @if ($model->eol) - {{ $model->eol }} months + {{ $model->eol }} + @lang('general.months') @else -- @endif @@ -63,7 +64,9 @@ - + @endforeach diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index 68188f4d08ad..b6b6d71263a6 100644 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -2,7 +2,8 @@ {{-- Page title --}} @section('title') -View Model {{ $model->model_tag }} :: +@lang('admin/models/table.view') +{{ $model->model_tag }} :: @parent @stop @@ -11,8 +12,9 @@
- Update Model -

History for {{ $model->name }}

+ + @lang('admin/models/table.update') +

@lang('general.history_for') {{ $model->name }}

@@ -61,10 +63,10 @@ @else -
+
- There are no results for your query. + @lang('general.no_results')
@endif @@ -79,19 +81,23 @@ @if ($model->manufacturer) -
  • Manufacturer: {{ $model->manufacturer->name }}
    • +
  • @lang('general.manufacturer'): + {{ $model->manufacturer->name }}
    • @endif @if ($model->modelno) -
  • Model No.: {{ $model->modelno }}
    • +
  • @lang('general.model_no'): + {{ $model->modelno }}
    • @endif @if ($model->depreciation) -
  • Depreciation: {{ $model->depreciation->name }} ({{ $model->depreciation->months }} months)
    • +
  • @lang('general.depreciation'): + {{ $model->depreciation->name }} ({{ $model->depreciation->months }} months)
    • @endif @if ($model->eol) -
  • EOL: {{ $model->eol }} months
    • +
  • @lang('general.eol'): + {{ $model->eol }} months
    • @endif diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php index 8e1ff0f27412..81086da06e8d 100644 --- a/app/views/backend/reports/index.blade.php +++ b/app/views/backend/reports/index.blade.php @@ -17,7 +17,7 @@ @lang('admin/hardware/table.dl_csv')
    -

    Depreciation Report

    +

    @lang('general.depreciation_report')