From 511d83cc47cefd52f3aac8308447afb7836088df Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 20 May 2023 14:52:42 -0700
Subject: [PATCH] Added/fixed a few more translations

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Livewire/Importer.php | 60 +++++++++++++++++++++++++---------
 resources/lang/en/general.php  |  6 ++++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php
index ff134cb778..16b68ca1ff 100644
--- a/app/Http/Livewire/Importer.php
+++ b/app/Http/Livewire/Importer.php
@@ -267,9 +267,9 @@ class Importer extends Component
             'first_name' => trans('general.first_name'),
             'last_name' => trans('general.last_name'),
             'notes' => trans('general.notes'),
-            'username' => trans('general.username'),
-            'jobtitle' => trans('general.job_title'),
-            'phone_number' => trans('general.phone'),
+            'username' => trans('admin/users/table.username'),
+            'jobtitle' => trans('admin/users/table.title'),
+            'phone_number' => trans('admin/users/table.phone'),
             'manager_first_name' => trans('general.importer.manager_first_name'),
             'manager_last_name' => trans('general.importer.manager_last_name'),
             'activated' => trans('general.activated'),
@@ -278,39 +278,69 @@ class Importer extends Component
             'state' => trans('general.state'),
             'country' => trans('general.country'),
             'zip' => trans('general.zip'),
-            'vip' => trans('general.vip'),
-            'remote' => trans('general.remote'),
-            'email' => trans('general.email'),
-            'avatar' => trans('general.avatar'),
+            'vip' => trans('general.importer.vip'),
+            'remote' => trans('admin/users/general.remote'),
+            'email' => trans('admin/users/table.email'),
+            'avatar' => trans('general.image'),
             'gravatar' => trans('general.gravatar'),
             'termination_date' => trans('general.termination_date'),
+            'employee_number'   => trans('general.employee_number'),
         ];
 
         $this->locations_fields  = [
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.location')]),
+            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
             'address' => trans('general.address'),
-            'address2' => trans('general.address2'),
+            'address2' => trans('general.importer.address2'),
             'city' => trans('general.city'),
             'state' => trans('general.state'),
             'country' => trans('general.country'),
             'zip' => trans('general.zip'),
-            'currency' => trans('general.currency'),
-            'ldap_ou' => trans('general.ldap_ou'),
-            'manager_username' => trans('general.manager_username'),
-            'manager' => trans('general.manager'),
-            'parent_location' => trans('general.parent_location'),
+            'currency' => trans('general.importer.currency'),
+            'ldap_ou' => trans('admin/locations/table.ldap_ou'),
+            'manager_username' => trans('general.importer.manager_username'),
+            'manager' => trans('general.importer.manager_full_name'),
+            'parent_location' => trans('admin/locations/table.parent'),
         ];
 
         // "real fieldnames" to a list of aliases for that field
         $this->aliases_fields = [
             'item_name' =>
                 [
-                    trans('general.item_name')
+                    trans('general.item_name'),
+                ],
+            'name' =>
+                [
+                    'name',
                 ],
             'model_name' =>
                 [
                     'model name',
                 ],
+            'currency' =>
+                [
+                    '$',
+                ],
+            'manager_username' =>
+                [
+                    'Manager',
+                ],
+            'jobtitle' =>
+                [
+                    'job title for user',
+                ],
+            'username' =>
+                [
+                    'user name',
+                ],
+            'phone_number' =>
+                [
+                    'phone',
+                    'phone number',
+                    'phone num',
+                    'telephone number',
+                    'telephone',
+                    'tel.',
+                ],
             'serial' =>
                 [
                     'serial number',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index cdf7a9b385..bc81b17246 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -457,10 +457,16 @@ return [
         'manager_first_name' => 'Manager First Name',
         'manager_last_name' => 'Manager First Name',
         'manager_full_name' => 'Manager Full Name',
+        'manager_username' => 'Manager Username',
         'checkout_type' => 'Checkout Type',
         'checkout_location' => 'Checkout Location',
         'image_filename' => 'Image Filename',
         'do_not_import'     => 'Do Not Import',
+        'vip' => 'VIP',
+        'avatar'  => 'Avatar',
+        'gravatar' => 'Gravatar Email',
+        'currency' => 'Currency',
+        'address2' => 'Address Line 2',
     ],
 
 ];