From 7559f5836b738e8717e7b1aebf2144b77a2d540b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Mar 2015 20:10:38 -0700 Subject: [PATCH] Language strings for table headers --- app/config/version.php | 4 ++-- app/views/backend/hardware/index.blade.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/version.php b/app/config/version.php index bda9aa6457..d85f2518e6 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-6', - 'hash_version' => 'v1.2.6.1-6-g84affba', + 'app_version' => 'v1.2.6.1-7', + 'hash_version' => 'v1.2.6.1-7-g482c288', ); \ No newline at end of file diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index ec9f18b769..ac973fb60b 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -52,7 +52,7 @@ {{ Datatable::table() - ->addColumn('name', 'asset_tag', 'serial', 'status','model','eol','checkedout_on') + ->addColumn(Lang::get('admin/hardware/form.name'), Lang::get('admin/hardware/table.asset_tag'), Lang::get('admin/hardware/table.serial'), Lang::get('admin/hardware/table.status'),Lang::get('admin/hardware/form.model'),Lang::get('admin/hardware/table.eol'),'checkedout_on') ->setUrl(route('api.hardware')) // this is the route where data will be retrieved ->setOptions( array(