From c54eb2275461eb32ddf72701f5455fce714bec9c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jan 2024 14:46:52 +0000
Subject: [PATCH 1/2] Moved URL string to general

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/admin/manufacturers/table.php          | 1 -
 resources/lang/en-US/admin/suppliers/table.php              | 1 -
 resources/lang/en-US/general.php                            | 1 +
 resources/views/manufacturers/edit.blade.php                | 2 +-
 resources/views/partials/label2-field-definitions.blade.php | 2 +-
 resources/views/reports/custom.blade.php                    | 2 +-
 resources/views/suppliers/index.blade.php                   | 2 +-
 7 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/resources/lang/en-US/admin/manufacturers/table.php b/resources/lang/en-US/admin/manufacturers/table.php
index 38cab6fd91..6a0aaa8865 100644
--- a/resources/lang/en-US/admin/manufacturers/table.php
+++ b/resources/lang/en-US/admin/manufacturers/table.php
@@ -12,6 +12,5 @@ return array(
     'support_url'   		=> 'Support URL',
     'warranty_lookup_url'   => 'Warranty Lookup URL',
     'update'				=> 'Update Manufacturer',
-    'url'   				=> 'URL',
 
 );
diff --git a/resources/lang/en-US/admin/suppliers/table.php b/resources/lang/en-US/admin/suppliers/table.php
index 2a7b07ca93..fe7ce55021 100644
--- a/resources/lang/en-US/admin/suppliers/table.php
+++ b/resources/lang/en-US/admin/suppliers/table.php
@@ -19,7 +19,6 @@ return array(
     'state'                 => 'State',
     'suppliers'             => 'Suppliers',
     'update'                => 'Update Supplier',
-    'url'                   => 'URL',
     'view'                  => 'View Supplier',
     'view_assets_for'       => 'View Assets for',
     'zip'                   => 'Postal Code',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index ec2c9c121a..0db52859ff 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -500,5 +500,6 @@ return [
     'edit' => 'edit',
     'action_source' => 'Action Source',
     'or' => 'or',
+    'url'                   => 'URL',
 
 ];
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 6e87344053..b5429e5f34 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -12,7 +12,7 @@
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/manufacturers/table.name')])
     <!-- URL -->
     <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
-        <label for="url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.url') }}
+        <label for="url" class="col-md-3 control-label">{{ trans('general.url') }}
         </label>
         <div class="col-md-6">
             <input class="form-control" type="text" name="url" id="url" value="{{ old('url', $item->url) }}" />
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 340c329432..8d8c680c94 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -322,7 +322,7 @@
                                 <option value="model.manufacturer.name">{{trans('admin/hardware/form.manufacturer')}}</option>
                                 <option value="model.manufacturer.support_email">{{trans('admin/manufacturers/table.support_email')}}</option>
                                 <option value="model.manufacturer.support_phone">{{trans('admin/manufacturers/table.support_phone')}}</option>
-                                <option value="model.manufacturer.support_url">{{trans('admin/manufacturers/table.url')}}</option>
+                                <option value="model.manufacturer.support_url">{{trans('general.url')}}</option>
                             </optgroup>
                             <optgroup label="Category">
                                 <option value="model.category.name">{{trans('admin/categories/general.category_name')}}</option>
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 0702f0332e..7a1f522e49 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -183,7 +183,7 @@
 
               <label class="form-control">
                 {{ Form::checkbox('url', '1', '1') }}
-                - {{ trans('admin/manufacturers/table.url') }}
+                - {{ trans('general.url') }}
               </label>
 
 
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index aa1577a371..1b88aae38b 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -50,7 +50,7 @@
             <th data-searchable="true" data-sortable="true" data-field="email" data-formatter="emailFormatter">{{ trans('admin/suppliers/table.email') }}</th>
             <th data-searchable="true" data-sortable="true" data-field="phone" data-formatter="phoneFormatter">{{ trans('admin/suppliers/table.phone') }}</th>
             <th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
-            <th data-sortable="true" data-field="url" data-visible="false" data-formatter="externalLinkFormatter">{{ trans('admin/suppliers/table.url') }}</th>
+            <th data-sortable="true" data-field="url" data-visible="false" data-formatter="externalLinkFormatter">{{ trans('general.url') }}</th>
             <th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th>
             <th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th>
             <th data-searchable="false" data-sortable="true" data-field="licenses_count">{{ trans('admin/suppliers/table.licenses') }}</th>

From e6f94cfebfe1947b5de3c2c908ce0bfddca8eed5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jan 2024 14:47:54 +0000
Subject: [PATCH 2/2] Missed one

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

diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 2f5c7c236f..50341be926 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -26,7 +26,7 @@
 @include ('partials.forms.edit.email')
 
 <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
-    {{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
+    {{ Form::label('url', trans('general.url'), array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7">
         {{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }}
         {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}