From ded1a59914113719316984afa0eb0eb180f62dd0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Apr 2019 18:22:31 -0700
Subject: [PATCH] Removed help text for email images (since we embed them by
 default now)

Added help text for username format
---
 resources/lang/en/admin/settings/general.php | 1 +
 resources/views/settings/general.blade.php   | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 613200d67..c6717fda7 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -191,4 +191,5 @@ return array(
     'unique_serial'                => 'Unique serial numbers',
     'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
     'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
 );
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 7ebb312a7..7fb6a5976 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -106,6 +106,10 @@
                         <div class="col-md-9">
                             {!! Form::username_format('username_format', Input::old('username_format', $setting->username_format), 'select2') !!}
                             {!! $errors->first('username_format', '<span class="alert-msg">:message</span>') !!}
+
+                            <p class="help-block">
+                                {{ trans('admin/settings/general.username_format_help') }}
+                            </p>
                         </div>
                     </div>
 
@@ -118,9 +122,7 @@
                                {{ Form::checkbox('show_images_in_email', '1', Input::old('show_images_in_email', $setting->show_images_in_email),array('class' => 'minimal')) }}
                                {{ trans('general.yes') }}
                                {!! $errors->first('show_images_in_email', '<span class="alert-msg">:message</span>') !!}
-                               <p class="help-block">
-                                   {{ trans('admin/settings/general.show_images_in_email_help') }}
-                               </p>
+
                            </div>
                        </div>