Merge pull request #1 from snipe/develop

A couple hardcoded strings replaced in according with snipe#6406 (snipe#6412)
jackka · Nov 9, 2018 · f472647 · f472647
2 parents b6daad7 + dd7db95
commit f472647
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -30,6 +30,7 @@
     'bulkaudit'             => 'Bulk Audit',
     'bulkaudit_status'      => 'Audit Status',
     'bulk_checkout'  		=> 'Bulk Checkout',
+    'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
     'category'				=> 'Category',
@@ -214,6 +215,7 @@
     'declined'			    => 'declined',
     'unaccepted_asset_report' => 'Unaccepted Assets',
     'users'                 => 'Users',
+    'viewall'				=> 'View All',
     'viewassets'  			=> 'View Assigned Assets',
     'website'               => 'Website',
     'welcome'				=> 'Welcome, :name',

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
@@ -200,7 +200,7 @@ class="table table-striped snipe-table"
             </div><!-- /.responsive -->
           </div><!-- /.col -->
           <div class="col-md-12 text-center" style="padding-top: 10px;">
-            <a href="{{ route('reports.activity') }}" class="btn btn-primary btn-sm" style="width: 100%">View All</a>
+            <a href="{{ route('reports.activity') }}" class="btn btn-primary btn-sm" style="width: 100%">{{ trans('general.viewall') }}</a>
           </div>
         </div><!-- /.row -->
       </div><!-- ./box-body -->
@@ -212,7 +212,7 @@ class="table table-striped snipe-table"
     <div class="col-md-6">
         <div class="box box-default">
             <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('general.assets') }} by Status</h3>
+                <h3 class="box-title">{{ trans('general.assets') }} {{ trans('general.bystatus') }} </h3>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
                     </button>
@@ -272,7 +272,7 @@ class="table table-striped snipe-table"
                         </div>
                     </div> <!-- /.col -->
                     <div class="col-md-12 text-center" style="padding-top: 10px;">
-                        <a href="{{ route('categories.index') }}" class="btn btn-primary btn-sm" style="width: 100%">View All</a>
+                        <a href="{{ route('categories.index') }}" class="btn btn-primary btn-sm" style="width: 100%">{{ trans('general.viewall') }}</a>
                     </div>
                 </div> <!-- /.row -->