From c0e93930923a0f43ca8066daf7ad8091ae75d2e3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 6 May 2022 01:30:58 -0700
Subject: [PATCH 1/2] Fixed #10890 - use translation strings in user asset
 printout

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/general.php         |  1 +
 resources/views/users/print.blade.php | 32 +++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 0e38b2193..219334b2c 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -229,6 +229,7 @@
     'show_current'  		=> 'Show Current',
     'sign_in'				=> 'Sign in',
     'signature'             => 'Signature',
+    'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'slack_msg_note'        => 'A slack message will be sent',
     'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index b218bc74d..c017cf208 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -64,11 +64,11 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 20%;">Asset Tag</th>
-                <th style="width: 20%;">Name</th>
-                <th style="width: 10%;">Category</th>
-                <th style="width: 20%;">Model</th>
-                <th style="width: 20%;">Serial</th>
+                <th style="width: 20%;">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                <th style="width: 20%;">{{ trans('general.name') }}</th>
+                <th style="width: 10%;">{{ trans('general.category') }}</th>
+                <th style="width: 20%;">{{ trans('admin/hardware/form.model') }}</th>
+                <th style="width: 20%;">{{ trans('admin/hardware/form.serial') }}</th>
                 <th style="width: 10%;">Checked Out</th>
                 <th data-formatter="imageFormatter" style="width: 20%;">{{ trans('general.signature') }}</th>
             </tr>
@@ -131,9 +131,9 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 40%;">Name</th>
-                <th style="width: 50%;">Serial/Product Key</th>
-                <th style="width: 10%;">Checked Out</th>
+                <th style="width: 40%;">{{ trans('general.name') }}</th>
+                <th style="width: 50%;">{{ trans('admin/licenses/form.license_key') }}</th>
+                <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
             </tr>
         </thead>
         @php
@@ -173,9 +173,9 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 40%;">Name</th>
-                <th style="width: 50%;">Category</th>
-                <th style="width: 10%;">Checked Out</th>
+                <th style="width: 40%;">{{ trans('general.name') }}</th>
+                <th style="width: 50%;">{{ trans('general.category') }}</th>
+                <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
             </tr>
         </thead>
         @php
@@ -209,9 +209,9 @@
         <thead>
         <tr>
             <th style="width: 20px;"></th>
-            <th style="width: 40%;">Name</th>
-            <th style="width: 50%;">Category</th>
-            <th style="width: 10%;">Checked Out</th>
+            <th style="width: 40%;">{{ trans('general.name') }}</th>
+            <th style="width: 50%;">{{ trans('general.category') }}</th>
+            <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
         </tr>
         </thead>
         @php
@@ -247,10 +247,10 @@
 <br>
 <table>
     <tr>
-        <td>Signed Off By:</td>
+        <td>{{ trans('general.signed_off_by') }}:</td>
         <td>________________________________________________________</td>
         <td></td>
-        <td>Date:</td>
+        <td>{{ trans('general.date') }}:</td>
         <td>________________________________________________________</td>
     </tr>
 </table>

From 39ee825ba223f33782c20d75dc78cd872adf47ee Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 6 May 2022 01:32:20 -0700
Subject: [PATCH 2/2] Fixed html lang specification

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/print.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index c017cf208..54a0dc862 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>Assigned to {{ $show_user->present()->fullName() }}</title>