From c3310a0772cf1d7c1a9dc0c7f9017e28fe245cc3 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 5 Feb 2025 10:38:16 -0800
Subject: [PATCH 1/2] adds translations to LDAP settings page

---
 resources/lang/en-US/admin/settings/general.php | 4 ++++
 resources/views/settings/ldap.blade.php         | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 97567df8df..23ce32fe73 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -330,6 +330,10 @@ return [
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 86a091252f..6a07ce26a0 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -733,7 +733,7 @@
                             <!-- LDAP test -->
                             <div class="form-group">
                                 <div class="col-md-3">
-                                    {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
+                                    <label for="test_ldap_sync"> {{trans('admin/settings/general.ldap_test_label')}} </label>
                                 </div>
                                 <div class="col-md-8" id="ldaptestrow">
                                     <a class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
@@ -757,15 +757,15 @@
                             <!-- LDAP Login test -->
                             <div class="form-group">
                                 <div class="col-md-3">
-                                    {{ Form::label('test_ldap_login', 'Test LDAP Login') }}
+                                    <label for="test_ldap_login"> {{trans('admin/settings/general.ldap_test_login')}} </label>
                                 </div>
                                 <div class="col-md-8">
                                     <div class="row">
                                     <div class="col-md-4">
-                                        <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="LDAP username">
+                                        <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="{{trans('admin/settings/general.ldap_username_placeholder')}}">
                                     </div>
                                     <div class="col-md-4">
-                                    <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="LDAP password" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
+                                    <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
                                     </div>
                                     <div class="col-md-3">
                                         <a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>

From f2981cf12ba91ec8fd17f70d94e9ea9cb0dca5c1 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 5 Feb 2025 10:55:05 -0800
Subject: [PATCH 2/2] adds translations to label settings

---
 resources/lang/en-US/general.php              |  3 +++
 .../label2-field-definitions.blade.php        | 26 +++++++++----------
 .../views/partials/label2-preview.blade.php   |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 77670b5a7e..ef6cc47cd7 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -92,6 +92,7 @@ return [
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -217,6 +218,8 @@ return [
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
     'add_note'              => 'Add Note',
     'note_edited'            => 'Note Edited',
     'edit_note'              => 'Edit Note',
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index efae291d2e..bcb979d01e 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -258,7 +258,7 @@
 <div x-data="{{ $name }}" x-init="_init" class="l2fd-root">
     <input type="hidden" name="{{ $name }}" x-model="valueString" x-ref="input" />
     <div class="l2fd-main">
-        <h1 class="l2fd-title" style="grid-area: fields-title">Fields</h1>
+        <h1 class="l2fd-title" style="grid-area: fields-title">{{trans('general.fields')}}</h1>
         <div class="l2fd-list" style="grid-area: fields-list">
             <template x-for="(field, index) in fields">
                 <div
@@ -296,7 +296,7 @@
                 ><i class="fa-solid fa-trash"></i></button>
         </div>
 
-        <h1 class="l2fd-title" style="grid-area: options-title">Options</h1>
+        <h1 class="l2fd-title" style="grid-area: options-title">{{trans('general.options')}}</h1>
         <div class="l2fd-list" style="grid-area: options-list">
             <template x-if="selectedField">
                 <template x-for="(option, index) in selectedField.options">
@@ -308,11 +308,11 @@
                             'selected': selectedOption == option 
                         }"
                         x-on:click="selectedOption = option" >
-                        <label style="grid-area: label-title">Label</label>
+                        <label style="grid-area: label-title">{{trans('general.label')}}</label>
                         <input style="grid-area: label-field" x-model="option.label" />
-                        <label style="grid-area: source-title">DataSource</label>
+                        <label style="grid-area: source-title">{{trans('general.data_source')}}</label>
                         <select style="grid-area: source-field" x-model="option.datasource">
-                            <optgroup label="Asset">
+                            <optgroup label="{{trans('general.asset')}}">
                                 <option value="" disabled>{{ trans('general.select_datasource') }}</option>
                                 <option value="asset_tag">{{trans('admin/hardware/table.asset_tag')}}</option>
                                 <option value="name">{{trans('admin/hardware/form.name')}}</option>
@@ -324,34 +324,34 @@
                                 <option value="last_audit_date">{{trans('general.last_audit')}}</option>
                                 <option value="next_audit_date">{{trans('general.next_audit_date')}}</option>
                             </optgroup>
-                            <optgroup label="Asset Model">
+                            <optgroup label="{{trans('general.asset')." ".trans('general.asset_model')}}">
                                 <option value="model.name">{{trans('admin/models/table.name')}}</option>
                                 <option value="model.model_number">{{trans('admin/models/table.modelnumber')}}</option>
                             </optgroup>
-                            <optgroup label="Manufacturer">
+                            <optgroup label="{{trans('general.manufacturer')}}">
                                 <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('general.url')}}</option>
                             </optgroup>
-                            <optgroup label="Category">
+                            <optgroup label="{{trans('general.category')}}">
                                 <option value="model.category.name">{{trans('admin/categories/general.category_name')}}</option>
                             </optgroup>
-                            <optgroup label="Status">
+                            <optgroup label="{{trans('general.status')}}">
                                 <option value="assetstatus.name">{{trans('admin/statuslabels/table.name')}}</option>
                             </optgroup>
-                            <optgroup label="Supplier">
+                            <optgroup label="{{trans('general.supplier')}}">
                                 <option value="supplier.name">{{trans('admin/suppliers/table.name')}}</option>
                             </optgroup>
-                            <optgroup label="Default Location">
+                            <optgroup label=" {{trans('admin/hardware/form.default_location')}}">
                                 <option value="defaultLoc.name">{{trans('admin/hardware/form.default_location')}}</option>
                                 <option value="defaultLoc.phone">{{trans('admin/hardware/form.default_location_phone')}}</option>
                             </optgroup>
-                            <optgroup label="Location">
+                            <optgroup label="{{trans('general.location')}}">
                                 <option value="location.name">{{trans('admin/locations/table.name')}}</option>
                                 <option value="location.phone">{{trans('admin/locations/table.phone')}}</option>
                             </optgroup>
-                            <optgroup label="Company">
+                            <optgroup label="{{trans('general.company')}}">
                                 <option value="company.email">{{trans('admin/companies/table.email')}}</option>
                                 <option value="company.name">{{trans('admin/companies/table.name')}}</option>
                                 <option value="company.phone">{{trans('admin/companies/table.phone')}}</option>
diff --git a/resources/views/partials/label2-preview.blade.php b/resources/views/partials/label2-preview.blade.php
index 78518f103c..084104aebe 100644
--- a/resources/views/partials/label2-preview.blade.php
+++ b/resources/views/partials/label2-preview.blade.php
@@ -91,7 +91,7 @@
 
 <div x-data="label2_preview" x-init="_init" class="l2p-root">
     <div class="l2p-top">
-        <label for="label2-preview">Preview</label>
+        <label for="label2-preview">{{trans('general.preview')}}</label>
         <button class="l2p-pop-button btn btn-default" x-on:click.prevent="popout" title="Pop Out"><i class="fa-solid fa-maximize"></i></button>
     </div>
     <iframe id="label2-preview" x-bind:src="previewURL"></iframe>