diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2e45646b9c..3b2ff4623f 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -630,7 +630,7 @@ class AssetsController extends Controller try { $results = $csv->getRecords(); } catch (\Exception $e) { - return back()->with('error', 'There was an error reading the CSV file: '.$e->getMessage()); + return back()->with('error', trans('general.error_in_import_file', ['error' => $e->getMessage()])); } $item = []; $status = []; diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index 3ef8b9a948..1b04ce1fec 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -35,7 +35,6 @@ return [ 'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.', 'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.', 'remove_group_memberships' => 'Remove Group Memberships', - 'warning_deletion' => 'WARNING:', 'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.', 'update_user_assets_status' => 'Update all assets for these users to this status', 'checkin_user_properties' => 'Check in all properties associated with these users', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 685d462c38..ad96a2bb79 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -266,7 +266,6 @@ return [ 'sure_to_delete' => 'Are you sure you wish to delete', 'submit' => 'Submit', 'target' => 'Target', - 'toggle_navigation' => 'Toogle Navigation', 'time_and_date_display' => 'Time and Date Display', 'total_assets' => 'total assets', 'total_licenses' => 'total licenses', @@ -422,5 +421,16 @@ return [ 'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ', 'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)', 'clear_and_save' => 'Clear & Save', - + 'update_existing_values' => 'Update Existing Values?', + 'send_welcome_email_to_users' => ' Send Welcome Email for new Users?', + 'back_before_importing' => 'Backup before importing?', + 'csv_header_field' => 'CSV Header Field', + 'import_field' => 'Import Field', + 'sample_value' => 'Sample Value', + 'no_headers' => 'No Columns Found', + 'error_in_import_file' => 'There was an error reading the CSV file: :error', + 'percent_complete' => ':percent % Complete', + 'errors_importing' => 'Some Errors occurred while importing: ', + 'warning' => 'WARNING: :warning', + 'success_redirecting' => '"Success... Redirecting.', ]; \ No newline at end of file diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index fe7be0a63f..fa3b884efb 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -24,7 +24,7 @@
- Warning Some Errors occurred while importing {{-- TODO: hardcoded string --}} + {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}
@@ -143,7 +143,7 @@
@@ -162,21 +162,21 @@
@@ -198,13 +198,13 @@
- CSV Header Field + {{ trans('general.csv_header_field') }}
- Import Field + {{ trans('general.import_field') }}
- Sample Value + {{ trans('general.sample_value') }}
@@ -234,7 +234,7 @@
@endforeach @else - No Columns Found! + {{ trans('general.no_headers') }} @endif
@@ -299,7 +299,7 @@ }, progress: function(e, data) { @this.progress = parseInt((data.loaded / data.total * 100, 10)); - @this.progress_message = @this.progress+'% Complete'; // TODO - this should come from server (so it can be internationalized) + @this.progress_message = @this.progress+'% Complete'; // TODO - make this use general.percent_complete as a translation, passing :percent as a variable }, fail: function(e, data) { @this.progress_bar_class = "progress-bar-danger"; @@ -353,7 +353,7 @@ }).done( function (body) { // Success @this.statusType="success"; - @this.statusText = "Success... Redirecting."; + @this.statusText = {{ trans('general.success_redirecting') }}; // console.dir(body) window.location.href = body.messages.redirect_url; }).fail( function (jqXHR, textStatus, error) {