From f96b7c505686f9eba332d7d58417f9d6ae32fcd3 Mon Sep 17 00:00:00 2001
From: NebelKreis <leipold.johannes@web.de>
Date: Tue, 5 Nov 2024 13:40:33 +0100
Subject: [PATCH] Feature: Added data type context for select options with
 "URL:" and "Data:" labels, including translations

---
 resources/lang/en-US/admin/settings/general.php |  3 ++-
 resources/views/settings/labels.blade.php       | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index d656391edd..c5987576f9 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -360,12 +360,13 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 47f429703f..9a323e7239 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -205,11 +205,11 @@
                                 </div>
                                 <div class="col-md-9">
                                     {{ Form::select('label2_2d_target', [
-                                        'hardware_id'           =>  '/hardware/{id} ('.trans('admin/settings/general.default').')', 
-                                        'ht_tag'                =>  '/ht/{asset_tag}', 
-                                        'plain_asset_tag'       =>  trans('general.asset_tag'),
-                                        'plain_serial_number'   =>  trans('general.serial_number'),
-                                        ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                        'hardware_id'           =>  trans('general.url') .': /hardware/{id} ('.trans('admin/settings/general.default').')', 
+                                        'ht_tag'                =>  trans('general.url') .': /ht/{asset_tag}', 
+                                        'plain_asset_tag'       =>  trans('admin/settings/general.data') .': '. trans('general.asset_tag') .' {asset_tag}',
+                                        'plain_serial_number'   =>  trans('admin/settings/general.data') .': '. trans('general.serial_number') .' {serial}',
+                                       ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
                                     {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>