DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixes #3924 - missing/donked language string

Browse source
This commit is contained in:
snipe 2017-09-06 17:11:23 -07:00
parent 42a03a0436
commit 472658b2fe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name', 'history_user' => 'History for :name',
'info' => 'Info', 'info' => 'Info',
'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login', 'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name', 'software_user' => 'Software Checked out to :name',

4
resources/views/users/view.blade.php
View file

@ -107,9 +107,9 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="callout callout-warning"> <div class="callout callout-warning">
<i class="icon fa fa-warning"></i> <i class="icon fa fa-warning"></i>
{{ trans('general.user_deleted_text') }} {{ trans('admin/users/message.user_deleted_warning') }}
@can('update', $user) @can('update', $user)
<a href="{{ route('restore/user', $user->id) }}">{{ trans('general.click_here') }}</a> {{ trans('general.to_restore_them') }} <a href="{{ route('restore/user', $user->id) }}">{{ trans('admin/users/general.restore_user') }}</a>
@endcan @endcan
</div> </div>
</div> </div>