DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11025 from snipe/fixes/missed_a_few_trans_strings

Browse source 
Fixed #10890 - Missed a few hard coded english strings
This commit is contained in:
snipe 2022-05-06 02:02:15 -07:00 committed by GitHub
parent 6304709c77 fba731ac1c
commit f91be34baf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/general.php
View file

@ -26,6 +26,7 @@
'audit' => 'Audit', 'audit' => 'Audit',
'audit_report' => 'Audit Log', 'audit_report' => 'Audit Log',
'assets' => 'Assets', 'assets' => 'Assets',
'assigned_to' => 'Assigned to :name',
'avatar_delete' => 'Delete Avatar', 'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar', 'avatar_upload' => 'Upload Avatar',
'back' => 'Back', 'back' => 'Back',

9
resources/views/users/print.blade.php
View file

@ -2,7 +2,7 @@
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Assigned to {{ $show_user->present()->fullName() }}</title> <title>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}</title>
<style> <style>
body { body {
font-family: "Arial, Helvetica", sans-serif; font-family: "Arial, Helvetica", sans-serif;
@ -49,7 +49,7 @@
@endif @endif
@endif @endif
<h2>Assigned to {{ $show_user->present()->fullName() }}</h4> <h2>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}</h4>
@if ($assets->count() > 0) @if ($assets->count() > 0)
@php @php
@ -69,7 +69,7 @@
<th style="width: 10%;">{{ trans('general.category') }}</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.model') }}</th>
<th style="width: 20%;">{{ trans('admin/hardware/form.serial') }}</th> <th style="width: 20%;">{{ trans('admin/hardware/form.serial') }}</th>
<th style="width: 10%;">Checked Out</th> <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
<th data-formatter="imageFormatter" style="width: 20%;">{{ trans('general.signature') }}</th> <th data-formatter="imageFormatter" style="width: 20%;">{{ trans('general.signature') }}</th>
</tr> </tr>
</thead> </thead>
@ -104,8 +104,7 @@
<td>{{ $asset->model->category->name }}</td> <td>{{ $asset->model->category->name }}</td>
<td>{{ $asset->model->name }}</td> <td>{{ $asset->model->name }}</td>
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td> <td>{{ $asset->last_checkout }}</td>
{{ $asset->last_checkout }}</td>
<td><img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></td> <td><img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></td>
</tr> </tr>
@php @php