From 934afa036f605cacaf3e890466985e89fe89ff4b Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:15:52 +0000 Subject: [PATCH 01/19] Adopt Laravel coding style Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200 --- .../Commands/CheckinLicensesFromAllUsers.php | 29 +- .../Commands/CheckoutLicenseToAllUsers.php | 33 +- app/Console/Commands/CreateAdmin.php | 8 +- app/Console/Commands/DisableLDAP.php | 3 - app/Console/Commands/FixDoubleEscape.php | 32 +- .../Commands/FixMismatchedAssetsAndLogs.php | 34 +- app/Console/Commands/ImportLocations.php | 34 +- app/Console/Commands/LdapSync.php | 143 ++-- app/Console/Commands/LdapSyncNg.php | 39 +- app/Console/Commands/MergeUsersByUsername.php | 33 +- app/Console/Commands/MoveUploadsToNewDisk.php | 91 +-- app/Console/Commands/ObjectImportCommand.php | 54 +- app/Console/Commands/Purge.php | 11 +- app/Console/Commands/PurgeLoginAttempts.php | 2 +- .../Commands/ReEncodeCustomFieldNames.php | 48 +- app/Console/Commands/RecryptFromMcrypt.php | 38 +- app/Console/Commands/RegenerateAssetTags.php | 21 +- app/Console/Commands/ResetDemoSettings.php | 5 - app/Console/Commands/RestoreDeletedUsers.php | 28 +- app/Console/Commands/RestoreFromBackup.php | 147 ++-- app/Console/Commands/RotateAppKey.php | 30 +- .../Commands/SendCurrentInventoryToUsers.php | 8 +- .../Commands/SendExpectedCheckinAlerts.php | 10 +- app/Console/Commands/SendExpirationAlerts.php | 2 +- .../Commands/SendUpcomingAuditReport.php | 19 +- app/Console/Commands/SyncAssetCounters.php | 11 +- app/Console/Commands/SyncAssetLocations.php | 66 +- app/Console/Commands/SystemBackup.php | 2 - app/Console/Commands/Version.php | 46 +- app/Console/Kernel.php | 1 - app/Events/CheckoutAccepted.php | 2 +- app/Events/CheckoutDeclined.php | 4 +- app/Events/CheckoutableCheckedIn.php | 6 +- app/Events/CheckoutableCheckedOut.php | 2 +- app/Exceptions/CheckoutNotAllowed.php | 6 +- app/Exceptions/Handler.php | 21 +- app/Helpers/Helper.php | 761 +++++++++--------- app/Helpers/StorageHelper.php | 10 +- .../Accessories/AccessoriesController.php | 71 +- .../AccessoryCheckinController.php | 9 +- .../AccessoryCheckoutController.php | 12 +- .../Account/AcceptanceController.php | 61 +- app/Http/Controllers/ActionlogController.php | 3 +- .../Controllers/Api/AccessoriesController.php | 66 +- .../Api/AssetMaintenancesController.php | 90 +-- .../Controllers/Api/AssetModelsController.php | 37 +- app/Http/Controllers/Api/AssetsController.php | 256 +++--- .../Controllers/Api/CategoriesController.php | 25 +- .../Controllers/Api/CompaniesController.php | 19 +- .../Controllers/Api/ComponentsController.php | 18 +- .../Controllers/Api/ConsumablesController.php | 64 +- .../Api/CustomFieldsController.php | 44 +- .../Api/CustomFieldsetsController.php | 55 +- .../Controllers/Api/DepartmentsController.php | 19 +- .../Api/DepreciationsController.php | 15 +- app/Http/Controllers/Api/GroupsController.php | 14 +- app/Http/Controllers/Api/ImportController.php | 69 +- .../Api/LicenseSeatsController.php | 19 +- .../Controllers/Api/LicensesController.php | 59 +- .../Controllers/Api/LocationsController.php | 44 +- .../Api/ManufacturersController.php | 27 +- .../Api/PredefinedKitsController.php | 276 +++---- .../Controllers/Api/ProfileController.php | 7 +- .../Controllers/Api/ReportsController.php | 23 +- .../Controllers/Api/SettingsController.php | 118 ++- .../Api/StatuslabelsController.php | 80 +- .../Controllers/Api/SuppliersController.php | 28 +- app/Http/Controllers/Api/UsersController.php | 93 +-- .../AssetMaintenancesController.php | 174 ++-- .../Controllers/AssetModelsController.php | 136 ++-- .../Assets/AssetCheckinController.php | 22 +- .../Assets/AssetCheckoutController.php | 32 +- .../Assets/AssetFilesController.php | 33 +- .../Controllers/Assets/AssetsController.php | 270 +++---- .../Assets/BulkAssetsController.php | 61 +- .../Auth/ForgotPasswordController.php | 14 +- app/Http/Controllers/Auth/LoginController.php | 126 ++- .../Controllers/Auth/RegisterController.php | 13 +- .../Auth/ResetPasswordController.php | 16 +- app/Http/Controllers/Auth/SamlController.php | 57 +- .../Controllers/BulkAssetModelsController.php | 29 +- app/Http/Controllers/CategoriesController.php | 50 +- app/Http/Controllers/CheckInOutRequest.php | 13 +- app/Http/Controllers/CompaniesController.php | 18 +- .../Components/ComponentCheckinController.php | 13 +- .../ComponentCheckoutController.php | 9 +- .../Components/ComponentsController.php | 58 +- .../ConsumableCheckoutController.php | 5 +- .../Consumables/ConsumablesController.php | 62 +- app/Http/Controllers/Controller.php | 1 + .../Controllers/CustomFieldsController.php | 93 +-- .../Controllers/CustomFieldsetsController.php | 106 ++- app/Http/Controllers/DashboardController.php | 24 +- .../Controllers/DepartmentsController.php | 24 +- .../Controllers/DepreciationsController.php | 22 +- app/Http/Controllers/GroupsController.php | 84 +- app/Http/Controllers/HealthController.php | 9 +- app/Http/Controllers/ImportsController.php | 1 + .../Kits/CheckoutKitController.php | 9 +- .../Kits/PredefinedKitsController.php | 63 +- .../Licenses/LicenseCheckinController.php | 21 +- .../Licenses/LicenseCheckoutController.php | 20 +- .../Licenses/LicenseFilesController.php | 37 +- .../Licenses/LicensesController.php | 104 ++- app/Http/Controllers/LocationsController.php | 109 ++- .../Controllers/ManufacturersController.php | 47 +- app/Http/Controllers/ModalController.php | 8 +- app/Http/Controllers/ProfileController.php | 97 +-- app/Http/Controllers/ReportsController.php | 317 ++++---- app/Http/Controllers/SettingsController.php | 362 ++++----- .../Controllers/StatuslabelsController.php | 58 +- app/Http/Controllers/SuppliersController.php | 72 +- .../Controllers/Users/BulkUsersController.php | 47 +- .../Users/LDAPImportController.php | 4 +- .../Controllers/Users/UserFilesController.php | 30 +- .../Controllers/Users/UsersController.php | 82 +- app/Http/Controllers/ViewAssetsController.php | 101 +-- app/Http/Middleware/AssetCountForSidebar.php | 5 +- app/Http/Middleware/CheckForDebug.php | 2 +- app/Http/Middleware/CheckForSetup.php | 7 +- app/Http/Middleware/CheckPermissions.php | 30 +- app/Http/Middleware/EncryptCookies.php | 3 - app/Http/Middleware/NoSessionStore.php | 5 +- app/Http/Middleware/SecurityHeaders.php | 14 +- app/Http/Middleware/VerifyCsrfToken.php | 2 +- app/Http/Requests/AssetCheckoutRequest.php | 9 +- app/Http/Requests/AssetFileRequest.php | 2 +- app/Http/Requests/CustomFieldRequest.php | 10 +- app/Http/Requests/ImageUploadRequest.php | 51 +- app/Http/Requests/ItemImportRequest.php | 20 +- app/Http/Requests/Request.php | 4 +- app/Http/Requests/SaveUserRequest.php | 18 +- app/Http/Requests/SettingsLdapRequest.php | 22 +- app/Http/Requests/SettingsSamlRequest.php | 64 +- app/Http/Traits/UniqueUndeletedTrait.php | 16 +- .../Transformers/AccessoriesTransformer.php | 35 +- .../Transformers/ActionlogsTransformer.php | 57 +- .../AssetMaintenancesTransformer.php | 32 +- .../Transformers/AssetModelsTransformer.php | 47 +- app/Http/Transformers/AssetsTransformer.php | 66 +- .../Transformers/CategoriesTransformer.php | 17 +- .../Transformers/CompaniesTransformer.php | 33 +- .../ComponentsAssetsTransformer.php | 16 +- .../Transformers/ComponentsTransformer.php | 22 +- .../Transformers/ConsumablesTransformer.php | 22 +- .../Transformers/CustomFieldsTransformer.php | 20 +- .../CustomFieldsetsTransformer.php | 17 +- .../Transformers/DatatablesTransformer.php | 3 +- .../Transformers/DepartmentsTransformer.php | 23 +- .../Transformers/DepreciationsTransformer.php | 14 +- app/Http/Transformers/GroupsTransformer.php | 12 +- app/Http/Transformers/ImportsTransformer.php | 7 +- .../Transformers/LicenseSeatsTransformer.php | 31 +- app/Http/Transformers/LicensesTransformer.php | 25 +- .../Transformers/LocationsTransformer.php | 20 +- .../Transformers/LoginAttemptsTransformer.php | 16 +- .../Transformers/ManufacturersTransformer.php | 19 +- .../PredefinedKitsTransformer.php | 33 +- .../Transformers/SelectlistTransformer.php | 23 +- .../Transformers/StatuslabelsTransformer.php | 16 +- .../Transformers/SuppliersTransformer.php | 17 +- app/Http/Transformers/UsersTransformer.php | 61 +- app/Importer/AccessoryImporter.php | 11 +- app/Importer/AssetImporter.php | 43 +- app/Importer/ComponentImporter.php | 19 +- app/Importer/ConsumableImporter.php | 17 +- app/Importer/Importer.php | 87 +- app/Importer/ItemImporter.php | 173 ++-- app/Importer/LicenseImporter.php | 18 +- app/Importer/UserImporter.php | 36 +- app/Listeners/CheckoutableListener.php | 81 +- app/Listeners/LogFailedLogin.php | 1 - app/Listeners/LogListener.php | 40 +- app/Listeners/LogSuccessfulLogin.php | 3 - app/Models/Accessory.php | 121 ++- app/Models/Actionlog.php | 53 +- app/Models/Asset.php | 638 +++++++-------- app/Models/AssetMaintenance.php | 61 +- app/Models/AssetModel.php | 50 +- app/Models/Category.php | 39 +- app/Models/CheckoutAcceptance.php | 61 +- app/Models/CheckoutRequest.php | 5 +- app/Models/Company.php | 62 +- app/Models/CompanyableChildScope.php | 2 + app/Models/CompanyableChildTrait.php | 1 + app/Models/CompanyableScope.php | 1 + app/Models/CompanyableTrait.php | 1 + app/Models/Component.php | 72 +- app/Models/Consumable.php | 97 ++- app/Models/ConsumableAssignment.php | 1 + app/Models/CustomField.php | 101 ++- app/Models/CustomFieldset.php | 23 +- app/Models/Department.php | 14 +- app/Models/Depreciable.php | 75 +- app/Models/Depreciation.php | 28 +- app/Models/Group.php | 24 +- app/Models/ICompanyableChild.php | 1 + app/Models/Import.php | 2 +- app/Models/Ldap.php | 145 ++-- app/Models/License.php | 87 +- app/Models/LicenseSeat.php | 28 +- app/Models/Location.php | 108 ++- app/Models/Loggable.php | 35 +- app/Models/Manufacturer.php | 26 +- app/Models/PredefinedKit.php | 35 +- app/Models/Recipients/AdminRecipient.php | 6 +- app/Models/Requestable.php | 3 +- app/Models/Setting.php | 49 +- app/Models/SnipeModel.php | 52 +- app/Models/Statuslabel.php | 26 +- app/Models/Supplier.php | 33 +- app/Models/Traits/Acceptable.php | 17 +- app/Models/Traits/Searchable.php | 120 +-- app/Models/User.php | 139 ++-- app/Notifications/AuditNotification.php | 5 +- .../CheckinAccessoryNotification.php | 25 +- .../CheckinAssetNotification.php | 20 +- .../CheckinLicenseSeatNotification.php | 15 +- .../CheckoutAccessoryNotification.php | 13 +- .../CheckoutAssetNotification.php | 19 +- .../CheckoutConsumableNotification.php | 15 +- .../CheckoutLicenseSeatNotification.php | 11 +- .../ExpectedCheckinAdminNotification.php | 7 +- .../ExpectedCheckinNotification.php | 8 +- .../ExpiringAssetsNotification.php | 7 +- .../ExpiringLicenseNotification.php | 7 +- app/Notifications/FirstAdminNotification.php | 5 +- app/Notifications/RequestAssetCancelation.php | 14 +- .../RequestAssetNotification.php | 11 +- .../SendUpcomingAuditNotification.php | 2 +- app/Notifications/WelcomeNotification.php | 4 +- app/Observers/AccessoryObserver.php | 9 +- app/Observers/AssetObserver.php | 18 +- app/Observers/ComponentObserver.php | 9 +- app/Observers/ConsumableObserver.php | 10 +- app/Observers/LicenseObserver.php | 10 +- app/Observers/SettingObserver.php | 1 - .../CheckoutablePermissionsPolicy.php | 8 +- app/Policies/CustomFieldsetPolicy.php | 4 +- app/Policies/LicensePolicy.php | 29 +- app/Policies/SnipePermissionsPolicy.php | 17 +- app/Presenters/AccessoryPresenter.php | 193 +++-- app/Presenters/ActionlogPresenter.php | 57 +- app/Presenters/AssetAuditPresenter.php | 396 +++++---- app/Presenters/AssetMaintenancesPresenter.php | 180 ++--- app/Presenters/AssetModelPresenter.php | 220 ++--- app/Presenters/AssetPresenter.php | 486 +++++------ app/Presenters/CategoryPresenter.php | 149 ++-- app/Presenters/CompanyPresenter.php | 166 ++-- app/Presenters/ComponentPresenter.php | 183 ++--- app/Presenters/ConsumablePresenter.php | 207 +++-- app/Presenters/DepreciationPresenter.php | 52 +- app/Presenters/LicensePresenter.php | 355 ++++---- app/Presenters/LicenseSeatPresenter.php | 1 - app/Presenters/LocationPresenter.php | 227 +++--- app/Presenters/ManufacturerPresenter.php | 176 ++-- app/Presenters/PredefinedKitPresenter.php | 347 ++++---- app/Presenters/Presentable.php | 7 +- app/Presenters/Presenter.php | 6 +- app/Presenters/UserPresenter.php | 408 +++++----- app/Providers/AppServiceProvider.php | 9 +- app/Providers/AuthServiceProvider.php | 27 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/LdapServiceProvider.php | 9 +- app/Providers/MacroServiceProvider.php | 10 +- app/Providers/SamlServiceProvider.php | 18 +- app/Providers/SettingsServiceProvider.php | 61 +- app/Providers/ValidationServiceProvider.php | 49 +- app/Services/LdapAd.php | 108 +-- app/Services/LdapAdConfiguration.php | 24 +- app/Services/PredefinedKitCheckoutService.php | 19 +- app/Services/Saml.php | 118 +-- config/app.php | 18 +- config/auth.php | 4 +- config/backup.php | 5 +- config/broadcasting.php | 2 - config/cache.php | 2 - config/compile.php | 2 - config/cors.php | 5 +- config/database.php | 7 +- config/debugbar.php | 54 +- config/filesystems.php | 6 +- config/image.php | 5 +- config/logging.php | 7 +- config/mail.php | 14 +- config/passport.php | 3 +- config/permissions.php | 466 ++++++----- config/services.php | 6 +- config/session.php | 6 +- config/trustedproxy.php | 6 +- config/version.php | 5 +- database/factories/AccessoryFactory.php | 19 +- database/factories/ActionLogFactory.php | 38 +- database/factories/AssetFactory.php | 48 +- database/factories/AssetModelFactory.php | 13 - database/factories/CategoryFactory.php | 5 - database/factories/ComponentsFactory.php | 17 +- database/factories/ConsumableFactory.php | 14 +- database/factories/CustomFieldsFactory.php | 3 - database/factories/CustomFieldsetFactory.php | 4 - database/factories/DepartmentsFactory.php | 5 +- database/factories/DepreciationFactory.php | 4 - database/factories/LicenseFactory.php | 25 +- database/factories/ManufacturerFactory.php | 5 - database/factories/ModelFactory.php | 6 +- database/factories/StatusLabelFactory.php | 2 +- database/factories/UserFactory.php | 12 +- ...gration_cartalyst_sentry_install_users.php | 83 +- ...ration_cartalyst_sentry_install_groups.php | 55 +- ...lyst_sentry_install_users_groups_pivot.php | 57 +- ...tion_cartalyst_sentry_install_throttle.php | 71 +- .../2013_03_23_193214_update_users_table.php | 1 - .../2013_11_13_075318_create_models_table.php | 3 +- ...3_11_13_075335_create_categories_table.php | 3 +- ...1_13_075347_create_manufacturers_table.php | 1 - ...11_15_015858_add_user_id_to_categories.php | 1 - ...15_112701_add_user_id_to_manufacturers.php | 1 - .../2013_11_15_190327_create_assets_table.php | 1 - ...013_11_15_190357_create_licenses_table.php | 29 +- ...15_201848_add_license_name_to_licenses.php | 2 - ...1_16_040323_create_depreciations_table.php | 1 - ...6_042851_add_depreciation_id_to_models.php | 1 - ...013_11_16_084923_add_user_id_to_models.php | 1 - ...13_11_16_103258_create_locations_table.php | 5 +- ...11_16_103336_add_location_id_to_assets.php | 1 - ..._16_103407_add_checkedout_to_to_assets.php | 1 - ...2013_11_16_103425_create_history_table.php | 1 - .../2013_11_17_054359_drop_licenses_table.php | 1 - ...13_11_17_054526_add_physical_to_assets.php | 4 +- ...013_11_17_055126_create_settings_table.php | 1 - ...013_11_17_062634_add_license_to_assets.php | 1 - ...013_11_18_134332_add_contacts_to_users.php | 4 - ...013_11_18_142847_add_info_to_locations.php | 5 - ...8_152942_remove_location_id_from_asset.php | 1 - ...3_11_18_164423_set_nullvalues_for_user.php | 5 +- ...3_11_19_013337_create_asset_logs_table.php | 1 - ..._061409_edit_added_on_asset_logs_table.php | 2 - ...2250_edit_location_id_asset_logs_table.php | 3 - ...11_20_055822_add_soft_delete_on_assets.php | 1 - ...20_121404_add_soft_delete_on_locations.php | 1 - ...23137_add_soft_delete_on_manufacturers.php | 1 - ...0_123725_add_soft_delete_on_categories.php | 1 - ...2013_11_20_130248_create_status_labels.php | 3 +- ...0_130830_add_status_id_on_assets_table.php | 1 - ...31544_add_status_type_on_status_labels.php | 1 - ...13_11_20_134103_add_archived_to_assets.php | 1 - .../2013_11_21_002321_add_uploads_table.php | 1 - ..._deployable_boolean_from_status_labels.php | 1 - ...308_add_option_label_to_settings_table.php | 1 - ...3_11_22_213400_edits_to_settings_table.php | 5 +- ...013_11_25_013244_create_licenses_table.php | 1 - ...1_25_031458_create_license_seats_table.php | 1 - ..._25_032022_add_type_to_actionlog_table.php | 1 - ...11_25_033008_delete_bad_licenses_table.php | 1 - ...11_25_033131_create_new_licenses_table.php | 1 - ..._033534_add_licensed_to_licenses_table.php | 1 - ...5_101308_add_warrantee_to_assets_table.php | 1 - ...104343_alter_warranty_column_on_assets.php | 3 +- ..._25_150450_drop_parent_from_categories.php | 1 - ..._11_25_151920_add_depreciate_to_assets.php | 5 - ...52903_add_depreciate_to_licenses_table.php | 4 - ..._211820_drop_license_from_assets_table.php | 1 - ...27_062510_add_note_to_asset_logs_table.php | 2 - ...12_01_113426_add_filename_to_asset_log.php | 2 - ..._094618_add_nullable_to_licenses_table.php | 13 +- ...3_12_10_084038_add_eol_on_models_table.php | 4 +- ...2_12_055218_add_manager_to_users_table.php | 4 +- ...8_031200_add_qr_code_to_settings_table.php | 4 +- ...3_183016_add_qr_text_to_settings_table.php | 5 +- ..._alter_default_license_depreciation_id.php | 3 +- ...7_231658_alter_default_values_licenses.php | 3 +- ...6_19_191508_add_asset_name_to_settings.php | 8 +- ..._make_asset_log_checkedout_to_nullable.php | 3 +- ...ake_asset_log_purchasedate_to_nullable.php | 3 +- .../2014_06_24_003011_add_suppliers.php | 23 +- ..._06_24_010742_add_supplier_id_to_asset.php | 5 +- .../2014_06_24_012839_add_zip_to_supplier.php | 7 +- .../2014_06_24_033908_add_url_to_supplier.php | 6 +- ..._07_08_054116_add_employee_id_to_users.php | 50 +- ...07_09_134316_add_requestable_to_assets.php | 50 +- ...014_07_17_085822_add_asset_to_software.php | 49 +- ..._161625_make_asset_id_in_logs_nullable.php | 45 +- .../2014_08_12_053504_alpha_0_4_2_release.php | 59 +- ...08_17_083523_make_location_id_nullable.php | 45 +- ...0_16_200626_add_rtd_location_to_assets.php | 49 +- ...0_24_000417_alter_supplier_state_to_32.php | 43 +- ...10_24_015641_add_display_checkout_date.php | 12 +- ...222654_add_avatar_field_to_users_table.php | 54 +- ...045924_add_image_field_to_models_table.php | 56 +- ..._01_214955_add_eol_display_to_settings.php | 22 +- ...31416_update_group_field_for_reporting.php | 14 +- ...14_11_05_212408_add_fields_to_licenses.php | 59 +- ...014_11_07_021042_add_image_to_supplier.php | 58 +- ...2014_11_20_203007_add_username_to_user.php | 60 +- ...2014_11_20_223947_add_auto_to_settings.php | 59 +- ...14_11_20_224421_add_prefix_to_settings.php | 59 +- .../2014_11_21_104401_change_licence_type.php | 51 +- ...add_fields_maintained_term_to_licenses.php | 55 +- ..._04_155757_increase_user_field_lengths.php | 47 +- ...5_02_07_013537_add_soft_deleted_to_log.php | 64 +- ...5_02_10_040958_fix_bad_assigned_to_ids.php | 71 +- ...10_053310_migrate_data_to_new_statuses.php | 83 +- ...104_migrate_make_license_assigned_null.php | 45 +- ...1_104406_migrate_create_requests_table.php | 47 +- ..._02_12_001312_add_mac_address_to_asset.php | 68 +- ...02_12_024100_change_license_notes_type.php | 46 +- ...02_17_231020_add_localonly_to_settings.php | 56 +- ...222322_add_logo_and_colors_to_settings.php | 60 +- ...15_02_24_072043_add_alerts_to_settings.php | 59 +- .../2015_02_25_022931_add_eula_fields.php | 112 ++- ...015_02_25_204513_add_accessories_table.php | 64 +- ...2_26_091228_add_accessories_user_table.php | 67 +- ...015_02_26_115128_add_deleted_at_models.php | 43 +- .../2015_02_26_233005_add_category_type.php | 55 +- ...12_update_accepted_at_to_acceptance_id.php | 65 +- ...5_03_05_011929_add_qr_type_to_settings.php | 55 +- .../2015_03_18_055327_add_note_to_user.php | 51 +- ...015_04_29_234704_add_slack_to_settings.php | 63 +- ...85151_add_parent_id_to_locations_table.php | 57 +- ...22_124421_add_reassignable_to_licenses.php | 55 +- ...6_10_003314_fix_default_for_user_notes.php | 45 +- .../2015_06_10_003554_create_consumables.php | 84 +- ...15_06_15_183253_move_email_to_username.php | 45 +- .../2015_06_23_070346_make_email_nullable.php | 50 +- ...213716_create_asset_maintenances_table.php | 45 +- ...7_04_212443_create_custom_fields_table.php | 52 +- ...add_currency_to_settings_and_locations.php | 78 +- ...dd_expected_checkin_date_to_asset_logs.php | 54 +- ...45_add_checkin_email_to_category_table.php | 51 +- ..._055415_remove_email_unique_constraint.php | 48 +- ...0054_add_thread_id_to_asset_logs_table.php | 54 +- ...15_07_31_015430_add_accepted_to_assets.php | 53 +- ...9_09_195301_add_custom_css_to_settings.php | 53 +- ...26_create_custom_field_custom_fieldset.php | 56 +- ...5_09_22_000104_create_custom_fieldsets.php | 54 +- ...09_22_003321_add_fieldset_id_to_assets.php | 52 +- .../2015_09_22_003413_migrate_mac_address.php | 99 ++- ...9_28_003314_fix_default_purchase_order.php | 51 +- ...51_add_accessory_consumable_price_info.php | 63 +- ...015_10_12_192706_add_brand_to_settings.php | 53 +- ..._10_22_003314_fix_defaults_accessories.php | 63 +- ...e_and_expected_checkout_date_to_assets.php | 65 +- ...15_11_05_061015_create_companies_table.php | 9 +- ...15_add_company_id_to_consumables_table.php | 12 +- .../migrations/2015_11_05_183749_image.php | 54 +- ...38_add_company_id_to_accessories_table.php | 12 +- ...6_100045_add_company_id_to_users_table.php | 12 +- ...34742_add_company_id_to_licenses_table.php | 12 +- ..._035832_add_company_id_to_assets_table.php | 12 +- ..._08_222305_add_ldap_fields_to_settings.php | 105 ++- ...le_companies_support_to_settings_table.php | 15 +- ...2015_11_26_195528_import_ldap_settings.php | 117 ++- ...2015_11_30_191504_remove_fk_company_id.php | 45 +- ...p_server_cert_ignore_to_settings_table.php | 53 +- ..._timestamp_and_userId_to_custom_fields.php | 53 +- ...mestamp_and_userId_to_custom_fieldsets.php | 60 +- .../2016_01_28_041048_add_notes_to_models.php | 51 +- ...0119_add_remember_token_to_users_table.php | 4 +- ...19_073625_create_password_resets_table.php | 21 +- ...16_03_02_193043_add_ldap_flag_to_users.php | 17 +- ...517_update_ldap_filter_to_longer_field.php | 8 +- ...6_03_08_225351_create_components_table.php | 105 ++- ...6_03_09_024038_add_min_stock_to_tables.php | 38 +- .../2016_03_10_133849_add_locale_to_users.php | 14 +- ...16_03_10_135519_add_locale_to_settings.php | 14 +- ..._185621_add_label_settings_to_settings.php | 42 +- ...03_22_125911_fix_custom_fields_regexes.php | 15 +- .../2016_04_28_141554_add_show_to_users.php | 4 +- ..._16_164733_add_model_mfg_to_consumable.php | 8 +- ..._05_19_180351_add_alt_barcode_settings.php | 2 +- .../2016_05_19_191146_add_alter_interval.php | 2 +- ...6_05_19_192226_add_inventory_threshold.php | 2 +- ...remove_option_keys_from_settings_table.php | 5 +- ...emove_option_value_from_settings_table.php | 5 +- ...1_000001_create_oauth_auth_codes_table.php | 4 +- ...00002_create_oauth_access_tokens_table.php | 5 +- ...0003_create_oauth_refresh_tokens_table.php | 4 +- ...6_01_000004_create_oauth_clients_table.php | 4 +- ...te_oauth_personal_access_clients_table.php | 5 +- ...dd_email_domain_and_format_to_settings.php | 4 +- ..._22_160725_add_user_id_to_maintenances.php | 4 +- ...016_07_13_150015_add_is_ad_to_settings.php | 2 +- ...07_14_153609_add_ad_domain_to_settings.php | 4 +- ...2_003348_fix_custom_fields_regex_stuff.php | 21 +- ...016_07_22_054850_one_more_mac_addr_fix.php | 8 +- ...07_22_143045_add_port_to_ldap_settings.php | 2 +- ..._07_22_153432_add_tls_to_ldap_settings.php | 2 +- ..._07_27_211034_add_zerofill_to_settings.php | 2 +- ..._08_02_124944_add_color_to_statuslabel.php | 4 +- ..._add_disallow_ldap_pw_sync_to_settings.php | 2 +- ...09_002225_add_manufacturer_to_licenses.php | 2 +- ..._add_manufacturer_to_accessories_table.php | 2 +- ...143353_add_new_fields_to_custom_fields.php | 2 +- ...45619_add_show_in_nav_to_status_labels.php | 2 +- ..._30_084634_make_purchase_cost_nullable.php | 5 +- ..._141051_add_requestable_to_asset_model.php | 2 +- ..._001448_create_checkout_requests_table.php | 2 +- ...16_09_04_180400_create_actionlog_table.php | 4 +- ...182149_migrate_asset_log_to_action_log.php | 31 +- ...9_235935_fix_fieldtype_for_target_type.php | 2 +- ...2_fix_modelno_in_consumables_to_string.php | 2 +- .../2016_09_28_231359_add_company_to_logs.php | 2 +- ..._14_130709_fix_order_number_to_varchar.php | 2 +- ..._015024_rename_modelno_to_model_number.php | 3 +- ...ame_consumable_modelno_to_model_number.php | 2 +- ...0_16_143235_rename_model_note_to_notes.php | 4 +- ...5052_rename_component_total_qty_to_qty.php | 2 +- ...x_order_number_in_components_to_string.php | 2 +- ..._10_27_151715_add_serial_to_components.php | 4 +- ..._213251_increase_serial_field_capacity.php | 2 +- .../2016_10_29_002724_enable_2fa_fields.php | 2 +- ..._29_082408_add_signature_to_acceptance.php | 2 +- ..._fix_forgotten_filename_in_action_logs.php | 14 +- ...name_component_serial_number_to_serial.php | 2 +- ..._16_172119_increase_purchase_cost_size.php | 28 +- ..._161317_longer_state_field_in_location.php | 2 +- ...193706_add_model_number_to_accessories.php | 2 +- ..._add_missing_target_type_to_logs_table.php | 2 +- ...20_increase_size_of_state_in_suppliers.php | 2 +- ...2_19_004212_adjust_locale_length_to_10.php | 4 +- ...hone_lengths_in_supplier_and_elsewhere.php | 13 +- ...631_make_asset_assigned_to_polymorphic.php | 14 +- ...0429_create_locations_ldap_query_field.php | 2 +- ...2017_01_14_002418_create_imports_table.php | 4 +- ...357_fix_utf8_custom_field_column_names.php | 29 +- ...4632_add_time_date_display_to_settings.php | 4 +- ...3_10_210807_add_fields_to_manufacturer.php | 4 +- ..._size_of_field_values_in_custom_fields.php | 5 +- .../2017_05_22_204422_create_departments.php | 4 +- ..._233509_add_manager_to_locations_table.php | 4 +- ...059_add_next_autoincrement_to_settings.php | 11 +- ...header_and_first_row_to_importer_table.php | 4 +- .../2017_07_07_191533_add_login_text.php | 4 +- ...07_25_130710_add_thumbsize_to_settings.php | 4 +- ...105_set_asset_archived_to_zero_default.php | 4 +- ..._22_180636_add_secure_password_options.php | 6 +- .../2017_08_25_074822_add_auditing_tables.php | 6 +- ..._08_25_101435_add_auditing_to_settings.php | 8 +- .../2017_10_03_015503_drop_foreign_keys.php | 19 +- ...low_nullable_depreciation_id_in_models.php | 5 +- ..._17_133709_add_display_url_to_settings.php | 4 +- ..._120002_add_custom_forgot_password_url.php | 4 +- ..._add_image_and_supplier_to_accessories.php | 4 +- ..._234129_add_location_indices_to_assets.php | 8 +- ...uploads_to_locations_manufacturers_etc.php | 7 +- ...17_10_27_180947_denorm_asset_locations.php | 6 +- ...92423_migrate_denormed_asset_locations.php | 2 +- .../2017_10_30_182938_add_address_to_user.php | 5 +- ...17_11_08_025918_add_alert_menu_setting.php | 4 +- ..._08_123942_labels_display_company_name.php | 4 +- ...010457_normalize_asset_last_audit_date.php | 11 +- .../2017_12_12_033618_add_actionlog_meta.php | 4 +- ...7_12_26_170856_re_normalize_last_audit.php | 8 +- ...17_184354_add_archived_in_list_setting.php | 4 +- ...3121_add_dashboard_message_to_settings.php | 4 +- ...062633_add_footer_settings_to_settings.php | 4 +- ...8_01_24_093426_add_modellist_preferenc.php | 4 +- ..._02_22_160436_add_remote_user_settings.php | 6 +- ...018_03_03_011032_add_theme_to_settings.php | 4 +- ...54937_add_default_flag_on_statuslabels.php | 4 +- ..._add_display_in_email_to_custom_fields.php | 4 +- ...30738_add_show_images_in_email_setting.php | 4 +- .../2018_03_24_050108_add_cc_alerts.php | 4 +- ...nceled_at_and_fulfilled_at_in_requests.php | 4 +- ..._03_29_070121_add_drop_unique_requests.php | 6 +- ...03_29_070511_add_new_index_requestable.php | 6 +- ...04_02_150700_labels_display_model_name.php | 6 +- ...eate_custom_field_default_values_table.php | 4 +- ..._05_04_073223_add_category_to_licenses.php | 7 +- ..._04_075235_add_update_license_category.php | 8 +- ...8_05_08_031515_add_gdpr_privacy_footer.php | 4 +- .../2018_05_14_215229_add_indexes.php | 5 +- ...018_05_14_223646_add_indexes_to_assets.php | 4 +- ...05_14_233638_denorm_counters_on_assets.php | 4 +- ...409_add_first_counter_totals_to_assets.php | 7 +- .../2018_06_21_134622_add_version_footer.php | 7 +- ...0_add_unique_serial_option_to_settings.php | 4 +- ..._17_005911_create_login_attempts_table.php | 4 +- ..._07_24_154348_add_logo_to_print_assets.php | 6 +- ...3826_create_checkout_acceptances_table.php | 4 +- ...42_add_depreciation_option_to_settings.php | 4 +- ...kout_acceptances_for_unaccepted_assets.php | 4 +- ...8_10_18_191228_add_kits_licenses_table.php | 51 +- .../2018_10_19_153910_add_kits_table.php | 51 +- ...018_10_19_154013_add_kits_models_table.php | 51 +- ...8_12_05_211936_add_favicon_to_settings.php | 4 +- ...2_05_212119_add_email_logo_to_settings.php | 4 +- ...2_07_185953_add_kits_consumables_table.php | 10 +- ...2_07_190030_add_kits_accessories_table.php | 10 +- ..._12_182750_add_actiondate_to_actionlog.php | 6 +- ...ange_auto_increment_prefix_to_nullable.php | 4 +- ...6_143518_auto_increment_back_to_string.php | 4 +- ...2_17_205048_add_label_logo_to_settings.php | 4 +- ...2019_02_20_234421_make_serial_nullable.php | 4 +- ...703_make_fields_nullable_for_integrity.php | 6 +- ...019_04_06_060145_add_user_skin_setting.php | 4 +- ..._06_205355_add_setting_allow_user_skin.php | 6 +- .../2019_06_12_184327_rename_groups_table.php | 5 +- ...6_add_show_assigned_assets_to_settings.php | 4 +- ...0_084049_add_custom_remote_user_header.php | 6 +- ...4_172100_add_ad_append_domain_settings.php | 4 +- ..._29_222305_add_saml_fields_to_settings.php | 79 +- ...020_08_11_200712_add_saml_key_rollover.php | 6 +- ..._accessory_checkout_note_to_join_table.php | 26 +- ...3_161736_fix_zero_values_for_locations.php | 5 +- ...233815_add_digit_separator_to_settings.php | 4 +- ..._210105_fix_bad_ldap_server_url_for_v5.php | 12 +- ..._05_172502_add_provider_to_oauth_table.php | 2 +- .../2021_04_07_001811_add_ldap_dept.php | 1 - .../2021_04_14_180125_add_ids_to_tables.php | 8 +- database/seeds/AccessorySeeder.php | 67 +- database/seeds/ActionlogSeeder.php | 15 +- database/seeds/AssetModelSeeder.php | 20 +- database/seeds/AssetSeeder.php | 73 +- database/seeds/CategorySeeder.php | 4 +- database/seeds/CompanySeeder.php | 18 +- database/seeds/ComponentSeeder.php | 3 +- database/seeds/ConsumableSeeder.php | 3 +- database/seeds/CustomFieldSeeder.php | 66 +- database/seeds/DatabaseSeeder.php | 7 +- database/seeds/DepartmentSeeder.php | 3 +- database/seeds/DepreciationSeeder.php | 3 +- database/seeds/LicenseSeeder.php | 3 +- database/seeds/LocationSeeder.php | 19 +- database/seeds/ManufacturerSeeder.php | 22 +- database/seeds/SettingsSeeder.php | 6 +- database/seeds/StatuslabelSeeder.php | 10 +- database/seeds/SupplierSeeder.php | 4 +- database/seeds/UserSeeder.php | 1 - .../lang/af/admin/accessories/general.php | 4 +- .../lang/af/admin/accessories/message.php | 35 +- resources/lang/af/admin/accessories/table.php | 9 +- .../lang/af/admin/asset_maintenances/form.php | 2 +- .../af/admin/asset_maintenances/message.php | 8 +- .../af/admin/asset_maintenances/table.php | 2 +- .../lang/af/admin/categories/general.php | 4 +- .../lang/af/admin/categories/message.php | 22 +- resources/lang/af/admin/categories/table.php | 6 +- resources/lang/af/admin/companies/general.php | 1 + resources/lang/af/admin/companies/message.php | 23 +- resources/lang/af/admin/companies/table.php | 5 +- .../lang/af/admin/components/general.php | 4 +- .../lang/af/admin/components/message.php | 35 +- resources/lang/af/admin/components/table.php | 4 +- .../lang/af/admin/consumables/general.php | 4 +- .../lang/af/admin/consumables/message.php | 35 +- resources/lang/af/admin/consumables/table.php | 4 +- .../lang/af/admin/custom_fields/general.php | 4 +- .../lang/af/admin/custom_fields/message.php | 49 +- .../lang/af/admin/departments/message.php | 22 +- resources/lang/af/admin/departments/table.php | 4 +- .../lang/af/admin/depreciations/general.php | 4 +- .../lang/af/admin/depreciations/message.php | 23 +- .../lang/af/admin/depreciations/table.php | 4 +- resources/lang/af/admin/groups/message.php | 12 +- resources/lang/af/admin/groups/table.php | 4 +- resources/lang/af/admin/groups/titles.php | 4 +- resources/lang/af/admin/hardware/form.php | 15 +- resources/lang/af/admin/hardware/general.php | 6 +- resources/lang/af/admin/hardware/message.php | 68 +- resources/lang/af/admin/hardware/table.php | 6 +- resources/lang/af/admin/kits/general.php | 4 +- resources/lang/af/admin/licenses/form.php | 6 +- resources/lang/af/admin/licenses/general.php | 4 +- resources/lang/af/admin/licenses/message.php | 43 +- resources/lang/af/admin/licenses/table.php | 4 +- resources/lang/af/admin/locations/message.php | 23 +- resources/lang/af/admin/locations/table.php | 4 +- .../lang/af/admin/manufacturers/message.php | 28 +- .../lang/af/admin/manufacturers/table.php | 4 +- resources/lang/af/admin/models/general.php | 6 +- resources/lang/af/admin/models/message.php | 39 +- resources/lang/af/admin/models/table.php | 4 +- resources/lang/af/admin/reports/general.php | 6 +- resources/lang/af/admin/reports/message.php | 6 +- resources/lang/af/admin/settings/general.php | 10 +- resources/lang/af/admin/settings/message.php | 21 +- .../lang/af/admin/statuslabels/message.php | 27 +- .../lang/af/admin/statuslabels/table.php | 4 +- resources/lang/af/admin/suppliers/message.php | 21 +- resources/lang/af/admin/suppliers/table.php | 4 +- resources/lang/af/admin/users/general.php | 7 +- resources/lang/af/admin/users/message.php | 21 +- resources/lang/af/admin/users/table.php | 8 +- resources/lang/af/auth/general.php | 1 - resources/lang/af/auth/message.php | 29 +- resources/lang/af/button.php | 6 +- resources/lang/af/general.php | 4 +- resources/lang/af/help.php | 10 +- resources/lang/af/mail.php | 6 +- resources/lang/af/pagination.php | 4 +- resources/lang/af/passwords.php | 1 - resources/lang/af/reminders.php | 12 +- resources/lang/af/table.php | 4 +- resources/lang/af/validation.php | 13 +- .../lang/ar/admin/accessories/general.php | 4 +- .../lang/ar/admin/accessories/message.php | 35 +- resources/lang/ar/admin/accessories/table.php | 9 +- .../lang/ar/admin/asset_maintenances/form.php | 2 +- .../ar/admin/asset_maintenances/message.php | 8 +- .../ar/admin/asset_maintenances/table.php | 2 +- .../lang/ar/admin/categories/general.php | 4 +- .../lang/ar/admin/categories/message.php | 22 +- resources/lang/ar/admin/categories/table.php | 6 +- resources/lang/ar/admin/companies/general.php | 1 + resources/lang/ar/admin/companies/message.php | 23 +- resources/lang/ar/admin/companies/table.php | 5 +- .../lang/ar/admin/components/general.php | 4 +- .../lang/ar/admin/components/message.php | 35 +- resources/lang/ar/admin/components/table.php | 4 +- .../lang/ar/admin/consumables/general.php | 4 +- .../lang/ar/admin/consumables/message.php | 35 +- resources/lang/ar/admin/consumables/table.php | 4 +- .../lang/ar/admin/custom_fields/general.php | 4 +- .../lang/ar/admin/custom_fields/message.php | 49 +- .../lang/ar/admin/departments/message.php | 22 +- resources/lang/ar/admin/departments/table.php | 4 +- .../lang/ar/admin/depreciations/general.php | 4 +- .../lang/ar/admin/depreciations/message.php | 23 +- .../lang/ar/admin/depreciations/table.php | 4 +- resources/lang/ar/admin/groups/message.php | 12 +- resources/lang/ar/admin/groups/table.php | 4 +- resources/lang/ar/admin/groups/titles.php | 4 +- resources/lang/ar/admin/hardware/form.php | 15 +- resources/lang/ar/admin/hardware/general.php | 6 +- resources/lang/ar/admin/hardware/message.php | 68 +- resources/lang/ar/admin/hardware/table.php | 6 +- resources/lang/ar/admin/kits/general.php | 4 +- resources/lang/ar/admin/licenses/form.php | 6 +- resources/lang/ar/admin/licenses/general.php | 4 +- resources/lang/ar/admin/licenses/message.php | 43 +- resources/lang/ar/admin/licenses/table.php | 4 +- resources/lang/ar/admin/locations/message.php | 23 +- resources/lang/ar/admin/locations/table.php | 4 +- .../lang/ar/admin/manufacturers/message.php | 28 +- .../lang/ar/admin/manufacturers/table.php | 4 +- resources/lang/ar/admin/models/general.php | 6 +- resources/lang/ar/admin/models/message.php | 39 +- resources/lang/ar/admin/models/table.php | 4 +- resources/lang/ar/admin/reports/general.php | 6 +- resources/lang/ar/admin/reports/message.php | 6 +- resources/lang/ar/admin/settings/general.php | 10 +- resources/lang/ar/admin/settings/message.php | 21 +- .../lang/ar/admin/statuslabels/message.php | 27 +- .../lang/ar/admin/statuslabels/table.php | 4 +- resources/lang/ar/admin/suppliers/message.php | 21 +- resources/lang/ar/admin/suppliers/table.php | 4 +- resources/lang/ar/admin/users/general.php | 7 +- resources/lang/ar/admin/users/message.php | 21 +- resources/lang/ar/admin/users/table.php | 8 +- resources/lang/ar/auth/general.php | 1 - resources/lang/ar/auth/message.php | 29 +- resources/lang/ar/button.php | 6 +- resources/lang/ar/general.php | 4 +- resources/lang/ar/help.php | 10 +- resources/lang/ar/mail.php | 6 +- resources/lang/ar/pagination.php | 4 +- resources/lang/ar/passwords.php | 1 - resources/lang/ar/reminders.php | 12 +- resources/lang/ar/table.php | 4 +- resources/lang/ar/validation.php | 15 +- .../lang/bg/admin/accessories/general.php | 4 +- .../lang/bg/admin/accessories/message.php | 35 +- resources/lang/bg/admin/accessories/table.php | 9 +- .../lang/bg/admin/asset_maintenances/form.php | 2 +- .../bg/admin/asset_maintenances/message.php | 8 +- .../bg/admin/asset_maintenances/table.php | 2 +- .../lang/bg/admin/categories/general.php | 4 +- .../lang/bg/admin/categories/message.php | 22 +- resources/lang/bg/admin/categories/table.php | 6 +- resources/lang/bg/admin/companies/general.php | 1 + resources/lang/bg/admin/companies/message.php | 23 +- resources/lang/bg/admin/companies/table.php | 5 +- .../lang/bg/admin/components/general.php | 4 +- .../lang/bg/admin/components/message.php | 35 +- resources/lang/bg/admin/components/table.php | 4 +- .../lang/bg/admin/consumables/general.php | 4 +- .../lang/bg/admin/consumables/message.php | 35 +- resources/lang/bg/admin/consumables/table.php | 4 +- .../lang/bg/admin/custom_fields/general.php | 4 +- .../lang/bg/admin/custom_fields/message.php | 49 +- .../lang/bg/admin/departments/message.php | 22 +- resources/lang/bg/admin/departments/table.php | 4 +- .../lang/bg/admin/depreciations/general.php | 4 +- .../lang/bg/admin/depreciations/message.php | 23 +- .../lang/bg/admin/depreciations/table.php | 4 +- resources/lang/bg/admin/groups/message.php | 12 +- resources/lang/bg/admin/groups/table.php | 4 +- resources/lang/bg/admin/groups/titles.php | 4 +- resources/lang/bg/admin/hardware/form.php | 15 +- resources/lang/bg/admin/hardware/general.php | 6 +- resources/lang/bg/admin/hardware/message.php | 68 +- resources/lang/bg/admin/hardware/table.php | 6 +- resources/lang/bg/admin/kits/general.php | 4 +- resources/lang/bg/admin/licenses/form.php | 6 +- resources/lang/bg/admin/licenses/general.php | 4 +- resources/lang/bg/admin/licenses/message.php | 43 +- resources/lang/bg/admin/licenses/table.php | 4 +- resources/lang/bg/admin/locations/message.php | 23 +- resources/lang/bg/admin/locations/table.php | 4 +- .../lang/bg/admin/manufacturers/message.php | 28 +- .../lang/bg/admin/manufacturers/table.php | 4 +- resources/lang/bg/admin/models/general.php | 6 +- resources/lang/bg/admin/models/message.php | 39 +- resources/lang/bg/admin/models/table.php | 4 +- resources/lang/bg/admin/reports/general.php | 6 +- resources/lang/bg/admin/reports/message.php | 6 +- resources/lang/bg/admin/settings/general.php | 10 +- resources/lang/bg/admin/settings/message.php | 21 +- .../lang/bg/admin/statuslabels/message.php | 27 +- .../lang/bg/admin/statuslabels/table.php | 4 +- resources/lang/bg/admin/suppliers/message.php | 21 +- resources/lang/bg/admin/suppliers/table.php | 4 +- resources/lang/bg/admin/users/general.php | 7 +- resources/lang/bg/admin/users/message.php | 21 +- resources/lang/bg/admin/users/table.php | 8 +- resources/lang/bg/auth/general.php | 1 - resources/lang/bg/auth/message.php | 29 +- resources/lang/bg/button.php | 6 +- resources/lang/bg/general.php | 4 +- resources/lang/bg/help.php | 10 +- resources/lang/bg/mail.php | 6 +- resources/lang/bg/pagination.php | 4 +- resources/lang/bg/passwords.php | 1 - resources/lang/bg/reminders.php | 12 +- resources/lang/bg/table.php | 4 +- resources/lang/bg/validation.php | 15 +- .../lang/cs/admin/accessories/general.php | 4 +- .../lang/cs/admin/accessories/message.php | 35 +- resources/lang/cs/admin/accessories/table.php | 9 +- .../lang/cs/admin/asset_maintenances/form.php | 2 +- .../cs/admin/asset_maintenances/message.php | 8 +- .../cs/admin/asset_maintenances/table.php | 2 +- .../lang/cs/admin/categories/general.php | 4 +- .../lang/cs/admin/categories/message.php | 22 +- resources/lang/cs/admin/categories/table.php | 6 +- resources/lang/cs/admin/companies/general.php | 1 + resources/lang/cs/admin/companies/message.php | 23 +- resources/lang/cs/admin/companies/table.php | 5 +- .../lang/cs/admin/components/general.php | 4 +- .../lang/cs/admin/components/message.php | 35 +- resources/lang/cs/admin/components/table.php | 4 +- .../lang/cs/admin/consumables/general.php | 4 +- .../lang/cs/admin/consumables/message.php | 35 +- resources/lang/cs/admin/consumables/table.php | 4 +- .../lang/cs/admin/custom_fields/general.php | 4 +- .../lang/cs/admin/custom_fields/message.php | 49 +- .../lang/cs/admin/departments/message.php | 22 +- resources/lang/cs/admin/departments/table.php | 4 +- .../lang/cs/admin/depreciations/general.php | 4 +- .../lang/cs/admin/depreciations/message.php | 23 +- .../lang/cs/admin/depreciations/table.php | 4 +- resources/lang/cs/admin/groups/message.php | 12 +- resources/lang/cs/admin/groups/table.php | 4 +- resources/lang/cs/admin/groups/titles.php | 4 +- resources/lang/cs/admin/hardware/form.php | 15 +- resources/lang/cs/admin/hardware/general.php | 6 +- resources/lang/cs/admin/hardware/message.php | 68 +- resources/lang/cs/admin/hardware/table.php | 6 +- resources/lang/cs/admin/kits/general.php | 4 +- resources/lang/cs/admin/licenses/form.php | 6 +- resources/lang/cs/admin/licenses/general.php | 4 +- resources/lang/cs/admin/licenses/message.php | 43 +- resources/lang/cs/admin/licenses/table.php | 4 +- resources/lang/cs/admin/locations/message.php | 23 +- resources/lang/cs/admin/locations/table.php | 4 +- .../lang/cs/admin/manufacturers/message.php | 28 +- .../lang/cs/admin/manufacturers/table.php | 4 +- resources/lang/cs/admin/models/general.php | 6 +- resources/lang/cs/admin/models/message.php | 39 +- resources/lang/cs/admin/models/table.php | 4 +- resources/lang/cs/admin/reports/general.php | 6 +- resources/lang/cs/admin/reports/message.php | 6 +- resources/lang/cs/admin/settings/general.php | 10 +- resources/lang/cs/admin/settings/message.php | 21 +- .../lang/cs/admin/statuslabels/message.php | 27 +- .../lang/cs/admin/statuslabels/table.php | 4 +- resources/lang/cs/admin/suppliers/message.php | 21 +- resources/lang/cs/admin/suppliers/table.php | 4 +- resources/lang/cs/admin/users/general.php | 7 +- resources/lang/cs/admin/users/message.php | 21 +- resources/lang/cs/admin/users/table.php | 8 +- resources/lang/cs/auth/general.php | 1 - resources/lang/cs/auth/message.php | 29 +- resources/lang/cs/button.php | 6 +- resources/lang/cs/general.php | 4 +- resources/lang/cs/help.php | 10 +- resources/lang/cs/mail.php | 6 +- resources/lang/cs/pagination.php | 4 +- resources/lang/cs/passwords.php | 1 - resources/lang/cs/reminders.php | 12 +- resources/lang/cs/table.php | 4 +- resources/lang/cs/validation.php | 15 +- .../lang/cy/admin/accessories/general.php | 4 +- .../lang/cy/admin/accessories/message.php | 35 +- resources/lang/cy/admin/accessories/table.php | 9 +- .../lang/cy/admin/asset_maintenances/form.php | 2 +- .../cy/admin/asset_maintenances/message.php | 8 +- .../cy/admin/asset_maintenances/table.php | 2 +- .../lang/cy/admin/categories/general.php | 4 +- .../lang/cy/admin/categories/message.php | 22 +- resources/lang/cy/admin/categories/table.php | 6 +- resources/lang/cy/admin/companies/general.php | 1 + resources/lang/cy/admin/companies/message.php | 23 +- resources/lang/cy/admin/companies/table.php | 5 +- .../lang/cy/admin/components/general.php | 4 +- .../lang/cy/admin/components/message.php | 35 +- resources/lang/cy/admin/components/table.php | 4 +- .../lang/cy/admin/consumables/general.php | 4 +- .../lang/cy/admin/consumables/message.php | 35 +- resources/lang/cy/admin/consumables/table.php | 4 +- .../lang/cy/admin/custom_fields/general.php | 4 +- .../lang/cy/admin/custom_fields/message.php | 49 +- .../lang/cy/admin/departments/message.php | 22 +- resources/lang/cy/admin/departments/table.php | 4 +- .../lang/cy/admin/depreciations/general.php | 4 +- .../lang/cy/admin/depreciations/message.php | 23 +- .../lang/cy/admin/depreciations/table.php | 4 +- resources/lang/cy/admin/groups/message.php | 12 +- resources/lang/cy/admin/groups/table.php | 4 +- resources/lang/cy/admin/groups/titles.php | 4 +- resources/lang/cy/admin/hardware/form.php | 15 +- resources/lang/cy/admin/hardware/general.php | 6 +- resources/lang/cy/admin/hardware/message.php | 62 +- resources/lang/cy/admin/hardware/table.php | 6 +- resources/lang/cy/admin/kits/general.php | 4 +- resources/lang/cy/admin/licenses/form.php | 6 +- resources/lang/cy/admin/licenses/general.php | 4 +- resources/lang/cy/admin/licenses/message.php | 43 +- resources/lang/cy/admin/licenses/table.php | 4 +- resources/lang/cy/admin/locations/message.php | 23 +- resources/lang/cy/admin/locations/table.php | 4 +- .../lang/cy/admin/manufacturers/message.php | 28 +- .../lang/cy/admin/manufacturers/table.php | 4 +- resources/lang/cy/admin/models/general.php | 6 +- resources/lang/cy/admin/models/message.php | 39 +- resources/lang/cy/admin/models/table.php | 4 +- resources/lang/cy/admin/reports/general.php | 6 +- resources/lang/cy/admin/reports/message.php | 6 +- resources/lang/cy/admin/settings/general.php | 8 +- resources/lang/cy/admin/settings/message.php | 21 +- .../lang/cy/admin/statuslabels/message.php | 27 +- .../lang/cy/admin/statuslabels/table.php | 4 +- resources/lang/cy/admin/suppliers/message.php | 21 +- resources/lang/cy/admin/suppliers/table.php | 4 +- resources/lang/cy/admin/users/general.php | 7 +- resources/lang/cy/admin/users/message.php | 21 +- resources/lang/cy/admin/users/table.php | 8 +- resources/lang/cy/auth/general.php | 1 - resources/lang/cy/auth/message.php | 29 +- resources/lang/cy/button.php | 6 +- resources/lang/cy/general.php | 4 +- resources/lang/cy/help.php | 10 +- resources/lang/cy/mail.php | 6 +- resources/lang/cy/pagination.php | 4 +- resources/lang/cy/passwords.php | 1 - resources/lang/cy/reminders.php | 12 +- resources/lang/cy/table.php | 4 +- resources/lang/cy/validation.php | 13 +- .../lang/da/admin/accessories/general.php | 4 +- .../lang/da/admin/accessories/message.php | 35 +- resources/lang/da/admin/accessories/table.php | 9 +- .../lang/da/admin/asset_maintenances/form.php | 2 +- .../da/admin/asset_maintenances/message.php | 8 +- .../da/admin/asset_maintenances/table.php | 2 +- .../lang/da/admin/categories/general.php | 4 +- .../lang/da/admin/categories/message.php | 22 +- resources/lang/da/admin/categories/table.php | 6 +- resources/lang/da/admin/companies/general.php | 1 + resources/lang/da/admin/companies/message.php | 23 +- resources/lang/da/admin/companies/table.php | 5 +- .../lang/da/admin/components/general.php | 4 +- .../lang/da/admin/components/message.php | 35 +- resources/lang/da/admin/components/table.php | 4 +- .../lang/da/admin/consumables/general.php | 4 +- .../lang/da/admin/consumables/message.php | 35 +- resources/lang/da/admin/consumables/table.php | 4 +- .../lang/da/admin/custom_fields/general.php | 4 +- .../lang/da/admin/custom_fields/message.php | 49 +- .../lang/da/admin/departments/message.php | 22 +- resources/lang/da/admin/departments/table.php | 4 +- .../lang/da/admin/depreciations/general.php | 4 +- .../lang/da/admin/depreciations/message.php | 23 +- .../lang/da/admin/depreciations/table.php | 4 +- resources/lang/da/admin/groups/message.php | 12 +- resources/lang/da/admin/groups/table.php | 4 +- resources/lang/da/admin/groups/titles.php | 4 +- resources/lang/da/admin/hardware/form.php | 15 +- resources/lang/da/admin/hardware/general.php | 6 +- resources/lang/da/admin/hardware/message.php | 68 +- resources/lang/da/admin/hardware/table.php | 6 +- resources/lang/da/admin/kits/general.php | 4 +- resources/lang/da/admin/licenses/form.php | 6 +- resources/lang/da/admin/licenses/general.php | 4 +- resources/lang/da/admin/licenses/message.php | 43 +- resources/lang/da/admin/licenses/table.php | 4 +- resources/lang/da/admin/locations/message.php | 23 +- resources/lang/da/admin/locations/table.php | 4 +- .../lang/da/admin/manufacturers/message.php | 28 +- .../lang/da/admin/manufacturers/table.php | 4 +- resources/lang/da/admin/models/general.php | 6 +- resources/lang/da/admin/models/message.php | 39 +- resources/lang/da/admin/models/table.php | 4 +- resources/lang/da/admin/reports/general.php | 6 +- resources/lang/da/admin/reports/message.php | 6 +- resources/lang/da/admin/settings/general.php | 10 +- resources/lang/da/admin/settings/message.php | 21 +- .../lang/da/admin/statuslabels/message.php | 27 +- .../lang/da/admin/statuslabels/table.php | 4 +- resources/lang/da/admin/suppliers/message.php | 21 +- resources/lang/da/admin/suppliers/table.php | 4 +- resources/lang/da/admin/users/general.php | 7 +- resources/lang/da/admin/users/message.php | 21 +- resources/lang/da/admin/users/table.php | 8 +- resources/lang/da/auth/general.php | 1 - resources/lang/da/auth/message.php | 29 +- resources/lang/da/button.php | 6 +- resources/lang/da/general.php | 4 +- resources/lang/da/help.php | 10 +- resources/lang/da/mail.php | 6 +- resources/lang/da/pagination.php | 4 +- resources/lang/da/passwords.php | 1 - resources/lang/da/reminders.php | 12 +- resources/lang/da/table.php | 4 +- resources/lang/da/validation.php | 15 +- .../lang/de/admin/accessories/general.php | 4 +- .../lang/de/admin/accessories/message.php | 35 +- resources/lang/de/admin/accessories/table.php | 9 +- .../lang/de/admin/asset_maintenances/form.php | 2 +- .../de/admin/asset_maintenances/message.php | 8 +- .../de/admin/asset_maintenances/table.php | 2 +- .../lang/de/admin/categories/general.php | 4 +- .../lang/de/admin/categories/message.php | 22 +- resources/lang/de/admin/categories/table.php | 6 +- resources/lang/de/admin/companies/general.php | 1 + resources/lang/de/admin/companies/message.php | 23 +- resources/lang/de/admin/companies/table.php | 5 +- .../lang/de/admin/components/general.php | 4 +- .../lang/de/admin/components/message.php | 35 +- resources/lang/de/admin/components/table.php | 4 +- .../lang/de/admin/consumables/general.php | 4 +- .../lang/de/admin/consumables/message.php | 35 +- resources/lang/de/admin/consumables/table.php | 4 +- .../lang/de/admin/custom_fields/general.php | 4 +- .../lang/de/admin/custom_fields/message.php | 49 +- .../lang/de/admin/departments/message.php | 22 +- resources/lang/de/admin/departments/table.php | 4 +- .../lang/de/admin/depreciations/general.php | 4 +- .../lang/de/admin/depreciations/message.php | 23 +- .../lang/de/admin/depreciations/table.php | 4 +- resources/lang/de/admin/groups/message.php | 12 +- resources/lang/de/admin/groups/table.php | 4 +- resources/lang/de/admin/groups/titles.php | 4 +- resources/lang/de/admin/hardware/form.php | 15 +- resources/lang/de/admin/hardware/general.php | 6 +- resources/lang/de/admin/hardware/message.php | 68 +- resources/lang/de/admin/hardware/table.php | 6 +- resources/lang/de/admin/kits/general.php | 4 +- resources/lang/de/admin/licenses/form.php | 6 +- resources/lang/de/admin/licenses/general.php | 4 +- resources/lang/de/admin/licenses/message.php | 43 +- resources/lang/de/admin/licenses/table.php | 4 +- resources/lang/de/admin/locations/message.php | 23 +- resources/lang/de/admin/locations/table.php | 4 +- .../lang/de/admin/manufacturers/message.php | 28 +- .../lang/de/admin/manufacturers/table.php | 4 +- resources/lang/de/admin/models/general.php | 6 +- resources/lang/de/admin/models/message.php | 39 +- resources/lang/de/admin/models/table.php | 4 +- resources/lang/de/admin/reports/general.php | 6 +- resources/lang/de/admin/reports/message.php | 6 +- resources/lang/de/admin/settings/general.php | 10 +- resources/lang/de/admin/settings/message.php | 21 +- .../lang/de/admin/statuslabels/message.php | 27 +- .../lang/de/admin/statuslabels/table.php | 4 +- resources/lang/de/admin/suppliers/message.php | 21 +- resources/lang/de/admin/suppliers/table.php | 4 +- resources/lang/de/admin/users/general.php | 7 +- resources/lang/de/admin/users/message.php | 21 +- resources/lang/de/admin/users/table.php | 8 +- resources/lang/de/auth/general.php | 1 - resources/lang/de/auth/message.php | 29 +- resources/lang/de/button.php | 6 +- resources/lang/de/general.php | 4 +- resources/lang/de/help.php | 10 +- resources/lang/de/mail.php | 6 +- resources/lang/de/pagination.php | 4 +- resources/lang/de/passwords.php | 1 - resources/lang/de/reminders.php | 12 +- resources/lang/de/table.php | 4 +- resources/lang/de/validation.php | 15 +- .../lang/el/admin/accessories/general.php | 4 +- .../lang/el/admin/accessories/message.php | 35 +- resources/lang/el/admin/accessories/table.php | 9 +- .../lang/el/admin/asset_maintenances/form.php | 2 +- .../el/admin/asset_maintenances/message.php | 8 +- .../el/admin/asset_maintenances/table.php | 2 +- .../lang/el/admin/categories/general.php | 4 +- .../lang/el/admin/categories/message.php | 22 +- resources/lang/el/admin/categories/table.php | 6 +- resources/lang/el/admin/companies/general.php | 1 + resources/lang/el/admin/companies/message.php | 23 +- resources/lang/el/admin/companies/table.php | 5 +- .../lang/el/admin/components/general.php | 4 +- .../lang/el/admin/components/message.php | 35 +- resources/lang/el/admin/components/table.php | 4 +- .../lang/el/admin/consumables/general.php | 4 +- .../lang/el/admin/consumables/message.php | 35 +- resources/lang/el/admin/consumables/table.php | 4 +- .../lang/el/admin/custom_fields/general.php | 4 +- .../lang/el/admin/custom_fields/message.php | 49 +- .../lang/el/admin/departments/message.php | 22 +- resources/lang/el/admin/departments/table.php | 4 +- .../lang/el/admin/depreciations/general.php | 4 +- .../lang/el/admin/depreciations/message.php | 23 +- .../lang/el/admin/depreciations/table.php | 4 +- resources/lang/el/admin/groups/message.php | 12 +- resources/lang/el/admin/groups/table.php | 4 +- resources/lang/el/admin/groups/titles.php | 4 +- resources/lang/el/admin/hardware/form.php | 15 +- resources/lang/el/admin/hardware/general.php | 6 +- resources/lang/el/admin/hardware/message.php | 68 +- resources/lang/el/admin/hardware/table.php | 6 +- resources/lang/el/admin/kits/general.php | 4 +- resources/lang/el/admin/licenses/form.php | 6 +- resources/lang/el/admin/licenses/general.php | 4 +- resources/lang/el/admin/licenses/message.php | 43 +- resources/lang/el/admin/licenses/table.php | 4 +- resources/lang/el/admin/locations/message.php | 23 +- resources/lang/el/admin/locations/table.php | 4 +- .../lang/el/admin/manufacturers/message.php | 28 +- .../lang/el/admin/manufacturers/table.php | 4 +- resources/lang/el/admin/models/general.php | 6 +- resources/lang/el/admin/models/message.php | 39 +- resources/lang/el/admin/models/table.php | 4 +- resources/lang/el/admin/reports/general.php | 6 +- resources/lang/el/admin/reports/message.php | 6 +- resources/lang/el/admin/settings/general.php | 10 +- resources/lang/el/admin/settings/message.php | 21 +- .../lang/el/admin/statuslabels/message.php | 27 +- .../lang/el/admin/statuslabels/table.php | 4 +- resources/lang/el/admin/suppliers/message.php | 21 +- resources/lang/el/admin/suppliers/table.php | 4 +- resources/lang/el/admin/users/general.php | 7 +- resources/lang/el/admin/users/message.php | 21 +- resources/lang/el/admin/users/table.php | 8 +- resources/lang/el/auth/general.php | 1 - resources/lang/el/auth/message.php | 29 +- resources/lang/el/button.php | 6 +- resources/lang/el/general.php | 4 +- resources/lang/el/help.php | 10 +- resources/lang/el/mail.php | 6 +- resources/lang/el/pagination.php | 4 +- resources/lang/el/passwords.php | 1 - resources/lang/el/reminders.php | 12 +- resources/lang/el/table.php | 4 +- resources/lang/el/validation.php | 15 +- .../lang/en-GB/admin/accessories/general.php | 4 +- .../lang/en-GB/admin/accessories/message.php | 35 +- .../lang/en-GB/admin/accessories/table.php | 9 +- .../en-GB/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../en-GB/admin/asset_maintenances/table.php | 2 +- .../lang/en-GB/admin/categories/general.php | 4 +- .../lang/en-GB/admin/categories/message.php | 22 +- .../lang/en-GB/admin/categories/table.php | 6 +- .../lang/en-GB/admin/companies/general.php | 1 + .../lang/en-GB/admin/companies/message.php | 23 +- .../lang/en-GB/admin/companies/table.php | 5 +- .../lang/en-GB/admin/components/general.php | 4 +- .../lang/en-GB/admin/components/message.php | 35 +- .../lang/en-GB/admin/components/table.php | 4 +- .../lang/en-GB/admin/consumables/general.php | 4 +- .../lang/en-GB/admin/consumables/message.php | 35 +- .../lang/en-GB/admin/consumables/table.php | 4 +- .../en-GB/admin/custom_fields/general.php | 4 +- .../en-GB/admin/custom_fields/message.php | 49 +- .../lang/en-GB/admin/departments/message.php | 22 +- .../lang/en-GB/admin/departments/table.php | 4 +- .../en-GB/admin/depreciations/general.php | 4 +- .../en-GB/admin/depreciations/message.php | 23 +- .../lang/en-GB/admin/depreciations/table.php | 4 +- resources/lang/en-GB/admin/groups/message.php | 12 +- resources/lang/en-GB/admin/groups/table.php | 4 +- resources/lang/en-GB/admin/groups/titles.php | 4 +- resources/lang/en-GB/admin/hardware/form.php | 15 +- .../lang/en-GB/admin/hardware/general.php | 6 +- .../lang/en-GB/admin/hardware/message.php | 68 +- resources/lang/en-GB/admin/hardware/table.php | 6 +- resources/lang/en-GB/admin/kits/general.php | 4 +- resources/lang/en-GB/admin/licenses/form.php | 6 +- .../lang/en-GB/admin/licenses/general.php | 4 +- .../lang/en-GB/admin/licenses/message.php | 43 +- resources/lang/en-GB/admin/licenses/table.php | 4 +- .../lang/en-GB/admin/locations/message.php | 23 +- .../lang/en-GB/admin/locations/table.php | 4 +- .../en-GB/admin/manufacturers/message.php | 28 +- .../lang/en-GB/admin/manufacturers/table.php | 4 +- resources/lang/en-GB/admin/models/general.php | 6 +- resources/lang/en-GB/admin/models/message.php | 39 +- resources/lang/en-GB/admin/models/table.php | 4 +- .../lang/en-GB/admin/reports/general.php | 6 +- .../lang/en-GB/admin/reports/message.php | 6 +- .../lang/en-GB/admin/settings/general.php | 8 +- .../lang/en-GB/admin/settings/message.php | 21 +- .../lang/en-GB/admin/statuslabels/message.php | 27 +- .../lang/en-GB/admin/statuslabels/table.php | 4 +- .../lang/en-GB/admin/suppliers/message.php | 21 +- .../lang/en-GB/admin/suppliers/table.php | 4 +- resources/lang/en-GB/admin/users/general.php | 7 +- resources/lang/en-GB/admin/users/message.php | 21 +- resources/lang/en-GB/admin/users/table.php | 8 +- resources/lang/en-GB/auth/general.php | 1 - resources/lang/en-GB/auth/message.php | 29 +- resources/lang/en-GB/button.php | 6 +- resources/lang/en-GB/general.php | 4 +- resources/lang/en-GB/help.php | 10 +- resources/lang/en-GB/mail.php | 6 +- resources/lang/en-GB/pagination.php | 4 +- resources/lang/en-GB/passwords.php | 1 - resources/lang/en-GB/reminders.php | 12 +- resources/lang/en-GB/table.php | 4 +- resources/lang/en-GB/validation.php | 15 +- .../lang/en-ID/admin/accessories/general.php | 4 +- .../lang/en-ID/admin/accessories/message.php | 35 +- .../lang/en-ID/admin/accessories/table.php | 9 +- .../en-ID/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../en-ID/admin/asset_maintenances/table.php | 2 +- .../lang/en-ID/admin/categories/general.php | 4 +- .../lang/en-ID/admin/categories/message.php | 22 +- .../lang/en-ID/admin/categories/table.php | 6 +- .../lang/en-ID/admin/companies/general.php | 1 + .../lang/en-ID/admin/companies/message.php | 23 +- .../lang/en-ID/admin/companies/table.php | 5 +- .../lang/en-ID/admin/components/general.php | 4 +- .../lang/en-ID/admin/components/message.php | 35 +- .../lang/en-ID/admin/components/table.php | 4 +- .../lang/en-ID/admin/consumables/general.php | 4 +- .../lang/en-ID/admin/consumables/message.php | 35 +- .../lang/en-ID/admin/consumables/table.php | 4 +- .../en-ID/admin/custom_fields/general.php | 4 +- .../en-ID/admin/custom_fields/message.php | 49 +- .../lang/en-ID/admin/departments/message.php | 22 +- .../lang/en-ID/admin/departments/table.php | 4 +- .../en-ID/admin/depreciations/general.php | 4 +- .../en-ID/admin/depreciations/message.php | 23 +- .../lang/en-ID/admin/depreciations/table.php | 4 +- resources/lang/en-ID/admin/groups/message.php | 12 +- resources/lang/en-ID/admin/groups/table.php | 4 +- resources/lang/en-ID/admin/groups/titles.php | 4 +- resources/lang/en-ID/admin/hardware/form.php | 15 +- .../lang/en-ID/admin/hardware/general.php | 6 +- .../lang/en-ID/admin/hardware/message.php | 68 +- resources/lang/en-ID/admin/hardware/table.php | 6 +- resources/lang/en-ID/admin/kits/general.php | 4 +- resources/lang/en-ID/admin/licenses/form.php | 6 +- .../lang/en-ID/admin/licenses/general.php | 4 +- .../lang/en-ID/admin/licenses/message.php | 43 +- resources/lang/en-ID/admin/licenses/table.php | 4 +- .../lang/en-ID/admin/locations/message.php | 23 +- .../lang/en-ID/admin/locations/table.php | 4 +- .../en-ID/admin/manufacturers/message.php | 28 +- .../lang/en-ID/admin/manufacturers/table.php | 4 +- resources/lang/en-ID/admin/models/general.php | 6 +- resources/lang/en-ID/admin/models/message.php | 39 +- resources/lang/en-ID/admin/models/table.php | 4 +- .../lang/en-ID/admin/reports/general.php | 6 +- .../lang/en-ID/admin/reports/message.php | 6 +- .../lang/en-ID/admin/settings/general.php | 10 +- .../lang/en-ID/admin/settings/message.php | 21 +- .../lang/en-ID/admin/statuslabels/message.php | 27 +- .../lang/en-ID/admin/statuslabels/table.php | 4 +- .../lang/en-ID/admin/suppliers/message.php | 21 +- .../lang/en-ID/admin/suppliers/table.php | 4 +- resources/lang/en-ID/admin/users/general.php | 7 +- resources/lang/en-ID/admin/users/message.php | 21 +- resources/lang/en-ID/admin/users/table.php | 8 +- resources/lang/en-ID/auth/general.php | 1 - resources/lang/en-ID/auth/message.php | 29 +- resources/lang/en-ID/button.php | 6 +- resources/lang/en-ID/general.php | 4 +- resources/lang/en-ID/help.php | 10 +- resources/lang/en-ID/mail.php | 6 +- resources/lang/en-ID/pagination.php | 4 +- resources/lang/en-ID/passwords.php | 1 - resources/lang/en-ID/reminders.php | 12 +- resources/lang/en-ID/table.php | 4 +- resources/lang/en-ID/validation.php | 15 +- .../lang/en/admin/accessories/general.php | 4 +- .../lang/en/admin/accessories/message.php | 35 +- resources/lang/en/admin/accessories/table.php | 9 +- .../lang/en/admin/asset_maintenances/form.php | 2 +- .../en/admin/asset_maintenances/message.php | 8 +- .../en/admin/asset_maintenances/table.php | 2 +- .../lang/en/admin/categories/general.php | 4 +- .../lang/en/admin/categories/message.php | 22 +- resources/lang/en/admin/categories/table.php | 6 +- resources/lang/en/admin/companies/general.php | 1 + resources/lang/en/admin/companies/message.php | 23 +- resources/lang/en/admin/companies/table.php | 5 +- .../lang/en/admin/components/general.php | 4 +- .../lang/en/admin/components/message.php | 35 +- resources/lang/en/admin/components/table.php | 4 +- .../lang/en/admin/consumables/general.php | 4 +- .../lang/en/admin/consumables/message.php | 35 +- resources/lang/en/admin/consumables/table.php | 4 +- .../lang/en/admin/custom_fields/general.php | 4 +- .../lang/en/admin/custom_fields/message.php | 49 +- .../lang/en/admin/departments/message.php | 22 +- resources/lang/en/admin/departments/table.php | 4 +- .../lang/en/admin/depreciations/general.php | 4 +- .../lang/en/admin/depreciations/message.php | 23 +- .../lang/en/admin/depreciations/table.php | 4 +- resources/lang/en/admin/groups/message.php | 12 +- resources/lang/en/admin/groups/table.php | 4 +- resources/lang/en/admin/groups/titles.php | 4 +- resources/lang/en/admin/hardware/form.php | 15 +- resources/lang/en/admin/hardware/general.php | 6 +- resources/lang/en/admin/hardware/message.php | 68 +- resources/lang/en/admin/hardware/table.php | 6 +- resources/lang/en/admin/kits/general.php | 4 +- resources/lang/en/admin/licenses/form.php | 6 +- resources/lang/en/admin/licenses/general.php | 4 +- resources/lang/en/admin/licenses/message.php | 43 +- resources/lang/en/admin/licenses/table.php | 4 +- resources/lang/en/admin/locations/message.php | 23 +- resources/lang/en/admin/locations/table.php | 4 +- .../lang/en/admin/manufacturers/message.php | 28 +- .../lang/en/admin/manufacturers/table.php | 4 +- resources/lang/en/admin/models/general.php | 6 +- resources/lang/en/admin/models/message.php | 39 +- resources/lang/en/admin/models/table.php | 4 +- resources/lang/en/admin/reports/general.php | 6 +- resources/lang/en/admin/reports/message.php | 6 +- resources/lang/en/admin/settings/general.php | 8 +- resources/lang/en/admin/settings/message.php | 21 +- .../lang/en/admin/statuslabels/message.php | 27 +- .../lang/en/admin/statuslabels/table.php | 4 +- resources/lang/en/admin/suppliers/message.php | 21 +- resources/lang/en/admin/suppliers/table.php | 4 +- resources/lang/en/admin/users/general.php | 7 +- resources/lang/en/admin/users/message.php | 22 +- resources/lang/en/admin/users/table.php | 8 +- resources/lang/en/auth/general.php | 1 - resources/lang/en/auth/message.php | 29 +- resources/lang/en/button.php | 6 +- resources/lang/en/general.php | 4 +- resources/lang/en/help.php | 10 +- resources/lang/en/mail.php | 6 +- resources/lang/en/pagination.php | 4 +- resources/lang/en/passwords.php | 1 - resources/lang/en/reminders.php | 12 +- resources/lang/en/table.php | 4 +- resources/lang/en/validation.php | 17 +- .../lang/es-CO/admin/accessories/general.php | 4 +- .../lang/es-CO/admin/accessories/message.php | 35 +- .../lang/es-CO/admin/accessories/table.php | 9 +- .../es-CO/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../es-CO/admin/asset_maintenances/table.php | 2 +- .../lang/es-CO/admin/categories/general.php | 4 +- .../lang/es-CO/admin/categories/message.php | 22 +- .../lang/es-CO/admin/categories/table.php | 6 +- .../lang/es-CO/admin/companies/general.php | 1 + .../lang/es-CO/admin/companies/message.php | 23 +- .../lang/es-CO/admin/companies/table.php | 5 +- .../lang/es-CO/admin/components/general.php | 4 +- .../lang/es-CO/admin/components/message.php | 35 +- .../lang/es-CO/admin/components/table.php | 4 +- .../lang/es-CO/admin/consumables/general.php | 4 +- .../lang/es-CO/admin/consumables/message.php | 35 +- .../lang/es-CO/admin/consumables/table.php | 4 +- .../es-CO/admin/custom_fields/general.php | 4 +- .../es-CO/admin/custom_fields/message.php | 49 +- .../lang/es-CO/admin/departments/message.php | 22 +- .../lang/es-CO/admin/departments/table.php | 4 +- .../es-CO/admin/depreciations/general.php | 4 +- .../es-CO/admin/depreciations/message.php | 23 +- .../lang/es-CO/admin/depreciations/table.php | 4 +- resources/lang/es-CO/admin/groups/message.php | 12 +- resources/lang/es-CO/admin/groups/table.php | 4 +- resources/lang/es-CO/admin/groups/titles.php | 4 +- resources/lang/es-CO/admin/hardware/form.php | 15 +- .../lang/es-CO/admin/hardware/general.php | 6 +- .../lang/es-CO/admin/hardware/message.php | 68 +- resources/lang/es-CO/admin/hardware/table.php | 6 +- resources/lang/es-CO/admin/kits/general.php | 4 +- resources/lang/es-CO/admin/licenses/form.php | 6 +- .../lang/es-CO/admin/licenses/general.php | 4 +- .../lang/es-CO/admin/licenses/message.php | 43 +- resources/lang/es-CO/admin/licenses/table.php | 4 +- .../lang/es-CO/admin/locations/message.php | 23 +- .../lang/es-CO/admin/locations/table.php | 4 +- .../es-CO/admin/manufacturers/message.php | 28 +- .../lang/es-CO/admin/manufacturers/table.php | 4 +- resources/lang/es-CO/admin/models/general.php | 6 +- resources/lang/es-CO/admin/models/message.php | 39 +- resources/lang/es-CO/admin/models/table.php | 4 +- .../lang/es-CO/admin/reports/general.php | 6 +- .../lang/es-CO/admin/reports/message.php | 6 +- .../lang/es-CO/admin/settings/general.php | 10 +- .../lang/es-CO/admin/settings/message.php | 21 +- .../lang/es-CO/admin/statuslabels/message.php | 27 +- .../lang/es-CO/admin/statuslabels/table.php | 4 +- .../lang/es-CO/admin/suppliers/message.php | 21 +- .../lang/es-CO/admin/suppliers/table.php | 4 +- resources/lang/es-CO/admin/users/general.php | 7 +- resources/lang/es-CO/admin/users/message.php | 21 +- resources/lang/es-CO/admin/users/table.php | 8 +- resources/lang/es-CO/auth/general.php | 1 - resources/lang/es-CO/auth/message.php | 29 +- resources/lang/es-CO/button.php | 6 +- resources/lang/es-CO/general.php | 4 +- resources/lang/es-CO/help.php | 10 +- resources/lang/es-CO/mail.php | 6 +- resources/lang/es-CO/pagination.php | 4 +- resources/lang/es-CO/passwords.php | 1 - resources/lang/es-CO/reminders.php | 12 +- resources/lang/es-CO/table.php | 4 +- resources/lang/es-CO/validation.php | 15 +- .../lang/es-ES/admin/accessories/general.php | 4 +- .../lang/es-ES/admin/accessories/message.php | 35 +- .../lang/es-ES/admin/accessories/table.php | 9 +- .../es-ES/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../es-ES/admin/asset_maintenances/table.php | 2 +- .../lang/es-ES/admin/categories/general.php | 4 +- .../lang/es-ES/admin/categories/message.php | 22 +- .../lang/es-ES/admin/categories/table.php | 6 +- .../lang/es-ES/admin/companies/general.php | 1 + .../lang/es-ES/admin/companies/message.php | 23 +- .../lang/es-ES/admin/companies/table.php | 5 +- .../lang/es-ES/admin/components/general.php | 4 +- .../lang/es-ES/admin/components/message.php | 35 +- .../lang/es-ES/admin/components/table.php | 4 +- .../lang/es-ES/admin/consumables/general.php | 4 +- .../lang/es-ES/admin/consumables/message.php | 35 +- .../lang/es-ES/admin/consumables/table.php | 4 +- .../es-ES/admin/custom_fields/general.php | 4 +- .../es-ES/admin/custom_fields/message.php | 49 +- .../lang/es-ES/admin/departments/message.php | 22 +- .../lang/es-ES/admin/departments/table.php | 4 +- .../es-ES/admin/depreciations/general.php | 4 +- .../es-ES/admin/depreciations/message.php | 23 +- .../lang/es-ES/admin/depreciations/table.php | 4 +- resources/lang/es-ES/admin/groups/message.php | 12 +- resources/lang/es-ES/admin/groups/table.php | 4 +- resources/lang/es-ES/admin/groups/titles.php | 4 +- resources/lang/es-ES/admin/hardware/form.php | 15 +- .../lang/es-ES/admin/hardware/general.php | 6 +- .../lang/es-ES/admin/hardware/message.php | 68 +- resources/lang/es-ES/admin/hardware/table.php | 6 +- resources/lang/es-ES/admin/kits/general.php | 4 +- resources/lang/es-ES/admin/licenses/form.php | 6 +- .../lang/es-ES/admin/licenses/general.php | 4 +- .../lang/es-ES/admin/licenses/message.php | 43 +- resources/lang/es-ES/admin/licenses/table.php | 4 +- .../lang/es-ES/admin/locations/message.php | 23 +- .../lang/es-ES/admin/locations/table.php | 4 +- .../es-ES/admin/manufacturers/message.php | 28 +- .../lang/es-ES/admin/manufacturers/table.php | 4 +- resources/lang/es-ES/admin/models/general.php | 6 +- resources/lang/es-ES/admin/models/message.php | 39 +- resources/lang/es-ES/admin/models/table.php | 4 +- .../lang/es-ES/admin/reports/general.php | 6 +- .../lang/es-ES/admin/reports/message.php | 6 +- .../lang/es-ES/admin/settings/general.php | 10 +- .../lang/es-ES/admin/settings/message.php | 21 +- .../lang/es-ES/admin/statuslabels/message.php | 27 +- .../lang/es-ES/admin/statuslabels/table.php | 4 +- .../lang/es-ES/admin/suppliers/message.php | 21 +- .../lang/es-ES/admin/suppliers/table.php | 4 +- resources/lang/es-ES/admin/users/general.php | 7 +- resources/lang/es-ES/admin/users/message.php | 21 +- resources/lang/es-ES/admin/users/table.php | 8 +- resources/lang/es-ES/auth/general.php | 1 - resources/lang/es-ES/auth/message.php | 29 +- resources/lang/es-ES/button.php | 6 +- resources/lang/es-ES/general.php | 4 +- resources/lang/es-ES/help.php | 10 +- resources/lang/es-ES/mail.php | 6 +- resources/lang/es-ES/pagination.php | 4 +- resources/lang/es-ES/passwords.php | 1 - resources/lang/es-ES/reminders.php | 12 +- resources/lang/es-ES/table.php | 4 +- resources/lang/es-ES/validation.php | 15 +- .../lang/es-MX/admin/accessories/general.php | 4 +- .../lang/es-MX/admin/accessories/message.php | 35 +- .../lang/es-MX/admin/accessories/table.php | 9 +- .../es-MX/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../es-MX/admin/asset_maintenances/table.php | 2 +- .../lang/es-MX/admin/categories/general.php | 4 +- .../lang/es-MX/admin/categories/message.php | 22 +- .../lang/es-MX/admin/categories/table.php | 6 +- .../lang/es-MX/admin/companies/general.php | 1 + .../lang/es-MX/admin/companies/message.php | 23 +- .../lang/es-MX/admin/companies/table.php | 5 +- .../lang/es-MX/admin/components/general.php | 4 +- .../lang/es-MX/admin/components/message.php | 35 +- .../lang/es-MX/admin/components/table.php | 4 +- .../lang/es-MX/admin/consumables/general.php | 4 +- .../lang/es-MX/admin/consumables/message.php | 35 +- .../lang/es-MX/admin/consumables/table.php | 4 +- .../es-MX/admin/custom_fields/general.php | 4 +- .../es-MX/admin/custom_fields/message.php | 49 +- .../lang/es-MX/admin/departments/message.php | 22 +- .../lang/es-MX/admin/departments/table.php | 4 +- .../es-MX/admin/depreciations/general.php | 4 +- .../es-MX/admin/depreciations/message.php | 23 +- .../lang/es-MX/admin/depreciations/table.php | 4 +- resources/lang/es-MX/admin/groups/message.php | 12 +- resources/lang/es-MX/admin/groups/table.php | 4 +- resources/lang/es-MX/admin/groups/titles.php | 4 +- resources/lang/es-MX/admin/hardware/form.php | 15 +- .../lang/es-MX/admin/hardware/general.php | 6 +- .../lang/es-MX/admin/hardware/message.php | 68 +- resources/lang/es-MX/admin/hardware/table.php | 6 +- resources/lang/es-MX/admin/kits/general.php | 4 +- resources/lang/es-MX/admin/licenses/form.php | 6 +- .../lang/es-MX/admin/licenses/general.php | 4 +- .../lang/es-MX/admin/licenses/message.php | 43 +- resources/lang/es-MX/admin/licenses/table.php | 4 +- .../lang/es-MX/admin/locations/message.php | 23 +- .../lang/es-MX/admin/locations/table.php | 4 +- .../es-MX/admin/manufacturers/message.php | 28 +- .../lang/es-MX/admin/manufacturers/table.php | 4 +- resources/lang/es-MX/admin/models/general.php | 6 +- resources/lang/es-MX/admin/models/message.php | 39 +- resources/lang/es-MX/admin/models/table.php | 4 +- .../lang/es-MX/admin/reports/general.php | 6 +- .../lang/es-MX/admin/reports/message.php | 6 +- .../lang/es-MX/admin/settings/general.php | 10 +- .../lang/es-MX/admin/settings/message.php | 21 +- .../lang/es-MX/admin/statuslabels/message.php | 27 +- .../lang/es-MX/admin/statuslabels/table.php | 4 +- .../lang/es-MX/admin/suppliers/message.php | 21 +- .../lang/es-MX/admin/suppliers/table.php | 4 +- resources/lang/es-MX/admin/users/general.php | 7 +- resources/lang/es-MX/admin/users/message.php | 21 +- resources/lang/es-MX/admin/users/table.php | 8 +- resources/lang/es-MX/auth/general.php | 1 - resources/lang/es-MX/auth/message.php | 29 +- resources/lang/es-MX/button.php | 6 +- resources/lang/es-MX/general.php | 4 +- resources/lang/es-MX/help.php | 10 +- resources/lang/es-MX/mail.php | 6 +- resources/lang/es-MX/pagination.php | 4 +- resources/lang/es-MX/passwords.php | 1 - resources/lang/es-MX/reminders.php | 12 +- resources/lang/es-MX/table.php | 4 +- resources/lang/es-MX/validation.php | 15 +- .../lang/es-VE/admin/accessories/general.php | 4 +- .../lang/es-VE/admin/accessories/message.php | 35 +- .../lang/es-VE/admin/accessories/table.php | 9 +- .../es-VE/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../es-VE/admin/asset_maintenances/table.php | 2 +- .../lang/es-VE/admin/categories/general.php | 4 +- .../lang/es-VE/admin/categories/message.php | 22 +- .../lang/es-VE/admin/categories/table.php | 6 +- .../lang/es-VE/admin/companies/general.php | 1 + .../lang/es-VE/admin/companies/message.php | 23 +- .../lang/es-VE/admin/companies/table.php | 5 +- .../lang/es-VE/admin/components/general.php | 4 +- .../lang/es-VE/admin/components/message.php | 35 +- .../lang/es-VE/admin/components/table.php | 4 +- .../lang/es-VE/admin/consumables/general.php | 4 +- .../lang/es-VE/admin/consumables/message.php | 35 +- .../lang/es-VE/admin/consumables/table.php | 4 +- .../es-VE/admin/custom_fields/general.php | 4 +- .../es-VE/admin/custom_fields/message.php | 49 +- .../lang/es-VE/admin/departments/message.php | 22 +- .../lang/es-VE/admin/departments/table.php | 4 +- .../es-VE/admin/depreciations/general.php | 4 +- .../es-VE/admin/depreciations/message.php | 23 +- .../lang/es-VE/admin/depreciations/table.php | 4 +- resources/lang/es-VE/admin/groups/message.php | 12 +- resources/lang/es-VE/admin/groups/table.php | 4 +- resources/lang/es-VE/admin/groups/titles.php | 4 +- resources/lang/es-VE/admin/hardware/form.php | 15 +- .../lang/es-VE/admin/hardware/general.php | 6 +- .../lang/es-VE/admin/hardware/message.php | 68 +- resources/lang/es-VE/admin/hardware/table.php | 6 +- resources/lang/es-VE/admin/kits/general.php | 4 +- resources/lang/es-VE/admin/licenses/form.php | 6 +- .../lang/es-VE/admin/licenses/general.php | 4 +- .../lang/es-VE/admin/licenses/message.php | 43 +- resources/lang/es-VE/admin/licenses/table.php | 4 +- .../lang/es-VE/admin/locations/message.php | 23 +- .../lang/es-VE/admin/locations/table.php | 4 +- .../es-VE/admin/manufacturers/message.php | 28 +- .../lang/es-VE/admin/manufacturers/table.php | 4 +- resources/lang/es-VE/admin/models/general.php | 6 +- resources/lang/es-VE/admin/models/message.php | 39 +- resources/lang/es-VE/admin/models/table.php | 4 +- .../lang/es-VE/admin/reports/general.php | 6 +- .../lang/es-VE/admin/reports/message.php | 6 +- .../lang/es-VE/admin/settings/general.php | 10 +- .../lang/es-VE/admin/settings/message.php | 21 +- .../lang/es-VE/admin/statuslabels/message.php | 27 +- .../lang/es-VE/admin/statuslabels/table.php | 4 +- .../lang/es-VE/admin/suppliers/message.php | 21 +- .../lang/es-VE/admin/suppliers/table.php | 4 +- resources/lang/es-VE/admin/users/general.php | 7 +- resources/lang/es-VE/admin/users/message.php | 21 +- resources/lang/es-VE/admin/users/table.php | 8 +- resources/lang/es-VE/auth/general.php | 1 - resources/lang/es-VE/auth/message.php | 29 +- resources/lang/es-VE/button.php | 6 +- resources/lang/es-VE/general.php | 4 +- resources/lang/es-VE/help.php | 10 +- resources/lang/es-VE/mail.php | 6 +- resources/lang/es-VE/pagination.php | 4 +- resources/lang/es-VE/passwords.php | 1 - resources/lang/es-VE/reminders.php | 12 +- resources/lang/es-VE/table.php | 4 +- resources/lang/es-VE/validation.php | 15 +- .../lang/et/admin/accessories/general.php | 4 +- .../lang/et/admin/accessories/message.php | 35 +- resources/lang/et/admin/accessories/table.php | 9 +- .../lang/et/admin/asset_maintenances/form.php | 2 +- .../et/admin/asset_maintenances/message.php | 8 +- .../et/admin/asset_maintenances/table.php | 2 +- .../lang/et/admin/categories/general.php | 4 +- .../lang/et/admin/categories/message.php | 22 +- resources/lang/et/admin/categories/table.php | 6 +- resources/lang/et/admin/companies/general.php | 1 + resources/lang/et/admin/companies/message.php | 23 +- resources/lang/et/admin/companies/table.php | 5 +- .../lang/et/admin/components/general.php | 4 +- .../lang/et/admin/components/message.php | 35 +- resources/lang/et/admin/components/table.php | 4 +- .../lang/et/admin/consumables/general.php | 4 +- .../lang/et/admin/consumables/message.php | 35 +- resources/lang/et/admin/consumables/table.php | 4 +- .../lang/et/admin/custom_fields/general.php | 4 +- .../lang/et/admin/custom_fields/message.php | 49 +- .../lang/et/admin/departments/message.php | 22 +- resources/lang/et/admin/departments/table.php | 4 +- .../lang/et/admin/depreciations/general.php | 4 +- .../lang/et/admin/depreciations/message.php | 23 +- .../lang/et/admin/depreciations/table.php | 4 +- resources/lang/et/admin/groups/message.php | 12 +- resources/lang/et/admin/groups/table.php | 4 +- resources/lang/et/admin/groups/titles.php | 4 +- resources/lang/et/admin/hardware/form.php | 15 +- resources/lang/et/admin/hardware/general.php | 6 +- resources/lang/et/admin/hardware/message.php | 68 +- resources/lang/et/admin/hardware/table.php | 6 +- resources/lang/et/admin/kits/general.php | 4 +- resources/lang/et/admin/licenses/form.php | 6 +- resources/lang/et/admin/licenses/general.php | 4 +- resources/lang/et/admin/licenses/message.php | 43 +- resources/lang/et/admin/licenses/table.php | 4 +- resources/lang/et/admin/locations/message.php | 23 +- resources/lang/et/admin/locations/table.php | 4 +- .../lang/et/admin/manufacturers/message.php | 28 +- .../lang/et/admin/manufacturers/table.php | 4 +- resources/lang/et/admin/models/general.php | 6 +- resources/lang/et/admin/models/message.php | 39 +- resources/lang/et/admin/models/table.php | 4 +- resources/lang/et/admin/reports/general.php | 6 +- resources/lang/et/admin/reports/message.php | 6 +- resources/lang/et/admin/settings/general.php | 10 +- resources/lang/et/admin/settings/message.php | 21 +- .../lang/et/admin/statuslabels/message.php | 27 +- .../lang/et/admin/statuslabels/table.php | 4 +- resources/lang/et/admin/suppliers/message.php | 21 +- resources/lang/et/admin/suppliers/table.php | 4 +- resources/lang/et/admin/users/general.php | 7 +- resources/lang/et/admin/users/message.php | 21 +- resources/lang/et/admin/users/table.php | 8 +- resources/lang/et/auth/general.php | 1 - resources/lang/et/auth/message.php | 29 +- resources/lang/et/button.php | 6 +- resources/lang/et/general.php | 4 +- resources/lang/et/help.php | 10 +- resources/lang/et/mail.php | 6 +- resources/lang/et/pagination.php | 4 +- resources/lang/et/passwords.php | 1 - resources/lang/et/reminders.php | 12 +- resources/lang/et/table.php | 4 +- resources/lang/et/validation.php | 15 +- .../lang/fa/admin/accessories/general.php | 4 +- .../lang/fa/admin/accessories/message.php | 35 +- resources/lang/fa/admin/accessories/table.php | 9 +- .../lang/fa/admin/asset_maintenances/form.php | 2 +- .../fa/admin/asset_maintenances/message.php | 8 +- .../fa/admin/asset_maintenances/table.php | 2 +- .../lang/fa/admin/categories/general.php | 4 +- .../lang/fa/admin/categories/message.php | 22 +- resources/lang/fa/admin/categories/table.php | 6 +- resources/lang/fa/admin/companies/general.php | 1 + resources/lang/fa/admin/companies/message.php | 23 +- resources/lang/fa/admin/companies/table.php | 5 +- .../lang/fa/admin/components/general.php | 4 +- .../lang/fa/admin/components/message.php | 35 +- resources/lang/fa/admin/components/table.php | 4 +- .../lang/fa/admin/consumables/general.php | 4 +- .../lang/fa/admin/consumables/message.php | 35 +- resources/lang/fa/admin/consumables/table.php | 4 +- .../lang/fa/admin/custom_fields/general.php | 4 +- .../lang/fa/admin/custom_fields/message.php | 49 +- .../lang/fa/admin/departments/message.php | 22 +- resources/lang/fa/admin/departments/table.php | 4 +- .../lang/fa/admin/depreciations/general.php | 4 +- .../lang/fa/admin/depreciations/message.php | 23 +- .../lang/fa/admin/depreciations/table.php | 4 +- resources/lang/fa/admin/groups/message.php | 12 +- resources/lang/fa/admin/groups/table.php | 4 +- resources/lang/fa/admin/groups/titles.php | 4 +- resources/lang/fa/admin/hardware/form.php | 15 +- resources/lang/fa/admin/hardware/general.php | 6 +- resources/lang/fa/admin/hardware/message.php | 68 +- resources/lang/fa/admin/hardware/table.php | 6 +- resources/lang/fa/admin/kits/general.php | 4 +- resources/lang/fa/admin/licenses/form.php | 6 +- resources/lang/fa/admin/licenses/general.php | 4 +- resources/lang/fa/admin/licenses/message.php | 43 +- resources/lang/fa/admin/licenses/table.php | 4 +- resources/lang/fa/admin/locations/message.php | 23 +- resources/lang/fa/admin/locations/table.php | 4 +- .../lang/fa/admin/manufacturers/message.php | 28 +- .../lang/fa/admin/manufacturers/table.php | 4 +- resources/lang/fa/admin/models/general.php | 6 +- resources/lang/fa/admin/models/message.php | 39 +- resources/lang/fa/admin/models/table.php | 4 +- resources/lang/fa/admin/reports/general.php | 6 +- resources/lang/fa/admin/reports/message.php | 6 +- resources/lang/fa/admin/settings/general.php | 10 +- resources/lang/fa/admin/settings/message.php | 21 +- .../lang/fa/admin/statuslabels/message.php | 27 +- .../lang/fa/admin/statuslabels/table.php | 4 +- resources/lang/fa/admin/suppliers/message.php | 21 +- resources/lang/fa/admin/suppliers/table.php | 4 +- resources/lang/fa/admin/users/general.php | 7 +- resources/lang/fa/admin/users/message.php | 21 +- resources/lang/fa/admin/users/table.php | 8 +- resources/lang/fa/auth/general.php | 1 - resources/lang/fa/auth/message.php | 29 +- resources/lang/fa/button.php | 6 +- resources/lang/fa/general.php | 4 +- resources/lang/fa/help.php | 10 +- resources/lang/fa/mail.php | 6 +- resources/lang/fa/pagination.php | 4 +- resources/lang/fa/passwords.php | 1 - resources/lang/fa/reminders.php | 18 +- resources/lang/fa/table.php | 4 +- resources/lang/fa/validation.php | 15 +- .../lang/fi/admin/accessories/general.php | 4 +- .../lang/fi/admin/accessories/message.php | 35 +- resources/lang/fi/admin/accessories/table.php | 9 +- .../lang/fi/admin/asset_maintenances/form.php | 2 +- .../fi/admin/asset_maintenances/message.php | 8 +- .../fi/admin/asset_maintenances/table.php | 2 +- .../lang/fi/admin/categories/general.php | 4 +- .../lang/fi/admin/categories/message.php | 22 +- resources/lang/fi/admin/categories/table.php | 6 +- resources/lang/fi/admin/companies/general.php | 1 + resources/lang/fi/admin/companies/message.php | 23 +- resources/lang/fi/admin/companies/table.php | 5 +- .../lang/fi/admin/components/general.php | 4 +- .../lang/fi/admin/components/message.php | 35 +- resources/lang/fi/admin/components/table.php | 4 +- .../lang/fi/admin/consumables/general.php | 4 +- .../lang/fi/admin/consumables/message.php | 35 +- resources/lang/fi/admin/consumables/table.php | 4 +- .../lang/fi/admin/custom_fields/general.php | 4 +- .../lang/fi/admin/custom_fields/message.php | 49 +- .../lang/fi/admin/departments/message.php | 22 +- resources/lang/fi/admin/departments/table.php | 4 +- .../lang/fi/admin/depreciations/general.php | 4 +- .../lang/fi/admin/depreciations/message.php | 23 +- .../lang/fi/admin/depreciations/table.php | 4 +- resources/lang/fi/admin/groups/message.php | 12 +- resources/lang/fi/admin/groups/table.php | 4 +- resources/lang/fi/admin/groups/titles.php | 4 +- resources/lang/fi/admin/hardware/form.php | 15 +- resources/lang/fi/admin/hardware/general.php | 6 +- resources/lang/fi/admin/hardware/message.php | 68 +- resources/lang/fi/admin/hardware/table.php | 6 +- resources/lang/fi/admin/kits/general.php | 4 +- resources/lang/fi/admin/licenses/form.php | 6 +- resources/lang/fi/admin/licenses/general.php | 4 +- resources/lang/fi/admin/licenses/message.php | 43 +- resources/lang/fi/admin/licenses/table.php | 4 +- resources/lang/fi/admin/locations/message.php | 23 +- resources/lang/fi/admin/locations/table.php | 4 +- .../lang/fi/admin/manufacturers/message.php | 28 +- .../lang/fi/admin/manufacturers/table.php | 4 +- resources/lang/fi/admin/models/general.php | 6 +- resources/lang/fi/admin/models/message.php | 39 +- resources/lang/fi/admin/models/table.php | 4 +- resources/lang/fi/admin/reports/general.php | 6 +- resources/lang/fi/admin/reports/message.php | 6 +- resources/lang/fi/admin/settings/general.php | 10 +- resources/lang/fi/admin/settings/message.php | 21 +- .../lang/fi/admin/statuslabels/message.php | 27 +- .../lang/fi/admin/statuslabels/table.php | 4 +- resources/lang/fi/admin/suppliers/message.php | 21 +- resources/lang/fi/admin/suppliers/table.php | 4 +- resources/lang/fi/admin/users/general.php | 7 +- resources/lang/fi/admin/users/message.php | 21 +- resources/lang/fi/admin/users/table.php | 8 +- resources/lang/fi/auth/general.php | 1 - resources/lang/fi/auth/message.php | 29 +- resources/lang/fi/button.php | 6 +- resources/lang/fi/general.php | 4 +- resources/lang/fi/help.php | 10 +- resources/lang/fi/mail.php | 6 +- resources/lang/fi/pagination.php | 4 +- resources/lang/fi/passwords.php | 1 - resources/lang/fi/reminders.php | 12 +- resources/lang/fi/table.php | 4 +- resources/lang/fi/validation.php | 15 +- .../lang/fil/admin/accessories/general.php | 4 +- .../lang/fil/admin/accessories/message.php | 35 +- .../lang/fil/admin/accessories/table.php | 9 +- .../fil/admin/asset_maintenances/form.php | 2 +- .../fil/admin/asset_maintenances/message.php | 8 +- .../fil/admin/asset_maintenances/table.php | 2 +- .../lang/fil/admin/categories/general.php | 4 +- .../lang/fil/admin/categories/message.php | 22 +- resources/lang/fil/admin/categories/table.php | 6 +- .../lang/fil/admin/companies/general.php | 1 + .../lang/fil/admin/companies/message.php | 23 +- resources/lang/fil/admin/companies/table.php | 5 +- .../lang/fil/admin/components/general.php | 4 +- .../lang/fil/admin/components/message.php | 35 +- resources/lang/fil/admin/components/table.php | 4 +- .../lang/fil/admin/consumables/general.php | 4 +- .../lang/fil/admin/consumables/message.php | 35 +- .../lang/fil/admin/consumables/table.php | 4 +- .../lang/fil/admin/custom_fields/general.php | 4 +- .../lang/fil/admin/custom_fields/message.php | 49 +- .../lang/fil/admin/departments/message.php | 22 +- .../lang/fil/admin/departments/table.php | 4 +- .../lang/fil/admin/depreciations/general.php | 4 +- .../lang/fil/admin/depreciations/message.php | 23 +- .../lang/fil/admin/depreciations/table.php | 4 +- resources/lang/fil/admin/groups/message.php | 12 +- resources/lang/fil/admin/groups/table.php | 4 +- resources/lang/fil/admin/groups/titles.php | 4 +- resources/lang/fil/admin/hardware/form.php | 15 +- resources/lang/fil/admin/hardware/general.php | 6 +- resources/lang/fil/admin/hardware/message.php | 68 +- resources/lang/fil/admin/hardware/table.php | 6 +- resources/lang/fil/admin/kits/general.php | 4 +- resources/lang/fil/admin/licenses/form.php | 6 +- resources/lang/fil/admin/licenses/general.php | 4 +- resources/lang/fil/admin/licenses/message.php | 43 +- resources/lang/fil/admin/licenses/table.php | 4 +- .../lang/fil/admin/locations/message.php | 23 +- resources/lang/fil/admin/locations/table.php | 4 +- .../lang/fil/admin/manufacturers/message.php | 28 +- .../lang/fil/admin/manufacturers/table.php | 4 +- resources/lang/fil/admin/models/general.php | 6 +- resources/lang/fil/admin/models/message.php | 39 +- resources/lang/fil/admin/models/table.php | 4 +- resources/lang/fil/admin/reports/general.php | 6 +- resources/lang/fil/admin/reports/message.php | 6 +- resources/lang/fil/admin/settings/general.php | 10 +- resources/lang/fil/admin/settings/message.php | 21 +- .../lang/fil/admin/statuslabels/message.php | 27 +- .../lang/fil/admin/statuslabels/table.php | 4 +- .../lang/fil/admin/suppliers/message.php | 21 +- resources/lang/fil/admin/suppliers/table.php | 4 +- resources/lang/fil/admin/users/general.php | 7 +- resources/lang/fil/admin/users/message.php | 21 +- resources/lang/fil/admin/users/table.php | 8 +- resources/lang/fil/auth/general.php | 1 - resources/lang/fil/auth/message.php | 29 +- resources/lang/fil/button.php | 6 +- resources/lang/fil/general.php | 4 +- resources/lang/fil/help.php | 10 +- resources/lang/fil/mail.php | 6 +- resources/lang/fil/pagination.php | 4 +- resources/lang/fil/passwords.php | 1 - resources/lang/fil/reminders.php | 12 +- resources/lang/fil/table.php | 4 +- resources/lang/fil/validation.php | 15 +- .../lang/fr/admin/accessories/general.php | 4 +- .../lang/fr/admin/accessories/message.php | 35 +- resources/lang/fr/admin/accessories/table.php | 9 +- .../lang/fr/admin/asset_maintenances/form.php | 2 +- .../fr/admin/asset_maintenances/message.php | 8 +- .../fr/admin/asset_maintenances/table.php | 2 +- .../lang/fr/admin/categories/general.php | 4 +- .../lang/fr/admin/categories/message.php | 22 +- resources/lang/fr/admin/categories/table.php | 6 +- resources/lang/fr/admin/companies/general.php | 1 + resources/lang/fr/admin/companies/message.php | 23 +- resources/lang/fr/admin/companies/table.php | 5 +- .../lang/fr/admin/components/general.php | 4 +- .../lang/fr/admin/components/message.php | 35 +- resources/lang/fr/admin/components/table.php | 4 +- .../lang/fr/admin/consumables/general.php | 4 +- .../lang/fr/admin/consumables/message.php | 35 +- resources/lang/fr/admin/consumables/table.php | 4 +- .../lang/fr/admin/custom_fields/general.php | 4 +- .../lang/fr/admin/custom_fields/message.php | 49 +- .../lang/fr/admin/departments/message.php | 22 +- resources/lang/fr/admin/departments/table.php | 4 +- .../lang/fr/admin/depreciations/general.php | 4 +- .../lang/fr/admin/depreciations/message.php | 23 +- .../lang/fr/admin/depreciations/table.php | 4 +- resources/lang/fr/admin/groups/message.php | 12 +- resources/lang/fr/admin/groups/table.php | 4 +- resources/lang/fr/admin/groups/titles.php | 4 +- resources/lang/fr/admin/hardware/form.php | 15 +- resources/lang/fr/admin/hardware/general.php | 6 +- resources/lang/fr/admin/hardware/message.php | 68 +- resources/lang/fr/admin/hardware/table.php | 6 +- resources/lang/fr/admin/kits/general.php | 4 +- resources/lang/fr/admin/licenses/form.php | 6 +- resources/lang/fr/admin/licenses/general.php | 4 +- resources/lang/fr/admin/licenses/message.php | 43 +- resources/lang/fr/admin/licenses/table.php | 4 +- resources/lang/fr/admin/locations/message.php | 23 +- resources/lang/fr/admin/locations/table.php | 4 +- .../lang/fr/admin/manufacturers/message.php | 28 +- .../lang/fr/admin/manufacturers/table.php | 4 +- resources/lang/fr/admin/models/general.php | 6 +- resources/lang/fr/admin/models/message.php | 39 +- resources/lang/fr/admin/models/table.php | 4 +- resources/lang/fr/admin/reports/general.php | 6 +- resources/lang/fr/admin/reports/message.php | 6 +- resources/lang/fr/admin/settings/general.php | 10 +- resources/lang/fr/admin/settings/message.php | 21 +- .../lang/fr/admin/statuslabels/message.php | 27 +- .../lang/fr/admin/statuslabels/table.php | 4 +- resources/lang/fr/admin/suppliers/message.php | 21 +- resources/lang/fr/admin/suppliers/table.php | 4 +- resources/lang/fr/admin/users/general.php | 7 +- resources/lang/fr/admin/users/message.php | 21 +- resources/lang/fr/admin/users/table.php | 8 +- resources/lang/fr/auth/general.php | 1 - resources/lang/fr/auth/message.php | 29 +- resources/lang/fr/button.php | 6 +- resources/lang/fr/general.php | 4 +- resources/lang/fr/help.php | 10 +- resources/lang/fr/mail.php | 6 +- resources/lang/fr/pagination.php | 4 +- resources/lang/fr/passwords.php | 1 - resources/lang/fr/reminders.php | 12 +- resources/lang/fr/table.php | 4 +- resources/lang/fr/validation.php | 13 +- .../lang/ga-IE/admin/accessories/general.php | 4 +- .../lang/ga-IE/admin/accessories/message.php | 35 +- .../lang/ga-IE/admin/accessories/table.php | 9 +- .../ga-IE/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../ga-IE/admin/asset_maintenances/table.php | 2 +- .../lang/ga-IE/admin/categories/general.php | 4 +- .../lang/ga-IE/admin/categories/message.php | 22 +- .../lang/ga-IE/admin/categories/table.php | 6 +- .../lang/ga-IE/admin/companies/general.php | 1 + .../lang/ga-IE/admin/companies/message.php | 23 +- .../lang/ga-IE/admin/companies/table.php | 5 +- .../lang/ga-IE/admin/components/general.php | 4 +- .../lang/ga-IE/admin/components/message.php | 35 +- .../lang/ga-IE/admin/components/table.php | 4 +- .../lang/ga-IE/admin/consumables/general.php | 4 +- .../lang/ga-IE/admin/consumables/message.php | 35 +- .../lang/ga-IE/admin/consumables/table.php | 4 +- .../ga-IE/admin/custom_fields/general.php | 4 +- .../ga-IE/admin/custom_fields/message.php | 49 +- .../lang/ga-IE/admin/departments/message.php | 22 +- .../lang/ga-IE/admin/departments/table.php | 4 +- .../ga-IE/admin/depreciations/general.php | 4 +- .../ga-IE/admin/depreciations/message.php | 23 +- .../lang/ga-IE/admin/depreciations/table.php | 4 +- resources/lang/ga-IE/admin/groups/message.php | 12 +- resources/lang/ga-IE/admin/groups/table.php | 4 +- resources/lang/ga-IE/admin/groups/titles.php | 4 +- resources/lang/ga-IE/admin/hardware/form.php | 15 +- .../lang/ga-IE/admin/hardware/general.php | 6 +- .../lang/ga-IE/admin/hardware/message.php | 68 +- resources/lang/ga-IE/admin/hardware/table.php | 6 +- resources/lang/ga-IE/admin/kits/general.php | 4 +- resources/lang/ga-IE/admin/licenses/form.php | 6 +- .../lang/ga-IE/admin/licenses/general.php | 4 +- .../lang/ga-IE/admin/licenses/message.php | 43 +- resources/lang/ga-IE/admin/licenses/table.php | 4 +- .../lang/ga-IE/admin/locations/message.php | 23 +- .../lang/ga-IE/admin/locations/table.php | 4 +- .../ga-IE/admin/manufacturers/message.php | 28 +- .../lang/ga-IE/admin/manufacturers/table.php | 4 +- resources/lang/ga-IE/admin/models/general.php | 6 +- resources/lang/ga-IE/admin/models/message.php | 39 +- resources/lang/ga-IE/admin/models/table.php | 4 +- .../lang/ga-IE/admin/reports/general.php | 6 +- .../lang/ga-IE/admin/reports/message.php | 6 +- .../lang/ga-IE/admin/settings/general.php | 8 +- .../lang/ga-IE/admin/settings/message.php | 21 +- .../lang/ga-IE/admin/statuslabels/message.php | 27 +- .../lang/ga-IE/admin/statuslabels/table.php | 4 +- .../lang/ga-IE/admin/suppliers/message.php | 21 +- .../lang/ga-IE/admin/suppliers/table.php | 4 +- resources/lang/ga-IE/admin/users/general.php | 7 +- resources/lang/ga-IE/admin/users/message.php | 21 +- resources/lang/ga-IE/admin/users/table.php | 8 +- resources/lang/ga-IE/auth/general.php | 1 - resources/lang/ga-IE/auth/message.php | 29 +- resources/lang/ga-IE/button.php | 6 +- resources/lang/ga-IE/general.php | 4 +- resources/lang/ga-IE/help.php | 10 +- resources/lang/ga-IE/mail.php | 6 +- resources/lang/ga-IE/pagination.php | 4 +- resources/lang/ga-IE/passwords.php | 1 - resources/lang/ga-IE/reminders.php | 12 +- resources/lang/ga-IE/table.php | 4 +- resources/lang/ga-IE/validation.php | 15 +- .../lang/he/admin/accessories/general.php | 4 +- .../lang/he/admin/accessories/message.php | 35 +- resources/lang/he/admin/accessories/table.php | 9 +- .../lang/he/admin/asset_maintenances/form.php | 2 +- .../he/admin/asset_maintenances/message.php | 8 +- .../he/admin/asset_maintenances/table.php | 2 +- .../lang/he/admin/categories/general.php | 4 +- .../lang/he/admin/categories/message.php | 22 +- resources/lang/he/admin/categories/table.php | 6 +- resources/lang/he/admin/companies/general.php | 1 + resources/lang/he/admin/companies/message.php | 23 +- resources/lang/he/admin/companies/table.php | 5 +- .../lang/he/admin/components/general.php | 4 +- .../lang/he/admin/components/message.php | 35 +- resources/lang/he/admin/components/table.php | 4 +- .../lang/he/admin/consumables/general.php | 4 +- .../lang/he/admin/consumables/message.php | 35 +- resources/lang/he/admin/consumables/table.php | 4 +- .../lang/he/admin/custom_fields/general.php | 4 +- .../lang/he/admin/custom_fields/message.php | 49 +- .../lang/he/admin/departments/message.php | 22 +- resources/lang/he/admin/departments/table.php | 4 +- .../lang/he/admin/depreciations/general.php | 4 +- .../lang/he/admin/depreciations/message.php | 23 +- .../lang/he/admin/depreciations/table.php | 4 +- resources/lang/he/admin/groups/message.php | 12 +- resources/lang/he/admin/groups/table.php | 4 +- resources/lang/he/admin/groups/titles.php | 4 +- resources/lang/he/admin/hardware/form.php | 15 +- resources/lang/he/admin/hardware/general.php | 6 +- resources/lang/he/admin/hardware/message.php | 68 +- resources/lang/he/admin/hardware/table.php | 6 +- resources/lang/he/admin/kits/general.php | 4 +- resources/lang/he/admin/licenses/form.php | 6 +- resources/lang/he/admin/licenses/general.php | 4 +- resources/lang/he/admin/licenses/message.php | 43 +- resources/lang/he/admin/licenses/table.php | 4 +- resources/lang/he/admin/locations/message.php | 23 +- resources/lang/he/admin/locations/table.php | 4 +- .../lang/he/admin/manufacturers/message.php | 28 +- .../lang/he/admin/manufacturers/table.php | 4 +- resources/lang/he/admin/models/general.php | 6 +- resources/lang/he/admin/models/message.php | 39 +- resources/lang/he/admin/models/table.php | 4 +- resources/lang/he/admin/reports/general.php | 6 +- resources/lang/he/admin/reports/message.php | 6 +- resources/lang/he/admin/settings/general.php | 10 +- resources/lang/he/admin/settings/message.php | 21 +- .../lang/he/admin/statuslabels/message.php | 27 +- .../lang/he/admin/statuslabels/table.php | 4 +- resources/lang/he/admin/suppliers/message.php | 21 +- resources/lang/he/admin/suppliers/table.php | 4 +- resources/lang/he/admin/users/general.php | 7 +- resources/lang/he/admin/users/message.php | 21 +- resources/lang/he/admin/users/table.php | 8 +- resources/lang/he/auth/general.php | 1 - resources/lang/he/auth/message.php | 29 +- resources/lang/he/button.php | 6 +- resources/lang/he/general.php | 4 +- resources/lang/he/help.php | 10 +- resources/lang/he/mail.php | 6 +- resources/lang/he/pagination.php | 4 +- resources/lang/he/passwords.php | 1 - resources/lang/he/reminders.php | 12 +- resources/lang/he/table.php | 4 +- resources/lang/he/validation.php | 15 +- .../lang/hr/admin/accessories/general.php | 4 +- .../lang/hr/admin/accessories/message.php | 35 +- resources/lang/hr/admin/accessories/table.php | 9 +- .../lang/hr/admin/asset_maintenances/form.php | 2 +- .../hr/admin/asset_maintenances/message.php | 8 +- .../hr/admin/asset_maintenances/table.php | 2 +- .../lang/hr/admin/categories/general.php | 4 +- .../lang/hr/admin/categories/message.php | 22 +- resources/lang/hr/admin/categories/table.php | 6 +- resources/lang/hr/admin/companies/general.php | 1 + resources/lang/hr/admin/companies/message.php | 23 +- resources/lang/hr/admin/companies/table.php | 5 +- .../lang/hr/admin/components/general.php | 4 +- .../lang/hr/admin/components/message.php | 35 +- resources/lang/hr/admin/components/table.php | 4 +- .../lang/hr/admin/consumables/general.php | 4 +- .../lang/hr/admin/consumables/message.php | 35 +- resources/lang/hr/admin/consumables/table.php | 4 +- .../lang/hr/admin/custom_fields/general.php | 4 +- .../lang/hr/admin/custom_fields/message.php | 49 +- .../lang/hr/admin/departments/message.php | 22 +- resources/lang/hr/admin/departments/table.php | 4 +- .../lang/hr/admin/depreciations/general.php | 4 +- .../lang/hr/admin/depreciations/message.php | 23 +- .../lang/hr/admin/depreciations/table.php | 4 +- resources/lang/hr/admin/groups/message.php | 12 +- resources/lang/hr/admin/groups/table.php | 4 +- resources/lang/hr/admin/groups/titles.php | 4 +- resources/lang/hr/admin/hardware/form.php | 15 +- resources/lang/hr/admin/hardware/general.php | 6 +- resources/lang/hr/admin/hardware/message.php | 68 +- resources/lang/hr/admin/hardware/table.php | 6 +- resources/lang/hr/admin/kits/general.php | 4 +- resources/lang/hr/admin/licenses/form.php | 6 +- resources/lang/hr/admin/licenses/general.php | 4 +- resources/lang/hr/admin/licenses/message.php | 43 +- resources/lang/hr/admin/licenses/table.php | 4 +- resources/lang/hr/admin/locations/message.php | 23 +- resources/lang/hr/admin/locations/table.php | 4 +- .../lang/hr/admin/manufacturers/message.php | 28 +- .../lang/hr/admin/manufacturers/table.php | 4 +- resources/lang/hr/admin/models/general.php | 6 +- resources/lang/hr/admin/models/message.php | 39 +- resources/lang/hr/admin/models/table.php | 4 +- resources/lang/hr/admin/reports/general.php | 6 +- resources/lang/hr/admin/reports/message.php | 6 +- resources/lang/hr/admin/settings/general.php | 10 +- resources/lang/hr/admin/settings/message.php | 21 +- .../lang/hr/admin/statuslabels/message.php | 27 +- .../lang/hr/admin/statuslabels/table.php | 4 +- resources/lang/hr/admin/suppliers/message.php | 21 +- resources/lang/hr/admin/suppliers/table.php | 4 +- resources/lang/hr/admin/users/general.php | 7 +- resources/lang/hr/admin/users/message.php | 21 +- resources/lang/hr/admin/users/table.php | 8 +- resources/lang/hr/auth/general.php | 1 - resources/lang/hr/auth/message.php | 29 +- resources/lang/hr/button.php | 6 +- resources/lang/hr/general.php | 4 +- resources/lang/hr/help.php | 10 +- resources/lang/hr/mail.php | 6 +- resources/lang/hr/pagination.php | 4 +- resources/lang/hr/passwords.php | 1 - resources/lang/hr/reminders.php | 12 +- resources/lang/hr/table.php | 4 +- resources/lang/hr/validation.php | 15 +- .../lang/hu/admin/accessories/general.php | 4 +- .../lang/hu/admin/accessories/message.php | 35 +- resources/lang/hu/admin/accessories/table.php | 9 +- .../lang/hu/admin/asset_maintenances/form.php | 2 +- .../hu/admin/asset_maintenances/message.php | 8 +- .../hu/admin/asset_maintenances/table.php | 2 +- .../lang/hu/admin/categories/general.php | 4 +- .../lang/hu/admin/categories/message.php | 22 +- resources/lang/hu/admin/categories/table.php | 6 +- resources/lang/hu/admin/companies/general.php | 1 + resources/lang/hu/admin/companies/message.php | 23 +- resources/lang/hu/admin/companies/table.php | 5 +- .../lang/hu/admin/components/general.php | 4 +- .../lang/hu/admin/components/message.php | 35 +- resources/lang/hu/admin/components/table.php | 4 +- .../lang/hu/admin/consumables/general.php | 4 +- .../lang/hu/admin/consumables/message.php | 35 +- resources/lang/hu/admin/consumables/table.php | 4 +- .../lang/hu/admin/custom_fields/general.php | 4 +- .../lang/hu/admin/custom_fields/message.php | 49 +- .../lang/hu/admin/departments/message.php | 22 +- resources/lang/hu/admin/departments/table.php | 4 +- .../lang/hu/admin/depreciations/general.php | 4 +- .../lang/hu/admin/depreciations/message.php | 23 +- .../lang/hu/admin/depreciations/table.php | 4 +- resources/lang/hu/admin/groups/message.php | 12 +- resources/lang/hu/admin/groups/table.php | 4 +- resources/lang/hu/admin/groups/titles.php | 4 +- resources/lang/hu/admin/hardware/form.php | 15 +- resources/lang/hu/admin/hardware/general.php | 6 +- resources/lang/hu/admin/hardware/message.php | 68 +- resources/lang/hu/admin/hardware/table.php | 6 +- resources/lang/hu/admin/kits/general.php | 4 +- resources/lang/hu/admin/licenses/form.php | 6 +- resources/lang/hu/admin/licenses/general.php | 4 +- resources/lang/hu/admin/licenses/message.php | 43 +- resources/lang/hu/admin/licenses/table.php | 4 +- resources/lang/hu/admin/locations/message.php | 23 +- resources/lang/hu/admin/locations/table.php | 4 +- .../lang/hu/admin/manufacturers/message.php | 28 +- .../lang/hu/admin/manufacturers/table.php | 4 +- resources/lang/hu/admin/models/general.php | 6 +- resources/lang/hu/admin/models/message.php | 39 +- resources/lang/hu/admin/models/table.php | 4 +- resources/lang/hu/admin/reports/general.php | 6 +- resources/lang/hu/admin/reports/message.php | 6 +- resources/lang/hu/admin/settings/general.php | 10 +- resources/lang/hu/admin/settings/message.php | 21 +- .../lang/hu/admin/statuslabels/message.php | 27 +- .../lang/hu/admin/statuslabels/table.php | 4 +- resources/lang/hu/admin/suppliers/message.php | 21 +- resources/lang/hu/admin/suppliers/table.php | 4 +- resources/lang/hu/admin/users/general.php | 7 +- resources/lang/hu/admin/users/message.php | 21 +- resources/lang/hu/admin/users/table.php | 8 +- resources/lang/hu/auth/general.php | 1 - resources/lang/hu/auth/message.php | 29 +- resources/lang/hu/button.php | 6 +- resources/lang/hu/general.php | 4 +- resources/lang/hu/help.php | 10 +- resources/lang/hu/mail.php | 6 +- resources/lang/hu/pagination.php | 4 +- resources/lang/hu/passwords.php | 1 - resources/lang/hu/reminders.php | 12 +- resources/lang/hu/table.php | 4 +- resources/lang/hu/validation.php | 15 +- .../lang/id/admin/accessories/general.php | 4 +- .../lang/id/admin/accessories/message.php | 35 +- resources/lang/id/admin/accessories/table.php | 9 +- .../lang/id/admin/asset_maintenances/form.php | 2 +- .../id/admin/asset_maintenances/message.php | 8 +- .../id/admin/asset_maintenances/table.php | 2 +- .../lang/id/admin/categories/general.php | 4 +- .../lang/id/admin/categories/message.php | 22 +- resources/lang/id/admin/categories/table.php | 6 +- resources/lang/id/admin/companies/general.php | 1 + resources/lang/id/admin/companies/message.php | 23 +- resources/lang/id/admin/companies/table.php | 5 +- .../lang/id/admin/components/general.php | 4 +- .../lang/id/admin/components/message.php | 35 +- resources/lang/id/admin/components/table.php | 4 +- .../lang/id/admin/consumables/general.php | 4 +- .../lang/id/admin/consumables/message.php | 35 +- resources/lang/id/admin/consumables/table.php | 4 +- .../lang/id/admin/custom_fields/general.php | 4 +- .../lang/id/admin/custom_fields/message.php | 49 +- .../lang/id/admin/departments/message.php | 22 +- resources/lang/id/admin/departments/table.php | 4 +- .../lang/id/admin/depreciations/general.php | 4 +- .../lang/id/admin/depreciations/message.php | 23 +- .../lang/id/admin/depreciations/table.php | 4 +- resources/lang/id/admin/groups/message.php | 12 +- resources/lang/id/admin/groups/table.php | 4 +- resources/lang/id/admin/groups/titles.php | 4 +- resources/lang/id/admin/hardware/form.php | 15 +- resources/lang/id/admin/hardware/general.php | 6 +- resources/lang/id/admin/hardware/message.php | 68 +- resources/lang/id/admin/hardware/table.php | 6 +- resources/lang/id/admin/kits/general.php | 4 +- resources/lang/id/admin/licenses/form.php | 6 +- resources/lang/id/admin/licenses/general.php | 4 +- resources/lang/id/admin/licenses/message.php | 43 +- resources/lang/id/admin/licenses/table.php | 4 +- resources/lang/id/admin/locations/message.php | 23 +- resources/lang/id/admin/locations/table.php | 4 +- .../lang/id/admin/manufacturers/message.php | 28 +- .../lang/id/admin/manufacturers/table.php | 4 +- resources/lang/id/admin/models/general.php | 6 +- resources/lang/id/admin/models/message.php | 39 +- resources/lang/id/admin/models/table.php | 4 +- resources/lang/id/admin/reports/general.php | 6 +- resources/lang/id/admin/reports/message.php | 6 +- resources/lang/id/admin/settings/general.php | 10 +- resources/lang/id/admin/settings/message.php | 21 +- .../lang/id/admin/statuslabels/message.php | 27 +- .../lang/id/admin/statuslabels/table.php | 4 +- resources/lang/id/admin/suppliers/message.php | 21 +- resources/lang/id/admin/suppliers/table.php | 4 +- resources/lang/id/admin/users/general.php | 7 +- resources/lang/id/admin/users/message.php | 21 +- resources/lang/id/admin/users/table.php | 8 +- resources/lang/id/auth/general.php | 1 - resources/lang/id/auth/message.php | 29 +- resources/lang/id/button.php | 6 +- resources/lang/id/general.php | 4 +- resources/lang/id/help.php | 10 +- resources/lang/id/mail.php | 6 +- resources/lang/id/pagination.php | 4 +- resources/lang/id/passwords.php | 1 - resources/lang/id/reminders.php | 12 +- resources/lang/id/table.php | 4 +- resources/lang/id/validation.php | 15 +- .../lang/is/admin/accessories/general.php | 4 +- .../lang/is/admin/accessories/message.php | 35 +- resources/lang/is/admin/accessories/table.php | 9 +- .../lang/is/admin/asset_maintenances/form.php | 2 +- .../is/admin/asset_maintenances/message.php | 8 +- .../is/admin/asset_maintenances/table.php | 2 +- .../lang/is/admin/categories/general.php | 4 +- .../lang/is/admin/categories/message.php | 22 +- resources/lang/is/admin/categories/table.php | 6 +- resources/lang/is/admin/companies/general.php | 1 + resources/lang/is/admin/companies/message.php | 23 +- resources/lang/is/admin/companies/table.php | 5 +- .../lang/is/admin/components/general.php | 4 +- .../lang/is/admin/components/message.php | 35 +- resources/lang/is/admin/components/table.php | 4 +- .../lang/is/admin/consumables/general.php | 4 +- .../lang/is/admin/consumables/message.php | 35 +- resources/lang/is/admin/consumables/table.php | 4 +- .../lang/is/admin/custom_fields/general.php | 4 +- .../lang/is/admin/custom_fields/message.php | 49 +- .../lang/is/admin/departments/message.php | 22 +- resources/lang/is/admin/departments/table.php | 4 +- .../lang/is/admin/depreciations/general.php | 4 +- .../lang/is/admin/depreciations/message.php | 23 +- .../lang/is/admin/depreciations/table.php | 4 +- resources/lang/is/admin/groups/message.php | 12 +- resources/lang/is/admin/groups/table.php | 4 +- resources/lang/is/admin/groups/titles.php | 4 +- resources/lang/is/admin/hardware/form.php | 15 +- resources/lang/is/admin/hardware/general.php | 6 +- resources/lang/is/admin/hardware/message.php | 68 +- resources/lang/is/admin/hardware/table.php | 6 +- resources/lang/is/admin/kits/general.php | 4 +- resources/lang/is/admin/licenses/form.php | 6 +- resources/lang/is/admin/licenses/general.php | 4 +- resources/lang/is/admin/licenses/message.php | 43 +- resources/lang/is/admin/licenses/table.php | 4 +- resources/lang/is/admin/locations/message.php | 23 +- resources/lang/is/admin/locations/table.php | 4 +- .../lang/is/admin/manufacturers/message.php | 28 +- .../lang/is/admin/manufacturers/table.php | 4 +- resources/lang/is/admin/models/general.php | 6 +- resources/lang/is/admin/models/message.php | 39 +- resources/lang/is/admin/models/table.php | 4 +- resources/lang/is/admin/reports/general.php | 6 +- resources/lang/is/admin/reports/message.php | 6 +- resources/lang/is/admin/settings/general.php | 8 +- resources/lang/is/admin/settings/message.php | 21 +- .../lang/is/admin/statuslabels/message.php | 27 +- .../lang/is/admin/statuslabels/table.php | 4 +- resources/lang/is/admin/suppliers/message.php | 21 +- resources/lang/is/admin/suppliers/table.php | 4 +- resources/lang/is/admin/users/general.php | 7 +- resources/lang/is/admin/users/message.php | 21 +- resources/lang/is/admin/users/table.php | 8 +- resources/lang/is/auth/general.php | 1 - resources/lang/is/auth/message.php | 29 +- resources/lang/is/button.php | 6 +- resources/lang/is/general.php | 4 +- resources/lang/is/help.php | 10 +- resources/lang/is/mail.php | 6 +- resources/lang/is/pagination.php | 4 +- resources/lang/is/passwords.php | 1 - resources/lang/is/reminders.php | 12 +- resources/lang/is/table.php | 4 +- resources/lang/is/validation.php | 15 +- .../lang/it/admin/accessories/general.php | 4 +- .../lang/it/admin/accessories/message.php | 35 +- resources/lang/it/admin/accessories/table.php | 9 +- .../lang/it/admin/asset_maintenances/form.php | 2 +- .../it/admin/asset_maintenances/message.php | 8 +- .../it/admin/asset_maintenances/table.php | 2 +- .../lang/it/admin/categories/general.php | 4 +- .../lang/it/admin/categories/message.php | 22 +- resources/lang/it/admin/categories/table.php | 6 +- resources/lang/it/admin/companies/general.php | 1 + resources/lang/it/admin/companies/message.php | 23 +- resources/lang/it/admin/companies/table.php | 5 +- .../lang/it/admin/components/general.php | 4 +- .../lang/it/admin/components/message.php | 35 +- resources/lang/it/admin/components/table.php | 4 +- .../lang/it/admin/consumables/general.php | 4 +- .../lang/it/admin/consumables/message.php | 35 +- resources/lang/it/admin/consumables/table.php | 4 +- .../lang/it/admin/custom_fields/general.php | 4 +- .../lang/it/admin/custom_fields/message.php | 49 +- .../lang/it/admin/departments/message.php | 22 +- resources/lang/it/admin/departments/table.php | 4 +- .../lang/it/admin/depreciations/general.php | 4 +- .../lang/it/admin/depreciations/message.php | 23 +- .../lang/it/admin/depreciations/table.php | 4 +- resources/lang/it/admin/groups/message.php | 12 +- resources/lang/it/admin/groups/table.php | 4 +- resources/lang/it/admin/groups/titles.php | 4 +- resources/lang/it/admin/hardware/form.php | 15 +- resources/lang/it/admin/hardware/general.php | 6 +- resources/lang/it/admin/hardware/message.php | 68 +- resources/lang/it/admin/hardware/table.php | 6 +- resources/lang/it/admin/kits/general.php | 4 +- resources/lang/it/admin/licenses/form.php | 6 +- resources/lang/it/admin/licenses/general.php | 4 +- resources/lang/it/admin/licenses/message.php | 43 +- resources/lang/it/admin/licenses/table.php | 4 +- resources/lang/it/admin/locations/message.php | 23 +- resources/lang/it/admin/locations/table.php | 4 +- .../lang/it/admin/manufacturers/message.php | 28 +- .../lang/it/admin/manufacturers/table.php | 4 +- resources/lang/it/admin/models/general.php | 6 +- resources/lang/it/admin/models/message.php | 39 +- resources/lang/it/admin/models/table.php | 4 +- resources/lang/it/admin/reports/general.php | 6 +- resources/lang/it/admin/reports/message.php | 6 +- resources/lang/it/admin/settings/general.php | 8 +- resources/lang/it/admin/settings/message.php | 21 +- .../lang/it/admin/statuslabels/message.php | 27 +- .../lang/it/admin/statuslabels/table.php | 4 +- resources/lang/it/admin/suppliers/message.php | 21 +- resources/lang/it/admin/suppliers/table.php | 4 +- resources/lang/it/admin/users/general.php | 7 +- resources/lang/it/admin/users/message.php | 21 +- resources/lang/it/admin/users/table.php | 8 +- resources/lang/it/auth/general.php | 1 - resources/lang/it/auth/message.php | 29 +- resources/lang/it/button.php | 6 +- resources/lang/it/general.php | 4 +- resources/lang/it/help.php | 10 +- resources/lang/it/mail.php | 6 +- resources/lang/it/pagination.php | 4 +- resources/lang/it/passwords.php | 1 - resources/lang/it/reminders.php | 12 +- resources/lang/it/table.php | 4 +- resources/lang/it/validation.php | 15 +- .../lang/iu/admin/accessories/general.php | 4 +- .../lang/iu/admin/accessories/message.php | 35 +- resources/lang/iu/admin/accessories/table.php | 9 +- .../lang/iu/admin/asset_maintenances/form.php | 2 +- .../iu/admin/asset_maintenances/message.php | 8 +- .../iu/admin/asset_maintenances/table.php | 2 +- .../lang/iu/admin/categories/general.php | 4 +- .../lang/iu/admin/categories/message.php | 22 +- resources/lang/iu/admin/categories/table.php | 6 +- resources/lang/iu/admin/companies/general.php | 1 + resources/lang/iu/admin/companies/message.php | 23 +- resources/lang/iu/admin/companies/table.php | 5 +- .../lang/iu/admin/components/general.php | 4 +- .../lang/iu/admin/components/message.php | 35 +- resources/lang/iu/admin/components/table.php | 4 +- .../lang/iu/admin/consumables/general.php | 4 +- .../lang/iu/admin/consumables/message.php | 35 +- resources/lang/iu/admin/consumables/table.php | 4 +- .../lang/iu/admin/custom_fields/general.php | 4 +- .../lang/iu/admin/custom_fields/message.php | 49 +- .../lang/iu/admin/departments/message.php | 22 +- resources/lang/iu/admin/departments/table.php | 4 +- .../lang/iu/admin/depreciations/general.php | 4 +- .../lang/iu/admin/depreciations/message.php | 23 +- .../lang/iu/admin/depreciations/table.php | 4 +- resources/lang/iu/admin/groups/message.php | 12 +- resources/lang/iu/admin/groups/table.php | 4 +- resources/lang/iu/admin/groups/titles.php | 4 +- resources/lang/iu/admin/hardware/form.php | 15 +- resources/lang/iu/admin/hardware/general.php | 6 +- resources/lang/iu/admin/hardware/message.php | 68 +- resources/lang/iu/admin/hardware/table.php | 6 +- resources/lang/iu/admin/kits/general.php | 4 +- resources/lang/iu/admin/licenses/form.php | 6 +- resources/lang/iu/admin/licenses/general.php | 4 +- resources/lang/iu/admin/licenses/message.php | 43 +- resources/lang/iu/admin/licenses/table.php | 4 +- resources/lang/iu/admin/locations/message.php | 23 +- resources/lang/iu/admin/locations/table.php | 4 +- .../lang/iu/admin/manufacturers/message.php | 28 +- .../lang/iu/admin/manufacturers/table.php | 4 +- resources/lang/iu/admin/models/general.php | 6 +- resources/lang/iu/admin/models/message.php | 39 +- resources/lang/iu/admin/models/table.php | 4 +- resources/lang/iu/admin/reports/general.php | 6 +- resources/lang/iu/admin/reports/message.php | 6 +- resources/lang/iu/admin/settings/general.php | 8 +- resources/lang/iu/admin/settings/message.php | 21 +- .../lang/iu/admin/statuslabels/message.php | 27 +- .../lang/iu/admin/statuslabels/table.php | 4 +- resources/lang/iu/admin/suppliers/message.php | 21 +- resources/lang/iu/admin/suppliers/table.php | 4 +- resources/lang/iu/admin/users/general.php | 7 +- resources/lang/iu/admin/users/message.php | 21 +- resources/lang/iu/admin/users/table.php | 8 +- resources/lang/iu/auth/general.php | 1 - resources/lang/iu/auth/message.php | 29 +- resources/lang/iu/button.php | 6 +- resources/lang/iu/general.php | 4 +- resources/lang/iu/help.php | 10 +- resources/lang/iu/mail.php | 6 +- resources/lang/iu/pagination.php | 4 +- resources/lang/iu/passwords.php | 1 - resources/lang/iu/reminders.php | 12 +- resources/lang/iu/table.php | 4 +- resources/lang/iu/validation.php | 15 +- .../lang/ja/admin/accessories/general.php | 4 +- .../lang/ja/admin/accessories/message.php | 35 +- resources/lang/ja/admin/accessories/table.php | 9 +- .../lang/ja/admin/asset_maintenances/form.php | 2 +- .../ja/admin/asset_maintenances/message.php | 8 +- .../ja/admin/asset_maintenances/table.php | 2 +- .../lang/ja/admin/categories/general.php | 4 +- .../lang/ja/admin/categories/message.php | 22 +- resources/lang/ja/admin/categories/table.php | 6 +- resources/lang/ja/admin/companies/general.php | 1 + resources/lang/ja/admin/companies/message.php | 23 +- resources/lang/ja/admin/companies/table.php | 5 +- .../lang/ja/admin/components/general.php | 4 +- .../lang/ja/admin/components/message.php | 35 +- resources/lang/ja/admin/components/table.php | 4 +- .../lang/ja/admin/consumables/general.php | 4 +- .../lang/ja/admin/consumables/message.php | 35 +- resources/lang/ja/admin/consumables/table.php | 4 +- .../lang/ja/admin/custom_fields/general.php | 4 +- .../lang/ja/admin/custom_fields/message.php | 49 +- .../lang/ja/admin/departments/message.php | 22 +- resources/lang/ja/admin/departments/table.php | 4 +- .../lang/ja/admin/depreciations/general.php | 4 +- .../lang/ja/admin/depreciations/message.php | 23 +- .../lang/ja/admin/depreciations/table.php | 4 +- resources/lang/ja/admin/groups/message.php | 12 +- resources/lang/ja/admin/groups/table.php | 4 +- resources/lang/ja/admin/groups/titles.php | 4 +- resources/lang/ja/admin/hardware/form.php | 15 +- resources/lang/ja/admin/hardware/general.php | 6 +- resources/lang/ja/admin/hardware/message.php | 68 +- resources/lang/ja/admin/hardware/table.php | 6 +- resources/lang/ja/admin/kits/general.php | 4 +- resources/lang/ja/admin/licenses/form.php | 6 +- resources/lang/ja/admin/licenses/general.php | 4 +- resources/lang/ja/admin/licenses/message.php | 43 +- resources/lang/ja/admin/licenses/table.php | 4 +- resources/lang/ja/admin/locations/message.php | 23 +- resources/lang/ja/admin/locations/table.php | 4 +- .../lang/ja/admin/manufacturers/message.php | 28 +- .../lang/ja/admin/manufacturers/table.php | 4 +- resources/lang/ja/admin/models/general.php | 6 +- resources/lang/ja/admin/models/message.php | 39 +- resources/lang/ja/admin/models/table.php | 4 +- resources/lang/ja/admin/reports/general.php | 6 +- resources/lang/ja/admin/reports/message.php | 6 +- resources/lang/ja/admin/settings/general.php | 10 +- resources/lang/ja/admin/settings/message.php | 21 +- .../lang/ja/admin/statuslabels/message.php | 27 +- .../lang/ja/admin/statuslabels/table.php | 4 +- resources/lang/ja/admin/suppliers/message.php | 21 +- resources/lang/ja/admin/suppliers/table.php | 4 +- resources/lang/ja/admin/users/general.php | 7 +- resources/lang/ja/admin/users/message.php | 21 +- resources/lang/ja/admin/users/table.php | 8 +- resources/lang/ja/auth/general.php | 1 - resources/lang/ja/auth/message.php | 29 +- resources/lang/ja/button.php | 6 +- resources/lang/ja/general.php | 4 +- resources/lang/ja/help.php | 10 +- resources/lang/ja/mail.php | 6 +- resources/lang/ja/pagination.php | 4 +- resources/lang/ja/passwords.php | 1 - resources/lang/ja/reminders.php | 12 +- resources/lang/ja/table.php | 4 +- resources/lang/ja/validation.php | 15 +- .../lang/ko/admin/accessories/general.php | 4 +- .../lang/ko/admin/accessories/message.php | 35 +- resources/lang/ko/admin/accessories/table.php | 9 +- .../lang/ko/admin/asset_maintenances/form.php | 2 +- .../ko/admin/asset_maintenances/message.php | 8 +- .../ko/admin/asset_maintenances/table.php | 2 +- .../lang/ko/admin/categories/general.php | 4 +- .../lang/ko/admin/categories/message.php | 22 +- resources/lang/ko/admin/categories/table.php | 6 +- resources/lang/ko/admin/companies/general.php | 1 + resources/lang/ko/admin/companies/message.php | 23 +- resources/lang/ko/admin/companies/table.php | 5 +- .../lang/ko/admin/components/general.php | 4 +- .../lang/ko/admin/components/message.php | 35 +- resources/lang/ko/admin/components/table.php | 4 +- .../lang/ko/admin/consumables/general.php | 4 +- .../lang/ko/admin/consumables/message.php | 35 +- resources/lang/ko/admin/consumables/table.php | 4 +- .../lang/ko/admin/custom_fields/general.php | 4 +- .../lang/ko/admin/custom_fields/message.php | 49 +- .../lang/ko/admin/departments/message.php | 22 +- resources/lang/ko/admin/departments/table.php | 4 +- .../lang/ko/admin/depreciations/general.php | 4 +- .../lang/ko/admin/depreciations/message.php | 23 +- .../lang/ko/admin/depreciations/table.php | 4 +- resources/lang/ko/admin/groups/message.php | 12 +- resources/lang/ko/admin/groups/table.php | 4 +- resources/lang/ko/admin/groups/titles.php | 4 +- resources/lang/ko/admin/hardware/form.php | 15 +- resources/lang/ko/admin/hardware/general.php | 6 +- resources/lang/ko/admin/hardware/message.php | 68 +- resources/lang/ko/admin/hardware/table.php | 6 +- resources/lang/ko/admin/kits/general.php | 4 +- resources/lang/ko/admin/licenses/form.php | 6 +- resources/lang/ko/admin/licenses/general.php | 4 +- resources/lang/ko/admin/licenses/message.php | 43 +- resources/lang/ko/admin/licenses/table.php | 4 +- resources/lang/ko/admin/locations/message.php | 23 +- resources/lang/ko/admin/locations/table.php | 4 +- .../lang/ko/admin/manufacturers/message.php | 28 +- .../lang/ko/admin/manufacturers/table.php | 4 +- resources/lang/ko/admin/models/general.php | 6 +- resources/lang/ko/admin/models/message.php | 39 +- resources/lang/ko/admin/models/table.php | 4 +- resources/lang/ko/admin/reports/general.php | 6 +- resources/lang/ko/admin/reports/message.php | 6 +- resources/lang/ko/admin/settings/general.php | 10 +- resources/lang/ko/admin/settings/message.php | 21 +- .../lang/ko/admin/statuslabels/message.php | 27 +- .../lang/ko/admin/statuslabels/table.php | 4 +- resources/lang/ko/admin/suppliers/message.php | 21 +- resources/lang/ko/admin/suppliers/table.php | 4 +- resources/lang/ko/admin/users/general.php | 7 +- resources/lang/ko/admin/users/message.php | 21 +- resources/lang/ko/admin/users/table.php | 8 +- resources/lang/ko/auth/general.php | 1 - resources/lang/ko/auth/message.php | 29 +- resources/lang/ko/button.php | 6 +- resources/lang/ko/general.php | 4 +- resources/lang/ko/help.php | 10 +- resources/lang/ko/mail.php | 6 +- resources/lang/ko/pagination.php | 4 +- resources/lang/ko/passwords.php | 1 - resources/lang/ko/reminders.php | 12 +- resources/lang/ko/table.php | 4 +- resources/lang/ko/validation.php | 15 +- .../lang/lt/admin/accessories/general.php | 4 +- .../lang/lt/admin/accessories/message.php | 35 +- resources/lang/lt/admin/accessories/table.php | 9 +- .../lang/lt/admin/asset_maintenances/form.php | 2 +- .../lt/admin/asset_maintenances/message.php | 8 +- .../lt/admin/asset_maintenances/table.php | 2 +- .../lang/lt/admin/categories/general.php | 4 +- .../lang/lt/admin/categories/message.php | 22 +- resources/lang/lt/admin/categories/table.php | 6 +- resources/lang/lt/admin/companies/general.php | 1 + resources/lang/lt/admin/companies/message.php | 23 +- resources/lang/lt/admin/companies/table.php | 5 +- .../lang/lt/admin/components/general.php | 4 +- .../lang/lt/admin/components/message.php | 35 +- resources/lang/lt/admin/components/table.php | 4 +- .../lang/lt/admin/consumables/general.php | 4 +- .../lang/lt/admin/consumables/message.php | 35 +- resources/lang/lt/admin/consumables/table.php | 4 +- .../lang/lt/admin/custom_fields/general.php | 4 +- .../lang/lt/admin/custom_fields/message.php | 49 +- .../lang/lt/admin/departments/message.php | 22 +- resources/lang/lt/admin/departments/table.php | 4 +- .../lang/lt/admin/depreciations/general.php | 4 +- .../lang/lt/admin/depreciations/message.php | 23 +- .../lang/lt/admin/depreciations/table.php | 4 +- resources/lang/lt/admin/groups/message.php | 12 +- resources/lang/lt/admin/groups/table.php | 4 +- resources/lang/lt/admin/groups/titles.php | 4 +- resources/lang/lt/admin/hardware/form.php | 15 +- resources/lang/lt/admin/hardware/general.php | 6 +- resources/lang/lt/admin/hardware/message.php | 68 +- resources/lang/lt/admin/hardware/table.php | 6 +- resources/lang/lt/admin/kits/general.php | 4 +- resources/lang/lt/admin/licenses/form.php | 6 +- resources/lang/lt/admin/licenses/general.php | 4 +- resources/lang/lt/admin/licenses/message.php | 43 +- resources/lang/lt/admin/licenses/table.php | 4 +- resources/lang/lt/admin/locations/message.php | 23 +- resources/lang/lt/admin/locations/table.php | 4 +- .../lang/lt/admin/manufacturers/message.php | 28 +- .../lang/lt/admin/manufacturers/table.php | 4 +- resources/lang/lt/admin/models/general.php | 6 +- resources/lang/lt/admin/models/message.php | 39 +- resources/lang/lt/admin/models/table.php | 4 +- resources/lang/lt/admin/reports/general.php | 6 +- resources/lang/lt/admin/reports/message.php | 6 +- resources/lang/lt/admin/settings/general.php | 10 +- resources/lang/lt/admin/settings/message.php | 21 +- .../lang/lt/admin/statuslabels/message.php | 27 +- .../lang/lt/admin/statuslabels/table.php | 4 +- resources/lang/lt/admin/suppliers/message.php | 21 +- resources/lang/lt/admin/suppliers/table.php | 4 +- resources/lang/lt/admin/users/general.php | 7 +- resources/lang/lt/admin/users/message.php | 21 +- resources/lang/lt/admin/users/table.php | 8 +- resources/lang/lt/auth/general.php | 1 - resources/lang/lt/auth/message.php | 29 +- resources/lang/lt/button.php | 6 +- resources/lang/lt/general.php | 4 +- resources/lang/lt/help.php | 10 +- resources/lang/lt/mail.php | 6 +- resources/lang/lt/pagination.php | 4 +- resources/lang/lt/passwords.php | 1 - resources/lang/lt/reminders.php | 12 +- resources/lang/lt/table.php | 4 +- resources/lang/lt/validation.php | 15 +- .../lang/lv/admin/accessories/general.php | 4 +- .../lang/lv/admin/accessories/message.php | 35 +- resources/lang/lv/admin/accessories/table.php | 9 +- .../lang/lv/admin/asset_maintenances/form.php | 2 +- .../lv/admin/asset_maintenances/message.php | 8 +- .../lv/admin/asset_maintenances/table.php | 2 +- .../lang/lv/admin/categories/general.php | 4 +- .../lang/lv/admin/categories/message.php | 22 +- resources/lang/lv/admin/categories/table.php | 6 +- resources/lang/lv/admin/companies/general.php | 1 + resources/lang/lv/admin/companies/message.php | 23 +- resources/lang/lv/admin/companies/table.php | 5 +- .../lang/lv/admin/components/general.php | 4 +- .../lang/lv/admin/components/message.php | 35 +- resources/lang/lv/admin/components/table.php | 4 +- .../lang/lv/admin/consumables/general.php | 4 +- .../lang/lv/admin/consumables/message.php | 35 +- resources/lang/lv/admin/consumables/table.php | 4 +- .../lang/lv/admin/custom_fields/general.php | 4 +- .../lang/lv/admin/custom_fields/message.php | 49 +- .../lang/lv/admin/departments/message.php | 22 +- resources/lang/lv/admin/departments/table.php | 4 +- .../lang/lv/admin/depreciations/general.php | 4 +- .../lang/lv/admin/depreciations/message.php | 23 +- .../lang/lv/admin/depreciations/table.php | 4 +- resources/lang/lv/admin/groups/message.php | 12 +- resources/lang/lv/admin/groups/table.php | 4 +- resources/lang/lv/admin/groups/titles.php | 4 +- resources/lang/lv/admin/hardware/form.php | 15 +- resources/lang/lv/admin/hardware/general.php | 6 +- resources/lang/lv/admin/hardware/message.php | 68 +- resources/lang/lv/admin/hardware/table.php | 6 +- resources/lang/lv/admin/kits/general.php | 4 +- resources/lang/lv/admin/licenses/form.php | 6 +- resources/lang/lv/admin/licenses/general.php | 4 +- resources/lang/lv/admin/licenses/message.php | 43 +- resources/lang/lv/admin/licenses/table.php | 4 +- resources/lang/lv/admin/locations/message.php | 23 +- resources/lang/lv/admin/locations/table.php | 4 +- .../lang/lv/admin/manufacturers/message.php | 28 +- .../lang/lv/admin/manufacturers/table.php | 4 +- resources/lang/lv/admin/models/general.php | 6 +- resources/lang/lv/admin/models/message.php | 39 +- resources/lang/lv/admin/models/table.php | 4 +- resources/lang/lv/admin/reports/general.php | 6 +- resources/lang/lv/admin/reports/message.php | 6 +- resources/lang/lv/admin/settings/general.php | 10 +- resources/lang/lv/admin/settings/message.php | 21 +- .../lang/lv/admin/statuslabels/message.php | 27 +- .../lang/lv/admin/statuslabels/table.php | 4 +- resources/lang/lv/admin/suppliers/message.php | 21 +- resources/lang/lv/admin/suppliers/table.php | 4 +- resources/lang/lv/admin/users/general.php | 7 +- resources/lang/lv/admin/users/message.php | 21 +- resources/lang/lv/admin/users/table.php | 8 +- resources/lang/lv/auth/general.php | 1 - resources/lang/lv/auth/message.php | 29 +- resources/lang/lv/button.php | 6 +- resources/lang/lv/general.php | 4 +- resources/lang/lv/help.php | 10 +- resources/lang/lv/mail.php | 6 +- resources/lang/lv/pagination.php | 4 +- resources/lang/lv/passwords.php | 1 - resources/lang/lv/reminders.php | 12 +- resources/lang/lv/table.php | 4 +- resources/lang/lv/validation.php | 15 +- .../lang/mi/admin/accessories/general.php | 4 +- .../lang/mi/admin/accessories/message.php | 35 +- resources/lang/mi/admin/accessories/table.php | 9 +- .../lang/mi/admin/asset_maintenances/form.php | 2 +- .../mi/admin/asset_maintenances/message.php | 8 +- .../mi/admin/asset_maintenances/table.php | 2 +- .../lang/mi/admin/categories/general.php | 4 +- .../lang/mi/admin/categories/message.php | 22 +- resources/lang/mi/admin/categories/table.php | 6 +- resources/lang/mi/admin/companies/general.php | 1 + resources/lang/mi/admin/companies/message.php | 23 +- resources/lang/mi/admin/companies/table.php | 5 +- .../lang/mi/admin/components/general.php | 4 +- .../lang/mi/admin/components/message.php | 35 +- resources/lang/mi/admin/components/table.php | 4 +- .../lang/mi/admin/consumables/general.php | 4 +- .../lang/mi/admin/consumables/message.php | 35 +- resources/lang/mi/admin/consumables/table.php | 4 +- .../lang/mi/admin/custom_fields/general.php | 4 +- .../lang/mi/admin/custom_fields/message.php | 49 +- .../lang/mi/admin/departments/message.php | 22 +- resources/lang/mi/admin/departments/table.php | 4 +- .../lang/mi/admin/depreciations/general.php | 4 +- .../lang/mi/admin/depreciations/message.php | 23 +- .../lang/mi/admin/depreciations/table.php | 4 +- resources/lang/mi/admin/groups/message.php | 12 +- resources/lang/mi/admin/groups/table.php | 4 +- resources/lang/mi/admin/groups/titles.php | 4 +- resources/lang/mi/admin/hardware/form.php | 15 +- resources/lang/mi/admin/hardware/general.php | 6 +- resources/lang/mi/admin/hardware/message.php | 68 +- resources/lang/mi/admin/hardware/table.php | 6 +- resources/lang/mi/admin/kits/general.php | 4 +- resources/lang/mi/admin/licenses/form.php | 6 +- resources/lang/mi/admin/licenses/general.php | 4 +- resources/lang/mi/admin/licenses/message.php | 43 +- resources/lang/mi/admin/licenses/table.php | 4 +- resources/lang/mi/admin/locations/message.php | 23 +- resources/lang/mi/admin/locations/table.php | 4 +- .../lang/mi/admin/manufacturers/message.php | 28 +- .../lang/mi/admin/manufacturers/table.php | 4 +- resources/lang/mi/admin/models/general.php | 6 +- resources/lang/mi/admin/models/message.php | 39 +- resources/lang/mi/admin/models/table.php | 4 +- resources/lang/mi/admin/reports/general.php | 6 +- resources/lang/mi/admin/reports/message.php | 6 +- resources/lang/mi/admin/settings/general.php | 10 +- resources/lang/mi/admin/settings/message.php | 21 +- .../lang/mi/admin/statuslabels/message.php | 27 +- .../lang/mi/admin/statuslabels/table.php | 4 +- resources/lang/mi/admin/suppliers/message.php | 21 +- resources/lang/mi/admin/suppliers/table.php | 4 +- resources/lang/mi/admin/users/general.php | 7 +- resources/lang/mi/admin/users/message.php | 21 +- resources/lang/mi/admin/users/table.php | 8 +- resources/lang/mi/auth/general.php | 1 - resources/lang/mi/auth/message.php | 29 +- resources/lang/mi/button.php | 6 +- resources/lang/mi/general.php | 4 +- resources/lang/mi/help.php | 10 +- resources/lang/mi/mail.php | 6 +- resources/lang/mi/pagination.php | 4 +- resources/lang/mi/passwords.php | 1 - resources/lang/mi/reminders.php | 12 +- resources/lang/mi/table.php | 4 +- resources/lang/mi/validation.php | 15 +- .../lang/mk/admin/accessories/general.php | 4 +- .../lang/mk/admin/accessories/message.php | 35 +- resources/lang/mk/admin/accessories/table.php | 9 +- .../lang/mk/admin/asset_maintenances/form.php | 2 +- .../mk/admin/asset_maintenances/message.php | 8 +- .../mk/admin/asset_maintenances/table.php | 2 +- .../lang/mk/admin/categories/general.php | 4 +- .../lang/mk/admin/categories/message.php | 22 +- resources/lang/mk/admin/categories/table.php | 6 +- resources/lang/mk/admin/companies/general.php | 1 + resources/lang/mk/admin/companies/message.php | 23 +- resources/lang/mk/admin/companies/table.php | 5 +- .../lang/mk/admin/components/general.php | 4 +- .../lang/mk/admin/components/message.php | 35 +- resources/lang/mk/admin/components/table.php | 4 +- .../lang/mk/admin/consumables/general.php | 4 +- .../lang/mk/admin/consumables/message.php | 35 +- resources/lang/mk/admin/consumables/table.php | 4 +- .../lang/mk/admin/custom_fields/general.php | 4 +- .../lang/mk/admin/custom_fields/message.php | 49 +- .../lang/mk/admin/departments/message.php | 22 +- resources/lang/mk/admin/departments/table.php | 4 +- .../lang/mk/admin/depreciations/general.php | 4 +- .../lang/mk/admin/depreciations/message.php | 23 +- .../lang/mk/admin/depreciations/table.php | 4 +- resources/lang/mk/admin/groups/message.php | 12 +- resources/lang/mk/admin/groups/table.php | 4 +- resources/lang/mk/admin/groups/titles.php | 4 +- resources/lang/mk/admin/hardware/form.php | 15 +- resources/lang/mk/admin/hardware/general.php | 6 +- resources/lang/mk/admin/hardware/message.php | 68 +- resources/lang/mk/admin/hardware/table.php | 6 +- resources/lang/mk/admin/kits/general.php | 4 +- resources/lang/mk/admin/licenses/form.php | 6 +- resources/lang/mk/admin/licenses/general.php | 4 +- resources/lang/mk/admin/licenses/message.php | 43 +- resources/lang/mk/admin/licenses/table.php | 4 +- resources/lang/mk/admin/locations/message.php | 23 +- resources/lang/mk/admin/locations/table.php | 4 +- .../lang/mk/admin/manufacturers/message.php | 28 +- .../lang/mk/admin/manufacturers/table.php | 4 +- resources/lang/mk/admin/models/general.php | 6 +- resources/lang/mk/admin/models/message.php | 39 +- resources/lang/mk/admin/models/table.php | 4 +- resources/lang/mk/admin/reports/general.php | 6 +- resources/lang/mk/admin/reports/message.php | 6 +- resources/lang/mk/admin/settings/general.php | 8 +- resources/lang/mk/admin/settings/message.php | 21 +- .../lang/mk/admin/statuslabels/message.php | 27 +- .../lang/mk/admin/statuslabels/table.php | 4 +- resources/lang/mk/admin/suppliers/message.php | 21 +- resources/lang/mk/admin/suppliers/table.php | 4 +- resources/lang/mk/admin/users/general.php | 7 +- resources/lang/mk/admin/users/message.php | 21 +- resources/lang/mk/admin/users/table.php | 8 +- resources/lang/mk/auth/general.php | 1 - resources/lang/mk/auth/message.php | 29 +- resources/lang/mk/button.php | 6 +- resources/lang/mk/general.php | 4 +- resources/lang/mk/help.php | 10 +- resources/lang/mk/mail.php | 6 +- resources/lang/mk/pagination.php | 4 +- resources/lang/mk/passwords.php | 1 - resources/lang/mk/reminders.php | 12 +- resources/lang/mk/table.php | 4 +- resources/lang/mk/validation.php | 15 +- .../lang/ml-IN/admin/accessories/general.php | 4 +- .../lang/ml-IN/admin/accessories/message.php | 35 +- .../lang/ml-IN/admin/accessories/table.php | 9 +- .../ml-IN/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../ml-IN/admin/asset_maintenances/table.php | 2 +- .../lang/ml-IN/admin/categories/general.php | 4 +- .../lang/ml-IN/admin/categories/message.php | 22 +- .../lang/ml-IN/admin/categories/table.php | 6 +- .../lang/ml-IN/admin/companies/general.php | 1 + .../lang/ml-IN/admin/companies/message.php | 23 +- .../lang/ml-IN/admin/companies/table.php | 5 +- .../lang/ml-IN/admin/components/general.php | 4 +- .../lang/ml-IN/admin/components/message.php | 35 +- .../lang/ml-IN/admin/components/table.php | 4 +- .../lang/ml-IN/admin/consumables/general.php | 4 +- .../lang/ml-IN/admin/consumables/message.php | 35 +- .../lang/ml-IN/admin/consumables/table.php | 4 +- .../ml-IN/admin/custom_fields/general.php | 4 +- .../ml-IN/admin/custom_fields/message.php | 49 +- .../lang/ml-IN/admin/departments/message.php | 22 +- .../lang/ml-IN/admin/departments/table.php | 4 +- .../ml-IN/admin/depreciations/general.php | 4 +- .../ml-IN/admin/depreciations/message.php | 23 +- .../lang/ml-IN/admin/depreciations/table.php | 4 +- resources/lang/ml-IN/admin/groups/message.php | 12 +- resources/lang/ml-IN/admin/groups/table.php | 4 +- resources/lang/ml-IN/admin/groups/titles.php | 4 +- resources/lang/ml-IN/admin/hardware/form.php | 15 +- .../lang/ml-IN/admin/hardware/general.php | 6 +- .../lang/ml-IN/admin/hardware/message.php | 68 +- resources/lang/ml-IN/admin/hardware/table.php | 6 +- resources/lang/ml-IN/admin/kits/general.php | 4 +- resources/lang/ml-IN/admin/licenses/form.php | 6 +- .../lang/ml-IN/admin/licenses/general.php | 4 +- .../lang/ml-IN/admin/licenses/message.php | 43 +- resources/lang/ml-IN/admin/licenses/table.php | 4 +- .../lang/ml-IN/admin/locations/message.php | 23 +- .../lang/ml-IN/admin/locations/table.php | 4 +- .../ml-IN/admin/manufacturers/message.php | 28 +- .../lang/ml-IN/admin/manufacturers/table.php | 4 +- resources/lang/ml-IN/admin/models/general.php | 6 +- resources/lang/ml-IN/admin/models/message.php | 39 +- resources/lang/ml-IN/admin/models/table.php | 4 +- .../lang/ml-IN/admin/reports/general.php | 6 +- .../lang/ml-IN/admin/reports/message.php | 6 +- .../lang/ml-IN/admin/settings/general.php | 8 +- .../lang/ml-IN/admin/settings/message.php | 21 +- .../lang/ml-IN/admin/statuslabels/message.php | 27 +- .../lang/ml-IN/admin/statuslabels/table.php | 4 +- .../lang/ml-IN/admin/suppliers/message.php | 21 +- .../lang/ml-IN/admin/suppliers/table.php | 4 +- resources/lang/ml-IN/admin/users/general.php | 7 +- resources/lang/ml-IN/admin/users/message.php | 21 +- resources/lang/ml-IN/admin/users/table.php | 8 +- resources/lang/ml-IN/auth/general.php | 1 - resources/lang/ml-IN/auth/message.php | 29 +- resources/lang/ml-IN/button.php | 6 +- resources/lang/ml-IN/general.php | 4 +- resources/lang/ml-IN/help.php | 10 +- resources/lang/ml-IN/mail.php | 6 +- resources/lang/ml-IN/pagination.php | 4 +- resources/lang/ml-IN/passwords.php | 1 - resources/lang/ml-IN/reminders.php | 12 +- resources/lang/ml-IN/table.php | 4 +- resources/lang/ml-IN/validation.php | 15 +- .../lang/mn/admin/accessories/general.php | 4 +- .../lang/mn/admin/accessories/message.php | 35 +- resources/lang/mn/admin/accessories/table.php | 9 +- .../lang/mn/admin/asset_maintenances/form.php | 2 +- .../mn/admin/asset_maintenances/message.php | 8 +- .../mn/admin/asset_maintenances/table.php | 2 +- .../lang/mn/admin/categories/general.php | 4 +- .../lang/mn/admin/categories/message.php | 22 +- resources/lang/mn/admin/categories/table.php | 6 +- resources/lang/mn/admin/companies/general.php | 1 + resources/lang/mn/admin/companies/message.php | 23 +- resources/lang/mn/admin/companies/table.php | 5 +- .../lang/mn/admin/components/general.php | 4 +- .../lang/mn/admin/components/message.php | 35 +- resources/lang/mn/admin/components/table.php | 4 +- .../lang/mn/admin/consumables/general.php | 4 +- .../lang/mn/admin/consumables/message.php | 35 +- resources/lang/mn/admin/consumables/table.php | 4 +- .../lang/mn/admin/custom_fields/general.php | 4 +- .../lang/mn/admin/custom_fields/message.php | 49 +- .../lang/mn/admin/departments/message.php | 22 +- resources/lang/mn/admin/departments/table.php | 4 +- .../lang/mn/admin/depreciations/general.php | 4 +- .../lang/mn/admin/depreciations/message.php | 23 +- .../lang/mn/admin/depreciations/table.php | 4 +- resources/lang/mn/admin/groups/message.php | 12 +- resources/lang/mn/admin/groups/table.php | 4 +- resources/lang/mn/admin/groups/titles.php | 4 +- resources/lang/mn/admin/hardware/form.php | 15 +- resources/lang/mn/admin/hardware/general.php | 6 +- resources/lang/mn/admin/hardware/message.php | 68 +- resources/lang/mn/admin/hardware/table.php | 6 +- resources/lang/mn/admin/kits/general.php | 4 +- resources/lang/mn/admin/licenses/form.php | 6 +- resources/lang/mn/admin/licenses/general.php | 4 +- resources/lang/mn/admin/licenses/message.php | 43 +- resources/lang/mn/admin/licenses/table.php | 4 +- resources/lang/mn/admin/locations/message.php | 23 +- resources/lang/mn/admin/locations/table.php | 4 +- .../lang/mn/admin/manufacturers/message.php | 28 +- .../lang/mn/admin/manufacturers/table.php | 4 +- resources/lang/mn/admin/models/general.php | 6 +- resources/lang/mn/admin/models/message.php | 39 +- resources/lang/mn/admin/models/table.php | 4 +- resources/lang/mn/admin/reports/general.php | 6 +- resources/lang/mn/admin/reports/message.php | 6 +- resources/lang/mn/admin/settings/general.php | 10 +- resources/lang/mn/admin/settings/message.php | 21 +- .../lang/mn/admin/statuslabels/message.php | 27 +- .../lang/mn/admin/statuslabels/table.php | 4 +- resources/lang/mn/admin/suppliers/message.php | 21 +- resources/lang/mn/admin/suppliers/table.php | 4 +- resources/lang/mn/admin/users/general.php | 7 +- resources/lang/mn/admin/users/message.php | 21 +- resources/lang/mn/admin/users/table.php | 8 +- resources/lang/mn/auth/general.php | 1 - resources/lang/mn/auth/message.php | 29 +- resources/lang/mn/button.php | 6 +- resources/lang/mn/general.php | 4 +- resources/lang/mn/help.php | 10 +- resources/lang/mn/mail.php | 6 +- resources/lang/mn/pagination.php | 4 +- resources/lang/mn/passwords.php | 1 - resources/lang/mn/reminders.php | 12 +- resources/lang/mn/table.php | 4 +- resources/lang/mn/validation.php | 15 +- .../lang/ms/admin/accessories/general.php | 4 +- .../lang/ms/admin/accessories/message.php | 35 +- resources/lang/ms/admin/accessories/table.php | 9 +- .../lang/ms/admin/asset_maintenances/form.php | 2 +- .../ms/admin/asset_maintenances/message.php | 8 +- .../ms/admin/asset_maintenances/table.php | 2 +- .../lang/ms/admin/categories/general.php | 4 +- .../lang/ms/admin/categories/message.php | 22 +- resources/lang/ms/admin/categories/table.php | 6 +- resources/lang/ms/admin/companies/general.php | 1 + resources/lang/ms/admin/companies/message.php | 23 +- resources/lang/ms/admin/companies/table.php | 5 +- .../lang/ms/admin/components/general.php | 4 +- .../lang/ms/admin/components/message.php | 35 +- resources/lang/ms/admin/components/table.php | 4 +- .../lang/ms/admin/consumables/general.php | 4 +- .../lang/ms/admin/consumables/message.php | 35 +- resources/lang/ms/admin/consumables/table.php | 4 +- .../lang/ms/admin/custom_fields/general.php | 4 +- .../lang/ms/admin/custom_fields/message.php | 49 +- .../lang/ms/admin/departments/message.php | 22 +- resources/lang/ms/admin/departments/table.php | 4 +- .../lang/ms/admin/depreciations/general.php | 4 +- .../lang/ms/admin/depreciations/message.php | 23 +- .../lang/ms/admin/depreciations/table.php | 4 +- resources/lang/ms/admin/groups/message.php | 12 +- resources/lang/ms/admin/groups/table.php | 4 +- resources/lang/ms/admin/groups/titles.php | 4 +- resources/lang/ms/admin/hardware/form.php | 15 +- resources/lang/ms/admin/hardware/general.php | 6 +- resources/lang/ms/admin/hardware/message.php | 68 +- resources/lang/ms/admin/hardware/table.php | 6 +- resources/lang/ms/admin/kits/general.php | 4 +- resources/lang/ms/admin/licenses/form.php | 6 +- resources/lang/ms/admin/licenses/general.php | 4 +- resources/lang/ms/admin/licenses/message.php | 43 +- resources/lang/ms/admin/licenses/table.php | 4 +- resources/lang/ms/admin/locations/message.php | 23 +- resources/lang/ms/admin/locations/table.php | 4 +- .../lang/ms/admin/manufacturers/message.php | 28 +- .../lang/ms/admin/manufacturers/table.php | 4 +- resources/lang/ms/admin/models/general.php | 6 +- resources/lang/ms/admin/models/message.php | 39 +- resources/lang/ms/admin/models/table.php | 4 +- resources/lang/ms/admin/reports/general.php | 6 +- resources/lang/ms/admin/reports/message.php | 6 +- resources/lang/ms/admin/settings/general.php | 10 +- resources/lang/ms/admin/settings/message.php | 21 +- .../lang/ms/admin/statuslabels/message.php | 27 +- .../lang/ms/admin/statuslabels/table.php | 4 +- resources/lang/ms/admin/suppliers/message.php | 21 +- resources/lang/ms/admin/suppliers/table.php | 4 +- resources/lang/ms/admin/users/general.php | 7 +- resources/lang/ms/admin/users/message.php | 21 +- resources/lang/ms/admin/users/table.php | 8 +- resources/lang/ms/auth/general.php | 1 - resources/lang/ms/auth/message.php | 29 +- resources/lang/ms/button.php | 6 +- resources/lang/ms/general.php | 4 +- resources/lang/ms/help.php | 10 +- resources/lang/ms/mail.php | 6 +- resources/lang/ms/pagination.php | 4 +- resources/lang/ms/passwords.php | 1 - resources/lang/ms/reminders.php | 12 +- resources/lang/ms/table.php | 4 +- resources/lang/ms/validation.php | 15 +- .../lang/nl/admin/accessories/general.php | 4 +- .../lang/nl/admin/accessories/message.php | 35 +- resources/lang/nl/admin/accessories/table.php | 9 +- .../lang/nl/admin/asset_maintenances/form.php | 2 +- .../nl/admin/asset_maintenances/message.php | 8 +- .../nl/admin/asset_maintenances/table.php | 2 +- .../lang/nl/admin/categories/general.php | 4 +- .../lang/nl/admin/categories/message.php | 22 +- resources/lang/nl/admin/categories/table.php | 6 +- resources/lang/nl/admin/companies/general.php | 1 + resources/lang/nl/admin/companies/message.php | 23 +- resources/lang/nl/admin/companies/table.php | 5 +- .../lang/nl/admin/components/general.php | 4 +- .../lang/nl/admin/components/message.php | 35 +- resources/lang/nl/admin/components/table.php | 4 +- .../lang/nl/admin/consumables/general.php | 4 +- .../lang/nl/admin/consumables/message.php | 35 +- resources/lang/nl/admin/consumables/table.php | 4 +- .../lang/nl/admin/custom_fields/general.php | 4 +- .../lang/nl/admin/custom_fields/message.php | 49 +- .../lang/nl/admin/departments/message.php | 22 +- resources/lang/nl/admin/departments/table.php | 4 +- .../lang/nl/admin/depreciations/general.php | 4 +- .../lang/nl/admin/depreciations/message.php | 23 +- .../lang/nl/admin/depreciations/table.php | 4 +- resources/lang/nl/admin/groups/message.php | 12 +- resources/lang/nl/admin/groups/table.php | 4 +- resources/lang/nl/admin/groups/titles.php | 4 +- resources/lang/nl/admin/hardware/form.php | 15 +- resources/lang/nl/admin/hardware/general.php | 6 +- resources/lang/nl/admin/hardware/message.php | 68 +- resources/lang/nl/admin/hardware/table.php | 6 +- resources/lang/nl/admin/kits/general.php | 4 +- resources/lang/nl/admin/licenses/form.php | 6 +- resources/lang/nl/admin/licenses/general.php | 4 +- resources/lang/nl/admin/licenses/message.php | 43 +- resources/lang/nl/admin/licenses/table.php | 4 +- resources/lang/nl/admin/locations/message.php | 23 +- resources/lang/nl/admin/locations/table.php | 4 +- .../lang/nl/admin/manufacturers/message.php | 28 +- .../lang/nl/admin/manufacturers/table.php | 4 +- resources/lang/nl/admin/models/general.php | 6 +- resources/lang/nl/admin/models/message.php | 39 +- resources/lang/nl/admin/models/table.php | 4 +- resources/lang/nl/admin/reports/general.php | 6 +- resources/lang/nl/admin/reports/message.php | 6 +- resources/lang/nl/admin/settings/general.php | 10 +- resources/lang/nl/admin/settings/message.php | 21 +- .../lang/nl/admin/statuslabels/message.php | 27 +- .../lang/nl/admin/statuslabels/table.php | 4 +- resources/lang/nl/admin/suppliers/message.php | 21 +- resources/lang/nl/admin/suppliers/table.php | 4 +- resources/lang/nl/admin/users/general.php | 7 +- resources/lang/nl/admin/users/message.php | 21 +- resources/lang/nl/admin/users/table.php | 8 +- resources/lang/nl/auth/general.php | 1 - resources/lang/nl/auth/message.php | 29 +- resources/lang/nl/button.php | 6 +- resources/lang/nl/general.php | 4 +- resources/lang/nl/help.php | 10 +- resources/lang/nl/mail.php | 6 +- resources/lang/nl/pagination.php | 4 +- resources/lang/nl/passwords.php | 1 - resources/lang/nl/reminders.php | 12 +- resources/lang/nl/table.php | 4 +- resources/lang/nl/validation.php | 15 +- .../lang/no/admin/accessories/general.php | 4 +- .../lang/no/admin/accessories/message.php | 35 +- resources/lang/no/admin/accessories/table.php | 9 +- .../lang/no/admin/asset_maintenances/form.php | 2 +- .../no/admin/asset_maintenances/message.php | 8 +- .../no/admin/asset_maintenances/table.php | 2 +- .../lang/no/admin/categories/general.php | 4 +- .../lang/no/admin/categories/message.php | 22 +- resources/lang/no/admin/categories/table.php | 6 +- resources/lang/no/admin/companies/general.php | 1 + resources/lang/no/admin/companies/message.php | 23 +- resources/lang/no/admin/companies/table.php | 5 +- .../lang/no/admin/components/general.php | 4 +- .../lang/no/admin/components/message.php | 35 +- resources/lang/no/admin/components/table.php | 4 +- .../lang/no/admin/consumables/general.php | 4 +- .../lang/no/admin/consumables/message.php | 35 +- resources/lang/no/admin/consumables/table.php | 4 +- .../lang/no/admin/custom_fields/general.php | 4 +- .../lang/no/admin/custom_fields/message.php | 49 +- .../lang/no/admin/departments/message.php | 22 +- resources/lang/no/admin/departments/table.php | 4 +- .../lang/no/admin/depreciations/general.php | 4 +- .../lang/no/admin/depreciations/message.php | 23 +- .../lang/no/admin/depreciations/table.php | 4 +- resources/lang/no/admin/groups/message.php | 12 +- resources/lang/no/admin/groups/table.php | 4 +- resources/lang/no/admin/groups/titles.php | 4 +- resources/lang/no/admin/hardware/form.php | 15 +- resources/lang/no/admin/hardware/general.php | 6 +- resources/lang/no/admin/hardware/message.php | 68 +- resources/lang/no/admin/hardware/table.php | 6 +- resources/lang/no/admin/kits/general.php | 4 +- resources/lang/no/admin/licenses/form.php | 6 +- resources/lang/no/admin/licenses/general.php | 4 +- resources/lang/no/admin/licenses/message.php | 43 +- resources/lang/no/admin/licenses/table.php | 4 +- resources/lang/no/admin/locations/message.php | 23 +- resources/lang/no/admin/locations/table.php | 4 +- .../lang/no/admin/manufacturers/message.php | 28 +- .../lang/no/admin/manufacturers/table.php | 4 +- resources/lang/no/admin/models/general.php | 6 +- resources/lang/no/admin/models/message.php | 39 +- resources/lang/no/admin/models/table.php | 4 +- resources/lang/no/admin/reports/general.php | 6 +- resources/lang/no/admin/reports/message.php | 6 +- resources/lang/no/admin/settings/general.php | 10 +- resources/lang/no/admin/settings/message.php | 21 +- .../lang/no/admin/statuslabels/message.php | 27 +- .../lang/no/admin/statuslabels/table.php | 4 +- resources/lang/no/admin/suppliers/message.php | 21 +- resources/lang/no/admin/suppliers/table.php | 4 +- resources/lang/no/admin/users/general.php | 7 +- resources/lang/no/admin/users/message.php | 21 +- resources/lang/no/admin/users/table.php | 8 +- resources/lang/no/auth/general.php | 1 - resources/lang/no/auth/message.php | 29 +- resources/lang/no/button.php | 6 +- resources/lang/no/general.php | 4 +- resources/lang/no/help.php | 10 +- resources/lang/no/mail.php | 6 +- resources/lang/no/pagination.php | 4 +- resources/lang/no/passwords.php | 1 - resources/lang/no/reminders.php | 12 +- resources/lang/no/table.php | 4 +- resources/lang/no/validation.php | 15 +- .../lang/pl/admin/accessories/general.php | 4 +- .../lang/pl/admin/accessories/message.php | 35 +- resources/lang/pl/admin/accessories/table.php | 9 +- .../lang/pl/admin/asset_maintenances/form.php | 2 +- .../pl/admin/asset_maintenances/message.php | 8 +- .../pl/admin/asset_maintenances/table.php | 2 +- .../lang/pl/admin/categories/general.php | 4 +- .../lang/pl/admin/categories/message.php | 22 +- resources/lang/pl/admin/categories/table.php | 6 +- resources/lang/pl/admin/companies/general.php | 1 + resources/lang/pl/admin/companies/message.php | 23 +- resources/lang/pl/admin/companies/table.php | 5 +- .../lang/pl/admin/components/general.php | 4 +- .../lang/pl/admin/components/message.php | 35 +- resources/lang/pl/admin/components/table.php | 4 +- .../lang/pl/admin/consumables/general.php | 4 +- .../lang/pl/admin/consumables/message.php | 35 +- resources/lang/pl/admin/consumables/table.php | 4 +- .../lang/pl/admin/custom_fields/general.php | 4 +- .../lang/pl/admin/custom_fields/message.php | 49 +- .../lang/pl/admin/departments/message.php | 22 +- resources/lang/pl/admin/departments/table.php | 4 +- .../lang/pl/admin/depreciations/general.php | 4 +- .../lang/pl/admin/depreciations/message.php | 23 +- .../lang/pl/admin/depreciations/table.php | 4 +- resources/lang/pl/admin/groups/message.php | 12 +- resources/lang/pl/admin/groups/table.php | 4 +- resources/lang/pl/admin/groups/titles.php | 4 +- resources/lang/pl/admin/hardware/form.php | 15 +- resources/lang/pl/admin/hardware/general.php | 6 +- resources/lang/pl/admin/hardware/message.php | 68 +- resources/lang/pl/admin/hardware/table.php | 6 +- resources/lang/pl/admin/kits/general.php | 4 +- resources/lang/pl/admin/licenses/form.php | 6 +- resources/lang/pl/admin/licenses/general.php | 4 +- resources/lang/pl/admin/licenses/message.php | 43 +- resources/lang/pl/admin/licenses/table.php | 4 +- resources/lang/pl/admin/locations/message.php | 23 +- resources/lang/pl/admin/locations/table.php | 4 +- .../lang/pl/admin/manufacturers/message.php | 28 +- .../lang/pl/admin/manufacturers/table.php | 4 +- resources/lang/pl/admin/models/general.php | 6 +- resources/lang/pl/admin/models/message.php | 39 +- resources/lang/pl/admin/models/table.php | 4 +- resources/lang/pl/admin/reports/general.php | 6 +- resources/lang/pl/admin/reports/message.php | 6 +- resources/lang/pl/admin/settings/general.php | 10 +- resources/lang/pl/admin/settings/message.php | 21 +- .../lang/pl/admin/statuslabels/message.php | 27 +- .../lang/pl/admin/statuslabels/table.php | 4 +- resources/lang/pl/admin/suppliers/message.php | 21 +- resources/lang/pl/admin/suppliers/table.php | 4 +- resources/lang/pl/admin/users/general.php | 7 +- resources/lang/pl/admin/users/message.php | 21 +- resources/lang/pl/admin/users/table.php | 8 +- resources/lang/pl/auth/general.php | 1 - resources/lang/pl/auth/message.php | 29 +- resources/lang/pl/button.php | 6 +- resources/lang/pl/general.php | 4 +- resources/lang/pl/help.php | 10 +- resources/lang/pl/mail.php | 6 +- resources/lang/pl/pagination.php | 4 +- resources/lang/pl/passwords.php | 1 - resources/lang/pl/reminders.php | 12 +- resources/lang/pl/table.php | 4 +- resources/lang/pl/validation.php | 15 +- .../lang/pt-BR/admin/accessories/general.php | 4 +- .../lang/pt-BR/admin/accessories/message.php | 35 +- .../lang/pt-BR/admin/accessories/table.php | 9 +- .../pt-BR/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../pt-BR/admin/asset_maintenances/table.php | 2 +- .../lang/pt-BR/admin/categories/general.php | 4 +- .../lang/pt-BR/admin/categories/message.php | 22 +- .../lang/pt-BR/admin/categories/table.php | 6 +- .../lang/pt-BR/admin/companies/general.php | 1 + .../lang/pt-BR/admin/companies/message.php | 23 +- .../lang/pt-BR/admin/companies/table.php | 5 +- .../lang/pt-BR/admin/components/general.php | 4 +- .../lang/pt-BR/admin/components/message.php | 35 +- .../lang/pt-BR/admin/components/table.php | 4 +- .../lang/pt-BR/admin/consumables/general.php | 4 +- .../lang/pt-BR/admin/consumables/message.php | 35 +- .../lang/pt-BR/admin/consumables/table.php | 4 +- .../pt-BR/admin/custom_fields/general.php | 4 +- .../pt-BR/admin/custom_fields/message.php | 49 +- .../lang/pt-BR/admin/departments/message.php | 22 +- .../lang/pt-BR/admin/departments/table.php | 4 +- .../pt-BR/admin/depreciations/general.php | 4 +- .../pt-BR/admin/depreciations/message.php | 23 +- .../lang/pt-BR/admin/depreciations/table.php | 4 +- resources/lang/pt-BR/admin/groups/message.php | 12 +- resources/lang/pt-BR/admin/groups/table.php | 4 +- resources/lang/pt-BR/admin/groups/titles.php | 4 +- resources/lang/pt-BR/admin/hardware/form.php | 15 +- .../lang/pt-BR/admin/hardware/general.php | 6 +- .../lang/pt-BR/admin/hardware/message.php | 68 +- resources/lang/pt-BR/admin/hardware/table.php | 6 +- resources/lang/pt-BR/admin/kits/general.php | 4 +- resources/lang/pt-BR/admin/licenses/form.php | 6 +- .../lang/pt-BR/admin/licenses/general.php | 4 +- .../lang/pt-BR/admin/licenses/message.php | 43 +- resources/lang/pt-BR/admin/licenses/table.php | 4 +- .../lang/pt-BR/admin/locations/message.php | 23 +- .../lang/pt-BR/admin/locations/table.php | 4 +- .../pt-BR/admin/manufacturers/message.php | 28 +- .../lang/pt-BR/admin/manufacturers/table.php | 4 +- resources/lang/pt-BR/admin/models/general.php | 6 +- resources/lang/pt-BR/admin/models/message.php | 39 +- resources/lang/pt-BR/admin/models/table.php | 4 +- .../lang/pt-BR/admin/reports/general.php | 6 +- .../lang/pt-BR/admin/reports/message.php | 6 +- .../lang/pt-BR/admin/settings/general.php | 10 +- .../lang/pt-BR/admin/settings/message.php | 21 +- .../lang/pt-BR/admin/statuslabels/message.php | 27 +- .../lang/pt-BR/admin/statuslabels/table.php | 4 +- .../lang/pt-BR/admin/suppliers/message.php | 21 +- .../lang/pt-BR/admin/suppliers/table.php | 4 +- resources/lang/pt-BR/admin/users/general.php | 7 +- resources/lang/pt-BR/admin/users/message.php | 21 +- resources/lang/pt-BR/admin/users/table.php | 8 +- resources/lang/pt-BR/auth/general.php | 1 - resources/lang/pt-BR/auth/message.php | 29 +- resources/lang/pt-BR/button.php | 6 +- resources/lang/pt-BR/general.php | 4 +- resources/lang/pt-BR/help.php | 10 +- resources/lang/pt-BR/mail.php | 6 +- resources/lang/pt-BR/pagination.php | 4 +- resources/lang/pt-BR/passwords.php | 1 - resources/lang/pt-BR/reminders.php | 12 +- resources/lang/pt-BR/table.php | 4 +- resources/lang/pt-BR/validation.php | 15 +- .../lang/pt-PT/admin/accessories/general.php | 4 +- .../lang/pt-PT/admin/accessories/message.php | 35 +- .../lang/pt-PT/admin/accessories/table.php | 9 +- .../pt-PT/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../pt-PT/admin/asset_maintenances/table.php | 2 +- .../lang/pt-PT/admin/categories/general.php | 4 +- .../lang/pt-PT/admin/categories/message.php | 22 +- .../lang/pt-PT/admin/categories/table.php | 6 +- .../lang/pt-PT/admin/companies/general.php | 1 + .../lang/pt-PT/admin/companies/message.php | 23 +- .../lang/pt-PT/admin/companies/table.php | 5 +- .../lang/pt-PT/admin/components/general.php | 4 +- .../lang/pt-PT/admin/components/message.php | 35 +- .../lang/pt-PT/admin/components/table.php | 4 +- .../lang/pt-PT/admin/consumables/general.php | 4 +- .../lang/pt-PT/admin/consumables/message.php | 35 +- .../lang/pt-PT/admin/consumables/table.php | 4 +- .../pt-PT/admin/custom_fields/general.php | 4 +- .../pt-PT/admin/custom_fields/message.php | 49 +- .../lang/pt-PT/admin/departments/message.php | 22 +- .../lang/pt-PT/admin/departments/table.php | 4 +- .../pt-PT/admin/depreciations/general.php | 4 +- .../pt-PT/admin/depreciations/message.php | 23 +- .../lang/pt-PT/admin/depreciations/table.php | 4 +- resources/lang/pt-PT/admin/groups/message.php | 12 +- resources/lang/pt-PT/admin/groups/table.php | 4 +- resources/lang/pt-PT/admin/groups/titles.php | 4 +- resources/lang/pt-PT/admin/hardware/form.php | 15 +- .../lang/pt-PT/admin/hardware/general.php | 6 +- .../lang/pt-PT/admin/hardware/message.php | 68 +- resources/lang/pt-PT/admin/hardware/table.php | 6 +- resources/lang/pt-PT/admin/kits/general.php | 4 +- resources/lang/pt-PT/admin/licenses/form.php | 6 +- .../lang/pt-PT/admin/licenses/general.php | 4 +- .../lang/pt-PT/admin/licenses/message.php | 43 +- resources/lang/pt-PT/admin/licenses/table.php | 4 +- .../lang/pt-PT/admin/locations/message.php | 23 +- .../lang/pt-PT/admin/locations/table.php | 4 +- .../pt-PT/admin/manufacturers/message.php | 28 +- .../lang/pt-PT/admin/manufacturers/table.php | 4 +- resources/lang/pt-PT/admin/models/general.php | 6 +- resources/lang/pt-PT/admin/models/message.php | 39 +- resources/lang/pt-PT/admin/models/table.php | 4 +- .../lang/pt-PT/admin/reports/general.php | 6 +- .../lang/pt-PT/admin/reports/message.php | 6 +- .../lang/pt-PT/admin/settings/general.php | 10 +- .../lang/pt-PT/admin/settings/message.php | 21 +- .../lang/pt-PT/admin/statuslabels/message.php | 27 +- .../lang/pt-PT/admin/statuslabels/table.php | 4 +- .../lang/pt-PT/admin/suppliers/message.php | 21 +- .../lang/pt-PT/admin/suppliers/table.php | 4 +- resources/lang/pt-PT/admin/users/general.php | 7 +- resources/lang/pt-PT/admin/users/message.php | 21 +- resources/lang/pt-PT/admin/users/table.php | 8 +- resources/lang/pt-PT/auth/general.php | 1 - resources/lang/pt-PT/auth/message.php | 29 +- resources/lang/pt-PT/button.php | 6 +- resources/lang/pt-PT/general.php | 4 +- resources/lang/pt-PT/help.php | 10 +- resources/lang/pt-PT/mail.php | 6 +- resources/lang/pt-PT/pagination.php | 4 +- resources/lang/pt-PT/passwords.php | 1 - resources/lang/pt-PT/reminders.php | 12 +- resources/lang/pt-PT/table.php | 4 +- resources/lang/pt-PT/validation.php | 15 +- .../lang/ro/admin/accessories/general.php | 4 +- .../lang/ro/admin/accessories/message.php | 35 +- resources/lang/ro/admin/accessories/table.php | 9 +- .../lang/ro/admin/asset_maintenances/form.php | 2 +- .../ro/admin/asset_maintenances/message.php | 8 +- .../ro/admin/asset_maintenances/table.php | 2 +- .../lang/ro/admin/categories/general.php | 4 +- .../lang/ro/admin/categories/message.php | 22 +- resources/lang/ro/admin/categories/table.php | 6 +- resources/lang/ro/admin/companies/general.php | 1 + resources/lang/ro/admin/companies/message.php | 23 +- resources/lang/ro/admin/companies/table.php | 5 +- .../lang/ro/admin/components/general.php | 4 +- .../lang/ro/admin/components/message.php | 35 +- resources/lang/ro/admin/components/table.php | 4 +- .../lang/ro/admin/consumables/general.php | 4 +- .../lang/ro/admin/consumables/message.php | 35 +- resources/lang/ro/admin/consumables/table.php | 4 +- .../lang/ro/admin/custom_fields/general.php | 4 +- .../lang/ro/admin/custom_fields/message.php | 49 +- .../lang/ro/admin/departments/message.php | 22 +- resources/lang/ro/admin/departments/table.php | 4 +- .../lang/ro/admin/depreciations/general.php | 4 +- .../lang/ro/admin/depreciations/message.php | 23 +- .../lang/ro/admin/depreciations/table.php | 4 +- resources/lang/ro/admin/groups/message.php | 12 +- resources/lang/ro/admin/groups/table.php | 4 +- resources/lang/ro/admin/groups/titles.php | 4 +- resources/lang/ro/admin/hardware/form.php | 15 +- resources/lang/ro/admin/hardware/general.php | 6 +- resources/lang/ro/admin/hardware/message.php | 68 +- resources/lang/ro/admin/hardware/table.php | 6 +- resources/lang/ro/admin/kits/general.php | 4 +- resources/lang/ro/admin/licenses/form.php | 6 +- resources/lang/ro/admin/licenses/general.php | 4 +- resources/lang/ro/admin/licenses/message.php | 43 +- resources/lang/ro/admin/licenses/table.php | 4 +- resources/lang/ro/admin/locations/message.php | 23 +- resources/lang/ro/admin/locations/table.php | 4 +- .../lang/ro/admin/manufacturers/message.php | 28 +- .../lang/ro/admin/manufacturers/table.php | 4 +- resources/lang/ro/admin/models/general.php | 6 +- resources/lang/ro/admin/models/message.php | 39 +- resources/lang/ro/admin/models/table.php | 4 +- resources/lang/ro/admin/reports/general.php | 6 +- resources/lang/ro/admin/reports/message.php | 6 +- resources/lang/ro/admin/settings/general.php | 10 +- resources/lang/ro/admin/settings/message.php | 21 +- .../lang/ro/admin/statuslabels/message.php | 27 +- .../lang/ro/admin/statuslabels/table.php | 4 +- resources/lang/ro/admin/suppliers/message.php | 21 +- resources/lang/ro/admin/suppliers/table.php | 4 +- resources/lang/ro/admin/users/general.php | 7 +- resources/lang/ro/admin/users/message.php | 21 +- resources/lang/ro/admin/users/table.php | 8 +- resources/lang/ro/auth/general.php | 1 - resources/lang/ro/auth/message.php | 29 +- resources/lang/ro/button.php | 6 +- resources/lang/ro/general.php | 4 +- resources/lang/ro/help.php | 10 +- resources/lang/ro/mail.php | 6 +- resources/lang/ro/pagination.php | 4 +- resources/lang/ro/passwords.php | 1 - resources/lang/ro/reminders.php | 12 +- resources/lang/ro/table.php | 4 +- resources/lang/ro/validation.php | 15 +- .../lang/ru/admin/accessories/general.php | 4 +- .../lang/ru/admin/accessories/message.php | 35 +- resources/lang/ru/admin/accessories/table.php | 9 +- .../lang/ru/admin/asset_maintenances/form.php | 2 +- .../ru/admin/asset_maintenances/message.php | 8 +- .../ru/admin/asset_maintenances/table.php | 2 +- .../lang/ru/admin/categories/general.php | 4 +- .../lang/ru/admin/categories/message.php | 22 +- resources/lang/ru/admin/categories/table.php | 6 +- resources/lang/ru/admin/companies/general.php | 1 + resources/lang/ru/admin/companies/message.php | 23 +- resources/lang/ru/admin/companies/table.php | 5 +- .../lang/ru/admin/components/general.php | 4 +- .../lang/ru/admin/components/message.php | 35 +- resources/lang/ru/admin/components/table.php | 4 +- .../lang/ru/admin/consumables/general.php | 4 +- .../lang/ru/admin/consumables/message.php | 35 +- resources/lang/ru/admin/consumables/table.php | 4 +- .../lang/ru/admin/custom_fields/general.php | 4 +- .../lang/ru/admin/custom_fields/message.php | 49 +- .../lang/ru/admin/departments/message.php | 22 +- resources/lang/ru/admin/departments/table.php | 4 +- .../lang/ru/admin/depreciations/general.php | 4 +- .../lang/ru/admin/depreciations/message.php | 23 +- .../lang/ru/admin/depreciations/table.php | 4 +- resources/lang/ru/admin/groups/message.php | 12 +- resources/lang/ru/admin/groups/table.php | 4 +- resources/lang/ru/admin/groups/titles.php | 4 +- resources/lang/ru/admin/hardware/form.php | 15 +- resources/lang/ru/admin/hardware/general.php | 6 +- resources/lang/ru/admin/hardware/message.php | 68 +- resources/lang/ru/admin/hardware/table.php | 6 +- resources/lang/ru/admin/kits/general.php | 4 +- resources/lang/ru/admin/licenses/form.php | 6 +- resources/lang/ru/admin/licenses/general.php | 4 +- resources/lang/ru/admin/licenses/message.php | 43 +- resources/lang/ru/admin/licenses/table.php | 4 +- resources/lang/ru/admin/locations/message.php | 23 +- resources/lang/ru/admin/locations/table.php | 4 +- .../lang/ru/admin/manufacturers/message.php | 28 +- .../lang/ru/admin/manufacturers/table.php | 4 +- resources/lang/ru/admin/models/general.php | 6 +- resources/lang/ru/admin/models/message.php | 39 +- resources/lang/ru/admin/models/table.php | 4 +- resources/lang/ru/admin/reports/general.php | 6 +- resources/lang/ru/admin/reports/message.php | 6 +- resources/lang/ru/admin/settings/general.php | 10 +- resources/lang/ru/admin/settings/message.php | 21 +- .../lang/ru/admin/statuslabels/message.php | 27 +- .../lang/ru/admin/statuslabels/table.php | 4 +- resources/lang/ru/admin/suppliers/message.php | 21 +- resources/lang/ru/admin/suppliers/table.php | 4 +- resources/lang/ru/admin/users/general.php | 7 +- resources/lang/ru/admin/users/message.php | 21 +- resources/lang/ru/admin/users/table.php | 8 +- resources/lang/ru/auth/general.php | 1 - resources/lang/ru/auth/message.php | 29 +- resources/lang/ru/button.php | 6 +- resources/lang/ru/general.php | 4 +- resources/lang/ru/help.php | 10 +- resources/lang/ru/mail.php | 6 +- resources/lang/ru/pagination.php | 4 +- resources/lang/ru/passwords.php | 1 - resources/lang/ru/reminders.php | 12 +- resources/lang/ru/table.php | 4 +- resources/lang/ru/validation.php | 15 +- .../lang/sl/admin/accessories/general.php | 4 +- .../lang/sl/admin/accessories/message.php | 35 +- resources/lang/sl/admin/accessories/table.php | 9 +- .../lang/sl/admin/asset_maintenances/form.php | 2 +- .../sl/admin/asset_maintenances/message.php | 8 +- .../sl/admin/asset_maintenances/table.php | 2 +- .../lang/sl/admin/categories/general.php | 4 +- .../lang/sl/admin/categories/message.php | 22 +- resources/lang/sl/admin/categories/table.php | 6 +- resources/lang/sl/admin/companies/general.php | 1 + resources/lang/sl/admin/companies/message.php | 23 +- resources/lang/sl/admin/companies/table.php | 5 +- .../lang/sl/admin/components/general.php | 4 +- .../lang/sl/admin/components/message.php | 35 +- resources/lang/sl/admin/components/table.php | 4 +- .../lang/sl/admin/consumables/general.php | 4 +- .../lang/sl/admin/consumables/message.php | 35 +- resources/lang/sl/admin/consumables/table.php | 4 +- .../lang/sl/admin/custom_fields/general.php | 4 +- .../lang/sl/admin/custom_fields/message.php | 49 +- .../lang/sl/admin/departments/message.php | 22 +- resources/lang/sl/admin/departments/table.php | 4 +- .../lang/sl/admin/depreciations/general.php | 4 +- .../lang/sl/admin/depreciations/message.php | 23 +- .../lang/sl/admin/depreciations/table.php | 4 +- resources/lang/sl/admin/groups/message.php | 12 +- resources/lang/sl/admin/groups/table.php | 4 +- resources/lang/sl/admin/groups/titles.php | 4 +- resources/lang/sl/admin/hardware/form.php | 15 +- resources/lang/sl/admin/hardware/general.php | 6 +- resources/lang/sl/admin/hardware/message.php | 68 +- resources/lang/sl/admin/hardware/table.php | 6 +- resources/lang/sl/admin/kits/general.php | 4 +- resources/lang/sl/admin/licenses/form.php | 6 +- resources/lang/sl/admin/licenses/general.php | 4 +- resources/lang/sl/admin/licenses/message.php | 43 +- resources/lang/sl/admin/licenses/table.php | 4 +- resources/lang/sl/admin/locations/message.php | 23 +- resources/lang/sl/admin/locations/table.php | 4 +- .../lang/sl/admin/manufacturers/message.php | 28 +- .../lang/sl/admin/manufacturers/table.php | 4 +- resources/lang/sl/admin/models/general.php | 6 +- resources/lang/sl/admin/models/message.php | 39 +- resources/lang/sl/admin/models/table.php | 4 +- resources/lang/sl/admin/reports/general.php | 6 +- resources/lang/sl/admin/reports/message.php | 6 +- resources/lang/sl/admin/settings/general.php | 10 +- resources/lang/sl/admin/settings/message.php | 21 +- .../lang/sl/admin/statuslabels/message.php | 27 +- .../lang/sl/admin/statuslabels/table.php | 4 +- resources/lang/sl/admin/suppliers/message.php | 21 +- resources/lang/sl/admin/suppliers/table.php | 4 +- resources/lang/sl/admin/users/general.php | 7 +- resources/lang/sl/admin/users/message.php | 21 +- resources/lang/sl/admin/users/table.php | 8 +- resources/lang/sl/auth/general.php | 1 - resources/lang/sl/auth/message.php | 29 +- resources/lang/sl/button.php | 6 +- resources/lang/sl/general.php | 4 +- resources/lang/sl/help.php | 10 +- resources/lang/sl/mail.php | 6 +- resources/lang/sl/pagination.php | 4 +- resources/lang/sl/passwords.php | 1 - resources/lang/sl/reminders.php | 12 +- resources/lang/sl/table.php | 4 +- resources/lang/sl/validation.php | 15 +- .../lang/sr-CS/admin/accessories/general.php | 4 +- .../lang/sr-CS/admin/accessories/message.php | 35 +- .../lang/sr-CS/admin/accessories/table.php | 9 +- .../sr-CS/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../sr-CS/admin/asset_maintenances/table.php | 2 +- .../lang/sr-CS/admin/categories/general.php | 4 +- .../lang/sr-CS/admin/categories/message.php | 22 +- .../lang/sr-CS/admin/categories/table.php | 6 +- .../lang/sr-CS/admin/companies/general.php | 1 + .../lang/sr-CS/admin/companies/message.php | 23 +- .../lang/sr-CS/admin/companies/table.php | 5 +- .../lang/sr-CS/admin/components/general.php | 4 +- .../lang/sr-CS/admin/components/message.php | 35 +- .../lang/sr-CS/admin/components/table.php | 4 +- .../lang/sr-CS/admin/consumables/general.php | 4 +- .../lang/sr-CS/admin/consumables/message.php | 35 +- .../lang/sr-CS/admin/consumables/table.php | 4 +- .../sr-CS/admin/custom_fields/general.php | 4 +- .../sr-CS/admin/custom_fields/message.php | 49 +- .../lang/sr-CS/admin/departments/message.php | 22 +- .../lang/sr-CS/admin/departments/table.php | 4 +- .../sr-CS/admin/depreciations/general.php | 4 +- .../sr-CS/admin/depreciations/message.php | 23 +- .../lang/sr-CS/admin/depreciations/table.php | 4 +- resources/lang/sr-CS/admin/groups/message.php | 12 +- resources/lang/sr-CS/admin/groups/table.php | 4 +- resources/lang/sr-CS/admin/groups/titles.php | 4 +- resources/lang/sr-CS/admin/hardware/form.php | 15 +- .../lang/sr-CS/admin/hardware/general.php | 6 +- .../lang/sr-CS/admin/hardware/message.php | 68 +- resources/lang/sr-CS/admin/hardware/table.php | 6 +- resources/lang/sr-CS/admin/kits/general.php | 4 +- resources/lang/sr-CS/admin/licenses/form.php | 6 +- .../lang/sr-CS/admin/licenses/general.php | 4 +- .../lang/sr-CS/admin/licenses/message.php | 43 +- resources/lang/sr-CS/admin/licenses/table.php | 4 +- .../lang/sr-CS/admin/locations/message.php | 23 +- .../lang/sr-CS/admin/locations/table.php | 4 +- .../sr-CS/admin/manufacturers/message.php | 28 +- .../lang/sr-CS/admin/manufacturers/table.php | 4 +- resources/lang/sr-CS/admin/models/general.php | 6 +- resources/lang/sr-CS/admin/models/message.php | 39 +- resources/lang/sr-CS/admin/models/table.php | 4 +- .../lang/sr-CS/admin/reports/general.php | 6 +- .../lang/sr-CS/admin/reports/message.php | 6 +- .../lang/sr-CS/admin/settings/general.php | 8 +- .../lang/sr-CS/admin/settings/message.php | 21 +- .../lang/sr-CS/admin/statuslabels/message.php | 27 +- .../lang/sr-CS/admin/statuslabels/table.php | 4 +- .../lang/sr-CS/admin/suppliers/message.php | 21 +- .../lang/sr-CS/admin/suppliers/table.php | 4 +- resources/lang/sr-CS/admin/users/general.php | 7 +- resources/lang/sr-CS/admin/users/message.php | 21 +- resources/lang/sr-CS/admin/users/table.php | 8 +- resources/lang/sr-CS/auth/general.php | 1 - resources/lang/sr-CS/auth/message.php | 29 +- resources/lang/sr-CS/button.php | 6 +- resources/lang/sr-CS/general.php | 4 +- resources/lang/sr-CS/help.php | 10 +- resources/lang/sr-CS/mail.php | 6 +- resources/lang/sr-CS/pagination.php | 4 +- resources/lang/sr-CS/passwords.php | 1 - resources/lang/sr-CS/reminders.php | 12 +- resources/lang/sr-CS/table.php | 4 +- resources/lang/sr-CS/validation.php | 15 +- .../lang/sv-SE/admin/accessories/general.php | 4 +- .../lang/sv-SE/admin/accessories/message.php | 35 +- .../lang/sv-SE/admin/accessories/table.php | 9 +- .../sv-SE/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../sv-SE/admin/asset_maintenances/table.php | 2 +- .../lang/sv-SE/admin/categories/general.php | 4 +- .../lang/sv-SE/admin/categories/message.php | 22 +- .../lang/sv-SE/admin/categories/table.php | 6 +- .../lang/sv-SE/admin/companies/general.php | 1 + .../lang/sv-SE/admin/companies/message.php | 23 +- .../lang/sv-SE/admin/companies/table.php | 5 +- .../lang/sv-SE/admin/components/general.php | 4 +- .../lang/sv-SE/admin/components/message.php | 35 +- .../lang/sv-SE/admin/components/table.php | 4 +- .../lang/sv-SE/admin/consumables/general.php | 4 +- .../lang/sv-SE/admin/consumables/message.php | 35 +- .../lang/sv-SE/admin/consumables/table.php | 4 +- .../sv-SE/admin/custom_fields/general.php | 4 +- .../sv-SE/admin/custom_fields/message.php | 49 +- .../lang/sv-SE/admin/departments/message.php | 22 +- .../lang/sv-SE/admin/departments/table.php | 4 +- .../sv-SE/admin/depreciations/general.php | 4 +- .../sv-SE/admin/depreciations/message.php | 23 +- .../lang/sv-SE/admin/depreciations/table.php | 4 +- resources/lang/sv-SE/admin/groups/message.php | 12 +- resources/lang/sv-SE/admin/groups/table.php | 4 +- resources/lang/sv-SE/admin/groups/titles.php | 4 +- resources/lang/sv-SE/admin/hardware/form.php | 15 +- .../lang/sv-SE/admin/hardware/general.php | 6 +- .../lang/sv-SE/admin/hardware/message.php | 68 +- resources/lang/sv-SE/admin/hardware/table.php | 6 +- resources/lang/sv-SE/admin/kits/general.php | 4 +- resources/lang/sv-SE/admin/licenses/form.php | 6 +- .../lang/sv-SE/admin/licenses/general.php | 4 +- .../lang/sv-SE/admin/licenses/message.php | 43 +- resources/lang/sv-SE/admin/licenses/table.php | 4 +- .../lang/sv-SE/admin/locations/message.php | 23 +- .../lang/sv-SE/admin/locations/table.php | 4 +- .../sv-SE/admin/manufacturers/message.php | 28 +- .../lang/sv-SE/admin/manufacturers/table.php | 4 +- resources/lang/sv-SE/admin/models/general.php | 6 +- resources/lang/sv-SE/admin/models/message.php | 39 +- resources/lang/sv-SE/admin/models/table.php | 4 +- .../lang/sv-SE/admin/reports/general.php | 6 +- .../lang/sv-SE/admin/reports/message.php | 6 +- .../lang/sv-SE/admin/settings/general.php | 10 +- .../lang/sv-SE/admin/settings/message.php | 21 +- .../lang/sv-SE/admin/statuslabels/message.php | 27 +- .../lang/sv-SE/admin/statuslabels/table.php | 4 +- .../lang/sv-SE/admin/suppliers/message.php | 21 +- .../lang/sv-SE/admin/suppliers/table.php | 4 +- resources/lang/sv-SE/admin/users/general.php | 7 +- resources/lang/sv-SE/admin/users/message.php | 21 +- resources/lang/sv-SE/admin/users/table.php | 8 +- resources/lang/sv-SE/auth/general.php | 1 - resources/lang/sv-SE/auth/message.php | 29 +- resources/lang/sv-SE/button.php | 6 +- resources/lang/sv-SE/general.php | 4 +- resources/lang/sv-SE/help.php | 10 +- resources/lang/sv-SE/mail.php | 6 +- resources/lang/sv-SE/pagination.php | 4 +- resources/lang/sv-SE/passwords.php | 1 - resources/lang/sv-SE/reminders.php | 12 +- resources/lang/sv-SE/table.php | 4 +- resources/lang/sv-SE/validation.php | 15 +- .../lang/ta/admin/accessories/general.php | 4 +- .../lang/ta/admin/accessories/message.php | 35 +- resources/lang/ta/admin/accessories/table.php | 9 +- .../lang/ta/admin/asset_maintenances/form.php | 2 +- .../ta/admin/asset_maintenances/message.php | 8 +- .../ta/admin/asset_maintenances/table.php | 2 +- .../lang/ta/admin/categories/general.php | 4 +- .../lang/ta/admin/categories/message.php | 22 +- resources/lang/ta/admin/categories/table.php | 6 +- resources/lang/ta/admin/companies/general.php | 1 + resources/lang/ta/admin/companies/message.php | 23 +- resources/lang/ta/admin/companies/table.php | 5 +- .../lang/ta/admin/components/general.php | 4 +- .../lang/ta/admin/components/message.php | 35 +- resources/lang/ta/admin/components/table.php | 4 +- .../lang/ta/admin/consumables/general.php | 4 +- .../lang/ta/admin/consumables/message.php | 35 +- resources/lang/ta/admin/consumables/table.php | 4 +- .../lang/ta/admin/custom_fields/general.php | 4 +- .../lang/ta/admin/custom_fields/message.php | 49 +- .../lang/ta/admin/departments/message.php | 22 +- resources/lang/ta/admin/departments/table.php | 4 +- .../lang/ta/admin/depreciations/general.php | 4 +- .../lang/ta/admin/depreciations/message.php | 23 +- .../lang/ta/admin/depreciations/table.php | 4 +- resources/lang/ta/admin/groups/message.php | 12 +- resources/lang/ta/admin/groups/table.php | 4 +- resources/lang/ta/admin/groups/titles.php | 4 +- resources/lang/ta/admin/hardware/form.php | 15 +- resources/lang/ta/admin/hardware/general.php | 6 +- resources/lang/ta/admin/hardware/message.php | 68 +- resources/lang/ta/admin/hardware/table.php | 6 +- resources/lang/ta/admin/kits/general.php | 4 +- resources/lang/ta/admin/licenses/form.php | 6 +- resources/lang/ta/admin/licenses/general.php | 4 +- resources/lang/ta/admin/licenses/message.php | 43 +- resources/lang/ta/admin/licenses/table.php | 4 +- resources/lang/ta/admin/locations/message.php | 23 +- resources/lang/ta/admin/locations/table.php | 4 +- .../lang/ta/admin/manufacturers/message.php | 28 +- .../lang/ta/admin/manufacturers/table.php | 4 +- resources/lang/ta/admin/models/general.php | 6 +- resources/lang/ta/admin/models/message.php | 39 +- resources/lang/ta/admin/models/table.php | 4 +- resources/lang/ta/admin/reports/general.php | 6 +- resources/lang/ta/admin/reports/message.php | 6 +- resources/lang/ta/admin/settings/general.php | 10 +- resources/lang/ta/admin/settings/message.php | 21 +- .../lang/ta/admin/statuslabels/message.php | 27 +- .../lang/ta/admin/statuslabels/table.php | 4 +- resources/lang/ta/admin/suppliers/message.php | 21 +- resources/lang/ta/admin/suppliers/table.php | 4 +- resources/lang/ta/admin/users/general.php | 7 +- resources/lang/ta/admin/users/message.php | 21 +- resources/lang/ta/admin/users/table.php | 8 +- resources/lang/ta/auth/general.php | 1 - resources/lang/ta/auth/message.php | 29 +- resources/lang/ta/button.php | 6 +- resources/lang/ta/general.php | 4 +- resources/lang/ta/help.php | 10 +- resources/lang/ta/mail.php | 6 +- resources/lang/ta/pagination.php | 4 +- resources/lang/ta/passwords.php | 1 - resources/lang/ta/reminders.php | 12 +- resources/lang/ta/table.php | 4 +- resources/lang/ta/validation.php | 15 +- .../lang/th/admin/accessories/general.php | 4 +- .../lang/th/admin/accessories/message.php | 35 +- resources/lang/th/admin/accessories/table.php | 9 +- .../lang/th/admin/asset_maintenances/form.php | 2 +- .../th/admin/asset_maintenances/message.php | 8 +- .../th/admin/asset_maintenances/table.php | 2 +- .../lang/th/admin/categories/general.php | 4 +- .../lang/th/admin/categories/message.php | 22 +- resources/lang/th/admin/categories/table.php | 6 +- resources/lang/th/admin/companies/general.php | 1 + resources/lang/th/admin/companies/message.php | 23 +- resources/lang/th/admin/companies/table.php | 5 +- .../lang/th/admin/components/general.php | 4 +- .../lang/th/admin/components/message.php | 35 +- resources/lang/th/admin/components/table.php | 4 +- .../lang/th/admin/consumables/general.php | 4 +- .../lang/th/admin/consumables/message.php | 35 +- resources/lang/th/admin/consumables/table.php | 4 +- .../lang/th/admin/custom_fields/general.php | 4 +- .../lang/th/admin/custom_fields/message.php | 49 +- .../lang/th/admin/departments/message.php | 22 +- resources/lang/th/admin/departments/table.php | 4 +- .../lang/th/admin/depreciations/general.php | 4 +- .../lang/th/admin/depreciations/message.php | 23 +- .../lang/th/admin/depreciations/table.php | 4 +- resources/lang/th/admin/groups/message.php | 12 +- resources/lang/th/admin/groups/table.php | 4 +- resources/lang/th/admin/groups/titles.php | 4 +- resources/lang/th/admin/hardware/form.php | 15 +- resources/lang/th/admin/hardware/general.php | 6 +- resources/lang/th/admin/hardware/message.php | 68 +- resources/lang/th/admin/hardware/table.php | 6 +- resources/lang/th/admin/kits/general.php | 4 +- resources/lang/th/admin/licenses/form.php | 6 +- resources/lang/th/admin/licenses/general.php | 4 +- resources/lang/th/admin/licenses/message.php | 43 +- resources/lang/th/admin/licenses/table.php | 4 +- resources/lang/th/admin/locations/message.php | 23 +- resources/lang/th/admin/locations/table.php | 4 +- .../lang/th/admin/manufacturers/message.php | 28 +- .../lang/th/admin/manufacturers/table.php | 4 +- resources/lang/th/admin/models/general.php | 6 +- resources/lang/th/admin/models/message.php | 39 +- resources/lang/th/admin/models/table.php | 4 +- resources/lang/th/admin/reports/general.php | 6 +- resources/lang/th/admin/reports/message.php | 6 +- resources/lang/th/admin/settings/general.php | 10 +- resources/lang/th/admin/settings/message.php | 21 +- .../lang/th/admin/statuslabels/message.php | 27 +- .../lang/th/admin/statuslabels/table.php | 4 +- resources/lang/th/admin/suppliers/message.php | 21 +- resources/lang/th/admin/suppliers/table.php | 4 +- resources/lang/th/admin/users/general.php | 7 +- resources/lang/th/admin/users/message.php | 21 +- resources/lang/th/admin/users/table.php | 8 +- resources/lang/th/auth/general.php | 1 - resources/lang/th/auth/message.php | 29 +- resources/lang/th/button.php | 6 +- resources/lang/th/general.php | 4 +- resources/lang/th/help.php | 10 +- resources/lang/th/mail.php | 6 +- resources/lang/th/pagination.php | 4 +- resources/lang/th/passwords.php | 1 - resources/lang/th/reminders.php | 12 +- resources/lang/th/table.php | 4 +- resources/lang/th/validation.php | 15 +- .../lang/tl/admin/accessories/general.php | 4 +- .../lang/tl/admin/accessories/message.php | 35 +- resources/lang/tl/admin/accessories/table.php | 9 +- .../lang/tl/admin/asset_maintenances/form.php | 2 +- .../tl/admin/asset_maintenances/message.php | 8 +- .../tl/admin/asset_maintenances/table.php | 2 +- .../lang/tl/admin/categories/general.php | 4 +- .../lang/tl/admin/categories/message.php | 22 +- resources/lang/tl/admin/categories/table.php | 6 +- resources/lang/tl/admin/companies/general.php | 1 + resources/lang/tl/admin/companies/message.php | 23 +- resources/lang/tl/admin/companies/table.php | 5 +- .../lang/tl/admin/components/general.php | 4 +- .../lang/tl/admin/components/message.php | 35 +- resources/lang/tl/admin/components/table.php | 4 +- .../lang/tl/admin/consumables/general.php | 4 +- .../lang/tl/admin/consumables/message.php | 35 +- resources/lang/tl/admin/consumables/table.php | 4 +- .../lang/tl/admin/custom_fields/general.php | 4 +- .../lang/tl/admin/custom_fields/message.php | 49 +- .../lang/tl/admin/departments/message.php | 22 +- resources/lang/tl/admin/departments/table.php | 4 +- .../lang/tl/admin/depreciations/general.php | 4 +- .../lang/tl/admin/depreciations/message.php | 23 +- .../lang/tl/admin/depreciations/table.php | 4 +- resources/lang/tl/admin/groups/message.php | 12 +- resources/lang/tl/admin/groups/table.php | 4 +- resources/lang/tl/admin/groups/titles.php | 4 +- resources/lang/tl/admin/hardware/form.php | 15 +- resources/lang/tl/admin/hardware/general.php | 6 +- resources/lang/tl/admin/hardware/message.php | 68 +- resources/lang/tl/admin/hardware/table.php | 6 +- resources/lang/tl/admin/kits/general.php | 4 +- resources/lang/tl/admin/licenses/form.php | 6 +- resources/lang/tl/admin/licenses/general.php | 4 +- resources/lang/tl/admin/licenses/message.php | 43 +- resources/lang/tl/admin/licenses/table.php | 4 +- resources/lang/tl/admin/locations/message.php | 23 +- resources/lang/tl/admin/locations/table.php | 4 +- .../lang/tl/admin/manufacturers/message.php | 28 +- .../lang/tl/admin/manufacturers/table.php | 4 +- resources/lang/tl/admin/models/general.php | 6 +- resources/lang/tl/admin/models/message.php | 39 +- resources/lang/tl/admin/models/table.php | 4 +- resources/lang/tl/admin/reports/general.php | 6 +- resources/lang/tl/admin/reports/message.php | 6 +- resources/lang/tl/admin/settings/general.php | 8 +- resources/lang/tl/admin/settings/message.php | 21 +- .../lang/tl/admin/statuslabels/message.php | 27 +- .../lang/tl/admin/statuslabels/table.php | 4 +- resources/lang/tl/admin/suppliers/message.php | 21 +- resources/lang/tl/admin/suppliers/table.php | 4 +- resources/lang/tl/admin/users/general.php | 7 +- resources/lang/tl/admin/users/message.php | 21 +- resources/lang/tl/admin/users/table.php | 8 +- resources/lang/tl/auth/general.php | 1 - resources/lang/tl/auth/message.php | 29 +- resources/lang/tl/button.php | 6 +- resources/lang/tl/general.php | 4 +- resources/lang/tl/help.php | 10 +- resources/lang/tl/mail.php | 6 +- resources/lang/tl/pagination.php | 4 +- resources/lang/tl/passwords.php | 1 - resources/lang/tl/reminders.php | 12 +- resources/lang/tl/table.php | 4 +- resources/lang/tl/validation.php | 15 +- .../lang/tr/admin/accessories/general.php | 4 +- .../lang/tr/admin/accessories/message.php | 35 +- resources/lang/tr/admin/accessories/table.php | 9 +- .../lang/tr/admin/asset_maintenances/form.php | 2 +- .../tr/admin/asset_maintenances/message.php | 8 +- .../tr/admin/asset_maintenances/table.php | 2 +- .../lang/tr/admin/categories/general.php | 4 +- .../lang/tr/admin/categories/message.php | 22 +- resources/lang/tr/admin/categories/table.php | 6 +- resources/lang/tr/admin/companies/general.php | 1 + resources/lang/tr/admin/companies/message.php | 23 +- resources/lang/tr/admin/companies/table.php | 5 +- .../lang/tr/admin/components/general.php | 4 +- .../lang/tr/admin/components/message.php | 35 +- resources/lang/tr/admin/components/table.php | 4 +- .../lang/tr/admin/consumables/general.php | 4 +- .../lang/tr/admin/consumables/message.php | 35 +- resources/lang/tr/admin/consumables/table.php | 4 +- .../lang/tr/admin/custom_fields/general.php | 4 +- .../lang/tr/admin/custom_fields/message.php | 49 +- .../lang/tr/admin/departments/message.php | 22 +- resources/lang/tr/admin/departments/table.php | 4 +- .../lang/tr/admin/depreciations/general.php | 4 +- .../lang/tr/admin/depreciations/message.php | 23 +- .../lang/tr/admin/depreciations/table.php | 4 +- resources/lang/tr/admin/groups/message.php | 12 +- resources/lang/tr/admin/groups/table.php | 4 +- resources/lang/tr/admin/groups/titles.php | 4 +- resources/lang/tr/admin/hardware/form.php | 15 +- resources/lang/tr/admin/hardware/general.php | 6 +- resources/lang/tr/admin/hardware/message.php | 68 +- resources/lang/tr/admin/hardware/table.php | 6 +- resources/lang/tr/admin/kits/general.php | 4 +- resources/lang/tr/admin/licenses/form.php | 6 +- resources/lang/tr/admin/licenses/general.php | 4 +- resources/lang/tr/admin/licenses/message.php | 43 +- resources/lang/tr/admin/licenses/table.php | 4 +- resources/lang/tr/admin/locations/message.php | 23 +- resources/lang/tr/admin/locations/table.php | 4 +- .../lang/tr/admin/manufacturers/message.php | 28 +- .../lang/tr/admin/manufacturers/table.php | 4 +- resources/lang/tr/admin/models/general.php | 6 +- resources/lang/tr/admin/models/message.php | 39 +- resources/lang/tr/admin/models/table.php | 4 +- resources/lang/tr/admin/reports/general.php | 6 +- resources/lang/tr/admin/reports/message.php | 6 +- resources/lang/tr/admin/settings/general.php | 10 +- resources/lang/tr/admin/settings/message.php | 21 +- .../lang/tr/admin/statuslabels/message.php | 27 +- .../lang/tr/admin/statuslabels/table.php | 4 +- resources/lang/tr/admin/suppliers/message.php | 21 +- resources/lang/tr/admin/suppliers/table.php | 4 +- resources/lang/tr/admin/users/general.php | 7 +- resources/lang/tr/admin/users/message.php | 21 +- resources/lang/tr/admin/users/table.php | 8 +- resources/lang/tr/auth/general.php | 1 - resources/lang/tr/auth/message.php | 29 +- resources/lang/tr/button.php | 6 +- resources/lang/tr/general.php | 4 +- resources/lang/tr/help.php | 10 +- resources/lang/tr/mail.php | 6 +- resources/lang/tr/pagination.php | 4 +- resources/lang/tr/passwords.php | 1 - resources/lang/tr/reminders.php | 12 +- resources/lang/tr/table.php | 4 +- resources/lang/tr/validation.php | 15 +- .../lang/uk/admin/accessories/general.php | 4 +- .../lang/uk/admin/accessories/message.php | 35 +- resources/lang/uk/admin/accessories/table.php | 9 +- .../lang/uk/admin/asset_maintenances/form.php | 2 +- .../uk/admin/asset_maintenances/message.php | 8 +- .../uk/admin/asset_maintenances/table.php | 2 +- .../lang/uk/admin/categories/general.php | 4 +- .../lang/uk/admin/categories/message.php | 22 +- resources/lang/uk/admin/categories/table.php | 6 +- resources/lang/uk/admin/companies/general.php | 1 + resources/lang/uk/admin/companies/message.php | 23 +- resources/lang/uk/admin/companies/table.php | 5 +- .../lang/uk/admin/components/general.php | 4 +- .../lang/uk/admin/components/message.php | 35 +- resources/lang/uk/admin/components/table.php | 4 +- .../lang/uk/admin/consumables/general.php | 4 +- .../lang/uk/admin/consumables/message.php | 35 +- resources/lang/uk/admin/consumables/table.php | 4 +- .../lang/uk/admin/custom_fields/general.php | 4 +- .../lang/uk/admin/custom_fields/message.php | 49 +- .../lang/uk/admin/departments/message.php | 22 +- resources/lang/uk/admin/departments/table.php | 4 +- .../lang/uk/admin/depreciations/general.php | 4 +- .../lang/uk/admin/depreciations/message.php | 23 +- .../lang/uk/admin/depreciations/table.php | 4 +- resources/lang/uk/admin/groups/message.php | 12 +- resources/lang/uk/admin/groups/table.php | 4 +- resources/lang/uk/admin/groups/titles.php | 4 +- resources/lang/uk/admin/hardware/form.php | 15 +- resources/lang/uk/admin/hardware/general.php | 6 +- resources/lang/uk/admin/hardware/message.php | 68 +- resources/lang/uk/admin/hardware/table.php | 6 +- resources/lang/uk/admin/kits/general.php | 4 +- resources/lang/uk/admin/licenses/form.php | 6 +- resources/lang/uk/admin/licenses/general.php | 4 +- resources/lang/uk/admin/licenses/message.php | 43 +- resources/lang/uk/admin/licenses/table.php | 4 +- resources/lang/uk/admin/locations/message.php | 23 +- resources/lang/uk/admin/locations/table.php | 4 +- .../lang/uk/admin/manufacturers/message.php | 28 +- .../lang/uk/admin/manufacturers/table.php | 4 +- resources/lang/uk/admin/models/general.php | 6 +- resources/lang/uk/admin/models/message.php | 39 +- resources/lang/uk/admin/models/table.php | 4 +- resources/lang/uk/admin/reports/general.php | 6 +- resources/lang/uk/admin/reports/message.php | 6 +- resources/lang/uk/admin/settings/general.php | 8 +- resources/lang/uk/admin/settings/message.php | 21 +- .../lang/uk/admin/statuslabels/message.php | 27 +- .../lang/uk/admin/statuslabels/table.php | 4 +- resources/lang/uk/admin/suppliers/message.php | 21 +- resources/lang/uk/admin/suppliers/table.php | 4 +- resources/lang/uk/admin/users/general.php | 7 +- resources/lang/uk/admin/users/message.php | 21 +- resources/lang/uk/admin/users/table.php | 8 +- resources/lang/uk/auth/general.php | 1 - resources/lang/uk/auth/message.php | 29 +- resources/lang/uk/button.php | 6 +- resources/lang/uk/general.php | 4 +- resources/lang/uk/help.php | 10 +- resources/lang/uk/mail.php | 6 +- resources/lang/uk/pagination.php | 4 +- resources/lang/uk/passwords.php | 1 - resources/lang/uk/reminders.php | 12 +- resources/lang/uk/table.php | 4 +- resources/lang/uk/validation.php | 15 +- .../lang/ur-PK/admin/accessories/general.php | 4 +- .../lang/ur-PK/admin/accessories/message.php | 35 +- .../lang/ur-PK/admin/accessories/table.php | 9 +- .../ur-PK/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../ur-PK/admin/asset_maintenances/table.php | 2 +- .../lang/ur-PK/admin/categories/general.php | 4 +- .../lang/ur-PK/admin/categories/message.php | 22 +- .../lang/ur-PK/admin/categories/table.php | 6 +- .../lang/ur-PK/admin/companies/general.php | 1 + .../lang/ur-PK/admin/companies/message.php | 23 +- .../lang/ur-PK/admin/companies/table.php | 5 +- .../lang/ur-PK/admin/components/general.php | 4 +- .../lang/ur-PK/admin/components/message.php | 35 +- .../lang/ur-PK/admin/components/table.php | 4 +- .../lang/ur-PK/admin/consumables/general.php | 4 +- .../lang/ur-PK/admin/consumables/message.php | 35 +- .../lang/ur-PK/admin/consumables/table.php | 4 +- .../ur-PK/admin/custom_fields/general.php | 4 +- .../ur-PK/admin/custom_fields/message.php | 49 +- .../lang/ur-PK/admin/departments/message.php | 22 +- .../lang/ur-PK/admin/departments/table.php | 4 +- .../ur-PK/admin/depreciations/general.php | 4 +- .../ur-PK/admin/depreciations/message.php | 23 +- .../lang/ur-PK/admin/depreciations/table.php | 4 +- resources/lang/ur-PK/admin/groups/message.php | 12 +- resources/lang/ur-PK/admin/groups/table.php | 4 +- resources/lang/ur-PK/admin/groups/titles.php | 4 +- resources/lang/ur-PK/admin/hardware/form.php | 15 +- .../lang/ur-PK/admin/hardware/general.php | 6 +- .../lang/ur-PK/admin/hardware/message.php | 68 +- resources/lang/ur-PK/admin/hardware/table.php | 6 +- resources/lang/ur-PK/admin/kits/general.php | 4 +- resources/lang/ur-PK/admin/licenses/form.php | 6 +- .../lang/ur-PK/admin/licenses/general.php | 4 +- .../lang/ur-PK/admin/licenses/message.php | 43 +- resources/lang/ur-PK/admin/licenses/table.php | 4 +- .../lang/ur-PK/admin/locations/message.php | 23 +- .../lang/ur-PK/admin/locations/table.php | 4 +- .../ur-PK/admin/manufacturers/message.php | 28 +- .../lang/ur-PK/admin/manufacturers/table.php | 4 +- resources/lang/ur-PK/admin/models/general.php | 6 +- resources/lang/ur-PK/admin/models/message.php | 39 +- resources/lang/ur-PK/admin/models/table.php | 4 +- .../lang/ur-PK/admin/reports/general.php | 6 +- .../lang/ur-PK/admin/reports/message.php | 6 +- .../lang/ur-PK/admin/settings/general.php | 8 +- .../lang/ur-PK/admin/settings/message.php | 21 +- .../lang/ur-PK/admin/statuslabels/message.php | 27 +- .../lang/ur-PK/admin/statuslabels/table.php | 4 +- .../lang/ur-PK/admin/suppliers/message.php | 21 +- .../lang/ur-PK/admin/suppliers/table.php | 4 +- resources/lang/ur-PK/admin/users/general.php | 7 +- resources/lang/ur-PK/admin/users/message.php | 21 +- resources/lang/ur-PK/admin/users/table.php | 8 +- resources/lang/ur-PK/auth/general.php | 1 - resources/lang/ur-PK/auth/message.php | 29 +- resources/lang/ur-PK/button.php | 6 +- resources/lang/ur-PK/general.php | 4 +- resources/lang/ur-PK/help.php | 10 +- resources/lang/ur-PK/mail.php | 6 +- resources/lang/ur-PK/pagination.php | 4 +- resources/lang/ur-PK/passwords.php | 1 - resources/lang/ur-PK/reminders.php | 12 +- resources/lang/ur-PK/table.php | 4 +- resources/lang/ur-PK/validation.php | 15 +- .../lang/vi/admin/accessories/general.php | 4 +- .../lang/vi/admin/accessories/message.php | 35 +- resources/lang/vi/admin/accessories/table.php | 9 +- .../lang/vi/admin/asset_maintenances/form.php | 2 +- .../vi/admin/asset_maintenances/message.php | 8 +- .../vi/admin/asset_maintenances/table.php | 2 +- .../lang/vi/admin/categories/general.php | 4 +- .../lang/vi/admin/categories/message.php | 22 +- resources/lang/vi/admin/categories/table.php | 6 +- resources/lang/vi/admin/companies/general.php | 1 + resources/lang/vi/admin/companies/message.php | 23 +- resources/lang/vi/admin/companies/table.php | 5 +- .../lang/vi/admin/components/general.php | 4 +- .../lang/vi/admin/components/message.php | 35 +- resources/lang/vi/admin/components/table.php | 4 +- .../lang/vi/admin/consumables/general.php | 4 +- .../lang/vi/admin/consumables/message.php | 35 +- resources/lang/vi/admin/consumables/table.php | 4 +- .../lang/vi/admin/custom_fields/general.php | 4 +- .../lang/vi/admin/custom_fields/message.php | 49 +- .../lang/vi/admin/departments/message.php | 22 +- resources/lang/vi/admin/departments/table.php | 4 +- .../lang/vi/admin/depreciations/general.php | 4 +- .../lang/vi/admin/depreciations/message.php | 23 +- .../lang/vi/admin/depreciations/table.php | 4 +- resources/lang/vi/admin/groups/message.php | 12 +- resources/lang/vi/admin/groups/table.php | 4 +- resources/lang/vi/admin/groups/titles.php | 4 +- resources/lang/vi/admin/hardware/form.php | 15 +- resources/lang/vi/admin/hardware/general.php | 6 +- resources/lang/vi/admin/hardware/message.php | 68 +- resources/lang/vi/admin/hardware/table.php | 6 +- resources/lang/vi/admin/kits/general.php | 4 +- resources/lang/vi/admin/licenses/form.php | 6 +- resources/lang/vi/admin/licenses/general.php | 4 +- resources/lang/vi/admin/licenses/message.php | 43 +- resources/lang/vi/admin/licenses/table.php | 4 +- resources/lang/vi/admin/locations/message.php | 23 +- resources/lang/vi/admin/locations/table.php | 4 +- .../lang/vi/admin/manufacturers/message.php | 28 +- .../lang/vi/admin/manufacturers/table.php | 4 +- resources/lang/vi/admin/models/general.php | 6 +- resources/lang/vi/admin/models/message.php | 39 +- resources/lang/vi/admin/models/table.php | 4 +- resources/lang/vi/admin/reports/general.php | 6 +- resources/lang/vi/admin/reports/message.php | 6 +- resources/lang/vi/admin/settings/general.php | 10 +- resources/lang/vi/admin/settings/message.php | 21 +- .../lang/vi/admin/statuslabels/message.php | 27 +- .../lang/vi/admin/statuslabels/table.php | 4 +- resources/lang/vi/admin/suppliers/message.php | 21 +- resources/lang/vi/admin/suppliers/table.php | 4 +- resources/lang/vi/admin/users/general.php | 7 +- resources/lang/vi/admin/users/message.php | 21 +- resources/lang/vi/admin/users/table.php | 8 +- resources/lang/vi/auth/general.php | 1 - resources/lang/vi/auth/message.php | 29 +- resources/lang/vi/button.php | 6 +- resources/lang/vi/general.php | 4 +- resources/lang/vi/help.php | 10 +- resources/lang/vi/mail.php | 6 +- resources/lang/vi/pagination.php | 4 +- resources/lang/vi/passwords.php | 1 - resources/lang/vi/reminders.php | 12 +- resources/lang/vi/table.php | 4 +- resources/lang/vi/validation.php | 15 +- .../lang/zh-CN/admin/accessories/general.php | 4 +- .../lang/zh-CN/admin/accessories/message.php | 35 +- .../lang/zh-CN/admin/accessories/table.php | 9 +- .../zh-CN/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../zh-CN/admin/asset_maintenances/table.php | 2 +- .../lang/zh-CN/admin/categories/general.php | 4 +- .../lang/zh-CN/admin/categories/message.php | 22 +- .../lang/zh-CN/admin/categories/table.php | 6 +- .../lang/zh-CN/admin/companies/general.php | 1 + .../lang/zh-CN/admin/companies/message.php | 23 +- .../lang/zh-CN/admin/companies/table.php | 5 +- .../lang/zh-CN/admin/components/general.php | 4 +- .../lang/zh-CN/admin/components/message.php | 35 +- .../lang/zh-CN/admin/components/table.php | 4 +- .../lang/zh-CN/admin/consumables/general.php | 4 +- .../lang/zh-CN/admin/consumables/message.php | 35 +- .../lang/zh-CN/admin/consumables/table.php | 4 +- .../zh-CN/admin/custom_fields/general.php | 4 +- .../zh-CN/admin/custom_fields/message.php | 49 +- .../lang/zh-CN/admin/departments/message.php | 22 +- .../lang/zh-CN/admin/departments/table.php | 4 +- .../zh-CN/admin/depreciations/general.php | 4 +- .../zh-CN/admin/depreciations/message.php | 23 +- .../lang/zh-CN/admin/depreciations/table.php | 4 +- resources/lang/zh-CN/admin/groups/message.php | 12 +- resources/lang/zh-CN/admin/groups/table.php | 4 +- resources/lang/zh-CN/admin/groups/titles.php | 4 +- resources/lang/zh-CN/admin/hardware/form.php | 15 +- .../lang/zh-CN/admin/hardware/general.php | 6 +- .../lang/zh-CN/admin/hardware/message.php | 68 +- resources/lang/zh-CN/admin/hardware/table.php | 6 +- resources/lang/zh-CN/admin/kits/general.php | 4 +- resources/lang/zh-CN/admin/licenses/form.php | 6 +- .../lang/zh-CN/admin/licenses/general.php | 4 +- .../lang/zh-CN/admin/licenses/message.php | 43 +- resources/lang/zh-CN/admin/licenses/table.php | 4 +- .../lang/zh-CN/admin/locations/message.php | 23 +- .../lang/zh-CN/admin/locations/table.php | 4 +- .../zh-CN/admin/manufacturers/message.php | 28 +- .../lang/zh-CN/admin/manufacturers/table.php | 4 +- resources/lang/zh-CN/admin/models/general.php | 6 +- resources/lang/zh-CN/admin/models/message.php | 39 +- resources/lang/zh-CN/admin/models/table.php | 4 +- .../lang/zh-CN/admin/reports/general.php | 6 +- .../lang/zh-CN/admin/reports/message.php | 6 +- .../lang/zh-CN/admin/settings/general.php | 10 +- .../lang/zh-CN/admin/settings/message.php | 21 +- .../lang/zh-CN/admin/statuslabels/message.php | 27 +- .../lang/zh-CN/admin/statuslabels/table.php | 4 +- .../lang/zh-CN/admin/suppliers/message.php | 21 +- .../lang/zh-CN/admin/suppliers/table.php | 4 +- resources/lang/zh-CN/admin/users/general.php | 7 +- resources/lang/zh-CN/admin/users/message.php | 21 +- resources/lang/zh-CN/admin/users/table.php | 8 +- resources/lang/zh-CN/auth/general.php | 1 - resources/lang/zh-CN/auth/message.php | 29 +- resources/lang/zh-CN/button.php | 6 +- resources/lang/zh-CN/general.php | 4 +- resources/lang/zh-CN/help.php | 10 +- resources/lang/zh-CN/mail.php | 6 +- resources/lang/zh-CN/pagination.php | 4 +- resources/lang/zh-CN/passwords.php | 1 - resources/lang/zh-CN/reminders.php | 12 +- resources/lang/zh-CN/table.php | 4 +- resources/lang/zh-CN/validation.php | 15 +- .../lang/zh-HK/admin/accessories/general.php | 4 +- .../lang/zh-HK/admin/accessories/message.php | 35 +- .../lang/zh-HK/admin/accessories/table.php | 9 +- .../zh-HK/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../zh-HK/admin/asset_maintenances/table.php | 2 +- .../lang/zh-HK/admin/categories/general.php | 4 +- .../lang/zh-HK/admin/categories/message.php | 22 +- .../lang/zh-HK/admin/categories/table.php | 6 +- .../lang/zh-HK/admin/companies/general.php | 1 + .../lang/zh-HK/admin/companies/message.php | 23 +- .../lang/zh-HK/admin/companies/table.php | 5 +- .../lang/zh-HK/admin/components/general.php | 4 +- .../lang/zh-HK/admin/components/message.php | 35 +- .../lang/zh-HK/admin/components/table.php | 4 +- .../lang/zh-HK/admin/consumables/general.php | 4 +- .../lang/zh-HK/admin/consumables/message.php | 35 +- .../lang/zh-HK/admin/consumables/table.php | 4 +- .../zh-HK/admin/custom_fields/general.php | 4 +- .../zh-HK/admin/custom_fields/message.php | 49 +- .../lang/zh-HK/admin/departments/message.php | 22 +- .../lang/zh-HK/admin/departments/table.php | 4 +- .../zh-HK/admin/depreciations/general.php | 4 +- .../zh-HK/admin/depreciations/message.php | 23 +- .../lang/zh-HK/admin/depreciations/table.php | 4 +- resources/lang/zh-HK/admin/groups/message.php | 12 +- resources/lang/zh-HK/admin/groups/table.php | 4 +- resources/lang/zh-HK/admin/groups/titles.php | 4 +- resources/lang/zh-HK/admin/hardware/form.php | 15 +- .../lang/zh-HK/admin/hardware/general.php | 6 +- .../lang/zh-HK/admin/hardware/message.php | 68 +- resources/lang/zh-HK/admin/hardware/table.php | 6 +- resources/lang/zh-HK/admin/kits/general.php | 4 +- resources/lang/zh-HK/admin/licenses/form.php | 6 +- .../lang/zh-HK/admin/licenses/general.php | 4 +- .../lang/zh-HK/admin/licenses/message.php | 43 +- resources/lang/zh-HK/admin/licenses/table.php | 4 +- .../lang/zh-HK/admin/locations/message.php | 23 +- .../lang/zh-HK/admin/locations/table.php | 4 +- .../zh-HK/admin/manufacturers/message.php | 28 +- .../lang/zh-HK/admin/manufacturers/table.php | 4 +- resources/lang/zh-HK/admin/models/general.php | 6 +- resources/lang/zh-HK/admin/models/message.php | 39 +- resources/lang/zh-HK/admin/models/table.php | 4 +- .../lang/zh-HK/admin/reports/general.php | 6 +- .../lang/zh-HK/admin/reports/message.php | 6 +- .../lang/zh-HK/admin/settings/general.php | 8 +- .../lang/zh-HK/admin/settings/message.php | 21 +- .../lang/zh-HK/admin/statuslabels/message.php | 27 +- .../lang/zh-HK/admin/statuslabels/table.php | 4 +- .../lang/zh-HK/admin/suppliers/message.php | 21 +- .../lang/zh-HK/admin/suppliers/table.php | 4 +- resources/lang/zh-HK/admin/users/general.php | 7 +- resources/lang/zh-HK/admin/users/message.php | 21 +- resources/lang/zh-HK/admin/users/table.php | 8 +- resources/lang/zh-HK/auth/general.php | 1 - resources/lang/zh-HK/auth/message.php | 29 +- resources/lang/zh-HK/button.php | 6 +- resources/lang/zh-HK/general.php | 4 +- resources/lang/zh-HK/help.php | 10 +- resources/lang/zh-HK/mail.php | 6 +- resources/lang/zh-HK/pagination.php | 4 +- resources/lang/zh-HK/passwords.php | 1 - resources/lang/zh-HK/reminders.php | 12 +- resources/lang/zh-HK/table.php | 4 +- resources/lang/zh-HK/validation.php | 15 +- .../lang/zh-TW/admin/accessories/general.php | 4 +- .../lang/zh-TW/admin/accessories/message.php | 35 +- .../lang/zh-TW/admin/accessories/table.php | 9 +- .../zh-TW/admin/asset_maintenances/form.php | 2 +- .../admin/asset_maintenances/message.php | 8 +- .../zh-TW/admin/asset_maintenances/table.php | 2 +- .../lang/zh-TW/admin/categories/general.php | 4 +- .../lang/zh-TW/admin/categories/message.php | 22 +- .../lang/zh-TW/admin/categories/table.php | 6 +- .../lang/zh-TW/admin/companies/general.php | 1 + .../lang/zh-TW/admin/companies/message.php | 23 +- .../lang/zh-TW/admin/companies/table.php | 5 +- .../lang/zh-TW/admin/components/general.php | 4 +- .../lang/zh-TW/admin/components/message.php | 35 +- .../lang/zh-TW/admin/components/table.php | 4 +- .../lang/zh-TW/admin/consumables/general.php | 4 +- .../lang/zh-TW/admin/consumables/message.php | 35 +- .../lang/zh-TW/admin/consumables/table.php | 4 +- .../zh-TW/admin/custom_fields/general.php | 4 +- .../zh-TW/admin/custom_fields/message.php | 49 +- .../lang/zh-TW/admin/departments/message.php | 22 +- .../lang/zh-TW/admin/departments/table.php | 4 +- .../zh-TW/admin/depreciations/general.php | 4 +- .../zh-TW/admin/depreciations/message.php | 23 +- .../lang/zh-TW/admin/depreciations/table.php | 4 +- resources/lang/zh-TW/admin/groups/message.php | 12 +- resources/lang/zh-TW/admin/groups/table.php | 4 +- resources/lang/zh-TW/admin/groups/titles.php | 4 +- resources/lang/zh-TW/admin/hardware/form.php | 15 +- .../lang/zh-TW/admin/hardware/general.php | 6 +- .../lang/zh-TW/admin/hardware/message.php | 68 +- resources/lang/zh-TW/admin/hardware/table.php | 6 +- resources/lang/zh-TW/admin/kits/general.php | 4 +- resources/lang/zh-TW/admin/licenses/form.php | 6 +- .../lang/zh-TW/admin/licenses/general.php | 4 +- .../lang/zh-TW/admin/licenses/message.php | 43 +- resources/lang/zh-TW/admin/licenses/table.php | 4 +- .../lang/zh-TW/admin/locations/message.php | 23 +- .../lang/zh-TW/admin/locations/table.php | 4 +- .../zh-TW/admin/manufacturers/message.php | 28 +- .../lang/zh-TW/admin/manufacturers/table.php | 4 +- resources/lang/zh-TW/admin/models/general.php | 6 +- resources/lang/zh-TW/admin/models/message.php | 39 +- resources/lang/zh-TW/admin/models/table.php | 4 +- .../lang/zh-TW/admin/reports/general.php | 6 +- .../lang/zh-TW/admin/reports/message.php | 6 +- .../lang/zh-TW/admin/settings/general.php | 10 +- .../lang/zh-TW/admin/settings/message.php | 21 +- .../lang/zh-TW/admin/statuslabels/message.php | 27 +- .../lang/zh-TW/admin/statuslabels/table.php | 4 +- .../lang/zh-TW/admin/suppliers/message.php | 21 +- .../lang/zh-TW/admin/suppliers/table.php | 4 +- resources/lang/zh-TW/admin/users/general.php | 7 +- resources/lang/zh-TW/admin/users/message.php | 21 +- resources/lang/zh-TW/admin/users/table.php | 8 +- resources/lang/zh-TW/auth/general.php | 1 - resources/lang/zh-TW/auth/message.php | 29 +- resources/lang/zh-TW/button.php | 6 +- resources/lang/zh-TW/general.php | 4 +- resources/lang/zh-TW/help.php | 10 +- resources/lang/zh-TW/mail.php | 6 +- resources/lang/zh-TW/pagination.php | 4 +- resources/lang/zh-TW/passwords.php | 1 - resources/lang/zh-TW/reminders.php | 12 +- resources/lang/zh-TW/table.php | 4 +- resources/lang/zh-TW/validation.php | 15 +- .../lang/zu/admin/accessories/general.php | 4 +- .../lang/zu/admin/accessories/message.php | 35 +- resources/lang/zu/admin/accessories/table.php | 9 +- .../lang/zu/admin/asset_maintenances/form.php | 2 +- .../zu/admin/asset_maintenances/message.php | 8 +- .../zu/admin/asset_maintenances/table.php | 2 +- .../lang/zu/admin/categories/general.php | 4 +- .../lang/zu/admin/categories/message.php | 22 +- resources/lang/zu/admin/categories/table.php | 6 +- resources/lang/zu/admin/companies/general.php | 1 + resources/lang/zu/admin/companies/message.php | 23 +- resources/lang/zu/admin/companies/table.php | 5 +- .../lang/zu/admin/components/general.php | 4 +- .../lang/zu/admin/components/message.php | 35 +- resources/lang/zu/admin/components/table.php | 4 +- .../lang/zu/admin/consumables/general.php | 4 +- .../lang/zu/admin/consumables/message.php | 35 +- resources/lang/zu/admin/consumables/table.php | 4 +- .../lang/zu/admin/custom_fields/general.php | 4 +- .../lang/zu/admin/custom_fields/message.php | 49 +- .../lang/zu/admin/departments/message.php | 22 +- resources/lang/zu/admin/departments/table.php | 4 +- .../lang/zu/admin/depreciations/general.php | 4 +- .../lang/zu/admin/depreciations/message.php | 23 +- .../lang/zu/admin/depreciations/table.php | 4 +- resources/lang/zu/admin/groups/message.php | 12 +- resources/lang/zu/admin/groups/table.php | 4 +- resources/lang/zu/admin/groups/titles.php | 4 +- resources/lang/zu/admin/hardware/form.php | 15 +- resources/lang/zu/admin/hardware/general.php | 6 +- resources/lang/zu/admin/hardware/message.php | 68 +- resources/lang/zu/admin/hardware/table.php | 6 +- resources/lang/zu/admin/kits/general.php | 4 +- resources/lang/zu/admin/licenses/form.php | 6 +- resources/lang/zu/admin/licenses/general.php | 4 +- resources/lang/zu/admin/licenses/message.php | 43 +- resources/lang/zu/admin/licenses/table.php | 4 +- resources/lang/zu/admin/locations/message.php | 23 +- resources/lang/zu/admin/locations/table.php | 4 +- .../lang/zu/admin/manufacturers/message.php | 28 +- .../lang/zu/admin/manufacturers/table.php | 4 +- resources/lang/zu/admin/models/general.php | 6 +- resources/lang/zu/admin/models/message.php | 39 +- resources/lang/zu/admin/models/table.php | 4 +- resources/lang/zu/admin/reports/general.php | 6 +- resources/lang/zu/admin/reports/message.php | 6 +- resources/lang/zu/admin/settings/general.php | 10 +- resources/lang/zu/admin/settings/message.php | 21 +- .../lang/zu/admin/statuslabels/message.php | 27 +- .../lang/zu/admin/statuslabels/table.php | 4 +- resources/lang/zu/admin/suppliers/message.php | 21 +- resources/lang/zu/admin/suppliers/table.php | 4 +- resources/lang/zu/admin/users/general.php | 7 +- resources/lang/zu/admin/users/message.php | 21 +- resources/lang/zu/admin/users/table.php | 8 +- resources/lang/zu/auth/general.php | 1 - resources/lang/zu/auth/message.php | 29 +- resources/lang/zu/button.php | 6 +- resources/lang/zu/general.php | 4 +- resources/lang/zu/help.php | 10 +- resources/lang/zu/mail.php | 6 +- resources/lang/zu/pagination.php | 4 +- resources/lang/zu/passwords.php | 1 - resources/lang/zu/reminders.php | 12 +- resources/lang/zu/table.php | 4 +- resources/lang/zu/validation.php | 15 +- resources/macros/macros.php | 256 +++--- routes/api.php | 425 ++++------ routes/console.php | 2 +- routes/web.php | 258 +++--- routes/web/accessories.php | 14 +- routes/web/components.php | 16 +- routes/web/consumables.php | 11 +- routes/web/fields.php | 19 +- routes/web/hardware.php | 94 +-- routes/web/kits.php | 85 +- routes/web/licenses.php | 26 +- routes/web/models.php | 21 +- routes/web/users.php | 32 +- tests/TestCase.php | 2 +- tests/_bootstrap.php | 1 + tests/_support/AcceptanceTester.php | 25 +- tests/_support/ApiTester.php | 13 +- tests/_support/FunctionalTester.php | 20 +- tests/_support/Helper/Acceptance.php | 2 +- tests/_support/Helper/Api.php | 1 + tests/_support/Helper/Functional.php | 2 +- tests/_support/Helper/HTMLValidator.php | 33 +- tests/_support/Helper/Unit.php | 2 +- tests/_support/UnitTester.php | 9 +- tests/acceptance/AccessoriesCept.php | 3 +- tests/acceptance/AssetsCept.php | 4 +- tests/acceptance/AssetsCest.php | 5 +- tests/acceptance/CategoriesCept.php | 3 +- tests/acceptance/CompaniesCept.php | 3 +- tests/acceptance/ConsumablesCept.php | 3 +- tests/acceptance/CustomfieldsCept.php | 1 + tests/acceptance/DepartmentsCept.php | 3 +- tests/acceptance/DepreciationsCept.php | 3 +- tests/acceptance/LocationsCept.php | 4 +- tests/acceptance/ManufacturersCept.php | 4 +- tests/acceptance/StatuslabelsCept.php | 3 +- tests/acceptance/SuppliersCept.php | 3 +- tests/acceptance/UsersCept.php | 5 +- tests/acceptance/_bootstrap.php | 1 + tests/api/ApiAccessoriesCest.php | 20 +- tests/api/ApiAssetsCest.php | 19 +- tests/api/ApiCategoriesCest.php | 19 +- tests/api/ApiCheckoutAssetsCest.php | 57 +- tests/api/ApiCompaniesCest.php | 19 +- tests/api/ApiComponentsCest.php | 21 +- tests/api/ApiConsumablesCest.php | 19 +- tests/api/ApiLicenseSeatsCest.php | 18 +- tests/api/ApiLicensesCest.php | 23 +- tests/api/ApiLocationsCest.php | 22 +- tests/api/ApiManufacturersCest.php | 19 +- tests/api/ApiModelsCest.php | 18 +- tests/api/ApiStatusLabelsCest.php | 29 +- tests/api/ApiUsersCest.php | 24 +- tests/api/_bootstrap.php | 1 + tests/functional/AccessoriesCest.php | 19 +- tests/functional/AssetModelsCest.php | 9 +- tests/functional/AssetsCest.php | 10 +- tests/functional/CategoriesCest.php | 18 +- tests/functional/CompaniesCest.php | 15 +- tests/functional/ComponentsCest.php | 18 +- tests/functional/ConsumablesCest.php | 17 +- tests/functional/DepreciationsCest.php | 21 +- tests/functional/GroupsCest.php | 15 +- tests/functional/LicensesCest.php | 16 +- tests/functional/LocationsCest.php | 18 +- tests/functional/ManufacturersCest.php | 22 +- tests/functional/StatusLabelsCest.php | 13 +- tests/functional/SuppliersCest.php | 14 +- tests/functional/UsersCest.php | 25 +- tests/functional/_bootstrap.php | 1 + tests/unit/AccessoryTest.php | 17 +- tests/unit/AssetMaintenanceTest.php | 14 +- tests/unit/AssetModelTest.php | 86 +- tests/unit/AssetTest.php | 338 ++++---- tests/unit/BaseTest.php | 25 +- tests/unit/CategoryTest.php | 95 +-- tests/unit/CompanyTest.php | 114 +-- tests/unit/ComponentTest.php | 17 +- tests/unit/ConsumableTest.php | 49 +- tests/unit/CustomFieldTest.php | 61 +- tests/unit/DepartmentTest.php | 2 +- tests/unit/DepreciationTest.php | 53 +- tests/unit/ImporterTest.php | 193 +++-- tests/unit/LocationTest.php | 22 +- tests/unit/ManufacturerTest.php | 6 +- tests/unit/NotificationTest.php | 11 +- tests/unit/PermissionsTest.php | 21 +- tests/unit/SnipeModelTest.php | 21 +- tests/unit/StatuslabelTest.php | 107 +-- tests/unit/SupplierTest.php | 6 +- tests/unit/UserTest.php | 14 +- tests/unit/_bootstrap.php | 1 + 4549 files changed, 35238 insertions(+), 38391 deletions(-) diff --git a/app/Console/Commands/CheckinLicensesFromAllUsers.php b/app/Console/Commands/CheckinLicensesFromAllUsers.php index bcd8583eaf..5e02bffb7b 100644 --- a/app/Console/Commands/CheckinLicensesFromAllUsers.php +++ b/app/Console/Commands/CheckinLicensesFromAllUsers.php @@ -2,10 +2,10 @@ namespace App\Console\Commands; -use App\Models\LicenseSeat; -use Illuminate\Console\Command; -use App\Models\User; use App\Models\License; +use App\Models\LicenseSeat; +use App\Models\User; +use Illuminate\Console\Command; use Illuminate\Database\Eloquent\Model; class CheckinLicensesFromAllUsers extends Command @@ -41,55 +41,48 @@ class CheckinLicensesFromAllUsers extends Command */ public function handle() { - $license_id = $this->option('license_id'); $notify = $this->option('notify'); - if (!$license_id) { + if (! $license_id) { $this->error('ERROR: License ID is required.'); + return false; } - - if (!$license = License::where('id','=',$license_id)->first()) { + if (! $license = License::where('id', '=', $license_id)->first()) { $this->error('Invalid license ID'); + return false; } $this->info('Checking in ALL seats for '.$license->name); - $licenseSeats = LicenseSeat::where('license_id', '=', $license_id) ->whereNotNull('assigned_to') ->with('user') ->get(); - $this->info(' There are ' .$licenseSeats->count(). ' seats checked out: '); + $this->info(' There are '.$licenseSeats->count().' seats checked out: '); - if (!$notify) { + if (! $notify) { $this->info('No mail will be sent.'); } foreach ($licenseSeats as $seat) { - $this->info($seat->user->username .' has a license seat for '.$license->name); + $this->info($seat->user->username.' has a license seat for '.$license->name); $seat->assigned_to = null; if ($seat->save()) { // Override the email address so we don't notify on checkin - if (!$notify) { + if (! $notify) { $seat->user->email = null; } // Log the checkin $seat->logCheckin($seat->user, 'Checked in via cli tool'); } - - - - } - - } } diff --git a/app/Console/Commands/CheckoutLicenseToAllUsers.php b/app/Console/Commands/CheckoutLicenseToAllUsers.php index 0855e5d084..fab2b318c6 100644 --- a/app/Console/Commands/CheckoutLicenseToAllUsers.php +++ b/app/Console/Commands/CheckoutLicenseToAllUsers.php @@ -2,10 +2,10 @@ namespace App\Console\Commands; -use App\Models\LicenseSeat; -use Illuminate\Console\Command; -use App\Models\User; use App\Models\License; +use App\Models\LicenseSeat; +use App\Models\User; +use Illuminate\Console\Command; use Illuminate\Database\Eloquent\Model; class CheckoutLicenseToAllUsers extends Command @@ -41,18 +41,18 @@ class CheckoutLicenseToAllUsers extends Command */ public function handle() { - $license_id = $this->option('license_id'); $notify = $this->option('notify'); - if (!$license_id) { - $this->error('ERROR: License ID is required.'); - return false; + if (! $license_id) { + $this->error('ERROR: License ID is required.'); + + return false; } - - if (!$license = License::where('id','=',$license_id)->with('assignedusers')->first()) { + if (! $license = License::where('id', '=', $license_id)->with('assignedusers')->first()) { $this->error('Invalid license ID'); + return false; } @@ -64,7 +64,7 @@ class CheckoutLicenseToAllUsers extends Command $this->info('Checking out '.$users->count().' of '.$license->getAvailSeatsCountAttribute().' seats for '.$license->name); - if (!$notify) { + if (! $notify) { $this->info('No mail will be sent.'); } @@ -74,14 +74,14 @@ class CheckoutLicenseToAllUsers extends Command // to them if ($user->licenses->where('id', '=', $license_id)->count()) { - $this->info($user->username .' already has this license checked out to them. Skipping... '); + $this->info($user->username.' already has this license checked out to them. Skipping... '); continue; } - // If the license is valid, check that there is an available seat if ($license->availCount()->count() < 1) { $this->error('ERROR: No available seats'); + return false; } @@ -89,13 +89,12 @@ class CheckoutLicenseToAllUsers extends Command // Get the seat ID $licenseSeat = $license->freeSeat(); - // Update the seat with checkout info, - $licenseSeat->assigned_to = $user->id; + $licenseSeat->assigned_to = $user->id; if ($licenseSeat->save()) { // Temporarily null the user's email address so we don't send mail if we're not supposed to - if (!$notify) { + if (! $notify) { $user->email = null; } @@ -103,10 +102,6 @@ class CheckoutLicenseToAllUsers extends Command $licenseSeat->logCheckout('Checked out via cli tool', $user); $this->info('License '.$license_id.' seat '.$licenseSeat->id.' checked out to '.$user->username); } - } - - - } } diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php index 7a2c9a1feb..a4b4b9e42c 100644 --- a/app/Console/Commands/CreateAdmin.php +++ b/app/Console/Commands/CreateAdmin.php @@ -37,7 +37,6 @@ class CreateAdmin extends Command */ public function handle() { - $first_name = $this->option('first_name'); $last_name = $this->option('last_name'); $username = $this->option('username'); @@ -45,7 +44,7 @@ class CreateAdmin extends Command $password = $this->option('password'); $show_in_list = $this->argument('show_in_list'); - if (($first_name=='') || ($last_name=='') || ($username=='') || ($email=='') || ($password=='')) { + if (($first_name == '') || ($last_name == '') || ($username == '') || ($email == '') || ($password == '')) { $this->info('ERROR: All fields are required.'); } else { $user = new \App\Models\User; @@ -68,12 +67,9 @@ class CreateAdmin extends Command $errors = $user->getErrors(); foreach ($errors->all() as $error) { - $this->info('ERROR:'. $error); + $this->info('ERROR:'.$error); } - } } - } - } diff --git a/app/Console/Commands/DisableLDAP.php b/app/Console/Commands/DisableLDAP.php index fd2f0a1070..ee707741ee 100644 --- a/app/Console/Commands/DisableLDAP.php +++ b/app/Console/Commands/DisableLDAP.php @@ -38,9 +38,7 @@ class DisableLDAP extends Command */ public function handle() { - if ($this->confirm("\n****************************************************\nThis will disable LDAP support. You will not be able \nto login with an account that does not exist \nlocally in the Snipe-IT local database. \n****************************************************\n\nDo you wish to continue? [y|N]")) { - $setting = Setting::getSettings(); $setting->ldap_enabled = 0; if ($setting->save()) { @@ -51,6 +49,5 @@ class DisableLDAP extends Command } else { $this->info('Canceled. No actions taken.'); } - } } diff --git a/app/Console/Commands/FixDoubleEscape.php b/app/Console/Commands/FixDoubleEscape.php index 64f6aad572..13a1d3b9b5 100644 --- a/app/Console/Commands/FixDoubleEscape.php +++ b/app/Console/Commands/FixDoubleEscape.php @@ -37,7 +37,6 @@ class FixDoubleEscape extends Command */ public function handle() { - $tables = [ '\App\Models\Asset' => ['name'], '\App\Models\License' => ['name'], @@ -56,30 +55,25 @@ class FixDoubleEscape extends Command '\App\Models\User' => ['first_name', 'last_name'], ]; - $count = array(); + $count = []; + foreach ($tables as $classname => $fields) { + $count[$classname] = []; + $count[$classname]['classname'] = 0; + foreach ($fields as $field) { + $count[$classname]['classname']++; + $count[$classname][$field] = 0; - foreach ($tables as $classname => $fields) { - $count[$classname] = array(); - $count[$classname]['classname'] = 0; - - foreach($fields as $field) { - - $count[$classname]['classname']++; - $count[$classname][$field] = 0; - - foreach($classname::where("$field",'LIKE','%&%')->get() as $row) { - $this->info('Updating '.$field.' for '.$classname); - $row->{$field} = html_entity_decode($row->{$field},ENT_QUOTES); - $row->save(); - $count[$classname][$field]++; - - } + foreach ($classname::where("$field", 'LIKE', '%&%')->get() as $row) { + $this->info('Updating '.$field.' for '.$classname); + $row->{$field} = html_entity_decode($row->{$field}, ENT_QUOTES); + $row->save(); + $count[$classname][$field]++; } } + } $this->info('Update complete'); - } } diff --git a/app/Console/Commands/FixMismatchedAssetsAndLogs.php b/app/Console/Commands/FixMismatchedAssetsAndLogs.php index 45a1694dd7..47729f8c30 100644 --- a/app/Console/Commands/FixMismatchedAssetsAndLogs.php +++ b/app/Console/Commands/FixMismatchedAssetsAndLogs.php @@ -29,7 +29,6 @@ class FixMismatchedAssetsAndLogs extends Command */ private $dryrun = false; - /** * Create a new command instance. * @@ -47,13 +46,12 @@ class FixMismatchedAssetsAndLogs extends Command */ public function handle() { - if ($this->option('dryrun')) { $this->dryrun = true; } if ($this->dryrun) { - $this->info('This is a DRY RUN - no changes will be saved.' ); + $this->info('This is a DRY RUN - no changes will be saved.'); } $mismatch_count = 0; @@ -70,7 +68,7 @@ class FixMismatchedAssetsAndLogs extends Command ->first()) { // Now check for a subsequent checkin log - we want to ignore those - if (!$checkin_log = Actionlog::where('target_type', '=', 'App\\Models\\User') + if (! $checkin_log = Actionlog::where('target_type', '=', 'App\\Models\\User') ->where('action_type', '=', 'checkin from') ->where('item_id', '=', $asset->id) ->whereDate('created_at', '>', $checkout_log->created_at) @@ -78,28 +76,24 @@ class FixMismatchedAssetsAndLogs extends Command ->first()) { //print_r($asset); - if ($checkout_log->target_id != $asset->assigned_to) { - $this->error('Log ID: '.$checkout_log->id.' -- Asset ID '. $checkout_log->item_id.' SHOULD BE checked out to User '.$checkout_log->target_id.' but its assigned_to is '.$asset->assigned_to ); + if ($checkout_log->target_id != $asset->assigned_to) { + $this->error('Log ID: '.$checkout_log->id.' -- Asset ID '.$checkout_log->item_id.' SHOULD BE checked out to User '.$checkout_log->target_id.' but its assigned_to is '.$asset->assigned_to); - if (!$this->dryrun) { - $asset->assigned_to = $checkout_log->target_id; - if ($asset->save()) { - $this->info('Asset record updated.'); - } else { - $this->error('Error updating asset: '.$asset->getErrors()); - } + if (! $this->dryrun) { + $asset->assigned_to = $checkout_log->target_id; + if ($asset->save()) { + $this->info('Asset record updated.'); + } else { + $this->error('Error updating asset: '.$asset->getErrors()); } - $mismatch_count++; } - } else { - //$this->info('Asset ID '.$asset->id.': There is a checkin '.$checkin_log->created_at.' after this checkout '.$checkout_log->created_at); - + $mismatch_count++; } - + } else { + //$this->info('Asset ID '.$asset->id.': There is a checkin '.$checkin_log->created_at.' after this checkout '.$checkout_log->created_at); + } } - } $this->info($mismatch_count.' mismatched assets.'); - } } diff --git a/app/Console/Commands/ImportLocations.php b/app/Console/Commands/ImportLocations.php index a0512aa393..3bd28f7f25 100644 --- a/app/Console/Commands/ImportLocations.php +++ b/app/Console/Commands/ImportLocations.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; +use App\Models\Location; use Illuminate\Console\Command; use League\Csv\Reader; -use App\Models\Location; class ImportLocations extends Command { @@ -39,10 +39,8 @@ class ImportLocations extends Command */ public function handle() { - - - if (!ini_get("auto_detect_line_endings")) { - ini_set("auto_detect_line_endings", '1'); + if (! ini_get('auto_detect_line_endings')) { + ini_set('auto_detect_line_endings', '1'); } $filename = $this->argument('filename'); @@ -53,18 +51,17 @@ class ImportLocations extends Command // Import parent location names first if they don't exist foreach ($results as $parent_index => $parent_row) { - if (array_key_exists('Parent Name', $parent_row)) { $parent_name = trim($parent_row['Parent Name']); if (array_key_exists('Name', $parent_row)) { - $this->info('- Parent: ' . $parent_name . ' in row as: ' . trim($parent_row['Parent Name'])); + $this->info('- Parent: '.$parent_name.' in row as: '.trim($parent_row['Parent Name'])); } // Save parent location name // This creates a sort of name-stub that we'll update later on in this script - $parent_location = Location::firstOrCreate(array('name' => $parent_name)); + $parent_location = Location::firstOrCreate(['name' => $parent_name]); if (array_key_exists('Name', $parent_row)) { - $this->info('Parent for ' . $parent_row['Name'] . ' is ' . $parent_name . '. Attempting to save ' . $parent_name . '.'); + $this->info('Parent for '.$parent_row['Name'].' is '.$parent_name.'. Attempting to save '.$parent_name.'.'); } // Check if the record was updated or created. @@ -74,18 +71,15 @@ class ImportLocations extends Command } else { $this->info('- Parent location '.$parent_name.' was created.'); } - } else { $this->info('- No Parent Name provided, so no parent location will be created.'); } - } $this->info('----- Parents Created.... backfilling additional details... --------'); // Loop through ALL records and add/update them if there are additional fields // besides name foreach ($results as $index => $row) { - if (array_key_exists('Parent Name', $row)) { $parent_name = trim($row['Parent Name']); } else { @@ -94,11 +88,12 @@ class ImportLocations extends Command // Set the location attributes to save if (array_key_exists('Name', $row)) { - $location = Location::firstOrCreate(array('name' => trim($row['Name']))); + $location = Location::firstOrCreate(['name' => trim($row['Name'])]); $location->name = trim($row['Name']); $this->info('Checking location: '.$location->name); } else { $this->error('Location name is required and is missing from at least one row in this dataset. Check your CSV for extra trailing rows and try again.'); + return false; } if (array_key_exists('Currency', $row)) { @@ -126,7 +121,6 @@ class ImportLocations extends Command $location->ldap_ou = trim($row['OU']); } - // If a parent name is provided, we created it earlier in the script, // so let's grab that ID if ($parent_name) { @@ -142,21 +136,15 @@ class ImportLocations extends Command // Check if the record was updated or created. // This is mostly for clearer debugging. if ($location->exists) { - $this->info('Location ' . $location->name . ' already exists. Updating...'); + $this->info('Location '.$location->name.' already exists. Updating...'); } else { $this->info('- Location '.$location->name.' was created. '); } - // If there's a validation error, display that + // If there's a validation error, display that } else { - $this->error('- Non-parent Location '.$location->name.' could not be created: '.$location->getErrors() ); + $this->error('- Non-parent Location '.$location->name.' could not be created: '.$location->getErrors()); } - - - - } - - } } diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index 9e337084a4..45a9bd44a6 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -3,11 +3,11 @@ namespace App\Console\Commands; use App\Models\Department; -use Illuminate\Console\Command; -use App\Models\Setting; use App\Models\Ldap; -use App\Models\User; use App\Models\Location; +use App\Models\Setting; +use App\Models\User; +use Illuminate\Console\Command; use Log; class LdapSync extends Command @@ -54,7 +54,7 @@ class LdapSync extends Command $ldap_result_email = Setting::getSettings()->ldap_email; $ldap_result_phone = Setting::getSettings()->ldap_phone_field; $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle; - $ldap_result_country = Setting::getSettings()->ldap_country; + $ldap_result_country = Setting::getSettings()->ldap_country; $ldap_result_dept = Setting::getSettings()->ldap_dept; try { @@ -62,14 +62,15 @@ class LdapSync extends Command Ldap::bindAdminToLdap($ldapconn); } catch (\Exception $e) { if ($this->option('json_summary')) { - $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ]; + $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } LOG::info($e); + return []; } - $summary = array(); + $summary = []; try { if ($this->option('base_dn') != '') { @@ -81,78 +82,78 @@ class LdapSync extends Command $results = Ldap::findLdapUsers($search_base); } catch (\Exception $e) { if ($this->option('json_summary')) { - $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ]; + $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } LOG::info($e); + return []; } /* Determine which location to assign users to by default. */ - $location = NULL; // FIXME - this would be better called "$default_location", which is more explicit about its purpose + $location = null; // FIXME - this would be better called "$default_location", which is more explicit about its purpose - if ($this->option('location')!='') { + if ($this->option('location') != '') { $location = Location::where('name', '=', $this->option('location'))->first(); LOG::debug('Location name '.$this->option('location').' passed'); LOG::debug('Importing to '.$location->name.' ('.$location->id.')'); - } elseif ($this->option('location_id')!='') { + } elseif ($this->option('location_id') != '') { $location = Location::where('id', '=', $this->option('location_id'))->first(); LOG::debug('Location ID '.$this->option('location_id').' passed'); LOG::debug('Importing to '.$location->name.' ('.$location->id.')'); } - if (!isset($location)) { + if (! isset($location)) { LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.'); } /* Process locations with explicitly defined OUs, if doing a full import. */ - if ($this->option('base_dn')=='') { + if ($this->option('base_dn') == '') { // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993) $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray(); - $ldap_ou_lengths = array(); + $ldap_ou_lengths = []; foreach ($ldap_ou_locations as $ou_loc) { - $ldap_ou_lengths[] = strlen($ou_loc["ldap_ou"]); + $ldap_ou_lengths[] = strlen($ou_loc['ldap_ou']); } array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations); - if (sizeof($ldap_ou_locations) > 0) { + if (count($ldap_ou_locations) > 0) { LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.'); } // Inject location information fields - for ($i = 0; $i < $results["count"]; $i++) { - $results[$i]["ldap_location_override"] = false; - $results[$i]["location_id"] = 0; + for ($i = 0; $i < $results['count']; $i++) { + $results[$i]['ldap_location_override'] = false; + $results[$i]['location_id'] = 0; } // Grab subsets based on location-specific DNs, and overwrite location for these users. foreach ($ldap_ou_locations as $ldap_loc) { try { - $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]); + $location_users = Ldap::findLdapUsers($ldap_loc['ldap_ou']); } catch (\Exception $e) { // FIXME: this is stolen from line 77 or so above if ($this->option('json_summary')) { - $json_summary = [ "error" => true, "error_message" => trans('admin/users/message.error.ldap_could_not_search')." Location: ".$ldap_loc['name']." (ID: ".$ldap_loc['id'].") cannot connect to \"".$ldap_loc["ldap_ou"]."\" - ".$e->getMessage(), "summary" => [] ]; + $json_summary = ['error' => true, 'error_message' => trans('admin/users/message.error.ldap_could_not_search').' Location: '.$ldap_loc['name'].' (ID: '.$ldap_loc['id'].') cannot connect to "'.$ldap_loc['ldap_ou'].'" - '.$e->getMessage(), 'summary' => []]; $this->info(json_encode($json_summary)); } LOG::info($e); + return []; } - $usernames = array(); - for ($i = 0; $i < $location_users["count"]; $i++) { - + $usernames = []; + for ($i = 0; $i < $location_users['count']; $i++) { if (array_key_exists($ldap_result_username, $location_users[$i])) { - $location_users[$i]["ldap_location_override"] = true; - $location_users[$i]["location_id"] = $ldap_loc["id"]; + $location_users[$i]['ldap_location_override'] = true; + $location_users[$i]['location_id'] = $ldap_loc['id']; $usernames[] = $location_users[$i][$ldap_result_username][0]; } - } // Delete located users from the general group. foreach ($results as $key => $generic_entry) { - if ((is_array($generic_entry)) && (array_key_exists($ldap_result_username, $generic_entry))) { + if ((is_array($generic_entry)) && (array_key_exists($ldap_result_username, $generic_entry))) { if (in_array($generic_entry[$ldap_result_username][0], $usernames)) { unset($results[$key]); } @@ -166,55 +167,52 @@ class LdapSync extends Command } /* Create user account entries in Snipe-IT */ - $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20); + $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20); $pass = bcrypt($tmp_pass); - for ($i = 0; $i < $results["count"]; $i++) { - if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") { - - $item = array(); - $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : ""; - $item["employee_number"] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : ""; - $item["lastname"] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : ""; - $item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : ""; - $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ; - $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:""; - $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:""; - $item["telephone"] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : ""; - $item["jobtitle"] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : ""; - $item["country"] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : ""; - $item["department"] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : ""; - + for ($i = 0; $i < $results['count']; $i++) { + if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == 'TRUE') { + $item = []; + $item['username'] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : ''; + $item['employee_number'] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : ''; + $item['lastname'] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : ''; + $item['firstname'] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : ''; + $item['email'] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : ''; + $item['ldap_location_override'] = isset($results[$i]['ldap_location_override']) ? $results[$i]['ldap_location_override'] : ''; + $item['location_id'] = isset($results[$i]['location_id']) ? $results[$i]['location_id'] : ''; + $item['telephone'] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : ''; + $item['jobtitle'] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : ''; + $item['country'] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : ''; + $item['department'] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : ''; $department = Department::firstOrCreate([ - 'name' => $item["department"], + 'name' => $item['department'], ]); - - $user = User::where('username', $item["username"])->first(); + $user = User::where('username', $item['username'])->first(); if ($user) { // Updating an existing user. - $item["createorupdate"] = 'updated'; + $item['createorupdate'] = 'updated'; } else { // Creating a new user. $user = new User; $user->password = $pass; $user->activated = 0; - $item["createorupdate"] = 'created'; + $item['createorupdate'] = 'created'; } - $user->first_name = $item["firstname"]; - $user->last_name = $item["lastname"]; - $user->username = $item["username"]; - $user->email = $item["email"]; - $user->employee_num = e($item["employee_number"]); - $user->phone = $item["telephone"]; - $user->jobtitle = $item["jobtitle"]; - $user->country = $item["country"]; + $user->first_name = $item['firstname']; + $user->last_name = $item['lastname']; + $user->username = $item['username']; + $user->email = $item['email']; + $user->employee_num = e($item['employee_number']); + $user->phone = $item['telephone']; + $user->jobtitle = $item['jobtitle']; + $user->country = $item['country']; $user->department_id = $department->id; // Sync activated state for Active Directory. - if ( array_key_exists('useraccountcontrol', $results[$i]) ) { + if (array_key_exists('useraccountcontrol', $results[$i])) { /* The following is _probably_ the correct logic, but we can't use it because some users may have been dependent upon the previous behavior, and this could cause additional access to be available to users they don't want @@ -231,7 +229,7 @@ class LdapSync extends Command } else { $user->activated = 0; } */ - $enabled_accounts = [ + $enabled_accounts = [ '512', // 0x200 NORMAL_ACCOUNT '544', // 0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD '66048', // 0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD @@ -240,27 +238,25 @@ class LdapSync extends Command '262688', // 0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED '328192', // 0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD '328224', // 0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD - '4260352',// 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH - '1049088',// 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED + '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH + '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED ]; - $user->activated = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0; + $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0; } // If we're not using AD, and there isn't an activated flag set, activate all users elseif (empty($ldap_result_active_flag)) { - $user->activated = 1; + $user->activated = 1; } if ($item['ldap_location_override'] == true) { $user->location_id = $item['location_id']; - } elseif ((isset($location)) && (!empty($location))) { - + } elseif ((isset($location)) && (! empty($location))) { if ((is_array($location)) && (array_key_exists('id', $location))) { $user->location_id = $location['id']; } elseif (is_object($location)) { $user->location_id = $location->id; } - } $user->ldap_import = 1; @@ -268,31 +264,30 @@ class LdapSync extends Command $errors = ''; if ($user->save()) { - $item["note"] = $item["createorupdate"]; - $item["status"]='success'; + $item['note'] = $item['createorupdate']; + $item['status'] = 'success'; } else { foreach ($user->getErrors()->getMessages() as $key => $err) { $errors .= $err[0]; } - $item["note"] = $errors; - $item["status"]='error'; + $item['note'] = $errors; + $item['status'] = 'error'; } array_push($summary, $item); } - } if ($this->option('summary')) { for ($x = 0; $x < count($summary); $x++) { - if ($summary[$x]['status']=='error') { + if ($summary[$x]['status'] == 'error') { $this->error('ERROR: '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].') was not imported: '.$summary[$x]['note']); } else { $this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username: '.$summary[$x]['username'].') was '.strtoupper($summary[$x]['createorupdate']).'.'); } } - } else if ($this->option('json_summary')) { - $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ]; // hardcoding the error to false and the error_message to blank seems a bit weird + } elseif ($this->option('json_summary')) { + $json_summary = ['error' => false, 'error_message' => '', 'summary' => $summary]; // hardcoding the error to false and the error_message to blank seems a bit weird $this->info(json_encode($json_summary)); } else { return $summary; diff --git a/app/Console/Commands/LdapSyncNg.php b/app/Console/Commands/LdapSyncNg.php index 527a99777c..b271c6c10c 100644 --- a/app/Console/Commands/LdapSyncNg.php +++ b/app/Console/Commands/LdapSyncNg.php @@ -4,13 +4,13 @@ declare(strict_types=1); namespace App\Console\Commands; -use Log; -use Exception; +use Adldap\Models\User as AdldapUser; +use App\Models\Location; use App\Models\User; use App\Services\LdapAd; -use App\Models\Location; +use Exception; use Illuminate\Console\Command; -use Adldap\Models\User as AdldapUser; +use Log; /** * LDAP / AD sync command. @@ -96,9 +96,9 @@ class LdapSyncNg extends Command public function __construct(LdapAd $ldap) { parent::__construct(); - $this->ldap = $ldap; + $this->ldap = $ldap; $this->settings = $this->ldap->ldapSettings; - $this->summary = collect(); + $this->summary = collect(); } /** @@ -108,22 +108,21 @@ class LdapSyncNg extends Command */ public function handle() { - - $dispatcher = \Adldap\Adldap::getEventDispatcher(); + $dispatcher = \Adldap\Adldap::getEventDispatcher(); // Listen for all model events. $dispatcher->listen('Adldap\Models\Events\*', function ($eventName, array $data) { echo $eventName; // Returns 'Adldap\Models\Events\Updating' var_dump($data); // Returns [0] => (object) Adldap\Models\Events\Updating; - \Log::debug("Event: ".$eventName." data - ".print_r($data, true)); + \Log::debug('Event: '.$eventName.' data - '.print_r($data, true)); }); $dispatcher->listen('Adldap\Auth\Events\*', function ($eventName, array $data) { echo $eventName; // Returns 'Adldap\Models\Events\Updating' var_dump($data); // Returns [0] => (object) Adldap\Models\Events\Updating; - \Log::debug("Event: ".$eventName." data - ".print_r($data, true)); + \Log::debug('Event: '.$eventName.' data - '.print_r($data, true)); }); - ini_set('max_execution_time', env('LDAP_TIME_LIM', "600")); //600 seconds = 10 minutes + ini_set('max_execution_time', env('LDAP_TIME_LIM', '600')); //600 seconds = 10 minutes ini_set('memory_limit', '500M'); $old_error_reporting = error_reporting(); // grab old error_reporting .ini setting, for later re-enablement error_reporting($old_error_reporting & ~E_DEPRECATED); // disable deprecation warnings, for LDAP in PHP 7.4 (and greater) @@ -138,7 +137,7 @@ class LdapSyncNg extends Command /* * Use the default location if set, this is needed for the LDAP users sync page */ - if (!$this->option('base_dn') && null == $this->defaultLocation) { + if (! $this->option('base_dn') && null == $this->defaultLocation) { $this->getMappedLocations(); } $this->processLdapUsers(); @@ -150,6 +149,7 @@ class LdapSyncNg extends Command } error_reporting($old_error_reporting); // re-enable deprecation warnings. + return $this->getSummary(); } @@ -205,17 +205,17 @@ class LdapSyncNg extends Command 'location_id' => $user->location_id, ]; // Only update the database if is not a dry run - if (!$this->dryrun) { + if (! $this->dryrun) { if ($user->isDirty()) { //if nothing on the user changed, don't bother trying to save anything nor put anything in the summary if ($user->save()) { - $summary['note'] = ($user->wasRecentlyCreated ? 'CREATED' : 'UPDATED'); + $summary['note'] = ($user->wasRecentlyCreated ? 'CREATED' : 'UPDATED'); $summary['status'] = 'SUCCESS'; } else { $errors = ''; foreach ($user->getErrors()->getMessages() as $error) { - $errors .= implode(", ",$error); + $errors .= implode(', ', $error); } - $summary['note'] = $snipeUser->getDN().' was not imported. REASON: '.$errors; + $summary['note'] = $snipeUser->getDN().' was not imported. REASON: '.$errors; $summary['status'] = 'ERROR'; } } else { @@ -224,7 +224,7 @@ class LdapSyncNg extends Command } // $summary['note'] = ($user->getOriginal('username') ? 'UPDATED' : 'CREATED'); // this seems, kinda, like, superfluous, relative to the $summary['note'] thing above, yeah? - if($summary) { //if the $user wasn't dirty, $summary was set to null so that we will skip the following push() + if ($summary) { //if the $user wasn't dirty, $summary was set to null so that we will skip the following push() $this->summary->push($summary); } } @@ -235,14 +235,13 @@ class LdapSyncNg extends Command * @author Wes Hulette * * @since 5.0.0 - * */ private function processLdapUsers(): void { try { - \Log::debug("CAL:LING GET LDAP SUSERS"); + \Log::debug('CAL:LING GET LDAP SUSERS'); $ldapUsers = $this->ldap->getLdapUsers(); - \Log::debug("END CALLING GET LDAP USERS"); + \Log::debug('END CALLING GET LDAP USERS'); } catch (Exception $e) { $this->outputError($e); exit($e->getMessage()); diff --git a/app/Console/Commands/MergeUsersByUsername.php b/app/Console/Commands/MergeUsersByUsername.php index 95278817ea..a3eb8f2d95 100644 --- a/app/Console/Commands/MergeUsersByUsername.php +++ b/app/Console/Commands/MergeUsersByUsername.php @@ -2,10 +2,9 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; use App\Models\User; use Carbon\Carbon; - +use Illuminate\Console\Command; class MergeUsersByUsername extends Command { @@ -44,7 +43,7 @@ class MergeUsersByUsername extends Command $users = User::where('username', 'LIKE', '%@%')->whereNull('deleted_at')->get(); foreach ($users as $user) { - $parts = explode("@", $user->username); + $parts = explode('@', $user->username); $bad_users = User::where('username', '=', $parts[0])->whereNull('deleted_at')->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations')->get(); foreach ($bad_users as $bad_user) { @@ -52,61 +51,55 @@ class MergeUsersByUsername extends Command // Walk the list of assets foreach ($bad_user->assets as $asset) { - $this->info( 'Updating asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id); + $this->info('Updating asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id); $asset->assigned_to = $user->id; - if (!$asset->save()) { - $this->error( 'Could not update assigned_to field on asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id); - $this->error( 'Error saving: '.$asset->getErrors()); + if (! $asset->save()) { + $this->error('Could not update assigned_to field on asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id); + $this->error('Error saving: '.$asset->getErrors()); } } // Walk the list of licenses foreach ($bad_user->licenses as $license) { - $this->info( 'Updating license '.$license->name.' '.$license->id.' to user '.$user->id); + $this->info('Updating license '.$license->name.' '.$license->id.' to user '.$user->id); $bad_user->licenses()->updateExistingPivot($license->id, ['assigned_to' => $user->id]); } // Walk the list of consumables foreach ($bad_user->consumables as $consumable) { - $this->info( 'Updating consumable '.$consumable->id.' to user '.$user->id); + $this->info('Updating consumable '.$consumable->id.' to user '.$user->id); $bad_user->consumables()->updateExistingPivot($consumable->id, ['assigned_to' => $user->id]); } // Walk the list of accessories foreach ($bad_user->accessories as $accessory) { - $this->info( 'Updating accessory '.$accessory->id.' to user '.$user->id); + $this->info('Updating accessory '.$accessory->id.' to user '.$user->id); $bad_user->accessories()->updateExistingPivot($accessory->id, ['assigned_to' => $user->id]); } // Walk the list of logs foreach ($bad_user->userlog as $log) { - $this->info( 'Updating action log record '.$log->id.' to user '.$user->id); + $this->info('Updating action log record '.$log->id.' to user '.$user->id); $log->target_id = $user->id; $log->save(); } // Update any manager IDs - $this->info( 'Updating managed user records to user '.$user->id); + $this->info('Updating managed user records to user '.$user->id); User::where('manager_id', '=', $bad_user->id)->update(['manager_id' => $user->id]); - // Update location manager IDs foreach ($bad_user->managedLocations as $managedLocation) { - $this->info( 'Updating managed location record '.$managedLocation->name.' to manager '.$user->id); + $this->info('Updating managed location record '.$managedLocation->name.' to manager '.$user->id); $managedLocation->manager_id = $user->id; $managedLocation->save(); } // Mark the user as deleted - $this->info( 'Marking the user as deleted'); + $this->info('Marking the user as deleted'); $bad_user->deleted_at = Carbon::now()->timestamp; $bad_user->save(); - - } - } - - } } diff --git a/app/Console/Commands/MoveUploadsToNewDisk.php b/app/Console/Commands/MoveUploadsToNewDisk.php index 9bd3a94aba..8fa5ddafd7 100644 --- a/app/Console/Commands/MoveUploadsToNewDisk.php +++ b/app/Console/Commands/MoveUploadsToNewDisk.php @@ -2,7 +2,6 @@ namespace App\Console\Commands; - use Illuminate\Console\Command; use Illuminate\Support\Facades\Storage; @@ -39,39 +38,37 @@ class MoveUploadsToNewDisk extends Command */ public function handle() { - - if (config('filesystems.default')=='local') { + if (config('filesystems.default') == 'local') { $this->error('Your current disk is set to local so we cannot proceed.'); $this->warn("Please configure your .env settings for S3. \nChange your PUBLIC_FILESYSTEM_DISK value to 's3_public' and your PRIVATE_FILESYSTEM_DISK to s3_private."); + return false; } $delete_local = $this->argument('delete_local'); - $public_uploads['accessories'] = glob('public/accessories'."/*.*"); - $public_uploads['assets'] = glob('public/assets'."/*.*"); - $public_uploads['avatars'] = glob('public/avatars'."/*.*"); - $public_uploads['categories'] = glob('public/categories'."/*.*"); - $public_uploads['companies'] = glob('public/companies'."/*.*"); - $public_uploads['components'] = glob('public/components'."/*.*"); - $public_uploads['consumables'] = glob('public/consumables'."/*.*"); - $public_uploads['departments'] = glob('public/departments'."/*.*"); - $public_uploads['locations'] = glob('public/locations'."/*.*"); - $public_uploads['manufacturers'] = glob('public/manufacturers'."/*.*"); - $public_uploads['suppliers'] = glob('public/suppliers'."/*.*"); - $public_uploads['assetmodels'] = glob('public/models'."/*.*"); - + $public_uploads['accessories'] = glob('public/accessories'.'/*.*'); + $public_uploads['assets'] = glob('public/assets'.'/*.*'); + $public_uploads['avatars'] = glob('public/avatars'.'/*.*'); + $public_uploads['categories'] = glob('public/categories'.'/*.*'); + $public_uploads['companies'] = glob('public/companies'.'/*.*'); + $public_uploads['components'] = glob('public/components'.'/*.*'); + $public_uploads['consumables'] = glob('public/consumables'.'/*.*'); + $public_uploads['departments'] = glob('public/departments'.'/*.*'); + $public_uploads['locations'] = glob('public/locations'.'/*.*'); + $public_uploads['manufacturers'] = glob('public/manufacturers'.'/*.*'); + $public_uploads['suppliers'] = glob('public/suppliers'.'/*.*'); + $public_uploads['assetmodels'] = glob('public/models'.'/*.*'); // iterate files - foreach($public_uploads as $public_type => $public_upload) - { + foreach ($public_uploads as $public_type => $public_upload) { $type_count = 0; - $this->info("- There are ".count($public_upload).' PUBLIC '.$public_type.' files.'); + $this->info('- There are '.count($public_upload).' PUBLIC '.$public_type.' files.'); for ($i = 0; $i < count($public_upload); $i++) { $type_count++; $filename = basename($public_upload[$i]); - try { + try { Storage::disk('public')->put('uploads/'.public_type.'/'.$filename, file_get_contents($public_upload[$i])); $new_url = Storage::disk('public')->url('uploads/'.$public_type.'/'.$filename, $filename); $this->info($type_count.'. PUBLIC: '.$filename.' was copied to '.$new_url); @@ -79,13 +76,11 @@ class MoveUploadsToNewDisk extends Command \Log::debug($e); $this->error($e); } - } - } - $logos = glob("public/uploads/setting*.*"); - $this->info("- There are ".count($logos).' files that might be logos.'); + $logos = glob('public/uploads/setting*.*'); + $this->info('- There are '.count($logos).' files that might be logos.'); $type_count = 0; foreach ($logos as $logo) { @@ -96,41 +91,35 @@ class MoveUploadsToNewDisk extends Command $this->info($type_count.'. LOGO: '.$filename.' was copied to '.env('PUBLIC_AWS_URL').'/uploads/'.$filename); } - $private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*"); - $private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*"); - $private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*"); - $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*"); - $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*"); - $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*"); - $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*"); - $private_uploads['backups'] = glob('storage/private_uploads/users'."/*.*"); + $private_uploads['assets'] = glob('storage/private_uploads/assets'.'/*.*'); + $private_uploads['signatures'] = glob('storage/private_uploads/signatures'.'/*.*'); + $private_uploads['audits'] = glob('storage/private_uploads/audits'.'/*.*'); + $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'.'/*.*'); + $private_uploads['imports'] = glob('storage/private_uploads/imports'.'/*.*'); + $private_uploads['licenses'] = glob('storage/private_uploads/licenses'.'/*.*'); + $private_uploads['users'] = glob('storage/private_uploads/users'.'/*.*'); + $private_uploads['backups'] = glob('storage/private_uploads/users'.'/*.*'); - - foreach($private_uploads as $private_type => $private_upload) - { - $this->info("- There are ".count($private_upload).' PRIVATE '.$private_type.' files.'); + foreach ($private_uploads as $private_type => $private_upload) { + $this->info('- There are '.count($private_upload).' PRIVATE '.$private_type.' files.'); $type_count = 0; for ($x = 0; $x < count($private_upload); $x++) { $type_count++; $filename = basename($private_upload[$x]); - try { + try { Storage::put($private_type.'/'.$filename, file_get_contents($private_upload[$i])); $new_url = Storage::url($private_type.'/'.$filename, $filename); $this->info($type_count.'. PRIVATE: '.$filename.' was copied to '.$new_url); - } catch (\Exception $e) { \Log::debug($e); $this->error($e); } - } - } - - if ($delete_local=='true') { + if ($delete_local == 'true') { $public_delete_count = 0; $private_delete_count = 0; @@ -139,10 +128,8 @@ class MoveUploadsToNewDisk extends Command $this->warn("\nTHIS WILL DELETE ALL OF YOUR LOCAL UPLOADED FILES. \n\nThis cannot be undone, so you should take a backup of your system before you proceed.\n"); $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'); - if ($this->confirm("Do you wish to continue?")) { - - foreach($public_uploads as $public_type => $public_upload) { - + if ($this->confirm('Do you wish to continue?')) { + foreach ($public_uploads as $public_type => $public_upload) { for ($i = 0; $i < count($public_upload); $i++) { $filename = $public_upload[$i]; try { @@ -152,13 +139,10 @@ class MoveUploadsToNewDisk extends Command \Log::debug($e); $this->error($e); } - } } - foreach($private_uploads as $private_type => $private_upload) - { - + foreach ($private_uploads as $private_type => $private_upload) { for ($i = 0; $i < count($private_upload); $i++) { $filename = $private_upload[$i]; try { @@ -168,16 +152,11 @@ class MoveUploadsToNewDisk extends Command \Log::debug($e); $this->error($e); } - } } - $this->info($public_delete_count." PUBLIC local files and ".$private_delete_count." PRIVATE local files were deleted from your filesystem."); + $this->info($public_delete_count.' PUBLIC local files and '.$private_delete_count.' PRIVATE local files were deleted from your filesystem.'); } } - - - - } } diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php index 71c974a21d..089ba34637 100644 --- a/app/Console/Commands/ObjectImportCommand.php +++ b/app/Console/Commands/ObjectImportCommand.php @@ -1,4 +1,5 @@ setShouldNotify($this->option('send-welcome')) ->setUsernameFormat($this->option('username_format')); - // This $logFile/useFiles() bit is currently broken, so commenting it out for now // $logFile = $this->option('logfile'); // \Log::useFiles($logFile); @@ -64,29 +65,29 @@ class ObjectImportCommand extends Command $this->bar = null; - if (!empty($this->errors)) { - $this->comment("The following Errors were encountered."); + if (! empty($this->errors)) { + $this->comment('The following Errors were encountered.'); foreach ($this->errors as $asset => $error) { - $this->comment('Error: Item: ' . $asset . ' failed validation: ' . json_encode($error)); + $this->comment('Error: Item: '.$asset.' failed validation: '.json_encode($error)); } } else { - $this->comment("All Items imported successfully!"); + $this->comment('All Items imported successfully!'); } - $this->comment(""); + $this->comment(''); - return; } public function errorCallback($item, $field, $errorString) { $this->errors[$item->name][$field] = $errorString; } + public function progress($count) { - if (!$this->bar) { + if (! $this->bar) { $this->bar = $this->output->createProgressBar($count); } - static $index =0; + static $index = 0; $index++; if ($index < $count) { $this->bar->advance(); @@ -94,12 +95,12 @@ class ObjectImportCommand extends Command $this->bar->finish(); } } + // Tracks the current item for error messages private $updating; // An array of errors encountered while parsing private $errors; - /** * Log a message to file, configurable by the --log-file parameter. * If a warning message is passed, we'll spit it to the console as well. @@ -108,7 +109,7 @@ class ObjectImportCommand extends Command * @since 3.0 * @param string $string * @param string $level - */ + */ public function log($string, $level = 'info') { if ($level === 'warning') { @@ -121,6 +122,7 @@ class ObjectImportCommand extends Command } } } + /** * Get the console command arguments. * @@ -130,12 +132,11 @@ class ObjectImportCommand extends Command */ protected function getArguments() { - return array( - array('filename', InputArgument::REQUIRED, 'File for the CSV import.'), - ); + return [ + ['filename', InputArgument::REQUIRED, 'File for the CSV import.'], + ]; } - /** * Get the console command options. * @@ -145,16 +146,15 @@ class ObjectImportCommand extends Command */ protected function getOptions() { - return array( - array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null), - array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null), - array('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to. storage/logs/importer.log by default', storage_path('logs/importer.log') ), - array('item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import. Valid Options are Asset, Consumable, Accessory, License, or User', 'Asset'), - array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'), - array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1), - array('update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'), - array('send-welcome', null, InputOption::VALUE_NONE, 'Whether to send a welcome email to any new users that are created.'), - ); - + return [ + ['email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null], + ['username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null], + ['logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to. storage/logs/importer.log by default', storage_path('logs/importer.log')], + ['item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import. Valid Options are Asset, Consumable, Accessory, License, or User', 'Asset'], + ['web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'], + ['user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1], + ['update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'], + ['send-welcome', null, InputOption::VALUE_NONE, 'Whether to send a welcome email to any new users that are created.'], + ]; } } diff --git a/app/Console/Commands/Purge.php b/app/Console/Commands/Purge.php index a9f1da7374..7abd83c85c 100644 --- a/app/Console/Commands/Purge.php +++ b/app/Console/Commands/Purge.php @@ -50,7 +50,7 @@ class Purge extends Command public function handle() { $force = $this->option('force'); - if (($this->confirm("\n****************************************************\nTHIS WILL PURGE ALL SOFT-DELETED ITEMS IN YOUR SYSTEM. \nThere is NO undo. This WILL permanently destroy \nALL of your deleted data. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) || $force == 'true') { + if (($this->confirm("\n****************************************************\nTHIS WILL PURGE ALL SOFT-DELETED ITEMS IN YOUR SYSTEM. \nThere is NO undo. This WILL permanently destroy \nALL of your deleted data. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) || $force == 'true') { /** * Delete assets @@ -80,9 +80,8 @@ class Purge extends Command $location->forceDelete(); } - $accessories = Accessory::whereNotNull('deleted_at')->withTrashed()->get(); - $accessory_assoc=0; + $accessory_assoc = 0; $this->info($accessories->count().' accessories purged.'); foreach ($accessories as $accessory) { $this->info('- Accessory "'.$accessory->name.'" deleted.'); @@ -92,7 +91,6 @@ class Purge extends Command } $this->info($accessory_assoc.' corresponding log records purged.'); - $consumables = Consumable::whereNotNull('deleted_at')->withTrashed()->get(); $this->info($consumables->count().' consumables purged.'); foreach ($consumables as $consumable) { @@ -101,7 +99,6 @@ class Purge extends Command $consumable->forceDelete(); } - $components = Component::whereNotNull('deleted_at')->withTrashed()->get(); $this->info($components->count().' components purged.'); foreach ($components as $component) { @@ -126,7 +123,6 @@ class Purge extends Command $model->forceDelete(); } - $categories = Category::whereNotNull('deleted_at')->withTrashed()->get(); $this->info($categories->count().' categories purged.'); foreach ($categories as $category) { @@ -165,11 +161,8 @@ class Purge extends Command $this->info('- Status Label "'.$status_label->name.'" deleted.'); $status_label->forceDelete(); } - - } else { $this->info('Action canceled. Nothing was purged.'); } - } } diff --git a/app/Console/Commands/PurgeLoginAttempts.php b/app/Console/Commands/PurgeLoginAttempts.php index 7a7a1394d7..44e1d1bd1e 100644 --- a/app/Console/Commands/PurgeLoginAttempts.php +++ b/app/Console/Commands/PurgeLoginAttempts.php @@ -38,7 +38,7 @@ class PurgeLoginAttempts extends Command public function handle() { if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE YOUR LOGIN ATTEMPT RECORDS. \nThere is NO undo! \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) { - \DB::statement('delete from login_attempts'); + \DB::statement('delete from login_attempts'); } } } diff --git a/app/Console/Commands/ReEncodeCustomFieldNames.php b/app/Console/Commands/ReEncodeCustomFieldNames.php index 14276b1bd3..f89864e951 100644 --- a/app/Console/Commands/ReEncodeCustomFieldNames.php +++ b/app/Console/Commands/ReEncodeCustomFieldNames.php @@ -48,15 +48,13 @@ class ReEncodeCustomFieldNames extends Command */ public function handle() { - - if ($this->confirm('This will regenerate all of the custom field database fieldnames in your database. THIS WILL CHANGE YOUR SCHEMA AND SHOULD NOT BE DONE WITHOUT MAKING A BACKUP FIRST. Do you wish to continue?')) - { + if ($this->confirm('This will regenerate all of the custom field database fieldnames in your database. THIS WILL CHANGE YOUR SCHEMA AND SHOULD NOT BE DONE WITHOUT MAKING A BACKUP FIRST. Do you wish to continue?')) { /** Get all of the custom fields */ $fields = CustomField::get(); $asset_columns = \DB::getSchemaBuilder()->getColumnListing('assets'); - $custom_field_columns = array(); + $custom_field_columns = []; /** Loop through the columns on the assets table */ foreach ($asset_columns as $asset_column) { @@ -71,18 +69,16 @@ class ReEncodeCustomFieldNames extends Command * Then use that ID as the array key for use comparing the actual assets field name * and the db_column value from the custom fields table. */ - $last_part = substr(strrchr($asset_column, "_snipeit_"), 1); + $last_part = substr(strrchr($asset_column, '_snipeit_'), 1); $custom_field_columns[$last_part] = $asset_column; } } foreach ($fields as $field) { - - $this->info($field->name .' ('.$field->id.') column should be '. $field->convertUnicodeDbSlug().''); + $this->info($field->name.' ('.$field->id.') column should be '.$field->convertUnicodeDbSlug().''); /** The assets table has the column it should have, all is well */ - if (\Schema::hasColumn('assets', $field->convertUnicodeDbSlug())) - { + if (\Schema::hasColumn('assets', $field->convertUnicodeDbSlug())) { $this->info('-- ✓ This field exists - all good'); /** @@ -90,24 +86,23 @@ class ReEncodeCustomFieldNames extends Command * what $field->convertUnicodeDbSlug() is *now* expecting. */ } else { - $this->warn('-- X Field mismatch: updating... '); + $this->warn('-- X Field mismatch: updating... '); - /** Make sure the custom_field_columns array has the ID */ - if (array_key_exists($field->id, $custom_field_columns)) { + /** Make sure the custom_field_columns array has the ID */ + if (array_key_exists($field->id, $custom_field_columns)) { - /** - * Update the asset schema to the corrected fieldname that will be recognized by the - * system elsewhere that we use $field->convertUnicodeDbSlug() - */ - \Schema::table('assets', function($table) use ($custom_field_columns, $field) { - $table->renameColumn($custom_field_columns[$field->id], $field->convertUnicodeDbSlug()); - }); + /** + * Update the asset schema to the corrected fieldname that will be recognized by the + * system elsewhere that we use $field->convertUnicodeDbSlug() + */ + \Schema::table('assets', function ($table) use ($custom_field_columns, $field) { + $table->renameColumn($custom_field_columns[$field->id], $field->convertUnicodeDbSlug()); + }); - $this->warn('-- ✓ Field updated from '.$custom_field_columns[$field->id].' to '.$field->convertUnicodeDbSlug()); - - } else { - $this->warn('-- X WARNING: There is no field on the assets table ending in '.$field->id.'. This may require more in-depth investigation and may mean the schema was altered manually.'); - } + $this->warn('-- ✓ Field updated from '.$custom_field_columns[$field->id].' to '.$field->convertUnicodeDbSlug()); + } else { + $this->warn('-- X WARNING: There is no field on the assets table ending in '.$field->id.'. This may require more in-depth investigation and may mean the schema was altered manually.'); + } } /** Update the db_column property in the custom fields table, just in case it doesn't match the other @@ -115,12 +110,7 @@ class ReEncodeCustomFieldNames extends Command */ $field->db_column = $field->convertUnicodeDbSlug(); $field->save(); - - } - } - - } } diff --git a/app/Console/Commands/RecryptFromMcrypt.php b/app/Console/Commands/RecryptFromMcrypt.php index 6c3a962823..805774a517 100644 --- a/app/Console/Commands/RecryptFromMcrypt.php +++ b/app/Console/Commands/RecryptFromMcrypt.php @@ -44,37 +44,35 @@ class RecryptFromMcrypt extends Command public function handle() { - // Check and see if they have a legacy app key listed in their .env // If not, we can try to use the current APP_KEY if looks like it's old $legacy_key = env('LEGACY_APP_KEY'); $key_parts = explode(':', $legacy_key); $legacy_cipher = env('LEGACY_CIPHER', 'rijndael-256'); - $errors = array(); + $errors = []; - if (!$legacy_key) { + if (! $legacy_key) { $this->error('ERROR: You do not have a LEGACY_APP_KEY set in your .env file. Please locate your old APP_KEY and ADD a line to your .env file like: LEGACY_APP_KEY=YOUR_OLD_APP_KEY'); + return false; } - // Do some basic legacy app key length checks if (strlen($legacy_key) == 32) { $legacy_length_check = true; - } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1])==44)) { - $legacy_key = base64_decode($key_parts[1],true); + } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1]) == 44)) { + $legacy_key = base64_decode($key_parts[1], true); $legacy_length_check = true; } else { $legacy_length_check = false; } - - // Check that the app key is 32 characters if ($legacy_length_check === true) { $this->comment('INFO: Your LEGACY_APP_KEY looks correct. Okay to continue.'); } else { $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters or base64 followed by 44 characters for later versions). Please locate your old APP_KEY and use that as your LEGACY_APP_KEY in your .env file to continue.'); + return false; } @@ -84,8 +82,7 @@ class RecryptFromMcrypt extends Command $force = ($this->option('force')) ? true : false; - if ($force || ($this->confirm("Are you SURE you wish to continue?"))) { - + if ($force || ($this->confirm('Are you SURE you wish to continue?'))) { $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis'); try { @@ -95,15 +92,14 @@ class RecryptFromMcrypt extends Command $this->info('WARNING: Could not backup app keys'); } - - if ($legacy_cipher){ - $mcrypter = new McryptEncrypter($legacy_key,$legacy_cipher); - }else{ + if ($legacy_cipher) { + $mcrypter = new McryptEncrypter($legacy_key, $legacy_cipher); + } else { $mcrypter = new McryptEncrypter($legacy_key); } $settings = Setting::getSettings(); - if ($settings->ldap_pword=='') { + if ($settings->ldap_pword == '') { $this->comment('INFO: No LDAP password found. Skipping... '); } else { $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword); @@ -111,30 +107,28 @@ class RecryptFromMcrypt extends Command $settings->save(); } /** @var CustomField[] $custom_fields */ - $custom_fields = CustomField::where('field_encrypted','=', 1)->get(); + $custom_fields = CustomField::where('field_encrypted', '=', 1)->get(); $this->comment('INFO: Retrieving encrypted custom fields...'); $query = Asset::withTrashed(); foreach ($custom_fields as $custom_field) { - $this->comment('FIELD TO RECRYPT: '.$custom_field->name .' ('.$custom_field->db_column.')'); + $this->comment('FIELD TO RECRYPT: '.$custom_field->name.' ('.$custom_field->db_column.')'); $query->orWhereNotNull($custom_field->db_column); } - // Get all assets with a value in any of the fields that were encrypted /** @var Asset[] $assets */ $assets = $query->get(); $bar = $this->output->createProgressBar(count($assets)); - foreach ($assets as $asset) { foreach ($custom_fields as $encrypted_field) { $columnName = $encrypted_field->db_column; // Make sure the value isn't null - if ($asset->{$columnName}!='') { + if ($asset->{$columnName} != '') { // Try to decrypt the payload using the legacy app key try { $decrypted_field = $mcrypter->decrypt($asset->{$columnName}); @@ -144,14 +138,11 @@ class RecryptFromMcrypt extends Command $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage(); } } - } $asset->save(); $bar->advance(); } - - $bar->finish(); if (count($errors) > 0) { @@ -162,6 +153,5 @@ class RecryptFromMcrypt extends Command } } } - } } diff --git a/app/Console/Commands/RegenerateAssetTags.php b/app/Console/Commands/RegenerateAssetTags.php index 2646ebeb35..94ed5ce07c 100644 --- a/app/Console/Commands/RegenerateAssetTags.php +++ b/app/Console/Commands/RegenerateAssetTags.php @@ -40,30 +40,26 @@ class RegenerateAssetTags extends Command */ public function handle() { - - if ($this->confirm('This will regenerate all of the asset tags within your system. This action is data-destructive and should be used with caution. Do you wish to continue?')) - { - + if ($this->confirm('This will regenerate all of the asset tags within your system. This action is data-destructive and should be used with caution. Do you wish to continue?')) { $output['info'] = []; $output['warn'] = []; $output['error'] = []; $settings = Setting::getSettings(); - $start_tag = ($this->option('start')) ? $this->option('start') : (($settings->next_auto_tag_base) ? Setting::getSettings()->next_auto_tag_base : 1) ; + $start_tag = ($this->option('start')) ? $this->option('start') : (($settings->next_auto_tag_base) ? Setting::getSettings()->next_auto_tag_base : 1); $this->info('Starting at '.$start_tag); - $total_assets = Asset::orderBy('id','asc')->get(); + $total_assets = Asset::orderBy('id', 'asc')->get(); $bar = $this->output->createProgressBar(count($total_assets)); - try { + try { Artisan::call('backup:run'); } catch (\Exception $e) { $output['error'][] = $e; } foreach ($total_assets as $asset) { - $start_tag++; $output['info'][] = 'Asset tag:'.$asset->asset_tag; $asset->asset_tag = $settings->auto_increment_prefix.$settings->auto_increment_prefix.$start_tag; @@ -81,24 +77,21 @@ class RegenerateAssetTags extends Command $bar->finish(); $this->info("\n"); - - if (($this->option('output')=='all') || ($this->option('output')=='info')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'info')) { foreach ($output['info'] as $key => $output_text) { $this->info($output_text); } } - if (($this->option('output')=='all') || ($this->option('output')=='warn')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'warn')) { foreach ($output['warn'] as $key => $output_text) { $this->warn($output_text); } } - if (($this->option('output')=='all') || ($this->option('output')=='error')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'error')) { foreach ($output['error'] as $key => $output_text) { $this->error($output_text); } } } - - } } diff --git a/app/Console/Commands/ResetDemoSettings.php b/app/Console/Commands/ResetDemoSettings.php index 6808b125c8..b873235289 100644 --- a/app/Console/Commands/ResetDemoSettings.php +++ b/app/Console/Commands/ResetDemoSettings.php @@ -2,7 +2,6 @@ namespace App\Console\Commands; - use App\Models\Setting; use App\Models\User; use Illuminate\Console\Command; @@ -40,7 +39,6 @@ class ResetDemoSettings extends Command */ public function handle() { - $this->info('Resetting the demo settings.'); $settings = Setting::first(); $settings->per_page = 20; @@ -73,7 +71,6 @@ class ResetDemoSettings extends Command $settings->saml_slo = null; $settings->saml_custom_settings = null; - $settings->save(); if ($user = User::where('username', '=', 'admin')->first()) { @@ -83,7 +80,5 @@ class ResetDemoSettings extends Command \Storage::disk('local_public')->put('snipe-logo.png', file_get_contents(public_path('img/demo/snipe-logo.png'))); \Storage::disk('local_public')->put('snipe-logo-lg.png', file_get_contents(public_path('img/demo/snipe-logo-lg.png'))); - } - } diff --git a/app/Console/Commands/RestoreDeletedUsers.php b/app/Console/Commands/RestoreDeletedUsers.php index c17c18984a..4bf26a544d 100644 --- a/app/Console/Commands/RestoreDeletedUsers.php +++ b/app/Console/Commands/RestoreDeletedUsers.php @@ -43,16 +43,15 @@ class RestoreDeletedUsers extends Command */ public function handle() { - $start_date = $this->option('start_date'); $end_date = $this->option('end_date'); $asset_totals = 0; $license_totals = 0; $user_count = 0; - - if (($start_date=='') || ($end_date=='')) { + if (($start_date == '') || ($end_date == '')) { $this->info('ERROR: All fields are required.'); + return false; } @@ -63,15 +62,15 @@ class RestoreDeletedUsers extends Command foreach ($users as $user) { $user_count++; - $user_logs = Actionlog::where('target_id', $user->id)->where('target_type',User::class) - ->where('action_type','checkout')->with('item')->get(); + $user_logs = Actionlog::where('target_id', $user->id)->where('target_type', User::class) + ->where('action_type', 'checkout')->with('item')->get(); - $this->info($user_count.'. '.$user->username.' ('.$user->id.') was deleted at '.$user->deleted_at. ' and has '.$user_logs->count().' checkouts associated.'); + $this->info($user_count.'. '.$user->username.' ('.$user->id.') was deleted at '.$user->deleted_at.' and has '.$user_logs->count().' checkouts associated.'); foreach ($user_logs as $user_log) { $this->info(' * '.$user_log->item_type.': '.$user_log->item->name.' - item_id: '.$user_log->item_id); - if ($user_log->item_type==Asset::class) { + if ($user_log->item_type == Asset::class) { $asset_totals++; DB::table('assets') @@ -79,11 +78,10 @@ class RestoreDeletedUsers extends Command ->update(['assigned_to' => $user->id, 'assigned_type'=> User::class]); $this->info(' ** Asset '.$user_log->item->id.' ('.$user_log->item->asset_tag.') restored to user '.$user->id.''); - - } elseif ($user_log->item_type==License::class) { + } elseif ($user_log->item_type == License::class) { $license_totals++; - $avail_seat = DB::table('license_seats')->where('license_id','=',$user_log->item->id) + $avail_seat = DB::table('license_seats')->where('license_id', '=', $user_log->item->id) ->whereNull('assigned_to')->whereNull('asset_id')->whereBetween('updated_at', [$start_date, $end_date])->first(); if ($avail_seat) { $this->info(' ** Allocating seat '.$avail_seat->id.' for this License'); @@ -91,27 +89,17 @@ class RestoreDeletedUsers extends Command DB::table('license_seats') ->where('id', $avail_seat->id) ->update(['assigned_to' => $user->id]); - } else { $this->warn('ERROR: No available seats for '.$user_log->item->name); } - } - } $this->warn('Restoring user '.$user->username.'!'); $user->restore(); - - } $this->info($asset_totals.' assets affected'); $this->info($license_totals.' licenses affected'); - - - } - - } diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php index b59eceacc7..d1b934e9cd 100644 --- a/app/Console/Commands/RestoreFromBackup.php +++ b/app/Console/Commands/RestoreFromBackup.php @@ -3,7 +3,6 @@ namespace App\Console\Commands; use Illuminate\Console\Command; - use ZipArchive; class RestoreFromBackup extends Command @@ -43,20 +42,20 @@ class RestoreFromBackup extends Command public function handle() { $dir = getcwd(); - print "Current working directory is: $dir\n"; + echo "Current working directory is: $dir\n"; // $filename = $this->argument('filename'); - if (!$filename) { - return $this->error("Missing required filename"); + if (! $filename) { + return $this->error('Missing required filename'); } - if (!$this->option('force') && !$this->confirm('Are you sure you wish to restore from the given backup file? This can lead to MASSIVE DATA LOSS!')) { - return $this->error("Data loss not confirmed"); + if (! $this->option('force') && ! $this->confirm('Are you sure you wish to restore from the given backup file? This can lead to MASSIVE DATA LOSS!')) { + return $this->error('Data loss not confirmed'); } if (config('database.default') != 'mysql') { - return $this->error("DB_CONNECTION must be MySQL in order to perform a restore. Detected: ".config('database.default')); + return $this->error('DB_CONNECTION must be MySQL in order to perform a restore. Detected: '.config('database.default')); } $za = new ZipArchive(); @@ -64,21 +63,20 @@ class RestoreFromBackup extends Command $errcode = $za->open($filename, ZipArchive::RDONLY); if ($errcode !== true) { $errors = [ - ZipArchive::ER_EXISTS => "File already exists.", - ZipArchive::ER_INCONS => "Zip archive inconsistent.", - ZipArchive::ER_INVAL => "Invalid argument.", - ZipArchive::ER_MEMORY => "Malloc failure.", - ZipArchive::ER_NOENT => "No such file.", - ZipArchive::ER_NOZIP => "Not a zip archive.", + ZipArchive::ER_EXISTS => 'File already exists.', + ZipArchive::ER_INCONS => 'Zip archive inconsistent.', + ZipArchive::ER_INVAL => 'Invalid argument.', + ZipArchive::ER_MEMORY => 'Malloc failure.', + ZipArchive::ER_NOENT => 'No such file.', + ZipArchive::ER_NOZIP => 'Not a zip archive.', ZipArchive::ER_OPEN => "Can't open file.", - ZipArchive::ER_READ => "Read error.", - ZipArchive::ER_SEEK => "Seek error." + ZipArchive::ER_READ => 'Read error.', + ZipArchive::ER_SEEK => 'Seek error.', ]; - return $this->error("Could not access file: ".$filename." - ".array_key_exists($errcode,$errors) ? $errors[$errcode] : " Unknown reason: $errcode"); + return $this->error('Could not access file: '.$filename.' - '.array_key_exists($errcode, $errors) ? $errors[$errcode] : " Unknown reason: $errcode"); } - $private_dirs = [ 'storage/private_uploads/assets', // these are asset _files_, not the pictures. 'storage/private_uploads/audits', @@ -86,11 +84,11 @@ class RestoreFromBackup extends Command 'storage/private_uploads/assetmodels', 'storage/private_uploads/users', 'storage/private_uploads/licenses', - 'storage/private_uploads/signatures' + 'storage/private_uploads/signatures', ]; $private_files = [ 'storage/oauth-private.key', - 'storage/oauth-public.key' + 'storage/oauth-public.key', ]; $public_dirs = [ 'public/uploads/companies', @@ -108,16 +106,16 @@ class RestoreFromBackup extends Command 'public/uploads/models', 'public/uploads/categories', 'public/uploads/avatars', - 'public/uploads/manufacturers' + 'public/uploads/manufacturers', ]; - + $public_files = [ 'public/uploads/logo.*', 'public/uploads/setting-email_logo*', 'public/uploads/setting-label_logo*', 'public/uploads/setting-logo*', 'public/uploads/favicon.*', - 'public/uploads/favicon-uploaded.*' + 'public/uploads/favicon-uploaded.*', ]; $all_files = $private_dirs + $public_dirs; @@ -127,64 +125,64 @@ class RestoreFromBackup extends Command $interesting_files = []; $boring_files = []; - - for ($i=0; $i<$za->numFiles;$i++) { + + for ($i = 0; $i < $za->numFiles; $i++) { $stat_results = $za->statIndex($i); // echo "index: $i\n"; // print_r($stat_results); - + $raw_path = $stat_results['name']; - if(strpos($raw_path,'\\')!==false) { //found a backslash, swap it to forward-slash - $raw_path = strtr($raw_path,'\\','/'); + if (strpos($raw_path, '\\') !== false) { //found a backslash, swap it to forward-slash + $raw_path = strtr($raw_path, '\\', '/'); //print "Translating file: ".$stat_results['name']." to: ".$raw_path."\n"; } - + // skip macOS resource fork files (?!?!?!) - if(strpos($raw_path,"__MACOSX")!==false && strpos($raw_path,"._") !== false) { + if (strpos($raw_path, '__MACOSX') !== false && strpos($raw_path, '._') !== false) { //print "SKIPPING macOS Resource fork file: $raw_path\n"; $boring_files[] = $raw_path; continue; } - if(@pathinfo($raw_path)['extension'] == "sql") { - print "Found a sql file!\n"; + if (@pathinfo($raw_path)['extension'] == 'sql') { + echo "Found a sql file!\n"; $sqlfiles[] = $raw_path; $sqlfile_indices[] = $i; continue; } - - foreach(array_merge($private_dirs,$public_dirs) as $dir) { - $last_pos = strrpos($raw_path,$dir.'/'); - if($last_pos !== false ) { + + foreach (array_merge($private_dirs, $public_dirs) as $dir) { + $last_pos = strrpos($raw_path, $dir.'/'); + if ($last_pos !== false) { //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n"); //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path? $interesting_files[$raw_path] = ['dest' =>$dir, 'index' => $i]; continue 2; - if($last_pos + strlen($dir) +1 == strlen($raw_path)) { + if ($last_pos + strlen($dir) + 1 == strlen($raw_path)) { // we don't care about that; we just want files with the appropriate prefix //print("FOUND THE EXACT DIRECTORY: $dir AT: $raw_path!!!\n"); } } } - $good_extensions = ["png","gif","jpg","svg","jpeg","doc","docx","pdf","txt", - "zip","rar","xls","xlsx","lic","xml","rtf", "webp","key","ico"]; - foreach(array_merge($private_files, $public_files) as $file) { - $has_wildcard = (strpos($file,"*") !== false); - if($has_wildcard) { - $file = substr($file,0,-1); //trim last character (which should be the wildcard) + $good_extensions = ['png', 'gif', 'jpg', 'svg', 'jpeg', 'doc', 'docx', 'pdf', 'txt', + 'zip', 'rar', 'xls', 'xlsx', 'lic', 'xml', 'rtf', 'webp', 'key', 'ico', ]; + foreach (array_merge($private_files, $public_files) as $file) { + $has_wildcard = (strpos($file, '*') !== false); + if ($has_wildcard) { + $file = substr($file, 0, -1); //trim last character (which should be the wildcard) } - $last_pos = strrpos($raw_path,$file); // no trailing slash! - if($last_pos !== false ) { + $last_pos = strrpos($raw_path, $file); // no trailing slash! + if ($last_pos !== false) { $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION)); - if(!in_array($extension, $good_extensions)) { - $this->warn("Potentially unsafe file ".$raw_path." is being skipped"); + if (! in_array($extension, $good_extensions)) { + $this->warn('Potentially unsafe file '.$raw_path.' is being skipped'); $boring_files[] = $raw_path; continue 2; } //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n"); //no wildcards found in $file, process 'normally' - if($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it. + if ($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it. // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though. - $interesting_files[$raw_path] = ['dest' => dirname($file),'index' => $i]; + $interesting_files[$raw_path] = ['dest' => dirname($file), 'index' => $i]; continue 2; } } @@ -194,11 +192,11 @@ class RestoreFromBackup extends Command // print_r($interesting_files);exit(-1); - if( count($sqlfiles) != 1) { - return $this->error("There should be exactly *one* sql backup file found, found: ".( count($sqlfiles) == 0 ? "None" : implode(", ",$sqlfiles))); + if (count($sqlfiles) != 1) { + return $this->error('There should be exactly *one* sql backup file found, found: '.(count($sqlfiles) == 0 ? 'None' : implode(', ', $sqlfiles))); } - if( strpos($sqlfiles[0], "db-dumps") === false ) { + if (strpos($sqlfiles[0], 'db-dumps') === false) { //return $this->error("SQL backup file is missing 'db-dumps' component of full pathname: ".$sqlfiles[0]); //older Snipe-IT installs don't have the db-dumps subdirectory component } @@ -207,14 +205,14 @@ class RestoreFromBackup extends Command $pipes = []; $env_vars = getenv(); - $env_vars['MYSQL_PWD'] = config("database.connections.mysql.password"); - $proc_results = proc_open("mysql -h ".escapeshellarg(config('database.connections.mysql.host'))." -u ".escapeshellarg(config('database.connections.mysql.username'))." ".escapeshellarg(config('database.connections.mysql.database')), // yanked -p since we pass via ENV - [0 => ['pipe','r'],1 => ['pipe','w'],2 => ['pipe','w']], + $env_vars['MYSQL_PWD'] = config('database.connections.mysql.password'); + $proc_results = proc_open('mysql -h '.escapeshellarg(config('database.connections.mysql.host')).' -u '.escapeshellarg(config('database.connections.mysql.username')).' '.escapeshellarg(config('database.connections.mysql.database')), // yanked -p since we pass via ENV + [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes, null, $env_vars); // this is not super-duper awesome-secure, but definitely more secure than showing it on the CLI, or dropping temporary files with passwords in them. - if($proc_results === false) { - return $this->error("Unable to invoke mysql via CLI"); + if ($proc_results === false) { + return $this->error('Unable to invoke mysql via CLI'); } // $this->info("Stdout says? ".fgets($pipes[1])); //FIXME: I think we might need to set non-blocking mode to use this properly? @@ -232,17 +230,19 @@ class RestoreFromBackup extends Command $this->info($stdout); $stderr = fgets($pipes[2]); $this->info($stderr); + return false; } - while(($buffer = fgets($sql_contents)) !== false ) { + while (($buffer = fgets($sql_contents)) !== false) { //$this->info("Buffer is: '$buffer'"); - $bytes_written = fwrite($pipes[0],$buffer); - if($bytes_written === false) { + $bytes_written = fwrite($pipes[0], $buffer); + if ($bytes_written === false) { $stdout = fgets($pipes[1]); $this->info($stdout); $stderr = fgets($pipes[2]); $this->info($stderr); + return false; } } @@ -252,41 +252,40 @@ class RestoreFromBackup extends Command fclose($pipes[2]); //wait, have to do fclose() on all pipes first? $close_results = proc_close($proc_results); - if($close_results != 0) { - return $this->error("There may have been a problem with the database import: Error number ".$close_results); + if ($close_results != 0) { + return $this->error('There may have been a problem with the database import: Error number '.$close_results); } - + //and now copy the files over too (right?) //FIXME - we don't prune the filesystem space yet!!!! - if($this->option('no-progress')) { + if ($this->option('no-progress')) { $bar = null; } else { $bar = $this->output->createProgressBar(count($interesting_files)); } - foreach($interesting_files AS $pretty_file_name => $file_details) { + foreach ($interesting_files as $pretty_file_name => $file_details) { $ugly_file_name = $za->statIndex($file_details['index'])['name']; $fp = $za->getStream($ugly_file_name); //$this->info("Weird problem, here are file details? ".print_r($file_details,true)); - $migrated_file = fopen($file_details['dest']."/".basename($pretty_file_name),"w"); - while(($buffer = fgets($fp))!== false) { - fwrite($migrated_file,$buffer); + $migrated_file = fopen($file_details['dest'].'/'.basename($pretty_file_name), 'w'); + while (($buffer = fgets($fp)) !== false) { + fwrite($migrated_file, $buffer); } fclose($migrated_file); fclose($fp); //$this->info("Wrote $ugly_file_name to $pretty_file_name"); - if($bar) { + if ($bar) { $bar->advance(); } } - if($bar) { + if ($bar) { $bar->finish(); - $this->line(""); + $this->line(''); } else { - $this->info(count($interesting_files)." files were succesfully transferred"); + $this->info(count($interesting_files).' files were succesfully transferred'); } - foreach($boring_files as $boring_file) { - $this->warn($boring_file." was skipped."); + foreach ($boring_files as $boring_file) { + $this->warn($boring_file.' was skipped.'); } - } } diff --git a/app/Console/Commands/RotateAppKey.php b/app/Console/Commands/RotateAppKey.php index 51c43d4ec9..08e528e4a4 100644 --- a/app/Console/Commands/RotateAppKey.php +++ b/app/Console/Commands/RotateAppKey.php @@ -2,12 +2,12 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use Artisan; -use App\Models\CustomField; use App\Models\Asset; +use App\Models\CustomField; use App\Models\Setting; -use \Illuminate\Encryption\Encrypter; +use Artisan; +use Illuminate\Console\Command; +use Illuminate\Encryption\Encrypter; class RotateAppKey extends Command { @@ -42,9 +42,7 @@ class RotateAppKey extends Command */ public function handle() { - if ($this->confirm("\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ")) { - - + if ($this->confirm("\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ")) { // Get the existing app_key and ciphers // We put them in a variable since we clear the cache partway through here. @@ -73,33 +71,26 @@ class RotateAppKey extends Command $fields = CustomField::where('field_encrypted', '1')->get(); - foreach ($fields as $field) { - $assets = Asset::whereNotNull($field->db_column)->get(); foreach ($assets as $asset) { - $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column}); - $this->line('DECRYPTED: '. $field->db_column); + $this->line('DECRYPTED: '.$field->db_column); $asset->{$field->db_column} = $newEncrypter->encrypt($asset->{$field->db_column}); $this->line('ENCRYPTED: '.$field->db_column); $asset->save(); - } - } // Handle the LDAP password if one is provided $setting = Setting::first(); - if ($setting->ldap_pword!='') { - $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword); - $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword); + if ($setting->ldap_pword != '') { + $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword); + $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword); $setting->save(); $this->warn('LDAP password has been re-encrypted.'); } - - } else { $this->info('This operation has been canceled. No changes have been made.'); } @@ -113,7 +104,6 @@ class RotateAppKey extends Command */ protected function writeNewEnvironmentFileWith($key) { - file_put_contents($this->laravel->environmentFilePath(), preg_replace( $this->keyReplacementPattern(), 'APP_KEY='.$key, @@ -129,7 +119,7 @@ class RotateAppKey extends Command protected function keyReplacementPattern() { $escaped = preg_quote('='.$this->laravel['config']['app.key'], '/'); + return "/^APP_KEY{$escaped}/m"; } - } diff --git a/app/Console/Commands/SendCurrentInventoryToUsers.php b/app/Console/Commands/SendCurrentInventoryToUsers.php index 9f1fe0f761..74acc9cc0f 100644 --- a/app/Console/Commands/SendCurrentInventoryToUsers.php +++ b/app/Console/Commands/SendCurrentInventoryToUsers.php @@ -39,22 +39,16 @@ class SendCurrentInventoryToUsers extends Command */ public function handle() { - $users = User::whereNull('deleted_at')->whereNotNull('email')->with('assets', 'accessories', 'licenses')->get(); $count = 0; foreach ($users as $user) { - - if (($user->assets->count() > 0) || ($user->accessories->count() > 0) || ($user->licenses->count() > 0)) - { + if (($user->assets->count() > 0) || ($user->accessories->count() > 0) || ($user->licenses->count() > 0)) { $count++; $user->notify((new CurrentInventory($user))); } - } $this->info($count.' users notified.'); - - } } diff --git a/app/Console/Commands/SendExpectedCheckinAlerts.php b/app/Console/Commands/SendExpectedCheckinAlerts.php index b0cbb1f518..83a93a8a6b 100644 --- a/app/Console/Commands/SendExpectedCheckinAlerts.php +++ b/app/Console/Commands/SendExpectedCheckinAlerts.php @@ -3,12 +3,12 @@ namespace App\Console\Commands; use App\Models\Asset; +use App\Models\Recipients\AlertRecipient; use App\Models\Setting; use App\Notifications\ExpectedCheckinAdminNotification; use App\Notifications\ExpectedCheckinNotification; use Carbon\Carbon; use Illuminate\Console\Command; -use App\Models\Recipients\AlertRecipient; class SendExpectedCheckinAlerts extends Command { @@ -41,12 +41,12 @@ class SendExpectedCheckinAlerts extends Command */ public function handle() { - $settings = Setting::getSettings(); + $settings = Setting::getSettings(); $whenNotify = Carbon::now()->addDays(7); - $assets = Asset::with('assignedTo')->whereNotNull('assigned_to')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get(); + $assets = Asset::with('assignedTo')->whereNotNull('assigned_to')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get(); - $this->info($whenNotify . ' is deadline'); - $this->info($assets->count() . ' assets'); + $this->info($whenNotify.' is deadline'); + $this->info($assets->count().' assets'); foreach ($assets as $asset) { if ($asset->assigned && $asset->checkedOutToUser()) { diff --git a/app/Console/Commands/SendExpirationAlerts.php b/app/Console/Commands/SendExpirationAlerts.php index f88c345669..025ba2ce23 100644 --- a/app/Console/Commands/SendExpirationAlerts.php +++ b/app/Console/Commands/SendExpirationAlerts.php @@ -41,7 +41,7 @@ class SendExpirationAlerts extends Command */ public function handle() { - $settings = Setting::getSettings(); + $settings = Setting::getSettings(); $threshold = $settings->alert_interval; if (($settings->alert_email != '') && ($settings->alerts_enabled == 1)) { diff --git a/app/Console/Commands/SendUpcomingAuditReport.php b/app/Console/Commands/SendUpcomingAuditReport.php index bac5a21698..e9cba106c6 100644 --- a/app/Console/Commands/SendUpcomingAuditReport.php +++ b/app/Console/Commands/SendUpcomingAuditReport.php @@ -4,13 +4,13 @@ namespace App\Console\Commands; use App\Models\Asset; use App\Models\License; +use App\Models\Recipients; use App\Models\Setting; use App\Notifications\ExpiringAssetsNotification; -use App\Models\Recipients; -use DB; -use Illuminate\Console\Command; use App\Notifications\SendUpcomingAuditNotification; use Carbon\Carbon; +use DB; +use Illuminate\Console\Command; class SendUpcomingAuditReport extends Command { @@ -54,7 +54,6 @@ class SendUpcomingAuditReport extends Command return new \App\Models\Recipients\AlertRecipient($item); }); - // Assets due for auditing $assets = Asset::whereNotNull('next_audit_date') @@ -62,7 +61,6 @@ class SendUpcomingAuditReport extends Command ->orderBy('last_audit_date', 'asc')->get(); if ($assets->count() > 0) { - $this->info(trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count(), 'threshold' => $settings->audit_warning_days])); \Notification::send($recipients, new SendUpcomingAuditNotification($assets, $settings->audit_warning_days)); @@ -70,14 +68,11 @@ class SendUpcomingAuditReport extends Command } else { $this->info('No assets to be audited. No report sent.'); } - - - - } elseif ($settings->alert_email=='') { + } elseif ($settings->alert_email == '') { $this->error('Could not send email. No alert email configured in settings'); - } elseif (!$settings->audit_warning_days) { + } elseif (! $settings->audit_warning_days) { $this->error('No audit warning days set in Admin Notifications. No mail will be sent.'); - } elseif ($settings->alerts_enabled!=1) { + } elseif ($settings->alerts_enabled != 1) { $this->info('Alerts are disabled in the settings. No mail will be sent'); } else { $this->error('Something went wrong. :( '); @@ -85,7 +80,5 @@ class SendUpcomingAuditReport extends Command $this->error('Admin Audit Warning Setting: '.$settings->audit_warning_days); $this->error('Admin Alerts Emnabled: '.$settings->alerts_enabled); } - - } } diff --git a/app/Console/Commands/SyncAssetCounters.php b/app/Console/Commands/SyncAssetCounters.php index 33104818e1..ab88168218 100644 --- a/app/Console/Commands/SyncAssetCounters.php +++ b/app/Console/Commands/SyncAssetCounters.php @@ -45,14 +45,14 @@ class SyncAssetCounters extends Command if ($assets) { if ($assets->count() > 0) { $bar = $this->output->createProgressBar($assets->count()); - + foreach ($assets as $asset) { $asset->checkin_counter = (int) $asset->checkins_count; $asset->checkout_counter = (int) $asset->checkouts_count; $asset->requests_counter = (int) $asset->user_requests_count; $asset->unsetEventDispatcher(); $asset->save(); - $output['info'][] = 'Asset: ' . $asset->id . ' has ' . $asset->checkin_counter . ' checkins, ' . $asset->checkout_counter . ' checkouts, and ' . $asset->requests_counter . ' requests'; + $output['info'][] = 'Asset: '.$asset->id.' has '.$asset->checkin_counter.' checkins, '.$asset->checkout_counter.' checkouts, and '.$asset->requests_counter.' requests'; $bar->advance(); } $bar->finish(); @@ -62,15 +62,10 @@ class SyncAssetCounters extends Command } $time_elapsed_secs = microtime(true) - $start; - $this->info('Sync executed in ' . $time_elapsed_secs . ' seconds'); - + $this->info('Sync executed in '.$time_elapsed_secs.' seconds'); } else { $this->info('No assets to sync'); } - } - - - } } diff --git a/app/Console/Commands/SyncAssetLocations.php b/app/Console/Commands/SyncAssetLocations.php index b5d3cd33e0..e7aae9991e 100644 --- a/app/Console/Commands/SyncAssetLocations.php +++ b/app/Console/Commands/SyncAssetLocations.php @@ -38,7 +38,6 @@ class SyncAssetLocations extends Command */ public function handle() { - $output['info'] = []; $output['warn'] = []; $output['error'] = []; @@ -51,96 +50,89 @@ class SyncAssetLocations extends Command $output['info'][] = 'There are '.$rtd_assets->count().' unassigned assets.'; foreach ($rtd_assets as $rtd_asset) { - $output['info'][] = 'Setting Unassigned Asset ' . $rtd_asset->id . ' ('.$rtd_asset->asset_tag.') to location: ' . $rtd_asset->rtd_location_id . " because their default location is: " . $rtd_asset->rtd_location_id; - $rtd_asset->location_id=$rtd_asset->rtd_location_id; + $output['info'][] = 'Setting Unassigned Asset '.$rtd_asset->id.' ('.$rtd_asset->asset_tag.') to location: '.$rtd_asset->rtd_location_id.' because their default location is: '.$rtd_asset->rtd_location_id; + $rtd_asset->location_id = $rtd_asset->rtd_location_id; $rtd_asset->unsetEventDispatcher(); $rtd_asset->save(); $bar->advance(); } - $assigned_user_assets = Asset::where('assigned_type','App\Models\User')->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); + $assigned_user_assets = Asset::where('assigned_type', 'App\Models\User')->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $output['info'][] = 'There are '.$assigned_user_assets->count().' assets checked out to users.'; foreach ($assigned_user_assets as $assigned_user_asset) { if (($assigned_user_asset->assignedTo) && ($assigned_user_asset->assignedTo->userLoc)) { $new_location = $assigned_user_asset->assignedTo->userLoc->id; - $output['info'][] ='Setting User Asset ' . $assigned_user_asset->id . ' ('.$assigned_user_asset->asset_tag.') to ' . $assigned_user_asset->assignedTo->userLoc->name . ' which is id: ' . $new_location; + $output['info'][] = 'Setting User Asset '.$assigned_user_asset->id.' ('.$assigned_user_asset->asset_tag.') to '.$assigned_user_asset->assignedTo->userLoc->name.' which is id: '.$new_location; } else { - $output['warn'][] ='Asset ' . $assigned_user_asset->id . ' ('.$assigned_user_asset->asset_tag.') still has no location! '; + $output['warn'][] = 'Asset '.$assigned_user_asset->id.' ('.$assigned_user_asset->asset_tag.') still has no location! '; $new_location = $assigned_user_asset->rtd_location_id; } - $assigned_user_asset->location_id=$new_location; + $assigned_user_asset->location_id = $new_location; $assigned_user_asset->unsetEventDispatcher(); $assigned_user_asset->save(); $bar->advance(); - } - $assigned_location_assets = Asset::where('assigned_type','App\Models\Location') + $assigned_location_assets = Asset::where('assigned_type', 'App\Models\Location') ->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $output['info'][] = 'There are '.$assigned_location_assets->count().' assets checked out to locations.'; foreach ($assigned_location_assets as $assigned_location_asset) { if ($assigned_location_asset->assignedTo) { $assigned_location_asset->location_id = $assigned_location_asset->assignedTo->id; - $output['info'][] ='Setting Location Assigned asset ' . $assigned_location_asset->id . ' ('.$assigned_location_asset->asset_tag.') that is checked out to '.$assigned_location_asset->assignedTo->name.' (#'.$assigned_location_asset->assignedTo->id.') to location: ' . $assigned_location_asset->assetLoc()->id; + $output['info'][] = 'Setting Location Assigned asset '.$assigned_location_asset->id.' ('.$assigned_location_asset->asset_tag.') that is checked out to '.$assigned_location_asset->assignedTo->name.' (#'.$assigned_location_asset->assignedTo->id.') to location: '.$assigned_location_asset->assetLoc()->id; $assigned_location_asset->unsetEventDispatcher(); $assigned_location_asset->save(); } else { - $output['warn'][] ='Asset ' . $assigned_location_asset->id . ' ('.$assigned_location_asset->asset_tag.') did not return a valid associated location - perhaps it was deleted?'; + $output['warn'][] = 'Asset '.$assigned_location_asset->id.' ('.$assigned_location_asset->asset_tag.') did not return a valid associated location - perhaps it was deleted?'; } $bar->advance(); - } - // Assigned to assets - $assigned_asset_assets = Asset::where('assigned_type','App\Models\Asset') + $assigned_asset_assets = Asset::where('assigned_type', 'App\Models\Asset') ->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); - $output['info'][] ='Asset-assigned assets: '.$assigned_asset_assets->count(); + $output['info'][] = 'Asset-assigned assets: '.$assigned_asset_assets->count(); - foreach ($assigned_asset_assets as $assigned_asset_asset) { + foreach ($assigned_asset_assets as $assigned_asset_asset) { // Check to make sure there aren't any invalid relationships - if ($assigned_asset_asset->assetLoc()) { - $assigned_asset_asset->location_id = $assigned_asset_asset->assetLoc()->id; - $output['info'][] ='Setting Asset Assigned asset ' . $assigned_asset_asset->assetLoc()->id. ' ('.$assigned_asset_asset->asset_tag.') location to: ' . $assigned_asset_asset->assetLoc()->id; - $assigned_asset_asset->unsetEventDispatcher(); - $assigned_asset_asset->save(); - } else { - $output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location'; - } - - $bar->advance(); - + if ($assigned_asset_asset->assetLoc()) { + $assigned_asset_asset->location_id = $assigned_asset_asset->assetLoc()->id; + $output['info'][] = 'Setting Asset Assigned asset '.$assigned_asset_asset->assetLoc()->id.' ('.$assigned_asset_asset->asset_tag.') location to: '.$assigned_asset_asset->assetLoc()->id; + $assigned_asset_asset->unsetEventDispatcher(); + $assigned_asset_asset->save(); + } else { + $output['warn'][] = 'Asset Assigned asset '.$assigned_asset_asset->id.' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location'; } - $unlocated_assets = Asset::whereNull("location_id")->whereNull('deleted_at')->get(); - $output['info'][] ='Assets still without a location: '.$unlocated_assets->count(); - foreach($unlocated_assets as $unlocated_asset) { - $output['warn'][] ='Asset: '.$unlocated_asset->id.' still has no location. '; + $bar->advance(); + } + + $unlocated_assets = Asset::whereNull('location_id')->whereNull('deleted_at')->get(); + $output['info'][] = 'Assets still without a location: '.$unlocated_assets->count(); + foreach ($unlocated_assets as $unlocated_asset) { + $output['warn'][] = 'Asset: '.$unlocated_asset->id.' still has no location. '; $bar->advance(); } $bar->finish(); $this->info("\n"); - - if (($this->option('output')=='all') || ($this->option('output')=='info')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'info')) { foreach ($output['info'] as $key => $output_text) { $this->info($output_text); } } - if (($this->option('output')=='all') || ($this->option('output')=='warn')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'warn')) { foreach ($output['warn'] as $key => $output_text) { $this->warn($output_text); } } - if (($this->option('output')=='all') || ($this->option('output')=='error')) { + if (($this->option('output') == 'all') || ($this->option('output') == 'error')) { foreach ($output['error'] as $key => $output_text) { $this->error($output_text); } } - - } } diff --git a/app/Console/Commands/SystemBackup.php b/app/Console/Commands/SystemBackup.php index 2e4965c28b..b7ca526052 100644 --- a/app/Console/Commands/SystemBackup.php +++ b/app/Console/Commands/SystemBackup.php @@ -6,7 +6,6 @@ use Illuminate\Console\Command; class SystemBackup extends Command { - /** * The console command name. * @@ -40,6 +39,5 @@ class SystemBackup extends Command { // $this->call('backup:run'); - } } diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.php index e73b6aae5e..0a10f4f541 100644 --- a/app/Console/Commands/Version.php +++ b/app/Console/Commands/Version.php @@ -37,7 +37,6 @@ class Version extends Command */ public function handle() { - $use_branch = $this->option('branch'); $use_type = $this->option('type'); $git_branch = trim(shell_exec('git rev-parse --abbrev-ref HEAD')); @@ -54,72 +53,66 @@ class Version extends Command $this->line('Type is: '.$use_type); $this->line('Current version is: '.$full_hash_version); - if (count($version)==3) { + if (count($version) == 3) { $this->line('This does not look like an alpha/beta release.'); } else { - if (array_key_exists('3',$version)) { + if (array_key_exists('3', $version)) { $this->line('The current version looks like a beta release.'); $prerelease_version = $version[1]; $hash_version = $version[3]; } } - $app_version_raw = explode('.', $app_version); $maj = str_replace('v', '', $app_version_raw[0]); $min = $app_version_raw[1]; $patch = ''; - - // This is a major release that might not have a third .0 if (array_key_exists(2, $app_version_raw)) { $patch = $app_version_raw[2]; } - if ($use_type=='major') { - $app_version = "v".($maj + 1).".$min.$patch"; - } elseif ($use_type=='minor') { - $app_version = "v"."$maj.".($min + 1).".$patch"; - } elseif ($use_type=='pre') { - $pre_raw = str_replace('beta','', $prerelease_version); - $pre_raw = str_replace('alpha','', $pre_raw); - $pre_raw = str_ireplace('rc','', $pre_raw); + if ($use_type == 'major') { + $app_version = 'v'.($maj + 1).".$min.$patch"; + } elseif ($use_type == 'minor') { + $app_version = 'v'."$maj.".($min + 1).".$patch"; + } elseif ($use_type == 'pre') { + $pre_raw = str_replace('beta', '', $prerelease_version); + $pre_raw = str_replace('alpha', '', $pre_raw); + $pre_raw = str_ireplace('rc', '', $pre_raw); $pre_raw = $pre_raw++; - $this->line('Setting the pre-release to '. $prerelease_version.'-'.$pre_raw); - $app_version = "v"."$maj.".($min + 1).".$patch"; - } elseif ($use_type=='patch') { - $app_version = "v" . "$maj.$min." . ($patch + 1); + $this->line('Setting the pre-release to '.$prerelease_version.'-'.$pre_raw); + $app_version = 'v'."$maj.".($min + 1).".$patch"; + } elseif ($use_type == 'patch') { + $app_version = 'v'."$maj.$min.".($patch + 1); // If nothing is passed, leave the version as it is, just increment the build } else { - $app_version = "v" . "$maj.$min." . $patch; + $app_version = 'v'."$maj.$min.".$patch; } // Determine if this tag already exists, or if this prior to a release $this->line('Running: git rev-parse master '.$current_app_version); // $pre_release = trim(shell_exec('git rev-parse '.$use_branch.' '.$current_app_version.' 2>&1 1> /dev/null')); - if ($use_branch=='develop') { + if ($use_branch == 'develop') { $app_version = $app_version.'-pre'; } $full_app_version = $app_version.' - build '.$build_version.'-'.$hash_version; - $array = var_export( - array( + [ 'app_version' => $app_version, 'full_app_version' => $full_app_version, 'build_version' => $build_version, 'prerelease_version' => $prerelease_version, 'hash_version' => $hash_version, 'full_hash' => $full_hash_version, - 'branch' => $git_branch), + 'branch' => $git_branch, ], true ); - - // Construct our file content $content = <<info('Setting NEW version: '. $full_app_version.' ('.$git_branch.')'); + $this->info('Setting NEW version: '.$full_app_version.' ('.$git_branch.')'); } - } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 1dcac211b2..9a5294c2d2 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -10,7 +10,6 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel; class Kernel extends ConsoleKernel { - /** * Define the application's command schedule. * diff --git a/app/Events/CheckoutAccepted.php b/app/Events/CheckoutAccepted.php index 5146b32ee9..cd5ee19776 100644 --- a/app/Events/CheckoutAccepted.php +++ b/app/Events/CheckoutAccepted.php @@ -18,6 +18,6 @@ class CheckoutAccepted */ public function __construct(CheckoutAcceptance $acceptance) { - $this->acceptance = $acceptance; + $this->acceptance = $acceptance; } } diff --git a/app/Events/CheckoutDeclined.php b/app/Events/CheckoutDeclined.php index 44f399423f..01d84b30f3 100644 --- a/app/Events/CheckoutDeclined.php +++ b/app/Events/CheckoutDeclined.php @@ -10,7 +10,7 @@ use Illuminate\Queue\SerializesModels; class CheckoutDeclined { use Dispatchable, SerializesModels; - + /** * Create a new event instance. * @@ -18,6 +18,6 @@ class CheckoutDeclined */ public function __construct(CheckoutAcceptance $acceptance) { - $this->acceptance = $acceptance; + $this->acceptance = $acceptance; } } diff --git a/app/Events/CheckoutableCheckedIn.php b/app/Events/CheckoutableCheckedIn.php index 54e3db6abc..9609f7d415 100644 --- a/app/Events/CheckoutableCheckedIn.php +++ b/app/Events/CheckoutableCheckedIn.php @@ -25,8 +25,8 @@ class CheckoutableCheckedIn { $this->checkoutable = $checkoutable; $this->checkedOutTo = $checkedOutTo; - $this->checkedInBy = $checkedInBy; - $this->note = $note; - $this->action_date = $action_date ?? date('Y-m-d'); + $this->checkedInBy = $checkedInBy; + $this->note = $note; + $this->action_date = $action_date ?? date('Y-m-d'); } } diff --git a/app/Events/CheckoutableCheckedOut.php b/app/Events/CheckoutableCheckedOut.php index 5e6ffd243a..30f70ca0d8 100644 --- a/app/Events/CheckoutableCheckedOut.php +++ b/app/Events/CheckoutableCheckedOut.php @@ -25,6 +25,6 @@ class CheckoutableCheckedOut $this->checkoutable = $checkoutable; $this->checkedOutTo = $checkedOutTo; $this->checkedOutBy = $checkedOutBy; - $this->note = $note; + $this->note = $note; } } diff --git a/app/Exceptions/CheckoutNotAllowed.php b/app/Exceptions/CheckoutNotAllowed.php index 6fe2c1d484..172f072aee 100644 --- a/app/Exceptions/CheckoutNotAllowed.php +++ b/app/Exceptions/CheckoutNotAllowed.php @@ -6,17 +6,17 @@ use Exception; class CheckoutNotAllowed extends Exception { - private $errorMessage; - function __construct($errorMessage = null) + public function __construct($errorMessage = null) { $this->errorMessage = $errorMessage; parent::__construct($errorMessage); } + public function __toString() { - return is_null($this->errorMessage) ? "A checkout is not allowed under these circumstances" : $this->errorMessage; + return is_null($this->errorMessage) ? 'A checkout is not allowed under these circumstances' : $this->errorMessage; } } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index de890d3e4d..ccb9d57c11 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,14 +2,13 @@ namespace App\Exceptions; +use App\Helpers\Helper; use Exception; use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use App\Helpers\Helper; use Illuminate\Validation\ValidationException; use Log; - class Handler extends ExceptionHandler { /** @@ -40,6 +39,7 @@ class Handler extends ExceptionHandler { if ($this->shouldReport($exception)) { \Log::error($exception); + return parent::report($exception); } } @@ -54,28 +54,25 @@ class Handler extends ExceptionHandler public function render($request, Exception $e) { - // CSRF token mismatch error if ($e instanceof \Illuminate\Session\TokenMismatchException) { return redirect()->back()->with('error', trans('general.token_expired')); } - // Handle Ajax requests that fail because the model doesn't exist if ($request->ajax() || $request->wantsJson()) { - if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) { $className = last(explode('\\', $e->getModel())); - return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200); + + return response()->json(Helper::formatStandardApiResponse('error', null, $className.' not found'), 200); } if ($this->isHttpException($e)) { - $statusCode = $e->getStatusCode(); switch ($e->getStatusCode()) { case '404': - return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404); + return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode.' endpoint not found'), 404); case '405': return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405); default: @@ -85,15 +82,13 @@ class Handler extends ExceptionHandler } } - - if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) { + if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404')) { return response()->view('layouts/basic', [ - 'content' => view('errors/404') - ],$statusCode); + 'content' => view('errors/404'), + ], $statusCode); } return parent::render($request, $e); - } /** diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index b950064988..b165707b17 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1,4 +1,5 @@ ] * @since [v2.0] - * @return String + * @return string */ public static function parseEscapedMarkedown($str) { @@ -33,7 +32,6 @@ class Helper } } - /** * The importer has formatted number strings since v3, * so the value might be a string, or an integer. @@ -41,7 +39,7 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.0] - * @return String + * @return string */ public static function formatCurrencyOutput($cost) { @@ -52,289 +50,285 @@ class Helper return $cost; } - /** * Static colors for pie charts. * * @author [A. Gianotto] [] * @since [v3.3] - * @return Array + * @return array */ public static function defaultChartColors($index = 0) { $colors = [ - "#008941", - "#FF4A46", - "#006FA6", - "#A30059", - "#1CE6FF", - "#FFDBE5", - "#7A4900", - "#0000A6", - "#63FFAC", - "#B79762", - "#004D43", - "#8FB0FF", - "#997D87", - "#5A0007", - "#809693", - "#FEFFE6", - "#1B4400", - "#4FC601", - "#3B5DFF", - "#4A3B53", - "#FF2F80", - "#61615A", - "#BA0900", - "#6B7900", - "#00C2A0", - "#FFAA92", - "#FF90C9", - "#B903AA", - "#D16100", - "#DDEFFF", - "#000035", - "#7B4F4B", - "#A1C299", - "#300018", - "#0AA6D8", - "#013349", - "#00846F", - "#372101", - "#FFB500", - "#C2FFED", - "#A079BF", - "#CC0744", - "#C0B9B2", - "#C2FF99", - "#001E09", - "#00489C", - "#6F0062", - "#0CBD66", - "#EEC3FF", - "#456D75", - "#B77B68", - "#7A87A1", - "#788D66", - "#885578", - "#FAD09F", - "#FF8A9A", - "#D157A0", - "#BEC459", - "#456648", - "#0086ED", - "#886F4C", - "#34362D", - "#B4A8BD", - "#00A6AA", - "#452C2C", - "#636375", - "#A3C8C9", - "#FF913F", - "#938A81", - "#575329", - "#00FECF", - "#B05B6F", - "#8CD0FF", - "#3B9700", - "#04F757", - "#C8A1A1", - "#1E6E00", - "#7900D7", - "#A77500", - "#6367A9", - "#A05837", - "#6B002C", - "#772600", - "#D790FF", - "#9B9700", - "#549E79", - "#FFF69F", - "#201625", - "#72418F", - "#BC23FF", - "#99ADC0", - "#3A2465", - "#922329", - "#5B4534", - "#FDE8DC", - "#404E55", - "#0089A3", - "#CB7E98", - "#A4E804", - "#324E72", - "#6A3A4C", - "#83AB58", - "#001C1E", - "#D1F7CE", - "#004B28", - "#C8D0F6", - "#A3A489", - "#806C66", - "#222800", - "#BF5650", - "#E83000", - "#66796D", - "#DA007C", - "#FF1A59", - "#8ADBB4", - "#1E0200", - "#5B4E51", - "#C895C5", - "#320033", - "#FF6832", - "#66E1D3", - "#CFCDAC", - "#D0AC94", - "#7ED379", - "#012C58", - "#7A7BFF", - "#D68E01", - "#353339", - "#78AFA1", - "#FEB2C6", - "#75797C", - "#837393", - "#943A4D", - "#B5F4FF", - "#D2DCD5", - "#9556BD", - "#6A714A", - "#001325", - "#02525F", - "#0AA3F7", - "#E98176", - "#DBD5DD", - "#5EBCD1", - "#3D4F44", - "#7E6405", - "#02684E", - "#962B75", - "#8D8546", - "#9695C5", - "#E773CE", - "#D86A78", - "#3E89BE", - "#CA834E", - "#518A87", - "#5B113C", - "#55813B", - "#E704C4", - "#00005F", - "#A97399", - "#4B8160", - "#59738A", - "#FF5DA7", - "#F7C9BF", - "#643127", - "#513A01", - "#6B94AA", - "#51A058", - "#A45B02", - "#1D1702", - "#E20027", - "#E7AB63", - "#4C6001", - "#9C6966", - "#64547B", - "#97979E", - "#006A66", - "#391406", - "#F4D749", - "#0045D2", - "#006C31", - "#DDB6D0", - "#7C6571", - "#9FB2A4", - "#00D891", - "#15A08A", - "#BC65E9", - "#FFFFFE", - "#C6DC99", - "#203B3C", - "#671190", - "#6B3A64", - "#F5E1FF", - "#FFA0F2", - "#CCAA35", - "#374527", - "#8BB400", - "#797868", - "#C6005A", - "#3B000A", - "#C86240", - "#29607C", - "#402334", - "#7D5A44", - "#CCB87C", - "#B88183", - "#AA5199", - "#B5D6C3", - "#A38469", - "#9F94F0", - "#A74571", - "#B894A6", - "#71BB8C", - "#00B433", - "#789EC9", - "#6D80BA", - "#953F00", - "#5EFF03", - "#E4FFFC", - "#1BE177", - "#BCB1E5", - "#76912F", - "#003109", - "#0060CD", - "#D20096", - "#895563", - "#29201D", - "#5B3213", - "#A76F42", - "#89412E", - "#1A3A2A", - "#494B5A", - "#A88C85", - "#F4ABAA", - "#A3F3AB", - "#00C6C8", - "#EA8B66", - "#958A9F", - "#BDC9D2", - "#9FA064", - "#BE4700", - "#658188", - "#83A485", - "#453C23", - "#47675D", - "#3A3F00", - "#061203", - "#DFFB71", - "#868E7E", - "#98D058", - "#6C8F7D", - "#D7BFC2", - "#3C3E6E", - "#D83D66", - "#2F5D9B", - "#6C5E46", - "#D25B88", - "#5B656C", - "#00B57F", - "#545C46", - "#866097", - "#365D25", - "#252F99", - "#00CCFF", - "#674E60", - "#FC009C", - "#92896B", + '#008941', + '#FF4A46', + '#006FA6', + '#A30059', + '#1CE6FF', + '#FFDBE5', + '#7A4900', + '#0000A6', + '#63FFAC', + '#B79762', + '#004D43', + '#8FB0FF', + '#997D87', + '#5A0007', + '#809693', + '#FEFFE6', + '#1B4400', + '#4FC601', + '#3B5DFF', + '#4A3B53', + '#FF2F80', + '#61615A', + '#BA0900', + '#6B7900', + '#00C2A0', + '#FFAA92', + '#FF90C9', + '#B903AA', + '#D16100', + '#DDEFFF', + '#000035', + '#7B4F4B', + '#A1C299', + '#300018', + '#0AA6D8', + '#013349', + '#00846F', + '#372101', + '#FFB500', + '#C2FFED', + '#A079BF', + '#CC0744', + '#C0B9B2', + '#C2FF99', + '#001E09', + '#00489C', + '#6F0062', + '#0CBD66', + '#EEC3FF', + '#456D75', + '#B77B68', + '#7A87A1', + '#788D66', + '#885578', + '#FAD09F', + '#FF8A9A', + '#D157A0', + '#BEC459', + '#456648', + '#0086ED', + '#886F4C', + '#34362D', + '#B4A8BD', + '#00A6AA', + '#452C2C', + '#636375', + '#A3C8C9', + '#FF913F', + '#938A81', + '#575329', + '#00FECF', + '#B05B6F', + '#8CD0FF', + '#3B9700', + '#04F757', + '#C8A1A1', + '#1E6E00', + '#7900D7', + '#A77500', + '#6367A9', + '#A05837', + '#6B002C', + '#772600', + '#D790FF', + '#9B9700', + '#549E79', + '#FFF69F', + '#201625', + '#72418F', + '#BC23FF', + '#99ADC0', + '#3A2465', + '#922329', + '#5B4534', + '#FDE8DC', + '#404E55', + '#0089A3', + '#CB7E98', + '#A4E804', + '#324E72', + '#6A3A4C', + '#83AB58', + '#001C1E', + '#D1F7CE', + '#004B28', + '#C8D0F6', + '#A3A489', + '#806C66', + '#222800', + '#BF5650', + '#E83000', + '#66796D', + '#DA007C', + '#FF1A59', + '#8ADBB4', + '#1E0200', + '#5B4E51', + '#C895C5', + '#320033', + '#FF6832', + '#66E1D3', + '#CFCDAC', + '#D0AC94', + '#7ED379', + '#012C58', + '#7A7BFF', + '#D68E01', + '#353339', + '#78AFA1', + '#FEB2C6', + '#75797C', + '#837393', + '#943A4D', + '#B5F4FF', + '#D2DCD5', + '#9556BD', + '#6A714A', + '#001325', + '#02525F', + '#0AA3F7', + '#E98176', + '#DBD5DD', + '#5EBCD1', + '#3D4F44', + '#7E6405', + '#02684E', + '#962B75', + '#8D8546', + '#9695C5', + '#E773CE', + '#D86A78', + '#3E89BE', + '#CA834E', + '#518A87', + '#5B113C', + '#55813B', + '#E704C4', + '#00005F', + '#A97399', + '#4B8160', + '#59738A', + '#FF5DA7', + '#F7C9BF', + '#643127', + '#513A01', + '#6B94AA', + '#51A058', + '#A45B02', + '#1D1702', + '#E20027', + '#E7AB63', + '#4C6001', + '#9C6966', + '#64547B', + '#97979E', + '#006A66', + '#391406', + '#F4D749', + '#0045D2', + '#006C31', + '#DDB6D0', + '#7C6571', + '#9FB2A4', + '#00D891', + '#15A08A', + '#BC65E9', + '#FFFFFE', + '#C6DC99', + '#203B3C', + '#671190', + '#6B3A64', + '#F5E1FF', + '#FFA0F2', + '#CCAA35', + '#374527', + '#8BB400', + '#797868', + '#C6005A', + '#3B000A', + '#C86240', + '#29607C', + '#402334', + '#7D5A44', + '#CCB87C', + '#B88183', + '#AA5199', + '#B5D6C3', + '#A38469', + '#9F94F0', + '#A74571', + '#B894A6', + '#71BB8C', + '#00B433', + '#789EC9', + '#6D80BA', + '#953F00', + '#5EFF03', + '#E4FFFC', + '#1BE177', + '#BCB1E5', + '#76912F', + '#003109', + '#0060CD', + '#D20096', + '#895563', + '#29201D', + '#5B3213', + '#A76F42', + '#89412E', + '#1A3A2A', + '#494B5A', + '#A88C85', + '#F4ABAA', + '#A3F3AB', + '#00C6C8', + '#EA8B66', + '#958A9F', + '#BDC9D2', + '#9FA064', + '#BE4700', + '#658188', + '#83A485', + '#453C23', + '#47675D', + '#3A3F00', + '#061203', + '#DFFB71', + '#868E7E', + '#98D058', + '#6C8F7D', + '#D7BFC2', + '#3C3E6E', + '#D83D66', + '#2F5D9B', + '#6C5E46', + '#D25B88', + '#5B656C', + '#00B57F', + '#545C46', + '#866097', + '#365D25', + '#252F99', + '#00CCFF', + '#674E60', + '#FC009C', + '#92896B', ]; - - return $colors[$index]; - } /** @@ -345,33 +339,33 @@ class Helper * * @return string */ - public static function adjustBrightness($hexCode, $adjustPercent) { + public static function adjustBrightness($hexCode, $adjustPercent) + { $hexCode = ltrim($hexCode, '#'); if (strlen($hexCode) == 3) { - $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2]; + $hexCode = $hexCode[0].$hexCode[0].$hexCode[1].$hexCode[1].$hexCode[2].$hexCode[2]; } $hexCode = array_map('hexdec', str_split($hexCode, 2)); - foreach ($hexCode as & $color) { + foreach ($hexCode as &$color) { $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color; $adjustAmount = ceil($adjustableLimit * $adjustPercent); $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT); } - return '#' . implode($hexCode); + return '#'.implode($hexCode); } - /** * Static background (highlight) colors for pie charts * This is inelegant, and could be refactored later. * * @author [A. Gianotto] [] * @since [v3.2] - * @return Array + * @return array */ public static function chartBackgroundColors() { @@ -387,22 +381,22 @@ class Helper '#3c8dbc', ]; + return $colors; } - /** * Format currency using comma for thousands until local info is property used. * * @author [A. Gianotto] [] * @since [v2.7] - * @return String + * @return string */ public static function ParseFloat($floatString) { $LocaleInfo = localeconv(); - $floatString = str_replace(",", "", $floatString); - $floatString = str_replace($LocaleInfo["decimal_point"], ".", $floatString); + $floatString = str_replace(',', '', $floatString); + $floatString = str_replace($LocaleInfo['decimal_point'], '.', $floatString); // Strip Currency symbol // If no currency symbol is set, default to $ because Murica $currencySymbol = $LocaleInfo['currency_symbol']; @@ -411,6 +405,7 @@ class Helper } $floatString = str_replace($currencySymbol, '', $floatString); + return floatval($floatString); } @@ -419,12 +414,13 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function statusLabelList() { - $statuslabel_list = array('' => trans('general.select_statuslabel')) + Statuslabel::orderBy('default_label', 'desc')->orderBy('name','asc')->orderBy('deployable','desc') + $statuslabel_list = ['' => trans('general.select_statuslabel')] + Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('deployable', 'desc') ->pluck('name', 'id')->toArray(); + return $statuslabel_list; } @@ -437,14 +433,15 @@ class Helper * * @author [A. Gianotto] [] * @since [v5.1.0] - * @return Array + * @return array */ public static function deployableStatusLabelList() { - $statuslabel_list = Statuslabel::where('deployable', '=', '1')->orderBy('default_label', 'desc') - ->orderBy('name','asc') - ->orderBy('deployable','desc') + $statuslabel_list = Statuslabel::where('deployable', '=', '1')->orderBy('default_label', 'desc') + ->orderBy('name', 'asc') + ->orderBy('deployable', 'desc') ->pluck('name', 'id')->toArray(); + return $statuslabel_list; } @@ -453,16 +450,17 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function statusTypeList() { $statuslabel_types = - array('' => trans('admin/hardware/form.select_statustype')) - + array('deployable' => trans('admin/hardware/general.deployable')) - + array('pending' => trans('admin/hardware/general.pending')) - + array('undeployable' => trans('admin/hardware/general.undeployable')) - + array('archived' => trans('admin/hardware/general.archived')); + ['' => trans('admin/hardware/form.select_statustype')] + + ['deployable' => trans('admin/hardware/general.deployable')] + + ['pending' => trans('admin/hardware/general.pending')] + + ['undeployable' => trans('admin/hardware/general.undeployable')] + + ['archived' => trans('admin/hardware/general.archived')]; + return $statuslabel_types; } @@ -471,12 +469,13 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function depreciationList() { $depreciation_list = ['' => 'Do Not Depreciate'] + Depreciation::orderBy('name', 'asc') ->pluck('name', 'id')->toArray(); + return $depreciation_list; } @@ -485,18 +484,19 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function categoryTypeList() { - $category_types = array( + $category_types = [ '' => '', 'accessory' => 'Accessory', 'asset' => 'Asset', 'consumable' => 'Consumable', 'component' => 'Component', - 'license' => 'License' - ); + 'license' => 'License', + ]; + return $category_types; } @@ -505,11 +505,12 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function customFieldsetList() { - $customfields = array('' => trans('admin/models/general.no_custom_field')) + CustomFieldset::pluck('name', 'id')->toArray(); + $customfields = ['' => trans('admin/models/general.no_custom_field')] + CustomFieldset::pluck('name', 'id')->toArray(); + return $customfields; } @@ -518,7 +519,7 @@ class Helper * * @author [A. Gianotto] [] * @since [v3.4] - * @return Array + * @return array */ public static function predefined_formats() { @@ -533,7 +534,7 @@ class Helper * * @author [A. Gianotto] [] * @since [v3.3] - * @return Array + * @return array */ public static function barcodeDimensions($barcode_type = 'QRCODE') { @@ -547,6 +548,7 @@ class Helper $size['height'] = '-3'; $size['width'] = '-3'; } + return $size; } @@ -555,7 +557,7 @@ class Helper * * @author [A. Gianotto] [] * @since [v3.0] - * @return Array + * @return array */ public static function generateRandomString($length = 10) { @@ -565,17 +567,17 @@ class Helper for ($i = 0; $i < $length; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } + return $randomString; } - /** * This nasty little method gets the low inventory info for the * alert dropdown * * @author [A. Gianotto] [] * @since [v3.0] - * @return Array + * @return array */ public static function checkLowInventory() { @@ -584,7 +586,7 @@ class Helper $components = Component::withCount('assets as assets_count')->whereNotNull('min_amt')->get(); $avail_consumables = 0; - $items_array = array(); + $items_array = []; $all_count = 0; foreach ($consumables as $consumable) { @@ -601,17 +603,14 @@ class Helper $items_array[$all_count]['type'] = 'consumables'; $items_array[$all_count]['percent'] = $percent; $items_array[$all_count]['remaining'] = $avail; - $items_array[$all_count]['min_amt']=$consumable->min_amt; + $items_array[$all_count]['min_amt'] = $consumable->min_amt; $all_count++; } - - } foreach ($accessories as $accessory) { $avail = $accessory->qty - $accessory->users_count; if ($avail < ($accessory->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) { - if ($accessory->qty > 0) { $percent = number_format((($avail / $accessory->qty) * 100), 0); } else { @@ -623,10 +622,9 @@ class Helper $items_array[$all_count]['type'] = 'accessories'; $items_array[$all_count]['percent'] = $percent; $items_array[$all_count]['remaining'] = $avail; - $items_array[$all_count]['min_amt']=$accessory->min_amt; + $items_array[$all_count]['min_amt'] = $accessory->min_amt; $all_count++; } - } foreach ($components as $component) { @@ -643,27 +641,21 @@ class Helper $items_array[$all_count]['type'] = 'components'; $items_array[$all_count]['percent'] = $percent; $items_array[$all_count]['remaining'] = $avail; - $items_array[$all_count]['min_amt']=$component->min_amt; + $items_array[$all_count]['min_amt'] = $component->min_amt; $all_count++; } - } - - return $items_array; - - } - /** * Check if the file is an image, so we can show a preview * * @author [A. Gianotto] [] * @since [v3.0] * @param File $file - * @return String | Boolean + * @return string | Boolean */ public static function checkUploadIsImage($file) { @@ -671,7 +663,7 @@ class Helper $filetype = @finfo_file($finfo, $file); finfo_close($finfo); - if (($filetype=="image/jpeg") || ($filetype=="image/jpg") || ($filetype=="image/png") || ($filetype=="image/bmp") || ($filetype=="image/gif")) { + if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif')) { return $filetype; } @@ -693,21 +685,17 @@ class Helper * @param array $permissions * @param array $selected_arr * @since [v1.0] - * @return Array + * @return array */ - public static function selectedPermissionsArray($permissions, $selected_arr = array()) + public static function selectedPermissionsArray($permissions, $selected_arr = []) { - - - $permissions_arr = array(); + $permissions_arr = []; foreach ($permissions as $permission) { - for ($x = 0; $x < count($permission); $x++) { $permission_name = $permission[$x]['permission']; if ($permission[$x]['display'] === true) { - if ($selected_arr) { if (array_key_exists($permission_name, $selected_arr)) { $permissions_arr[$permission_name] = $selected_arr[$permission_name]; @@ -718,11 +706,7 @@ class Helper $permissions_arr[$permission_name] = '0'; } } - - } - - } return $permissions_arr; @@ -738,7 +722,7 @@ class Helper * * @author [A. Gianotto] [] * @since [v3.0] - * @return boolean + * @return bool */ public static function checkIfRequired($class, $field) { @@ -750,12 +734,10 @@ class Helper } else { return true; } - } } } - /** * Check to see if the given key exists in the array, and trim excess white space before returning it * @@ -769,9 +751,9 @@ class Helper public static function array_smart_fetch(array $array, $key, $default = '') { array_change_key_case($array, CASE_LOWER); - return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[ $key ])) : $default; - } + return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[$key])) : $default; + } /** * Gracefully handle decrypting encrypted fields (custom fields, etc). @@ -781,52 +763,47 @@ class Helper * @author A. Gianotto * @since 3.6 * @param CustomField $field - * @param String $string + * @param string $string * @return string */ public static function gracefulDecrypt(CustomField $field, $string) { - if ($field->isFieldDecryptable($string)) { - try { Crypt::decrypt($string); - return Crypt::decrypt($string); + return Crypt::decrypt($string); } catch (DecryptException $e) { return 'Error Decrypting: '.$e->getMessage(); } - } - return $string; + return $string; } - - - public static function formatStandardApiResponse($status, $payload = null, $messages = null) { - + public static function formatStandardApiResponse($status, $payload = null, $messages = null) + { $array['status'] = $status; $array['messages'] = $messages; - if (($messages) && (is_array($messages)) && (count($messages) > 0)) { + if (($messages) && (is_array($messages)) && (count($messages) > 0)) { $array['messages'] = $messages; } ($payload) ? $array['payload'] = $payload : $array['payload'] = null; + return $array; } - /* Possible solution for unicode fieldnames */ - public static function make_slug($string) { + public static function make_slug($string) + { return preg_replace('/\s+/u', '_', trim($string)); } - - public static function getFormattedDateObject($date, $type = 'datetime', $array = true) { - - if ($date=='') { + public static function getFormattedDateObject($date, $type = 'datetime', $array = true) + { + if ($date == '') { return null; } @@ -835,7 +812,7 @@ class Helper if ($type == 'datetime') { $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s'); - $dt['formatted'] = $tmp_date->format($settings->date_display_format .' '. $settings->time_display_format); + $dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format); } else { $dt['date'] = $tmp_date->format('Y-m-d'); $dt['formatted'] = $tmp_date->format($settings->date_display_format); @@ -844,28 +821,28 @@ class Helper if ($array == 'true') { return $dt; } + return $dt['formatted']; - } - // Nicked from Drupal :) // Returns a file size limit in bytes based on the PHP upload_max_filesize // and post_max_size - public static function file_upload_max_size() { + public static function file_upload_max_size() + { static $max_size = -1; if ($max_size < 0) { // Start with post_max_size. - $post_max_size = Helper::parse_size(ini_get('post_max_size')); + $post_max_size = self::parse_size(ini_get('post_max_size')); if ($post_max_size > 0) { $max_size = $post_max_size; } // If upload_max_size is less, then reduce. Except if upload_max_size is // zero, which indicates no limit. - $upload_max = Helper::parse_size(ini_get('upload_max_filesize')); + $upload_max = self::parse_size(ini_get('upload_max_filesize')); if ($upload_max > 0 && $upload_max < $max_size) { $max_size = $upload_max; } @@ -874,42 +851,43 @@ class Helper return $max_size; } - public static function file_upload_max_size_readable() { + public static function file_upload_max_size_readable() + { static $max_size = -1; if ($max_size < 0) { // Start with post_max_size. - $post_max_size = Helper::parse_size(ini_get('post_max_size')); + $post_max_size = self::parse_size(ini_get('post_max_size')); if ($post_max_size > 0) { $max_size = ini_get('post_max_size'); } // If upload_max_size is less, then reduce. Except if upload_max_size is // zero, which indicates no limit. - $upload_max = Helper::parse_size(ini_get('upload_max_filesize')); + $upload_max = self::parse_size(ini_get('upload_max_filesize')); if ($upload_max > 0 && $upload_max < $max_size) { $max_size = ini_get('upload_max_filesize'); } } + return $max_size; } - public static function parse_size($size) { + public static function parse_size($size) + { $unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size. $size = preg_replace('/[^0-9\.]/', '', $size); // Remove the non-numeric characters from the size. if ($unit) { // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by. return round($size * pow(1024, stripos('bkmgtpezy', $unit[0]))); - } - else { + } else { return round($size); } } - - public static function filetype_icon($filename) { - - $extension = substr(strrchr($filename,'.'),1); + public static function filetype_icon($filename) + { + $extension = substr(strrchr($filename, '.'), 1); $allowedExtensionMap = [ // Images @@ -938,12 +916,13 @@ class Helper if ($extension && array_key_exists($extension, $allowedExtensionMap)) { return $allowedExtensionMap[$extension]; } - return "fa fa-file-o"; + + return 'fa fa-file-o'; } - public static function show_file_inline($filename) { - - $extension = substr(strrchr($filename,'.'),1); + public static function show_file_inline($filename) + { + $extension = substr(strrchr($filename, '.'), 1); if ($extension) { switch ($extension) { @@ -957,6 +936,7 @@ class Helper return false; } } + return false; } @@ -971,7 +951,7 @@ class Helper */ public static function generateEncyrptedPassword(): string { - return bcrypt(Helper::generateUnencryptedPassword()); + return bcrypt(self::generateUnencryptedPassword()); } /** @@ -988,9 +968,10 @@ class Helper $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $password = ''; - for ( $i = 0; $i < 20; $i++ ) { - $password .= substr( $chars, random_int( 0, strlen( $chars ) - 1 ), 1 ); + for ($i = 0; $i < 20; $i++) { + $password .= substr($chars, random_int(0, strlen($chars) - 1), 1); } + return $password; } @@ -1001,7 +982,8 @@ class Helper * @param string $save_path path to a folder where the image should be saved * @return string path to uploaded image or false if something went wrong */ - public static function processUploadedImage(String $image_data, String $save_path) { + public static function processUploadedImage(String $image_data, String $save_path) + { if ($image_data == null || $save_path == null) { return false; } @@ -1010,15 +992,15 @@ class Helper // data:image/jpeg;base64,; This causes the image library to be unhappy, so we need to remove it. $header = explode(';', $image_data, 2)[0]; // Grab the image type from the header while we're at it. - $extension = substr($header, strpos($header, '/')+1); + $extension = substr($header, strpos($header, '/') + 1); // Start reading the image after the first comma, postceding the base64. - $image = substr($image_data, strpos($image_data, ',')+1); + $image = substr($image_data, strpos($image_data, ',') + 1); - $file_name = str_random(25).".".$extension; + $file_name = str_random(25).'.'.$extension; - $directory= public_path($save_path); + $directory = public_path($save_path); // Check if the uploads directory exists. If not, try to create it. - if (!file_exists($directory)) { + if (! file_exists($directory)) { mkdir($directory, 0755, true); } @@ -1035,5 +1017,4 @@ class Helper return $file_name; } - } diff --git a/app/Helpers/StorageHelper.php b/app/Helpers/StorageHelper.php index c5e084fa68..94dfe62c76 100644 --- a/app/Helpers/StorageHelper.php +++ b/app/Helpers/StorageHelper.php @@ -1,15 +1,17 @@ download(Storage::disk($disk)->path($filename)); //works for PRIVATE or public?! @@ -20,4 +22,4 @@ class StorageHelper return Storage::disk($disk)->download($filename); } } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index a96859d928..256634f891 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -1,4 +1,5 @@ authorize('index', Accessory::class); + return view('accessories/index'); } - /** * Returns a view with a form to create a new Accessory. * @@ -45,11 +46,11 @@ class AccessoriesController extends Controller { $this->authorize('create', Accessory::class); $category_type = 'accessory'; + return view('accessories/edit')->with('category_type', $category_type) ->with('item', new Accessory); } - /** * Validate and save new Accessory from form post * @@ -65,27 +66,28 @@ class AccessoriesController extends Controller $accessory = new Accessory(); // Update the accessory data - $accessory->name = request('name'); - $accessory->category_id = request('category_id'); - $accessory->location_id = request('location_id'); - $accessory->min_amt = request('min_amt'); - $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); - $accessory->order_number = request('order_number'); - $accessory->manufacturer_id = request('manufacturer_id'); - $accessory->model_number = request('model_number'); - $accessory->purchase_date = request('purchase_date'); - $accessory->purchase_cost = Helper::ParseFloat(request('purchase_cost')); - $accessory->qty = request('qty'); - $accessory->user_id = Auth::user()->id; - $accessory->supplier_id = request('supplier_id'); + $accessory->name = request('name'); + $accessory->category_id = request('category_id'); + $accessory->location_id = request('location_id'); + $accessory->min_amt = request('min_amt'); + $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); + $accessory->order_number = request('order_number'); + $accessory->manufacturer_id = request('manufacturer_id'); + $accessory->model_number = request('model_number'); + $accessory->purchase_date = request('purchase_date'); + $accessory->purchase_cost = Helper::ParseFloat(request('purchase_cost')); + $accessory->qty = request('qty'); + $accessory->user_id = Auth::user()->id; + $accessory->supplier_id = request('supplier_id'); $accessory = $request->handleImages($accessory); - + // Was the accessory created? if ($accessory->save()) { // Redirect to the new accessory page return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success')); } + return redirect()->back()->withInput()->withErrors($accessory->getErrors()); } @@ -99,17 +101,15 @@ class AccessoriesController extends Controller */ public function edit($accessoryId = null) { - if ($item = Accessory::find($accessoryId)) { $this->authorize($item); + return view('accessories/edit', compact('item'))->with('category_type', 'accessory'); } return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); - } - /** * Save edited Accessory from form post * @@ -128,18 +128,18 @@ class AccessoriesController extends Controller $this->authorize($accessory); // Update the accessory data - $accessory->name = request('name'); - $accessory->location_id = request('location_id'); - $accessory->min_amt = request('min_amt'); - $accessory->category_id = request('category_id'); - $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); - $accessory->manufacturer_id = request('manufacturer_id'); - $accessory->order_number = request('order_number'); - $accessory->model_number = request('model_number'); - $accessory->purchase_date = request('purchase_date'); - $accessory->purchase_cost = request('purchase_cost'); - $accessory->qty = request('qty'); - $accessory->supplier_id = request('supplier_id'); + $accessory->name = request('name'); + $accessory->location_id = request('location_id'); + $accessory->min_amt = request('min_amt'); + $accessory->category_id = request('category_id'); + $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); + $accessory->manufacturer_id = request('manufacturer_id'); + $accessory->order_number = request('order_number'); + $accessory->model_number = request('model_number'); + $accessory->purchase_date = request('purchase_date'); + $accessory->purchase_cost = request('purchase_cost'); + $accessory->qty = request('qty'); + $accessory->supplier_id = request('supplier_id'); $accessory = $request->handleImages($accessory); @@ -147,6 +147,7 @@ class AccessoriesController extends Controller if ($accessory->save()) { return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success')); } + return redirect()->back()->withInput()->withErrors($accessory->getErrors()); } @@ -166,13 +167,12 @@ class AccessoriesController extends Controller $this->authorize($accessory); - if ($accessory->hasUsers() > 0) { - return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers()))); + return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()])); } if ($accessory->image) { - try { + try { Storage::disk('public')->delete('accessories'.'/'.$accessory->image); } catch (\Exception $e) { \Log::debug($e); @@ -180,10 +180,10 @@ class AccessoriesController extends Controller } $accessory->delete(); + return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.delete.success')); } - /** * Returns a view that invokes the ajax table which contains * the content for the accessory detail view, which is generated in getDataView. @@ -202,6 +202,7 @@ class AccessoriesController extends Controller if (isset($accessory->id)) { return view('accessories/view', compact('accessory')); } + return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryID])); } } diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php index 1cfbaec1b4..3424c2aa13 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php @@ -17,7 +17,7 @@ class AccessoryCheckinController extends Controller * * @author [A. Gianotto] [] * @param Request $request - * @param integer $accessoryUserId + * @param int $accessoryUserId * @param string $backto * @return View * @internal param int $accessoryId @@ -33,6 +33,7 @@ class AccessoryCheckinController extends Controller $accessory = Accessory::find($accessory_user->accessory_id); $this->authorize('checkin', $accessory); + return view('accessories/checkin', compact('accessory'))->with('backto', $backto); } @@ -49,7 +50,7 @@ class AccessoryCheckinController extends Controller */ public function store(Request $request, $accessoryUserId = null, $backto = null) { - // Check if the accessory exists + // Check if the accessory exists if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) { // Redirect to the accessory management page with error return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); @@ -60,7 +61,7 @@ class AccessoryCheckinController extends Controller $this->authorize('checkin', $accessory); $checkin_at = date('Y-m-d'); - if($request->filled('checkin_at')){ + if ($request->filled('checkin_at')) { $checkin_at = $request->input('checkin_at'); } @@ -70,7 +71,7 @@ class AccessoryCheckinController extends Controller event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note'), $checkin_at)); - return redirect()->route("accessories.show", $accessory->id)->with('success', trans('admin/accessories/message.checkin.success')); + return redirect()->route('accessories.show', $accessory->id)->with('success', trans('admin/accessories/message.checkin.success')); } // Redirect to the accessory management page with error return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error')); diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php index 656a040a55..7eb9b39a46 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php @@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Input; class AccessoryCheckoutController extends Controller { - /** * Return the form to checkout an Accessory to a user. * @@ -32,7 +31,6 @@ class AccessoryCheckoutController extends Controller } if ($accessory->category) { - $this->authorize('checkout', $accessory); // Get the dropdown of users and then pass it to the checkout view @@ -56,7 +54,7 @@ class AccessoryCheckoutController extends Controller */ public function store(Request $request, $accessoryId) { - // Check if the accessory exists + // Check if the accessory exists if (is_null($accessory = Accessory::find($accessoryId))) { // Redirect to the accessory management page with error return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found')); @@ -64,11 +62,11 @@ class AccessoryCheckoutController extends Controller $this->authorize('checkout', $accessory); - if (!$user = User::find($request->input('assigned_to'))) { + if (! $user = User::find($request->input('assigned_to'))) { return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist')); } - // Update the accessory data + // Update the accessory data $accessory->assigned_to = e($request->input('assigned_to')); $accessory->users()->attach($accessory->id, [ @@ -76,14 +74,14 @@ class AccessoryCheckoutController extends Controller 'created_at' => Carbon::now(), 'user_id' => Auth::id(), 'assigned_to' => $request->get('assigned_to'), - 'note' => $request->input('note') + 'note' => $request->input('note'), ]); DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first(); event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note'))); - // Redirect to the new accessory page + // Redirect to the new accessory page return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success')); } } diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 6502196b25..b25a8df45b 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -1,4 +1,5 @@ -pending()->get(); return view('account/accept.index', compact('acceptances')); @@ -29,12 +31,12 @@ class AcceptanceController extends Controller { /** * Shows a form to either accept or decline the checkout acceptance - * + * * @param int $id * @return mixed */ - public function create($id) { - + public function create($id) + { $acceptance = CheckoutAcceptance::find($id); if (is_null($acceptance)) { @@ -43,28 +45,28 @@ class AcceptanceController extends Controller { if (! $acceptance->isPending()) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted')); - } + } if (! $acceptance->isCheckedOutTo(Auth::user())) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } - if (!Company::isCurrentUserHasAccess($acceptance->checkoutable)) { + if (! Company::isCurrentUserHasAccess($acceptance->checkoutable)) { return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions')); - } + } return view('account/accept.create', compact('acceptance')); - } + } /** * Stores the accept/decline of the checkout acceptance - * + * * @param Request $request * @param int $id * @return Redirect */ - public function store(Request $request, $id) { - + public function store(Request $request, $id) + { $acceptance = CheckoutAcceptance::find($id); if (is_null($acceptance)) { @@ -73,55 +75,50 @@ class AcceptanceController extends Controller { if (! $acceptance->isPending()) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted')); - } + } if (! $acceptance->isCheckedOutTo(Auth::user())) { return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } - if (!Company::isCurrentUserHasAccess($acceptance->checkoutable)) { + if (! Company::isCurrentUserHasAccess($acceptance->checkoutable)) { return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions')); - } + } - if (!$request->filled('asset_acceptance')) { + if (! $request->filled('asset_acceptance')) { return redirect()->back()->with('error', trans('admin/users/message.error.accept_or_decline')); } /** * Get the signature and save it */ - - if (!Storage::exists('private_uploads/signatures')) Storage::makeDirectory('private_uploads/signatures', 775); - + if (! Storage::exists('private_uploads/signatures')) { + Storage::makeDirectory('private_uploads/signatures', 775); + } $sig_filename = ''; if ($request->filled('signature_output')) { - $sig_filename = "siglog-" .Str::uuid() . '-'.date('Y-m-d-his').".png"; + $sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png'; $data_uri = e($request->input('signature_output')); - $encoded_image = explode(",", $data_uri); + $encoded_image = explode(',', $data_uri); $decoded_image = base64_decode($encoded_image[1]); - Storage::put('private_uploads/signatures/'.$sig_filename, (string)$decoded_image); + Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image); } - if ($request->input('asset_acceptance') == 'accepted') { - $acceptance->accept($sig_filename); event(new CheckoutAccepted($acceptance)); $return_msg = trans('admin/users/message.accepted'); - } else { - - $acceptance->decline($sig_filename); + $acceptance->decline($sig_filename); event(new CheckoutDeclined($acceptance)); $return_msg = trans('admin/users/message.declined'); - } return redirect()->to('account/accept')->with('success', $return_msg); - } + } } diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php index f0d4faad2f..31ac13dab5 100644 --- a/app/Http/Controllers/ActionlogController.php +++ b/app/Http/Controllers/ActionlogController.php @@ -10,9 +10,10 @@ class ActionlogController extends Controller public function displaySig($filename) { $this->authorize('view', \App\Models\Asset::class); - $file = config('app.private_uploads') . '/signatures/' . $filename; + $file = config('app.private_uploads').'/signatures/'.$filename; $filetype = Helper::checkUploadIsImage($file); $contents = file_get_contents($file); + return Response::make($contents)->header('Content-Type', $filetype); } } diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index edbf90d15c..e7a5743568 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -9,8 +9,8 @@ use App\Http\Transformers\SelectlistTransformer; use App\Models\Accessory; use App\Models\Company; use App\Models\User; -use Carbon\Carbon; use Auth; +use Carbon\Carbon; use DB; use Illuminate\Http\Request; @@ -26,7 +26,7 @@ class AccessoriesController extends Controller public function index(Request $request) { $this->authorize('view', Accessory::class); - $allowed_columns = ['id','name','model_number','eol','notes','created_at','min_amt','company_id']; + $allowed_columns = ['id', 'name', 'model_number', 'eol', 'notes', 'created_at', 'min_amt', 'company_id']; $accessories = Accessory::with('category', 'company', 'manufacturer', 'users', 'location'); @@ -35,19 +35,19 @@ class AccessoriesController extends Controller } if ($request->filled('company_id')) { - $accessories->where('company_id','=',$request->input('company_id')); + $accessories->where('company_id', '=', $request->input('company_id')); } if ($request->filled('category_id')) { - $accessories->where('category_id','=',$request->input('category_id')); + $accessories->where('category_id', '=', $request->input('category_id')); } if ($request->filled('manufacturer_id')) { - $accessories->where('manufacturer_id','=',$request->input('manufacturer_id')); + $accessories->where('manufacturer_id', '=', $request->input('manufacturer_id')); } if ($request->filled('supplier_id')) { - $accessories->where('supplier_id','=',$request->input('supplier_id')); + $accessories->where('supplier_id', '=', $request->input('supplier_id')); } // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which @@ -57,7 +57,6 @@ class AccessoriesController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); - $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; @@ -77,10 +76,10 @@ class AccessoriesController extends Controller $total = $accessories->count(); $accessories = $accessories->skip($offset)->take($limit)->get(); + return (new AccessoriesTransformer)->transformAccessories($accessories, $total); } - /** * Store a newly created resource in storage. * @@ -98,8 +97,8 @@ class AccessoriesController extends Controller if ($accessory->save()) { return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $accessory->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $accessory->getErrors())); } /** @@ -114,10 +113,10 @@ class AccessoriesController extends Controller { $this->authorize('view', Accessory::class); $accessory = Accessory::findOrFail($id); + return (new AccessoriesTransformer)->transformAccessory($accessory); } - /** * Display the specified resource. * @@ -130,10 +129,10 @@ class AccessoriesController extends Controller { $this->authorize('view', Accessory::class); $accessory = Accessory::findOrFail($id); + return (new AccessoriesTransformer)->transformAccessory($accessory); } - /** * Display the specified resource. * @@ -147,7 +146,7 @@ class AccessoriesController extends Controller $this->authorize('view', Accessory::class); $accessory = Accessory::with('lastCheckout')->findOrFail($id); - if (!Company::isCurrentUserHasAccess($accessory)) { + if (! Company::isCurrentUserHasAccess($accessory)) { return ['total' => 0, 'rows' => []]; } @@ -157,7 +156,7 @@ class AccessoriesController extends Controller $accessory_users = $accessory->users; $total = $accessory_users->count(); - if($total < $offset){ + if ($total < $offset) { $offset = 0; } @@ -174,7 +173,6 @@ class AccessoriesController extends Controller return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $accessory_users, $total); } - /** * Update the specified resource in storage. * @@ -212,15 +210,14 @@ class AccessoriesController extends Controller $this->authorize($accessory); if ($accessory->hasUsers() > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()]))); } $accessory->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.delete.success'))); } - /** * Save the Accessory checkout information. * @@ -240,10 +237,8 @@ class AccessoriesController extends Controller $this->authorize('checkout', $accessory); - if ($accessory->numRemaining() > 0) { - - if (!$user = User::find($request->input('assigned_to'))) { + if (! $user = User::find($request->input('assigned_to'))) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkout.user_does_not_exist'))); } @@ -255,16 +250,15 @@ class AccessoriesController extends Controller 'created_at' => Carbon::now(), 'user_id' => Auth::id(), 'assigned_to' => $request->get('assigned_to'), - 'note' => $request->get('note') + 'note' => $request->get('note'), ]); $accessory->logCheckout($request->input('note'), $user); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success'))); } return response()->json(Helper::formatStandardApiResponse('error', null, 'No accessories remaining')); - } /** @@ -273,7 +267,7 @@ class AccessoriesController extends Controller * @uses Accessory::checkin_email() to determine if an email can and should be sent * @author [A. Gianotto] [] * @param Request $request - * @param integer $accessoryUserId + * @param int $accessoryUserId * @param string $backto * @return Redirect * @internal param int $accessoryId @@ -291,7 +285,7 @@ class AccessoriesController extends Controller // Was the accessory updated? if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) { - if (!is_null($accessory_user->assigned_to)) { + if (! is_null($accessory_user->assigned_to)) { $user = User::find($accessory_user->assigned_to); } @@ -303,26 +297,22 @@ class AccessoriesController extends Controller $data['item_tag'] = ''; $data['note'] = $logaction->note; - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkin.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkin.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkin.error'))); - + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkin.error'))); } - /** - * Gets a paginated collection for the select2 menus - * - * @see \App\Http\Transformers\SelectlistTransformer - * - */ + * Gets a paginated collection for the select2 menus + * + * @see \App\Http\Transformers\SelectlistTransformer + */ public function selectlist(Request $request) { - $accessories = Accessory::select([ 'accessories.id', - 'accessories.name' + 'accessories.name', ]); if ($request->filled('search')) { @@ -331,10 +321,6 @@ class AccessoriesController extends Controller $accessories = $accessories->orderBy('name', 'ASC')->paginate(50); - return (new SelectlistTransformer)->transformSelectlist($accessories); } - - - } diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php index 519c7c0737..2d694df021 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/AssetMaintenancesController.php @@ -1,4 +1,5 @@ * @version v1.0 * @since [v1.8] - * @return String JSON + * @return string JSON */ public function index(Request $request) { - $maintenances = AssetMaintenance::with('asset', 'asset.model','asset.location', 'supplier', 'asset.company', 'admin'); + $maintenances = AssetMaintenance::with('asset', 'asset.model', 'asset.location', 'supplier', 'asset.company', 'admin'); if ($request->filled('search')) { $maintenances = $maintenances->TextSearch($request->input('search')); @@ -50,7 +49,6 @@ class AssetMaintenancesController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); - $allowed_columns = [ 'id', 'title', @@ -62,7 +60,7 @@ class AssetMaintenancesController extends Controller 'notes', 'asset_tag', 'asset_name', - 'user_id' + 'user_id', ]; $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; @@ -84,12 +82,10 @@ class AssetMaintenancesController extends Controller $total = $maintenances->count(); $maintenances = $maintenances->skip($offset)->take($limit)->get(); + return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total); - - } - /** * Validates and stores the new asset maintenance * @@ -97,7 +93,7 @@ class AssetMaintenancesController extends Controller * @author Vincent Sposato * @version v1.0 * @since [v1.8] - * @return String JSON + * @return string JSON */ public function store(Request $request) { @@ -105,42 +101,39 @@ class AssetMaintenancesController extends Controller $assetMaintenance = new AssetMaintenance(); $assetMaintenance->supplier_id = $request->input('supplier_id'); $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = e($request->input('cost')); + $assetMaintenance->cost = e($request->input('cost')); $assetMaintenance->notes = e($request->input('notes')); $asset = Asset::find(e($request->input('asset_id'))); - if (!Company::isCurrentUserHasAccess($asset)) { + if (! Company::isCurrentUserHasAccess($asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot add a maintenance for that asset')); } // Save the asset maintenance data - $assetMaintenance->asset_id = $request->input('asset_id'); + $assetMaintenance->asset_id = $request->input('asset_id'); $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); - $assetMaintenance->user_id = Auth::id(); + $assetMaintenance->title = $request->input('title'); + $assetMaintenance->start_date = $request->input('start_date'); + $assetMaintenance->completion_date = $request->input('completion_date'); + $assetMaintenance->user_id = Auth::id(); - if (( $assetMaintenance->completion_date !== null ) - && ( $assetMaintenance->start_date !== "" ) - && ( $assetMaintenance->start_date !== "0000-00-00" ) + if (($assetMaintenance->completion_date !== null) + && ($assetMaintenance->start_date !== '') + && ($assetMaintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); + $startDate = Carbon::parse($assetMaintenance->start_date); + $completionDate = Carbon::parse($assetMaintenance->completion_date); $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate); } // Was the asset maintenance created? if ($assetMaintenance->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.create.success'))); - } return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors())); - } - /** * Validates and stores an update to an asset maintenance * @@ -149,59 +142,58 @@ class AssetMaintenancesController extends Controller * @param int $request * @version v1.0 * @since [v4.0] - * @return String JSON + * @return string JSON */ public function update(Request $request, $assetMaintenanceId = null) { // Check if the asset maintenance exists $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); - if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset')); } $assetMaintenance->supplier_id = e($request->input('supplier_id')); $assetMaintenance->is_warranty = e($request->input('is_warranty')); - $assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost'))); + $assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost'))); $assetMaintenance->notes = e($request->input('notes')); $asset = Asset::find(request('asset_id')); - if (!Company::isCurrentUserHasAccess($asset)) { + if (! Company::isCurrentUserHasAccess($asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset')); } // Save the asset maintenance data - $assetMaintenance->asset_id = $request->input('asset_id'); + $assetMaintenance->asset_id = $request->input('asset_id'); $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); + $assetMaintenance->title = $request->input('title'); + $assetMaintenance->start_date = $request->input('start_date'); + $assetMaintenance->completion_date = $request->input('completion_date'); - if (( $assetMaintenance->completion_date == null ) + if (($assetMaintenance->completion_date == null) ) { - if (( $assetMaintenance->asset_maintenance_time !== 0 ) - || ( !is_null($assetMaintenance->asset_maintenance_time) ) + if (($assetMaintenance->asset_maintenance_time !== 0) + || (! is_null($assetMaintenance->asset_maintenance_time)) ) { $assetMaintenance->asset_maintenance_time = null; } } - if (( $assetMaintenance->completion_date !== null ) - && ( $assetMaintenance->start_date !== "" ) - && ( $assetMaintenance->start_date !== "0000-00-00" ) + if (($assetMaintenance->completion_date !== null) + && ($assetMaintenance->start_date !== '') + && ($assetMaintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); + $startDate = Carbon::parse($assetMaintenance->start_date); + $completionDate = Carbon::parse($assetMaintenance->completion_date); $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate); } // Was the asset maintenance created? if ($assetMaintenance->save()) { - return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.edit.success'))); - } + return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors())); } @@ -212,22 +204,20 @@ class AssetMaintenancesController extends Controller * @param int $assetMaintenanceId * @version v1.0 * @since [v4.0] - * @return String JSON + * @return string JSON */ public function destroy($assetMaintenanceId) { // Check if the asset maintenance exists $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); - if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot delete a maintenance for that asset')); } $assetMaintenance->delete(); return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success'))); - - } /** @@ -237,15 +227,15 @@ class AssetMaintenancesController extends Controller * @param int $assetMaintenanceId * @version v1.0 * @since [v4.0] - * @return String JSON + * @return string JSON */ public function show($assetMaintenanceId) { $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); - if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset')); } - return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance); + return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance); } } diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index abc1f65a5a..bf1a723e14 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -1,4 +1,5 @@ with('category','depreciation', 'manufacturer','fieldset') + ->with('category', 'depreciation', 'manufacturer', 'fieldset') ->withCount('assets as assets_count'); - - if ($request->filled('status')) { $assetmodels->onlyTrashed(); } @@ -98,10 +97,10 @@ class AssetModelsController extends Controller $total = $assetmodels->count(); $assetmodels = $assetmodels->skip($offset)->take($limit)->get(); + return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total); } - /** * Store a newly created resource in storage. * @@ -119,8 +118,8 @@ class AssetModelsController extends Controller if ($assetmodel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors())); } /** @@ -135,6 +134,7 @@ class AssetModelsController extends Controller { $this->authorize('view', AssetModel::class); $assetmodel = AssetModel::withCount('assets as assets_count')->findOrFail($id); + return (new AssetModelsTransformer)->transformAssetModel($assetmodel); } @@ -149,11 +149,11 @@ class AssetModelsController extends Controller public function assets($id) { $this->authorize('view', AssetModel::class); - $assets = Asset::where('model_id','=',$id)->get(); + $assets = Asset::where('model_id', '=', $id)->get(); + return (new AssetsTransformer)->transformAssets($assets, $assets->count()); } - /** * Update the specified resource in storage. * @@ -178,10 +178,9 @@ class AssetModelsController extends Controller * it, but I'll be damned if I can think of one. - snipe */ if ($request->filled('custom_fieldset_id')) { - $assetmodel->fieldset_id = $request->get("custom_fieldset_id"); + $assetmodel->fieldset_id = $request->get('custom_fieldset_id'); } - if ($assetmodel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.update.success'))); } @@ -204,11 +203,11 @@ class AssetModelsController extends Controller $this->authorize('delete', $assetmodel); if ($assetmodel->assets()->count() > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.assoc_users'))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.assoc_users'))); } if ($assetmodel->image) { - try { + try { Storage::disk('public')->delete('assetmodels/'.$assetmodel->image); } catch (\Exception $e) { \Log::info($e); @@ -216,8 +215,8 @@ class AssetModelsController extends Controller } $assetmodel->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.delete.success'))); } /** @@ -226,11 +225,9 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $assetmodels = AssetModel::select([ 'models.id', 'models.name', @@ -238,7 +235,7 @@ class AssetModelsController extends Controller 'models.model_number', 'models.manufacturer_id', 'models.category_id', - ])->with('manufacturer','category'); + ])->with('manufacturer', 'category'); $settings = \App\Models\Setting::getSettings(); @@ -249,7 +246,6 @@ class AssetModelsController extends Controller $assetmodels = $assetmodels->OrderCategory('ASC')->OrderManufacturer('ASC')->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50); foreach ($assetmodels as $assetmodel) { - $assetmodel->use_text = ''; if ($settings->modellistCheckedValue('category')) { @@ -260,10 +256,10 @@ class AssetModelsController extends Controller $assetmodel->use_text .= (($assetmodel->manufacturer) ? $assetmodel->manufacturer->name.' ' : ''); } - $assetmodel->use_text .= $assetmodel->name; + $assetmodel->use_text .= $assetmodel->name; - if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number!='')) { - $assetmodel->use_text .= ' (#'.$assetmodel->model_number.')'; + if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number != '')) { + $assetmodel->use_text .= ' (#'.$assetmodel->model_number.')'; } $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null; @@ -271,5 +267,4 @@ class AssetModelsController extends Controller return (new SelectlistTransformer)->transformSelectlist($assetmodels); } - } diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 8ac4307a55..3ad544a785 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -1,7 +1,7 @@ authorize('index', Asset::class); $settings = Setting::getSettings(); @@ -76,7 +74,7 @@ class AssetsController extends Controller 'requests_counter', ]; - $filter = array(); + $filter = []; if ($request->filled('filter')) { $filter = json_decode($request->input('filter'), true); @@ -84,13 +82,12 @@ class AssetsController extends Controller $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load foreach ($all_custom_fields as $field) { - $allowed_columns[]=$field->db_column_name(); + $allowed_columns[] = $field->db_column_name(); } - $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets") + $assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets') ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', - 'model.category', 'model.manufacturer', 'model.fieldset','supplier'); - + 'model.category', 'model.manufacturer', 'model.fieldset', 'supplier'); // These are used by the API to query against specific ID numbers. // They are also used by the individual searches on detail pages like @@ -99,7 +96,7 @@ class AssetsController extends Controller $assets->where('assets.status_id', '=', $request->input('status_id')); } - if ($request->input('requestable')=='true') { + if ($request->input('requestable') == 'true') { $assets->where('assets.requestable', '=', '1'); } @@ -146,7 +143,6 @@ class AssetsController extends Controller // case we override with the actual count, so we should return 0 items. $offset = (($assets) && ($request->get('offset') > $assets->count())) ? $assets->count() : $request->get('offset', 0); - // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); @@ -154,7 +150,6 @@ class AssetsController extends Controller // This is used by the audit reporting routes if (Gate::allows('audit', Asset::class)) { - switch ($audit) { case 'due': $assets->DueOrOverdueForAudit($settings); @@ -165,8 +160,6 @@ class AssetsController extends Controller } } - - // This is used by the sidenav, mostly // We switched from using query scopes here because of a Laravel bug @@ -177,19 +170,19 @@ class AssetsController extends Controller $assets->onlyTrashed(); break; case 'Pending': - $assets->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id") - ->where('status_alias.deployable','=',0) - ->where('status_alias.pending','=',1) + $assets->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id') + ->where('status_alias.deployable', '=', 0) + ->where('status_alias.pending', '=', 1) ->where('status_alias.archived', '=', 0); }); break; case 'RTD': $assets->whereNull('assets.assigned_to') - ->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id") - ->where('status_alias.deployable','=',1) - ->where('status_alias.pending','=',0) + ->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id') + ->where('status_alias.deployable', '=', 1) + ->where('status_alias.pending', '=', 0) ->where('status_alias.archived', '=', 0); }); break; @@ -197,19 +190,19 @@ class AssetsController extends Controller $assets->Undeployable(); break; case 'Archived': - $assets->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id") - ->where('status_alias.deployable','=',0) - ->where('status_alias.pending','=',0) + $assets->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id') + ->where('status_alias.deployable', '=', 0) + ->where('status_alias.pending', '=', 0) ->where('status_alias.archived', '=', 1); }); break; case 'Requestable': $assets->where('assets.requestable', '=', 1) - ->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id") - ->where('status_alias.deployable','=',1) - ->where('status_alias.pending','=',0) + ->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id') + ->where('status_alias.deployable', '=', 1) + ->where('status_alias.pending', '=', 0) ->where('status_alias.archived', '=', 0); }); @@ -220,40 +213,37 @@ class AssetsController extends Controller break; default: - if ((!$request->filled('status_id')) && ($settings->show_archived_in_list!='1')) { + if ((! $request->filled('status_id')) && ($settings->show_archived_in_list != '1')) { // terrible workaround for complex-query Laravel bug in fulltext - $assets->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id") + $assets->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id') ->where('status_alias.archived', '=', 0); }); - // If there is a status ID, don't take show_archived_in_list into consideration + // If there is a status ID, don't take show_archived_in_list into consideration } else { - $assets->join('status_labels AS status_alias',function ($join) { - $join->on('status_alias.id', "=", "assets.status_id"); + $assets->join('status_labels AS status_alias', function ($join) { + $join->on('status_alias.id', '=', 'assets.status_id'); }); } } - - if ((!is_null($filter)) && (count($filter)) > 0) { + if ((! is_null($filter)) && (count($filter)) > 0) { $assets->ByFilter($filter); } elseif ($request->filled('search')) { $assets->TextSearch($request->input('search')); } - // This is kinda gross, but we need to do this because the Bootstrap Tables // API passes custom field ordering as custom_fields.fieldname, and we have to strip // that out to let the default sorter below order them correctly on the assets table. - $sort_override = str_replace('custom_fields.','', $request->input('sort')) ; + $sort_override = str_replace('custom_fields.', '', $request->input('sort')); // This handles all of the pivot sorting (versus the assets.* fields // in the allowed_columns array) $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at'; - switch ($sort_override) { case 'model': $assets->OrderModels($order); @@ -289,14 +279,12 @@ class AssetsController extends Controller break; } - $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); // dd($assets); return (new AssetsTransformer)->transformAssets($assets, $total); } - /** * Returns JSON with information about an asset (by tag) for detail view. * @@ -307,12 +295,13 @@ class AssetsController extends Controller */ public function showByTag($tag) { - if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag',$tag)->first()) { + if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag', $tag)->first()) { $this->authorize('view', $asset); + return (new AssetsTransformer)->transformAsset($asset); } - return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); + return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); } /** @@ -327,14 +316,13 @@ class AssetsController extends Controller { $this->authorize('index', Asset::class); if ($assets = Asset::with('assetstatus')->with('assignedTo') - ->withTrashed()->where('serial',$serial)->get()) { - return (new AssetsTransformer)->transformAssets($assets, $assets->count()); + ->withTrashed()->where('serial', $serial)->get()) { + return (new AssetsTransformer)->transformAssets($assets, $assets->count()); } + return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); - } - /** * Returns JSON with information about an asset for detail view. * @@ -348,20 +336,20 @@ class AssetsController extends Controller if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed() ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->findOrFail($id)) { $this->authorize('view', $asset); + return (new AssetsTransformer)->transformAsset($asset); } - - } + public function licenses($id) { $this->authorize('view', Asset::class); $this->authorize('view', License::class); $asset = Asset::where('id', $id)->withTrashed()->first(); $licenses = $asset->licenses()->get(); - return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count()); - } + return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count()); + } /** * Gets a paginated collection for the select2 menus @@ -369,11 +357,9 @@ class AssetsController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $assets = Company::scopeCompanyables(Asset::select([ 'assets.id', 'assets.name', @@ -381,7 +367,7 @@ class AssetsController extends Controller 'assets.model_id', 'assets.assigned_to', 'assets.assigned_type', - 'assets.status_id' + 'assets.status_id', ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(), 'company_id', 'assets'); if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') { @@ -392,34 +378,28 @@ class AssetsController extends Controller $assets = $assets->AssignedSearch($request->input('search')); } - $assets = $assets->paginate(50); // Loop through and set some custom properties for the transformer to use. // This lets us have more flexibility in special cases like assets, where // they may not have a ->name value but we want to display something anyway foreach ($assets as $asset) { - - $asset->use_text = $asset->present()->fullName; if (($asset->checkedOutToUser()) && ($asset->assigned)) { $asset->use_text .= ' → '.$asset->assigned->getFullNameAttribute(); } - - if ($asset->assetstatus->getStatuslabelType()=='pending') { - $asset->use_text .= '('.$asset->assetstatus->getStatuslabelType().')'; + if ($asset->assetstatus->getStatuslabelType() == 'pending') { + $asset->use_text .= '('.$asset->assetstatus->getStatuslabelType().')'; } $asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null; } return (new SelectlistTransformer)->transformSelectlist($assets); - } - /** * Accepts a POST request to create a new asset * @@ -430,39 +410,38 @@ class AssetsController extends Controller */ public function store(Request $request) { - $this->authorize('create', Asset::class); $asset = new Asset(); $asset->model()->associate(AssetModel::find((int) $request->get('model_id'))); - $asset->name = $request->get('name'); - $asset->serial = $request->get('serial'); - $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')); - $asset->model_id = $request->get('model_id'); - $asset->order_number = $request->get('order_number'); - $asset->notes = $request->get('notes'); - $asset->asset_tag = $request->get('asset_tag', Asset::autoincrement_asset()); - $asset->user_id = Auth::id(); - $asset->archived = '0'; - $asset->physical = '1'; - $asset->depreciate = '0'; - $asset->status_id = $request->get('status_id', 0); - $asset->warranty_months = $request->get('warranty_months', null); - $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); - $asset->purchase_date = $request->get('purchase_date', null); - $asset->assigned_to = $request->get('assigned_to', null); - $asset->supplier_id = $request->get('supplier_id', 0); - $asset->requestable = $request->get('requestable', 0); - $asset->rtd_location_id = $request->get('rtd_location_id', null); - $asset->location_id = $request->get('rtd_location_id', null); + $asset->name = $request->get('name'); + $asset->serial = $request->get('serial'); + $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')); + $asset->model_id = $request->get('model_id'); + $asset->order_number = $request->get('order_number'); + $asset->notes = $request->get('notes'); + $asset->asset_tag = $request->get('asset_tag', Asset::autoincrement_asset()); + $asset->user_id = Auth::id(); + $asset->archived = '0'; + $asset->physical = '1'; + $asset->depreciate = '0'; + $asset->status_id = $request->get('status_id', 0); + $asset->warranty_months = $request->get('warranty_months', null); + $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); + $asset->purchase_date = $request->get('purchase_date', null); + $asset->assigned_to = $request->get('assigned_to', null); + $asset->supplier_id = $request->get('supplier_id', 0); + $asset->requestable = $request->get('requestable', 0); + $asset->rtd_location_id = $request->get('rtd_location_id', null); + $asset->location_id = $request->get('rtd_location_id', null); - if ($request->has('image_source') && $request->input('image_source') != "") { + if ($request->has('image_source') && $request->input('image_source') != '') { $saved_image_path = Helper::processUploadedImage( $request->input('image_source'), 'uploads/assets/' ); - if (!$saved_image_path) { + if (! $saved_image_path) { return response()->json(Helper::formatStandardApiResponse( 'error', null, @@ -491,13 +470,12 @@ class AssetsController extends Controller // if the field is set to encrypted, make sure we encrypt the value if ($field->field_encrypted == '1') { - \Log::debug('This model field is encrypted in this fieldset.'); if (Gate::allows('admin')) { // If input value is null, use custom field's default value - if (($field_val == null) && ($request->has('model_id')!='')){ + if (($field_val == null) && ($request->has('model_id') != '')) { $field_val = \Crypt::encrypt($field->defaultValue($request->get('model_id'))); } else { $field_val = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug())); @@ -505,14 +483,11 @@ class AssetsController extends Controller } } - $asset->{$field->convertUnicodeDbSlug()} = $field_val; - } } if ($asset->save()) { - if ($request->get('assigned_user')) { $target = User::find(request('assigned_user')); } elseif ($request->get('assigned_asset')) { @@ -534,7 +509,6 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200); } - /** * Accepts a POST request to update an asset * @@ -557,13 +531,12 @@ class AssetsController extends Controller ($request->filled('company_id')) ? $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : ''; -($request->filled('rtd_location_id')) ? + ($request->filled('rtd_location_id')) ? $asset->location_id = $request->get('rtd_location_id') : null; - if ($request->filled('image_source')) { - if ($request->input('image_source') == "") { - ($request->filled('rtd_location_id')) ? + if ($request->input('image_source') == '') { + ($request->filled('rtd_location_id')) ? $asset->location_id = $request->get('rtd_location_id') : null; $asset->image = null; } else { @@ -571,7 +544,7 @@ class AssetsController extends Controller $request->input('image_source'), 'uploads/assets/' ); - if (!$saved_image_path) { + if (! $saved_image_path) { return response()->json(Helper::formatStandardApiResponse( 'error', null, @@ -587,7 +560,7 @@ class AssetsController extends Controller if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) { foreach ($model->fieldset->fields as $field) { if ($request->has($field->convertUnicodeDbSlug())) { - if ($field->field_encrypted=='1') { + if ($field->field_encrypted == '1') { if (Gate::allows('admin')) { $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug())); } @@ -598,17 +571,14 @@ class AssetsController extends Controller } } - if ($asset->save()) { - if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) { - $location = $target->location_id; + $location = $target->location_id; } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) { $location = $target->location_id; Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $id) ->update(['location_id' => $target->location_id]); - } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) { $location = $target->id; } @@ -623,12 +593,13 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200); } + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200); } - /** * Delete a given asset (mark as deleted). * @@ -642,12 +613,11 @@ class AssetsController extends Controller $this->authorize('delete', Asset::class); if ($asset = Asset::find($id)) { - $this->authorize('delete', $asset); DB::table('assets') ->where('id', $asset->id) - ->update(array('assigned_to' => null)); + ->update(['assigned_to' => null]); $asset->delete(); @@ -657,8 +627,6 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200); } - - /** * Checkout an asset * @@ -672,7 +640,7 @@ class AssetsController extends Controller $this->authorize('checkout', Asset::class); $asset = Asset::findOrFail($asset_id); - if (!$asset->availableForCheckout()) { + if (! $asset->availableForCheckout()) { return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.not_available'))); } @@ -684,23 +652,20 @@ class AssetsController extends Controller 'asset_tag' => $asset->asset_tag, ]; - // This item is checked out to a location - if (request('checkout_to_type')=='location') { + if (request('checkout_to_type') == 'location') { $target = Location::find(request('assigned_location')); $asset->location_id = ($target) ? $target->id : ''; $error_payload['target_id'] = $request->input('assigned_location'); $error_payload['target_type'] = 'location'; - - } elseif (request('checkout_to_type')=='asset') { - $target = Asset::where('id','!=',$asset_id)->find(request('assigned_asset')); + } elseif (request('checkout_to_type') == 'asset') { + $target = Asset::where('id', '!=', $asset_id)->find(request('assigned_asset')); $asset->location_id = $target->rtd_location_id; // Override with the asset's location_id if it has one $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : ''; $error_payload['target_id'] = $request->input('assigned_asset'); $error_payload['target_type'] = 'asset'; - - } elseif (request('checkout_to_type')=='user') { + } elseif (request('checkout_to_type') == 'user') { // Fetch the target and set the asset's new location_id $target = User::find(request('assigned_user')); $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : ''; @@ -708,30 +673,23 @@ class AssetsController extends Controller $error_payload['target_type'] = 'user'; } - - - if (!isset($target)) { + if (! isset($target)) { return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset '.e($asset->asset_tag).' is invalid - '.$error_payload['target_type'].' does not exist.')); } - - - $checkout_at = request('checkout_at', date("Y-m-d H:i:s")); + $checkout_at = request('checkout_at', date('Y-m-d H:i:s')); $expected_checkin = request('expected_checkin', null); $note = request('note', null); $asset_name = request('name', null); // Set the location ID to the RTD location id if there is one // Wait, why are we doing this? This overrides the stuff we set further up, which makes no sense. - // TODO: Follow up here. WTF. Commented out for now. - + // TODO: Follow up here. WTF. Commented out for now. // if ((isset($target->rtd_location_id)) && ($asset->rtd_location_id!='')) { // $asset->location_id = $target->rtd_location_id; // } - - if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) { return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success'))); } @@ -739,7 +697,6 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.error'))); } - /** * Checkin an asset * @@ -754,7 +711,6 @@ class AssetsController extends Controller $asset = Asset::findOrFail($asset_id); $this->authorize('checkin', $asset); - $user = $asset->assignedUser; if (is_null($target = $asset->assignedTo)) { return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.already_checked_in'))); @@ -769,26 +725,26 @@ class AssetsController extends Controller if ($request->filled('name')) { $asset->name = $request->input('name'); } - - $asset->location_id = $asset->rtd_location_id; + + $asset->location_id = $asset->rtd_location_id; if ($request->filled('location_id')) { - $asset->location_id = $request->input('location_id'); + $asset->location_id = $request->input('location_id'); } if ($request->has('status_id')) { - $asset->status_id = $request->input('status_id'); + $asset->status_id = $request->input('status_id'); } if ($asset->save()) { $asset->logCheckin($target, e($request->input('note'))); + return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success'))); } return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error'))); } - /** * Mark an asset as audited * @@ -797,15 +753,14 @@ class AssetsController extends Controller * @since [v4.0] * @return JsonResponse */ - public function audit(Request $request) { - - + public function audit(Request $request) + { $this->authorize('audit', Asset::class); - $rules = array( + $rules = [ 'asset_tag' => 'required', 'location_id' => 'exists:locations,id|nullable|numeric', - 'next_audit_date' => 'date|nullable' - ); + 'next_audit_date' => 'date|nullable', + ]; $validator = Validator::make($request->all(), $rules); if ($validator->fails()) { @@ -815,8 +770,7 @@ class AssetsController extends Controller $settings = Setting::getSettings(); $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); - $asset = Asset::where('asset_tag','=', $request->input('asset_tag'))->first(); - + $asset = Asset::where('asset_tag', '=', $request->input('asset_tag'))->first(); if ($asset) { // We don't want to log this as a normal update, so let's bypass that @@ -829,32 +783,26 @@ class AssetsController extends Controller // Check to see if they checked the box to update the physical location, // not just note it in the audit notes - if ($request->input('update_location')=='1') { + if ($request->input('update_location') == '1') { $asset->location_id = $request->input('location_id'); } $asset->last_audit_date = date('Y-m-d H:i:s'); if ($asset->save()) { - $log = $asset->logAudit(request('note'),request('location_id')); + $log = $asset->logAudit(request('note'), request('location_id')); + return response()->json(Helper::formatStandardApiResponse('success', [ 'asset_tag'=> e($asset->asset_tag), 'note'=> e($request->input('note')), - 'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date) + 'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date), ], trans('admin/hardware/message.audit.success'))); } } return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.$request->input('asset_tag').' not found')); - - - - - } - - /** * Returns JSON listing of all requestable assets * @@ -866,9 +814,9 @@ class AssetsController extends Controller { $this->authorize('viewRequestable', Asset::class); - $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets") + $assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets') ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', - 'model.category', 'model.manufacturer', 'model.fieldset','supplier')->where('assets.requestable', '=', '1'); + 'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')->where('assets.requestable', '=', '1'); $offset = request('offset', 0); $limit = $request->input('limit', 50); @@ -893,9 +841,9 @@ class AssetsController extends Controller break; } - $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); + return (new AssetsTransformer)->transformRequestedAssets($assets, $total); } } diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index ae085c0f35..8a60f343b9 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -22,10 +22,10 @@ class CategoriesController extends Controller public function index(Request $request) { $this->authorize('view', Category::class); - $allowed_columns = ['id', 'name','category_type', 'category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count','licenses_count', 'image']; + $allowed_columns = ['id', 'name', 'category_type', 'category_type', 'use_default_eula', 'eula_text', 'require_acceptance', 'checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count', 'licenses_count', 'image']; - $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email','image']) - ->withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count','licenses as licenses_count'); + $categories = Category::select(['id', 'created_at', 'updated_at', 'name', 'category_type', 'use_default_eula', 'eula_text', 'require_acceptance', 'checkin_email', 'image']) + ->withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count'); if ($request->filled('search')) { $categories = $categories->TextSearch($request->input('search')); @@ -44,11 +44,10 @@ class CategoriesController extends Controller $total = $categories->count(); $categories = $categories->skip($offset)->take($limit)->get(); + return (new CategoriesTransformer)->transformCategories($categories, $total); - } - /** * Store a newly created resource in storage. * @@ -66,8 +65,8 @@ class CategoriesController extends Controller if ($category->save()) { return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $category->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $category->getErrors())); } /** @@ -82,11 +81,10 @@ class CategoriesController extends Controller { $this->authorize('view', Category::class); $category = Category::findOrFail($id); + return (new CategoriesTransformer)->transformCategory($category); - } - /** * Update the specified resource in storage. * @@ -122,28 +120,25 @@ class CategoriesController extends Controller $this->authorize('delete', Category::class); $category = Category::findOrFail($id); - if (!$category->isDeletable()) { + if (! $category->isDeletable()) { return response()->json( - Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type])) + Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type])) ); } $category->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/categories/message.delete.success'))); } - /** * Gets a paginated collection for the select2 menus * * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request, $category_type = 'asset') { - $categories = Category::select([ 'id', 'name', @@ -164,7 +159,5 @@ class CategoriesController extends Controller } return (new SelectlistTransformer)->transformSelectlist($categories); - } - } diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php index c56ed9f871..51e1681c43 100644 --- a/app/Http/Controllers/Api/CompaniesController.php +++ b/app/Http/Controllers/Api/CompaniesController.php @@ -36,7 +36,7 @@ class CompaniesController extends Controller 'components_count', ]; - $companies = Company::withCount('assets as assets_count','licenses as licenses_count','accessories as accessories_count','consumables as consumables_count','components as components_count','users as users_count'); + $companies = Company::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count'); if ($request->filled('search')) { $companies->TextSearch($request->input('search')); @@ -55,11 +55,10 @@ class CompaniesController extends Controller $total = $companies->count(); $companies = $companies->skip($offset)->take($limit)->get(); + return (new CompaniesTransformer)->transformCompanies($companies, $total); - } - /** * Store a newly created resource in storage. * @@ -77,9 +76,9 @@ class CompaniesController extends Controller if ($company->save()) { return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.create.success'))); } + return response() ->json(Helper::formatStandardApiResponse('error', null, $company->getErrors())); - } /** @@ -94,11 +93,10 @@ class CompaniesController extends Controller { $this->authorize('view', Company::class); $company = Company::findOrFail($id); + return (new CompaniesTransformer)->transformCompany($company); - } - /** * Update the specified resource in storage. * @@ -137,13 +135,14 @@ class CompaniesController extends Controller $company = Company::findOrFail($id); $this->authorize('delete', $company); - if ( !$company->isDeletable() ) { + if (! $company->isDeletable()) { return response() - ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users'))); + ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users'))); } $company->delete(); + return response() - ->json(Helper::formatStandardApiResponse('success', null, trans('admin/companies/message.delete.success'))); + ->json(Helper::formatStandardApiResponse('success', null, trans('admin/companies/message.delete.success'))); } /** @@ -152,11 +151,9 @@ class CompaniesController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $companies = Company::select([ 'companies.id', 'companies.name', diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index d7af18b21c..ccd73eb497 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -30,15 +30,15 @@ class ComponentsController extends Controller } if ($request->filled('company_id')) { - $components->where('company_id','=',$request->input('company_id')); + $components->where('company_id', '=', $request->input('company_id')); } if ($request->filled('category_id')) { - $components->where('category_id','=',$request->input('category_id')); + $components->where('category_id', '=', $request->input('category_id')); } if ($request->filled('location_id')) { - $components->where('location_id','=',$request->input('location_id')); + $components->where('location_id', '=', $request->input('location_id')); } // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which @@ -48,7 +48,7 @@ class ComponentsController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); - $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image']; + $allowed_columns = ['id', 'name', 'min_amt', 'order_number', 'serial', 'purchase_date', 'purchase_cost', 'company', 'category', 'qty', 'location', 'image']; $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; @@ -69,10 +69,10 @@ class ComponentsController extends Controller $total = $components->count(); $components = $components->skip($offset)->take($limit)->get(); + return (new ComponentsTransformer)->transformComponents($components, $total); } - /** * Store a newly created resource in storage. * @@ -90,6 +90,7 @@ class ComponentsController extends Controller if ($component->save()) { return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.create.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $component->getErrors())); } @@ -110,7 +111,6 @@ class ComponentsController extends Controller } } - /** * Update the specified resource in storage. * @@ -147,6 +147,7 @@ class ComponentsController extends Controller $component = Component::findOrFail($id); $this->authorize('delete', $component); $component->delete(); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.delete.success'))); } @@ -158,11 +159,11 @@ class ComponentsController extends Controller * @param Request $request * @param int $id * @return \Illuminate\Http\Response - */ + */ public function getAssets(Request $request, $id) { $this->authorize('view', \App\Models\Asset::class); - + $component = Component::findOrFail($id); $assets = $component->assets(); @@ -170,6 +171,7 @@ class ComponentsController extends Controller $limit = $request->input('limit', 50); $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); + return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total); } } diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php index e67215a00d..e05277f269 100644 --- a/app/Http/Controllers/Api/ConsumablesController.php +++ b/app/Http/Controllers/Api/ConsumablesController.php @@ -34,18 +34,17 @@ class ConsumablesController extends Controller } if ($request->filled('company_id')) { - $consumables->where('company_id','=',$request->input('company_id')); + $consumables->where('company_id', '=', $request->input('company_id')); } if ($request->filled('category_id')) { - $consumables->where('category_id','=',$request->input('category_id')); + $consumables->where('category_id', '=', $request->input('category_id')); } if ($request->filled('manufacturer_id')) { - $consumables->where('manufacturer_id','=',$request->input('manufacturer_id')); + $consumables->where('manufacturer_id', '=', $request->input('manufacturer_id')); } - // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which // case we override with the actual count, so we should return 0 items. $offset = (($consumables) && ($request->get('offset') > $consumables->count())) ? $consumables->count() : $request->get('offset', 0); @@ -53,11 +52,10 @@ class ConsumablesController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); - $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image']; + $allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image']; $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; - switch ($sort) { case 'category': $consumables = $consumables->OrderCategory($order); @@ -76,15 +74,12 @@ class ConsumablesController extends Controller break; } - - $total = $consumables->count(); $consumables = $consumables->skip($offset)->take($limit)->get(); + return (new ConsumablesTransformer)->transformConsumables($consumables, $total); - } - /** * Store a newly created resource in storage. * @@ -102,6 +97,7 @@ class ConsumablesController extends Controller if ($consumable->save()) { return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.create.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $consumable->getErrors())); } @@ -116,10 +112,10 @@ class ConsumablesController extends Controller { $this->authorize('view', Consumable::class); $consumable = Consumable::findOrFail($id); + return (new ConsumablesTransformer)->transformConsumable($consumable); } - /** * Update the specified resource in storage. * @@ -156,35 +152,35 @@ class ConsumablesController extends Controller $consumable = Consumable::findOrFail($id); $this->authorize('delete', $consumable); $consumable->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.delete.success'))); + + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.delete.success'))); } /** - * Returns a JSON response containing details on the users associated with this consumable. - * - * @author [A. Gianotto] [] - * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form. - * @since [v1.0] - * @param int $consumableId - * @return array + * Returns a JSON response containing details on the users associated with this consumable. + * + * @author [A. Gianotto] [] + * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form. + * @since [v1.0] + * @param int $consumableId + * @return array */ public function getDataView($consumableId) { - $consumable = Consumable::with(array('consumableAssignments'=> - function ($query) { + $consumable = Consumable::with(['consumableAssignments'=> function ($query) { $query->orderBy($query->getModel()->getTable().'.created_at', 'DESC'); }, 'consumableAssignments.admin'=> function ($query) { }, 'consumableAssignments.user'=> function ($query) { }, - ))->find($consumableId); + ])->find($consumableId); - if (!Company::isCurrentUserHasAccess($consumable)) { + if (! Company::isCurrentUserHasAccess($consumable)) { return ['total' => 0, 'rows' => []]; } $this->authorize('view', Consumable::class); - $rows = array(); + $rows = []; foreach ($consumable->consumableAssignments as $consumable_assignment) { $rows[] = [ @@ -195,7 +191,8 @@ class ConsumablesController extends Controller } $consumableCount = $consumable->users->count(); - $data = array('total' => $consumableCount, 'rows' => $rows); + $data = ['total' => $consumableCount, 'rows' => $rows]; + return $data; } @@ -231,7 +228,7 @@ class ConsumablesController extends Controller $consumable->users()->attach($consumable->id, [ 'consumable_id' => $consumable->id, 'user_id' => $user->id, - 'assigned_to' => $assigned_to + 'assigned_to' => $assigned_to, ]); // Log checkout event @@ -244,24 +241,22 @@ class ConsumablesController extends Controller $data['note'] = $logaction->note; $data['require_acceptance'] = $consumable->requireAcceptance(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success'))); } return response()->json(Helper::formatStandardApiResponse('error', null, 'No consumables remaining')); } /** - * Gets a paginated collection for the select2 menus - * - * @see \App\Http\Transformers\SelectlistTransformer - * - */ + * Gets a paginated collection for the select2 menus + * + * @see \App\Http\Transformers\SelectlistTransformer + */ public function selectlist(Request $request) { - $consumables = Consumable::select([ 'consumables.id', - 'consumables.name' + 'consumables.name', ]); if ($request->filled('search')) { @@ -270,7 +265,6 @@ class ConsumablesController extends Controller $consumables = $consumables->orderBy('name', 'ASC')->paginate(50); - return (new SelectlistTransformer)->transformSelectlist($consumables); } } diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.php index c42e68b677..d137164956 100644 --- a/app/Http/Controllers/Api/CustomFieldsController.php +++ b/app/Http/Controllers/Api/CustomFieldsController.php @@ -18,26 +18,26 @@ class CustomFieldsController extends Controller * @author [Brady Wetherington] [] * @param int $id * @since [v3.0] - * @return Array + * @return array */ - public function index() { $this->authorize('index', CustomField::class); $fields = CustomField::get(); + return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count()); } /** - * Shows the given field - * @author [V. Cordes] [] - * @param int $id - * @since [v4.1.10] - * @return View - */ + * Shows the given field + * @author [V. Cordes] [] + * @param int $id + * @since [v4.1.10] + * @return View + */ public function show($id) { - $this->authorize('view', CustomField::class); + $this->authorize('view', CustomField::class); if ($field = CustomField::find($id)) { return (new CustomFieldsTransformer)->transformCustomField($field); } @@ -45,7 +45,7 @@ class CustomFieldsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/custom_fields/message.field.invalid')), 200); } - /** + /** * Update the specified field * * @author [V. Cordes] [] @@ -80,7 +80,6 @@ class CustomFieldsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors())); } - /** * Store a newly created field. * @@ -96,9 +95,9 @@ class CustomFieldsController extends Controller $data = $request->all(); $regex_format = null; - - if (str_contains($data["format"], "regex:")){ - $regex_format = $data["format"]; + + if (str_contains($data['format'], 'regex:')) { + $regex_format = $data['format']; } $validator = Validator::make($data, $field->validationRules($regex_format)); @@ -111,8 +110,8 @@ class CustomFieldsController extends Controller if ($field->save()) { return response()->json(Helper::formatStandardApiResponse('success', $field, trans('admin/custom_fields/message.field.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors())); } public function postReorder(Request $request, $id) @@ -121,8 +120,8 @@ class CustomFieldsController extends Controller $this->authorize('update', $fieldset); - $fields = array(); - $order_array = array(); + $fields = []; + $order_array = []; $items = $request->input('item'); @@ -135,7 +134,6 @@ class CustomFieldsController extends Controller } return $fieldset->fields()->sync($fields); - } public function associate(Request $request, $field_id) @@ -152,7 +150,8 @@ class CustomFieldsController extends Controller } $fieldset = CustomFieldset::findOrFail($fieldset_id); - $fieldset->fields()->attach($field->id, ["required" => ($request->input('required') == "on"), "order" => $request->input('order', $fieldset->fields->count())]); + $fieldset->fields()->attach($field->id, ['required' => ($request->input('required') == 'on'), 'order' => $request->input('order', $fieldset->fields->count())]); + return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success'))); } @@ -166,10 +165,12 @@ class CustomFieldsController extends Controller foreach ($field->fieldset as $fieldset) { if ($fieldset->id == $fieldset_id) { $fieldset->fields()->detach($field->id); + return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success'))); } } $fieldset = CustomFieldset::findOrFail($fieldset_id); + return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success'))); } @@ -186,13 +187,12 @@ class CustomFieldsController extends Controller $this->authorize('delete', $field); - if ($field->fieldset->count() >0) { + if ($field->fieldset->count() > 0) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Field is in use.')); } $field->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/custom_fields/message.field.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/custom_fields/message.field.delete.success'))); } - } diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php index 321959b9fd..18da1b67c2 100644 --- a/app/Http/Controllers/Api/CustomFieldsetsController.php +++ b/app/Http/Controllers/Api/CustomFieldsetsController.php @@ -1,4 +1,5 @@ ] * @author [Josh Gibson] */ - class CustomFieldsetsController extends Controller { - /** - * Shows the given fieldset and its fields - * @author [A. Gianotto] [] - * @author [Josh Gibson] - * @param int $id - * @since [v1.8] - * @return View - */ + * Shows the given fieldset and its fields + * @author [A. Gianotto] [] + * @author [Josh Gibson] + * @param int $id + * @since [v1.8] + * @return View + */ public function index() { $this->authorize('index', CustomFieldset::class); $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get(); - return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count()); + return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count()); } /** - * Shows the given fieldset and its fields - * @author [A. Gianotto] [] - * @author [Josh Gibson] - * @param int $id - * @since [v1.8] - * @return View - */ + * Shows the given fieldset and its fields + * @author [A. Gianotto] [] + * @author [Josh Gibson] + * @param int $id + * @since [v1.8] + * @return View + */ public function show($id) { - $this->authorize('view', CustomFieldset::class); + $this->authorize('view', CustomFieldset::class); if ($fieldset = CustomFieldset::find($id)) { return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset); } return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/custom_fields/message.fieldset.does_not_exist')), 200); - } - - /** + /** * Update the specified resource in storage. * * @author [A. Gianotto] [] @@ -82,7 +79,6 @@ class CustomFieldsetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, $fieldset->getErrors())); } - /** * Store a newly created resource in storage. * @@ -100,11 +96,10 @@ class CustomFieldsetsController extends Controller if ($fieldset->save()) { return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.create.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $fieldset->getErrors())); - } - /** * Delete a custom fieldset. * @@ -120,18 +115,15 @@ class CustomFieldsetsController extends Controller $modelsCount = $fieldset->models->count(); $fieldsCount = $fieldset->fields->count(); - if (($modelsCount > 0) || ($fieldsCount > 0) ){ + if (($modelsCount > 0) || ($fieldsCount > 0)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Fieldset is in use.')); } - if ($fieldset->delete()) { - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/custom_fields/message.fieldset.delete.success'))); - } + if ($fieldset->delete()) { + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/custom_fields/message.fieldset.delete.success'))); + } return response()->json(Helper::formatStandardApiResponse('error', null, 'Unspecified error')); - - - } /** @@ -147,6 +139,7 @@ class CustomFieldsetsController extends Controller $this->authorize('view', CustomFieldset::class); $set = CustomFieldset::findOrFail($id); $fields = $set->fields; + return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count()); } diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index b692d378b7..872da9183d 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -23,7 +23,7 @@ class DepartmentsController extends Controller public function index(Request $request) { $this->authorize('view', Department::class); - $allowed_columns = ['id','name','image','users_count']; + $allowed_columns = ['id', 'name', 'image', 'users_count']; $departments = Department::select([ 'departments.id', @@ -33,7 +33,7 @@ class DepartmentsController extends Controller 'departments.manager_id', 'departments.created_at', 'departments.updated_at', - 'departments.image' + 'departments.image', ])->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count'); if ($request->filled('search')) { @@ -64,8 +64,8 @@ class DepartmentsController extends Controller $total = $departments->count(); $departments = $departments->skip($offset)->take($limit)->get(); - return (new DepartmentsTransformer)->transformDepartments($departments, $total); + return (new DepartmentsTransformer)->transformDepartments($departments, $total); } /** @@ -82,13 +82,13 @@ class DepartmentsController extends Controller $department = new Department; $department->fill($request->all()); $department->user_id = Auth::user()->id; - $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); + $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null); if ($department->save()) { return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors())); } /** @@ -103,6 +103,7 @@ class DepartmentsController extends Controller { $this->authorize('view', Department::class); $department = Department::findOrFail($id); + return (new DepartmentsTransformer)->transformDepartment($department); } @@ -128,8 +129,6 @@ class DepartmentsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors())); } - - /** * Validates and deletes selected department. * @@ -149,8 +148,8 @@ class DepartmentsController extends Controller } $department->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/departments/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/departments/message.delete.success'))); } /** @@ -159,11 +158,9 @@ class DepartmentsController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $departments = Department::select([ 'id', 'name', @@ -184,7 +181,5 @@ class DepartmentsController extends Controller } return (new SelectlistTransformer)->transformSelectlist($departments); - } - } diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php index 931d751d22..1701deebfb 100644 --- a/app/Http/Controllers/Api/DepreciationsController.php +++ b/app/Http/Controllers/Api/DepreciationsController.php @@ -20,9 +20,9 @@ class DepreciationsController extends Controller public function index(Request $request) { $this->authorize('view', Depreciation::class); - $allowed_columns = ['id','name','months','created_at']; + $allowed_columns = ['id', 'name', 'months', 'created_at']; - $depreciations = Depreciation::select('id','name','months','user_id','created_at','updated_at'); + $depreciations = Depreciation::select('id', 'name', 'months', 'user_id', 'created_at', 'updated_at'); if ($request->filled('search')) { $depreciations = $depreciations->TextSearch($request->input('search')); @@ -41,10 +41,10 @@ class DepreciationsController extends Controller $total = $depreciations->count(); $depreciations = $depreciations->skip($offset)->take($limit)->get(); + return (new DepreciationsTransformer)->transformDepreciations($depreciations, $total); } - /** * Store a newly created resource in storage. * @@ -62,8 +62,8 @@ class DepreciationsController extends Controller if ($depreciation->save()) { return response()->json(Helper::formatStandardApiResponse('success', $depreciation, trans('admin/depreciations/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $depreciation->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $depreciation->getErrors())); } /** @@ -78,10 +78,10 @@ class DepreciationsController extends Controller { $this->authorize('view', Depreciation::class); $depreciation = Depreciation::findOrFail($id); + return (new DepreciationsTransformer)->transformDepreciation($depreciation); } - /** * Update the specified resource in storage. * @@ -123,10 +123,7 @@ class DepreciationsController extends Controller } $depreciation->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/depreciations/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/depreciations/message.delete.success'))); } - - - } diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index 120dbfe3bd..5a3fe0642d 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -20,9 +20,9 @@ class GroupsController extends Controller public function index(Request $request) { $this->authorize('view', Group::class); - $allowed_columns = ['id','name','created_at', 'users_count']; + $allowed_columns = ['id', 'name', 'created_at', 'users_count']; - $groups = Group::select('id','name','permissions','created_at','updated_at')->withCount('users as users_count'); + $groups = Group::select('id', 'name', 'permissions', 'created_at', 'updated_at')->withCount('users as users_count'); if ($request->filled('search')) { $groups = $groups->TextSearch($request->input('search')); @@ -41,10 +41,10 @@ class GroupsController extends Controller $total = $groups->count(); $groups = $groups->skip($offset)->take($limit)->get(); + return (new GroupsTransformer)->transformGroups($groups, $total); } - /** * Store a newly created resource in storage. * @@ -62,8 +62,8 @@ class GroupsController extends Controller if ($group->save()) { return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $group->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $group->getErrors())); } /** @@ -78,10 +78,10 @@ class GroupsController extends Controller { $this->authorize('view', Group::class); $group = Group::findOrFail($id); + return (new GroupsTransformer)->transformGroup($group); } - /** * Update the specified resource in storage. * @@ -118,9 +118,7 @@ class GroupsController extends Controller $group = Group::findOrFail($id); $this->authorize('delete', $group); $group->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success'))); } - - } diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 682f18d72b..0e8d969815 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -27,8 +27,8 @@ class ImportController extends Controller { $this->authorize('import'); $imports = Import::latest()->get(); - return (new ImportsTransformer)->transformImports($imports); + return (new ImportsTransformer)->transformImports($imports); } /** @@ -40,27 +40,28 @@ class ImportController extends Controller public function store() { $this->authorize('import'); - if (!config('app.lock_passwords')) { + if (! config('app.lock_passwords')) { $files = Request::file('files'); $path = config('app.private_uploads').'/imports'; $results = []; $import = new Import; foreach ($files as $file) { - if (!in_array($file->getMimeType(), array( + if (! in_array($file->getMimeType(), [ 'application/vnd.ms-excel', 'text/csv', 'application/csv', 'text/x-Algol68', // because wtf CSV files? 'text/plain', 'text/comma-separated-values', - 'text/tsv'))) { - $results['error']='File type must be CSV. Uploaded file is '.$file->getMimeType(); + 'text/tsv', ])) { + $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType(); + return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500); } //TODO: is there a lighter way to do this? - if (! ini_get("auto_detect_line_endings")) { - ini_set("auto_detect_line_endings", '1'); + if (! ini_get('auto_detect_line_endings')) { + ini_set('auto_detect_line_endings', '1'); } $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak? $import->header_row = $reader->fetchOne(0); @@ -68,20 +69,20 @@ class ImportController extends Controller //duplicate headers check $duplicate_headers = []; - for($i = 0; $iheader_row); $i++) { + for ($i = 0; $i < count($import->header_row); $i++) { $header = $import->header_row[$i]; - if(in_array($header, $import->header_row)) { + if (in_array($header, $import->header_row)) { $found_at = array_search($header, $import->header_row); - if($i > $found_at) { + if ($i > $found_at) { //avoid reporting duplicates twice, e.g. "1 is same as 17! 17 is same as 1!!!" //as well as "1 is same as 1!!!" (which is always true) //has to be > because otherwise the first result of array_search will always be $i itself(!) - array_push($duplicate_headers,"Duplicate header '$header' detected, first at column: ".($found_at+1).", repeats at column: ".($i+1)); + array_push($duplicate_headers, "Duplicate header '$header' detected, first at column: ".($found_at + 1).', repeats at column: '.($i + 1)); } } } - if(count($duplicate_headers) > 0) { - return response()->json(Helper::formatStandardApiResponse('error',null, implode("; ",$duplicate_headers)), 500); //should this be '4xx'? + if (count($duplicate_headers) > 0) { + return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'? } // Grab the first row to display via ajax as the user picks fields @@ -92,10 +93,11 @@ class ImportController extends Controller try { $file->move($path, $date.'-'.$fixed_filename); } catch (FileException $exception) { - $results['error']=trans('admin/hardware/message.upload.error'); + $results['error'] = trans('admin/hardware/message.upload.error'); if (config('app.debug')) { - $results['error'].= ' ' . $exception->getMessage(); + $results['error'] .= ' '.$exception->getMessage(); } + return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500); } $file_name = date('Y-m-d-his').'-'.$fixed_filename; @@ -105,12 +107,15 @@ class ImportController extends Controller $results[] = $import; } $results = (new ImportsTransformer)->transformImports($results); + return [ 'files' => $results, ]; } + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500); } + /** * Processes the specified Import. * @@ -130,25 +135,25 @@ class ImportController extends Controller } $errors = $request->import(Import::find($import_id)); - $redirectTo = "hardware.index"; + $redirectTo = 'hardware.index'; switch ($request->get('import-type')) { - case "asset": - $redirectTo = "hardware.index"; + case 'asset': + $redirectTo = 'hardware.index'; break; - case "accessory": - $redirectTo = "accessories.index"; + case 'accessory': + $redirectTo = 'accessories.index'; break; - case "consumable": - $redirectTo = "consumables.index"; + case 'consumable': + $redirectTo = 'consumables.index'; break; - case "component": - $redirectTo = "components.index"; + case 'component': + $redirectTo = 'components.index'; break; - case "license": - $redirectTo = "licenses.index"; + case 'license': + $redirectTo = 'licenses.index'; break; - case "user": - $redirectTo = "users.index"; + case 'user': + $redirectTo = 'users.index'; break; } @@ -157,8 +162,8 @@ class ImportController extends Controller } //Flash message before the redirect Session::flash('success', trans('admin/hardware/message.import.success')); - return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route($redirectTo)])); + return response()->json(Helper::formatStandardApiResponse('success', null, ['redirect_url' => route($redirectTo)])); } /** @@ -170,20 +175,20 @@ class ImportController extends Controller public function destroy($import_id) { $this->authorize('create', Asset::class); - + if ($import = Import::find($import_id)) { try { // Try to delete the file Storage::delete('imports/'.$import->file_path); $import->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.import.file_delete_success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.import.file_delete_success'))); } catch (\Exception $e) { // If the file delete didn't work, remove it from the database anyway and return a warning $import->delete(); + return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning'))); } } - } } diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index f86856718d..0dd1c1fbd6 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -32,7 +32,7 @@ class LicenseSeatsController extends Controller $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; - if ($request->input('sort')=='department') { + if ($request->input('sort') == 'department') { $seats->OrderDepartments($order); } else { $seats->orderBy('id', $order); @@ -41,7 +41,7 @@ class LicenseSeatsController extends Controller $total = $seats->count(); $offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0); $limit = request('limit', 50); - + $seats = $seats->skip($offset)->take($limit)->get(); if ($seats) { @@ -65,13 +65,14 @@ class LicenseSeatsController extends Controller $this->authorize('view', License::class); // sanity checks: // 1. does the license seat exist? - if (!$licenseSeat = LicenseSeat::find($seatId)) { + if (! $licenseSeat = LicenseSeat::find($seatId)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found')); } // 2. does the seat belong to the specified license? - if (!$license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) { + if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license')); } + return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat); } @@ -89,11 +90,11 @@ class LicenseSeatsController extends Controller // sanity checks: // 1. does the license seat exist? - if (!$licenseSeat = LicenseSeat::find($seatId)) { + if (! $licenseSeat = LicenseSeat::find($seatId)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found')); } // 2. does the seat belong to the specified license? - if (!$license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) { + if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license')); } @@ -103,14 +104,14 @@ class LicenseSeatsController extends Controller // attempt to update the license seat $licenseSeat->fill($request->all()); $licenseSeat->user_id = Auth::user()->id; - + // check if this update is a checkin operation // 1. are relevant fields touched at all? $touched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id'); // 2. are they cleared? if yes then this is a checkin operation $is_checkin = ($touched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null); - if (!$touched) { + if (! $touched) { // nothing to update return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))); } @@ -128,11 +129,13 @@ class LicenseSeatsController extends Controller if ($is_checkin) { $licenseSeat->logCheckin($target, $request->input('note')); + return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))); } // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation. $licenseSeat->logCheckout($request->input('note'), $target); + return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success'))); } diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php index 268248ab77..b8ea3b03e3 100644 --- a/app/Http/Controllers/Api/LicensesController.php +++ b/app/Http/Controllers/Api/LicensesController.php @@ -26,63 +26,60 @@ class LicensesController extends Controller public function index(Request $request) { $this->authorize('view', License::class); - $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'freeSeats', 'supplier','category')->withCount('freeSeats as free_seats_count')); - + $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'freeSeats', 'supplier', 'category')->withCount('freeSeats as free_seats_count')); if ($request->filled('company_id')) { - $licenses->where('company_id','=',$request->input('company_id')); + $licenses->where('company_id', '=', $request->input('company_id')); } if ($request->filled('name')) { - $licenses->where('licenses.name','=',$request->input('name')); + $licenses->where('licenses.name', '=', $request->input('name')); } if ($request->filled('product_key')) { - $licenses->where('licenses.serial','=',$request->input('product_key')); + $licenses->where('licenses.serial', '=', $request->input('product_key')); } if ($request->filled('order_number')) { - $licenses->where('order_number','=',$request->input('order_number')); + $licenses->where('order_number', '=', $request->input('order_number')); } if ($request->filled('purchase_order')) { - $licenses->where('purchase_order','=',$request->input('purchase_order')); + $licenses->where('purchase_order', '=', $request->input('purchase_order')); } if ($request->filled('license_name')) { - $licenses->where('license_name','=',$request->input('license_name')); + $licenses->where('license_name', '=', $request->input('license_name')); } if ($request->filled('license_email')) { - $licenses->where('license_email','=',$request->input('license_email')); + $licenses->where('license_email', '=', $request->input('license_email')); } if ($request->filled('manufacturer_id')) { - $licenses->where('manufacturer_id','=',$request->input('manufacturer_id')); + $licenses->where('manufacturer_id', '=', $request->input('manufacturer_id')); } if ($request->filled('supplier_id')) { - $licenses->where('supplier_id','=',$request->input('supplier_id')); + $licenses->where('supplier_id', '=', $request->input('supplier_id')); } if ($request->filled('category_id')) { - $licenses->where('category_id','=',$request->input('category_id')); + $licenses->where('category_id', '=', $request->input('category_id')); } if ($request->filled('depreciation_id')) { - $licenses->where('depreciation_id','=',$request->input('depreciation_id')); + $licenses->where('depreciation_id', '=', $request->input('depreciation_id')); } if ($request->filled('supplier_id')) { - $licenses->where('supplier_id','=',$request->input('supplier_id')); + $licenses->where('supplier_id', '=', $request->input('supplier_id')); } - if ($request->filled('search')) { $licenses = $licenses->TextSearch($request->input('search')); } - // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which // case we override with the actual count, so we should return 0 items. $offset = (($licenses) && ($request->get('offset') > $licenses->count())) ? $licenses->count() : $request->get('offset', 0); @@ -92,7 +89,6 @@ class LicensesController extends Controller $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; - switch ($request->input('sort')) { case 'manufacturer': $licenses = $licenses->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order); @@ -128,25 +124,20 @@ class LicensesController extends Controller 'free_seats_count', 'seats', 'termination_date', - 'depreciation_id' + 'depreciation_id', ]; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $licenses = $licenses->orderBy($sort, $order); break; } - - $total = $licenses->count(); $licenses = $licenses->skip($offset)->take($limit)->get(); + return (new LicensesTransformer)->transformLicenses($licenses, $total); - } - - - /** * Store a newly created resource in storage. * @@ -162,9 +153,10 @@ class LicensesController extends Controller $license = new License; $license->fill($request->all()); - if($license->save()) { + if ($license->save()) { return response()->json(Helper::formatStandardApiResponse('success', $license, trans('admin/licenses/message.create.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $license->getErrors())); } @@ -180,10 +172,10 @@ class LicensesController extends Controller $this->authorize('view', License::class); $license = License::withCount('freeSeats')->findOrFail($id); $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset'); + return (new LicensesTransformer)->transformLicense($license); } - /** * Update the specified resource in storage. * @@ -222,22 +214,23 @@ class LicensesController extends Controller $license = License::findOrFail($id); $this->authorize('delete', $license); - if($license->assigned_seats_count == 0) { + if ($license->assigned_seats_count == 0) { // Delete the license and the associated license seats DB::table('license_seats') ->where('id', $license->id) - ->update(array('assigned_to' => null,'asset_id' => null)); + ->update(['assigned_to' => null, 'asset_id' => null]); $licenseSeats = $license->licenseseats(); $licenseSeats->delete(); $license->delete(); // Redirect to the licenses management page - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/licenses/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/licenses/message.delete.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.assoc_users'))); } - + /** * Gets a paginated collection for the select2 menus * @@ -245,10 +238,9 @@ class LicensesController extends Controller */ public function selectlist(Request $request) { - $licenses = License::select([ 'licenses.id', - 'licenses.name' + 'licenses.name', ]); if ($request->filled('search')) { @@ -257,9 +249,6 @@ class LicensesController extends Controller $licenses = $licenses->orderBy('name', 'ASC')->paginate(50); - return (new SelectlistTransformer)->transformSelectlist($licenses); } - - } diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php index ed71685159..01c8040c69 100644 --- a/app/Http/Controllers/Api/LocationsController.php +++ b/app/Http/Controllers/Api/LocationsController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\Request; -use App\Http\Controllers\Controller; use App\Helpers\Helper; -use App\Models\Location; +use App\Http\Controllers\Controller; use App\Http\Transformers\LocationsTransformer; use App\Http\Transformers\SelectlistTransformer; +use App\Models\Location; +use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -24,9 +24,9 @@ class LocationsController extends Controller { $this->authorize('view', Location::class); $allowed_columns = [ - 'id','name','address','address2','city','state','country','zip','created_at', - 'updated_at','manager_id','image', - 'assigned_assets_count','users_count','assets_count','currency','ldap_ou']; + 'id', 'name', 'address', 'address2', 'city', 'state', 'country', 'zip', 'created_at', + 'updated_at', 'manager_id', 'image', + 'assigned_assets_count', 'users_count', 'assets_count', 'currency', 'ldap_ou', ]; $locations = Location::with('parent', 'manager', 'children')->select([ 'locations.id', @@ -43,7 +43,7 @@ class LocationsController extends Controller 'locations.updated_at', 'locations.image', 'locations.ldap_ou', - 'locations.currency' + 'locations.currency', ])->withCount('assignedAssets as assigned_assets_count') ->withCount('assets as assets_count') ->withCount('users as users_count'); @@ -52,8 +52,6 @@ class LocationsController extends Controller $locations = $locations->TextSearch($request->input('search')); } - - $offset = (($locations) && (request('offset') > $locations->count())) ? $locations->count() : request('offset', 0); // Check to make sure the limit is not higher than the max allowed @@ -74,13 +72,12 @@ class LocationsController extends Controller break; } - $total = $locations->count(); $locations = $locations->skip($offset)->take($limit)->get(); + return (new LocationsTransformer)->transformLocations($locations, $total); } - /** * Store a newly created resource in storage. * @@ -98,6 +95,7 @@ class LocationsController extends Controller if ($location->save()) { return response()->json(Helper::formatStandardApiResponse('success', (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.create.success'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors())); } @@ -127,15 +125,15 @@ class LocationsController extends Controller 'locations.created_at', 'locations.updated_at', 'locations.image', - 'locations.currency' + 'locations.currency', ]) ->withCount('assignedAssets as assigned_assets_count') ->withCount('assets as assets_count') ->withCount('users as users_count')->findOrFail($id); + return (new LocationsTransformer)->transformLocation($location); } - /** * Update the specified resource in storage. * @@ -152,10 +150,9 @@ class LocationsController extends Controller $location->fill($request->all()); - if ($location->isValid()) { - $location->save(); + return response()->json( Helper::formatStandardApiResponse( 'success', @@ -180,12 +177,13 @@ class LocationsController extends Controller { $this->authorize('delete', Location::class); $location = Location::findOrFail($id); - if(!$location->isDeletable()) { + if (! $location->isDeletable()) { return response() - ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users'))); + ->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users'))); } $this->authorize('delete', $location); $location->delete(); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/locations/message.delete.success'))); } @@ -216,11 +214,9 @@ class LocationsController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $locations = Location::select([ 'locations.id', 'locations.name', @@ -242,26 +238,22 @@ class LocationsController extends Controller $locations_with_children = []; foreach ($locations as $location) { - if (!array_key_exists($location->parent_id, $locations_with_children)) { + if (! array_key_exists($location->parent_id, $locations_with_children)) { $locations_with_children[$location->parent_id] = []; } $locations_with_children[$location->parent_id][] = $location; } if ($request->filled('search')) { - $locations_formatted = $locations; + $locations_formatted = $locations; } else { $location_options = Location::indenter($locations_with_children); $locations_formatted = new Collection($location_options); - } - $paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []); + $paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []); //return []; return (new SelectlistTransformer)->transformSelectlist($paginated_results); - } - - } diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index 6b9212137f..51dc2c496b 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -22,13 +22,13 @@ class ManufacturersController extends Controller public function index(Request $request) { $this->authorize('view', Manufacturer::class); - $allowed_columns = ['id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count']; + $allowed_columns = ['id', 'name', 'url', 'support_url', 'support_email', 'support_phone', 'created_at', 'updated_at', 'image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count']; $manufacturers = Manufacturer::select( - array('id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'deleted_at') + ['id', 'name', 'url', 'support_url', 'support_email', 'support_phone', 'created_at', 'updated_at', 'image', 'deleted_at'] )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count'); - if ($request->input('deleted')=='true') { + if ($request->input('deleted') == 'true') { $manufacturers->onlyTrashed(); } @@ -36,7 +36,6 @@ class ManufacturersController extends Controller $manufacturers = $manufacturers->TextSearch($request->input('search')); } - // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which // case we override with the actual count, so we should return 0 items. $offset = (($manufacturers) && ($request->get('offset') > $manufacturers->count())) ? $manufacturers->count() : $request->get('offset', 0); @@ -50,10 +49,10 @@ class ManufacturersController extends Controller $total = $manufacturers->count(); $manufacturers = $manufacturers->skip($offset)->take($limit)->get(); + return (new ManufacturersTransformer)->transformManufacturers($manufacturers, $total); } - /** * Store a newly created resource in storage. * @@ -71,8 +70,8 @@ class ManufacturersController extends Controller if ($manufacturer->save()) { return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $manufacturer->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $manufacturer->getErrors())); } /** @@ -87,10 +86,10 @@ class ManufacturersController extends Controller { $this->authorize('view', Manufacturer::class); $manufacturer = Manufacturer::withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count')->findOrFail($id); + return (new ManufacturersTransformer)->transformManufacturer($manufacturer); } - /** * Update the specified resource in storage. * @@ -123,22 +122,17 @@ class ManufacturersController extends Controller */ public function destroy($id) { - $this->authorize('delete', Manufacturer::class); $manufacturer = Manufacturer::findOrFail($id); $this->authorize('delete', $manufacturer); if ($manufacturer->isDeletable()) { $manufacturer->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success'))); + + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users'))); - - - - - + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users'))); } /** @@ -147,11 +141,9 @@ class ManufacturersController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $manufacturers = Manufacturer::select([ 'id', 'name', @@ -173,6 +165,5 @@ class ManufacturersController extends Controller } return (new SelectlistTransformer)->transformSelectlist($manufacturers); - } } diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.php index 6d6f2797f1..97514850f6 100644 --- a/app/Http/Controllers/Api/PredefinedKitsController.php +++ b/app/Http/Controllers/Api/PredefinedKitsController.php @@ -37,11 +37,10 @@ class PredefinedKitsController extends Controller $total = $kits->count(); $kits = $kits->skip($offset)->take($limit)->get(); + return (new PredefinedKitsTransformer)->transformPredefinedKits($kits, $total); - } - /** * Store a newly created resource in storage. * @@ -57,8 +56,8 @@ class PredefinedKitsController extends Controller if ($kit->save()) { return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.create_success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $kit->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $kit->getErrors())); } /** @@ -71,10 +70,10 @@ class PredefinedKitsController extends Controller { $this->authorize('view', PredefinedKit::class); $kit = PredefinedKit::findOrFail($id); + return (new PredefinedKitsTransformer)->transformPredefinedKit($kit); } - /** * Update the specified resource in storage. * @@ -113,23 +112,20 @@ class PredefinedKitsController extends Controller $kit->accessories()->detach(); $kit->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/kits/general.delete_success'))); // TODO: trans + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/kits/general.delete_success'))); // TODO: trans } - /** * Gets a paginated collection for the select2 menus * * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $kits = PredefinedKit::select([ 'id', - 'name' + 'name', ]); if ($request->filled('search')) { @@ -139,7 +135,6 @@ class PredefinedKitsController extends Controller $kits = $kits->orderBy('name', 'ASC')->paginate(50); return (new SelectlistTransformer)->transformSelectlist($kits); - } /** @@ -148,38 +143,40 @@ class PredefinedKitsController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function indexLicenses($kit_id) { + public function indexLicenses($kit_id) + { $this->authorize('view', PredefinedKit::class); $kit = PredefinedKit::findOrFail($kit_id); $licenses = $kit->licenses; + return (new PredefinedKitsTransformer)->transformElements($licenses, $licenses->count()); } - /** * Store the specified resource. * * @param int $id * @return \Illuminate\Http\Response */ - public function storeLicense(Request $request, $kit_id) - { - $this->authorize('update', PredefinedKit::class); - - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } + public function storeLicense(Request $request, $kit_id) + { + $this->authorize('update', PredefinedKit::class); - $license_id = $request->get('license'); - $relation = $kit->licenses(); - if( $relation->find($license_id) ) { - return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => 'License already attached to kit'])); - } + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } - $relation->attach( $license_id, ['quantity' => $quantity]); - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License added successfull')); // TODO: trans + $license_id = $request->get('license'); + $relation = $kit->licenses(); + if ($relation->find($license_id)) { + return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => 'License already attached to kit'])); + } + + $relation->attach($license_id, ['quantity' => $quantity]); + + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License added successfull')); // TODO: trans } /** @@ -189,20 +186,20 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return \Illuminate\Http\Response */ - public function updateLicense(Request $request, $kit_id, $license_id) - { - $this->authorize('update', PredefinedKit::class); - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } - $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' => $quantity]]); - - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated')); // TODO: trans - } + public function updateLicense(Request $request, $kit_id, $license_id) + { + $this->authorize('update', PredefinedKit::class); + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } + $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' => $quantity]]); - /** + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated')); // TODO: trans + } + + /** * Remove the specified resource from storage. * * @param int $kit_id @@ -214,48 +211,49 @@ class PredefinedKitsController extends Controller $kit = PredefinedKit::findOrFail($kit_id); $kit->licenses()->detach($license_id); - return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.delete_success'))); + + return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.delete_success'))); } - + /** * Display the specified resource. * * @param int $kit_id * @return \Illuminate\Http\Response */ - public function indexModels($kit_id) { + public function indexModels($kit_id) + { $this->authorize('view', PredefinedKit::class); $kit = PredefinedKit::findOrFail($kit_id); $models = $kit->models; + return (new PredefinedKitsTransformer)->transformElements($models, $models->count()); } - + /** * Store the specified resource. * * @param int $id * @return \Illuminate\Http\Response */ - public function storeModel(Request $request, $kit_id) - { - - + public function storeModel(Request $request, $kit_id) + { $this->authorize('update', PredefinedKit::class); - - $kit = PredefinedKit::findOrFail($kit_id); - + + $kit = PredefinedKit::findOrFail($kit_id); + $model_id = $request->get('model'); $quantity = $request->input('quantity', 1); - if( $quantity < 1) { + if ($quantity < 1) { $quantity = 1; } - + $relation = $kit->models(); - if( $relation->find($model_id) ) { + if ($relation->find($model_id)) { return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => 'Model already attached to kit'])); } $relation->attach($model_id, ['quantity' => $quantity]); - + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Model added successfull')); } @@ -266,20 +264,20 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return \Illuminate\Http\Response */ - public function updateModel(Request $request, $kit_id, $model_id) - { - $this->authorize('update', PredefinedKit::class); - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } - $kit->models()->syncWithoutDetaching([$model_id => ['quantity' => $quantity]]); - - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated')); // TODO: trans - } + public function updateModel(Request $request, $kit_id, $model_id) + { + $this->authorize('update', PredefinedKit::class); + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } + $kit->models()->syncWithoutDetaching([$model_id => ['quantity' => $quantity]]); - /** + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated')); // TODO: trans + } + + /** * Remove the specified resource from storage. * * @param int $kit_id @@ -291,49 +289,50 @@ class PredefinedKitsController extends Controller $kit = PredefinedKit::findOrFail($kit_id); $kit->models()->detach($model_id); - return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.model_removed_success'))); + + return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.model_removed_success'))); } - - /** * Display the specified resource. * * @param int $kit_id * @return \Illuminate\Http\Response */ - public function indexConsumables($kit_id) { + public function indexConsumables($kit_id) + { $this->authorize('view', PredefinedKit::class); $kit = PredefinedKit::findOrFail($kit_id); $consumables = $kit->consumables; + return (new PredefinedKitsTransformer)->transformElements($consumables, $consumables->count()); } - /** * Store the specified resource. * * @param int $id * @return \Illuminate\Http\Response */ - public function storeConsumable(Request $request, $kit_id) - { - $this->authorize('update', PredefinedKit::class); - - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } + public function storeConsumable(Request $request, $kit_id) + { + $this->authorize('update', PredefinedKit::class); - $consumable_id = $request->get('consumable'); - $relation = $kit->consumables(); - if( $relation->find($consumable_id) ) { - return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => 'Consumable already attached to kit'])); - } + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } - $relation->attach( $consumable_id, ['quantity' => $quantity]); - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable added successfull')); // TODO: trans + $consumable_id = $request->get('consumable'); + $relation = $kit->consumables(); + if ($relation->find($consumable_id)) { + return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => 'Consumable already attached to kit'])); + } + + $relation->attach($consumable_id, ['quantity' => $quantity]); + + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable added successfull')); // TODO: trans } /** @@ -343,20 +342,20 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return \Illuminate\Http\Response */ - public function updateConsumable(Request $request, $kit_id, $consumable_id) - { - $this->authorize('update', PredefinedKit::class); - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } - $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' => $quantity]]); - - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable updated')); // TODO: trans - } + public function updateConsumable(Request $request, $kit_id, $consumable_id) + { + $this->authorize('update', PredefinedKit::class); + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } + $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' => $quantity]]); - /** + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable updated')); // TODO: trans + } + + /** * Remove the specified resource from storage. * * @param int $kit_id @@ -368,48 +367,50 @@ class PredefinedKitsController extends Controller $kit = PredefinedKit::findOrFail($kit_id); $kit->consumables()->detach($consumable_id); - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans + + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans } - /** * Display the specified resource. * * @param int $kit_id * @return \Illuminate\Http\Response */ - public function indexAccessories($kit_id) { + public function indexAccessories($kit_id) + { $this->authorize('view', PredefinedKit::class); $kit = PredefinedKit::findOrFail($kit_id); $accessories = $kit->accessories; + return (new PredefinedKitsTransformer)->transformElements($accessories, $accessories->count()); } - /** * Store the specified resource. * * @param int $kit_id * @return \Illuminate\Http\Response */ - public function storeAccessory(Request $request, $kit_id) - { - $this->authorize('update', PredefinedKit::class); - - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } + public function storeAccessory(Request $request, $kit_id) + { + $this->authorize('update', PredefinedKit::class); - $accessory_id = $request->get('accessory'); - $relation = $kit->accessories(); - if( $relation->find($accessory_id) ) { - return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => 'Accessory already attached to kit'])); - } + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } - $relation->attach( $accessory_id, ['quantity' => $quantity]); - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory added successfull')); // TODO: trans + $accessory_id = $request->get('accessory'); + $relation = $kit->accessories(); + if ($relation->find($accessory_id)) { + return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => 'Accessory already attached to kit'])); + } + + $relation->attach($accessory_id, ['quantity' => $quantity]); + + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory added successfull')); // TODO: trans } /** @@ -419,20 +420,20 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return \Illuminate\Http\Response */ - public function updateAccessory(Request $request, $kit_id, $accessory_id) - { - $this->authorize('update', PredefinedKit::class); - $kit = PredefinedKit::findOrFail($kit_id); - $quantity = $request->input('quantity', 1); - if( $quantity < 1) { - $quantity = 1; - } - $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' => $quantity]]); - - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory updated')); // TODO: trans - } + public function updateAccessory(Request $request, $kit_id, $accessory_id) + { + $this->authorize('update', PredefinedKit::class); + $kit = PredefinedKit::findOrFail($kit_id); + $quantity = $request->input('quantity', 1); + if ($quantity < 1) { + $quantity = 1; + } + $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' => $quantity]]); - /** + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory updated')); // TODO: trans + } + + /** * Remove the specified resource from storage. * * @param int $kit_id @@ -444,6 +445,7 @@ class PredefinedKitsController extends Controller $kit = PredefinedKit::findOrFail($kit_id); $kit->accessories()->detach($accessory_id); - return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans + + return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans } } diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php index f6c31d5db1..fd98225320 100644 --- a/app/Http/Controllers/Api/ProfileController.php +++ b/app/Http/Controllers/Api/ProfileController.php @@ -15,7 +15,7 @@ class ProfileController extends Controller * @author [A. Gianotto] [] * @since [v4.3.0] * - * @return Array + * @return array */ public function requestedAssets() { @@ -24,7 +24,6 @@ class ProfileController extends Controller $results = []; $results['total'] = $checkoutRequests->count(); - foreach ($checkoutRequests as $checkoutRequest) { // Make sure the asset and request still exist @@ -39,10 +38,8 @@ class ProfileController extends Controller 'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'), ]; } - } + return $results; } - - } diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index ba88d6acc3..1406dba791 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -19,25 +19,25 @@ class ReportsController extends Controller public function index(Request $request) { $this->authorize('reports.view'); - - $actionlogs = Actionlog::with('item', 'user', 'target','location'); + + $actionlogs = Actionlog::with('item', 'user', 'target', 'location'); if ($request->filled('search')) { $actionlogs = $actionlogs->TextSearch(e($request->input('search'))); } - if (($request->filled('target_type')) && ($request->filled('target_id'))) { - $actionlogs = $actionlogs->where('target_id','=',$request->input('target_id')) - ->where('target_type','=',"App\\Models\\".ucwords($request->input('target_type'))); + if (($request->filled('target_type')) && ($request->filled('target_id'))) { + $actionlogs = $actionlogs->where('target_id', '=', $request->input('target_id')) + ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('target_type'))); } - if (($request->filled('item_type')) && ($request->filled('item_id'))) { - $actionlogs = $actionlogs->where('item_id','=',$request->input('item_id')) - ->where('item_type','=',"App\\Models\\".ucwords($request->input('item_type'))); + if (($request->filled('item_type')) && ($request->filled('item_id'))) { + $actionlogs = $actionlogs->where('item_id', '=', $request->input('item_id')) + ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type'))); } if ($request->filled('action_type')) { - $actionlogs = $actionlogs->where('action_type','=',$request->input('action_type'))->orderBy('created_at', 'desc'); + $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc'); } if ($request->filled('uploads')) { @@ -51,9 +51,9 @@ class ReportsController extends Controller 'user_id', 'accept_signature', 'action_type', - 'note' + 'note', ]; - + $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $order = ($request->input('order') == 'asc') ? 'asc' : 'desc'; $offset = request('offset', 0); @@ -62,6 +62,5 @@ class ReportsController extends Controller $actionlogs = $actionlogs->orderBy($sort, $order)->skip($offset)->take($limit)->get(); return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE); - } } diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 462c685361..852530c207 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -4,60 +4,59 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use App\Http\Transformers\LoginAttemptsTransformer; +use App\Models\Ldap; use App\Models\Setting; use App\Notifications\MailTest; use App\Services\LdapAd; +use GuzzleHttp\Client; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Notification; -use GuzzleHttp\Client; use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Facades\Validator; -use App\Models\Ldap; // forward-port of v4 LDAP model for Sync - +use Illuminate\Support\Facades\Validator; // forward-port of v4 LDAP model for Sync class SettingsController extends Controller { - /** * Test the ldap settings - * + * * @author Wes Hulette - * + * * @since 5.0.0 - * + * * @param App\Models\LdapAd $ldap - * + * * @return \Illuminate\Http\JsonResponse */ public function ldapAdSettingsTest(LdapAd $ldap): JsonResponse { - if(!$ldap->init()) { + if (! $ldap->init()) { Log::info('LDAP is not enabled so we cannot test.'); + return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400); } // The connect, bind and resulting users message $message = []; - // This is all kinda fucked right now. The connection test doesn't actually do what you think, // // and the way we parse the errors - // on the JS side is horrible. + // on the JS side is horrible. Log::info('Preparing to test LDAP user login'); // Test user can connect to the LDAP server try { $ldap->testLdapAdUserConnection(); $message['login'] = [ - 'message' => 'Successfully connected to LDAP server.' + 'message' => 'Successfully connected to LDAP server.', ]; } catch (\Exception $ex) { - \Log::debug('Connection to LDAP server '.Setting::getSettings()->ldap_server.' failed. Please check your LDAP settings and try again. Server Responded with error: ' . $ex->getMessage()); + \Log::debug('Connection to LDAP server '.Setting::getSettings()->ldap_server.' failed. Please check your LDAP settings and try again. Server Responded with error: '.$ex->getMessage()); + return response()->json( - ['message' => 'Connection to LDAP server '.Setting::getSettings()->ldap_server." failed. Verify that the LDAP hostname is entered correctly and that it can be reached from this web server. \n\nServer Responded with error: " . $ex->getMessage() + ['message' => 'Connection to LDAP server '.Setting::getSettings()->ldap_server." failed. Verify that the LDAP hostname is entered correctly and that it can be reached from this web server. \n\nServer Responded with error: ".$ex->getMessage(), ], 400); } @@ -68,15 +67,15 @@ class SettingsController extends Controller Log::info('Testing Bind'); $ldap->testLdapAdBindConnection(); $message['bind'] = [ - 'message' => 'Successfully bound to LDAP server.' + 'message' => 'Successfully bound to LDAP server.', ]; } catch (\Exception $ex) { Log::info('LDAP Bind failed'); - return response()->json(['message' => 'Connection to LDAP successful, but we were unable to Bind the LDAP user '.Setting::getSettings()->ldap_uname.". Verify your that your LDAP Bind username and password are correct. \n\nServer Responded with error: " . $ex->getMessage() + + return response()->json(['message' => 'Connection to LDAP successful, but we were unable to Bind the LDAP user '.Setting::getSettings()->ldap_uname.". Verify your that your LDAP Bind username and password are correct. \n\nServer Responded with error: ".$ex->getMessage(), ], 400); } - Log::info('Preparing to get sample user set from LDAP directory'); // Get a sample of 10 users so user can verify the data is correct $settings = Setting::getSettings(); @@ -96,21 +95,22 @@ class SettingsController extends Controller ]; }); if ($users->count() > 0) { - $message['user_sync'] = [ - 'users' => $users + $message['user_sync'] = [ + 'users' => $users, ]; } else { - $message['user_sync'] = [ - 'message' => 'Connection to LDAP was successful, however there were no users returned from your query. You should confirm the Base Bind DN above.' + $message['user_sync'] = [ + 'message' => 'Connection to LDAP was successful, however there were no users returned from your query. You should confirm the Base Bind DN above.', ]; + return response()->json($message, 400); } - } catch (\Exception $ex) { Log::info('LDAP sync failed'); - $message['user_sync'] = [ - 'message' => 'Error getting users from LDAP directory, error: ' . $ex->getMessage() + $message['user_sync'] = [ + 'message' => 'Error getting users from LDAP directory, error: '.$ex->getMessage(), ]; + return response()->json($message, 400); } @@ -119,25 +119,24 @@ class SettingsController extends Controller public function ldaptestlogin(Request $request, LdapAd $ldap) { - - if (Setting::getSettings()->ldap_enabled!='1') { + if (Setting::getSettings()->ldap_enabled != '1') { \Log::debug('LDAP is not enabled. Cannot test.'); + return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400); } - - $rules = array( + $rules = [ 'ldaptest_user' => 'required', - 'ldaptest_password' => 'required' - ); + 'ldaptest_password' => 'required', + ]; $validator = Validator::make($request->all(), $rules); if ($validator->fails()) { \Log::debug('LDAP Validation test failed.'); - $validation_errors = implode(' ',$validator->errors()->all()); + $validation_errors = implode(' ', $validator->errors()->all()); + return response()->json(['message' => $validator->errors()->all()], 400); } - \Log::debug('Preparing to test LDAP login'); try { @@ -147,52 +146,48 @@ class SettingsController extends Controller // can't do this because that's a protected property. $results = $ldap->ldapLogin($request->input('ldaptest_user'), $request->input('ldaptest_password')); // this would normally create a user on success (if they didn't already exist), but for the transaction - if($results) { - return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200); + if ($results) { + return response()->json(['message' => 'It worked! '.$request->input('ldaptest_user').' successfully binded to LDAP.'], 200); } else { - return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400); + return response()->json(['message' => 'Login Failed. '.$request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400); } } catch (\Exception $e) { \Log::debug('Connection failed'); + return response()->json(['message' => $e->getMessage()], 400); } finally { DB::rollBack(); // ALWAYS rollback, whether success or failure } - - } public function slacktest(Request $request) { - $slack = new Client([ 'base_url' => e($request->input('slack_endpoint')), 'defaults' => [ - 'exceptions' => false - ] + 'exceptions' => false, + ], ]); - $payload = json_encode( [ 'channel' => e($request->input('slack_channel')), 'text' => trans('general.slack_test_msg'), 'username' => e($request->input('slack_botname')), - 'icon_emoji' => ':heart:' + 'icon_emoji' => ':heart:', ]); try { - $slack->post($request->input('slack_endpoint'),['body' => $payload]); + $slack->post($request->input('slack_endpoint'), ['body' => $payload]); + return response()->json(['message' => 'Success'], 200); } catch (\Exception $e) { return response()->json(['message' => 'Oops! Please check the channel name and webhook endpoint URL. Slack responded with: '.$e->getMessage()], 400); } return response()->json(['message' => 'Something went wrong :( '], 400); - } - /** * Test the email configuration * @@ -202,19 +197,19 @@ class SettingsController extends Controller */ public function ajaxTestEmail() { - if (!config('app.lock_passwords')) { + if (! config('app.lock_passwords')) { try { Notification::send(Setting::first(), new MailTest()); + return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200); } catch (\Exception $e) { return response()->json(['message' => $e->getMessage()], 500); } } + return response()->json(['message' => 'Mail would have been sent, but this application is in demo mode! '], 200); - } - /** * Delete server-cached barcodes * @@ -224,23 +219,20 @@ class SettingsController extends Controller */ public function purgeBarcodes() { - $file_count = 0; $files = Storage::disk('public')->files('barcodes'); foreach ($files as $file) { // iterate files - $file_parts = explode(".", $file); + $file_parts = explode('.', $file); $extension = end($file_parts); \Log::debug($extension); // Only generated barcodes would have a .png file extension - if ($extension =='png') { - + if ($extension == 'png') { \Log::debug('Deleting: '.$file); - - try { + try { Storage::disk('public')->delete($file); \Log::debug('Deleting: '.$file); $file_count++; @@ -248,17 +240,11 @@ class SettingsController extends Controller \Log::debug($e); } } - } return response()->json(['message' => 'Deleted '.$file_count.' barcodes'], 200); - } - - - - /** * Get a list of login attempts * @@ -269,20 +255,16 @@ class SettingsController extends Controller */ public function showLoginAttempts(Request $request) { - $allowed_columns = ['id', 'username', 'remote_ip', 'user_agent','successful','created_at']; + $allowed_columns = ['id', 'username', 'remote_ip', 'user_agent', 'successful', 'created_at']; - $login_attempts = DB::table('login_attempts'); + $login_attempts = DB::table('login_attempts'); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'created_at'; $total = $login_attempts->count(); $login_attempts->orderBy($sort, $order); - $login_attempt_results = $login_attempts->skip(request('offset', 0))->take(request('limit', 20))->get(); + $login_attempt_results = $login_attempts->skip(request('offset', 0))->take(request('limit', 20))->get(); return (new LoginAttemptsTransformer)->transformLoginAttempts($login_attempt_results, $total); - } - - - } diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 567159c58f..0e9940ffec 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -22,7 +22,7 @@ class StatuslabelsController extends Controller public function index(Request $request) { $this->authorize('view', Statuslabel::class); - $allowed_columns = ['id','name','created_at', 'assets_count','color','default_label']; + $allowed_columns = ['id', 'name', 'created_at', 'assets_count', 'color', 'default_label']; $statuslabels = Statuslabel::withCount('assets as assets_count'); @@ -43,10 +43,10 @@ class StatuslabelsController extends Controller $total = $statuslabels->count(); $statuslabels = $statuslabels->skip($offset)->take($limit)->get(); + return (new StatuslabelsTransformer)->transformStatuslabels($statuslabels, $total); } - /** * Store a newly created resource in storage. * @@ -58,25 +58,25 @@ class StatuslabelsController extends Controller public function store(Request $request) { $this->authorize('create', Statuslabel::class); - $request->except('deployable', 'pending','archived'); + $request->except('deployable', 'pending', 'archived'); - if (!$request->filled('type')) { - return response()->json(Helper::formatStandardApiResponse('error', null, ["type" => ["Status label type is required."]]),500); + if (! $request->filled('type')) { + return response()->json(Helper::formatStandardApiResponse('error', null, ['type' => ['Status label type is required.']]), 500); } $statuslabel = new Statuslabel; $statuslabel->fill($request->all()); $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type')); - $statuslabel->deployable = $statusType['deployable']; - $statuslabel->pending = $statusType['pending']; - $statuslabel->archived = $statusType['archived']; + $statuslabel->deployable = $statusType['deployable']; + $statuslabel->pending = $statusType['pending']; + $statuslabel->archived = $statusType['archived']; if ($statuslabel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors())); } /** @@ -91,10 +91,10 @@ class StatuslabelsController extends Controller { $this->authorize('view', Statuslabel::class); $statuslabel = Statuslabel::findOrFail($id); + return (new StatuslabelsTransformer)->transformStatuslabel($statuslabel); } - /** * Update the specified resource in storage. * @@ -108,19 +108,19 @@ class StatuslabelsController extends Controller { $this->authorize('update', Statuslabel::class); $statuslabel = Statuslabel::findOrFail($id); - - $request->except('deployable', 'pending','archived'); - if (!$request->filled('type')) { + $request->except('deployable', 'pending', 'archived'); + + if (! $request->filled('type')) { return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.')); } $statuslabel->fill($request->all()); $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type')); - $statuslabel->deployable = $statusType['deployable']; - $statuslabel->pending = $statusType['pending']; - $statuslabel->archived = $statusType['archived']; + $statuslabel->deployable = $statusType['deployable']; + $statuslabel->pending = $statusType['pending']; + $statuslabel->archived = $statusType['archived']; if ($statuslabel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.update.success'))); @@ -146,23 +146,20 @@ class StatuslabelsController extends Controller // Check that there are no assets associated if ($statuslabel->assets()->count() == 0) { $statuslabel->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/statuslabels/message.delete.success'))); + + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/statuslabels/message.delete.success'))); } return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/statuslabels/message.assoc_assets'))); - } - - - /** + /** * Show a count of assets by status label for pie chart * * @author [A. Gianotto] [] * @since [v3.0] * @return \Illuminate\Http\Response */ - public function getAssetCountByStatuslabel() { $this->authorize('view', Statuslabel::class); @@ -172,18 +169,17 @@ class StatuslabelsController extends Controller ->withCount('assets as assets_count') ->get(); - $labels=[]; - $points=[]; + $labels = []; + $points = []; $default_color_count = 0; - $colors_array = array(); + $colors_array = []; foreach ($statuslabels as $statuslabel) { if ($statuslabel->assets_count > 0) { + $labels[] = $statuslabel->name.' ('.number_format($statuslabel->assets_count).')'; + $points[] = $statuslabel->assets_count; - $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')'; - $points[]=$statuslabel->assets_count; - - if ($statuslabel->color!='') { + if ($statuslabel->color != '') { $colors_array[] = $statuslabel->color; } else { $colors_array[] = Helper::defaultChartColors($default_color_count); @@ -192,14 +188,15 @@ class StatuslabelsController extends Controller } } - $result= [ - "labels" => $labels, - "datasets" => [ [ - "data" => $points, - "backgroundColor" => $colors_array, - "hoverBackgroundColor" => $colors_array - ]] + $result = [ + 'labels' => $labels, + 'datasets' => [[ + 'data' => $points, + 'backgroundColor' => $colors_array, + 'hoverBackgroundColor' => $colors_array, + ]], ]; + return $result; } @@ -215,7 +212,7 @@ class StatuslabelsController extends Controller { $this->authorize('view', Statuslabel::class); $this->authorize('index', Asset::class); - $assets = Asset::where('status_id','=',$id)->with('assignedTo'); + $assets = Asset::where('status_id', '=', $id)->with('assignedTo'); $allowed_columns = [ 'id', @@ -231,11 +228,9 @@ class StatuslabelsController extends Controller $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); - return (new AssetsTransformer)->transformAssets($assets, $total); } - /** * Returns a boolean response based on whether the status label * is one that is deployable. @@ -245,11 +240,12 @@ class StatuslabelsController extends Controller * * @author [A. Gianotto] [] * @since [v4.0] - * @return Bool + * @return bool */ - public function checkIfDeployable($id) { + public function checkIfDeployable($id) + { $statuslabel = Statuslabel::findOrFail($id); - if ($statuslabel->getStatuslabelType()=='deployable') { + if ($statuslabel->getStatuslabelType() == 'deployable') { return '1'; } diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index 5616913ff3..6197d630b8 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -22,12 +22,11 @@ class SuppliersController extends Controller public function index(Request $request) { $this->authorize('view', Supplier::class); - $allowed_columns = ['id','name','address','phone','contact','fax','email','image','assets_count','licenses_count', 'accessories_count','url']; - - $suppliers = Supplier::select( - array('id','name','address','address2','city','state','country','fax', 'phone','email','contact','created_at','updated_at','deleted_at','image','notes') - )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('accessories as accessories_count'); + $allowed_columns = ['id', 'name', 'address', 'phone', 'contact', 'fax', 'email', 'image', 'assets_count', 'licenses_count', 'accessories_count', 'url']; + $suppliers = Supplier::select( + ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes'] + )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('accessories as accessories_count'); if ($request->filled('search')) { $suppliers = $suppliers->TextSearch($request->input('search')); @@ -46,10 +45,10 @@ class SuppliersController extends Controller $total = $suppliers->count(); $suppliers = $suppliers->skip($offset)->take($limit)->get(); + return (new SuppliersTransformer)->transformSuppliers($suppliers, $total); } - /** * Store a newly created resource in storage. * @@ -67,8 +66,8 @@ class SuppliersController extends Controller if ($supplier->save()) { return response()->json(Helper::formatStandardApiResponse('success', $supplier, trans('admin/suppliers/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $supplier->getErrors())); + return response()->json(Helper::formatStandardApiResponse('error', null, $supplier->getErrors())); } /** @@ -83,10 +82,10 @@ class SuppliersController extends Controller { $this->authorize('view', Supplier::class); $supplier = Supplier::findOrFail($id); + return (new SuppliersTransformer)->transformSupplier($supplier); } - /** * Update the specified resource in storage. * @@ -120,16 +119,15 @@ class SuppliersController extends Controller public function destroy($id) { $this->authorize('delete', Supplier::class); - $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count','assets as assets_count', 'licenses as licenses_count')->findOrFail($id); + $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id); $this->authorize('delete', $supplier); - if ($supplier->assets_count > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]))); } if ($supplier->asset_maintenances_count > 0) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]))); } if ($supplier->licenses_count > 0) { @@ -137,8 +135,8 @@ class SuppliersController extends Controller } $supplier->delete(); - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/suppliers/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/suppliers/message.delete.success'))); } /** @@ -147,11 +145,9 @@ class SuppliersController extends Controller * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $suppliers = Supplier::select([ 'id', 'name', @@ -173,7 +169,5 @@ class SuppliersController extends Controller } return (new SelectlistTransformer)->transformSelectlist($suppliers); - } - } diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index b8bbf39d4d..599f7ded55 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -63,14 +63,13 @@ class UsersController extends Controller 'users.zip', 'users.ldap_import', - ])->with('manager', 'groups', 'userloc', 'company', 'department','assets','licenses','accessories','consumables') - ->withCount('assets as assets_count','licenses as licenses_count','accessories as accessories_count','consumables as consumables_count'); + ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables') + ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count'); $users = Company::scopeCompanyables($users); - - if (($request->filled('deleted')) && ($request->input('deleted')=='true')) { + if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) { $users = $users->onlyTrashed(); - } elseif (($request->filled('all')) && ($request->input('all')=='true')) { + } elseif (($request->filled('all')) && ($request->input('all') == 'true')) { $users = $users->withTrashed(); } @@ -95,7 +94,7 @@ class UsersController extends Controller } if ($request->filled('department_id')) { - $users = $users->where('users.department_id','=',$request->input('department_id')); + $users = $users->where('users.department_id', '=', $request->input('department_id')); } if ($request->filled('search')) { @@ -112,7 +111,6 @@ class UsersController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); - switch ($request->input('sort')) { case 'manager': $users = $users->OrderManager($order); @@ -129,11 +127,11 @@ class UsersController extends Controller default: $allowed_columns = [ - 'last_name','first_name','email','jobtitle','username','employee_num', - 'assets','accessories', 'consumables','licenses','groups','activated','created_at', - 'two_factor_enrolled','two_factor_optin','last_login', 'assets_count', 'licenses_count', + 'last_name', 'first_name', 'email', 'jobtitle', 'username', 'employee_num', + 'assets', 'accessories', 'consumables', 'licenses', 'groups', 'activated', 'created_at', + 'two_factor_enrolled', 'two_factor_optin', 'last_login', 'assets_count', 'licenses_count', 'consumables_count', 'accessories_count', 'phone', 'address', 'city', 'state', - 'country', 'zip', 'id', 'ldap_import' + 'country', 'zip', 'id', 'ldap_import', ]; $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name'; @@ -141,24 +139,21 @@ class UsersController extends Controller break; } - $total = $users->count(); $users = $users->skip($offset)->take($limit)->get(); + return (new UsersTransformer)->transformUsers($users, $total); } - /** * Gets a paginated collection for the select2 menus * * @author [A. Gianotto] [] * @since [v4.0.16] * @see \App\Http\Transformers\SelectlistTransformer - * */ public function selectlist(Request $request) { - $users = User::select( [ 'users.id', @@ -185,16 +180,16 @@ class UsersController extends Controller foreach ($users as $user) { $name_str = ''; - if ($user->last_name!='') { + if ($user->last_name != '') { $name_str .= $user->last_name.', '; } $name_str .= $user->first_name; - if ($user->username!='') { + if ($user->username != '') { $name_str .= ' ('.$user->username.')'; } - if ($user->employee_num!='') { + if ($user->employee_num != '') { $name_str .= ' - #'.$user->employee_num; } @@ -203,11 +198,8 @@ class UsersController extends Controller } return (new SelectlistTransformer)->transformSelectlist($users); - } - - /** * Store a newly created resource in storage. * @@ -224,29 +216,28 @@ class UsersController extends Controller $user->fill($request->all()); if ($request->has('permissions')) { - $permissions_array = $request->input('permissions'); // Strip out the superuser permission if the API user isn't a superadmin - if (!Auth::user()->isSuperUser()) { + if (! Auth::user()->isSuperUser()) { unset($permissions_array['superuser']); } - $user->permissions = $permissions_array; + $user->permissions = $permissions_array; } - $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20); + $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20); $user->password = bcrypt($request->get('password', $tmp_pass)); - if ($user->save()) { if ($request->filled('groups')) { $user->groups()->sync($request->input('groups')); } else { - $user->groups()->sync(array()); + $user->groups()->sync([]); } - + return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.create'))); } + return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors())); } @@ -260,11 +251,11 @@ class UsersController extends Controller public function show($id) { $this->authorize('view', User::class); - $user = User::withCount('assets as assets_count','licenses as licenses_count','accessories as accessories_count','consumables as consumables_count')->findOrFail($id); + $user = User::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count')->findOrFail($id); + return (new UsersTransformer)->transformUser($user); } - /** * Update the specified resource in storage. * @@ -288,7 +279,6 @@ class UsersController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.')); } - $user->fill($request->all()); if ($user->id == $request->input('manager_id')) { @@ -303,19 +293,15 @@ class UsersController extends Controller // here because we need to overwrite permissions // if someone needs to null them out if ($request->has('permissions')) { - $permissions_array = $request->input('permissions'); // Strip out the superuser permission if the API user isn't a superadmin - if (!Auth::user()->isSuperUser()) { + if (! Auth::user()->isSuperUser()) { unset($permissions_array['superuser']); } - $user->permissions = $permissions_array; + $user->permissions = $permissions_array; } - - - // Update the location of any assets checked out to this user Asset::where('assigned_type', User::class) ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]); @@ -332,11 +318,10 @@ class UsersController extends Controller if ($request->filled('groups')) { $user->groups()->sync($request->input('groups')); // The groups field has been passed but it is null, so we should blank it out - } elseif ($request->has('groups')) { - $user->groups()->sync(array()); + } elseif ($request->has('groups')) { + $user->groups()->sync([]); } - return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update'))); } @@ -357,36 +342,37 @@ class UsersController extends Controller $user = User::findOrFail($id); $this->authorize('delete', $user); - if (($user->assets) && ($user->assets->count() > 0)) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete_has_assets'))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete_has_assets'))); } if (($user->licenses) && ($user->licenses->count() > 0)) { - return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has ' . $user->licenses->count() . ' license(s) associated with them and cannot be deleted.')); + return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->licenses->count().' license(s) associated with them and cannot be deleted.')); } if (($user->accessories) && ($user->accessories->count() > 0)) { - return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has ' . $user->accessories->count() . ' accessories associated with them.')); + return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->accessories->count().' accessories associated with them.')); } if (($user->managedLocations()) && ($user->managedLocations()->count() > 0)) { - return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has ' . $user->managedLocations()->count() . ' locations that they manage.')); + return response()->json(Helper::formatStandardApiResponse('error', null, 'This user still has '.$user->managedLocations()->count().' locations that they manage.')); } if ($user->delete()) { // Remove the user's avatar if they have one if (Storage::disk('public')->exists('avatars/'.$user->avatar)) { - try { + try { Storage::disk('public')->delete('avatars/'.$user->avatar); } catch (\Exception $e) { \Log::debug($e); - } + } } - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.delete'))); + + return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.delete'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete'))); + + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete'))); } /** @@ -402,6 +388,7 @@ class UsersController extends Controller $this->authorize('view', User::class); $this->authorize('view', Asset::class); $assets = Asset::where('assigned_to', '=', $id)->where('assigned_type', '=', User::class)->with('model')->get(); + return (new AssetsTransformer)->transformAssets($assets, $assets->count()); } @@ -419,6 +406,7 @@ class UsersController extends Controller $user = User::findOrFail($id); $this->authorize('view', Accessory::class); $accessories = $user->accessories; + return (new AccessoriesTransformer)->transformAccessories($accessories, $accessories->count()); } @@ -436,12 +424,11 @@ class UsersController extends Controller $this->authorize('view', License::class); $user = User::where('id', $id)->withTrashed()->first(); $licenses = $user->licenses()->get(); + return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count()); } /** - - * Reset the user's two-factor status * * @author [A. Gianotto] [] @@ -451,7 +438,6 @@ class UsersController extends Controller */ public function postTwoFactorReset(Request $request) { - $this->authorize('update', User::class); if ($request->filled('id')) { @@ -460,13 +446,14 @@ class UsersController extends Controller $user->two_factor_secret = null; $user->two_factor_enrolled = 0; $user->save(); + return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200); } catch (\Exception $e) { return response()->json(['message' => trans('admin/settings/general.two_factor_reset_error')], 500); } } - return response()->json(['message' => 'No ID provided'], 500); + return response()->json(['message' => 'No ID provided'], 500); } /** diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php index d05b190ba7..c00e0ea455 100644 --- a/app/Http/Controllers/AssetMaintenancesController.php +++ b/app/Http/Controllers/AssetMaintenancesController.php @@ -1,4 +1,5 @@ - * @version v1.0 - * @since [v1.8] - * @return View - */ + * Checks for permissions for this action. + * + * @todo This should be replaced with middleware and/or policies + * @author Vincent Sposato + * @version v1.0 + * @since [v1.8] + * @return View + */ private static function getInsufficientPermissionsRedirect() { return redirect()->route('maintenances.index') @@ -38,23 +38,21 @@ class AssetMaintenancesController extends Controller } /** - * Returns a view that invokes the ajax tables which actually contains - * the content for the asset maintenances listing, which is generated in getDatatable. - * - * @todo This should be replaced with middleware and/or policies - * @see AssetMaintenancesController::getDatatable() method that generates the JSON response - * @author Vincent Sposato - * @version v1.0 - * @since [v1.8] - * @return View - */ + * Returns a view that invokes the ajax tables which actually contains + * the content for the asset maintenances listing, which is generated in getDatatable. + * + * @todo This should be replaced with middleware and/or policies + * @see AssetMaintenancesController::getDatatable() method that generates the JSON response + * @author Vincent Sposato + * @version v1.0 + * @since [v1.8] + * @return View + */ public function index() { return view('asset_maintenances/index'); } - - /** * Returns a form view to create a new asset maintenance. * @@ -86,42 +84,42 @@ class AssetMaintenancesController extends Controller } /** - * Validates and stores the new asset maintenance - * - * @see AssetMaintenancesController::getCreate() method for the form - * @author Vincent Sposato - * @version v1.0 - * @since [v1.8] - * @return mixed - */ + * Validates and stores the new asset maintenance + * + * @see AssetMaintenancesController::getCreate() method for the form + * @author Vincent Sposato + * @version v1.0 + * @since [v1.8] + * @return mixed + */ public function store(Request $request) { // create a new model instance $assetMaintenance = new AssetMaintenance(); $assetMaintenance->supplier_id = $request->input('supplier_id'); $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = $request->input('cost'); + $assetMaintenance->cost = $request->input('cost'); $assetMaintenance->notes = $request->input('notes'); $asset = Asset::find($request->input('asset_id')); - if ((!Company::isCurrentUserHasAccess($asset)) && ($asset!=null)) { + if ((! Company::isCurrentUserHasAccess($asset)) && ($asset != null)) { return static::getInsufficientPermissionsRedirect(); } // Save the asset maintenance data - $assetMaintenance->asset_id = $request->input('asset_id'); + $assetMaintenance->asset_id = $request->input('asset_id'); $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); - $assetMaintenance->user_id = Auth::id(); + $assetMaintenance->title = $request->input('title'); + $assetMaintenance->start_date = $request->input('start_date'); + $assetMaintenance->completion_date = $request->input('completion_date'); + $assetMaintenance->user_id = Auth::id(); - if (( $assetMaintenance->completion_date !== null ) - && ( $assetMaintenance->start_date !== "" ) - && ( $assetMaintenance->start_date !== "0000-00-00" ) + if (($assetMaintenance->completion_date !== null) + && ($assetMaintenance->start_date !== '') + && ($assetMaintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); + $startDate = Carbon::parse($assetMaintenance->start_date); + $completionDate = Carbon::parse($assetMaintenance->completion_date); $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate); } @@ -133,19 +131,18 @@ class AssetMaintenancesController extends Controller } return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors()); - } /** - * Returns a form view to edit a selected asset maintenance. - * - * @see AssetMaintenancesController::postEdit() method that stores the data - * @author Vincent Sposato - * @param int $assetMaintenanceId - * @version v1.0 - * @since [v1.8] - * @return mixed - */ + * Returns a form view to edit a selected asset maintenance. + * + * @see AssetMaintenancesController::postEdit() method that stores the data + * @author Vincent Sposato + * @param int $assetMaintenanceId + * @version v1.0 + * @since [v1.8] + * @return mixed + */ public function edit($assetMaintenanceId = null) { // Check if the asset maintenance exists @@ -153,11 +150,10 @@ class AssetMaintenancesController extends Controller // Redirect to the improvement management page return redirect()->route('maintenances.index') ->with('error', trans('admin/asset_maintenances/message.not_found')); - } elseif (!$assetMaintenance->asset) { + } elseif (! $assetMaintenance->asset) { return redirect()->route('maintenances.index') ->with('error', 'The asset associated with this maintenance does not exist.'); - - } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return static::getInsufficientPermissionsRedirect(); } @@ -184,7 +180,6 @@ class AssetMaintenancesController extends Controller ->with('selectedAsset', null) ->with('assetMaintenanceType', $assetMaintenanceType) ->with('item', $assetMaintenance); - } /** @@ -205,65 +200,66 @@ class AssetMaintenancesController extends Controller // Redirect to the asset maintenance management page return redirect()->route('maintenances.index') ->with('error', trans('admin/asset_maintenances/message.not_found')); - } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return static::getInsufficientPermissionsRedirect(); } $assetMaintenance->supplier_id = e($request->input('supplier_id')); $assetMaintenance->is_warranty = e($request->input('is_warranty')); - $assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost'))); + $assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost'))); $assetMaintenance->notes = e($request->input('notes')); $asset = Asset::find(request('asset_id')); - if (!Company::isCurrentUserHasAccess($asset)) { + if (! Company::isCurrentUserHasAccess($asset)) { return static::getInsufficientPermissionsRedirect(); } // Save the asset maintenance data - $assetMaintenance->asset_id = $request->input('asset_id'); + $assetMaintenance->asset_id = $request->input('asset_id'); $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); + $assetMaintenance->title = $request->input('title'); + $assetMaintenance->start_date = $request->input('start_date'); + $assetMaintenance->completion_date = $request->input('completion_date'); - if (( $assetMaintenance->completion_date == null ) + if (($assetMaintenance->completion_date == null) ) { - if (( $assetMaintenance->asset_maintenance_time !== 0 ) - || ( !is_null($assetMaintenance->asset_maintenance_time) ) + if (($assetMaintenance->asset_maintenance_time !== 0) + || (! is_null($assetMaintenance->asset_maintenance_time)) ) { $assetMaintenance->asset_maintenance_time = null; } } - if (( $assetMaintenance->completion_date !== null ) - && ( $assetMaintenance->start_date !== "" ) - && ( $assetMaintenance->start_date !== "0000-00-00" ) + if (($assetMaintenance->completion_date !== null) + && ($assetMaintenance->start_date !== '') + && ($assetMaintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); + $startDate = Carbon::parse($assetMaintenance->start_date); + $completionDate = Carbon::parse($assetMaintenance->completion_date); $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate); } - // Was the asset maintenance created? + // Was the asset maintenance created? if ($assetMaintenance->save()) { // Redirect to the new asset maintenance page return redirect()->route('maintenances.index') ->with('success', trans('admin/asset_maintenances/message.edit.success')); } + return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors()); } /** - * Delete an asset maintenance - * - * @author Vincent Sposato - * @param int $assetMaintenanceId - * @version v1.0 - * @since [v1.8] - * @return mixed - */ + * Delete an asset maintenance + * + * @author Vincent Sposato + * @param int $assetMaintenanceId + * @version v1.0 + * @since [v1.8] + * @return mixed + */ public function destroy($assetMaintenanceId) { // Check if the asset maintenance exists @@ -271,7 +267,7 @@ class AssetMaintenancesController extends Controller // Redirect to the asset maintenance management page return redirect()->route('maintenances.index') ->with('error', trans('admin/asset_maintenances/message.not_found')); - } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return static::getInsufficientPermissionsRedirect(); } @@ -284,14 +280,14 @@ class AssetMaintenancesController extends Controller } /** - * View an asset maintenance - * - * @author Vincent Sposato - * @param int $assetMaintenanceId - * @version v1.0 - * @since [v1.8] - * @return View - */ + * View an asset maintenance + * + * @author Vincent Sposato + * @param int $assetMaintenanceId + * @version v1.0 + * @since [v1.8] + * @return View + */ public function show($assetMaintenanceId) { // Check if the asset maintenance exists @@ -299,7 +295,7 @@ class AssetMaintenancesController extends Controller // Redirect to the asset maintenance management page return redirect()->route('maintenances.index') ->with('error', trans('admin/asset_maintenances/message.not_found')); - } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { return static::getInsufficientPermissionsRedirect(); } diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index 29914b40a2..1afc9d8a60 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -1,4 +1,5 @@ authorize('index', AssetModel::class); + return view('models/index'); } @@ -48,12 +49,12 @@ class AssetModelsController extends Controller public function create() { $this->authorize('create', AssetModel::class); + return view('models/edit')->with('category_type', 'asset') ->with('depreciation_list', Helper::depreciationList()) ->with('item', new AssetModel); } - /** * Validate and process the new Asset Model data. * @@ -65,7 +66,6 @@ class AssetModelsController extends Controller */ public function store(ImageUploadRequest $request) { - $this->authorize('create', AssetModel::class); // Create a new asset model $model = new AssetModel; @@ -73,29 +73,30 @@ class AssetModelsController extends Controller // Save the model data $model->eol = $request->input('eol'); $model->depreciation_id = $request->input('depreciation_id'); - $model->name = $request->input('name'); - $model->model_number = $request->input('model_number'); - $model->manufacturer_id = $request->input('manufacturer_id'); - $model->category_id = $request->input('category_id'); - $model->notes = $request->input('notes'); - $model->user_id = Auth::id(); - $model->requestable = Request::has('requestable'); + $model->name = $request->input('name'); + $model->model_number = $request->input('model_number'); + $model->manufacturer_id = $request->input('manufacturer_id'); + $model->category_id = $request->input('category_id'); + $model->notes = $request->input('notes'); + $model->user_id = Auth::id(); + $model->requestable = Request::has('requestable'); - if ($request->input('custom_fieldset')!='') { + if ($request->input('custom_fieldset') != '') { $model->fieldset_id = e($request->input('custom_fieldset')); } $model = $request->handleImages($model); - // Was it created? + // Was it created? if ($model->save()) { if ($this->shouldAddDefaultValues($request->input())) { $this->assignCustomFieldsDefaultValues($model, $request->input('default_values')); } // Redirect to the new model page - return redirect()->route("models.index")->with('success', trans('admin/models/message.create.success')); + return redirect()->route('models.index')->with('success', trans('admin/models/message.create.success')); } + return redirect()->back()->withInput()->withErrors($model->getErrors()); } @@ -113,16 +114,15 @@ class AssetModelsController extends Controller $this->authorize('update', AssetModel::class); if ($item = AssetModel::find($modelId)) { $category_type = 'asset'; - $view = View::make('models/edit', compact('item','category_type')); + $view = View::make('models/edit', compact('item', 'category_type')); $view->with('depreciation_list', Helper::depreciationList()); + return $view; } return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist')); - } - /** * Validates and processes form data from the edit * Asset Model form based on the model ID passed. @@ -145,20 +145,18 @@ class AssetModelsController extends Controller $model = $request->handleImages($model); - $model->depreciation_id = $request->input('depreciation_id'); - $model->eol = $request->input('eol'); - $model->name = $request->input('name'); - $model->model_number = $request->input('model_number'); - $model->manufacturer_id = $request->input('manufacturer_id'); - $model->category_id = $request->input('category_id'); - $model->notes = $request->input('notes'); - $model->requestable = $request->input('requestable', '0'); - - + $model->depreciation_id = $request->input('depreciation_id'); + $model->eol = $request->input('eol'); + $model->name = $request->input('name'); + $model->model_number = $request->input('model_number'); + $model->manufacturer_id = $request->input('manufacturer_id'); + $model->category_id = $request->input('category_id'); + $model->notes = $request->input('notes'); + $model->requestable = $request->input('requestable', '0'); $this->removeCustomFieldsDefaultValues($model); - if ($request->input('custom_fieldset')=='') { + if ($request->input('custom_fieldset') == '') { $model->fieldset_id = null; } else { $model->fieldset_id = $request->input('custom_fieldset'); @@ -168,10 +166,10 @@ class AssetModelsController extends Controller } } - if ($model->save()) { - return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success')); + return redirect()->route('models.index')->with('success', trans('admin/models/message.update.success')); } + return redirect()->back()->withInput()->withErrors($model->getErrors()); } @@ -199,7 +197,7 @@ class AssetModelsController extends Controller } if ($model->image) { - try { + try { Storage::disk('public')->delete('models/'.$model->image); } catch (\Exception $e) { \Log::info($e); @@ -213,7 +211,6 @@ class AssetModelsController extends Controller return redirect()->route('models.index')->with('success', trans('admin/models/message.delete.success')); } - /** * Restore a given Asset Model (mark as un-deleted) * @@ -231,13 +228,13 @@ class AssetModelsController extends Controller if (isset($model->id)) { $model->restore(); + return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success')); } + return redirect()->back()->with('error', trans('admin/models/message.not_found')); - } - /** * Get the model information to present to the model view page * @@ -260,13 +257,13 @@ class AssetModelsController extends Controller } /** - * Get the clone page to clone a model - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @param int $modelId - * @return View - */ + * Get the clone page to clone a model + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @param int $modelId + * @return View + */ public function getClone($modelId = null) { // Check if the model exists @@ -284,23 +281,19 @@ class AssetModelsController extends Controller ->with('clone_model', $model_to_clone); } - /** - * Get the custom fields form - * - * @author [B. Wetherington] [] - * @since [v2.0] - * @param int $modelId - * @return View - */ + * Get the custom fields form + * + * @author [B. Wetherington] [] + * @since [v2.0] + * @param int $modelId + * @return View + */ public function getCustomFields($modelId) { - return view("models.custom_fields_form")->with("model", AssetModel::find($modelId)); + return view('models.custom_fields_form')->with('model', AssetModel::find($modelId)); } - - - /** * Returns a view that allows the user to bulk edit model attrbutes * @@ -310,28 +303,25 @@ class AssetModelsController extends Controller */ public function postBulkEdit(Request $request) { - $models_raw_array = $request->input('ids'); // Make sure some IDs have been selected if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) { - - $models = AssetModel::whereIn('id', $models_raw_array)->withCount('assets as assets_count')->orderBy('assets_count', 'ASC')->get(); // If deleting.... - if ($request->input('bulk_actions')=='delete') { + if ($request->input('bulk_actions') == 'delete') { $valid_count = 0; foreach ($models as $model) { if ($model->assets_count == 0) { $valid_count++; } } + return view('models/bulk-delete', compact('models'))->with('valid_count', $valid_count); // Otherwise display the bulk edit screen } else { - $nochange = ['NC' => 'No Change']; $fieldset_list = $nochange + Helper::customFieldsetList(); $depreciation_list = $nochange + Helper::depreciationList(); @@ -340,16 +330,12 @@ class AssetModelsController extends Controller ->with('fieldset_list', $fieldset_list) ->with('depreciation_list', $depreciation_list); } - } return redirect()->route('models.index') ->with('error', 'You must select at least one model to edit.'); - } - - /** * Returns a view that allows the user to bulk edit model attrbutes * @@ -359,35 +345,31 @@ class AssetModelsController extends Controller */ public function postBulkEditSave(Request $request) { - $models_raw_array = $request->input('ids'); - $update_array = array(); + $update_array = []; - - if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id')!='NC'))) { + if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) { $update_array['manufacturer_id'] = $request->input('manufacturer_id'); } - if (($request->filled('category_id') && ($request->input('category_id')!='NC'))) { + if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) { $update_array['category_id'] = $request->input('category_id'); } - if ($request->input('fieldset_id')!='NC') { + if ($request->input('fieldset_id') != 'NC') { $update_array['fieldset_id'] = $request->input('fieldset_id'); } - if ($request->input('depreciation_id')!='NC') { + if ($request->input('depreciation_id') != 'NC') { $update_array['depreciation_id'] = $request->input('depreciation_id'); } - - if (count($update_array) > 0) { AssetModel::whereIn('id', $models_raw_array)->update($update_array); + return redirect()->route('models.index') ->with('success', trans('admin/models/message.bulkedit.success')); } return redirect()->route('models.index') ->with('warning', trans('admin/models/message.bulkedit.error')); - } /** @@ -404,7 +386,6 @@ class AssetModelsController extends Controller $models_raw_array = $request->input('ids'); if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) { - $models = AssetModel::whereIn('id', $models_raw_array)->withCount('assets as assets_count')->get(); $del_error_count = 0; @@ -426,7 +407,7 @@ class AssetModelsController extends Controller if ($del_error_count == 0) { return redirect()->route('models.index') - ->with('success', trans('admin/models/message.bulkdelete.success',['success_count'=> $del_count] )); + ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count'=> $del_count])); } return redirect()->route('models.index') @@ -435,7 +416,6 @@ class AssetModelsController extends Controller return redirect()->route('models.index') ->with('error', trans('admin/models/message.bulkdelete.error')); - } /** @@ -443,13 +423,13 @@ class AssetModelsController extends Controller * any default values were entered into the form. * * @param array $input - * @return boolean + * @return bool */ private function shouldAddDefaultValues(array $input) { - return !empty($input['add_default_values']) - && !empty($input['default_values']) - && !empty($input['custom_fieldset']); + return ! empty($input['add_default_values']) + && ! empty($input['default_values']) + && ! empty($input['custom_fieldset']); } /** diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php index ec0ef1c365..2c34bc5c9c 100644 --- a/app/Http/Controllers/Assets/AssetCheckinController.php +++ b/app/Http/Controllers/Assets/AssetCheckinController.php @@ -13,7 +13,6 @@ use Illuminate\Support\Facades\View; class AssetCheckinController extends Controller { - /** * Returns a view that presents a form to check an asset back into inventory. * @@ -33,6 +32,7 @@ class AssetCheckinController extends Controller } $this->authorize('checkin', $asset); + return view('hardware/checkin', compact('asset'))->with('statusLabel_list', Helper::statusLabelList())->with('backto', $backto); } @@ -73,7 +73,7 @@ class AssetCheckinController extends Controller $asset->name = $request->get('name'); if ($request->filled('status_id')) { - $asset->status_id = e($request->get('status_id')); + $asset->status_id = e($request->get('status_id')); } // This is just meant to correct legacy issues where some user data would have 0 @@ -81,14 +81,14 @@ class AssetCheckinController extends Controller // rules, so it's necessary to fix this for long-time users. It's kinda gross, but will help // people (and their data) in the long run - if ($asset->rtd_location_id=='0') { + if ($asset->rtd_location_id == '0') { \Log::debug('Manually override the RTD location IDs'); \Log::debug('Original RTD Location ID: '.$asset->rtd_location_id); $asset->rtd_location_id = ''; \Log::debug('New RTD Location ID: '.$asset->rtd_location_id); } - if ($asset->location_id=='0') { + if ($asset->location_id == '0') { \Log::debug('Manually override the location IDs'); \Log::debug('Original Location ID: '.$asset->location_id); $asset->location_id = ''; @@ -99,14 +99,13 @@ class AssetCheckinController extends Controller \Log::debug('After Location ID: '.$asset->location_id); \Log::debug('After RTD Location ID: '.$asset->rtd_location_id); - if ($request->filled('location_id')) { \Log::debug('NEW Location ID: '.$request->get('location_id')); - $asset->location_id = e($request->get('location_id')); + $asset->location_id = e($request->get('location_id')); } $checkin_at = date('Y-m-d'); - if($request->filled('checkin_at')){ + if ($request->filled('checkin_at')) { $checkin_at = $request->input('checkin_at'); } @@ -114,12 +113,13 @@ class AssetCheckinController extends Controller if ($asset->save()) { event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at)); - if ((isset($user)) && ($backto =='user')) { - return redirect()->route("users.show", $user->id)->with('success', trans('admin/hardware/message.checkin.success')); + if ((isset($user)) && ($backto == 'user')) { + return redirect()->route('users.show', $user->id)->with('success', trans('admin/hardware/message.checkin.success')); } - return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkin.success')); + + return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkin.success')); } // Redirect to the asset management page with error - return redirect()->route("hardware.index")->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors()); + return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors()); } } diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php index dcb5154cfc..dc4ea8fb50 100644 --- a/app/Http/Controllers/Assets/AssetCheckoutController.php +++ b/app/Http/Controllers/Assets/AssetCheckoutController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Assets; - use App\Exceptions\CheckoutNotAllowed; use App\Helpers\Helper; use App\Http\Controllers\CheckInOutRequest; @@ -15,15 +14,16 @@ use Illuminate\Support\Facades\Auth; class AssetCheckoutController extends Controller { use CheckInOutRequest; + /** - * Returns a view that presents a form to check an asset out to a - * user. - * - * @author [A. Gianotto] [] - * @param int $assetId - * @since [v1.0] - * @return View - */ + * Returns a view that presents a form to check an asset out to a + * user. + * + * @author [A. Gianotto] [] + * @param int $assetId + * @since [v1.0] + * @return View + */ public function create($assetId) { // Check if the asset exists @@ -37,9 +37,8 @@ class AssetCheckoutController extends Controller return view('hardware/checkout', compact('asset')) ->with('statusLabel_list', Helper::deployableStatusLabelList()); } + return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available')); - - } /** @@ -55,9 +54,9 @@ class AssetCheckoutController extends Controller { try { // Check if the asset exists - if (!$asset = Asset::find($assetId)) { + if (! $asset = Asset::find($assetId)) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); - } elseif (!$asset->availableForCheckout()) { + } elseif (! $asset->availableForCheckout()) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available')); } $this->authorize('checkout', $asset); @@ -67,8 +66,8 @@ class AssetCheckoutController extends Controller $asset = $this->updateAssetLocation($asset, $target); - $checkout_at = date("Y-m-d H:i:s"); - if (($request->filled('checkout_at')) && ($request->get('checkout_at')!= date("Y-m-d"))) { + $checkout_at = date('Y-m-d H:i:s'); + if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) { $checkout_at = $request->get('checkout_at'); } @@ -82,7 +81,7 @@ class AssetCheckoutController extends Controller } if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $request->get('name'))) { - return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkout.success')); + return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success')); } // Redirect to the asset management page with error @@ -93,5 +92,4 @@ class AssetCheckoutController extends Controller return redirect()->back()->with('error', $e->getMessage()); } } - } diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php index 7cdd075ab9..276705b46a 100644 --- a/app/Http/Controllers/Assets/AssetFilesController.php +++ b/app/Http/Controllers/Assets/AssetFilesController.php @@ -2,14 +2,13 @@ namespace App\Http\Controllers\Assets; - +use App\Helpers\StorageHelper; use App\Http\Controllers\Controller; use App\Http\Requests\AssetFileRequest; use App\Models\Actionlog; use App\Models\Asset; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; -use App\Helpers\StorageHelper; class AssetFilesController extends Controller { @@ -25,15 +24,16 @@ class AssetFilesController extends Controller */ public function store(AssetFileRequest $request, $assetId = null) { - if (!$asset = Asset::find($assetId)) { + if (! $asset = Asset::find($assetId)) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } $this->authorize('update', $asset); if ($request->hasFile('file')) { - - if (!Storage::exists('private_uploads/assets')) Storage::makeDirectory('private_uploads/assets', 775); + if (! Storage::exists('private_uploads/assets')) { + Storage::makeDirectory('private_uploads/assets', 775); + } foreach ($request->file('file') as $file) { $extension = $file->getClientOriginalExtension(); @@ -41,6 +41,7 @@ class AssetFilesController extends Controller Storage::put('private_uploads/assets/'.$file_name, file_get_contents($file)); $asset->logUpload($file_name, e($request->get('notes'))); } + return redirect()->back()->with('success', trans('admin/hardware/message.upload.success')); } @@ -64,7 +65,7 @@ class AssetFilesController extends Controller if (isset($asset->id)) { $this->authorize('view', $asset); - if (!$log = Actionlog::find($fileId)) { + if (! $log = Actionlog::find($fileId)) { return response('No matching record for that asset/file', 500) ->header('Content-Type', 'text/plain'); } @@ -72,21 +73,23 @@ class AssetFilesController extends Controller $file = 'private_uploads/assets/'.$log->filename; \Log::debug('Checking for '.$file); - if ($log->action_type =='audit') { + if ($log->action_type == 'audit') { $file = 'private_uploads/audits/'.$log->filename; } - if (!Storage::exists($file)) { + if (! Storage::exists($file)) { return response('File '.$file.' not found on server', 404) ->header('Content-Type', 'text/plain'); } if ($download != 'true') { - if ($contents = file_get_contents(Storage::url($file))) { - return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file))); - } - return JsonResponse::create(["error" => "Failed validation: "], 500); + if ($contents = file_get_contents(Storage::url($file))) { + return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file))); + } + + return JsonResponse::create(['error' => 'Failed validation: '], 500); } + return StorageHelper::downloader($file); } // Prepare the error message @@ -117,13 +120,15 @@ class AssetFilesController extends Controller $this->authorize('update', $asset); $log = Actionlog::find($fileId); if ($log) { - if (Storage::exists($rel_path.'/'.$log->filename)) { - Storage::delete($rel_path.'/'.$log->filename); + if (Storage::exists($rel_path.'/'.$log->filename)) { + Storage::delete($rel_path.'/'.$log->filename); } $log->delete(); + return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); } $log->delete(); + return redirect()->back() ->with('success', trans('admin/hardware/message.deletefile.success')); } diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 8fed678d40..b4ea12b6f1 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -1,4 +1,5 @@ 3.5, 'width' => 3.5); - protected $barCodeDimensions = array( 'height' => 2, 'width' => 22); - + protected $qrCodeDimensions = ['height' => 3.5, 'width' => 3.5]; + protected $barCodeDimensions = ['height' => 2, 'width' => 22]; public function __construct() { @@ -65,6 +65,7 @@ class AssetsController extends Controller { $this->authorize('index', Asset::class); $company = Company::find($request->input('company_id')); + return view('hardware/index')->with('company', $company); } @@ -89,6 +90,7 @@ class AssetsController extends Controller $selected_model = AssetModel::find($request->input('model_id')); $view->with('selected_model', $selected_model); } + return $view; } @@ -114,42 +116,41 @@ class AssetsController extends Controller $serials = $request->input('serials'); for ($a = 1; $a <= count($asset_tags); $a++) { - $asset = new Asset(); $asset->model()->associate(AssetModel::find($request->input('model_id'))); - $asset->name = $request->input('name'); + $asset->name = $request->input('name'); // Check for a corresponding serial if (($serials) && (array_key_exists($a, $serials))) { - $asset->serial = $serials[$a]; + $asset->serial = $serials[$a]; } if (($asset_tags) && (array_key_exists($a, $asset_tags))) { - $asset->asset_tag = $asset_tags[$a]; + $asset->asset_tag = $asset_tags[$a]; } - $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $asset->model_id = $request->input('model_id'); - $asset->order_number = $request->input('order_number'); - $asset->notes = $request->input('notes'); - $asset->user_id = Auth::id(); - $asset->archived = '0'; - $asset->physical = '1'; - $asset->depreciate = '0'; - $asset->status_id = request('status_id', 0); - $asset->warranty_months = request('warranty_months', null); - $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); - $asset->purchase_date = request('purchase_date', null); - $asset->assigned_to = request('assigned_to', null); - $asset->supplier_id = request('supplier_id', 0); - $asset->requestable = request('requestable', 0); - $asset->rtd_location_id = request('rtd_location_id', null); + $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $asset->model_id = $request->input('model_id'); + $asset->order_number = $request->input('order_number'); + $asset->notes = $request->input('notes'); + $asset->user_id = Auth::id(); + $asset->archived = '0'; + $asset->physical = '1'; + $asset->depreciate = '0'; + $asset->status_id = request('status_id', 0); + $asset->warranty_months = request('warranty_months', null); + $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); + $asset->purchase_date = request('purchase_date', null); + $asset->assigned_to = request('assigned_to', null); + $asset->supplier_id = request('supplier_id', 0); + $asset->requestable = request('requestable', 0); + $asset->rtd_location_id = request('rtd_location_id', null); - if (!empty($settings->audit_interval)) { - $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); + if (! empty($settings->audit_interval)) { + $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); } - if ($asset->assigned_to=='') { + if ($asset->assigned_to == '') { $asset->location_id = $request->input('rtd_location_id', null); } @@ -164,17 +165,18 @@ class AssetsController extends Controller if (($model) && ($model->fieldset)) { foreach ($model->fieldset->fields as $field) { - if ($field->field_encrypted=='1') { + if ($field->field_encrypted == '1') { if (Gate::allows('admin')) { - if(is_array($request->input($field->convertUnicodeDbSlug()))){ + if (is_array($request->input($field->convertUnicodeDbSlug()))) { $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug())))); - }else{ + } else { $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug()))); - } } + } + } } else { - if(is_array($request->input($field->convertUnicodeDbSlug()))){ + if (is_array($request->input($field->convertUnicodeDbSlug()))) { $asset->{$field->convertUnicodeDbSlug()} = implode(', ', $request->input($field->convertUnicodeDbSlug())); - }else{ + } else { $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug()); } } @@ -183,7 +185,6 @@ class AssetsController extends Controller // Validate the asset before saving if ($asset->isValid() && $asset->save()) { - if (request('assigned_user')) { $target = User::find(request('assigned_user')); $location = $target->location_id; @@ -200,10 +201,7 @@ class AssetsController extends Controller } $success = true; - - } - } if ($success) { @@ -213,7 +211,6 @@ class AssetsController extends Controller } return redirect()->back()->withInput()->withErrors($asset->getErrors()); - } /** @@ -226,7 +223,7 @@ class AssetsController extends Controller */ public function edit($assetId = null) { - if (!$item = Asset::find($assetId)) { + if (! $item = Asset::find($assetId)) { // Redirect to the asset management page with error return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } @@ -238,7 +235,6 @@ class AssetsController extends Controller ->with('statuslabel_types', Helper::statusTypeList()); } - /** * Returns a view that presents information about an asset for detail view. * @@ -262,17 +258,17 @@ class AssetsController extends Controller if ($asset->location) { $use_currency = $asset->location->currency; } else { - if ($settings->default_currency!='') { + if ($settings->default_currency != '') { $use_currency = $settings->default_currency; } else { $use_currency = trans('general.currency'); } } - $qr_code = (object) array( + $qr_code = (object) [ 'display' => $settings->qr_code == '1', - 'url' => route('qr_code/hardware', $asset->id) - ); + 'url' => route('qr_code/hardware', $asset->id), + ]; return view('hardware/view', compact('asset', 'qr_code', 'settings')) ->with('use_currency', $use_currency)->with('audit_log', $audit_log); @@ -281,7 +277,6 @@ class AssetsController extends Controller return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } - /** * Validate and process asset edit form. * @@ -290,11 +285,10 @@ class AssetsController extends Controller * @since [v1.0] * @return Redirect */ - public function update(ImageUploadRequest $request, $assetId = null) { // Check if the asset exists - if (!$asset = Asset::find($assetId)) { + if (! $asset = Asset::find($assetId)) { // Redirect to the asset management page with error return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } @@ -311,11 +305,10 @@ class AssetsController extends Controller $asset->requestable = $request->filled('requestable'); $asset->rtd_location_id = $request->input('rtd_location_id', null); - if ($asset->assigned_to=='') { + if ($asset->assigned_to == '') { $asset->location_id = $request->input('rtd_location_id', null); } - if ($request->filled('image_delete')) { try { unlink(public_path().'/uploads/assets/'.$asset->image); @@ -323,21 +316,19 @@ class AssetsController extends Controller } catch (\Exception $e) { \Log::info($e); } - } - // Update the asset data - $asset_tag = $request->input('asset_tags'); - $serial = $request->input('serials'); - $asset->name = $request->input('name'); - $asset->serial = $serial[1]; - $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $asset->model_id = $request->input('model_id'); + $asset_tag = $request->input('asset_tags'); + $serial = $request->input('serials'); + $asset->name = $request->input('name'); + $asset->serial = $serial[1]; + $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $asset->model_id = $request->input('model_id'); $asset->order_number = $request->input('order_number'); - $asset->asset_tag = $asset_tag[1]; - $asset->notes = $request->input('notes'); - $asset->physical = '1'; + $asset->asset_tag = $asset_tag[1]; + $asset->notes = $request->input('notes'); + $asset->physical = '1'; $asset = $request->handleImages($asset); @@ -348,27 +339,26 @@ class AssetsController extends Controller $model = AssetModel::find($request->get('model_id')); if (($model) && ($model->fieldset)) { foreach ($model->fieldset->fields as $field) { - if ($field->field_encrypted=='1') { + if ($field->field_encrypted == '1') { if (Gate::allows('admin')) { - if(is_array($request->input($field->convertUnicodeDbSlug()))){ + if (is_array($request->input($field->convertUnicodeDbSlug()))) { $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug())))); - }else{ + } else { $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug()))); } } } else { - if(is_array($request->input($field->convertUnicodeDbSlug()))){ + if (is_array($request->input($field->convertUnicodeDbSlug()))) { $asset->{$field->convertUnicodeDbSlug()} = implode(', ', $request->input($field->convertUnicodeDbSlug())); - }else{ + } else { $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug()); } } } } - if ($asset->save()) { - return redirect()->route("hardware.show", $assetId) + return redirect()->route('hardware.show', $assetId) ->with('success', trans('admin/hardware/message.update.success')); } @@ -395,10 +385,10 @@ class AssetsController extends Controller DB::table('assets') ->where('id', $asset->id) - ->update(array('assigned_to' => null)); + ->update(['assigned_to' => null]); if ($asset->image) { - try { + try { Storage::disk('public')->delete('assets'.'/'.$asset->image); } catch (\Exception $e) { \Log::debug($e); @@ -410,8 +400,6 @@ class AssetsController extends Controller return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success')); } - - /** * Searches the assets table by asset tag, and redirects if it finds one * @@ -421,14 +409,16 @@ class AssetsController extends Controller */ public function getAssetByTag(Request $request) { - $topsearch = ($request->get('topsearch')=="true"); + $topsearch = ($request->get('topsearch') == 'true'); - if (!$asset = Asset::where('asset_tag', '=', $request->get('assetTag'))->first()) { + if (! $asset = Asset::where('asset_tag', '=', $request->get('assetTag'))->first()) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } $this->authorize('view', $asset); + return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch); } + /** * Return a QR code for the asset * @@ -450,20 +440,22 @@ class AssetsController extends Controller if (isset($asset->id, $asset->asset_tag)) { if (file_exists($qr_file)) { $header = ['Content-type' => 'image/png']; + return response()->file($qr_file, $header); } else { $barcode = new \Com\Tecnick\Barcode\Barcode(); - $barcode_obj = $barcode->getBarcodeObj($settings->barcode_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2)); + $barcode_obj = $barcode->getBarcodeObj($settings->barcode_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]); file_put_contents($qr_file, $barcode_obj->getPngData()); + return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); } } } + return 'That asset is invalid'; } } - /** * Return a 2D barcode for the asset * @@ -481,6 +473,7 @@ class AssetsController extends Controller if (isset($asset->id, $asset->asset_tag)) { if (file_exists($barcode_file)) { $header = ['Content-type' => 'image/png']; + return response()->file($barcode_file, $header); } else { // Calculate barcode width in pixel based on label width (inch) @@ -488,20 +481,19 @@ class AssetsController extends Controller $barcode = new \Com\Tecnick\Barcode\Barcode(); try { - $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50); + $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, ($barcode_width < 300 ? $barcode_width : 300), 50); file_put_contents($barcode_file, $barcode_obj->getPngData()); + return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); - } catch(\Exception $e) { + } catch (\Exception $e) { \Log::debug('The barcode format is invalid.'); + return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif'); } - - } } } - /** * Return a label for an individual asset. * @@ -523,7 +515,6 @@ class AssetsController extends Controller } } - /** * Returns a view that presents a form to clone an asset. * @@ -564,6 +555,7 @@ class AssetsController extends Controller public function getImportHistory() { $this->authorize('admin'); + return view('hardware/history'); } @@ -572,49 +564,48 @@ class AssetsController extends Controller * * This needs a LOT of love. It's done very inelegantly right now, and there are * a ton of optimizations that could (and should) be done. - * + * * Updated to respect checkin dates: * No checkin column, assume all items are checked in (todays date) * Checkin date in the past, update history. * Checkin date in future or empty, check the item out to the user. - * + * * @author [A. Gianotto] [] * @since [v3.3] * @return View */ public function postImportHistory(Request $request) { - - if (!$request->hasFile('user_import_csv')) { + if (! $request->hasFile('user_import_csv')) { return back()->with('error', 'No file provided. Please select a file for import and try again. '); } - if (!ini_get("auto_detect_line_endings")) { - ini_set("auto_detect_line_endings", '1'); + if (! ini_get('auto_detect_line_endings')) { + ini_set('auto_detect_line_endings', '1'); } $csv = Reader::createFromPath($request->file('user_import_csv')); $csv->setHeaderOffset(0); $header = $csv->getHeader(); - $isCheckinHeaderExplicit = in_array("checkin date", (array_map('strtolower', $header))); + $isCheckinHeaderExplicit = in_array('checkin date', (array_map('strtolower', $header))); $results = $csv->getRecords(); - $item = array(); - $status = array(); - $status['error'] = array(); - $status['success'] = array(); + $item = []; + $status = []; + $status['error'] = []; + $status['success'] = []; foreach ($results as $row) { if (is_array($row)) { $row = array_change_key_case($row, CASE_LOWER); - $asset_tag = Helper::array_smart_fetch($row, "asset tag"); - if (!array_key_exists($asset_tag, $item)) { - $item[$asset_tag] = array(); + $asset_tag = Helper::array_smart_fetch($row, 'asset tag'); + if (! array_key_exists($asset_tag, $item)) { + $item[$asset_tag] = []; } $batch_counter = count($item[$asset_tag]); - $item[$asset_tag][$batch_counter]['checkout_date'] = Carbon::parse(Helper::array_smart_fetch($row, "checkout date"))->format('Y-m-d H:i:s'); - - if ($isCheckinHeaderExplicit){ + $item[$asset_tag][$batch_counter]['checkout_date'] = Carbon::parse(Helper::array_smart_fetch($row, 'checkout date'))->format('Y-m-d H:i:s'); + + if ($isCheckinHeaderExplicit) { //checkin date not empty, assume past transaction or future checkin date (expected) - if (!empty(Helper::array_smart_fetch($row, "checkin date"))) { - $item[$asset_tag][$batch_counter]['checkin_date'] = Carbon::parse(Helper::array_smart_fetch($row, "checkin date"))->format('Y-m-d H:i:s'); + if (! empty(Helper::array_smart_fetch($row, 'checkin date'))) { + $item[$asset_tag][$batch_counter]['checkin_date'] = Carbon::parse(Helper::array_smart_fetch($row, 'checkin date'))->format('Y-m-d H:i:s'); } else { $item[$asset_tag][$batch_counter]['checkin_date'] = ''; } @@ -623,44 +614,44 @@ class AssetsController extends Controller $item[$asset_tag][$batch_counter]['checkin_date'] = Carbon::parse(now())->format('Y-m-d H:i:s'); } - $item[$asset_tag][$batch_counter]['asset_tag'] = Helper::array_smart_fetch($row, "asset tag"); - $item[$asset_tag][$batch_counter]['name'] = Helper::array_smart_fetch($row, "name"); - $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, "email"); + $item[$asset_tag][$batch_counter]['asset_tag'] = Helper::array_smart_fetch($row, 'asset tag'); + $item[$asset_tag][$batch_counter]['name'] = Helper::array_smart_fetch($row, 'name'); + $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, 'email'); if ($asset = Asset::where('asset_tag', '=', $asset_tag)->first()) { $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id; $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format, $item[$asset_tag][$batch_counter]['name']); $user = User::where('username', '=', $base_username['username']); $user_query = ' on username '.$base_username['username']; - if ($request->input('match_firstnamelastname')=='1') { + if ($request->input('match_firstnamelastname') == '1') { $firstnamedotlastname = User::generateFormattedNameFromFullName('firstname.lastname', $item[$asset_tag][$batch_counter]['name']); $item[$asset_tag][$batch_counter]['username'][] = $firstnamedotlastname['username']; $user->orWhere('username', '=', $firstnamedotlastname['username']); $user_query .= ', or on username '.$firstnamedotlastname['username']; } - if ($request->input('match_flastname')=='1') { + if ($request->input('match_flastname') == '1') { $flastname = User::generateFormattedNameFromFullName('filastname', $item[$asset_tag][$batch_counter]['name']); $item[$asset_tag][$batch_counter]['username'][] = $flastname['username']; $user->orWhere('username', '=', $flastname['username']); $user_query .= ', or on username '.$flastname['username']; } - if ($request->input('match_firstname')=='1') { + if ($request->input('match_firstname') == '1') { $firstname = User::generateFormattedNameFromFullName('firstname', $item[$asset_tag][$batch_counter]['name']); $item[$asset_tag][$batch_counter]['username'][] = $firstname['username']; $user->orWhere('username', '=', $firstname['username']); $user_query .= ', or on username '.$firstname['username']; } - if ($request->input('match_email')=='1') { - if ($item[$asset_tag][$batch_counter]['name']=='') { + if ($request->input('match_email') == '1') { + if ($item[$asset_tag][$batch_counter]['name'] == '') { $item[$asset_tag][$batch_counter]['username'][] = $user_email = User::generateEmailFromFullName($item[$asset_tag][$batch_counter]['name']); $user->orWhere('username', '=', $user_email); $user_query .= ', or on username '.$user_email; } } - if ($request->input('match_username') == '1'){ + if ($request->input('match_username') == '1') { // Added #8825: add explicit username lookup - $raw_username = $item[$asset_tag][$batch_counter]['name']; - $user->orWhere('username', '=', $raw_username); - $user_query .= ', or on username ' . $raw_username; + $raw_username = $item[$asset_tag][$batch_counter]['name']; + $user->orWhere('username', '=', $raw_username); + $user_query .= ', or on username '.$raw_username; } // A matching user was found @@ -668,7 +659,7 @@ class AssetsController extends Controller //$user is now matched user from db $item[$asset_tag][$batch_counter]['user_id'] = $user->id; - Actionlog::firstOrCreate(array( + Actionlog::firstOrCreate([ 'item_id' => $asset->id, 'item_type' => Asset::class, 'user_id' => Auth::user()->id, @@ -677,7 +668,7 @@ class AssetsController extends Controller 'target_type' => User::class, 'created_at' => $item[$asset_tag][$batch_counter]['checkout_date'], 'action_type' => 'checkout', - )); + ]); $checkin_date = $item[$asset_tag][$batch_counter]['checkin_date']; @@ -685,7 +676,7 @@ class AssetsController extends Controller //if checkin date header exists, assume that empty or future date is still checked out //if checkin is before todays date, assume it's checked in and do not assign user ID, if checkin date is in the future or blank, this is the expected checkin date, items is checked out - + if ((strtotime($checkin_date) > strtotime(Carbon::now())) || (empty($checkin_date)) ) { //only do this if item is checked out @@ -694,29 +685,27 @@ class AssetsController extends Controller } } - if (!empty($checkin_date)) { + if (! empty($checkin_date)) { //only make a checkin there is a valid checkin date or we created one on import. - Actionlog::firstOrCreate(array( - 'item_id' => - $item[$asset_tag][$batch_counter]['asset_id'], + Actionlog::firstOrCreate([ + 'item_id' => $item[$asset_tag][$batch_counter]['asset_id'], 'item_type' => Asset::class, 'user_id' => Auth::user()->id, - 'note' => 'Checkin imported by ' . Auth::user()->present()->fullName() . ' from history importer', + 'note' => 'Checkin imported by '.Auth::user()->present()->fullName().' from history importer', 'target_id' => null, 'created_at' => $checkin_date, - 'action_type' => 'checkin' - )); - + 'action_type' => 'checkin', + ]); } - + if ($asset->save()) { - $status['success'][]['asset'][$asset_tag]['msg'] = 'Asset successfully matched for '.Helper::array_smart_fetch($row, "name").$user_query.' on '.$item[$asset_tag][$batch_counter]['checkout_date']; + $status['success'][]['asset'][$asset_tag]['msg'] = 'Asset successfully matched for '.Helper::array_smart_fetch($row, 'name').$user_query.' on '.$item[$asset_tag][$batch_counter]['checkout_date']; } else { $status['error'][]['asset'][$asset_tag]['msg'] = 'Asset and user was matched but could not be saved.'; } } else { $item[$asset_tag][$batch_counter]['user_id'] = null; - $status['error'][]['user'][Helper::array_smart_fetch($row, "name")]['msg'] = 'User does not exist so no checkin log was created.'; + $status['error'][]['user'][Helper::array_smart_fetch($row, 'name')]['msg'] = 'User does not exist so no checkin log was created.'; } } else { $item[$asset_tag][$batch_counter]['asset_id'] = null; @@ -724,6 +713,7 @@ class AssetsController extends Controller } } } + return view('hardware/history')->with('status', $status); } @@ -752,12 +742,13 @@ class AssetsController extends Controller $logaction = new Actionlog(); $logaction->item_type = Asset::class; $logaction->item_id = $asset->id; - $logaction->created_at = date("Y-m-d H:i:s"); + $logaction->created_at = date('Y-m-d H:i:s'); $logaction->user_id = Auth::user()->id; $logaction->logaction('restored'); return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success')); } + return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } @@ -765,41 +756,42 @@ class AssetsController extends Controller { $this->authorize('audit', Asset::class); $dt = Carbon::now()->addMonths(12)->toDateString(); + return view('hardware/quickscan')->with('next_audit_date', $dt); } - - public function audit($id) { $settings = Setting::getSettings(); $this->authorize('audit', Asset::class); $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); $asset = Asset::findOrFail($id); + return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list'); } public function dueForAudit() { $this->authorize('audit', Asset::class); + return view('hardware/audit-due'); } public function overdueForAudit() { $this->authorize('audit', Asset::class); + return view('hardware/audit-overdue'); } - public function auditStore(Request $request, $id) { $this->authorize('audit', Asset::class); - $rules = array( + $rules = [ 'location_id' => 'exists:locations,id|nullable|numeric', - 'next_audit_date' => 'date|nullable' - ); + 'next_audit_date' => 'date|nullable', + ]; $validator = \Validator::make($request->all(), $rules); @@ -817,27 +809,28 @@ class AssetsController extends Controller // Check to see if they checked the box to update the physical location, // not just note it in the audit notes - if ($request->input('update_location')=='1') { + if ($request->input('update_location') == '1') { \Log::debug('update location in audit'); $asset->location_id = $request->input('location_id'); } - if ($asset->save()) { $file_name = ''; // Upload an image, if attached if ($request->hasFile('image')) { $path = 'private_uploads/audits'; - if (!Storage::exists($path)) Storage::makeDirectory($path, 775); + if (! Storage::exists($path)) { + Storage::makeDirectory($path, 775); + } $upload = $image = $request->file('image'); $ext = $image->getClientOriginalExtension(); $file_name = 'audit-'.str_random(18).'.'.$ext; Storage::putFileAs($path, $upload, $file_name); } - $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name); - return redirect()->to("hardware")->with('success', trans('admin/hardware/message.audit.success')); + + return redirect()->to('hardware')->with('success', trans('admin/hardware/message.audit.success')); } } @@ -853,5 +846,4 @@ class AssetsController extends Controller return view('hardware/requested', compact('requestedItems')); } - } diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 1a6da89c96..ebc2b08738 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -28,14 +28,14 @@ class BulkAssetsController extends Controller { $this->authorize('update', Asset::class); - if (!$request->filled('ids')) { + if (! $request->filled('ids')) { return redirect()->back()->with('error', 'No assets selected'); } $asset_ids = array_keys($request->input('ids')); if ($request->filled('bulk_actions')) { - switch($request->input('bulk_actions')) { + switch ($request->input('bulk_actions')) { case 'labels': return view('hardware/labels') ->with('assets', Asset::find($asset_ids)) @@ -47,6 +47,7 @@ class BulkAssetsController extends Controller $assets->each(function ($asset) { $this->authorize('delete', $asset); }); + return view('hardware/bulk-delete')->with('assets', $assets); case 'edit': return view('hardware/bulk') @@ -54,6 +55,7 @@ class BulkAssetsController extends Controller ->with('statuslabel_list', Helper::statusLabelList()); } } + return redirect()->back()->with('error', 'No action selected'); } @@ -71,8 +73,8 @@ class BulkAssetsController extends Controller \Log::debug($request->input('ids')); - if(!$request->filled('ids') || count($request->input('ids')) <= 0) { - return redirect()->route("hardware.index")->with('warning', trans('No assets selected, so nothing was updated.')); + if (! $request->filled('ids') || count($request->input('ids')) <= 0) { + return redirect()->route('hardware.index')->with('warning', trans('No assets selected, so nothing was updated.')); } $assets = array_keys($request->input('ids')); @@ -102,12 +104,12 @@ class BulkAssetsController extends Controller ->conditionallyAddItem('warranty_months'); if ($request->filled('purchase_cost')) { - $this->update_array['purchase_cost'] = Helper::ParseFloat($request->input('purchase_cost')); + $this->update_array['purchase_cost'] = Helper::ParseFloat($request->input('purchase_cost')); } if ($request->filled('company_id')) { - $this->update_array['company_id'] = $request->input('company_id'); - if ($request->input('company_id')=="clear") { + $this->update_array['company_id'] = $request->input('company_id'); + if ($request->input('company_id') == 'clear') { $this->update_array['company_id'] = null; } } @@ -123,29 +125,31 @@ class BulkAssetsController extends Controller ->where('id', $assetId) ->update($this->update_array); } // endforeach - return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.update.success')); - // no values given, nothing to update - } - return redirect()->route("hardware.index")->with('warning', trans('admin/hardware/message.update.nothing_updated')); + return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.update.success')); + // no values given, nothing to update + } + + return redirect()->route('hardware.index')->with('warning', trans('admin/hardware/message.update.nothing_updated')); } /** * Array to store update data per item - * @var Array + * @var array */ private $update_array; /** * Adds parameter to update array for an item if it exists in request - * @param String $field field name + * @param string $field field name * @return BulkAssetsController Model for Chaining */ protected function conditionallyAddItem($field) { - if(request()->filled($field)) { + if (request()->filled($field)) { $this->update_array[$field] = request()->input($field); } + return $this; } @@ -173,10 +177,12 @@ class BulkAssetsController extends Controller ->where('id', $asset->id) ->update($update_array); } // endforeach - return redirect()->to("hardware")->with('success', trans('admin/hardware/message.delete.success')); + + return redirect()->to('hardware')->with('success', trans('admin/hardware/message.delete.success')); // no values given, nothing to update } - return redirect()->to("hardware")->with('info', trans('admin/hardware/message.delete.nothing_updated')); + + return redirect()->to('hardware')->with('info', trans('admin/hardware/message.delete.nothing_updated')); } /** @@ -202,21 +208,21 @@ class BulkAssetsController extends Controller $target = $this->determineCheckoutTarget(); - if (!is_array($request->get('selected_assets'))) { + if (! is_array($request->get('selected_assets'))) { return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected')); } $asset_ids = array_filter($request->get('selected_assets')); - if(request('checkout_to_type') =='asset') { + if (request('checkout_to_type') == 'asset') { foreach ($asset_ids as $asset_id) { - if ($target->id == $asset_id) { + if ($target->id == $asset_id) { return redirect()->back()->with('error', 'You cannot check an asset out to itself.'); } } } - $checkout_at = date("Y-m-d H:i:s"); - if (($request->filled('checkout_at')) && ($request->get('checkout_at')!= date("Y-m-d"))) { + $checkout_at = date('Y-m-d H:i:s'); + if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) { $checkout_at = e($request->get('checkout_at')); } @@ -228,13 +234,12 @@ class BulkAssetsController extends Controller $errors = []; DB::transaction(function () use ($target, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids, $request) { - foreach ($asset_ids as $asset_id) { $asset = Asset::findOrFail($asset_id); $this->authorize('checkout', $asset); $error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), null); - if ($target->location_id!='') { + if ($target->location_id != '') { $asset->location_id = $target->location_id; $asset->unsetEventDispatcher(); $asset->save(); @@ -246,14 +251,14 @@ class BulkAssetsController extends Controller } }); - if (!$errors) { - // Redirect to the new asset page - return redirect()->to("hardware")->with('success', trans('admin/hardware/message.checkout.success')); + if (! $errors) { + // Redirect to the new asset page + return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success')); } // Redirect to the asset management page with error - return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors); + return redirect()->to('hardware/bulk-checkout')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors); } catch (ModelNotFoundException $e) { - return redirect()->to("hardware/bulk-checkout")->with('error', $e->getErrors()); + return redirect()->to('hardware/bulk-checkout')->with('error', $e->getErrors()); } } } diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index d54ca4ed09..74f5df4c1a 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -41,8 +41,6 @@ class ForgotPasswordController extends Controller return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link'); } - - /** * Send a reset link to the given user. * @@ -57,12 +55,9 @@ class ForgotPasswordController extends Controller * buffer overflow issues with attackers sending very large * payloads through. */ - $request->validate([ 'username' => ['required', 'max:255'], ]); - - /** * If we find a matching email with an activated user, we will @@ -85,7 +80,6 @@ class ForgotPasswordController extends Controller \Log::info('Password reset attempt: User matching username '.$request->input('username').' NOT FOUND or user is inactive'); } - /** * If an error was returned by the password broker, we will get this message * translated so we can notify a user of the problem. We'll redirect back @@ -97,12 +91,10 @@ class ForgotPasswordController extends Controller * * Instead we tell the user we've sent an email even though we haven't. * It's bad UX, but better security. The compromises we sometimes have to make. - */ + */ // Regardless of response, we do not want to disclose the status of a user account, // so we give them a generic "If this exists, we're TOTALLY gonna email you" response - return redirect()->route('login')->with('success',trans('passwords.sent')); - } - - + return redirect()->route('login')->with('success', trans('passwords.sent')); + } } diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 101a55bc80..b7bbe45365 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -27,7 +27,6 @@ use Redirect; */ class LoginController extends Controller { - use ThrottlesLogins; // This tells the auth controller to use username instead of email address @@ -61,13 +60,13 @@ class LoginController extends Controller public function __construct(/*LdapAd $ldap, */ Saml $saml) { parent::__construct(); - $this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]); + $this->middleware('guest', ['except' => ['logout', 'postTwoFactorAuth', 'getTwoFactorAuth', 'getTwoFactorEnroll']]); Session::put('backUrl', \URL::previous()); // $this->ldap = $ldap; $this->saml = $saml; } - function showLoginForm(Request $request) + public function showLoginForm(Request $request) { $this->loginViaRemoteUser($request); $this->loginViaSaml($request); @@ -75,11 +74,11 @@ class LoginController extends Controller return redirect()->intended('/'); } - if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == "1" && !($request->has('nosaml') || $request->session()->has('error'))) { + if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == '1' && ! ($request->has('nosaml') || $request->session()->has('error'))) { return redirect()->route('saml.login'); } - if (Setting::getSettings()->login_common_disabled == "1") { + if (Setting::getSettings()->login_common_disabled == '1') { return view('errors.403'); } @@ -88,26 +87,26 @@ class LoginController extends Controller /** * Log in a user by SAML - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param Request $request - * + * * @return User - * + * * @throws \Exception */ private function loginViaSaml(Request $request) { $saml = $this->saml; $samlData = $request->session()->get('saml_login'); - if ($saml->isEnabled() && !empty($samlData)) { + if ($saml->isEnabled() && ! empty($samlData)) { try { - Log::debug("Attempting to log user in by SAML authentication."); + Log::debug('Attempting to log user in by SAML authentication.'); $user = $saml->samlLogin($samlData); - if(!is_null($user)) { + if (! is_null($user)) { Auth::login($user); } else { $username = $saml->getUsername(); @@ -121,7 +120,7 @@ class LoginController extends Controller $user->save(); } } catch (\Exception $e) { - \Log::warning("There was an error authenticating the SAML user: " . $e->getMessage()); + \Log::warning('There was an error authenticating the SAML user: '.$e->getMessage()); throw new \Exception($e->getMessage()); } } @@ -129,24 +128,24 @@ class LoginController extends Controller /** * Log in a user by LDAP - * + * * @author Wes Hulette - * + * * @since 5.0.0 * * @param Request $request - * + * * @return User - * + * * @throws \Exception */ private function loginViaLdap(Request $request): User { - $ldap = \App::make( LdapAd::class); + $ldap = \App::make(LdapAd::class); try { return $ldap->ldapLogin($request->input('username'), $request->input('password')); } catch (\Exception $ex) { - LOG::debug("LDAP user login: " . $ex->getMessage()); + LOG::debug('LDAP user login: '.$ex->getMessage()); throw new \Exception($ex->getMessage()); } } @@ -155,7 +154,7 @@ class LoginController extends Controller { $header_name = Setting::getSettings()->login_remote_user_header_name ?: 'REMOTE_USER'; $remote_user = $request->server($header_name); - if (Setting::getSettings()->login_remote_user_enabled == "1" && isset($remote_user) && !empty($remote_user)) { + if (Setting::getSettings()->login_remote_user_enabled == '1' && isset($remote_user) && ! empty($remote_user)) { Log::debug("Authenticating via HTTP header $header_name."); $strip_prefixes = [ @@ -170,7 +169,7 @@ class LoginController extends Controller $pos = 0; foreach ($strip_prefixes as $needle) { - if (($pos = strpos($remote_user, $needle)) !== FALSE) { + if (($pos = strpos($remote_user, $needle)) !== false) { $pos += strlen($needle); break; } @@ -178,14 +177,16 @@ class LoginController extends Controller if ($pos > 0) { $remote_user = substr($remote_user, $pos); - }; - + } + try { $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('activated', '=', '1')->first(); - Log::debug("Remote user auth lookup complete"); - if(!is_null($user)) Auth::login($user, $request->input('remember')); - } catch(Exception $e) { - Log::debug("There was an error authenticating the Remote user: " . $e->getMessage()); + Log::debug('Remote user auth lookup complete'); + if (! is_null($user)) { + Auth::login($user, $request->input('remember')); + } + } catch (Exception $e) { + Log::debug('There was an error authenticating the Remote user: '.$e->getMessage()); } } } @@ -197,7 +198,7 @@ class LoginController extends Controller */ public function login(Request $request) { - if (Setting::getSettings()->login_common_disabled == "1") { + if (Setting::getSettings()->login_common_disabled == '1') { return view('errors.403'); } @@ -212,6 +213,7 @@ class LoginController extends Controller if ($lockedOut = $this->hasTooManyLoginAttempts($request)) { $this->fireLockoutEvent($request); + return $this->sendLockoutResponse($request); } @@ -219,34 +221,33 @@ class LoginController extends Controller // Should we even check for LDAP users? if (Setting::getSettings()->ldap_enabled) { // avoid hitting the $this->ldap - LOG::debug("LDAP is enabled."); + LOG::debug('LDAP is enabled.'); try { - LOG::debug("Attempting to log user in by LDAP authentication."); + LOG::debug('Attempting to log user in by LDAP authentication.'); $user = $this->loginViaLdap($request); Auth::login($user, $request->input('remember')); - // If the user was unable to login via LDAP, log the error and let them fall through to + // If the user was unable to login via LDAP, log the error and let them fall through to // local authentication. } catch (\Exception $e) { - Log::debug("There was an error authenticating the LDAP user: ".$e->getMessage()); + Log::debug('There was an error authenticating the LDAP user: '.$e->getMessage()); } } // If the user wasn't authenticated via LDAP, skip to local auth - if (!$user) { - Log::debug("Authenticating user against database."); - // Try to log the user in - if (!Auth::attempt(['username' => $request->input('username'), 'password' => $request->input('password'), 'activated' => 1], $request->input('remember'))) { - - if (!$lockedOut) { + if (! $user) { + Log::debug('Authenticating user against database.'); + // Try to log the user in + if (! Auth::attempt(['username' => $request->input('username'), 'password' => $request->input('password'), 'activated' => 1], $request->input('remember'))) { + if (! $lockedOut) { $this->incrementLoginAttempts($request); } - Log::debug("Local authentication failed."); + Log::debug('Local authentication failed.'); + return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found')); } else { - - $this->clearLoginAttempts($request); + $this->clearLoginAttempts($request); } } @@ -259,7 +260,6 @@ class LoginController extends Controller return redirect()->intended()->with('success', trans('auth/message.signin.success')); } - /** * Two factor enrollment page * @@ -269,11 +269,10 @@ class LoginController extends Controller { // Make sure the user is logged in - if (!Auth::check()) { + if (! Auth::check()) { return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } - $settings = Setting::getSettings(); $user = Auth::user(); @@ -283,7 +282,7 @@ class LoginController extends Controller // While you can access this page directly, enrolling a device when 2FA isn't enforced // won't cause any harm. - if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) { + if (($user->two_factor_secret != '') && ($user->two_factor_enrolled == 1)) { return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled')); } @@ -310,7 +309,6 @@ class LoginController extends Controller return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj); } - /** * Two factor code form page * @@ -319,7 +317,7 @@ class LoginController extends Controller public function getTwoFactorAuth() { // Check that the user is logged in - if (!Auth::check()) { + if (! Auth::check()) { return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } @@ -328,7 +326,7 @@ class LoginController extends Controller // Check whether there is a device enrolled. // This *should* be handled via the \App\Http\Middleware\CheckForTwoFactor middleware // but we're just making sure (in case someone edited the database directly, etc) - if (($user->two_factor_secret=='') || ($user->two_factor_enrolled!=1)) { + if (($user->two_factor_secret == '') || ($user->two_factor_enrolled != 1)) { return redirect()->route('two-factor-enroll'); } @@ -344,16 +342,15 @@ class LoginController extends Controller */ public function postTwoFactorAuth(Request $request) { - - if (!Auth::check()) { + if (! Auth::check()) { return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } - if (!$request->filled('two_factor_secret')) { + if (! $request->filled('two_factor_secret')) { return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required')); } - if (!$request->has('two_factor_secret')) { + if (! $request->has('two_factor_secret')) { return redirect()->route('two-factor')->with('error', 'Two-factor code is required.'); } @@ -364,15 +361,13 @@ class LoginController extends Controller $user->two_factor_enrolled = 1; $user->save(); $request->session()->put('2fa_authed', 'true'); + return redirect()->route('home')->with('success', 'You are logged in!'); } return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code')); - - } - /** * Logout page. * @@ -390,15 +385,15 @@ class LoginController extends Controller if ($saml->isEnabled()) { $auth = $saml->getAuth(); $sloRedirectUrl = $request->session()->get('saml_slo_redirect_url'); - - if (!empty($auth->getSLOurl()) && $settings->saml_slo == '1' && $saml->isAuthenticated() && empty($sloRedirectUrl)) { - $sloRequestUrl = $auth->logout(null, array(), $saml->getNameId(), $saml->getSessionIndex(), true, $saml->getNameIdFormat(), $saml->getNameIdNameQualifier(), $saml->getNameIdSPNameQualifier()); + + if (! empty($auth->getSLOurl()) && $settings->saml_slo == '1' && $saml->isAuthenticated() && empty($sloRedirectUrl)) { + $sloRequestUrl = $auth->logout(null, [], $saml->getNameId(), $saml->getSessionIndex(), true, $saml->getNameIdFormat(), $saml->getNameIdNameQualifier(), $saml->getNameIdSPNameQualifier()); } $saml->clearData(); } - if (!empty($sloRequestUrl)) { + if (! empty($sloRequestUrl)) { return redirect()->away($sloRequestUrl); } @@ -407,11 +402,11 @@ class LoginController extends Controller $request->session()->regenerate(true); Auth::logout(); - if (!empty($sloRedirectUrl)) { + if (! empty($sloRedirectUrl)) { return redirect()->away($sloRedirectUrl); } - $customLogoutUrl = $settings->login_remote_user_custom_logout_url ; + $customLogoutUrl = $settings->login_remote_user_custom_logout_url; if ($settings->login_remote_user_enabled == '1' && $customLogoutUrl != '') { return redirect()->away($customLogoutUrl); } @@ -419,7 +414,6 @@ class LoginController extends Controller return redirect()->route('login')->with(['success' => trans('auth/message.logout.success'), 'loggedout' => true]); } - /** * Get a validator for an incoming registration request. * @@ -434,7 +428,6 @@ class LoginController extends Controller ]); } - public function username() { return 'username'; @@ -461,7 +454,6 @@ class LoginController extends Controller ->withErrors([$this->username() => $message]); } - /** * Override the lockout time and duration * @@ -480,13 +472,13 @@ class LoginController extends Controller ); } - public function legacyAuthRedirect() { + public function legacyAuthRedirect() + { return redirect()->route('login'); } public function redirectTo() { - return Session::get('backUrl') ? Session::get('backUrl') : $this->redirectTo; + return Session::get('backUrl') ? Session::get('backUrl') : $this->redirectTo; } - } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 901af3e2d0..1a188b51e1 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -6,17 +6,18 @@ use App\Http\Controllers\Controller; class RegisterController extends Controller { - public function __construct() { $this->middleware('guest'); } - public function showRegistrationForm() { - abort(404,'Page not found'); + public function showRegistrationForm() + { + abort(404, 'Page not found'); } - - public function register() { - abort(404,'Page not found'); + + public function register() + { + abort(404, 'Page not found'); } } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 92b86fd737..95700e2992 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -54,29 +54,25 @@ class ResetPasswordController extends Controller ]; } - protected function credentials(Request $request) { return $request->only( 'username', 'password', 'password_confirmation', 'token' ); } - public function showResetForm(Request $request, $token = null) { return view('auth.passwords.reset')->with( [ 'token' => $token, - 'username' => $request->input('username') + 'username' => $request->input('username'), ] ); } - public function reset(Request $request) { - $messages = [ 'password.not_in' => trans('validation.disallow_same_pwd_as_user_fields'), ]; @@ -87,15 +83,13 @@ class ResetPasswordController extends Controller $user = User::where('username', '=', $request->input('username'))->first(); $broker = $this->broker(); - if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== FALSE) { + if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) { $request->validate( [ - 'password' => 'required|notIn:["'.$user->email.'","'.$user->username.'","'.$user->first_name.'","'.$user->last_name.'"' + 'password' => 'required|notIn:["'.$user->email.'","'.$user->username.'","'.$user->first_name.'","'.$user->last_name.'"', ], $messages); - } - $response = $broker->reset( $this->credentials($request), function ($user, $password) { $this->resetPassword($user, $password); @@ -107,14 +101,10 @@ class ResetPasswordController extends Controller : $this->sendResetFailedResponse($request, $response); } - protected function sendResetFailedResponse(Request $request, $response) { return redirect()->back() ->withInput(['username'=> $request->input('username')]) ->withErrors(['username' => trans($response), 'password' => trans($response)]); } - - - } diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.php index 5a2075daed..41eda91d9c 100644 --- a/app/Http/Controllers/Auth/SamlController.php +++ b/app/Http/Controllers/Auth/SamlController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Services\Saml; +use Illuminate\Http\Request; use Log; /** @@ -30,20 +30,20 @@ class SamlController extends Controller { $this->saml = $saml; - $this->middleware('guest', ['except' => ['metadata','sls']]); + $this->middleware('guest', ['except' => ['metadata', 'sls']]); } /** * Return SAML SP metadata for Snipe-IT - * + * * /saml/metadata - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param Request $request - * + * * @return Response */ public function metadata(Request $request) @@ -53,7 +53,7 @@ class SamlController extends Controller if (empty($metadata)) { return response()->view('errors.403', [], 403); } - + return response()->streamDownload(function () use ($metadata) { echo $metadata; }, 'snipe-it-metadata.xml', ['Content-Type' => 'text/xml']); @@ -61,36 +61,37 @@ class SamlController extends Controller /** * Begin the SP-Initiated SSO by sending AuthN to the IdP. - * + * * /login/saml - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param Request $request - * + * * @return Redirect */ public function login(Request $request) { $auth = $this->saml->getAuth(); - $ssoUrl = $auth->login(null, array(), false, false, false, false); + $ssoUrl = $auth->login(null, [], false, false, false, false); + return redirect()->away($ssoUrl); } /** * Receives, parses the assertion from IdP and flashes SAML data * back to the LoginController for authentication. - * + * * /saml/acs - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param Request $request - * + * * @return Redirect */ public function acs(Request $request) @@ -100,9 +101,10 @@ class SamlController extends Controller $auth->processResponse(); $errors = $auth->getErrors(); - if (!empty($errors)) { - Log::error("There was an error with SAML ACS: " . implode(', ', $errors)); - Log::error("Reason: " . $auth->getLastErrorReason()); + if (! empty($errors)) { + Log::error('There was an error with SAML ACS: '.implode(', ', $errors)); + Log::error('Reason: '.$auth->getLastErrorReason()); + return redirect()->route('login')->with('error', trans('auth/message.signin.error')); } @@ -114,15 +116,15 @@ class SamlController extends Controller /** * Receives LogoutRequest/LogoutResponse from IdP and flashes * back to the LoginController for logging out. - * + * * /saml/sls - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param Request $request - * + * * @return Redirect */ public function sls(Request $request) @@ -131,10 +133,11 @@ class SamlController extends Controller $retrieveParametersFromServer = $this->saml->getSetting('retrieveParametersFromServer', false); $sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true); $errors = $auth->getErrors(); - - if (!empty($errors)) { - Log::error("There was an error with SAML SLS: " . implode(', ', $errors)); - Log::error("Reason: " . $auth->getLastErrorReason()); + + if (! empty($errors)) { + Log::error('There was an error with SAML SLS: '.implode(', ', $errors)); + Log::error('Reason: '.$auth->getLastErrorReason()); + return view('errors.403'); } diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.php index 088e8da509..19cd7f11d8 100644 --- a/app/Http/Controllers/BulkAssetModelsController.php +++ b/app/Http/Controllers/BulkAssetModelsController.php @@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Redirect; class BulkAssetModelsController extends Controller { - /** + /** * Returns a view that allows the user to bulk edit model attrbutes * * @author [A. Gianotto] [] @@ -24,26 +24,27 @@ class BulkAssetModelsController extends Controller // Make sure some IDs have been selected if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) { - $models = AssetModel::whereIn('id', $models_raw_array) ->withCount('assets as assets_count') ->orderBy('assets_count', 'ASC') ->get(); // If deleting.... - if ($request->input('bulk_actions')=='delete') { + if ($request->input('bulk_actions') == 'delete') { $valid_count = 0; foreach ($models as $model) { if ($model->assets_count == 0) { $valid_count++; } } + return view('models/bulk-delete', compact('models'))->with('valid_count', $valid_count); - // Otherwise display the bulk edit screen + // Otherwise display the bulk edit screen } $nochange = ['NC' => 'No Change']; + return view('models/bulk-edit', compact('models')) ->with('fieldset_list', $nochange + Helper::customFieldsetList()) ->with('depreciation_list', $nochange + Helper::depreciationList()); @@ -63,34 +64,31 @@ class BulkAssetModelsController extends Controller */ public function update(Request $request) { - $models_raw_array = $request->input('ids'); - $update_array = array(); + $update_array = []; - if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id')!='NC'))) { + if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) { $update_array['manufacturer_id'] = $request->input('manufacturer_id'); } - if (($request->filled('category_id') && ($request->input('category_id')!='NC'))) { + if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) { $update_array['category_id'] = $request->input('category_id'); } - if ($request->input('fieldset_id')!='NC') { + if ($request->input('fieldset_id') != 'NC') { $update_array['fieldset_id'] = $request->input('fieldset_id'); } - if ($request->input('depreciation_id')!='NC') { + if ($request->input('depreciation_id') != 'NC') { $update_array['depreciation_id'] = $request->input('depreciation_id'); } - - if (count($update_array) > 0) { AssetModel::whereIn('id', $models_raw_array)->update($update_array); + return redirect()->route('models.index') ->with('success', trans('admin/models/message.bulkedit.success')); } return redirect()->route('models.index') ->with('warning', trans('admin/models/message.bulkedit.error')); - } /** @@ -106,7 +104,6 @@ class BulkAssetModelsController extends Controller $models_raw_array = $request->input('ids'); if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) { - $models = AssetModel::whereIn('id', $models_raw_array)->withCount('assets as assets_count')->get(); $del_error_count = 0; @@ -123,7 +120,7 @@ class BulkAssetModelsController extends Controller if ($del_error_count == 0) { return redirect()->route('models.index') - ->with('success', trans('admin/models/message.bulkdelete.success',['success_count'=> $del_count] )); + ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count'=> $del_count])); } return redirect()->route('models.index') @@ -132,7 +129,5 @@ class BulkAssetModelsController extends Controller return redirect()->route('models.index') ->with('error', trans('admin/models/message.bulkdelete.error')); - } - } diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index 244a687ede..5844b54dc8 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -1,4 +1,5 @@ authorize('view', Category::class); + return view('categories/index'); } - /** * Returns a form view to create a new category. * @@ -49,11 +49,11 @@ class CategoriesController extends Controller { // Show the page $this->authorize('create', Category::class); + return view('categories/edit')->with('item', new Category) ->with('category_types', Helper::categoryTypeList()); } - /** * Validates and stores the new category data. * @@ -68,13 +68,13 @@ class CategoriesController extends Controller { $this->authorize('create', Category::class); $category = new Category(); - $category->name = $request->input('name'); - $category->category_type = $request->input('category_type'); - $category->eula_text = $request->input('eula_text'); - $category->use_default_eula = $request->input('use_default_eula', '0'); - $category->require_acceptance = $request->input('require_acceptance', '0'); - $category->checkin_email = $request->input('checkin_email', '0'); - $category->user_id = Auth::id(); + $category->name = $request->input('name'); + $category->category_type = $request->input('category_type'); + $category->eula_text = $request->input('eula_text'); + $category->use_default_eula = $request->input('use_default_eula', '0'); + $category->require_acceptance = $request->input('require_acceptance', '0'); + $category->checkin_email = $request->input('checkin_email', '0'); + $category->user_id = Auth::id(); $category = $request->handleImages($category); if ($category->save()) { @@ -100,11 +100,11 @@ class CategoriesController extends Controller if (is_null($item = Category::find($categoryId))) { return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist')); } + return view('categories/edit', compact('item')) ->with('category_types', Helper::categoryTypeList()); } - /** * Validates and stores the updated category data. * @@ -125,15 +125,14 @@ class CategoriesController extends Controller } // Update the category data - $category->name = $request->input('name'); + $category->name = $request->input('name'); // If the item count is > 0, we disable the category type in the edit. Disabled items // don't POST, so if the category_type is blank we just set it to the default. - $category->category_type = $request->input('category_type', $category->category_type); - $category->eula_text = $request->input('eula_text'); - $category->use_default_eula = $request->input('use_default_eula', '0'); - $category->require_acceptance = $request->input('require_acceptance', '0'); - $category->checkin_email = $request->input('checkin_email', '0'); - + $category->category_type = $request->input('category_type', $category->category_type); + $category->eula_text = $request->input('eula_text'); + $category->use_default_eula = $request->input('use_default_eula', '0'); + $category->require_acceptance = $request->input('require_acceptance', '0'); + $category->checkin_email = $request->input('checkin_email', '0'); $category = $request->handleImages($category); @@ -162,8 +161,8 @@ class CategoriesController extends Controller return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found')); } - if (!$category->isDeletable()) { - return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=> $category->category_type ])); + if (! $category->isDeletable()) { + return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=> $category->category_type])); } Storage::disk('public')->delete('categories'.'/'.$category->image); @@ -172,7 +171,6 @@ class CategoriesController extends Controller return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success')); } - /** * Returns a view that invokes the ajax tables which actually contains * the content for the categories detail view, which is generated in getDataView. @@ -188,20 +186,20 @@ class CategoriesController extends Controller { $this->authorize('view', Category::class); if ($category = Category::find($id)) { - - if ($category->category_type=='asset') { + if ($category->category_type == 'asset') { $category_type = 'hardware'; $category_type_route = 'assets'; - } elseif ($category->category_type=='accessory') { + } elseif ($category->category_type == 'accessory') { $category_type = 'accessories'; $category_type_route = 'accessories'; } else { $category_type = $category->category_type; $category_type_route = $category->category_type.'s'; } + return view('categories/view', compact('category')) - ->with('category_type',$category_type) - ->with('category_type_route',$category_type_route); + ->with('category_type', $category_type) + ->with('category_type_route', $category_type_route); } return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist')); diff --git a/app/Http/Controllers/CheckInOutRequest.php b/app/Http/Controllers/CheckInOutRequest.php index f080dac4e3..c521c7a3ef 100644 --- a/app/Http/Controllers/CheckInOutRequest.php +++ b/app/Http/Controllers/CheckInOutRequest.php @@ -1,4 +1,5 @@ location_id = $target->id; break; case 'asset': $asset->location_id = $target->rtd_location_id; // Override with the asset's location_id if it has one - if ($target->location_id!='') { + if ($target->location_id != '') { $asset->location_id = $target->location_id; } break; @@ -51,6 +51,7 @@ trait CheckInOutRequest $asset->location_id = $target->location_id; break; } + return $asset; } } diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php index fbb5754a51..396ec5ef68 100644 --- a/app/Http/Controllers/CompaniesController.php +++ b/app/Http/Controllers/CompaniesController.php @@ -1,4 +1,5 @@ route('companies.index') ->with('success', trans('admin/companies/message.create.success')); } + return redirect()->back()->withInput()->withErrors($company->getErrors()); } - /** * Return form to edit existing company. * @@ -113,14 +112,13 @@ final class CompaniesController extends Controller $company->name = $request->input('name'); - $company = $request->handleImages($company); - if ($company->save()) { return redirect()->route('companies.index') ->with('success', trans('admin/companies/message.update.success')); } + return redirect()->route('companies.edit', ['company' => $companyId]) ->with('error', trans('admin/companies/message.update.error')); } @@ -142,13 +140,13 @@ final class CompaniesController extends Controller } $this->authorize('delete', $company); - if(!$company->isDeletable()) { + if (! $company->isDeletable()) { return redirect()->route('companies.index') ->with('error', trans('admin/companies/message.assoc_users')); } if ($company->image) { - try { + try { Storage::disk('public')->delete('companies'.'/'.$company->image); } catch (\Exception $e) { \Log::debug($e); @@ -156,11 +154,13 @@ final class CompaniesController extends Controller } $company->delete(); + return redirect()->route('companies.index') ->with('success', trans('admin/companies/message.delete.success')); } - public function show($id) { + public function show($id) + { $this->authorize('view', Company::class); if (is_null($company = Company::find($id))) { @@ -168,6 +168,6 @@ final class CompaniesController extends Controller ->with('error', trans('admin/companies/message.not_found')); } - return view('companies/view')->with('company',$company); + return view('companies/view')->with('company', $company); } } diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.php index eee0f15827..09acee0277 100644 --- a/app/Http/Controllers/Components/ComponentCheckinController.php +++ b/app/Http/Controllers/Components/ComponentCheckinController.php @@ -15,7 +15,6 @@ use Illuminate\Support\Facades\Validator; class ComponentCheckinController extends Controller { - /** * Returns a view that allows the checkin of a component from an asset. * @@ -39,14 +38,13 @@ class ComponentCheckinController extends Controller trans('admin/components/message.not_found')); } $this->authorize('checkin', $component); - return view('components/checkin', compact('component_assets','component','asset')); + + return view('components/checkin', compact('component_assets', 'component', 'asset')); } return redirect()->route('components.index')->with('error', trans('admin/components/messages.not_found')); - } - /** * Validate and store checkin data. * @@ -66,12 +64,11 @@ class ComponentCheckinController extends Controller trans('admin/components/message.not_found')); } - $this->authorize('checkin', $component); $max_to_checkin = $component_assets->assigned_qty; $validator = Validator::make($request->all(), [ - "checkin_qty" => "required|numeric|between:1,$max_to_checkin" + 'checkin_qty' => "required|numeric|between:1,$max_to_checkin", ]); if ($validator->fails()) { @@ -81,7 +78,7 @@ class ComponentCheckinController extends Controller } // Validation passed, so let's figure out what we have to do here. - $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int)$request->input('checkin_qty')); + $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int) $request->input('checkin_qty')); // We have to modify the record to reflect the new qty that's // actually checked out. @@ -102,7 +99,7 @@ class ComponentCheckinController extends Controller return redirect()->route('components.index')->with('success', trans('admin/components/message.checkin.success')); } + return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist')); } - } diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.php index 4ae37dbd0a..ffeaf1b829 100644 --- a/app/Http/Controllers/Components/ComponentCheckoutController.php +++ b/app/Http/Controllers/Components/ComponentCheckoutController.php @@ -32,6 +32,7 @@ class ComponentCheckoutController extends Controller return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found')); } $this->authorize('checkout', $component); + return view('components/checkout', compact('component')); } @@ -58,8 +59,8 @@ class ComponentCheckoutController extends Controller $max_to_checkout = $component->numRemaining(); $validator = Validator::make($request->all(), [ - "asset_id" => "required", - "assigned_qty" => "required|numeric|between:1,$max_to_checkout" + 'asset_id' => 'required', + 'assigned_qty' => "required|numeric|between:1,$max_to_checkout", ]); if ($validator->fails()) { @@ -78,14 +79,14 @@ class ComponentCheckoutController extends Controller } // Update the component data - $component->asset_id = $asset_id; + $component->asset_id = $asset_id; $component->assets()->attach($component->id, [ 'component_id' => $component->id, 'user_id' => $admin_user->id, 'created_at' => date('Y-m-d H:i:s'), 'assigned_qty' => $request->input('assigned_qty'), - 'asset_id' => $asset_id + 'asset_id' => $asset_id, ]); event(new CheckoutableCheckedOut($component, $asset, Auth::user(), $request->input('note'))); diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php index 16dc081342..95bb8c5e07 100644 --- a/app/Http/Controllers/Components/ComponentsController.php +++ b/app/Http/Controllers/Components/ComponentsController.php @@ -1,4 +1,5 @@ authorize('view', Component::class); + return view('components/index'); } - /** * Returns a form to create a new component. * @@ -47,11 +48,11 @@ class ComponentsController extends Controller public function create() { $this->authorize('create', Component::class); + return view('components/edit')->with('category_type', 'component') ->with('item', new Component); } - /** * Validate and store data for new component. * @@ -66,23 +67,24 @@ class ComponentsController extends Controller { $this->authorize('create', Component::class); $component = new Component(); - $component->name = $request->input('name'); - $component->category_id = $request->input('category_id'); - $component->location_id = $request->input('location_id'); - $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $component->order_number = $request->input('order_number', null); - $component->min_amt = $request->input('min_amt', null); - $component->serial = $request->input('serial', null); - $component->purchase_date = $request->input('purchase_date', null); - $component->purchase_cost = $request->input('purchase_cost', null); - $component->qty = $request->input('qty'); - $component->user_id = Auth::id(); + $component->name = $request->input('name'); + $component->category_id = $request->input('category_id'); + $component->location_id = $request->input('location_id'); + $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $component->order_number = $request->input('order_number', null); + $component->min_amt = $request->input('min_amt', null); + $component->serial = $request->input('serial', null); + $component->purchase_date = $request->input('purchase_date', null); + $component->purchase_cost = $request->input('purchase_cost', null); + $component->qty = $request->input('qty'); + $component->user_id = Auth::id(); $component = $request->handleImages($component); if ($component->save()) { return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success')); } + return redirect()->back()->withInput()->withErrors($component->getErrors()); } @@ -100,12 +102,13 @@ class ComponentsController extends Controller { if ($item = Component::find($componentId)) { $this->authorize('update', $item); + return view('components/edit', compact('item'))->with('category_type', 'component'); } + return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist')); } - /** * Return a view to edit a component. * @@ -124,7 +127,7 @@ class ComponentsController extends Controller } $min = $component->numCHeckedOut(); $validator = Validator::make($request->all(), [ - "qty" => "required|numeric|min:$min" + 'qty' => "required|numeric|min:$min", ]); if ($validator->fails()) { @@ -136,22 +139,23 @@ class ComponentsController extends Controller $this->authorize('update', $component); // Update the component data - $component->name = $request->input('name'); - $component->category_id = $request->input('category_id'); - $component->location_id = $request->input('location_id'); - $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $component->order_number = $request->input('order_number'); - $component->min_amt = $request->input('min_amt'); - $component->serial = $request->input('serial'); - $component->purchase_date = $request->input('purchase_date'); - $component->purchase_cost = request('purchase_cost'); - $component->qty = $request->input('qty'); + $component->name = $request->input('name'); + $component->category_id = $request->input('category_id'); + $component->location_id = $request->input('location_id'); + $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $component->order_number = $request->input('order_number'); + $component->min_amt = $request->input('min_amt'); + $component->serial = $request->input('serial'); + $component->purchase_date = $request->input('purchase_date'); + $component->purchase_cost = request('purchase_cost'); + $component->qty = $request->input('qty'); $component = $request->handleImages($component); if ($component->save()) { return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success')); } + return redirect()->back()->withInput()->withErrors($component->getErrors()); } @@ -174,7 +178,7 @@ class ComponentsController extends Controller // Remove the image if one exists if (Storage::disk('public')->exists('components/'.$component->image)) { - try { + try { Storage::disk('public')->delete('components/'.$component->image); } catch (\Exception $e) { \Log::debug($e); @@ -182,6 +186,7 @@ class ComponentsController extends Controller } $component->delete(); + return redirect()->route('components.index')->with('success', trans('admin/components/message.delete.success')); } @@ -201,6 +206,7 @@ class ComponentsController extends Controller if (isset($component->id)) { $this->authorize('view', $component); + return view('components/view', compact('component')); } // Redirect to the user management page diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php index 8dc43b54c1..03ca2f2052 100644 --- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php +++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php @@ -12,7 +12,6 @@ use Illuminate\Support\Facades\Input; class ConsumableCheckoutController extends Controller { - /** * Return a view to checkout a consumable to a user. * @@ -29,6 +28,7 @@ class ConsumableCheckoutController extends Controller return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist')); } $this->authorize('checkout', $consumable); + return view('consumables/checkout', compact('consumable')); } @@ -65,13 +65,12 @@ class ConsumableCheckoutController extends Controller $consumable->users()->attach($consumable->id, [ 'consumable_id' => $consumable->id, 'user_id' => $admin_user->id, - 'assigned_to' => e($request->input('assigned_to')) + 'assigned_to' => e($request->input('assigned_to')), ]); event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note'))); // Redirect to the new consumable page return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success')); - } } diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php index 69987f1570..7b3947cabf 100644 --- a/app/Http/Controllers/Consumables/ConsumablesController.php +++ b/app/Http/Controllers/Consumables/ConsumablesController.php @@ -30,10 +30,10 @@ class ConsumablesController extends Controller public function index() { $this->authorize('index', Consumable::class); + return view('consumables/index'); } - /** * Return a view to display the form view to create a new consumable * @@ -46,11 +46,11 @@ class ConsumablesController extends Controller public function create() { $this->authorize('create', Consumable::class); + return view('consumables/edit')->with('category_type', 'consumable') ->with('item', new Consumable); } - /** * Validate and store new consumable data. * @@ -65,20 +65,19 @@ class ConsumablesController extends Controller { $this->authorize('create', Consumable::class); $consumable = new Consumable(); - $consumable->name = $request->input('name'); - $consumable->category_id = $request->input('category_id'); - $consumable->location_id = $request->input('location_id'); - $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $consumable->order_number = $request->input('order_number'); - $consumable->min_amt = $request->input('min_amt'); - $consumable->manufacturer_id = $request->input('manufacturer_id'); - $consumable->model_number = $request->input('model_number'); - $consumable->item_no = $request->input('item_no'); - $consumable->purchase_date = $request->input('purchase_date'); - $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); - $consumable->qty = $request->input('qty'); - $consumable->user_id = Auth::id(); - + $consumable->name = $request->input('name'); + $consumable->category_id = $request->input('category_id'); + $consumable->location_id = $request->input('location_id'); + $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $consumable->order_number = $request->input('order_number'); + $consumable->min_amt = $request->input('min_amt'); + $consumable->manufacturer_id = $request->input('manufacturer_id'); + $consumable->model_number = $request->input('model_number'); + $consumable->item_no = $request->input('item_no'); + $consumable->purchase_date = $request->input('purchase_date'); + $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); + $consumable->qty = $request->input('qty'); + $consumable->user_id = Auth::id(); $consumable = $request->handleImages($consumable); @@ -87,7 +86,6 @@ class ConsumablesController extends Controller } return redirect()->back()->withInput()->withErrors($consumable->getErrors()); - } /** @@ -104,14 +102,13 @@ class ConsumablesController extends Controller { if ($item = Consumable::find($consumableId)) { $this->authorize($item); + return view('consumables/edit', compact('item'))->with('category_type', 'consumable'); } return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist')); - } - /** * Returns a form view to edit a consumable. * @@ -131,24 +128,25 @@ class ConsumablesController extends Controller $this->authorize($consumable); - $consumable->name = $request->input('name'); - $consumable->category_id = $request->input('category_id'); - $consumable->location_id = $request->input('location_id'); - $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $consumable->order_number = $request->input('order_number'); - $consumable->min_amt = $request->input('min_amt'); - $consumable->manufacturer_id = $request->input('manufacturer_id'); - $consumable->model_number = $request->input('model_number'); - $consumable->item_no = $request->input('item_no'); - $consumable->purchase_date = $request->input('purchase_date'); - $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); - $consumable->qty = Helper::ParseFloat($request->input('qty')); + $consumable->name = $request->input('name'); + $consumable->category_id = $request->input('category_id'); + $consumable->location_id = $request->input('location_id'); + $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $consumable->order_number = $request->input('order_number'); + $consumable->min_amt = $request->input('min_amt'); + $consumable->manufacturer_id = $request->input('manufacturer_id'); + $consumable->model_number = $request->input('model_number'); + $consumable->item_no = $request->input('item_no'); + $consumable->purchase_date = $request->input('purchase_date'); + $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); + $consumable->qty = Helper::ParseFloat($request->input('qty')); $consumable = $request->handleImages($consumable); if ($consumable->save()) { return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.update.success')); } + return redirect()->back()->withInput()->withErrors($consumable->getErrors()); } @@ -189,8 +187,8 @@ class ConsumablesController extends Controller if (isset($consumable->id)) { return view('consumables/view', compact('consumable')); } + return redirect()->route('consumables.index') ->with('error', trans('admin/consumables/message.does_not_exist')); } - } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 14f56d0d05..96d761ef5b 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -19,6 +19,7 @@ * etc have been included in this documentation (excluding vendors, Laravel core, etc) * for simplicity. */ + namespace App\Http\Controllers; use Auth; diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index a8be424841..8c7b7a2b64 100644 --- a/app/Http/Controllers/CustomFieldsController.php +++ b/app/Http/Controllers/CustomFieldsController.php @@ -1,4 +1,5 @@ ] */ - class CustomFieldsController extends Controller { - /** * Returns a view with a listing of custom fields. * @@ -33,13 +32,12 @@ class CustomFieldsController extends Controller { $this->authorize('view', CustomField::class); - $fieldsets = CustomFieldset::with("fields", "models")->get(); - $fields = CustomField::with("fieldset")->get(); + $fieldsets = CustomFieldset::with('fields', 'models')->get(); + $fields = CustomField::with('fieldset')->get(); - return view("custom_fields.index")->with("custom_fieldsets", $fieldsets)->with("custom_fields", $fields); + return view('custom_fields.index')->with('custom_fieldsets', $fieldsets)->with('custom_fields', $fields); } - /** * Just redirect the user back if they try to view the details of a field. * We already show those details on the listing page. @@ -50,14 +48,11 @@ class CustomFieldsController extends Controller * @return Redirect * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function show() { - return redirect()->route("fields.index"); - + return redirect()->route('fields.index'); } - /** * Returns a view with a form to create a new custom field. * @@ -71,13 +66,12 @@ class CustomFieldsController extends Controller { $this->authorize('create', CustomField::class); - return view("custom_fields.fields.edit",[ + return view('custom_fields.fields.edit', [ 'predefinedFormats' => Helper::predefined_formats(), - 'customFormat' => '' + 'customFormat' => '', ])->with('field', new CustomField()); } - /** * Validates and stores a new custom field. * @@ -92,33 +86,29 @@ class CustomFieldsController extends Controller $this->authorize('create', CustomField::class); $field = new CustomField([ - "name" => $request->get("name"), - "element" => $request->get("element"), - "help_text" => $request->get("help_text"), - "field_values" => $request->get("field_values"), - "field_encrypted" => $request->get("field_encrypted", 0), - "show_in_email" => $request->get("show_in_email", 0), - "user_id" => Auth::id() + 'name' => $request->get('name'), + 'element' => $request->get('element'), + 'help_text' => $request->get('help_text'), + 'field_values' => $request->get('field_values'), + 'field_encrypted' => $request->get('field_encrypted', 0), + 'show_in_email' => $request->get('show_in_email', 0), + 'user_id' => Auth::id(), ]); - - if ($request->filled("custom_format")) { - $field->format = e($request->get("custom_format")); + if ($request->filled('custom_format')) { + $field->format = e($request->get('custom_format')); } else { - $field->format = e($request->get("format")); + $field->format = e($request->get('format')); } if ($field->save()) { - - return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.create.success')); + return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.create.success')); } return redirect()->back()->withInput() ->with('error', trans('admin/custom_fields/message.field.create.error')); - } - /** * Detach a custom field from a fieldset. * @@ -135,10 +125,10 @@ class CustomFieldsController extends Controller if ($field->fieldset()->detach($fieldset_id)) { return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id]) - ->with("success", trans('admin/custom_fields/message.field.delete.success')); + ->with('success', trans('admin/custom_fields/message.field.delete.success')); } - return redirect()->back()->withErrors(['message' => "Field is in-use"]); + return redirect()->back()->withErrors(['message' => 'Field is in-use']); } /** @@ -152,21 +142,20 @@ class CustomFieldsController extends Controller public function destroy($field_id) { if ($field = CustomField::find($field_id)) { - $this->authorize('delete', $field); if (($field->fieldset) && ($field->fieldset->count() > 0)) { - return redirect()->back()->withErrors(['message' => "Field is in-use"]); + return redirect()->back()->withErrors(['message' => 'Field is in-use']); } $field->delete(); - return redirect()->route("fields.index") - ->with("success", trans('admin/custom_fields/message.field.delete.success')); + + return redirect()->route('fields.index') + ->with('success', trans('admin/custom_fields/message.field.delete.success')); } - return redirect()->back()->withErrors(['message' => "Field does not exist"]); + return redirect()->back()->withErrors(['message' => 'Field does not exist']); } - /** * Return a view to edit a custom field * @@ -183,18 +172,17 @@ class CustomFieldsController extends Controller $this->authorize('update', $field); $customFormat = ''; - if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) { + if ((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) { $customFormat = $field->format; } - return view("custom_fields.fields.edit",[ + return view('custom_fields.fields.edit', [ 'field' => $field, 'customFormat' => $customFormat, - 'predefinedFormats' => Helper::predefined_formats() + 'predefinedFormats' => Helper::predefined_formats(), ]); } - /** * Store the updated field * @@ -208,30 +196,27 @@ class CustomFieldsController extends Controller */ public function update(CustomFieldRequest $request, $id) { - $field = CustomField::find($id); - + $field = CustomField::find($id); + $this->authorize('update', $field); - $field->name = e($request->get("name")); - $field->element = e($request->get("element")); - $field->field_values = e($request->get("field_values")); - $field->user_id = Auth::id(); - $field->help_text = $request->get("help_text"); - $field->show_in_email = $request->get("show_in_email", 0); + $field->name = e($request->get('name')); + $field->element = e($request->get('element')); + $field->field_values = e($request->get('field_values')); + $field->user_id = Auth::id(); + $field->help_text = $request->get('help_text'); + $field->show_in_email = $request->get('show_in_email', 0); if ($request->get('format') == 'CUSTOM REGEX') { - $field->format = e($request->get("custom_format")); + $field->format = e($request->get('custom_format')); } else { - $field->format = e($request->get("format")); + $field->format = e($request->get('format')); } if ($field->save()) { - return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.update.success')); + return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.update.success')); } return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.update.error')); } - - - } diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index f484931325..3d072dbcfd 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -1,4 +1,5 @@ ] */ - class CustomFieldsetsController extends Controller { - /** * Validates and stores a new custom field. * @@ -40,28 +39,25 @@ class CustomFieldsetsController extends Controller $this->authorize('view', $cfset); if ($cfset) { - $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray(); - + $custom_fields_list = ['' => 'Add New Field to Fieldset'] + CustomField::pluck('name', 'id')->toArray(); $maxid = 0; foreach ($cfset->fields as $field) { if ($field->pivot->order > $maxid) { - $maxid=$field->pivot->order; + $maxid = $field->pivot->order; } if (isset($custom_fields_list[$field->id])) { unset($custom_fields_list[$field->id]); } } - return view("custom_fields.fieldsets.view")->with("custom_fieldset", $cfset)->with("maxid", $maxid+1)->with("custom_fields_list", $custom_fields_list); + return view('custom_fields.fieldsets.view')->with('custom_fieldset', $cfset)->with('maxid', $maxid + 1)->with('custom_fields_list', $custom_fields_list); } - return redirect()->route("fields.index") - ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist')); - + return redirect()->route('fields.index') + ->with('error', trans('admin/custom_fields/message.fieldset.does_not_exist')); } - /** * Returns a view with a form for creating a new custom fieldset. * @@ -74,10 +70,9 @@ class CustomFieldsetsController extends Controller { $this->authorize('create', CustomFieldset::class); - return view("custom_fields.fieldsets.edit"); + return view('custom_fields.fieldsets.edit'); } - /** * Validates and stores a new custom fieldset. * @@ -92,52 +87,49 @@ class CustomFieldsetsController extends Controller $this->authorize('create', CustomFieldset::class); $cfset = new CustomFieldset([ - "name" => e($request->get("name")), - "user_id" => Auth::user()->id + 'name' => e($request->get('name')), + 'user_id' => Auth::user()->id, ]); $validator = Validator::make($request->all(), $cfset->rules); if ($validator->passes()) { $cfset->save(); - return redirect()->route("fieldsets.show", [$cfset->id]) + + return redirect()->route('fieldsets.show', [$cfset->id]) ->with('success', trans('admin/custom_fields/message.fieldset.create.success')); } + return redirect()->back()->withInput()->withErrors($validator); } - - - /** - * What the actual fuck, Brady? - * - * @todo Uhh, build this? - * @author [Brady Wetherington] [] - * @param int $id - * @since [v1.8] - * @return Fuckall - */ + * What the actual fuck, Brady? + * + * @todo Uhh, build this? + * @author [Brady Wetherington] [] + * @param int $id + * @since [v1.8] + * @return Fuckall + */ public function edit($id) { // } - /** - * GET IN THE SEA BRADY. - * - * @todo Uhh, build this too? - * @author [Brady Wetherington] [] - * @param int $id - * @since [v1.8] - * @return Fuckall - */ + * GET IN THE SEA BRADY. + * + * @todo Uhh, build this too? + * @author [Brady Wetherington] [] + * @param int $id + * @since [v1.8] + * @return Fuckall + */ public function update($id) { // } - /** * Validates a custom fieldset and then deletes if it has no models associated. * @@ -154,30 +146,28 @@ class CustomFieldsetsController extends Controller $this->authorize('delete', $fieldset); if ($fieldset) { - $models = AssetModel::where("fieldset_id", "=", $id); + $models = AssetModel::where('fieldset_id', '=', $id); if ($models->count() == 0) { $fieldset->delete(); - return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success')); + + return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.fieldset.delete.success')); } - return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use')); + + return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/message.fieldset.delete.in_use')); } - return redirect()->route("fields.index")->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist')); - - + return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/message.fieldset.does_not_exist')); } - /** - * Associate the custom field with a custom fieldset. - * - * @author [Brady Wetherington] [] - * @since [v1.8] - * @return View - */ + * Associate the custom field with a custom fieldset. + * + * @author [Brady Wetherington] [] + * @since [v1.8] + * @return View + */ public function associate(Request $request, $id) { - $set = CustomFieldset::find($id); $this->authorize('update', $set); @@ -185,17 +175,16 @@ class CustomFieldsetsController extends Controller if ($request->filled('field_id')) { foreach ($set->fields as $field) { if ($field->id == $request->input('field_id')) { - return redirect()->route("fieldsets.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]); + return redirect()->route('fieldsets.show', [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]); } } - $results = $set->fields()->attach($request->input('field_id'), ["required" => ($request->input('required') == "on"),"order" => $request->input('order', 1)]); + $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => $request->input('order', 1)]); - return redirect()->route("fieldsets.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success')); + return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success')); } - return redirect()->route("fieldsets.show", [$id])->with("error", 'No field selected.'); - + return redirect()->route('fieldsets.show', [$id])->with('error', 'No field selected.'); } /** @@ -206,7 +195,6 @@ class CustomFieldsetsController extends Controller */ public function makeFieldRequired($fieldset_id, $field_id) { - $this->authorize('update', CustomFieldset::class); $field = CustomField::findOrFail($field_id); $fieldset = CustomFieldset::findOrFail($fieldset_id); @@ -214,8 +202,7 @@ class CustomFieldsetsController extends Controller $fieldset->fields()->syncWithoutDetaching($fields); return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id]) - ->with("success", trans('Field successfully set to required')); - + ->with('success', trans('Field successfully set to required')); } /** @@ -233,7 +220,6 @@ class CustomFieldsetsController extends Controller $fieldset->fields()->syncWithoutDetaching($fields); return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id]) - ->with("success", trans('Field successfully set to optional')); - + ->with('success', trans('Field successfully set to optional')); } } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index e6ad988c45..41f348e172 100755 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -1,4 +1,5 @@ ] - * @since [v1.0] - * @return View - */ + * Check authorization and display admin dashboard, otherwise display + * the user's checked-out assets. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return View + */ public function getIndex() { // Show the page if (Auth::user()->hasAccess('admin')) { - - $asset_stats=null; + $asset_stats = null; $counts['asset'] = \App\Models\Asset::count(); $counts['accessory'] = \App\Models\Accessory::count(); $counts['license'] = \App\Models\License::assetcount(); $counts['consumable'] = \App\Models\Consumable::count(); - $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable']; + $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable']; - if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) { + if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) { \Artisan::call('migrate', ['--force' => true]); \Artisan::call('passport:install'); } return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts); } else { - // Redirect to the profile page + // Redirect to the profile page return redirect()->intended('account/view-assets'); } } diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php index b0d7768b0f..920cc1f2b4 100644 --- a/app/Http/Controllers/DepartmentsController.php +++ b/app/Http/Controllers/DepartmentsController.php @@ -34,10 +34,10 @@ class DepartmentsController extends Controller if ($request->filled('company_id')) { $company = Company::find($request->input('company_id')); } + return view('departments/index')->with('company', $company); } - /** * Store a newly created resource in storage. * @@ -53,13 +53,14 @@ class DepartmentsController extends Controller $department = new Department; $department->fill($request->all()); $department->user_id = Auth::user()->id; - $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); + $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null); $department = $request->handleImages($department); if ($department->save()) { - return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success')); + return redirect()->route('departments.index')->with('success', trans('admin/departments/message.create.success')); } + return redirect()->back()->withInput()->withErrors($department->getErrors()); } @@ -82,10 +83,10 @@ class DepartmentsController extends Controller if (isset($department->id)) { return view('departments/view', compact('department')); } + return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist')); } - /** * Returns a form view used to create a new department. * @@ -102,7 +103,6 @@ class DepartmentsController extends Controller return view('departments/edit')->with('item', new Department); } - /** * Validates and deletes selected department. * @@ -125,7 +125,7 @@ class DepartmentsController extends Controller } if ($department->image) { - try { + try { Storage::disk('public')->delete('departments'.'/'.$department->image); } catch (\Exception $e) { \Log::debug($e); @@ -134,7 +134,6 @@ class DepartmentsController extends Controller $department->delete(); return redirect()->back()->with('success', trans('admin/departments/message.delete.success')); - } /** @@ -158,8 +157,8 @@ class DepartmentsController extends Controller return view('departments/edit', compact('item')); } - public function update(ImageUploadRequest $request, $id) { - + public function update(ImageUploadRequest $request, $id) + { if (is_null($department = Department::find($id))) { return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist')); } @@ -167,13 +166,14 @@ class DepartmentsController extends Controller $this->authorize('update', $department); $department->fill($request->all()); - $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); + $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null); $department = $request->handleImages($department); - + if ($department->save()) { - return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success')); + return redirect()->route('departments.index')->with('success', trans('admin/departments/message.update.success')); } + return redirect()->back()->withInput()->withErrors($department->getErrors()); } } diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php index d7177829ea..c49bc21c4a 100755 --- a/app/Http/Controllers/DepreciationsController.php +++ b/app/Http/Controllers/DepreciationsController.php @@ -1,4 +1,5 @@ with('item', new Depreciation); } - /** * Validates and stores the new depreciation data. * @@ -67,15 +66,16 @@ class DepreciationsController extends Controller // create a new instance $depreciation = new Depreciation(); // Depreciation data - $depreciation->name = $request->input('name'); - $depreciation->months = $request->input('months'); - $depreciation->user_id = Auth::id(); + $depreciation->name = $request->input('name'); + $depreciation->months = $request->input('months'); + $depreciation->user_id = Auth::id(); // Was the asset created? if ($depreciation->save()) { // Redirect to the new depreciation page return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.create.success')); } + return redirect()->back()->withInput()->withErrors($depreciation->getErrors()); } @@ -102,7 +102,6 @@ class DepreciationsController extends Controller return view('depreciations/edit', compact('item')); } - /** * Validates and stores the updated depreciation data. * @@ -125,14 +124,15 @@ class DepreciationsController extends Controller $this->authorize('update', $depreciation); // Depreciation data - $depreciation->name = $request->input('name'); - $depreciation->months = $request->input('months'); + $depreciation->name = $request->input('name'); + $depreciation->months = $request->input('months'); // Was the asset created? if ($depreciation->save()) { // Redirect to the depreciation page - return redirect()->route("depreciations.index")->with('success', trans('admin/depreciations/message.update.success')); + return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.update.success')); } + return redirect()->back()->withInput()->withErrors($depreciation->getErrors()); } @@ -143,7 +143,7 @@ class DepreciationsController extends Controller * * @author [A. Gianotto] [permissions = json_encode($request->input('permission')); if ($group->save()) { - return redirect()->route("groups.index")->with('success', trans('admin/groups/message.success.create')); + return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create')); } + return redirect()->back()->withInput()->withErrors($group->getErrors()); } /** - * Returns a view that presents a form to edit a User Group. - * - * @author [A. Gianotto] [decodePermissions(); $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions); + return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions')); } @@ -94,28 +96,30 @@ class GroupsController extends Controller } /** - * Validates and stores the updated User Group data. - * - * @author [A. Gianotto] [route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); } $group->name = $request->input('name'); $group->permissions = json_encode($request->input('permission')); - if (!config('app.lock_passwords')) { + if (! config('app.lock_passwords')) { if ($group->save()) { return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.update')); } + return redirect()->back()->withInput()->withErrors($group->getErrors()); } + return redirect()->route('groups.index')->with('error', trans('general.feature_disabled')); } @@ -131,14 +135,15 @@ class GroupsController extends Controller */ public function destroy($id = null) { - if (!config('app.lock_passwords')) { - if (!$group = Group::find($id)) { + if (! config('app.lock_passwords')) { + if (! $group = Group::find($id)) { return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); } $group->delete(); // Redirect to the group management page return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete')); } + return redirect()->route('groups.index')->with('error', trans('general.feature_disabled')); } @@ -161,5 +166,4 @@ class GroupsController extends Controller return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); } - } diff --git a/app/Http/Controllers/HealthController.php b/app/Http/Controllers/HealthController.php index 5fc2c70f4e..456f6b6f94 100644 --- a/app/Http/Controllers/HealthController.php +++ b/app/Http/Controllers/HealthController.php @@ -1,9 +1,9 @@ json([ - "status" => "ok" + 'status' => 'ok', ]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/ImportsController.php b/app/Http/Controllers/ImportsController.php index 46954303c5..5c2ca6175b 100644 --- a/app/Http/Controllers/ImportsController.php +++ b/app/Http/Controllers/ImportsController.php @@ -16,6 +16,7 @@ class ImportsController extends Controller { $this->authorize('import'); $imports = (new ImportsTransformer)->transformImports(Import::latest()->get()); + return view('importer/import')->with('imports', $imports); } } diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php index 0d99560751..2ff79d0d6b 100644 --- a/app/Http/Controllers/Kits/CheckoutKitController.php +++ b/app/Http/Controllers/Kits/CheckoutKitController.php @@ -1,4 +1,5 @@ ] * @return View View to checkout */ @@ -39,6 +39,7 @@ class CheckoutKitController extends Controller $this->authorize('checkout', Asset::class); $kit = PredefinedKit::findOrFail($kit_id); + return view('kits/checkout')->with('kit', $kit); } @@ -59,13 +60,13 @@ class CheckoutKitController extends Controller $kit->id = $kit_id; $checkout_result = $this->kitService->checkout($request, $kit, $user); - if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0 ) { + if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0) { return redirect()->back()->with('error', 'Checkout error')->with('error_messages', $checkout_result['errors']); // TODO: trans } + return redirect()->back()->with('success', 'Checkout was successful') ->with('assets', Arr::get($checkout_result, 'assets', null)) ->with('accessories', Arr::get($checkout_result, 'accessories', null)) ->with('consumables', Arr::get($checkout_result, 'consumables', null)); // TODO: trans - } } diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.php index 79c76f887d..66c4c3f4ee 100644 --- a/app/Http/Controllers/Kits/PredefinedKitsController.php +++ b/app/Http/Controllers/Kits/PredefinedKitsController.php @@ -1,4 +1,5 @@ authorize('index', PredefinedKit::class); + return view('kits/index'); } /** * Returns a form view to create a new kit. - * + * * @author [D. Minaev] [] * @throws \Illuminate\Auth\Access\AuthorizationException * @return mixed @@ -37,6 +39,7 @@ class PredefinedKitsController extends Controller public function create() { $this->authorize('create', PredefinedKit::class); + return view('kits/create')->with('item', new PredefinedKit); } @@ -53,14 +56,15 @@ class PredefinedKitsController extends Controller $kit = new PredefinedKit; $kit->name = $request->input('name'); - if (!$kit->save()) { + if (! $kit->save()) { return redirect()->back()->withInput()->withErrors($kit->getErrors()); } $success = $kit->save(); - if (!$success) { + if (! $success) { return redirect()->back()->withInput()->withErrors($kit->getErrors()); } - return redirect()->route("kits.index")->with('success', 'Kit was successfully created.'); // TODO: trans() + + return redirect()->route('kits.index')->with('success', 'Kit was successfully created.'); // TODO: trans() } /** @@ -71,7 +75,7 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return View */ - public function edit($kit_id=null) + public function edit($kit_id = null) { $this->authorize('update', PredefinedKit::class); if ($kit = PredefinedKit::find($kit_id)) { @@ -80,10 +84,10 @@ class PredefinedKitsController extends Controller ->with('models', $kit->models) ->with('licenses', $kit->licenses); } + return redirect()->route('kits.index')->with('error', 'Kit does not exist'); // TODO: trans } - /** * Validates and processes form data from the edit * Predefined Kit form based on the kit ID passed. @@ -93,7 +97,7 @@ class PredefinedKitsController extends Controller * @param int $kit_id * @return Redirect */ - public function update(ImageUploadRequest $request, $kit_id=null) + public function update(ImageUploadRequest $request, $kit_id = null) { $this->authorize('update', PredefinedKit::class); // Check if the kit exists @@ -105,8 +109,9 @@ class PredefinedKitsController extends Controller $kit->name = $request->input('name'); if ($kit->save()) { - return redirect()->route("kits.index")->with('success', 'Kit was successfully updated'); // TODO: trans + return redirect()->route('kits.index')->with('success', 'Kit was successfully updated'); // TODO: trans } + return redirect()->back()->withInput()->withErrors($kit->getErrors()); } @@ -147,12 +152,11 @@ class PredefinedKitsController extends Controller * @param int $modelId * @return View */ - public function show($kit_id=null) + public function show($kit_id = null) { return $this->edit($kit_id); } - /** * Returns a view containing the Predefined Kit edit form. * @@ -165,13 +169,13 @@ class PredefinedKitsController extends Controller $this->authorize('update', PredefinedKit::class); if (($kit = PredefinedKit::find($kit_id)) && ($model = $kit->models()->find($model_id))) { - return view('kits/model-edit', [ 'kit' => $kit, 'model' => $model, - 'item' => $model->pivot + 'item' => $model->pivot, ]); } + return redirect()->route('kits.index')->with('error', 'Kit does not exist'); // TODO: trans } @@ -184,7 +188,6 @@ class PredefinedKitsController extends Controller */ public function updateModel(Request $request, $kit_id, $model_id) { - $this->authorize('update', PredefinedKit::class); if (is_null($kit = PredefinedKit::find($kit_id))) { // Redirect to the kits management page @@ -223,7 +226,7 @@ class PredefinedKitsController extends Controller // Delete childs $kit->models()->detach($model_id); - + // Redirect to the kit management page return redirect()->route('kits.edit', $kit_id)->with('success', 'Model was successfully detached'); // TODO: trans } @@ -239,17 +242,17 @@ class PredefinedKitsController extends Controller public function editLicense($kit_id, $license_id) { $this->authorize('update', PredefinedKit::class); - if (!($kit = PredefinedKit::find($kit_id))) { + if (! ($kit = PredefinedKit::find($kit_id))) { return redirect()->route('kits.index')->with('error', 'Kit does not exist'); // TODO: trans } - if (!($license = $kit->licenses()->find($license_id))) { + if (! ($license = $kit->licenses()->find($license_id))) { return redirect()->route('kits.index')->with('error', 'License does not exist'); // TODO: trans } return view('kits/license-edit', [ 'kit' => $kit, 'license' => $license, - 'item' => $license->pivot + 'item' => $license->pivot, ]); } @@ -263,7 +266,6 @@ class PredefinedKitsController extends Controller */ public function updateLicense(Request $request, $kit_id, $license_id) { - $this->authorize('update', PredefinedKit::class); if (is_null($kit = PredefinedKit::find($kit_id))) { // Redirect to the kits management page @@ -287,7 +289,7 @@ class PredefinedKitsController extends Controller /** * Remove the license from set - * + * * @author [D. Minaev] [] * @param int $kit_id * @param int $license_id @@ -303,12 +305,11 @@ class PredefinedKitsController extends Controller // Delete childs $kit->licenses()->detach($license_id); - + // Redirect to the kit management page return redirect()->route('kits.edit', $kit_id)->with('success', 'License was successfully detached'); // TODO: trans } - /** * Returns a view containing attached accessory edit form. * @@ -320,23 +321,23 @@ class PredefinedKitsController extends Controller public function editAccessory($kit_id, $accessory_id) { $this->authorize('update', PredefinedKit::class); - if (!($kit = PredefinedKit::find($kit_id))) { + if (! ($kit = PredefinedKit::find($kit_id))) { return redirect()->route('kits.index')->with('error', 'Kit does not exist'); // TODO: trans } - if (!($accessory = $kit->accessories()->find($accessory_id))) { + if (! ($accessory = $kit->accessories()->find($accessory_id))) { return redirect()->route('kits.index')->with('error', 'Accessory does not exist'); // TODO: trans } return view('kits/accessory-edit', [ 'kit' => $kit, 'accessory' => $accessory, - 'item' => $accessory->pivot + 'item' => $accessory->pivot, ]); } /** * Update attached accessory - * + * * @author [D. Minaev] [] * @param int $kit_id * @param int $accessory_id @@ -344,7 +345,6 @@ class PredefinedKitsController extends Controller */ public function updateAccessory(Request $request, $kit_id, $accessory_id) { - $this->authorize('update', PredefinedKit::class); if (is_null($kit = PredefinedKit::find($kit_id))) { // Redirect to the kits management page @@ -383,7 +383,7 @@ class PredefinedKitsController extends Controller // Delete childs $kit->accessories()->detach($accessory_id); - + // Redirect to the kit management page return redirect()->route('kits.edit', $kit_id)->with('success', 'Accessory was successfully detached'); // TODO: trans } @@ -399,17 +399,17 @@ class PredefinedKitsController extends Controller public function editConsumable($kit_id, $consumable_id) { $this->authorize('update', PredefinedKit::class); - if (!($kit = PredefinedKit::find($kit_id))) { + if (! ($kit = PredefinedKit::find($kit_id))) { return redirect()->route('kits.index')->with('error', 'Kit does not exist'); // TODO: trans } - if (!($consumable = $kit->consumables()->find($consumable_id))) { + if (! ($consumable = $kit->consumables()->find($consumable_id))) { return redirect()->route('kits.index')->with('error', 'Consumable does not exist'); // TODO: trans } return view('kits/consumable-edit', [ 'kit' => $kit, 'consumable' => $consumable, - 'item' => $consumable->pivot + 'item' => $consumable->pivot, ]); } @@ -423,7 +423,6 @@ class PredefinedKitsController extends Controller */ public function updateConsumable(Request $request, $kit_id, $consumable_id) { - $this->authorize('update', PredefinedKit::class); if (is_null($kit = PredefinedKit::find($kit_id))) { // Redirect to the kits management page @@ -462,7 +461,7 @@ class PredefinedKitsController extends Controller // Delete childs $kit->consumables()->detach($consumable_id); - + // Redirect to the kit management page return redirect()->route('kits.edit', $kit_id)->with('success', 'Consumable was successfully detached'); // TODO: trans } diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php index a5be968cad..9acbbf4bc5 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckinController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php @@ -15,7 +15,6 @@ use Illuminate\Support\Facades\Validator; class LicenseCheckinController extends Controller { - /** * Makes the form view to check a license seat back into inventory. * @@ -35,10 +34,10 @@ class LicenseCheckinController extends Controller } $this->authorize('checkout', $license); + return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo); } - /** * Validates and stores the license checkin action. * @@ -61,9 +60,10 @@ class LicenseCheckinController extends Controller $license = License::find($licenseSeat->license_id); $this->authorize('checkout', $license); - if (!$license->reassignable) { + if (! $license->reassignable) { // Not allowed to checkin Session::flash('error', 'License not reassignable.'); + return redirect()->back()->withInput(); } @@ -83,22 +83,21 @@ class LicenseCheckinController extends Controller $return_to = User::find($licenseSeat->assigned_to); // Update the asset data - $licenseSeat->assigned_to = null; - $licenseSeat->asset_id = null; + $licenseSeat->assigned_to = null; + $licenseSeat->asset_id = null; // Was the asset updated? if ($licenseSeat->save()) { - event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note'))); - if ($backTo=='user') { - return redirect()->route("users.show", $return_to->id)->with('success', trans('admin/licenses/message.checkin.success')); + if ($backTo == 'user') { + return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success')); } - return redirect()->route("licenses.show", $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success')); + + return redirect()->route('licenses.show', $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success')); } // Redirect to the license page with error - return redirect()->route("licenses.index")->with('error', trans('admin/licenses/message.checkin.error')); + return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkin.error')); } - } diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php index 8edbc2e664..e5a3b98947 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php @@ -37,10 +37,10 @@ class LicenseCheckoutController extends Controller } $this->authorize('checkout', $license); + return view('licenses/checkout', compact('license')); } - /** * Validates and stores the license checkout action. * @@ -51,10 +51,9 @@ class LicenseCheckoutController extends Controller * @return \Illuminate\Http\RedirectResponse * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function store(LicenseCheckoutRequest $request, $licenseId, $seatId = null) { - if (!$license = License::find($licenseId)) { + if (! $license = License::find($licenseId)) { return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found')); } @@ -65,24 +64,25 @@ class LicenseCheckoutController extends Controller $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type')); if ($this->$checkoutMethod($licenseSeat)) { - return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.checkout.success')); + return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success')); } - return redirect()->route("licenses.index")->with('error', trans('Something went wrong handling this checkout.')); + return redirect()->route('licenses.index')->with('error', trans('Something went wrong handling this checkout.')); } protected function findLicenseSeatToCheckout($license, $seatId) { $licenseSeat = LicenseSeat::find($seatId) ?? $license->freeSeat(); - if (!$licenseSeat) { + if (! $licenseSeat) { if ($seatId) { return redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'); } + return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license'); } - if(!$licenseSeat->license->is($license)) { + if (! $licenseSeat->license->is($license)) { return redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'); } @@ -98,14 +98,14 @@ class LicenseCheckoutController extends Controller // Override asset's assigned user if available if ($target->checkedOutToUser()) { - $licenseSeat->assigned_to = $target->assigned_to; + $licenseSeat->assigned_to = $target->assigned_to; } if ($licenseSeat->save()) { - event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note'))); return true; } + return false; } @@ -118,11 +118,11 @@ class LicenseCheckoutController extends Controller $licenseSeat->assigned_to = request('assigned_to'); if ($licenseSeat->save()) { - event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note'))); return true; } + return false; } } diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php index 33f47d1238..e93aaf2be2 100644 --- a/app/Http/Controllers/Licenses/LicenseFilesController.php +++ b/app/Http/Controllers/Licenses/LicenseFilesController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Licenses; +use App\Helpers\StorageHelper; use App\Http\Controllers\Controller; use App\Http\Requests\AssetFileRequest; use App\Models\Actionlog; @@ -10,11 +11,9 @@ use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; use Symfony\Component\HttpFoundation\JsonResponse; -use App\Helpers\StorageHelper; class LicenseFilesController extends Controller { - /** * Validates and stores files associated with a license. * @@ -34,16 +33,14 @@ class LicenseFilesController extends Controller $this->authorize('update', $license); if ($request->hasFile('file')) { - - if (!Storage::exists('private_uploads/licenses')) Storage::makeDirectory('private_uploads/licenses', 775); + if (! Storage::exists('private_uploads/licenses')) { + Storage::makeDirectory('private_uploads/licenses', 775); + } $upload_success = false; foreach ($request->file('file') as $file) { - - $file_name = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$file->getClientOriginalExtension())).'.'.$file->getClientOriginalExtension(); - $upload_success = $file->storeAs('private_uploads/licenses', $file_name); // $upload_success = $file->storeAs('private_uploads/licenses/'.$file_name, $file); @@ -58,8 +55,10 @@ class LicenseFilesController extends Controller if ($upload_success) { return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success')); } + return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.error')); } + return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles')); } // Prepare the error message @@ -67,7 +66,6 @@ class LicenseFilesController extends Controller ->with('error', trans('admin/licenses/message.does_not_exist')); } - /** * Deletes the selected license file. * @@ -89,7 +87,7 @@ class LicenseFilesController extends Controller // Remove the file if one exists if (Storage::exists('licenses/'.$log->filename)) { - try { + try { Storage::delete('licenses/'.$log->filename); } catch (\Exception $e) { \Log::debug($e); @@ -97,6 +95,7 @@ class LicenseFilesController extends Controller } $log->delete(); + return redirect()->back() ->with('success', trans('admin/hardware/message.deletefile.success')); } @@ -105,8 +104,6 @@ class LicenseFilesController extends Controller return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist')); } - - /** * Allows the selected file to be viewed. * @@ -119,25 +116,24 @@ class LicenseFilesController extends Controller */ public function show($licenseId = null, $fileId = null, $download = true) { - - \Log::info('Private filesystem is: '.config('filesystems.default') ); + \Log::info('Private filesystem is: '.config('filesystems.default')); $license = License::find($licenseId); // the license is valid if (isset($license->id)) { $this->authorize('view', $license); - if (!$log = Actionlog::find($fileId)) { + if (! $log = Actionlog::find($fileId)) { return response('No matching record for that asset/file', 500) ->header('Content-Type', 'text/plain'); } $file = 'private_uploads/licenses/'.$log->filename; - if (Storage::missing($file)) { \Log::debug('NOT EXISTS for '.$file); \Log::debug('NOT EXISTS URL should be '.Storage::url($file)); + return response('File '.$file.' ('.Storage::url($file).') not found on server', 404) ->header('Content-Type', 'text/plain'); } else { @@ -152,20 +148,15 @@ class LicenseFilesController extends Controller if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file))); } - return JsonResponse::create(["error" => "Failed validation: "], 500); + + return JsonResponse::create(['error' => 'Failed validation: '], 500); } return StorageHelper::downloader($file); } - } - - } + return redirect()->route('license.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId])); - } - - - } diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php index 428dfa4f4f..2d1eca6969 100755 --- a/app/Http/Controllers/Licenses/LicensesController.php +++ b/app/Http/Controllers/Licenses/LicensesController.php @@ -1,4 +1,5 @@ authorize('view', License::class); + return view('licenses/index'); } - /** * Returns a form view that allows an admin to create a new licence. * @@ -50,17 +50,15 @@ class LicensesController extends Controller $maintained_list = [ '' => 'Maintained', '1' => 'Yes', - '0' => 'No' + '0' => 'No', ]; return view('licenses/edit') ->with('depreciation_list', Helper::depreciationList()) ->with('maintained_list', $maintained_list) ->with('item', new License); - } - /** * Validates and stores the license form data submitted from the new * license form. @@ -78,31 +76,32 @@ class LicensesController extends Controller // create a new model instance $license = new License(); // Save the license data - $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $license->depreciation_id = $request->input('depreciation_id'); - $license->expiration_date = $request->input('expiration_date'); - $license->license_email = $request->input('license_email'); - $license->license_name = $request->input('license_name'); - $license->maintained = $request->input('maintained', 0); - $license->manufacturer_id = $request->input('manufacturer_id'); - $license->name = $request->input('name'); - $license->notes = $request->input('notes'); - $license->order_number = $request->input('order_number'); - $license->purchase_cost = $request->input('purchase_cost'); - $license->purchase_date = $request->input('purchase_date'); - $license->purchase_order = $request->input('purchase_order'); - $license->purchase_order = $request->input('purchase_order'); - $license->reassignable = $request->input('reassignable', 0); - $license->seats = $request->input('seats'); - $license->serial = $request->input('serial'); - $license->supplier_id = $request->input('supplier_id'); - $license->category_id = $request->input('category_id'); - $license->termination_date = $request->input('termination_date'); - $license->user_id = Auth::id(); + $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $license->depreciation_id = $request->input('depreciation_id'); + $license->expiration_date = $request->input('expiration_date'); + $license->license_email = $request->input('license_email'); + $license->license_name = $request->input('license_name'); + $license->maintained = $request->input('maintained', 0); + $license->manufacturer_id = $request->input('manufacturer_id'); + $license->name = $request->input('name'); + $license->notes = $request->input('notes'); + $license->order_number = $request->input('order_number'); + $license->purchase_cost = $request->input('purchase_cost'); + $license->purchase_date = $request->input('purchase_date'); + $license->purchase_order = $request->input('purchase_order'); + $license->purchase_order = $request->input('purchase_order'); + $license->reassignable = $request->input('reassignable', 0); + $license->seats = $request->input('seats'); + $license->serial = $request->input('serial'); + $license->supplier_id = $request->input('supplier_id'); + $license->category_id = $request->input('category_id'); + $license->termination_date = $request->input('termination_date'); + $license->user_id = Auth::id(); if ($license->save()) { - return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.create.success')); + return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.create.success')); } + return redirect()->back()->withInput()->withErrors($license->getErrors()); } @@ -127,7 +126,7 @@ class LicensesController extends Controller $maintained_list = [ '' => 'Maintained', '1' => 'Yes', - '0' => 'No' + '0' => 'No', ]; return view('licenses/edit', compact('item')) @@ -135,7 +134,6 @@ class LicensesController extends Controller ->with('maintained_list', $maintained_list); } - /** * Validates and stores the license form data submitted from the edit * license form. @@ -156,25 +154,25 @@ class LicensesController extends Controller $this->authorize('update', $license); - $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $license->depreciation_id = $request->input('depreciation_id'); - $license->expiration_date = $request->input('expiration_date'); - $license->license_email = $request->input('license_email'); - $license->license_name = $request->input('license_name'); - $license->maintained = $request->input('maintained',0); - $license->name = $request->input('name'); - $license->notes = $request->input('notes'); - $license->order_number = $request->input('order_number'); - $license->purchase_cost = $request->input('purchase_cost'); - $license->purchase_date = $request->input('purchase_date'); - $license->purchase_order = $request->input('purchase_order'); - $license->reassignable = $request->input('reassignable', 0); - $license->serial = $request->input('serial'); - $license->termination_date = $request->input('termination_date'); - $license->seats = e($request->input('seats')); - $license->manufacturer_id = $request->input('manufacturer_id'); - $license->supplier_id = $request->input('supplier_id'); - $license->category_id = $request->input('category_id'); + $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $license->depreciation_id = $request->input('depreciation_id'); + $license->expiration_date = $request->input('expiration_date'); + $license->license_email = $request->input('license_email'); + $license->license_name = $request->input('license_name'); + $license->maintained = $request->input('maintained', 0); + $license->name = $request->input('name'); + $license->notes = $request->input('notes'); + $license->order_number = $request->input('order_number'); + $license->purchase_cost = $request->input('purchase_cost'); + $license->purchase_date = $request->input('purchase_date'); + $license->purchase_order = $request->input('purchase_order'); + $license->reassignable = $request->input('reassignable', 0); + $license->serial = $request->input('serial'); + $license->termination_date = $request->input('termination_date'); + $license->seats = e($request->input('seats')); + $license->manufacturer_id = $request->input('manufacturer_id'); + $license->supplier_id = $request->input('supplier_id'); + $license->category_id = $request->input('category_id'); if ($license->save()) { return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success')); @@ -207,7 +205,7 @@ class LicensesController extends Controller // Delete the license and the associated license seats DB::table('license_seats') ->where('id', $license->id) - ->update(array('assigned_to' => null,'asset_id' => null)); + ->update(['assigned_to' => null, 'asset_id' => null]); $licenseSeats = $license->licenseseats(); $licenseSeats->delete(); @@ -219,10 +217,8 @@ class LicensesController extends Controller } // There are still licenses in use. return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.assoc_users')); - } - /** * Makes the license detail page. * @@ -234,17 +230,17 @@ class LicensesController extends Controller */ public function show($licenseId = null) { - $license = License::with('assignedusers', 'licenseSeats.user', 'licenseSeats.asset')->find($licenseId); if ($license) { $this->authorize('view', $license); + return view('licenses/view', compact('license')); } + return redirect()->route('licenses.index') ->with('error', trans('admin/licenses/message.does_not_exist')); } - public function getClone($licenseId = null) { @@ -257,7 +253,7 @@ class LicensesController extends Controller $maintained_list = [ '' => 'Maintained', '1' => 'Yes', - '0' => 'No' + '0' => 'No', ]; //clone the orig $license = clone $license_to_clone; diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 7a112656d4..668b8190b2 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -1,12 +1,12 @@ authorize('create', Location::class); + return view('locations/edit') ->with('item', new Location); } - /** * Validates and stores a new location. * @@ -69,28 +67,28 @@ class LocationsController extends Controller { $this->authorize('create', Location::class); $location = new Location(); - $location->name = $request->input('name'); - $location->parent_id = $request->input('parent_id', null); - $location->currency = $request->input('currency', '$'); - $location->address = $request->input('address'); - $location->address2 = $request->input('address2'); - $location->city = $request->input('city'); - $location->state = $request->input('state'); - $location->country = $request->input('country'); - $location->zip = $request->input('zip'); - $location->ldap_ou = $request->input('ldap_ou'); - $location->manager_id = $request->input('manager_id'); - $location->user_id = Auth::id(); + $location->name = $request->input('name'); + $location->parent_id = $request->input('parent_id', null); + $location->currency = $request->input('currency', '$'); + $location->address = $request->input('address'); + $location->address2 = $request->input('address2'); + $location->city = $request->input('city'); + $location->state = $request->input('state'); + $location->country = $request->input('country'); + $location->zip = $request->input('zip'); + $location->ldap_ou = $request->input('ldap_ou'); + $location->manager_id = $request->input('manager_id'); + $location->user_id = Auth::id(); $location = $request->handleImages($location); if ($location->save()) { - return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success')); + return redirect()->route('locations.index')->with('success', trans('admin/locations/message.create.success')); } + return redirect()->back()->withInput()->withErrors($location->getErrors()); } - /** * Makes a form view to edit location information. * @@ -109,11 +107,9 @@ class LocationsController extends Controller return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist')); } - return view('locations/edit', compact('item')); } - /** * Validates and stores updated location data from edit form. * @@ -134,24 +130,24 @@ class LocationsController extends Controller } // Update the location data - $location->name = $request->input('name'); - $location->parent_id = $request->input('parent_id', null); - $location->currency = $request->input('currency', '$'); - $location->address = $request->input('address'); - $location->address2 = $request->input('address2'); - $location->city = $request->input('city'); - $location->state = $request->input('state'); - $location->country = $request->input('country'); - $location->zip = $request->input('zip'); - $location->ldap_ou = $request->input('ldap_ou'); - $location->manager_id = $request->input('manager_id'); + $location->name = $request->input('name'); + $location->parent_id = $request->input('parent_id', null); + $location->currency = $request->input('currency', '$'); + $location->address = $request->input('address'); + $location->address2 = $request->input('address2'); + $location->city = $request->input('city'); + $location->state = $request->input('state'); + $location->country = $request->input('country'); + $location->zip = $request->input('zip'); + $location->ldap_ou = $request->input('ldap_ou'); + $location->manager_id = $request->input('manager_id'); $location = $request->handleImages($location); - if ($location->save()) { - return redirect()->route("locations.index")->with('success', trans('admin/locations/message.update.success')); + return redirect()->route('locations.index')->with('success', trans('admin/locations/message.update.success')); } + return redirect()->back()->withInput()->withInput()->withErrors($location->getErrors()); } @@ -182,25 +178,25 @@ class LocationsController extends Controller } if ($location->image) { - try { + try { Storage::disk('public')->delete('locations/'.$location->image); } catch (\Exception $e) { \Log::error($e); } } $location->delete(); + return redirect()->to(route('locations.index'))->with('success', trans('admin/locations/message.delete.success')); } - /** - * Returns a view that invokes the ajax tables which actually contains - * the content for the locations detail page. - * - * @author [A. Gianotto] [] - * @param int $id - * @since [v1.0] - * @return \Illuminate\Contracts\View\View + * Returns a view that invokes the ajax tables which actually contains + * the content for the locations detail page. + * + * @author [A. Gianotto] [] + * @param int $id + * @since [v1.0] + * @return \Illuminate\Contracts\View\View */ public function show($id = null) { @@ -212,29 +208,26 @@ class LocationsController extends Controller return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist')); } - -public function print_assigned($id) - { - $location = Location::where('id',$id)->first(); - $parent = Location::where('id',$location->parent_id)->first(); - $manager = User::where('id',$location->manager_id)->first(); + public function print_assigned($id) + { + $location = Location::where('id', $id)->first(); + $parent = Location::where('id', $location->parent_id)->first(); + $manager = User::where('id', $location->manager_id)->first(); $users = User::where('location_id', $id)->with('company', 'department', 'location')->get(); $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get(); - return view('locations/print')->with('assets', $assets)->with('users',$users)->with('location', $location)->with('parent', $parent)->with('manager', $manager); + return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager); } - + public function print_all_assigned($id) { - - $location = Location::where('id',$id)->first(); - $parent = Location::where('id',$location->parent_id)->first(); - $manager = User::where('id',$location->manager_id)->first(); + $location = Location::where('id', $id)->first(); + $parent = Location::where('id', $location->parent_id)->first(); + $manager = User::where('id', $location->manager_id)->first(); $users = User::where('location_id', $id)->with('company', 'department', 'location')->get(); $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get(); - return view('locations/print')->with('assets', $assets)->with('users',$users)->with('location', $location)->with('parent', $parent)->with('manager', $manager); + return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager); } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index 1943300e30..1f7d2f2c07 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -1,4 +1,5 @@ authorize('index', Manufacturer::class); + return view('manufacturers/index'); } - /** * Returns a view that displays a form to create a new manufacturer. * @@ -45,10 +46,10 @@ class ManufacturersController extends Controller public function create() { $this->authorize('create', Manufacturer::class); + return view('manufacturers/edit')->with('item', new Manufacturer); } - /** * Validates and stores the data for a new manufacturer. * @@ -61,22 +62,20 @@ class ManufacturersController extends Controller */ public function store(ImageUploadRequest $request) { - $this->authorize('create', Manufacturer::class); $manufacturer = new Manufacturer; - $manufacturer->name = $request->input('name'); - $manufacturer->user_id = Auth::id(); - $manufacturer->url = $request->input('url'); - $manufacturer->support_url = $request->input('support_url'); - $manufacturer->support_phone = $request->input('support_phone'); - $manufacturer->support_email = $request->input('support_email'); + $manufacturer->name = $request->input('name'); + $manufacturer->user_id = Auth::id(); + $manufacturer->url = $request->input('url'); + $manufacturer->support_url = $request->input('support_url'); + $manufacturer->support_phone = $request->input('support_phone'); + $manufacturer->support_email = $request->input('support_email'); $manufacturer = $request->handleImages($manufacturer); - - if ($manufacturer->save()) { return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.create.success')); } + return redirect()->back()->withInput()->withErrors($manufacturer->getErrors()); } @@ -96,7 +95,7 @@ class ManufacturersController extends Controller $this->authorize('update', Manufacturer::class); // Check if the manufacturer exists - if (!$item = Manufacturer::find($manufacturerId)) { + if (! $item = Manufacturer::find($manufacturerId)) { return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist')); } @@ -104,7 +103,6 @@ class ManufacturersController extends Controller return view('manufacturers/edit', compact('item')); } - /** * Validates and stores the updated manufacturer data. * @@ -126,11 +124,11 @@ class ManufacturersController extends Controller } // Save the data - $manufacturer->name = $request->input('name'); - $manufacturer->url = $request->input('url'); - $manufacturer->support_url = $request->input('support_url'); - $manufacturer->support_phone = $request->input('support_phone'); - $manufacturer->support_email = $request->input('support_email'); + $manufacturer->name = $request->input('name'); + $manufacturer->url = $request->input('url'); + $manufacturer->support_url = $request->input('support_url'); + $manufacturer->support_phone = $request->input('support_phone'); + $manufacturer->support_email = $request->input('support_email'); // Set the model's image property to null if the image is being deleted if ($request->input('image_delete') == 1) { @@ -139,10 +137,10 @@ class ManufacturersController extends Controller $manufacturer = $request->handleImages($manufacturer); - if ($manufacturer->save()) { return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.update.success')); } + return redirect()->back()->withInput()->withErrors($manufacturer->getErrors()); } @@ -162,12 +160,12 @@ class ManufacturersController extends Controller return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found')); } - if (!$manufacturer->isDeletable()) { + if (! $manufacturer->isDeletable()) { return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users')); } if ($manufacturer->image) { - try { + try { Storage::disk('public')->delete('manufacturers/'.$manufacturer->image); } catch (\Exception $e) { \Log::info($e); @@ -175,7 +173,7 @@ class ManufacturersController extends Controller } // Soft delete the manufacturer if active, permanent delete if is already deleted - if($manufacturer->deleted_at === NULL) { + if ($manufacturer->deleted_at === null) { $manufacturer->delete(); } else { $manufacturer->forceDelete(); @@ -221,7 +219,7 @@ class ManufacturersController extends Controller public function restore($manufacturers_id) { $this->authorize('create', Manufacturer::class); - $manufacturer = Manufacturer::onlyTrashed()->where('id',$manufacturers_id)->first(); + $manufacturer = Manufacturer::onlyTrashed()->where('id', $manufacturers_id)->first(); if ($manufacturer) { @@ -230,9 +228,10 @@ class ManufacturersController extends Controller if ($manufacturer->restore()) { return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success')); } + return redirect()->back()->with('error', 'Could not restore.'); } - return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist')); + return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist')); } } diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 61a3cf10b6..05f2b280d5 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -6,15 +6,17 @@ use App\Helpers\Helper; class ModalController extends Controller { - function show($type, $itemId = null) { + public function show($type, $itemId = null) + { $view = view("modals.${type}"); - if($type == "statuslabel") { + if ($type == 'statuslabel') { $view->with('statuslabel_types', Helper::statusTypeList()); } - if(in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) { + if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) { $view->with('kitId', $itemId); } + return $view; } } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index c43317fd79..ef6c00a54a 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -1,4 +1,5 @@ ] - * @since [v1.0] - * @return \Illuminate\Contracts\View\View + * Returns a view with the user's profile form for editing + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return \Illuminate\Contracts\View\View */ public function getIndex() { $user = Auth::user(); + return view('account/profile', compact('user')); } /** - * Validates and stores the user's update data. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @return \Illuminate\Http\RedirectResponse + * Validates and stores the user's update data. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return \Illuminate\Http\RedirectResponse */ public function postIndex(ImageUploadRequest $request) { - $user = Auth::user(); $user->first_name = $request->input('first_name'); - $user->last_name = $request->input('last_name'); - $user->website = $request->input('website'); - $user->gravatar = $request->input('gravatar'); - $user->skin = $request->input('skin'); - $user->phone = $request->input('phone'); + $user->last_name = $request->input('last_name'); + $user->website = $request->input('website'); + $user->gravatar = $request->input('gravatar'); + $user->skin = $request->input('skin'); + $user->phone = $request->input('phone'); - if (!config('app.lock_passwords')) { + if (! config('app.lock_passwords')) { $user->locale = $request->input('locale', 'en'); } - if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled=='1') && (!config('app.lock_passwords')))) { + if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled == '1') && (! config('app.lock_passwords')))) { $user->two_factor_optin = $request->input('two_factor_optin', '0'); } - if (Gate::allows('self.edit_location') && (!config('app.lock_passwords'))) { - $user->location_id = $request->input('location_id'); + if (Gate::allows('self.edit_location') && (! config('app.lock_passwords'))) { + $user->location_id = $request->input('location_id'); } - if ($request->input('avatar_delete') == 1) { $user->avatar = null; } - if ($request->hasFile('avatar')) { $path = 'avatars'; - if(!Storage::disk('public')->exists($path)) Storage::disk('public')->makeDirectory($path, 775); + if (! Storage::disk('public')->exists($path)) { + Storage::disk('public')->makeDirectory($path, 775); + } $upload = $image = $request->file('avatar'); $ext = $image->getClientOriginalExtension(); $file_name = 'avatar-'.str_random(18).'.'.$ext; - if ($image->getClientOriginalExtension()!='svg') { - $upload = Image::make($image->getRealPath())->resize(84, 84); + if ($image->getClientOriginalExtension() != 'svg') { + $upload = Image::make($image->getRealPath())->resize(84, 84); } // This requires a string instead of an object, so we use ($string) - Storage::disk('public')->put($path.'/'.$file_name, (string)$upload->encode()); + Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode()); // Remove Current image if exists if (($user->avatar) && (Storage::disk('public')->exists($path.'/'.$user->avatar))) { @@ -93,15 +94,13 @@ class ProfileController extends Controller $user->avatar = $file_name; } - - if ($user->save()) { return redirect()->route('profile')->with('success', 'Account successfully updated'); } + return redirect()->back()->withInput()->withErrors($user->getErrors()); } - /** * Returns a page with the API token generation interface. * @@ -112,7 +111,8 @@ class ProfileController extends Controller * @since [v4.0] * @return View */ - public function api() { + public function api() + { return view('account/api'); } @@ -124,6 +124,7 @@ class ProfileController extends Controller public function password() { $user = Auth::user(); + return view('account/change-password', compact('user')); } @@ -134,25 +135,23 @@ class ProfileController extends Controller */ public function passwordSave(Request $request) { - if (config('app.lock_passwords')) { return redirect()->route('account.password.index')->with('error', trans('admin/users/table.lock_passwords')); } $user = Auth::user(); - if ($user->ldap_import=='1') { + if ($user->ldap_import == '1') { return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap')); } - $rules = array( + $rules = [ 'current_password' => 'required', 'password' => Setting::passwordComplexityRulesSaving('store').'|confirmed', - ); + ]; $validator = \Validator::make($request->all(), $rules); - $validator->after(function($validator) use ($request, $user) { - - if (!Hash::check($request->input('current_password'), $user->password)) { + $validator->after(function ($validator) use ($request, $user) { + if (! Hash::check($request->input('current_password'), $user->password)) { $validator->errors()->add('current_password', trans('validation.hashed_pass')); } @@ -165,30 +164,24 @@ class ProfileController extends Controller // There may be a more elegant way to do this in the future. // First let's see if that option is enabled in the settings - if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== FALSE) { + if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) { if (($request->input('password') == $user->username) || ($request->input('password') == $user->email) || ($request->input('password') == $user->first_name) || - ($request->input('password') == $user->last_name)) - { + ($request->input('password') == $user->last_name)) { $validator->errors()->add('password', trans('validation.disallow_same_pwd_as_user_fields')); } } - - - - }); - if (!$validator->fails()) { + if (! $validator->fails()) { $user->password = Hash::make($request->input('password')); $user->save(); + return redirect()->route('account.password.index')->with('success', 'Password updated!'); - } + return redirect()->back()->withInput()->withErrors($validator); - - } /** @@ -202,14 +195,12 @@ class ProfileController extends Controller * @since [v4.0] * @return View */ - - public function getMenuState(Request $request) { - if ($request->input('state')=='open') { + public function getMenuState(Request $request) + { + if ($request->input('state') == 'open') { $request->session()->put('menu_state', 'open'); } else { $request->session()->put('menu_state', 'closed'); } } - - } diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 4b92634b4d..be0b84a5c9 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -1,4 +1,5 @@ ] - * @since [v1.0] - * @return View - */ + * Returns a view that displays the accessories report. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return View + */ public function getAccessoryReport() { $this->authorize('reports.view'); $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get(); + return view('reports/accessories', compact('accessories')); } /** - * Exports the accessories to CSV - * - * @deprecated Server-side exports have been replaced by datatables export since v2. - * @author [A. Gianotto] [] - * @see ManufacturersController::getDatatable() method that generates the JSON response - * @since [v1.0] - * @return \Illuminate\Http\Response - */ + * Exports the accessories to CSV + * + * @deprecated Server-side exports have been replaced by datatables export since v2. + * @author [A. Gianotto] [] + * @see ManufacturersController::getDatatable() method that generates the JSON response + * @since [v1.0] + * @return \Illuminate\Http\Response + */ public function exportAccessoryReport() { $this->authorize('reports.view'); $accessories = Accessory::orderBy('created_at', 'DESC')->get(); - $rows = array(); - $header = array( + $rows = []; + $header = [ trans('admin/accessories/table.title'), trans('admin/accessories/general.accessory_category'), trans('admin/accessories/general.total'), - trans('admin/accessories/general.remaining') - ); + trans('admin/accessories/general.remaining'), + ]; $header = array_map('trim', $header); $rows[] = implode($header, ', '); // Row per accessory foreach ($accessories as $accessory) { - $row = array(); + $row = []; $row[] = e($accessory->accessory_name); $row[] = e($accessory->accessory_category); $row[] = e($accessory->total); @@ -92,31 +95,31 @@ class ReportsController extends Controller } /** - * Show depreciation report for assets. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @return View - */ + * Show depreciation report for assets. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return View + */ public function getDeprecationReport() { $this->authorize('reports.view'); $depreciations = Depreciation::get(); // Grab all the assets - $assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'company', 'model.category', 'model.depreciation') + $assets = Asset::with('assignedTo', 'assetstatus', 'defaultLoc', 'location', 'company', 'model.category', 'model.depreciation') ->orderBy('created_at', 'DESC')->get(); - return view('reports/depreciation', compact('assets'))->with('depreciations',$depreciations); + return view('reports/depreciation', compact('assets'))->with('depreciations', $depreciations); } /** - * Exports the depreciations to CSV - * - * @deprecated Server-side exports have been replaced by datatables export since v2. - * @author [A. Gianotto] [] - * @since [v1.0] - * @return \Illuminate\Http\Response - */ + * Exports the depreciations to CSV + * + * @deprecated Server-side exports have been replaced by datatables export since v2. + * @author [A. Gianotto] [] + * @since [v1.0] + * @return \Illuminate\Http\Response + */ public function exportDeprecationReport() { $this->authorize('reports.view'); @@ -127,7 +130,7 @@ class ReportsController extends Controller $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject()); $csv->setOutputBOM(Reader::BOM_UTF16_BE); - $rows = [ ]; + $rows = []; // Create the header row $header = [ @@ -139,7 +142,7 @@ class ReportsController extends Controller trans('admin/hardware/table.purchase_date'), trans('admin/hardware/table.purchase_cost'), trans('admin/hardware/table.book_value'), - trans('admin/hardware/table.diff') + trans('admin/hardware/table.diff'), ]; //we insert the CSV header @@ -147,7 +150,7 @@ class ReportsController extends Controller // Create a row per asset foreach ($assets as $asset) { - $row = [ ]; + $row = []; $row[] = e($asset->asset_tag); $row[] = e($asset->name); $row[] = e($asset->serial); @@ -158,9 +161,9 @@ class ReportsController extends Controller $row[] = ''; // Empty string if unassigned } - if (( $asset->assigned_to > 0 ) && ( $location = $asset->location )) { + if (($asset->assigned_to > 0) && ($location = $asset->location)) { if ($location->city) { - $row[] = e($location->city) . ', ' . e($location->state); + $row[] = e($location->city).', '.e($location->state); } elseif ($location->name) { $row[] = e($location->name); } else { @@ -177,18 +180,16 @@ class ReportsController extends Controller } $row[] = $asset->purchase_date; - $row[] = $currency . Helper::formatCurrencyOutput($asset->purchase_cost); - $row[] = $currency . Helper::formatCurrencyOutput($asset->getDepreciatedValue()); - $row[] = $currency . Helper::formatCurrencyOutput(( $asset->purchase_cost - $asset->getDepreciatedValue() )); + $row[] = $currency.Helper::formatCurrencyOutput($asset->purchase_cost); + $row[] = $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue()); + $row[] = $currency.Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())); $csv->insertOne($row); } - $csv->output('depreciation-report-' . date('Y-m-d') . '.csv'); + $csv->output('depreciation-report-'.date('Y-m-d').'.csv'); die; - } - /** * Displays audit report. * @@ -199,24 +200,24 @@ class ReportsController extends Controller public function audit() { $this->authorize('reports.view'); + return view('reports/audit'); } - /** - * Displays activity report. - * - * @author [A. Gianotto] [] - * @since [v1.0] - * @return View - */ + * Displays activity report. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @return View + */ public function getActivityReport() { $this->authorize('reports.view'); + return view('reports/activity'); } - /** * Exports the activity report to CSV * @@ -231,7 +232,6 @@ class ReportsController extends Controller \Debugbar::disable(); $response = new StreamedResponse(function () { - \Log::debug('Starting streamed response'); // Open output stream @@ -249,67 +249,57 @@ class ReportsController extends Controller 'Changed', ]; - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; \Log::debug('Starting headers: '.$executionTime); fputcsv($handle, $header); - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; \Log::debug('Added headers: '.$executionTime); - $actionlogs = Actionlog::with('item', 'user', 'target','location') + $actionlogs = Actionlog::with('item', 'user', 'target', 'location') ->orderBy('created_at', 'DESC') - ->chunk(20, function($actionlogs) use($handle) { + ->chunk(20, function ($actionlogs) use ($handle) { + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; + \Log::debug('Walking results: '.$executionTime); + $count = 0; - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; - \Log::debug('Walking results: '.$executionTime); - $count = 0; + foreach ($actionlogs as $actionlog) { + $count++; + $target_name = ''; - foreach ($actionlogs as $actionlog) { - - $count++; - $target_name = ''; - - if ($actionlog->target) { - if ($actionlog->targetType()=='user') { - $target_name = $actionlog->target->getFullNameAttribute(); - } else { - $target_name = $actionlog->target->getDisplayNameAttribute(); + if ($actionlog->target) { + if ($actionlog->targetType() == 'user') { + $target_name = $actionlog->target->getFullNameAttribute(); + } else { + $target_name = $actionlog->target->getDisplayNameAttribute(); + } } - } - - $row = [ + $row = [ $actionlog->created_at, ($actionlog->user) ? e($actionlog->user->getFullNameAttribute()) : '', $actionlog->present()->actionType(), e($actionlog->itemType()), - ($actionlog->itemType()=='user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()), + ($actionlog->itemType() == 'user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()), $target_name, - ($actionlog->note) ? e($actionlog->note): '', + ($actionlog->note) ? e($actionlog->note) : '', $actionlog->log_meta, ]; - fputcsv($handle, $row); - - } - }); + fputcsv($handle, $row); + } + }); // Close the output stream fclose($handle); - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; - \Log::debug('-- SCRIPT COMPLETED IN '. $executionTime); - + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; + \Log::debug('-- SCRIPT COMPLETED IN '.$executionTime); }, 200, [ 'Content-Type' => 'text/csv', - 'Content-Disposition' - => 'attachment; filename="activity-report-'.date('Y-m-d-his').'.csv"', + 'Content-Disposition' => 'attachment; filename="activity-report-'.date('Y-m-d-his').'.csv"', ]); - return $response; - - } - /** * Displays license report * @@ -328,20 +318,20 @@ class ReportsController extends Controller } /** - * Exports the licenses to CSV - * - * @deprecated Server-side exports have been replaced by datatables export since v2. - * @author [A. Gianotto] [] - * @since [v1.0] - * @return \Illuminate\Http\Response - */ + * Exports the licenses to CSV + * + * @deprecated Server-side exports have been replaced by datatables export since v2. + * @author [A. Gianotto] [] + * @since [v1.0] + * @return \Illuminate\Http\Response + */ public function exportLicenseReport() { $this->authorize('reports.view'); $licenses = License::orderBy('created_at', 'DESC')->get(); - $rows = [ ]; - $header = [ + $rows = []; + $header = [ trans('admin/licenses/table.title'), trans('admin/licenses/table.serial'), trans('admin/licenses/form.seats'), @@ -349,7 +339,7 @@ class ReportsController extends Controller trans('admin/licenses/form.expiration'), trans('general.purchase_date'), trans('general.depreciation'), - trans('general.purchase_cost') + trans('general.purchase_cost'), ]; $header = array_map('trim', $header); @@ -357,20 +347,20 @@ class ReportsController extends Controller // Row per license foreach ($licenses as $license) { - $row = [ ]; + $row = []; $row[] = e($license->name); $row[] = e($license->serial); $row[] = e($license->seats); $row[] = $license->remaincount(); $row[] = $license->expiration_date; $row[] = $license->purchase_date; - $row[] = ($license->depreciation!='') ? '' : e($license->depreciation->name); - $row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"'; + $row[] = ($license->depreciation != '') ? '' : e($license->depreciation->name); + $row[] = '"'.Helper::formatCurrencyOutput($license->purchase_cost).'"'; $rows[] = implode($row, ','); } - $csv = implode($rows, "\n"); + $csv = implode($rows, "\n"); $response = Response::make($csv, 200); $response->header('Content-Type', 'text/csv'); $response->header('Content-disposition', 'attachment;filename=report.csv'); @@ -379,17 +369,18 @@ class ReportsController extends Controller } /** - * Returns a form that allows the user to generate a custom CSV report. - * - * @author [A. Gianotto] [] - * @see ReportsController::postCustomReport() method that generates the CSV - * @since [v1.0] - * @return \Illuminate\Http\Response - */ + * Returns a form that allows the user to generate a custom CSV report. + * + * @author [A. Gianotto] [] + * @see ReportsController::postCustomReport() method that generates the CSV + * @since [v1.0] + * @return \Illuminate\Http\Response + */ public function getCustomReport() { $this->authorize('reports.view'); $customfields = CustomField::get(); + return view('reports/custom')->with('customfields', $customfields); } @@ -406,24 +397,21 @@ class ReportsController extends Controller ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes $this->authorize('reports.view'); - \Debugbar::disable(); $customfields = CustomField::get(); $response = new StreamedResponse(function () use ($customfields, $request) { - \Log::debug('Starting streamed response'); // Open output stream $handle = fopen('php://output', 'w'); stream_set_timeout($handle, 2000); - + if ($request->filled('use_bom')) { - fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF)); + fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF)); } $header = []; - if ($request->filled('company')) { $header[] = trans('general.company'); } @@ -456,7 +444,7 @@ class ReportsController extends Controller $header[] = trans('admin/hardware/table.purchase_date'); } - if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) { + if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) { $header[] = trans('admin/hardware/table.purchase_cost'); } @@ -487,7 +475,7 @@ class ReportsController extends Controller if ($request->filled('rtd_location')) { $header[] = trans('admin/hardware/form.default_location'); } - + if ($request->filled('rtd_location_address')) { $header[] = trans('general.address'); $header[] = trans('general.address'); @@ -497,7 +485,6 @@ class ReportsController extends Controller $header[] = trans('general.zip'); } - if ($request->filled('assigned_to')) { $header[] = trans('admin/hardware/table.checkoutto'); $header[] = trans('general.type'); @@ -561,24 +548,22 @@ class ReportsController extends Controller $header[] = trans('general.notes'); } - foreach ($customfields as $customfield) { if (e($request->input($customfield->db_column_name())) == '1') { $header[] = $customfield->name; } } - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; \Log::debug('Starting headers: '.$executionTime); fputcsv($handle, $header); - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; \Log::debug('Added headers: '.$executionTime); - $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with( - 'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', - 'model.category', 'model.manufacturer','supplier'); - + 'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc', 'assignedTo', + 'model.category', 'model.manufacturer', 'supplier'); + if ($request->filled('by_location_id')) { $assets->where('assets.location_id', $request->input('by_location_id')); } @@ -640,16 +625,15 @@ class ReportsController extends Controller if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); } - - $assets->orderBy('assets.id', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) { - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; + $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; \Log::debug('Walking results: '.$executionTime); $count = 0; foreach ($assets as $asset) { $count++; $row = []; - + if ($request->filled('company')) { $row[] = ($asset->company) ? $asset->company->name : ''; } @@ -688,7 +672,7 @@ class ReportsController extends Controller } if ($request->filled('eol')) { - $row[] = ($asset->purchase_date!='') ? $asset->present()->eol_date() : ''; + $row[] = ($asset->purchase_date != '') ? $asset->present()->eol_date() : ''; } if ($request->filled('order')) { @@ -698,7 +682,6 @@ class ReportsController extends Controller if ($request->filled('supplier')) { $row[] = ($asset->supplier) ? $asset->supplier->name : ''; } - if ($request->filled('location')) { $row[] = ($asset->location) ? $asset->location->present()->name() : ''; @@ -726,7 +709,6 @@ class ReportsController extends Controller $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->zip : ''; } - if ($request->filled('assigned_to')) { $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? $asset->assigned->getFullNameAttribute() : ($asset->assigned ? $asset->assigned->display_name : ''); $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : $asset->assignedType(); @@ -758,7 +740,6 @@ class ReportsController extends Controller } } - if ($request->filled('department')) { if ($asset->checkedOutToUser()) { $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : ''; @@ -771,19 +752,17 @@ class ReportsController extends Controller $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : ''; } - if ($request->filled('warranty')) { $row[] = ($asset->warranty_months) ? $asset->warranty_months : ''; $row[] = $asset->present()->warrantee_expires(); } - if ($request->filled('depreciation')) { - $depreciation = $asset->getDepreciatedValue(); - $diff = ($asset->purchase_cost - $depreciation); - $row[] = Helper::formatCurrencyOutput($depreciation); - $row[] = Helper::formatCurrencyOutput($diff); - $row[] = ($asset->depreciation) ? $asset->depreciated_date()->format('Y-m-d') : ''; + $depreciation = $asset->getDepreciatedValue(); + $diff = ($asset->purchase_cost - $depreciation); + $row[] = Helper::formatCurrencyOutput($depreciation); + $row[] = Helper::formatCurrencyOutput($diff); + $row[] = ($asset->depreciation) ? $asset->depreciated_date()->format('Y-m-d') : ''; } if ($request->filled('checkout_date')) { @@ -821,30 +800,23 @@ class ReportsController extends Controller } } fputcsv($handle, $row); - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; - \Log::debug('-- Record '.$count.' Asset ID:' .$asset->id. ' in '. $executionTime); - + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; + \Log::debug('-- Record '.$count.' Asset ID:'.$asset->id.' in '.$executionTime); } }); // Close the output stream fclose($handle); - $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; - \Log::debug('-- SCRIPT COMPLETED IN '. $executionTime); - + $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; + \Log::debug('-- SCRIPT COMPLETED IN '.$executionTime); }, 200, [ 'Content-Type' => 'text/csv', - 'Content-Disposition' - => 'attachment; filename="custom-assets-report-'.date('Y-m-d-his').'.csv"', + 'Content-Disposition' => 'attachment; filename="custom-assets-report-'.date('Y-m-d-his').'.csv"', ]); - return $response; - - } - /** * getImprovementsReport * @@ -861,7 +833,6 @@ class ReportsController extends Controller ->get(); return view('reports/asset_maintenances', compact('assetMaintenances')); - } /** @@ -879,7 +850,7 @@ class ReportsController extends Controller ->orderBy('created_at', 'DESC') ->get(); - $rows = [ ]; + $rows = []; $header = [ trans('admin/hardware/table.asset_tag'), @@ -890,14 +861,14 @@ class ReportsController extends Controller trans('admin/asset_maintenances/form.start_date'), trans('admin/asset_maintenances/form.completion_date'), trans('admin/asset_maintenances/form.asset_maintenance_time'), - trans('admin/asset_maintenances/form.cost') + trans('admin/asset_maintenances/form.cost'), ]; $header = array_map('trim', $header); $rows[] = implode($header, ','); foreach ($assetMaintenances as $assetMaintenance) { - $row = [ ]; + $row = []; $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag)); $row[] = str_replace(',', '', e($assetMaintenance->asset->name)); $row[] = str_replace(',', '', e($assetMaintenance->supplier->name)); @@ -911,13 +882,13 @@ class ReportsController extends Controller } else { $improvementTime = intval($assetMaintenance->asset_maintenance_time); } - $row[] = $improvementTime; - $row[] = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost); + $row[] = $improvementTime; + $row[] = trans('general.currency').Helper::formatCurrencyOutput($assetMaintenance->cost); $rows[] = implode($row, ','); } // spit out a csv - $csv = implode($rows, "\n"); + $csv = implode($rows, "\n"); $response = Response::make($csv, 200); $response->header('Content-Type', 'text/csv'); $response->header('Content-disposition', 'attachment;filename=report.csv'); @@ -939,14 +910,13 @@ class ReportsController extends Controller /** * Get all assets with pending checkout acceptances */ - $acceptances = CheckoutAcceptance::pending()->get(); $assetsForReport = $acceptances - ->filter(function($acceptance) { + ->filter(function ($acceptance) { return $acceptance->checkoutable_type == 'App\Models\Asset'; }) - ->map(function($acceptance) { + ->map(function ($acceptance) { return $acceptance->checkoutable; }); @@ -967,7 +937,7 @@ class ReportsController extends Controller $assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet()) ->get(); - $rows = [ ]; + $rows = []; $header = [ trans('general.category'), @@ -981,23 +951,22 @@ class ReportsController extends Controller $rows[] = implode($header, ','); foreach ($assetsForReport as $assetItem) { - $row = [ ]; - $row[] = str_replace(',', '', e($assetItem->assetlog->model->category->name)); - $row[] = str_replace(',', '', e($assetItem->assetlog->model->name)); - $row[] = str_replace(',', '', e($assetItem->assetlog->present()->name())); - $row[] = str_replace(',', '', e($assetItem->assetlog->asset_tag)); - $row[] = str_replace(',', '', e($assetItem->assetlog->assignedTo->present()->name())); + $row = []; + $row[] = str_replace(',', '', e($assetItem->assetlog->model->category->name)); + $row[] = str_replace(',', '', e($assetItem->assetlog->model->name)); + $row[] = str_replace(',', '', e($assetItem->assetlog->present()->name())); + $row[] = str_replace(',', '', e($assetItem->assetlog->asset_tag)); + $row[] = str_replace(',', '', e($assetItem->assetlog->assignedTo->present()->name())); $rows[] = implode($row, ','); } // spit out a csv - $csv = implode($rows, "\n"); + $csv = implode($rows, "\n"); $response = Response::make($csv, 200); $response->header('Content-Type', 'text/csv'); $response->header('Content-disposition', 'attachment;filename=report.csv'); return $response; - } /** @@ -1032,6 +1001,7 @@ class ReportsController extends Controller protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance) { $this->authorize('reports.view'); + return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance) ->select('id') ->get() @@ -1048,6 +1018,7 @@ class ReportsController extends Controller protected function getCategoriesThatRequireAcceptance() { $this->authorize('reports.view'); + return array_pluck(Category::requiresAcceptance() ->select('id') ->get() @@ -1064,6 +1035,7 @@ class ReportsController extends Controller protected function getAssetsCheckedOutRequiringAcceptance() { $this->authorize('reports.view'); + return $this->getCheckedOutAssetsRequiringAcceptance( $this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance()) ); @@ -1079,6 +1051,7 @@ class ReportsController extends Controller protected function getAssetsNotAcceptedYet() { $this->authorize('reports.view'); + return Asset::unaccepted(); } } diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 02a0f2c47c..9ae83856c0 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use enshrined\svgSanitize\Sanitizer; use App\Helpers\Helper; +use App\Helpers\StorageHelper; use App\Http\Requests\ImageUploadRequest; use App\Http\Requests\SettingsSamlRequest; use App\Http\Requests\SetupUserRequest; @@ -15,13 +15,13 @@ use Artisan; use Auth; use Crypt; use DB; +use enshrined\svgSanitize\Sanitizer; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Image; use Input; use Redirect; use Response; -use App\Helpers\StorageHelper; /** * This controller handles all actions related to Settings for @@ -46,17 +46,17 @@ class SettingsController extends Controller $start_settings['php_version_min'] = false; if (version_compare(PHP_VERSION, config('app.min_php'), '<')) { - return response('

This software requires PHP version ' . config('app.min_php') . ' or greater. This server is running ' . PHP_VERSION . '.

Please upgrade PHP on this server and try again.

', 500); + return response('

This software requires PHP version '.config('app.min_php').' or greater. This server is running '.PHP_VERSION.'.

Please upgrade PHP on this server and try again.

', 500); } try { - $conn = DB::select('select 2 + 2'); - $start_settings['db_conn'] = true; - $start_settings['db_name'] = DB::connection()->getDatabaseName(); + $conn = DB::select('select 2 + 2'); + $start_settings['db_conn'] = true; + $start_settings['db_name'] = DB::connection()->getDatabaseName(); $start_settings['db_error'] = null; } catch (\PDOException $e) { - $start_settings['db_conn'] = false; - $start_settings['db_name'] = config('database.connections.mysql.database'); + $start_settings['db_conn'] = false; + $start_settings['db_name'] = config('database.connections.mysql.database'); $start_settings['db_error'] = $e->getMessage(); } @@ -65,23 +65,23 @@ class SettingsController extends Controller $host = array_key_exists('SERVER_NAME', $_SERVER) ? $_SERVER['SERVER_NAME'] : null; $port = array_key_exists('SERVER_PORT', $_SERVER) ? $_SERVER['SERVER_PORT'] : null; if (('http://' === $protocol && '80' != $port) || ('https://' === $protocol && '443' != $port)) { - $host .= ':' . $port; + $host .= ':'.$port; } - $pageURL = $protocol . $host . $_SERVER['REQUEST_URI']; + $pageURL = $protocol.$host.$_SERVER['REQUEST_URI']; - $start_settings['url_valid'] = (url('/') . '/setup' === $pageURL); + $start_settings['url_valid'] = (url('/').'/setup' === $pageURL); - $start_settings['url_config'] = url('/'); - $start_settings['real_url'] = $pageURL; + $start_settings['url_config'] = url('/'); + $start_settings['real_url'] = $pageURL; $start_settings['php_version_min'] = true; // Curl the .env file to make sure it's not accessible via a browser - $ch = curl_init($protocol . $host . '/.env'); + $ch = curl_init($protocol.$host.'/.env'); curl_setopt($ch, CURLOPT_HEADER, true); // we want headers curl_setopt($ch, CURLOPT_NOBODY, true); // we don't need body curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_TIMEOUT, 10); - $output = curl_exec($ch); + $output = curl_exec($ch); $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE); curl_close($ch); @@ -99,15 +99,15 @@ class SettingsController extends Controller $environment = app()->environment(); if ('production' != $environment) { - $start_settings['env'] = $environment; + $start_settings['env'] = $environment; $start_settings['prod'] = false; } else { - $start_settings['env'] = $environment; + $start_settings['env'] = $environment; $start_settings['prod'] = true; } if (function_exists('posix_getpwuid')) { // Probably Linux - $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME'])); + $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME'])); $start_settings['owner'] = $owner['name']; } else { // Windows // TODO: Is there a way of knowing if a windows user has elevated permissions @@ -123,11 +123,11 @@ class SettingsController extends Controller } if ((is_writable(storage_path())) - && (is_writable(storage_path() . '/framework')) - && (is_writable(storage_path() . '/framework/cache')) - && (is_writable(storage_path() . '/framework/sessions')) - && (is_writable(storage_path() . '/framework/views')) - && (is_writable(storage_path() . '/logs')) + && (is_writable(storage_path().'/framework')) + && (is_writable(storage_path().'/framework/cache')) + && (is_writable(storage_path().'/framework/sessions')) + && (is_writable(storage_path().'/framework/views')) + && (is_writable(storage_path().'/logs')) ) { $start_settings['writable'] = true; } else { @@ -153,32 +153,32 @@ class SettingsController extends Controller */ public function postSaveFirstAdmin(SetupUserRequest $request) { - $user = new User(); - $user->first_name = $data['first_name'] = $request->input('first_name'); - $user->last_name = $request->input('last_name'); - $user->email = $data['email'] = $request->input('email'); - $user->activated = 1; - $permissions = ['superuser' => 1]; + $user = new User(); + $user->first_name = $data['first_name'] = $request->input('first_name'); + $user->last_name = $request->input('last_name'); + $user->email = $data['email'] = $request->input('email'); + $user->activated = 1; + $permissions = ['superuser' => 1]; $user->permissions = json_encode($permissions); - $user->username = $data['username'] = $request->input('username'); - $user->password = bcrypt($request->input('password')); - $data['password'] = $request->input('password'); + $user->username = $data['username'] = $request->input('username'); + $user->password = bcrypt($request->input('password')); + $data['password'] = $request->input('password'); - $settings = new Setting(); + $settings = new Setting(); $settings->full_multiple_companies_support = $request->input('full_multiple_companies_support', 0); - $settings->site_name = $request->input('site_name'); - $settings->alert_email = $request->input('email'); - $settings->alerts_enabled = 1; - $settings->pwd_secure_min = 10; - $settings->brand = 1; - $settings->locale = $request->input('locale', 'en'); - $settings->default_currency = $request->input('default_currency', 'USD'); - $settings->user_id = 1; - $settings->email_domain = $request->input('email_domain'); - $settings->email_format = $request->input('email_format'); - $settings->next_auto_tag_base = 1; - $settings->auto_increment_assets = $request->input('auto_increment_assets', 0); - $settings->auto_increment_prefix = $request->input('auto_increment_prefix'); + $settings->site_name = $request->input('site_name'); + $settings->alert_email = $request->input('email'); + $settings->alerts_enabled = 1; + $settings->pwd_secure_min = 10; + $settings->brand = 1; + $settings->locale = $request->input('locale', 'en'); + $settings->default_currency = $request->input('default_currency', 'USD'); + $settings->user_id = 1; + $settings->email_domain = $request->input('email_domain'); + $settings->email_format = $request->input('email_format'); + $settings->next_auto_tag_base = 1; + $settings->auto_increment_assets = $request->input('auto_increment_assets', 0); + $settings->auto_increment_prefix = $request->input('auto_increment_prefix'); if ((! $user->isValid()) || (! $settings->isValid())) { return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors()); @@ -188,12 +188,12 @@ class SettingsController extends Controller $settings->save(); if ($request->input('email_creds') == '1') { - $data = []; - $data['email'] = $user->email; - $data['username'] = $user->username; + $data = []; + $data['email'] = $user->email; + $data['username'] = $user->username; $data['first_name'] = $user->first_name; - $data['last_name'] = $user->last_name; - $data['password'] = $request->input('password'); + $data['last_name'] = $user->last_name; + $data['password'] = $request->input('password'); $user->notify(new FirstAdminNotification($data)); } @@ -246,8 +246,7 @@ class SettingsController extends Controller public function getSetupMigrate() { Artisan::call('migrate', ['--force' => true]); - if ((! file_exists(storage_path() . '/oauth-private.key')) || (! file_exists(storage_path() . '/oauth-public.key'))) { - + if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) { Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations', '--force' => true]); Artisan::call('passport:install'); } @@ -323,27 +322,26 @@ class SettingsController extends Controller $setting->modellist_displays = ''; - if (($request->filled('show_in_model_list')) && (count($request->input('show_in_model_list')) > 0)) - { + if (($request->filled('show_in_model_list')) && (count($request->input('show_in_model_list')) > 0)) { $setting->modellist_displays = implode(',', $request->input('show_in_model_list')); } $setting->full_multiple_companies_support = $request->input('full_multiple_companies_support', '0'); - $setting->unique_serial = $request->input('unique_serial', '0'); - $setting->show_images_in_email = $request->input('show_images_in_email', '0'); - $setting->show_archived_in_list = $request->input('show_archived_in_list', '0'); - $setting->dashboard_message = $request->input('dashboard_message'); - $setting->email_domain = $request->input('email_domain'); - $setting->email_format = $request->input('email_format'); - $setting->username_format = $request->input('username_format'); - $setting->require_accept_signature = $request->input('require_accept_signature'); - $setting->show_assigned_assets = $request->input('show_assigned_assets', '0'); + $setting->unique_serial = $request->input('unique_serial', '0'); + $setting->show_images_in_email = $request->input('show_images_in_email', '0'); + $setting->show_archived_in_list = $request->input('show_archived_in_list', '0'); + $setting->dashboard_message = $request->input('dashboard_message'); + $setting->email_domain = $request->input('email_domain'); + $setting->email_format = $request->input('email_format'); + $setting->username_format = $request->input('username_format'); + $setting->require_accept_signature = $request->input('require_accept_signature'); + $setting->show_assigned_assets = $request->input('show_assigned_assets', '0'); if (! config('app.lock_passwords')) { $setting->login_note = $request->input('login_note'); } - $setting->default_eula_text = $request->input('default_eula_text'); - $setting->thumbnail_max_h = $request->input('thumbnail_max_h'); + $setting->default_eula_text = $request->input('default_eula_text'); + $setting->thumbnail_max_h = $request->input('thumbnail_max_h'); $setting->privacy_policy_link = $request->input('privacy_policy_link'); $setting->depreciation_method = $request->input('depreciation_method'); @@ -362,7 +360,6 @@ class SettingsController extends Controller return redirect()->back()->withInput()->withErrors($setting->getErrors()); } - /** * Return a form to allow a super admin to update settings. * @@ -394,60 +391,53 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->brand = $request->input('brand', '1'); - $setting->header_color = $request->input('header_color'); - $setting->support_footer = $request->input('support_footer'); - $setting->version_footer = $request->input('version_footer'); - $setting->footer_text = $request->input('footer_text'); - $setting->skin = $request->input('skin'); - $setting->allow_user_skin = $request->input('allow_user_skin'); + $setting->brand = $request->input('brand', '1'); + $setting->header_color = $request->input('header_color'); + $setting->support_footer = $request->input('support_footer'); + $setting->version_footer = $request->input('version_footer'); + $setting->footer_text = $request->input('footer_text'); + $setting->skin = $request->input('skin'); + $setting->allow_user_skin = $request->input('allow_user_skin'); $setting->show_url_in_emails = $request->input('show_url_in_emails', '0'); - $setting->logo_print_assets = $request->input('logo_print_assets', '0'); + $setting->logo_print_assets = $request->input('logo_print_assets', '0'); // Only allow the site name and CSS to be changed if lock_passwords is false // Because public demos make people act like dicks if (! config('app.lock_passwords')) { - $setting->site_name = $request->input('site_name'); + $setting->site_name = $request->input('site_name'); $setting->custom_css = $request->input('custom_css'); } - $setting = $request->handleImages($setting,600,'logo','', 'logo'); - + $setting = $request->handleImages($setting, 600, 'logo', '', 'logo'); if ('1' == $request->input('clear_logo')) { - Storage::disk('public')->delete($setting->logo); - $setting->logo = null; - $setting->brand = 1; + Storage::disk('public')->delete($setting->logo); + $setting->logo = null; + $setting->brand = 1; } + $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo'); - $setting = $request->handleImages($setting,600,'email_logo','', 'email_logo'); - - - if ('1' == $request->input('clear_email_logo')) { + if ('1' == $request->input('clear_email_logo')) { Storage::disk('public')->delete($setting->email_logo); - $setting->email_logo = null; + $setting->email_logo = null; // If they are uploading an image, validate it and upload it } - - $setting = $request->handleImages($setting,600,'label_logo','', 'label_logo'); - + $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo'); if ('1' == $request->input('clear_label_logo')) { Storage::disk('public')->delete($setting->label_logo); - $setting->label_logo = null; - + $setting->label_logo = null; } - // If the user wants to clear the favicon... - if ($request->hasFile('favicon')) { - $favicon_image = $favicon_upload = $request->file('favicon'); - $favicon_ext = $favicon_image->getClientOriginalExtension(); - $setting->favicon = $favicon_file_name = 'favicon-uploaded.' . $favicon_ext; + if ($request->hasFile('favicon')) { + $favicon_image = $favicon_upload = $request->file('favicon'); + $favicon_ext = $favicon_image->getClientOriginalExtension(); + $setting->favicon = $favicon_file_name = 'favicon-uploaded.'.$favicon_ext; - if (($favicon_image->getClientOriginalExtension()!='ico') && ($favicon_image->getClientOriginalExtension()!='svg')) { + if (($favicon_image->getClientOriginalExtension() != 'ico') && ($favicon_image->getClientOriginalExtension() != 'svg')) { $favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 36, function ($constraint) { $constraint->aspectRatio(); $constraint->upsize(); @@ -459,17 +449,16 @@ class SettingsController extends Controller Storage::disk('public')->put($favicon_file_name, file_get_contents($request->file('favicon'))); } - // Remove Current image if exists if (($setting->favicon) && (file_exists($favicon_file_name))) { Storage::disk('public')->delete($favicon_file_name); } } elseif ('1' == $request->input('clear_favicon')) { - Storage::disk('public')->delete($setting->clear_favicon); - $setting->favicon = null; + Storage::disk('public')->delete($setting->clear_favicon); + $setting->favicon = null; - // If they are uploading an image, validate it and upload it - } + // If they are uploading an image, validate it and upload it + } if ($setting->save()) { return redirect()->route('settings.index') @@ -479,7 +468,6 @@ class SettingsController extends Controller return redirect()->back()->withInput()->withErrors($setting->getErrors()); } - /** * Return a form to allow a super admin to update settings. * @@ -511,7 +499,6 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } if (! config('app.lock_passwords')) { - if ('' == $request->input('two_factor_enabled')) { $setting->two_factor_enabled = null; } else { @@ -519,19 +506,18 @@ class SettingsController extends Controller } // remote user login - $setting->login_remote_user_enabled = (int) $request->input('login_remote_user_enabled'); - $setting->login_common_disabled = (int) $request->input('login_common_disabled'); + $setting->login_remote_user_enabled = (int) $request->input('login_remote_user_enabled'); + $setting->login_common_disabled = (int) $request->input('login_common_disabled'); $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url'); $setting->login_remote_user_header_name = $request->input('login_remote_user_header_name'); } - $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon'); - $setting->pwd_secure_min = (int) $request->input('pwd_secure_min'); + $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon'); + $setting->pwd_secure_min = (int) $request->input('pwd_secure_min'); $setting->pwd_secure_complexity = ''; - if ($request->filled('pwd_secure_complexity')) { - $setting->pwd_secure_complexity = implode('|', $request->input('pwd_secure_complexity')); + $setting->pwd_secure_complexity = implode('|', $request->input('pwd_secure_complexity')); } if ($setting->save()) { @@ -576,7 +562,7 @@ class SettingsController extends Controller if (! config('app.lock_passwords')) { $setting->locale = $request->input('locale', 'en'); } - $setting->default_currency = $request->input('default_currency', '$'); + $setting->default_currency = $request->input('default_currency', '$'); $setting->date_display_format = $request->input('date_display_format'); $setting->time_display_format = $request->input('time_display_format'); $setting->digit_separator = $request->input('digit_separator'); @@ -620,18 +606,18 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $alert_email = rtrim($request->input('alert_email'), ','); - $alert_email = trim($alert_email); + $alert_email = rtrim($request->input('alert_email'), ','); + $alert_email = trim($alert_email); $admin_cc_email = rtrim($request->input('admin_cc_email'), ','); $admin_cc_email = trim($admin_cc_email); - $setting->alert_email = $alert_email; - $setting->admin_cc_email = $admin_cc_email; - $setting->alerts_enabled = $request->input('alerts_enabled', '0'); - $setting->alert_interval = $request->input('alert_interval'); - $setting->alert_threshold = $request->input('alert_threshold'); - $setting->audit_interval = $request->input('audit_interval'); - $setting->audit_warning_days = $request->input('audit_warning_days'); + $setting->alert_email = $alert_email; + $setting->admin_cc_email = $admin_cc_email; + $setting->alerts_enabled = $request->input('alerts_enabled', '0'); + $setting->alert_interval = $request->input('alert_interval'); + $setting->alert_threshold = $request->input('alert_threshold'); + $setting->audit_interval = $request->input('audit_interval'); + $setting->audit_warning_days = $request->input('audit_warning_days'); $setting->show_alerts_in_menu = $request->input('show_alerts_in_menu', '0'); if ($setting->save()) { @@ -677,13 +663,10 @@ class SettingsController extends Controller 'slack_channel' => 'regex:/(?slack_endpoint = $request->input('slack_endpoint'); $setting->slack_channel = $request->input('slack_channel'); $setting->slack_botname = $request->input('slack_botname'); - } if ($setting->save()) { @@ -727,8 +710,8 @@ class SettingsController extends Controller $setting->auto_increment_prefix = $request->input('auto_increment_prefix'); $setting->auto_increment_assets = $request->input('auto_increment_assets', '0'); - $setting->zerofill_count = $request->input('zerofill_count'); - $setting->next_auto_tag_base = $request->input('next_auto_tag_base'); + $setting->zerofill_count = $request->input('zerofill_count'); + $setting->next_auto_tag_base = $request->input('next_auto_tag_base'); if ($setting->save()) { return redirect()->route('settings.index') @@ -749,7 +732,7 @@ class SettingsController extends Controller */ public function getBarcodes() { - $setting = Setting::getSettings(); + $setting = Setting::getSettings(); $is_gd_installed = extension_loaded('gd'); return view('settings.barcodes', compact('setting'))->with('is_gd_installed', $is_gd_installed); @@ -770,11 +753,11 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->qr_code = $request->input('qr_code', '0'); - $setting->alt_barcode = $request->input('alt_barcode'); + $setting->qr_code = $request->input('qr_code', '0'); + $setting->alt_barcode = $request->input('alt_barcode'); $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0'); - $setting->barcode_type = $request->input('barcode_type'); - $setting->qr_text = $request->input('qr_text'); + $setting->barcode_type = $request->input('barcode_type'); + $setting->qr_text = $request->input('qr_text'); if ($setting->save()) { return redirect()->route('settings.index') @@ -833,23 +816,21 @@ class SettingsController extends Controller if (is_null($setting = Setting::getSettings())) { return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->labels_per_page = $request->input('labels_per_page'); - $setting->labels_width = $request->input('labels_width'); - $setting->labels_height = $request->input('labels_height'); - $setting->labels_pmargin_left = $request->input('labels_pmargin_left'); - $setting->labels_pmargin_right = $request->input('labels_pmargin_right'); - $setting->labels_pmargin_top = $request->input('labels_pmargin_top'); - $setting->labels_pmargin_bottom = $request->input('labels_pmargin_bottom'); - $setting->labels_display_bgutter = $request->input('labels_display_bgutter'); - $setting->labels_display_sgutter = $request->input('labels_display_sgutter'); - $setting->labels_fontsize = $request->input('labels_fontsize'); - $setting->labels_pagewidth = $request->input('labels_pagewidth'); - $setting->labels_pageheight = $request->input('labels_pageheight'); + $setting->labels_per_page = $request->input('labels_per_page'); + $setting->labels_width = $request->input('labels_width'); + $setting->labels_height = $request->input('labels_height'); + $setting->labels_pmargin_left = $request->input('labels_pmargin_left'); + $setting->labels_pmargin_right = $request->input('labels_pmargin_right'); + $setting->labels_pmargin_top = $request->input('labels_pmargin_top'); + $setting->labels_pmargin_bottom = $request->input('labels_pmargin_bottom'); + $setting->labels_display_bgutter = $request->input('labels_display_bgutter'); + $setting->labels_display_sgutter = $request->input('labels_display_sgutter'); + $setting->labels_fontsize = $request->input('labels_fontsize'); + $setting->labels_pagewidth = $request->input('labels_pagewidth'); + $setting->labels_pageheight = $request->input('labels_pageheight'); $setting->labels_display_company_name = $request->input('labels_display_company_name', '0'); $setting->labels_display_company_name = $request->input('labels_display_company_name', '0'); - - if ($request->filled('labels_display_name')) { $setting->labels_display_name = 1; } else { @@ -919,35 +900,34 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - if (!config('app.lock_passwords')===true) { - $setting->ldap_enabled = $request->input('ldap_enabled', '0'); - $setting->ldap_server = $request->input('ldap_server'); + if (! config('app.lock_passwords') === true) { + $setting->ldap_enabled = $request->input('ldap_enabled', '0'); + $setting->ldap_server = $request->input('ldap_server'); $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false); - $setting->ldap_uname = $request->input('ldap_uname'); + $setting->ldap_uname = $request->input('ldap_uname'); if ($request->filled('ldap_pword')) { $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword')); } - $setting->ldap_basedn = $request->input('ldap_basedn'); - $setting->ldap_filter = $request->input('ldap_filter'); - $setting->ldap_username_field = $request->input('ldap_username_field'); - $setting->ldap_lname_field = $request->input('ldap_lname_field'); - $setting->ldap_fname_field = $request->input('ldap_fname_field'); + $setting->ldap_basedn = $request->input('ldap_basedn'); + $setting->ldap_filter = $request->input('ldap_filter'); + $setting->ldap_username_field = $request->input('ldap_username_field'); + $setting->ldap_lname_field = $request->input('ldap_lname_field'); + $setting->ldap_fname_field = $request->input('ldap_fname_field'); $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query'); - $setting->ldap_version = $request->input('ldap_version'); - $setting->ldap_active_flag = $request->input('ldap_active_flag'); - $setting->ldap_emp_num = $request->input('ldap_emp_num'); - $setting->ldap_email = $request->input('ldap_email'); - $setting->ad_domain = $request->input('ad_domain'); - $setting->is_ad = $request->input('is_ad', '0'); - $setting->ad_append_domain = $request->input('ad_append_domain', '0'); - $setting->ldap_tls = $request->input('ldap_tls', '0'); - $setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0'); + $setting->ldap_version = $request->input('ldap_version'); + $setting->ldap_active_flag = $request->input('ldap_active_flag'); + $setting->ldap_emp_num = $request->input('ldap_emp_num'); + $setting->ldap_email = $request->input('ldap_email'); + $setting->ad_domain = $request->input('ad_domain'); + $setting->is_ad = $request->input('is_ad', '0'); + $setting->ad_append_domain = $request->input('ad_append_domain', '0'); + $setting->ldap_tls = $request->input('ldap_tls', '0'); + $setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0'); $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url'); - $setting->ldap_phone_field = $request->input('ldap_phone'); - $setting->ldap_jobtitle = $request->input('ldap_jobtitle'); - $setting->ldap_country = $request->input('ldap_country'); - $setting->ldap_dept = $request->input('ldap_dept'); - + $setting->ldap_phone_field = $request->input('ldap_phone'); + $setting->ldap_jobtitle = $request->input('ldap_jobtitle'); + $setting->ldap_country = $request->input('ldap_country'); + $setting->ldap_dept = $request->input('ldap_dept'); } if ($setting->save()) { @@ -989,21 +969,21 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->saml_enabled = $request->input('saml_enabled', '0'); - $setting->saml_idp_metadata = $request->input('saml_idp_metadata'); - $setting->saml_attr_mapping_username = $request->input('saml_attr_mapping_username'); - $setting->saml_forcelogin = $request->input('saml_forcelogin', '0'); - $setting->saml_slo = $request->input('saml_slo', '0'); - if (!empty($request->input('saml_sp_privatekey'))) { - $setting->saml_sp_x509cert = $request->input('saml_sp_x509cert'); - $setting->saml_sp_privatekey = $request->input('saml_sp_privatekey'); + $setting->saml_enabled = $request->input('saml_enabled', '0'); + $setting->saml_idp_metadata = $request->input('saml_idp_metadata'); + $setting->saml_attr_mapping_username = $request->input('saml_attr_mapping_username'); + $setting->saml_forcelogin = $request->input('saml_forcelogin', '0'); + $setting->saml_slo = $request->input('saml_slo', '0'); + if (! empty($request->input('saml_sp_privatekey'))) { + $setting->saml_sp_x509cert = $request->input('saml_sp_x509cert'); + $setting->saml_sp_privatekey = $request->input('saml_sp_privatekey'); } - if (!empty($request->input('saml_sp_x509certNew'))) { - $setting->saml_sp_x509certNew = $request->input('saml_sp_x509certNew'); + if (! empty($request->input('saml_sp_x509certNew'))) { + $setting->saml_sp_x509certNew = $request->input('saml_sp_x509certNew'); } else { - $setting->saml_sp_x509certNew = ""; + $setting->saml_sp_x509certNew = ''; } - $setting->saml_custom_settings = $request->input('saml_custom_settings'); + $setting->saml_custom_settings = $request->input('saml_custom_settings'); if ($setting->save()) { return redirect()->route('settings.saml.index') @@ -1024,26 +1004,21 @@ class SettingsController extends Controller */ public function getBackups() { - - $path = 'app/backups'; + $path = 'app/backups'; $backup_files = Storage::files($path); - $files_raw = []; + $files_raw = []; if (count($backup_files) > 0) { - for ($f = 0; $f < count($backup_files); ++$f) { + for ($f = 0; $f < count($backup_files); $f++) { // Skip dotfiles like .gitignore and .DS_STORE if ((substr(basename($backup_files[$f]), 0, 1) != '.')) { - $files_raw[] = [ 'filename' => basename($backup_files[$f]), 'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])), 'modified' => Storage::lastModified($backup_files[$f]), ]; - } - - } } @@ -1075,7 +1050,7 @@ class SettingsController extends Controller } $formatted_output = str_replace('Backup completed!', '', $output); - $output_split = explode('...', $formatted_output); + $output_split = explode('...', $formatted_output); if (array_key_exists(2, $output_split)) { return redirect()->route('settings.backups.index')->with('error', $output_split[2]); @@ -1101,8 +1076,8 @@ class SettingsController extends Controller $path = 'app/backups'; if (! config('app.lock_passwords')) { - if (Storage::exists($path . '/' . $filename)) { - return StorageHelper::downloader($path . '/' . $filename); + if (Storage::exists($path.'/'.$filename)) { + return StorageHelper::downloader($path.'/'.$filename); } else { // Redirect to the backup page return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found')); @@ -1127,9 +1102,10 @@ class SettingsController extends Controller if (! config('app.lock_passwords')) { $path = 'app/backups'; - if (Storage::exists($path . '/' . $filename)) { + if (Storage::exists($path.'/'.$filename)) { try { - Storage::delete($path . '/' . $filename); + Storage::delete($path.'/'.$filename); + return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted')); } catch (\Exception $e) { \Log::debug($e); @@ -1154,6 +1130,7 @@ class SettingsController extends Controller public function getPurge() { \Log::warning('User ID '.Auth::user()->id.' is attempting a PURGE'); + return view('settings.purge-form'); } @@ -1170,7 +1147,6 @@ class SettingsController extends Controller { if (! config('app.lock_passwords')) { if ('DELETE' == $request->input('confirm_purge')) { - \Log::warning('User ID '.Auth::user()->id.' initiated a PURGE!'); // Run a backup immediately before processing Artisan::call('backup:run'); diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php index e1b7ffe0ef..0c559560e0 100755 --- a/app/Http/Controllers/StatuslabelsController.php +++ b/app/Http/Controllers/StatuslabelsController.php @@ -1,10 +1,11 @@ authorize('view', Statuslabel::class); + return view('statuslabels.index'); } @@ -37,7 +38,6 @@ class StatuslabelsController extends Controller return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist')); } - /** * Statuslabel create. * @@ -54,7 +54,6 @@ class StatuslabelsController extends Controller ->with('statuslabel_types', Helper::statusTypeList()); } - /** * Statuslabel create form processing. * @@ -64,7 +63,6 @@ class StatuslabelsController extends Controller */ public function store(Request $request) { - $this->authorize('create', Statuslabel::class); // create a new model instance $statusLabel = new Statuslabel(); @@ -76,21 +74,21 @@ class StatuslabelsController extends Controller $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types')); // Save the Statuslabel data - $statusLabel->name = $request->input('name'); - $statusLabel->user_id = Auth::id(); - $statusLabel->notes = $request->input('notes'); - $statusLabel->deployable = $statusType['deployable']; - $statusLabel->pending = $statusType['pending']; - $statusLabel->archived = $statusType['archived']; - $statusLabel->color = $request->input('color'); - $statusLabel->show_in_nav = $request->input('show_in_nav', 0); - $statusLabel->default_label = $request->input('default_label', 0); - + $statusLabel->name = $request->input('name'); + $statusLabel->user_id = Auth::id(); + $statusLabel->notes = $request->input('notes'); + $statusLabel->deployable = $statusType['deployable']; + $statusLabel->pending = $statusType['pending']; + $statusLabel->archived = $statusType['archived']; + $statusLabel->color = $request->input('color'); + $statusLabel->show_in_nav = $request->input('show_in_nav', 0); + $statusLabel->default_label = $request->input('default_label', 0); if ($statusLabel->save()) { // Redirect to the new Statuslabel page return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.create.success')); } + return redirect()->back()->withInput()->withErrors($statusLabel->getErrors()); } @@ -112,12 +110,11 @@ class StatuslabelsController extends Controller $use_statuslabel_type = $item->getStatuslabelType(); - $statuslabel_types = array('' => trans('admin/hardware/form.select_statustype')) + array('undeployable' => trans('admin/hardware/general.undeployable')) + array('pending' => trans('admin/hardware/general.pending')) + array('archived' => trans('admin/hardware/general.archived')) + array('deployable' => trans('admin/hardware/general.deployable')); + $statuslabel_types = ['' => trans('admin/hardware/form.select_statustype')] + ['undeployable' => trans('admin/hardware/general.undeployable')] + ['pending' => trans('admin/hardware/general.pending')] + ['archived' => trans('admin/hardware/general.archived')] + ['deployable' => trans('admin/hardware/general.deployable')]; return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type); } - /** * Statuslabel update form processing page. * @@ -134,28 +131,27 @@ class StatuslabelsController extends Controller return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist')); } - if (!$request->filled('statuslabel_types')) { + if (! $request->filled('statuslabel_types')) { return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]); } - // Update the Statuslabel data - $statustype = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types')); - $statuslabel->name = $request->input('name'); - $statuslabel->notes = $request->input('notes'); - $statuslabel->deployable = $statustype['deployable']; - $statuslabel->pending = $statustype['pending']; - $statuslabel->archived = $statustype['archived']; - $statuslabel->color = $request->input('color'); - $statuslabel->show_in_nav = $request->input('show_in_nav', 0); - $statuslabel->default_label = $request->input('default_label', 0); - + $statustype = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types')); + $statuslabel->name = $request->input('name'); + $statuslabel->notes = $request->input('notes'); + $statuslabel->deployable = $statustype['deployable']; + $statuslabel->pending = $statustype['pending']; + $statuslabel->archived = $statustype['archived']; + $statuslabel->color = $request->input('color'); + $statuslabel->show_in_nav = $request->input('show_in_nav', 0); + $statuslabel->default_label = $request->input('default_label', 0); // Was the asset created? if ($statuslabel->save()) { // Redirect to the saved Statuslabel page - return redirect()->route("statuslabels.index")->with('success', trans('admin/statuslabels/message.update.success')); + return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.update.success')); } + return redirect()->back()->withInput()->withErrors($statuslabel->getErrors()); } @@ -177,10 +173,10 @@ class StatuslabelsController extends Controller // Check that there are no assets associated if ($statuslabel->assets()->count() == 0) { $statuslabel->delete(); + return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.delete.success')); } return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.assoc_assets')); } - } diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index 41ff456791..c36bc34505 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -1,4 +1,5 @@ authorize('create', Supplier::class); + return view('suppliers/edit')->with('item', new Supplier); } - /** * Supplier create form processing. * @@ -55,26 +55,26 @@ class SuppliersController extends Controller // Create a new supplier $supplier = new Supplier; // Save the location data - $supplier->name = request('name'); - $supplier->address = request('address'); - $supplier->address2 = request('address2'); - $supplier->city = request('city'); - $supplier->state = request('state'); - $supplier->country = request('country'); - $supplier->zip = request('zip'); - $supplier->contact = request('contact'); - $supplier->phone = request('phone'); - $supplier->fax = request('fax'); - $supplier->email = request('email'); - $supplier->notes = request('notes'); - $supplier->url = $supplier->addhttp(request('url')); - $supplier->user_id = Auth::id(); + $supplier->name = request('name'); + $supplier->address = request('address'); + $supplier->address2 = request('address2'); + $supplier->city = request('city'); + $supplier->state = request('state'); + $supplier->country = request('country'); + $supplier->zip = request('zip'); + $supplier->contact = request('contact'); + $supplier->phone = request('phone'); + $supplier->fax = request('fax'); + $supplier->email = request('email'); + $supplier->notes = request('notes'); + $supplier->url = $supplier->addhttp(request('url')); + $supplier->user_id = Auth::id(); $supplier = $request->handleImages($supplier); - if ($supplier->save()) { return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success')); } + return redirect()->back()->withInput()->withErrors($supplier->getErrors()); } @@ -98,7 +98,6 @@ class SuppliersController extends Controller return view('suppliers/edit', compact('item')); } - /** * Supplier update form processing page. * @@ -116,19 +115,19 @@ class SuppliersController extends Controller } // Save the data - $supplier->name = request('name'); - $supplier->address = request('address'); - $supplier->address2 = request('address2'); - $supplier->city = request('city'); - $supplier->state = request('state'); - $supplier->country = request('country'); - $supplier->zip = request('zip'); - $supplier->contact = request('contact'); - $supplier->phone = request('phone'); - $supplier->fax = request('fax'); - $supplier->email = request('email'); - $supplier->url = $supplier->addhttp(request('url')); - $supplier->notes = request('notes'); + $supplier->name = request('name'); + $supplier->address = request('address'); + $supplier->address2 = request('address2'); + $supplier->city = request('city'); + $supplier->state = request('state'); + $supplier->country = request('country'); + $supplier->zip = request('zip'); + $supplier->contact = request('contact'); + $supplier->phone = request('phone'); + $supplier->fax = request('fax'); + $supplier->email = request('email'); + $supplier->url = $supplier->addhttp(request('url')); + $supplier->notes = request('notes'); $supplier = $request->handleImages($supplier); if ($supplier->save()) { @@ -136,7 +135,6 @@ class SuppliersController extends Controller } return redirect()->back()->withInput()->withErrors($supplier->getErrors()); - } /** @@ -149,11 +147,10 @@ class SuppliersController extends Controller public function destroy($supplierId) { $this->authorize('delete', Supplier::class); - if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count','assets as assets_count','licenses as licenses_count')->find($supplierId))) { + if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) { return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found')); } - if ($supplier->assets_count > 0) { return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])); } @@ -167,14 +164,12 @@ class SuppliersController extends Controller } $supplier->delete(); + return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.success') ); - - } - /** * Get the asset information to present to the supplier view page * @@ -187,10 +182,9 @@ class SuppliersController extends Controller $supplier = Supplier::find($supplierId); if (isset($supplier->id)) { - return view('suppliers/view', compact('supplier')); + return view('suppliers/view', compact('supplier')); } return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist')); } - } diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 7bda003802..fc02753e74 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Password; class BulkUsersController extends Controller { - /** * Returns a view that confirms the user's a bulk delete will be applied to. * @@ -40,30 +39,25 @@ class BulkUsersController extends Controller if ($request->input('bulk_actions') == 'edit') { return view('users/bulk-edit', compact('users')) ->with('groups', Group::pluck('name', 'id')); - } elseif ($request->input('bulk_actions') == 'delete') { - return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list', Helper::statusLabelList()); - - + return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list', Helper::statusLabelList()); } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') { foreach ($users as $user) { - if (($user->activated=='1') && ($user->email!='')) { + if (($user->activated == '1') && ($user->email != '')) { $credentials = ['email' => $user->email]; Password::sendResetLink($credentials, function (Message $message) { $message->subject($this->getEmailSubject()); }); } } + return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent')); - } - } return redirect()->back()->with('error', 'No users selected'); } - /** * Save bulk-edited users * @@ -77,7 +71,7 @@ class BulkUsersController extends Controller { $this->authorize('update', User::class); - if((!$request->filled('ids')) || $request->input('ids') <= 0) { + if ((! $request->filled('ids')) || $request->input('ids') <= 0) { return redirect()->back()->with('error', 'No users selected'); } $user_raw_array = $request->input('ids'); @@ -88,28 +82,25 @@ class BulkUsersController extends Controller $users = User::whereIn('id', $user_raw_array)->where('id', '!=', Auth::user()->id)->get(); $return_array = [ - 'success' => trans('admin/users/message.success.update_bulk') + 'success' => trans('admin/users/message.success.update_bulk'), ]; - $this->conditionallyAddItem('location_id') ->conditionallyAddItem('department_id') ->conditionallyAddItem('company_id') ->conditionallyAddItem('locale') - ->conditionallyAddItem('activated') -; + ->conditionallyAddItem('activated'); // If the manager_id is one of the users being updated, generate a warning. if (array_search($request->input('manager_id'), $user_raw_array)) { $manager_conflict = true; $return_array = [ - 'warning' => trans('admin/users/message.bulk_manager_warn') + 'warning' => trans('admin/users/message.bulk_manager_warn'), ]; } - if (!$manager_conflict) { + if (! $manager_conflict) { $this->conditionallyAddItem('manager_id'); } - // Save the updated info User::whereIn('id', $user_raw_array) ->where('id', '!=', Auth::id())->update($this->update_array); @@ -127,20 +118,21 @@ class BulkUsersController extends Controller /** * Array to store update data per item - * @var Array + * @var array */ private $update_array = []; /** * Adds parameter to update array for an item if it exists in request - * @param String $field field name + * @param string $field field name * @return BulkUsersController Model for Chaining */ protected function conditionallyAddItem($field) { - if(request()->filled($field)) { + if (request()->filled($field)) { $this->update_array[$field] = request()->input($field); } + return $this; } @@ -157,10 +149,10 @@ class BulkUsersController extends Controller { $this->authorize('update', User::class); - if ((!$request->filled('ids')) || (count($request->input('ids')) == 0)) { + if ((! $request->filled('ids')) || (count($request->input('ids')) == 0)) { return redirect()->back()->with('error', 'No users selected'); } - if ((!$request->filled('status_id')) || ($request->input('status_id')=='')) { + if ((! $request->filled('status_id')) || ($request->input('status_id') == '')) { return redirect()->route('users.index')->with('error', 'No status selected'); } @@ -178,7 +170,6 @@ class BulkUsersController extends Controller $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get(); $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get(); - $this->logItemCheckinAndDelete($assets, Asset::class); $this->logItemCheckinAndDelete($accessories, Accessory::class); $this->logItemCheckinAndDelete($licenses, LicenseSeat::class); @@ -189,7 +180,6 @@ class BulkUsersController extends Controller 'assigned_type' => null, ]); - LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]); foreach ($users as $user) { @@ -205,9 +195,9 @@ class BulkUsersController extends Controller * @param $items * @param $itemType string name of items being passed. */ - protected function logItemCheckinAndDelete($items, $itemType) { - - foreach($items as $item) { + protected function logItemCheckinAndDelete($items, $itemType) + { + foreach ($items as $item) { $logAction = new Actionlog(); $logAction->item_id = $item->id; // We can't rely on get_class here because the licenses/accessories fetched above are not eloquent models, but simply arrays. @@ -219,7 +209,4 @@ class BulkUsersController extends Controller $logAction->logaction('checkin from'); } } - - - } diff --git a/app/Http/Controllers/Users/LDAPImportController.php b/app/Http/Controllers/Users/LDAPImportController.php index 337a43bc36..a204581eb6 100644 --- a/app/Http/Controllers/Users/LDAPImportController.php +++ b/app/Http/Controllers/Users/LDAPImportController.php @@ -3,10 +3,10 @@ namespace App\Http\Controllers\Users; use App\Http\Controllers\Controller; +use App\Models\User; use App\Services\LdapAd; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Artisan; -use App\Models\User; // Note that this is awful close to 'Users' the namespace above; be careful +use Illuminate\Support\Facades\Artisan; // Note that this is awful close to 'Users' the namespace above; be careful class LDAPImportController extends Controller { diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php index 61a195012a..9599f9c66c 100644 --- a/app/Http/Controllers/Users/UserFilesController.php +++ b/app/Http/Controllers/Users/UserFilesController.php @@ -26,7 +26,7 @@ class UserFilesController extends Controller public function store(AssetFileRequest $request, $userId = null) { $user = User::find($userId); - $destinationPath = config('app.private_uploads') . '/users'; + $destinationPath = config('app.private_uploads').'/users'; if (isset($user->id)) { $this->authorize('update', $user); @@ -34,14 +34,14 @@ class UserFilesController extends Controller $logActions = []; $files = $request->file('file'); - if (is_null($files)){ + if (is_null($files)) { return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); } - foreach($files as $file) { + foreach ($files as $file) { $extension = $file->getClientOriginalExtension(); - $filename = 'user-' . $user->id . '-' . str_random(8); - $filename .= '-' . str_slug($file->getClientOriginalName()) . '.' . $extension; - if (!$file->move($destinationPath, $filename)) { + $filename = 'user-'.$user->id.'-'.str_random(8); + $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension; + if (! $file->move($destinationPath, $filename)) { return redirect()->back()->with('error', trans('admin/users/message.upload.invalidfiles')); } //Log the uploaded file to the log @@ -51,24 +51,22 @@ class UserFilesController extends Controller $logAction->user_id = Auth::id(); $logAction->note = $request->input('notes'); $logAction->target_id = null; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->filename = $filename; $logAction->action_type = 'uploaded'; - if (!$logAction->save()) { - return JsonResponse::create(["error" => "Failed validation: " . print_r($logAction->getErrors(), true)], 500); - + if (! $logAction->save()) { + return JsonResponse::create(['error' => 'Failed validation: '.print_r($logAction->getErrors(), true)], 500); } $logActions[] = $logAction; } // dd($logActions); return redirect()->back()->with('success', trans('admin/users/message.upload.success')); } + return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); - } - /** * Delete file * @@ -87,18 +85,18 @@ class UserFilesController extends Controller if (isset($user->id)) { $this->authorize('update', $user); $log = Actionlog::find($fileId); - $full_filename = $destinationPath . '/' . $log->filename; + $full_filename = $destinationPath.'/'.$log->filename; if (file_exists($full_filename)) { - unlink($destinationPath . '/' . $log->filename); + unlink($destinationPath.'/'.$log->filename); } $log->delete(); + return redirect()->back()->with('success', trans('admin/users/message.deletefile.success')); } // Prepare the error message $error = trans('admin/users/message.user_not_found', ['id' => $userId]); // Redirect to the licence management page return redirect()->route('users.index')->with('error', $error); - } /** @@ -121,6 +119,7 @@ class UserFilesController extends Controller $log = Actionlog::find($fileId); $file = $log->get_src('users'); + return Response::download($file); //FIXME this doesn't use the new StorageHelper yet, but it's complicated... } // Prepare the error message @@ -129,5 +128,4 @@ class UserFilesController extends Controller // Redirect to the licence management page return redirect()->route('users.index')->with('error', $error); } - } diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 227260369e..bc7c2a2da5 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -1,11 +1,12 @@ authorize('index', User::class); + return view('users/index'); } @@ -72,7 +69,7 @@ class UsersController extends Controller } $permissions = config('permissions'); - $userPermissions = Helper::selectedPermissionsArray($permissions, $request->old('permissions', array())); + $userPermissions = Helper::selectedPermissionsArray($permissions, $request->old('permissions', [])); $permissions = $this->filterDisplayable($permissions); $user = new User; @@ -96,7 +93,7 @@ class UsersController extends Controller $this->authorize('create', User::class); $user = new User; //Username, email, and password need to be handled specially because the need to respect config values on an edit. - $user->email = e($request->input('email')); + $user->email = e($request->input('email')); $user->username = e($request->input('username')); if ($request->filled('password')) { $user->password = bcrypt($request->input('password')); @@ -122,11 +119,10 @@ class UsersController extends Controller // Strip out the superuser permission if the user isn't a superadmin $permissions_array = $request->input('permission'); - if (!Auth::user()->isSuperUser()) { + if (! Auth::user()->isSuperUser()) { unset($permissions_array['superuser']); } - $user->permissions = json_encode($permissions_array); - + $user->permissions = json_encode($permissions_array); // we have to invoke the app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar'); @@ -135,12 +131,12 @@ class UsersController extends Controller if ($request->filled('groups')) { $user->groups()->sync($request->input('groups')); } else { - $user->groups()->sync(array()); + $user->groups()->sync([]); } if (($request->input('email_user') == 1) && ($request->filled('email'))) { // Send the credentials through email - $data = array(); + $data = []; $data['email'] = e($request->input('email')); $data['username'] = e($request->input('username')); $data['first_name'] = e($request->input('first_name')); @@ -149,13 +145,13 @@ class UsersController extends Controller $user->notify(new WelcomeNotification($data)); } + return redirect::route('users.index')->with('success', trans('admin/users/message.success.create')); } + return redirect()->back()->withInput()->withErrors($user->getErrors()); } - - private function filterDisplayable($permissions) { $output = null; @@ -164,6 +160,7 @@ class UsersController extends Controller return $p['display'] === true; }); } + return $output; } @@ -179,7 +176,7 @@ class UsersController extends Controller */ public function edit($id) { - if ($user = User::find($id)) { + if ($user = User::find($id)) { $this->authorize('update', $user); $permissions = config('permissions'); @@ -194,6 +191,7 @@ class UsersController extends Controller } $error = trans('admin/users/message.user_not_found', compact('id')); + return redirect()->route('users.index')->with('error', $error); } @@ -212,7 +210,7 @@ class UsersController extends Controller // We need to reverse the UI specific logic for our // permissions here before we update the user. - $permissions = $request->input('permissions', array()); + $permissions = $request->input('permissions', []); app('request')->request->set('permissions', $permissions); // This is a janky hack to prevent people from changing admin demo user data on the public demo. @@ -245,7 +243,6 @@ class UsersController extends Controller $user->groups()->sync($request->input('groups')); } - // Update the user if ($request->filled('username')) { $user->username = $request->input('username'); @@ -271,7 +268,6 @@ class UsersController extends Controller $user->activated = $request->input('activated', 0); $user->zip = $request->input('zip', null); - // Update the location of any assets checked out to this user Asset::where('assigned_type', User::class) ->where('assigned_to', $user->id) @@ -285,17 +281,16 @@ class UsersController extends Controller $permissions_array = $request->input('permission'); // Strip out the superuser permission if the user isn't a superadmin - if (!Auth::user()->isSuperUser()) { + if (! Auth::user()->isSuperUser()) { unset($permissions_array['superuser']); $permissions_array['superuser'] = $orig_superuser; } - $user->permissions = json_encode($permissions_array); + $user->permissions = json_encode($permissions_array); // Handle uploaded avatar app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar'); - //\Log::debug(print_r($user, true)); // Was the user updated? @@ -304,6 +299,7 @@ class UsersController extends Controller return redirect()->route('users.index') ->with('success', trans('admin/users/message.success.update')); } + return redirect()->back()->withInput()->withErrors($user->getErrors()); } @@ -334,25 +330,25 @@ class UsersController extends Controller if (($user->assets()) && (($assetsCount = $user->assets()->count()) > 0)) { // Redirect to the user management page return redirect()->route('users.index') - ->with('error', 'This user still has ' . $assetsCount . ' assets associated with them.'); + ->with('error', 'This user still has '.$assetsCount.' assets associated with them.'); } if (($user->licenses()) && (($licensesCount = $user->licenses()->count())) > 0) { // Redirect to the user management page return redirect()->route('users.index') - ->with('error', 'This user still has ' . $licensesCount . ' licenses associated with them.'); + ->with('error', 'This user still has '.$licensesCount.' licenses associated with them.'); } if (($user->accessories()) && (($accessoriesCount = $user->accessories()->count()) > 0)) { // Redirect to the user management page return redirect()->route('users.index') - ->with('error', 'This user still has ' . $accessoriesCount . ' accessories associated with them.'); + ->with('error', 'This user still has '.$accessoriesCount.' accessories associated with them.'); } if (($user->managedLocations()) && (($managedLocationsCount = $user->managedLocations()->count())) > 0) { // Redirect to the user management page return redirect()->route('users.index') - ->with('error', 'This user still has ' . $managedLocationsCount . ' locations that they manage.'); + ->with('error', 'This user still has '.$managedLocationsCount.' locations that they manage.'); } // Delete the user @@ -382,7 +378,7 @@ class UsersController extends Controller { $this->authorize('update', User::class); // Get user information - if (!User::onlyTrashed()->find($id)) { + if (! User::onlyTrashed()->find($id)) { return redirect()->route('users.index')->with('error', trans('admin/users/messages.user_not_found')); } @@ -390,10 +386,10 @@ class UsersController extends Controller if (User::withTrashed()->where('id', $id)->restore()) { return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored')); } + return redirect()->route('users.index')->with('error', 'User could not be restored.'); } - /** * Return a view with user detail * @@ -405,7 +401,7 @@ class UsersController extends Controller */ public function show($userId = null) { - if (!$user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId)) { + if (! $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId)) { // Redirect to the user management page return redirect()->route('users.index') ->with('error', trans('admin/users/message.user_not_found', ['id' => $userId])); @@ -414,6 +410,7 @@ class UsersController extends Controller $userlog = $user->userlog->load('item'); $this->authorize('view', $user); + return view('users/view', compact('user', 'userlog')) ->with('settings', Setting::getSettings()); } @@ -443,7 +440,7 @@ class UsersController extends Controller } // Do we have permission to unsuspend this user? - if ($user->isSuperUser() && !Auth::user()->isSuperUser()) { + if ($user->isSuperUser() && ! Auth::user()->isSuperUser()) { // Redirect to the user management page return redirect()->route('users.index')->with('error', 'Insufficient permissions!'); } @@ -457,7 +454,6 @@ class UsersController extends Controller } } - /** * Return a view containing a pre-populated new user form, * populated with some fields from an existing user. @@ -473,10 +469,9 @@ class UsersController extends Controller $this->authorize('create', User::class); // We need to reverse the UI specific logic for our // permissions here before we update the user. - $permissions = $request->input('permissions', array()); + $permissions = $request->input('permissions', []); app('request')->request->set('permissions', $permissions); - try { // Get the user information $user_to_clone = User::withTrashed()->find($id); @@ -509,7 +504,6 @@ class UsersController extends Controller } } - /** * Exports users to CSV * @@ -530,7 +524,7 @@ class UsersController extends Controller User::with('assets', 'accessories', 'consumables', 'department', 'licenses', 'manager', 'groups', 'userloc', 'company') ->orderBy('created_at', 'DESC') ->chunk(500, function ($users) use ($handle) { - $headers=[ + $headers = [ // strtolower to prevent Excel from trying to open it as a SYLK file strtolower(trans('general.id')), trans('admin/companies/table.title'), @@ -549,7 +543,7 @@ class UsersController extends Controller trans('admin/users/table.groups'), trans('general.notes'), trans('admin/users/table.activated'), - trans('general.created_at') + trans('general.created_at'), ]; fputcsv($handle, $headers); @@ -579,7 +573,7 @@ class UsersController extends Controller $user->consumables->count(), $user_groups, $user->notes, - ($user->activated=='1') ? trans('general.yes') : trans('general.no'), + ($user->activated == '1') ? trans('general.yes') : trans('general.no'), $user->created_at, ]; @@ -611,6 +605,7 @@ class UsersController extends Controller $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get(); $accessories = $show_user->accessories()->get(); $consumables = $show_user->consumables()->get(); + return view('users/print')->with('assets', $assets) ->with('licenses', $show_user->licenses()->get()) ->with('accessories', $accessories) @@ -619,7 +614,6 @@ class UsersController extends Controller ->with('settings', Setting::getSettings()); } - /** * Send individual password reset email * @@ -627,22 +621,22 @@ class UsersController extends Controller * @since [v5.0.15] * @return \Illuminate\Http\RedirectResponse */ - public function sendPasswordReset($id) { - - if (($user = User::find($id)) && ($user->activated == '1') && ($user->email!='') && ($user->ldap_import == '0')) { + public function sendPasswordReset($id) + { + if (($user = User::find($id)) && ($user->activated == '1') && ($user->email != '') && ($user->ldap_import == '0')) { $credentials = ['email' => $user->email]; try { \Password::sendResetLink($credentials, function (Message $message) use ($user) { $message->subject($this->getEmailSubject()); }); - return redirect()->back()->with('success', trans('admin/users/message.password_reset_sent', ['email' => $user->email])); + return redirect()->back()->with('success', trans('admin/users/message.password_reset_sent', ['email' => $user->email])); } catch (\Exception $e) { return redirect()->back()->with('error', ' Error sending email. :( '); } - } + return redirect()->back()->with('error', 'User is not activated, is LDAP synced, or does not have an email address '); } } diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 1525e73dbb..e5e66c7027 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -1,4 +1,5 @@ withTrashed()->find(Auth::user()->id); - $userlog = $user->userlog->load('item', 'user', 'target'); if (isset($user->id)) { @@ -50,42 +49,36 @@ class ViewAssetsController extends Controller // Redirect to the user management page return redirect()->route('users.index') ->with('error', trans('admin/users/message.user_not_found', $user->id)); - } - /** * Returns view of requestable items for a user. * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function getRequestableIndex() { - $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get(); $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get(); return view('account/requestable-assets', compact('assets', 'models')); } - - public function getRequestItem(Request $request, $itemType, $itemId = null) { $item = null; - $fullItemType = 'App\\Models\\' . studly_case($itemType); + $fullItemType = 'App\\Models\\'.studly_case($itemType); - if ($itemType == "asset_model") { - $itemType = "model"; + if ($itemType == 'asset_model') { + $itemType = 'model'; } - $item = call_user_func(array($fullItemType, 'find'), $itemId); + $item = call_user_func([$fullItemType, 'find'], $itemId); $user = Auth::user(); - $logaction = new Actionlog(); $logaction->item_id = $data['asset_id'] = $item->id; $logaction->item_type = $fullItemType; - $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s"); + $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s'); if ($user->location_id) { $logaction->location_id = $user->location_id; @@ -99,41 +92,35 @@ class ViewAssetsController extends Controller $data['item_type'] = $itemType; $data['target'] = Auth::user(); - if ($fullItemType == Asset::class) { $data['item_url'] = route('hardware.show', $item->id); } else { $data['item_url'] = route("view/${itemType}", $item->id); - } $settings = Setting::getSettings(); if ($item_request = $item->isRequestedBy($user)) { - $item->cancelRequest(); - $data['item_quantity'] = $item_request->qty; - $logaction->logaction('request_canceled'); + $item->cancelRequest(); + $data['item_quantity'] = $item_request->qty; + $logaction->logaction('request_canceled'); - if (($settings->alert_email!='') && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) { + if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) { $settings->notify(new RequestAssetCancelation($data)); } return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled')); - } else { $item->request(); - if (($settings->alert_email!='') && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) { + if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) { $logaction->logaction('requested'); $settings->notify(new RequestAssetNotification($data)); } - - return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); } } - /** * Process a specific requested asset * @param null $assetId @@ -141,7 +128,6 @@ class ViewAssetsController extends Controller */ public function getRequestAsset($assetId = null) { - $user = Auth::user(); // Check if the asset exists and is requestable @@ -149,20 +135,20 @@ class ViewAssetsController extends Controller return redirect()->route('requestable-assets') ->with('error', trans('admin/hardware/message.does_not_exist_or_not_requestable')); } - if (!Company::isCurrentUserHasAccess($asset)) { + if (! Company::isCurrentUserHasAccess($asset)) { return redirect()->route('requestable-assets') ->with('error', trans('general.insufficient_permissions')); } $data['item'] = $asset; - $data['target'] = Auth::user(); + $data['target'] = Auth::user(); $data['item_quantity'] = 1; $settings = Setting::getSettings(); $logaction = new Actionlog(); $logaction->item_id = $data['asset_id'] = $asset->id; $logaction->item_type = $data['item_type'] = Asset::class; - $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s"); + $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s'); if ($user->location_id) { $logaction->location_id = $user->location_id; @@ -170,14 +156,14 @@ class ViewAssetsController extends Controller $logaction->target_id = $data['user_id'] = Auth::user()->id; $logaction->target_type = User::class; - // If it's already requested, cancel the request. if ($asset->isRequestedBy(Auth::user())) { $asset->cancelRequest(); $asset->decrement('requests_counter', 1); - + $logaction->logaction('request canceled'); $settings->notify(new RequestAssetCancelation($data)); + return redirect()->route('requestable-assets') ->with('success')->with('success', trans('admin/hardware/message.requests.cancel-success')); } @@ -187,10 +173,7 @@ class ViewAssetsController extends Controller $asset->increment('requests_counter', 1); $settings->notify(new RequestAssetNotification($data)); - return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); - - } public function getRequestedAssets() @@ -198,37 +181,33 @@ class ViewAssetsController extends Controller return view('account/requested'); } - // Get the acceptance screen public function getAcceptAsset($logID = null) { - $findlog = Actionlog::where('id', $logID)->first(); - if (!$findlog) { + if (! $findlog) { return redirect()->to('account/view-assets')->with('error', 'No matching record.'); } - if ($findlog->accepted_id!='') { + if ($findlog->accepted_id != '') { return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted')); } $user = Auth::user(); - // TODO - Fix this for non-assets - if (($findlog->item_type==Asset::class) && ($user->id != $findlog->item->assigned_to)) { + if (($findlog->item_type == Asset::class) && ($user->id != $findlog->item->assigned_to)) { return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } - $item = $findlog->item; // Check if the asset exists if (is_null($item)) { // Redirect to the asset management page return redirect()->to('account')->with('error', trans('admin/hardware/message.does_not_exist')); - } elseif (!Company::isCurrentUserHasAccess($item)) { + } elseif (! Company::isCurrentUserHasAccess($item)) { return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions')); } else { return view('account/accept-asset', compact('item'))->with('findlog', $findlog)->with('item', $item); @@ -245,8 +224,7 @@ class ViewAssetsController extends Controller return redirect()->to('account/view-assets')->with('error', trans('admin/hardware/message.does_not_exist')); } - - if ($findlog->accepted_id!='') { + if ($findlog->accepted_id != '') { // Redirect to the asset management page return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted')); } @@ -257,48 +235,46 @@ class ViewAssetsController extends Controller $user = Auth::user(); - if (($findlog->item_type==Asset::class) && ($user->id != $findlog->item->assigned_to)) { + if (($findlog->item_type == Asset::class) && ($user->id != $findlog->item->assigned_to)) { return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted')); } if ($request->filled('signature_output')) { $path = config('app.private_uploads').'/signatures'; - $sig_filename = "siglog-".$findlog->id.'-'.date('Y-m-d-his').".png"; + $sig_filename = 'siglog-'.$findlog->id.'-'.date('Y-m-d-his').'.png'; $data_uri = e($request->get('signature_output')); - $encoded_image = explode(",", $data_uri); + $encoded_image = explode(',', $data_uri); $decoded_image = base64_decode($encoded_image[1]); - file_put_contents($path."/".$sig_filename, $decoded_image); + file_put_contents($path.'/'.$sig_filename, $decoded_image); } - $logaction = new Actionlog(); - if ($request->input('asset_acceptance')=='accepted') { - $logaction_msg = 'accepted'; - $accepted="accepted"; + if ($request->input('asset_acceptance') == 'accepted') { + $logaction_msg = 'accepted'; + $accepted = 'accepted'; $return_msg = trans('admin/users/message.accepted'); } else { $logaction_msg = 'declined'; - $accepted="rejected"; + $accepted = 'rejected'; $return_msg = trans('admin/users/message.declined'); } - $logaction->item_id = $findlog->item_id; - $logaction->item_type = $findlog->item_type; + $logaction->item_id = $findlog->item_id; + $logaction->item_type = $findlog->item_type; // Asset - if (($findlog->item_id!='') && ($findlog->item_type==Asset::class)) { - if ($request->input('asset_acceptance')!='accepted') { + if (($findlog->item_id != '') && ($findlog->item_type == Asset::class)) { + if ($request->input('asset_acceptance') != 'accepted') { DB::table('assets') ->where('id', $findlog->item_id) - ->update(array('assigned_to' => null)); + ->update(['assigned_to' => null]); } } $logaction->target_id = $findlog->target_id; $logaction->target_type = User::class; $logaction->note = e($request->input('note')); - $logaction->updated_at = date("Y-m-d H:i:s"); - + $logaction->updated_at = date('Y-m-d H:i:s'); if (isset($sig_filename)) { $logaction->accept_signature = $sig_filename; @@ -307,9 +283,9 @@ class ViewAssetsController extends Controller $update_checkout = DB::table('action_logs') ->where('id', $findlog->id) - ->update(array('accepted_id' => $logaction->id)); + ->update(['accepted_id' => $logaction->id]); - if (($findlog->item_id!='') && ($findlog->item_type==Asset::class)) { + if (($findlog->item_id != '') && ($findlog->item_type == Asset::class)) { $affected_asset = $logaction->item; $affected_asset->accepted = $accepted; $affected_asset->save(); @@ -317,7 +293,6 @@ class ViewAssetsController extends Controller if ($update_checkout) { return redirect()->to('account/view-assets')->with('success', $return_msg); - } else { return redirect()->to('account/view-assets')->with('error', 'Something went wrong '); } diff --git a/app/Http/Middleware/AssetCountForSidebar.php b/app/Http/Middleware/AssetCountForSidebar.php index ac14f8f8d2..414c10e8a1 100644 --- a/app/Http/Middleware/AssetCountForSidebar.php +++ b/app/Http/Middleware/AssetCountForSidebar.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Auth; use App\Models\Asset; +use Auth; use Closure; class AssetCountForSidebar @@ -17,8 +17,7 @@ class AssetCountForSidebar */ public function handle($request, Closure $next) { - try - { + try { $total_rtd_sidebar = Asset::RTD()->count(); view()->share('total_rtd_sidebar', $total_rtd_sidebar); } catch (\Exception $e) { diff --git a/app/Http/Middleware/CheckForDebug.php b/app/Http/Middleware/CheckForDebug.php index 923b76b1c6..6b6bd6ba8b 100644 --- a/app/Http/Middleware/CheckForDebug.php +++ b/app/Http/Middleware/CheckForDebug.php @@ -18,7 +18,7 @@ class CheckForDebug { view()->share('debug_in_production', false); - if (((Auth::check() && (Auth::user()->isSuperUser()))) && (app()->environment()=='production') && (config('app.warn_debug')===true) && (config('app.debug')===true)) { + if (((Auth::check() && (Auth::user()->isSuperUser()))) && (app()->environment() == 'production') && (config('app.warn_debug') === true) && (config('app.debug') === true)) { view()->share('debug_in_production', true); } diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php index aa21f649fa..b4beb70588 100644 --- a/app/Http/Middleware/CheckForSetup.php +++ b/app/Http/Middleware/CheckForSetup.php @@ -19,22 +19,17 @@ class CheckForSetup } if (Setting::setupCompleted()) { - if ($request->is('setup*')) { return redirect(url('/')); } else { return $next($request); } - } else { - if (!($request->is('setup*')) && !($request->is('.env')) && !($request->is('health'))) { + if (! ($request->is('setup*')) && ! ($request->is('.env')) && ! ($request->is('health'))) { return redirect(url('/').'/setup'); } return $next($request); - } - - } } diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php index a0b5be6ad6..48df11ba51 100644 --- a/app/Http/Middleware/CheckPermissions.php +++ b/app/Http/Middleware/CheckPermissions.php @@ -7,31 +7,25 @@ use Gate; class CheckPermissions { - /** - * Handle the ACLs for permissions. - * - * The $section variable is passed via the route middleware, - * 'middleware' => [authorize:superadmin'] - * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null $section - * @return mixed - */ + /** + * Handle the ACLs for permissions. + * + * The $section variable is passed via the route middleware, + * 'middleware' => [authorize:superadmin'] + * + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @param string|null $section + * @return mixed + */ public function handle($request, Closure $next, $section = null) { - - if (Gate::allows($section)) { return $next($request); } return response()->view('layouts/basic', [ - 'content' => view('errors/403') + 'content' => view('errors/403'), ]); - - - - } } diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 7817127da3..5f4c62723a 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -6,7 +6,6 @@ use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter; class EncryptCookies extends BaseEncrypter { - /** * The names of the cookies that should not be encrypted. * @@ -22,6 +21,4 @@ class EncryptCookies extends BaseEncrypter * @var bool */ protected static $serialize = true; - - } diff --git a/app/Http/Middleware/NoSessionStore.php b/app/Http/Middleware/NoSessionStore.php index 86706a0974..c445d4e7f8 100644 --- a/app/Http/Middleware/NoSessionStore.php +++ b/app/Http/Middleware/NoSessionStore.php @@ -7,7 +7,7 @@ use Closure; class NoSessionStore { protected $except = [ - 'health' + 'health', ]; /** @@ -24,6 +24,7 @@ class NoSessionStore config()->set('session.driver', 'array'); } } + return $next($request); } -} \ No newline at end of file +} diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index 8a3800ffe6..9ce387400e 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -68,11 +68,9 @@ class SecurityHeaders $feature_policy[] = "wake-lock 'none'"; $feature_policy[] = "xr-spatial-tracking 'none'"; - $feature_policy = join(';', $feature_policy); + $feature_policy = implode(';', $feature_policy); $response->headers->set('Feature-Policy', $feature_policy); - - // Defaults to same-origin if REFERRER_POLICY is not set in the .env $response->headers->set('Referrer-Policy', config('app.referrer_policy')); @@ -86,7 +84,6 @@ class SecurityHeaders $response->headers->set('X-Frame-Options', 'DENY'); } - // This defaults to false to maintain backwards compatibility for // people who are not running Snipe-IT over TLS (shame, shame, shame!) // Seriously though, please run Snipe-IT over TLS. Let's Encrypt is free. @@ -99,15 +96,15 @@ class SecurityHeaders // We have to exclude debug mode here because debugbar pulls from a CDN or two // and it will break things. - if ((config('app.debug')!='true') && (config('app.enable_csp')=='true')) { + if ((config('app.debug') != 'true') && (config('app.enable_csp') == 'true')) { $csp_policy[] = "default-src 'self'"; $csp_policy[] = "style-src 'self' 'unsafe-inline'"; $csp_policy[] = "script-src 'self' 'unsafe-inline' 'unsafe-eval'"; $csp_policy[] = "connect-src 'self'"; $csp_policy[] = "object-src 'none'"; $csp_policy[] = "font-src 'self' data:"; - $csp_policy[] = "img-src 'self' data: ".config('app.url')." ".env('PUBLIC_AWS_URL')." https://secure.gravatar.com http://gravatar.com maps.google.com maps.gstatic.com *.googleapis.com"; - $csp_policy = join(';', $csp_policy); + $csp_policy[] = "img-src 'self' data: ".config('app.url').' '.env('PUBLIC_AWS_URL').' https://secure.gravatar.com http://gravatar.com maps.google.com maps.gstatic.com *.googleapis.com'; + $csp_policy = implode(';', $csp_policy); $response->headers->set('Content-Security-Policy', $csp_policy); } @@ -116,7 +113,8 @@ class SecurityHeaders private function removeUnwantedHeaders($headerList) { - foreach ($headerList as $header) + foreach ($headerList as $header) { header_remove($header); + } } } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index f09e2ac9bd..33772440ea 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -12,6 +12,6 @@ class VerifyCsrfToken extends BaseVerifier * @var array */ protected $except = [ - 'health' + 'health', ]; } diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php index 4ba8ce09b7..d6ed2d590a 100644 --- a/app/Http/Requests/AssetCheckoutRequest.php +++ b/app/Http/Requests/AssetCheckoutRequest.php @@ -22,13 +22,12 @@ class AssetCheckoutRequest extends Request public function rules() { $rules = [ - "assigned_user" => 'required_without_all:assigned_asset,assigned_location', - "assigned_asset" => 'required_without_all:assigned_user,assigned_location', - "assigned_location" => 'required_without_all:assigned_user,assigned_asset', - "checkout_to_type" => 'required|in:asset,location,user' + 'assigned_user' => 'required_without_all:assigned_asset,assigned_location', + 'assigned_asset' => 'required_without_all:assigned_user,assigned_location', + 'assigned_location' => 'required_without_all:assigned_user,assigned_asset', + 'checkout_to_type' => 'required|in:asset,location,user', ]; - return $rules; } } diff --git a/app/Http/Requests/AssetFileRequest.php b/app/Http/Requests/AssetFileRequest.php index de012afeb1..f8631f23ba 100644 --- a/app/Http/Requests/AssetFileRequest.php +++ b/app/Http/Requests/AssetFileRequest.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; - class AssetFileRequest extends Request { /** @@ -23,6 +22,7 @@ class AssetFileRequest extends Request public function rules() { $max_file_size = \App\Helpers\Helper::file_upload_max_size(); + return [ 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,webp|max:'.$max_file_size, ]; diff --git a/app/Http/Requests/CustomFieldRequest.php b/app/Http/Requests/CustomFieldRequest.php index cc7749f27f..7c6ba1e97e 100644 --- a/app/Http/Requests/CustomFieldRequest.php +++ b/app/Http/Requests/CustomFieldRequest.php @@ -24,28 +24,26 @@ class CustomFieldRequest extends FormRequest */ public function rules(Request $request) { - $rules = []; - switch($this->method()) - { + switch ($this->method()) { // Brand new case 'POST': { - $rules['name'] = "required|unique:custom_fields"; + $rules['name'] = 'required|unique:custom_fields'; break; } // Save all fields case 'PUT': - $rules['name'] = "required"; + $rules['name'] = 'required'; break; // Save only what's passed case 'PATCH': { - $rules['name'] = "required"; + $rules['name'] = 'required'; break; } diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index 3f4a7b64b0..0a25ad7336 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -3,8 +3,8 @@ namespace App\Http\Requests; use App\Models\SnipeModel; -use Intervention\Image\Facades\Image; use enshrined\svgSanitize\Sanitizer; +use Intervention\Image\Facades\Image; use Storage; class ImageUploadRequest extends Request @@ -40,23 +40,22 @@ class ImageUploadRequest extends Request /** * Handle and store any images attached to request * @param SnipeModel $item Item the image is associated with - * @param String $path location for uploaded images, defaults to uploads/plural of item type. + * @param string $path location for uploaded images, defaults to uploads/plural of item type. * @return SnipeModel Target asset is being checked out to. */ public function handleImages($item, $w = 600, $form_fieldname = null, $path = null, $db_fieldname = 'image') { - $type = strtolower(class_basename(get_class($item))); if (is_null($path)) { $path = str_plural($type); if ($type == 'assetmodel') { - $path = 'models'; + $path = 'models'; } if ($type == 'user') { - $path = 'avatars'; + $path = 'avatars'; } } @@ -71,46 +70,41 @@ class ImageUploadRequest extends Request $use_db_field = $db_fieldname; } - \Log::info('Image path is: '.$path); \Log::debug('Type is: '.$type); \Log::debug('Form fieldname is: '.$form_fieldname); \Log::debug('DB fieldname is: '.$use_db_field); - \Log::debug('Trying to upload to '. $path); + \Log::debug('Trying to upload to '.$path); \Log::debug($this->file()); if ($this->hasFile($form_fieldname)) { - - if (!config('app.lock_passwords')) { - + if (! config('app.lock_passwords')) { $image = $this->file($form_fieldname); $ext = $image->getClientOriginalExtension(); $file_name = $type.'-'.$form_fieldname.'-'.str_random(10).'.'.$ext; \Log::info('File name will be: '.$file_name); - \Log::debug('File extension is: '. $ext); + \Log::debug('File extension is: '.$ext); - if (($image->getClientOriginalExtension()!=='webp') && ($image->getClientOriginalExtension()!=='svg')) { + if (($image->getClientOriginalExtension() !== 'webp') && ($image->getClientOriginalExtension() !== 'svg')) { \Log::debug('Not an SVG or webp - resize'); \Log::debug('Trying to upload to: '.$path.'/'.$file_name); $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) { $constraint->aspectRatio(); $constraint->upsize(); - }); + }); // This requires a string instead of an object, so we use ($string) - Storage::disk('public')->put($path.'/'.$file_name, (string)$upload->encode()); - + Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode()); } else { // If the file is a webp, we need to just move it since webp support // needs to be compiled into gd for resizing to be available - if ($image->getClientOriginalExtension()=='webp') { + if ($image->getClientOriginalExtension() == 'webp') { \Log::debug('This is a webp, just move it'); Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image)); // If the file is an SVG, we need to clean it and NOT encode it } else { - \Log::debug('This is an SVG'); $sanitizer = new Sanitizer(); $dirtySVG = file_get_contents($image->getRealPath()); @@ -126,43 +120,34 @@ class ImageUploadRequest extends Request } } - - // Remove Current image if exists + // Remove Current image if exists if (Storage::disk('public')->exists($path.'/'.$item->{$use_db_field})) { - \Log::debug('A file already exists that we are replacing - we should delete the old one.'); try { - Storage::disk('public')->delete($path.'/'.$item->{$use_db_field}); - \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.'); + Storage::disk('public')->delete($path.'/'.$item->{$use_db_field}); + \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.'); } catch (\Exception $e) { \Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?'); - } } $item->{$use_db_field} = $file_name; - } - // If the user isn't uploading anything new but wants to delete their old image, do so + // If the user isn't uploading anything new but wants to delete their old image, do so } else { \Log::debug('No file passed for '.$form_fieldname); - if ($this->input('image_delete')=='1') { - + if ($this->input('image_delete') == '1') { \Log::debug('Deleting image'); try { - - Storage::disk('public')->delete($path . '/' . $item->{$use_db_field}); - $item->{$use_db_field} = null; - + Storage::disk('public')->delete($path.'/'.$item->{$use_db_field}); + $item->{$use_db_field} = null; } catch (\Exception $e) { \Log::debug($e); } } - } - return $item; } } diff --git a/app/Http/Requests/ItemImportRequest.php b/app/Http/Requests/ItemImportRequest.php index b9c12d3459..05babb97cd 100644 --- a/app/Http/Requests/ItemImportRequest.php +++ b/app/Http/Requests/ItemImportRequest.php @@ -34,30 +34,30 @@ class ItemImportRequest extends FormRequest { ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M')); - - $filename = config('app.private_uploads') . '/imports/' . $import->file_path; + + $filename = config('app.private_uploads').'/imports/'.$import->file_path; $import->import_type = $this->input('import-type'); $class = title_case($import->import_type); $classString = "App\\Importer\\{$class}Importer"; $importer = new $classString($filename); - $import->field_map = request('column-mappings'); + $import->field_map = request('column-mappings'); $import->save(); - $fieldMappings=[]; + $fieldMappings = []; if ($import->field_map) { foreach ($import->field_map as $field => $fieldValue) { $errorMessage = null; - if(is_null($fieldValue)){ + if (is_null($fieldValue)) { $errorMessage = trans('validation.import_field_empty'); $this->errorCallback($import, $field, $errorMessage); - + return $this->errors; } } // We submit as csv field: column, but the importer is happier if we flip it here. $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER); - // dd($fieldMappings); + // dd($fieldMappings); } $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback']) ->setUserId(Auth::id()) @@ -68,19 +68,21 @@ class ItemImportRequest extends FormRequest // $logFile = storage_path('logs/importer.log'); // \Log::useFiles($logFile); $importer->import(); + return $this->errors; } public function log($string) { - \Log::Info($string); + \Log::Info($string); } public function progress($count) { // Open for future - return; + } + public function errorCallback($item, $field, $errorString) { $this->errors[$item->name][$field] = $errorString; diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 35bfcdee93..ff8f123b3d 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -1,6 +1,7 @@ ajax() || $this->wantsJson()) - { + if ($this->ajax() || $this->wantsJson()) { return Helper::formatStandardApiResponse('error', null, $errors); } diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php index 3c706e854a..b6e44c3f44 100644 --- a/app/Http/Requests/SaveUserRequest.php +++ b/app/Http/Requests/SaveUserRequest.php @@ -3,9 +3,9 @@ namespace App\Http\Requests; use App\Models\Setting; -use Illuminate\Http\Exceptions\HttpResponseException; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Contracts\Validation\Validator; +use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\Exceptions\HttpResponseException; class SaveUserRequest extends FormRequest { @@ -24,7 +24,6 @@ class SaveUserRequest extends FormRequest return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag); } - /** * Get the validation rules that apply to the request. * @@ -32,21 +31,18 @@ class SaveUserRequest extends FormRequest */ public function rules() { - $rules = [ - 'manager_id' => "nullable|exists:users,id" + 'manager_id' => 'nullable|exists:users,id', ]; - switch($this->method()) - { + switch ($this->method()) { // Brand new user case 'POST': { $rules['first_name'] = 'required|string|min:1'; $rules['username'] = 'required_unless:ldap_import,1|string|min:1'; - if ($this->request->get('ldap_import') == false) - { + if ($this->request->get('ldap_import') == false) { $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed'; } break; @@ -68,9 +64,7 @@ class SaveUserRequest extends FormRequest default:break; } - + return $rules; - } - } diff --git a/app/Http/Requests/SettingsLdapRequest.php b/app/Http/Requests/SettingsLdapRequest.php index 33da10fd65..234903cba4 100644 --- a/app/Http/Requests/SettingsLdapRequest.php +++ b/app/Http/Requests/SettingsLdapRequest.php @@ -24,20 +24,19 @@ class SettingsLdapRequest extends Request public function rules() { $rules = [ - "ldap_server" => 'sometimes|required_if:ldap_enabled,1|url|nullable', - "ldap_uname" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_basedn" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_filter" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_username_field" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_fname_field" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_lname_field" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_auth_filter_query" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ldap_version" => 'sometimes|required_if:ldap_enabled,1|nullable', - "ad_domain" => 'sometimes|required_if:is_ad,1|nullable', + 'ldap_server' => 'sometimes|required_if:ldap_enabled,1|url|nullable', + 'ldap_uname' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_basedn' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_filter' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_username_field' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_fname_field' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_lname_field' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_auth_filter_query' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ldap_version' => 'sometimes|required_if:ldap_enabled,1|nullable', + 'ad_domain' => 'sometimes|required_if:is_ad,1|nullable', ]; return $rules; - } public function response(array $errors) @@ -45,6 +44,7 @@ class SettingsLdapRequest extends Request $this->session()->flash('errors', Session::get('errors', new \Illuminate\Support\ViewErrorBag) ->put('default', new \Illuminate\Support\MessageBag($errors))); \Input::flash(); + return parent::response($errors); } } diff --git a/app/Http/Requests/SettingsSamlRequest.php b/app/Http/Requests/SettingsSamlRequest.php index 74cdaf39da..8f02d64f03 100644 --- a/app/Http/Requests/SettingsSamlRequest.php +++ b/app/Http/Requests/SettingsSamlRequest.php @@ -2,10 +2,10 @@ namespace App\Http\Requests; +use App\Models\Setting; use Illuminate\Foundation\Http\FormRequest; use OneLogin\Saml2\IdPMetadataParser as OneLogin_Saml2_IdPMetadataParser; use OneLogin\Saml2\Utils as OneLogin_Saml2_Utils; -use App\Models\Setting; /** * This handles validating and cleaning SAML settings provided by the user. @@ -42,9 +42,8 @@ class SettingsSamlRequest extends FormRequest { $validator->after(function ($validator) { if ($this->input('saml_enabled') == '1') { - $idpMetadata = $this->input('saml_idp_metadata'); - if (!empty($idpMetadata)) { + if (! empty($idpMetadata)) { try { if (filter_var($idpMetadata, FILTER_VALIDATE_URL)) { $metadataInfo = OneLogin_Saml2_IdPMetadataParser::parseRemoteXML($idpMetadata); @@ -59,21 +58,21 @@ class SettingsSamlRequest extends FormRequest $was_custom_x509cert = strpos(Setting::getSettings()->saml_custom_settings, 'sp_x509cert') !== false; - $custom_x509cert=''; - $custom_privateKey=''; - $custom_x509certNew=''; - if (!empty($this->input('saml_custom_settings'))) { + $custom_x509cert = ''; + $custom_privateKey = ''; + $custom_x509certNew = ''; + if (! empty($this->input('saml_custom_settings'))) { $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings')); $custom_settings = []; - + foreach ($req_custom_settings as $custom_setting) { $split = explode('=', $custom_setting, 2); - + if (count($split) == 2) { $split[0] = trim($split[0]); $split[1] = trim($split[1]); - - if (!empty($split[0])) { + + if (! empty($split[0])) { $custom_settings[] = implode('=', $split); } if ($split[0] == 'sp_x509cert') { @@ -86,37 +85,36 @@ class SettingsSamlRequest extends FormRequest } } } - - $this->merge(['saml_custom_settings' => implode(PHP_EOL, $custom_settings) . PHP_EOL]); + + $this->merge(['saml_custom_settings' => implode(PHP_EOL, $custom_settings).PHP_EOL]); } - $cert_updated=false; - if (!empty($custom_x509cert) && !empty($custom_privateKey)) { + $cert_updated = false; + if (! empty($custom_x509cert) && ! empty($custom_privateKey)) { // custom certificate and private key are defined - $cert_updated=true; + $cert_updated = true; $x509 = openssl_x509_read($custom_x509cert); $pkey = openssl_pkey_get_private($custom_privateKey); - } elseif ($this->input('saml_sp_regenerate_keypair') == '1' || !$this->has('saml_sp_x509cert') || $was_custom_x509cert) { + } elseif ($this->input('saml_sp_regenerate_keypair') == '1' || ! $this->has('saml_sp_x509cert') || $was_custom_x509cert) { // key regeneration requested, no certificate defined yet or previous custom certicate was removed -error_log("regen"); - $cert_updated=true; + error_log('regen'); + $cert_updated = true; $dn = [ - "countryName" => "US", - "stateOrProvinceName" => "N/A", - "localityName" => "N/A", - "organizationName" => "Snipe-IT", - "commonName" => "Snipe-IT", + 'countryName' => 'US', + 'stateOrProvinceName' => 'N/A', + 'localityName' => 'N/A', + 'organizationName' => 'Snipe-IT', + 'commonName' => 'Snipe-IT', ]; $pkey = openssl_pkey_new([ - "private_key_bits" => 2048, - "private_key_type" => OPENSSL_KEYTYPE_RSA, + 'private_key_bits' => 2048, + 'private_key_type' => OPENSSL_KEYTYPE_RSA, ]); - + $csr = openssl_csr_new($dn, $pkey, ['digest_alg' => 'sha256']); if ($csr) { - $x509 = openssl_csr_sign($csr, null, $pkey, 3650, ['digest_alg' => 'sha256']); openssl_x509_export($x509, $x509cert); @@ -126,8 +124,8 @@ error_log("regen"); while (($error = openssl_error_string() !== false)) { $errors[] = $error; } - - if (!(empty($x509cert) && empty($privateKey))) { + + if (! (empty($x509cert) && empty($privateKey))) { $this->merge([ 'saml_sp_x509cert' => $x509cert, 'saml_sp_privatekey' => $privateKey, @@ -146,14 +144,14 @@ error_log("regen"); $errors[] = $error; } - if (!empty($x509certNew)) { + if (! empty($x509certNew)) { $this->merge([ - 'saml_sp_x509certNew' => $x509certNew + 'saml_sp_x509certNew' => $x509certNew, ]); } } else { $this->merge([ - 'saml_sp_x509certNew' => "" + 'saml_sp_x509certNew' => '', ]); } }); diff --git a/app/Http/Traits/UniqueUndeletedTrait.php b/app/Http/Traits/UniqueUndeletedTrait.php index 63a3740b54..d4c726bd73 100644 --- a/app/Http/Traits/UniqueUndeletedTrait.php +++ b/app/Http/Traits/UniqueUndeletedTrait.php @@ -1,21 +1,21 @@ exists) { - return 'unique_undeleted:'.$this->table.','. $this->getKey(); + return 'unique_undeleted:'.$this->table.','.$this->getKey(); } return 'unique_undeleted:'.$this->table.',0'; diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index d40642d875..d8858f91b8 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformAccessory (Accessory $accessory) + public function transformAccessory(Accessory $accessory) { $array = [ 'id' => $accessory->id, 'name' => e($accessory->name), 'image' => ($accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory->image)) : null, - 'company' => ($accessory->company) ? ['id' => $accessory->company->id,'name'=> e($accessory->company->name)] : null, - 'manufacturer' => ($accessory->manufacturer) ? ['id' => $accessory->manufacturer->id,'name'=> e($accessory->manufacturer->name)] : null, - 'supplier' => ($accessory->supplier) ? ['id' => $accessory->supplier->id,'name'=> e($accessory->supplier->name)] : null, + 'company' => ($accessory->company) ? ['id' => $accessory->company->id, 'name'=> e($accessory->company->name)] : null, + 'manufacturer' => ($accessory->manufacturer) ? ['id' => $accessory->manufacturer->id, 'name'=> e($accessory->manufacturer->name)] : null, + 'supplier' => ($accessory->supplier) ? ['id' => $accessory->supplier->id, 'name'=> e($accessory->supplier->name)] : null, 'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null, - 'category' => ($accessory->category) ? ['id' => $accessory->category->id,'name'=> e($accessory->category->name)] : null, - 'location' => ($accessory->location) ? ['id' => $accessory->location->id,'name'=> e($accessory->location->name)] : null, + 'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null, + 'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null, 'notes' => ($accessory->notes) ? e($accessory->notes) : null, 'qty' => ($accessory->qty) ? (int) $accessory->qty : null, 'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null, @@ -47,7 +48,7 @@ class AccessoriesTransformer $permissions_array['available_actions'] = [ 'checkout' => Gate::allows('checkout', Accessory::class), 'checkin' => false, - 'update' => Gate::allows('update', Accessory::class) , + 'update' => Gate::allows('update', Accessory::class), 'delete' => Gate::allows('delete', Accessory::class), ]; @@ -62,13 +63,9 @@ class AccessoriesTransformer return $array; } - - public function transformCheckedoutAccessory ($accessory, $accessory_users, $total) + public function transformCheckedoutAccessory($accessory, $accessory_users, $total) { - - - $array = array(); - + $array = []; foreach ($accessory_users as $user) { \Log::debug(print_r($user->pivot, true)); @@ -85,14 +82,10 @@ class AccessoriesTransformer 'checkout_notes' => $user->pivot->note, 'last_checkout' => Helper::getFormattedDateObject($user->pivot->created_at, 'datetime'), 'type' => 'user', - 'available_actions' => ['checkin' => true] + 'available_actions' => ['checkin' => true], ]; - } return (new DatatablesTransformer)->transformDatatables($array, $total); } - - - } diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index f2b18fab4e..b3a01d3b7b 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformActionlog (Actionlog $actionlog, $settings = null) + public function transformActionlog(Actionlog $actionlog, $settings = null) { $icon = $actionlog->present()->icon(); - if ($actionlog->filename!='') { - $icon = e(\App\Helpers\Helper::filetype_icon($actionlog->filename)); + if ($actionlog->filename != '') { + $icon = e(\App\Helpers\Helper::filetype_icon($actionlog->filename)); } // This is necessary since we can't escape special characters within a JSON object - if (($actionlog->log_meta) && ($actionlog->log_meta!='')) { + if (($actionlog->log_meta) && ($actionlog->log_meta != '')) { $meta_array = json_decode($actionlog->log_meta); if ($meta_array) { foreach ($meta_array as $key => $value) { foreach ($value as $meta_key => $meta_value) { - if (is_array($meta_value)) { foreach ($meta_value as $meta_value_key => $meta_value_value) { $clean_meta[$key][$meta_value_key] = e($meta_value_value); @@ -50,9 +50,7 @@ class ActionlogsTransformer // so we have to walk down that next level if (is_object($meta_value)) { - foreach ($meta_value as $meta_value_key => $meta_value_value) { - if ($meta_value_key == 'value') { $clean_meta[$key]['old'] = null; $clean_meta[$key]['new'] = e($meta_value->value); @@ -61,25 +59,19 @@ class ActionlogsTransformer $clean_meta[$meta_value_key]['new'] = e($meta_value_value); } } - - - } else { $clean_meta[$key][$meta_key] = e($meta_value); } } - } } - } } - - $array = [ + $array = [ 'id' => (int) $actionlog->id, 'icon' => $icon, - 'file' => ($actionlog->filename!='') ? + 'file' => ($actionlog->filename != '') ? [ 'url' => route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]), 'filename' => $actionlog->filename, @@ -88,52 +80,47 @@ class ActionlogsTransformer 'item' => ($actionlog->item) ? [ 'id' => (int) $actionlog->item->id, - 'name' => ($actionlog->itemType()=='user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()), + 'name' => ($actionlog->itemType() == 'user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()), 'type' => e($actionlog->itemType()), ] : null, 'location' => ($actionlog->location) ? [ 'id' => (int) $actionlog->location->id, - 'name' => e($actionlog->location->name) + 'name' => e($actionlog->location->name), ] : null, 'created_at' => Helper::getFormattedDateObject($actionlog->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($actionlog->updated_at, 'datetime'), - 'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->calcNextAuditDate(null, $actionlog->item), 'date'): null, + 'next_audit_date' => ($actionlog->itemType() == 'asset') ? Helper::getFormattedDateObject($actionlog->calcNextAuditDate(null, $actionlog->item), 'date') : null, 'days_to_next_audit' => $actionlog->daysUntilNextAudit($settings->audit_interval, $actionlog->item), 'action_type' => $actionlog->present()->actionType(), 'admin' => ($actionlog->user) ? [ 'id' => (int) $actionlog->user->id, 'name' => e($actionlog->user->getFullNameAttribute()), 'first_name'=> e($actionlog->user->first_name), - 'last_name'=> e($actionlog->user->last_name) + 'last_name'=> e($actionlog->user->last_name), ] : null, 'target' => ($actionlog->target) ? [ 'id' => (int) $actionlog->target->id, - 'name' => ($actionlog->targetType()=='user') ? e($actionlog->target->getFullNameAttribute()) : e($actionlog->target->getDisplayNameAttribute()), + 'name' => ($actionlog->targetType() == 'user') ? e($actionlog->target->getFullNameAttribute()) : e($actionlog->target->getDisplayNameAttribute()), 'type' => e($actionlog->targetType()), ] : null, - 'note' => ($actionlog->note) ? e($actionlog->note): null, - 'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null, - 'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null, - 'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): null, + 'note' => ($actionlog->note) ? e($actionlog->note) : null, + 'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature]) : null, + 'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta : null, + 'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime') : null, ]; return $array; } - - - public function transformCheckedoutActionlog (Collection $accessories_users, $total) + public function transformCheckedoutActionlog(Collection $accessories_users, $total) { - - $array = array(); + $array = []; foreach ($accessories_users as $user) { $array[] = (new UsersTransformer)->transformUser($user); } + return (new DatatablesTransformer)->transformDatatables($array, $total); } - - - } diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php index 49c1b38b65..72ec786f68 100644 --- a/app/Http/Transformers/AssetMaintenancesTransformer.php +++ b/app/Http/Transformers/AssetMaintenancesTransformer.php @@ -1,57 +1,58 @@ transformDatatables($array, $total); } - public function transformAssetMaintenance (AssetMaintenance $assetmaintenance) + public function transformAssetMaintenance(AssetMaintenance $assetmaintenance) { $array = [ 'id' => (int) $assetmaintenance->id, 'asset' => ($assetmaintenance->asset) ? [ 'id' => (int) $assetmaintenance->asset->id, 'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null, - 'asset_tag'=> e($assetmaintenance->asset->asset_tag) + 'asset_tag'=> e($assetmaintenance->asset->asset_tag), - ] : null, + ] : null, 'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [ 'id' => (int) $assetmaintenance->asset->model->id, - 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null - ] : null, + 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null, + ] : null, 'company' => (($assetmaintenance->asset) && ($assetmaintenance->asset->company)) ? [ 'id' => (int) $assetmaintenance->asset->company->id, 'name'=> ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null, - ] : null, + ] : null, 'title' => ($assetmaintenance->title) ? e($assetmaintenance->title) : null, 'location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->location)) ? [ 'id' => (int) $assetmaintenance->asset->location->id, 'name'=> e($assetmaintenance->asset->location->name), - ] : null, + ] : null, 'notes' => ($assetmaintenance->notes) ? e($assetmaintenance->notes) : null, - 'supplier' => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id,'name'=> e($assetmaintenance->supplier->name)] : null, + 'supplier' => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null, 'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost), 'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type), 'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'), 'asset_maintenance_time' => $assetmaintenance->asset_maintenance_time, 'completion_date' => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'), - 'user_id' => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id,'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null, + 'user_id' => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null, 'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'), @@ -66,9 +67,4 @@ class AssetMaintenancesTransformer return $array; } - - - - - } diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index 3f561b7b9f..528df3b146 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformAssetModel (AssetModel $assetmodel) + public function transformAssetModel(AssetModel $assetmodel) { - $array = [ 'id' => (int) $assetmodel->id, 'name' => e($assetmodel->name), 'manufacturer' => ($assetmodel->manufacturer) ? [ 'id' => (int) $assetmodel->manufacturer->id, - 'name'=> e($assetmodel->manufacturer->name) - ] : null, - 'image' => ($assetmodel->image!='') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null, + 'name'=> e($assetmodel->manufacturer->name), + ] : null, + 'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null, 'model_number' => e($assetmodel->model_number), 'depreciation' => ($assetmodel->depreciation) ? [ 'id' => (int) $assetmodel->depreciation->id, - 'name'=> e($assetmodel->depreciation->name) - ] : null, + 'name'=> e($assetmodel->depreciation->name), + ] : null, 'assets_count' => (int) $assetmodel->assets_count, 'category' => ($assetmodel->category) ? [ 'id' => (int) $assetmodel->category->id, - 'name'=> e($assetmodel->category->name) - ] : null, + 'name'=> e($assetmodel->category->name), + ] : null, 'fieldset' => ($assetmodel->fieldset) ? [ 'id' => (int) $assetmodel->fieldset->id, - 'name'=> e($assetmodel->fieldset->name) - ] : null, - 'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol .' months': 'None', - 'requestable' => ($assetmodel->requestable =='1') ? true : false, + 'name'=> e($assetmodel->fieldset->name), + ] : null, + 'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None', + 'requestable' => ($assetmodel->requestable == '1') ? true : false, 'notes' => e($assetmodel->notes), 'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'), @@ -54,20 +54,19 @@ class AssetModelsTransformer ]; $permissions_array['available_actions'] = [ - 'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at=='')), - 'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->assets_count==0)), - 'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at=='')), - 'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at!='')), + 'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')), + 'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->assets_count == 0)), + 'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at == '')), + 'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at != '')), ]; $array += $permissions_array; + return $array; } - - public function transformAssetModelsDatatable($assetmodels) { + public function transformAssetModelsDatatable($assetmodels) + { return (new DatatablesTransformer)->transformDatatables($assetmodels); } - - } diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 400a5dd111..1936764464 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformAsset(Asset $asset) { $array = [ @@ -27,10 +28,10 @@ class AssetsTransformer 'serial' => e($asset->serial), 'model' => ($asset->model) ? [ 'id' => (int) $asset->model->id, - 'name'=> e($asset->model->name) + 'name'=> e($asset->model->name), ] : null, 'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null, - 'eol' => ($asset->purchase_date!='') ? Helper::getFormattedDateObject($asset->present()->eol_date(), 'date') : null , + 'eol' => ($asset->purchase_date != '') ? Helper::getFormattedDateObject($asset->present()->eol_date(), 'date') : null, 'status_label' => ($asset->assetstatus) ? [ 'id' => (int) $asset->assetstatus->id, 'name'=> e($asset->assetstatus->name), @@ -39,34 +40,34 @@ class AssetsTransformer ] : null, 'category' => (($asset->model) && ($asset->model->category)) ? [ 'id' => (int) $asset->model->category->id, - 'name'=> e($asset->model->category->name) - ] : null, + 'name'=> e($asset->model->category->name), + ] : null, 'manufacturer' => (($asset->model) && ($asset->model->manufacturer)) ? [ 'id' => (int) $asset->model->manufacturer->id, - 'name'=> e($asset->model->manufacturer->name) + 'name'=> e($asset->model->manufacturer->name), ] : null, 'supplier' => ($asset->supplier) ? [ 'id' => (int) $asset->supplier->id, - 'name'=> e($asset->supplier->name) - ] : null, + 'name'=> e($asset->supplier->name), + ] : null, 'notes' => ($asset->notes) ? e($asset->notes) : null, 'order_number' => ($asset->order_number) ? e($asset->order_number) : null, 'company' => ($asset->company) ? [ 'id' => (int) $asset->company->id, - 'name'=> e($asset->company->name) + 'name'=> e($asset->company->name), ] : null, 'location' => ($asset->location) ? [ 'id' => (int) $asset->location->id, - 'name'=> e($asset->location->name) - ] : null, + 'name'=> e($asset->location->name), + ] : null, 'rtd_location' => ($asset->defaultLoc) ? [ 'id' => (int) $asset->defaultLoc->id, - 'name'=> e($asset->defaultLoc->name) - ] : null, + 'name'=> e($asset->defaultLoc->name), + ] : null, 'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null, 'assigned_to' => $this->transformAssignedTo($asset), - 'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null, - 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, + 'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null, + 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, 'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'), 'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'datetime'), @@ -82,14 +83,12 @@ class AssetsTransformer 'user_can_checkout' => (bool) $asset->availableForCheckout(), ]; - if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) { - $fields_array = array(); + $fields_array = []; foreach ($asset->model->fieldset->fields as $field) { - if ($field->isFieldDecryptable($asset->{$field->convertUnicodeDbSlug()})) { - $decrypted = \App\Helpers\Helper::gracefulDecrypt($field,$asset->{$field->convertUnicodeDbSlug()}); + $decrypted = \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->convertUnicodeDbSlug()}); $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted')); $fields_array[$field->name] = [ @@ -97,20 +96,17 @@ class AssetsTransformer 'value' => $value, 'field_format' => $field->format, ]; - } else { $fields_array[$field->name] = [ 'field' => $field->convertUnicodeDbSlug(), 'value' => $asset->{$field->convertUnicodeDbSlug()}, 'field_format' => $field->format, ]; - - } $array['custom_fields'] = $fields_array; } } else { - $array['custom_fields'] = array(); + $array['custom_fields'] = []; } $permissions_array['available_actions'] = [ @@ -119,10 +115,10 @@ class AssetsTransformer 'clone' => Gate::allows('create', Asset::class), 'restore' => false, 'update' => (bool) Gate::allows('update', Asset::class), - 'delete' => ($asset->assigned_to=='' && Gate::allows('delete', Asset::class)), + 'delete' => ($asset->assigned_to == '' && Gate::allows('delete', Asset::class)), ]; - if ($asset->deleted_at!='') { + if ($asset->deleted_at != '') { $permissions_array['available_actions'] = [ 'checkout' => true, 'checkin' => false, @@ -133,8 +129,8 @@ class AssetsTransformer ]; } - $array += $permissions_array; + return $array; } @@ -153,27 +149,29 @@ class AssetsTransformer 'first_name'=> e($asset->assigned->first_name), 'last_name'=> ($asset->assigned->last_name) ? e($asset->assigned->last_name) : null, 'employee_number' => ($asset->assigned->employee_num) ? e($asset->assigned->employee_num) : null, - 'type' => 'user' + 'type' => 'user', ] : null; } + return $asset->assigned ? [ 'id' => $asset->assigned->id, 'name' => $asset->assigned->display_name, - 'type' => $asset->assignedType() + 'type' => $asset->assignedType(), ] : null; } - public function transformRequestedAssets(Collection $assets, $total) { - $array = array(); + $array = []; foreach ($assets as $asset) { $array[] = self::transformRequestedAsset($asset); } + return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformRequestedAsset(Asset $asset) { + public function transformRequestedAsset(Asset $asset) + { $array = [ 'id' => (int) $asset->id, 'name' => e($asset->name), @@ -193,8 +191,8 @@ class AssetsTransformer ]; - $array += $permissions_array; - return $array; + $array += $permissions_array; + return $array; } } diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php index a07d8b345c..2c2f4c64d4 100644 --- a/app/Http/Transformers/CategoriesTransformer.php +++ b/app/Http/Transformers/CategoriesTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformCategory (Category $category = null) + public function transformCategory(Category $category = null) { if ($category) { - $array = [ 'id' => (int) $category->id, 'name' => e($category->name), @@ -30,7 +30,7 @@ class CategoriesTransformer 'category_type' => ucwords(e($category->category_type)), 'has_eula' => ($category->getEula() ? true : false), 'eula' => ($category->getEula()), - 'checkin_email' => ($category->checkin_email =='1'), + 'checkin_email' => ($category->checkin_email == '1'), 'require_acceptance' => ($category->require_acceptance == '1'), 'item_count' => (int) $category->itemCount(), 'assets_count' => (int) $category->assets_count, @@ -51,10 +51,5 @@ class CategoriesTransformer return $array; } - - } - - - } diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php index 4460b30c14..bafe1f9f68 100644 --- a/app/Http/Transformers/CompaniesTransformer.php +++ b/app/Http/Transformers/CompaniesTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformCompany (Company $company = null) + public function transformCompany(Company $company = null) { if ($company) { - $array = [ 'id' => (int) $company->id, 'name' => e($company->name), 'image' => ($company->image) ? Storage::disk('public')->url('companies/'.e($company->image)) : null, - "created_at" => Helper::getFormattedDateObject($company->created_at, 'datetime'), - "updated_at" => Helper::getFormattedDateObject($company->updated_at, 'datetime'), - "assets_count" => (int) $company->assets_count, - "licenses_count" => (int) $company->licenses_count, - "accessories_count" => (int) $company->accessories_count, - "consumables_count" => (int) $company->consumables_count, - "components_count" => (int) $company->components_count, - "users_count" => (int) $company->users_count + 'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'), + 'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'), + 'assets_count' => (int) $company->assets_count, + 'licenses_count' => (int) $company->licenses_count, + 'accessories_count' => (int) $company->accessories_count, + 'consumables_count' => (int) $company->consumables_count, + 'components_count' => (int) $company->components_count, + 'users_count' => (int) $company->users_count, ]; $permissions_array['available_actions'] = [ 'update' => Gate::allows('update', Company::class), - 'delete' => $company->isDeletable() + 'delete' => $company->isDeletable(), ]; $array += $permissions_array; return $array; } - - } - - - } diff --git a/app/Http/Transformers/ComponentsAssetsTransformer.php b/app/Http/Transformers/ComponentsAssetsTransformer.php index 8ce3a8600d..1c288bfc9a 100644 --- a/app/Http/Transformers/ComponentsAssetsTransformer.php +++ b/app/Http/Transformers/ComponentsAssetsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - - public function transformAsset (Asset $asset) + public function transformAsset(Asset $asset) { $array = [ 'id' => $asset->id, @@ -34,8 +35,6 @@ class ComponentsAssetsTransformer 'delete' => Gate::allows('delete', Asset::class), ]; - - $array += $permissions_array; if ($asset->model->fieldset) { @@ -43,12 +42,13 @@ class ComponentsAssetsTransformer $fields_array = [$field->name => $asset->{$field->convertUnicodeDbSlug()}]; $array += $fields_array; } - } + } return $array; } - public function transformAssetsDatatable ($assets) { + public function transformAssetsDatatable($assets) + { return (new DatatablesTransformer)->transformDatatables($assets); } } diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php index c27deb2a1f..c43c2d5bdc 100644 --- a/app/Http/Transformers/ComponentsTransformer.php +++ b/app/Http/Transformers/ComponentsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } @@ -27,13 +29,13 @@ class ComponentsTransformer 'serial' => ($component->serial) ? e($component->serial) : null, 'location' => ($component->location) ? [ 'id' => (int) $component->location->id, - 'name' => e($component->location->name) + 'name' => e($component->location->name), ] : null, - 'qty' => ($component->qty!='') ? (int) $component->qty : null, - 'min_amt' => ($component->min_amt!='') ? (int) $component->min_amt : null, + 'qty' => ($component->qty != '') ? (int) $component->qty : null, + 'min_amt' => ($component->min_amt != '') ? (int) $component->min_amt : null, 'category' => ($component->category) ? [ 'id' => (int) $component->category->id, - 'name' => e($component->category->name) + 'name' => e($component->category->name), ] : null, 'order_number' => e($component->order_number), 'purchase_date' => Helper::getFormattedDateObject($component->purchase_date, 'date'), @@ -41,7 +43,7 @@ class ComponentsTransformer 'remaining' => (int) $component->numRemaining(), 'company' => ($component->company) ? [ 'id' => (int) $component->company->id, - 'name' => e($component->company->name) + 'name' => e($component->company->name), ] : null, 'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'), @@ -59,21 +61,19 @@ class ComponentsTransformer return $array; } - public function transformCheckedoutComponents(Collection $components_assets, $total) { - $array = array(); + $array = []; foreach ($components_assets as $asset) { $array[] = [ 'assigned_pivot_id' => $asset->pivot->id, 'id' => (int) $asset->id, - 'name' => e($asset->model->present()->name) .' '.e($asset->present()->name), + 'name' => e($asset->model->present()->name).' '.e($asset->present()->name), 'qty' => $asset->pivot->assigned_qty, 'type' => 'asset', 'created_at' => Helper::getFormattedDateObject($asset->pivot->created_at, 'datetime'), - 'available_actions' => ['checkin' => true] + 'available_actions' => ['checkin' => true], ]; - } return (new DatatablesTransformer)->transformDatatables($array, $total); diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php index c82299de98..abc1fc42ee 100644 --- a/app/Http/Transformers/ConsumablesTransformer.php +++ b/app/Http/Transformers/ConsumablesTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformConsumable (Consumable $consumable) + public function transformConsumable(Consumable $consumable) { $array = [ 'id' => (int) $consumable->id, @@ -31,7 +32,7 @@ class ConsumablesTransformer 'location' => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null, 'manufacturer' => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null, 'min_amt' => (int) $consumable->min_amt, - 'model_number' => ($consumable->model_number!='') ? e($consumable->model_number) : null, + 'model_number' => ($consumable->model_number != '') ? e($consumable->model_number) : null, 'remaining' => $consumable->numRemaining(), 'order_number' => e($consumable->order_number), 'purchase_cost' => Helper::formatCurrencyOutput($consumable->purchase_cost), @@ -54,20 +55,17 @@ class ConsumablesTransformer 'delete' => Gate::allows('delete', Consumable::class), ]; $array += $permissions_array; + return $array; } - - public function transformCheckedoutConsumables (Collection $consumables_users, $total) + public function transformCheckedoutConsumables(Collection $consumables_users, $total) { - - $array = array(); + $array = []; foreach ($consumables_users as $user) { $array[] = (new UsersTransformer)->transformUser($user); } + return (new DatatablesTransformer)->transformDatatables($array, $total); } - - - } diff --git a/app/Http/Transformers/CustomFieldsTransformer.php b/app/Http/Transformers/CustomFieldsTransformer.php index 1ef6904de8..81135de13c 100644 --- a/app/Http/Transformers/CustomFieldsTransformer.php +++ b/app/Http/Transformers/CustomFieldsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } @@ -24,7 +25,7 @@ class CustomFieldsTransformer * @param int $total * @return array */ - public function transformCustomFieldsWithDefaultValues (Collection $fields, $modelId, $total) + public function transformCustomFieldsWithDefaultValues(Collection $fields, $modelId, $total) { $array = []; @@ -35,20 +36,21 @@ class CustomFieldsTransformer return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformCustomField (CustomField $field) + public function transformCustomField(CustomField $field) { $array = [ 'id' => $field->id, 'name' => e($field->name), 'db_column_name' => e($field->db_column_name()), 'format' => e($field->format), - 'field_values' => ($field->field_values) ? e($field->field_values) : null, - 'field_values_array' => ($field->field_values) ? explode("\r\n", e($field->field_values)) : null, + 'field_values' => ($field->field_values) ? e($field->field_values) : null, + 'field_values_array' => ($field->field_values) ? explode("\r\n", e($field->field_values)) : null, 'type' => e($field->element), 'required' => $field->pivot ? $field->pivot->required : false, 'created_at' => Helper::getFormattedDateObject($field->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($field->updated_at, 'datetime'), ]; + return $array; } @@ -60,13 +62,13 @@ class CustomFieldsTransformer * @param int $modelId * @return array */ - public function transformCustomFieldWithDefaultValue (CustomField $field, $modelId) + public function transformCustomFieldWithDefaultValue(CustomField $field, $modelId) { return [ 'id' => $field->id, 'name' => e($field->name), 'type' => e($field->element), - 'field_values_array' => ($field->field_values) ? explode("\r\n", e($field->field_values)) : null, + 'field_values_array' => ($field->field_values) ? explode("\r\n", e($field->field_values)) : null, 'default_value' => $field->defaultValue($modelId), ]; } diff --git a/app/Http/Transformers/CustomFieldsetsTransformer.php b/app/Http/Transformers/CustomFieldsetsTransformer.php index 260164ef8c..61e42486ab 100644 --- a/app/Http/Transformers/CustomFieldsetsTransformer.php +++ b/app/Http/Transformers/CustomFieldsetsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformCustomFieldset (CustomFieldset $fieldset) + public function transformCustomFieldset(CustomFieldset $fieldset) { $fields = $fieldset->fields; $models = $fieldset->models; - $modelsArray = array(); + $modelsArray = []; - foreach ($models as $model) - { + foreach ($models as $model) { $modelsArray[] = [ 'id' => $model->id, - 'name' => e($model->name) + 'name' => e($model->name), ]; } @@ -39,6 +39,7 @@ class CustomFieldsetsTransformer 'created_at' => Helper::getFormattedDateObject($fieldset->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($fieldset->updated_at, 'datetime'), ]; + return $array; } } diff --git a/app/Http/Transformers/DatatablesTransformer.php b/app/Http/Transformers/DatatablesTransformer.php index 0fc90bec8c..0e69109391 100644 --- a/app/Http/Transformers/DatatablesTransformer.php +++ b/app/Http/Transformers/DatatablesTransformer.php @@ -1,13 +1,14 @@ transformDatatables($array, $total); } - public function transformDepartment (Department $department = null) + public function transformDepartment(Department $department = null) { if ($department) { - $array = [ 'id' => (int) $department->id, 'name' => e($department->name), 'image' => ($department->image) ? Storage::disk('public')->url(app('departments_upload_url').e($department->image)) : null, 'company' => ($department->company) ? [ 'id' => (int) $department->company->id, - 'name'=> e($department->company->name) + 'name'=> e($department->company->name), ] : null, 'manager' => ($department->manager) ? [ 'id' => (int) $department->manager->id, 'name' => e($department->manager->getFullNameAttribute()), 'first_name'=> e($department->manager->first_name), - 'last_name'=> e($department->manager->last_name) + 'last_name'=> e($department->manager->last_name), ] : null, 'location' => ($department->location) ? [ 'id' => (int) $department->location->id, - 'name' => e($department->location->name) + 'name' => e($department->location->name), ] : null, 'users_count' => e($department->users_count), 'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'), @@ -48,17 +48,12 @@ class DepartmentsTransformer $permissions_array['available_actions'] = [ 'update' => Gate::allows('update', Department::class), - 'delete' => (Gate::allows('delete', Department::class) && ($department->users_count==0)), + 'delete' => (Gate::allows('delete', Department::class) && ($department->users_count == 0)), ]; $array += $permissions_array; return $array; } - - } - - - } diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php index 0b9d011e23..b2e1c91739 100644 --- a/app/Http/Transformers/DepreciationsTransformer.php +++ b/app/Http/Transformers/DepreciationsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array); } - public function transformDepreciation (Depreciation $depreciation) + public function transformDepreciation(Depreciation $depreciation) { $array = [ 'id' => (int) $depreciation->id, 'name' => e($depreciation->name), - 'months' => $depreciation->months . ' '. trans('general.months'), + 'months' => $depreciation->months.' '.trans('general.months'), 'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime'), ]; @@ -37,7 +38,4 @@ class DepreciationsTransformer return $array; } - - - } diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php index 8f116aad76..93511ce9ff 100644 --- a/app/Http/Transformers/GroupsTransformer.php +++ b/app/Http/Transformers/GroupsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array); } - public function transformGroup (Group $group) + public function transformGroup(Group $group) { $array = [ 'id' => (int) $group->id, @@ -38,7 +39,4 @@ class GroupsTransformer return $array; } - - - } diff --git a/app/Http/Transformers/ImportsTransformer.php b/app/Http/Transformers/ImportsTransformer.php index 813819c193..486c18f28c 100644 --- a/app/Http/Transformers/ImportsTransformer.php +++ b/app/Http/Transformers/ImportsTransformer.php @@ -1,4 +1,5 @@ (int) $import->id, + 'id' => (int) $import->id, 'file_path' => e($import->file_path), 'filesize' => Setting::fileSizeConvert($import->filesize), 'name' => e($import->name), diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index c8454d06e7..126361b17a 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformLicenseSeat (LicenseSeat $seat, $seat_count=0) + public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0) { $array = [ 'id' => (int) $seat->id, @@ -28,27 +29,26 @@ class LicenseSeatsTransformer 'assigned_user' => ($seat->user) ? [ 'id' => (int) $seat->user->id, 'name'=> e($seat->user->present()->fullName), - 'department'=> - ($seat->user->department) ? + 'department'=> ($seat->user->department) ? [ - "id" => (int) $seat->user->department->id, - "name" => e($seat->user->department->name) + 'id' => (int) $seat->user->department->id, + 'name' => e($seat->user->department->name), - ] : null + ] : null, ] : null, 'assigned_asset' => ($seat->asset) ? [ 'id' => (int) $seat->asset->id, - 'name'=> e($seat->asset->present()->fullName) + 'name'=> e($seat->asset->present()->fullName), ] : null, 'location' => ($seat->location()) ? [ 'id' => (int) $seat->location()->id, - 'name'=> e($seat->location()->name) + 'name'=> e($seat->location()->name), ] : null, 'reassignable' => (bool) $seat->license->reassignable, - 'user_can_checkout' => (($seat->assigned_to=='') && ($seat->asset_id=='')), + 'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')), ]; - if($seat_count != 0) { + if ($seat_count != 0) { $array['name'] = 'Seat '.$seat_count; } @@ -64,9 +64,4 @@ class LicenseSeatsTransformer return $array; } - - - - - } diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php index 48d5152688..51b193a76a 100644 --- a/app/Http/Transformers/LicensesTransformer.php +++ b/app/Http/Transformers/LicensesTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformLicense (License $license) + public function transformLicense(License $license) { $array = [ 'id' => (int) $license->id, 'name' => e($license->name), - 'company' => ($license->company) ? ['id' => (int) $license->company->id,'name'=> e($license->company->name)] : null, - 'manufacturer' => ($license->manufacturer) ? ['id' => (int) $license->manufacturer->id,'name'=> e($license->manufacturer->name)] : null, + 'company' => ($license->company) ? ['id' => (int) $license->company->id, 'name'=> e($license->company->name)] : null, + 'manufacturer' => ($license->manufacturer) ? ['id' => (int) $license->manufacturer->id, 'name'=> e($license->manufacturer->name)] : null, 'product_key' => (Gate::allows('viewKeys', License::class)) ? e($license->serial) : '------------', 'order_number' => e($license->order_number), 'purchase_order' => e($license->purchase_order), 'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'), 'termination_date' => Helper::getFormattedDateObject($license->termination_date, 'date'), - 'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null, + 'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id, 'name'=> e($license->depreciation->name)] : null, 'purchase_cost' => e($license->purchase_cost), 'notes' => e($license->notes), 'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'), @@ -40,8 +41,8 @@ class LicensesTransformer 'license_email' => e($license->license_email), 'reassignable' => ($license->reassignable == 1) ? true : false, 'maintained' => ($license->maintained == 1) ? true : false, - 'supplier' => ($license->supplier) ? ['id' => (int) $license->supplier->id,'name'=> e($license->supplier->name)] : null, - 'category' => ($license->category) ? ['id' => (int) $license->category->id,'name'=> e($license->category->name)] : null, + 'supplier' => ($license->supplier) ? ['id' => (int) $license->supplier->id, 'name'=> e($license->supplier->name)] : null, + 'category' => ($license->category) ? ['id' => (int) $license->category->id, 'name'=> e($license->category->name)] : null, 'created_at' => Helper::getFormattedDateObject($license->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($license->updated_at, 'datetime'), 'user_can_checkout' => (bool) ($license->free_seats_count > 0), @@ -60,10 +61,8 @@ class LicensesTransformer return $array; } - public function transformAssetsDatatable($licenses) { + public function transformAssetsDatatable($licenses) + { return (new DatatablesTransformer)->transformDatatables($licenses); } - - - } diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php index 2f7013b21a..78d8cc8096 100644 --- a/app/Http/Transformers/LocationsTransformer.php +++ b/app/Http/Transformers/LocationsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } public function transformLocation(Location $location = null) { if ($location) { - $children_arr = []; - if(!is_null($location->children)){ - foreach($location->children as $child) { + if (! is_null($location->children)) { + foreach ($location->children as $child) { $children_arr[] = [ 'id' => (int) $child->id, - 'name' => $child->name + 'name' => $child->name, ]; } } @@ -52,11 +52,10 @@ class LocationsTransformer 'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'), 'parent' => ($location->parent) ? [ 'id' => (int) $location->parent->id, - 'name'=> e($location->parent->name) + 'name'=> e($location->parent->name), ] : null, 'manager' => ($location->manager) ? (new UsersTransformer)->transformUser($location->manager) : null, - 'children' => $children_arr, ]; @@ -69,10 +68,5 @@ class LocationsTransformer return $array; } - - } - - - } diff --git a/app/Http/Transformers/LoginAttemptsTransformer.php b/app/Http/Transformers/LoginAttemptsTransformer.php index a0af36d121..cc1c512fbb 100644 --- a/app/Http/Transformers/LoginAttemptsTransformer.php +++ b/app/Http/Transformers/LoginAttemptsTransformer.php @@ -1,15 +1,14 @@ (int) $login_attempt->id, 'username' => e($login_attempt->username), 'user_agent' => e($login_attempt->user_agent), - 'remote_ip' => (!config('app.lock_passwords')) ? e($login_attempt->remote_ip) : '--', + 'remote_ip' => (! config('app.lock_passwords')) ? e($login_attempt->remote_ip) : '--', 'successful' => e($login_attempt->successful), 'created_at' => Helper::getFormattedDateObject($login_attempt->created_at, 'datetime'), ]; + return $array; } - - } - - - } diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php index 1cdf5dd3fe..a7ac0e6a42 100644 --- a/app/Http/Transformers/ManufacturersTransformer.php +++ b/app/Http/Transformers/ManufacturersTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformManufacturer (Manufacturer $manufacturer = null) + public function transformManufacturer(Manufacturer $manufacturer = null) { if ($manufacturer) { - $array = [ 'id' => (int) $manufacturer->id, 'name' => e($manufacturer->name), @@ -41,8 +41,8 @@ class ManufacturersTransformer ]; $permissions_array['available_actions'] = [ - 'update' => (($manufacturer->deleted_at=='') && (Gate::allows('update', Manufacturer::class))), - 'restore' => (($manufacturer->deleted_at!='') && (Gate::allows('create', Manufacturer::class))), + 'update' => (($manufacturer->deleted_at == '') && (Gate::allows('update', Manufacturer::class))), + 'restore' => (($manufacturer->deleted_at != '') && (Gate::allows('create', Manufacturer::class))), 'delete' => $manufacturer->isDeletable(), ]; @@ -50,10 +50,5 @@ class ManufacturersTransformer return $array; } - - } - - - } diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php index 57e3aa62f4..ebd91aef0c 100644 --- a/app/Http/Transformers/PredefinedKitsTransformer.php +++ b/app/Http/Transformers/PredefinedKitsTransformer.php @@ -1,4 +1,5 @@ ] * @return array */ class PredefinedKitsTransformer { - - public function transformPredefinedKits (Collection $kits, $total) + public function transformPredefinedKits(Collection $kits, $total) { - $array = array(); + $array = []; foreach ($kits as $kit) { $array[] = self::transformPredefinedKit($kit); } + return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformPredefinedKit (PredefinedKit $kit) + public function transformPredefinedKit(PredefinedKit $kit) { $array = [ 'id' => (int) $kit->id, - 'name' => e($kit->name) + 'name' => e($kit->name), ]; $permissions_array['available_actions'] = [ @@ -40,28 +41,32 @@ class PredefinedKitsTransformer ]; $array['user_can_checkout'] = true; $array += $permissions_array; + return $array; } /** - * transform collection of any elemets attached to kit + * transform collection of any elemets attached to kit * @return array */ - public function transformElements(Collection $elements, $total) { - $array = array(); + public function transformElements(Collection $elements, $total) + { + $array = []; foreach ($elements as $element) { $array[] = self::transformElement($element); } + return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformElement(SnipeModel $element) { + public function transformElement(SnipeModel $element) + { $array = [ 'id' => (int) $element->id, 'pivot_id' => (int) $element->pivot->id, 'owner_id' => (int) $element->pivot->kit_id, 'quantity' => (int) $element->pivot->quantity, - 'name' => e($element->name) + 'name' => e($element->name), ]; $permissions_array['available_actions'] = [ @@ -70,12 +75,12 @@ class PredefinedKitsTransformer ]; $array += $permissions_array; + return $array; } - public function transformPredefinedKitsDatatable($kits) { + public function transformPredefinedKitsDatatable($kits) + { return (new DatatablesTransformer)->transformDatatables($kits); } - - } diff --git a/app/Http/Transformers/SelectlistTransformer.php b/app/Http/Transformers/SelectlistTransformer.php index 6b0d8caee3..363d92126a 100644 --- a/app/Http/Transformers/SelectlistTransformer.php +++ b/app/Http/Transformers/SelectlistTransformer.php @@ -1,5 +1,7 @@ ] * @since [v4.0.16] * @return \Illuminate\Http\Response */ - class SelectlistTransformer { - - public function transformSelectlist (LengthAwarePaginator $select_items) + public function transformSelectlist(LengthAwarePaginator $select_items) { - $items_array=[]; + $items_array = []; // Loop through the paginated collection to set the array values foreach ($select_items as $select_item) { - $items_array[]= [ + $items_array[] = [ 'id' => (int) $select_item->id, 'text' => ($select_item->use_text) ? $select_item->use_text : $select_item->name, - 'image' => ($select_item->use_image) ? $select_item->use_image : null, + 'image' => ($select_item->use_image) ? $select_item->use_image : null, ]; - } $results = [ 'results' => $items_array, - 'pagination' => - [ + 'pagination' => [ 'more' => ($select_items->currentPage() >= $select_items->lastPage()) ? false : true, - 'per_page' => $select_items->perPage() + 'per_page' => $select_items->perPage(), ], 'total_count' => $select_items->total(), 'page' => $select_items->currentPage(), - 'page_count' => $select_items->lastPage() + 'page_count' => $select_items->lastPage(), ]; return $results; - } - } diff --git a/app/Http/Transformers/StatuslabelsTransformer.php b/app/Http/Transformers/StatuslabelsTransformer.php index b320129f37..cc229a590f 100644 --- a/app/Http/Transformers/StatuslabelsTransformer.php +++ b/app/Http/Transformers/StatuslabelsTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformStatuslabel (Statuslabel $statuslabel) + public function transformStatuslabel(Statuslabel $statuslabel) { $array = [ 'id' => (int) $statuslabel->id, 'name' => e($statuslabel->name), 'type' => $statuslabel->getStatuslabelType(), 'color' => ($statuslabel->color) ? e($statuslabel->color) : null, - 'show_in_nav' => ($statuslabel->show_in_nav=='1') ? true : false, - 'default_label' => ($statuslabel->default_label =='1') ? true : false, + 'show_in_nav' => ($statuslabel->show_in_nav == '1') ? true : false, + 'default_label' => ($statuslabel->default_label == '1') ? true : false, 'assets_count' => (int) $statuslabel->assets_count, 'notes' => e($statuslabel->notes), 'created_at' => Helper::getFormattedDateObject($statuslabel->created_at, 'datetime'), @@ -41,7 +42,4 @@ class StatuslabelsTransformer return $array; } - - - } diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php index e24e399bd1..76b2a01514 100644 --- a/app/Http/Transformers/SuppliersTransformer.php +++ b/app/Http/Transformers/SuppliersTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformSupplier (Supplier $supplier = null) + public function transformSupplier(Supplier $supplier = null) { if ($supplier) { - $array = [ 'id' => (int) $supplier->id, 'name' => e($supplier->name), @@ -49,17 +49,12 @@ class SuppliersTransformer $permissions_array['available_actions'] = [ 'update' => Gate::allows('update', Supplier::class), - 'delete' => (Gate::allows('delete', Supplier::class) && ($supplier->assets_count == 0) && ($supplier->licenses_count == 0) && ($supplier->accessories_count == 0)), + 'delete' => (Gate::allows('delete', Supplier::class) && ($supplier->assets_count == 0) && ($supplier->licenses_count == 0) && ($supplier->accessories_count == 0)), ]; $array += $permissions_array; return $array; } - - } - - - } diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index f2d1c795fa..49aea90a1d 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -1,4 +1,5 @@ transformDatatables($array, $total); } - public function transformUser (User $user) + public function transformUser(User $user) { $array = [ 'id' => (int) $user->id, @@ -31,8 +32,8 @@ class UsersTransformer 'employee_num' => e($user->employee_num), 'manager' => ($user->manager) ? [ 'id' => (int) $user->manager->id, - 'name'=> e($user->manager->username) - ] : null, + 'name'=> e($user->manager->username), + ] : null, 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null, 'phone' => ($user->phone) ? e($user->phone) : null, 'website' => ($user->website) ? e($user->website) : null, @@ -44,61 +45,57 @@ class UsersTransformer 'email' => e($user->email), 'department' => ($user->department) ? [ 'id' => (int) $user->department->id, - 'name'=> e($user->department->name) - ] : null, + 'name'=> e($user->department->name), + ] : null, 'location' => ($user->userloc) ? [ 'id' => (int) $user->userloc->id, - 'name'=> e($user->userloc->name) - ] : null, + 'name'=> e($user->userloc->name), + ] : null, 'notes'=> e($user->notes), 'permissions' => $user->decodePermissions(), - 'activated' => ($user->activated =='1') ? true : false, - 'ldap_import' => ($user->ldap_import =='1') ? true : false, + 'activated' => ($user->activated == '1') ? true : false, + 'ldap_import' => ($user->ldap_import == '1') ? true : false, 'two_factor_activated' => ($user->two_factor_active()) ? true : false, 'two_factor_enrolled' => ($user->two_factor_active_and_enrolled()) ? true : false, 'assets_count' => (int) $user->assets_count, 'licenses_count' => (int) $user->licenses_count, 'accessories_count' => (int) $user->accessories_count, 'consumables_count' => (int) $user->consumables_count, - 'company' => ($user->company) ? ['id' => (int) $user->company->id,'name'=> e($user->company->name)] : null, + 'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null, 'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($user->updated_at, 'datetime'), 'last_login' => Helper::getFormattedDateObject($user->last_login, 'datetime'), - 'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null, + 'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null, ]; $permissions_array['available_actions'] = [ - 'update' => (Gate::allows('update', User::class) && ($user->deleted_at=='')), - 'delete' => (Gate::allows('delete', User::class) && ($user->assets_count == 0) && ($user->licenses_count == 0) && ($user->accessories_count == 0) && ($user->consumables_count == 0)), - 'clone' => (Gate::allows('create', User::class) && ($user->deleted_at=='')) , - 'restore' => (Gate::allows('create', User::class) && ($user->deleted_at!='')), + 'update' => (Gate::allows('update', User::class) && ($user->deleted_at == '')), + 'delete' => (Gate::allows('delete', User::class) && ($user->assets_count == 0) && ($user->licenses_count == 0) && ($user->accessories_count == 0) && ($user->consumables_count == 0)), + 'clone' => (Gate::allows('create', User::class) && ($user->deleted_at == '')), + 'restore' => (Gate::allows('create', User::class) && ($user->deleted_at != '')), ]; $array += $permissions_array; - $numGroups = $user->groups->count(); - if($numGroups > 0) - { - $groups["total"] = $numGroups; - foreach($user->groups as $group) - { - $groups["rows"][] = [ + if ($numGroups > 0) { + $groups['total'] = $numGroups; + foreach ($user->groups as $group) { + $groups['rows'][] = [ 'id' => (int) $group->id, - 'name' => e($group->name) + 'name' => e($group->name), ]; } - $array["groups"] = $groups; - } - else { - $array["groups"] = null; + $array['groups'] = $groups; + } else { + $array['groups'] = null; } return $array; } - public function transformUsersDatatable($users) { + public function transformUsersDatatable($users) + { return (new DatatablesTransformer)->transformDatatables($users); } - } diff --git a/app/Importer/AccessoryImporter.php b/app/Importer/AccessoryImporter.php index 709b58ea3c..a9b940911d 100644 --- a/app/Importer/AccessoryImporter.php +++ b/app/Importer/AccessoryImporter.php @@ -27,17 +27,19 @@ class AccessoryImporter extends ItemImporter { $accessory = Accessory::where('name', $this->item['name'])->first(); if ($accessory) { - if (!$this->updating) { - $this->log('A matching Accessory ' . $this->item["name"] . ' already exists. '); + if (! $this->updating) { + $this->log('A matching Accessory '.$this->item['name'].' already exists. '); + return; } $this->log('Updating Accessory'); $accessory->update($this->sanitizeItemForUpdating($accessory)); $accessory->save(); + return; } - $this->log("No Matching Accessory, Creating a new one"); + $this->log('No Matching Accessory, Creating a new one'); $accessory = new Accessory(); $accessory->fill($this->sanitizeItemForStoring($accessory)); @@ -45,7 +47,8 @@ class AccessoryImporter extends ItemImporter // $accessory->unsetEventDispatcher(); if ($accessory->save()) { $accessory->logCreate('Imported using CSV Importer'); - $this->log('Accessory ' . $this->item["name"] . ' was created'); + $this->log('Accessory '.$this->item['name'].' was created'); + return; } $this->logError($accessory, 'Accessory'); diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php index be117d6fae..8e6781db7d 100644 --- a/app/Importer/AssetImporter.php +++ b/app/Importer/AssetImporter.php @@ -21,20 +21,17 @@ class AssetImporter extends ItemImporter parent::handle($row); if ($this->customFields) { - foreach ($this->customFields as $customField) { $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField); if ($customFieldValue) { - if ($customField->field_encrypted == 1) { $this->item['custom_fields'][$customField->db_column_name()] = \Crypt::encrypt($customFieldValue); - $this->log('Custom Field '. $customField->name.': '.\Crypt::encrypt($customFieldValue)); + $this->log('Custom Field '.$customField->name.': '.\Crypt::encrypt($customFieldValue)); } else { $this->item['custom_fields'][$customField->db_column_name()] = $customFieldValue; - $this->log('Custom Field '. $customField->name.': '.$customFieldValue); + $this->log('Custom Field '.$customField->name.': '.$customFieldValue); } - } else { // Clear out previous data. $this->item['custom_fields'][$customField->db_column_name()] = null; @@ -42,7 +39,6 @@ class AssetImporter extends ItemImporter } } - $this->createAssetIfNotExists($row); } @@ -57,30 +53,31 @@ class AssetImporter extends ItemImporter public function createAssetIfNotExists(array $row) { $editingAsset = false; - $asset_tag = $this->findCsvMatch($row, "asset_tag"); + $asset_tag = $this->findCsvMatch($row, 'asset_tag'); $asset = Asset::where(['asset_tag'=> $asset_tag])->first(); if ($asset) { - if (!$this->updating) { - $this->log('A matching Asset ' . $asset_tag . ' already exists'); + if (! $this->updating) { + $this->log('A matching Asset '.$asset_tag.' already exists'); + return; } - $this->log("Updating Asset"); + $this->log('Updating Asset'); $editingAsset = true; } else { - $this->log("No Matching Asset, Creating a new one"); + $this->log('No Matching Asset, Creating a new one'); $asset = new Asset; } - $this->item['image'] = $this->findCsvMatch($row, "image"); - $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));; - $asset->requestable = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable")); - $this->item['warranty_months'] = intval($this->findCsvMatch($row, "warranty_months")); + $this->item['image'] = $this->findCsvMatch($row, 'image'); + $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable')); + $asset->requestable = $this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable')); + $this->item['warranty_months'] = intval($this->findCsvMatch($row, 'warranty_months')); $this->item['model_id'] = $this->createOrFetchAssetModel($row); // If no status ID is found - if (!array_key_exists('status_id', $this->item) && !$editingAsset) { - $this->log("No status field found, defaulting to first status."); + if (! array_key_exists('status_id', $this->item) && ! $editingAsset) { + $this->log('No status field found, defaulting to first status.'); $this->item['status_id'] = $this->defaultStatusLabelId; } @@ -88,18 +85,17 @@ class AssetImporter extends ItemImporter // We need to save the user if it exists so that we can checkout to user later. // Sanitizing the item will remove it. - if(array_key_exists('checkout_target', $this->item)) { + if (array_key_exists('checkout_target', $this->item)) { $target = $this->item['checkout_target']; } $item = $this->sanitizeItemForStoring($asset, $editingAsset); // The location id fetched by the csv reader is actually the rtd_location_id. // This will also set location_id, but then that will be overridden by the // checkout method if necessary below. - if (isset($this->item["location_id"])) { + if (isset($this->item['location_id'])) { $item['rtd_location_id'] = $this->item['location_id']; } - if ($editingAsset) { $asset->update($item); } else { @@ -117,16 +113,17 @@ class AssetImporter extends ItemImporter // $asset->unsetEventDispatcher(); if ($asset->save()) { $asset->logCreate('Imported using csv importer'); - $this->log('Asset ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created'); + $this->log('Asset '.$this->item['name'].' with serial number '.$this->item['serial'].' was created'); // If we have a target to checkout to, lets do so. //-- user_id is a property of the abstract class Importer, which this class inherits from and it's setted by //-- the class that needs to use it (command importer or GUI importer inside the project). - if(isset($target)) { + if (isset($target)) { $asset->fresh()->checkOut($target, $this->user_id); } + return; } - $this->logError($asset, 'Asset "' . $this->item['name'].'"'); + $this->logError($asset, 'Asset "'.$this->item['name'].'"'); } } diff --git a/app/Importer/ComponentImporter.php b/app/Importer/ComponentImporter.php index a12828f5d5..de3ee14d1c 100644 --- a/app/Importer/ComponentImporter.php +++ b/app/Importer/ComponentImporter.php @@ -27,30 +27,32 @@ class ComponentImporter extends ItemImporter public function createComponentIfNotExists() { $component = null; - $this->log("Creating Component"); + $this->log('Creating Component'); $component = Component::where('name', $this->item['name']) ->where('serial', $this->item['serial']) ->first(); if ($component) { - $this->log('A matching Component ' . $this->item["name"] . ' with serial ' .$this->item['serial'].' already exists. '); - if (!$this->updating) { - $this->log("Skipping Component"); + $this->log('A matching Component '.$this->item['name'].' with serial '.$this->item['serial'].' already exists. '); + if (! $this->updating) { + $this->log('Skipping Component'); + return; } - $this->log("Updating Component"); + $this->log('Updating Component'); $component->update($this->sanitizeItemForUpdating($component)); $component->save(); + return; } - $this->log("No matching component, creating one"); + $this->log('No matching component, creating one'); $component = new Component; $component->fill($this->sanitizeItemForStoring($component)); //FIXME: this disables model validation. Need to find a way to avoid double-logs without breaking everything. $component->unsetEventDispatcher(); if ($component->save()) { $component->logCreate('Imported using CSV Importer'); - $this->log("Component " . $this->item["name"] . ' was created'); + $this->log('Component '.$this->item['name'].' was created'); // If we have an asset tag, checkout to that asset. if (isset($this->item['asset_tag']) && ($asset = Asset::where('asset_tag', $this->item['asset_tag'])->first())) { @@ -59,9 +61,10 @@ class ComponentImporter extends ItemImporter 'user_id' => $this->user_id, 'created_at' => date('Y-m-d H:i:s'), 'assigned_qty' => 1, // Only assign the first one to the asset - 'asset_id' => $asset->id + 'asset_id' => $asset->id, ]); } + return; } $this->logError($component, 'Component'); diff --git a/app/Importer/ConsumableImporter.php b/app/Importer/ConsumableImporter.php index e7972bb2cd..2fbed94dea 100644 --- a/app/Importer/ConsumableImporter.php +++ b/app/Importer/ConsumableImporter.php @@ -28,28 +28,31 @@ class ConsumableImporter extends ItemImporter { $consumable = Consumable::where('name', $this->item['name'])->first(); if ($consumable) { - if (!$this->updating) { - $this->log('A matching Consumable ' . $this->item["name"] . ' already exists. '); + if (! $this->updating) { + $this->log('A matching Consumable '.$this->item['name'].' already exists. '); + return; } $this->log('Updating Consumable'); $consumable->update($this->sanitizeItemForUpdating($consumable)); $consumable->save(); + return; } - $this->log("No matching consumable, creating one"); + $this->log('No matching consumable, creating one'); $consumable = new Consumable(); - $this->item['model_number'] = $this->findCsvMatch($row, "model_number");; - $this->item['item_no'] = $this->findCsvMatch($row, "item_number"); + $this->item['model_number'] = $this->findCsvMatch($row, 'model_number'); + $this->item['item_no'] = $this->findCsvMatch($row, 'item_number'); $consumable->fill($this->sanitizeItemForStoring($consumable)); //FIXME: this disables model validation. Need to find a way to avoid double-logs without breaking everything. $consumable->unsetEventDispatcher(); if ($consumable->save()) { $consumable->logCreate('Imported using CSV Importer'); - $this->log("Consumable " . $this->item["name"] . ' was created'); + $this->log('Consumable '.$this->item['name'].' was created'); + return; } $this->logError($consumable, 'Consumable'); - return; + } } diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php index 6466c3b2d1..f80b869d54 100644 --- a/app/Importer/Importer.php +++ b/app/Importer/Importer.php @@ -1,13 +1,14 @@ 'checkout location', 'company' => 'company', 'item_name' => 'item name', - 'item_number' => "item number", + 'item_number' => 'item number', 'image' => 'image', 'expiration_date' => 'expiration date', 'location' => 'location', 'notes' => 'notes', 'license_email' => 'licensed to email', - 'license_name' => "licensed to name", + 'license_name' => 'licensed to name', 'maintained' => 'maintained', 'manufacturer' => 'manufacturer', - 'asset_model' => "model name", + 'asset_model' => 'model name', 'model_number' => 'model number', 'order_number' => 'order number', 'purchase_cost' => 'purchase cost', @@ -106,8 +107,8 @@ abstract class Importer public function __construct($file) { $this->fieldMap = $this->defaultFieldMap; - if (! ini_get("auto_detect_line_endings")) { - ini_set("auto_detect_line_endings", '1'); + if (! ini_get('auto_detect_line_endings')) { + ini_set('auto_detect_line_endings', '1'); } // By default the importer passes a url to the file. // However, for testing we also support passing a string directly @@ -116,8 +117,9 @@ abstract class Importer } else { $this->csv = Reader::createFromString($file); } - $this->tempPassword = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20); + $this->tempPassword = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20); } + // Cached Values for import lookups protected $customFields; @@ -138,7 +140,7 @@ abstract class Importer DB::transaction(function () use (&$results) { Model::unguard(); - $resultsCount = sizeof($results); + $resultsCount = count($results); foreach ($results as $row) { $this->handle($row); if ($this->progressCallback) { @@ -150,7 +152,6 @@ abstract class Importer }); } - abstract protected function handle($row); /** @@ -166,6 +167,7 @@ abstract class Importer // This 'inverts' the fields such that we have a collection of fields indexed by name. $this->customFields = CustomField::All()->reduce(function ($nameLookup, $field) { $nameLookup[$field['name']] = $field; + return $nameLookup; }); // Remove any custom fields that do not exist in the header row. This prevents nulling out values that shouldn't exist. @@ -177,8 +179,8 @@ abstract class Importer array_change_key_case(array_flip($headerRow)) ); } - } + /** * Check to see if the given key exists in the array, and trim excess white space before returning it * @@ -191,13 +193,12 @@ abstract class Importer */ public function findCsvMatch(array $array, $key, $default = null) { - $val = $default; $key = $this->lookupCustomKey($key); // $this->log("Custom Key: ${key}"); if (array_key_exists($key, $array)) { - $val = Encoding::toUTF8(trim($array[ $key ])); + $val = Encoding::toUTF8(trim($array[$key])); } // $this->log("${key}: ${val}"); return $val; @@ -222,7 +223,7 @@ abstract class Importer /** * Used to lowercase header values to ensure we're comparing values properly. - * + * * @param $results * @return array */ @@ -232,8 +233,10 @@ abstract class Importer foreach ($results as $index => $arrayToNormalize) { $newArray[$index] = array_change_key_case($arrayToNormalize); } + return $newArray; } + /** * Figure out the fieldname of the custom field * @@ -245,6 +248,7 @@ abstract class Importer public function array_smart_custom_field_fetch(array $array, $key) { $index_name = strtolower($key->name); + return array_key_exists($index_name, $array) ? trim($array[$index_name]) : false; } @@ -277,34 +281,36 @@ abstract class Importer protected function createOrFetchUser($row) { $user_array = [ - 'full_name' => $this->findCsvMatch($row, "full_name"), - 'email' => $this->findCsvMatch($row, "email"), + 'full_name' => $this->findCsvMatch($row, 'full_name'), + 'email' => $this->findCsvMatch($row, 'email'), 'manager_id'=> '', 'department_id' => '', - 'username' => $this->findCsvMatch($row, "username"), + 'username' => $this->findCsvMatch($row, 'username'), 'activated' => $this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')), ]; // Maybe we're lucky and the user already exists. - if($user = User::where('username', $user_array['username'])->first()) { + if ($user = User::where('username', $user_array['username'])->first()) { $this->log('User '.$user_array['username'].' already exists'); + return $user; } // If the full name is empty, bail out--we need this to extract first name (at the very least) - if(empty($user_array['full_name'])) { + if (empty($user_array['full_name'])) { $this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset'); + return false; } // Is the user actually an ID? - if($user = $this->findUserByNumber($user_array['full_name'])) { + if ($user = $this->findUserByNumber($user_array['full_name'])) { return $user; } $this->log('User does not appear to be an id with number: '.$user_array['full_name'].'. Continuing through our processes'); // Populate email if it does not exist. - if(empty($user_array['email'])) { + if (empty($user_array['email'])) { $user_array['email'] = User::generateEmailFromFullName($user_array['full_name']); } @@ -314,7 +320,7 @@ abstract class Importer if (empty($user_array['username'])) { $user_array['username'] = $user_formatted_array['username']; - if ($this->usernameFormat =='email') { + if ($this->usernameFormat == 'email') { $user_array['username'] = $user_array['email']; } } @@ -323,32 +329,35 @@ abstract class Importer // Check for a matching user after trying to guess username. if ($user = User::where('username', $user_array['username'])->first()) { $this->log('User '.$user_array['username'].' already exists'); + return $user; } // If at this point we have not found a username or first name, bail out in shame. - if(empty($user_array['username']) || empty($user_array['first_name'])) { + if (empty($user_array['username']) || empty($user_array['first_name'])) { return false; } // No Luck, let's create one. $user = new User; - $user->first_name = $user_array['first_name']; - $user->last_name = $user_array['last_name']; - $user->username = $user_array['username']; - $user->email = $user_array['email']; - $user->manager_id = $user_array['manager_id'] ?? null; + $user->first_name = $user_array['first_name']; + $user->last_name = $user_array['last_name']; + $user->username = $user_array['username']; + $user->email = $user_array['email']; + $user->manager_id = $user_array['manager_id'] ?? null; $user->department_id = $user_array['department_id'] ?? null; - $user->activated = 1; - $user->password = $this->tempPassword; + $user->activated = 1; + $user->password = $this->tempPassword; \Log::debug('Creating a user with the following attributes: '.print_r($user_array, true)); if ($user->save()) { $this->log('User '.$user_array['username'].' created'); + return $user; } - $this->logError($user, 'User "' . $user_array['username'] . '" was not able to be created.'); + $this->logError($user, 'User "'.$user_array['username'].'" was not able to be created.'); + return false; } @@ -362,6 +371,7 @@ abstract class Importer // A number was given instead of a name if (is_numeric($user_name)) { $this->log('User '.$user_name.' is a number - lets see if it matches a user id'); + return User::find($user_name); } } @@ -442,6 +452,7 @@ abstract class Importer return $this; } + /** * Sets the value of usernameFormat. * @@ -458,7 +469,7 @@ abstract class Importer public function fetchHumanBoolean($value) { - return (int) filter_var($value, FILTER_VALIDATE_BOOLEAN); + return (int) filter_var($value, FILTER_VALIDATE_BOOLEAN); } /** @@ -471,11 +482,12 @@ abstract class Importer */ public function createOrFetchDepartment($user_department_name) { - if ($user_department_name!='') { + if ($user_department_name != '') { $department = Department::where('name', '=', $user_department_name)->first(); if ($department) { - $this->log('A matching Department ' . $user_department_name . ' already exists'); + $this->log('A matching Department '.$user_department_name.' already exists'); + return $department->id; } @@ -483,7 +495,8 @@ abstract class Importer $department->name = $user_department_name; if ($department->save()) { - $this->log('Department ' . $user_department_name . ' was created'); + $this->log('Department '.$user_department_name.' was created'); + return $department->id; } $this->logError($department, 'Department'); @@ -505,10 +518,12 @@ abstract class Importer $manager = User::where('first_name', '=', $user_manager_first_name) ->where('last_name', '=', $user_manager_last_name)->first(); if ($manager) { - $this->log('A matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' already exists'); + $this->log('A matching Manager '.$user_manager_first_name.' '.$user_manager_last_name.' already exists'); + return $manager->id; } - $this->log('No matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' found. If their user account is being created through this import, you should re-process this file again. '); + $this->log('No matching Manager '.$user_manager_first_name.' '.$user_manager_last_name.' found. If their user account is being created through this import, you should re-process this file again. '); + return null; } } diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php index b68d9d5e8c..b88e7e5ff1 100644 --- a/app/Importer/ItemImporter.php +++ b/app/Importer/ItemImporter.php @@ -14,6 +14,7 @@ use App\Models\User; class ItemImporter extends Importer { protected $item; + public function __construct($filename) { parent::__construct($filename); @@ -24,67 +25,67 @@ class ItemImporter extends Importer // Need to reset this between iterations or we'll have stale data. $this->item = []; - $item_category = $this->findCsvMatch($row, "category"); + $item_category = $this->findCsvMatch($row, 'category'); if ($this->shouldUpdateField($item_category)) { - $this->item["category_id"] = $this->createOrFetchCategory($item_category); + $this->item['category_id'] = $this->createOrFetchCategory($item_category); } - $item_company_name = $this->findCsvMatch($row, "company"); + $item_company_name = $this->findCsvMatch($row, 'company'); if ($this->shouldUpdateField($item_company_name)) { - $this->item["company_id"] = $this->createOrFetchCompany($item_company_name); + $this->item['company_id'] = $this->createOrFetchCompany($item_company_name); } - $item_location = $this->findCsvMatch($row, "location"); + $item_location = $this->findCsvMatch($row, 'location'); if ($this->shouldUpdateField($item_location)) { - $this->item["location_id"] = $this->createOrFetchLocation($item_location); + $this->item['location_id'] = $this->createOrFetchLocation($item_location); } - $item_manufacturer = $this->findCsvMatch($row, "manufacturer"); + $item_manufacturer = $this->findCsvMatch($row, 'manufacturer'); if ($this->shouldUpdateField($item_manufacturer)) { - $this->item["manufacturer_id"] = $this->createOrFetchManufacturer($item_manufacturer); + $this->item['manufacturer_id'] = $this->createOrFetchManufacturer($item_manufacturer); } - $item_status_name = $this->findCsvMatch($row, "status"); + $item_status_name = $this->findCsvMatch($row, 'status'); if ($this->shouldUpdateField($item_status_name)) { - $this->item["status_id"] = $this->createOrFetchStatusLabel($item_status_name); + $this->item['status_id'] = $this->createOrFetchStatusLabel($item_status_name); } - $item_supplier = $this->findCsvMatch($row, "supplier"); + $item_supplier = $this->findCsvMatch($row, 'supplier'); if ($this->shouldUpdateField($item_supplier)) { $this->item['supplier_id'] = $this->createOrFetchSupplier($item_supplier); } - $item_department = $this->findCsvMatch($row, "department"); + $item_department = $this->findCsvMatch($row, 'department'); if ($this->shouldUpdateField($item_department)) { $this->item['department_id'] = $this->createOrFetchDepartment($item_department); } - $item_manager_first_name = $this->findCsvMatch($row, "manage_first_name"); - $item_manager_last_name = $this->findCsvMatch($row, "manage_last_name"); + $item_manager_first_name = $this->findCsvMatch($row, 'manage_first_name'); + $item_manager_last_name = $this->findCsvMatch($row, 'manage_last_name'); if ($this->shouldUpdateField($item_manager_first_name)) { $this->item['manager_id'] = $this->fetchManager($item_manager_first_name, $item_manager_last_name); } - $this->item["name"] = $this->findCsvMatch($row, "item_name"); - $this->item["notes"] = $this->findCsvMatch($row, "notes"); - $this->item["order_number"] = $this->findCsvMatch($row, "order_number"); - $this->item["purchase_cost"] = $this->findCsvMatch($row, "purchase_cost"); + $this->item['name'] = $this->findCsvMatch($row, 'item_name'); + $this->item['notes'] = $this->findCsvMatch($row, 'notes'); + $this->item['order_number'] = $this->findCsvMatch($row, 'order_number'); + $this->item['purchase_cost'] = $this->findCsvMatch($row, 'purchase_cost'); - $this->item["purchase_date"] = null; - if ($this->findCsvMatch($row, "purchase_date")!='') { - $this->item["purchase_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "purchase_date"))); + $this->item['purchase_date'] = null; + if ($this->findCsvMatch($row, 'purchase_date') != '') { + $this->item['purchase_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'purchase_date'))); } - $this->item["qty"] = $this->findCsvMatch($row, "quantity"); - $this->item["requestable"] = $this->findCsvMatch($row, "requestable"); - $this->item["user_id"] = $this->user_id; - $this->item['serial'] = $this->findCsvMatch($row, "serial"); + $this->item['qty'] = $this->findCsvMatch($row, 'quantity'); + $this->item['requestable'] = $this->findCsvMatch($row, 'requestable'); + $this->item['user_id'] = $this->user_id; + $this->item['serial'] = $this->findCsvMatch($row, 'serial'); // NO need to call this method if we're running the user import. // TODO: Merge these methods. - $this->item['checkout_class'] = $this->findCsvMatch($row, "checkout_class"); - if(get_class($this) !== UserImporter::class) { + $this->item['checkout_class'] = $this->findCsvMatch($row, 'checkout_class'); + if (get_class($this) !== UserImporter::class) { // $this->item["user"] = $this->createOrFetchUser($row); - $this->item["checkout_target"] = $this->determineCheckout($row); + $this->item['checkout_target'] = $this->determineCheckout($row); } } @@ -92,11 +93,11 @@ class ItemImporter extends Importer * Parse row to determine what (if anything) we should checkout to. * @param array $row CSV Row being parsed * @return SnipeModel Model to be checked out to - */ + */ protected function determineCheckout($row) { // We only support checkout-to-location for asset, so short circuit otherwise. - if(get_class($this) != AssetImporter::class) { + if (get_class($this) != AssetImporter::class) { return $this->createOrFetchUser($row); } @@ -105,7 +106,6 @@ class ItemImporter extends Importer } return $this->createOrFetchUser($row); - } /** @@ -119,7 +119,6 @@ class ItemImporter extends Importer * @param $updating boolean Should we remove blank values? * @return array */ - protected function sanitizeItemForStoring($model, $updating = false) { // Create a collection for all manipulations to come. @@ -138,10 +137,10 @@ class ItemImporter extends Importer } /** - * Convenience function for updating that strips the empty values. + * Convenience function for updating that strips the empty values. * @param $model SnipeModel Model that's being updated. * @return array - */ + */ protected function sanitizeItemForUpdating($model) { return $this->sanitizeItemForStoring($model, true); @@ -156,15 +155,17 @@ class ItemImporter extends Importer * @author Daniel Melzter * @since 4.0 * @param $field string - * @return boolean + * @return bool */ protected function shouldUpdateField($field) { if (empty($field)) { return false; } - return !($this->updating && empty($field)); + + return ! ($this->updating && empty($field)); } + /** * Select the asset model if it exists, otherwise create it. * @@ -177,36 +178,37 @@ class ItemImporter extends Importer */ public function createOrFetchAssetModel(array $row) { - - $asset_model_name = $this->findCsvMatch($row, "asset_model"); - $asset_modelNumber = $this->findCsvMatch($row, "model_number"); + $asset_model_name = $this->findCsvMatch($row, 'asset_model'); + $asset_modelNumber = $this->findCsvMatch($row, 'model_number'); // TODO: At the moment, this means we can't update the model number if the model name stays the same. - if (!$this->shouldUpdateField($asset_model_name)) { + if (! $this->shouldUpdateField($asset_model_name)) { return; } - if ((empty($asset_model_name)) && (!empty($asset_modelNumber))) { + if ((empty($asset_model_name)) && (! empty($asset_modelNumber))) { $asset_model_name = $asset_modelNumber; - } elseif ((empty($asset_model_name)) && (empty($asset_modelNumber))) { - $asset_model_name ='Unknown'; + } elseif ((empty($asset_model_name)) && (empty($asset_modelNumber))) { + $asset_model_name = 'Unknown'; } $editingModel = $this->updating; $asset_model = AssetModel::where(['name' => $asset_model_name, 'model_number' => $asset_modelNumber])->first(); if ($asset_model) { - if (!$this->updating) { - $this->log("A matching model already exists, returning it."); + if (! $this->updating) { + $this->log('A matching model already exists, returning it.'); + return $asset_model->id; } - $this->log("Matching Model found, updating it."); + $this->log('Matching Model found, updating it.'); $item = $this->sanitizeItemForStoring($asset_model, $editingModel); $item['name'] = $asset_model_name; $item['model_number'] = $asset_modelNumber; $asset_model->update($item); $asset_model->save(); - $this->log("Asset Model Updated"); + $this->log('Asset Model Updated'); + return $asset_model->id; } - $this->log("No Matching Model, Creating a new one"); + $this->log('No Matching Model, Creating a new one'); $asset_model = new AssetModel(); $item = $this->sanitizeItemForStoring($asset_model, $editingModel); @@ -217,10 +219,12 @@ class ItemImporter extends Importer $item = null; if ($asset_model->save()) { - $this->log('Asset Model ' . $asset_model_name . ' with model number ' . $asset_modelNumber . ' was created'); + $this->log('Asset Model '.$asset_model_name.' with model number '.$asset_modelNumber.' was created'); + return $asset_model->id; } - $this->logError($asset_model, 'Asset Model "' . $asset_model_name . '"'); + $this->logError($asset_model, 'Asset Model "'.$asset_model_name.'"'); + return null; } @@ -245,7 +249,8 @@ class ItemImporter extends Importer $category = Category::where(['name' => $asset_category, 'category_type' => $item_type])->first(); if ($category) { - $this->log("A matching category: " . $asset_category . " already exists"); + $this->log('A matching category: '.$asset_category.' already exists'); + return $category->id; } @@ -255,11 +260,13 @@ class ItemImporter extends Importer $category->user_id = $this->user_id; if ($category->save()) { - $this->log('Category ' . $asset_category . ' was created'); + $this->log('Category '.$asset_category.' was created'); + return $category->id; } - $this->logError($category, 'Category "'. $asset_category. '"'); + $this->logError($category, 'Category "'.$asset_category.'"'); + return null; } @@ -275,22 +282,23 @@ class ItemImporter extends Importer { $company = Company::where(['name' => $asset_company_name])->first(); if ($company) { - $this->log('A matching Company ' . $asset_company_name . ' already exists'); + $this->log('A matching Company '.$asset_company_name.' already exists'); + return $company->id; } $company = new Company(); $company->name = $asset_company_name; if ($company->save()) { - $this->log('Company ' . $asset_company_name . ' was created'); + $this->log('Company '.$asset_company_name.' was created'); + return $company->id; } $this->logError($company, 'Company'); + return null; } - - /** * Fetch an existing manager * @@ -304,14 +312,15 @@ class ItemImporter extends Importer $manager = User::where('first_name', '=', $user_manager_first_name) ->where('last_name', '=', $user_manager_last_name)->first(); if ($manager) { - $this->log('A matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' already exists'); + $this->log('A matching Manager '.$user_manager_first_name.' '.$user_manager_last_name.' already exists'); + return $manager->id; } - $this->log('No matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' found. If their user account is being created through this import, you should re-process this file again. '); + $this->log('No matching Manager '.$user_manager_first_name.' '.$user_manager_last_name.' found. If their user account is being created through this import, you should re-process this file again. '); + return null; } - /** * Fetch the existing status label or create new if it doesn't exist. * @@ -322,17 +331,17 @@ class ItemImporter extends Importer */ public function createOrFetchStatusLabel($asset_statuslabel_name) { - if (empty($asset_statuslabel_name)) { return null; } $status = Statuslabel::where(['name' => $asset_statuslabel_name])->first(); if ($status) { - $this->log('A matching Status ' . $asset_statuslabel_name . ' already exists'); + $this->log('A matching Status '.$asset_statuslabel_name.' already exists'); + return $status->id; } - $this->log("Creating a new status"); + $this->log('Creating a new status'); $status = new Statuslabel(); $status->name = $asset_statuslabel_name; @@ -341,11 +350,13 @@ class ItemImporter extends Importer $status->archived = 0; if ($status->save()) { - $this->log('Status ' . $asset_statuslabel_name . ' was created'); + $this->log('Status '.$asset_statuslabel_name.' was created'); + return $status->id; } - $this->logError($status, 'Status "'. $asset_statuslabel_name . '"'); + $this->logError($status, 'Status "'.$asset_statuslabel_name.'"'); + return null; } @@ -357,17 +368,16 @@ class ItemImporter extends Importer * @param $item_manufacturer string * @return Manufacturer */ - public function createOrFetchManufacturer($item_manufacturer) { - if (empty($item_manufacturer)) { - $item_manufacturer='Unknown'; + $item_manufacturer = 'Unknown'; } $manufacturer = Manufacturer::where(['name'=> $item_manufacturer])->first(); if ($manufacturer) { - $this->log('Manufacturer ' . $item_manufacturer . ' already exists') ; + $this->log('Manufacturer '.$item_manufacturer.' already exists'); + return $manufacturer->id; } @@ -377,10 +387,12 @@ class ItemImporter extends Importer $manufacturer->user_id = $this->user_id; if ($manufacturer->save()) { - $this->log('Manufacturer ' . $manufacturer->name . ' was created'); + $this->log('Manufacturer '.$manufacturer->name.' was created'); + return $manufacturer->id; } - $this->logError($manufacturer, 'Manufacturer "'. $manufacturer->name . '"'); + $this->logError($manufacturer, 'Manufacturer "'.$manufacturer->name.'"'); + return null; } @@ -396,12 +408,14 @@ class ItemImporter extends Importer { if (empty($asset_location)) { $this->log('No location given, so none created.'); + return null; } $location = Location::where(['name' => $asset_location])->first(); if ($location) { - $this->log('Location ' . $asset_location . ' already exists'); + $this->log('Location '.$asset_location.' already exists'); + return $location->id; } // No matching locations in the collection, create a new one. @@ -414,10 +428,12 @@ class ItemImporter extends Importer $location->user_id = $this->user_id; if ($location->save()) { - $this->log('Location ' . $asset_location . ' was created'); + $this->log('Location '.$asset_location.' was created'); + return $location->id; } $this->logError($location, 'Location'); + return null; } @@ -432,13 +448,14 @@ class ItemImporter extends Importer public function createOrFetchSupplier($item_supplier) { if (empty($item_supplier)) { - $item_supplier='Unknown'; + $item_supplier = 'Unknown'; } - $supplier = Supplier::where(['name' => $item_supplier ])->first(); + $supplier = Supplier::where(['name' => $item_supplier])->first(); if ($supplier) { - $this->log('Supplier ' . $item_supplier . ' already exists'); + $this->log('Supplier '.$item_supplier.' already exists'); + return $supplier->id; } @@ -447,10 +464,12 @@ class ItemImporter extends Importer $supplier->user_id = $this->user_id; if ($supplier->save()) { - $this->log('Supplier ' . $item_supplier . ' was created'); + $this->log('Supplier '.$item_supplier.' was created'); + return $supplier->id; } $this->logError($supplier, 'Supplier'); + return null; } } diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index f9bc1d825b..627e6ae5f1 100644 --- a/app/Importer/LicenseImporter.php +++ b/app/Importer/LicenseImporter.php @@ -35,21 +35,22 @@ class LicenseImporter extends ItemImporter ->where('serial', $this->item['serial']) ->first(); if ($license) { - if (!$this->updating) { - $this->log('A matching License ' . $this->item['name'] . 'with serial ' . $this->item['serial'] . ' already exists'); + if (! $this->updating) { + $this->log('A matching License '.$this->item['name'].'with serial '.$this->item['serial'].' already exists'); + return; } - $this->log("Updating License"); + $this->log('Updating License'); $editingLicense = true; } else { - $this->log("No Matching License, Creating a new one"); + $this->log('No Matching License, Creating a new one'); $license = new License; } $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset. $this->item['expiration_date'] = $this->findCsvMatch($row, 'expiration_date'); - $this->item['license_email'] = $this->findCsvMatch($row, "license_email"); - $this->item['license_name'] = $this->findCsvMatch($row, "license_name"); + $this->item['license_email'] = $this->findCsvMatch($row, 'license_email'); + $this->item['license_name'] = $this->findCsvMatch($row, 'license_name'); $this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); @@ -65,7 +66,7 @@ class LicenseImporter extends ItemImporter // $license->unsetEventDispatcher(); if ($license->save()) { $license->logCreate('Imported using csv importer'); - $this->log('License ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created'); + $this->log('License '.$this->item['name'].' with serial number '.$this->item['serial'].' was created'); // Lets try to checkout seats if the fields exist and we have seats. if ($license->seats > 0) { @@ -85,8 +86,9 @@ class LicenseImporter extends ItemImporter $targetLicense->save(); } } + return; } - $this->logError($license, 'License "' . $this->item['name'].'"'); + $this->logError($license, 'License "'.$this->item['name'].'"'); } } diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index be476aef97..37434f1616 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -12,8 +12,6 @@ use App\Notifications\WelcomeNotification; * App\Importer.php. [ALG] * * Class UserImporter - * @package App\Importer - * */ class UserImporter extends ItemImporter { @@ -52,20 +50,21 @@ class UserImporter extends ItemImporter $this->item['city'] = $this->findCsvMatch($row, 'city'); $this->item['state'] = $this->findCsvMatch($row, 'state'); $this->item['country'] = $this->findCsvMatch($row, 'country'); - $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; + $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num'); $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')); $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')); $user_department = $this->findCsvMatch($row, 'department'); if ($this->shouldUpdateField($user_department)) { - $this->item["department_id"] = $this->createOrFetchDepartment($user_department); + $this->item['department_id'] = $this->createOrFetchDepartment($user_department); } $user = User::where('username', $this->item['username'])->first(); if ($user) { - if (!$this->updating) { - $this->log('A matching User ' . $this->item["name"] . ' already exists. '); - \Log::debug('A matching User ' . $this->item["name"] . ' already exists. '); + if (! $this->updating) { + $this->log('A matching User '.$this->item['name'].' already exists. '); + \Log::debug('A matching User '.$this->item['name'].' already exists. '); + return; } $this->log('Updating User'); @@ -75,21 +74,19 @@ class UserImporter extends ItemImporter return; } - - // This needs to be applied after the update logic, otherwise we'll overwrite user passwords // Issue #5408 $this->item['password'] = bcrypt($this->tempPassword); - $this->log("No matching user, creating one"); + $this->log('No matching user, creating one'); $user = new User(); $user->fill($this->sanitizeItemForStoring($user)); if ($user->save()) { // $user->logCreate('Imported using CSV Importer'); - $this->log("User " . $this->item["name"] . ' was created'); + $this->log('User '.$this->item['name'].' was created'); - if(($user->email) && ($user->activated=='1')) { + if (($user->email) && ($user->activated == '1')) { $data = [ 'email' => $user->email, 'username' => $user->username, @@ -104,14 +101,15 @@ class UserImporter extends ItemImporter } $user = null; $this->item = null; + return; } $this->logError($user, 'User'); - return; + } - /** + /** * Fetch an existing department, or create new if it doesn't exist * * @author Daniel Melzter @@ -123,7 +121,8 @@ class UserImporter extends ItemImporter { $department = Department::where(['name' => $department_name])->first(); if ($department) { - $this->log('A matching department ' . $department_name . ' already exists'); + $this->log('A matching department '.$department_name.' already exists'); + return $department->id; } else { return null; @@ -134,15 +133,18 @@ class UserImporter extends ItemImporter $department->user_id = $this->user_id; if ($department->save()) { - $this->log('department ' . $department_name . ' was created'); + $this->log('department '.$department_name.' was created'); + return $department->id; } $this->logError($department, 'Department'); + return null; } - public function sendWelcome($send = true) { + public function sendWelcome($send = true) + { $this->send_welcome = $send; } } diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index ce38d7253c..2baacbfaa8 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -23,31 +23,31 @@ use Illuminate\Support\Facades\Notification; class CheckoutableListener { - /** * Notify the user about the checked out checkoutable */ - public function onCheckedOut($event) { + public function onCheckedOut($event) + { /** * When the item wasn't checked out to a user, we can't send notifications */ - if(! $event->checkedOutTo instanceof User) { + if (! $event->checkedOutTo instanceof User) { return; } /** * Make a checkout acceptance and attach it in the notification */ - $acceptance = $this->getCheckoutAcceptance($event); + $acceptance = $this->getCheckoutAcceptance($event); - if(!$event->checkedOutTo->locale){ + if (! $event->checkedOutTo->locale) { Notification::locale(Setting::getSettings()->locale)->send( - $this->getNotifiables($event), + $this->getNotifiables($event), $this->getCheckoutNotification($event, $acceptance) ); } else { Notification::send( - $this->getNotifiables($event), + $this->getNotifiables($event), $this->getCheckoutNotification($event, $acceptance) ); } @@ -55,48 +55,48 @@ class CheckoutableListener /** * Notify the user about the checked in checkoutable - */ - public function onCheckedIn($event) { - + */ + public function onCheckedIn($event) + { \Log::debug('checkin fired'); /** * When the item wasn't checked out to a user, we can't send notifications */ - if(!$event->checkedOutTo instanceof User) { + if (! $event->checkedOutTo instanceof User) { \Log::debug('checked out to not a user'); + return; } /** * Send the appropriate notification */ - - \Log::debug('checked out to a user'); - if(!$event->checkedOutTo->locale){ + if (! $event->checkedOutTo->locale) { \Log::debug('Use default settings locale'); Notification::locale(Setting::getSettings()->locale)->send( - $this->getNotifiables($event), + $this->getNotifiables($event), $this->getCheckinNotification($event) ); } else { \Log::debug('Use user locale? I do not think this works as expected yet'); // \Log::debug(print_r($this->getNotifiables($event), true)); Notification::send( - $this->getNotifiables($event), + $this->getNotifiables($event), $this->getCheckinNotification($event) ); } - } + } /** * Generates a checkout acceptance * @param Event $event * @return mixed */ - private function getCheckoutAcceptance($event) { - if (!$event->checkoutable->requireAcceptance()) { + private function getCheckoutAcceptance($event) + { + if (! $event->checkoutable->requireAcceptance()) { return null; } @@ -105,16 +105,17 @@ class CheckoutableListener $acceptance->assignedTo()->associate($event->checkedOutTo); $acceptance->save(); - return $acceptance; + return $acceptance; } /** * Gets the entities to be notified of the passed event - * + * * @param Event $event * @return Collection */ - private function getNotifiables($event) { + private function getNotifiables($event) + { $notifiables = collect(); /** @@ -129,21 +130,20 @@ class CheckoutableListener $notifiables->push(new AdminRecipient()); } - return $notifiables; + return $notifiables; } /** * Get the appropriate notification for the event - * - * @param CheckoutableCheckedIn $event + * + * @param CheckoutableCheckedIn $event * @return Notification */ - private function getCheckinNotification($event) { + private function getCheckinNotification($event) + { // $model = get_class($event->checkoutable); - - $notificationClass = null; switch (get_class($event->checkoutable)) { @@ -152,24 +152,26 @@ class CheckoutableListener break; case Asset::class: $notificationClass = CheckinAssetNotification::class; - break; + break; case LicenseSeat::class: $notificationClass = CheckinLicenseSeatNotification::class; break; } \Log::debug('Notification class: '.$notificationClass); - return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note); + + return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note); } /** * Get the appropriate notification for the event - * - * @param CheckoutableCheckedIn $event - * @param CheckoutAcceptance $acceptance + * + * @param CheckoutableCheckedIn $event + * @param CheckoutAcceptance $acceptance * @return Notification */ - private function getCheckoutNotification($event, $acceptance) { + private function getCheckoutNotification($event, $acceptance) + { $notificationClass = null; switch (get_class($event->checkoutable)) { @@ -181,10 +183,10 @@ class CheckoutableListener break; case Consumable::class: $notificationClass = CheckoutConsumableNotification::class; - break; + break; case LicenseSeat::class: $notificationClass = CheckoutLicenseSeatNotification::class; - break; + break; } return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note); @@ -200,12 +202,11 @@ class CheckoutableListener $events->listen( 'App\Events\CheckoutableCheckedIn', 'App\Listeners\CheckoutableListener@onCheckedIn' - ); + ); $events->listen( 'App\Events\CheckoutableCheckedOut', 'App\Listeners\CheckoutableListener@onCheckedOut' - ); + ); } - -} \ No newline at end of file +} diff --git a/app/Listeners/LogFailedLogin.php b/app/Listeners/LogFailedLogin.php index 663b4559c1..9ce326219d 100644 --- a/app/Listeners/LogFailedLogin.php +++ b/app/Listeners/LogFailedLogin.php @@ -40,6 +40,5 @@ class LogFailedLogin } catch (\Exception $e) { \Log::debug($e); } - } } diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php index 5e9445183f..f337df60f5 100644 --- a/app/Listeners/LogListener.php +++ b/app/Listeners/LogListener.php @@ -22,16 +22,18 @@ use App\Models\LicenseSeat; class LogListener { - - public function onCheckoutableCheckedIn(CheckoutableCheckedIn $event) { + public function onCheckoutableCheckedIn(CheckoutableCheckedIn $event) + { $event->checkoutable->logCheckin($event->checkedOutTo, $event->note, $event->action_date); } - public function onCheckoutableCheckedOut(CheckoutableCheckedOut $event) { + public function onCheckoutableCheckedOut(CheckoutableCheckedOut $event) + { $event->checkoutable->logCheckout($event->note, $event->checkedOutTo, $event->checkoutable->last_checkout); - } + } - public function onCheckoutAccepted(CheckoutAccepted $event) { + public function onCheckoutAccepted(CheckoutAccepted $event) + { $logaction = new Actionlog(); $logaction->item()->associate($event->acceptance->checkoutable); @@ -40,14 +42,15 @@ class LogListener $logaction->action_type = 'accepted'; // TODO: log the actual license seat that was checked out - if($event->acceptance->checkoutable instanceof LicenseSeat) { + if ($event->acceptance->checkoutable instanceof LicenseSeat) { $logaction->item()->associate($event->acceptance->checkoutable->license); } - - $logaction->save(); - } - public function onCheckoutDeclined(CheckoutDeclined $event) { + $logaction->save(); + } + + public function onCheckoutDeclined(CheckoutDeclined $event) + { $logaction = new Actionlog(); $logaction->item()->associate($event->acceptance->checkoutable); $logaction->target()->associate($event->acceptance->assignedTo); @@ -55,12 +58,12 @@ class LogListener $logaction->action_type = 'declined'; // TODO: log the actual license seat that was checked out - if($event->acceptance->checkoutable instanceof LicenseSeat) { + if ($event->acceptance->checkoutable instanceof LicenseSeat) { $logaction->item()->associate($event->acceptance->checkoutable->license); } - $logaction->save(); - } + $logaction->save(); + } /** * Register the listeners for the subscriber. @@ -73,15 +76,14 @@ class LogListener 'CheckoutableCheckedIn', 'CheckoutableCheckedOut', 'CheckoutAccepted', - 'CheckoutDeclined', + 'CheckoutDeclined', ]; - foreach($list as $event) { + foreach ($list as $event) { $events->listen( - 'App\Events\\' . $event, - 'App\Listeners\LogListener@on' . $event + 'App\Events\\'.$event, + 'App\Listeners\LogListener@on'.$event ); - } + } } - } diff --git a/app/Listeners/LogSuccessfulLogin.php b/app/Listeners/LogSuccessfulLogin.php index 0fab5d00f6..3bfb3b6ffe 100644 --- a/app/Listeners/LogSuccessfulLogin.php +++ b/app/Listeners/LogSuccessfulLogin.php @@ -29,7 +29,6 @@ class LogSuccessfulLogin $now = new Carbon(); try { - DB::table('login_attempts')->insert( [ 'username' => $event->user->username, @@ -42,7 +41,5 @@ class LogSuccessfulLogin } catch (\Exception $e) { \Log::debug($e); } - - } } diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index fbd611939d..c201ce07b5 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -1,4 +1,5 @@ 'boolean' + 'requestable' => 'boolean', ]; use Searchable; - use Acceptable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'model_number', 'order_number', 'purchase_date']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -47,29 +47,28 @@ class Accessory extends SnipeModel 'company' => ['name'], 'manufacturer' => ['name'], 'supplier' => ['name'], - 'location' => ['name'] + 'location' => ['name'], ]; /** - * Accessory validation rules - */ - public $rules = array( + * Accessory validation rules + */ + public $rules = [ 'name' => 'required|min:3|max:255', 'qty' => 'required|integer|min:1', 'category_id' => 'required|integer|exists:categories,id', 'company_id' => 'integer|nullable', 'min_amt' => 'integer|min:0|nullable', 'purchase_cost' => 'numeric|nullable', - ); - + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -91,11 +90,9 @@ class Accessory extends SnipeModel 'supplier_id', 'image', 'qty', - 'requestable' + 'requestable', ]; - - /** * Establishes the accessory -> supplier relationship * @@ -108,7 +105,6 @@ class Accessory extends SnipeModel return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); } - /** * Sets the requestable attribute on the accessory * @@ -122,7 +118,7 @@ class Accessory extends SnipeModel $value = null; } $this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN); - return; + } /** @@ -170,12 +166,12 @@ class Accessory extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Accessory::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** * Get the LAST checkout for this accessory. - * + * * This is kinda gross, but is necessary for how the accessory * pivot stuff works for now. * @@ -198,14 +194,12 @@ class Accessory extends SnipeModel * @since v5.0.0 * * @see \App\Http\Controllers\Api\AccessoriesController\checkedout() - * */ public function lastCheckout() { - return $this->assetlog()->where('action_type','=','checkout')->take(1); + return $this->assetlog()->where('action_type', '=', 'checkout')->take(1); } - /** * Sets the full image url * @@ -216,12 +210,13 @@ class Accessory extends SnipeModel * @since [v3.0] * @return string */ - public function getImageUrl() { + public function getImageUrl() + { if ($this->image) { return Storage::disk('public')->url(app('accessories_upload_path').$this->image); } - return false; + return false; } /** @@ -231,7 +226,6 @@ class Accessory extends SnipeModel * @since [v3.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function users() { return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed(); @@ -267,7 +261,7 @@ class Accessory extends SnipeModel * * @author [A. Gianotto] [] * @since [v3.0] - * @return boolean + * @return bool */ public function checkin_email() { @@ -280,7 +274,7 @@ class Accessory extends SnipeModel * * @author [A. Gianotto] [] * @since [v3.0] - * @return boolean + * @return bool */ public function requireAcceptance() { @@ -297,15 +291,15 @@ class Accessory extends SnipeModel */ public function getEula() { - $Parsedown = new \Parsedown(); if ($this->category->eula_text) { return $Parsedown->text(e($this->category->eula_text)); - } elseif ((Setting::getSettings()->default_eula_text) && ($this->category->use_default_eula=='1')) { + } elseif ((Setting::getSettings()->default_eula_text) && ($this->category->use_default_eula == '1')) { return $Parsedown->text(e(Setting::getSettings()->default_eula_text)); } - return null; + + return null; } /** @@ -320,17 +314,18 @@ class Accessory extends SnipeModel $checkedout = $this->users->count(); $total = $this->qty; $remaining = $total - $checkedout; + return $remaining; } /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCompany($query, $order) { return $query->leftJoin('companies', 'accessories.company_id', '=', 'companies.id') @@ -338,13 +333,13 @@ class Accessory extends SnipeModel } /** - * Query builder scope to order on category - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on category + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCategory($query, $order) { return $query->leftJoin('categories', 'accessories.category_id', '=', 'categories.id') @@ -352,13 +347,13 @@ class Accessory extends SnipeModel } /** - * Query builder scope to order on location - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on location + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderLocation($query, $order) { return $query->leftJoin('locations', 'accessories.location_id', '=', 'locations.id') @@ -366,13 +361,13 @@ class Accessory extends SnipeModel } /** - * Query builder scope to order on manufacturer - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on manufacturer + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderManufacturer($query, $order) { return $query->leftJoin('manufacturers', 'accessories.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order); diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index 7540568387..b1f0cddb4c 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -1,5 +1,7 @@ ['name'] + 'company' => ['name'], ]; /** @@ -51,7 +53,7 @@ class Actionlog extends SnipeModel public static function boot() { parent::boot(); - static::creating(function (Actionlog $actionlog) { + static::creating(function (self $actionlog) { // If the admin is a superadmin, let's see if the target instead has a company. if (Auth::user() && Auth::user()->isSuperUser()) { if ($actionlog->target) { @@ -65,7 +67,6 @@ class Actionlog extends SnipeModel }); } - /** * Establishes the actionlog -> item relationship * @@ -99,10 +100,10 @@ class Actionlog extends SnipeModel */ public function itemType() { - if ($this->item_type == AssetModel::class) { - return "model"; + return 'model'; } + return camel_case(class_basename($this->item_type)); } @@ -116,12 +117,12 @@ class Actionlog extends SnipeModel public function targetType() { if ($this->target_type == User::class) { - return "user"; + return 'user'; } + return camel_case(class_basename($this->target_type)); } - /** * Establishes the actionlog -> uploads relationship * @@ -180,11 +181,11 @@ class Actionlog extends SnipeModel * @since [v3.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id' )->withTrashed(); + public function location() + { + return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); } - /** * Check if the file exists, and if it does, force a download * @@ -194,25 +195,24 @@ class Actionlog extends SnipeModel */ public function get_src($type = 'assets', $fieldname = 'filename') { - if ($this->filename!='') { - $file = config('app.private_uploads') . '/' . $type . '/' . $this->{$fieldname}; + if ($this->filename != '') { + $file = config('app.private_uploads').'/'.$type.'/'.$this->{$fieldname}; + return $file; } + return false; } - - /** * Saves the log record with the action type * * @author [A. Gianotto] [] * @since [v3.0] - * @return boolean + * @return bool */ public function logaction($actiontype) { - $this->action_type = $actiontype; if ($this->save()) { @@ -229,8 +229,8 @@ class Actionlog extends SnipeModel * @since [v4.0] * @return int */ - public function daysUntilNextAudit($monthInterval = 12, $asset = null) { - + public function daysUntilNextAudit($monthInterval = 12, $asset = null) + { $now = Carbon::now(); $last_audit_date = $this->created_at; $next_audit = $last_audit_date->addMonth($monthInterval); @@ -252,8 +252,8 @@ class Actionlog extends SnipeModel * @since [v4.0] * @return \Datetime */ - public function calcNextAuditDate($monthInterval = 12, $asset = null) { - + public function calcNextAuditDate($monthInterval = 12, $asset = null) + { $last_audit_date = Carbon::parse($this->created_at); // If there is an asset-specific next date already given, if (($asset) && ($asset->next_audit_date)) { @@ -272,7 +272,6 @@ class Actionlog extends SnipeModel */ public function getListingOfActionLogsChronologicalOrder() { - return $this->all() ->where('action_type', '!=', 'uploaded') ->orderBy('item_id', 'asc') diff --git a/app/Models/Asset.php b/app/Models/Asset.php index d26f8dbc94..26c3a0a4ed 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1,4 +1,5 @@ assigned_to = null; - $this->assigned_type = null; - $this->accepted = null; - $this->save(); + */ + public function declinedCheckout(User $declinedBy, $signature) + { + $this->assigned_to = null; + $this->assigned_type = null; + $this->accepted = null; + $this->save(); } - /** - * The database table used by the model. - * - * @var string - */ + * The database table used by the model. + * + * @var string + */ protected $table = 'assets'; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; // We set these as protected dates so that they will be easily accessible via Carbon @@ -73,10 +74,9 @@ class Asset extends Depreciable 'last_checkout', 'expected_checkin', 'last_audit_date', - 'next_audit_date' + 'next_audit_date', ]; - protected $casts = [ 'model_id' => 'integer', 'status_id' => 'integer', @@ -106,11 +106,11 @@ class Asset extends Depreciable 'last_audit_date' => 'date|nullable', ]; - /** - * The attributes that are mass assignable. - * - * @var array - */ + /** + * The attributes that are mass assignable. + * + * @var array + */ protected $fillable = [ 'asset_tag', 'assigned_to', @@ -138,27 +138,27 @@ class Asset extends Depreciable /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = [ - 'name', - 'asset_tag', - 'serial', - 'order_number', - 'purchase_cost', - 'notes', + 'name', + 'asset_tag', + 'serial', + 'order_number', + 'purchase_cost', + 'notes', 'created_at', - 'updated_at', - 'purchase_date', - 'expected_checkin', - 'next_audit_date', - 'last_audit_date' + 'updated_at', + 'purchase_date', + 'expected_checkin', + 'next_audit_date', + 'last_audit_date', ]; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -172,7 +172,6 @@ class Asset extends Depreciable 'model.manufacturer' => ['name'], ]; - /** * This handles the custom field validation for assets * @@ -180,7 +179,7 @@ class Asset extends Depreciable */ public function save(array $params = []) { - if($this->model_id != '') { + if ($this->model_id != '') { $model = AssetModel::find($this->model_id); if (($model) && ($model->fieldset)) { @@ -191,7 +190,6 @@ class Asset extends Depreciable return parent::save($params); } - public function getDisplayNameAttribute() { return $this->present()->name(); @@ -210,13 +208,13 @@ class Asset extends Depreciable $purchase_date = \Carbon\Carbon::instance($this->attributes['purchase_date']); } $purchase_date->setTime(0, 0, 0); + return $purchase_date->addMonths((int) $this->attributes['warranty_months']); } return null; } - /** * Establishes the asset -> company relationship * @@ -237,27 +235,24 @@ class Asset extends Depreciable * * @author [A. Gianotto] [] * @since [v3.0] - * @return boolean + * @return bool */ public function availableForCheckout() { // This asset is not currently assigned to anyone and is not deleted... - if ((!$this->assigned_to) && (!$this->deleted_at)) { + if ((! $this->assigned_to) && (! $this->deleted_at)) { // The asset status is not archived and is deployable if (($this->assetstatus) && ($this->assetstatus->archived == '0') - && ($this->assetstatus->deployable == '1')) - { - + && ($this->assetstatus->deployable == '1')) { return true; } - } + return false; } - /** * Checks the asset out to the target * @@ -272,11 +267,11 @@ class Asset extends Depreciable * @param null $name * @return bool * @since [v3.0] - * @return boolean + * @return bool */ public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null) { - if (!$target) { + if (! $target) { return false; } if ($this->is($target)) { @@ -291,7 +286,6 @@ class Asset extends Depreciable $this->assignedTo()->associate($target); - if ($name != null) { $this->name = $name; } @@ -308,7 +302,7 @@ class Asset extends Depreciable } if ($this->save()) { - if (is_integer($admin)){ + if (is_int($admin)) { $checkedOutBy = User::findOrFail($admin); } elseif (get_class($admin) === 'App\Models\User') { $checkedOutBy = $admin; @@ -318,8 +312,10 @@ class Asset extends Depreciable event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note)); $this->increment('checkout_counter', 1); + return true; } + return false; } @@ -335,9 +331,10 @@ class Asset extends Depreciable if ($this->assignedto) { $user_name = $this->assignedto->present()->name(); } else { - $user_name = "Unassigned"; + $user_name = 'Unassigned'; } - return $this->asset_tag . ' - ' . $this->name . ' (' . $user_name . ') ' . ($this->model) ? $this->model->name: ''; + + return $this->asset_tag.' - '.$this->name.' ('.$user_name.') '.($this->model) ? $this->model->name : ''; } /** @@ -352,7 +349,6 @@ class Asset extends Depreciable return $this->rules; } - /** * Establishes the asset -> depreciation relationship * @@ -365,7 +361,6 @@ class Asset extends Depreciable return $this->model->belongsTo('\App\Models\Depreciation', 'depreciation_id'); } - /** * Get components assigned to this asset * @@ -378,7 +373,6 @@ class Asset extends Depreciable return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed(); } - /** * Get depreciation attribute from associated asset model * @@ -395,7 +389,6 @@ class Asset extends Depreciable } } - /** * Get uploads for this asset * @@ -406,13 +399,12 @@ class Asset extends Depreciable public function uploads() { return $this->hasMany('\App\Models\Actionlog', 'item_id') - ->where('item_type', '=', Asset::class) + ->where('item_type', '=', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') ->orderBy('created_at', 'desc'); } - /** * Determines whether the asset is checked out to a user * @@ -421,11 +413,11 @@ class Asset extends Depreciable * * @author [A. Gianotto] [] * @since [v4.0] - * @return boolean + * @return bool */ public function checkedOutToUser() { - return $this->assignedType() === self::USER; + return $this->assignedType() === self::USER; } /** @@ -454,7 +446,6 @@ class Asset extends Depreciable return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } - /** * Get the asset's location based on the assigned user * @@ -464,17 +455,17 @@ class Asset extends Depreciable * @since [v4.0] * @return \ArrayObject */ - public function assetLoc($iterations = 1,$first_asset = null) + public function assetLoc($iterations = 1, $first_asset = null) { - if (!empty($this->assignedType())) { + if (! empty($this->assignedType())) { if ($this->assignedType() == self::ASSET) { - if(!$first_asset) { - $first_asset=$this; + if (! $first_asset) { + $first_asset = $this; } - if($iterations>10) { - throw new \Exception("Asset assignment Loop for Asset ID: ".$first_asset->id); + if ($iterations > 10) { + throw new \Exception('Asset assignment Loop for Asset ID: '.$first_asset->id); } - $assigned_to=Asset::find($this->assigned_to); //have to do this this way because otherwise it errors + $assigned_to = self::find($this->assigned_to); //have to do this this way because otherwise it errors if ($assigned_to) { return $assigned_to->assetLoc($iterations + 1, $first_asset); } // Recurse until we have a final location @@ -483,7 +474,6 @@ class Asset extends Depreciable if ($this->assignedTo) { return $this->assignedTo; } - } if ($this->assignedType() == self::USER) { if (($this->assignedTo) && $this->assignedTo->userLoc) { @@ -491,10 +481,9 @@ class Asset extends Depreciable } //this makes no sense return $this->defaultLoc; - } - } + return $this->defaultLoc; } @@ -534,15 +523,15 @@ class Asset extends Depreciable */ public function getImageUrl() { - if ($this->image && !empty($this->image)) { + if ($this->image && ! empty($this->image)) { return Storage::disk('public')->url(app('assets_upload_path').e($this->image)); - } elseif ($this->model && !empty($this->model->image)) { + } elseif ($this->model && ! empty($this->model->image)) { return Storage::disk('public')->url(app('models_upload_path').e($this->model->image)); } + return false; } - /** * Get the asset's logs * @@ -553,7 +542,7 @@ class Asset extends Depreciable public function assetlog() { return $this->hasMany('\App\Models\Actionlog', 'item_id') - ->where('item_type', '=', Asset::class) + ->where('item_type', '=', self::class) ->orderBy('created_at', 'desc') ->withTrashed(); } @@ -602,7 +591,6 @@ class Asset extends Depreciable ->withTrashed(); } - /** * Get maintenances for this asset * @@ -628,8 +616,6 @@ class Asset extends Depreciable return $this->belongsTo('\App\Models\User', 'user_id'); } - - /** * Establishes the asset -> status relationship * @@ -664,18 +650,17 @@ class Asset extends Depreciable */ public static function getExpiringWarrantee($days = 30) { - return Asset::where('archived', '=', '0') + return self::where('archived', '=', '0') ->whereNotNull('warranty_months') ->whereNotNull('purchase_date') ->whereNull('deleted_at') ->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL ' - . $days - . ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()')) + .$days + .' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()')) ->orderBy('purchase_date', 'ASC') ->get(); } - /** * Establishes the asset -> assigned licenses relationship * @@ -724,8 +709,6 @@ class Asset extends Depreciable return $this->belongsTo('\App\Models\Location', 'location_id'); } - - /** * Get the next autoincremented asset tag * @@ -737,7 +720,6 @@ class Asset extends Depreciable { $settings = \App\Models\Setting::getSettings(); - if ($settings->auto_increment_assets == '1') { $temp_asset_tag = \DB::table('assets') ->where('physical', '=', '1') @@ -747,15 +729,15 @@ class Asset extends Depreciable $asset_tag = preg_replace('/^0*/', '', $asset_tag_digits); if ($settings->zerofill_count > 0) { - return $settings->auto_increment_prefix.Asset::zerofill($settings->next_auto_tag_base, $settings->zerofill_count); + return $settings->auto_increment_prefix.self::zerofill($settings->next_auto_tag_base, $settings->zerofill_count); } + return $settings->auto_increment_prefix.$settings->next_auto_tag_base; } else { return false; } } - /** * Get the next base number for the auto-incrementer. * @@ -767,28 +749,23 @@ class Asset extends Depreciable */ public static function nextAutoIncrement($assets) { - $max = 1; foreach ($assets as $asset) { - $results = preg_match ( "/\d+$/" , $asset['asset_tag'], $matches); + $results = preg_match("/\d+$/", $asset['asset_tag'], $matches); - if ($results) - { + if ($results) { $number = $matches[0]; - if ($number > $max) - { + if ($number > $max) { $max = $number; } } } + return $max + 1; - } - - /** * Add zerofilling based on Settings * @@ -809,7 +786,7 @@ class Asset extends Depreciable * * @author [A. Gianotto] [] * @since [v4.0] - * @return boolean + * @return bool */ public function checkin_email() { @@ -821,14 +798,13 @@ class Asset extends Depreciable * * @author [A. Gianotto] [] * @since [v4.0] - * @return boolean + * @return bool */ public function requireAcceptance() { if (($this->model) && ($this->model->category)) { return $this->model->category->require_acceptance; } - } /** @@ -842,7 +818,7 @@ class Asset extends Depreciable public function getEula() { $Parsedown = new \Parsedown(); - + if (($this->model) && ($this->model->category)) { if ($this->model->category->eula_text) { return $Parsedown->text(e($this->model->category->eula_text)); @@ -852,15 +828,15 @@ class Asset extends Depreciable return false; } } + return false; } - /** - * ----------------------------------------------- - * BEGIN QUERY SCOPES - * ----------------------------------------------- - **/ + * ----------------------------------------------- + * BEGIN QUERY SCOPES + * ----------------------------------------------- + **/ /** * Run additional, advanced searches. @@ -869,79 +845,71 @@ class Asset extends Depreciable * @param array $terms The search terms * @return \Illuminate\Database\Eloquent\Builder */ - public function advancedTextSearch(Builder $query, array $terms) { + public function advancedTextSearch(Builder $query, array $terms) + { /** * Assigned user */ - $query = $query->leftJoin('users as assets_users',function ($leftJoin) { - $leftJoin->on("assets_users.id", "=", "assets.assigned_to") - ->where("assets.assigned_type", "=", User::class); + $query = $query->leftJoin('users as assets_users', function ($leftJoin) { + $leftJoin->on('assets_users.id', '=', 'assets.assigned_to') + ->where('assets.assigned_type', '=', User::class); }); - foreach($terms as $term) { - + foreach ($terms as $term) { $query = $query ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%') ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%') ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%') ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$term%", "%$term%"]); - } /** * Assigned location */ - $query = $query->leftJoin('locations as assets_locations',function ($leftJoin) { - $leftJoin->on("assets_locations.id","=","assets.assigned_to") - ->where("assets.assigned_type","=",Location::class); + $query = $query->leftJoin('locations as assets_locations', function ($leftJoin) { + $leftJoin->on('assets_locations.id', '=', 'assets.assigned_to') + ->where('assets.assigned_type', '=', Location::class); }); - foreach($terms as $term) { - + foreach ($terms as $term) { $query = $query->orWhere('assets_locations.name', 'LIKE', '%'.$term.'%'); - } /** * Assigned assets */ - $query = $query->leftJoin('assets as assigned_assets',function ($leftJoin) { + $query = $query->leftJoin('assets as assigned_assets', function ($leftJoin) { $leftJoin->on('assigned_assets.id', '=', 'assets.assigned_to') - ->where('assets.assigned_type', '=', Asset::class); + ->where('assets.assigned_type', '=', self::class); }); - foreach($terms as $term) { - + foreach ($terms as $term) { $query = $query->orWhere('assigned_assets.name', 'LIKE', '%'.$term.'%'); - } return $query; } - /** - * Query builder scope for hardware - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + * Query builder scope for hardware + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeHardware($query) { return $query->where('physical', '=', '1'); } /** - * Query builder scope for pending assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + * Query builder scope for pending assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopePending($query) { return $query->whereHas('assetstatus', function ($query) { @@ -951,28 +919,26 @@ class Asset extends Depreciable }); } - /** - * Query builder scope for searching location - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + * Query builder scope for searching location + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeAssetsByLocation($query, $location) { return $query->where(function ($query) use ($location) { $query->whereHas('assignedTo', function ($query) use ($location) { $query->where([ ['users.location_id', '=', $location->id], - ['assets.assigned_type', '=', User::class] + ['assets.assigned_type', '=', User::class], ])->orWhere([ ['locations.id', '=', $location->id], - ['assets.assigned_type', '=', Location::class] + ['assets.assigned_type', '=', Location::class], ])->orWhere([ ['assets.rtd_location_id', '=', $location->id], - ['assets.assigned_type', '=', Asset::class] + ['assets.assigned_type', '=', self::class], ]); })->orWhere(function ($query) use ($location) { $query->where('assets.rtd_location_id', '=', $location->id); @@ -981,15 +947,13 @@ class Asset extends Depreciable }); } - /** - * Query builder scope for RTD assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + * Query builder scope for RTD assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeRTD($query) { return $query->whereNull('assets.assigned_to') @@ -1000,14 +964,13 @@ class Asset extends Depreciable }); } - /** - * Query builder scope for Undeployable assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + /** + * Query builder scope for Undeployable assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeUndeployable($query) { return $query->whereHas('assetstatus', function ($query) { @@ -1024,7 +987,6 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ - public function scopeNotArchived($query) { return $query->whereHas('assetstatus', function ($query) { @@ -1054,7 +1016,6 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ - public function scopeDueForAudit($query, $settings) { $interval = $settings->audit_warning_days ?? 0; @@ -1079,7 +1040,6 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ - public function scopeOverdueForAudit($query) { return $query->whereNotNull('assets.next_audit_date') @@ -1101,26 +1061,23 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ - public function scopeDueOrOverdueForAudit($query, $settings) { $interval = $settings->audit_warning_days ?? 0; return $query->whereNotNull('assets.next_audit_date') - ->whereRaw("DATE_SUB(".DB::getTablePrefix()."assets.next_audit_date, INTERVAL $interval DAY) <= '".Carbon::now()."'") + ->whereRaw('DATE_SUB('.DB::getTablePrefix()."assets.next_audit_date, INTERVAL $interval DAY) <= '".Carbon::now()."'") ->where('assets.archived', '=', 0) ->NotArchived(); } - - /** - * Query builder scope for Archived assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + /** + * Query builder scope for Archived assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeArchived($query) { return $query->whereHas('assetstatus', function ($query) { @@ -1130,27 +1087,25 @@ class Asset extends Depreciable }); } - /** - * Query builder scope for Deployed assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + /** + * Query builder scope for Deployed assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeDeployed($query) { return $query->where('assigned_to', '>', '0'); } - /** - * Query builder scope for Requestable assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ - + /** + * Query builder scope for Requestable assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeRequestableAssets($query) { return Company::scopeCompanyables($query->where('requestable', '=', 1)) @@ -1161,58 +1116,56 @@ class Asset extends Depreciable }); } - /** - * scopeInModelList - * Get all assets in the provided listing of model ids - * - * @param $query - * @param array $modelIdListing - * - * @return mixed - * @author Vincent Sposato - * @version v1.0 - */ + * scopeInModelList + * Get all assets in the provided listing of model ids + * + * @param $query + * @param array $modelIdListing + * + * @return mixed + * @author Vincent Sposato + * @version v1.0 + */ public function scopeInModelList($query, array $modelIdListing) { return $query->whereIn('assets.model_id', $modelIdListing); } - /** - * Query builder scope to get not-yet-accepted assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + /** + * Query builder scope to get not-yet-accepted assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeNotYetAccepted($query) { - return $query->where("accepted", "=", "pending"); + return $query->where('accepted', '=', 'pending'); } - /** - * Query builder scope to get rejected assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + /** + * Query builder scope to get rejected assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeRejected($query) { - return $query->where("accepted", "=", "rejected"); + return $query->where('accepted', '=', 'rejected'); } - - /** - * Query builder scope to get accepted assets - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + /** + * Query builder scope to get accepted assets + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeAccepted($query) { - return $query->where("accepted", "=", "accepted"); + return $query->where('accepted', '=', 'accepted'); } /** @@ -1227,15 +1180,15 @@ class Asset extends Depreciable { $search = explode(' OR ', $search); - return $query->leftJoin('users as assets_users',function ($leftJoin) { - $leftJoin->on("assets_users.id", "=", "assets.assigned_to") - ->where("assets.assigned_type", "=", User::class); - })->leftJoin('locations as assets_locations',function ($leftJoin) { - $leftJoin->on("assets_locations.id","=","assets.assigned_to") - ->where("assets.assigned_type","=",Location::class); - })->leftJoin('assets as assigned_assets',function ($leftJoin) { + return $query->leftJoin('users as assets_users', function ($leftJoin) { + $leftJoin->on('assets_users.id', '=', 'assets.assigned_to') + ->where('assets.assigned_type', '=', User::class); + })->leftJoin('locations as assets_locations', function ($leftJoin) { + $leftJoin->on('assets_locations.id', '=', 'assets.assigned_to') + ->where('assets.assigned_type', '=', Location::class); + })->leftJoin('assets as assigned_assets', function ($leftJoin) { $leftJoin->on('assigned_assets.id', '=', 'assets.assigned_to') - ->where('assets.assigned_type', '=', Asset::class); + ->where('assets.assigned_type', '=', self::class); })->where(function ($query) use ($search) { foreach ($search as $search) { $query->whereHas('model', function ($query) use ($search) { @@ -1265,8 +1218,7 @@ class Asset extends Depreciable ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%') ->orWhere('assets.notes', 'LIKE', '%'.$search.'%'); } - - })->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug + })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug } /** @@ -1280,17 +1232,14 @@ class Asset extends Depreciable */ public function scopeCheckedOutToTargetInDepartment($query, $search) { - return $query->leftJoin('users as assets_dept_users',function ($leftJoin) { - $leftJoin->on("assets_dept_users.id", "=", "assets.assigned_to") - ->where("assets.assigned_type", "=", User::class); + return $query->leftJoin('users as assets_dept_users', function ($leftJoin) { + $leftJoin->on('assets_dept_users.id', '=', 'assets.assigned_to') + ->where('assets.assigned_type', '=', User::class); })->where(function ($query) use ($search) { - $query->where('assets_dept_users.department_id', '=', $search); - - })->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug + $query->where('assets_dept_users.department_id', '=', $search); + })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug } - - /** * Query builder scope to search on text filters for complex Bootstrap Tables API * @@ -1303,60 +1252,58 @@ class Asset extends Depreciable { return $query->where(function ($query) use ($filter) { foreach ($filter as $key => $search_val) { + $fieldname = str_replace('custom_fields.', '', $key); - $fieldname = str_replace('custom_fields.','', $key) ; - - if ($fieldname =='asset_tag') { + if ($fieldname == 'asset_tag') { $query->where('assets.asset_tag', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='name') { + if ($fieldname == 'name') { $query->where('assets.name', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='product_key') { + if ($fieldname == 'product_key') { $query->where('assets.serial', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='purchase_date') { + if ($fieldname == 'purchase_date') { $query->where('assets.purchase_date', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='purchase_cost') { + if ($fieldname == 'purchase_cost') { $query->where('assets.purchase_cost', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='notes') { + if ($fieldname == 'notes') { $query->where('assets.notes', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='order_number') { + if ($fieldname == 'order_number') { $query->where('assets.order_number', 'LIKE', '%'.$search_val.'%'); } - if ($fieldname =='status_label') { + if ($fieldname == 'status_label') { $query->whereHas('assetstatus', function ($query) use ($search_val) { - $query->where('status_labels.name', 'LIKE', '%' . $search_val . '%'); + $query->where('status_labels.name', 'LIKE', '%'.$search_val.'%'); }); } - if ($fieldname =='location') { + if ($fieldname == 'location') { $query->whereHas('location', function ($query) use ($search_val) { - $query->where('locations.name', 'LIKE', '%' . $search_val . '%'); + $query->where('locations.name', 'LIKE', '%'.$search_val.'%'); }); } - if ($fieldname =='checkedout_to') { + if ($fieldname == 'checkedout_to') { $query->whereHas('assigneduser', function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) { - $query->where('users.first_name', 'LIKE', '%' . $search_val . '%') - ->orWhere('users.last_name', 'LIKE', '%' . $search_val . '%'); + $query->where('users.first_name', 'LIKE', '%'.$search_val.'%') + ->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%'); }); }); } - - if ($fieldname =='manufacturer') { + if ($fieldname == 'manufacturer') { $query->whereHas('model', function ($query) use ($search_val) { $query->whereHas('manufacturer', function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) { @@ -1366,47 +1313,46 @@ class Asset extends Depreciable }); } - if ($fieldname =='category') { + if ($fieldname == 'category') { $query->whereHas('model', function ($query) use ($search_val) { $query->whereHas('category', function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) { - $query->where('categories.name', 'LIKE', '%' . $search_val . '%') - ->orWhere('models.name', 'LIKE', '%' . $search_val . '%') - ->orWhere('models.model_number', 'LIKE', '%' . $search_val . '%'); + $query->where('categories.name', 'LIKE', '%'.$search_val.'%') + ->orWhere('models.name', 'LIKE', '%'.$search_val.'%') + ->orWhere('models.model_number', 'LIKE', '%'.$search_val.'%'); }); }); }); } - if ($fieldname =='model') { + if ($fieldname == 'model') { $query->where(function ($query) use ($search_val) { $query->whereHas('model', function ($query) use ($search_val) { - $query->where('models.name', 'LIKE', '%' . $search_val . '%'); + $query->where('models.name', 'LIKE', '%'.$search_val.'%'); }); }); } - if ($fieldname =='model_number') { + if ($fieldname == 'model_number') { $query->where(function ($query) use ($search_val) { $query->whereHas('model', function ($query) use ($search_val) { - $query->where('models.model_number', 'LIKE', '%' . $search_val . '%'); + $query->where('models.model_number', 'LIKE', '%'.$search_val.'%'); }); }); } - - if ($fieldname =='company') { + if ($fieldname == 'company') { $query->where(function ($query) use ($search_val) { $query->whereHas('company', function ($query) use ($search_val) { - $query->where('companies.name', 'LIKE', '%' . $search_val . '%'); + $query->where('companies.name', 'LIKE', '%'.$search_val.'%'); }); }); } - if ($fieldname =='supplier') { + if ($fieldname == 'supplier') { $query->where(function ($query) use ($search_val) { $query->whereHas('supplier', function ($query) use ($search_val) { - $query->where('suppliers.name', 'LIKE', '%' . $search_val . '%'); + $query->where('suppliers.name', 'LIKE', '%'.$search_val.'%'); }); }); } @@ -1431,89 +1377,80 @@ class Asset extends Depreciable * assets.location would fail, as that field doesn't exist -- plus we're already searching * against those relationships earlier in this method. * - * - snipe - * + * - snipe */ - if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier') - && ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) { - $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%'); + if (($fieldname != 'category') && ($fieldname != 'model_number') && ($fieldname != 'rtd_location') && ($fieldname != 'location') && ($fieldname != 'supplier') + && ($fieldname != 'status_label') && ($fieldname != 'model') && ($fieldname != 'company') && ($fieldname != 'manufacturer')) { + $query->orWhere('assets.'.$fieldname, 'LIKE', '%'.$search_val.'%'); } - - - - }); - } - /** - * Query builder scope to order on model - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on model + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderModels($query, $order) { return $query->join('models as asset_models', 'assets.model_id', '=', 'asset_models.id')->orderBy('asset_models.name', $order); } /** - * Query builder scope to order on model number - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on model number + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderModelNumber($query, $order) { return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order); } - /** - * Query builder scope to order on assigned user - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on assigned user + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderAssigned($query, $order) { return $query->leftJoin('users as users_sort', 'assets.assigned_to', '=', 'users_sort.id')->select('assets.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order); } /** - * Query builder scope to order on status - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on status + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderStatus($query, $order) { return $query->join('status_labels as status_sort', 'assets.status_id', '=', 'status_sort.id')->orderBy('status_sort.name', $order); } /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCompany($query, $order) { return $query->leftJoin('companies as company_sort', 'assets.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order); } - /** * Query builder scope to return results of a category * @@ -1542,16 +1479,14 @@ class Asset extends Depreciable ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->where('models.manufacturer_id', '=', $manufacturer_id); } - - /** - * Query builder scope to order on category - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on category + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCategory($query, $order) { return $query->join('models as order_model_category', 'assets.model_id', '=', 'order_model_category.id') @@ -1559,7 +1494,6 @@ class Asset extends Depreciable ->orderBy('category_order.name', $order); } - /** * Query builder scope to order on manufacturer * @@ -1575,14 +1509,14 @@ class Asset extends Depreciable ->orderBy('manufacturers.name', $order); } - /** - * Query builder scope to order on location - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + /** + * Query builder scope to order on location + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderLocation($query, $order) { return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.location_id')->orderBy('asset_locations.name', $order); @@ -1600,7 +1534,6 @@ class Asset extends Depreciable return $query->leftJoin('locations as rtd_asset_locations', 'rtd_asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('rtd_asset_locations.name', $order); } - /** * Query builder scope to order on supplier name * @@ -1629,10 +1562,8 @@ class Asset extends Depreciable $query->where('locations.id', '=', $search); }); }); - } - /** * Query builder scope to search on depreciation name * @param \Illuminate\Database\Query\Builder $query Query builder instance @@ -1644,8 +1575,5 @@ class Asset extends Depreciable { return $query->join('models', 'assets.model_id', '=', 'models.id') ->join('depreciations', 'models.depreciation_id', '=', 'depreciations.id')->where('models.depreciation_id', '=', $search); - } - - } diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index 580aa18e04..d88a968fc6 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -1,4 +1,5 @@ 'required|integer', @@ -30,21 +30,21 @@ class AssetMaintenance extends Model implements ICompanyableChild 'start_date' => 'required|date', 'completion_date' => 'nullable|date', 'notes' => 'string|nullable', - 'cost' => 'numeric|nullable' + 'cost' => 'numeric|nullable', ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['title', 'notes', 'asset_maintenance_type', 'cost', 'start_date', 'completion_date']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -52,22 +52,20 @@ class AssetMaintenance extends Model implements ICompanyableChild 'asset.model' => ['name', 'model_number'], ]; - public function getCompanyableParents() { - return [ 'asset' ]; + return ['asset']; } /** - * getImprovementOptions - * - * @return array - * @author Vincent Sposato - * @version v1.0 - */ + * getImprovementOptions + * + * @return array + * @author Vincent Sposato + * @version v1.0 + */ public static function getImprovementOptions() { - return [ trans('admin/asset_maintenances/general.maintenance') => trans('admin/asset_maintenances/general.maintenance'), trans('admin/asset_maintenances/general.repair') => trans('admin/asset_maintenances/general.repair'), @@ -92,7 +90,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function setCostAttribute($value) { - $value = Helper::ParseFloat($value); + $value = Helper::ParseFloat($value); if ($value == '0.0') { $value = null; } @@ -115,23 +113,22 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function setCompletionDateAttribute($value) { - if ($value == '' || $value == "0000-00-00") { + if ($value == '' || $value == '0000-00-00') { $value = null; } $this->attributes['completion_date'] = $value; } /** - * asset - * Get asset for this improvement - * - * @return mixed - * @author Vincent Sposato - * @version v1.0 - */ + * asset + * Get asset for this improvement + * + * @return mixed + * @author Vincent Sposato + * @version v1.0 + */ public function asset() { - return $this->belongsTo('\App\Models\Asset', 'asset_id') ->withTrashed(); } @@ -145,25 +142,21 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function admin() { - return $this->belongsTo('\App\Models\User', 'user_id') ->withTrashed(); } public function supplier() { - return $this->belongsTo('\App\Models\Supplier', 'supplier_id') ->withTrashed(); } - /** - * ----------------------------------------------- - * BEGIN QUERY SCOPES - * ----------------------------------------------- - **/ - + * ----------------------------------------------- + * BEGIN QUERY SCOPES + * ----------------------------------------------- + **/ /** * Query builder scope to order on admin user @@ -207,6 +200,4 @@ class AssetMaintenance extends Model implements ICompanyableChild return $query->leftJoin('assets', 'asset_maintenances.asset_id', '=', 'assets.id') ->orderBy('assets.name', $order); } - - } diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index 1bb7902fda..acb50b5879 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -1,4 +1,5 @@ 'required|min:1|max:255', 'model_number' => 'max:255|nullable', 'category_id' => 'required|integer|exists:categories,id', 'manufacturer_id' => 'required|integer|exists:manufacturers,id', 'eol' => 'integer:min:0|max:240|nullable', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -49,6 +50,7 @@ class AssetModel extends SnipeModel $this->attributes['eol'] = $value; } + /** * The attributes that are mass assignable. * @@ -68,17 +70,17 @@ class AssetModel extends SnipeModel ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'model_number', 'notes', 'eol']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -87,7 +89,6 @@ class AssetModel extends SnipeModel 'manufacturer' => ['name'], ]; - /** * Establishes the model -> assets relationship * @@ -124,7 +125,6 @@ class AssetModel extends SnipeModel return $this->belongsTo('\App\Models\Depreciation', 'depreciation_id'); } - /** * Establishes the model -> manufacturer relationship * @@ -161,7 +161,6 @@ class AssetModel extends SnipeModel return $this->belongsToMany('\App\Models\CustomField', 'models_custom_fields')->withPivot('default_value'); } - /** * Gets the full url for the image * @@ -171,19 +170,20 @@ class AssetModel extends SnipeModel * @since [v2.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function getImageUrl() { + public function getImageUrl() + { if ($this->image) { return Storage::disk('public')->url(app('models_upload_path').$this->image); } + return false; } /** - * ----------------------------------------------- - * BEGIN QUERY SCOPES - * ----------------------------------------------- - **/ - + * ----------------------------------------------- + * BEGIN QUERY SCOPES + * ----------------------------------------------- + **/ /** * scopeInCategory @@ -198,7 +198,6 @@ class AssetModel extends SnipeModel */ public function scopeInCategory($query, array $categoryIdListing) { - return $query->whereIn('category_id', $categoryIdListing); } @@ -214,9 +213,8 @@ class AssetModel extends SnipeModel */ public function scopeRequestableModels($query) { - return $query->where('requestable', '1'); - } + } /** * Query builder scope to search on text, including catgeory and manufacturer name @@ -228,7 +226,6 @@ class AssetModel extends SnipeModel */ public function scopeSearchByManufacturerOrCat($query, $search) { - return $query->where('models.name', 'LIKE', "%$search%") ->orWhere('model_number', 'LIKE', "%$search%") ->orWhere(function ($query) use ($search) { @@ -241,7 +238,6 @@ class AssetModel extends SnipeModel $query->where('manufacturers.name', 'LIKE', '%'.$search.'%'); }); }); - } /** @@ -269,6 +265,4 @@ class AssetModel extends SnipeModel { return $query->leftJoin('categories', 'models.category_id', '=', 'categories.id')->orderBy('categories.name', $order); } - - } diff --git a/app/Models/Category.php b/app/Models/Category.php index ad21f15b48..31726ee0d5 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -1,4 +1,5 @@ 'integer', ]; - /** - * Category validation rules - */ - public $rules = array( + * Category validation rules + */ + public $rules = [ 'user_id' => 'numeric|nullable', 'name' => 'required|min:1|max:255|unique_undeleted', 'require_acceptance' => 'boolean', 'use_default_eula' => 'boolean', 'category_type' => 'required|in:asset,accessory,consumable,component,license', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; use UniqueUndeletedTrait; - /** * The attributes that are mass assignable. * @@ -85,7 +83,6 @@ class Category extends SnipeModel */ protected $searchableRelations = []; - /** * Checks if category can be deleted * @@ -95,8 +92,8 @@ class Category extends SnipeModel */ public function isDeletable() { - return (Gate::allows('delete', $this) - && ($this->itemCount() == 0)); + return Gate::allows('delete', $this) + && ($this->itemCount() == 0); } /** @@ -168,6 +165,7 @@ class Category extends SnipeModel case 'license': return $this->licenses()->count(); } + return '0'; } @@ -205,20 +203,17 @@ class Category extends SnipeModel */ public function getEula() { - $Parsedown = new \Parsedown(); if ($this->eula_text) { return $Parsedown->text(e($this->eula_text)); - } elseif ((Setting::getSettings()->default_eula_text) && ($this->use_default_eula=='1')) { + } elseif ((Setting::getSettings()->default_eula_text) && ($this->use_default_eula == '1')) { return $Parsedown->text(e(Setting::getSettings()->default_eula_text)); } else { return null; } - } - /** * ----------------------------------------------- * BEGIN QUERY SCOPES @@ -233,10 +228,8 @@ class Category extends SnipeModel * @param \Illuminate\Database\Query\Builder $query Query builder instance * @return \Illuminate\Database\Query\Builder Modified query builder */ - public function scopeRequiresAcceptance($query) { - return $query->where('require_acceptance', '=', true); } } diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php index 4bbe0af164..cb58093a47 100644 --- a/app/Models/CheckoutAcceptance.php +++ b/app/Models/CheckoutAcceptance.php @@ -8,8 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; class CheckoutAcceptance extends Model { - - use SoftDeletes; + use SoftDeletes; /** * The attributes that should be mutated to dates. @@ -17,71 +16,77 @@ class CheckoutAcceptance extends Model * @var array */ protected $dates = [ - 'accepted_at', - 'declined_at', - 'deleted_at' + 'accepted_at', + 'declined_at', + 'deleted_at', ]; /** * The resource that was is out - * + * * @return Illuminate\Database\Eloquent\Relations\MorphTo */ - public function checkoutable() { - return $this->morphTo(); + public function checkoutable() + { + return $this->morphTo(); } /** * The user that the checkoutable was checked out to - * + * * @return Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function assignedTo() { - return $this->belongsTo(User::class); + public function assignedTo() + { + return $this->belongsTo(User::class); } /** * Is this checkout acceptance pending? - * - * @return boolean + * + * @return bool */ - public function isPending() { + public function isPending() + { return $this->accepted_at == null && $this->declined_at == null; } /** * Was the checkoutable checked out to this user? - * + * * @param User $user - * @return boolean + * @return bool */ - public function isCheckedOutTo(User $user) { + public function isCheckedOutTo(User $user) + { return $this->assignedTo->is($user); } /** * Accept the checkout acceptance - * + * * @param string $signature_filename */ - public function accept($signature_filename) { - $this->accepted_at = now(); + public function accept($signature_filename) + { + $this->accepted_at = now(); $this->signature_filename = $signature_filename; $this->save(); /** * Update state for the checked out item */ - $this->checkoutable->acceptedCheckout($this->assignedTo, $signature_filename); + $this->checkoutable->acceptedCheckout($this->assignedTo, $signature_filename); } /** * Decline the checkout acceptance - * + * * @param string $signature_filename */ - public function decline($signature_filename) { - $this->declined_at = now(); + public function decline($signature_filename) + { + $this->declined_at = now(); $this->signature_filename = $signature_filename; $this->save(); @@ -89,7 +94,7 @@ class CheckoutAcceptance extends Model * Update state for the checked out item */ $this->checkoutable->declinedCheckout($this->assignedTo, $signature_filename); - } + } /** * Filter checkout acceptences by the user @@ -97,7 +102,8 @@ class CheckoutAcceptance extends Model * @param User $user * @return \Illuminate\Database\Eloquent\Builder */ - public function scopeForUser(Builder $query, User $user) { + public function scopeForUser(Builder $query, User $user) + { return $query->where('assigned_to_id', $user->id); } @@ -106,7 +112,8 @@ class CheckoutAcceptance extends Model * @param Illuminate\Database\Eloquent\Builder $query * @return \Illuminate\Database\Eloquent\Builder */ - public function scopePending(Builder $query) { + public function scopePending(Builder $query) + { return $query->whereNull('accepted_at')->whereNull('declined_at'); } } diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php index 462af447e9..26abdd301e 100644 --- a/app/Models/CheckoutRequest.php +++ b/app/Models/CheckoutRequest.php @@ -1,6 +1,7 @@ itemType() == "asset") { + if ($this->itemType() == 'asset') { return $this->itemRequested()->present()->name(); } - return $this->itemRequested()->name; + return $this->itemRequested()->name; } } diff --git a/app/Models/Company.php b/app/Models/Company.php index 04f138ccd0..373c623a32 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -1,4 +1,5 @@ 'required|min:1|max:255|unique:companies,name' + 'name' => 'required|min:1|max:255|unique:companies,name', ]; protected $presenter = 'App\Presenters\CompanyPresenter'; use Presentable; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; - use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'created_at', 'updated_at']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ - protected $searchableRelations = []; + protected $searchableRelations = []; /** * The attributes that are mass assignable. @@ -70,7 +70,7 @@ final class Company extends SnipeModel } } - private static function scopeCompanyablesDirectly($query, $column = 'company_id', $table_name = null ) + private static function scopeCompanyablesDirectly($query, $column = 'company_id', $table_name = null) { if (Auth::user()) { $company_id = Auth::user()->company_id; @@ -78,12 +78,12 @@ final class Company extends SnipeModel $company_id = null; } - $table = ($table_name) ? $table_name."." : ''; + $table = ($table_name) ? $table_name.'.' : ''; - if(\Schema::hasColumn($query->getModel()->getTable(), $column)){ - return $query->where($table.$column, '=', $company_id); + if (\Schema::hasColumn($query->getModel()->getTable(), $column)) { + return $query->where($table.$column, '=', $company_id); } else { - return $query->join('users as users_comp', 'users_comp.id', 'user_id')->where('users_comp.company_id', '=', $company_id); + return $query->join('users as users_comp', 'users_comp.id', 'user_id')->where('users_comp.company_id', '=', $company_id); } } @@ -100,7 +100,7 @@ final class Company extends SnipeModel public static function getIdForCurrentUser($unescaped_input) { - if (!static::isFullMultipleCompanySupportEnabled()) { + if (! static::isFullMultipleCompanySupportEnabled()) { return static::getIdFromInput($unescaped_input); } else { $current_user = Auth::user(); @@ -115,7 +115,6 @@ final class Company extends SnipeModel return static::getIdFromInput($unescaped_input); } } - } } @@ -123,27 +122,27 @@ final class Company extends SnipeModel { if (is_null($companyable)) { return false; - } elseif (!static::isFullMultipleCompanySupportEnabled()) { + } elseif (! static::isFullMultipleCompanySupportEnabled()) { return true; } else { if (Auth::user()) { $current_user_company_id = Auth::user()->company_id; $companyable_company_id = $companyable->company_id; - return ($current_user_company_id == null || $current_user_company_id == $companyable_company_id || Auth::user()->isSuperUser()); - } + return $current_user_company_id == null || $current_user_company_id == $companyable_company_id || Auth::user()->isSuperUser(); + } } } public static function isCurrentUserAuthorized() { - return ((!static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->isSuperUser())); + return (! static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->isSuperUser()); } public static function canManageUsersCompanies() { - return (!static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser() || - Auth::user()->company_id == null); + return ! static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser() || + Auth::user()->company_id == null; } /** @@ -153,7 +152,8 @@ final class Company extends SnipeModel * @since [v5.0] * @return bool */ - public function isDeletable() { + public function isDeletable() + { return Gate::allows('delete', $this) && ($this->assets()->count() === 0) && ($this->accessories()->count() === 0) @@ -164,17 +164,17 @@ final class Company extends SnipeModel public static function getIdForUser($unescaped_input) { - if (!static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser()) { + if (! static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser()) { return static::getIdFromInput($unescaped_input); } else { return static::getIdForCurrentUser($unescaped_input); } } - public static function scopeCompanyables($query, $column = 'company_id', $table_name = null ) + public static function scopeCompanyables($query, $column = 'company_id', $table_name = null) { // If not logged in and hitting this, assume we are on the command line and don't scope?' - if (!static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser()) || (!Auth::check())) { + if (! static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser()) || (! Auth::check())) { return $query; } else { return static::scopeCompanyablesDirectly($query, $column, $table_name); @@ -185,7 +185,7 @@ final class Company extends SnipeModel { if (count($companyable_names) == 0) { throw new Exception('No Companyable Children to scope'); - } elseif (!static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser())) { + } elseif (! static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser())) { return $query; } else { $f = function ($q) { @@ -199,6 +199,7 @@ final class Company extends SnipeModel $q2 = $q2->orWhereHas($companyable_names[$i], $f); } }); + return $q; } } @@ -217,6 +218,7 @@ final class Company extends SnipeModel { return $this->hasMany(License::class, 'company_id'); } + public function accessories() { return $this->hasMany(Accessory::class, 'company_id'); diff --git a/app/Models/CompanyableChildScope.php b/app/Models/CompanyableChildScope.php index e83eb18ed8..4077ebd596 100644 --- a/app/Models/CompanyableChildScope.php +++ b/app/Models/CompanyableChildScope.php @@ -1,4 +1,5 @@ getModel(); + return Company::scopeCompanyableChildren($model->getCompanyableParents(), $builder); } diff --git a/app/Models/CompanyableChildTrait.php b/app/Models/CompanyableChildTrait.php index 02682d0bab..1158c70e98 100644 --- a/app/Models/CompanyableChildTrait.php +++ b/app/Models/CompanyableChildTrait.php @@ -1,4 +1,5 @@ 'required|min:3|max:255', 'qty' => 'required|integer|min:1', 'category_id' => 'required|integer|exists:categories,id', @@ -32,15 +33,15 @@ class Component extends SnipeModel 'min_amt' => 'integer|min:0|nullable', 'purchase_date' => 'date|nullable', 'purchase_cost' => 'numeric|nullable', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -63,17 +64,17 @@ class Component extends SnipeModel ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -153,7 +154,7 @@ class Component extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Component::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** @@ -186,40 +187,39 @@ class Component extends SnipeModel } /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param string $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param string $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCategory($query, $order) { return $query->join('categories', 'components.category_id', '=', 'categories.id')->orderBy('categories.name', $order); } /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param string $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param string $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderLocation($query, $order) { return $query->leftJoin('locations', 'components.location_id', '=', 'locations.id')->orderBy('locations.name', $order); } - /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param string $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param string $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCompany($query, $order) { return $query->leftJoin('companies', 'components.company_id', '=', 'companies.id')->orderBy('companies.name', $order); diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index 14de8c6ebb..3869ea68d3 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -1,4 +1,5 @@ 'integer', ]; - - /** - * Category validation rules - */ - public $rules = array( + * Category validation rules + */ + public $rules = [ 'name' => 'required|min:3|max:255', 'qty' => 'required|integer|min:0', 'category_id' => 'required|integer', 'company_id' => 'integer|nullable', 'min_amt' => 'integer|min:0|nullable', 'purchase_cost' => 'numeric|nullable', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -68,27 +66,27 @@ class Consumable extends SnipeModel 'purchase_cost', 'purchase_date', 'qty', - 'requestable' + 'requestable', ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ 'category' => ['name'], 'company' => ['name'], - 'location' => ['name'], + 'location' => ['name'], 'manufacturer' => ['name'], ]; @@ -111,7 +109,7 @@ class Consumable extends SnipeModel $value = null; } $this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN); - return; + } /** @@ -186,7 +184,6 @@ class Consumable extends SnipeModel return $this->belongsTo('\App\Models\Category', 'category_id'); } - /** * Establishes the component -> action logs relationship * @@ -196,7 +193,7 @@ class Consumable extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Consumable::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** @@ -206,12 +203,13 @@ class Consumable extends SnipeModel * @since [v3.0] * @return string | false */ - public function getImageUrl() { + public function getImageUrl() + { if ($this->image) { return Storage::disk('public')->url(app('consumables_upload_path').$this->image); } - return false; + return false; } /** @@ -226,14 +224,13 @@ class Consumable extends SnipeModel return $this->belongsToMany('\App\Models\User', 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps(); } - /** * Determine whether to send a checkin/checkout email based on * asset model category * * @author [A. Gianotto] [] * @since [v4.0] - * @return boolean + * @return bool */ public function checkin_email() { @@ -245,7 +242,7 @@ class Consumable extends SnipeModel * * @author [A. Gianotto] [] * @since [v4.0] - * @return boolean + * @return bool */ public function requireAcceptance() { @@ -262,17 +259,15 @@ class Consumable extends SnipeModel */ public function getEula() { - $Parsedown = new \Parsedown(); if ($this->category->eula_text) { return $Parsedown->text(e($this->category->eula_text)); - } elseif ((Setting::getSettings()->default_eula_text) && ($this->category->use_default_eula=='1')) { + } elseif ((Setting::getSettings()->default_eula_text) && ($this->category->use_default_eula == '1')) { return $Parsedown->text(e(Setting::getSettings()->default_eula_text)); } else { return null; } - } /** @@ -287,30 +282,31 @@ class Consumable extends SnipeModel $checkedout = $this->users->count(); $total = $this->qty; $remaining = $total - $checkedout; + return $remaining; } /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param string $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param string $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCategory($query, $order) { return $query->join('categories', 'consumables.category_id', '=', 'categories.id')->orderBy('categories.name', $order); } /** - * Query builder scope to order on location - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on location + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderLocation($query, $order) { return $query->leftJoin('locations', 'consumables.location_id', '=', 'locations.id')->orderBy('locations.name', $order); @@ -329,15 +325,14 @@ class Consumable extends SnipeModel return $query->leftJoin('manufacturers', 'consumables.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order); } - /** - * Query builder scope to order on company - * - * @param \Illuminate\Database\Query\Builder $query Query builder instance - * @param string $order Order - * - * @return \Illuminate\Database\Query\Builder Modified query builder - */ + * Query builder scope to order on company + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param string $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ public function scopeOrderCompany($query, $order) { return $query->leftJoin('companies', 'consumables.company_id', '=', 'companies.id')->orderBy('companies.name', $order); diff --git a/app/Models/ConsumableAssignment.php b/app/Models/ConsumableAssignment.php index d8d684ca27..d82cbb5870 100644 --- a/app/Models/ConsumableAssignment.php +++ b/app/Models/ConsumableAssignment.php @@ -1,4 +1,5 @@ ] * @since [v3.0] */ - public static $table_name = "assets"; + public static $table_name = 'assets'; /** * Convert the custom field's name property to a db-safe string. @@ -81,11 +82,11 @@ class CustomField extends Model * * @author [A. Gianotto] [] * @since [v3.4] - * @return String + * @return string */ public static function name_to_db_name($name) { - return "_snipeit_" . preg_replace("/[^a-zA-Z0-9]/", "_", strtolower($name)); + return '_snipeit_'.preg_replace('/[^a-zA-Z0-9]/', '_', strtolower($name)); } /** @@ -98,7 +99,7 @@ class CustomField extends Model * * @author [A. Gianotto] [] * @since [v3.4] - * @return Boolean + * @return bool */ public static function boot() { @@ -107,12 +108,12 @@ class CustomField extends Model // Column already exists on the assets table - nothing to do here. // This *shouldn't* happen in the wild. - if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) { + if (Schema::hasColumn(self::$table_name, $custom_field->convertUnicodeDbSlug())) { return false; } // Update the column name in the assets table - Schema::table(CustomField::$table_name, function ($table) use ($custom_field) { + Schema::table(self::$table_name, function ($table) use ($custom_field) { $table->text($custom_field->convertUnicodeDbSlug())->nullable(); }); @@ -121,13 +122,11 @@ class CustomField extends Model $custom_field->save(); }); - self::updating(function ($custom_field) { // Column already exists on the assets table - nothing to do here. - if ($custom_field->isDirty("name")) { - - if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) { + if ($custom_field->isDirty('name')) { + if (Schema::hasColumn(self::$table_name, $custom_field->convertUnicodeDbSlug())) { return true; } @@ -137,8 +136,8 @@ class CustomField extends Model $platform->registerDoctrineTypeMapping('enum', 'string'); // Rename the field if the name has changed - Schema::table(CustomField::$table_name, function ($table) use ($custom_field) { - $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug()); + Schema::table(self::$table_name, function ($table) use ($custom_field) { + $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal('name')), $custom_field->convertUnicodeDbSlug()); }); // Save the updated column name to the custom fields table @@ -147,13 +146,13 @@ class CustomField extends Model return true; } + return true; }); - // Drop the assets column if we've deleted it from custom fields self::deleting(function ($custom_field) { - return Schema::table(CustomField::$table_name, function ($table) use ($custom_field) { + return Schema::table(self::$table_name, function ($table) use ($custom_field) { $table->dropColumn($custom_field->convertUnicodeDbSlug()); }); }); @@ -217,11 +216,11 @@ class CustomField extends Model * @author [A. Gianotto] [] * @param $value string * @since [v3.0] - * @return boolean + * @return bool */ public function check_format($value) { - return preg_match('/^'.$this->attributes['format'].'$/', $value)===1; + return preg_match('/^'.$this->attributes['format'].'$/', $value) === 1; } /** @@ -270,9 +269,9 @@ class CustomField extends Model public function setFormatAttribute($value) { if (isset(self::PREDEFINED_FORMATS[$value])) { - $this->attributes['format']=self::PREDEFINED_FORMATS[$value]; + $this->attributes['format'] = self::PREDEFINED_FORMATS[$value]; } else { - $this->attributes['format']=$value; + $this->attributes['format'] = $value; } } @@ -286,17 +285,16 @@ class CustomField extends Model public function formatFieldValuesAsArray() { $result = []; - $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values); + $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values); - if (($this->element!='checkbox') && ($this->element!='radio')) { + if (($this->element != 'checkbox') && ($this->element != 'radio')) { $result[''] = 'Select '.strtolower($this->format); } - for ($x = 0; $x < count($arr); $x++) { $arr_parts = explode('|', $arr[$x]); - if ($arr_parts[0]!='') { - if (key_exists('1', $arr_parts)) { + if ($arr_parts[0] != '') { + if (array_key_exists('1', $arr_parts)) { $result[$arr_parts[0]] = $arr_parts[1]; } else { $result[$arr_parts[0]] = $arr_parts[0]; @@ -304,7 +302,6 @@ class CustomField extends Model } } - return $result; } @@ -313,17 +310,17 @@ class CustomField extends Model * * @author [A. Gianotto] [] * @since [v3.4] - * @return boolean + * @return bool */ public function isFieldDecryptable($string) { - if (($this->field_encrypted=='1') && ($string!='')) { + if (($this->field_encrypted == '1') && ($string != '')) { return true; } + return false; } - /** * Convert non-UTF-8 or weirdly encoded text into something that * won't break the database. @@ -337,52 +334,52 @@ class CustomField extends Model $name = $original ? $original : $this->name; $id = $this->id ? $this->id : 'xx'; - if (!function_exists('transliterator_transliterate')) { - $long_slug = '_snipeit_' . str_slug(\Patchwork\Utf8::utf8_encode(trim($name)), '_'); + if (! function_exists('transliterator_transliterate')) { + $long_slug = '_snipeit_'.str_slug(\Patchwork\Utf8::utf8_encode(trim($name)), '_'); } else { - $long_slug = '_snipeit_' . Utf8Slugger::slugify($name, '_'); + $long_slug = '_snipeit_'.Utf8Slugger::slugify($name, '_'); } - return substr($long_slug, 0, 50) . '_' . $id; + return substr($long_slug, 0, 50).'_'.$id; } /** - * Get validation rules for custom fields to use with Validator - * @author [V. Cordes] [] - * @param int $id - * @since [v4.1.10] - * @return array - */ + * Get validation rules for custom fields to use with Validator + * @author [V. Cordes] [] + * @param int $id + * @since [v4.1.10] + * @return array + */ public function validationRules($regex_format = null) { return [ - "name" => "required|unique:custom_fields", - "element" => [ - "required", - Rule::in(['text', 'listbox', 'textarea', 'checkbox', 'radio']) + 'name' => 'required|unique:custom_fields', + 'element' => [ + 'required', + Rule::in(['text', 'listbox', 'textarea', 'checkbox', 'radio']), ], 'format' => [ - Rule::in(array_merge(array_keys(CustomField::PREDEFINED_FORMATS), CustomField::PREDEFINED_FORMATS, [$regex_format])) + Rule::in(array_merge(array_keys(self::PREDEFINED_FORMATS), self::PREDEFINED_FORMATS, [$regex_format])), ], - 'field_encrypted' => "nullable|boolean" + 'field_encrypted' => 'nullable|boolean', ]; } /** * Check to see if there is a custom regex format type * @see https://github.com/snipe/snipe-it/issues/5896 - * - * @author Wes Hulette - * + * + * @author Wes Hulette + * * @since 5.0.0 - * + * * @return string */ public function getFormatType() { - if(stripos($this->format,'regex') === 0 && ($this->format !== self::PREDEFINED_FORMATS['MAC'])) { - return 'CUSTOM REGEX'; - } + if (stripos($this->format, 'regex') === 0 && ($this->format !== self::PREDEFINED_FORMATS['MAC'])) { + return 'CUSTOM REGEX'; + } return $this->format; } diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index 157c193b41..f6f1e77cd5 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -1,4 +1,5 @@ "required|unique:custom_fieldsets" + 'name' => 'required|unique:custom_fieldsets', ]; /** @@ -24,11 +25,10 @@ class CustomFieldset extends Model * validation rules before attempting validation. If this property * is not set in the model it will default to true. * - * @var boolean + * @var bool */ protected $injectUniqueIdentifier = true; - /** * Establishes the fieldset -> field relationship * @@ -38,7 +38,7 @@ class CustomFieldset extends Model */ public function fields() { - return $this->belongsToMany('\App\Models\CustomField')->withPivot(["required","order"])->orderBy("pivot_order"); + return $this->belongsToMany('\App\Models\CustomField')->withPivot(['required', 'order'])->orderBy('pivot_order'); } /** @@ -50,7 +50,7 @@ class CustomFieldset extends Model */ public function models() { - return $this->hasMany('\App\Models\AssetModel', "fieldset_id"); + return $this->hasMany('\App\Models\AssetModel', 'fieldset_id'); } /** @@ -75,18 +75,19 @@ class CustomFieldset extends Model */ public function validation_rules() { - $rules=[]; + $rules = []; foreach ($this->fields as $field) { $rule = []; - if (($field->field_encrypted!='1') || - (($field->field_encrypted =='1') && (Gate::allows('admin')) )) { - $rule[] = ($field->pivot->required=='1') ? "required" : "nullable"; + if (($field->field_encrypted != '1') || + (($field->field_encrypted == '1') && (Gate::allows('admin')))) { + $rule[] = ($field->pivot->required == '1') ? 'required' : 'nullable'; } array_push($rule, $field->attributes['format']); - $rules[$field->db_column_name()]=$rule; + $rules[$field->db_column_name()] = $rule; } + return $rules; } } diff --git a/app/Models/Department.php b/app/Models/Department.php index 96aa4dd860..1fd9567145 100644 --- a/app/Models/Department.php +++ b/app/Models/Department.php @@ -13,7 +13,7 @@ class Department extends SnipeModel * validation rules before attempting validation. If this property * is not set in the model it will default to true. * - * @var boolean + * @var bool */ protected $injectUniqueIdentifier = true; @@ -47,17 +47,17 @@ class Department extends SnipeModel ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'notes']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = []; @@ -74,7 +74,6 @@ class Department extends SnipeModel return $this->belongsTo('\App\Models\Company', 'company_id'); } - /** * Establishes the department -> users relationship * @@ -87,7 +86,6 @@ class Department extends SnipeModel return $this->hasMany('\App\Models\User', 'department_id'); } - /** * Establishes the department -> manager relationship * @@ -111,7 +109,7 @@ class Department extends SnipeModel { return $this->belongsTo('\App\Models\Location', 'location_id'); } - + /** * Query builder scope to order on location name * @@ -137,6 +135,4 @@ class Department extends SnipeModel { return $query->leftJoin('users as department_user', 'departments.manager_id', '=', 'department_user.id')->orderBy('department_user.first_name', $order)->orderBy('department_user.last_name', $order); } - - } diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php index fde9530c45..caced500c7 100644 --- a/app/Models/Depreciable.php +++ b/app/Models/Depreciable.php @@ -1,11 +1,12 @@ get_depreciation()) { // will never happen + if (! $this->get_depreciation()) { // will never happen return $this->purchase_cost; } @@ -47,11 +47,11 @@ class Depreciable extends SnipeModel } $depreciation = 0; $setting = Setting::getSettings(); - switch($setting->depreciation_method) { + switch ($setting->depreciation_method) { case 'half_1': $depreciation = $this->getHalfYearDepreciatedValue(true); break; - + case 'half_2': $depreciation = $this->getHalfYearDepreciatedValue(false); break; @@ -59,22 +59,23 @@ class Depreciable extends SnipeModel default: $depreciation = $this->getLinearDepreciatedValue(); } + return $depreciation; } /** * @return float|int */ - public function getLinearDepreciatedValue() { // fraction of value left - $months_remaining = $this->time_until_depreciated()->m + 12*$this->time_until_depreciated()->y; //UGlY - $current_value = round(($months_remaining/ $this->get_depreciation()->months) * $this->purchase_cost, 2); + $months_remaining = $this->time_until_depreciated()->m + 12 * $this->time_until_depreciated()->y; //UGlY + $current_value = round(($months_remaining / $this->get_depreciation()->months) * $this->purchase_cost, 2); if ($current_value < 0) { $current_value = 0; } + return $current_value; } @@ -82,55 +83,56 @@ class Depreciable extends SnipeModel * @param onlyHalfFirstYear Boolean always applied only second half of the first year * @return float|int */ - public function getHalfYearDepreciatedValue($onlyHalfFirstYear = false) + public function getHalfYearDepreciatedValue($onlyHalfFirstYear = false) { // @link http://www.php.net/manual/en/class.dateinterval.php $current_date = $this->getDateTime(); $purchase_date = date_create($this->purchase_date); - $currentYear = $this->get_fiscal_year( $current_date ); - $purchaseYear = $this->get_fiscal_year( $purchase_date ); + $currentYear = $this->get_fiscal_year($current_date); + $purchaseYear = $this->get_fiscal_year($purchase_date); $yearsPast = $currentYear - $purchaseYear; $deprecationYears = ceil($this->get_depreciation()->months / 12); - if( $onlyHalfFirstYear ) { + if ($onlyHalfFirstYear) { + $yearsPast -= 0.5; + } elseif (! $this->is_first_half_of_year($purchase_date)) { $yearsPast -= 0.5; } - else if( !$this->is_first_half_of_year($purchase_date) ) { - $yearsPast -= 0.5; - } - if( !$this->is_first_half_of_year($current_date) ) { + if (! $this->is_first_half_of_year($current_date)) { $yearsPast += 0.5; } - if($yearsPast >= $deprecationYears) { + if ($yearsPast >= $deprecationYears) { $yearsPast = $deprecationYears; - } - else if($yearsPast < 0) { + } elseif ($yearsPast < 0) { $yearsPast = 0; } + return round($yearsPast / $deprecationYears * $this->purchase_cost, 2); } - + /** - * @param \DateTime $date - * @return int - */ - protected function get_fiscal_year($date) { + * @param \DateTime $date + * @return int + */ + protected function get_fiscal_year($date) + { $year = intval($date->format('Y')); // also, maybe it'll have to set fiscal year date - if($date->format('nj') === '1231') { + if ($date->format('nj') === '1231') { return $year; - } - else { + } else { return $year - 1; } } /** - * @param \DateTime $date - * @return bool - */ - protected function is_first_half_of_year($date) { + * @param \DateTime $date + * @return bool + */ + protected function is_first_half_of_year($date) + { $date0m0d = intval($date->format('md')); + return ($date0m0d < 601) || ($date0m0d >= 1231); } @@ -142,22 +144,23 @@ class Depreciable extends SnipeModel // @link http://www.php.net/manual/en/class.dateinterval.php $interval = $d1->diff($d2); - if (!$interval->invert) { + if (! $interval->invert) { return $interval; } else { - return new \DateInterval("PT0S"); //null interval (zero seconds from now) + return new \DateInterval('PT0S'); //null interval (zero seconds from now) } } public function depreciated_date() { $date = date_create($this->purchase_date); - date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months . ' months')); + date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months')); + return $date; //date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization } // it's necessary for unit tests - protected function getDateTime($time = null) + protected function getDateTime($time = null) { return new \DateTime($time); } diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php index c706f2f1e7..2612f6ee1b 100755 --- a/app/Models/Depreciation.php +++ b/app/Models/Depreciation.php @@ -1,4 +1,5 @@ 'required|min:3|max:255|unique:depreciations,name', 'months' => 'required|max:3600|integer', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -30,20 +31,20 @@ class Depreciation extends SnipeModel * * @var array */ - protected $fillable = ['name','months']; + protected $fillable = ['name', 'months']; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'months']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = []; @@ -60,7 +61,6 @@ class Depreciation extends SnipeModel return $this->hasMany('\App\Models\AssetModel', 'depreciation_id'); } - /** * Establishes the depreciation -> licenses relationship * @@ -71,5 +71,5 @@ class Depreciation extends SnipeModel public function licenses() { return $this->hasMany('\App\Models\License', 'depreciation_id'); - } + } } diff --git a/app/Models/Group.php b/app/Models/Group.php index 25c2505101..b493d02fef 100755 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -1,4 +1,5 @@ 'required|min:2|max:255', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; - use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'created_at']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = []; diff --git a/app/Models/ICompanyableChild.php b/app/Models/ICompanyableChild.php index 0f24598ec9..b435ee00a4 100644 --- a/app/Models/ICompanyableChild.php +++ b/app/Models/ICompanyableChild.php @@ -1,4 +1,5 @@ 'array', 'first_row' => 'array', - 'field_map' => 'json' + 'field_map' => 'json', ]; } diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index f06da90581..bade1c0c00 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -1,16 +1,16 @@ Settings. * @@ -18,30 +18,27 @@ class Ldap extends Model * @since [v3.0] * @return connection */ - public static function connectToLdap() { - - $ldap_host = Setting::getSettings()->ldap_server; + $ldap_host = Setting::getSettings()->ldap_server; $ldap_version = Setting::getSettings()->ldap_version; $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore; $ldap_use_tls = Setting::getSettings()->ldap_tls; - // If we are ignoring the SSL cert we need to setup the environment variable // before we create the connection - if ($ldap_server_cert_ignore=='1') { + if ($ldap_server_cert_ignore == '1') { putenv('LDAPTLS_REQCERT=never'); } // If the user specifies where CA Certs are, make sure to use them - if (env("LDAPTLS_CACERT")) { - putenv("LDAPTLS_CACERT=".env("LDAPTLS_CACERT")); + if (env('LDAPTLS_CACERT')) { + putenv('LDAPTLS_CACERT='.env('LDAPTLS_CACERT')); } $connection = @ldap_connect($ldap_host); - if (!$connection) { + if (! $connection) { throw new Exception('Could not connect to LDAP server at '.$ldap_host.'. Please check your LDAP server name and port number in your settings.'); } @@ -50,14 +47,13 @@ class Ldap extends Model ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION, $ldap_version); ldap_set_option($connection, LDAP_OPT_NETWORK_TIMEOUT, 20); - if ($ldap_use_tls=='1') { + if ($ldap_use_tls == '1') { ldap_start_tls($connection); } return $connection; } - /** * Binds/authenticates the user to LDAP, and returns their attributes. * @@ -69,61 +65,55 @@ class Ldap extends Model * @return bool true if the username and/or password provided are valid * false if the username and/or password provided are invalid * array of ldap_attributes if $user is true - * */ - static function findAndBindUserLdap($username, $password) + public static function findAndBindUserLdap($username, $password) { $settings = Setting::getSettings(); - $connection = Ldap::connectToLdap(); - $ldap_username_field = $settings->ldap_username_field; - $baseDn = $settings->ldap_basedn; - $userDn = $ldap_username_field.'='.$username.','.$settings->ldap_basedn; + $connection = self::connectToLdap(); + $ldap_username_field = $settings->ldap_username_field; + $baseDn = $settings->ldap_basedn; + $userDn = $ldap_username_field.'='.$username.','.$settings->ldap_basedn; - if ($settings->is_ad =='1') { + if ($settings->is_ad == '1') { // Check if they are using the userprincipalname for the username field. // If they are, we can skip building the UPN to authenticate against AD - if ($ldap_username_field=='userprincipalname') { + if ($ldap_username_field == 'userprincipalname') { $userDn = $username; } else { // In case they haven't added an AD domain - $userDn = ($settings->ad_domain != '') ? $username.'@'.$settings->ad_domain : $username.'@'.$settings->email_domain; + $userDn = ($settings->ad_domain != '') ? $username.'@'.$settings->ad_domain : $username.'@'.$settings->email_domain; } - } \Log::debug('Attempting to login using distinguished name:'.$userDn); - - $filterQuery = $settings->ldap_auth_filter_query . $username; + $filterQuery = $settings->ldap_auth_filter_query.$username; $filter = Setting::getSettings()->ldap_filter; $filterQuery = "({$filter}({$filterQuery}))"; \Log::debug('Filter query: '.$filterQuery); - - if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) { - if(!$ldapbind = Ldap::bindAdminToLdap($connection)){ - return false; + if (! $ldapbind = @ldap_bind($connection, $userDn, $password)) { + if (! $ldapbind = self::bindAdminToLdap($connection)) { + return false; } } - if (!$results = ldap_search($connection, $baseDn, $filterQuery)) { + if (! $results = ldap_search($connection, $baseDn, $filterQuery)) { throw new Exception('Could not search LDAP: '); } - if (!$entry = ldap_first_entry($connection, $results)) { + if (! $entry = ldap_first_entry($connection, $results)) { return false; } - if (!$user = ldap_get_attributes($connection, $entry)) { + if (! $user = ldap_get_attributes($connection, $entry)) { return false; } return array_change_key_case($user); - } - /** * Binds/authenticates an admin to LDAP for LDAP searching/syncing. * Here we also return a better error if the app key is donked. @@ -133,29 +123,23 @@ class Ldap extends Model * @param bool|false $user * @return bool true if the username and/or password provided are valid * false if the username and/or password provided are invalid - * */ - static function bindAdminToLdap($connection) + public static function bindAdminToLdap($connection) { - - $ldap_username = Setting::getSettings()->ldap_uname; + $ldap_username = Setting::getSettings()->ldap_uname; // Lets return some nicer messages for users who donked their app key, and disable LDAP try { - $ldap_pass = \Crypt::decrypt(Setting::getSettings()->ldap_pword); + $ldap_pass = \Crypt::decrypt(Setting::getSettings()->ldap_pword); } catch (Exception $e) { - throw new Exception('Your app key has changed! Could not decrypt LDAP password using your current app key, so LDAP authentication has been disabled. Login with a local account, update the LDAP password and re-enable it in Admin > Settings.'); } - - if (!$ldapbind = @ldap_bind($connection, $ldap_username, $ldap_pass)) { + if (! $ldapbind = @ldap_bind($connection, $ldap_username, $ldap_pass)) { throw new Exception('Could not bind to LDAP: '.ldap_error($connection)); } - } - /** * Parse and map LDAP attributes based on settings * @@ -165,7 +149,7 @@ class Ldap extends Model * @param $ldapatttibutes * @return array|bool */ - static function parseAndMapLdapAttributes($ldapattributes) + public static function parseAndMapLdapAttributes($ldapattributes) { //Get LDAP attribute config $ldap_result_username = Setting::getSettings()->ldap_username_field; @@ -175,22 +159,21 @@ class Ldap extends Model $ldap_result_email = Setting::getSettings()->ldap_email; $ldap_result_phone = Setting::getSettings()->ldap_phone; $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle; - $ldap_result_country = Setting::getSettings()->ldap_country; + $ldap_result_country = Setting::getSettings()->ldap_country; $ldap_result_dept = Setting::getSettings()->ldap_dept; // Get LDAP user data - $item = array(); - $item["username"] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : ""; - $item["employee_number"] = isset($ldapattributes[$ldap_result_emp_num][0]) ? $ldapattributes[$ldap_result_emp_num][0] : ""; - $item["lastname"] = isset($ldapattributes[$ldap_result_last_name][0]) ? $ldapattributes[$ldap_result_last_name][0] : ""; - $item["firstname"] = isset($ldapattributes[$ldap_result_first_name][0]) ? $ldapattributes[$ldap_result_first_name][0] : ""; - $item["email"] = isset($ldapattributes[$ldap_result_email][0]) ? $ldapattributes[$ldap_result_email][0] : "" ; - $item["telephone"] = isset($ldapattributes[$ldap_result_phone][0]) ?$ldapattributes[$ldap_result_phone][0] : ""; - $item["jobtitle"] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : ""; - $item["country"] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : ""; - $item["department"] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : ""; + $item = []; + $item['username'] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : ''; + $item['employee_number'] = isset($ldapattributes[$ldap_result_emp_num][0]) ? $ldapattributes[$ldap_result_emp_num][0] : ''; + $item['lastname'] = isset($ldapattributes[$ldap_result_last_name][0]) ? $ldapattributes[$ldap_result_last_name][0] : ''; + $item['firstname'] = isset($ldapattributes[$ldap_result_first_name][0]) ? $ldapattributes[$ldap_result_first_name][0] : ''; + $item['email'] = isset($ldapattributes[$ldap_result_email][0]) ? $ldapattributes[$ldap_result_email][0] : ''; + $item['telephone'] = isset($ldapattributes[$ldap_result_phone][0]) ? $ldapattributes[$ldap_result_phone][0] : ''; + $item['jobtitle'] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : ''; + $item['country'] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : ''; + $item['department'] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : ''; + return $item; - - } /** @@ -201,23 +184,22 @@ class Ldap extends Model * @param $ldapatttibutes * @return array|bool */ - static function createUserFromLdap($ldapatttibutes) + public static function createUserFromLdap($ldapatttibutes) { - $item = Ldap::parseAndMapLdapAttributes($ldapatttibutes); - + $item = self::parseAndMapLdapAttributes($ldapatttibutes); // Create user from LDAP data - if (!empty($item["username"])) { + if (! empty($item['username'])) { $user = new User; - $user->first_name = $item["firstname"]; - $user->last_name = $item["lastname"]; - $user->username = $item["username"]; - $user->email = $item["email"]; + $user->first_name = $item['firstname']; + $user->last_name = $item['lastname']; + $user->username = $item['username']; + $user->email = $item['email']; - if (Setting::getSettings()->ldap_pw_sync=='1') { - $user->password = bcrypt(Input::get("password")); + if (Setting::getSettings()->ldap_pw_sync == '1') { + $user->password = bcrypt(Input::get('password')); } else { - $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 25); + $pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 25); $user->password = bcrypt($pass); } @@ -229,12 +211,11 @@ class Ldap extends Model return $user; } else { LOG::debug('Could not create user.'.$user->getErrors()); - throw new Exception("Could not create user: ".$user->getErrors()); + throw new Exception('Could not create user: '.$user->getErrors()); } } return false; - } /** @@ -246,11 +227,10 @@ class Ldap extends Model * @param $base_dn * @return array|bool */ - static function findLdapUsers($base_dn = null) + public static function findLdapUsers($base_dn = null) { - - $ldapconn = Ldap::connectToLdap(); - $ldap_bind = Ldap::bindAdminToLdap($ldapconn); + $ldapconn = self::connectToLdap(); + $ldap_bind = self::bindAdminToLdap($ldapconn); // Default to global base DN if nothing else is provided. if (is_null($base_dn)) { $base_dn = Setting::getSettings()->ldap_basedn; @@ -260,33 +240,32 @@ class Ldap extends Model // Set up LDAP pagination for very large databases $page_size = 500; $cookie = ''; - $result_set = array(); + $result_set = []; $global_count = 0; // Perform the search do { // Paginate (non-critical, if not supported by server) - if (!$ldap_paging = @ldap_control_paged_result($ldapconn, $page_size, false, $cookie)) { + if (! $ldap_paging = @ldap_control_paged_result($ldapconn, $page_size, false, $cookie)) { throw new Exception('Problem with your LDAP connection. Try checking the Use TLS setting in Admin > Settings. '); } if ($filter != '' && substr($filter, 0, 1) != '(') { // wrap parens around NON-EMPTY filters that DON'T have them, for back-compatibility with AdLdap2-based filters $filter = "($filter)"; } elseif ($filter == '') { - $filter = "(cn=*)"; + $filter = '(cn=*)'; } - $search_results = ldap_search($ldapconn, $base_dn, $filter); - if (!$search_results) { + if (! $search_results) { return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn)); // FIXME this is never called in any routed context - only from the Artisan command. So this redirect will never work. } // Get results from page $results = ldap_get_entries($ldapconn, $search_results); - if (!$results) { + if (! $results) { return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_get_entries').ldap_error($ldapconn)); // FIXME this is never called in any routed context - only from the Artisan command. So this redirect will never work. } @@ -295,17 +274,13 @@ class Ldap extends Model $result_set = array_merge($result_set, $results); @ldap_control_paged_result_response($ldapconn, $search_results, $cookie); - } while ($cookie !== null && $cookie != ''); - // Clean up after search $result_set['count'] = $global_count; $results = $result_set; @ldap_control_paged_result($ldapconn, 0); return $results; - - } } diff --git a/app/Models/License.php b/app/Models/License.php index 8f0fbdfaab..027bb84d71 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -1,4 +1,5 @@ 'integer', ]; - protected $rules = array( + protected $rules = [ 'name' => 'required|string|min:3|max:255', 'seats' => 'required|min:1|max:999|integer', 'license_email' => 'email|nullable|max:120', @@ -51,13 +50,13 @@ class License extends Depreciable 'notes' => 'string|nullable', 'category_id' => 'required|exists:categories,id', 'company_id' => 'integer|nullable', - ); + ]; - /** - * The attributes that are mass assignable. - * - * @var array - */ + /** + * The attributes that are mass assignable. + * + * @var array + */ protected $fillable = [ 'company_id', 'depreciation_id', @@ -82,26 +81,26 @@ class License extends Depreciable ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = [ - 'name', - 'serial', - 'notes', - 'order_number', - 'purchase_order', - 'purchase_cost', + 'name', + 'serial', + 'notes', + 'order_number', + 'purchase_order', + 'purchase_cost', 'purchase_date', 'expiration_date', ]; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -123,12 +122,14 @@ class License extends Depreciable // We need to listen for created for the initial setup so that we have a license ID. static::created(function ($license) { $newSeatCount = $license->getAttributes()['seats']; + return static::adjustSeatCount($license, $oldSeatCount = 0, $newSeatCount); }); // However, we listen for updating to be able to prevent the edit if we cannot delete enough seats. static::updating(function ($license) { $newSeatCount = $license->getAttributes()['seats']; $oldSeatCount = isset($license->getOriginal()['seats']) ? $license->getOriginal()['seats'] : 0; + return static::adjustSeatCount($license, $oldSeatCount, $newSeatCount); }); } @@ -143,7 +144,7 @@ class License extends Depreciable public static function adjustSeatCount($license, $oldSeats, $newSeats) { // If the seats haven't changed, continue on happily. - if ($oldSeats==$newSeats) { + if ($oldSeats == $newSeats) { return true; } // On Create, we just make one for each of the seats. @@ -153,24 +154,26 @@ class License extends Depreciable // Need to delete seats... lets see if if we have enough. $seatsAvailableForDelete = $license->licenseseats->reject(function ($seat) { - return (!! $seat->assigned_to) || (!! $seat->asset_id); + return ((bool) $seat->assigned_to) || ((bool) $seat->asset_id); }); if ($change > $seatsAvailableForDelete->count()) { Session::flash('error', trans('admin/licenses/message.assoc_users')); + return false; } - for ($i=1; $i <= $change; $i++) { + for ($i = 1; $i <= $change; $i++) { $seatsAvailableForDelete->pop()->delete(); } // Log Deletion of seats. $logAction = new Actionlog; - $logAction->item_type = License::class; + $logAction->item_type = self::class; $logAction->item_id = $license->id; $logAction->user_id = Auth::id() ?: 1; // We don't have an id while running the importer from CLI. $logAction->note = "deleted ${change} seats"; - $logAction->target_id = null; + $logAction->target_id = null; $logAction->logaction('delete seats'); + return true; } // Else we're adding seats. @@ -183,13 +186,14 @@ class License extends Depreciable if ($license->id) { //Log the addition of license to the log. $logAction = new Actionlog(); - $logAction->item_type = License::class; + $logAction->item_type = self::class; $logAction->item_id = $license->id; $logAction->user_id = Auth::id() ?: 1; // Importer. $logAction->note = "added ${change} seats"; - $logAction->target_id = null; + $logAction->target_id = null; $logAction->logaction('add seats'); } + return true; } @@ -226,7 +230,6 @@ class License extends Depreciable */ public function setExpirationDateAttribute($value) { - if ($value == '' || $value == '0000-00-00') { $value = null; } else { @@ -293,7 +296,7 @@ class License extends Depreciable * * @author A. Gianotto * @since [v2.0] - * @return boolean + * @return bool */ public function checkin_email() { @@ -305,7 +308,7 @@ class License extends Depreciable * * @author A. Gianotto * @since [v4.0] - * @return boolean + * @return bool */ public function requireAcceptance() { @@ -355,7 +358,7 @@ class License extends Depreciable public function assetlog() { return $this->hasMany('\App\Models\Actionlog', 'item_id') - ->where('item_type', '=', License::class) + ->where('item_type', '=', self::class) ->orderBy('created_at', 'desc'); } @@ -369,13 +372,12 @@ class License extends Depreciable public function uploads() { return $this->hasMany('\App\Models\Actionlog', 'item_id') - ->where('item_type', '=', License::class) + ->where('item_type', '=', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') ->orderBy('created_at', 'desc'); } - /** * Establishes the license -> admin user relationship * @@ -403,7 +405,6 @@ class License extends Depreciable ->count(); } - /** * Return the number of seats for this asset * @@ -538,8 +539,9 @@ class License extends Depreciable public function remaincount() { $total = $this->licenseSeatsCount; - $taken = $this->assigned_seats_count; - $diff = ($total - $taken); + $taken = $this->assigned_seats_count; + $diff = ($total - $taken); + return $diff; } @@ -552,9 +554,10 @@ class License extends Depreciable */ public function totalcount() { - $avail = $this->availSeatsCount; - $taken = $this->assignedcount(); - $diff = ($avail + $taken); + $avail = $this->availSeatsCount; + $taken = $this->assignedcount(); + $diff = ($avail + $taken); + return $diff; } @@ -582,7 +585,6 @@ class License extends Depreciable return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); } - /** * Gets the next available free seat - used by * the API to populate next_seat @@ -603,7 +605,6 @@ class License extends Depreciable ->first(); } - /** * Establishes the license -> free seats relationship * @@ -627,14 +628,12 @@ class License extends Depreciable */ public static function getExpiringLicenses($days = 60) { - - return License::whereNotNull('expiration_date') + return self::whereNotNull('expiration_date') ->whereNull('deleted_at') ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) ')) - ->where('expiration_date', '>', date("Y-m-d")) + ->where('expiration_date', '>', date('Y-m-d')) ->orderBy('expiration_date', 'ASC') ->get(); - } /** diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 40a53adf86..e3a64332be 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -1,4 +1,5 @@ * @since [v4.0] - * @return boolean + * @return bool */ public function requireAcceptance() { return $this->license->category->require_acceptance; } - public function getEula() { + public function getEula() + { return $this->license->getEula(); } - + /** * Establishes the seat -> license relationship * @@ -101,13 +103,11 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild { if (($this->user) && ($this->user->location)) { return $this->user->location; - } elseif (($this->asset) && ($this->asset->location)) { return $this->asset->location; } return false; - } /** @@ -120,12 +120,8 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild */ public function scopeOrderDepartments($query, $order) { - return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id') - ->leftJoin('departments as license_user_dept', 'license_user_dept.id', '=', 'license_seat_users.department_id') + return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id') + ->leftJoin('departments as license_user_dept', 'license_user_dept.id', '=', 'license_seat_users.department_id') ->orderBy('license_user_dept.name', $order); } - - - - } diff --git a/app/Models/Location.php b/app/Models/Location.php index 1f48f96e77..9113f97d2f 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -1,4 +1,5 @@ 'required|min:2|max:255|unique_undeleted', 'city' => 'min:2|max:255|nullable', 'country' => 'min:2|max:255|nullable', @@ -28,8 +29,8 @@ class Location extends SnipeModel 'address2' => 'max:80|nullable', 'zip' => 'min:3|max:10|nullable', 'manager_id' => 'exists:users,id|nullable', - 'parent_id' => 'non_circular:locations,id' - ); + 'parent_id' => 'non_circular:locations,id', + ]; protected $casts = [ 'parent_id' => 'integer', @@ -37,17 +38,16 @@ class Location extends SnipeModel ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; use UniqueUndeletedTrait; - /** * The attributes that are mass assignable. * @@ -70,29 +70,29 @@ class Location extends SnipeModel protected $hidden = ['user_id']; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name', 'address', 'city', 'state', 'zip', 'created_at', 'ldap_ou']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ - 'parent' => ['name'] + 'parent' => ['name'], ]; public function isDeletable() { return Gate::allows('delete', $this) - && ($this->assignedAssets()->count()===0) - && ($this->assets()->count()===0) - && ($this->users()->count()===0); + && ($this->assignedAssets()->count() === 0) + && ($this->assets()->count() === 0) + && ($this->users()->count() === 0); } public function users() @@ -104,7 +104,7 @@ class Location extends SnipeModel { return $this->hasMany('\App\Models\Asset', 'location_id') ->whereHas('assetstatus', function ($query) { - $query->where('status_labels.deployable', '=', 1) + $query->where('status_labels.deployable', '=', 1) ->orWhere('status_labels.pending', '=', 1) ->orWhere('status_labels.archived', '=', 0); }); @@ -117,7 +117,7 @@ class Location extends SnipeModel definitely was setting fire to the query-planner. So don't do that. It is arguable that we should have a '...->whereNull('assigned_to') - bit in there, but that isn't always correct either (in the case + bit in there, but that isn't always correct either (in the case where a user has no location, for example). In all likelyhood, we need to denorm an "effective_location" column @@ -128,7 +128,7 @@ class Location extends SnipeModel public function parent() { - return $this->belongsTo('\App\Models\Location', 'parent_id','id') + return $this->belongsTo('\App\Models\Location', 'parent_id', 'id') ->with('parent'); } @@ -137,8 +137,9 @@ class Location extends SnipeModel return $this->belongsTo('\App\Models\User', 'manager_id'); } - public function children() { - return $this->hasMany('\App\Models\Location','parent_id') + public function children() + { + return $this->hasMany('\App\Models\Location', 'parent_id') ->with('children'); } @@ -153,6 +154,34 @@ class Location extends SnipeModel return $this->attributes['ldap_ou'] = empty($ldap_ou) ? null : $ldap_ou; } + /** + * Query builder scope to order on parent + * + * @param Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return Illuminate\Database\Query\Builder Modified query builder + */ + public static function indenter($locations_with_children, $parent_id = null, $prefix = '') + { + $results = []; + + if (! array_key_exists($parent_id, $locations_with_children)) { + return []; + } + + foreach ($locations_with_children[$parent_id] as $location) { + $location->use_text = $prefix.' '.$location->name; + $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null; + $results[] = $location; + //now append the children. (if we have any) + if (array_key_exists($location->id, $locations_with_children)) { + $results = array_merge($results, self::indenter($locations_with_children, $location->id, $prefix.'--')); + } + } + + return $results; + } /** * Query builder scope to order on parent @@ -162,42 +191,9 @@ class Location extends SnipeModel * * @return Illuminate\Database\Query\Builder Modified query builder */ - - public static function indenter($locations_with_children, $parent_id = null, $prefix = '') { - $results = Array(); - - - if (!array_key_exists($parent_id, $locations_with_children)) { - return []; - } - - - foreach ($locations_with_children[$parent_id] as $location) { - $location->use_text = $prefix.' '.$location->name; - $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null; - $results[] = $location; - //now append the children. (if we have any) - if (array_key_exists($location->id, $locations_with_children)) { - $results = array_merge($results, Location::indenter($locations_with_children, $location->id,$prefix.'--')); - } - } - return $results; - } - - - - - /** - * Query builder scope to order on parent - * - * @param Illuminate\Database\Query\Builder $query Query builder instance - * @param text $order Order - * - * @return Illuminate\Database\Query\Builder Modified query builder - */ public function scopeOrderParent($query, $order) { - // Left join here, or it will only return results with parents + // Left join here, or it will only return results with parents return $query->leftJoin('locations as parent_loc', 'locations.parent_id', '=', 'parent_loc.id')->orderBy('parent_loc.name', $order); } diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php index 501b5057ca..3c44009aab 100644 --- a/app/Models/Loggable.php +++ b/app/Models/Loggable.php @@ -2,19 +2,17 @@ namespace App\Models; +use App\Models\Setting; use App\Notifications\AuditNotification; use Illuminate\Support\Facades\Auth; -use App\Models\Setting; trait Loggable { - /** * @author Daniel Meltzer * @since [v3.4] * @return \App\Models\Actionlog */ - public function log() { return $this->morphMany(Actionlog::class, 'item'); @@ -33,20 +31,21 @@ trait Loggable $log->user_id = Auth::user()->id; } - if (!isset($target)) { + if (! isset($target)) { throw new \Exception('All checkout logs require a target.'); + return; } - if (!isset($target->id)) { + if (! isset($target->id)) { throw new \Exception('That target seems invalid (no target ID available).'); + return; } $log->target_type = get_class($target); $log->target_id = $target->id; - // Figure out what the target is if ($log->target_type == Location::class) { $log->location_id = $target->id; @@ -59,7 +58,7 @@ trait Loggable $log->note = $note; $log->action_date = $action_date; - if (!$log->action_date) { + if (! $log->action_date) { $log->action_date = date('Y-m-d H:i:s'); } @@ -69,8 +68,8 @@ trait Loggable } /** - * Helper method to determine the log item type - */ + * Helper method to determine the log item type + */ private function determineLogItemType($log) { // We need to special case licenses because of license_seat vs license. So much for clean polymorphism : @@ -84,6 +83,7 @@ trait Loggable return $log; } + /** * @author Daniel Meltzer * @since [v3.4] @@ -100,7 +100,6 @@ trait Loggable $log->item_type = License::class; $log->item_id = $this->license_id; } else { - $log->item_type = static::class; $log->item_id = $this->id; @@ -109,17 +108,15 @@ trait Loggable $asset->increment('checkin_counter', 1); } } - } - $log->location_id = null; $log->note = $note; if (Auth::user()) { $log->user_id = Auth::user()->id; } - + $log->logaction('checkin from'); // $params = [ @@ -158,7 +155,6 @@ trait Loggable return $log; } - /** * @author A. Gianotto * @since [v4.0] @@ -186,15 +182,13 @@ trait Loggable 'filename' => $log->filename, 'admin' => $log->user, 'location' => ($location) ? $location->name : '', - 'note' => $note + 'note' => $note, ]; Setting::getSettings()->notify(new AuditNotification($params)); return $log; } - - /** * @author Daniel Meltzer * @since [v3.5] @@ -219,6 +213,7 @@ trait Loggable $log->user_id = $user_id; $log->logaction('create'); $log->save(); + return $log; } @@ -239,9 +234,9 @@ trait Loggable } $log->user_id = Auth::user()->id; $log->note = $note; - $log->target_id = null; - $log->created_at = date("Y-m-d H:i:s"); - $log->filename = $filename; + $log->target_id = null; + $log->created_at = date('Y-m-d H:i:s'); + $log->filename = $filename; $log->logaction('uploaded'); return $log; diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php index 085bed2d3f..c5bd3e18d9 100755 --- a/app/Models/Manufacturer.php +++ b/app/Models/Manufacturer.php @@ -1,4 +1,5 @@ 'required|min:2|max:255|unique:manufacturers,name,NULL,id,deleted_at,NULL', 'url' => 'url|nullable', 'support_url' => 'url|nullable', - 'support_email' => 'email|nullable' - ); + 'support_email' => 'email|nullable', + ]; protected $hidden = ['user_id']; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; @@ -65,14 +66,13 @@ class Manufacturer extends SnipeModel */ protected $searchableRelations = []; - public function isDeletable() { - return (Gate::allows('delete', $this) - && ($this->assets()->count() === 0) + return Gate::allows('delete', $this) + && ($this->assets()->count() === 0) && ($this->licenses()->count() === 0) && ($this->consumables()->count() === 0) - && ($this->accessories()->count() === 0)); + && ($this->accessories()->count() === 0); } public function assets() diff --git a/app/Models/PredefinedKit.php b/app/Models/PredefinedKit.php index 317cf3cd6a..9bc8f86c1f 100644 --- a/app/Models/PredefinedKit.php +++ b/app/Models/PredefinedKit.php @@ -1,4 +1,5 @@ ] * @version v1.0 */ @@ -21,16 +22,16 @@ class PredefinedKit extends SnipeModel /** * Category validation rules */ - public $rules = array( - 'name' => 'required|min:1|max:255|unique' - ); + public $rules = [ + 'name' => 'required|min:1|max:255|unique', + ]; use ValidatingTrait; public $modelRules = [ 'model_id' => 'required|exists:models,id', 'quantity' => 'required|integer|min:1', - 'pivot_id' => 'integer|exists:kits_models,id' + 'pivot_id' => 'integer|exists:kits_models,id', ]; /** @@ -39,7 +40,7 @@ class PredefinedKit extends SnipeModel * @param int $model_id * @param bool $new = true if append a new element to kit */ - public function makeModelRules($model_id, $new=false) + public function makeModelRules($model_id, $new = false) { return $this->_makeRuleHelper('models', 'kits_models', 'model_id', $model_id, $new); } @@ -50,7 +51,7 @@ class PredefinedKit extends SnipeModel * @param int $license_id * @param bool $new = true if append a new element to kit */ - public function makeLicenseRules($license_id, $new=false) + public function makeLicenseRules($license_id, $new = false) { return $this->_makeRuleHelper('licenses', 'kits_licenses', 'license_id', $license_id, $new); } @@ -61,7 +62,7 @@ class PredefinedKit extends SnipeModel * @param int $accessoriy_id * @param bool $new = true if append a new element to kit */ - public function makeAccessoryRules($accessory_id, $new=false) + public function makeAccessoryRules($accessory_id, $new = false) { return $this->_makeRuleHelper('accessories', 'kits_accessories', 'accessory_id', $accessory_id, $new); } @@ -72,7 +73,7 @@ class PredefinedKit extends SnipeModel * @param int $consumable_id * @param bool $new = true if append a new element to kit */ - public function makeConsumableRules($consumable_id, $new=false) + public function makeConsumableRules($consumable_id, $new = false) { return $this->_makeRuleHelper('consumables', 'kits_consumables', 'consumable_id', $consumable_id, $new); } @@ -96,14 +97,14 @@ class PredefinedKit extends SnipeModel $pivot_elem_key => [ 'required', "exists:$table,id", - Rule::unique($pivot_table)->whereNot($pivot_elem_key, $element_id)->where('kit_id', $this->id) + Rule::unique($pivot_table)->whereNot($pivot_elem_key, $element_id)->where('kit_id', $this->id), ], - 'quantity' => 'required|integer|min:1' + 'quantity' => 'required|integer|min:1', ]; - if (!$new) { + if (! $new) { $rule['pivot_id'] = "integer|exists:$pivot_table,id"; - } + return $rule; } @@ -113,26 +114,25 @@ class PredefinedKit extends SnipeModel * @var array */ protected $fillable = [ - 'name' + 'name', ]; use Searchable; /** * The attributes that should be included when searching the kit. - * + * * @var array */ protected $searchableAttributes = ['name']; /** * The relations and their attributes that should be included when searching the kit. - * + * * @var array */ protected $searchableRelations = []; - /** * Establishes the kits -> models relationship * @return \Illuminate\Database\Eloquent\Relations\Relation @@ -179,5 +179,4 @@ class PredefinedKit extends SnipeModel * BEGIN QUERY SCOPES * ----------------------------------------------- **/ - } diff --git a/app/Models/Recipients/AdminRecipient.php b/app/Models/Recipients/AdminRecipient.php index a5311bbcda..0a15557caf 100644 --- a/app/Models/Recipients/AdminRecipient.php +++ b/app/Models/Recipients/AdminRecipient.php @@ -1,14 +1,14 @@ email = $settings->admin_cc_email; } - } diff --git a/app/Models/Requestable.php b/app/Models/Requestable.php index 5fc3f5450f..3983254e41 100644 --- a/app/Models/Requestable.php +++ b/app/Models/Requestable.php @@ -9,7 +9,6 @@ use Illuminate\Support\Facades\Auth; // $asset->whereRequestedBy($user) trait Requestable { - public function requests() { return $this->morphMany(CheckoutRequest::class, 'requestable'); @@ -17,7 +16,7 @@ trait Requestable public function isRequestedBy(User $user) { - return $this->requests->where('canceled_at', NULL)->where('user_id', $user->id)->first(); + return $this->requests->where('canceled_at', null)->where('user_id', $user->id)->first(); } public function scopeRequestedBy($query, User $user) diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 150e290c7c..9179a73c00 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -96,7 +96,7 @@ class Setting extends Model * * @return \App\Models\Setting|null */ - public static function getSettings(): ?Setting + public static function getSettings(): ?self { return Cache::rememberForever(self::APP_SETTINGS_KEY, function () { // Need for setup as no tables exist @@ -106,7 +106,7 @@ class Setting extends Model return null; } }); - } + } /** * Check to see if setup process is complete. @@ -116,17 +116,16 @@ class Setting extends Model */ public static function setupCompleted(): bool { - try { - $usercount = User::withTrashed()->count(); - $settingsCount = self::count(); - return $usercount > 0 && $settingsCount > 0; - } catch (\Throwable $th) { - \Log::debug('User table and settings table DO NOT exist or DO NOT have records'); - // Catch the error if the tables dont exit - return false; - } - + try { + $usercount = User::withTrashed()->count(); + $settingsCount = self::count(); + return $usercount > 0 && $settingsCount > 0; + } catch (\Throwable $th) { + \Log::debug('User table and settings table DO NOT exist or DO NOT have records'); + // Catch the error if the tables dont exit + return false; + } } /** @@ -187,9 +186,9 @@ class Setting extends Model * Escapes the custom CSS, and then un-escapes the greater-than symbol * so it can work with direct descendant characters for bootstrap * menu overrides like:. - * + * * .skin-blue .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a - * + * * Important: Do not remove the e() escaping here, as we output raw in the blade. * * @return string escaped CSS @@ -210,14 +209,14 @@ class Setting extends Model } /** - * Converts bytes into human readable file size. - * - * @param string $bytes + * Converts bytes into human readable file size. * - * @return string human readable file size (2,87 Мб) + * @param string $bytes * - * @author Mogilev Arseny - */ + * @return string human readable file size (2,87 Мб) + * + * @author Mogilev Arseny + */ public static function fileSizeConvert($bytes): string { $bytes = floatval($bytes); @@ -244,15 +243,15 @@ class Setting extends Model ], ]; - foreach ($arBytes as $arItem) { + foreach ($arBytes as $arItem) { if ($bytes >= $arItem['VALUE']) { $result = $bytes / $arItem['VALUE']; $result = round($result, 2).$arItem['UNIT']; - break; - } + break; } + } - return $result; + return $result; } /** @@ -307,8 +306,6 @@ class Setting extends Model return 'required|min:'.$settings->pwd_secure_min.$security_rules; } - - /** * Get the specific LDAP settings * diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php index 2911be1c38..d220d27d93 100644 --- a/app/Models/SnipeModel.php +++ b/app/Models/SnipeModel.php @@ -14,7 +14,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['purchase_date'] = $value; - return; + } /** @@ -22,13 +22,13 @@ class SnipeModel extends Model */ public function setPurchaseCostAttribute($value) { - $value = Helper::ParseFloat($value); + $value = Helper::ParseFloat($value); if ($value == '0.0') { $value = null; } $this->attributes['purchase_cost'] = $value; - return; + } public function setLocationIdAttribute($value) @@ -37,7 +37,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['location_id'] = $value; - return; + } public function setCategoryIdAttribute($value) @@ -47,7 +47,7 @@ class SnipeModel extends Model } $this->attributes['category_id'] = $value; // dd($this->attributes); - return; + } public function setSupplierIdAttribute($value) @@ -56,7 +56,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['supplier_id'] = $value; - return; + } public function setDepreciationIdAttribute($value) @@ -65,7 +65,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['depreciation_id'] = $value; - return; + } public function setManufacturerIdAttribute($value) @@ -74,7 +74,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['manufacturer_id'] = $value; - return; + } public function setMinAmtAttribute($value) @@ -83,7 +83,7 @@ class SnipeModel extends Model $value = null; } $this->attributes['min_amt'] = $value; - return; + } public function setParentIdAttribute($value) @@ -92,79 +92,79 @@ class SnipeModel extends Model $value = null; } $this->attributes['parent_id'] = $value; - return; + } public function setFieldSetIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['fieldset_id'] = $value; - return; + } public function setCompanyIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['company_id'] = $value; - return; + } public function setWarrantyMonthsAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['warranty_months'] = $value; - return; + } public function setRtdLocationIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['rtd_location_id'] = $value; - return; + } public function setDepartmentIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['department_id'] = $value; - return; + } public function setManagerIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['manager_id'] = $value; - return; + } public function setModelIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['model_id'] = $value; - return; + } public function setStatusIdAttribute($value) { - if($value == '') { + if ($value == '') { $value = null; } $this->attributes['status_id'] = $value; - return; + } // diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index cd4672b841..681dd08307 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -1,4 +1,5 @@ 'required|string|unique_undeleted', 'notes' => 'string|nullable', 'deployable' => 'required', 'pending' => 'required', 'archived' => 'required', - ); + ]; protected $fillable = [ 'archived', @@ -35,22 +35,21 @@ class Statuslabel extends SnipeModel ]; use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = []; - /** * Establishes the status label -> assets relationship * @@ -72,17 +71,15 @@ class Statuslabel extends SnipeModel */ public function getStatuslabelType() { - - if (($this->pending == '1') && ($this->archived == '0') && ($this->deployable == '0')) { + if (($this->pending == '1') && ($this->archived == '0') && ($this->deployable == '0')) { return 'pending'; - } elseif (($this->pending == '0') && ($this->archived == '1') && ($this->deployable == '0')) { + } elseif (($this->pending == '0') && ($this->archived == '1') && ($this->deployable == '0')) { return 'archived'; - } elseif (($this->pending == '0') && ($this->archived == '0') && ($this->deployable == '0')) { + } elseif (($this->pending == '0') && ($this->archived == '0') && ($this->deployable == '0')) { return 'undeployable'; } return 'deployable'; - } /** @@ -130,7 +127,6 @@ class Statuslabel extends SnipeModel */ public static function getStatuslabelTypesForDB($type) { - $statustype['pending'] = 0; $statustype['deployable'] = 0; $statustype['archived'] = 0; @@ -139,12 +135,10 @@ class Statuslabel extends SnipeModel $statustype['pending'] = 1; $statustype['deployable'] = 0; $statustype['archived'] = 0; - } elseif ($type == 'deployable') { $statustype['pending'] = 0; $statustype['deployable'] = 1; $statustype['archived'] = 0; - } elseif ($type == 'archived') { $statustype['pending'] = 0; $statustype['deployable'] = 0; diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 230a713cda..285147b079 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -1,4 +1,5 @@ 'required|min:1|max:255|unique_undeleted', 'address' => 'max:50|nullable', 'address2' => 'max:50|nullable', @@ -26,43 +27,40 @@ class Supplier extends SnipeModel 'email' => 'email|max:150|nullable', 'zip' => 'max:10|nullable', 'url' => 'sometimes|nullable|string|max:250', - ); + ]; /** - * Whether the model should inject it's identifier to the unique - * validation rules before attempting validation. If this property - * is not set in the model it will default to true. - * - * @var boolean - */ + * Whether the model should inject it's identifier to the unique + * validation rules before attempting validation. If this property + * is not set in the model it will default to true. + * + * @var bool + */ protected $injectUniqueIdentifier = true; use ValidatingTrait; use UniqueUndeletedTrait; - use Searchable; - + /** * The attributes that should be included when searching the model. - * + * * @var array */ protected $searchableAttributes = ['name']; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = []; - /** * The attributes that are mass assignable. * * @var array */ - protected $fillable = ['name','address','address2','city','state','country','zip','phone','fax','email','contact','url','notes']; - + protected $fillable = ['name', 'address', 'address2', 'city', 'state', 'country', 'zip', 'phone', 'fax', 'email', 'contact', 'url', 'notes']; /** * Eager load counts @@ -184,9 +182,10 @@ class Supplier extends SnipeModel */ public function addhttp($url) { - if (!preg_match("~^(?:f|ht)tps?://~i", $url)) { - $url = "http://" . $url; + if (! preg_match('~^(?:f|ht)tps?://~i', $url)) { + $url = 'http://'.$url; } + return $url; } } diff --git a/app/Models/Traits/Acceptable.php b/app/Models/Traits/Acceptable.php index 4da3575182..b0ddd665a6 100644 --- a/app/Models/Traits/Acceptable.php +++ b/app/Models/Traits/Acceptable.php @@ -9,20 +9,25 @@ use App\Models\User; * * @author Till Deeke */ -trait Acceptable { +trait Acceptable +{ /** * Run after the checkout acceptance was accepted by the user - * + * * @param User $acceptedBy * @param string $signature */ - public function acceptedCheckout(User $acceptedBy, $signature) {} + public function acceptedCheckout(User $acceptedBy, $signature) + { + } /** * Run after the checkout acceptance was declined by the user - * + * * @param User $acceptedBy * @param string $signature - */ - public function declinedCheckout(User $declinedBy, $signature) {} + */ + public function declinedCheckout(User $declinedBy, $signature) + { + } } diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php index e43081e557..3661c66226 100644 --- a/app/Models/Traits/Searchable.php +++ b/app/Models/Traits/Searchable.php @@ -7,16 +7,16 @@ use App\Models\CustomField; use Illuminate\Database\Eloquent\Builder; /** - * This trait allows for cleaner searching of models, + * This trait allows for cleaner searching of models, * moving from complex queries to an easier declarative syntax. * * @author Till Deeke */ -trait Searchable { - +trait Searchable +{ /** * Performs a search on the model, using the provided search terms - * + * * @param \Illuminate\Database\Eloquent\Builder $query The query to start the search on * @param string $search * @return \Illuminate\Database\Eloquent\Builder A query with added "where" clauses @@ -27,13 +27,13 @@ trait Searchable { /** * Search the attributes of this model - */ + */ $query = $this->searchAttributes($query, $terms); /** * Search through the custom fields of the model */ - $query = $this->searchCustomFields($query, $terms); + $query = $this->searchCustomFields($query, $terms); /** * Search through the relations of the model @@ -53,32 +53,32 @@ trait Searchable { * @param string $search The search term * @return array An array of search terms */ - private function prepeareSearchTerms($search) { - return explode(' OR ', $search); - } + private function prepeareSearchTerms($search) + { + return explode(' OR ', $search); + } /** * Searches the models attributes for the search terms - * + * * @param Illuminate\Database\Eloquent\Builder $query * @param array $terms * @return Illuminate\Database\Eloquent\Builder */ - private function searchAttributes(Builder $query, array $terms) { - + private function searchAttributes(Builder $query, array $terms) + { $table = $this->getTable(); $firstConditionAdded = false; - foreach($this->getSearchableAttributes() as $column) { - - foreach($terms as $term) { + foreach ($this->getSearchableAttributes() as $column) { + foreach ($terms as $term) { /** * Making sure to only search in date columns if the search term consists of characters that can make up a MySQL timestamp! * * @see https://github.com/snipe/snipe-it/issues/4590 */ - if (!preg_match('/^[0-9 :-]++$/', $term) && in_array($column, $this->getDates())) { + if (! preg_match('/^[0-9 :-]++$/', $term) && in_array($column, $this->getDates())) { continue; } @@ -88,29 +88,30 @@ trait Searchable { * * @todo This does the job, but is inelegant and fragile */ - if (!$firstConditionAdded) { - $query = $query->where($table . '.' . $column, 'LIKE', '%'.$term.'%'); + if (! $firstConditionAdded) { + $query = $query->where($table.'.'.$column, 'LIKE', '%'.$term.'%'); $firstConditionAdded = true; continue; } - - $query = $query->orWhere($table . '.' . $column, 'LIKE', '%'.$term.'%'); + + $query = $query->orWhere($table.'.'.$column, 'LIKE', '%'.$term.'%'); } } - return $query; + return $query; } /** * Searches the models custom fields for the search terms - * - * @param Illuminate\Database\Eloquent\Builder $query + * + * @param Illuminate\Database\Eloquent\Builder $query * @param array $terms * @return Illuminate\Database\Eloquent\Builder */ - private function searchCustomFields(Builder $query, array $terms) { - + private function searchCustomFields(Builder $query, array $terms) + { + /** * If we are searching on something other that an asset, skip custom fields. */ @@ -121,29 +122,27 @@ trait Searchable { $customFields = CustomField::all(); foreach ($customFields as $field) { - foreach($terms as $term) { - $query->orWhere($this->getTable() . '.'. $field->db_column_name(), 'LIKE', '%'.$term.'%'); + foreach ($terms as $term) { + $query->orWhere($this->getTable().'.'.$field->db_column_name(), 'LIKE', '%'.$term.'%'); } } - return $query; - } + return $query; + } /** * Searches the models relations for the search terms - * + * * @param Illuminate\Database\Eloquent\Builder $query * @param array $terms * @return Illuminate\Database\Eloquent\Builder */ - private function searchRelations(Builder $query, array $terms) { - - foreach($this->getSearchableRelations() as $relation => $columns) { - - $query = $query->orWhereHas($relation, function($query) use ($relation, $columns, $terms) { - + private function searchRelations(Builder $query, array $terms) + { + foreach ($this->getSearchableRelations() as $relation => $columns) { + $query = $query->orWhereHas($relation, function ($query) use ($relation, $columns, $terms) { $table = $this->getRelationTable($relation); - + /** * We need to form the query properly, starting with a "where", * otherwise the generated nested select is wrong. @@ -152,72 +151,75 @@ trait Searchable { */ $firstConditionAdded = false; - foreach($columns as $column) { - foreach($terms as $term) { - if (!$firstConditionAdded) { - $query->where($table . '.' . $column, 'LIKE', '%'.$term.'%'); + foreach ($columns as $column) { + foreach ($terms as $term) { + if (! $firstConditionAdded) { + $query->where($table.'.'.$column, 'LIKE', '%'.$term.'%'); $firstConditionAdded = true; continue; } - $query->orWhere($table . '.' . $column, 'LIKE', '%'.$term.'%'); + $query->orWhere($table.'.'.$column, 'LIKE', '%'.$term.'%'); } } }); + } - } - - return $query; + return $query; } /** * Run additional, advanced searches that can't be done using the attributes or relations. * * This is a noop in this trait, but can be overridden in the implementing model, to allow more advanced searches - * + * * @param Illuminate\Database\Eloquent\Builder $query * @param array $terms The search terms * @return Illuminate\Database\Eloquent\Builder * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function advancedTextSearch(Builder $query, array $terms) { + public function advancedTextSearch(Builder $query, array $terms) + { return $query; - } + } /** * Get the searchable attributes, if defined. Otherwise it returns an empty array - * + * * @return array The attributes to search in */ - private function getSearchableAttributes() { + private function getSearchableAttributes() + { return isset($this->searchableAttributes) ? $this->searchableAttributes : []; } /** * Get the searchable relations, if defined. Otherwise it returns an empty array - * + * * @return array The relations to search in - */ - private function getSearchableRelations() { + */ + private function getSearchableRelations() + { return isset($this->searchableRelations) ? $this->searchableRelations : []; } /** * Get the table name of a relation. * - * This method loops over a relation name, + * This method loops over a relation name, * getting the table name of the last relation in the series. - * So "category" would get the table name for the Category model, + * So "category" would get the table name for the Category model, * "model.manufacturer" would get the tablename for the Manufacturer model. - * + * * @param string $relation * @return string The table name */ - private function getRelationTable($relation) { + private function getRelationTable($relation) + { $related = $this; - foreach(explode('.', $relation) as $relationName) { + foreach (explode('.', $relation) as $relationName) { $related = $related->{$relationName}()->getRelated(); } @@ -249,6 +251,6 @@ trait Searchable { return implode('_', $parts->toArray()); } - return $related->getTable(); + return $related->getTable(); } } diff --git a/app/Models/User.php b/app/Models/User.php index 8f86811c81..4a0fbfc934 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -1,4 +1,5 @@ 'exists:locations,id|nullable', ]; - /** * The attributes that should be included when searching the model. * @@ -96,12 +96,12 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'notes', 'phone', 'jobtitle', - 'employee_num' + 'employee_num', ]; /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -109,21 +109,19 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'department' => ['name'], 'groups' => ['name'], 'company' => ['name'], - 'manager' => ['first_name', 'last_name', 'username'] + 'manager' => ['first_name', 'last_name', 'username'], ]; - /** * Internally check the user permission for the given section * - * @return boolean + * @return bool */ protected function checkPermissionSection($section) { $user_groups = $this->groups; - - if (($this->permissions=='') && (count($user_groups) == 0)) { + if (($this->permissions == '') && (count($user_groups) == 0)) { return false; } @@ -131,18 +129,18 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo $is_user_section_permissions_set = ($user_permissions != '') && array_key_exists($section, $user_permissions); //If the user is explicitly granted, return true - if ($is_user_section_permissions_set && ($user_permissions[$section]=='1')) { + if ($is_user_section_permissions_set && ($user_permissions[$section] == '1')) { return true; } // If the user is explicitly denied, return false - if ($is_user_section_permissions_set && ($user_permissions[$section]=='-1')) { + if ($is_user_section_permissions_set && ($user_permissions[$section] == '-1')) { return false; } // Loop through the groups to see if any of them grant this permission foreach ($user_groups as $user_group) { $group_permissions = (array) json_decode($user_group->permissions, true); - if (((array_key_exists($section, $group_permissions)) && ($group_permissions[$section]=='1'))) { + if (((array_key_exists($section, $group_permissions)) && ($group_permissions[$section] == '1'))) { return true; } } @@ -158,13 +156,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * * @author A. Gianotto * @since [v1.0] - * @return boolean + * @return bool */ public function hasAccess($section) { if ($this->isSuperUser()) { return true; } + return $this->checkPermissionSection($section); } @@ -173,14 +172,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * * @author A. Gianotto * @since [v1.0] - * @return boolean + * @return bool */ public function isSuperUser() { return $this->checkPermissionSection('superuser'); } - /** * Establishes the user -> company relationship * @@ -210,11 +208,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * * @author A. Gianotto * @since [v1.0] - * @return boolean + * @return bool */ public function isActivated() { - return $this->activated ==1; + return $this->activated == 1; } /** @@ -226,7 +224,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function getFullNameAttribute() { - return $this->first_name . " " . $this->last_name; + return $this->first_name.' '.$this->last_name; } /** @@ -240,7 +238,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function getCompleteNameAttribute() { - return $this->last_name . ", " . $this->first_name . " (" . $this->username . ")"; + return $this->last_name.', '.$this->first_name.' ('.$this->username.')'; } /** @@ -253,10 +251,10 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint; + return $this->endpoint; } - /** * Establishes the user -> assets relationship * @@ -333,7 +331,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $this->hasMany('\App\Models\Actionlog', 'target_id')->where('target_type', '=', 'App\Models\User')->orderBy('created_at', 'DESC')->withTrashed(); } - /** * Establishes the user -> location relationship * @@ -345,13 +342,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * @since [v4.0] * @return \Illuminate\Database\Eloquent\Relations\Relation */ - public function userloc() { return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); } - /** * Establishes the user -> location relationship * @@ -424,7 +419,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo public function uploads() { return $this->hasMany('\App\Models\Actionlog', 'item_id') - ->where('item_type', User::class) + ->where('item_type', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') ->orderBy('created_at', 'desc'); @@ -442,7 +437,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $this->belongsToMany(Asset::class, 'checkout_requests', 'user_id', 'requestable_id')->whereNull('canceled_at'); } - /** * Query builder scope to return NOT-deleted users * @author A. Gianotto @@ -476,7 +470,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo /** * Generate email from full name - * + * * @author A. Gianotto * @since [v2.0] * @@ -485,7 +479,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public static function generateEmailFromFullName($name) { - $username = User::generateFormattedNameFromFullName($name, Setting::getSettings()->email_format); + $username = self::generateFormattedNameFromFullName($name, Setting::getSettings()->email_format); + return $username['username'].'@'.Setting::getSettings()->email_domain; } @@ -496,50 +491,39 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo if (strpos($users_name, ' ') === false) { $first_name = $users_name; $last_name = ''; - $username = $users_name; - + $username = $users_name; } else { - - list($first_name, $last_name) = explode(" ", $users_name, 2); + list($first_name, $last_name) = explode(' ', $users_name, 2); // Assume filastname by default $username = str_slug(substr($first_name, 0, 1).$last_name); - if ($format=='firstname.lastname') { - $username = str_slug($first_name) . '.' . str_slug($last_name); - - } elseif ($format=='lastnamefirstinitial') { + if ($format == 'firstname.lastname') { + $username = str_slug($first_name).'.'.str_slug($last_name); + } elseif ($format == 'lastnamefirstinitial') { $username = str_slug($last_name.substr($first_name, 0, 1)); - - } elseif ($format=='firstintial.lastname') { + } elseif ($format == 'firstintial.lastname') { $username = substr($first_name, 0, 1).'.'.str_slug($last_name); - - } elseif ($format=='firstname_lastname') { + } elseif ($format == 'firstname_lastname') { $username = str_slug($first_name).'_'.str_slug($last_name); - - } elseif ($format=='firstname') { + } elseif ($format == 'firstname') { $username = str_slug($first_name); - } - elseif ($format=='firstinitial.lastname') { - $username = str_slug(substr($first_name, 0, 1). '.' . str_slug($last_name)); - } - elseif ($format=='lastname_firstinitial') { + } elseif ($format == 'firstinitial.lastname') { + $username = str_slug(substr($first_name, 0, 1).'.'.str_slug($last_name)); + } elseif ($format == 'lastname_firstinitial') { $username = str_slug($last_name).'_'.str_slug(substr($first_name, 0, 1)); - } - elseif ($format=='firstnamelastname') { - $username = str_slug($first_name) . str_slug($last_name); - } - elseif ($format=='firstnamelastinitial') { + } elseif ($format == 'firstnamelastname') { + $username = str_slug($first_name).str_slug($last_name); + } elseif ($format == 'firstnamelastinitial') { $username = str_slug(($first_name.substr($last_name, 0, 1))); - } + } } $user['first_name'] = $first_name; $user['last_name'] = $last_name; $user['username'] = strtolower($username); + return $user; - - } /** @@ -554,21 +538,19 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * * @return bool */ - public function two_factor_active () { + public function two_factor_active() + { // If the 2FA is optional and the user has opted in - if ((Setting::getSettings()->two_factor_enabled =='1') && ($this->two_factor_optin =='1')) - { + if ((Setting::getSettings()->two_factor_enabled == '1') && ($this->two_factor_optin == '1')) { return true; } // If the 2FA is required for everyone so is implicitly active - elseif (Setting::getSettings()->two_factor_enabled =='2') - { + elseif (Setting::getSettings()->two_factor_enabled == '2') { return true; } return false; - } /** @@ -584,23 +566,21 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * * @return bool */ - public function two_factor_active_and_enrolled () { + public function two_factor_active_and_enrolled() + { // If the 2FA is optional and the user has opted in and is enrolled - if ((Setting::getSettings()->two_factor_enabled =='1') && ($this->two_factor_optin =='1') && ($this->two_factor_enrolled =='1')) - { + if ((Setting::getSettings()->two_factor_enabled == '1') && ($this->two_factor_optin == '1') && ($this->two_factor_enrolled == '1')) { return true; } // If the 2FA is required for everyone and the user has enrolled - elseif ((Setting::getSettings()->two_factor_enabled =='2') && ($this->two_factor_enrolled)) - { + elseif ((Setting::getSettings()->two_factor_enabled == '2') && ($this->two_factor_enrolled)) { return true; } + return false; - } - public function decodePermissions() { return json_decode($this->permissions, true); @@ -615,16 +595,15 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * @param array $terms The search terms * @return \Illuminate\Database\Query\Builder */ - public function scopeSimpleNameSearch($query, $search) { - - $query = $query->where('first_name', 'LIKE', '%'.$search.'%') + public function scopeSimpleNameSearch($query, $search) + { + $query = $query->where('first_name', 'LIKE', '%'.$search.'%') ->orWhere('last_name', 'LIKE', '%'.$search.'%') ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$search%", "%$search%"]); + return $query; } - - /** * Run additional, advanced searches. * @@ -632,9 +611,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * @param array $terms The search terms * @return \Illuminate\Database\Eloquent\Builder */ - public function advancedTextSearch(Builder $query, array $terms) { - - foreach($terms as $term) { + public function advancedTextSearch(Builder $query, array $terms) + { + foreach ($terms as $term) { $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$term%", "%$term%"]); } @@ -648,13 +627,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo * @param int $id * @return \Illuminate\Database\Query\Builder */ - public function scopeByGroup($query, $id) { + public function scopeByGroup($query, $id) + { return $query->whereHas('groups', function ($query) use ($id) { $query->where('permission_groups.id', '=', $id); }); } - /** * Query builder scope to order on manager * @@ -682,7 +661,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $query->leftJoin('locations as locations_users', 'users.location_id', '=', 'locations_users.id')->orderBy('locations_users.name', $order); } - /** * Query builder scope to order on department * @@ -709,9 +687,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $query->leftJoin('companies as companies_user', 'users.company_id', '=', 'companies_user.id')->orderBy('companies_user.name', $order); } - public function preferredLocale(){ + public function preferredLocale() + { return $this->locale; } - - } diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php index 900650e975..84f1753767 100644 --- a/app/Notifications/AuditNotification.php +++ b/app/Notifications/AuditNotification.php @@ -43,15 +43,14 @@ class AuditNotification extends Notification public function toSlack() { - return (new SlackMessage) ->success() - ->content(class_basename(get_class($this->params['item'])) . " Audited") + ->content(class_basename(get_class($this->params['item'])).' Audited') ->attachment(function ($attachment) { $item = $this->params['item']; $admin_user = $this->params['admin']; $fields = [ - 'By' => '<'.$admin_user->present()->viewUrl().'|'.$admin_user->present()->fullName().'>' + 'By' => '<'.$admin_user->present()->viewUrl().'|'.$admin_user->present()->fullName().'>', ]; array_key_exists('note', $this->params) && $fields['Notes'] = $this->params['note']; array_key_exists('location', $this->params) && $fields['Location'] = $this->params['location']; diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index ba7c3b2011..f9abba59f9 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -21,10 +21,10 @@ class CheckinAccessoryNotification extends Notification */ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedInby, $note) { - $this->item = $accessory; - $this->target = $checkedOutTo; - $this->admin = $checkedInby; - $this->note = $note; + $this->item = $accessory; + $this->target = $checkedOutTo; + $this->admin = $checkedInby; + $this->note = $note; $this->settings = Setting::getSettings(); \Log::debug('Constructor for notification fired'); } @@ -43,16 +43,14 @@ class CheckinAccessoryNotification extends Notification $notifyBy[] = 'slack'; } - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } - /** * Only send notifications to users that have email addresses */ if ($this->target instanceof User && $this->target->email != '') { - \Log::debug('The target is a user'); /** @@ -63,16 +61,12 @@ class CheckinAccessoryNotification extends Notification $notifyBy[] = 'mail'; } - - - - /** * Send an email if the asset requires acceptance, * so the user can accept or decline the asset */ if ($this->item->requireAcceptance()) { - \Log::debug('This accessory requires acceptance'); + \Log::debug('This accessory requires acceptance'); } /** @@ -88,7 +82,6 @@ class CheckinAccessoryNotification extends Notification if ($this->item->checkin_email()) { \Log::debug('This accessory has a checkin_email()'); } - } \Log::debug('checkin_email on this category is '.$this->item->checkin_email()); @@ -98,12 +91,11 @@ class CheckinAccessoryNotification extends Notification public function toSlack() { - $target = $this->target; $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', @@ -119,6 +111,7 @@ class CheckinAccessoryNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -128,6 +121,7 @@ class CheckinAccessoryNotification extends Notification public function toMail() { \Log::debug('to email called'); + return (new MailMessage)->markdown('notifications.markdown.checkin-accessory', [ 'item' => $this->item, @@ -136,6 +130,5 @@ class CheckinAccessoryNotification extends Notification 'target' => $this->target, ]) ->subject(trans('mail.Accessory_Checkin_Notification')); - } } diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index e0f1e66f3a..df2665beaa 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -14,7 +14,6 @@ class CheckinAssetNotification extends Notification { use Queueable; - /** * Create a new notification instance. * @@ -23,9 +22,9 @@ class CheckinAssetNotification extends Notification public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $note) { $this->target = $checkedOutTo; - $this->item = $asset; - $this->admin = $checkedInBy; - $this->note = $note; + $this->item = $asset; + $this->admin = $checkedInBy; + $this->note = $note; $this->settings = Setting::getSettings(); $this->expected_checkin = ''; @@ -43,10 +42,9 @@ class CheckinAssetNotification extends Notification */ public function via() { - $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { \Log::debug('use slack'); $notifyBy[] = 'slack'; } @@ -55,8 +53,7 @@ class CheckinAssetNotification extends Notification * Only send checkin notifications to users if the category * has the corresponding checkbox checked. */ - if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') - { + if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') { \Log::debug('use email'); $notifyBy[] = 'mail'; } @@ -66,11 +63,10 @@ class CheckinAssetNotification extends Notification public function toSlack() { - $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname!='') ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname != '') ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', @@ -86,8 +82,6 @@ class CheckinAssetNotification extends Notification ->fields($fields) ->content($note); }); - - } /** @@ -115,8 +109,6 @@ class CheckinAssetNotification extends Notification ]) ->subject(trans('mail.Asset_Checkin_Notification')); - return $message; } - } diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php index a3bfb039e2..faeafecb1b 100644 --- a/app/Notifications/CheckinLicenseSeatNotification.php +++ b/app/Notifications/CheckinLicenseSeatNotification.php @@ -41,7 +41,7 @@ class CheckinLicenseSeatNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } @@ -49,8 +49,7 @@ class CheckinLicenseSeatNotification extends Notification * Only send checkin notifications to users if the category * has the corresponding checkbox checked. */ - if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') - { + if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') { $notifyBy[] = 'mail'; } @@ -59,13 +58,11 @@ class CheckinLicenseSeatNotification extends Notification public function toSlack() { - $target = $this->target; $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; - + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; if ($admin) { $fields = [ @@ -79,9 +76,6 @@ class CheckinLicenseSeatNotification extends Notification ]; } - - - return (new SlackMessage) ->content(':arrow_down: :floppy_disk: '.trans('mail.License_Checkin_Notification')) ->from($botname) @@ -91,6 +85,7 @@ class CheckinLicenseSeatNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -107,7 +102,5 @@ class CheckinLicenseSeatNotification extends Notification 'target' => $this->target, ]) ->subject(trans('mail.License_Checkin_Notification')); - } - } diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php index 2c2001253d..5882fdf275 100644 --- a/app/Notifications/CheckoutAccessoryNotification.php +++ b/app/Notifications/CheckoutAccessoryNotification.php @@ -19,7 +19,6 @@ class CheckoutAccessoryNotification extends Notification */ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOutBy, $acceptance, $note) { - $this->item = $accessory; $this->admin = $checkedOutBy; $this->note = $note; @@ -27,7 +26,6 @@ class CheckoutAccessoryNotification extends Notification $this->acceptance = $acceptance; $this->settings = Setting::getSettings(); - } /** @@ -37,14 +35,12 @@ class CheckoutAccessoryNotification extends Notification */ public function via() { - $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } - /** * Only send notifications to users that have email addresses */ @@ -71,7 +67,6 @@ class CheckoutAccessoryNotification extends Notification if ($this->item->checkin_email()) { $notifyBy[1] = 'mail'; } - } return $notifyBy; @@ -83,7 +78,7 @@ class CheckoutAccessoryNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', @@ -99,6 +94,7 @@ class CheckoutAccessoryNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -107,7 +103,7 @@ class CheckoutAccessoryNotification extends Notification public function toMail() { \Log::debug($this->item->getImageUrl()); - $eula = $this->item->getEula(); + $eula = $this->item->getEula(); $req_accept = $this->item->requireAcceptance(); $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance); @@ -123,6 +119,5 @@ class CheckoutAccessoryNotification extends Notification 'accept_url' => $accept_url, ]) ->subject(trans('mail.Confirm_accessory_delivery')); - } } diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index ff759f68ef..791f0c1c32 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -21,7 +21,6 @@ class CheckoutAssetNotification extends Notification */ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note) { - $this->item = $asset; $this->admin = $checkedOutBy; $this->note = $note; @@ -42,8 +41,6 @@ class CheckoutAssetNotification extends Notification $this->expected_checkin = \App\Helpers\Helper::getFormattedDateObject($this->item->expected_checkin, 'date', false); } - - } /** @@ -53,10 +50,9 @@ class CheckoutAssetNotification extends Notification */ public function via() { - $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { \Log::debug('use slack'); $notifyBy[] = 'slack'; } @@ -87,7 +83,6 @@ class CheckoutAssetNotification extends Notification if ($this->item->checkin_email()) { $notifyBy[1] = 'mail'; } - } return $notifyBy; @@ -95,19 +90,18 @@ class CheckoutAssetNotification extends Notification public function toSlack() { - $target = $this->target; $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', 'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', ]; - if (($this->expected_checkin) && ($this->expected_checkin!='')) { + if (($this->expected_checkin) && ($this->expected_checkin != '')) { $fields['Expected Checkin'] = $this->expected_checkin; } @@ -120,6 +114,7 @@ class CheckoutAssetNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -128,8 +123,7 @@ class CheckoutAssetNotification extends Notification */ public function toMail() { - - $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : ''; + $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : ''; $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0; $fields = []; @@ -156,9 +150,6 @@ class CheckoutAssetNotification extends Notification ]) ->subject(trans('mail.Confirm_asset_delivery')); - return $message; - } - } diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php index edf970789d..bfebe2c7d5 100644 --- a/app/Notifications/CheckoutConsumableNotification.php +++ b/app/Notifications/CheckoutConsumableNotification.php @@ -25,7 +25,6 @@ class CheckoutConsumableNotification extends Notification */ public function __construct(Consumable $consumable, $checkedOutTo, User $checkedOutBy, $acceptance, $note) { - $this->item = $consumable; $this->admin = $checkedOutBy; $this->note = $note; @@ -33,7 +32,6 @@ class CheckoutConsumableNotification extends Notification $this->acceptance = $acceptance; $this->settings = Setting::getSettings(); - } /** @@ -45,7 +43,7 @@ class CheckoutConsumableNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } @@ -72,12 +70,9 @@ class CheckoutConsumableNotification extends Notification /** * Send an email if an email should be sent at checkin/checkout */ - if ((method_exists($this->item, 'checkin_email')) && ($this->item->checkin_email())) { - $notifyBy[1] = 'mail'; } - } return $notifyBy; @@ -89,7 +84,7 @@ class CheckoutConsumableNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', @@ -105,6 +100,7 @@ class CheckoutConsumableNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -112,9 +108,8 @@ class CheckoutConsumableNotification extends Notification */ public function toMail() { - \Log::debug($this->item->getImageUrl()); - $eula = $this->item->getEula(); + $eula = $this->item->getEula(); $req_accept = $this->item->requireAcceptance(); $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance); @@ -130,7 +125,5 @@ class CheckoutConsumableNotification extends Notification 'accept_url' => $accept_url, ]) ->subject(trans('mail.Confirm_consumable_delivery')); - } - } diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php index 3ec2c1f9ae..50d8313c09 100644 --- a/app/Notifications/CheckoutLicenseSeatNotification.php +++ b/app/Notifications/CheckoutLicenseSeatNotification.php @@ -43,7 +43,7 @@ class CheckoutLicenseSeatNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } @@ -73,7 +73,6 @@ class CheckoutLicenseSeatNotification extends Notification if ($this->item->checkin_email()) { $notifyBy[1] = 'mail'; } - } return $notifyBy; @@ -85,7 +84,7 @@ class CheckoutLicenseSeatNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', @@ -101,6 +100,7 @@ class CheckoutLicenseSeatNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -108,8 +108,7 @@ class CheckoutLicenseSeatNotification extends Notification */ public function toMail() { - - $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : ''; + $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : ''; $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0; $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance); @@ -125,7 +124,5 @@ class CheckoutLicenseSeatNotification extends Notification 'accept_url' => $accept_url, ]) ->subject(trans('mail.Confirm_license_delivery')); - } - } diff --git a/app/Notifications/ExpectedCheckinAdminNotification.php b/app/Notifications/ExpectedCheckinAdminNotification.php index 7f29a915f5..67c709f98d 100644 --- a/app/Notifications/ExpectedCheckinAdminNotification.php +++ b/app/Notifications/ExpectedCheckinAdminNotification.php @@ -32,7 +32,8 @@ class ExpectedCheckinAdminNotification extends Notification public function via() { $notifyBy = []; - $notifyBy[]='mail'; + $notifyBy[] = 'mail'; + return $notifyBy; } @@ -43,7 +44,6 @@ class ExpectedCheckinAdminNotification extends Notification */ public function toMail() { - $message = (new MailMessage)->markdown('notifications.markdown.report-expected-checkins', [ 'assets' => $this->assets, @@ -51,8 +51,5 @@ class ExpectedCheckinAdminNotification extends Notification ->subject(trans('mail.Expected_Checkin_Report')); return $message; - - } - } diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.php index dadd920cf0..6248b72779 100644 --- a/app/Notifications/ExpectedCheckinNotification.php +++ b/app/Notifications/ExpectedCheckinNotification.php @@ -35,7 +35,8 @@ class ExpectedCheckinNotification extends Notification $notifyBy = []; $item = $this->params['item']; - $notifyBy[]='mail'; + $notifyBy[] = 'mail'; + return $notifyBy; } @@ -46,18 +47,15 @@ class ExpectedCheckinNotification extends Notification */ public function toMail() { - $message = (new MailMessage)->markdown('notifications.markdown.expected-checkin', [ 'date' => Helper::getFormattedDateObject($this->params->expected_checkin, 'date', false), 'asset' => $this->params->present()->name(), 'serial' => $this->params->serial, - 'asset_tag' => $this->params->asset_tag + 'asset_tag' => $this->params->asset_tag, ]) ->subject(trans('mail.Expected_Checkin_Notification', ['name' => $this->params->present()->name()])); return $message; - } - } diff --git a/app/Notifications/ExpiringAssetsNotification.php b/app/Notifications/ExpiringAssetsNotification.php index 47d5509259..076db149fb 100644 --- a/app/Notifications/ExpiringAssetsNotification.php +++ b/app/Notifications/ExpiringAssetsNotification.php @@ -33,7 +33,8 @@ class ExpiringAssetsNotification extends Notification public function via() { $notifyBy = []; - $notifyBy[]='mail'; + $notifyBy[] = 'mail'; + return $notifyBy; } @@ -45,7 +46,6 @@ class ExpiringAssetsNotification extends Notification */ public function toMail() { - $message = (new MailMessage)->markdown('notifications.markdown.report-expiring-assets', [ 'assets' => $this->assets, @@ -54,8 +54,5 @@ class ExpiringAssetsNotification extends Notification ->subject(trans('mail.Expiring_Assets_Report')); return $message; - - } - } diff --git a/app/Notifications/ExpiringLicenseNotification.php b/app/Notifications/ExpiringLicenseNotification.php index 5ca1e93cf6..4be549e452 100644 --- a/app/Notifications/ExpiringLicenseNotification.php +++ b/app/Notifications/ExpiringLicenseNotification.php @@ -34,7 +34,8 @@ class ExpiringLicenseNotification extends Notification public function via() { $notifyBy = []; - $notifyBy[]='mail'; + $notifyBy[] = 'mail'; + return $notifyBy; } @@ -46,7 +47,6 @@ class ExpiringLicenseNotification extends Notification */ public function toMail() { - $message = (new MailMessage)->markdown('notifications.markdown.report-expiring-licenses', [ 'licenses' => $this->licenses, @@ -55,8 +55,5 @@ class ExpiringLicenseNotification extends Notification ->subject(trans('mail.Expiring_Licenses_Report')); return $message; - - } - } diff --git a/app/Notifications/FirstAdminNotification.php b/app/Notifications/FirstAdminNotification.php index 153aff4aec..71637b5e80 100644 --- a/app/Notifications/FirstAdminNotification.php +++ b/app/Notifications/FirstAdminNotification.php @@ -10,7 +10,7 @@ class FirstAdminNotification extends Notification { use Queueable; - private $_data = array(); + private $_data = []; /** * Create a new notification instance. @@ -45,8 +45,7 @@ class FirstAdminNotification extends Notification public function toMail() { return (new MailMessage) - ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'] . ' ' . $this->_data['last_name'] ])) + ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']])) ->markdown('notifications.FirstAdmin', $this->_data); } - } diff --git a/app/Notifications/RequestAssetCancelation.php b/app/Notifications/RequestAssetCancelation.php index d50aea3529..ea76056af3 100644 --- a/app/Notifications/RequestAssetCancelation.php +++ b/app/Notifications/RequestAssetCancelation.php @@ -55,15 +55,13 @@ class RequestAssetCancelation extends Notification */ public function via() { - $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { \Log::debug('use slack'); $notifyBy[] = 'slack'; } - $notifyBy[] = 'mail'; return $notifyBy; @@ -75,19 +73,19 @@ class RequestAssetCancelation extends Notification $item = $this->item; $note = $this->note; $qty = $this->item_quantity; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'QTY' => $qty, 'Canceled By' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', ]; - if (($this->expected_checkin) && ($this->expected_checkin!='')) { + if (($this->expected_checkin) && ($this->expected_checkin != '')) { $fields['Expected Checkin'] = $this->expected_checkin; } return (new SlackMessage) - ->content( trans('mail.a_user_canceled')) + ->content(trans('mail.a_user_canceled')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) @@ -95,6 +93,7 @@ class RequestAssetCancelation extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -103,7 +102,6 @@ class RequestAssetCancelation extends Notification */ public function toMail() { - $fields = []; // Check if the item has custom fields associated with it @@ -125,8 +123,6 @@ class RequestAssetCancelation extends Notification ]) ->subject(trans('Item Request Canceled')); - return $message; } - } diff --git a/app/Notifications/RequestAssetNotification.php b/app/Notifications/RequestAssetNotification.php index b78f5eeb93..22a8f3d464 100644 --- a/app/Notifications/RequestAssetNotification.php +++ b/app/Notifications/RequestAssetNotification.php @@ -46,8 +46,6 @@ class RequestAssetNotification extends Notification $this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date', false); } - - } /** @@ -58,10 +56,9 @@ class RequestAssetNotification extends Notification */ public function via() { - $notifyBy = []; - if (Setting::getSettings()->slack_endpoint!='') { + if (Setting::getSettings()->slack_endpoint != '') { $notifyBy[] = 'slack'; } @@ -76,7 +73,7 @@ class RequestAssetNotification extends Notification $qty = $this->item_quantity; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot' ; + $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; $fields = [ 'QTY' => $qty, @@ -92,6 +89,7 @@ class RequestAssetNotification extends Notification ->content($note); }); } + /** * Get the mail representation of the notification. * @@ -99,7 +97,6 @@ class RequestAssetNotification extends Notification */ public function toMail() { - $fields = []; // Check if the item has custom fields associated with it @@ -121,8 +118,6 @@ class RequestAssetNotification extends Notification ]) ->subject(trans('mail.Item_Requested')); - return $message; } - } diff --git a/app/Notifications/SendUpcomingAuditNotification.php b/app/Notifications/SendUpcomingAuditNotification.php index a6863ea8e3..a883220f2f 100644 --- a/app/Notifications/SendUpcomingAuditNotification.php +++ b/app/Notifications/SendUpcomingAuditNotification.php @@ -4,9 +4,9 @@ namespace App\Notifications; use App\Models\Setting; use Illuminate\Bus\Queueable; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; class SendUpcomingAuditNotification extends Notification { diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.php index 9a98a97734..3d2657b944 100644 --- a/app/Notifications/WelcomeNotification.php +++ b/app/Notifications/WelcomeNotification.php @@ -10,7 +10,7 @@ class WelcomeNotification extends Notification { use Queueable; - private $_data = array(); + private $_data = []; /** * Create a new notification instance. @@ -45,7 +45,7 @@ class WelcomeNotification extends Notification public function toMail() { return (new MailMessage) - ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'] . ' ' . $this->_data['last_name'] ])) + ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']])) ->markdown('notifications.Welcome', $this->_data); } } diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.php index 1dd3e40437..f97d166b17 100644 --- a/app/Observers/AccessoryObserver.php +++ b/app/Observers/AccessoryObserver.php @@ -16,16 +16,14 @@ class AccessoryObserver */ public function updated(Accessory $accessory) { - $logAction = new Actionlog(); $logAction->item_type = Accessory::class; $logAction->item_id = $accessory->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('update'); } - /** * Listen to the Accessory created event when * a new accessory is created. @@ -38,10 +36,9 @@ class AccessoryObserver $logAction = new Actionlog(); $logAction->item_type = Accessory::class; $logAction->item_id = $accessory->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('create'); - } /** @@ -55,7 +52,7 @@ class AccessoryObserver $logAction = new Actionlog(); $logAction->item_type = Accessory::class; $logAction->item_id = $accessory->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); } diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index 164792a3a9..85e33ee045 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -22,8 +22,7 @@ class AssetObserver // (Those other actions already create log entries.) if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to']) && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date']) - && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])) - { + && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])) { $changed = []; foreach ($asset->getOriginal() as $key => $value) { @@ -33,22 +32,18 @@ class AssetObserver } } - $logAction = new Actionlog(); $logAction->item_type = Asset::class; $logAction->item_id = $asset->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->log_meta = json_encode($changed); $logAction->logaction('update'); - - } - + } } - /** - * Listen to the Asset created event, and increment + * Listen to the Asset created event, and increment * the next_auto_tag_base value in the settings table when i * a new asset is created. * @@ -65,10 +60,9 @@ class AssetObserver $logAction = new Actionlog(); $logAction->item_type = Asset::class; $logAction->item_id = $asset->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('create'); - } /** @@ -82,7 +76,7 @@ class AssetObserver $logAction = new Actionlog(); $logAction->item_type = Asset::class; $logAction->item_id = $asset->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); } diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php index 3cb0aeda6c..57792022bb 100644 --- a/app/Observers/ComponentObserver.php +++ b/app/Observers/ComponentObserver.php @@ -16,16 +16,14 @@ class ComponentObserver */ public function updated(Component $component) { - $logAction = new Actionlog(); $logAction->item_type = Component::class; $logAction->item_id = $component->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('update'); } - /** * Listen to the Component created event when * a new component is created. @@ -38,10 +36,9 @@ class ComponentObserver $logAction = new Actionlog(); $logAction->item_type = Component::class; $logAction->item_id = $component->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('create'); - } /** @@ -55,7 +52,7 @@ class ComponentObserver $logAction = new Actionlog(); $logAction->item_type = Component::class; $logAction->item_id = $component->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); } diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php index 22c94f2688..b945196e20 100644 --- a/app/Observers/ConsumableObserver.php +++ b/app/Observers/ConsumableObserver.php @@ -16,16 +16,14 @@ class ConsumableObserver */ public function updated(Consumable $consumable) { - $logAction = new Actionlog(); $logAction->item_type = Consumable::class; $logAction->item_id = $consumable->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('update'); } - /** * Listen to the Consumable created event when * a new consumable is created. @@ -35,14 +33,12 @@ class ConsumableObserver */ public function created(Consumable $consumable) { - $logAction = new Actionlog(); $logAction->item_type = Consumable::class; $logAction->item_id = $consumable->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('create'); - } /** @@ -56,7 +52,7 @@ class ConsumableObserver $logAction = new Actionlog(); $logAction->item_type = Consumable::class; $logAction->item_id = $consumable->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); } diff --git a/app/Observers/LicenseObserver.php b/app/Observers/LicenseObserver.php index 5f0132f208..1478aba113 100644 --- a/app/Observers/LicenseObserver.php +++ b/app/Observers/LicenseObserver.php @@ -16,16 +16,14 @@ class LicenseObserver */ public function updated(License $license) { - $logAction = new Actionlog(); $logAction->item_type = License::class; $logAction->item_id = $license->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('update'); } - /** * Listen to the License created event when * a new license is created. @@ -35,14 +33,12 @@ class LicenseObserver */ public function created(License $license) { - $logAction = new Actionlog(); $logAction->item_type = License::class; $logAction->item_id = $license->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('create'); - } /** @@ -56,7 +52,7 @@ class LicenseObserver $logAction = new Actionlog(); $logAction->item_type = License::class; $logAction->item_id = $license->id; - $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); } diff --git a/app/Observers/SettingObserver.php b/app/Observers/SettingObserver.php index eea0240017..aeb682a03a 100644 --- a/app/Observers/SettingObserver.php +++ b/app/Observers/SettingObserver.php @@ -18,6 +18,5 @@ class SettingObserver { Cache::forget(Setting::APP_SETTINGS_KEY); Cache::forget(Setting::SETUP_CHECK_KEY); - } } diff --git a/app/Policies/CheckoutablePermissionsPolicy.php b/app/Policies/CheckoutablePermissionsPolicy.php index d1c39ae314..bcd0e0f39a 100644 --- a/app/Policies/CheckoutablePermissionsPolicy.php +++ b/app/Policies/CheckoutablePermissionsPolicy.php @@ -1,12 +1,12 @@ hasAccess($this->columnName().'.checkout'); } - /** + /** * Determine whether the user can checkin the accessory. * * @param \App\User $user @@ -28,7 +28,7 @@ abstract class CheckoutablePermissionsPolicy extends SnipePermissionsPolicy return $user->hasAccess($this->columnName().'.checkin'); } - /** + /** * Determine whether the user can manage the accessory. * * @param \App\User $user diff --git a/app/Policies/CustomFieldsetPolicy.php b/app/Policies/CustomFieldsetPolicy.php index 0d95cbafe5..a6c06a7007 100644 --- a/app/Policies/CustomFieldsetPolicy.php +++ b/app/Policies/CustomFieldsetPolicy.php @@ -8,11 +8,11 @@ class CustomFieldsetPolicy extends SnipePermissionsPolicy { /** * Proxy the authorization for custom fieldsets down to custom fields. - * This allows us to use the existing permissions in use and have more + * This allows us to use the existing permissions in use and have more * semantically correct authorization checks for custom fieldsets. * * See: https://github.com/snipe/snipe-it/pull/5795 */ return 'customfields'; - } + } } diff --git a/app/Policies/LicensePolicy.php b/app/Policies/LicensePolicy.php index 9d1ec815c6..7a92b5b7de 100644 --- a/app/Policies/LicensePolicy.php +++ b/app/Policies/LicensePolicy.php @@ -13,25 +13,26 @@ class LicensePolicy extends CheckoutablePermissionsPolicy } /** - * Determine whether the user can view license keys. - * This gets a little tricky, UX/logic-wise. If a user has the ability - * to create a license (which requires a product key), shouldn't they - * have the ability to see the product key as well? - * - * Example: I create the license, realize I need to change - * something (maybe I got the product key wrong), and now I can never - * see/edit that product key. - * - * @see https://github.com/snipe/snipe-it/issues/6956 - * @param \App\Models\User $user - * @param \App\Models\License $license - * @return mixed - */ + * Determine whether the user can view license keys. + * This gets a little tricky, UX/logic-wise. If a user has the ability + * to create a license (which requires a product key), shouldn't they + * have the ability to see the product key as well? + * + * Example: I create the license, realize I need to change + * something (maybe I got the product key wrong), and now I can never + * see/edit that product key. + * + * @see https://github.com/snipe/snipe-it/issues/6956 + * @param \App\Models\User $user + * @param \App\Models\License $license + * @return mixed + */ public function viewKeys(User $user, License $license = null) { if ($user->hasAccess('licenses.keys') || $user->hasAccess('licenses.create') || $user->hasAccess('licenses.edit')) { return true; } + return false; } diff --git a/app/Policies/SnipePermissionsPolicy.php b/app/Policies/SnipePermissionsPolicy.php index 435828fd14..f6f6e4db82 100644 --- a/app/Policies/SnipePermissionsPolicy.php +++ b/app/Policies/SnipePermissionsPolicy.php @@ -1,4 +1,5 @@ hasAccess($this->columnName().'.view'); } + /** * Determine whether the user can view the accessory. * @@ -93,12 +93,13 @@ abstract class SnipePermissionsPolicy { $itemConditional = true; if ($item) { - $itemConditional = empty($item->deleted_at); + $itemConditional = empty($item->deleted_at); } + return $itemConditional && $user->hasAccess($this->columnName().'.delete'); } - /** + /** * Determine whether the user can manage the accessory. * * @param \App\Models\User $user @@ -108,6 +109,4 @@ abstract class SnipePermissionsPolicy { return $user->hasAccess($this->columnName().'.edit'); } - - } diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php index bf7074ad55..5eb58f4bc1 100644 --- a/app/Presenters/AccessoryPresenter.php +++ b/app/Presenters/AccessoryPresenter.php @@ -1,9 +1,9 @@ "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false - ],[ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/hardware/table.image'), - "visible" => true, - "formatter" => "imageFormatter" + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.title'), - "visible" => false, - "formatter" => "companiesLinkObjFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/hardware/table.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('general.name'), - "formatter" => "accessoriesLinkFormatter" + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.title'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/accessories/general.accessory_category'), - "formatter" => "categoriesLinkObjFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.name'), + 'formatter' => 'accessoriesLinkFormatter', ], [ - "field" => "model_number", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/models/table.modelnumber'), - "formatter" => "accessoriesLinkFormatter" + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/accessories/general.accessory_category'), + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "manufacturer", - "searchable" => true, - "sortable" => true, - "title" => trans('general.manufacturer'), - "formatter" => "manufacturersLinkObjFormatter", + 'field' => 'model_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/models/table.modelnumber'), + 'formatter' => 'accessoriesLinkFormatter', ], [ - "field" => "supplier", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.supplier'), - "visible" => false, - "formatter" => "suppliersLinkObjFormatter" + 'field' => 'manufacturer', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.manufacturer'), + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('general.location'), - "formatter" => "locationsLinkObjFormatter", + 'field' => 'supplier', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.supplier'), + 'visible' => false, + 'formatter' => 'suppliersLinkObjFormatter', ], [ - "field" => "qty", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/accessories/general.total'), + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.location'), + 'formatter' => 'locationsLinkObjFormatter', + ], [ + 'field' => 'qty', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/accessories/general.total'), ], [ - "field" => "min_qty", - "searchable" => false, - "sortable" => true, - "title" => trans('general.min_amt'), + 'field' => 'min_qty', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.min_amt'), ], [ - "field" => "remaining_qty", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/accessories/general.remaining'), + 'field' => 'remaining_qty', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/accessories/general.remaining'), ], [ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_cost'), - "footerFormatter" => 'sumFormatter', + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_cost'), + 'footerFormatter' => 'sumFormatter', ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.order_number'), - ],[ - "field" => "change", - "searchable" => false, - "sortable" => false, - "visible" => true, - "title" => trans('general.change'), - "formatter" => "accessoriesInOutFormatter", + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.order_number'), ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "accessoriesActionsFormatter", - ] + 'field' => 'change', + 'searchable' => false, + 'sortable' => false, + 'visible' => true, + 'title' => trans('general.change'), + 'formatter' => 'accessoriesInOutFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'accessoriesActionsFormatter', + ], ]; return json_encode($layout); } - /** * Pregenerated link to this accessories view page. * @return string diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php index 79ab28269e..ff62d16a69 100644 --- a/app/Presenters/ActionlogPresenter.php +++ b/app/Presenters/ActionlogPresenter.php @@ -4,26 +4,25 @@ namespace App\Presenters; /** * Class CompanyPresenter - * @package App\Presenters */ class ActionlogPresenter extends Presenter { - public function admin() { if ($user = $this->model->user) { - if(empty($user->deleted_at)) { + if (empty($user->deleted_at)) { return $user->present()->nameUrl(); } // The user was deleted - return ''.$user->getFullNameAttribute()." (deleted)"; + return ''.$user->getFullNameAttribute().' (deleted)'; } + return ''; } public function item() { - if($this->action_type=='uploaded') { + if ($this->action_type == 'uploaded') { return (string) link_to_route('show/userfile', $this->model->filename, [$this->model->item->id, $this->model->id]); } if ($item = $this->model->item) { @@ -33,63 +32,63 @@ class ActionlogPresenter extends Presenter // The item was deleted return ''.$item->name.' (deleted)'; } + return ''; } - public function icon() { - $itemicon = 'fa fa-paperclip'; + $itemicon = 'fa fa-paperclip'; - if ($this->itemType() == "asset") { + if ($this->itemType() == 'asset') { $itemicon = 'fa fa-barcode'; - } elseif ($this->itemType() == "accessory") { - $itemicon = 'fa fa-keyboard-o'; - } elseif ($this->itemType()=="consumable") { - $itemicon = 'fa fa-tint'; - } elseif ($this->itemType()=="license") { - $itemicon = 'fa fa-floppy-o'; - } elseif ($this->itemType()=="component") { - $itemicon = 'fa fa-hdd-o'; - } + } elseif ($this->itemType() == 'accessory') { + $itemicon = 'fa fa-keyboard-o'; + } elseif ($this->itemType() == 'consumable') { + $itemicon = 'fa fa-tint'; + } elseif ($this->itemType() == 'license') { + $itemicon = 'fa fa-floppy-o'; + } elseif ($this->itemType() == 'component') { + $itemicon = 'fa fa-hdd-o'; + } return $itemicon; } - - public function actionType() { + public function actionType() + { return mb_strtolower(trans('general.'.str_replace(' ', '_', $this->action_type))); } - - public function target() { $target = null; // Target is messy. // On an upload, the target is the item we are uploading to, stored as the "item" in the log. - if ($this->action_type=='uploaded') { + if ($this->action_type == 'uploaded') { $target = $this->model->item; - } elseif (($this->action_type=='accepted') || ($this->action_type=='declined')) { - // If we are logging an accept/reject, the target is not stored directly, - // so we access it through who the item is assigned to. - // FIXME: On a reject it's not assigned to anyone. + } elseif (($this->action_type == 'accepted') || ($this->action_type == 'declined')) { + // If we are logging an accept/reject, the target is not stored directly, + // so we access it through who the item is assigned to. + // FIXME: On a reject it's not assigned to anyone. $target = $this->model->item->assignedTo; - } elseif ($this->action_type=='requested') { + } elseif ($this->action_type == 'requested') { if ($this->model->user) { $target = $this->model->user; } } elseif ($this->model->target) { - // Otherwise, we'll just take the target of the log. + // Otherwise, we'll just take the target of the log. $target = $this->model->target; } - if($target) { + if ($target) { if (empty($target->deleted_at)) { return $target->present()->nameUrl(); } + return ''.$target->present()->name().''; } + return ''; } } diff --git a/app/Presenters/AssetAuditPresenter.php b/app/Presenters/AssetAuditPresenter.php index bfc917eea5..6af3952fca 100644 --- a/app/Presenters/AssetAuditPresenter.php +++ b/app/Presenters/AssetAuditPresenter.php @@ -1,4 +1,5 @@ "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.company'), - "visible" => false, - "formatter" => 'assetCompanyObjFilterFormatter' + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.company'), + 'visible' => false, + 'formatter' => 'assetCompanyObjFilterFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.name'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.name'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/hardware/table.image'), - "visible" => false, - "formatter" => "imageFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/hardware/table.image'), + 'visible' => false, + 'formatter' => 'imageFormatter', ], [ - "field" => "asset_tag", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.asset_tag'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'asset_tag', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.asset_tag'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "serial", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.serial'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'serial', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.serial'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "model", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.model'), - "visible" => true, - "formatter" => "modelsLinkObjFormatter" + 'field' => 'model', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.model'), + 'visible' => true, + 'formatter' => 'modelsLinkObjFormatter', ], [ - "field" => "model_number", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/models/table.modelnumber'), - "visible" => false + 'field' => 'model_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/models/table.modelnumber'), + 'visible' => false, ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "title" => trans('general.category'), - "visible" => false, - "formatter" => "categoriesLinkObjFormatter" + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.category'), + 'visible' => false, + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "status_label", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.status'), - "visible" => true, - "formatter" => "statuslabelsLinkObjFormatter" + 'field' => 'status_label', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.status'), + 'visible' => true, + 'formatter' => 'statuslabelsLinkObjFormatter', ], [ - "field" => "assigned_to", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.checkedout_to'), - "visible" => true, - "formatter" => "polymorphicItemFormatter" + 'field' => 'assigned_to', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.checkedout_to'), + 'visible' => true, + 'formatter' => 'polymorphicItemFormatter', ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.location'), - "visible" => true, - "formatter" => "deployedLocationFormatter" + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.location'), + 'visible' => true, + 'formatter' => 'deployedLocationFormatter', ], [ - "field" => "rtd_location", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.default_location'), - "visible" => false, - "formatter" => "deployedLocationFormatter" + 'field' => 'rtd_location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.default_location'), + 'visible' => false, + 'formatter' => 'deployedLocationFormatter', ], [ - "field" => "manufacturer", - "searchable" => true, - "sortable" => true, - "title" => trans('general.manufacturer'), - "visible" => false, - "formatter" => "manufacturersLinkObjFormatter" + 'field' => 'manufacturer', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.manufacturer'), + 'visible' => false, + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_cost'), - "footerFormatter" => 'sumFormatter', + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_cost'), + 'footerFormatter' => 'sumFormatter', ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.order_number'), - 'formatter' => "orderNumberObjFilterFormatter" + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.order_number'), + 'formatter' => 'orderNumberObjFilterFormatter', ], [ - "field" => "eol", - "searchable" => false, - "sortable" => false, - "visible" => false, - "title" => trans('general.eol'), - "formatter" => "dateDisplayFormatter" + 'field' => 'eol', + 'searchable' => false, + 'sortable' => false, + 'visible' => false, + 'title' => trans('general.eol'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "warranty_months", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/form.warranty') - ],[ - "field" => "warranty_expires", - "searchable" => false, - "sortable" => false, - "visible" => false, - "title" => trans('admin/hardware/form.warranty_expires'), - "formatter" => "dateDisplayFormatter" - ],[ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.notes'), + 'field' => 'warranty_months', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/form.warranty'), + ], [ + 'field' => 'warranty_expires', + 'searchable' => false, + 'sortable' => false, + 'visible' => false, + 'title' => trans('admin/hardware/form.warranty_expires'), + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.notes'), ], [ - "field" => "checkout_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.checkouts_count') - - ],[ - "field" => "checkin_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.checkins_count') + 'field' => 'checkout_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.checkouts_count'), ], [ - "field" => "requests_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.user_requests_count') + 'field' => 'checkin_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.checkins_count'), ], [ - "field" => "created_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.created_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'requests_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.user_requests_count'), + ], [ - "field" => "updated_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.updated_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'created_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.created_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "last_checkout", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/table.checkout_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'updated_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.updated_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "expected_checkin", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/form.expected_checkin'), - "formatter" => "dateDisplayFormatter" + 'field' => 'last_checkout', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/table.checkout_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "last_audit_date", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => trans('general.last_audit'), - "formatter" => "dateDisplayFormatter" + 'field' => 'expected_checkin', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/form.expected_checkin'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "next_audit_date", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => trans('general.next_audit_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'last_audit_date', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => trans('general.last_audit'), + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'next_audit_date', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => trans('general.next_audit_date'), + 'formatter' => 'dateDisplayFormatter', ], ]; @@ -238,36 +237,31 @@ class AssetAuditPresenter extends Presenter // models. We only pass the fieldsets that pertain to each asset (via their model) so that we // don't junk up the REST API with tons of custom fields that don't apply - $fields = CustomField::whereHas('fieldset', function ($query) { + $fields = CustomField::whereHas('fieldset', function ($query) { $query->whereHas('models'); })->get(); foreach ($fields as $field) { $layout[] = [ - "field" => 'custom_fields.'.$field->convertUnicodeDbSlug(), - "searchable" => true, - "sortable" => true, - "visible" => false, - "switchable" => true, - "title" => ($field->field_encrypted=='1') ?' '.e($field->name) : e($field->name), - "formatter" => "customFieldsFormatter" + 'field' => 'custom_fields.'.$field->convertUnicodeDbSlug(), + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'switchable' => true, + 'title' => ($field->field_encrypted == '1') ? ' '.e($field->name) : e($field->name), + 'formatter' => 'customFieldsFormatter', ]; - } - $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "hardwareAuditFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'hardwareAuditFormatter', ]; return json_encode($layout); } - - - } diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php index 3d69cd794f..f7a9ff0229 100644 --- a/app/Presenters/AssetMaintenancesPresenter.php +++ b/app/Presenters/AssetMaintenancesPresenter.php @@ -4,11 +4,9 @@ namespace App\Presenters; /** * Class AssetModelPresenter - * @package App\Presenters */ class AssetMaintenancesPresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -17,106 +15,106 @@ class AssetMaintenancesPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false - ],[ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.title'), - "visible" => false, - "formatter" => "companiesLinkObjFormatter" + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "asset_name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/table.asset_name'), - "formatter" => "assetNameLinkFormatter" - ],[ - "field" => "asset_tag", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.asset_tag'), - "formatter" => "assetTagLinkFormatter" + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.title'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "model", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/hardware/form.model'), - "visible" => false, - "formatter" => "modelsLinkObjFormatter" - ],[ - "field" => "supplier", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.supplier'), - "visible" => false, - "formatter" => "suppliersLinkObjFormatter" + 'field' => 'asset_name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/table.asset_name'), + 'formatter' => 'assetNameLinkFormatter', ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('general.location'), - "formatter" => "locationsLinkObjFormatter", + 'field' => 'asset_tag', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.asset_tag'), + 'formatter' => 'assetTagLinkFormatter', ], [ - "field" => "asset_maintenance_type", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.asset_maintenance_type'), + 'field' => 'model', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/hardware/form.model'), + 'visible' => false, + 'formatter' => 'modelsLinkObjFormatter', ], [ - "field" => "title", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.title'), + 'field' => 'supplier', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.supplier'), + 'visible' => false, + 'formatter' => 'suppliersLinkObjFormatter', ], [ - "field" => "start_date", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.start_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.location'), + 'formatter' => 'locationsLinkObjFormatter', ], [ - "field" => "completion_date", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.completion_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'asset_maintenance_type', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.asset_maintenance_type'), ], [ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.notes') - ],[ - "field" => "is_warranty", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/table.is_warranty') + 'field' => 'title', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.title'), ], [ - "field" => "cost", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/asset_maintenances/form.cost') + 'field' => 'start_date', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.start_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "user_id", - "searchable" => true, - "sortable" => true, - "title" => trans('general.admin'), - "formatter" => "usersLinkObjFormatter" + 'field' => 'completion_date', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.completion_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "maintenancesActionsFormatter", - ] + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.notes'), + ], [ + 'field' => 'is_warranty', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/table.is_warranty'), + ], [ + 'field' => 'cost', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/asset_maintenances/form.cost'), + ], [ + 'field' => 'user_id', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.admin'), + 'formatter' => 'usersLinkObjFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'maintenancesActionsFormatter', + ], ]; return json_encode($layout); diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php index 65836da9a8..08fec15200 100644 --- a/app/Presenters/AssetModelPresenter.php +++ b/app/Presenters/AssetModelPresenter.php @@ -4,150 +4,147 @@ namespace App\Presenters; /** * Class AssetModelPresenter - * @package App\Presenters */ class AssetModelPresenter extends Presenter { - public static function dataTableLayout() { - + public static function dataTableLayout() + { $layout = [ [ - "field" => "checkbox", - "checkbox" => true + 'field' => 'checkbox', + 'checkbox' => true, ], [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.title'), - "visible" => false, - "formatter" => "companiesLinkObjFormatter" + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.title'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "visible" => true, - "title" => trans('general.name'), - "formatter" => "modelsLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'visible' => true, + 'title' => trans('general.name'), + 'formatter' => 'modelsLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => true, - "formatter" => 'imageFormatter', + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', ], [ - "field" => "manufacturer", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.manufacturer'), - "visible" => false, - "formatter" => 'manufacturersLinkObjFormatter', + 'field' => 'manufacturer', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.manufacturer'), + 'visible' => false, + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "model_number", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/models/table.modelnumber'), - "visible" => true, + 'field' => 'model_number', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/models/table.modelnumber'), + 'visible' => true, ], [ - "field" => "assets_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/models/table.numassets'), - "visible" => true, + 'field' => 'assets_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/models/table.numassets'), + 'visible' => true, ], [ - "field" => "depreciation", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.depreciation'), - "visible" => false, - "formatter" => "depreciationsLinkObjFormatter", + 'field' => 'depreciation', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.depreciation'), + 'visible' => false, + 'formatter' => 'depreciationsLinkObjFormatter', ], [ - "field" => "category", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.category'), - "visible" => false, - "formatter" => "categoriesLinkObjFormatter", + 'field' => 'category', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.category'), + 'visible' => false, + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "eol", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.eol'), - "visible" => true, + 'field' => 'eol', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.eol'), + 'visible' => true, ], [ - "field" => "fieldset", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/models/general.fieldset'), - "visible" => true, - "formatter" => "fieldsetsLinkObjFormatter", + 'field' => 'fieldset', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/models/general.fieldset'), + 'visible' => true, + 'formatter' => 'fieldsetsLinkObjFormatter', ], [ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.notes'), - "visible" => false, + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.notes'), + 'visible' => false, ], [ - "field" => "created_at", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.created_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'created_at', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.created_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "updated_at", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.updated_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'updated_at', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.updated_at'), + 'formatter' => 'dateDisplayFormatter', ], ]; - $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "modelsActionsFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'modelsActionsFormatter', ]; - return json_encode($layout); - } + /** * Formatted note for this model * @return string @@ -159,7 +156,6 @@ class AssetModelPresenter extends Presenter if ($this->model->note) { return $Parsedown->text($this->model->note); } - } public function eolText() @@ -167,6 +163,7 @@ class AssetModelPresenter extends Presenter if ($this->eol) { return $this->eol.' '.trans('general.months'); } + return ''; } @@ -183,8 +180,9 @@ class AssetModelPresenter extends Presenter $name .= $this->name; if ($this->model_number) { - $name .=" (#".$this->model_number.')'; + $name .= ' (#'.$this->model_number.')'; } + return $name; } @@ -203,9 +201,10 @@ class AssetModelPresenter extends Presenter */ public function imageUrl() { - if (!empty($this->image)) { - return ''.$this->name.''; + if (! empty($this->image)) { + return ''.$this->name.''; } + return ''; } @@ -215,9 +214,10 @@ class AssetModelPresenter extends Presenter */ public function imageSrc() { - if (!empty($this->image)) { - return url('/') . '/uploads/models/' . $this->image; + if (! empty($this->image)) { + return url('/').'/uploads/models/'.$this->image; } + return ''; } diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index 05cff0dfdc..c3bc23c69b 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -1,4 +1,5 @@ "checkbox", - "checkbox" => true + 'field' => 'checkbox', + 'checkbox' => true, ], [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.company'), - "visible" => false, - "formatter" => 'assetCompanyObjFilterFormatter' + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.company'), + 'visible' => false, + 'formatter' => 'assetCompanyObjFilterFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.name'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.name'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/hardware/table.image'), - "visible" => true, - "formatter" => "imageFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/hardware/table.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', ], [ - "field" => "asset_tag", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.asset_tag'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'asset_tag', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.asset_tag'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "serial", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.serial'), - "visible" => true, - "formatter" => "hardwareLinkFormatter" + 'field' => 'serial', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.serial'), + 'visible' => true, + 'formatter' => 'hardwareLinkFormatter', ], [ - "field" => "model", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.model'), - "visible" => true, - "formatter" => "modelsLinkObjFormatter" + 'field' => 'model', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.model'), + 'visible' => true, + 'formatter' => 'modelsLinkObjFormatter', ], [ - "field" => "model_number", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/models/table.modelnumber'), - "visible" => false + 'field' => 'model_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/models/table.modelnumber'), + 'visible' => false, ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "title" => trans('general.category'), - "visible" => true, - "formatter" => "categoriesLinkObjFormatter" + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.category'), + 'visible' => true, + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "status_label", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.status'), - "visible" => true, - "formatter" => "statuslabelsLinkObjFormatter" + 'field' => 'status_label', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.status'), + 'visible' => true, + 'formatter' => 'statuslabelsLinkObjFormatter', ], [ - "field" => "assigned_to", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.checkedout_to'), - "visible" => true, - "formatter" => "polymorphicItemFormatter" + 'field' => 'assigned_to', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.checkedout_to'), + 'visible' => true, + 'formatter' => 'polymorphicItemFormatter', ], [ - "field" => "employee_number", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/users/table.employee_num'), - "visible" => false, - "formatter" => "employeeNumFormatter" - ],[ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/table.location'), - "visible" => true, - "formatter" => "deployedLocationFormatter" + 'field' => 'employee_number', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/users/table.employee_num'), + 'visible' => false, + 'formatter' => 'employeeNumFormatter', ], [ - "field" => "rtd_location", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.default_location'), - "visible" => false, - "formatter" => "deployedLocationFormatter" + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/table.location'), + 'visible' => true, + 'formatter' => 'deployedLocationFormatter', ], [ - "field" => "manufacturer", - "searchable" => true, - "sortable" => true, - "title" => trans('general.manufacturer'), - "visible" => false, - "formatter" => "manufacturersLinkObjFormatter" - ],[ - "field" => "supplier", - "searchable" => true, - "sortable" => true, - "title" => trans('general.supplier'), - "visible" => false, - "formatter" => "suppliersLinkObjFormatter" + 'field' => 'rtd_location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.default_location'), + 'visible' => false, + 'formatter' => 'deployedLocationFormatter', ], [ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'manufacturer', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.manufacturer'), + 'visible' => false, + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_cost'), - "formatter" => 'numberWithCommas', - "footerFormatter" => 'sumFormatter', + 'field' => 'supplier', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.supplier'), + 'visible' => false, + 'formatter' => 'suppliersLinkObjFormatter', ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.order_number'), - 'formatter' => "orderNumberObjFilterFormatter" + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "eol", - "searchable" => false, - "sortable" => false, - "visible" => false, - "title" => trans('general.eol'), - "formatter" => "dateDisplayFormatter" + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_cost'), + 'formatter' => 'numberWithCommas', + 'footerFormatter' => 'sumFormatter', ], [ - "field" => "warranty_months", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/form.warranty') - ],[ - "field" => "warranty_expires", - "searchable" => false, - "sortable" => false, - "visible" => false, - "title" => trans('admin/hardware/form.warranty_expires'), - "formatter" => "dateDisplayFormatter" - ],[ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.notes'), + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.order_number'), + 'formatter' => 'orderNumberObjFilterFormatter', + ], [ + 'field' => 'eol', + 'searchable' => false, + 'sortable' => false, + 'visible' => false, + 'title' => trans('general.eol'), + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'warranty_months', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/form.warranty'), + ], [ + 'field' => 'warranty_expires', + 'searchable' => false, + 'sortable' => false, + 'visible' => false, + 'title' => trans('admin/hardware/form.warranty_expires'), + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.notes'), ], [ - "field" => "checkout_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.checkouts_count') - - ],[ - "field" => "checkin_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.checkins_count') + 'field' => 'checkout_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.checkouts_count'), ], [ - "field" => "requests_counter", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.user_requests_count') + 'field' => 'checkin_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.checkins_count'), ], [ - "field" => "created_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.created_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'requests_counter', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.user_requests_count'), + ], [ - "field" => "updated_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.updated_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'created_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.created_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "last_checkout", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/table.checkout_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'updated_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.updated_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "expected_checkin", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/hardware/form.expected_checkin'), - "formatter" => "dateDisplayFormatter" + 'field' => 'last_checkout', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/table.checkout_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "last_audit_date", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.last_audit'), - "formatter" => "dateDisplayFormatter" + 'field' => 'expected_checkin', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/form.expected_checkin'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "next_audit_date", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.next_audit_date'), - "formatter" => "dateDisplayFormatter" + 'field' => 'last_audit_date', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.last_audit'), + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'next_audit_date', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.next_audit_date'), + 'formatter' => 'dateDisplayFormatter', ], ]; @@ -255,53 +254,49 @@ class AssetPresenter extends Presenter // models. We only pass the fieldsets that pertain to each asset (via their model) so that we // don't junk up the REST API with tons of custom fields that don't apply - $fields = CustomField::whereHas('fieldset', function ($query) { + $fields = CustomField::whereHas('fieldset', function ($query) { $query->whereHas('models'); })->get(); - // Note: We do not need to e() escape the field names here, as they are already escaped when // they are presented in the blade view. If we escape them here, custom fields with quotes in their // name can break the listings page. - snipe foreach ($fields as $field) { $layout[] = [ - "field" => 'custom_fields.'.$field->convertUnicodeDbSlug(), - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => $field->name, - "formatter"=> 'customFieldsFormatter', - "escape" => true, - "class" => ($field->field_encrypted=='1') ? 'css-padlock' : '', - "visible" => true, + 'field' => 'custom_fields.'.$field->convertUnicodeDbSlug(), + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => $field->name, + 'formatter'=> 'customFieldsFormatter', + 'escape' => true, + 'class' => ($field->field_encrypted == '1') ? 'css-padlock' : '', + 'visible' => true, ]; - } $layout[] = [ - "field" => "checkincheckout", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.checkin').'/'.trans('general.checkout'), - "visible" => true, - "formatter" => "hardwareInOutFormatter", + 'field' => 'checkincheckout', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.checkin').'/'.trans('general.checkout'), + 'visible' => true, + 'formatter' => 'hardwareInOutFormatter', ]; $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "hardwareActionsFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'hardwareActionsFormatter', ]; return json_encode($layout); } - - /** * Generate html link to this items name. * @return string @@ -316,6 +311,7 @@ class AssetPresenter extends Presenter if ($this->model->model) { return $this->model->model->present()->nameUrl(); } + return ''; } @@ -326,17 +322,18 @@ class AssetPresenter extends Presenter public function imageUrl() { $imagePath = ''; - if ($this->image && !empty($this->image)) { + if ($this->image && ! empty($this->image)) { $imagePath = $this->image; $imageAlt = $this->name; - } elseif ($this->model && !empty($this->model->image)) { + } elseif ($this->model && ! empty($this->model->image)) { $imagePath = $this->model->image; $imageAlt = $this->model->name; } $url = config('app.url'); - if (!empty($imagePath)) { + if (! empty($imagePath)) { $imagePath = ''.$imageAlt.''; } + return $imagePath; } @@ -347,14 +344,15 @@ class AssetPresenter extends Presenter public function imageSrc() { $imagePath = ''; - if ($this->image && !empty($this->image)) { + if ($this->image && ! empty($this->image)) { $imagePath = $this->image; - } elseif ($this->model && !empty($this->model->image)) { + } elseif ($this->model && ! empty($this->model->image)) { $imagePath = $this->model->image; } - if (!empty($imagePath)) { + if (! empty($imagePath)) { return config('app.url').'/uploads/assets/'.$imagePath; } + return $imagePath; } @@ -392,21 +390,22 @@ class AssetPresenter extends Presenter if ($this->model->model) { $str .= ' - '.$this->model->model->name; } + return $str; } + /** * Returns the date this item hits EOL. * @return false|string */ public function eol_date() { - - if (( $this->purchase_date ) && ( $this->model->model ) && ($this->model->model->eol) ) { + if (($this->purchase_date) && ($this->model->model) && ($this->model->model->eol)) { $date = date_create($this->purchase_date); - date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months')); + date_add($date, date_interval_create_from_date_string($this->model->model->eol.' months')); + return date_format($date, 'Y-m-d'); } - } /** @@ -415,10 +414,9 @@ class AssetPresenter extends Presenter */ public function months_until_eol() { - - $today = date("Y-m-d"); - $d1 = new DateTime($today); - $d2 = new DateTime($this->eol_date()); + $today = date('Y-m-d'); + $d1 = new DateTime($today); + $d2 = new DateTime($this->eol_date()); if ($this->eol_date() > $today) { $interval = $d2->diff($d1); @@ -439,6 +437,7 @@ class AssetPresenter extends Presenter if ($this->model->assigned) { return 'deployed'; } + return $this->model->assetstatus->getStatuslabelType(); } @@ -452,6 +451,7 @@ class AssetPresenter extends Presenter if ($this->model->assigned) { return trans('general.deployed'); } + return $this->model->assetstatus->name; } @@ -469,7 +469,8 @@ class AssetPresenter extends Presenter * (if not deployed:) * Another Status Label */ - public function fullStatusText() { + public function fullStatusText() + { // Make sure the status is valid if ($this->assetstatus) { @@ -478,7 +479,7 @@ class AssetPresenter extends Presenter // If it's assigned and not set to the default "ready to deploy" status if ($this->assetstatus->name != trans('general.ready_to_deploy')) { - return trans('general.deployed'). ' (' . $this->model->assetstatus->name.')'; + return trans('general.deployed').' ('.$this->model->assetstatus->name.')'; } // If it's assigned to the default "ready to deploy" status, just @@ -504,7 +505,8 @@ class AssetPresenter extends Presenter { if (($this->purchase_date) && ($this->warranty_months)) { $date = date_create($this->purchase_date); - date_add($date, date_interval_create_from_date_string($this->warranty_months . ' months')); + date_add($date, date_interval_create_from_date_string($this->warranty_months.' months')); + return date_format($date, 'Y-m-d'); } diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index 19507e2771..b45bd01609 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -4,11 +4,9 @@ namespace App\Presenters; /** * Class CategoryPresenter - * @package App\Presenters */ class CategoryPresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -17,91 +15,90 @@ class CategoryPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('general.name'), - "visible" => true, - "formatter" => 'categoriesLinkFormatter', - ],[ - "field" => "image", - "searchable" => false, - "sortable" => true, - "title" => trans('general.image'), - "visible" => true, - "formatter" => 'imageFormatter', - ],[ - "field" => "category_type", - "searchable" => true, - "sortable" => true, - "title" => trans('general.type'), - "visible" => true - ],[ - "field" => "item_count", - "searchable" => false, - "sortable" => true, - "title" => trans('general.qty'), - "visible" => true - ],[ - "field" => "has_eula", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/categories/table.eula_text'), - "visible" => false, - "formatter" => 'trueFalseFormatter', - ],[ - "field" => "checkin_email", - "searchable" => false, - "sortable" => true, - "class" => 'css-envelope', - "title" => 'Send Email', - "visible" => true, - "formatter" => 'trueFalseFormatter', - ],[ - "field" => "require_acceptance", - "searchable" => false, - "sortable" => true, - "title" => trans('admin/categories/table.require_acceptance'), - "visible" => true, - "formatter" => 'trueFalseFormatter', - ],[ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "categoriesActionsFormatter", + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.name'), + 'visible' => true, + 'formatter' => 'categoriesLinkFormatter', + ], [ + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', + ], [ + 'field' => 'category_type', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.type'), + 'visible' => true, + ], [ + 'field' => 'item_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.qty'), + 'visible' => true, + ], [ + 'field' => 'has_eula', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/categories/table.eula_text'), + 'visible' => false, + 'formatter' => 'trueFalseFormatter', + ], [ + 'field' => 'checkin_email', + 'searchable' => false, + 'sortable' => true, + 'class' => 'css-envelope', + 'title' => 'Send Email', + 'visible' => true, + 'formatter' => 'trueFalseFormatter', + ], [ + 'field' => 'require_acceptance', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/categories/table.require_acceptance'), + 'visible' => true, + 'formatter' => 'trueFalseFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'categoriesActionsFormatter', ], [ - "field" => "created_at", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.created_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'created_at', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.created_at'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "updated_at", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.updated_at'), - "formatter" => "dateDisplayFormatter" + 'field' => 'updated_at', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.updated_at'), + 'formatter' => 'dateDisplayFormatter', ], ]; return json_encode($layout); } - /** * Link to this categories name * @return string diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php index 9f8e6fb376..5f829f1ccb 100644 --- a/app/Presenters/CompanyPresenter.php +++ b/app/Presenters/CompanyPresenter.php @@ -4,7 +4,6 @@ namespace App\Presenters; /** * Class CompanyPresenter - * @package App\Presenters */ class CompanyPresenter extends Presenter { @@ -16,95 +15,94 @@ class CompanyPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false - ],[ - "field" => "name", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.name'), - "visible" => true, - "formatter" => 'companiesLinkFormatter', - ],[ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => true, - "formatter" => 'imageFormatter', - ],[ - "field" => "users_count", - "searchable" => false, - "sortable" => true, - "title" => '', - "visible" => true, - - ],[ - "field" => "assets_count", - "searchable" => false, - "sortable" => true, - "title" => '', - "visible" => true, + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, + ], [ + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.name'), + 'visible' => true, + 'formatter' => 'companiesLinkFormatter', + ], [ + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', + ], [ + 'field' => 'users_count', + 'searchable' => false, + 'sortable' => true, + 'title' => '', + 'visible' => true, - ],[ - "field" => "licenses_count", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => ' ', - ],[ - "field" => "accessories_count", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => ' ', - ],[ - "field" => "consumables_count", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => ' ', - ],[ - "field" => "components_count", - "searchable" => false, - "sortable" => true, - "visible" => true, - "title" => ' ', - ],[ - "field" => "updated_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.updated_at'), - "formatter" => 'createdAtFormatter', - ],[ - "field" => "created_at", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('general.created_at'), - "formatter" => 'createdAtFormatter', - ],[ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "companiesActionsFormatter", - ] + ], [ + 'field' => 'assets_count', + 'searchable' => false, + 'sortable' => true, + 'title' => '', + 'visible' => true, + + ], [ + 'field' => 'licenses_count', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => ' ', + ], [ + 'field' => 'accessories_count', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => ' ', + ], [ + 'field' => 'consumables_count', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => ' ', + ], [ + 'field' => 'components_count', + 'searchable' => false, + 'sortable' => true, + 'visible' => true, + 'title' => ' ', + ], [ + 'field' => 'updated_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.updated_at'), + 'formatter' => 'createdAtFormatter', + ], [ + 'field' => 'created_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.created_at'), + 'formatter' => 'createdAtFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'companiesActionsFormatter', + ], ]; return json_encode($layout); } - /** * Link to this companies name * @return string diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 669b5c651f..7f3dab0aa2 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -4,11 +4,9 @@ namespace App\Presenters; /** * Class ComponentPresenter - * @package App\Presenters */ class ComponentPresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -17,116 +15,115 @@ class ComponentPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.company'), - "visible" => false, - "formatter" => 'companiesLinkObjFormatter', + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.company'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('general.name'), - "visible" => true, - "formatter" => 'componentsLinkFormatter', + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.name'), + 'visible' => true, + 'formatter' => 'componentsLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => false, - "formatter" => 'imageFormatter', - ],[ - "field" => "serial", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/hardware/form.serial'), - "formatter" => "componentsLinkFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => false, + 'formatter' => 'imageFormatter', ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "title" => trans('general.category'), - "formatter" => "categoriesLinkObjFormatter" + 'field' => 'serial', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/hardware/form.serial'), + 'formatter' => 'componentsLinkFormatter', ], [ - "field" => "qty", - "searchable" => false, - "sortable" => true, - "title" => trans('admin/components/general.total'), - "visible" => true, + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.category'), + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "remaining", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/components/general.remaining'), - "visible" => true, + 'field' => 'qty', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/components/general.total'), + 'visible' => true, ], [ - "field" => "min_amt", - "searchable" => false, - "sortable" => false, - "title" => trans('general.min_amt'), - "visible" => true, + 'field' => 'remaining', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/components/general.remaining'), + 'visible' => true, ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('general.location'), - "formatter" => "locationsLinkObjFormatter" + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('general.min_amt'), + 'visible' => true, ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "title" => trans('general.order_number'), - "visible" => true, - ],[ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_date'), - "visible" => true, - "formatter" => "dateDisplayFormatter", - ],[ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_cost'), - "visible" => true, - "footerFormatter" => 'sumFormatter', + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.location'), + 'formatter' => 'locationsLinkObjFormatter', + ], [ + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.order_number'), + 'visible' => true, + ], [ + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_date'), + 'visible' => true, + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_cost'), + 'visible' => true, + 'footerFormatter' => 'sumFormatter', ], ]; $layout[] = [ - "field" => "checkincheckout", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.checkin').'/'.trans('general.checkout'), - "visible" => true, - "formatter" => "componentsInOutFormatter", + 'field' => 'checkincheckout', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.checkin').'/'.trans('general.checkout'), + 'visible' => true, + 'formatter' => 'componentsInOutFormatter', ]; $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "componentsActionsFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'componentsActionsFormatter', ]; - return json_encode($layout); } @@ -147,6 +144,4 @@ class ComponentPresenter extends Presenter { return route('accessories.show', $this->id); } - - } diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php index 334398fabd..c80972955e 100644 --- a/app/Presenters/ConsumablePresenter.php +++ b/app/Presenters/ConsumablePresenter.php @@ -2,14 +2,11 @@ namespace App\Presenters; - /** * Class ComponentPresenter - * @package App\Presenters */ class ConsumablePresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -18,121 +15,121 @@ class ConsumablePresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.company'), - "visible" => false, - "formatter" => 'companiesLinkObjFormatter', + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.company'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('general.name'), - "visible" => true, - "formatter" => 'consumablesLinkFormatter', + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.name'), + 'visible' => true, + 'formatter' => 'consumablesLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => false, - "formatter" => 'imageFormatter', + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => false, + 'formatter' => 'imageFormatter', ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "title" => trans('general.category'), - "formatter" => "categoriesLinkObjFormatter" - ],[ - "field" => "model_number", - "searchable" => true, - "sortable" => true, - "title" => trans('general.model_no'), - ],[ - "field" => "item_no", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/consumables/general.item_no') + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.category'), + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "qty", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/components/general.total'), - "visible" => true, + 'field' => 'model_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.model_no'), ], [ - "field" => "remaining", - "searchable" => false, - "sortable" => false, - "title" => trans('admin/components/general.remaining'), - "visible" => true, + 'field' => 'item_no', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/consumables/general.item_no'), ], [ - "field" => "min_amt", - "searchable" => false, - "sortable" => false, - "title" => trans('general.min_amt'), - "visible" => true, + 'field' => 'qty', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/components/general.total'), + 'visible' => true, + ], [ + 'field' => 'remaining', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('admin/components/general.remaining'), + 'visible' => true, + ], [ + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => false, + 'title' => trans('general.min_amt'), + 'visible' => true, ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "title" => trans('general.location'), - "formatter" => "locationsLinkObjFormatter" + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.location'), + 'formatter' => 'locationsLinkObjFormatter', ], [ - "field" => "manufacturer", - "searchable" => true, - "sortable" => true, - "title" => trans('general.manufacturer'), - "visible" => false, - "formatter" => "manufacturersLinkObjFormatter" + 'field' => 'manufacturer', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.manufacturer'), + 'visible' => false, + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "title" => trans('general.order_number'), - "visible" => true, - ],[ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_date'), - "visible" => true, - "formatter" => "dateDisplayFormatter", - ],[ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "title" => trans('general.purchase_cost'), - "visible" => true, - "footerFormatter" => 'sumFormatter', - ],[ - "field" => "change", - "searchable" => false, - "sortable" => false, - "visible" => true, - "title" => trans('general.change'), - "formatter" => "consumablesInOutFormatter", + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.order_number'), + 'visible' => true, ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "consumablesActionsFormatter", - ] + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_date'), + 'visible' => true, + 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.purchase_cost'), + 'visible' => true, + 'footerFormatter' => 'sumFormatter', + ], [ + 'field' => 'change', + 'searchable' => false, + 'sortable' => false, + 'visible' => true, + 'title' => trans('general.change'), + 'formatter' => 'consumablesInOutFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'consumablesActionsFormatter', + ], ]; return json_encode($layout); @@ -155,6 +152,4 @@ class ConsumablePresenter extends Presenter { return (string) link_to_route('consumables.show', e($this->name), $this->id); } - - } diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php index d6e51ec81c..c0ff037988 100644 --- a/app/Presenters/DepreciationPresenter.php +++ b/app/Presenters/DepreciationPresenter.php @@ -4,7 +4,6 @@ namespace App\Presenters; /** * Class DepreciationPresenter - * @package App\Presenters */ class DepreciationPresenter extends Presenter { @@ -16,41 +15,40 @@ class DepreciationPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('general.name'), - "visible" => true, - "formatter" => 'depreciationsLinkFormatter', + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.name'), + 'visible' => true, + 'formatter' => 'depreciationsLinkFormatter', ], [ - "field" => "months", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/depreciations/table.term'), - "visible" => true, + 'field' => 'months', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/depreciations/table.term'), + 'visible' => true, ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "depreciationsActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'depreciationsActionsFormatter', + ], ]; return json_encode($layout); } - } diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index be5a600c4f..d050a521d2 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -4,7 +4,6 @@ namespace App\Presenters; /** * Class LicensePresenter - * @package App\Presenters */ class LicensePresenter extends Presenter { @@ -16,174 +15,172 @@ class LicensePresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.title'), - "visible" => false, - "formatter" => "companiesLinkObjFormatter" + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.title'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/licenses/table.title'), - "formatter" => "licensesLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/licenses/table.title'), + 'formatter' => 'licensesLinkFormatter', ], [ - "field" => "product_key", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/licenses/form.license_key'), - "formatter" => "licensesLinkFormatter" + 'field' => 'product_key', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/licenses/form.license_key'), + 'formatter' => 'licensesLinkFormatter', ], [ - "field" => "expiration_date", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/licenses/form.expiration'), - 'formatter' => 'dateDisplayFormatter' + 'field' => 'expiration_date', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/licenses/form.expiration'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "license_email", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/licenses/form.to_email') + 'field' => 'license_email', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/licenses/form.to_email'), ], [ - "field" => "license_name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/licenses/form.to_name'), + 'field' => 'license_name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/licenses/form.to_name'), ], [ - "field" => "category", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.category'), - "visible" => false, - "formatter" => "categoriesLinkObjFormatter" + 'field' => 'category', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.category'), + 'visible' => false, + 'formatter' => 'categoriesLinkObjFormatter', ], [ - "field" => "supplier", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.supplier'), - "visible" => false, - "formatter" => "suppliersLinkObjFormatter" + 'field' => 'supplier', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.supplier'), + 'visible' => false, + 'formatter' => 'suppliersLinkObjFormatter', ], [ - "field" => "manufacturer", - "searchable" => true, - "sortable" => true, - "title" => trans('general.manufacturer'), - "formatter" => "manufacturersLinkObjFormatter", + 'field' => 'manufacturer', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('general.manufacturer'), + 'formatter' => 'manufacturersLinkObjFormatter', ], [ - "field" => "seats", - "searchable" => false, - "sortable" => true, - "title" => trans('admin/accessories/general.total'), + 'field' => 'seats', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/accessories/general.total'), ], [ - "field" => "free_seats_count", - "searchable" => false, - "sortable" => true, - "title" => trans('admin/accessories/general.remaining'), + 'field' => 'free_seats_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/accessories/general.remaining'), ], [ - "field" => "purchase_date", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_date'), - 'formatter' => 'dateDisplayFormatter' + 'field' => 'purchase_date', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "termination_date", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('admin/licenses/form.termination_date'), - 'formatter' => 'dateDisplayFormatter' + 'field' => 'termination_date', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/licenses/form.termination_date'), + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "depreciation", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/hardware/form.depreciation'), - "visible" => false, - "formatter" => "depreciationsLinkObjFormatter", + 'field' => 'depreciation', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/hardware/form.depreciation'), + 'visible' => false, + 'formatter' => 'depreciationsLinkObjFormatter', ], [ - "field" => "maintained", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/licenses/form.maintained'), - "formatter" => "trueFalseFormatter" + 'field' => 'maintained', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/licenses/form.maintained'), + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "reassignable", - "searchable" => false, - "sortable" => true, - "visible" => false, - "title" => trans('admin/licenses/form.reassignable'), - "formatter" => "trueFalseFormatter" + 'field' => 'reassignable', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/licenses/form.reassignable'), + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "purchase_cost", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.purchase_cost'), - "footerFormatter" => 'sumFormatter', + 'field' => 'purchase_cost', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.purchase_cost'), + 'footerFormatter' => 'sumFormatter', ], [ - "field" => "purchase_order", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('admin/licenses/form.purchase_order'), + 'field' => 'purchase_order', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/licenses/form.purchase_order'), ], [ - "field" => "order_number", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.order_number'), + 'field' => 'order_number', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.order_number'), ], [ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "visible" => false, - "title" => trans('general.notes'), - "formatter" => "notesFormatter" - ] + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.notes'), + 'formatter' => 'notesFormatter', + ], ]; $layout[] = [ - "field" => "checkincheckout", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.checkin').'/'.trans('general.checkout'), - "visible" => true, - "formatter" => "licensesInOutFormatter", + 'field' => 'checkincheckout', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.checkin').'/'.trans('general.checkout'), + 'visible' => true, + 'formatter' => 'licensesInOutFormatter', ]; $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "licensesActionsFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'licensesActionsFormatter', ]; - return json_encode($layout); } - /** * Json Column Layout for bootstrap table * @return string @@ -192,69 +189,68 @@ class LicensePresenter extends Presenter { $layout = [ [ - "field" => "name", - "searchable" => false, - "sortable" => false, - "sorter" => "numericOnly", - "switchable" => true, - "title" => trans('admin/licenses/general.seat'), - "visible" => true, + 'field' => 'name', + 'searchable' => false, + 'sortable' => false, + 'sorter' => 'numericOnly', + 'switchable' => true, + 'title' => trans('admin/licenses/general.seat'), + 'visible' => true, ], [ - "field" => "assigned_user", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('admin/licenses/general.user'), - "visible" => true, - "formatter" => "usersLinkObjFormatter" + 'field' => 'assigned_user', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('admin/licenses/general.user'), + 'visible' => true, + 'formatter' => 'usersLinkObjFormatter', ], [ - "field" => "department", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.department'), - "visible" => false, - "formatter" => "departmentNameLinkFormatter" + 'field' => 'department', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.department'), + 'visible' => false, + 'formatter' => 'departmentNameLinkFormatter', ], [ - "field" => "assigned_asset", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('admin/licenses/form.asset'), - "visible" => true, - "formatter" => "hardwareLinkObjFormatter" + 'field' => 'assigned_asset', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('admin/licenses/form.asset'), + 'visible' => true, + 'formatter' => 'hardwareLinkObjFormatter', ], [ - "field" => "location", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.location'), - "visible" => true, - "formatter" => "locationsLinkObjFormatter" + 'field' => 'location', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.location'), + 'visible' => true, + 'formatter' => 'locationsLinkObjFormatter', ], [ - "field" => "checkincheckout", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.checkin').'/'.trans('general.checkout'), - "visible" => true, - "formatter" => "licenseSeatInOutFormatter" - ] + 'field' => 'checkincheckout', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.checkin').'/'.trans('general.checkout'), + 'visible' => true, + 'formatter' => 'licenseSeatInOutFormatter', + ], ]; return json_encode($layout); } - /** * Link to this licenses Name * @return string */ public function nameUrl() { - return (string)link_to_route('licenses.show', $this->name, $this->id); + return (string) link_to_route('licenses.show', $this->name, $this->id); } /** @@ -266,14 +262,13 @@ class LicensePresenter extends Presenter return $this->name; } - /** * Link to this licenses serial * @return string */ public function serialUrl() { - return (string) link_to('/licenses/'.$this->id, mb_strimwidth($this->serial, 0, 50, "...")); + return (string) link_to('/licenses/'.$this->id, mb_strimwidth($this->serial, 0, 50, '...')); } /** diff --git a/app/Presenters/LicenseSeatPresenter.php b/app/Presenters/LicenseSeatPresenter.php index 03f02cbd72..ed706f95a7 100644 --- a/app/Presenters/LicenseSeatPresenter.php +++ b/app/Presenters/LicenseSeatPresenter.php @@ -4,7 +4,6 @@ namespace App\Presenters; /** * Class LicensePresenter - * @package App\Presenters */ class LicenseSeatPresenter extends Presenter { diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php index 9a91e2af2a..b327cf07b3 100644 --- a/app/Presenters/LocationPresenter.php +++ b/app/Presenters/LocationPresenter.php @@ -4,11 +4,9 @@ namespace App\Presenters; /** * Class LocationPresenter - * @package App\Presenters */ class LocationPresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -18,163 +16,161 @@ class LocationPresenter extends Presenter $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/locations/table.name'), - "visible" => true, - "formatter" => "locationsLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/locations/table.name'), + 'visible' => true, + 'formatter' => 'locationsLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => true, - "formatter" => "imageFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', ], [ - "field" => "parent", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.parent'), - "visible" => true, - "formatter" => "locationsLinkObjFormatter" + 'field' => 'parent', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.parent'), + 'visible' => true, + 'formatter' => 'locationsLinkObjFormatter', ], [ - "field" => "assets_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.assets_rtd'), - "visible" => true, + 'field' => 'assets_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.assets_rtd'), + 'visible' => true, ], [ - "field" => "assigned_assets_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.assets_checkedout'), - "visible" => true, + 'field' => 'assigned_assets_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.assets_checkedout'), + 'visible' => true, ], [ - "field" => "users_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.people'), - "visible" => true, + 'field' => 'users_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.people'), + 'visible' => true, ], [ - "field" => "currency", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.currency'), - "visible" => true, + 'field' => 'currency', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.currency'), + 'visible' => true, ], [ - "field" => "address", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.address'), - "visible" => true, + 'field' => 'address', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.address'), + 'visible' => true, ], [ - "field" => "city", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.city'), - "visible" => true, + 'field' => 'city', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.city'), + 'visible' => true, ], [ - "field" => "state", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.state'), - "visible" => true, + 'field' => 'state', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.state'), + 'visible' => true, ], [ - "field" => "zip", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.zip'), - "visible" => false, + 'field' => 'zip', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.zip'), + 'visible' => false, ], [ - "field" => "country", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.country'), - "visible" => false, + 'field' => 'country', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.country'), + 'visible' => false, ], [ - "field" => "ldap_ou", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/locations/table.ldap_ou'), - "visible" => false, + 'field' => 'ldap_ou', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/locations/table.ldap_ou'), + 'visible' => false, ], [ - "field" => "manager", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.manager'), - "visible" => false, - "formatter" => 'usersLinkObjFormatter' + 'field' => 'manager', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.manager'), + 'visible' => false, + 'formatter' => 'usersLinkObjFormatter', ], [ - "field" => "created_at", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.created_at'), - "visible" => false, - 'formatter' => 'dateDisplayFormatter' + 'field' => 'created_at', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.created_at'), + 'visible' => false, + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "locationsActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'locationsActionsFormatter', + ], ]; return json_encode($layout); } - - /** * Link to this locations name * @return string */ public function nameUrl() { - return (string)link_to_route('locations.show', $this->name, $this->id); + return (string) link_to_route('locations.show', $this->name, $this->id); } /** @@ -199,8 +195,9 @@ class LocationPresenter extends Presenter { return ''; } - - public function fullName() { + + public function fullName() + { return $this->name; } } diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php index c78da85f00..d2c3a93456 100644 --- a/app/Presenters/ManufacturerPresenter.php +++ b/app/Presenters/ManufacturerPresenter.php @@ -4,11 +4,9 @@ namespace App\Presenters; /** * Class ManufacturerPresenter - * @package App\Presenters */ class ManufacturerPresenter extends Presenter { - /** * Json Column Layout for bootstrap table * @return string @@ -18,131 +16,129 @@ class ManufacturerPresenter extends Presenter $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/manufacturers/table.name'), - "visible" => true, - "formatter" => "manufacturersLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/manufacturers/table.name'), + 'visible' => true, + 'formatter' => 'manufacturersLinkFormatter', ], [ - "field" => "image", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.image'), - "visible" => true, - "formatter" => "imageFormatter" + 'field' => 'image', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.image'), + 'visible' => true, + 'formatter' => 'imageFormatter', ], [ - "field" => "url", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/manufacturers/table.url'), - "visible" => true, - "formatter" => "linkFormatter" + 'field' => 'url', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/manufacturers/table.url'), + 'visible' => true, + 'formatter' => 'linkFormatter', ], [ - "field" => "support_url", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/manufacturers/table.support_url'), - "visible" => true, - "formatter" => "linkFormatter" + 'field' => 'support_url', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/manufacturers/table.support_url'), + 'visible' => true, + 'formatter' => 'linkFormatter', ], [ - "field" => "support_phone", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/manufacturers/table.support_phone'), - "visible" => true, - "formatter" => "phoneFormatter" + 'field' => 'support_phone', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/manufacturers/table.support_phone'), + 'visible' => true, + 'formatter' => 'phoneFormatter', ], [ - "field" => "support_email", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/manufacturers/table.support_email'), - "visible" => true, - "formatter" => "emailFormatter" + 'field' => 'support_email', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/manufacturers/table.support_email'), + 'visible' => true, + 'formatter' => 'emailFormatter', ], [ - "field" => "assets_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => ' ' + 'field' => 'assets_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => ' ' .'', - "visible" => true, + 'visible' => true, ], [ - "field" => "licenses_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => ' ' + 'field' => 'licenses_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => ' ' .'', - "visible" => true, + 'visible' => true, ], [ - "field" => "consumables_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => ' ' + 'field' => 'consumables_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => ' ' .'', - "visible" => true, + 'visible' => true, ], [ - "field" => "accessories_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => ' ' + 'field' => 'accessories_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => ' ' .'', - "visible" => true, + 'visible' => true, ], [ - "field" => "created_at", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.created_at'), - "visible" => false, - 'formatter' => 'dateDisplayFormatter' + 'field' => 'created_at', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.created_at'), + 'visible' => false, + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "manufacturersActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'manufacturersActionsFormatter', + ], ]; return json_encode($layout); } - - /** * Link to this manufacturers name * @return string diff --git a/app/Presenters/PredefinedKitPresenter.php b/app/Presenters/PredefinedKitPresenter.php index dddaff069f..b9fa5b5ae5 100644 --- a/app/Presenters/PredefinedKitPresenter.php +++ b/app/Presenters/PredefinedKitPresenter.php @@ -4,7 +4,6 @@ namespace App\Presenters; /** * Class LicensePresenter - * @package App\Presenters */ class PredefinedKitPresenter extends Presenter { @@ -16,45 +15,43 @@ class PredefinedKitPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => 'Name', // TODO: trans - "formatter" => "kitsLinkFormatter" - ] + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => 'Name', // TODO: trans + 'formatter' => 'kitsLinkFormatter', + ], ]; $layout[] = [ - "field" => "checkincheckout", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.checkin').'/'.trans('general.checkout'), - "visible" => true, - "formatter" => "kitsInOutFormatter", + 'field' => 'checkincheckout', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.checkin').'/'.trans('general.checkout'), + 'visible' => true, + 'formatter' => 'kitsInOutFormatter', ]; $layout[] = [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "kitsActionsFormatter", + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'kitsActionsFormatter', ]; - return json_encode($layout); } - /** * Json Column Layout for bootstrap table of kit models * @return string @@ -63,215 +60,213 @@ class PredefinedKitPresenter extends Presenter { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "pivot_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'pivot_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "owner_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'owner_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => 'Name', // TODO: trans - "formatter" => "modelsLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => 'Name', // TODO: trans + 'formatter' => 'modelsLinkFormatter', ], [ - "field" => "quantity", - "searchable" => false, - "sortable" => false, - "title" => 'Quantity', // TODO: trans + 'field' => 'quantity', + 'searchable' => false, + 'sortable' => false, + 'title' => 'Quantity', // TODO: trans ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "kits_modelsActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'kits_modelsActionsFormatter', + ], ]; return json_encode($layout); } /** - * Json Column Layout for bootstrap table of kit licenses - * @return string - */ + * Json Column Layout for bootstrap table of kit licenses + * @return string + */ public static function dataTableLicenses() { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "pivot_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'pivot_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "owner_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'owner_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => 'Name', // TODO: trans - "formatter" => "licensesLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => 'Name', // TODO: trans + 'formatter' => 'licensesLinkFormatter', ], [ - "field" => "quantity", - "searchable" => false, - "sortable" => false, - "title" => 'Quantity', // TODO: trans + 'field' => 'quantity', + 'searchable' => false, + 'sortable' => false, + 'title' => 'Quantity', // TODO: trans ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "kits_licensesActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'kits_licensesActionsFormatter', + ], ]; return json_encode($layout); } /** - * Json Column Layout for bootstrap table of kit accessories - * @return string - */ + * Json Column Layout for bootstrap table of kit accessories + * @return string + */ public static function dataTableAccessories() { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "pivot_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'pivot_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "owner_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'owner_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => 'Name', // TODO: trans - "formatter" => "accessoriesLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => 'Name', // TODO: trans + 'formatter' => 'accessoriesLinkFormatter', ], [ - "field" => "quantity", - "searchable" => false, - "sortable" => false, - "title" => 'Quantity', // TODO: trans + 'field' => 'quantity', + 'searchable' => false, + 'sortable' => false, + 'title' => 'Quantity', // TODO: trans ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "kits_accessoriesActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'kits_accessoriesActionsFormatter', + ], ]; return json_encode($layout); } - /** - * Json Column Layout for bootstrap table of kit consumables - * @return string - */ + * Json Column Layout for bootstrap table of kit consumables + * @return string + */ public static function dataTableConsumables() { $layout = [ [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "pivot_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'pivot_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "owner_id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'owner_id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => 'Name', // TODO: trans - "formatter" => "consumablesLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => 'Name', // TODO: trans + 'formatter' => 'consumablesLinkFormatter', ], [ - "field" => "quantity", - "searchable" => false, - "sortable" => false, - "title" => 'Quantity', // TODO: trans + 'field' => 'quantity', + 'searchable' => false, + 'sortable' => false, + 'title' => 'Quantity', // TODO: trans ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "formatter" => "kits_consumablesActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'kits_consumablesActionsFormatter', + ], ]; return json_encode($layout); } - /** * Link to this kit Name * @return string */ public function nameUrl() { - return (string)link_to_route('kits.show', $this->name, $this->id); + return (string) link_to_route('kits.show', $this->name, $this->id); } /** diff --git a/app/Presenters/Presentable.php b/app/Presenters/Presentable.php index 19e9526599..15da2ba04f 100644 --- a/app/Presenters/Presentable.php +++ b/app/Presenters/Presentable.php @@ -4,21 +4,18 @@ namespace App\Presenters; trait Presentable { - protected $presenterInterface; public function present() { - - if (!$this->presenter || !class_exists($this->presenter)) { + if (! $this->presenter || ! class_exists($this->presenter)) { throw new \Exception('Presenter class does not exist'); } - if (!isset($this->presenterInterface)) { + if (! isset($this->presenterInterface)) { $this->presenterInterface = new $this->presenter($this); } return $this->presenterInterface; - } } diff --git a/app/Presenters/Presenter.php b/app/Presenters/Presenter.php index c47c2547d9..85fe2338ae 100644 --- a/app/Presenters/Presenter.php +++ b/app/Presenters/Presenter.php @@ -6,7 +6,6 @@ use App\Models\SnipeModel; abstract class Presenter { - /** * @var SnipeModel */ @@ -33,6 +32,7 @@ abstract class Presenter if ($model->category) { return $model->category->present()->nameUrl(); } + return ''; } @@ -41,6 +41,7 @@ abstract class Presenter if ($this->model->location) { return $this->model->location->present()->nameUrl(); } + return ''; } @@ -49,8 +50,10 @@ abstract class Presenter if ($this->model->company) { return $this->model->company->present()->nameUrl(); } + return ''; } + public function manufacturerUrl() { $model = $this->model; @@ -62,6 +65,7 @@ abstract class Presenter if ($model->manufacturer) { return $model->manufacturer->present()->nameUrl(); } + return ''; } diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 77d24265fe..e2164b891b 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -10,12 +10,9 @@ use Illuminate\Support\Facades\Storage; /** * Class UserPresenter - * @package App\Presenters */ class UserPresenter extends Presenter { - - /** * Json Column Layout for bootstrap table * @return string @@ -24,152 +21,152 @@ class UserPresenter extends Presenter { $layout = [ [ - "field" => "checkbox", - "checkbox" => true + 'field' => 'checkbox', + 'checkbox' => true, ], [ - "field" => "id", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.id'), - "visible" => false + 'field' => 'id', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.id'), + 'visible' => false, ], [ - "field" => "avatar", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => 'Avatar', - "visible" => false, - "formatter" => "imageFormatter" + 'field' => 'avatar', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => 'Avatar', + 'visible' => false, + 'formatter' => 'imageFormatter', ], [ - "field" => "company", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/companies/table.title'), - "visible" => false, - "formatter" => "companiesLinkObjFormatter" + 'field' => 'company', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/companies/table.title'), + 'visible' => false, + 'formatter' => 'companiesLinkObjFormatter', ], [ - "field" => "name", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/users/table.name'), - "visible" => true, - "formatter" => "usersLinkFormatter" + 'field' => 'name', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/users/table.name'), + 'visible' => true, + 'formatter' => 'usersLinkFormatter', ], [ - "field" => "jobtitle", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.title'), - "visible" => true, - "formatter" => "usersLinkFormatter" + 'field' => 'jobtitle', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.title'), + 'visible' => true, + 'formatter' => 'usersLinkFormatter', ], [ - "field" => "email", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.email'), - "visible" => true, - "formatter" => "emailFormatter" + 'field' => 'email', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.email'), + 'visible' => true, + 'formatter' => 'emailFormatter', ], [ - "field" => "phone", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.phone'), - "visible" => true, - "formatter" => "phoneFormatter", + 'field' => 'phone', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.phone'), + 'visible' => true, + 'formatter' => 'phoneFormatter', ], [ - "field" => "address", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.address'), - "visible" => false, + 'field' => 'address', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.address'), + 'visible' => false, ], [ - "field" => "city", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.city'), - "visible" => false, + 'field' => 'city', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.city'), + 'visible' => false, ], [ - "field" => "state", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.state'), - "visible" => false, + 'field' => 'state', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.state'), + 'visible' => false, ], [ - "field" => "country", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.country'), - "visible" => false, + 'field' => 'country', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.country'), + 'visible' => false, ], [ - "field" => "zip", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.zip'), - "visible" => false, + 'field' => 'zip', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.zip'), + 'visible' => false, ], [ - "field" => "username", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.username'), - "visible" => true, - "formatter" => "usersLinkFormatter" + 'field' => 'username', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.username'), + 'visible' => true, + 'formatter' => 'usersLinkFormatter', ], [ - "field" => "employee_num", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.employee_num'), - "visible" => false + 'field' => 'employee_num', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.employee_num'), + 'visible' => false, ], [ - "field" => "department", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.department'), - "visible" => true, - "formatter" => "departmentsLinkObjFormatter" + 'field' => 'department', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.department'), + 'visible' => true, + 'formatter' => 'departmentsLinkObjFormatter', ], [ - "field" => "location", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/table.location'), - "visible" => true, - "formatter" => "locationsLinkObjFormatter" + 'field' => 'location', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/table.location'), + 'visible' => true, + 'formatter' => 'locationsLinkObjFormatter', ], [ - "field" => "manager", - "searchable" => true, - "sortable" => true, - "title" => trans('admin/users/table.manager'), - "visible" => true, - "formatter" => "usersLinkObjFormatter" + 'field' => 'manager', + 'searchable' => true, + 'sortable' => true, + 'title' => trans('admin/users/table.manager'), + 'visible' => true, + 'formatter' => 'usersLinkObjFormatter', ], [ 'field' => 'assets_count', @@ -182,126 +179,127 @@ class UserPresenter extends Presenter 'visible' => true, ], [ - "field" => "licenses_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, + 'field' => 'licenses_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, 'class' => 'css-license', - "title" => 'License', - "visible" => true, + 'title' => 'License', + 'visible' => true, ], [ - "field" => "consumables_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, + 'field' => 'consumables_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, 'class' => 'css-consumable', - "title" => 'Consumables', - "visible" => true, + 'title' => 'Consumables', + 'visible' => true, ], [ - "field" => "accessories_count", - "searchable" => false, - "sortable" => true, - "switchable" => true, + 'field' => 'accessories_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, 'class' => 'css-accessory', - "title" => 'Accessories', - "visible" => true, + 'title' => 'Accessories', + 'visible' => true, ], [ - "field" => "notes", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.notes'), - "visible" => true, + 'field' => 'notes', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.notes'), + 'visible' => true, ], [ - "field" => "groups", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('general.groups'), - "visible" => true, - 'formatter' => 'groupsFormatter' + 'field' => 'groups', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.groups'), + 'visible' => true, + 'formatter' => 'groupsFormatter', ], [ - "field" => "ldap_import", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/settings/general.ldap_enabled'), - "visible" => false, - 'formatter' => 'trueFalseFormatter' + 'field' => 'ldap_import', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/settings/general.ldap_enabled'), + 'visible' => false, + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "two_factor_enrolled", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('admin/users/general.two_factor_enrolled'), - "visible" => false, - 'formatter' => 'trueFalseFormatter' + 'field' => 'two_factor_enrolled', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/general.two_factor_enrolled'), + 'visible' => false, + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "two_factor_activated", - "searchable" => false, - "sortable" => false, - "switchable" => true, - "title" => trans('admin/users/general.two_factor_active'), - "visible" => false, - 'formatter' => 'trueFalseFormatter' + 'field' => 'two_factor_activated', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('admin/users/general.two_factor_active'), + 'visible' => false, + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "activated", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.login_enabled'), - "visible" => true, - 'formatter' => 'trueFalseFormatter' + 'field' => 'activated', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.login_enabled'), + 'visible' => true, + 'formatter' => 'trueFalseFormatter', ], [ - "field" => "created_at", - "searchable" => true, - "sortable" => true, - "switchable" => true, - "title" => trans('general.created_at'), - "visible" => false, - 'formatter' => 'dateDisplayFormatter' + 'field' => 'created_at', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.created_at'), + 'visible' => false, + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "last_login", - "searchable" => false, - "sortable" => true, - "switchable" => true, - "title" => trans('general.last_login'), - "visible" => false, - 'formatter' => 'dateDisplayFormatter' + 'field' => 'last_login', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('general.last_login'), + 'visible' => false, + 'formatter' => 'dateDisplayFormatter', ], [ - "field" => "actions", - "searchable" => false, - "sortable" => false, - "switchable" => false, - "title" => trans('table.actions'), - "visible" => true, - "formatter" => "usersActionsFormatter", - ] + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'visible' => true, + 'formatter' => 'usersActionsFormatter', + ], ]; return json_encode($layout); } - public function emailLink() { if ($this->email) { return ''.$this->email.'' .''; } + return ''; } + /** * Returns the user full name, it simply concatenates * the user first and last name. @@ -322,6 +320,7 @@ class UserPresenter extends Presenter { return $this->fullName(); } + /** * Returns the user Gravatar image url. * @@ -329,25 +328,24 @@ class UserPresenter extends Presenter */ public function gravatar() { - - if ($this->avatar) { return Storage::disk('public')->url('avatars/'.e($this->avatar)); } - if (Setting::getSettings()->load_remote=='1') { - if ($this->model->gravatar!='') { + if (Setting::getSettings()->load_remote == '1') { + if ($this->model->gravatar != '') { $gravatar = md5(strtolower(trim($this->model->gravatar))); - return "//gravatar.com/avatar/".$gravatar; - } elseif ($this->email!='') { + + return '//gravatar.com/avatar/'.$gravatar; + } elseif ($this->email != '') { $gravatar = md5(strtolower(trim($this->email))); - return "//gravatar.com/avatar/".$gravatar; + + return '//gravatar.com/avatar/'.$gravatar; } } // Set a fun, gender-neutral default icon return url('/').'/img/default-sm.png'; - } /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c2651c3aef..d05ab5fef9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -1,6 +1,6 @@ app->environment('production')) && (config('logging.channels.rollbar.access_token'))) { + if (($this->app->environment('production')) && (config('logging.channels.rollbar.access_token'))) { $this->app->register(\Rollbar\Laravel\RollbarServiceProvider::class); } - } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index b24df173c3..31a328abfe 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -80,14 +80,12 @@ class AuthServiceProvider extends ServiceProvider */ public function boot() { - $this->commands([ \Laravel\Passport\Console\InstallCommand::class, \Laravel\Passport\Console\ClientCommand::class, \Laravel\Passport\Console\KeysCommand::class, ]); - $this->registerPolicies(); Passport::routes(); Passport::tokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); @@ -95,7 +93,6 @@ class AuthServiceProvider extends ServiceProvider Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); Passport::withCookieSerialization(); - // -------------------------------- // BEFORE ANYTHING ELSE // -------------------------------- @@ -117,42 +114,40 @@ class AuthServiceProvider extends ServiceProvider } }); - // Can the user import CSVs? Gate::define('import', function ($user) { - if ($user->hasAccess('import') ) { + if ($user->hasAccess('import')) { return true; } }); - - # ----------------------------------------- - # Reports - # ----------------------------------------- + // ----------------------------------------- + // Reports + // ----------------------------------------- Gate::define('reports.view', function ($user) { if ($user->hasAccess('reports.view')) { return true; } }); - # ----------------------------------------- - # Self - # ----------------------------------------- + // ----------------------------------------- + // Self + // ----------------------------------------- Gate::define('self.two_factor', function ($user) { if (($user->hasAccess('self.two_factor')) || ($user->hasAccess('admin'))) { return true; } }); - Gate::define('self.api', function($user) { + Gate::define('self.api', function ($user) { return $user->hasAccess('self.api'); }); - Gate::define('self.edit_location', function($user) { + Gate::define('self.edit_location', function ($user) { return $user->hasAccess('self.edit_location'); }); - Gate::define('self.checkout_assets', function($user) { + Gate::define('self.checkout_assets', function ($user) { return $user->hasAccess('self.checkout_assets'); }); @@ -167,7 +162,7 @@ class AuthServiceProvider extends ServiceProvider || $user->can('view', Company::class) || $user->can('view', Manufacturer::class) || $user->can('view', CustomField::class) - || $user->can('view', CustomFieldset::class) + || $user->can('view', CustomFieldset::class) || $user->can('view', Depreciation::class); }); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a67715fc12..6a454d28eb 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -30,6 +30,6 @@ class EventServiceProvider extends ServiceProvider */ protected $subscribe = [ LogListener::class, - CheckoutableListener::class + CheckoutableListener::class, ]; } diff --git a/app/Providers/LdapServiceProvider.php b/app/Providers/LdapServiceProvider.php index 5b3e71761c..58f93096d3 100644 --- a/app/Providers/LdapServiceProvider.php +++ b/app/Providers/LdapServiceProvider.php @@ -1,12 +1,13 @@ - 'saml.metadata', - 'uses' => 'Auth\SamlController@metadata' ] + 'uses' => 'Auth\SamlController@metadata', ] ); Route::match( @@ -31,14 +31,14 @@ class SamlServiceProvider extends ServiceProvider 'acs', [ 'as' => 'saml.acs', - 'uses' => 'Auth\SamlController@acs' ] + 'uses' => 'Auth\SamlController@acs', ] ); Route::get( 'sls', [ 'as' => 'saml.sls', - 'uses' => 'Auth\SamlController@sls' ] + 'uses' => 'Auth\SamlController@sls', ] ); }); @@ -46,14 +46,12 @@ class SamlServiceProvider extends ServiceProvider 'login/saml', [ 'as' => 'saml.login', - 'uses' => 'Auth\SamlController@login' ] + 'uses' => 'Auth\SamlController@login', ] ); - Route::group(['prefix' => 'admin','middleware' => ['web','auth', 'authorize:superuser']], function () { - - Route::get('saml', ['as' => 'settings.saml.index','uses' => 'SettingsController@getSamlSettings' ]); - Route::post('saml', ['as' => 'settings.saml.save','uses' => 'SettingsController@postSamlSettings' ]); - + Route::group(['prefix' => 'admin', 'middleware' => ['web', 'auth', 'authorize:superuser']], function () { + Route::get('saml', ['as' => 'settings.saml.index', 'uses' => 'SettingsController@getSamlSettings']); + Route::post('saml', ['as' => 'settings.saml.save', 'uses' => 'SettingsController@postSamlSettings']); }); }); } diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php index adf25b6435..be9928282c 100644 --- a/app/Providers/SettingsServiceProvider.php +++ b/app/Providers/SettingsServiceProvider.php @@ -1,8 +1,9 @@ composer('*', function ($view) { $view->with('snipeSettings', Setting::getSettings()); }); - /** * Set some common variables so that they're globally available. * The paths should always be public (versus private uploads) */ - - // Model paths and URLs - \App::singleton('assets_upload_path', function(){ + \App::singleton('assets_upload_path', function () { return 'assets/'; }); - \App::singleton('accessories_upload_path', function() { + \App::singleton('accessories_upload_path', function () { return 'public/uploads/accessories/'; }); - \App::singleton('models_upload_path', function(){ + \App::singleton('models_upload_path', function () { return 'models/'; }); - \App::singleton('models_upload_url', function(){ + \App::singleton('models_upload_url', function () { return 'models/'; }); // Categories - \App::singleton('categories_upload_path', function(){ + \App::singleton('categories_upload_path', function () { return 'categories/'; }); - \App::singleton('categories_upload_url', function(){ + \App::singleton('categories_upload_url', function () { return 'categories/'; }); // Locations - \App::singleton('locations_upload_path', function(){ + \App::singleton('locations_upload_path', function () { return 'locations/'; }); - \App::singleton('locations_upload_url', function(){ + \App::singleton('locations_upload_url', function () { return 'locations/'; }); // Users - \App::singleton('users_upload_path', function(){ + \App::singleton('users_upload_path', function () { return 'avatars/'; }); - \App::singleton('users_upload_url', function(){ + \App::singleton('users_upload_url', function () { return 'users/'; }); // Manufacturers - \App::singleton('manufacturers_upload_path', function(){ + \App::singleton('manufacturers_upload_path', function () { return 'manufacturers/'; }); - \App::singleton('manufacturers_upload_url', function(){ + \App::singleton('manufacturers_upload_url', function () { return 'manufacturers/'; }); // Suppliers - \App::singleton('suppliers_upload_path', function(){ + \App::singleton('suppliers_upload_path', function () { return 'suppliers/'; }); - \App::singleton('suppliers_upload_url', function(){ + \App::singleton('suppliers_upload_url', function () { return 'suppliers/'; }); // Departments - \App::singleton('departments_upload_path', function(){ + \App::singleton('departments_upload_path', function () { return 'departments/'; }); - \App::singleton('departments_upload_url', function(){ + \App::singleton('departments_upload_url', function () { return 'departments/'; }); // Company paths and URLs - \App::singleton('companies_upload_path', function(){ + \App::singleton('companies_upload_path', function () { return 'companies/'; }); - \App::singleton('companies_upload_url', function(){ + \App::singleton('companies_upload_url', function () { return 'companies/'; }); // Accessories paths and URLs - \App::singleton('accessories_upload_path', function(){ + \App::singleton('accessories_upload_path', function () { return 'accessories/'; }); - \App::singleton('accessories_upload_url', function(){ + \App::singleton('accessories_upload_url', function () { return 'accessories/'; }); // Consumables paths and URLs - \App::singleton('consumables_upload_path', function(){ + \App::singleton('consumables_upload_path', function () { return 'consumables/'; }); - \App::singleton('consumables_upload_url', function(){ + \App::singleton('consumables_upload_url', function () { return 'consumables/'; }); - // Components paths and URLs - \App::singleton('components_upload_path', function(){ + \App::singleton('components_upload_path', function () { return 'components/'; }); - \App::singleton('components_upload_url', function(){ + \App::singleton('components_upload_url', function () { return 'components/'; }); - - // Set the monetary locale to the configured locale to make helper::parseFloat work. setlocale(LC_MONETARY, config('app.locale')); setlocale(LC_NUMERIC, config('app.locale')); - } /** @@ -162,6 +154,5 @@ class SettingsServiceProvider extends ServiceProvider */ public function register() { - } } diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php index ea9c322765..d68c79a268 100644 --- a/app/Providers/ValidationServiceProvider.php +++ b/app/Providers/ValidationServiceProvider.php @@ -1,4 +1,5 @@ 'email'); - $messages = array( - 'alert_email.*'=>trans('validation.email_array') - ); + $rules = ['alert_email.*'=>'email']; + $messages = [ + 'alert_email.*'=>trans('validation.email_array'), + ]; $validator = Validator::make($email_to_validate, $rules, $messages); return $validator->passes(); - }); - // Unique only if undeleted // This works around the use case where multiple deleted items have the same unique attribute. // (I think this is a bug in Laravel's validator?) Validator::extend('unique_undeleted', function ($attribute, $value, $parameters, $validator) { - if (count($parameters)) { $count = DB::table($parameters[0])->select('id')->where($attribute, '=', $value)->whereNull('deleted_at')->where('id', '!=', $parameters[1])->count(); + return $count < 1; } - }); - // Prevent circular references // // Example usage in Location model where parent_id references another Location: @@ -83,7 +79,7 @@ class ValidationServiceProvider extends ServiceProvider $data_pk = array_get($data, $pk); $value_pk = $value; - // If we’re editing an existing model and there is a parent value set… + // If we’re editing an existing model and there is a parent value set… while ($data_pk && $value_pk) { // It’s not valid for any parent id to be equal to the existing model’s id @@ -103,7 +99,6 @@ class ValidationServiceProvider extends ServiceProvider return true; }); - // Yo dawg. I heard you like validators. // This validates the custom validator regex in custom fields. // We're just checking that the regex won't throw an exception, not @@ -112,7 +107,7 @@ class ValidationServiceProvider extends ServiceProvider Validator::extend('valid_regex', function ($attribute, $value, $parameters, $validator) { // Make sure it's not just an ANY format - if ($value!='') { + if ($value != '') { // Check that the string starts with regex: if (strpos($value, 'regex:') === false) { @@ -122,55 +117,50 @@ class ValidationServiceProvider extends ServiceProvider $test_string = 'My hovercraft is full of eels'; // We have to stip out the regex: part here to check with preg_match - $test_pattern = str_replace('regex:','', $value); + $test_pattern = str_replace('regex:', '', $value); try { preg_match($test_pattern, $test_string); + return true; } catch (\Exception $e) { return false; } - } + return true; - }); - // This ONLY works for create/update user forms, since the Update Profile Password form doesn't // include any of these additional validator fields Validator::extend('disallow_same_pwd_as_user_fields', function ($attribute, $value, $parameters, $validator) { - $data = $validator->getData(); - if (array_key_exists("username", $data)) { + if (array_key_exists('username', $data)) { if ($data['username'] == $data['password']) { return false; } } - if (array_key_exists("email", $data)) { + if (array_key_exists('email', $data)) { if ($data['email'] == $data['password']) { return false; } } - if (array_key_exists("first_name", $data)) { + if (array_key_exists('first_name', $data)) { if ($data['first_name'] == $data['password']) { return false; } } - if (array_key_exists("last_name", $data)) { + if (array_key_exists('last_name', $data)) { if ($data['last_name'] == $data['password']) { return false; } } - - return true; - - + return true; }); Validator::extend('letters', function ($attribute, $value, $parameters) { @@ -196,7 +186,7 @@ class ValidationServiceProvider extends ServiceProvider // $validator gives us proper access to the rest of the actual data $data = $validator->getData(); - if(array_key_exists("id", $data)) { + if (array_key_exists('id', $data)) { if ($value && $value == $data['id']) { // if you definitely have an ID - you're saving an existing user - and your ID matches your manager's ID - fail. return false; @@ -209,8 +199,6 @@ class ValidationServiceProvider extends ServiceProvider return true; } }); - - } /** @@ -220,6 +208,5 @@ class ValidationServiceProvider extends ServiceProvider */ public function register() { - } } diff --git a/app/Services/LdapAd.php b/app/Services/LdapAd.php index 4bfef3d3ed..186a2c7a9d 100644 --- a/app/Services/LdapAd.php +++ b/app/Services/LdapAd.php @@ -47,9 +47,9 @@ class LdapAd extends LdapAdConfiguration '262688', // 0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED '328192', // 0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD '328224', // 0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD - '4260352',// 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH - '1049088',// 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED - '1114624',// 0x110200 NORMAL_ACCOUNT, NOT_DELEGATED, DONT_EXPIRE_PASSWORD + '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH + '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED + '1114624', // 0x110200 NORMAL_ACCOUNT, NOT_DELEGATED, DONT_EXPIRE_PASSWORD ]; /** @@ -86,8 +86,8 @@ class LdapAd extends LdapAdConfiguration } parent::init(); - if($this->isLdapEnabled()) { - if($this->ldapSettings['is_ad'] == 0 ) { //only for NON-AD setups! + if ($this->isLdapEnabled()) { + if ($this->ldapSettings['is_ad'] == 0) { //only for NON-AD setups! $this->ldapConfig['account_prefix'] = $this->ldapSettings['ldap_auth_filter_query']; $this->ldapConfig['account_suffix'] = ','.$this->ldapConfig['base_dn']; } /* @@ -98,16 +98,19 @@ class LdapAd extends LdapAdConfiguration */ $this->ldap = new Adldap(); $this->ldap->addProvider($this->ldapConfig); + return true; } + return false; } - public function __construct() { + public function __construct() + { $this->init(); } - /** + /** * Create a user if they successfully login to the LDAP server. * * @author Wes Hulette @@ -124,7 +127,7 @@ class LdapAd extends LdapAdConfiguration public function ldapLogin(string $username, string $password): User { if ($this->ldapSettings['ad_append_domain']) { //if you're using 'userprincipalname', don't check the ad_append_domain checkbox - $login_username = $username . '@' . $this->ldapSettings['ad_domain']; // I feel like could can be solved with the 'suffix' feature? Then this would be easier. + $login_username = $username.'@'.$this->ldapSettings['ad_domain']; // I feel like could can be solved with the 'suffix' feature? Then this would be easier. } else { $login_username = $username; } @@ -137,18 +140,17 @@ class LdapAd extends LdapAdConfiguration if (($this->ldap) && ($this->ldap->auth()->attempt($login_username, $password, $bind_as_user) === false)) { throw new Exception('Unable to validate user credentials!'); - } + } // Should we sync the logged in user Log::debug('Attempting to find user in LDAP directory'); $record = $this->ldap->search()->findBy($this->ldapSettings['ldap_username_field'], $username); - if($record) { + if ($record) { if ($this->isLdapSync($record)) { $this->syncUserLdapLogin($record, $password); } - } - else { + } else { throw new Exception('Unable to find user in LDAP directory!'); } @@ -158,7 +160,7 @@ class LdapAd extends LdapAdConfiguration /* Above, I could've just done ->firstOrFail() which would've been cleaner, but it would've been miserable to troubleshoot if it ever came up (giving a really generic and untraceable error message) */ - if (!$user) { + if (! $user) { throw new Exception("User is either deleted, not activated (can't log in), not from LDAP, or can't be found in database"); } @@ -178,19 +180,19 @@ class LdapAd extends LdapAdConfiguration * * @return null|\App\Models\User */ - public function processUser(AdldapUser $user, ?Collection $defaultLocation=null, ?Collection $mappedLocations=null): ?User + public function processUser(AdldapUser $user, ?Collection $defaultLocation = null, ?Collection $mappedLocations = null): ?User { // Only sync active users <- I think this actually means 'existing', not 'activated/deactivated' - if(!$user) { + if (! $user) { return null; } $snipeUser = []; - $snipeUser['username'] = $user->{$this->ldapSettings['ldap_username_field']}[0] ?? ''; + $snipeUser['username'] = $user->{$this->ldapSettings['ldap_username_field']}[0] ?? ''; $snipeUser['employee_number'] = $user->{$this->ldapSettings['ldap_emp_num']}[0] ?? ''; - $snipeUser['lastname'] = $user->{$this->ldapSettings['ldap_lname_field']}[0] ?? ''; - $snipeUser['firstname'] = $user->{$this->ldapSettings['ldap_fname_field']}[0] ?? ''; - $snipeUser['email'] = $user->{$this->ldapSettings['ldap_email']}[0] ?? ''; - $snipeUser['title'] = $user->getTitle() ?? ''; + $snipeUser['lastname'] = $user->{$this->ldapSettings['ldap_lname_field']}[0] ?? ''; + $snipeUser['firstname'] = $user->{$this->ldapSettings['ldap_fname_field']}[0] ?? ''; + $snipeUser['email'] = $user->{$this->ldapSettings['ldap_email']}[0] ?? ''; + $snipeUser['title'] = $user->getTitle() ?? ''; $snipeUser['telephonenumber'] = $user->getTelephoneNumber() ?? ''; /* @@ -204,7 +206,7 @@ class LdapAd extends LdapAdConfiguration * and it *will* override the administrators previous choices. I think this is a fair compromise. */ $locationId = $this->getLocationId($user, $defaultLocation, $mappedLocations); - if ($locationId !== null ) { + if ($locationId !== null) { $snipeUser['location_id'] = $locationId; } @@ -233,29 +235,29 @@ class LdapAd extends LdapAdConfiguration $user = User::firstOrNew([ 'username' => $userInfo['username'], ]); - $user->username = $user->username ?? trim($userInfo['username']); - $user->password = $user->password ?? Helper::generateEncyrptedPassword(); - $user->first_name = trim($userInfo['firstname']); - $user->last_name = trim($userInfo['lastname']); - $user->email = trim($userInfo['email']); + $user->username = $user->username ?? trim($userInfo['username']); + $user->password = $user->password ?? Helper::generateEncyrptedPassword(); + $user->first_name = trim($userInfo['firstname']); + $user->last_name = trim($userInfo['lastname']); + $user->email = trim($userInfo['email']); $user->employee_num = trim($userInfo['employee_number']); - $user->jobtitle = trim($userInfo['title']); - $user->phone = trim($userInfo['telephonenumber']); - if (array_key_exists('activated',$userInfo)) { - $user->activated = $userInfo['activated']; - } else if ( !$user->exists ) { // no 'activated' flag was set or unset, *AND* this user is new - activate by default. + $user->jobtitle = trim($userInfo['title']); + $user->phone = trim($userInfo['telephonenumber']); + if (array_key_exists('activated', $userInfo)) { + $user->activated = $userInfo['activated']; + } elseif (! $user->exists) { // no 'activated' flag was set or unset, *AND* this user is new - activate by default. $user->activated = 1; } - if (array_key_exists('location_id',$userInfo)) { - $user->location_id = $userInfo['location_id']; + if (array_key_exists('location_id', $userInfo)) { + $user->location_id = $userInfo['location_id']; } // this is a new user - if (!isset($user->id)) { - $user->notes = 'Imported from LDAP'; + if (! isset($user->id)) { + $user->notes = 'Imported from LDAP'; } - $user->ldap_import = 1; + $user->ldap_import = 1; return $user; } @@ -285,7 +287,7 @@ class LdapAd extends LdapAdConfiguration $user->password = bcrypt($password); } - if (!$user->save()) { + if (! $user->save()) { Log::debug('Could not save user. '.$user->getErrors()); throw new Exception('Could not save user: '.$user->getErrors()); } @@ -304,13 +306,13 @@ class LdapAd extends LdapAdConfiguration */ private function isLdapSync(AdldapUser $user): bool { - if ( !$this->ldapSettings['ldap_active_flag']) { + if (! $this->ldapSettings['ldap_active_flag']) { return true; // always sync if you didn't define an 'active' flag } - - if ( $user->{$this->ldapSettings['ldap_active_flag']} && // if your LDAP user has the aforementioned flag as an attribute *AND* - count($user->{$this->ldapSettings['ldap_active_flag']}) == 1 && // if that attribute has exactly one value *AND* - strtolower($user->{$this->ldapSettings['ldap_active_flag']}[0]) == 'false') { // that value is the string 'false' (regardless of case), + + if ($user->{$this->ldapSettings['ldap_active_flag']} && // if your LDAP user has the aforementioned flag as an attribute *AND* + count($user->{$this->ldapSettings['ldap_active_flag']}) == 1 && // if that attribute has exactly one value *AND* + strtolower($user->{$this->ldapSettings['ldap_active_flag']}[0]) == 'false') { // that value is the string 'false' (regardless of case), return false; // then your user is *INACTIVE* - return false } // otherwise, return true @@ -338,8 +340,8 @@ class LdapAd extends LdapAdConfiguration * If the admin has set their own 'active flag' - respect that instead * (this may work to allow AD users to ignore the built-in UAC stuff that AD does) */ - if ($user->hasAttribute($user->getSchema()->userAccountControl()) && !$this->ldapSettings['ldap_active_flag']) { - \Log::debug('This is AD - userAccountControl is'. $user->getSchema()->userAccountControl()); + if ($user->hasAttribute($user->getSchema()->userAccountControl()) && ! $this->ldapSettings['ldap_active_flag']) { + \Log::debug('This is AD - userAccountControl is'.$user->getSchema()->userAccountControl()); $activeStatus = (in_array($user->getUserAccountControl(), self::AD_USER_ACCOUNT_CONTROL_FLAGS)) ? 1 : 0; } else { @@ -347,26 +349,27 @@ class LdapAd extends LdapAdConfiguration // If there is no activated flag, then we can't make any determination about activated/deactivated if (false == $this->ldapSettings['ldap_active_flag']) { \Log::debug('ldap_active_flag is false - no ldap_active_flag is set'); + return null; } // If there *is* an activated flag, then respect it *only* if it is actually present. If it's not there, ignore it. - if (!$user->hasAttribute($this->ldapSettings['ldap_active_flag'])) { + if (! $user->hasAttribute($this->ldapSettings['ldap_active_flag'])) { return null; // 'active' flag is defined, but does not exist on returned user record. So we don't know if they're active or not. } // if $user has the flag *AND* that flag has exactly one value - - if ( $user->{$this->ldapSettings['ldap_active_flag']} && count($user->{$this->ldapSettings['ldap_active_flag']}) == 1 ) { - + if ($user->{$this->ldapSettings['ldap_active_flag']} && count($user->{$this->ldapSettings['ldap_active_flag']}) == 1) { $active_flag_value = $user->{$this->ldapSettings['ldap_active_flag']}[0]; // if the value of that flag is case-insensitively the string 'false' or boolean false - if ( strcasecmp($active_flag_value, "false") == 0 || $active_flag_value === false ) { + if (strcasecmp($active_flag_value, 'false') == 0 || $active_flag_value === false) { return 0; // then make them INACTIVE } else { return 1; // otherwise active } } + return 1; // fail 'open' (active) if we have the attribute and it's multivalued or empty; that's weird } @@ -399,7 +402,7 @@ class LdapAd extends LdapAdConfiguration $location = $mappedLocations->filter(function ($value, $key) use ($user) { //if ($user->inOu($value)) { // <----- *THIS* seems not to be working, and it seems more 'intelligent' - but it's literally just a strpos() call, and it doesn't work quite right against plain strings $user_ou = substr($user->getDn(), -strlen($value)); // get the LAST chars of the user's DN, the count of those chars being the length of the thing we're checking against - if(strcasecmp($user_ou, $value) === 0) { // case *IN*sensitive comparision - some people say OU=blah, some say ou=blah. returns 0 when strings are identical (which is a little odd, yeah) + if (strcasecmp($user_ou, $value) === 0) { // case *IN*sensitive comparision - some people say OU=blah, some say ou=blah. returns 0 when strings are identical (which is a little odd, yeah) return $key; // WARNING: we are doing a 'filter' - not a regular for-loop. So the answer(s) get "return"ed into the $location array } }); @@ -423,7 +426,7 @@ class LdapAd extends LdapAdConfiguration */ private function getBaseDn(): string { - if (!is_null($this->baseDn)) { + if (! is_null($this->baseDn)) { return $this->baseDn; } @@ -442,7 +445,7 @@ class LdapAd extends LdapAdConfiguration private function getFilter(): ?string { $filter = $this->ldapSettings['ldap_filter']; - if (!$filter) { + if (! $filter) { return null; } // Add surrounding parentheses as needed @@ -468,6 +471,7 @@ class LdapAd extends LdapAdConfiguration { /** @var Schema $schema */ $schema = new $this->ldapConfig['schema']; + return array_values(array_filter([ $this->ldapSettings['ldap_username_field'], $this->ldapSettings['ldap_fname_field'], @@ -557,7 +561,7 @@ class LdapAd extends LdapAdConfiguration $search = $this->ldap->search()->users()->in($this->getBaseDn()); //this looks wrong; we should instead have a passable parameter that does this, and use this as a 'sane' default, yeah? $filter = $this->getFilter(); - if (!is_null($filter)) { + if (! is_null($filter)) { $search = $search->rawFilter($filter); } //I think it might be possible to potentially do our own paging here? diff --git a/app/Services/LdapAdConfiguration.php b/app/Services/LdapAdConfiguration.php index e9b7e96d42..3845f1613a 100644 --- a/app/Services/LdapAdConfiguration.php +++ b/app/Services/LdapAdConfiguration.php @@ -19,9 +19,9 @@ use Illuminate\Support\Collection; */ class LdapAdConfiguration { - const LDAP_PORT = 389; - const CONNECTION_TIMEOUT = 5; - const DEFAULT_LDAP_VERSION = 3; + const LDAP_PORT = 389; + const CONNECTION_TIMEOUT = 5; + const DEFAULT_LDAP_VERSION = 3; const LDAP_BOOLEAN_SETTINGS = [ 'ldap_enabled', 'ldap_server_cert_ignore', @@ -51,7 +51,8 @@ class LdapAdConfiguration * * @since 5.0.0 */ - public function init() { + public function init() + { // This try/catch is dumb, but is necessary to run initial migrations, since // this service provider is booted even during migrations. :( - snipe @@ -64,7 +65,6 @@ class LdapAdConfiguration \Log::debug($e); $this->ldapSettings = null; } - } /** @@ -92,7 +92,7 @@ class LdapAdConfiguration private function getSnipeItLdapSettings(): Collection { $ldapSettings = collect(); - if(Setting::first()) { // during early migration steps, there may be no settings table entry to start with + if (Setting::first()) { // during early migration steps, there may be no settings table entry to start with $ldapSettings = Setting::getLdapSettings() ->map(function ($item, $key) { // Trim the items @@ -105,7 +105,7 @@ class LdapAdConfiguration } // Decrypt the admin password - if ('ldap_pword' === $key && !empty($item)) { + if ('ldap_pword' === $key && ! empty($item)) { try { return decrypt($item); } catch (Exception $e) { @@ -120,6 +120,7 @@ class LdapAdConfiguration return $item; }); } + return $ldapSettings; } @@ -216,6 +217,7 @@ class LdapAdConfiguration if ($port && is_int($port)) { return $port; } + return self::LDAP_PORT; } @@ -234,6 +236,7 @@ class LdapAdConfiguration if ($scheme && 'ldaps' === strtolower($scheme)) { return true; } + return false; } @@ -253,11 +256,12 @@ class LdapAdConfiguration return trim($item); })->toArray(); } */ // <- this was the *original* intent of the PR for AdLdap2, but we've been moving away from having - // two separate fields - one for "ldap_host" and one for "ad_domain" - towards just using "ldap_host" - // ad_domain for us just means "append this domain to your usernames for login, if you click that checkbox" - // that's all, nothing more (I hope). + // two separate fields - one for "ldap_host" and one for "ad_domain" - towards just using "ldap_host" + // ad_domain for us just means "append this domain to your usernames for login, if you click that checkbox" + // that's all, nothing more (I hope). $url = $this->getLdapServerData('host'); + return $url ? [$url] : []; } diff --git a/app/Services/PredefinedKitCheckoutService.php b/app/Services/PredefinedKitCheckoutService.php index 8a1c624cbe..7ef28c9ee0 100644 --- a/app/Services/PredefinedKitCheckoutService.php +++ b/app/Services/PredefinedKitCheckoutService.php @@ -17,6 +17,7 @@ use Illuminate\Support\Facades\DB; class PredefinedKitCheckoutService { use AuthorizesRequests; + /** * @param Request $request, this function works with fields: checkout_at, expected_checkin, note * @param PredefinedKit $kit kit for checkout @@ -43,8 +44,8 @@ class PredefinedKitCheckoutService return ['errors' => $errors]; } - $checkout_at = date("Y-m-d H:i:s"); - if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date("Y-m-d"))) { + $checkout_at = date('Y-m-d H:i:s'); + if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) { $checkout_at = $request->get('checkout_at'); } @@ -59,7 +60,7 @@ class PredefinedKitCheckoutService $errors = $this->saveToDb($user, $admin, $checkout_at, $expected_checkin, $errors, $assets_to_add, $license_seats_to_add, $consumables_to_add, $accessories_to_add, $note); - return ['errors' => $errors, 'assets' => $assets_to_add, 'accessories' => $accessories_to_add, 'consumables' => $consumables_to_add ]; + return ['errors' => $errors, 'assets' => $assets_to_add, 'accessories' => $accessories_to_add, 'consumables' => $consumables_to_add]; } catch (ModelNotFoundException $e) { return ['errors' => [$e->getMessage()]]; } catch (CheckoutNotAllowed $e) { @@ -79,12 +80,10 @@ class PredefinedKitCheckoutService $assets = $model->assets; $quantity = $model->pivot->quantity; foreach ($assets as $asset) { - if ( $asset->availableForCheckout() - && !$asset->is($user) + && ! $asset->is($user) ) { - $this->authorize('checkout', $asset); $quantity -= 1; $assets_to_add[] = $asset; @@ -116,6 +115,7 @@ class PredefinedKitCheckoutService $seats_to_add[] = $license->freeSeats[$i]; } } + return $seats_to_add; } @@ -127,6 +127,7 @@ class PredefinedKitCheckoutService $errors[] = trans('admin/kits/general.none_consumables', ['consumable'=> $consumable->name, 'qty' => $consumable->pivot->quantity]); } } + return $consumables; } @@ -138,6 +139,7 @@ class PredefinedKitCheckoutService $errors[] = trans('admin/kits/general.none_accessory', ['accessory'=> $accessory->name, 'qty' => $accessory->pivot->quantity]); } } + return $accessories; } @@ -169,7 +171,7 @@ class PredefinedKitCheckoutService $consumable->users()->attach($consumable->id, [ 'consumable_id' => $consumable->id, 'user_id' => $admin->id, - 'assigned_to' => $user->id + 'assigned_to' => $user->id, ]); event(new CheckoutableCheckedOut($consumable, $user, $admin, $note)); } @@ -179,10 +181,11 @@ class PredefinedKitCheckoutService $accessory->users()->attach($accessory->id, [ 'accessory_id' => $accessory->id, 'user_id' => $admin->id, - 'assigned_to' => $user->id + 'assigned_to' => $user->id, ]); event(new CheckoutableCheckedOut($accessory, $user, $admin, $note)); } + return $errors; } ); diff --git a/app/Services/Saml.php b/app/Services/Saml.php index 9b0204bbce..9d73e05b49 100644 --- a/app/Services/Saml.php +++ b/app/Services/Saml.php @@ -2,15 +2,15 @@ namespace App\Services; -use OneLogin\Saml2\Auth as OneLogin_Saml2_Auth; -use OneLogin\Saml2\IdPMetadataParser as OneLogin_Saml2_IdPMetadataParser; -use OneLogin\Saml2\Settings as OneLogin_Saml2_Settings; -use OneLogin\Saml2\Utils as OneLogin_Saml2_Utils; use App\Models\Setting; use App\Models\User; use Exception; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Session; +use OneLogin\Saml2\Auth as OneLogin_Saml2_Auth; +use OneLogin\Saml2\IdPMetadataParser as OneLogin_Saml2_IdPMetadataParser; +use OneLogin\Saml2\Settings as OneLogin_Saml2_Settings; +use OneLogin\Saml2\Utils as OneLogin_Saml2_Utils; use Symfony\Component\HttpKernel\Exception\HttpException; /** @@ -112,15 +112,15 @@ class Saml /** * Initializes the SAML service and builds the OneLogin_Saml2_Auth instance. - * + * * @author Johnson Yi - * + * * @since 5.0.0 - * + * * @throws Exception * @throws Error */ - function __construct() + public function __construct() { $this->loadSettings(); @@ -139,10 +139,10 @@ class Saml /** * Builds settings from Snipe-IT for OneLogin_Saml2_Auth. - * + * * @author Johnson Yi * @author Michael Pietsch - * + * * @since 5.0.0 * * @return void @@ -163,19 +163,19 @@ class Saml data_set($settings, 'sp.singleLogoutService.url', route('saml.sls')); data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert); data_set($settings, 'sp.privateKey', $setting->saml_sp_privatekey); - if(!empty($setting->saml_sp_x509certNew)) { + if (! empty($setting->saml_sp_x509certNew)) { data_set($settings, 'sp.x509certNew', $setting->saml_sp_x509certNew); } else { - data_set($settings, 'sp.x509certNew', ""); + data_set($settings, 'sp.x509certNew', ''); } - if (!empty(data_get($settings, 'sp.privateKey'))) { + if (! empty(data_get($settings, 'sp.privateKey'))) { data_set($settings, 'security.logoutRequestSigned', true); data_set($settings, 'security.logoutResponseSigned', true); } $idpMetadata = $setting->saml_idp_metadata; - if (!empty($idpMetadata)) { + if (! empty($idpMetadata)) { $updatedAt = $setting->updated_at->timestamp; $metadataCache = Cache::get('saml_idp_metadata_cache'); try { @@ -203,16 +203,16 @@ class Saml } catch (Exception $e) { } } - + $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings); - if ($custom_settings){ - foreach($custom_settings as $custom_setting) { + if ($custom_settings) { + foreach ($custom_settings as $custom_setting) { $split = explode('=', $custom_setting, 2); if (count($split) == 2) { $boolValue = filter_var($split[1], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); - if (!is_null($boolValue)) { + if (! is_null($boolValue)) { $split[1] = $boolValue; } @@ -226,16 +226,17 @@ class Saml /** * Load SAML data from Session. - * + * * @author Johnson Yi - * + * * @since 5.0.0 - * + * * @return void */ - private function loadDataFromSession() { + private function loadDataFromSession() + { $samlData = collect(session(self::DATA_SESSION_KEY)); - $this->_authenticated = !$samlData->isEmpty(); + $this->_authenticated = ! $samlData->isEmpty(); $this->_nameid = $samlData->get('nameId'); $this->_nameidFormat = $samlData->get('nameIdFormat'); $this->_nameidNameQualifier = $samlData->get('nameIdNameQualifier'); @@ -248,9 +249,9 @@ class Saml /** * Save SAML data to Session. - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param string $data @@ -264,9 +265,9 @@ class Saml /** * Check to see if SAML is enabled and has valid settings. - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @return bool @@ -278,9 +279,9 @@ class Saml /** * Clear SAML data from session. - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @return void @@ -293,36 +294,38 @@ class Saml /** * Find user from SAML data. - * + * * @author Johnson Yi - * + * * @since 5.0.0 * * @param string $data * * @return \App\Models\User */ - public function samlLogin($data) { + public function samlLogin($data) + { $setting = Setting::getSettings(); $this->saveDataToSession($data); $this->loadDataFromSession(); - + $username = $this->getUsername(); - + return User::where('username', '=', $username)->whereNull('deleted_at')->where('activated', '=', '1')->first(); } /** - * Returns the OneLogin_Saml2_Auth instance. - * + * Returns the OneLogin_Saml2_Auth instance. + * * @author Johnson Yi - * + * * @since 5.0.0 - * + * * @return OneLogin\Saml2\Auth */ - public function getAuth() { - if (!$this->isEnabled()) { + public function getAuth() + { + if (! $this->isEnabled()) { throw new HttpException(403, 'SAML not enabled.'); } @@ -331,15 +334,16 @@ class Saml /** * Get a setting. - * + * * @author Johnson Yi - * + * * @param string|array|int $key * @param mixed $default - * + * * @return void */ - public function getSetting($key, $default = null) { + public function getSetting($key, $default = null) + { return data_get($this->_settings, $key, $default); } @@ -359,27 +363,28 @@ class Saml public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null) { try { - $settings = new OneLogin_Saml2_Settings($this->_settings , true); + $settings = new OneLogin_Saml2_Settings($this->_settings, true); $metadata = $settings->getSPMetadata($alwaysPublishEncryptionCert, $validUntil, $cacheDuration); - + return $metadata; } catch (Exception $e) { - return ""; + return ''; } } /** - * Extract data from SAML Response. - * + * Extract data from SAML Response. + * * @author Johnson Yi - * + * * @since 5.0.0 - * + * * @return array */ public function extractData() { $auth = $this->getAuth(); + return [ 'attributes' => $auth->getAttributes(), 'attributesWithFriendlyName' => $auth->getAttributesWithFriendlyName(), @@ -483,12 +488,12 @@ class Saml } /** - * Returns the correct username from SAML Response. - * + * Returns the correct username from SAML Response. + * * @author Johnson Yi - * + * * @since 5.0.0 - * + * * @return string */ public function getUsername() @@ -496,8 +501,7 @@ class Saml $setting = Setting::getSettings(); $username = $this->getNameId(); - if (!empty($setting->saml_attr_mapping_username)) - { + if (! empty($setting->saml_attr_mapping_username)) { $attributes = $this->getAttributes(); if (isset($attributes[$setting->saml_attr_mapping_username])) { diff --git a/config/app.php b/config/app.php index 55184884dc..2f3eda64b7 100755 --- a/config/app.php +++ b/config/app.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -164,8 +163,8 @@ return [ | Logging Detail |-------------------------------------------------------------------------- | - | By default, Laravel writes all log levels to storage. However, in your - | production environment, you may wish to configure the minimum severity that + | By default, Laravel writes all log levels to storage. However, in your + | production environment, you may wish to configure the minimum severity that | should be logged by editing your APP_LOG_LEVEL env config. | | Laravel will log all levels greater than or equal to the specified severity. @@ -176,9 +175,8 @@ return [ | "debug", "info", "notice", "warning", "error", "critical", "alert", "emergency" | */ - - 'log_level' => env('APP_LOG_LEVEL', 'error'), + 'log_level' => env('APP_LOG_LEVEL', 'error'), /* |-------------------------------------------------------------------------- @@ -195,7 +193,6 @@ return [ 'private_uploads' => storage_path().'/private_uploads', - /* |-------------------------------------------------------------------------- | ALLOW I-FRAMING @@ -209,7 +206,6 @@ return [ 'allow_iframing' => env('ALLOW_IFRAMING', false), - /* |-------------------------------------------------------------------------- | ENABLE HTTP Strict Transport Security (HSTS) @@ -254,9 +250,6 @@ return [ 'enable_csp' => env('ENABLE_CSP', false), - - - /* |-------------------------------------------------------------------------- | Demo Mode Lockdown @@ -269,7 +262,6 @@ return [ 'lock_passwords' => env('APP_LOCKED', false), - /* |-------------------------------------------------------------------------- | Minimum PHP version @@ -281,7 +273,6 @@ return [ 'min_php' => '7.2.5', - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers @@ -346,7 +337,6 @@ return [ App\Providers\SettingsServiceProvider::class, App\Providers\ValidationServiceProvider::class, - /* * Custom service provider */ @@ -354,7 +344,6 @@ return [ App\Providers\LdapServiceProvider::class, App\Providers\SamlServiceProvider::class, - ], /* @@ -408,7 +397,6 @@ return [ 'Image' => Intervention\Image\ImageServiceProvider::class, 'Carbon' => Carbon\Carbon::class, - ], ]; diff --git a/config/auth.php b/config/auth.php index 24ecf6d184..e8bdb30bdc 100644 --- a/config/auth.php +++ b/config/auth.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -105,7 +104,7 @@ return [ 'expire' => env('RESET_PASSWORD_LINK_EXPIRES', 900), 'throttle' => [ 'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 5), - 'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60) + 'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60), ], ], ], @@ -123,5 +122,4 @@ return [ 'password_timeout' => 10800, - ]; diff --git a/config/backup.php b/config/backup.php index f63516c077..479b1db6aa 100644 --- a/config/backup.php +++ b/config/backup.php @@ -8,7 +8,6 @@ | be modified directly. */ - // This is janky, but necessary to figure out whether to include the .env in the backup $included_dirs = [ base_path('public/uploads'), @@ -18,7 +17,7 @@ $included_dirs = [ ]; -if (env('BACKUP_ENV')=='true') { +if (env('BACKUP_ENV') == 'true') { $included_dirs[] = base_path('.env'); } @@ -212,4 +211,4 @@ return [ ], ], -]; \ No newline at end of file +]; diff --git a/config/broadcasting.php b/config/broadcasting.php index e3f0576864..20512c8cbd 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -8,8 +8,6 @@ | be modified directly. */ - - return [ /* diff --git a/config/cache.php b/config/cache.php index c1af7b98ce..d819784051 100644 --- a/config/cache.php +++ b/config/cache.php @@ -8,8 +8,6 @@ | be modified directly. */ - - return [ /* diff --git a/config/compile.php b/config/compile.php index f5fe56d0d5..086b36545a 100644 --- a/config/compile.php +++ b/config/compile.php @@ -8,8 +8,6 @@ | be modified directly. */ - - return [ /* diff --git a/config/cors.php b/config/cors.php index 0aa4b8cef4..2e3b8c993a 100644 --- a/config/cors.php +++ b/config/cors.php @@ -15,16 +15,13 @@ * set it to * to allow all. If there is a value, either a single url or a comma-delimited * list of urls, explode that out into an array to whitelist just those urls. */ - $allowed_origins = env('CORS_ALLOWED_ORIGINS') !== null ? explode(',', env('CORS_ALLOWED_ORIGINS')) : []; /** * Original Laravel CORS package config file modifications end here - * */ - return [ /* @@ -36,7 +33,7 @@ return [ | to accept any value. | */ - + 'supportsCredentials' => false, 'allowedOrigins' => $allowed_origins, 'allowedOriginsPatterns' => [], diff --git a/config/database.php b/config/database.php index f32810326a..9d94454db2 100755 --- a/config/database.php +++ b/config/database.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -79,7 +78,7 @@ return [ 'prefix' => env('DB_PREFIX', null), 'strict' => false, 'engine' => 'InnoDB', - 'unix_socket' => env('DB_SOCKET',''), + 'unix_socket' => env('DB_SOCKET', ''), 'dump' => [ 'dump_binary_path' => env('DB_DUMP_PATH', '/usr/local/bin'), // only the path, so without 'mysqldump' 'use_single_transaction' => false, @@ -96,8 +95,8 @@ return [ PDO::MYSQL_ATTR_SSL_KEY => env('DB_SSL_KEY_PATH'), // /path/to/key.pem PDO::MYSQL_ATTR_SSL_CERT => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem - PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER') - ]) : [] + PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER'), + ]) : [], ], 'pgsql' => [ diff --git a/config/debugbar.php b/config/debugbar.php index aeb5005615..ca7848678c 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,6 +1,6 @@ array( + 'storage' => [ 'enabled' => true, 'driver' => 'file', // redis, file, pdo - 'path' => storage_path() . '/debugbar', // For file driver + 'path' => storage_path().'/debugbar', // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - ), + ], /* |-------------------------------------------------------------------------- @@ -81,7 +81,7 @@ return array( | */ - 'collectors' => array( + 'collectors' => [ 'phpinfo' => true, // Php version 'messages' => true, // Messages 'time' => true, // Time Datalogger @@ -102,7 +102,7 @@ return array( 'auth' => true, // Display Laravel authentication status 'gate' => true, // Display Laravel Gate checks 'session' => true, // Display session data - ), + ], /* |-------------------------------------------------------------------------- @@ -113,33 +113,33 @@ return array( | */ - 'options' => array( - 'auth' => array( + 'options' => [ + 'auth' => [ 'show_name' => false, // Also show the users name/email in the debugbar - ), - 'db' => array( + ], + 'db' => [ 'with_params' => true, // Render SQL with the parameters substituted 'timeline' => true, // Add the queries to the timeline 'backtrace' => true, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. - 'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries + 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries 'enabled' => false, - 'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ - ), + 'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ + ], 'hints' => true, // Show hints for common mistakes - ), - 'mail' => array( - 'full_log' => false - ), - 'views' => array( + ], + 'mail' => [ + 'full_log' => false, + ], + 'views' => [ 'data' => false, //Note: Can slow down the application, because the data can be quite large.. - ), - 'route' => array( - 'label' => true // show complete route on bar - ), - 'logs' => array( - 'file' => null - ), - ), + ], + 'route' => [ + 'label' => true, // show complete route on bar + ], + 'logs' => [ + 'file' => null, + ], + ], /* |-------------------------------------------------------------------------- @@ -166,4 +166,4 @@ return array( */ 'route_prefix' => '_debugbar', -); +]; diff --git a/config/filesystems.php b/config/filesystems.php index b4bf6303e4..2cad75b165 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -64,7 +64,7 @@ $config = [ 'bucket' => env('PUBLIC_AWS_BUCKET'), 'url' => env('PUBLIC_AWS_URL'), 'root' => env('PUBLIC_AWS_BUCKET_ROOT'), - 'visibility' => 'public' + 'visibility' => 'public', ], 's3_private' => [ @@ -79,7 +79,7 @@ $config = [ 'bucket' => env('PRIVATE_AWS_BUCKET'), 'url' => env('PRIVATE_AWS_URL'), 'root' => env('PRIVATE_AWS_BUCKET_ROOT'), - 'visibility' => 'private' + 'visibility' => 'private', ], 'rackspace' => [ @@ -103,6 +103,6 @@ $config = [ // copy the selected PUBLIC_FILESYSTEM_DISK's configuration to the 'public' key for easy use // (by default, the PUBLIC_FILESYSTEM DISK is 'local_public', in the public/uploads directory) -$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK','local_public')]; +$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK', 'local_public')]; return $config; diff --git a/config/image.php b/config/image.php index 1b9dbaaf06..9458b9c1cc 100644 --- a/config/image.php +++ b/config/image.php @@ -8,8 +8,7 @@ | be modified directly. */ - -return array( +return [ /* |-------------------------------------------------------------------------- @@ -26,4 +25,4 @@ return array( 'driver' => env('IMAGE_LIB', 'gd'), -); +]; diff --git a/config/logging.php b/config/logging.php index 1f6538e1b8..fa0d25d884 100644 --- a/config/logging.php +++ b/config/logging.php @@ -43,7 +43,6 @@ $config = [ 'level' => env('APP_LOG_LEVEL', 'error'), ], - 'daily' => [ 'driver' => 'daily', 'path' => storage_path('logs/laravel.log'), @@ -58,7 +57,6 @@ $config = [ 'level' => env('APP_LOG_LEVEL', 'debug'), ], - 'slack' => [ 'driver' => 'slack', 'url' => env('LOG_SLACK_WEBHOOK_URL'), @@ -78,7 +76,7 @@ $config = [ 'stdout' => [ 'driver' => 'monolog', 'handler' => StreamHandler::class, - 'with' => [ 'stream' => 'php://stdout', ], + 'with' => ['stream' => 'php://stdout'], ], 'syslog' => [ @@ -94,9 +92,8 @@ $config = [ ]; -if ((env('APP_ENV')=='production') && env('ROLLBAR_TOKEN')) { +if ((env('APP_ENV') == 'production') && env('ROLLBAR_TOKEN')) { array_push($config['channels']['stack']['channels'], 'rollbar'); } - return $config; diff --git a/config/mail.php b/config/mail.php index 9c2aac439f..d47d182ed3 100755 --- a/config/mail.php +++ b/config/mail.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -70,13 +69,11 @@ return [ | */ - 'from' => - [ + 'from' => [ 'address' => env('MAIL_FROM_ADDR', null), - 'name' => env('MAIL_FROM_NAME', null) + 'name' => env('MAIL_FROM_NAME', null), ], - /* |-------------------------------------------------------------------------- | Global "Reply-To" Address @@ -84,13 +81,13 @@ return [ | | You may wish for all e-mails sent by your application to have a different "Reply-to" | address than the "From" address. If this is left blank, the application will use - | your MAIL_FROM information. + | your MAIL_FROM information. | */ 'reply_to' => [ - 'address' => env('MAIL_REPLYTO_ADDR',null), - 'name' => env('MAIL_REPLYTO_NAME', null) + 'address' => env('MAIL_REPLYTO_ADDR', null), + 'name' => env('MAIL_REPLYTO_NAME', null), ], /* @@ -145,7 +142,6 @@ return [ 'sendmail' => '/usr/sbin/sendmail -bs', - 'markdown' => [ 'theme' => 'default', 'paths' => [ diff --git a/config/passport.php b/config/passport.php index b8342a6b59..d410cfe20e 100644 --- a/config/passport.php +++ b/config/passport.php @@ -1,4 +1,5 @@ env('PASSPORT_PRIVATE_KEY'), 'public_key' => env('PASSPORT_PUBLIC_KEY'), 'expiration_years' => env('API_TOKEN_EXPIRATION_YEARS', 20), -]; \ No newline at end of file +]; diff --git a/config/permissions.php b/config/permissions.php index 0176dc13ba..57aa4a3232 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -6,639 +6,625 @@ |-------------------------------------------------------------------------- */ +return [ -return array( - - 'Global' => array( - array( + 'Global' => [ + [ 'permission' => 'superuser', 'label' => 'Super User', 'note' => 'Determines whether the user has full access to all aspects of the admin. This setting overrides any more specific permissions throughout the system. ', 'display' => true, - ), - ), + ], + ], - 'Admin' => array( - array( + 'Admin' => [ + [ 'permission' => 'admin', 'label' => '', 'note' => 'Determines whether the user has access to most aspects of the admin. ', 'display' => true, - ) - ), + ], + ], - 'CSV Import' => array( - array( + 'CSV Import' => [ + [ 'permission' => 'import', 'label' => '', 'note' => 'This will allow users to import even if access to users, assets, etc is denied elsewhere.', 'display' => true, - ) - ), + ], + ], - 'Reports' => array( - array( + 'Reports' => [ + [ 'permission' => 'reports.view', 'label' => 'View', 'note' => 'Determines whether the user has the ability to view reports.', 'display' => true, - ), - ), + ], + ], - 'Assets' => array( - array( + 'Assets' => [ + [ 'permission' => 'assets.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'assets.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'assets.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'assets.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'assets.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => false, - ), + ], - array( + [ 'permission' => 'assets.checkin', 'label' => 'Checkin ', 'note' => '', 'display' => true, - ), + ], - array( + [ 'permission' => 'assets.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), + ], - array( + [ 'permission' => 'assets.audit', 'label' => 'Audit ', 'note' => 'Allows the user to mark an asset as physically inventoried.', 'display' => true, - ), + ], - - array( + [ 'permission' => 'assets.view.requestable', 'label' => 'View Requestable Assets', 'note' => '', 'display' => true, - ), + ], - ), + ], - 'Accessories' => array( - array( + 'Accessories' => [ + [ 'permission' => 'accessories.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'accessories.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'accessories.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'accessories.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'accessories.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'accessories.checkin', 'label' => 'Checkin ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Consumables' => array( - array( + 'Consumables' => [ + [ 'permission' => 'consumables.view', 'label' => 'View', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'consumables.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'consumables.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'consumables.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'consumables.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), - ), + ], + ], - - 'Licenses' => array( - array( + 'Licenses' => [ + [ 'permission' => 'licenses.view', 'label' => 'View', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.keys', 'label' => 'View License Keys', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'licenses.files', 'label' => 'View and Modify License Files', 'note' => '', 'display' => true, - ), - ), + ], + ], - - 'Components' => array( - array( + 'Components' => [ + [ 'permission' => 'components.view', 'label' => 'View', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'components.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'components.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'components.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'components.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'components.checkin', 'label' => 'Checkin ', 'note' => '', 'display' => true, - ), + ], - ), + ], - 'Kits' => array( - array( + 'Kits' => [ + [ 'permission' => 'kits.view', 'label' => 'View ', 'note' => 'These are predefined kits that can be used to quickly checkout assets, licenses, etc.', 'display' => true, - ), - array( + ], + [ 'permission' => 'kits.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'kits.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'kits.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), + ], - array( + [ 'permission' => 'kits.checkout', 'label' => 'Checkout ', 'note' => '', 'display' => true, - ), - ), + ], + ], - - 'Users' => array( - array( + 'Users' => [ + [ 'permission' => 'users.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'users.create', 'label' => 'Create Users', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'users.edit', 'label' => 'Edit Users', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'users.delete', 'label' => 'Delete Users', 'note' => '', 'display' => true, - ), + ], - ), + ], - - 'Models' => array( - array( + 'Models' => [ + [ 'permission' => 'models.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'models.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'models.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'models.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), + ], - ), + ], - 'Categories' => array( - array( + 'Categories' => [ + [ 'permission' => 'categories.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'categories.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'categories.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'categories.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Departments' => array( - array( + 'Departments' => [ + [ 'permission' => 'departments.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'departments.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'departments.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'departments.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Status Labels' => array( - array( + 'Status Labels' => [ + [ 'permission' => 'statuslabels.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'statuslabels.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'statuslabels.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'statuslabels.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Custom Fields' => array( - array( + 'Custom Fields' => [ + [ 'permission' => 'customfields.view', 'label' => 'View', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'customfields.create', 'label' => 'Create', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'customfields.edit', 'label' => 'Edit', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'customfields.delete', 'label' => 'Delete', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Suppliers' => array( - array( + 'Suppliers' => [ + [ 'permission' => 'suppliers.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'suppliers.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'suppliers.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'suppliers.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - - 'Manufacturers' => array( - array( + 'Manufacturers' => [ + [ 'permission' => 'manufacturers.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'manufacturers.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'manufacturers.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'manufacturers.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Depreciations' => array( - array( + 'Depreciations' => [ + [ 'permission' => 'depreciations.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'depreciations.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'depreciations.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'depreciations.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Locations' => array( - array( + 'Locations' => [ + [ 'permission' => 'locations.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'locations.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'locations.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'locations.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - 'Companies' => array( - array( + 'Companies' => [ + [ 'permission' => 'companies.view', 'label' => 'View ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'companies.create', 'label' => 'Create ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'companies.edit', 'label' => 'Edit ', 'note' => '', 'display' => true, - ), - array( + ], + [ 'permission' => 'companies.delete', 'label' => 'Delete ', 'note' => '', 'display' => true, - ), - ), + ], + ], - - - - 'Self' => array( - array( + 'Self' => [ + [ 'permission' => 'self.two_factor', 'label' => 'Two-Factor Authentication', 'note' => 'The user may disable/enable two-factor authentication themselves if two-factor is enabled and set to selective.', 'display' => true, - ), + ], - array( + [ 'permission' => 'self.api', 'label' => 'Create API Keys', 'note' => 'The user create personal API keys to utilize the REST API.', 'display' => true, - ), + ], - array( + [ 'permission' => 'self.edit_location', 'label' => 'Profile Edit Location', 'note' => 'The user may update their own location in their profile. Note that this is not affected by any additional Users permissions you grant to this user or group.', 'display' => true, - ), + ], - array( + [ 'permission' => 'self.checkout_assets', 'label' => 'Self-Checkout', 'note' => 'This user may check out assets that are marked for self-checkout.', 'display' => true, - ), + ], - ), + ], - - - - -); +]; diff --git a/config/services.php b/config/services.php index c5eb915b55..dd594e67cb 100644 --- a/config/services.php +++ b/config/services.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -49,10 +48,9 @@ return [ 'app_key' => env('STUNNING_APP_KEY'), 'stripe_id' => env('STUNNING_STRIPE_ID'), ], - + 'google' => [ - 'maps_api_key' => env('GOOGLE_MAPS_API') + 'maps_api_key' => env('GOOGLE_MAPS_API'), ], - ]; diff --git a/config/session.php b/config/session.php index d6710975a6..d867229956 100644 --- a/config/session.php +++ b/config/session.php @@ -8,8 +8,6 @@ | be modified directly. */ - - return [ /* @@ -67,7 +65,7 @@ return [ | */ - 'files' => (env('SESSION_PATH')!='' ? env('SESSION_PATH') : storage_path('framework/sessions')), + 'files' => (env('SESSION_PATH') != '' ? env('SESSION_PATH') : storage_path('framework/sessions')), /* |-------------------------------------------------------------------------- @@ -158,6 +156,6 @@ return [ | */ - 'secure' => env('SECURE_COOKIES', false) + 'secure' => env('SECURE_COOKIES', false), ]; diff --git a/config/trustedproxy.php b/config/trustedproxy.php index 04e90ac2d2..a3d80418ba 100644 --- a/config/trustedproxy.php +++ b/config/trustedproxy.php @@ -8,7 +8,6 @@ | be modified directly. */ - return [ /* @@ -40,13 +39,13 @@ return [ * To trust one or more specific proxies that connect * directly to your server, use an array of IP addresses: */ - # 'proxies' => ['192.168.1.1'], + // 'proxies' => ['192.168.1.1'], /* * Or, to trust all proxies that connect * directly to your server, use a "*" */ - # 'proxies' => '*', + // 'proxies' => '*', /* * Which headers to use to detect proxy related data (For, Host, Proto, Port) @@ -60,5 +59,4 @@ return [ */ 'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL, - ]; diff --git a/config/version.php b/config/version.php index 65141829e4..668b1e8318 100644 --- a/config/version.php +++ b/config/version.php @@ -1,5 +1,6 @@ 'v5.1.5', 'full_app_version' => 'v5.1.5 - build 6082-g9eea46ade', 'build_version' => '6082', @@ -7,4 +8,4 @@ return array ( 'hash_version' => 'g9eea46ade', 'full_hash' => 'v5.1.5-44-g9eea46ade', 'branch' => 'develop', -); \ No newline at end of file +]; diff --git a/database/factories/AccessoryFactory.php b/database/factories/AccessoryFactory.php index 9e69004862..d6b9f0dde0 100644 --- a/database/factories/AccessoryFactory.php +++ b/database/factories/AccessoryFactory.php @@ -13,12 +13,11 @@ $factory->define(App\Models\Accessory::class, function (Faker\Generator $faker) return [ 'user_id' => 1, 'model_number' => $faker->numberBetween(1000000, 50000000), - 'location_id' => rand(1,5), + 'location_id' => rand(1, 5), ]; }); $factory->state(App\Models\Accessory::class, 'apple-bt-keyboard', function ($faker) { - return [ 'name' => 'Bluetooth Keyboard', 'image' => 'bluetooth.jpg', @@ -26,13 +25,11 @@ $factory->state(App\Models\Accessory::class, 'apple-bt-keyboard', function ($fak 'manufacturer_id' => 1, 'qty' => 10, 'min_amt' => 2, - 'supplier_id' => rand(1,5) + 'supplier_id' => rand(1, 5), ]; - }); $factory->state(App\Models\Accessory::class, 'apple-usb-keyboard', function ($faker) { - return [ 'name' => 'USB Keyboard', 'image' => 'usb-keyboard.jpg', @@ -40,13 +37,11 @@ $factory->state(App\Models\Accessory::class, 'apple-usb-keyboard', function ($fa 'manufacturer_id' => 1, 'qty' => 15, 'min_amt' => 2, - 'supplier_id' => rand(1,5) + 'supplier_id' => rand(1, 5), ]; - }); $factory->state(App\Models\Accessory::class, 'apple-mouse', function ($faker) { - return [ 'name' => 'Magic Mouse', 'image' => 'magic-mouse.jpg', @@ -54,21 +49,17 @@ $factory->state(App\Models\Accessory::class, 'apple-mouse', function ($faker) { 'manufacturer_id' => 1, 'qty' => 13, 'min_amt' => 2, - 'supplier_id' => rand(1,5) + 'supplier_id' => rand(1, 5), ]; - }); $factory->state(App\Models\Accessory::class, 'microsoft-mouse', function ($faker) { - return [ 'name' => 'Sculpt Comfort Mouse', 'image' => 'comfort-mouse.jpg', 'category_id' => 9, 'manufacturer_id' => 2, 'qty' => 13, - 'min_amt' => 2 + 'min_amt' => 2, ]; - }); - diff --git a/database/factories/ActionLogFactory.php b/database/factories/ActionLogFactory.php index d1a8ece7dd..939415c76b 100644 --- a/database/factories/ActionLogFactory.php +++ b/database/factories/ActionLogFactory.php @@ -1,11 +1,10 @@ define(Actionlog::class, function (Faker\Generator $faker) { return [ @@ -13,23 +12,22 @@ $factory->define(Actionlog::class, function (Faker\Generator $faker) { ]; }); - $factory->defineAs(App\Models\Actionlog::class, 'asset-upload', function ($faker) { $asset = factory(App\Models\Asset::class)->create(); + return [ 'item_type' => get_class($asset), 'item_id' => 1, 'user_id' => 1, 'filename' => $faker->word, - 'action_type' => 'uploaded' + 'action_type' => 'uploaded', ]; }); - $factory->defineAs(Actionlog::class, 'asset-checkout-user', function (Faker\Generator $faker) { $target = User::inRandomOrder()->first(); $item = Asset::inRandomOrder()->RTD()->first(); - $user_id = rand(1,2); // keep it simple - make it one of the two superadmins + $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins $asset = App\Models\Asset::where('id', $item->id) ->update( [ @@ -40,7 +38,7 @@ $factory->defineAs(Actionlog::class, 'asset-checkout-user', function (Faker\Gene ); return [ - 'created_at' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'created_at' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'user_id' => $user_id, 'action_type' => 'checkout', 'item_id' => $item->id, @@ -48,14 +46,13 @@ $factory->defineAs(Actionlog::class, 'asset-checkout-user', function (Faker\Gene 'target_id' => $target->id, 'target_type' => get_class($target), - ]; }); $factory->defineAs(Actionlog::class, 'asset-checkout-location', function (Faker\Generator $faker) { $target = Location::inRandomOrder()->first(); $item = Asset::inRandomOrder()->RTD()->first(); - $user_id = rand(1,2); // keep it simple - make it one of the two superadmins + $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins $asset = App\Models\Asset::where('id', $item->id) ->update( [ @@ -66,7 +63,7 @@ $factory->defineAs(Actionlog::class, 'asset-checkout-location', function (Faker\ ); return [ - 'created_at' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'created_at' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'user_id' => $user_id, 'action_type' => 'checkout', 'item_id' => $item->id, @@ -80,7 +77,7 @@ $factory->defineAs(Actionlog::class, 'asset-checkout-location', function (Faker\ $factory->defineAs(Actionlog::class, 'license-checkout-asset', function (Faker\Generator $faker) { $target = Asset::inRandomOrder()->RTD()->first(); $item = License::inRandomOrder()->first(); - $user_id = rand(1,2); // keep it simple - make it one of the two superadmins + $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins return [ 'user_id' => $user_id, @@ -90,15 +87,14 @@ $factory->defineAs(Actionlog::class, 'license-checkout-asset', function (Faker\G 'target_id' => $target->id, 'target_type' => get_class($target), 'created_at' => $faker->dateTime(), - 'note' => $faker->sentence + 'note' => $faker->sentence, ]; }); - $factory->defineAs(Actionlog::class, 'accessory-checkout', function (Faker\Generator $faker) { $target = Asset::inRandomOrder()->RTD()->first(); $item = Accessory::inRandomOrder()->first(); - $user_id = rand(1,2); // keep it simple - make it one of the two superadmins + $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins return [ 'user_id' => $user_id, @@ -108,12 +104,12 @@ $factory->defineAs(Actionlog::class, 'accessory-checkout', function (Faker\Gener 'target_id' => $target->id, 'target_type' => get_class($target), 'created_at' => $faker->dateTime(), - 'note' => $faker->sentence + 'note' => $faker->sentence, ]; }); $factory->defineAs(Actionlog::class, 'consumable-checkout', function (Faker\Generator $faker) { - $company = factory(App\Models\Company::class)->create(); + $company = factory(App\Models\Company::class)->create(); $user = factory(App\Models\User::class)->create(['company_id' => $company->id]); $target = factory(App\Models\User::class)->create(['company_id' => $company->id]); $item = factory(App\Models\Consumable::class)->create(['company_id' => $company->id]); @@ -127,12 +123,12 @@ $factory->defineAs(Actionlog::class, 'consumable-checkout', function (Faker\Gene 'target_type' => get_class($target), 'created_at' => $faker->dateTime(), 'note' => $faker->sentence, - 'company_id' => $company->id + 'company_id' => $company->id, ]; }); $factory->defineAs(Actionlog::class, 'component-checkout', function (Faker\Generator $faker) { - $company = factory(App\Models\Company::class)->create(); + $company = factory(App\Models\Company::class)->create(); $user = factory(App\Models\User::class)->create(['company_id' => $company->id]); $target = factory(App\Models\User::class)->create(['company_id' => $company->id]); $item = factory(App\Models\Component::class)->create(['company_id' => $company->id]); @@ -146,6 +142,6 @@ $factory->defineAs(Actionlog::class, 'component-checkout', function (Faker\Gener 'target_type' => get_class($target), 'created_at' => $faker->dateTime(), 'note' => $faker->sentence, - 'company_id' => $company->id + 'company_id' => $company->id, ]; }); diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index e028127c89..32f739e0ba 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -16,13 +16,13 @@ use App\Models\Category; $factory->define(Asset::class, function (Faker\Generator $faker) { return [ 'name' => null, - 'rtd_location_id' => rand(1,10), + 'rtd_location_id' => rand(1, 10), 'serial' => $faker->uuid, 'status_id' => 1, 'user_id' => 1, 'asset_tag' => $faker->unixTime('now'), 'notes' => 'Created by DB seeder', - 'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'purchase_cost' => $faker->randomFloat(2, '299.99', '2999.99'), 'order_number' => $faker->numberBetween(1000000, 50000000), 'supplier_id' => 1, @@ -34,12 +34,9 @@ $factory->define(Asset::class, function (Faker\Generator $faker) { ]; }); - - - $factory->state(Asset::class, 'laptop-mbp', function ($faker) { return [ - 'model_id' => 1 + 'model_id' => 1, ]; }); @@ -59,107 +56,106 @@ $factory->state(Asset::class, 'laptop-mbp-archived', function ($faker) { $factory->state(Asset::class, 'laptop-air', function ($faker) { return [ - 'model_id' => 2 + 'model_id' => 2, ]; }); $factory->state(Asset::class, 'laptop-surface', function ($faker) { return [ - 'model_id' => 3 + 'model_id' => 3, ]; }); $factory->state(Asset::class, 'laptop-xps', function ($faker) { return [ - 'model_id' => 4 + 'model_id' => 4, ]; }); $factory->state(Asset::class, 'laptop-spectre', function ($faker) { return [ - 'model_id' => 5 + 'model_id' => 5, ]; }); $factory->state(Asset::class, 'laptop-zenbook', function ($faker) { return [ - 'model_id' => 6 + 'model_id' => 6, ]; }); $factory->state(Asset::class, 'laptop-yoga', function ($faker) { return [ - 'model_id' => 7 + 'model_id' => 7, ]; }); $factory->state(Asset::class, 'desktop-macpro', function ($faker) { return [ - 'model_id' => 8 + 'model_id' => 8, ]; }); $factory->state(Asset::class, 'desktop-lenovo-i5', function ($faker) { return [ - 'model_id' => 9 + 'model_id' => 9, ]; }); $factory->state(Asset::class, 'desktop-optiplex', function ($faker) { return [ - 'model_id' => 10 + 'model_id' => 10, ]; }); $factory->state(Asset::class, 'conf-polycom', function ($faker) { return [ - 'model_id' => 11 + 'model_id' => 11, ]; }); $factory->state(Asset::class, 'conf-polycomcx', function ($faker) { return [ - 'model_id' => 12 + 'model_id' => 12, ]; }); $factory->state(Asset::class, 'tablet-ipad', function ($faker) { return [ - 'model_id' => 13 + 'model_id' => 13, ]; }); $factory->state(Asset::class, 'tablet-tab3', function ($faker) { return [ - 'model_id' => 14 + 'model_id' => 14, ]; }); $factory->state(Asset::class, 'phone-iphone6s', function ($faker) { return [ - 'model_id' => 15 + 'model_id' => 15, ]; }); $factory->state(Asset::class, 'phone-iphone7', function ($faker) { return [ - 'model_id' => 16 + 'model_id' => 16, ]; }); $factory->state(Asset::class, 'ultrafine', function ($faker) { return [ - 'model_id' => 17 + 'model_id' => 17, ]; }); $factory->state(Asset::class, 'ultrasharp', function ($faker) { return [ - 'model_id' => 18 + 'model_id' => 18, ]; }); - // These are just for unit tests, not to generate data $factory->state(Asset::class, 'assigned-to-user', function ($faker) { @@ -190,15 +186,13 @@ $factory->state(Asset::class, 'requires-acceptance', function ($faker) { ]; }); - $factory->state(Asset::class, 'deleted', function ($faker) { return [ 'model_id' => 1, - 'deleted_at' => $faker->dateTime() + 'deleted_at' => $faker->dateTime(), ]; }); - $factory->define(App\Models\AssetMaintenance::class, function (Faker\Generator $faker) { return [ 'asset_id' => function () { diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php index 89cb21578c..8b4e9ea105 100644 --- a/database/factories/AssetModelFactory.php +++ b/database/factories/AssetModelFactory.php @@ -23,7 +23,6 @@ $factory->define(App\Models\AssetModel::class, function (Faker\Generator $faker) ]; }); - // 1 $factory->state(App\Models\AssetModel::class, 'mbp-13-model', function ($faker) { return [ @@ -121,7 +120,6 @@ $factory->state(App\Models\AssetModel::class, 'yoga-model', function ($faker) { |-------------------------------------------------------------------------- */ - $factory->state(App\Models\AssetModel::class, 'macpro-model', function ($faker) { return [ 'name' => 'iMac Pro', @@ -159,14 +157,12 @@ $factory->state(App\Models\AssetModel::class, 'optiplex-model', function ($faker ]; }); - /* |-------------------------------------------------------------------------- | Conference Phones |-------------------------------------------------------------------------- */ - $factory->state(App\Models\AssetModel::class, 'polycom-model', function ($faker) { return [ 'name' => 'SoundStation 2', @@ -189,7 +185,6 @@ $factory->state(App\Models\AssetModel::class, 'polycomcx-model', function ($fake ]; }); - /* |-------------------------------------------------------------------------- | Tablets @@ -207,7 +202,6 @@ $factory->state(App\Models\AssetModel::class, 'ipad-model', function ($faker) { ]; }); - $factory->state(App\Models\AssetModel::class, 'tab3-model', function ($faker) { return [ 'name' => 'Tab3', @@ -219,7 +213,6 @@ $factory->state(App\Models\AssetModel::class, 'tab3-model', function ($faker) { ]; }); - /* |-------------------------------------------------------------------------- | Mobile Phones @@ -277,9 +270,3 @@ $factory->state(App\Models\AssetModel::class, 'ultrasharp', function ($faker) { 'image' => 'ultrasharp.jpg', ]; }); - - - - - - diff --git a/database/factories/CategoryFactory.php b/database/factories/CategoryFactory.php index 26b59ffac2..ec9a5f84f8 100644 --- a/database/factories/CategoryFactory.php +++ b/database/factories/CategoryFactory.php @@ -9,7 +9,6 @@ | */ - $factory->define(App\Models\Category::class, function (Faker\Generator $faker) { return [ 'checkin_email' => $faker->boolean(), @@ -70,7 +69,6 @@ $factory->state(App\Models\Category::class, 'asset-voip-category', function ($fa ]; }); - $factory->state(App\Models\Category::class, 'accessory-keyboard-category', function ($faker) { return [ 'name' => 'Keyboards', @@ -85,7 +83,6 @@ $factory->state(App\Models\Category::class, 'accessory-mouse-category', function ]; }); - $factory->state(App\Models\Category::class, 'component-hdd-category', function ($faker) { return [ 'name' => 'HDD/SSD', @@ -114,7 +111,6 @@ $factory->state(App\Models\Category::class, 'consumable-ink-category', function ]; }); - $factory->state(App\Models\Category::class, 'license-graphics-category', function ($faker) { return [ 'name' => 'Graphics Software', @@ -122,7 +118,6 @@ $factory->state(App\Models\Category::class, 'license-graphics-category', functio ]; }); - $factory->state(App\Models\Category::class, 'license-office-category', function ($faker) { return [ 'name' => 'Office Software', diff --git a/database/factories/ComponentsFactory.php b/database/factories/ComponentsFactory.php index c550493c2b..90c61d7bd6 100644 --- a/database/factories/ComponentsFactory.php +++ b/database/factories/ComponentsFactory.php @@ -13,7 +13,7 @@ $factory->define(App\Models\Component::class, function (Faker\Generator $faker) return [ 'user_id' => 1, 'order_number' => $faker->numberBetween(1000000, 50000000), - 'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'purchase_cost' => $faker->randomFloat(2, 1, 50), 'qty' => $faker->numberBetween(5, 10), 'min_amt' => $faker->numberBetween($min = 1, $max = 2), @@ -21,46 +21,39 @@ $factory->define(App\Models\Component::class, function (Faker\Generator $faker) }); $factory->state(App\Models\Component::class, 'ram-crucial4', function ($faker) { - return [ 'name' => 'Crucial 4GB DDR3L-1600 SODIMM', 'category_id' => 13, 'qty' => 10, 'min_amt' => 2, 'location_id' => 3, - 'company_id' => 2 + 'company_id' => 2, ]; }); $factory->state(App\Models\Component::class, 'ram-crucial8', function ($faker) { - return [ 'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac', 'category_id' => 13, 'qty' => 10, - 'min_amt' => 2 + 'min_amt' => 2, ]; }); $factory->state(App\Models\Component::class, 'ssd-crucial120', function ($faker) { - return [ 'name' => 'Crucial BX300 120GB SATA Internal SSD', 'category_id' => 12, 'qty' => 10, - 'min_amt' => 2 + 'min_amt' => 2, ]; }); $factory->state(App\Models\Component::class, 'ssd-crucial240', function ($faker) { - return [ 'name' => 'Crucial BX300 240GB SATA Internal SSD', 'category_id' => 12, 'qty' => 10, - 'min_amt' => 2 + 'min_amt' => 2, ]; }); - - - diff --git a/database/factories/ConsumableFactory.php b/database/factories/ConsumableFactory.php index 41ddcf42a8..3148a0d7a4 100644 --- a/database/factories/ConsumableFactory.php +++ b/database/factories/ConsumableFactory.php @@ -14,7 +14,7 @@ $factory->define(App\Models\Consumable::class, function (Faker\Generator $faker) 'user_id' => 1, 'item_no' => $faker->numberBetween(1000000, 50000000), 'order_number' => $faker->numberBetween(1000000, 50000000), - 'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'purchase_cost' => $faker->randomFloat(2, 1, 50), 'qty' => $faker->numberBetween(5, 10), 'min_amt' => $faker->numberBetween($min = 1, $max = 2), @@ -22,38 +22,32 @@ $factory->define(App\Models\Consumable::class, function (Faker\Generator $faker) }); $factory->state(App\Models\Consumable::class, 'cardstock', function ($faker) { - return [ 'name' => 'Cardstock (White)', 'category_id' => 10, 'manufacturer_id' => 10, 'qty' => 10, 'min_amt' => 2, - 'company_id' => 3 + 'company_id' => 3, ]; }); $factory->state(App\Models\Consumable::class, 'paper', function ($faker) { - return [ 'name' => 'Laserjet Paper (Ream)', 'category_id' => 10, 'manufacturer_id' => 10, 'qty' => 20, - 'min_amt' => 2 + 'min_amt' => 2, ]; }); $factory->state(App\Models\Consumable::class, 'ink', function ($faker) { - return [ 'name' => 'Laserjet Toner (black)', 'category_id' => 11, 'manufacturer_id' => 5, 'qty' => 20, - 'min_amt' => 2 + 'min_amt' => 2, ]; }); - - - diff --git a/database/factories/CustomFieldsFactory.php b/database/factories/CustomFieldsFactory.php index 7840014fd0..fd623341e2 100644 --- a/database/factories/CustomFieldsFactory.php +++ b/database/factories/CustomFieldsFactory.php @@ -1,6 +1,5 @@ define(App\Models\CustomField::class, function (Faker\Generator $faker) { return [ 'name' => $faker->catchPhrase, @@ -38,11 +37,9 @@ $factory->state(App\Models\CustomField::class, 'cpu', function ($faker) { ]; }); - $factory->state(App\Models\CustomField::class, 'mac-address', function ($faker) { return [ 'name' => 'MAC Address', 'format' => 'regex:/^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/', ]; }); - diff --git a/database/factories/CustomFieldsetFactory.php b/database/factories/CustomFieldsetFactory.php index bab8cbe58f..7a31378ac7 100644 --- a/database/factories/CustomFieldsetFactory.php +++ b/database/factories/CustomFieldsetFactory.php @@ -1,6 +1,5 @@ define(App\Models\CustomFieldset::class, function (Faker\Generator $faker) { return [ 'name' => $faker->catchPhrase, @@ -18,6 +17,3 @@ $factory->state(App\Models\CustomFieldset::class, 'computer', function ($faker) 'name' => 'Laptops and Desktops', ]; }); - - - diff --git a/database/factories/DepartmentsFactory.php b/database/factories/DepartmentsFactory.php index 8b4d0f357a..6a394e191c 100644 --- a/database/factories/DepartmentsFactory.php +++ b/database/factories/DepartmentsFactory.php @@ -12,7 +12,7 @@ $factory->define(App\Models\Department::class, function (Faker\Generator $faker) { return [ 'user_id' => 1, - 'location_id' => rand(1,5), + 'location_id' => rand(1, 5), ]; }); @@ -57,6 +57,3 @@ $factory->state(App\Models\Department::class, 'silly', function ($faker) { 'name' => 'Dept of Silly Walks', ]; }); - - - diff --git a/database/factories/DepreciationFactory.php b/database/factories/DepreciationFactory.php index e1df63dab2..da7dfd29a3 100644 --- a/database/factories/DepreciationFactory.php +++ b/database/factories/DepreciationFactory.php @@ -35,7 +35,3 @@ $factory->state(App\Models\Depreciation::class, 'mobile-phones', function ($fake 'months' => 24, ]; }); - - - - diff --git a/database/factories/LicenseFactory.php b/database/factories/LicenseFactory.php index b4b440f45c..70bfa42e4b 100644 --- a/database/factories/LicenseFactory.php +++ b/database/factories/LicenseFactory.php @@ -10,25 +10,24 @@ */ $factory->define(App\Models\License::class, function (Faker\Generator $faker) { - return [ 'user_id' => 1, 'license_name' => $faker->name, 'license_email' => $faker->safeEmail, 'serial' => $faker->uuid, 'notes' => 'Created by DB seeder', - 'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()), + 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'order_number' => $faker->numberBetween(1000000, 50000000), 'expiration_date' => $faker->dateTimeBetween('now', '+3 years', date_default_timezone_get())->format('Y-m-d H:i:s'), 'reassignable' => $faker->boolean(), - 'termination_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get())->format('Y-m-d H:i:s'), - 'supplier_id' => $faker->numberBetween(1,5), + 'termination_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d H:i:s'), + 'supplier_id' => $faker->numberBetween(1, 5), ]; }); // 1 $factory->state(App\Models\License::class, 'photoshop', function ($faker) { - $data = [ + $data = [ 'name' => 'Photoshop', 'manufacturer_id' => 9, 'purchase_cost' => '299.99', @@ -37,44 +36,39 @@ $factory->state(App\Models\License::class, 'photoshop', function ($faker) { 'maintained' => true, 'category_id' => 14, ]; - - return $data; + return $data; }); // 2 $factory->state(App\Models\License::class, 'acrobat', function ($faker) { - - $data = [ + $data = [ 'name' => 'Acrobat', 'manufacturer_id' => 9, 'purchase_cost' => '29.99', 'seats' => 10, 'category_id' => 14, ]; - return $data; }); // 3 $factory->state(App\Models\License::class, 'indesign', function ($faker) { - $data = [ + $data = [ 'name' => 'InDesign', 'manufacturer_id' => 9, 'purchase_cost' => '199.99', 'seats' => 10, 'category_id' => 14, ]; - return $data; }); - // 4 $factory->state(App\Models\License::class, 'office', function ($faker) { - $data = [ + $data = [ 'name' => 'Office', 'manufacturer_id' => 2, 'purchase_cost' => '49.99', @@ -82,8 +76,5 @@ $factory->state(App\Models\License::class, 'office', function ($faker) { 'category_id' => 15, ]; - return $data; }); - - diff --git a/database/factories/ManufacturerFactory.php b/database/factories/ManufacturerFactory.php index ff1ab4645f..a4ba86c19f 100644 --- a/database/factories/ManufacturerFactory.php +++ b/database/factories/ManufacturerFactory.php @@ -18,7 +18,6 @@ $factory->define(App\Models\Manufacturer::class, function (Faker\Generator $fake ]; }); - // 1 $factory->state(App\Models\Manufacturer::class, 'apple', function ($faker) { return [ @@ -109,7 +108,6 @@ $factory->state(App\Models\Manufacturer::class, 'adobe', function ($faker) { ]; }); - // 10 $factory->state(App\Models\Manufacturer::class, 'avery', function ($faker) { return [ @@ -129,6 +127,3 @@ $factory->state(App\Models\Manufacturer::class, 'crucial', function ($faker) { 'image' => 'crucial.jpg', ]; }); - - - diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index ad903e33ba..9dd9a14a8a 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -19,7 +19,6 @@ use App\Models\Manufacturer; use App\Models\Statuslabel; use App\Models\Supplier; - $factory->define(App\Models\Company::class, function (Faker\Generator $faker) { return [ 'name' => $faker->company, @@ -61,11 +60,10 @@ $factory->define(App\Models\Location::class, function (Faker\Generator $faker) { 'country' => $faker->countryCode, 'currency' => $faker->currencyCode, 'zip' => $faker->postcode, - 'image' => rand(1,9).'.jpg', + 'image' => rand(1, 9).'.jpg', ]; }); - $factory->define(App\Models\Supplier::class, function (Faker\Generator $faker) { return [ 'name' => $faker->company, @@ -80,7 +78,7 @@ $factory->define(App\Models\Supplier::class, function (Faker\Generator $faker) { 'fax' => $faker->phoneNumber, 'email' => $faker->safeEmail, 'url' => $faker->url, - 'notes' => $faker->text(191) // Supplier notes can be a max of 255 characters. + 'notes' => $faker->text(191), // Supplier notes can be a max of 255 characters. ]; }); diff --git a/database/factories/StatusLabelFactory.php b/database/factories/StatusLabelFactory.php index ac4d07d6e0..1c850564d8 100644 --- a/database/factories/StatusLabelFactory.php +++ b/database/factories/StatusLabelFactory.php @@ -12,7 +12,7 @@ $factory->define(Statuslabel::class, function (Faker\Generator $faker) { 'deployable' => 0, 'pending' => 0, 'archived' => 0, - 'notes' => '' + 'notes' => '', ]; }); $factory->state(Statuslabel::class, 'rtd', function (Faker\Generator $faker) { diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index a26897817c..cf5a0688d0 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -9,27 +9,26 @@ $factory->define(App\Models\User::class, function (Faker\Generator $faker) use ( 'activated' => 1, 'address' => $faker->address, 'city' => $faker->city, - 'company_id' => rand(1,4), + 'company_id' => rand(1, 4), 'country' => $faker->country, - 'department_id' => rand(1,6), + 'department_id' => rand(1, 6), 'email' => $faker->safeEmail, 'employee_num' => $faker->numberBetween(3500, 35050), 'first_name' => $faker->firstName, 'jobtitle' => $faker->jobTitle, 'last_name' => $faker->lastName, 'locale' => $faker->locale, - 'location_id' => rand(1,5), + 'location_id' => rand(1, 5), 'notes' => 'Created by DB seeder', 'password' => $password, 'permissions' => '{"user":"0"}', 'phone' => $faker->phoneNumber, 'state' => $faker->stateAbbr, 'username' => $faker->username, - 'zip' => $faker->postcode + 'zip' => $faker->postcode, ]; }); - $factory->state(App\Models\User::class, 'first-admin', function ($faker) { return [ 'first_name' => 'Admin', @@ -49,7 +48,6 @@ $factory->state(App\Models\User::class, 'snipe-admin', function ($faker) { ]; }); - // USER GLOBAL PERMISSION STATES $factory->state(App\Models\User::class, 'superuser', function ($faker) { return [ @@ -60,7 +58,7 @@ $factory->state(App\Models\User::class, 'superuser', function ($faker) { $factory->state(App\Models\User::class, 'admin', function ($faker) { return [ 'permissions' => '{"admin":"1"}', - 'manager_id' => rand(1,2), + 'manager_id' => rand(1, 2), ]; }); // USER ASSET PERMISSION STATES diff --git a/database/migrations/2012_12_06_225921_migration_cartalyst_sentry_install_users.php b/database/migrations/2012_12_06_225921_migration_cartalyst_sentry_install_users.php index bee5d9370c..c4518f7926 100644 --- a/database/migrations/2012_12_06_225921_migration_cartalyst_sentry_install_users.php +++ b/database/migrations/2012_12_06_225921_migration_cartalyst_sentry_install_users.php @@ -10,7 +10,6 @@ * bundled with this package in the LICENSE file. It is also available at * the following URL: http://www.opensource.org/licenses/BSD-3-Clause * - * @package Sentry * @version 2.0.0 * @author Cartalyst LLC * @license BSD License (3-clause) @@ -20,48 +19,46 @@ use Illuminate\Database\Migrations\Migration; -class MigrationCartalystSentryInstallUsers extends Migration { +class MigrationCartalystSentryInstallUsers extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('users', function ($table) { + $table->increments('id'); + $table->string('email'); + $table->string('password'); + $table->text('permissions')->nullable(); + $table->boolean('activated')->default(0); + $table->string('activation_code')->nullable(); + $table->timestamp('activated_at')->nullable(); + $table->timestamp('last_login')->nullable(); + $table->string('persist_code')->nullable(); + $table->string('reset_password_code')->nullable(); + $table->string('first_name')->nullable(); + $table->string('last_name')->nullable(); + $table->timestamps(); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('users', function($table) - { - $table->increments('id'); - $table->string('email'); - $table->string('password'); - $table->text('permissions')->nullable(); - $table->boolean('activated')->default(0); - $table->string('activation_code')->nullable(); - $table->timestamp('activated_at')->nullable(); - $table->timestamp('last_login')->nullable(); - $table->string('persist_code')->nullable(); - $table->string('reset_password_code')->nullable(); - $table->string('first_name')->nullable(); - $table->string('last_name')->nullable(); - $table->timestamps(); - - // We'll need to ensure that MySQL uses the InnoDB engine to - // support the indexes, other engines aren't affected. - $table->engine = 'InnoDB'; - $table->unique('email'); - $table->index('activation_code'); - $table->index('reset_password_code'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('users'); - } + // We'll need to ensure that MySQL uses the InnoDB engine to + // support the indexes, other engines aren't affected. + $table->engine = 'InnoDB'; + $table->unique('email'); + $table->index('activation_code'); + $table->index('reset_password_code'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('users'); + } } diff --git a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php index d929a62707..cd45847bc7 100644 --- a/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php +++ b/database/migrations/2012_12_06_225929_migration_cartalyst_sentry_install_groups.php @@ -10,7 +10,6 @@ * bundled with this package in the LICENSE file. It is also available at * the following URL: http://www.opensource.org/licenses/BSD-3-Clause * - * @package Sentry * @version 2.0.0 * @author Cartalyst LLC * @license BSD License (3-clause) @@ -20,33 +19,31 @@ use Illuminate\Database\Migrations\Migration; -class MigrationCartalystSentryInstallGroups extends Migration { - - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('permission_groups', function($table) - { - $table->increments('id'); - $table->string('name'); - $table->text('permissions')->nullable(); - $table->timestamps(); - $table->engine = 'InnoDB'; - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('permission_groups'); - } +class MigrationCartalystSentryInstallGroups extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('permission_groups', function ($table) { + $table->increments('id'); + $table->string('name'); + $table->text('permissions')->nullable(); + $table->timestamps(); + $table->engine = 'InnoDB'; + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('permission_groups'); + } } diff --git a/database/migrations/2012_12_06_225945_migration_cartalyst_sentry_install_users_groups_pivot.php b/database/migrations/2012_12_06_225945_migration_cartalyst_sentry_install_users_groups_pivot.php index 012873c6c0..d5ecbe35dd 100644 --- a/database/migrations/2012_12_06_225945_migration_cartalyst_sentry_install_users_groups_pivot.php +++ b/database/migrations/2012_12_06_225945_migration_cartalyst_sentry_install_users_groups_pivot.php @@ -10,7 +10,6 @@ * bundled with this package in the LICENSE file. It is also available at * the following URL: http://www.opensource.org/licenses/BSD-3-Clause * - * @package Sentry * @version 2.0.0 * @author Cartalyst LLC * @license BSD License (3-clause) @@ -20,35 +19,33 @@ use Illuminate\Database\Migrations\Migration; -class MigrationCartalystSentryInstallUsersGroupsPivot extends Migration { +class MigrationCartalystSentryInstallUsersGroupsPivot extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('users_groups', function ($table) { + $table->integer('user_id')->unsigned(); + $table->integer('group_id')->unsigned(); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('users_groups', function($table) - { - $table->integer('user_id')->unsigned(); - $table->integer('group_id')->unsigned(); - - // We'll need to ensure that MySQL uses the InnoDB engine to - // support the indexes, other engines aren't affected. - $table->engine = 'InnoDB'; - $table->primary(array('user_id', 'group_id')); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('users_groups'); - } + // We'll need to ensure that MySQL uses the InnoDB engine to + // support the indexes, other engines aren't affected. + $table->engine = 'InnoDB'; + $table->primary(['user_id', 'group_id']); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('users_groups'); + } } diff --git a/database/migrations/2012_12_06_225988_migration_cartalyst_sentry_install_throttle.php b/database/migrations/2012_12_06_225988_migration_cartalyst_sentry_install_throttle.php index 07c1d27a68..641e3187b5 100644 --- a/database/migrations/2012_12_06_225988_migration_cartalyst_sentry_install_throttle.php +++ b/database/migrations/2012_12_06_225988_migration_cartalyst_sentry_install_throttle.php @@ -10,7 +10,6 @@ * bundled with this package in the LICENSE file. It is also available at * the following URL: http://www.opensource.org/licenses/BSD-3-Clause * - * @package Sentry * @version 2.0.0 * @author Cartalyst LLC * @license BSD License (3-clause) @@ -20,42 +19,40 @@ use Illuminate\Database\Migrations\Migration; -class MigrationCartalystSentryInstallThrottle extends Migration { +class MigrationCartalystSentryInstallThrottle extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('throttle', function ($table) { + $table->increments('id'); + $table->integer('user_id')->unsigned()->nullable(); + $table->string('ip_address')->nullable(); + $table->integer('attempts')->default(0); + $table->boolean('suspended')->default(0); + $table->boolean('banned')->default(0); + $table->timestamp('last_attempt_at')->nullable(); + $table->timestamp('suspended_at')->nullable(); + $table->timestamp('banned_at')->nullable(); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('throttle', function($table) - { - $table->increments('id'); - $table->integer('user_id')->unsigned()->nullable(); - $table->string('ip_address')->nullable(); - $table->integer('attempts')->default(0); - $table->boolean('suspended')->default(0); - $table->boolean('banned')->default(0); - $table->timestamp('last_attempt_at')->nullable(); - $table->timestamp('suspended_at')->nullable(); - $table->timestamp('banned_at')->nullable(); - - // We'll need to ensure that MySQL uses the InnoDB engine to - // support the indexes, other engines aren't affected. - $table->engine = 'InnoDB'; - $table->index('user_id'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('throttle'); - } + // We'll need to ensure that MySQL uses the InnoDB engine to + // support the indexes, other engines aren't affected. + $table->engine = 'InnoDB'; + $table->index('user_id'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('throttle'); + } } diff --git a/database/migrations/2013_03_23_193214_update_users_table.php b/database/migrations/2013_03_23_193214_update_users_table.php index eed98d12ee..9c95a0c858 100755 --- a/database/migrations/2013_03_23_193214_update_users_table.php +++ b/database/migrations/2013_03_23_193214_update_users_table.php @@ -32,5 +32,4 @@ class UpdateUsersTable extends Migration $table->dropColumn('deleted_at', 'website', 'country', 'gravatar'); }); } - } diff --git a/database/migrations/2013_11_13_075318_create_models_table.php b/database/migrations/2013_11_13_075318_create_models_table.php index 393cbcf9a1..cd2d9dfc70 100755 --- a/database/migrations/2013_11_13_075318_create_models_table.php +++ b/database/migrations/2013_11_13_075318_create_models_table.php @@ -11,7 +11,7 @@ class CreateModelsTable extends Migration */ public function up() { - Schema::create('models', function ($table) { + Schema::create('models', function ($table) { $table->increments('id'); $table->string('name'); $table->string('modelno')->nullable(); @@ -31,5 +31,4 @@ class CreateModelsTable extends Migration { Schema::drop('models'); } - } diff --git a/database/migrations/2013_11_13_075335_create_categories_table.php b/database/migrations/2013_11_13_075335_create_categories_table.php index bb64d87cb0..280c2f48a8 100755 --- a/database/migrations/2013_11_13_075335_create_categories_table.php +++ b/database/migrations/2013_11_13_075335_create_categories_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; class CreateCategoriesTable extends Migration { -/** + /** * Run the migrations. * * @return void @@ -29,5 +29,4 @@ class CreateCategoriesTable extends Migration { Schema::drop('categories'); } - } diff --git a/database/migrations/2013_11_13_075347_create_manufacturers_table.php b/database/migrations/2013_11_13_075347_create_manufacturers_table.php index 3f2426ea6d..827ee7da7c 100755 --- a/database/migrations/2013_11_13_075347_create_manufacturers_table.php +++ b/database/migrations/2013_11_13_075347_create_manufacturers_table.php @@ -28,5 +28,4 @@ class CreateManufacturersTable extends Migration { Schema::drop('manufacturers'); } - } diff --git a/database/migrations/2013_11_15_015858_add_user_id_to_categories.php b/database/migrations/2013_11_15_015858_add_user_id_to_categories.php index a4744877ba..935362ab52 100755 --- a/database/migrations/2013_11_15_015858_add_user_id_to_categories.php +++ b/database/migrations/2013_11_15_015858_add_user_id_to_categories.php @@ -25,5 +25,4 @@ class AddUserIdToCategories extends Migration { // } - } diff --git a/database/migrations/2013_11_15_112701_add_user_id_to_manufacturers.php b/database/migrations/2013_11_15_112701_add_user_id_to_manufacturers.php index a21ad59277..fee43b0ba8 100755 --- a/database/migrations/2013_11_15_112701_add_user_id_to_manufacturers.php +++ b/database/migrations/2013_11_15_112701_add_user_id_to_manufacturers.php @@ -25,5 +25,4 @@ class AddUserIdToManufacturers extends Migration { // } - } diff --git a/database/migrations/2013_11_15_190327_create_assets_table.php b/database/migrations/2013_11_15_190327_create_assets_table.php index 12f906fa27..a66a933025 100755 --- a/database/migrations/2013_11_15_190327_create_assets_table.php +++ b/database/migrations/2013_11_15_190327_create_assets_table.php @@ -38,5 +38,4 @@ class CreateAssetsTable extends Migration { Schema::drop('assets'); } - } diff --git a/database/migrations/2013_11_15_190357_create_licenses_table.php b/database/migrations/2013_11_15_190357_create_licenses_table.php index d6e01cac39..848315ef39 100755 --- a/database/migrations/2013_11_15_190357_create_licenses_table.php +++ b/database/migrations/2013_11_15_190357_create_licenses_table.php @@ -12,20 +12,20 @@ class CreateLicensesTable extends Migration public function up() { Schema::create('licenses', function ($table) { - $table->increments('id'); - $table->string('name'); - $table->integer('model_id'); - $table->text('serial'); - $table->string('license_email'); - $table->string('license_name'); - $table->date('purchase_date')->nullable(); - $table->decimal('purchase_cost', 8, 2)->nullable(); - $table->string('order_number'); - $table->integer('assigned_to'); - $table->text('notes'); - $table->integer('user_id')->nullable(); - $table->timestamps(); - $table->engine = 'InnoDB'; + $table->increments('id'); + $table->string('name'); + $table->integer('model_id'); + $table->text('serial'); + $table->string('license_email'); + $table->string('license_name'); + $table->date('purchase_date')->nullable(); + $table->decimal('purchase_cost', 8, 2)->nullable(); + $table->string('order_number'); + $table->integer('assigned_to'); + $table->text('notes'); + $table->integer('user_id')->nullable(); + $table->timestamps(); + $table->engine = 'InnoDB'; }); } @@ -38,5 +38,4 @@ class CreateLicensesTable extends Migration { Schema::dropIfExists('licenses'); } - } diff --git a/database/migrations/2013_11_15_201848_add_license_name_to_licenses.php b/database/migrations/2013_11_15_201848_add_license_name_to_licenses.php index 50b0a1ff05..f9094c4f02 100755 --- a/database/migrations/2013_11_15_201848_add_license_name_to_licenses.php +++ b/database/migrations/2013_11_15_201848_add_license_name_to_licenses.php @@ -11,7 +11,6 @@ class AddLicenseNameToLicenses extends Migration */ public function up() { - } /** @@ -23,5 +22,4 @@ class AddLicenseNameToLicenses extends Migration { // } - } diff --git a/database/migrations/2013_11_16_040323_create_depreciations_table.php b/database/migrations/2013_11_16_040323_create_depreciations_table.php index 620b5299a4..b35a04fee3 100755 --- a/database/migrations/2013_11_16_040323_create_depreciations_table.php +++ b/database/migrations/2013_11_16_040323_create_depreciations_table.php @@ -31,5 +31,4 @@ class CreateDepreciationsTable extends Migration { Schema::drop('depreciations'); } - } diff --git a/database/migrations/2013_11_16_042851_add_depreciation_id_to_models.php b/database/migrations/2013_11_16_042851_add_depreciation_id_to_models.php index a9e9dbd496..0e5e0db18a 100755 --- a/database/migrations/2013_11_16_042851_add_depreciation_id_to_models.php +++ b/database/migrations/2013_11_16_042851_add_depreciation_id_to_models.php @@ -25,5 +25,4 @@ class AddDepreciationIdToModels extends Migration { // } - } diff --git a/database/migrations/2013_11_16_084923_add_user_id_to_models.php b/database/migrations/2013_11_16_084923_add_user_id_to_models.php index b14f40be2e..070a5feb9f 100755 --- a/database/migrations/2013_11_16_084923_add_user_id_to_models.php +++ b/database/migrations/2013_11_16_084923_add_user_id_to_models.php @@ -25,5 +25,4 @@ class AddUserIdToModels extends Migration { // } - } diff --git a/database/migrations/2013_11_16_103258_create_locations_table.php b/database/migrations/2013_11_16_103258_create_locations_table.php index d87a273e35..2bbc1cce4f 100755 --- a/database/migrations/2013_11_16_103258_create_locations_table.php +++ b/database/migrations/2013_11_16_103258_create_locations_table.php @@ -15,8 +15,8 @@ class CreateLocationsTable extends Migration $table->increments('id'); $table->string('name')->nullable(); $table->string('city')->nullable(); - $table->string('state',2)->nullable(); - $table->string('country',2)->nullable(); + $table->string('state', 2)->nullable(); + $table->string('country', 2)->nullable(); $table->timestamps(); $table->integer('user_id')->nullable(); $table->engine = 'InnoDB'; @@ -32,5 +32,4 @@ class CreateLocationsTable extends Migration { Schema::drop('locations'); } - } diff --git a/database/migrations/2013_11_16_103336_add_location_id_to_assets.php b/database/migrations/2013_11_16_103336_add_location_id_to_assets.php index fbaee98b3e..11c462ec92 100755 --- a/database/migrations/2013_11_16_103336_add_location_id_to_assets.php +++ b/database/migrations/2013_11_16_103336_add_location_id_to_assets.php @@ -25,5 +25,4 @@ class AddLocationIdToAssets extends Migration { // } - } diff --git a/database/migrations/2013_11_16_103407_add_checkedout_to_to_assets.php b/database/migrations/2013_11_16_103407_add_checkedout_to_to_assets.php index 8fdb112f03..9e3594b746 100755 --- a/database/migrations/2013_11_16_103407_add_checkedout_to_to_assets.php +++ b/database/migrations/2013_11_16_103407_add_checkedout_to_to_assets.php @@ -25,5 +25,4 @@ class AddCheckedoutToToAssets extends Migration { // } - } diff --git a/database/migrations/2013_11_16_103425_create_history_table.php b/database/migrations/2013_11_16_103425_create_history_table.php index 3e5d6ba84d..d3d84f3843 100755 --- a/database/migrations/2013_11_16_103425_create_history_table.php +++ b/database/migrations/2013_11_16_103425_create_history_table.php @@ -30,5 +30,4 @@ class CreateHistoryTable extends Migration { //Schema::drop('history'); } - } diff --git a/database/migrations/2013_11_17_054359_drop_licenses_table.php b/database/migrations/2013_11_17_054359_drop_licenses_table.php index 353dcc6944..6fbc11703b 100755 --- a/database/migrations/2013_11_17_054359_drop_licenses_table.php +++ b/database/migrations/2013_11_17_054359_drop_licenses_table.php @@ -23,5 +23,4 @@ class DropLicensesTable extends Migration { // } - } diff --git a/database/migrations/2013_11_17_054526_add_physical_to_assets.php b/database/migrations/2013_11_17_054526_add_physical_to_assets.php index 725d1e900b..2ccc7c43dc 100755 --- a/database/migrations/2013_11_17_054526_add_physical_to_assets.php +++ b/database/migrations/2013_11_17_054526_add_physical_to_assets.php @@ -1,6 +1,7 @@ dropColumn('physical'); } - } diff --git a/database/migrations/2013_11_17_055126_create_settings_table.php b/database/migrations/2013_11_17_055126_create_settings_table.php index 0bedd659bf..5e36add8c0 100755 --- a/database/migrations/2013_11_17_055126_create_settings_table.php +++ b/database/migrations/2013_11_17_055126_create_settings_table.php @@ -31,5 +31,4 @@ class CreateSettingsTable extends Migration { Schema::drop('settings'); } - } diff --git a/database/migrations/2013_11_17_062634_add_license_to_assets.php b/database/migrations/2013_11_17_062634_add_license_to_assets.php index 7766b34f2c..fbc81fae1e 100755 --- a/database/migrations/2013_11_17_062634_add_license_to_assets.php +++ b/database/migrations/2013_11_17_062634_add_license_to_assets.php @@ -26,5 +26,4 @@ class AddLicenseToAssets extends Migration { // } - } diff --git a/database/migrations/2013_11_18_134332_add_contacts_to_users.php b/database/migrations/2013_11_18_134332_add_contacts_to_users.php index bf6d482d37..acff0b75a5 100755 --- a/database/migrations/2013_11_18_134332_add_contacts_to_users.php +++ b/database/migrations/2013_11_18_134332_add_contacts_to_users.php @@ -15,7 +15,6 @@ class AddContactsToUsers extends Migration $table->integer('location_id')->nullable(); $table->string('phone')->nullable(); $table->string('jobtitle')->nullable(); - }); } @@ -30,9 +29,6 @@ class AddContactsToUsers extends Migration $table->dropColumn('location_id'); $table->dropColumn('phone'); $table->dropColumn('jobtitle'); - }); - } - } diff --git a/database/migrations/2013_11_18_142847_add_info_to_locations.php b/database/migrations/2013_11_18_142847_add_info_to_locations.php index 07f85b6116..9cd240a0bf 100755 --- a/database/migrations/2013_11_18_142847_add_info_to_locations.php +++ b/database/migrations/2013_11_18_142847_add_info_to_locations.php @@ -12,11 +12,9 @@ class AddInfoToLocations extends Migration public function up() { Schema::table('locations', function ($table) { - $table->string('address', 80)->nullable(); $table->string('address2', 80)->nullable(); $table->string('zip', 10)->nullable(); - }); } @@ -28,12 +26,9 @@ class AddInfoToLocations extends Migration public function down() { Schema::table('locations', function ($table) { - $table->dropColumn('address'); $table->dropColumn('address2'); $table->dropColumn('zip'); - }); } - } diff --git a/database/migrations/2013_11_18_152942_remove_location_id_from_asset.php b/database/migrations/2013_11_18_152942_remove_location_id_from_asset.php index 07ef525fe4..f7450cdb59 100755 --- a/database/migrations/2013_11_18_152942_remove_location_id_from_asset.php +++ b/database/migrations/2013_11_18_152942_remove_location_id_from_asset.php @@ -27,5 +27,4 @@ class RemoveLocationIdFromAsset extends Migration $table->integer('location_id')->nullable(); }); } - } diff --git a/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php b/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php index 6665934587..6f52b47ee4 100755 --- a/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php +++ b/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php @@ -9,14 +9,12 @@ class SetNullvaluesForUser extends Migration * * @return void */ - public function up() { // - // $prefix = DB::getTablePrefix(); + // $prefix = DB::getTablePrefix(); // DB::statement('ALTER TABLE '.$prefix.'users MODIFY phone varchar(20) null'); // DB::statement('ALTER TABLE '.$prefix.'users MODIFY jobtitle varchar(50) null'); - } /** @@ -28,5 +26,4 @@ class SetNullvaluesForUser extends Migration { // } - } diff --git a/database/migrations/2013_11_19_013337_create_asset_logs_table.php b/database/migrations/2013_11_19_013337_create_asset_logs_table.php index 3bdf3f9bae..51aebacbd4 100755 --- a/database/migrations/2013_11_19_013337_create_asset_logs_table.php +++ b/database/migrations/2013_11_19_013337_create_asset_logs_table.php @@ -32,5 +32,4 @@ class CreateAssetLogsTable extends Migration { Schema::drop('asset_logs'); } - } diff --git a/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php b/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php index b1c8a848b3..57ce195e93 100755 --- a/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php +++ b/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php @@ -12,7 +12,6 @@ class EditAddedOnAssetLogsTable extends Migration public function up() { // DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY added_on timestamp null'); - } /** @@ -24,5 +23,4 @@ class EditAddedOnAssetLogsTable extends Migration { // } - } diff --git a/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php b/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php index 02d1118eea..9ea493b34e 100755 --- a/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php +++ b/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php @@ -16,8 +16,6 @@ class EditLocationIdAssetLogsTable extends Migration // $table->string('location_id')->nullable()->change(); // $table->dateTime('added_on',11)->nullable()->default(DB::raw('CURRENT_TIMESTAMP(0)'))->change(); // }); - - } /** @@ -29,5 +27,4 @@ class EditLocationIdAssetLogsTable extends Migration { // } - } diff --git a/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php b/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php index c729376383..2405878d5f 100755 --- a/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php +++ b/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php @@ -25,5 +25,4 @@ class AddSoftDeleteOnAssets extends Migration { // } - } diff --git a/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php b/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php index afdc9e2aa2..33a3577a9f 100755 --- a/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php +++ b/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php @@ -25,5 +25,4 @@ class AddSoftDeleteOnLocations extends Migration { // } - } diff --git a/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php b/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php index 04cb01d15d..0ba42701fa 100755 --- a/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php +++ b/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php @@ -25,5 +25,4 @@ class AddSoftDeleteOnManufacturers extends Migration { // } - } diff --git a/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php b/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php index a17045bf79..8da8d8dccb 100755 --- a/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php +++ b/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php @@ -25,5 +25,4 @@ class AddSoftDeleteOnCategories extends Migration { // } - } diff --git a/database/migrations/2013_11_20_130248_create_status_labels.php b/database/migrations/2013_11_20_130248_create_status_labels.php index 7bdfb8a6f6..5b7634682f 100755 --- a/database/migrations/2013_11_20_130248_create_status_labels.php +++ b/database/migrations/2013_11_20_130248_create_status_labels.php @@ -13,7 +13,7 @@ class CreateStatusLabels extends Migration { Schema::create('status_labels', function ($table) { $table->increments('id'); - $table->string('name',100)->nullable(); + $table->string('name', 100)->nullable(); $table->integer('user_id')->nullable(); $table->timestamps(); $table->softDeletes(); @@ -30,5 +30,4 @@ class CreateStatusLabels extends Migration { Schema::drop('status_labels'); } - } diff --git a/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php b/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php index 01b24c5a04..ac561efa71 100755 --- a/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php +++ b/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php @@ -27,5 +27,4 @@ class AddStatusIdOnAssetsTable extends Migration $table->dropColumn('status_id'); }); } - } diff --git a/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php b/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php index 2a8cfcd229..70ad31f9c4 100755 --- a/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php +++ b/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php @@ -27,5 +27,4 @@ class AddStatusTypeOnStatusLabels extends Migration $table->dropColumn('deployable'); }); } - } diff --git a/database/migrations/2013_11_20_134103_add_archived_to_assets.php b/database/migrations/2013_11_20_134103_add_archived_to_assets.php index 4623f67d7e..dd00382ac9 100755 --- a/database/migrations/2013_11_20_134103_add_archived_to_assets.php +++ b/database/migrations/2013_11_20_134103_add_archived_to_assets.php @@ -27,5 +27,4 @@ class AddArchivedToAssets extends Migration $table->dropColumn('archived'); }); } - } diff --git a/database/migrations/2013_11_21_002321_add_uploads_table.php b/database/migrations/2013_11_21_002321_add_uploads_table.php index d54d5e5d76..233416e2bc 100755 --- a/database/migrations/2013_11_21_002321_add_uploads_table.php +++ b/database/migrations/2013_11_21_002321_add_uploads_table.php @@ -32,5 +32,4 @@ class AddUploadsTable extends Migration { Schema::drop('asset_uploads'); } - } diff --git a/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php b/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php index 574c7bd8ec..3db9e2f1d3 100755 --- a/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php +++ b/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php @@ -27,5 +27,4 @@ class RemoveDeployableBooleanFromStatusLabels extends Migration $table->boolean('deployable'); }); } - } diff --git a/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php b/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php index 9e007850d0..803edfe1ee 100755 --- a/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php +++ b/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php @@ -27,5 +27,4 @@ class AddOptionLabelToSettingsTable extends Migration // $table->dropColumn('option_label'); // }); } - } diff --git a/database/migrations/2013_11_22_213400_edits_to_settings_table.php b/database/migrations/2013_11_22_213400_edits_to_settings_table.php index e689e5cd0a..942c82d3df 100755 --- a/database/migrations/2013_11_22_213400_edits_to_settings_table.php +++ b/database/migrations/2013_11_22_213400_edits_to_settings_table.php @@ -16,10 +16,8 @@ class EditsToSettingsTable extends Migration //$table->dropColumn('option_name'); // $table->dropColumn('option_value'); $table->integer('per_page')->default(20); - $table->string('site_name','100')->default("Snipe IT Asset Management"); + $table->string('site_name', '100')->default('Snipe IT Asset Management'); }); - - } /** @@ -31,5 +29,4 @@ class EditsToSettingsTable extends Migration { // } - } diff --git a/database/migrations/2013_11_25_013244_create_licenses_table.php b/database/migrations/2013_11_25_013244_create_licenses_table.php index 38c2f6f68e..404a37228b 100755 --- a/database/migrations/2013_11_25_013244_create_licenses_table.php +++ b/database/migrations/2013_11_25_013244_create_licenses_table.php @@ -39,5 +39,4 @@ class ReCreateLicensesTable extends Migration // Schema::drop('licenses'); } - } diff --git a/database/migrations/2013_11_25_031458_create_license_seats_table.php b/database/migrations/2013_11_25_031458_create_license_seats_table.php index acd101e3f8..466ef00870 100755 --- a/database/migrations/2013_11_25_031458_create_license_seats_table.php +++ b/database/migrations/2013_11_25_031458_create_license_seats_table.php @@ -33,5 +33,4 @@ class CreateLicenseSeatsTable extends Migration { // } - } diff --git a/database/migrations/2013_11_25_032022_add_type_to_actionlog_table.php b/database/migrations/2013_11_25_032022_add_type_to_actionlog_table.php index 4edfc94091..73fd422355 100755 --- a/database/migrations/2013_11_25_032022_add_type_to_actionlog_table.php +++ b/database/migrations/2013_11_25_032022_add_type_to_actionlog_table.php @@ -29,5 +29,4 @@ class AddTypeToActionlogTable extends Migration $table->dropColumn('asset_type'); }); } - } diff --git a/database/migrations/2013_11_25_033008_delete_bad_licenses_table.php b/database/migrations/2013_11_25_033008_delete_bad_licenses_table.php index 755b647228..91179fb7be 100755 --- a/database/migrations/2013_11_25_033008_delete_bad_licenses_table.php +++ b/database/migrations/2013_11_25_033008_delete_bad_licenses_table.php @@ -23,5 +23,4 @@ class DeleteBadLicensesTable extends Migration { // } - } diff --git a/database/migrations/2013_11_25_033131_create_new_licenses_table.php b/database/migrations/2013_11_25_033131_create_new_licenses_table.php index c852e0dc00..c56d0da77d 100755 --- a/database/migrations/2013_11_25_033131_create_new_licenses_table.php +++ b/database/migrations/2013_11_25_033131_create_new_licenses_table.php @@ -39,5 +39,4 @@ class CreateNewLicensesTable extends Migration // Schema::drop('licenses'); } - } diff --git a/database/migrations/2013_11_25_033534_add_licensed_to_licenses_table.php b/database/migrations/2013_11_25_033534_add_licensed_to_licenses_table.php index d51d88bceb..74297099ca 100755 --- a/database/migrations/2013_11_25_033534_add_licensed_to_licenses_table.php +++ b/database/migrations/2013_11_25_033534_add_licensed_to_licenses_table.php @@ -31,5 +31,4 @@ class AddLicensedToLicensesTable extends Migration $table->dropColumn('license_email'); }); } - } diff --git a/database/migrations/2013_11_25_101308_add_warrantee_to_assets_table.php b/database/migrations/2013_11_25_101308_add_warrantee_to_assets_table.php index e912aacf86..bbce108de2 100755 --- a/database/migrations/2013_11_25_101308_add_warrantee_to_assets_table.php +++ b/database/migrations/2013_11_25_101308_add_warrantee_to_assets_table.php @@ -29,5 +29,4 @@ class AddWarranteeToAssetsTable extends Migration $table->dropColumn('warrantee_months'); }); } - } diff --git a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php index e0d994f5e5..be62374dce 100755 --- a/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php +++ b/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php @@ -12,7 +12,7 @@ class AlterWarrantyColumnOnAssets extends Migration public function up() { Schema::table('assets', function ($table) { - $table->renameColumn('warrantee_months', 'warranty_months'); + $table->renameColumn('warrantee_months', 'warranty_months'); }); } @@ -25,5 +25,4 @@ class AlterWarrantyColumnOnAssets extends Migration { // } - } diff --git a/database/migrations/2013_11_25_150450_drop_parent_from_categories.php b/database/migrations/2013_11_25_150450_drop_parent_from_categories.php index ba1949941a..665bc781f9 100755 --- a/database/migrations/2013_11_25_150450_drop_parent_from_categories.php +++ b/database/migrations/2013_11_25_150450_drop_parent_from_categories.php @@ -25,5 +25,4 @@ class DropParentFromCategories extends Migration { // } - } diff --git a/database/migrations/2013_11_25_151920_add_depreciate_to_assets.php b/database/migrations/2013_11_25_151920_add_depreciate_to_assets.php index 13e009bfd4..233392fe6e 100755 --- a/database/migrations/2013_11_25_151920_add_depreciate_to_assets.php +++ b/database/migrations/2013_11_25_151920_add_depreciate_to_assets.php @@ -14,7 +14,6 @@ class AddDepreciateToAssets extends Migration // Schema::table('assets', function ($table) { $table->boolean('depreciate')->nullable(); - }); } @@ -28,9 +27,5 @@ class AddDepreciateToAssets extends Migration Schema::table('assets', function ($table) { $table->dropColumn('depreciate'); }); - - - } - } diff --git a/database/migrations/2013_11_25_152903_add_depreciate_to_licenses_table.php b/database/migrations/2013_11_25_152903_add_depreciate_to_licenses_table.php index 1a2fbc05a0..bbe23a482f 100755 --- a/database/migrations/2013_11_25_152903_add_depreciate_to_licenses_table.php +++ b/database/migrations/2013_11_25_152903_add_depreciate_to_licenses_table.php @@ -27,9 +27,5 @@ class AddDepreciateToLicensesTable extends Migration Schema::table('licenses', function ($table) { $table->dropColumn('depreciate'); }); - - - } - } diff --git a/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php b/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php index 611cf4b123..5640c24261 100755 --- a/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php +++ b/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php @@ -26,5 +26,4 @@ class DropLicenseFromAssetsTable extends Migration { // } - } diff --git a/database/migrations/2013_11_27_062510_add_note_to_asset_logs_table.php b/database/migrations/2013_11_27_062510_add_note_to_asset_logs_table.php index de0d70a00f..90fa457183 100755 --- a/database/migrations/2013_11_27_062510_add_note_to_asset_logs_table.php +++ b/database/migrations/2013_11_27_062510_add_note_to_asset_logs_table.php @@ -14,7 +14,6 @@ class AddNoteToAssetLogsTable extends Migration // Schema::table('asset_logs', function ($table) { $table->text('note')->nullable(); - }); } @@ -30,5 +29,4 @@ class AddNoteToAssetLogsTable extends Migration $table->dropColumn('note'); }); } - } diff --git a/database/migrations/2013_12_01_113426_add_filename_to_asset_log.php b/database/migrations/2013_12_01_113426_add_filename_to_asset_log.php index 01b9e3130a..8a174dcb14 100755 --- a/database/migrations/2013_12_01_113426_add_filename_to_asset_log.php +++ b/database/migrations/2013_12_01_113426_add_filename_to_asset_log.php @@ -14,7 +14,6 @@ class AddFilenameToAssetLog extends Migration // Schema::table('asset_logs', function ($table) { $table->text('filename')->nullable(); - }); } @@ -30,5 +29,4 @@ class AddFilenameToAssetLog extends Migration $table->dropColumn('filename'); }); } - } diff --git a/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php b/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php index fed1b8e9de..24a7cfa674 100755 --- a/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php +++ b/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php @@ -11,13 +11,11 @@ class AddNullableToLicensesTable extends Migration */ public function up() { - Schema::table('licenses', function ($table) { - $table->string('order_number',50)->nullable()->change(); - $table->string('notes',255)->nullable()->change(); - $table->string('license_name',120)->nullable()->change(); - }); - - + Schema::table('licenses', function ($table) { + $table->string('order_number', 50)->nullable()->change(); + $table->string('notes', 255)->nullable()->change(); + $table->string('license_name', 120)->nullable()->change(); + }); } /** @@ -29,5 +27,4 @@ class AddNullableToLicensesTable extends Migration { // } - } diff --git a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php index 5e873bebb1..d8d222deec 100755 --- a/database/migrations/2013_12_10_084038_add_eol_on_models_table.php +++ b/database/migrations/2013_12_10_084038_add_eol_on_models_table.php @@ -12,8 +12,7 @@ class AddEolOnModelsTable extends Migration public function up() { Schema::table('models', function ($table) { - $table->integer('eol')->nullable()->default(NULL); - + $table->integer('eol')->nullable()->default(null); }); } @@ -28,5 +27,4 @@ class AddEolOnModelsTable extends Migration $table->dropColumn('old'); }); } - } diff --git a/database/migrations/2013_12_12_055218_add_manager_to_users_table.php b/database/migrations/2013_12_12_055218_add_manager_to_users_table.php index 3d399c39b4..5ffbfd633f 100755 --- a/database/migrations/2013_12_12_055218_add_manager_to_users_table.php +++ b/database/migrations/2013_12_12_055218_add_manager_to_users_table.php @@ -12,8 +12,7 @@ class AddManagerToUsersTable extends Migration public function up() { Schema::table('users', function ($table) { - $table->integer('manager_id')->nullable()->default(NULL); - + $table->integer('manager_id')->nullable()->default(null); }); } @@ -28,5 +27,4 @@ class AddManagerToUsersTable extends Migration $table->dropColumn('manager_id'); }); } - } diff --git a/database/migrations/2014_01_28_031200_add_qr_code_to_settings_table.php b/database/migrations/2014_01_28_031200_add_qr_code_to_settings_table.php index 671f127eaf..37d0b48c12 100755 --- a/database/migrations/2014_01_28_031200_add_qr_code_to_settings_table.php +++ b/database/migrations/2014_01_28_031200_add_qr_code_to_settings_table.php @@ -12,8 +12,7 @@ class AddQrCodeToSettingsTable extends Migration public function up() { Schema::table('settings', function ($table) { - $table->integer('qr_code')->nullable()->default(NULL); - + $table->integer('qr_code')->nullable()->default(null); }); } @@ -28,5 +27,4 @@ class AddQrCodeToSettingsTable extends Migration $table->dropColumn('qr_code'); }); } - } diff --git a/database/migrations/2014_02_13_183016_add_qr_text_to_settings_table.php b/database/migrations/2014_02_13_183016_add_qr_text_to_settings_table.php index 48d17aed2b..b55b01ab04 100755 --- a/database/migrations/2014_02_13_183016_add_qr_text_to_settings_table.php +++ b/database/migrations/2014_02_13_183016_add_qr_text_to_settings_table.php @@ -1,7 +1,7 @@ string('qr_text', 32)->nullable()->default(NULL); + $table->string('qr_text', 32)->nullable()->default(null); }); } @@ -28,5 +28,4 @@ class AddQrTextToSettingsTable extends Migration $table->dropColumn('qr_text'); }); } - } diff --git a/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php b/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php index bec8ae64b3..d14195ff84 100755 --- a/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php +++ b/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php @@ -1,7 +1,7 @@ integer('display_asset_name')->nullable()->default(NULL); - + $table->integer('display_asset_name')->nullable()->default(null); }); } @@ -29,5 +28,4 @@ class AddAssetNameToSettings extends Migration $table->dropColumn('display_asset_name'); }); } - } diff --git a/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php b/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php index 75eb893998..a430c41a8c 100755 --- a/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php +++ b/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php @@ -1,7 +1,7 @@ increments('id'); $table->string('name'); - $table->string('address',50)->nullable()->default(NULL); - $table->string('address2',50)->nullable()->default(NULL); - $table->string('city')->nullable()->default(NULL); - $table->string('state',2)->nullable()->default(NULL); - $table->string('country',2)->nullable()->default(NULL); - $table->string('phone',20)->nullable()->default(NULL); - $table->string('fax',20)->nullable()->default(NULL); - $table->string('email',150)->nullable()->default(NULL); - $table->string('contact',100)->nullable()->default(NULL); - $table->string('notes')->nullable()->default(NULL); + $table->string('address', 50)->nullable()->default(null); + $table->string('address2', 50)->nullable()->default(null); + $table->string('city')->nullable()->default(null); + $table->string('state', 2)->nullable()->default(null); + $table->string('country', 2)->nullable()->default(null); + $table->string('phone', 20)->nullable()->default(null); + $table->string('fax', 20)->nullable()->default(null); + $table->string('email', 150)->nullable()->default(null); + $table->string('contact', 100)->nullable()->default(null); + $table->string('notes')->nullable()->default(null); $table->timestamps(); $table->integer('user_id')->nullable(); $table->softDeletes(); @@ -42,5 +42,4 @@ class AddSuppliers extends Migration // Schema::drop('suppliers'); } - } diff --git a/database/migrations/2014_06_24_010742_add_supplier_id_to_asset.php b/database/migrations/2014_06_24_010742_add_supplier_id_to_asset.php index 75c9c97e86..331e1739f2 100755 --- a/database/migrations/2014_06_24_010742_add_supplier_id_to_asset.php +++ b/database/migrations/2014_06_24_010742_add_supplier_id_to_asset.php @@ -1,7 +1,7 @@ integer('supplier_id')->nullable()->default(NULL); + $table->integer('supplier_id')->nullable()->default(null); }); } @@ -28,5 +28,4 @@ class AddSupplierIdToAsset extends Migration $table->dropColumn('supplier_id'); }); } - } diff --git a/database/migrations/2014_06_24_012839_add_zip_to_supplier.php b/database/migrations/2014_06_24_012839_add_zip_to_supplier.php index 49eff46409..5eb356257e 100755 --- a/database/migrations/2014_06_24_012839_add_zip_to_supplier.php +++ b/database/migrations/2014_06_24_012839_add_zip_to_supplier.php @@ -1,7 +1,7 @@ string('zip',10)->nullable()->default(NULL); - + $table->string('zip', 10)->nullable()->default(null); }); } @@ -29,6 +28,4 @@ class AddZipToSupplier extends Migration $table->dropColumn('zip'); }); } - - } diff --git a/database/migrations/2014_06_24_033908_add_url_to_supplier.php b/database/migrations/2014_06_24_033908_add_url_to_supplier.php index 806a775e0c..9cb1bb198b 100755 --- a/database/migrations/2014_06_24_033908_add_url_to_supplier.php +++ b/database/migrations/2014_06_24_033908_add_url_to_supplier.php @@ -1,7 +1,7 @@ string('url',250)->nullable()->default(NULL); - + $table->string('url', 250)->nullable()->default(null); }); } @@ -29,5 +28,4 @@ class AddUrlToSupplier extends Migration $table->dropColumn('url'); }); } - } diff --git a/database/migrations/2014_07_08_054116_add_employee_id_to_users.php b/database/migrations/2014_07_08_054116_add_employee_id_to_users.php index dc64a9f601..fcf4336b54 100755 --- a/database/migrations/2014_07_08_054116_add_employee_id_to_users.php +++ b/database/migrations/2014_07_08_054116_add_employee_id_to_users.php @@ -1,35 +1,33 @@ text('employee_num','50')->nullable()->default(NULL); +class AddEmployeeIdToUsers extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('users', function ($table) { + $table->text('employee_num', '50')->nullable()->default(null); }); - } + } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('users', function ($table) { + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('users', function ($table) { $table->dropColumn('employee_num'); }); - - } - + } } diff --git a/database/migrations/2014_07_09_134316_add_requestable_to_assets.php b/database/migrations/2014_07_09_134316_add_requestable_to_assets.php index 69e4838b26..a37939baaa 100755 --- a/database/migrations/2014_07_09_134316_add_requestable_to_assets.php +++ b/database/migrations/2014_07_09_134316_add_requestable_to_assets.php @@ -1,37 +1,33 @@ tinyInteger('requestable')->default(0); }); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('assets', function ($table) { + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('assets', function ($table) { $table->dropColumn('requestable'); }); - - } - + } } - diff --git a/database/migrations/2014_07_17_085822_add_asset_to_software.php b/database/migrations/2014_07_17_085822_add_asset_to_software.php index ecca3f4387..e5e83cf882 100755 --- a/database/migrations/2014_07_17_085822_add_asset_to_software.php +++ b/database/migrations/2014_07_17_085822_add_asset_to_software.php @@ -1,34 +1,33 @@ integer('asset_id')->nullable()->default(NULL); +class AddAssetToSoftware extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('license_seats', function ($table) { + $table->integer('asset_id')->nullable()->default(null); }); - } + } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('license_seats', function ($table) { + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('license_seats', function ($table) { $table->dropColumn('asset_id'); }); - } - + } } diff --git a/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php b/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php index 1c8f5c1cad..337f98e417 100755 --- a/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php +++ b/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php @@ -1,29 +1,28 @@ integer('rtd_location_id')->nullable()->default(NULL); +class AddRtdLocationToAssets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('assets', function ($table) { + $table->integer('rtd_location_id')->nullable()->default(null); }); - } + } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('assets', function ($table) { + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('assets', function ($table) { $table->dropColumn('rtd_location_id'); }); - } - + } } diff --git a/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php b/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php index 5195c5c714..da1fdaa518 100644 --- a/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php +++ b/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php @@ -1,28 +1,27 @@ integer('display_checkout_date')->nullable()->default(NULL); - + $table->integer('display_checkout_date')->nullable()->default(null); }); } @@ -29,5 +28,4 @@ class AddDisplayCheckoutDate extends Migration { $table->dropColumn('display_checkout_date'); }); } - } diff --git a/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php b/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php index 27eb94684c..16c95eae67 100644 --- a/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php +++ b/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php @@ -3,35 +3,29 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -class AddAvatarFieldToUsersTable extends Migration { - - /** - * Make changes to the table. - * - * @return void - */ - public function up() - { - Schema::table('users', function(Blueprint $table) { - - $table->string('avatar')->nullable(); - - }); - - } - - /** - * Revert the changes to the table. - * - * @return void - */ - public function down() - { - Schema::table('users', function(Blueprint $table) { - - $table->dropColumn('avatar'); - - }); - } +class AddAvatarFieldToUsersTable extends Migration +{ + /** + * Make changes to the table. + * + * @return void + */ + public function up() + { + Schema::table('users', function (Blueprint $table) { + $table->string('avatar')->nullable(); + }); + } + /** + * Revert the changes to the table. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('avatar'); + }); + } } diff --git a/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php b/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php index 27ec34cb03..986c1d29fa 100644 --- a/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php +++ b/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php @@ -1,37 +1,31 @@ string('image')->nullable(); - - }); - - } - - /** - * Revert the changes to the table. - * - * @return void - */ - public function down() - { - Schema::table('models', function(Blueprint $table) { - - $table->dropColumn('image'); - - }); - } +class AddImageFieldToModelsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('models', function (Blueprint $table) { + $table->string('image')->nullable(); + }); + } + /** + * Revert the changes to the table. + * + * @return void + */ + public function down() + { + Schema::table('models', function (Blueprint $table) { + $table->dropColumn('image'); + }); + } } diff --git a/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php b/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php index 9c7e8061fe..82d69e12ba 100644 --- a/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php +++ b/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php @@ -1,20 +1,19 @@ integer('display_eol')->nullable()->default(NULL); - + $table->integer('display_eol')->nullable()->default(null); }); } @@ -29,5 +28,4 @@ class AddEolDisplayToSettings extends Migration { $table->dropColumn('display_eol'); }); } - } diff --git a/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php b/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php index 248e26dde2..c5c42b1f0e 100644 --- a/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php +++ b/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php @@ -1,11 +1,11 @@ update(['permissions' => '{"users-poop":1,"reports":1}']); Group::where('id', 2)->update(['permissions' => '{"users-pop":1,"reports":1}']); - } elseif (Schema::hasTable('groups')) { DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin-farts":1,"users":1,"reports":1}', 1]); DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users-farts":1,"reports":1}', 2]); } - } /** @@ -41,5 +38,4 @@ class UpdateGroupFieldForReporting extends Migration { { // } - } diff --git a/database/migrations/2014_11_05_212408_add_fields_to_licenses.php b/database/migrations/2014_11_05_212408_add_fields_to_licenses.php index e5bbad46d5..f8909764e0 100644 --- a/database/migrations/2014_11_05_212408_add_fields_to_licenses.php +++ b/database/migrations/2014_11_05_212408_add_fields_to_licenses.php @@ -1,36 +1,35 @@ integer('supplier_id')->nullable()->default(NULL); - $table->date('expiration_date')->nullable(); - $table->string('purchase_order')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('licenses', function ($table) { - $table->dropColumn('supplier_id'); - $table->dropColumn('expiration_date'); - $table->dropColumn('purchase_order'); - }); - } +class AddFieldsToLicenses extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('licenses', function ($table) { + $table->integer('supplier_id')->nullable()->default(null); + $table->date('expiration_date')->nullable(); + $table->string('purchase_order')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('licenses', function ($table) { + $table->dropColumn('supplier_id'); + $table->dropColumn('expiration_date'); + $table->dropColumn('purchase_order'); + }); + } } diff --git a/database/migrations/2014_11_07_021042_add_image_to_supplier.php b/database/migrations/2014_11_07_021042_add_image_to_supplier.php index 0efb41eb09..a1c71d90a2 100644 --- a/database/migrations/2014_11_07_021042_add_image_to_supplier.php +++ b/database/migrations/2014_11_07_021042_add_image_to_supplier.php @@ -1,37 +1,31 @@ string('image')->nullable(); + }); + } - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::table('suppliers', function(Blueprint $table) { - - $table->string('image')->nullable(); - - }); - - } - - /** - * Revert the changes to the table. - * - * @return void - */ - public function down() - { - Schema::table('suppliers', function(Blueprint $table) { - - $table->dropColumn('image'); - - }); - } - -} \ No newline at end of file + /** + * Revert the changes to the table. + * + * @return void + */ + public function down() + { + Schema::table('suppliers', function (Blueprint $table) { + $table->dropColumn('image'); + }); + } +} diff --git a/database/migrations/2014_11_20_203007_add_username_to_user.php b/database/migrations/2014_11_20_203007_add_username_to_user.php index 5dfecac39a..0861145f21 100644 --- a/database/migrations/2014_11_20_203007_add_username_to_user.php +++ b/database/migrations/2014_11_20_203007_add_username_to_user.php @@ -1,39 +1,33 @@ string('username')->nullable()->default(NULL); - - }); - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('users', function(Blueprint $table) { - - $table->dropColumn('username'); - - }); - } +class AddUsernameToUser extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('users', function (Blueprint $table) { + $table->string('username')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('username'); + }); + } } diff --git a/database/migrations/2014_11_20_223947_add_auto_to_settings.php b/database/migrations/2014_11_20_223947_add_auto_to_settings.php index 3d3a4765f7..529e00d907 100644 --- a/database/migrations/2014_11_20_223947_add_auto_to_settings.php +++ b/database/migrations/2014_11_20_223947_add_auto_to_settings.php @@ -1,38 +1,33 @@ integer('auto_increment_assets')->default(0); - - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function(Blueprint $table) { - - $table->dropColumn('auto_increment_assets'); - - }); - } +class AddAutoToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function (Blueprint $table) { + $table->integer('auto_increment_assets')->default(0); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('auto_increment_assets'); + }); + } } diff --git a/database/migrations/2014_11_20_224421_add_prefix_to_settings.php b/database/migrations/2014_11_20_224421_add_prefix_to_settings.php index e325b3c55e..06162125dc 100644 --- a/database/migrations/2014_11_20_224421_add_prefix_to_settings.php +++ b/database/migrations/2014_11_20_224421_add_prefix_to_settings.php @@ -1,38 +1,33 @@ string('auto_increment_prefix')->nullable()->default(NULL); - - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function(Blueprint $table) { - - $table->dropColumn('auto_increment_prefix'); - - }); - } +class AddPrefixToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function (Blueprint $table) { + $table->string('auto_increment_prefix')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('auto_increment_prefix'); + }); + } } diff --git a/database/migrations/2014_11_21_104401_change_licence_type.php b/database/migrations/2014_11_21_104401_change_licence_type.php index 1028cca3e5..97701d0b0f 100644 --- a/database/migrations/2014_11_21_104401_change_licence_type.php +++ b/database/migrations/2014_11_21_104401_change_licence_type.php @@ -1,32 +1,31 @@ date('termination_date')->nullable(); - $table->boolean('maintained')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('licenses', function ($table) { - $table->dropColumn('termination_date'); - $table->dropColumn('maintained'); - }); - } +class AddFieldsMaintainedTermToLicenses extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('licenses', function ($table) { + $table->date('termination_date')->nullable(); + $table->boolean('maintained')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('licenses', function ($table) { + $table->dropColumn('termination_date'); + $table->dropColumn('maintained'); + }); + } } diff --git a/database/migrations/2015_02_04_155757_increase_user_field_lengths.php b/database/migrations/2015_02_04_155757_increase_user_field_lengths.php index e71eedd007..493e07ee41 100644 --- a/database/migrations/2015_02_04_155757_increase_user_field_lengths.php +++ b/database/migrations/2015_02_04_155757_increase_user_field_lengths.php @@ -1,30 +1,29 @@ getDoctrineSchemaManager()->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('enum', 'string'); Schema::table('asset_logs', function ($table) { - $table->string('asset_type',100)->nullable()->change(); + $table->string('asset_type', 100)->nullable()->change(); }); - // DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null'); - // DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"'); - // Schema::table('asset_logs', function ($table) { - // $table->renameColumn('added_on', 'created_at'); - // $table->timestamp('updated_at'); + // DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null'); + // DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"'); + // Schema::table('asset_logs', function ($table) { + // $table->renameColumn('added_on', 'created_at'); + // $table->timestamp('updated_at'); // $table->softDeletes(); - // }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // Schema::table('asset_logs', function ($table) { - // $table->renameColumn('created_at', 'added_on'); - // $table->dropColumn('updated_at'); - // $table->dropSoftDeletes(); - // }); - } + // }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // Schema::table('asset_logs', function ($table) { + // $table->renameColumn('created_at', 'added_on'); + // $table->dropColumn('updated_at'); + // $table->dropSoftDeletes(); + // }); + } } diff --git a/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php b/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php index 7be7dc63a1..36ba8f8caa 100644 --- a/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php +++ b/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php @@ -1,50 +1,47 @@ boolean('deployable')->default(0); - $table->boolean('pending')->default(0); - $table->boolean('archived')->default(0); - $table->text('notes')->nullable(); - }); + Schema::table('status_labels', function ($table) { + $table->boolean('deployable')->default(0); + $table->boolean('pending')->default(0); + $table->boolean('archived')->default(0); + $table->text('notes')->nullable(); + }); DB::table('status_labels')->insert([ ['user_id' => 1, 'name' => 'Pending', 'deployable' => 0, 'pending' => 1, 'archived' => 0, 'notes' => 'These assets are not yet ready to be deployed, usually because of configuration or waiting on parts.'], ['user_id' => 1, 'name' => 'Ready to Deploy', 'deployable' => 1, 'pending' => 0, 'archived' => 0, 'notes' => 'These assets are ready to deploy.'], ['user_id' => 1, 'name' => 'Archived', 'deployable' => 0, 'pending' => 0, 'archived' => 1, 'notes' => 'These assets are no longer in circulation or viable.'], ]); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('status_labels', function ($table) { - $table->dropColumn('deployable'); - $table->dropColumn('pending'); - $table->dropColumn('archived'); - $table->dropColumn('notes'); - - }); - } - + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('status_labels', function ($table) { + $table->dropColumn('deployable'); + $table->dropColumn('pending'); + $table->dropColumn('archived'); + $table->dropColumn('notes'); + }); + } } diff --git a/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php b/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php index 8b9c33632c..50dacc1f7a 100644 --- a/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php +++ b/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php @@ -1,60 +1,51 @@ where('name', 'Pending')->orWhere('name', 'Ready to Deploy')->get(); - foreach ($statuses as $status) { - if ($status->name =="Pending") { - $pending_id = array($status->id); - } elseif ($status->name =="Ready to Deploy") { - $rtd_id = array($status->id); - } - } + foreach ($statuses as $status) { + if ($status->name == 'Pending') { + $pending_id = [$status->id]; + } elseif ($status->name == 'Ready to Deploy') { + $rtd_id = [$status->id]; + } + } - // Pending + // Pending $pendings = DB::table('assets')->where('status_id', null)->where('physical', '1')->get(); + foreach ($pendings as $pending) { + DB::update('update '.DB::getTablePrefix().'assets set status_id = ? where status_id IS NULL AND physical=1', $pending_id); + } - foreach ($pendings as $pending) { - DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id IS NULL AND physical=1',$pending_id); - - } - - - // Ready to Deploy + // Ready to Deploy $rtds = DB::table('assets')->where('status_id', 0)->where('physical', '1')->get(); - foreach ($rtds as $rtd) { - //DB::update('update users set votes = 100 where name = ?', array('John')); - DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id = 0 AND physical=1',$rtd_id); - - } - - - - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } + foreach ($rtds as $rtd) { + //DB::update('update users set votes = 100 where name = ?', array('John')); + DB::update('update '.DB::getTablePrefix().'assets set status_id = ? where status_id = 0 AND physical=1', $rtd_id); + } + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } } diff --git a/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php b/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php index 75f2e46301..e3586b7763 100644 --- a/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php +++ b/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php @@ -1,29 +1,28 @@ increments('id'); $table->integer('asset_id'); $table->integer('user_id')->nullable(); @@ -21,17 +21,16 @@ class MigrateCreateRequestsTable extends Migration { $table->timestamps(); $table->softDeletes(); }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('requests'); - } + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('requests'); + } } diff --git a/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php b/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php index eb658a53ae..8f0bf1385a 100644 --- a/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php +++ b/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php @@ -1,43 +1,41 @@ string('mac_address')->nullable()->default(null); + }); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - // - Schema::table('assets', function ($table) { - $table->string('mac_address')->nullable()->default(NULL); - }); + Schema::table('models', function ($table) { + $table->boolean('show_mac_address')->default(0); + }); + } - Schema::table('models', function ($table) { - $table->boolean('show_mac_address')->default(0); - }); - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('assets', function ($table) { - $table->dropColumn('mac_address'); - }); - - Schema::table('models', function ($table) { - $table->dropColumn('show_mac_address'); - }); - } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('assets', function ($table) { + $table->dropColumn('mac_address'); + }); + Schema::table('models', function ($table) { + $table->dropColumn('show_mac_address'); + }); + } } diff --git a/database/migrations/2015_02_12_024100_change_license_notes_type.php b/database/migrations/2015_02_12_024100_change_license_notes_type.php index a9a3029a8b..ba2f4b3188 100644 --- a/database/migrations/2015_02_12_024100_change_license_notes_type.php +++ b/database/migrations/2015_02_12_024100_change_license_notes_type.php @@ -1,27 +1,29 @@ text('notes')->change(); - }); +use Illuminate\Database\Schema\Blueprint; - } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { +class ChangeLicenseNotesType extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('licenses', function ($table) { + $table->text('notes')->change(); + }); + } - } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + } } diff --git a/database/migrations/2015_02_17_231020_add_localonly_to_settings.php b/database/migrations/2015_02_17_231020_add_localonly_to_settings.php index 6ac91ba23d..5c5b0eeb95 100644 --- a/database/migrations/2015_02_17_231020_add_localonly_to_settings.php +++ b/database/migrations/2015_02_17_231020_add_localonly_to_settings.php @@ -1,35 +1,33 @@ boolean('load_remote')->default(1); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function ($table) { - $table->dropColumn('load_remote'); - }); - - } +class AddLocalonlyToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function ($table) { + $table->boolean('load_remote')->default(1); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function ($table) { + $table->dropColumn('load_remote'); + }); + } } diff --git a/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php b/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php index f047a7080f..cb2d7ac983 100644 --- a/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php +++ b/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php @@ -1,37 +1,35 @@ string('logo')->nullable()->default(NULL); - $table->string('header_color')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function ($table) { - $table->dropColumn('logo'); - $table->dropColumn('header_color'); - }); - - } +class AddLogoAndColorsToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function ($table) { + $table->string('logo')->nullable()->default(null); + $table->string('header_color')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function ($table) { + $table->dropColumn('logo'); + $table->dropColumn('header_color'); + }); + } } diff --git a/database/migrations/2015_02_24_072043_add_alerts_to_settings.php b/database/migrations/2015_02_24_072043_add_alerts_to_settings.php index 8a208457ea..d7119ab4cd 100644 --- a/database/migrations/2015_02_24_072043_add_alerts_to_settings.php +++ b/database/migrations/2015_02_24_072043_add_alerts_to_settings.php @@ -1,36 +1,35 @@ string('alert_email')->nullable()->default(NULL); - $table->boolean('alerts_enabled')->default(1); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function ($table) { - $table->dropColumn('alert_email'); - $table->dropColumn('alerts_enabled'); - }); - } +class AddAlertsToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function ($table) { + $table->string('alert_email')->nullable()->default(null); + $table->boolean('alerts_enabled')->default(1); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function ($table) { + $table->dropColumn('alert_email'); + $table->dropColumn('alerts_enabled'); + }); + } } diff --git a/database/migrations/2015_02_25_022931_add_eula_fields.php b/database/migrations/2015_02_25_022931_add_eula_fields.php index a4eff87120..90c249dd49 100644 --- a/database/migrations/2015_02_25_022931_add_eula_fields.php +++ b/database/migrations/2015_02_25_022931_add_eula_fields.php @@ -1,69 +1,67 @@ longText('default_eula_text')->nullable()->default(null); + }); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - // - Schema::table('settings', function ($table) { - $table->longText('default_eula_text')->nullable()->default(NULL); - }); + Schema::table('categories', function ($table) { + $table->longText('eula_text')->nullable()->default(null); + $table->boolean('use_default_eula')->default(0); + $table->boolean('require_acceptance')->default(0); + }); - Schema::table('categories', function ($table) { - $table->longText('eula_text')->nullable()->default(NULL); - $table->boolean('use_default_eula')->default(0); - $table->boolean('require_acceptance')->default(0); - }); + Schema::table('asset_logs', function ($table) { + $table->dateTime('requested_at')->nullable()->default(null); + $table->dateTime('accepted_at')->nullable()->default(null); + }); - Schema::table('asset_logs', function ($table) { - $table->dateTime('requested_at')->nullable()->default(NULL); - $table->dateTime('accepted_at')->nullable()->default(NULL); - }); + Schema::create('requested_assets', function ($table) { + $table->increments('id'); + $table->integer('asset_id')->default(null); + $table->integer('user_id')->default(null); + $table->dateTime('accepted_at')->nullable()->default(null); + $table->dateTime('denied_at')->nullable()->default(null); + $table->string('notes')->default(null); + $table->timestamps(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function ($table) { + $table->dropColumn('default_eula_text'); + }); - Schema::create('requested_assets', function ($table) { - $table->increments('id'); - $table->integer('asset_id')->default(NULL); - $table->integer('user_id')->default(NULL); - $table->dateTime('accepted_at')->nullable()->default(NULL); - $table->dateTime('denied_at')->nullable()->default(NULL); - $table->string('notes')->default(NULL); - $table->timestamps(); - }); - } + Schema::table('categories', function ($table) { + $table->dropColumn('eula_text'); + $table->dropColumn('use_default_eula'); + $table->dropColumn('require_acceptance'); + }); - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function ($table) { - $table->dropColumn('default_eula_text'); - }); - - Schema::table('categories', function ($table) { - $table->dropColumn('eula_text'); - $table->dropColumn('use_default_eula'); - $table->dropColumn('require_acceptance'); - }); - - Schema::table('asset_logs', function ($table) { - $table->dropColumn('requested_at'); - $table->dropColumn('accepted_at'); - }); - - Schema::drop('requested_assets'); - } + Schema::table('asset_logs', function ($table) { + $table->dropColumn('requested_at'); + $table->dropColumn('accepted_at'); + }); + Schema::drop('requested_assets'); + } } diff --git a/database/migrations/2015_02_25_204513_add_accessories_table.php b/database/migrations/2015_02_25_204513_add_accessories_table.php index 037351f861..49d95d721f 100644 --- a/database/migrations/2015_02_25_204513_add_accessories_table.php +++ b/database/migrations/2015_02_25_204513_add_accessories_table.php @@ -1,23 +1,23 @@ increments('id'); - $table->string('name')->nullable()->default(NULL); - $table->integer('category_id')->nullable()->default(NULL); - $table->integer('user_id')->nullable()->default(NULL); + $table->string('name')->nullable()->default(null); + $table->integer('category_id')->nullable()->default(null); + $table->integer('user_id')->nullable()->default(null); $table->integer('qty')->default(0); $table->boolean('requestable')->default(0); $table->timestamps(); @@ -26,24 +26,22 @@ class AddAccessoriesTable extends Migration { }); Schema::table('asset_logs', function ($table) { - $table->integer('accessory_id')->nullable()->default(NULL); - }); + $table->integer('accessory_id')->nullable()->default(null); + }); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('accessories'); - - Schema::table('asset_logs', function ($table) { - $table->dropColumn('accessory_id'); - }); - } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('accessories'); + Schema::table('asset_logs', function ($table) { + $table->dropColumn('accessory_id'); + }); + } } diff --git a/database/migrations/2015_02_26_091228_add_accessories_user_table.php b/database/migrations/2015_02_26_091228_add_accessories_user_table.php index e8a01d5508..38e1ac5b52 100644 --- a/database/migrations/2015_02_26_091228_add_accessories_user_table.php +++ b/database/migrations/2015_02_26_091228_add_accessories_user_table.php @@ -1,46 +1,43 @@ increments('id'); - $table->integer('user_id')->nullable()->default(NULL); - $table->integer('accessory_id')->nullable()->default(NULL); - $table->integer('assigned_to')->nullable()->default(NULL); + $table->integer('user_id')->nullable()->default(null); + $table->integer('accessory_id')->nullable()->default(null); + $table->integer('assigned_to')->nullable()->default(null); $table->timestamps(); }); - + Schema::table('accessories', function ($table) { - $table->integer('location_id')->nullable()->default(NULL); - }); + $table->integer('location_id')->nullable()->default(null); + }); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('accessories_users'); - - Schema::table('accessories', function ($table) { - $table->dropColumn('location_id'); - }); - - } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('accessories_users'); + Schema::table('accessories', function ($table) { + $table->dropColumn('location_id'); + }); + } } diff --git a/database/migrations/2015_02_26_115128_add_deleted_at_models.php b/database/migrations/2015_02_26_115128_add_deleted_at_models.php index 044647d43d..28f42d2366 100644 --- a/database/migrations/2015_02_26_115128_add_deleted_at_models.php +++ b/database/migrations/2015_02_26_115128_add_deleted_at_models.php @@ -1,32 +1,31 @@ softDeletes(); }); - } + } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('models', function ($table){ + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models', function ($table) { $table->dropColumn('deleted_at'); }); - } - + } } diff --git a/database/migrations/2015_02_26_233005_add_category_type.php b/database/migrations/2015_02_26_233005_add_category_type.php index 7fe85587f1..8f41f6fda9 100644 --- a/database/migrations/2015_02_26_233005_add_category_type.php +++ b/database/migrations/2015_02_26_233005_add_category_type.php @@ -1,34 +1,33 @@ string('category_type')->nullable()->default('asset'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('categories', function ($table) { - $table->dropColumn('category_type'); - }); - } +class AddCategoryType extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('categories', function ($table) { + $table->string('category_type')->nullable()->default('asset'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('categories', function ($table) { + $table->dropColumn('category_type'); + }); + } } diff --git a/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php b/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php index 6d913e03a5..9cae90a791 100644 --- a/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php +++ b/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php @@ -1,47 +1,44 @@ integer('accepted_id')->nullable()->default(null); + }); - Schema::table('asset_logs', function ($table) { - $table->integer('accepted_id')->nullable()->default(NULL); - }); - - $results = DB::table('asset_logs as invitation')->join('asset_logs as acceptance', function($join) { + $results = DB::table('asset_logs as invitation')->join('asset_logs as acceptance', function ($join) { $join->on('invitation.checkedout_to', '=', 'acceptance.checkedout_to'); $join->on('invitation.asset_id', '=', 'acceptance.asset_id'); })->select('invitation.id as invitation_id', 'acceptance.id as acceptance_id') ->where('invitation.action_type', 'checkout')->where('acceptance.action_type', 'accepted')->get(); - foreach ($results as $result) { - $update = DB::update('update '.DB::getTablePrefix().'asset_logs set accepted_id=? where id=?', [$result->acceptance_id, $result->invitation_id]); - } - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('asset_logs', function ($table) { - $table->dropColumn('accepted_id'); - }); - - } + foreach ($results as $result) { + $update = DB::update('update '.DB::getTablePrefix().'asset_logs set accepted_id=? where id=?', [$result->acceptance_id, $result->invitation_id]); + } + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('asset_logs', function ($table) { + $table->dropColumn('accepted_id'); + }); + } } diff --git a/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php b/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php index cc171bbfef..e85d79bd97 100644 --- a/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php +++ b/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php @@ -1,34 +1,33 @@ string('barcode_type')->nullable()->default('QRCODE'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function ($table) { - $table->dropColumn('barcode_type'); - }); - } +class AddQrTypeToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('settings', function ($table) { + $table->string('barcode_type')->nullable()->default('QRCODE'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function ($table) { + $table->dropColumn('barcode_type'); + }); + } } diff --git a/database/migrations/2015_03_18_055327_add_note_to_user.php b/database/migrations/2015_03_18_055327_add_note_to_user.php index 631f4574c0..191d34c572 100644 --- a/database/migrations/2015_03_18_055327_add_note_to_user.php +++ b/database/migrations/2015_03_18_055327_add_note_to_user.php @@ -1,32 +1,31 @@ text('notes')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function ($table) { - $table->dropColumn('notes'); - }); - } +class AddNoteToUser extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('users', function ($table) { + $table->text('notes')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function ($table) { + $table->dropColumn('notes'); + }); + } } diff --git a/database/migrations/2015_04_29_234704_add_slack_to_settings.php b/database/migrations/2015_04_29_234704_add_slack_to_settings.php index 8dca9e0b06..c7970ef1dd 100644 --- a/database/migrations/2015_04_29_234704_add_slack_to_settings.php +++ b/database/migrations/2015_04_29_234704_add_slack_to_settings.php @@ -1,39 +1,36 @@ string('slack_endpoint')->nullable()->default(NULL); - $table->string('slack_channel')->nullable()->default(NULL); - $table->string('slack_botname')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - // - $table->dropColumn('slack_endpoint'); - $table->dropColumn('slack_channel'); - $table->dropColumn('slack_botname'); - }); - } +class AddSlackToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->string('slack_endpoint')->nullable()->default(null); + $table->string('slack_channel')->nullable()->default(null); + $table->string('slack_botname')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + // + $table->dropColumn('slack_endpoint'); + $table->dropColumn('slack_channel'); + $table->dropColumn('slack_botname'); + }); + } } diff --git a/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php b/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php index 6c0ed7f831..5b9dc26ea1 100644 --- a/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php +++ b/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php @@ -1,36 +1,33 @@ integer('parent_id')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('locations', function(Blueprint $table) - { - // - $table->dropColumn('parent_id'); - }); - } +class AddParentIdToLocationsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('locations', function (Blueprint $table) { + // + $table->integer('parent_id')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('locations', function (Blueprint $table) { + // + $table->dropColumn('parent_id'); + }); + } } diff --git a/database/migrations/2015_05_22_124421_add_reassignable_to_licenses.php b/database/migrations/2015_05_22_124421_add_reassignable_to_licenses.php index b0e94a92f8..fc029e2619 100644 --- a/database/migrations/2015_05_22_124421_add_reassignable_to_licenses.php +++ b/database/migrations/2015_05_22_124421_add_reassignable_to_licenses.php @@ -1,35 +1,32 @@ boolean('reassignable')->default(true); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('licenses', function(Blueprint $table) - { - // - $table->dropColumn('reassignable'); - }); - } +class AddReassignableToLicenses extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('licenses', function (Blueprint $table) { + $table->boolean('reassignable')->default(true); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('licenses', function (Blueprint $table) { + // + $table->dropColumn('reassignable'); + }); + } } diff --git a/database/migrations/2015_06_10_003314_fix_default_for_user_notes.php b/database/migrations/2015_06_10_003314_fix_default_for_user_notes.php index 12255c4c23..6fb202c443 100644 --- a/database/migrations/2015_06_10_003314_fix_default_for_user_notes.php +++ b/database/migrations/2015_06_10_003314_fix_default_for_user_notes.php @@ -1,29 +1,28 @@ increments('id'); - $table->string('name')->nullable()->default(NULL); - $table->integer('category_id')->nullable()->default(NULL); - $table->integer('location_id')->nullable()->default(NULL); - $table->integer('user_id')->nullable()->default(NULL); + $table->string('name')->nullable()->default(null); + $table->integer('category_id')->nullable()->default(null); + $table->integer('location_id')->nullable()->default(null); + $table->integer('user_id')->nullable()->default(null); $table->integer('qty')->default(0); $table->boolean('requestable')->default(0); $table->timestamps(); @@ -27,38 +27,32 @@ class CreateConsumables extends Migration { }); Schema::table('asset_logs', function ($table) { - $table->integer('consumable_id')->nullable()->default(NULL); - }); - - Schema::create('consumables_users', function ($table) { - $table->increments('id'); - $table->integer('user_id')->nullable()->default(NULL); - $table->integer('consumable_id')->nullable()->default(NULL); - $table->integer('assigned_to')->nullable()->default(NULL); - $table->timestamps(); + $table->integer('consumable_id')->nullable()->default(null); }); + Schema::create('consumables_users', function ($table) { + $table->increments('id'); + $table->integer('user_id')->nullable()->default(null); + $table->integer('consumable_id')->nullable()->default(null); + $table->integer('assigned_to')->nullable()->default(null); + $table->timestamps(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('consumables'); - } - - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('consumables'); - - Schema::table('asset_logs', function ($table) { - $table->dropColumn('consumable_id'); - }); - - Schema::drop('consumables_users'); - - } + Schema::table('asset_logs', function ($table) { + $table->dropColumn('consumable_id'); + }); + Schema::drop('consumables_users'); + } } diff --git a/database/migrations/2015_06_15_183253_move_email_to_username.php b/database/migrations/2015_06_15_183253_move_email_to_username.php index 66c07acb77..8506bd4d16 100644 --- a/database/migrations/2015_06_15_183253_move_email_to_username.php +++ b/database/migrations/2015_06_15_183253_move_email_to_username.php @@ -1,30 +1,29 @@ string('email')->nullable()->change(); - }); - - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - - } +class MakeEmailNullable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('users', function (Blueprint $table) { + $table->string('email')->nullable()->change(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } } diff --git a/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php b/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php index 4c465528dc..f328bb61f8 100644 --- a/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php +++ b/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php @@ -6,7 +6,6 @@ class CreateAssetMaintenancesTable extends Migration { - /** * Run the migrations. * @@ -14,39 +13,36 @@ */ public function up() { - - Schema::create( 'asset_maintenances', function ( Blueprint $table ) { - - $table->increments( 'id' ); - $table->integer( 'asset_id' ) + Schema::create('asset_maintenances', function (Blueprint $table) { + $table->increments('id'); + $table->integer('asset_id') ->unsigned(); - $table->integer( 'supplier_id' ) + $table->integer('supplier_id') ->unsigned(); - $table->string( 'asset_maintenance_type'); - $table->string( 'title', 100 ); - $table->boolean( 'is_warranty' ); - $table->date( 'start_date' ); - $table->date( 'completion_date' ) + $table->string('asset_maintenance_type'); + $table->string('title', 100); + $table->boolean('is_warranty'); + $table->date('start_date'); + $table->date('completion_date') ->nullable(); - $table->integer( 'asset_maintenance_time' ) + $table->integer('asset_maintenance_time') ->nullable(); - $table->longText( 'notes' ) + $table->longText('notes') ->nullable(); - $table->decimal( 'cost', 10, 2 ) + $table->decimal('cost', 10, 2) ->nullable(); - $table->dateTime( 'deleted_at' ) + $table->dateTime('deleted_at') ->nullable(); $table->timestamps(); - } ); + }); } protected function getEnumFields() { - return [ - trans( 'admin/asset_maintenances/general.maintenance' ), - trans( 'admin/asset_maintenances/general.repair' ), - trans( 'admin/asset_maintenances/general.upgrade' ) + trans('admin/asset_maintenances/general.maintenance'), + trans('admin/asset_maintenances/general.repair'), + trans('admin/asset_maintenances/general.upgrade'), ]; } @@ -57,9 +53,6 @@ */ public function down() { - - Schema::dropIfExists( 'asset_maintenances' ); - + Schema::dropIfExists('asset_maintenances'); } - -} + } diff --git a/database/migrations/2015_07_04_212443_create_custom_fields_table.php b/database/migrations/2015_07_04_212443_create_custom_fields_table.php index b2dbbebb8c..3e3319c635 100644 --- a/database/migrations/2015_07_04_212443_create_custom_fields_table.php +++ b/database/migrations/2015_07_04_212443_create_custom_fields_table.php @@ -5,32 +5,30 @@ use Illuminate\Database\Migrations\Migration; class CreateCustomFieldsTable extends Migration { + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('custom_fields', function ($table) { + $table->increments('id'); + $table->string('name'); + $table->string('format'); + $table->string('element'); + $table->timestamps(); + }); + } - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('custom_fields', function ($table) { - $table->increments('id'); - $table->string('name'); - $table->string('format'); - $table->string('element'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('custom_fields'); - } - + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('custom_fields'); + } } diff --git a/database/migrations/2015_07_09_014359_add_currency_to_settings_and_locations.php b/database/migrations/2015_07_09_014359_add_currency_to_settings_and_locations.php index 254a3c018b..37e0edb743 100644 --- a/database/migrations/2015_07_09_014359_add_currency_to_settings_and_locations.php +++ b/database/migrations/2015_07_09_014359_add_currency_to_settings_and_locations.php @@ -1,56 +1,46 @@ string('default_currency',10)->nullable()->default(NULL); - }); +class AddCurrencyToSettingsAndLocations extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->string('default_currency', 10)->nullable()->default(null); + }); DB::table('settings')->update(['default_currency' => trans('general.currency')]); - Schema::table('locations', function(Blueprint $table) - { - $table->string('currency',10)->nullable()->default(NULL); - }); + Schema::table('locations', function (Blueprint $table) { + $table->string('currency', 10)->nullable()->default(null); + }); DB::table('locations')->update(['currency' => trans('general.currency')]); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('settings', function (Blueprint $table) { + // + $table->dropColumn('default_currency'); + }); - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('settings', function(Blueprint $table) - { - // - $table->dropColumn('default_currency'); - }); - - Schema::table('locations', function(Blueprint $table) - { - // - $table->dropColumn('currency'); - }); - - } - + Schema::table('locations', function (Blueprint $table) { + // + $table->dropColumn('currency'); + }); + } } diff --git a/database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php b/database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php index 40826af579..cb8f6b3aaf 100644 --- a/database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php +++ b/database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php @@ -1,37 +1,31 @@ date('expected_checkin')->nullable()->default(NULL); +class AddExpectedCheckinDateToAssetLogs extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('asset_logs', function ($table) { + $table->date('expected_checkin')->nullable()->default(null); }); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - - Schema::table('asset_logs', function(Blueprint $table) - { - $table->dropColumn('expected_checkin'); - }); - - } - + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('asset_logs', function (Blueprint $table) { + $table->dropColumn('expected_checkin'); + }); + } } diff --git a/database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php b/database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php index a2009e4dea..00e6aaa3d1 100644 --- a/database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php +++ b/database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php @@ -1,32 +1,31 @@ boolean('checkin_email')->default(0); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('categories', function ($table) { - $table->dropColumn('checkin_email'); - }); - } +class AddCheckinEmailToCategoryTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('categories', function ($table) { + $table->boolean('checkin_email')->default(0); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('categories', function ($table) { + $table->dropColumn('checkin_email'); + }); + } } diff --git a/database/migrations/2015_07_25_055415_remove_email_unique_constraint.php b/database/migrations/2015_07_25_055415_remove_email_unique_constraint.php index 06c84a9df3..48f01645ed 100644 --- a/database/migrations/2015_07_25_055415_remove_email_unique_constraint.php +++ b/database/migrations/2015_07_25_055415_remove_email_unique_constraint.php @@ -1,31 +1,29 @@ dropUnique('users_email_unique'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } +class RemoveEmailUniqueConstraint extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('users', function (Blueprint $table) { + $table->dropUnique('users_email_unique'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } } diff --git a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php index 4a0e45bbef..eefc283e3f 100644 --- a/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php +++ b/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php @@ -1,12 +1,11 @@ dropIndex( 'thread_id' ); - $table->dropColumn( 'thread_id' ); - } ); + Schema::table('asset_logs', function (Blueprint $table) { + $table->dropIndex('thread_id'); + $table->dropColumn('thread_id'); + }); } /** @@ -125,9 +120,8 @@ * @author Vincent Sposato * @version v1.0 */ - protected function hasAssetChanged( $assetLog ) + protected function hasAssetChanged($assetLog) { - return $assetLog->asset_id !== $this->currentAssetId; } @@ -139,11 +133,10 @@ * @author Vincent Sposato * @version v1.0 */ - protected function resetCurrentAssetInformation( $assetLog ) + protected function resetCurrentAssetInformation($assetLog) { - - $this->currentAssetId = $assetLog->asset_id; - $this->currentAssetLogId = $assetLog->id; + $this->currentAssetId = $assetLog->asset_id; + $this->currentAssetLogId = $assetLog->id; $this->startOfCurrentThread = true; } @@ -156,10 +149,9 @@ * @author Vincent Sposato * @version v1.0 */ - protected function hasReachedEndOfChain( $assetLog ) + protected function hasReachedEndOfChain($assetLog) { - - return in_array( $assetLog->action_type, $this->threadFinalActionTypes ) + return in_array($assetLog->action_type, $this->threadFinalActionTypes) && $this->startOfCurrentThread == false; } @@ -170,10 +162,9 @@ */ protected function clearCurrentAssetInformation() { - $this->startOfCurrentThread = true; - $this->currentAssetLogId = null; - $this->currentAssetId = null; + $this->currentAssetLogId = null; + $this->currentAssetId = null; } /** @@ -184,16 +175,15 @@ * @author Vincent Sposato * @version v1.0 */ - protected function updateAssetLogWithThreadInformation( $assetLog ) + protected function updateAssetLogWithThreadInformation($assetLog) { - - $loadedAssetLog = Actionlog::find( $assetLog->id ); + $loadedAssetLog = Actionlog::find($assetLog->id); $loadedAssetLog->thread_id = $this->currentAssetLogId; $loadedAssetLog->update(); - unset( $loadedAssetLog ); + unset($loadedAssetLog); } /** @@ -205,11 +195,9 @@ * @author Vincent Sposato * @version v1.0 */ - protected function hasBegunNewChain( $assetLog ) + protected function hasBegunNewChain($assetLog) { - - return in_array( $assetLog->action_type, $this->threadStartingActionTypes ) + return in_array($assetLog->action_type, $this->threadStartingActionTypes) && $this->startOfCurrentThread == true; } - } diff --git a/database/migrations/2015_07_31_015430_add_accepted_to_assets.php b/database/migrations/2015_07_31_015430_add_accepted_to_assets.php index 8f07b0951c..db964b5456 100644 --- a/database/migrations/2015_07_31_015430_add_accepted_to_assets.php +++ b/database/migrations/2015_07_31_015430_add_accepted_to_assets.php @@ -1,34 +1,31 @@ string('accepted')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('assets', function(Blueprint $table) - { - $table->dropColumn('accepted'); - }); - } +class AddAcceptedToAssets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('assets', function (Blueprint $table) { + $table->string('accepted')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('assets', function (Blueprint $table) { + $table->dropColumn('accepted'); + }); + } } diff --git a/database/migrations/2015_09_09_195301_add_custom_css_to_settings.php b/database/migrations/2015_09_09_195301_add_custom_css_to_settings.php index 0baa89bb08..8acb55757b 100644 --- a/database/migrations/2015_09_09_195301_add_custom_css_to_settings.php +++ b/database/migrations/2015_09_09_195301_add_custom_css_to_settings.php @@ -1,34 +1,31 @@ text('custom_css')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - $table->dropColumn('custom_css'); - }); - } +class AddCustomCssToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->text('custom_css')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('custom_css'); + }); + } } diff --git a/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php b/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php index acf920ce73..6e56769d5c 100644 --- a/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php +++ b/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php @@ -1,36 +1,34 @@ integer('custom_field_id'); + $table->integer('custom_fieldset_id'); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('custom_field_custom_fieldset', function(Blueprint $table) - { - $table->integer('custom_field_id'); - $table->integer('custom_fieldset_id'); - - $table->integer('order'); - $table->boolean('required'); - $table->engine = 'InnoDB'; - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('custom_field_custom_fieldset'); - } + $table->integer('order'); + $table->boolean('required'); + $table->engine = 'InnoDB'; + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('custom_field_custom_fieldset'); + } } diff --git a/database/migrations/2015_09_22_000104_create_custom_fieldsets.php b/database/migrations/2015_09_22_000104_create_custom_fieldsets.php index 436a579692..5265404d15 100644 --- a/database/migrations/2015_09_22_000104_create_custom_fieldsets.php +++ b/database/migrations/2015_09_22_000104_create_custom_fieldsets.php @@ -1,34 +1,32 @@ increments('id'); - $table->string('name'); - $table->engine = 'InnoDB'; - // - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('custom_fieldsets'); - } +class CreateCustomFieldsets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('custom_fieldsets', function (Blueprint $table) { + $table->increments('id'); + $table->string('name'); + $table->engine = 'InnoDB'; + // + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('custom_fieldsets'); + } } diff --git a/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php b/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php index 7771b30e0e..721271250c 100644 --- a/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php +++ b/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php @@ -1,33 +1,31 @@ integer('fieldset_id')->nullable(); - }); - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('models',function (Blueprint $table) { - $table->dropColumn('fieldset_id'); - }); - } +class AddFieldsetIdToAssets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('models', function (Blueprint $table) { + $table->integer('fieldset_id')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models', function (Blueprint $table) { + $table->dropColumn('fieldset_id'); + }); + } } diff --git a/database/migrations/2015_09_22_003413_migrate_mac_address.php b/database/migrations/2015_09_22_003413_migrate_mac_address.php index 6345773ca1..516b5c2ec7 100644 --- a/database/migrations/2015_09_22_003413_migrate_mac_address.php +++ b/database/migrations/2015_09_22_003413_migrate_mac_address.php @@ -1,61 +1,60 @@ getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string'); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string'); + $f2 = new \App\Models\CustomFieldset(['name' => 'Asset with MAC Address']); + $f2->timestamps = false; //when this model was first created, it had no timestamps. But later on it gets them. + if (! $f2->save()) { + throw new Exception("couldn't save customfieldset"); + } + $macid = DB::table('custom_fields')->insertGetId([ + 'name' => 'MAC Address', + 'format' => \App\Models\CustomField::PREDEFINED_FORMATS['MAC'], + 'element'=>'text', ]); + if (! $macid) { + throw new Exception("Can't save MAC Custom field: $macid"); + } - $f2=new \App\Models\CustomFieldset(['name' => "Asset with MAC Address"]); - $f2->timestamps=false; //when this model was first created, it had no timestamps. But later on it gets them. - if(!$f2->save()) { - throw new Exception("couldn't save customfieldset"); - } - $macid=DB::table('custom_fields')->insertGetId([ - 'name' => "MAC Address", - 'format' => \App\Models\CustomField::PREDEFINED_FORMATS['MAC'], - 'element'=>'text']); - if(!$macid) { - throw new Exception("Can't save MAC Custom field: $macid"); - } + $f2->fields()->attach($macid, ['required' => false, 'order' => 1]); + \App\Models\AssetModel::where(['show_mac_address' => true])->update(['fieldset_id'=>$f2->id]); - $f2->fields()->attach($macid,['required' => false, 'order' => 1]); - \App\Models\AssetModel::where(["show_mac_address" => true])->update(["fieldset_id"=>$f2->id]); + Schema::table('assets', function (Blueprint $table) { + $table->renameColumn('mac_address', '_snipeit_mac_address'); + }); - Schema::table('assets', function (Blueprint $table) { - $table->renameColumn('mac_address', '_snipeit_mac_address'); - }); + // DB::statement("ALTER TABLE assets CHANGE mac_address _snipeit_mac_address varchar(255)"); - // DB::statement("ALTER TABLE assets CHANGE mac_address _snipeit_mac_address varchar(255)"); - - $ans=Schema::table("models",function (Blueprint $table) { - $table->renameColumn('show_mac_address','deprecated_mac_address'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - $f=\App\Models\CustomFieldset::where(["name" => "Asset with MAC Address"])->first(); - $f->fields()->delete(); - $f->delete(); - Schema::table("models",function(Blueprint $table) { - $table->renameColumn("deprecated_mac_address","show_mac_address"); - }); - DB::statement("ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)"); - } + $ans = Schema::table('models', function (Blueprint $table) { + $table->renameColumn('show_mac_address', 'deprecated_mac_address'); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + $f = \App\Models\CustomFieldset::where(['name' => 'Asset with MAC Address'])->first(); + $f->fields()->delete(); + $f->delete(); + Schema::table('models', function (Blueprint $table) { + $table->renameColumn('deprecated_mac_address', 'show_mac_address'); + }); + DB::statement('ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)'); + } } diff --git a/database/migrations/2015_09_28_003314_fix_default_purchase_order.php b/database/migrations/2015_09_28_003314_fix_default_purchase_order.php index 5e9f14c1a6..749df3c821 100644 --- a/database/migrations/2015_09_28_003314_fix_default_purchase_order.php +++ b/database/migrations/2015_09_28_003314_fix_default_purchase_order.php @@ -1,33 +1,32 @@ string('purchase_order')->nullable()->change(); + }); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::table('licenses', function (Blueprint $table) { - $table->string('purchase_order')->nullable()->change(); - }); - - // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255) DEFAULT NULL;'); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255);'); - } + // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255) DEFAULT NULL;'); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255);'); + } } diff --git a/database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php b/database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php index 7e3535c71a..e9192fd56e 100644 --- a/database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php +++ b/database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php @@ -1,48 +1,47 @@ date('purchase_date')->nullable(); +class AddAccessoryConsumablePriceInfo extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('accessories', function ($table) { + $table->date('purchase_date')->nullable(); $table->decimal('purchase_cost', 13, 4)->nullable(); $table->string('order_number')->nullable(); - }); + }); - Schema::table('consumables', function ($table) { - $table->date('purchase_date')->nullable(); + Schema::table('consumables', function ($table) { + $table->date('purchase_date')->nullable(); $table->decimal('purchase_cost', 13, 4)->nullable(); $table->string('order_number')->nullable(); - }); - } + }); + } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('accessories', function ($table) { - $table->dropColumn('purchase_date'); + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('accessories', function ($table) { + $table->dropColumn('purchase_date'); $table->dropColumn('purchase_cost'); $table->dropColumn('order_number'); - }); + }); - Schema::table('consumables', function ($table) { - $table->dropColumn('purchase_date'); + Schema::table('consumables', function ($table) { + $table->dropColumn('purchase_date'); $table->dropColumn('purchase_cost'); $table->dropColumn('order_number'); - }); - } - + }); + } } diff --git a/database/migrations/2015_10_12_192706_add_brand_to_settings.php b/database/migrations/2015_10_12_192706_add_brand_to_settings.php index eae3acd849..109a982a5a 100644 --- a/database/migrations/2015_10_12_192706_add_brand_to_settings.php +++ b/database/migrations/2015_10_12_192706_add_brand_to_settings.php @@ -1,34 +1,31 @@ tinyInteger('brand')->default(1); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - $table->dropColumn('brand'); - }); - } +class AddBrandToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->tinyInteger('brand')->default(1); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('brand'); + }); + } } diff --git a/database/migrations/2015_10_22_003314_fix_defaults_accessories.php b/database/migrations/2015_10_22_003314_fix_defaults_accessories.php index 9ac9e824d1..da7dcfbabe 100644 --- a/database/migrations/2015_10_22_003314_fix_defaults_accessories.php +++ b/database/migrations/2015_10_22_003314_fix_defaults_accessories.php @@ -1,41 +1,40 @@ string('order_number')->nullable()->change(); + }); - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::table('accessories', function (Blueprint $table) { - $table->string('order_number')->nullable()->change(); - }); - - Schema::table('consumables', function (Blueprint $table) { - $table->string('order_number')->nullable()->change(); - }); + Schema::table('consumables', function (Blueprint $table) { + $table->string('order_number')->nullable()->change(); + }); + // + // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255) DEFAULT NULL;'); // - // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255) DEFAULT NULL;'); - // - // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255) DEFAULT NULL;'); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255);'); - DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255);'); - } + // DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255) DEFAULT NULL;'); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255);'); + DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255);'); + } } diff --git a/database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php b/database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php index ac220f5984..87ecf062d8 100644 --- a/database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php +++ b/database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php @@ -1,40 +1,37 @@ dateTime('last_checkout')->nullable(); - $table->date('expected_checkin')->nullable(); - }); - DB::statement("UPDATE ".DB::getTablePrefix()."assets SET last_checkout=(SELECT MAX(created_at) FROM ".DB::getTablePrefix()."asset_logs WHERE ".DB::getTablePrefix()."asset_logs.id=".DB::getTablePrefix()."assets.id AND action_type='checkout') WHERE assigned_to IS NOT NULL"); - DB::statement("UPDATE ".DB::getTablePrefix()."assets SET expected_checkin=(SELECT expected_checkin FROM ".DB::getTablePrefix()."asset_logs WHERE ".DB::getTablePrefix()."asset_logs.id=".DB::getTablePrefix()."assets.id AND action_type='checkout' ORDER BY id DESC limit 1) WHERE assigned_to IS NOT NULL"); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('assets', function(Blueprint $table) - { - // - $table->dropColumn('last_checkout'); - $table->dropColumn('expected_checkin'); - }); - } +class AddCheckoutTimeAndExpectedCheckoutDateToAssets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('assets', function (Blueprint $table) { + // + $answer = $table->dateTime('last_checkout')->nullable(); + $table->date('expected_checkin')->nullable(); + }); + DB::statement('UPDATE '.DB::getTablePrefix().'assets SET last_checkout=(SELECT MAX(created_at) FROM '.DB::getTablePrefix().'asset_logs WHERE '.DB::getTablePrefix().'asset_logs.id='.DB::getTablePrefix()."assets.id AND action_type='checkout') WHERE assigned_to IS NOT NULL"); + DB::statement('UPDATE '.DB::getTablePrefix().'assets SET expected_checkin=(SELECT expected_checkin FROM '.DB::getTablePrefix().'asset_logs WHERE '.DB::getTablePrefix().'asset_logs.id='.DB::getTablePrefix()."assets.id AND action_type='checkout' ORDER BY id DESC limit 1) WHERE assigned_to IS NOT NULL"); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('assets', function (Blueprint $table) { + // + $table->dropColumn('last_checkout'); + $table->dropColumn('expected_checkin'); + }); + } } diff --git a/database/migrations/2015_11_05_061015_create_companies_table.php b/database/migrations/2015_11_05_061015_create_companies_table.php index d0bc86cbe6..4c7c736f5e 100644 --- a/database/migrations/2015_11_05_061015_create_companies_table.php +++ b/database/migrations/2015_11_05_061015_create_companies_table.php @@ -1,10 +1,10 @@ increments('id'); $table->string('name')->unique(); $table->timestamps(); diff --git a/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php b/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php index 930b47e3c9..afcb9e1c0f 100644 --- a/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php +++ b/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php @@ -1,10 +1,10 @@ integer('company_id')->unsigned()->nullable(); //$table->foreign('company_id')->references('id')->on('companies'); }); @@ -26,8 +25,7 @@ class AddCompanyIdToConsumablesTable extends Migration { */ public function down() { - Schema::table('consumables', function(Blueprint $table) - { + Schema::table('consumables', function (Blueprint $table) { //$table->dropForeign('consumables_company_id_foreign'); $table->dropColumn('company_id'); }); diff --git a/database/migrations/2015_11_05_183749_image.php b/database/migrations/2015_11_05_183749_image.php index 8d5749a43a..0582b852aa 100644 --- a/database/migrations/2015_11_05_183749_image.php +++ b/database/migrations/2015_11_05_183749_image.php @@ -1,34 +1,32 @@ text('image')->after('notes')->nullable()->default(NULL); - // - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('assets', function ($table) { - $table->dropColumn('image'); - }); - } +class Image extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('assets', function (Blueprint $table) { + $table->text('image')->after('notes')->nullable()->default(null); + // + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('assets', function ($table) { + $table->dropColumn('image'); + }); + } } diff --git a/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php b/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php index cee633bc3d..e51cb797ef 100644 --- a/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php +++ b/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php @@ -1,10 +1,10 @@ integer('company_id')->unsigned()->nullable(); //$table->foreign('company_id')->references('id')->on('companies'); }); @@ -26,8 +25,7 @@ class AddCompanyIdToAccessoriesTable extends Migration { */ public function down() { - Schema::table('accessories', function(Blueprint $table) - { + Schema::table('accessories', function (Blueprint $table) { //$table->dropForeign('accessories_company_id_foreign'); $table->dropColumn('company_id'); }); diff --git a/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php b/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php index aef83fe265..37e8ce12ee 100644 --- a/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php +++ b/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php @@ -1,10 +1,10 @@ integer('company_id')->unsigned()->nullable(); //$table->foreign('company_id')->references('id')->on('companies'); }); @@ -26,8 +25,7 @@ class AddCompanyIdToUsersTable extends Migration { */ public function down() { - Schema::table('users', function(Blueprint $table) - { + Schema::table('users', function (Blueprint $table) { //$table->dropForeign('users_company_id_foreign'); $table->dropColumn('company_id'); }); diff --git a/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php b/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php index 4f0756cf2c..2d4a5ba9df 100644 --- a/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php +++ b/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php @@ -1,10 +1,10 @@ integer('company_id')->unsigned()->nullable(); //$table->foreign('company_id')->references('id')->on('companies'); }); @@ -26,8 +25,7 @@ class AddCompanyIdToLicensesTable extends Migration { */ public function down() { - Schema::table('licenses', function(Blueprint $table) - { + Schema::table('licenses', function (Blueprint $table) { //$table->dropForeign('licenses_company_id_foreign'); $table->dropColumn('company_id'); }); diff --git a/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php b/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php index 010ec528e7..9aec3920eb 100644 --- a/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php +++ b/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php @@ -1,10 +1,10 @@ integer('company_id')->unsigned()->nullable(); //$table->foreign('company_id')->references('id')->on('companies'); }); @@ -26,8 +25,7 @@ class AddCompanyIdToAssetsTable extends Migration { */ public function down() { - Schema::table('assets', function(Blueprint $table) - { + Schema::table('assets', function (Blueprint $table) { // $table->dropForeign('assets_company_id_foreign'); $table->dropColumn('company_id'); }); diff --git a/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php b/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php index a293b43525..d52191f3d0 100644 --- a/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php +++ b/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php @@ -1,60 +1,57 @@ string('ldap_enabled')->nullable()->default(NULL); - $table->string('ldap_server')->nullable()->default(NULL); - $table->string('ldap_uname')->nullable()->default(NULL); - $table->longText('ldap_pword')->nullable()->default(NULL); - $table->string('ldap_basedn')->nullable()->default(NULL); - $table->string('ldap_filter')->nullable()->default('cn=*'); - $table->string('ldap_username_field')->nullable()->default('samaccountname'); - $table->string('ldap_lname_field')->nullable()->default('sn'); - $table->string('ldap_fname_field')->nullable()->default('givenname'); - $table->string('ldap_auth_filter_query')->nullable()->default('uid=samaccountname'); - $table->integer('ldap_version')->nullable()->default(3); - $table->string('ldap_active_flag')->nullable()->default(NULL); - $table->string('ldap_emp_num')->nullable()->default(NULL); - $table->string('ldap_email')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - $table->dropColumn('ldap_enabled'); - $table->dropColumn('ldap_server'); - $table->dropColumn('ldap_uname'); - $table->dropColumn('ldap_pword'); - $table->dropColumn('ldap_basedn'); - $table->dropColumn('ldap_filter'); - $table->dropColumn('ldap_username_field'); - $table->dropColumn('ldap_lname_field'); - $table->dropColumn('ldap_fname_field'); - $table->dropColumn('ldap_auth_filter_query'); - $table->dropColumn('ldap_version'); - $table->dropColumn('ldap_active_flag'); - $table->dropColumn('ldap_emp_num'); - $table->dropColumn('ldap_email'); - }); - } +class AddLdapFieldsToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->string('ldap_enabled')->nullable()->default(null); + $table->string('ldap_server')->nullable()->default(null); + $table->string('ldap_uname')->nullable()->default(null); + $table->longText('ldap_pword')->nullable()->default(null); + $table->string('ldap_basedn')->nullable()->default(null); + $table->string('ldap_filter')->nullable()->default('cn=*'); + $table->string('ldap_username_field')->nullable()->default('samaccountname'); + $table->string('ldap_lname_field')->nullable()->default('sn'); + $table->string('ldap_fname_field')->nullable()->default('givenname'); + $table->string('ldap_auth_filter_query')->nullable()->default('uid=samaccountname'); + $table->integer('ldap_version')->nullable()->default(3); + $table->string('ldap_active_flag')->nullable()->default(null); + $table->string('ldap_emp_num')->nullable()->default(null); + $table->string('ldap_email')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('ldap_enabled'); + $table->dropColumn('ldap_server'); + $table->dropColumn('ldap_uname'); + $table->dropColumn('ldap_pword'); + $table->dropColumn('ldap_basedn'); + $table->dropColumn('ldap_filter'); + $table->dropColumn('ldap_username_field'); + $table->dropColumn('ldap_lname_field'); + $table->dropColumn('ldap_fname_field'); + $table->dropColumn('ldap_auth_filter_query'); + $table->dropColumn('ldap_version'); + $table->dropColumn('ldap_active_flag'); + $table->dropColumn('ldap_emp_num'); + $table->dropColumn('ldap_email'); + }); + } } diff --git a/database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php b/database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php index 9cf8b163b0..b15db47da5 100644 --- a/database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php +++ b/database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php @@ -1,10 +1,10 @@ boolean('full_multiple_companies_support')->default(FALSE); + Schema::table('settings', function (Blueprint $table) { + $table->boolean('full_multiple_companies_support')->default(false); }); } @@ -25,10 +24,8 @@ class AddFullMultipleCompaniesSupportToSettingsTable extends Migration { */ public function down() { - Schema::table('settings', function(Blueprint $table) - { + Schema::table('settings', function (Blueprint $table) { $table->dropColumn('full_multiple_companies_support'); }); } - } diff --git a/database/migrations/2015_11_26_195528_import_ldap_settings.php b/database/migrations/2015_11_26_195528_import_ldap_settings.php index 3cd3826901..eb66bf6f68 100644 --- a/database/migrations/2015_11_26_195528_import_ldap_settings.php +++ b/database/migrations/2015_11_26_195528_import_ldap_settings.php @@ -1,77 +1,68 @@ ldap_server)) { + $settings->ldap_enabled = 1; + $settings->ldap_server = config('ldap.url'); + $settings->ldap_uname = config('ldap.username'); + $settings->ldap_pword = Crypt::encrypt(config('ldap.password')); + $settings->ldap_basedn = config('ldap.basedn'); + $settings->ldap_filter = config('ldap.filter'); + $settings->ldap_username_field = config('ldap.result.username'); + $settings->ldap_lname_field = config('ldap.result.last.name'); + $settings->ldap_fname_field = config('ldap.result.first.name'); + $settings->ldap_auth_filter_query = config('ldap.authentication.filter.query'); + $settings->ldap_version = config('ldap.version'); + $settings->ldap_active_flag = config('ldap.result.active.flag'); + $settings->ldap_emp_num = config('ldap.result.emp.num'); + $settings->ldap_email = config('ldap.result.email'); - // Only update the settings record if there IS an LDAP Config - // AND the Settings table doesn't already have LDAP settings in it + // Save the imported settings + if ($settings->save()) { + echo 'LDAP settings imported into database'."\n"; - if ((config('ldap.url')) && ($settings) && ($settings->ldap_server)) { - - $settings->ldap_enabled = 1; - $settings->ldap_server = config('ldap.url'); - $settings->ldap_uname = config('ldap.username'); - $settings->ldap_pword = Crypt::encrypt(config('ldap.password')); - $settings->ldap_basedn = config('ldap.basedn'); - $settings->ldap_filter = config('ldap.filter'); - $settings->ldap_username_field = config('ldap.result.username'); - $settings->ldap_lname_field = config('ldap.result.last.name'); - $settings->ldap_fname_field = config('ldap.result.first.name'); - $settings->ldap_auth_filter_query = config('ldap.authentication.filter.query'); - $settings->ldap_version = config('ldap.version'); - $settings->ldap_active_flag = config('ldap.result.active.flag'); - $settings->ldap_emp_num = config('ldap.result.emp.num'); - $settings->ldap_email = config('ldap.result.email'); - - // Save the imported settings - if ($settings->save()) { - echo 'LDAP settings imported into database'."\n"; - - // Copy the old LDAP config file to prevent any future confusion - if (@copy(app_path().'/config/'.app()->environment().'/ldap.php', app_path().'/config/'.app()->environment().'/deprecated.ldap.php')) { - - if (@unlink(app_path().'/config/'.app()->environment().'/ldap.php')) { - echo 'Original LDAP file archived to '.app_path().'/config/'.app()->environment().'/deprecated.ldap.php'."\n"; - } else { - echo 'Could not archive LDAP config file'."\n"; + // Copy the old LDAP config file to prevent any future confusion + if (@copy(app_path().'/config/'.app()->environment().'/ldap.php', app_path().'/config/'.app()->environment().'/deprecated.ldap.php')) { + if (@unlink(app_path().'/config/'.app()->environment().'/ldap.php')) { + echo 'Original LDAP file archived to '.app_path().'/config/'.app()->environment().'/deprecated.ldap.php'."\n"; + } else { + echo 'Could not archive LDAP config file'."\n"; + } + } else { + echo 'Could not archive LDAP config file'."\n"; + } } - - } else { - echo 'Could not archive LDAP config file'."\n"; } - - } - } - } - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - - if (@copy(app_path().'/config/'.app()->environment().'/deprecated.ldap.php', app_path().'/config/'.app()->environment().'/ldap.php')) { - echo 'Un-archived LDAP config file'."\n"; - @unlink(app_path().'/config/'.app()->environment().'/deprecated.ldap.php'); - - } else { - echo 'Could not un-archive LDAP config file. Manually rename it instead.'."\n"; + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + if (@copy(app_path().'/config/'.app()->environment().'/deprecated.ldap.php', app_path().'/config/'.app()->environment().'/ldap.php')) { + echo 'Un-archived LDAP config file'."\n"; + @unlink(app_path().'/config/'.app()->environment().'/deprecated.ldap.php'); + } else { + echo 'Could not un-archive LDAP config file. Manually rename it instead.'."\n"; + } } - } - } diff --git a/database/migrations/2015_11_30_191504_remove_fk_company_id.php b/database/migrations/2015_11_30_191504_remove_fk_company_id.php index bd0a9bda06..37ec4a1833 100644 --- a/database/migrations/2015_11_30_191504_remove_fk_company_id.php +++ b/database/migrations/2015_11_30_191504_remove_fk_company_id.php @@ -1,18 +1,18 @@ dropForeign('users_company_id_foreign'); @@ -37,18 +37,15 @@ class RemoveFkCompanyId extends Migration { // { // $table->dropForeign('licenses_company_id_foreign'); // }); + } - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } - + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } } diff --git a/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php b/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php index 0e22c78683..ce0fad9e7a 100644 --- a/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php +++ b/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php @@ -1,34 +1,31 @@ boolean('ldap_server_cert_ignore')->default(FALSE); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - $table->dropColumn('ldap_server_cert_ignore'); - }); - } +class AddLdapServerCertIgnoreToSettingsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->boolean('ldap_server_cert_ignore')->default(false); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('ldap_server_cert_ignore'); + }); + } } diff --git a/database/migrations/2015_12_30_233509_add_timestamp_and_userId_to_custom_fields.php b/database/migrations/2015_12_30_233509_add_timestamp_and_userId_to_custom_fields.php index 9b7854615a..52586b46a4 100644 --- a/database/migrations/2015_12_30_233509_add_timestamp_and_userId_to_custom_fields.php +++ b/database/migrations/2015_12_30_233509_add_timestamp_and_userId_to_custom_fields.php @@ -1,34 +1,31 @@ integer("user_id")->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('custom_fields', function(Blueprint $table) - { - $table->dropColumn("user_id"); - }); - } +class AddTimestampAndUserIdToCustomFields extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('custom_fields', function (Blueprint $table) { + $table->integer('user_id')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('custom_fields', function (Blueprint $table) { + $table->dropColumn('user_id'); + }); + } } diff --git a/database/migrations/2015_12_30_233658_add_timestamp_and_userId_to_custom_fieldsets.php b/database/migrations/2015_12_30_233658_add_timestamp_and_userId_to_custom_fieldsets.php index 1d2ba523ee..a0c475fac5 100644 --- a/database/migrations/2015_12_30_233658_add_timestamp_and_userId_to_custom_fieldsets.php +++ b/database/migrations/2015_12_30_233658_add_timestamp_and_userId_to_custom_fieldsets.php @@ -1,38 +1,34 @@ timestamps(); - $table->integer("user_id")->nullable(); - }); - - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('custom_fieldsets', function(Blueprint $table) - { - $table->dropTimestamps(); - $table->dropColumn("user_id"); - }); - } +class AddTimestampAndUserIdToCustomFieldsets extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::table('custom_fieldsets', function (Blueprint $table) { + $table->timestamps(); + $table->integer('user_id')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('custom_fieldsets', function (Blueprint $table) { + $table->dropTimestamps(); + $table->dropColumn('user_id'); + }); + } } diff --git a/database/migrations/2016_01_28_041048_add_notes_to_models.php b/database/migrations/2016_01_28_041048_add_notes_to_models.php index de922da180..abbc42dae1 100644 --- a/database/migrations/2016_01_28_041048_add_notes_to_models.php +++ b/database/migrations/2016_01_28_041048_add_notes_to_models.php @@ -1,32 +1,31 @@ text('note')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('models', function ($table) { - $table->dropColumn('note'); - }); - } +class AddNotesToModels extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('models', function ($table) { + $table->text('note')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models', function ($table) { + $table->dropColumn('note'); + }); + } } diff --git a/database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php b/database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php index 6270018e53..06531a9584 100644 --- a/database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php +++ b/database/migrations/2016_02_19_070119_add_remember_token_to_users_table.php @@ -1,7 +1,7 @@ text('remember_token')->nullable()->default(null); }); diff --git a/database/migrations/2016_02_19_073625_create_password_resets_table.php b/database/migrations/2016_02_19_073625_create_password_resets_table.php index 113175711b..2a5c366cb4 100644 --- a/database/migrations/2016_02_19_073625_create_password_resets_table.php +++ b/database/migrations/2016_02_19_073625_create_password_resets_table.php @@ -1,7 +1,7 @@ engine = 'InnoDB'; - $table->string('email')->index(); - $table->string('token')->index(); - $table->timestamp('created_at'); - }); + Schema::create('password_resets', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->string('email')->index(); + $table->string('token')->index(); + $table->timestamp('created_at'); + }); } /** diff --git a/database/migrations/2016_03_02_193043_add_ldap_flag_to_users.php b/database/migrations/2016_03_02_193043_add_ldap_flag_to_users.php index c7e6f2b9a7..7c51eaf4c5 100644 --- a/database/migrations/2016_03_02_193043_add_ldap_flag_to_users.php +++ b/database/migrations/2016_03_02_193043_add_ldap_flag_to_users.php @@ -1,7 +1,7 @@ boolean('ldap_import')->default(0); - }); - - DB::table('users')->where('notes','LIKE','%LDAP%')->update(['ldap_import' => 1]); + Schema::table('users', function (Blueprint $table) { + $table->boolean('ldap_import')->default(0); + }); + DB::table('users')->where('notes', 'LIKE', '%LDAP%')->update(['ldap_import' => 1]); } /** @@ -27,8 +26,8 @@ class AddLdapFlagToUsers extends Migration */ public function down() { - Schema::table('users', function ($table) { - $table->dropColumn('ldap_import'); - }); + Schema::table('users', function ($table) { + $table->dropColumn('ldap_import'); + }); } } diff --git a/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php b/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php index 57a1786dba..a17830f114 100644 --- a/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php +++ b/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php @@ -1,7 +1,7 @@ text('ldap_filter')->default(NULL)->change(); - }); + Schema::table('settings', function (Blueprint $table) { + $table->text('ldap_filter')->default(null)->change(); + }); } /** diff --git a/database/migrations/2016_03_08_225351_create_components_table.php b/database/migrations/2016_03_08_225351_create_components_table.php index 446285b014..8a3dfb7c5a 100644 --- a/database/migrations/2016_03_08_225351_create_components_table.php +++ b/database/migrations/2016_03_08_225351_create_components_table.php @@ -1,68 +1,61 @@ increments('id'); - $table->string('name')->nullable()->default(NULL); - $table->integer('category_id')->nullable()->default(NULL); - $table->integer('location_id')->nullable()->default(NULL); - $table->integer('company_id')->nullable()->default(NULL); - $table->integer('user_id')->nullable()->default(NULL); - $table->integer('total_qty')->default(1); - $table->integer('order_number')->nullable()->default(NULL); - $table->date('purchase_date')->nullable()->default(NULL); - $table->decimal('purchase_cost', 13,4)->nullable()->default(NULL); - $table->timestamps(); - $table->softDeletes(); - $table->engine = 'InnoDB'; - }); + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + // + Schema::create('components', function ($table) { + $table->increments('id'); + $table->string('name')->nullable()->default(null); + $table->integer('category_id')->nullable()->default(null); + $table->integer('location_id')->nullable()->default(null); + $table->integer('company_id')->nullable()->default(null); + $table->integer('user_id')->nullable()->default(null); + $table->integer('total_qty')->default(1); + $table->integer('order_number')->nullable()->default(null); + $table->date('purchase_date')->nullable()->default(null); + $table->decimal('purchase_cost', 13, 4)->nullable()->default(null); + $table->timestamps(); + $table->softDeletes(); + $table->engine = 'InnoDB'; + }); Schema::table('asset_logs', function ($table) { - $table->integer('component_id')->nullable()->default(NULL); - }); + $table->integer('component_id')->nullable()->default(null); + }); - Schema::create('components_assets', function ($table) { - $table->increments('id'); - $table->integer('user_id')->nullable()->default(NULL); - $table->integer('assigned_qty')->nullable()->default(1); - $table->integer('component_id')->nullable()->default(NULL); - $table->integer('asset_id')->nullable()->default(NULL); - $table->timestamps(); - }); + Schema::create('components_assets', function ($table) { + $table->increments('id'); + $table->integer('user_id')->nullable()->default(null); + $table->integer('assigned_qty')->nullable()->default(1); + $table->integer('component_id')->nullable()->default(null); + $table->integer('asset_id')->nullable()->default(null); + $table->timestamps(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::dropIfExists('components'); + Schema::dropIfExists('components_assets'); - - } - - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::dropIfExists('components'); - Schema::dropIfExists('components_assets'); - - Schema::table('asset_logs', function ($table) { - $table->dropColumn('component_id'); - }); - - - } - + Schema::table('asset_logs', function ($table) { + $table->dropColumn('component_id'); + }); + } } diff --git a/database/migrations/2016_03_09_024038_add_min_stock_to_tables.php b/database/migrations/2016_03_09_024038_add_min_stock_to_tables.php index 5fd8cc6e2e..6d00779f74 100644 --- a/database/migrations/2016_03_09_024038_add_min_stock_to_tables.php +++ b/database/migrations/2016_03_09_024038_add_min_stock_to_tables.php @@ -1,7 +1,7 @@ integer('min_amt')->nullable()->default(NULL); - }); - Schema::table('consumables', function (Blueprint $table) { - $table->integer('min_amt')->nullable()->default(NULL); - }); - Schema::table('components', function (Blueprint $table) { - $table->integer('min_amt')->nullable()->default(NULL); - }); + Schema::table('accessories', function (Blueprint $table) { + $table->integer('min_amt')->nullable()->default(null); + }); + Schema::table('consumables', function (Blueprint $table) { + $table->integer('min_amt')->nullable()->default(null); + }); + Schema::table('components', function (Blueprint $table) { + $table->integer('min_amt')->nullable()->default(null); + }); } /** @@ -30,14 +30,14 @@ class AddMinStockToTables extends Migration */ public function down() { - Schema::table('accessories', function ($table) { - $table->dropColumn('min_amt'); - }); - Schema::table('components', function ($table) { - $table->dropColumn('min_amt'); - }); - Schema::table('consumables', function ($table) { - $table->dropColumn('min_amt'); - }); + Schema::table('accessories', function ($table) { + $table->dropColumn('min_amt'); + }); + Schema::table('components', function ($table) { + $table->dropColumn('min_amt'); + }); + Schema::table('consumables', function ($table) { + $table->dropColumn('min_amt'); + }); } } diff --git a/database/migrations/2016_03_10_133849_add_locale_to_users.php b/database/migrations/2016_03_10_133849_add_locale_to_users.php index cf2d484dee..9a903f5391 100644 --- a/database/migrations/2016_03_10_133849_add_locale_to_users.php +++ b/database/migrations/2016_03_10_133849_add_locale_to_users.php @@ -1,7 +1,7 @@ string('locale',5)->nullable()->default(config('app.locale')); - }); + Schema::table('users', function (Blueprint $table) { + $table->string('locale', 5)->nullable()->default(config('app.locale')); + }); } /** @@ -24,8 +24,8 @@ class AddLocaleToUsers extends Migration */ public function down() { - Schema::table('users', function ($table) { - $table->dropColumn('locale'); - }); + Schema::table('users', function ($table) { + $table->dropColumn('locale'); + }); } } diff --git a/database/migrations/2016_03_10_135519_add_locale_to_settings.php b/database/migrations/2016_03_10_135519_add_locale_to_settings.php index 58ade4724f..e9ee81aaf4 100644 --- a/database/migrations/2016_03_10_135519_add_locale_to_settings.php +++ b/database/migrations/2016_03_10_135519_add_locale_to_settings.php @@ -1,7 +1,7 @@ string('locale',5)->nullable()->default(config('app.locale')); - }); + Schema::table('settings', function (Blueprint $table) { + $table->string('locale', 5)->nullable()->default(config('app.locale')); + }); } /** @@ -24,8 +24,8 @@ class AddLocaleToSettings extends Migration */ public function down() { - Schema::table('settings', function ($table) { - $table->dropColumn('locale'); - }); + Schema::table('settings', function ($table) { + $table->dropColumn('locale'); + }); } } diff --git a/database/migrations/2016_03_11_185621_add_label_settings_to_settings.php b/database/migrations/2016_03_11_185621_add_label_settings_to_settings.php index ab85695cbd..679bf51994 100644 --- a/database/migrations/2016_03_11_185621_add_label_settings_to_settings.php +++ b/database/migrations/2016_03_11_185621_add_label_settings_to_settings.php @@ -1,7 +1,7 @@ tinyInteger('labels_per_page')->default(30); - $table->decimal('labels_width', 6, 5)->default(2.625); - $table->decimal('labels_height', 6, 5)->default(1); - $table->decimal('labels_pmargin_left', 6, 5)->default(0.21975); - $table->decimal('labels_pmargin_right', 6, 5)->default(0.21975); - $table->decimal('labels_pmargin_top', 6, 5)->default(0.5); - $table->decimal('labels_pmargin_bottom', 6, 5)->default(0.5); - $table->decimal('labels_display_bgutter', 6, 5)->default(0.07); - $table->decimal('labels_display_sgutter', 6, 5)->default(0.05); - $table->tinyInteger('labels_fontsize')->default(9); - $table->decimal('labels_pagewidth', 7, 5)->default(8.5); - $table->decimal('labels_pageheight', 7, 5)->default(11); - $table->tinyInteger('labels_display_name')->default(0); - $table->tinyInteger('labels_display_serial')->default(1); - $table->tinyInteger('labels_display_tag')->default(1); - }); + Schema::table('settings', function (Blueprint $table) { + $table->tinyInteger('labels_per_page')->default(30); + $table->decimal('labels_width', 6, 5)->default(2.625); + $table->decimal('labels_height', 6, 5)->default(1); + $table->decimal('labels_pmargin_left', 6, 5)->default(0.21975); + $table->decimal('labels_pmargin_right', 6, 5)->default(0.21975); + $table->decimal('labels_pmargin_top', 6, 5)->default(0.5); + $table->decimal('labels_pmargin_bottom', 6, 5)->default(0.5); + $table->decimal('labels_display_bgutter', 6, 5)->default(0.07); + $table->decimal('labels_display_sgutter', 6, 5)->default(0.05); + $table->tinyInteger('labels_fontsize')->default(9); + $table->decimal('labels_pagewidth', 7, 5)->default(8.5); + $table->decimal('labels_pageheight', 7, 5)->default(11); + $table->tinyInteger('labels_display_name')->default(0); + $table->tinyInteger('labels_display_serial')->default(1); + $table->tinyInteger('labels_display_tag')->default(1); + }); } /** @@ -38,8 +38,8 @@ class AddLabelSettingsToSettings extends Migration */ public function down() { - Schema::table('settings', function ($table) { - $table->dropColumn( + Schema::table('settings', function ($table) { + $table->dropColumn( 'labels_per_page', 'labels_width', 'labels_height', @@ -56,6 +56,6 @@ class AddLabelSettingsToSettings extends Migration 'labels_display_serial', 'labels_display_tag' ); - }); + }); } } diff --git a/database/migrations/2016_03_22_125911_fix_custom_fields_regexes.php b/database/migrations/2016_03_22_125911_fix_custom_fields_regexes.php index e731a1b05e..8634ede9af 100644 --- a/database/migrations/2016_03_22_125911_fix_custom_fields_regexes.php +++ b/database/migrations/2016_03_22_125911_fix_custom_fields_regexes.php @@ -1,7 +1,7 @@ format) { + foreach (\App\Models\CustomField::all() as $custom_field) { + switch ($custom_field->format) { case '[a-zA-Z]*': - $custom_field->format='ALPHA'; + $custom_field->format = 'ALPHA'; break; case '[0-9]*': - $custom_field->format='NUMERIC'; + $custom_field->format = 'NUMERIC'; break; case '([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])': - $custom_field->format='IP'; + $custom_field->format = 'IP'; break; //ANYTHING ELSE. default: - $custom_field->format='regex:/^'.$custom_field->format."$/"; + $custom_field->format = 'regex:/^'.$custom_field->format.'$/'; } $custom_field->save(); } - } /** diff --git a/database/migrations/2016_04_28_141554_add_show_to_users.php b/database/migrations/2016_04_28_141554_add_show_to_users.php index 52b80d6fd9..8b6fd47122 100644 --- a/database/migrations/2016_04_28_141554_add_show_to_users.php +++ b/database/migrations/2016_04_28_141554_add_show_to_users.php @@ -1,7 +1,7 @@ boolean('show_in_list')->default(1); + $table->boolean('show_in_list')->default(1); }); } diff --git a/database/migrations/2016_05_16_164733_add_model_mfg_to_consumable.php b/database/migrations/2016_05_16_164733_add_model_mfg_to_consumable.php index 182eedae49..180ef43279 100644 --- a/database/migrations/2016_05_16_164733_add_model_mfg_to_consumable.php +++ b/database/migrations/2016_05_16_164733_add_model_mfg_to_consumable.php @@ -1,7 +1,7 @@ integer('model_no')->nullable()->default(NULL); - $table->integer('manufacturer_id')->nullable()->default(NULL); - $table->string('item_no')->nullable()->default(NULL); + $table->integer('model_no')->nullable()->default(null); + $table->integer('manufacturer_id')->nullable()->default(null); + $table->string('item_no')->nullable()->default(null); }); } diff --git a/database/migrations/2016_05_19_180351_add_alt_barcode_settings.php b/database/migrations/2016_05_19_180351_add_alt_barcode_settings.php index bbd849a24e..68320ae9ed 100644 --- a/database/migrations/2016_05_19_180351_add_alt_barcode_settings.php +++ b/database/migrations/2016_05_19_180351_add_alt_barcode_settings.php @@ -1,7 +1,7 @@ dropColumn('option_name'); + } }); } diff --git a/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php b/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php index 2836aaefb6..dccbbe5e60 100644 --- a/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php +++ b/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php @@ -1,7 +1,7 @@ dropColumn('option_value'); + } }); } diff --git a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php index a7261b4278..86ebc1d6ca 100644 --- a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php +++ b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php @@ -13,7 +13,7 @@ class CreateOauthAuthCodesTable extends Migration */ public function up() { - if (!Schema::hasTable('oauth_auth_codes')) { + if (! Schema::hasTable('oauth_auth_codes')) { Schema::create('oauth_auth_codes', function (Blueprint $table) { $table->string('id', 100)->primary(); $table->unsignedBigInteger('user_id')->index(); @@ -32,6 +32,6 @@ class CreateOauthAuthCodesTable extends Migration */ public function down() { - Schema::dropIfExists('oauth_auth_codes'); + Schema::dropIfExists('oauth_auth_codes'); } } diff --git a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php index ca15e62454..a12ea153bb 100644 --- a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php +++ b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php @@ -13,8 +13,7 @@ class CreateOauthAccessTokensTable extends Migration */ public function up() { - if (!Schema::hasTable('oauth_access_tokens')) { - + if (! Schema::hasTable('oauth_access_tokens')) { Schema::create('oauth_access_tokens', function (Blueprint $table) { $table->string('id', 100)->primary(); $table->unsignedBigInteger('user_id')->nullable()->index(); @@ -35,6 +34,6 @@ class CreateOauthAccessTokensTable extends Migration */ public function down() { - Schema::dropIfExists('oauth_access_tokens'); + Schema::dropIfExists('oauth_access_tokens'); } } diff --git a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php index 9d7327d69c..30c4e27546 100644 --- a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php +++ b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php @@ -13,7 +13,7 @@ class CreateOauthRefreshTokensTable extends Migration */ public function up() { - if (!Schema::hasTable('oauth_refresh_tokens')) { + if (! Schema::hasTable('oauth_refresh_tokens')) { Schema::create('oauth_refresh_tokens', function (Blueprint $table) { $table->string('id', 100)->primary(); $table->string('access_token_id', 100); @@ -30,6 +30,6 @@ class CreateOauthRefreshTokensTable extends Migration */ public function down() { - Schema::dropIfExists('oauth_refresh_tokens'); + Schema::dropIfExists('oauth_refresh_tokens'); } } diff --git a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php index 65937a72af..0046eb6e79 100644 --- a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php +++ b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php @@ -13,7 +13,7 @@ class CreateOauthClientsTable extends Migration */ public function up() { - if (!Schema::hasTable('oauth_clients')) { + if (! Schema::hasTable('oauth_clients')) { Schema::create('oauth_clients', function (Blueprint $table) { $table->bigIncrements('id'); $table->unsignedBigInteger('user_id')->nullable()->index(); @@ -35,6 +35,6 @@ class CreateOauthClientsTable extends Migration */ public function down() { - Schema::dropIfExists('oauth_clients'); + Schema::dropIfExists('oauth_clients'); } } diff --git a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php index b469b42364..0a50768ed8 100644 --- a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php +++ b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php @@ -13,14 +13,13 @@ class CreateOauthPersonalAccessClientsTable extends Migration */ public function up() { - if (!Schema::hasTable('oauth_personal_access_clients')) { + if (! Schema::hasTable('oauth_personal_access_clients')) { Schema::create('oauth_personal_access_clients', function (Blueprint $table) { $table->bigIncrements('id'); $table->unsignedBigInteger('client_id'); $table->timestamps(); }); } - } /** @@ -30,6 +29,6 @@ class CreateOauthPersonalAccessClientsTable extends Migration */ public function down() { - Schema::dropIfExists('oauth_personal_access_clients'); + Schema::dropIfExists('oauth_personal_access_clients'); } } diff --git a/database/migrations/2016_06_01_140218_add_email_domain_and_format_to_settings.php b/database/migrations/2016_06_01_140218_add_email_domain_and_format_to_settings.php index a2b29e9b60..02789e8a99 100644 --- a/database/migrations/2016_06_01_140218_add_email_domain_and_format_to_settings.php +++ b/database/migrations/2016_06_01_140218_add_email_domain_and_format_to_settings.php @@ -1,7 +1,7 @@ string('email_domain')->nullable()->default(NULL); + $table->string('email_domain')->nullable()->default(null); $table->string('email_format')->nullable()->default('filastname'); $table->string('username_format')->nullable()->default('filastname'); }); diff --git a/database/migrations/2016_06_22_160725_add_user_id_to_maintenances.php b/database/migrations/2016_06_22_160725_add_user_id_to_maintenances.php index cdbd128759..284a63ca9b 100644 --- a/database/migrations/2016_06_22_160725_add_user_id_to_maintenances.php +++ b/database/migrations/2016_06_22_160725_add_user_id_to_maintenances.php @@ -1,7 +1,7 @@ integer('user_id')->nullable()->default(NULL); + $table->integer('user_id')->nullable()->default(null); }); } diff --git a/database/migrations/2016_07_13_150015_add_is_ad_to_settings.php b/database/migrations/2016_07_13_150015_add_is_ad_to_settings.php index ad6bc1beec..35543c90fe 100644 --- a/database/migrations/2016_07_13_150015_add_is_ad_to_settings.php +++ b/database/migrations/2016_07_13_150015_add_is_ad_to_settings.php @@ -1,7 +1,7 @@ string('ad_domain')->nullable()->default(NULL); + $table->string('ad_domain')->nullable()->default(null); }); } diff --git a/database/migrations/2016_07_22_003348_fix_custom_fields_regex_stuff.php b/database/migrations/2016_07_22_003348_fix_custom_fields_regex_stuff.php index f487910823..da81cb1e50 100644 --- a/database/migrations/2016_07_22_003348_fix_custom_fields_regex_stuff.php +++ b/database/migrations/2016_07_22_003348_fix_custom_fields_regex_stuff.php @@ -1,7 +1,7 @@ format, 'ALPHA') !== false) { - $custom_field->format='alpha'; + $custom_field->format = 'alpha'; // Numeric } elseif (stripos($custom_field->format, 'NUMERIC') !== false) { - $custom_field->format='numeric'; + $custom_field->format = 'numeric'; // IP } elseif (stripos($custom_field->format, 'IP') !== false) { - $custom_field->format='ip'; + $custom_field->format = 'ip'; // Email } elseif (stripos($custom_field->format, 'EMAIL') !== false) { - $custom_field->format='email'; + $custom_field->format = 'email'; // MAC } elseif (stripos($custom_field->format, 'regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/') !== false) { - $custom_field->format='regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/'; + $custom_field->format = 'regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/'; // Date } elseif (stripos($custom_field->format, 'DATE') !== false) { - $custom_field->format='date'; - + $custom_field->format = 'date'; // URL } elseif (stripos($custom_field->format, 'URL') !== false) { - $custom_field->format='url'; + $custom_field->format = 'url'; // ANY } elseif (stripos($custom_field->format, 'ANY') !== false) { - $custom_field->format=''; + $custom_field->format = ''; // Fix any custom regexes } else { diff --git a/database/migrations/2016_07_22_054850_one_more_mac_addr_fix.php b/database/migrations/2016_07_22_054850_one_more_mac_addr_fix.php index cc45976d54..ac64e278fe 100644 --- a/database/migrations/2016_07_22_054850_one_more_mac_addr_fix.php +++ b/database/migrations/2016_07_22_054850_one_more_mac_addr_fix.php @@ -1,7 +1,7 @@ format=='regex:/^MAC$/') { + foreach (\App\Models\CustomField::all() as $custom_field) { + if ($custom_field->format == 'regex:/^MAC$/') { $custom_field->format = 'regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/'; } $custom_field->save(); - } } diff --git a/database/migrations/2016_07_22_143045_add_port_to_ldap_settings.php b/database/migrations/2016_07_22_143045_add_port_to_ldap_settings.php index b0dd1a601c..1eda0698a5 100644 --- a/database/migrations/2016_07_22_143045_add_port_to_ldap_settings.php +++ b/database/migrations/2016_07_22_143045_add_port_to_ldap_settings.php @@ -1,7 +1,7 @@ string('color', 10)->nullable()->default(NULL); + $table->string('color', 10)->nullable()->default(null); }); } diff --git a/database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php b/database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php index c46203fdad..d141af056c 100644 --- a/database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php +++ b/database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php @@ -1,7 +1,7 @@ getDoctrineSchemaManager()->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('enum', 'string'); Schema::table('assets', function ($table) { - $table->decimal('purchase_cost',8,2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change(); }); } diff --git a/database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php b/database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php index 6fc16b9cdf..89b5dfc556 100644 --- a/database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php +++ b/database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php @@ -1,7 +1,7 @@ increments('id'); $table->integer('user_id')->nullable(); diff --git a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php index 4d0de747ae..b27c602741 100644 --- a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php +++ b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php @@ -23,45 +23,44 @@ class MigrateAssetLogToActionLog extends Migration // var_dump($log); $a->user_id = $log->user_id; - if (!is_null($log->asset_id)) { + if (! is_null($log->asset_id)) { $a->item_id = $log->asset_id; - if ($log->asset_type == "hardware") { + if ($log->asset_type == 'hardware') { $a->item_type = 'App\\Models\\Asset'; } else { $a->item_type = 'App\\Models\\License'; } } - if (!is_null($log->accessory_id)) { + if (! is_null($log->accessory_id)) { $a->item_id = $log->accessory_id; $a->item_type = 'App\\Models\\Accessory'; - } else if (!is_null($log->consumable_id)) { + } elseif (! is_null($log->consumable_id)) { $a->item_id = $log->consumable_id; $a->item_type = 'App\\Models\\Consumable'; - } else if (!is_null($log->component_id)) { + } elseif (! is_null($log->component_id)) { $a->item_id = $log->component_id; $a->item_type = 'App\\Models\\Component'; } $a->action_type = $log->action_type; // $a->checkout_to = $log->checkout_to; - if(!is_null($log->checkedout_to)) { + if (! is_null($log->checkedout_to)) { $a->target_id = $log->checkedout_to; $a->target_type = User::class; } - if(!is_null($log->accepted_id)) { + if (! is_null($log->accepted_id)) { $a->target_id = $log->accepted_id; $a->target_type = User::class; } - $a->location_id = $log->location_id; - $a->created_at = $log->created_at; - $a->updated_at = $log->updated_at; - $a->deleted_at = $log->deleted_at; - $a->note = $log->note; - $a->expected_checkin = $log->expected_checkin; - $a->accepted_id = $log->accepted_id; - $a->filename = $log->filename; + $a->location_id = $log->location_id; + $a->created_at = $log->created_at; + $a->updated_at = $log->updated_at; + $a->deleted_at = $log->deleted_at; + $a->note = $log->note; + $a->expected_checkin = $log->expected_checkin; + $a->accepted_id = $log->accepted_id; + $a->filename = $log->filename; $a->save(); - } // dd($logs); } diff --git a/database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php b/database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php index db10820f60..0d74936ef6 100644 --- a/database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php +++ b/database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php @@ -1,7 +1,7 @@ get(); foreach ($logs as $log) { - if($log->item) { + if ($log->item) { $log->company_id = $log->item->company_id; $log->save(); } else { diff --git a/database/migrations/2016_10_14_130709_fix_order_number_to_varchar.php b/database/migrations/2016_10_14_130709_fix_order_number_to_varchar.php index 96f801987f..280984e33e 100644 --- a/database/migrations/2016_10_14_130709_fix_order_number_to_varchar.php +++ b/database/migrations/2016_10_14_130709_fix_order_number_to_varchar.php @@ -1,7 +1,7 @@ renameColumn('model_number', 'modelno'); - }); } } diff --git a/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php b/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php index daf93c3ac5..86718230d0 100644 --- a/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php +++ b/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php @@ -1,7 +1,7 @@ renameColumn('notes', 'note'); }); } diff --git a/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php b/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php index 1aba51ce99..e9fa829c7c 100644 --- a/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php +++ b/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php @@ -1,7 +1,7 @@ string('serial_number')->nullable()->default(null); }); - } /** @@ -28,6 +27,5 @@ class AddSerialToComponents extends Migration Schema::table('components', function ($table) { $table->dropColumn('serial_number'); }); - } } diff --git a/database/migrations/2016_10_27_213251_increase_serial_field_capacity.php b/database/migrations/2016_10_27_213251_increase_serial_field_capacity.php index f81c9373ef..71302ff3ac 100644 --- a/database/migrations/2016_10_27_213251_increase_serial_field_capacity.php +++ b/database/migrations/2016_10_27_213251_increase_serial_field_capacity.php @@ -1,7 +1,7 @@ where('filename', '!=', null)->get(); // - foreach($logs as $log) { + foreach ($logs as $log) { $matching_action_log = Actionlog::where('item_id', $log->asset_id) ->where('created_at', $log->created_at) ->where('note', $log->note) @@ -24,21 +24,19 @@ class FixForgottenFilenameInActionLogs extends Migration ->withTrashed() ->get()->first(); - if($matching_action_log) { + if ($matching_action_log) { $matching_action_log->filename = $log->filename; $matching_action_log->save(); - }else{ - echo("Couldn't find matching Action log row when trying to migrate". + } else { + echo "Couldn't find matching Action log row when trying to migrate". " filename from asset log:\n". "LogDate{$log->created_at} LogForAsset:{$log->asset_id}". - "LogNote:{$log->note} \n"); + "LogNote:{$log->note} \n"; } } - }); } - /** * Reverse the migrations. * diff --git a/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php b/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php index b1cde650e9..d6be3bb199 100644 --- a/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php +++ b/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php @@ -1,7 +1,7 @@ getDoctrineSchemaManager()->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('enum', 'string'); - Schema::table('assets', function ($table) { - $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); }); Schema::table('accessories', function ($table) { - $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); }); Schema::table('asset_maintenances', function ($table) { - $table->decimal('cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('cost', 20, 2)->nullable()->default(null)->change(); }); Schema::table('components', function ($table) { - $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); }); Schema::table('consumables', function ($table) { - $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); }); Schema::table('licenses', function ($table) { - $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change(); }); - } /** @@ -53,27 +51,27 @@ class IncreasePurchaseCostSize extends Migration $platform->registerDoctrineTypeMapping('enum', 'string'); Schema::table('assets', function ($table) { - $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change(); }); Schema::table('accessories', function ($table) { - $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); }); Schema::table('asset_maintenances', function ($table) { - $table->decimal('cost', 10, 2)->nullable()->default(null)->change(); + $table->decimal('cost', 10, 2)->nullable()->default(null)->change(); }); Schema::table('components', function ($table) { - $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); }); Schema::table('consumables', function ($table) { - $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 13, 4)->nullable()->default(null)->change(); }); Schema::table('licenses', function ($table) { - $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change(); + $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change(); }); } } diff --git a/database/migrations/2016_11_17_161317_longer_state_field_in_location.php b/database/migrations/2016_11_17_161317_longer_state_field_in_location.php index b60466597b..3c77db6743 100644 --- a/database/migrations/2016_11_17_161317_longer_state_field_in_location.php +++ b/database/migrations/2016_11_17_161317_longer_state_field_in_location.php @@ -1,7 +1,7 @@ where('target_type', null)->where(function($query) { + DB::table('action_logs')->where('target_type', null)->where(function ($query) { $query->where('action_type', 'accepted') ->orWhere('action_type', 'declined'); })->update(['target_type'=> 'App\Models\User']); diff --git a/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php index 1c1468d23a..70539c1198 100644 --- a/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php +++ b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php @@ -1,7 +1,7 @@ string('phone',35)->nullable()->default(NULL)->change(); - $table->string('fax',35)->nullable()->default(NULL)->change(); + $table->string('phone', 35)->nullable()->default(null)->change(); + $table->string('fax', 35)->nullable()->default(null)->change(); }); } @@ -29,9 +29,8 @@ class ExtendPhoneLengthsInSupplierAndElsewhere extends Migration { Schema::table('suppliers', function (Blueprint $table) { // - $table->string('phone',20)->nullable()->default(NULL)->change(); - $table->string('fax',20)->nullable()->default(NULL)->change(); - + $table->string('phone', 20)->nullable()->default(null)->change(); + $table->string('fax', 20)->nullable()->default(null)->change(); }); } } diff --git a/database/migrations/2016_12_27_212631_make_asset_assigned_to_polymorphic.php b/database/migrations/2016_12_27_212631_make_asset_assigned_to_polymorphic.php index 772bd170a5..c4534ddcc8 100644 --- a/database/migrations/2016_12_27_212631_make_asset_assigned_to_polymorphic.php +++ b/database/migrations/2016_12_27_212631_make_asset_assigned_to_polymorphic.php @@ -1,10 +1,10 @@ string('assigned_type')->nullable(); - }); - if(config('database.default') == 'mysql') { + Schema::table('assets', function (Blueprint $table) { + $table->string('assigned_type')->nullable(); + }); + if (config('database.default') == 'mysql') { Asset::whereNotNull('assigned_to')->orWhere('assigned_to', '!=', '')->update(['assigned_type' => User::class]); } } diff --git a/database/migrations/2017_01_09_040429_create_locations_ldap_query_field.php b/database/migrations/2017_01_09_040429_create_locations_ldap_query_field.php index f67f85c2aa..f0556e2833 100644 --- a/database/migrations/2017_01_09_040429_create_locations_ldap_query_field.php +++ b/database/migrations/2017_01_09_040429_create_locations_ldap_query_field.php @@ -1,7 +1,7 @@ ] * @since [v4.0] - * @return Array + * @return array */ - -function updateLegacyColumnName($customfield) { - +function updateLegacyColumnName($customfield) +{ $name_to_db_name = CustomField::name_to_db_name($customfield->name); //\Log::debug('Trying to rename '.$name_to_db_name." to ".$customfield->convertUnicodeDbSlug()."...\n"); if (Schema::hasColumn(CustomField::$table_name, $name_to_db_name)) { - return Schema::table(CustomField::$table_name, - function ($table) use ($name_to_db_name, $customfield) { + function ($table) use ($name_to_db_name, $customfield) { $table->renameColumn($name_to_db_name, $customfield->convertUnicodeDbSlug()); } ); - } else { //\Log::debug('Legacy DB column '.$name_to_db_name.' was not found on the assets table.'); } - } - - - class FixUtf8CustomFieldColumnNames extends Migration { /** @@ -52,15 +45,14 @@ class FixUtf8CustomFieldColumnNames extends Migration $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('enum', 'string'); - if (!Schema::hasColumn('custom_fields', 'db_column')) { + if (! Schema::hasColumn('custom_fields', 'db_column')) { Schema::table('custom_fields', function ($table) { $table->string('db_column')->nullable(); $table->text('help_text')->nullable(); }); } - foreach(CustomField::all() as $field) { - + foreach (CustomField::all() as $field) { $db_column = $field->convertUnicodeDbSlug(); DB::table('custom_fields') @@ -69,11 +61,7 @@ class FixUtf8CustomFieldColumnNames extends Migration // change the name of the column updateLegacyColumnName($field); - - } - - } /** @@ -88,5 +76,4 @@ class FixUtf8CustomFieldColumnNames extends Migration $table->dropColumn('help_text'); }); } - } diff --git a/database/migrations/2017_03_03_154632_add_time_date_display_to_settings.php b/database/migrations/2017_03_03_154632_add_time_date_display_to_settings.php index b3f40ab98d..c704696893 100644 --- a/database/migrations/2017_03_03_154632_add_time_date_display_to_settings.php +++ b/database/migrations/2017_03_03_154632_add_time_date_display_to_settings.php @@ -1,8 +1,8 @@ text('field_values')->nullable()->default(null)->change(); }); - } /** diff --git a/database/migrations/2017_05_22_204422_create_departments.php b/database/migrations/2017_05_22_204422_create_departments.php index cf2e1eaf7c..a1c235af69 100644 --- a/database/migrations/2017_05_22_204422_create_departments.php +++ b/database/migrations/2017_05_22_204422_create_departments.php @@ -1,8 +1,8 @@ whereNull('deleted_at')->get(); - if (!$next = Asset::nextAutoIncrement($assets)) { + if (! $next = Asset::nextAutoIncrement($assets)) { $next = 1; } @@ -31,7 +29,6 @@ class AddNextAutoincrementToSettings extends Migration $settings->next_auto_tag_base = $next; $settings->save(); } - } /** diff --git a/database/migrations/2017_06_18_151753_add_header_and_first_row_to_importer_table.php b/database/migrations/2017_06_18_151753_add_header_and_first_row_to_importer_table.php index 6947c421a1..8f82243a70 100644 --- a/database/migrations/2017_06_18_151753_add_header_and_first_row_to_importer_table.php +++ b/database/migrations/2017_06_18_151753_add_header_and_first_row_to_importer_table.php @@ -1,8 +1,8 @@ boolean('pwd_secure_uncommon')->default('0'); - $table->string('pwd_secure_complexity')->nullable()->default(NULL); + $table->string('pwd_secure_complexity')->nullable()->default(null); $table->integer('pwd_secure_min')->default('8'); }); } diff --git a/database/migrations/2017_08_25_074822_add_auditing_tables.php b/database/migrations/2017_08_25_074822_add_auditing_tables.php index e8a6f5209a..ef064ffc26 100644 --- a/database/migrations/2017_08_25_074822_add_auditing_tables.php +++ b/database/migrations/2017_08_25_074822_add_auditing_tables.php @@ -1,8 +1,8 @@ date('next_audit_date')->nullable()->default(NULL); + $table->date('next_audit_date')->nullable()->default(null); }); } diff --git a/database/migrations/2017_08_25_101435_add_auditing_to_settings.php b/database/migrations/2017_08_25_101435_add_auditing_to_settings.php index 7ef4ed306f..14522da79f 100644 --- a/database/migrations/2017_08_25_101435_add_auditing_to_settings.php +++ b/database/migrations/2017_08_25_101435_add_auditing_to_settings.php @@ -1,8 +1,8 @@ integer('audit_interval')->nullable()->default(NULL); - $table->integer('audit_warning_days')->nullable()->default(NULL); + $table->integer('audit_interval')->nullable()->default(null); + $table->integer('audit_warning_days')->nullable()->default(null); }); } diff --git a/database/migrations/2017_10_03_015503_drop_foreign_keys.php b/database/migrations/2017_10_03_015503_drop_foreign_keys.php index 37ef6ae684..9f42fc068e 100644 --- a/database/migrations/2017_10_03_015503_drop_foreign_keys.php +++ b/database/migrations/2017_10_03_015503_drop_foreign_keys.php @@ -1,8 +1,8 @@ dropForeign(['company_id']); }); @@ -21,7 +21,7 @@ class DropForeignKeys extends Migration //echo $e; } - try { + try { Schema::table('users', function (Blueprint $table) { $table->dropForeign(['company_id']); }); @@ -29,7 +29,7 @@ class DropForeignKeys extends Migration //echo $e; } - try { + try { Schema::table('assets', function (Blueprint $table) { $table->dropForeign(['company_id']); }); @@ -37,7 +37,7 @@ class DropForeignKeys extends Migration //echo $e; } - try { + try { Schema::table('components', function (Blueprint $table) { $table->dropForeign(['company_id']); }); @@ -45,7 +45,7 @@ class DropForeignKeys extends Migration //echo $e; } - try { + try { Schema::table('consumables', function (Blueprint $table) { $table->dropForeign(['company_id']); }); @@ -53,16 +53,13 @@ class DropForeignKeys extends Migration //echo $e; } - try { + try { Schema::table('licenses', function (Blueprint $table) { $table->dropForeign(['company_id']); }); } catch (\Exception $e) { //echo $e; } - - - } /** diff --git a/database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php b/database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php index fd252bd59c..c1e296095c 100644 --- a/database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php +++ b/database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php @@ -1,8 +1,8 @@ integer('depreciation_id')->nullable()->default(null)->change(); }); - } /** diff --git a/database/migrations/2017_10_17_133709_add_display_url_to_settings.php b/database/migrations/2017_10_17_133709_add_display_url_to_settings.php index 9b90df9571..8f8237b7d2 100644 --- a/database/migrations/2017_10_17_133709_add_display_url_to_settings.php +++ b/database/migrations/2017_10_17_133709_add_display_url_to_settings.php @@ -1,8 +1,8 @@ index('rtd_location_id'); - $table->index(['assigned_type','assigned_to']); + $table->index(['assigned_type', 'assigned_to']); }); } @@ -29,7 +29,7 @@ class AddLocationIndicesToAssets extends Migration Schema::table('assets', function (Blueprint $table) { // $table->dropIndex(['rtd_location_id']); - $table->dropIndex(['assigned_type','assigned_to']); + $table->dropIndex(['assigned_type', 'assigned_to']); }); } } diff --git a/database/migrations/2017_10_25_202930_add_images_uploads_to_locations_manufacturers_etc.php b/database/migrations/2017_10_25_202930_add_images_uploads_to_locations_manufacturers_etc.php index f6775a564a..7fb7cedd24 100644 --- a/database/migrations/2017_10_25_202930_add_images_uploads_to_locations_manufacturers_etc.php +++ b/database/migrations/2017_10_25_202930_add_images_uploads_to_locations_manufacturers_etc.php @@ -1,8 +1,8 @@ string('image')->nullable()->default(null); }); - } /** @@ -65,7 +64,5 @@ class AddImagesUploadsToLocationsManufacturersEtc extends Migration Schema::table('manufacturers', function (Blueprint $table) { $table->dropColumn('image'); }); - - } } diff --git a/database/migrations/2017_10_27_180947_denorm_asset_locations.php b/database/migrations/2017_10_27_180947_denorm_asset_locations.php index b6ec3df8e4..7d26fd36c3 100644 --- a/database/migrations/2017_10_27_180947_denorm_asset_locations.php +++ b/database/migrations/2017_10_27_180947_denorm_asset_locations.php @@ -1,9 +1,8 @@ integer('location_id')->nullable()->default(null); }); - } /** diff --git a/database/migrations/2017_10_27_192423_migrate_denormed_asset_locations.php b/database/migrations/2017_10_27_192423_migrate_denormed_asset_locations.php index 2da67eb667..e0e10e1a88 100644 --- a/database/migrations/2017_10_27_192423_migrate_denormed_asset_locations.php +++ b/database/migrations/2017_10_27_192423_migrate_denormed_asset_locations.php @@ -1,6 +1,6 @@ dropColumn('city'); $table->dropColumn('state'); $table->dropColumn('zip'); - }); } } diff --git a/database/migrations/2017_11_08_025918_add_alert_menu_setting.php b/database/migrations/2017_11_08_025918_add_alert_menu_setting.php index 5833f157c3..a2c5f3af81 100644 --- a/database/migrations/2017_11_08_025918_add_alert_menu_setting.php +++ b/database/migrations/2017_11_08_025918_add_alert_menu_setting.php @@ -1,8 +1,8 @@ datetime('last_audit_date')->after('assigned_type')->nullable()->default(null); }); } - - - } /** diff --git a/database/migrations/2017_12_12_033618_add_actionlog_meta.php b/database/migrations/2017_12_12_033618_add_actionlog_meta.php index a9a662fa1a..1189f828c8 100644 --- a/database/migrations/2017_12_12_033618_add_actionlog_meta.php +++ b/database/migrations/2017_12_12_033618_add_actionlog_meta.php @@ -1,8 +1,8 @@ unsetEventDispatcher(); $asset->save(); } - } } } diff --git a/database/migrations/2018_01_17_184354_add_archived_in_list_setting.php b/database/migrations/2018_01_17_184354_add_archived_in_list_setting.php index 970e218cdc..128ab58d39 100644 --- a/database/migrations/2018_01_17_184354_add_archived_in_list_setting.php +++ b/database/migrations/2018_01_17_184354_add_archived_in_list_setting.php @@ -1,8 +1,8 @@ boolean('login_remote_user_enabled')->default(0); $table->boolean('login_common_disabled')->default(0); - $table->string('login_remote_user_custom_logout_url')->default(""); + $table->string('login_remote_user_custom_logout_url')->default(''); }); } diff --git a/database/migrations/2018_03_03_011032_add_theme_to_settings.php b/database/migrations/2018_03_03_011032_add_theme_to_settings.php index 876b618d8b..2c44a4af35 100644 --- a/database/migrations/2018_03_03_011032_add_theme_to_settings.php +++ b/database/migrations/2018_03_03_011032_add_theme_to_settings.php @@ -1,8 +1,8 @@ index(['user_id','requestable_id','requestable_type'], 'checkout_requests_user_id_requestable_id_requestable_type_unique')->unique(); + $table->index(['user_id', 'requestable_id', 'requestable_type'], 'checkout_requests_user_id_requestable_id_requestable_type_unique')->unique(); }); } } diff --git a/database/migrations/2018_03_29_070511_add_new_index_requestable.php b/database/migrations/2018_03_29_070511_add_new_index_requestable.php index 09c06566e8..394dbaac45 100644 --- a/database/migrations/2018_03_29_070511_add_new_index_requestable.php +++ b/database/migrations/2018_03_29_070511_add_new_index_requestable.php @@ -1,8 +1,8 @@ index(['user_id','requestable_id','requestable_type'], 'checkout_requests_user_id_requestable_id_requestable_type'); + $table->index(['user_id', 'requestable_id', 'requestable_type'], 'checkout_requests_user_id_requestable_id_requestable_type'); }); } diff --git a/database/migrations/2018_04_02_150700_labels_display_model_name.php b/database/migrations/2018_04_02_150700_labels_display_model_name.php index 60200cdbe2..93e44bb0ba 100644 --- a/database/migrations/2018_04_02_150700_labels_display_model_name.php +++ b/database/migrations/2018_04_02_150700_labels_display_model_name.php @@ -1,8 +1,8 @@ boolean('labels_display_model')->default(0); + $table->boolean('labels_display_model')->default(0); }); } diff --git a/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php b/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php index aea8509b8b..072ed2ca19 100644 --- a/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php +++ b/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php @@ -1,8 +1,8 @@ integer('category_id')->nullable()->default(null); }); - } /** diff --git a/database/migrations/2018_05_04_075235_add_update_license_category.php b/database/migrations/2018_05_04_075235_add_update_license_category.php index 4997b0a1cf..964ca103fc 100644 --- a/database/migrations/2018_05_04_075235_add_update_license_category.php +++ b/database/migrations/2018_05_04_075235_add_update_license_category.php @@ -1,10 +1,10 @@ withTrashed() ->update(['category_id' => $category->id]); } - } /** @@ -35,7 +34,6 @@ class AddUpdateLicenseCategory extends Migration */ public function down() { - App\Models\Category::where('name', 'Misc Software')->forceDelete(); License::whereNotNull('category_id') diff --git a/database/migrations/2018_05_08_031515_add_gdpr_privacy_footer.php b/database/migrations/2018_05_08_031515_add_gdpr_privacy_footer.php index bc5de9f2c1..0207548f2a 100644 --- a/database/migrations/2018_05_08_031515_add_gdpr_privacy_footer.php +++ b/database/migrations/2018_05_08_031515_add_gdpr_privacy_footer.php @@ -1,8 +1,8 @@ index(['item_type', 'item_id', 'action_type']); $table->index(['target_type', 'target_id', 'action_type']); }); - } /** diff --git a/database/migrations/2018_05_14_223646_add_indexes_to_assets.php b/database/migrations/2018_05_14_223646_add_indexes_to_assets.php index a7161bdb53..ceff4891a2 100644 --- a/database/migrations/2018_05_14_223646_add_indexes_to_assets.php +++ b/database/migrations/2018_05_14_223646_add_indexes_to_assets.php @@ -1,8 +1,8 @@ char('version_footer', 5)->nullable()->default('on'); }); } + /** * Reverse the migrations. * diff --git a/database/migrations/2018_07_05_215440_add_unique_serial_option_to_settings.php b/database/migrations/2018_07_05_215440_add_unique_serial_option_to_settings.php index eeaeb79279..42e3c9f149 100644 --- a/database/migrations/2018_07_05_215440_add_unique_serial_option_to_settings.php +++ b/database/migrations/2018_07_05_215440_add_unique_serial_option_to_settings.php @@ -1,8 +1,8 @@ boolean('logo_print_assets')->default('0'); }); - - } /** diff --git a/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php b/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php index 8a8d32fcfa..adc9477b37 100644 --- a/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php +++ b/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php @@ -1,8 +1,8 @@ 'App\Models\Asset', 'checkoutable_id' => $asset->id, @@ -28,7 +28,7 @@ class CreateCheckoutAcceptancesForUnacceptedAssets extends Migration ]; } - DB::table('checkout_acceptances')->insert($acceptances); + DB::table('checkout_acceptances')->insert($acceptances); } /** diff --git a/database/migrations/2018_10_18_191228_add_kits_licenses_table.php b/database/migrations/2018_10_18_191228_add_kits_licenses_table.php index 44ca2c0a24..4942942121 100644 --- a/database/migrations/2018_10_18_191228_add_kits_licenses_table.php +++ b/database/migrations/2018_10_18_191228_add_kits_licenses_table.php @@ -1,36 +1,35 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(NULL); - $table->integer('license_id')->nullable()->default(NULL); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('license_id')->nullable()->default(null); $table->integer('quantity')->default(1); $table->timestamps(); }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('kits_licenses'); - } + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('kits_licenses'); + } } diff --git a/database/migrations/2018_10_19_153910_add_kits_table.php b/database/migrations/2018_10_19_153910_add_kits_table.php index 949c150146..04e9290aba 100644 --- a/database/migrations/2018_10_19_153910_add_kits_table.php +++ b/database/migrations/2018_10_19_153910_add_kits_table.php @@ -1,37 +1,34 @@ increments('id'); - $table->string('name')->nullable()->default(NULL); + $table->string('name')->nullable()->default(null); $table->timestamps(); $table->engine = 'InnoDB'; }); + } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('kits'); - - } - + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('kits'); + } } diff --git a/database/migrations/2018_10_19_154013_add_kits_models_table.php b/database/migrations/2018_10_19_154013_add_kits_models_table.php index a0abeeef7b..0f62dd45ef 100644 --- a/database/migrations/2018_10_19_154013_add_kits_models_table.php +++ b/database/migrations/2018_10_19_154013_add_kits_models_table.php @@ -1,36 +1,35 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(NULL); - $table->integer('model_id')->nullable()->default(NULL); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('model_id')->nullable()->default(null); $table->integer('quantity')->default(1); $table->timestamps(); }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::drop('kits_models'); - } + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('kits_models'); + } } diff --git a/database/migrations/2018_12_05_211936_add_favicon_to_settings.php b/database/migrations/2018_12_05_211936_add_favicon_to_settings.php index 570eb53926..067ef30b91 100644 --- a/database/migrations/2018_12_05_211936_add_favicon_to_settings.php +++ b/database/migrations/2018_12_05_211936_add_favicon_to_settings.php @@ -1,8 +1,8 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(NULL); - $table->integer('consumable_id')->nullable()->default(NULL); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('consumable_id')->nullable()->default(null); $table->integer('quantity')->default(1); $table->timestamps(); }); @@ -31,6 +31,6 @@ class AddKitsConsumablesTable extends Migration public function down() { // - Schema::drop('kits_consumables'); + Schema::drop('kits_consumables'); } } diff --git a/database/migrations/2019_02_07_190030_add_kits_accessories_table.php b/database/migrations/2019_02_07_190030_add_kits_accessories_table.php index f0e80249db..12e20beba2 100644 --- a/database/migrations/2019_02_07_190030_add_kits_accessories_table.php +++ b/database/migrations/2019_02_07_190030_add_kits_accessories_table.php @@ -1,8 +1,8 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(NULL); - $table->integer('accessory_id')->nullable()->default(NULL); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('accessory_id')->nullable()->default(null); $table->integer('quantity')->default(1); $table->timestamps(); }); @@ -31,6 +31,6 @@ class AddKitsAccessoriesTable extends Migration public function down() { // - Schema::drop('kits_accessories'); + Schema::drop('kits_accessories'); } } diff --git a/database/migrations/2019_02_12_182750_add_actiondate_to_actionlog.php b/database/migrations/2019_02_12_182750_add_actiondate_to_actionlog.php index 053b793b9a..1bbff083ae 100644 --- a/database/migrations/2019_02_12_182750_add_actiondate_to_actionlog.php +++ b/database/migrations/2019_02_12_182750_add_actiondate_to_actionlog.php @@ -1,8 +1,8 @@ select('created_at', 'id')->where('action_type', 'checkout')->orWhere('action_type', 'checkin from')->get(); - foreach($results as $result){ + foreach ($results as $result) { $update = DB::update('update '.DB::getTablePrefix().'action_logs set action_date=? where id=?', [$result->created_at, $result->id]); } } diff --git a/database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php b/database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php index faf24747d1..4808209d21 100644 --- a/database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php +++ b/database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php @@ -1,8 +1,8 @@ string('city')->nullable()->default(null)->change(); $table->string('state')->nullable()->default(null)->change(); diff --git a/database/migrations/2019_04_06_060145_add_user_skin_setting.php b/database/migrations/2019_04_06_060145_add_user_skin_setting.php index efe1f94c48..475f0c6aec 100644 --- a/database/migrations/2019_04_06_060145_add_user_skin_setting.php +++ b/database/migrations/2019_04_06_060145_add_user_skin_setting.php @@ -1,8 +1,8 @@ dropColumn('allow_user_skin'); }); } -} \ No newline at end of file +} diff --git a/database/migrations/2019_06_12_184327_rename_groups_table.php b/database/migrations/2019_06_12_184327_rename_groups_table.php index 3c50971614..58dafbc8f6 100644 --- a/database/migrations/2019_06_12_184327_rename_groups_table.php +++ b/database/migrations/2019_06_12_184327_rename_groups_table.php @@ -1,8 +1,8 @@ string('login_remote_user_header_name')->default(""); + $table->string('login_remote_user_header_name')->default(''); }); } diff --git a/database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php b/database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php index aced0bf111..e5b62c8ce6 100644 --- a/database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php +++ b/database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php @@ -1,9 +1,9 @@ ad_append_domain = 1; $s->save(); } -} + } /** * Reverse the migrations. diff --git a/database/migrations/2020_04_29_222305_add_saml_fields_to_settings.php b/database/migrations/2020_04_29_222305_add_saml_fields_to_settings.php index 90c656ce24..dd23aed1b6 100644 --- a/database/migrations/2020_04_29_222305_add_saml_fields_to_settings.php +++ b/database/migrations/2020_04_29_222305_add_saml_fields_to_settings.php @@ -1,48 +1,45 @@ boolean('saml_enabled')->default(0); - $table->text('saml_idp_metadata')->nullable()->default(NULL); - $table->string('saml_attr_mapping_username')->nullable()->default(NULL); +class AddSamlFieldsToSettings extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table('settings', function (Blueprint $table) { + $table->boolean('saml_enabled')->default(0); + $table->text('saml_idp_metadata')->nullable()->default(null); + $table->string('saml_attr_mapping_username')->nullable()->default(null); $table->boolean('saml_forcelogin')->default(0); - $table->boolean('saml_slo')->default(0); - $table->text('saml_sp_x509cert')->nullable()->default(NULL); - $table->text('saml_sp_privatekey')->nullable()->default(NULL); - $table->text('saml_custom_settings')->nullable()->default(NULL); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('settings', function(Blueprint $table) - { - $table->dropColumn('saml_enabled'); - $table->dropColumn('saml_idp_metadata'); - $table->dropColumn('saml_attr_mapping_username'); - $table->dropColumn('saml_forcelogin'); - $table->dropColumn('saml_slo'); - $table->dropColumn('saml_sp_x509cert'); - $table->dropColumn('saml_sp_privatekey'); - $table->dropColumn('saml_custom_settings'); - }); - } + $table->boolean('saml_slo')->default(0); + $table->text('saml_sp_x509cert')->nullable()->default(null); + $table->text('saml_sp_privatekey')->nullable()->default(null); + $table->text('saml_custom_settings')->nullable()->default(null); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('saml_enabled'); + $table->dropColumn('saml_idp_metadata'); + $table->dropColumn('saml_attr_mapping_username'); + $table->dropColumn('saml_forcelogin'); + $table->dropColumn('saml_slo'); + $table->dropColumn('saml_sp_x509cert'); + $table->dropColumn('saml_sp_privatekey'); + $table->dropColumn('saml_custom_settings'); + }); + } } diff --git a/database/migrations/2020_08_11_200712_add_saml_key_rollover.php b/database/migrations/2020_08_11_200712_add_saml_key_rollover.php index 42a3e24dcd..7b81f2b1ca 100644 --- a/database/migrations/2020_08_11_200712_add_saml_key_rollover.php +++ b/database/migrations/2020_08_11_200712_add_saml_key_rollover.php @@ -13,8 +13,8 @@ class AddSamlKeyRollover extends Migration */ public function up() { - Schema::table('settings', function(Blueprint $table) { - $table->text('saml_sp_x509certNew')->nullable()->default(NULL); + Schema::table('settings', function (Blueprint $table) { + $table->text('saml_sp_x509certNew')->nullable()->default(null); }); } @@ -25,7 +25,7 @@ class AddSamlKeyRollover extends Migration */ public function down() { - Schema::table('settings', function(Blueprint $table) { + Schema::table('settings', function (Blueprint $table) { $table->dropColumn('saml_sp_x509certNew'); }); } diff --git a/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php b/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php index bfa9a7e362..cbf1e2d070 100644 --- a/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php +++ b/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php @@ -1,10 +1,10 @@ count()); - + \Log::debug('Accessory Count: '.$accessories->count()); // Loop through all of the accessories foreach ($accessories as $accessory) { @@ -37,22 +36,21 @@ class MoveAccessoryCheckoutNoteToJoinTable extends Migration // Loop through the accessories_users records foreach ($join_logs as $join_log) { \Log::debug($join_logs->count().' join log records'); - \Log::debug('Looking for accessories_users that match '. $join_log->created_at); + \Log::debug('Looking for accessories_users that match '.$join_log->created_at); // Get the records from action_logs so we can copy the notes over to the new notes field // on the accessories_users table - $action_log_entries = Actionlog::where('created_at', '=',$join_log->created_at) - ->where('target_id', '=',$join_log->assigned_to) - ->where('item_id', '=',$accessory->id) - ->where('target_type', '=','App\\Models\\User') + $action_log_entries = Actionlog::where('created_at', '=', $join_log->created_at) + ->where('target_id', '=', $join_log->assigned_to) + ->where('item_id', '=', $accessory->id) + ->where('target_type', '=', 'App\\Models\\User') ->where('action_type', '=', 'checkout') ->orderBy('created_at', 'DESC')->get(); \Log::debug($action_log_entries->count().' matching entries in the action_logs table'); - \Log::debug('Looking for action_logs that match '. $join_log->created_at); + \Log::debug('Looking for action_logs that match '.$join_log->created_at); foreach ($action_log_entries as $action_log_entry) { - \Log::debug('Checkout date in asset log: '.$action_log_entry->created_at.' against accessories_users: '.$join_log->created_at); \Log::debug('Action log: '.$action_log_entry->created_at); \Log::debug('Join log: '.$join_log->created_at); @@ -65,14 +63,8 @@ class MoveAccessoryCheckoutNoteToJoinTable extends Migration \Log::debug('No match'); } } - } - - - } - - } /** diff --git a/database/migrations/2020_10_23_161736_fix_zero_values_for_locations.php b/database/migrations/2020_10_23_161736_fix_zero_values_for_locations.php index 66685c8e41..110a6c3e91 100644 --- a/database/migrations/2020_10_23_161736_fix_zero_values_for_locations.php +++ b/database/migrations/2020_10_23_161736_fix_zero_values_for_locations.php @@ -1,10 +1,10 @@ update(['location_id' => null]); - } /** diff --git a/database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php b/database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php index 8a5471233e..4f10cc40b6 100644 --- a/database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php +++ b/database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php @@ -1,8 +1,8 @@ where("ldap_server","not like","ldaps://%"); - foreach($settings->get() AS $setting) { // we don't formally support having multiple settings records, but just in case they come up... - $setting->ldap_server = "ldap://".$setting->ldap_server; + $settings = App\Models\Setting::where('ldap_server', 'not like', 'ldap://%')->where('ldap_server', 'not like', 'ldaps://%'); + foreach ($settings->get() as $setting) { // we don't formally support having multiple settings records, but just in case they come up... + $setting->ldap_server = 'ldap://'.$setting->ldap_server; $setting->save(); } } diff --git a/database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php b/database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php index b2dff776e7..0f9164c08d 100644 --- a/database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php +++ b/database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php @@ -15,7 +15,7 @@ class AddProviderToOauthTable extends Migration public function up() { // Add a 'provider' column if not existing or else modify it - if (!Schema::hasColumn('oauth_clients', 'provider')) { + if (! Schema::hasColumn('oauth_clients', 'provider')) { Schema::table('oauth_clients', function (Blueprint $table) { $table->string('provider')->after('secret')->nullable(); }); diff --git a/database/migrations/2021_04_07_001811_add_ldap_dept.php b/database/migrations/2021_04_07_001811_add_ldap_dept.php index 5557a6747f..7ce62e8709 100644 --- a/database/migrations/2021_04_07_001811_add_ldap_dept.php +++ b/database/migrations/2021_04_07_001811_add_ldap_dept.php @@ -27,7 +27,6 @@ class AddLdapDept extends Migration { Schema::table('settings', function (Blueprint $table) { $table->dropColumn('ldap_dept'); - }); } } diff --git a/database/migrations/2021_04_14_180125_add_ids_to_tables.php b/database/migrations/2021_04_14_180125_add_ids_to_tables.php index 22cf03ebf9..07172164fe 100644 --- a/database/migrations/2021_04_14_180125_add_ids_to_tables.php +++ b/database/migrations/2021_04_14_180125_add_ids_to_tables.php @@ -13,23 +13,19 @@ class AddIdsToTables extends Migration */ public function up() { - Schema::table('migrations', function (Blueprint $table) { // Add the id column to the migrations table if it doesn't yet have one - if (!Schema::hasColumn('migrations', 'id')) { + if (! Schema::hasColumn('migrations', 'id')) { $table->increments('id'); } }); Schema::table('password_resets', function (Blueprint $table) { // Add the id column to the password_resets table if it doesn't yet have one - if (!Schema::hasColumn('password_resets', 'id')) { + if (! Schema::hasColumn('password_resets', 'id')) { $table->increments('id'); } }); - - - } /** diff --git a/database/seeds/AccessorySeeder.php b/database/seeds/AccessorySeeder.php index a9041b782c..7f35ba8e0e 100644 --- a/database/seeds/AccessorySeeder.php +++ b/database/seeds/AccessorySeeder.php @@ -1,43 +1,42 @@ truncate(); - factory(Accessory::class, 1)->states('apple-usb-keyboard')->create(); - factory(Accessory::class, 1)->states('apple-bt-keyboard')->create(); - factory(Accessory::class, 1)->states('apple-mouse')->create(); - factory(Accessory::class, 1)->states('microsoft-mouse')->create(); + public function run() + { + Accessory::truncate(); + DB::table('accessories_users')->truncate(); + factory(Accessory::class, 1)->states('apple-usb-keyboard')->create(); + factory(Accessory::class, 1)->states('apple-bt-keyboard')->create(); + factory(Accessory::class, 1)->states('apple-mouse')->create(); + factory(Accessory::class, 1)->states('microsoft-mouse')->create(); - $src = public_path('/img/demo/accessories/'); - $dst = 'accessories'.'/'; - $del_files = Storage::files($dst); + $src = public_path('/img/demo/accessories/'); + $dst = 'accessories'.'/'; + $del_files = Storage::files($dst); - foreach($del_files as $del_file){ // iterate files - $file_to_delete = str_replace($src,'',$del_file); - \Log::debug('Deleting: '.$file_to_delete); - try { - Storage::disk('public')->delete($dst.$del_file); - } catch (\Exception $e) { - \Log::debug($e); - } - } + foreach ($del_files as $del_file) { // iterate files + $file_to_delete = str_replace($src, '', $del_file); + \Log::debug('Deleting: '.$file_to_delete); + try { + Storage::disk('public')->delete($dst.$del_file); + } catch (\Exception $e) { + \Log::debug($e); + } + } - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); - \Log::debug('Copying: '.$file_to_copy); - try { - Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); - } catch (\Exception $e) { - \Log::debug($e); - } - } - } + $add_files = glob($src.'/*.*'); + foreach ($add_files as $add_file) { + $file_to_copy = str_replace($src, '', $add_file); + \Log::debug('Copying: '.$file_to_copy); + try { + Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); + } catch (\Exception $e) { + \Log::debug($e); + } + } + } } diff --git a/database/seeds/ActionlogSeeder.php b/database/seeds/ActionlogSeeder.php index e186bf6ab4..71d0bb08b8 100644 --- a/database/seeds/ActionlogSeeder.php +++ b/database/seeds/ActionlogSeeder.php @@ -1,13 +1,14 @@ create(); - factory(Actionlog::class, 'asset-checkout-location',100)->create(); - } + public function run() + { + Actionlog::truncate(); + factory(Actionlog::class, 'asset-checkout-user', 300)->create(); + factory(Actionlog::class, 'asset-checkout-location', 100)->create(); + } } diff --git a/database/seeds/AssetModelSeeder.php b/database/seeds/AssetModelSeeder.php index c9f188ed10..b179c5788e 100755 --- a/database/seeds/AssetModelSeeder.php +++ b/database/seeds/AssetModelSeeder.php @@ -1,7 +1,7 @@ delete($dst.$del_file); } catch (\Exception $e) { \Log::debug($e); } } - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); + $add_files = glob($src.'/*.*'); + foreach ($add_files as $add_file) { + $file_to_copy = str_replace($src, '', $add_file); \Log::debug('Copying: '.$file_to_copy); - try { + try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { \Log::debug($e); } } - - } - } diff --git a/database/seeds/AssetSeeder.php b/database/seeds/AssetSeeder.php index 9bb9fd75db..1d7db0f1a3 100644 --- a/database/seeds/AssetSeeder.php +++ b/database/seeds/AssetSeeder.php @@ -1,51 +1,50 @@ states('laptop-mbp')->create(); - factory(Asset::class, 50)->states('laptop-mbp-pending')->create(); - factory(Asset::class, 50)->states('laptop-mbp-archived')->create(); - factory(Asset::class, 50)->states('laptop-air')->create(); - factory(Asset::class, 5)->states('laptop-surface')->create(); - factory(Asset::class, 5)->states('laptop-xps')->create(); - factory(Asset::class, 5)->states('laptop-spectre')->create(); - factory(Asset::class, 5)->states('laptop-zenbook')->create(); - factory(Asset::class, 3)->states('laptop-yoga')->create(); + public function run() + { + Asset::truncate(); + factory(Asset::class, 1000)->states('laptop-mbp')->create(); + factory(Asset::class, 50)->states('laptop-mbp-pending')->create(); + factory(Asset::class, 50)->states('laptop-mbp-archived')->create(); + factory(Asset::class, 50)->states('laptop-air')->create(); + factory(Asset::class, 5)->states('laptop-surface')->create(); + factory(Asset::class, 5)->states('laptop-xps')->create(); + factory(Asset::class, 5)->states('laptop-spectre')->create(); + factory(Asset::class, 5)->states('laptop-zenbook')->create(); + factory(Asset::class, 3)->states('laptop-yoga')->create(); - factory(Asset::class, 30)->states('desktop-macpro')->create(); - factory(Asset::class, 30)->states('desktop-lenovo-i5')->create(); - factory(Asset::class, 30)->states('desktop-optiplex')->create(); + factory(Asset::class, 30)->states('desktop-macpro')->create(); + factory(Asset::class, 30)->states('desktop-lenovo-i5')->create(); + factory(Asset::class, 30)->states('desktop-optiplex')->create(); - factory(Asset::class, 5)->states('conf-polycom')->create(); - factory(Asset::class, 2)->states('conf-polycomcx')->create(); + factory(Asset::class, 5)->states('conf-polycom')->create(); + factory(Asset::class, 2)->states('conf-polycomcx')->create(); - factory(Asset::class, 12)->states('tablet-ipad')->create(); - factory(Asset::class, 4)->states('tablet-tab3')->create(); + factory(Asset::class, 12)->states('tablet-ipad')->create(); + factory(Asset::class, 4)->states('tablet-tab3')->create(); - factory(Asset::class, 27)->states('phone-iphone6s')->create(); - factory(Asset::class, 40)->states('phone-iphone7')->create(); + factory(Asset::class, 27)->states('phone-iphone6s')->create(); + factory(Asset::class, 40)->states('phone-iphone7')->create(); - factory(Asset::class, 10)->states('ultrafine')->create(); - factory(Asset::class, 10)->states('ultrasharp')->create(); + factory(Asset::class, 10)->states('ultrafine')->create(); + factory(Asset::class, 10)->states('ultrasharp')->create(); + $del_files = Storage::files('assets'); + foreach ($del_files as $del_file) { // iterate files + \Log::debug('Deleting: '.$del_files); + try { + Storage::disk('public')->delete('assets'.'/'.$del_files); + } catch (\Exception $e) { + \Log::debug($e); + } + } - $del_files = Storage::files('assets'); - foreach($del_files as $del_file){ // iterate files - \Log::debug('Deleting: '.$del_files); - try { - Storage::disk('public')->delete('assets'.'/'.$del_files); - } catch (\Exception $e) { - \Log::debug($e); - } - } - - DB::table('checkout_requests')->truncate(); - - } + DB::table('checkout_requests')->truncate(); + } } diff --git a/database/seeds/CategorySeeder.php b/database/seeds/CategorySeeder.php index dbf4dfca1e..37e11a2be8 100755 --- a/database/seeds/CategorySeeder.php +++ b/database/seeds/CategorySeeder.php @@ -1,6 +1,7 @@ states('license-graphics-category')->create(); // 14 factory(Category::class, 1)->states('license-office-category')->create(); // 15 } - } diff --git a/database/seeds/CompanySeeder.php b/database/seeds/CompanySeeder.php index eeae5492b7..5969b8cdbb 100644 --- a/database/seeds/CompanySeeder.php +++ b/database/seeds/CompanySeeder.php @@ -16,33 +16,29 @@ class CompanySeeder extends Seeder Company::truncate(); factory(Company::class, 4)->create(); - $src = public_path('/img/demo/companies/'); $dst = 'companies'.'/'; $del_files = Storage::files('companies/'.$dst); - foreach($del_files as $del_file){ // iterate files - $file_to_delete = str_replace($src,'',$del_file); + foreach ($del_files as $del_file) { // iterate files + $file_to_delete = str_replace($src, '', $del_file); \Log::debug('Deleting: '.$file_to_delete); - try { + try { Storage::disk('public')->delete($dst.$del_file); } catch (\Exception $e) { \Log::debug($e); } } - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); + $add_files = glob($src.'/*.*'); + foreach ($add_files as $add_file) { + $file_to_copy = str_replace($src, '', $add_file); \Log::debug('Copying: '.$file_to_copy); - try { + try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { \Log::debug($e); } } - - } } diff --git a/database/seeds/ComponentSeeder.php b/database/seeds/ComponentSeeder.php index bf22c394fe..1347901a21 100644 --- a/database/seeds/ComponentSeeder.php +++ b/database/seeds/ComponentSeeder.php @@ -1,6 +1,7 @@ getColumnListing('assets'); + public function run() + { + $columns = DB::getSchemaBuilder()->getColumnListing('assets'); + foreach ($columns as $column) { + if (strpos($column, '_snipeit_') !== false) { + Schema::table('assets', function (Blueprint $table) use ($column) { + $table->dropColumn($column); + }); + } + } + CustomField::truncate(); + CustomFieldset::truncate(); + DB::table('custom_field_custom_fieldset')->truncate(); - foreach ($columns as $column) { - if(strpos($column, '_snipeit_') !== FALSE) { + factory(CustomFieldset::class, 1)->states('mobile')->create(); + factory(CustomFieldset::class, 1)->states('computer')->create(); + factory(CustomField::class, 1)->states('imei')->create(); + factory(CustomField::class, 1)->states('phone')->create(); + factory(CustomField::class, 1)->states('ram')->create(); + factory(CustomField::class, 1)->states('cpu')->create(); + factory(CustomField::class, 1)->states('mac-address')->create(); - Schema::table('assets', function (Blueprint $table) use ($column) { - $table->dropColumn($column); - }); - } - } - CustomField::truncate(); - CustomFieldset::truncate(); - DB::table('custom_field_custom_fieldset')->truncate(); - - factory(CustomFieldset::class, 1)->states('mobile')->create(); - factory(CustomFieldset::class, 1)->states('computer')->create(); - factory(CustomField::class, 1)->states('imei')->create(); - factory(CustomField::class, 1)->states('phone')->create(); - factory(CustomField::class, 1)->states('ram')->create(); - factory(CustomField::class, 1)->states('cpu')->create(); - factory(CustomField::class, 1)->states('mac-address')->create(); - - DB::table('custom_field_custom_fieldset')->insert([ + DB::table('custom_field_custom_fieldset')->insert([ [ 'custom_field_id' => '1', - 'custom_fieldset_id' => '1' + 'custom_fieldset_id' => '1', ], [ 'custom_field_id' => '2', - 'custom_fieldset_id' => '1' + 'custom_fieldset_id' => '1', ], [ 'custom_field_id' => '3', - 'custom_fieldset_id' => '2' + 'custom_fieldset_id' => '2', ], [ 'custom_field_id' => '4', - 'custom_fieldset_id' => '2' + 'custom_fieldset_id' => '2', ], [ 'custom_field_id' => '5', - 'custom_fieldset_id' => '2' + 'custom_fieldset_id' => '2', ], ]); - - - - - } + } } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index f90326c058..7a0fd5f6f8 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -16,8 +16,8 @@ class DatabaseSeeder extends Seeder Model::unguard(); // Only create default settings if they do not exist in the db. - if(!Setting::first()) { - // factory(Setting::class)->create(); + if (! Setting::first()) { + // factory(Setting::class)->create(); $this->call(SettingsSeeder::class); } @@ -40,7 +40,6 @@ class DatabaseSeeder extends Seeder $this->call(ActionlogSeeder::class); $this->call(CustomFieldSeeder::class); - Artisan::call('snipeit:sync-asset-locations', ['--output' => 'all']); $output = Artisan::output(); \Log::info($output); @@ -50,7 +49,5 @@ class DatabaseSeeder extends Seeder DB::table('imports')->truncate(); DB::table('asset_maintenances')->truncate(); DB::table('requested_assets')->truncate(); - - } } diff --git a/database/seeds/DepartmentSeeder.php b/database/seeds/DepartmentSeeder.php index b92455a1fc..3b3f929c77 100644 --- a/database/seeds/DepartmentSeeder.php +++ b/database/seeds/DepartmentSeeder.php @@ -1,6 +1,7 @@ delete($dst.$del_file); } catch (\Exception $e) { \Log::debug($e); } } - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); + $add_files = glob($src.'/*.*'); + foreach ($add_files as $add_file) { + $file_to_copy = str_replace($src, '', $add_file); \Log::debug('Copying: '.$file_to_copy); - try { + try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { \Log::debug($e); } } - } } diff --git a/database/seeds/ManufacturerSeeder.php b/database/seeds/ManufacturerSeeder.php index a65d12a2e4..c7bde59b0d 100644 --- a/database/seeds/ManufacturerSeeder.php +++ b/database/seeds/ManufacturerSeeder.php @@ -1,6 +1,7 @@ delete($dst.$del_file); } catch (\Exception $e) { \Log::debug($e); } } - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); + $add_files = glob($src.'/*.*'); + foreach ($add_files as $add_file) { + $file_to_copy = str_replace($src, '', $add_file); \Log::debug('Copying: '.$file_to_copy); - try { + try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { \Log::debug($e); } } - - } - - } diff --git a/database/seeds/SettingsSeeder.php b/database/seeds/SettingsSeeder.php index 3ad8b8d856..1c408a3746 100644 --- a/database/seeds/SettingsSeeder.php +++ b/database/seeds/SettingsSeeder.php @@ -1,8 +1,8 @@ save(); } - // Copy the logos from the img/demo directory Storage::disk('local_public')->put('snipe-logo.png', file_get_contents(public_path('img/demo/snipe-logo.png'))); Storage::disk('local_public')->put('snipe-logo-lg.png', file_get_contents(public_path('img/demo/snipe-logo-lg.png'))); - } } diff --git a/database/seeds/StatuslabelSeeder.php b/database/seeds/StatuslabelSeeder.php index 1c58d76a0b..733ed33d12 100755 --- a/database/seeds/StatuslabelSeeder.php +++ b/database/seeds/StatuslabelSeeder.php @@ -1,16 +1,16 @@ states('rtd')->create(['name' => "Ready to Deploy"]); - factory(Statuslabel::class)->states('pending')->create(['name' => "Pending"]); - factory(Statuslabel::class)->states('archived')->create(['name' => "Archived"]); + factory(Statuslabel::class)->states('rtd')->create(['name' => 'Ready to Deploy']); + factory(Statuslabel::class)->states('pending')->create(['name' => 'Pending']); + factory(Statuslabel::class)->states('archived')->create(['name' => 'Archived']); factory(Statuslabel::class)->states('out_for_diagnostics')->create(); factory(Statuslabel::class)->states('out_for_repair')->create(); factory(Statuslabel::class)->states('broken')->create(); diff --git a/database/seeds/SupplierSeeder.php b/database/seeds/SupplierSeeder.php index 8dbeac9964..98336205bb 100644 --- a/database/seeds/SupplierSeeder.php +++ b/database/seeds/SupplierSeeder.php @@ -1,6 +1,7 @@ create(); - } } diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php index 348a26a6b4..9e088df426 100644 --- a/database/seeds/UserSeeder.php +++ b/database/seeds/UserSeeder.php @@ -18,6 +18,5 @@ class UserSeeder extends Seeder factory(User::class, 3)->states('superuser')->create(); factory(User::class, 3)->states('admin')->create(); factory(User::class, 50)->states('view-assets')->create(); - } } diff --git a/resources/lang/af/admin/accessories/general.php b/resources/lang/af/admin/accessories/general.php index fb4968061a..64a6714e28 100644 --- a/resources/lang/af/admin/accessories/general.php +++ b/resources/lang/af/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Toebehore Kategorie', 'accessory_name' => 'Toebehore Naam', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Gebruik eerder die primary standaard EULA.', 'use_default_eula_disabled' => 'Gebruik die primêre standaardverlof in plaas daarvan. Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.', -); +]; diff --git a/resources/lang/af/admin/accessories/message.php b/resources/lang/af/admin/accessories/message.php index 36c2fd100b..e98b68d296 100644 --- a/resources/lang/af/admin/accessories/message.php +++ b/resources/lang/af/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Hierdie bykomstige het tans: tel items wat uitgekontroleer is aan gebruikers. Kontroleer asseblief die bykomstighede en en probeer weer.', - 'create' => array( + 'create' => [ 'error' => 'Die bykomstigheid is nie geskep nie, probeer asseblief weer.', - 'success' => 'Die bykomstigheid is suksesvol geskep.' - ), + 'success' => 'Die bykomstigheid is suksesvol geskep.', + ], - 'update' => array( + 'update' => [ 'error' => 'Die bykomstigheid is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Die bykomstigheid is suksesvol opgedateer.' - ), + 'success' => 'Die bykomstigheid is suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie toebehore uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die bykomstigheid. Probeer asseblief weer.', - 'success' => 'Die bykomstigheid is suksesvol verwyder.' - ), + 'success' => 'Die bykomstigheid is suksesvol verwyder.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Toebehore is nie nagegaan nie, probeer asseblief weer', 'success' => 'Toebehore suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ), + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Toebehore is nie nagegaan nie, probeer asseblief weer', 'success' => 'Toebehore is suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ) + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - -); +]; diff --git a/resources/lang/af/admin/accessories/table.php b/resources/lang/af/admin/accessories/table.php index d8fa52c62c..275d9db851 100644 --- a/resources/lang/af/admin/accessories/table.php +++ b/resources/lang/af/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Laai CSV af', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Laai CSV af', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'aanvaarding', 'title' => 'Toebehore Naam', - -); +]; diff --git a/resources/lang/af/admin/asset_maintenances/form.php b/resources/lang/af/admin/asset_maintenances/form.php index eb6caf5937..4fb7228e4a 100644 --- a/resources/lang/af/admin/asset_maintenances/form.php +++ b/resources/lang/af/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'dae', 'notes' => 'notas', 'update' => 'Opdateer', - 'create' => 'Skep' + 'create' => 'Skep', ]; diff --git a/resources/lang/af/admin/asset_maintenances/message.php b/resources/lang/af/admin/asset_maintenances/message.php index 5ba89ba544..5b2ecf216f 100644 --- a/resources/lang/af/admin/asset_maintenances/message.php +++ b/resources/lang/af/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie bate instandhouding uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die bate-instandhouding. Probeer asseblief weer.', - 'success' => 'Die bate-instandhouding is suksesvol verwyder.' + 'success' => 'Die bate-instandhouding is suksesvol verwyder.', ], 'create' => [ 'error' => 'Asset Maintenance is nie geskep nie, probeer asseblief weer.', - 'success' => 'Bate Onderhoud geskep suksesvol.' + 'success' => 'Bate Onderhoud geskep suksesvol.', ], 'edit' => [ 'error' => 'Bateonderhoud is nie geredigeer nie, probeer asseblief weer.', - 'success' => 'Bate Onderhoud suksesvol geredigeer.' + 'success' => 'Bate Onderhoud suksesvol geredigeer.', ], 'asset_maintenance_incomplete' => 'Nog nie voltooi nie', 'warranty' => 'waarborg', 'not_warranty' => 'Nie waarborg nie', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/af/admin/asset_maintenances/table.php b/resources/lang/af/admin/asset_maintenances/table.php index 260d5ce06b..67af29507f 100644 --- a/resources/lang/af/admin/asset_maintenances/table.php +++ b/resources/lang/af/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Bate Onderhoud', 'asset_name' => 'Bate Naam', 'is_warranty' => 'waarborg', - 'dl_csv' => 'Laai CSV af' + 'dl_csv' => 'Laai CSV af', ]; diff --git a/resources/lang/af/admin/categories/general.php b/resources/lang/af/admin/categories/general.php index c5182b4c5a..6de722e97d 100644 --- a/resources/lang/af/admin/categories/general.php +++ b/resources/lang/af/admin/categories/general.php @@ -1,6 +1,6 @@ 'Bate kategorieë', 'category_name' => 'Kategorie Naam', 'checkin_email' => 'Stuur e-pos aan gebruiker by aanmelding/afmelding.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Gebruik eerder die primary standaard EULA.', 'use_default_eula_disabled' => 'Gebruik die primêre standaardverlof in plaas daarvan. Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.', -); +]; diff --git a/resources/lang/af/admin/categories/message.php b/resources/lang/af/admin/categories/message.php index 85103589b2..6d05579ad2 100644 --- a/resources/lang/af/admin/categories/message.php +++ b/resources/lang/af/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorie bestaan ​​nie.', 'assoc_models' => 'Hierdie kategorie is tans gekoppel aan ten minste een model en kan nie uitgevee word nie. Dateer asseblief jou modelle op om nie meer hierdie kategorie te verwys nie en probeer weer.', 'assoc_items' => 'Hierdie kategorie word tans geassosieer met ten minste een: asset_type en kan nie uitgevee word nie. Werk asseblief jou: bat_type op om nie meer hierdie kategorie te verwys nie en probeer weer.', - 'create' => array( + 'create' => [ 'error' => 'Kategorie is nie geskep nie, probeer asseblief weer.', - 'success' => 'Kategorie geskep suksesvol.' - ), + 'success' => 'Kategorie geskep suksesvol.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorie is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Kategorie suksesvol opgedateer.' - ), + 'success' => 'Kategorie suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie kategorie uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die kategorie. Probeer asseblief weer.', - 'success' => 'Die kategorie is suksesvol verwyder.' - ) + 'success' => 'Die kategorie is suksesvol verwyder.', + ], -); +]; diff --git a/resources/lang/af/admin/categories/table.php b/resources/lang/af/admin/categories/table.php index 8c05175bd9..6bd492e76c 100644 --- a/resources/lang/af/admin/categories/table.php +++ b/resources/lang/af/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Ouer', 'require_acceptance' => 'aanvaarding', 'title' => 'Bate Kategorie Naam', -); +]; diff --git a/resources/lang/af/admin/companies/general.php b/resources/lang/af/admin/companies/general.php index 040e6466e1..eaa6228206 100644 --- a/resources/lang/af/admin/companies/general.php +++ b/resources/lang/af/admin/companies/general.php @@ -1,4 +1,5 @@ 'Kies Maatskappy', ]; diff --git a/resources/lang/af/admin/companies/message.php b/resources/lang/af/admin/companies/message.php index e093b94859..17b569e916 100644 --- a/resources/lang/af/admin/companies/message.php +++ b/resources/lang/af/admin/companies/message.php @@ -1,18 +1,19 @@ 'Maatskappy bestaan ​​nie.', 'assoc_users' => 'Hierdie maatskappy is tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie maatskappy te verwys nie en probeer weer.', - 'create' => array( + 'create' => [ 'error' => 'Maatskappy is nie geskep nie, probeer asseblief weer.', - 'success' => 'Maatskappy geskep suksesvol.' - ), - 'update' => array( + 'success' => 'Maatskappy geskep suksesvol.', + ], + 'update' => [ 'error' => 'Maatskappy is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Maatskappy suksesvol opgedateer.' - ), - 'delete' => array( + 'success' => 'Maatskappy suksesvol opgedateer.', + ], + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie maatskappy uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die maatskappy. Probeer asseblief weer.', - 'success' => 'Die maatskappy is suksesvol verwyder.' - ) -); + 'success' => 'Die maatskappy is suksesvol verwyder.', + ], +]; diff --git a/resources/lang/af/admin/companies/table.php b/resources/lang/af/admin/companies/table.php index 9c4badb11b..bfdafd7a25 100644 --- a/resources/lang/af/admin/companies/table.php +++ b/resources/lang/af/admin/companies/table.php @@ -1,9 +1,10 @@ 'maatskappye', 'create' => 'Skep maatskappy', 'title' => 'maatskappy', 'update' => 'Update Company', 'name' => 'maatskappynaam', 'id' => 'ID', -); +]; diff --git a/resources/lang/af/admin/components/general.php b/resources/lang/af/admin/components/general.php index 61ea3b215d..7af3143aed 100644 --- a/resources/lang/af/admin/components/general.php +++ b/resources/lang/af/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponentnaam', 'checkin' => 'Checkin-komponent', 'checkout' => 'Afhandelingskomponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'oorblywende', 'total' => 'totale', 'update' => 'Opdateer komponent', -); +]; diff --git a/resources/lang/af/admin/components/message.php b/resources/lang/af/admin/components/message.php index a841a29e6d..297616b906 100644 --- a/resources/lang/af/admin/components/message.php +++ b/resources/lang/af/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponent bestaan ​​nie.', - 'create' => array( + 'create' => [ 'error' => 'Komponent is nie geskep nie, probeer asseblief weer.', - 'success' => 'Komponent geskep suksesvol.' - ), + 'success' => 'Komponent geskep suksesvol.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponent is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Komponent suksesvol opgedateer.' - ), + 'success' => 'Komponent suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie komponent uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die komponent. Probeer asseblief weer.', - 'success' => 'Die komponent is suksesvol verwyder.' - ), + 'success' => 'Die komponent is suksesvol verwyder.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponent is nie nagegaan nie, probeer asseblief weer', 'success' => 'Komponent is suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ), + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponent is nie nagegaan nie, probeer asseblief weer', 'success' => 'Komponent is suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ) + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - -); +]; diff --git a/resources/lang/af/admin/components/table.php b/resources/lang/af/admin/components/table.php index 093d250f2b..b50120bc6c 100644 --- a/resources/lang/af/admin/components/table.php +++ b/resources/lang/af/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentnaam', -); +]; diff --git a/resources/lang/af/admin/consumables/general.php b/resources/lang/af/admin/consumables/general.php index 9c690cb898..12f50364ff 100644 --- a/resources/lang/af/admin/consumables/general.php +++ b/resources/lang/af/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Afhandeling Verbruiker na Gebruiker', 'consumable_name' => 'Verbruikbare Naam', 'create' => 'Skep Verbruik', @@ -8,4 +8,4 @@ return array( 'remaining' => 'oorblywende', 'total' => 'totale', 'update' => 'Verbruik Verbruik', -); +]; diff --git a/resources/lang/af/admin/consumables/message.php b/resources/lang/af/admin/consumables/message.php index 0dca909303..d3ca5a3236 100644 --- a/resources/lang/af/admin/consumables/message.php +++ b/resources/lang/af/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Verbruiksgoedere bestaan ​​nie.', - 'create' => array( + 'create' => [ 'error' => 'Verbruiksgoedere is nie geskep nie, probeer asseblief weer.', - 'success' => 'Verbruiker geskep suksesvol.' - ), + 'success' => 'Verbruiker geskep suksesvol.', + ], - 'update' => array( + 'update' => [ 'error' => 'Verbruiksgoedere is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Verbruiksgoedere suksesvol opgedateer.' - ), + 'success' => 'Verbruiksgoedere suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie verbruiksgoed uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die verbruik. Probeer asseblief weer.', - 'success' => 'Die verbruiksgoed is suksesvol verwyder.' - ), + 'success' => 'Die verbruiksgoed is suksesvol verwyder.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Verbruiksgoedere is nie nagegaan nie, probeer asseblief weer', 'success' => 'Verbruiksgoedere is suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ), + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Verbruiksgoedere is nie nagegaan nie, probeer asseblief weer', 'success' => 'Verbruiker word suksesvol nagegaan.', - 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.' - ) + 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', + ], - -); +]; diff --git a/resources/lang/af/admin/consumables/table.php b/resources/lang/af/admin/consumables/table.php index f468d5363e..ca3de2964c 100644 --- a/resources/lang/af/admin/consumables/table.php +++ b/resources/lang/af/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Verbruikbare Naam', -); +]; diff --git a/resources/lang/af/admin/custom_fields/general.php b/resources/lang/af/admin/custom_fields/general.php index 99124470ea..0705e80006 100644 --- a/resources/lang/af/admin/custom_fields/general.php +++ b/resources/lang/af/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Aangepaste velde', 'field' => 'veld', 'about_fieldsets_title' => 'Oor Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuwe aangepaste veld', 'value_encrypted' => 'Die waarde van hierdie veld is geïnkripteer in die databasis. Slegs admingebruikers sal die gedecodeerde waarde kan sien', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/af/admin/custom_fields/message.php b/resources/lang/af/admin/custom_fields/message.php index b52f9bb43f..534c449072 100644 --- a/resources/lang/af/admin/custom_fields/message.php +++ b/resources/lang/af/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Daardie veld bestaan ​​nie.', 'already_added' => 'Veld reeds bygevoeg', - 'create' => array( + 'create' => [ 'error' => 'Veld is nie geskep nie, probeer asseblief weer.', 'success' => 'Veld geskep suksesvol.', - 'assoc_success' => 'Veld suksesvol bygevoeg tot veldtog.' - ), + 'assoc_success' => 'Veld suksesvol bygevoeg tot veldtog.', + ], - 'update' => array( + 'update' => [ 'error' => 'Veld is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Veld suksesvol opgedateer.' - ), + 'success' => 'Veld suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie veld uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die veld. Probeer asseblief weer.', 'success' => 'Die veld is suksesvol verwyder.', 'in_use' => 'Veld is nog steeds in gebruik.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Veldset bestaan ​​nie', - 'create' => array( + 'create' => [ 'error' => 'Veldtipe is nie geskep nie, probeer asseblief weer.', - 'success' => 'Veldtipe suksesvol geskep.' - ), + 'success' => 'Veldtipe suksesvol geskep.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Veldset suksesvol opgedateer.' - ), + 'success' => 'Veldset suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie veldtog uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die veldtog. Probeer asseblief weer.', 'success' => 'Die veldtog is suksesvol verwyder.', 'in_use' => 'Veldset is nog steeds in gebruik.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/af/admin/departments/message.php b/resources/lang/af/admin/departments/message.php index d1351b1862..b9f406e891 100644 --- a/resources/lang/af/admin/departments/message.php +++ b/resources/lang/af/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departement bestaan ​​nie.', 'assoc_users' => 'Hierdie afdeling word tans geassosieer met minstens een gebruiker en kan nie verwyder word nie. Dateer asseblief u gebruikers op om nie meer hierdie departement te verwys nie en probeer weer.', - 'create' => array( + 'create' => [ 'error' => 'Departement is nie geskep nie, probeer asseblief weer.', - 'success' => 'Departement geskep suksesvol.' - ), - 'update' => array( + 'success' => 'Departement geskep suksesvol.', + ], + 'update' => [ 'error' => 'Departement is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Departement suksesvol opgedateer.' - ), - 'delete' => array( + 'success' => 'Departement suksesvol opgedateer.', + ], + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie departement uitvee?', 'error' => 'Daar is \'n probleem met die verwydering van die departement. Probeer asseblief weer.', - 'success' => 'Die departement is suksesvol geskrap.' - ) + 'success' => 'Die departement is suksesvol geskrap.', + ], -); +]; diff --git a/resources/lang/af/admin/departments/table.php b/resources/lang/af/admin/departments/table.php index fd299d67b9..4fa0ecdd9e 100644 --- a/resources/lang/af/admin/departments/table.php +++ b/resources/lang/af/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Departement Naam', @@ -8,4 +8,4 @@ return array( 'location' => 'plek', 'create' => 'Skep Departement', 'update' => 'Update Departement', - ); + ]; diff --git a/resources/lang/af/admin/depreciations/general.php b/resources/lang/af/admin/depreciations/general.php index fe35498748..7ee137cd73 100644 --- a/resources/lang/af/admin/depreciations/general.php +++ b/resources/lang/af/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Oor bate afskrywing', 'about_depreciations' => 'U kan bate-afskrywings opstel om bates te deprecieer gebaseer op reguit-waardevermindering.', 'asset_depreciations' => 'Bate afskrywing', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Aantal maande', 'update' => 'Werk waardevermindering op', -); +]; diff --git a/resources/lang/af/admin/depreciations/message.php b/resources/lang/af/admin/depreciations/message.php index 50b978ff38..63996c2342 100644 --- a/resources/lang/af/admin/depreciations/message.php +++ b/resources/lang/af/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Waardeverminderingsklas bestaan ​​nie.', 'assoc_users' => 'Hierdie waardevermindering word tans geassosieer met een of meer modelle en kan nie uitgevee word nie. Skrap asseblief die modelle, en probeer dan weer uitvee.', - - 'create' => array( + 'create' => [ 'error' => 'Waardeverminderingsklas is nie geskep nie, probeer asseblief weer. :(', - 'success' => 'Depresiasieklas geskep suksesvol. :)' - ), + 'success' => 'Depresiasieklas geskep suksesvol. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Waardeverminderingsklas is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Waardeverminderingsklas suksesvol opgedateer.' - ), + 'success' => 'Waardeverminderingsklas suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie depresiasieklas verwyder?', 'error' => 'Daar was \'n probleem met die verwydering van die waardeverminderingsklas. Probeer asseblief weer.', - 'success' => 'Die waardeverminderingsklas is suksesvol verwyder.' - ) + 'success' => 'Die waardeverminderingsklas is suksesvol verwyder.', + ], -); +]; diff --git a/resources/lang/af/admin/depreciations/table.php b/resources/lang/af/admin/depreciations/table.php index d20d28cbe6..133ba2b1df 100644 --- a/resources/lang/af/admin/depreciations/table.php +++ b/resources/lang/af/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'maande', 'term' => 'termyn', 'title' => 'naam', -); +]; diff --git a/resources/lang/af/admin/groups/message.php b/resources/lang/af/admin/groups/message.php index 8a9f6e8fa1..0d7e090c07 100644 --- a/resources/lang/af/admin/groups/message.php +++ b/resources/lang/af/admin/groups/message.php @@ -1,22 +1,22 @@ 'Groep bestaan ​​reeds!', 'group_not_found' => 'Groep [: id] bestaan ​​nie.', 'group_name_required' => 'Die naam veld is nodig', - 'success' => array( + 'success' => [ 'create' => 'Groep is suksesvol geskep.', 'update' => 'Groep is suksesvol opgedateer.', 'delete' => 'Groep is suksesvol verwyder.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie groep uitvee?', 'create' => 'Kon nie die groep skep nie. Probeer asseblief weer.', 'update' => 'Kon nie die groep opdateer nie. Probeer asseblief weer.', 'delete' => 'Kon nie die groep uitvee nie. Probeer asseblief weer.', - ), + ], -); +]; diff --git a/resources/lang/af/admin/groups/table.php b/resources/lang/af/admin/groups/table.php index 98842b37a6..4061e0e52a 100644 --- a/resources/lang/af/admin/groups/table.php +++ b/resources/lang/af/admin/groups/table.php @@ -1,9 +1,9 @@ 'id', 'name' => 'naam', 'users' => '# gebruikers', -); +]; diff --git a/resources/lang/af/admin/groups/titles.php b/resources/lang/af/admin/groups/titles.php index 969e8a885a..16fce4789a 100644 --- a/resources/lang/af/admin/groups/titles.php +++ b/resources/lang/af/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Oor groepe', 'about_groups' => 'Groepe word gebruik om gebruikersregte te veralgemeen.', 'group_management' => 'Groepbestuur', @@ -11,4 +11,4 @@ return array( 'allow' => 'laat', 'deny' => 'ontken', -); +]; diff --git a/resources/lang/af/admin/hardware/form.php b/resources/lang/af/admin/hardware/form.php index a91c99d135..753ad62709 100644 --- a/resources/lang/af/admin/hardware/form.php +++ b/resources/lang/af/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Bevestig bates vir die verwydering van grootmaat', +return [ + 'bulk_delete' => 'Bevestig bates vir die verwydering van grootmaat', 'bulk_delete_help' => 'Hersien die bates vir grootmaatverwydering hieronder. Sodra dit verwyder is, kan hierdie bates herstel word, maar hulle word nie meer geassosieer met enige gebruikers wat hulle tans toegewys is nie.', 'bulk_delete_warn' => 'Jy is op die punt om te verwyder: bate_count bates.', - 'bulk_update' => 'Grootskaalse opdateringsbates', - 'bulk_update_help' => 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.', - 'bulk_update_warn' => 'Jy is op die punt om die eienskappe van: bate_count bates te wysig.', + 'bulk_update' => 'Grootskaalse opdateringsbates', + 'bulk_update_help' => 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.', + 'bulk_update_warn' => 'Jy is op die punt om die eienskappe van: bate_count bates te wysig.', 'checkedout_to' => 'Gekontroleer na', 'checkout_date' => 'Checkout Datum', 'checkin_date' => 'Incheckdatum', @@ -38,7 +38,6 @@ return array( 'tag' => 'Bate-tag', 'update' => 'Asset Update', 'warranty' => 'waarborg', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'jaar', -) -; +]; diff --git a/resources/lang/af/admin/hardware/general.php b/resources/lang/af/admin/hardware/general.php index 2338bfd0d1..7503353890 100644 --- a/resources/lang/af/admin/hardware/general.php +++ b/resources/lang/af/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Oor bates', 'about_assets_text' => 'Bates is items opgespoor volgens reeksnommer of bate-tag. Hulle is geneig om hoër waarde items te wees waar die identifisering van \'n spesifieke item saak maak.', - 'archived' => 'argief', + 'archived' => 'argief', 'asset' => 'bate', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Kontrole bate', @@ -19,4 +19,4 @@ return array( 'pending' => 'hangende', 'undeployable' => 'Undeployable', 'view' => 'Bekyk bate', -); +]; diff --git a/resources/lang/af/admin/hardware/message.php b/resources/lang/af/admin/hardware/message.php index 6179ce6bb7..be0dd10c65 100644 --- a/resources/lang/af/admin/hardware/message.php +++ b/resources/lang/af/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Waarskuwing: Hierdie bate is gemerk as tans onbruikbaar. As hierdie status verander het, verander asseblief die batestatus.', 'does_not_exist' => 'Bate bestaan ​​nie.', 'does_not_exist_or_not_requestable' => 'Goeie probeerslag. Daardie bate bestaan ​​nie of is nie versoekbaar nie.', 'assoc_users' => 'Hierdie bate word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die bate eers in, en probeer dan weer uitvee.', - 'create' => array( + 'create' => [ 'error' => 'Bate is nie geskep nie, probeer asseblief weer. :(', - 'success' => 'Bate geskep suksesvol. :)' - ), + 'success' => 'Bate geskep suksesvol. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Bate is nie opgedateer nie, probeer asseblief weer', 'success' => 'Bate is suksesvol opgedateer.', 'nothing_updated' => 'Geen velde is gekies nie, dus niks is opgedateer nie.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Bate is nie herstel nie, probeer asseblief weer', - 'success' => 'Bate herstel suksesvol.' - ), + 'success' => 'Bate herstel suksesvol.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Bate-oudit was onsuksesvol. Probeer asseblief weer.', - 'success' => 'Bate oudit suksesvol aangemeld.' - ), + 'success' => 'Bate oudit suksesvol aangemeld.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Lêer nie verwyder nie. Probeer asseblief weer.', 'success' => 'Lêer suksesvol uitgevee.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Lêer (s) nie opgelaai nie. Probeer asseblief weer.', 'success' => 'Lêer (s) suksesvol opgelaai.', 'nofiles' => 'Jy het nie enige lêers vir oplaai gekies nie, of die lêer wat jy probeer oplaai is te groot', 'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, doc, docx, pdf en txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Sommige items is nie korrek ingevoer nie.', 'errorDetail' => 'Die volgende items is nie ingevoer as gevolg van foute nie.', - 'success' => "Jou lêer is ingevoer", - 'file_delete_success' => "Jou lêer is suksesvol verwyder", - 'file_delete_error' => "Die lêer kon nie uitgevee word nie", - ), + 'success' => 'Jou lêer is ingevoer', + 'file_delete_success' => 'Jou lêer is suksesvol verwyder', + 'file_delete_error' => 'Die lêer kon nie uitgevee word nie', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie bate uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die bate. Probeer asseblief weer.', 'nothing_updated' => 'Geen bates is gekies nie, so niks is verwyder nie.', - 'success' => 'Die bate is suksesvol verwyder.' - ), + 'success' => 'Die bate is suksesvol verwyder.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Bate is nie nagegaan nie, probeer asseblief weer', 'success' => 'Die bate is suksesvol nagegaan.', 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', 'not_available' => 'Die bate is nie beskikbaar vir die kassa nie!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Bate is nie nagegaan nie, probeer asseblief weer', 'success' => 'Die bate is suksesvol nagegaan.', 'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.', 'already_checked_in' => 'Daardie bate is reeds nagegaan.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Bate is nie aangevra nie, probeer asseblief weer', 'success' => 'Die bate is suksesvol aangevra.', - 'canceled' => 'Afhandeling versoek suksesvol gekanselleer' - ) + 'canceled' => 'Afhandeling versoek suksesvol gekanselleer', + ], -); +]; diff --git a/resources/lang/af/admin/hardware/table.php b/resources/lang/af/admin/hardware/table.php index be6c07894c..099f465538 100644 --- a/resources/lang/af/admin/hardware/table.php +++ b/resources/lang/af/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Bate-tag', 'asset_model' => 'model', @@ -20,6 +20,6 @@ return array( 'title' => 'bate', 'image' => 'Toestelbeeld', 'days_without_acceptance' => 'Dae sonder aanvaarding', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/af/admin/kits/general.php b/resources/lang/af/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/af/admin/kits/general.php +++ b/resources/lang/af/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/af/admin/licenses/form.php b/resources/lang/af/admin/licenses/form.php index 88d7c31150..460cd0da22 100644 --- a/resources/lang/af/admin/licenses/form.php +++ b/resources/lang/af/admin/licenses/form.php @@ -1,6 +1,6 @@ 'bate', 'checkin' => 'Inboek', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Gelisensieer om te e-pos', 'to_name' => 'Gelisensieer om te Noem', 'update' => 'Update Lisensie', - 'checkout_help' => 'U moet \'n lisensie na \'n hardeware bate of \'n persoon nagaan. Jy kan albei kies, maar die eienaar van die bate moet ooreenstem met die persoon waarna jy die bate nagaan.' -); + 'checkout_help' => 'U moet \'n lisensie na \'n hardeware bate of \'n persoon nagaan. Jy kan albei kies, maar die eienaar van die bate moet ooreenstem met die persoon waarna jy die bate nagaan.', +]; diff --git a/resources/lang/af/admin/licenses/general.php b/resources/lang/af/admin/licenses/general.php index 7b4f741389..8abc29a517 100644 --- a/resources/lang/af/admin/licenses/general.php +++ b/resources/lang/af/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Oor lisensies', 'about_licenses' => 'Lisensies word gebruik om sagteware op te spoor. Hulle het \'n gespesifiseerde aantal sitplekke wat aan individue nagekeken kan word', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Sagteware lisensies', 'user' => 'gebruiker', 'view' => 'Bekyk lisensie', -); +]; diff --git a/resources/lang/af/admin/licenses/message.php b/resources/lang/af/admin/licenses/message.php index bb40061b72..ed94574534 100644 --- a/resources/lang/af/admin/licenses/message.php +++ b/resources/lang/af/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisensie bestaan ​​nie.', 'user_does_not_exist' => 'Gebruiker bestaan ​​nie.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Jy moet \'n bate of \'n gebruiker kies, maar nie albei nie.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Lisensie is nie geskep nie, probeer asseblief weer.', - 'success' => 'Lisensie geskep suksesvol.' - ), + 'success' => 'Lisensie geskep suksesvol.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Lêer nie verwyder nie. Probeer asseblief weer.', 'success' => 'Lêer suksesvol uitgevee.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Lêer (s) nie opgelaai nie. Probeer asseblief weer.', 'success' => 'Lêer (s) suksesvol opgelaai.', 'nofiles' => 'Jy het nie enige lêers vir oplaai gekies nie, of die lêer wat jy probeer oplaai is te groot', 'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml en lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lisensie is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Lisensie suksesvol opgedateer.' - ), + 'success' => 'Lisensie suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie lisensie uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die lisensie. Probeer asseblief weer.', - 'success' => 'Die lisensie is suksesvol verwyder.' - ), + 'success' => 'Die lisensie is suksesvol verwyder.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Daar was \'n probleem om die lisensie te kontroleer. Probeer asseblief weer.', - 'success' => 'Die lisensie is suksesvol nagegaan' - ), + 'success' => 'Die lisensie is suksesvol nagegaan', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Daar was \'n probleem om die lisensie te kontroleer. Probeer asseblief weer.', - 'success' => 'Die lisensie is suksesvol nagegaan' - ), + 'success' => 'Die lisensie is suksesvol nagegaan', + ], -); +]; diff --git a/resources/lang/af/admin/licenses/table.php b/resources/lang/af/admin/licenses/table.php index f9c2c2c662..f652e0086b 100644 --- a/resources/lang/af/admin/licenses/table.php +++ b/resources/lang/af/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Toevertrou aan', 'checkout' => 'In uit', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'lisensie', -); +]; diff --git a/resources/lang/af/admin/locations/message.php b/resources/lang/af/admin/locations/message.php index 28d3b421c7..f74be9dfe6 100644 --- a/resources/lang/af/admin/locations/message.php +++ b/resources/lang/af/admin/locations/message.php @@ -1,27 +1,26 @@ 'Ligging bestaan ​​nie.', 'assoc_users' => 'Hierdie ligging is tans gekoppel aan ten minste een gebruiker en kan nie uitgevee word nie. Dateer asseblief u gebruikers op om nie meer hierdie ligging te verwys nie en probeer weer.', 'assoc_assets' => 'Hierdie ligging is tans geassosieer met ten minste een bate en kan nie uitgevee word nie. Dateer asseblief jou bates op om nie meer hierdie ligging te verwys nie en probeer weer.', 'assoc_child_loc' => 'Hierdie ligging is tans die ouer van ten minste een kind se plek en kan nie uitgevee word nie. Werk asseblief jou liggings by om nie meer hierdie ligging te verwys nie en probeer weer.', - - 'create' => array( + 'create' => [ 'error' => 'Ligging is nie geskep nie, probeer asseblief weer.', - 'success' => 'Ligging suksesvol geskep.' - ), + 'success' => 'Ligging suksesvol geskep.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ligging is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Ligging suksesvol opgedateer.' - ), + 'success' => 'Ligging suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie ligging uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die ligging. Probeer asseblief weer.', - 'success' => 'Die ligging is suksesvol verwyder.' - ) + 'success' => 'Die ligging is suksesvol verwyder.', + ], -); +]; diff --git a/resources/lang/af/admin/locations/table.php b/resources/lang/af/admin/locations/table.php index 6dbe4e41d7..c01ecd7666 100644 --- a/resources/lang/af/admin/locations/table.php +++ b/resources/lang/af/admin/locations/table.php @@ -1,6 +1,6 @@ 'Oor plekke', 'about_locations' => 'Plekke word gebruik om ligginginligting vir gebruikers, bates en ander items op te spoor', 'assets_rtd' => 'bates', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Ouer', 'currency' => 'Ligging Geld', 'ldap_ou' => 'LDAP soek OU', - ); + ]; diff --git a/resources/lang/af/admin/manufacturers/message.php b/resources/lang/af/admin/manufacturers/message.php index fa3c570978..f8ed7bc513 100644 --- a/resources/lang/af/admin/manufacturers/message.php +++ b/resources/lang/af/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Vervaardiger bestaan ​​nie.', 'assoc_users' => 'Hierdie vervaardiger word tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie vervaardiger te gebruik nie en probeer weer.', - 'create' => array( + 'create' => [ 'error' => 'Vervaardiger is nie geskep nie, probeer asseblief weer.', - 'success' => 'Vervaardiger suksesvol geskep.' - ), + 'success' => 'Vervaardiger suksesvol geskep.', + ], - 'update' => array( + 'update' => [ 'error' => 'Vervaardiger is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Vervaardiger suksesvol opgedateer.' - ), + 'success' => 'Vervaardiger suksesvol opgedateer.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie vervaardiger uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die vervaardiger. Probeer asseblief weer.', - 'success' => 'Die vervaardiger is suksesvol verwyder.' - ) + 'success' => 'Die vervaardiger is suksesvol verwyder.', + ], -); +]; diff --git a/resources/lang/af/admin/manufacturers/table.php b/resources/lang/af/admin/manufacturers/table.php index cb869350ab..8b179d8d72 100644 --- a/resources/lang/af/admin/manufacturers/table.php +++ b/resources/lang/af/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Oor vervaardigers', 'about_manufacturers_text' => 'Vervaardigers is die maatskappye wat jou bates skep. U kan belangrike kontakbesonderhede vir ondersteuning hier opberg, wat op u bate detailbladsye vertoon sal word.', 'asset_manufacturers' => 'Bate Vervaardigers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Fabrikant', 'url' => 'URL', -); +]; diff --git a/resources/lang/af/admin/models/general.php b/resources/lang/af/admin/models/general.php index 96ebbbe526..5274b166e1 100644 --- a/resources/lang/af/admin/models/general.php +++ b/resources/lang/af/admin/models/general.php @@ -1,6 +1,6 @@ 'Oor Asset Models', 'about_models_text' => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.', 'deleted' => 'Hierdie model is verwyder. Klik hier om dit te herstel.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Herstel Model', 'requestable' => 'Gebruikers kan hierdie model aanvra', - 'show_mac_address' => 'Wys MAC adres veld in bates in hierdie model', + 'show_mac_address' => 'Wys MAC adres veld in bates in hierdie model', 'view_deleted' => 'Bekyk verwyder', 'view_models' => 'Kyk Modelle', 'fieldset' => 'fieldset', 'no_custom_field' => 'Geen persoonlike velde nie', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/af/admin/models/message.php b/resources/lang/af/admin/models/message.php index 3c09500b07..0fdeecad2f 100644 --- a/resources/lang/af/admin/models/message.php +++ b/resources/lang/af/admin/models/message.php @@ -1,42 +1,41 @@ 'Model bestaan ​​nie.', 'assoc_users' => 'Hierdie model word tans geassosieer met een of meer bates en kan nie verwyder word nie. Verwyder asseblief die bates en probeer dan weer uitvee.', - - 'create' => array( + 'create' => [ 'error' => 'Model is nie geskep nie, probeer asseblief weer.', 'success' => 'Model suksesvol geskep.', 'duplicate_set' => '\'N Bate-model met die naam, vervaardiger en modelnommer bestaan ​​reeds.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Model suksesvol opgedateer.' - ), + 'success' => 'Model suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie batemodel uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die model. Probeer asseblief weer.', - 'success' => 'Die model is suksesvol verwyder.' - ), + 'success' => 'Die model is suksesvol verwyder.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model is nie herstel nie, probeer asseblief weer', - 'success' => 'Model herstel suksesvol.' - ), + 'success' => 'Model herstel suksesvol.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Geen velde is verander nie, so niks is opgedateer nie.', - 'success' => 'Modelle opgedateer.' - ), + 'success' => 'Modelle opgedateer.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/af/admin/models/table.php b/resources/lang/af/admin/models/table.php index 32f0dcf009..b1f4d8b01a 100644 --- a/resources/lang/af/admin/models/table.php +++ b/resources/lang/af/admin/models/table.php @@ -1,6 +1,6 @@ 'Skep bate model', 'created_at' => 'Geskep op', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Bate Model', 'clone' => 'Klone Model', 'edit' => 'Wysig Model', -); +]; diff --git a/resources/lang/af/admin/reports/general.php b/resources/lang/af/admin/reports/general.php index 70d914f743..c3d194910c 100644 --- a/resources/lang/af/admin/reports/general.php +++ b/resources/lang/af/admin/reports/general.php @@ -1,5 +1,5 @@ 'Kies die opsies wat jy wil hê vir jou bateverslag.' -); +return [ + 'info' => 'Kies die opsies wat jy wil hê vir jou bateverslag.', +]; diff --git a/resources/lang/af/admin/reports/message.php b/resources/lang/af/admin/reports/message.php index f79828cffc..90dd0d98a6 100644 --- a/resources/lang/af/admin/reports/message.php +++ b/resources/lang/af/admin/reports/message.php @@ -1,5 +1,5 @@ 'Jy moet ten minste EEN opsie kies.' -); +return [ + 'error' => 'Jy moet ten minste EEN opsie kies.', +]; diff --git a/resources/lang/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php index aa5d4805a2..c622cf7914 100644 --- a/resources/lang/af/admin/settings/general.php +++ b/resources/lang/af/admin/settings/general.php @@ -1,12 +1,12 @@ 'Aktiewe gids', 'ad_domain' => 'Active Directory-domein', 'ad_domain_help' => 'Dit is soms dieselfde as jou e-pos domein, maar nie altyd nie.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Dit is \'n Active Directory-bediener', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Uitgaande Alert Drempel (in dae)', 'alert_inv_threshold' => 'Voorraadwaarskuwingsdrempel', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Bate ID\'s', 'audit_interval' => 'Ouditinterval', 'audit_interval_help' => 'As u gereeld u bates fisies moet kontroleer, vul die interval in maande in.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Voer twee-faktor kode in', 'two_factor_config_complete' => 'Dien kode in', 'two_factor_enabled_edit_not_allowed' => 'Jou administrateur laat jou nie toe om hierdie instelling te wysig nie.', - 'two_factor_enrollment_text' => "Twee faktor verifikasie is nodig, maar jou toestel is nog nie ingeskryf nie. Maak jou Google Authenticator-program oop en scan die QR-kode hieronder om jou toestel in te skryf. Sodra jy jou toestel ingeskryf het, voer die kode hieronder in", + 'two_factor_enrollment_text' => 'Twee faktor verifikasie is nodig, maar jou toestel is nog nie ingeskryf nie. Maak jou Google Authenticator-program oop en scan die QR-kode hieronder om jou toestel in te skryf. Sodra jy jou toestel ingeskryf het, voer die kode hieronder in', 'require_accept_signature' => 'Vereis Handtekening', 'require_accept_signature_help_text' => 'As u hierdie kenmerk aanskakel, sal gebruikers fisies moet afmeld wanneer hulle \'n bate aanvaar.', 'left' => 'links', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Lengte van bate-etikette, insluitend zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/af/admin/settings/message.php b/resources/lang/af/admin/settings/message.php index 221d7edf78..fec5c10eb4 100644 --- a/resources/lang/af/admin/settings/message.php +++ b/resources/lang/af/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '\'N Fout het voorgekom tydens opdatering.', - 'success' => 'Stellings suksesvol opgedateer.' - ), - 'backup' => array( + 'success' => 'Stellings suksesvol opgedateer.', + ], + 'backup' => [ 'delete_confirm' => 'Is jy seker jy wil hierdie rugsteunlêer uitvee? Hierdie handeling kan nie ongedaan gemaak word nie.', 'file_deleted' => 'Die rugsteunlêer is suksesvol verwyder.', 'generated' => '\'N Nuwe rugsteunlêer is suksesvol geskep.', 'file_not_found' => 'Daardie rugsteunlêer kon nie op die bediener gevind word nie.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => '\'N Fout het voorgekom tydens suiwering.', 'validation_failed' => 'Jou skoonmaakbevestiging is verkeerd. Tik asseblief die woord "DELETE" in die bevestigingsboks.', - 'success' => 'Geskrapte rekords verwyder.' - ), + 'success' => 'Geskrapte rekords verwyder.', + ], -); +]; diff --git a/resources/lang/af/admin/statuslabels/message.php b/resources/lang/af/admin/statuslabels/message.php index 7562d7d5a5..fdf1bf9b4f 100644 --- a/resources/lang/af/admin/statuslabels/message.php +++ b/resources/lang/af/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Statuslabel bestaan ​​nie.', 'assoc_assets' => 'Hierdie statusetiket word tans geassosieer met ten minste een bate en kan nie uitgevee word nie. Dateer asseblief jou bates op om nie meer hierdie status te verwys nie en probeer weer.', - - 'create' => array( + 'create' => [ 'error' => 'Statuslabel is nie geskep nie, probeer asseblief weer.', - 'success' => 'Status Label suksesvol geskep.' - ), + 'success' => 'Status Label suksesvol geskep.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statuslabel is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Status Label suksesvol opgedateer.' - ), + 'success' => 'Status Label suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie Status Label uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die statusetiket. Probeer asseblief weer.', - 'success' => 'Die statusetiket is suksesvol verwyder.' - ), + 'success' => 'Die statusetiket is suksesvol verwyder.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Hierdie bates kan nie aan enigiemand toegewys word nie.', 'deployable' => 'Hierdie bates kan nagegaan word. Sodra hulle toegewys is, sal hulle \'n meta-status van Deployed aanvaar.', 'archived' => 'Hierdie bates kan nie nagegaan word nie en sal eers in die Argief-aansig verskyn. Dit is nuttig vir die behoud van inligting oor bates vir begrotings / historiese doeleindes, maar om hulle uit die dag-tot-dag-bate lys te hou.', 'pending' => 'Hierdie bates kan nog nie aan iemand toegewys word nie, wat dikwels gebruik word vir items wat buite herstel is, maar sal na verwagting terugkeer.', - ), + ], -); +]; diff --git a/resources/lang/af/admin/statuslabels/table.php b/resources/lang/af/admin/statuslabels/table.php index 24e1078b69..b8a0781f07 100644 --- a/resources/lang/af/admin/statuslabels/table.php +++ b/resources/lang/af/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Oor Status Etikette', 'archived' => 'argief', 'create' => 'Skep statusetiket', @@ -16,4 +16,4 @@ return array( 'title' => 'Status etikette', 'undeployable' => 'Undeployable', 'update' => 'Dateer Status Label op', -); +]; diff --git a/resources/lang/af/admin/suppliers/message.php b/resources/lang/af/admin/suppliers/message.php index 98805d0d3a..03b8045b5b 100644 --- a/resources/lang/af/admin/suppliers/message.php +++ b/resources/lang/af/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Verskaffer bestaan ​​nie.', - - 'create' => array( + 'create' => [ 'error' => 'Verskaffer is nie geskep nie, probeer asseblief weer.', - 'success' => 'Verskaffer geskep suksesvol.' - ), + 'success' => 'Verskaffer geskep suksesvol.', + ], - 'update' => array( + 'update' => [ 'error' => 'Verskaffer is nie opgedateer nie, probeer asseblief weer', - 'success' => 'Verskaffer suksesvol opgedateer.' - ), + 'success' => 'Verskaffer suksesvol opgedateer.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Is jy seker jy wil hierdie verskaffer uitvee?', 'error' => 'Daar was \'n probleem met die verwydering van die verskaffer. Probeer asseblief weer.', 'success' => 'Verskaffer is suksesvol verwyder.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/af/admin/suppliers/table.php b/resources/lang/af/admin/suppliers/table.php index 1229fab10b..68953ac062 100644 --- a/resources/lang/af/admin/suppliers/table.php +++ b/resources/lang/af/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Oor verskaffers', 'about_suppliers_text' => 'Verskaffers word gebruik om die bron van items op te spoor', 'address' => 'Verskaffer Adres', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Bekyk bates vir', 'zip' => 'Poskode', -); +]; diff --git a/resources/lang/af/admin/users/general.php b/resources/lang/af/admin/users/general.php index ef3175ee62..1fc598fd7a 100644 --- a/resources/lang/af/admin/users/general.php +++ b/resources/lang/af/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Bates toegewys aan: naam', @@ -13,7 +12,7 @@ return array( 'edit' => 'Wysig gebruiker', 'filetype_info' => 'Toegelate filetipes is png, gif, jpg, jpeg, doc, docx, pdf, txt, zip en rar.', 'history_user' => 'Geskiedenis vir: naam', - 'info' => 'info', + 'info' => 'info', 'restore_user' => 'Klik hier om dit te herstel.', 'last_login' => 'Laaste Aanmelding', 'ldap_config_text' => 'LDAP-konfigurasie-instellings kan Admin> Instellings gevind word. Die (opsionele) gekose ligging sal vir alle ingevoerde gebruikers gestel word.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Jou huidige administrasie-instellings laat selektiewe handhawing van twee-faktor-verifikasie toe.', 'two_factor_enrolled' => '2FA-toestel ingeskryf', 'two_factor_active' => '2FA aktief', - ); + ]; diff --git a/resources/lang/af/admin/users/message.php b/resources/lang/af/admin/users/message.php index ea47019c7e..2d1406c8fb 100644 --- a/resources/lang/af/admin/users/message.php +++ b/resources/lang/af/admin/users/message.php @@ -1,6 +1,6 @@ 'U het hierdie bate suksesvol aanvaar.', 'declined' => 'Jy het hierdie bate suksesvol geweier.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP-integrasie is nie vir hierdie installasie gekonfigureer nie.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Gebruiker is suksesvol geskep.', 'update' => 'Gebruiker is suksesvol opgedateer.', 'update_bulk' => 'Gebruikers is suksesvol opgedateer!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Gebruiker is suksesvol ingetrek.', 'restored' => 'Gebruiker is suksesvol herstel.', 'import' => 'Gebruikers suksesvol ingevoer.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Kon nie die gebruiker skep nie. Probeer asseblief weer.', 'update' => 'Kon nie die gebruiker opdateer nie. Probeer asseblief weer.', 'delete' => 'Daar was \'n probleem met die verwydering van die gebruiker. Probeer asseblief weer.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Kon nie die LDAP-bediener soek nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer.
Error van LDAP-bediener:', 'ldap_could_not_get_entries' => 'Kon nie inskrywings van die LDAP-bediener kry nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer.
Error van LDAP-bediener:', 'password_ldap' => 'Die wagwoord vir hierdie rekening word bestuur deur LDAP / Active Directory. Kontak asseblief u IT-afdeling om u wagwoord te verander.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Lêer nie verwyder nie. Probeer asseblief weer.', 'success' => 'Lêer suksesvol uitgevee.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Lêer (s) nie opgelaai nie. Probeer asseblief weer.', 'success' => 'Lêer (s) suksesvol opgelaai.', 'nofiles' => 'Jy het nie enige lêers vir oplaai gekies nie', 'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, doc, docx, pdf en txt.', - ), + ], -); +]; diff --git a/resources/lang/af/admin/users/table.php b/resources/lang/af/admin/users/table.php index df7b1e7428..bc116caa5e 100644 --- a/resources/lang/af/admin/users/table.php +++ b/resources/lang/af/admin/users/table.php @@ -1,6 +1,6 @@ 'aktiewe', 'allow' => 'laat', 'checkedout' => 'bates', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Wys huidige gebruikers', 'show_deleted' => 'Wys verwyderde gebruikers', 'title' => 'Titel', - 'to_restore_them' => 'om hulle te herstel.', + 'to_restore_them' => 'om hulle te herstel.', 'updateuser' => 'Update gebruiker', 'username' => 'Gebruikersnaam', - 'user_deleted_text' => 'Hierdie gebruiker is gemerk as verwyder.', + 'user_deleted_text' => 'Hierdie gebruiker is gemerk as verwyder.', 'username_note' => '(Dit word slegs vir Active Directory-binding gebruik, nie vir inskrywing nie.)', 'cloneuser' => 'Klone gebruiker', 'viewusers' => 'Bekyk gebruikers', -); +]; diff --git a/resources/lang/af/auth/general.php b/resources/lang/af/auth/general.php index 7fbe28b922..a3df40c4eb 100644 --- a/resources/lang/af/auth/general.php +++ b/resources/lang/af/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/af/auth/message.php b/resources/lang/af/auth/message.php index cac4449af3..be057c79da 100644 --- a/resources/lang/af/auth/message.php +++ b/resources/lang/af/auth/message.php @@ -1,6 +1,6 @@ '\'N Rekening met hierdie e-pos bestaan ​​reeds.', 'account_not_found' => 'Die gebruikersnaam of wagwoord is verkeerd.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Hierdie gebruikerrekening is verban.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Kon nie jou inteken nie, probeer asseblief weer.', 'success' => 'Jy is suksesvol aangemeld.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Kon nie jou rekening skep nie, probeer asseblief weer.', 'success' => 'Rekening suksesvol geskep.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Daar was \'n probleem tydens die herstel van wagwoordkode, probeer asseblief weer.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Kon nie jou wagwoord herstel nie, probeer asseblief weer.', 'success' => 'Jou wagwoord is suksesvol gereset.', - ), + ], - -); +]; diff --git a/resources/lang/af/button.php b/resources/lang/af/button.php index 58662fb7a8..a61ebf5e25 100644 --- a/resources/lang/af/button.php +++ b/resources/lang/af/button.php @@ -1,6 +1,6 @@ 'aksies', 'add' => 'Voeg nuwe', 'cancel' => 'kanselleer', @@ -11,7 +11,7 @@ return array( 'request' => 'versoek', 'submit' => 'Indien', 'upload' => 'oplaai', - 'select_file' => 'Kies lêer ...', + 'select_file' => 'Kies lêer ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php index 66b0e9b8cc..289640e9d4 100644 --- a/resources/lang/af/general.php +++ b/resources/lang/af/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Stad', - 'click_here' => 'Klik hier', + 'click_here' => 'Klik hier', 'clear_selection' => 'Clear Selection', 'companies' => 'maatskappye', 'company' => 'maatskappy', 'component' => 'komponent', 'components' => 'komponente', - 'complete' => 'volledige', + 'complete' => 'volledige', 'consumable' => 'verbruikbare', 'consumables' => 'Consumables', 'country' => 'land', diff --git a/resources/lang/af/help.php b/resources/lang/af/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/af/help.php +++ b/resources/lang/af/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/af/mail.php b/resources/lang/af/mail.php index 6f577833e7..3ec32acb7e 100644 --- a/resources/lang/af/mail.php +++ b/resources/lang/af/mail.php @@ -1,6 +1,6 @@ '\'N Gebruiker het \'n itemversoek op die webwerf gekanselleer', 'a_user_requested' => '\'N Gebruiker het \'n item op die webwerf versoek', 'accessory_name' => 'Toebehore Naam:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/af/pagination.php b/resources/lang/af/pagination.php index 6f99c193af..d3fef03af5 100644 --- a/resources/lang/af/pagination.php +++ b/resources/lang/af/pagination.php @@ -1,6 +1,6 @@ 'Volgende »', -); +]; diff --git a/resources/lang/af/passwords.php b/resources/lang/af/passwords.php index f88ae1454b..ec74a026df 100644 --- a/resources/lang/af/passwords.php +++ b/resources/lang/af/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Jou wagwoord skakel is gestuur!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/af/reminders.php b/resources/lang/af/reminders.php index c8c030ffa9..7bdd172bb3 100644 --- a/resources/lang/af/reminders.php +++ b/resources/lang/af/reminders.php @@ -1,6 +1,6 @@ "Wagwoorde moet ses karakters wees en ooreenstem met die bevestiging.", + 'password' => 'Wagwoorde moet ses karakters wees en ooreenstem met die bevestiging.', - "user" => "Gebruikersnaam of e-posadres is verkeerd", + 'user' => 'Gebruikersnaam of e-posadres is verkeerd', - "token" => "Hierdie wagwoord-reset-token is ongeldig.", + 'token' => 'Hierdie wagwoord-reset-token is ongeldig.', - "sent" => "As 'n ooreenstemmende e-posadres gevind is, is 'n wagwoordherinnering gestuur!", + 'sent' => "As 'n ooreenstemmende e-posadres gevind is, is 'n wagwoordherinnering gestuur!", -); +]; diff --git a/resources/lang/af/table.php b/resources/lang/af/table.php index 50f5f3c4c8..2c9a1a9250 100644 --- a/resources/lang/af/table.php +++ b/resources/lang/af/table.php @@ -1,10 +1,10 @@ 'aksies', 'action' => 'aksie', 'by' => 'deur', 'item' => 'item', -); +]; diff --git a/resources/lang/af/validation.php b/resources/lang/af/validation.php index dfc52b94fb..f0bfdb8bca 100644 --- a/resources/lang/af/validation.php +++ b/resources/lang/af/validation.php @@ -1,6 +1,6 @@ 'Die: Attribuut is reeds geneem.', 'uploaded' => 'Die: kenmerk kon nie opgelaai word nie.', 'url' => 'Die: Attribuutformaat is ongeldig.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -115,10 +114,10 @@ return array( 'custom' => [ 'alpha_space' => "Die: attribuut veld bevat 'n karakter wat nie toegelaat word nie.", - "email_array" => "Een of meer e-posadresse is ongeldig.", - "hashed_pass" => "Jou huidige wagwoord is verkeerd", + 'email_array' => 'Een of meer e-posadresse is ongeldig.', + 'hashed_pass' => 'Jou huidige wagwoord is verkeerd', 'dumbpwd' => 'Daardie wagwoord is te algemeen.', - "statuslabel_type" => "U moet 'n geldige statusetiket tipe kies", + 'statuslabel_type' => "U moet 'n geldige statusetiket tipe kies", ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ar/admin/accessories/general.php b/resources/lang/ar/admin/accessories/general.php index ca72ba694c..bc2e6ca248 100644 --- a/resources/lang/ar/admin/accessories/general.php +++ b/resources/lang/ar/admin/accessories/general.php @@ -1,6 +1,6 @@ 'تصنيف الملحق', 'accessory_name' => 'اسم الملحق', 'checkout' => 'اخراج الملحق', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'قم باستعمال اتفاقية ترخيص المستخدم الافتراضية الاساسية.', 'use_default_eula_disabled' => 'استخدام (اتفاقية ترخيص المستخدم) الافتراضية الأساسية بدلا من ذلك. لم يتم تحديد (اتفاقية ترخيص المستخدم) الافتراضية الأساسية. الرجاء إضافتها في الإعدادات.', -); +]; diff --git a/resources/lang/ar/admin/accessories/message.php b/resources/lang/ar/admin/accessories/message.php index 9c4ee00a22..7ffc745518 100644 --- a/resources/lang/ar/admin/accessories/message.php +++ b/resources/lang/ar/admin/accessories/message.php @@ -1,37 +1,36 @@ 'الملحق [:id] غير موجود.', 'assoc_users' => 'تم إخراج :count عنصر من هذا الملحق للمستخدمين، الرجاء ادخال بعض الملحقات ثم حاول مرة أخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لم يتم انشاء الملحق، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم انشاء الملحق بنجاح.' - ), + 'success' => 'تم انشاء الملحق بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الملحق، الرجاء المحاولة مرة أخرى', - 'success' => 'تم تحديث الملحق بنجاح.' - ), + 'success' => 'تم تحديث الملحق بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا الملحق؟', 'error' => 'حدث خطأ أثناء محاولة حذف الملحق. الرجاء المحاولة مرة أخرى.', - 'success' => 'تم حذف الملحق بنجاح.' - ), + 'success' => 'تم حذف الملحق بنجاح.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى', 'success' => 'تم إخراج الملحق بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.' - ), + 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'لم يتم ادخال الملحق، الرجاء المحاولة مرة أخرى', 'success' => 'تم ادخال الملحق بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.' - ) + 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.', + ], - -); +]; diff --git a/resources/lang/ar/admin/accessories/table.php b/resources/lang/ar/admin/accessories/table.php index 203b5f05fd..2f13ee80d4 100644 --- a/resources/lang/ar/admin/accessories/table.php +++ b/resources/lang/ar/admin/accessories/table.php @@ -1,11 +1,10 @@ 'التنزيل كملف CSV', - 'eula_text' => 'إتفاقية ترخيص المستخدم النهائي', +return [ + 'dl_csv' => 'التنزيل كملف CSV', + 'eula_text' => 'إتفاقية ترخيص المستخدم النهائي', 'id' => 'رقم التعريف', 'require_acceptance' => 'القبول', 'title' => 'اسم الملحق', - -); +]; diff --git a/resources/lang/ar/admin/asset_maintenances/form.php b/resources/lang/ar/admin/asset_maintenances/form.php index 26921bab04..8a284d38a4 100644 --- a/resources/lang/ar/admin/asset_maintenances/form.php +++ b/resources/lang/ar/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'أيام', 'notes' => 'مُلاحظات', 'update' => 'تعديل', - 'create' => 'إنشاء' + 'create' => 'إنشاء', ]; diff --git a/resources/lang/ar/admin/asset_maintenances/message.php b/resources/lang/ar/admin/asset_maintenances/message.php index 7ef7e67b80..6546c9dbe9 100644 --- a/resources/lang/ar/admin/asset_maintenances/message.php +++ b/resources/lang/ar/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف سند صيانة الأصل؟', 'error' => 'حدثت مشكلة في عملية الحذف لسند صيانة الأصل. الرجاء المحاولة مرة اُخرى.', - 'success' => 'تم حذف سند صيانة الأصل بنجاح.' + 'success' => 'تم حذف سند صيانة الأصل بنجاح.', ], 'create' => [ 'error' => 'لم يتم إنشاء سند صيانة الأصل، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء سند صيانة الأصل بنجاح.' + 'success' => 'تم إنشاء سند صيانة الأصل بنجاح.', ], 'edit' => [ 'error' => 'لم يتم تعديل سند صيانة الأصل، يرجى إعادة المحاولة.', - 'success' => 'تم تعديل سند صيانة الأصل بنجاح.' + 'success' => 'تم تعديل سند صيانة الأصل بنجاح.', ], 'asset_maintenance_incomplete' => 'لم يكتمل بعد', 'warranty' => 'الضمان', 'not_warranty' => 'لا يوجد ضمان', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ar/admin/asset_maintenances/table.php b/resources/lang/ar/admin/asset_maintenances/table.php index 187b8106c3..133136d89e 100644 --- a/resources/lang/ar/admin/asset_maintenances/table.php +++ b/resources/lang/ar/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'صيانة الاُصل', 'asset_name' => 'اسم الأصل', 'is_warranty' => 'الضمان', - 'dl_csv' => 'التنزيل كملف CSV' + 'dl_csv' => 'التنزيل كملف CSV', ]; diff --git a/resources/lang/ar/admin/categories/general.php b/resources/lang/ar/admin/categories/general.php index 45768a64d1..452168b9d0 100644 --- a/resources/lang/ar/admin/categories/general.php +++ b/resources/lang/ar/admin/categories/general.php @@ -1,6 +1,6 @@ 'تصنيفات الأصول', 'category_name' => 'اسم التصنيف', 'checkin_email' => 'إرسال رسالة إلكترونية للمستخدم عند الإدخال \\ الإخراج.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'قم باستعمال إتفاقية الترخيص الإفتراضية.', 'use_default_eula_disabled' => 'استخدام (اتفاقية ترخيص المستخدم) الافتراضية الأساسية بدلا من ذلك. لم يتم تحديد (اتفاقية ترخيص المستخدم) الافتراضية الأساسية. الرجاء إضافتها من الإعدادات.', -); +]; diff --git a/resources/lang/ar/admin/categories/message.php b/resources/lang/ar/admin/categories/message.php index 275321cecb..c9086b6d6a 100644 --- a/resources/lang/ar/admin/categories/message.php +++ b/resources/lang/ar/admin/categories/message.php @@ -1,25 +1,25 @@ 'التصنيف غير موجود.', 'assoc_models' => 'هذا التصنيف حاليا مرتبط مع موديل ولا يمكن حذفه. الرجاء القيام بتحديث الموديلات بحيث لا تكون مرتبطة بهذا التصنيف، ثم حاول مرة اخرى. ', 'assoc_items' => 'هذه التصنيف مرتبط حاليا مع واحد على الأقل من أنواع الأصول :asset_type ولا يمكن حذفه. الرجاء تحديث نوع الأصل الخاص بك :asset_type حيث لا يكون مرتبط بهذا التصنيف، ثم حاول مرة أخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لقد فشل إنشاء التصنيف، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء التصنيف بنجاح.' - ), + 'success' => 'تم إنشاء التصنيف بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لقد فشل تحديث التصنيف، الرجاء المحاولة مرة أخرى', - 'success' => 'تم تحديث التصنيف بنجاح.' - ), + 'success' => 'تم تحديث التصنيف بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد أنك تريد حذف هذا التصنيف؟', 'error' => 'حدث خطأ أثناء محاولة حذف التصنيف. الرجاء المحاولة مرة أخرى.', - 'success' => 'تم حذف التصنيف بنجاح.' - ) + 'success' => 'تم حذف التصنيف بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/categories/table.php b/resources/lang/ar/admin/categories/table.php index 581a4f7f74..b2caebf67f 100644 --- a/resources/lang/ar/admin/categories/table.php +++ b/resources/lang/ar/admin/categories/table.php @@ -1,10 +1,10 @@ 'إتفاقية ترخيص المستخدم النهائي', +return [ + 'eula_text' => 'إتفاقية ترخيص المستخدم النهائي', 'id' => 'رقم التعريف', 'parent' => 'التصنيف الأب', 'require_acceptance' => 'القبول', 'title' => 'اسم تصنيف الأصول', -); +]; diff --git a/resources/lang/ar/admin/companies/general.php b/resources/lang/ar/admin/companies/general.php index 1684893cab..13cfe13b91 100644 --- a/resources/lang/ar/admin/companies/general.php +++ b/resources/lang/ar/admin/companies/general.php @@ -1,4 +1,5 @@ 'اختر الشركة', ]; diff --git a/resources/lang/ar/admin/companies/message.php b/resources/lang/ar/admin/companies/message.php index aa8f946906..e8586af1e8 100644 --- a/resources/lang/ar/admin/companies/message.php +++ b/resources/lang/ar/admin/companies/message.php @@ -1,18 +1,19 @@ 'الشركة غير موجودة.', 'assoc_users' => 'هذه الشركة مرتبطة حاليا مع موديل ولا يمكن حذفها. رجاءً قم بتحديث الموديلات بحيث لا تكون مرتبطة بهذه الشركة ثم حاول مرة اُخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لم يتم انشاء الشركة، الرجاء المحاولة مرة اُخرى.', - 'success' => 'تم إنشاء الشركة بنجاح.' - ), - 'update' => array( + 'success' => 'تم إنشاء الشركة بنجاح.', + ], + 'update' => [ 'error' => 'لم يتم انشاء الشركة، الرجاء المحاولة مرة اُخرى', - 'success' => 'تم تحديث الشركة بنجاح.' - ), - 'delete' => array( + 'success' => 'تم تحديث الشركة بنجاح.', + ], + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذه الشركة؟', 'error' => 'حدثت مشكلة اثناء عملية حذف الشركة. الرجاء المحاولة مرة اُخرى.', - 'success' => 'تم حذف الشركة بنجاح.' - ) -); + 'success' => 'تم حذف الشركة بنجاح.', + ], +]; diff --git a/resources/lang/ar/admin/companies/table.php b/resources/lang/ar/admin/companies/table.php index 281b476d95..673872b8ec 100644 --- a/resources/lang/ar/admin/companies/table.php +++ b/resources/lang/ar/admin/companies/table.php @@ -1,9 +1,10 @@ 'الشركات', 'create' => 'إنشاء شركة', 'title' => 'شركة', 'update' => 'تحديث الشركة', 'name' => 'إسم الشركة', 'id' => 'رقم التعريف', -); +]; diff --git a/resources/lang/ar/admin/components/general.php b/resources/lang/ar/admin/components/general.php index a99b2336f1..cf97b81a8a 100644 --- a/resources/lang/ar/admin/components/general.php +++ b/resources/lang/ar/admin/components/general.php @@ -1,6 +1,6 @@ 'اسم المكون', 'checkin' => 'ادخالات المكونات', 'checkout' => 'مخرجات المكونات', @@ -12,4 +12,4 @@ return array( 'remaining' => 'المتبقية', 'total' => 'المجموع', 'update' => 'تحديث مكون', -); +]; diff --git a/resources/lang/ar/admin/components/message.php b/resources/lang/ar/admin/components/message.php index c2b1931214..e8674a1b56 100644 --- a/resources/lang/ar/admin/components/message.php +++ b/resources/lang/ar/admin/components/message.php @@ -1,36 +1,35 @@ 'المكون غير موجود.', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء المكون، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء المكون بنجاح.' - ), + 'success' => 'تم إنشاء المكون بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث المكون، الرجاء المحاولة مرة أخرى', - 'success' => 'تم تحديث المكون بنجاح.' - ), + 'success' => 'تم تحديث المكون بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا المكون؟', 'error' => 'حدثت مشكلة اثناء عملية حذف المكون. الرجاء المحاولة مرة اُخرى.', - 'success' => 'تم حذف المكون بنجاح.' - ), + 'success' => 'تم حذف المكون بنجاح.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'لم تتم عملية اخراج المكون، الرجاء المحاولة مرة اخرى', 'success' => 'تم إخراج المكون بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.' - ), + 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'لم تتم عملية ادخال المكون، الرجاء المحاولة مرة اخرى', 'success' => 'تم إدخال المكون بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.' - ) + 'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.', + ], - -); +]; diff --git a/resources/lang/ar/admin/components/table.php b/resources/lang/ar/admin/components/table.php index 6ab2e193c5..998ac55f73 100644 --- a/resources/lang/ar/admin/components/table.php +++ b/resources/lang/ar/admin/components/table.php @@ -1,5 +1,5 @@ 'اسم المكون', -); +]; diff --git a/resources/lang/ar/admin/consumables/general.php b/resources/lang/ar/admin/consumables/general.php index 430cfe89fa..a18457d468 100644 --- a/resources/lang/ar/admin/consumables/general.php +++ b/resources/lang/ar/admin/consumables/general.php @@ -1,6 +1,6 @@ 'إخراج المواد الاستهلاكية لمستخدم', 'consumable_name' => 'اسم المادة الإستهلاكية', 'create' => 'إنشاء مادة إستهلاكية', @@ -8,4 +8,4 @@ return array( 'remaining' => 'المتبقية', 'total' => 'المجموع', 'update' => 'تحديث المادة الإستهلاكية', -); +]; diff --git a/resources/lang/ar/admin/consumables/message.php b/resources/lang/ar/admin/consumables/message.php index 8819d48fde..08696702c6 100644 --- a/resources/lang/ar/admin/consumables/message.php +++ b/resources/lang/ar/admin/consumables/message.php @@ -1,36 +1,35 @@ 'المادة الإستهلاكية غير موجودة.', - 'create' => array( + 'create' => [ 'error' => 'لم يتم انشاء المادة الإستهلاكية، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم إنشاء المادة الإستهلاكية بنجاح.' - ), + 'success' => 'تم إنشاء المادة الإستهلاكية بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث المادة الإستهلاكية، الرجاء المحاولة مرة اخرى', - 'success' => 'تم تحديث المادة الإستهلاكية بنجاح.' - ), + 'success' => 'تم تحديث المادة الإستهلاكية بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذه المادة الإستهلاكية؟', 'error' => 'لقد حدثت مشكلة اثناء عملية حذف المادة الإستهلاكية، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم حذف المادة الإستهلاكية بنجاح.' - ), + 'success' => 'تم حذف المادة الإستهلاكية بنجاح.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'لم يتم إخراج المادة الإستهلاكية، الرجاء المحاولة مرة اخرى', 'success' => 'تم إخراج المادة الإستهلاكية بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.' - ), + 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'لم يتم ادخال المادة الإستهلاكية، الرجاء المحاولة مرة اخرى', 'success' => 'تم إخراج المادة الإستهلاكية بنجاح.', - 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.' - ) + 'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.', + ], - -); +]; diff --git a/resources/lang/ar/admin/consumables/table.php b/resources/lang/ar/admin/consumables/table.php index ffcf321aa6..e3ffcdc7a2 100644 --- a/resources/lang/ar/admin/consumables/table.php +++ b/resources/lang/ar/admin/consumables/table.php @@ -1,5 +1,5 @@ 'إسم المادة الإستهلاكية', -); +]; diff --git a/resources/lang/ar/admin/custom_fields/general.php b/resources/lang/ar/admin/custom_fields/general.php index 7c823c0fcf..a3a5b1d30e 100644 --- a/resources/lang/ar/admin/custom_fields/general.php +++ b/resources/lang/ar/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'حقول مخصصة', 'field' => 'حقل', 'about_fieldsets_title' => 'حول مجموعة الحقول', @@ -29,4 +29,4 @@ return array( 'create_field' => 'حقل جديد مخصص', 'value_encrypted' => 'هذا الحقل مشفر في قاعدة البيانات. يمكن قرائته من قبل مدراء النظام فقط', 'show_in_email' => 'هل تريد تضمين قيمة هذا الحقل في رسائل البريد الإلكتروني المرسلة إلى المستخدم؟ لا يمكن تضمين الحقول المشفرة في رسائل البريد الإلكتروني.', -); +]; diff --git a/resources/lang/ar/admin/custom_fields/message.php b/resources/lang/ar/admin/custom_fields/message.php index 44ff697900..aa0544d129 100644 --- a/resources/lang/ar/admin/custom_fields/message.php +++ b/resources/lang/ar/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'هذا الحقل غير موجود.', 'already_added' => 'تم إضافة الحقل مسبقا', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء الحقل، الرجاء المحاولة مرة اخرى.', 'success' => 'تم إنشاء الحقل بنجاح.', - 'assoc_success' => 'تم اضافة الحقل الى مجموعة الحقول بنجاح.' - ), + 'assoc_success' => 'تم اضافة الحقل الى مجموعة الحقول بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الحقل، الرجاء المحاولة مرة اخرى', - 'success' => 'تم تحديث الحقل بنجاح.' - ), + 'success' => 'تم تحديث الحقل بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا الحقل؟', 'error' => 'لقد حدثت مشكلة أثناء عملية حذف الحقل، الرجاء المحاولة مرة اخرى.', 'success' => 'تم حذف الحقل بنجاح.', 'in_use' => 'لا يزال الحقل قيد الإستخدام.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'مجموعة الحقول غير موجودة', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء مجموعة الحقول، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم إنشاء مجموعة الحقول بنجاح.' - ), + 'success' => 'تم إنشاء مجموعة الحقول بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث مجموعة الحقول، الرجاء المحاولة مرة اخرى', - 'success' => 'تم تحديث مجموعة الحقول بنجاح.' - ), + 'success' => 'تم تحديث مجموعة الحقول بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف مجموعة الحقول هذه؟', 'error' => 'لقد حدثت مشكلة أثناء عملية حذف مجموعة الحقول هذه، الرجاء المحاولة مرة اخرى.', 'success' => 'تم حذف مجموعة الحقول بنجاح.', 'in_use' => 'مجموعة الحقول لا تزال قيد الاستخدام.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ar/admin/departments/message.php b/resources/lang/ar/admin/departments/message.php index 4d4ad8eccf..c8f5e274e0 100644 --- a/resources/lang/ar/admin/departments/message.php +++ b/resources/lang/ar/admin/departments/message.php @@ -1,21 +1,21 @@ 'القسم الاداري غير موجود.', 'assoc_users' => 'هذا القسم الإداري مرتبط حاليا مع مستخدم واحد على الأقل ولا يمكن حذفه. الرجاء تحديث تفاصيل المستخدمين حيث لا تحتوي هذا القسم وحاول مرة أخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء القسم الإداري، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم انشاء القسم الاداري بنجاح.' - ), - 'update' => array( + 'success' => 'تم انشاء القسم الاداري بنجاح.', + ], + 'update' => [ 'error' => 'لم يتم تحديث القسم الإداري، الرجاء المحاولة مرة أخرى', - 'success' => 'تم تحديث القسم الاداري بنجاح.' - ), - 'delete' => array( + 'success' => 'تم تحديث القسم الاداري بنجاح.', + ], + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا القسم؟', 'error' => 'حدثت مشكلة اثناء عملية حذف القسم الاداري. الرجاء المحاولة مرة اُخرى.', - 'success' => 'تم حذف القسم الاداري بنجاح.' - ) + 'success' => 'تم حذف القسم الاداري بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/departments/table.php b/resources/lang/ar/admin/departments/table.php index 92f7df1ea8..c43a83a49b 100644 --- a/resources/lang/ar/admin/departments/table.php +++ b/resources/lang/ar/admin/departments/table.php @@ -1,6 +1,6 @@ 'رقم التعريف', 'name' => 'اسم القسم الإداري', @@ -8,4 +8,4 @@ return array( 'location' => 'الموقع', 'create' => 'إنشاء قسم اداري', 'update' => 'تحديث قسم اداري', - ); + ]; diff --git a/resources/lang/ar/admin/depreciations/general.php b/resources/lang/ar/admin/depreciations/general.php index 01c356038b..48342e87df 100644 --- a/resources/lang/ar/admin/depreciations/general.php +++ b/resources/lang/ar/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'حول استهلاك الأصول', 'about_depreciations' => 'يمكنك إعداد استهلاك الأصول لخفض قيمة الأصول على اساس القسط الثابت للاستهلاك.', 'asset_depreciations' => 'استهلاك الأصول', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'عدد الأشهر', 'update' => 'تحديث الاستهلاك', -); +]; diff --git a/resources/lang/ar/admin/depreciations/message.php b/resources/lang/ar/admin/depreciations/message.php index 4a9914bf64..a2ad27b5b8 100644 --- a/resources/lang/ar/admin/depreciations/message.php +++ b/resources/lang/ar/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'فئة الاستهلاك غير موجودة.', 'assoc_users' => 'لا يزال سند هذا الاستهلاك مرتبط مع أحد الموديلات ولا يمكن حذفه، الرجاء حذف الموديلات، وثم حاول الحذف مرة اخرى. ', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء فئة الاستهلاك، الرجاء المحاولة مرة اخرى :(', - 'success' => 'تم إنشاء فئة الاستهلاك بنجاح. :)' - ), + 'success' => 'تم إنشاء فئة الاستهلاك بنجاح. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث فئة الاستهلاك، الرجاء المحاولة مرة اخرى', - 'success' => 'تم تحديث فئة الاستهلاك بنجاح.' - ), + 'success' => 'تم تحديث فئة الاستهلاك بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف فئة الاستهلاك هذه؟', 'error' => 'لقد حدثت مشكلة أثناء عملية حذف فئة الاستهلاك، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم إنشاء فئة الاستهلاك بنجاح.' - ) + 'success' => 'تم إنشاء فئة الاستهلاك بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/depreciations/table.php b/resources/lang/ar/admin/depreciations/table.php index 3e973a0b5b..1bb64837fa 100644 --- a/resources/lang/ar/admin/depreciations/table.php +++ b/resources/lang/ar/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'رقم التعريف', 'months' => 'أشهر', 'term' => 'المدة', 'title' => 'الإسم ', -); +]; diff --git a/resources/lang/ar/admin/groups/message.php b/resources/lang/ar/admin/groups/message.php index 56e9755c0b..7691e68652 100644 --- a/resources/lang/ar/admin/groups/message.php +++ b/resources/lang/ar/admin/groups/message.php @@ -1,22 +1,22 @@ 'المجموعة موجودة مسبقا!', 'group_not_found' => 'المجموعة رقم :id غير موجودة.', 'group_name_required' => 'حقل الإسم اجباري', - 'success' => array( + 'success' => [ 'create' => 'تم إنشاء المجموعة بنجاح.', 'update' => 'تم تحديث المجموعة بنجاح.', 'delete' => 'تم حذف المجموعة بنجاح.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف المجموعة؟', 'create' => 'لقد حدث خطأ أثناء إنشاء هذه المجموعة. الرجاء المحاولة مرة اخرى.', 'update' => 'لقد حدث خطأ أثناء تحديث هذه المجموعة. الرجاء المحاولة مرة أخرى.', 'delete' => 'لقد حدث خطأ أثناء حذف هذه المجموعة. الرجاء المحاولة مرة أخرى.', - ), + ], -); +]; diff --git a/resources/lang/ar/admin/groups/table.php b/resources/lang/ar/admin/groups/table.php index 0afbdddd09..0962e474ac 100644 --- a/resources/lang/ar/admin/groups/table.php +++ b/resources/lang/ar/admin/groups/table.php @@ -1,9 +1,9 @@ 'رقم التعريف', 'name' => 'الإسم', 'users' => 'عدد المستخدمين', -); +]; diff --git a/resources/lang/ar/admin/groups/titles.php b/resources/lang/ar/admin/groups/titles.php index 8bc0c7df6f..ea254f0a68 100644 --- a/resources/lang/ar/admin/groups/titles.php +++ b/resources/lang/ar/admin/groups/titles.php @@ -1,6 +1,6 @@ 'حول المجموعات', 'about_groups' => 'تستخدم المجموعات لتعميم صلاحيات المستخدم.', 'group_management' => 'إدارة المجموعة', @@ -11,4 +11,4 @@ return array( 'allow' => 'سماح', 'deny' => 'منع', -); +]; diff --git a/resources/lang/ar/admin/hardware/form.php b/resources/lang/ar/admin/hardware/form.php index a8bda782f5..42933c6ffa 100644 --- a/resources/lang/ar/admin/hardware/form.php +++ b/resources/lang/ar/admin/hardware/form.php @@ -1,12 +1,12 @@ 'تاكيد إجراء حذف للاُصول المحددة', +return [ + 'bulk_delete' => 'تاكيد إجراء حذف للاُصول المحددة', 'bulk_delete_help' => 'الرجاء مراجعة الأصول المحددة للحذف أدناه. بمجرد الحذف، يمكن استعادة هذه الأصول، لكنها لن تكون مرتبطة مع أي من المستخدمين اللذين تم اخراج الأصول لهم من قبل.', 'bulk_delete_warn' => 'أنت على وشك حذف :asset_count من الأصول.', - 'bulk_update' => 'تحديث للأصول المحددة', - 'bulk_update_help' => 'يتيح لك هذا النموذج تحديث عدة أصول دفعة واحدة. قم بملء الحقول التي تحتاج إلى تغييرها. ستظل أية حقول فارغة بدون تغيير. ', - 'bulk_update_warn' => 'أنت على وشك تعديل خصائص :asset_count من الأصول.', + 'bulk_update' => 'تحديث للأصول المحددة', + 'bulk_update_help' => 'يتيح لك هذا النموذج تحديث عدة أصول دفعة واحدة. قم بملء الحقول التي تحتاج إلى تغييرها. ستظل أية حقول فارغة بدون تغيير. ', + 'bulk_update_warn' => 'أنت على وشك تعديل خصائص :asset_count من الأصول.', 'checkedout_to' => 'تم الاخراج إلى', 'checkout_date' => 'تاريخ الاخراج', 'checkin_date' => 'تاريخ الادخال', @@ -38,7 +38,6 @@ return array( 'tag' => 'ترميز الأصل', 'update' => 'تحديث الأصل', 'warranty' => 'الضمان', - 'warranty_expires' => 'انتهاء مدة صلاحية الضمان', + 'warranty_expires' => 'انتهاء مدة صلاحية الضمان', 'years' => 'سنوات', -) -; +]; diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php index 50ab2635ed..d55ff54273 100644 --- a/resources/lang/ar/admin/hardware/general.php +++ b/resources/lang/ar/admin/hardware/general.php @@ -1,9 +1,9 @@ 'حول الأصول', 'about_assets_text' => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.', - 'archived' => 'مؤرشفة', + 'archived' => 'مؤرشفة', 'asset' => 'أصل', 'bulk_checkout' => 'إخراج الأصول', 'checkin' => 'ادخال الأصل', @@ -19,4 +19,4 @@ return array( 'pending' => 'قيد الانتظار', 'undeployable' => 'غير قابل للتوزيع', 'view' => 'عرض الأصل', -); +]; diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php index 810b0e956c..62bcc77ec2 100644 --- a/resources/lang/ar/admin/hardware/message.php +++ b/resources/lang/ar/admin/hardware/message.php @@ -1,82 +1,80 @@ ' تحذير: تم تحديد الحالة لهذا الأصل بانه غير قابل للتوزيع حاليا. إذا تغيرت هذه الحالة، يرجى تحديث حالة الأصل.', 'does_not_exist' => 'الأصل غير موجود.', 'does_not_exist_or_not_requestable' => 'محاولة جيدة. هذا الأصل غير موجود أو غير قابل للطلب.', 'assoc_users' => 'هذا الأصل مخرج حاليا لمستخدم ولا يمكن حذفه. يرجى التحقق من الأصل أولا، ثم حاول الحذف مرة أخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء الأصل، يرجى إعادة المحاولة. :(', - 'success' => 'تم إنشاء الأصل بنجاح. :)' - ), + 'success' => 'تم إنشاء الأصل بنجاح. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الأصل، يرجى إعادة المحاولة', 'success' => 'تم تحديث الأصل بنجاح.', 'nothing_updated' => 'لم يتم اختيار أي حقول، لذلك لم يتم تحديث أي شيء.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'لم تتم استعادة الأصل، يرجى إعادة المحاولة', - 'success' => 'تمت استعادة الأصل بنجاح.' - ), + 'success' => 'تمت استعادة الأصل بنجاح.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'لم تنجح مراجعة الأصل. حاول مرة اخرى.', - 'success' => 'تم تسجيل تدقيق الأصل بنجاح.' - ), + 'success' => 'تم تسجيل تدقيق الأصل بنجاح.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'لم يتم حذف الملف. الرجاء المحاولة مرة اخرى.', 'success' => 'تم حذف الملف بنجاح.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'لم يتم تحميل الملف. حاول مرة اخرى.', 'success' => 'تم تحميل الملف بنجاح.', 'nofiles' => 'لم تحدد أي ملفات للتحميل، أو أن الملف الذي تحاول تحميله كبير جدا', 'invalidfiles' => 'واحد أو أكثر من الملفات كبيرة جداً أو نوع الملف غير مسموح. أنواع الملفات المسموح بها هي png, gif, jpg, doc, docx, pdf, و txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'لم يتم استيراد بعض العناصر بشكل صحيح.', 'errorDetail' => 'لم يتم استيراد العناصر التالية بسبب الأخطاء.', - 'success' => "تم استيراد الملف الخاص بك", - 'file_delete_success' => "تم حذف ملفك بنجاح", - 'file_delete_error' => "تعذر حذف الملف", - ), + 'success' => 'تم استيراد الملف الخاص بك', + 'file_delete_success' => 'تم حذف ملفك بنجاح', + 'file_delete_error' => 'تعذر حذف الملف', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'هل تريد بالتأكيد حذف هذا الأصل؟', 'error' => 'حدثت مشكلة أثناء حذف هذا الأصل. حاول مرة اخرى.', 'nothing_updated' => 'لم يتم اختيار أي أصول، لذلك لم يتم حذف أي شيء.', - 'success' => 'تم حذف الأصل بنجاح.' - ), + 'success' => 'تم حذف الأصل بنجاح.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'لم يتم اخراج الأصل، يرجى إعادة المحاولة', 'success' => 'تم اخراج الأصل بنجاح.', 'user_does_not_exist' => 'هذا المستخدم غير صالح. حاول مرة اخرى.', 'not_available' => 'هذا الأصل غير متاح للخروج!', - 'no_assets_selected' => 'يجب عليك تحديد أصل واحد على الأقل من القائمة' - ), + 'no_assets_selected' => 'يجب عليك تحديد أصل واحد على الأقل من القائمة', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'لم يتم ادخال الأصل، يرجى إعادة المحاولة', 'success' => 'تم ادخال الأصل بنجاح.', 'user_does_not_exist' => 'هذا المستخدم غير صالح. حاول مرة اخرى.', 'already_checked_in' => 'تم ادخال هذا الأصل مسبقا.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'لم يتم طلب الأصل، يرجى إعادة المحاولة', 'success' => 'تم طلب الأصل بنجاح.', - 'canceled' => 'تم إلغاء طلب الاخراج بنجاح' - ) + 'canceled' => 'تم إلغاء طلب الاخراج بنجاح', + ], -); +]; diff --git a/resources/lang/ar/admin/hardware/table.php b/resources/lang/ar/admin/hardware/table.php index 48c3b85b04..997a713c50 100644 --- a/resources/lang/ar/admin/hardware/table.php +++ b/resources/lang/ar/admin/hardware/table.php @@ -1,6 +1,6 @@ 'ترميز الأصل', 'asset_model' => 'الموديل', @@ -20,6 +20,6 @@ return array( 'title' => 'أصل ', 'image' => 'صورة الجهاز', 'days_without_acceptance' => 'أيام بدون قبول', - 'monthly_depreciation' => 'الإهلاك الشهري' + 'monthly_depreciation' => 'الإهلاك الشهري', -); +]; diff --git a/resources/lang/ar/admin/kits/general.php b/resources/lang/ar/admin/kits/general.php index b6a7650d5c..ac037af293 100644 --- a/resources/lang/ar/admin/kits/general.php +++ b/resources/lang/ar/admin/kits/general.php @@ -1,6 +1,6 @@ 'حول مجموعات محددة مسبقا', 'about_kits_text' => 'مجموعات محددة مسبقا تتيح لك تحقق بسرعة من مجموعة من العناصر (الأصول والتراخيص ، الخ) لمستخدم. قد يكون هذا مفيداً عندما تكون عملية تشغيلك متناسقة عبر العديد من المستخدمين وتتلقى كافة المستخدمين نفس العناصر. ', @@ -16,4 +16,4 @@ return array( 'none_consumables' => 'لا توجد وحدات متوفرة كافية من: قابلة للاستهلاك لـ Checkout. الكمية مطلوبة. ', 'none_accessory' => 'لا توجد وحدات متوفرة كافية من: ملحق ل checkout. الكمية مطلوبة. ', -); +]; diff --git a/resources/lang/ar/admin/licenses/form.php b/resources/lang/ar/admin/licenses/form.php index eb8bd96da6..37851fc511 100644 --- a/resources/lang/ar/admin/licenses/form.php +++ b/resources/lang/ar/admin/licenses/form.php @@ -1,6 +1,6 @@ 'أصل', 'checkin' => 'ادخال', @@ -18,5 +18,5 @@ return array( 'to_email' => 'مرخص إلى البريد الإلكتروني', 'to_name' => 'مرخص للاسم', 'update' => 'تحديث الترخيص', - 'checkout_help' => 'يجب عليك اخراج الترخيص إلى جهاز أو شخص. يمكنك اختيار كليهما، ولكن يجب أن يتطابق مالك الأصل مع الشخص الذي تم الاخراج له.' -); + 'checkout_help' => 'يجب عليك اخراج الترخيص إلى جهاز أو شخص. يمكنك اختيار كليهما، ولكن يجب أن يتطابق مالك الأصل مع الشخص الذي تم الاخراج له.', +]; diff --git a/resources/lang/ar/admin/licenses/general.php b/resources/lang/ar/admin/licenses/general.php index 9a9e0df1b7..24471007f6 100644 --- a/resources/lang/ar/admin/licenses/general.php +++ b/resources/lang/ar/admin/licenses/general.php @@ -1,6 +1,6 @@ 'حول التراخيص', 'about_licenses' => 'تستخدم التراخيص لتتبع البرمجيات. كل لديه عدد محدد من المقاعد التي يمكن اخراجها للأفراد', 'checkin' => 'ادخال مقعد الترخيص', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'تراخيص البرامج', 'user' => 'مستخدم', 'view' => 'عرض الترخيص', -); +]; diff --git a/resources/lang/ar/admin/licenses/message.php b/resources/lang/ar/admin/licenses/message.php index 89b7f9ef97..df03445120 100644 --- a/resources/lang/ar/admin/licenses/message.php +++ b/resources/lang/ar/admin/licenses/message.php @@ -1,6 +1,6 @@ 'الترخيص غير موجود.', 'user_does_not_exist' => 'المستخدم غير موجود.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'يجب تحديد أصل أو مستخدم، وليس كليهما.', 'not_found' => 'لم يتم العثور على الترخيص', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء الترخيص، يرجى إعادة المحاولة.', - 'success' => 'تم إنشاء الترخيص بنجاح.' - ), + 'success' => 'تم إنشاء الترخيص بنجاح.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'لم يتم حذف الملف. الرجاء المحاولة مرة اخرى.', 'success' => 'تم حذف الملف بنجاح.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'لم يتم تحميل الملف(ات). حاول مرة اخرى.', 'success' => 'تم تحميل الملف(ات) بنجاح.', 'nofiles' => 'لم تحدد أي ملفات للتحميل، أو أن الملف الذي تحاول تحميله كبير جدا', 'invalidfiles' => 'واحد أو أكثر من الملفات كبير جدا أو انه نوع ملف غير مسموح به. أنواع الملفات المسموح بها هي png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, و lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الترخيص، يرجى إعادة المحاولة', - 'success' => 'تم تحديث الترخيص بنجاح.' - ), + 'success' => 'تم تحديث الترخيص بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا الترخيص؟', 'error' => 'حدثت مشكلة أثناء حذف الترخيص. يرجى إعادة المحاولة.', - 'success' => 'تم حذف الترخيص بنجاح.' - ), + 'success' => 'تم حذف الترخيص بنجاح.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'حدثت مشكلة أثناء اخراج الترخيص. يرجى إعادة المحاولة.', - 'success' => 'تم اخراج الترخيص بنجاح' - ), + 'success' => 'تم اخراج الترخيص بنجاح', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'حدثت مشكلة في التحقق من الترخيص. يرجى إعادة المحاولة.', - 'success' => 'تم ادخال الترخيص بنجاح' - ), + 'success' => 'تم ادخال الترخيص بنجاح', + ], -); +]; diff --git a/resources/lang/ar/admin/licenses/table.php b/resources/lang/ar/admin/licenses/table.php index 10fc7de7f9..0dfc45ed58 100644 --- a/resources/lang/ar/admin/licenses/table.php +++ b/resources/lang/ar/admin/licenses/table.php @@ -1,6 +1,6 @@ 'عينت الى', 'checkout' => 'داخل\\خارج', @@ -14,4 +14,4 @@ return array( 'serial' => 'التسلسل', 'title' => 'الترخيص', -); +]; diff --git a/resources/lang/ar/admin/locations/message.php b/resources/lang/ar/admin/locations/message.php index 1dab8f3bde..2daf5036ba 100644 --- a/resources/lang/ar/admin/locations/message.php +++ b/resources/lang/ar/admin/locations/message.php @@ -1,27 +1,26 @@ 'الموقع غير موجود.', 'assoc_users' => 'هذا الموقع مرتبط حاليا بمستخدم واحد على الأقل ولا يمكن حذفه. يرجى تحديث المستخدمين لم يعد يشيروا إلى هذا الموقع ثم أعد المحاولة. ', 'assoc_assets' => 'هذا الموقع مرتبط حاليا بمادة عرض واحدة على الأقل ولا يمكن حذفها. يرجى تحديث مواد العرض لم تعد تشير إلى هذا الموقع ثم أعد المحاولة. ', 'assoc_child_loc' => 'هذا الموقع هو حاليا أحد الوالدين لموقع طفل واحد على الأقل ولا يمكن حذفه. يرجى تحديث مواقعك لم تعد تشير إلى هذا الموقع ثم أعد المحاولة.', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء الموقع، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء الموقع بنجاح.' - ), + 'success' => 'تم إنشاء الموقع بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الموقع، الرجاء المحاولة مرة أخرى', - 'success' => 'تم تحديث الموقع بنجاح.' - ), + 'success' => 'تم تحديث الموقع بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل تريد بالتأكيد حذف هذا الموقع؟', 'error' => 'حدثت مشكلة أثناء حذف الموقع. حاول مرة اخرى.', - 'success' => 'تم حذف الموقع بنجاح.' - ) + 'success' => 'تم حذف الموقع بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/locations/table.php b/resources/lang/ar/admin/locations/table.php index 9576954029..b7307f22f2 100644 --- a/resources/lang/ar/admin/locations/table.php +++ b/resources/lang/ar/admin/locations/table.php @@ -1,6 +1,6 @@ 'حول المواقع', 'about_locations' => 'يتم استخدام المواقع لتتبع معلومات الموقع للمستخدمين والأصول والعناصر الأخرى', 'assets_rtd' => 'الأصول', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'الأبوين', 'currency' => 'عملة الموقع', 'ldap_ou' => 'لداب البحث أو', - ); + ]; diff --git a/resources/lang/ar/admin/manufacturers/message.php b/resources/lang/ar/admin/manufacturers/message.php index 569536b9ff..b9b2628e66 100644 --- a/resources/lang/ar/admin/manufacturers/message.php +++ b/resources/lang/ar/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'الشركة المصنعة غير موجودة.', 'assoc_users' => 'هذه الشركة المصنعة مرتبطة حاليا مع موديل واحد على الأقل وبالتالي لا يمكن حذفها. يرجى تحديث الموديلات الخاصة بك بحيث لا تشير لهذه الشركة المصنعة وحاول مرة أخرى. ', - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء هذه الشركة المصنعة، يرجى المحاولة مرة أخرى.', - 'success' => 'تم إنشاء الشركة المصنعة بنجاح.' - ), + 'success' => 'تم إنشاء الشركة المصنعة بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الشركة المصنعة، يرجى إعادة المحاولة', - 'success' => 'تم تحديث الشركة المصنعة بنجاح.' - ), + 'success' => 'تم تحديث الشركة المصنعة بنجاح.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'لم تتم استعادة الشركة المصنعة، يرجى المحاولة مرة أخرى', - 'success' => 'تم إستعادة الشركة المصنعة بنجاح.' - ), + 'success' => 'تم إستعادة الشركة المصنعة بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذه الشركة المصنعة؟', 'error' => 'لقد حدثت مشكلة اثناء عملية حذف الشركة المصنعة، الرجاء المحاولة مرة اخرى.', - 'success' => 'تم حذف الشركة المصنعة بنجاح.' - ) + 'success' => 'تم حذف الشركة المصنعة بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/manufacturers/table.php b/resources/lang/ar/admin/manufacturers/table.php index ff5f3cff63..a6b178405d 100644 --- a/resources/lang/ar/admin/manufacturers/table.php +++ b/resources/lang/ar/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'حول الشركات المصنعة', 'about_manufacturers_text' => 'الشركات المصنعة هي الشركات التي تقوم بتصنيع الأصول الخاصة بك. يمكنك تخزين معلومات الاتصال بالدعم المهمة عنها هنا، والتي سيتم عرضها على صفحات تفاصيل الأصول.', 'asset_manufacturers' => 'مصنعي الأصول', @@ -13,4 +13,4 @@ return array( 'update' => 'تحديث الشركة المصنعة', 'url' => 'الرابط', -); +]; diff --git a/resources/lang/ar/admin/models/general.php b/resources/lang/ar/admin/models/general.php index 2d1722c571..4d6c5463a3 100644 --- a/resources/lang/ar/admin/models/general.php +++ b/resources/lang/ar/admin/models/general.php @@ -1,6 +1,6 @@ 'حول موديلات الأصول', 'about_models_text' => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.', 'deleted' => 'تم حذف هذا الموديل. انقر هنا لاستعادته .', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'أنت على وشك حذف :model_count من موديلات الأصول.', 'restore' => 'إستعادة الموديل', 'requestable' => 'يمكن للمستخدمين طلب هذا الموديل', - 'show_mac_address' => 'عرض حقل عنوان ماك MAC في الأصول لهذا الموديل', + 'show_mac_address' => 'عرض حقل عنوان ماك MAC في الأصول لهذا الموديل', 'view_deleted' => 'مشاهدة محذوفة', 'view_models' => 'عرض الموديلات', 'fieldset' => 'مجموعة حقول', 'no_custom_field' => 'لا يوجد حقول مخصصة', 'add_default_values' => 'أضف القيم الافتراضية', -); +]; diff --git a/resources/lang/ar/admin/models/message.php b/resources/lang/ar/admin/models/message.php index e690990305..d83bcc092b 100644 --- a/resources/lang/ar/admin/models/message.php +++ b/resources/lang/ar/admin/models/message.php @@ -1,42 +1,41 @@ 'الموديل غير موجود.', 'assoc_users' => 'هذا الموديل مرتبط حاليا بواحد أو أكثر من الأصول ولا يمكن حذفه. يرجى حذف الأصول، ثم محاولة الحذف مرة أخرى. ', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم انشاء الموديل، يرجى إعادة المحاولة.', 'success' => 'تم إنشاء الموديل بنجاح.', 'duplicate_set' => 'يوجد مسبقا موديل بهذا الاسم، الشركة المصنعة ورقم الموديل.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث الموديل، يرجى إعادة المحاولة', - 'success' => 'تم تحديث الموديل بنجاح.' - ), + 'success' => 'تم تحديث الموديل بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل تريد بالتأكيد حذف موديل الأصل هذا؟', 'error' => 'حدثت مشكلة أثناء حذف الموديل. حاول مرة اخرى.', - 'success' => 'تم حذف الموديل بنجاح.' - ), + 'success' => 'تم حذف الموديل بنجاح.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'لم تتم استعادة الموديل، يرجى إعادة المحاولة', - 'success' => 'تم إستعادة الموديل بنجاح.' - ), + 'success' => 'تم إستعادة الموديل بنجاح.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'لم يتم تغيير أي حقول، لذلك لم يتم تحديث أي شيء.', - 'success' => 'تم تحديث الموديل.' - ), + 'success' => 'تم تحديث الموديل.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'لم يتم اختيار أي موديلات، لذلك لم يتم حذف أي شيء.', 'success' => 'تم حذف success_count: من الموديلات!', - 'success_partial' => 'تم حذف:success_count: من الموديلات، ومع ذلك تعذر حذف fail_count: نظرًا لأنها لا تزال تحتوي على أصول مقترنة بها.' - ), + 'success_partial' => 'تم حذف:success_count: من الموديلات، ومع ذلك تعذر حذف fail_count: نظرًا لأنها لا تزال تحتوي على أصول مقترنة بها.', + ], -); +]; diff --git a/resources/lang/ar/admin/models/table.php b/resources/lang/ar/admin/models/table.php index d1f27a13fc..e90871cc65 100644 --- a/resources/lang/ar/admin/models/table.php +++ b/resources/lang/ar/admin/models/table.php @@ -1,6 +1,6 @@ 'إنشاء موديل الأصل', 'created_at' => 'أنشئت في', @@ -14,4 +14,4 @@ return array( 'update' => 'تحديث موديل الأصول', 'clone' => 'استنساخ الموديل', 'edit' => 'تعديل الموديل', -); +]; diff --git a/resources/lang/ar/admin/reports/general.php b/resources/lang/ar/admin/reports/general.php index 362e71ac59..da261494b2 100644 --- a/resources/lang/ar/admin/reports/general.php +++ b/resources/lang/ar/admin/reports/general.php @@ -1,5 +1,5 @@ 'حدد الخيارات التي تريدها لتقرير الأصول الخاصة بك.' -); +return [ + 'info' => 'حدد الخيارات التي تريدها لتقرير الأصول الخاصة بك.', +]; diff --git a/resources/lang/ar/admin/reports/message.php b/resources/lang/ar/admin/reports/message.php index 9c1a9fc16f..8d619b2f7b 100644 --- a/resources/lang/ar/admin/reports/message.php +++ b/resources/lang/ar/admin/reports/message.php @@ -1,5 +1,5 @@ 'يجب عليك أن تختار اختيار واحد على الأقل.' -); +return [ + 'error' => 'يجب عليك أن تختار اختيار واحد على الأقل.', +]; diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php index 7792963205..fdd5af0302 100644 --- a/resources/lang/ar/admin/settings/general.php +++ b/resources/lang/ar/admin/settings/general.php @@ -1,12 +1,12 @@ 'الدليل النشط', 'ad_domain' => 'مجال الدليل النشط', 'ad_domain_help' => 'هذا هو أحيانا نفس نطاق البريد الإلكتروني الخاص بك، ولكن ليس دائما.', 'ad_append_domain_label' => 'إلحاق اسم domain', 'ad_append_domain' => 'إلحاق اسم domain إلى حقل اسم المستخدم', - 'ad_append_domain_help' => 'المستخدم غير مطلوب لكتابة "username@domain.local" ، فإنها يمكن أن تكتب فقط "اسم المستخدم".' , + 'ad_append_domain_help' => 'المستخدم غير مطلوب لكتابة "username@domain.local" ، فإنها يمكن أن تكتب فقط "اسم المستخدم".', 'admin_cc_email' => 'نسخة اضافية للبريد الإكتروني', 'admin_cc_email_help' => 'إذا كنت ترغب في إرسال نسخة من رسائل البريد الإلكتروني لتسجيل الدخول / الخروج التي يتم إرسالها إلى المستخدمين إلى حساب بريد إلكتروني إضافي، فقم بإدخالها هنا. خلاف ذلك، اترك هذه الخانة فارغة.', 'is_ad' => 'هذا هو ملقم أكتيف ديركتوري', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'انتهاء فترة التنبيهات (بالأيام)', 'alert_inv_threshold' => 'عتبة تنبيه المخزون', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ارقام تعريف الاصول', 'audit_interval' => 'مدة التدقيق', 'audit_interval_help' => 'إذا كان مطلوبا منك مراجعة أصولك الفعلية بشكل دوري، قم بإدخال المدة بالأشهر.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'أدخل رمز عاملين', 'two_factor_config_complete' => 'إرسال الرمز', 'two_factor_enabled_edit_not_allowed' => 'لا يسمح لك المشرف بتعديل هذا الإعداد.', - 'two_factor_enrollment_text' => "التوثيق ذو العاملين 2FA اجباري، ولكن لم يتم تسجيل جهازك بعد. افتح تطبيق غوغل للتوثيق Google Authenticator وافحص رمز الاستجابة السريعة QR أدناه لتسجيل جهازك. بعد تسجيل جهازك، أدخل الرمز أدناه", + 'two_factor_enrollment_text' => 'التوثيق ذو العاملين 2FA اجباري، ولكن لم يتم تسجيل جهازك بعد. افتح تطبيق غوغل للتوثيق Google Authenticator وافحص رمز الاستجابة السريعة QR أدناه لتسجيل جهازك. بعد تسجيل جهازك، أدخل الرمز أدناه', 'require_accept_signature' => 'يتطلب التوقيع', 'require_accept_signature_help_text' => 'سيتطلب تمكين هذه الميزة من المستخدمين تسجيل الدخول فعليا عند قبول مادة العرض.', 'left' => 'اليسار', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'تحديد المربع سيؤدي الى فرض سياسة التفرد على الرقم التسلسلي للمتلكات', 'zerofill_count' => 'طول ترميز الأصل، بما في ذلك تعبئة الاصفار', 'username_format_help' => 'سيتم استخدام هذا الإعداد فقط من قبل عملية الاستيراد إذا لم يتم توفير اسم المستخدم ويتعين علينا إنشاء اسم مستخدم لك.', -); +]; diff --git a/resources/lang/ar/admin/settings/message.php b/resources/lang/ar/admin/settings/message.php index 2d687d3c8a..e9c19ff8f2 100644 --- a/resources/lang/ar/admin/settings/message.php +++ b/resources/lang/ar/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'حدث خطأ أثناء التحديث. ', - 'success' => 'تم تحديث الإعدادات بنجاح.' - ), - 'backup' => array( + 'success' => 'تم تحديث الإعدادات بنجاح.', + ], + 'backup' => [ 'delete_confirm' => 'هل تريد بالتأكيد حذف ملف النسخة الاحتياطية هذا؟ لا يمكن التراجع عن هذا الإجراء.', 'file_deleted' => 'تم حذف ملف النسخ الاحتياطي بنجاح.', 'generated' => 'تم إنشاء ملف نسخ احتياطي جديد بنجاح.', 'file_not_found' => 'تعذر العثور على ملف النسخ الاحتياطي هذا على الملقم.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'حدث خطأ أثناء التطهير.', 'validation_failed' => 'تأكيد التطهير غير صحيح. الرجاء كتابة الكلمة "ديليت" في مربع التأكيد.', - 'success' => 'تمت إزالة السجلات المحذوفة بنجاح.' - ), + 'success' => 'تمت إزالة السجلات المحذوفة بنجاح.', + ], -); +]; diff --git a/resources/lang/ar/admin/statuslabels/message.php b/resources/lang/ar/admin/statuslabels/message.php index 79c14f3f83..bdb7a6dda0 100644 --- a/resources/lang/ar/admin/statuslabels/message.php +++ b/resources/lang/ar/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'تسمية الحالة غير موجودة.', 'assoc_assets' => 'ترتبط تسمية الحالة هذه مع واحد على الأقل من الأصول ولا يمكن حذفها. يرجى تحديث الأصول حيث لا تشير إلى هذه الحالة وحاول مرة أخرى. ', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء تسمية الحالة، يرجى إعادة المحاولة.', - 'success' => 'تم إنشاء تسمية الحالة بنجاح.' - ), + 'success' => 'تم إنشاء تسمية الحالة بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث تسمية الحالة، يرجى إعادة المحاولة', - 'success' => 'تم تحديث تسمية الحالة بنجاح.' - ), + 'success' => 'تم تحديث تسمية الحالة بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل تريد بالتأكيد حذف تسمية الحالة هذه؟', 'error' => 'حدثت مشكلة أثناء حذف تسمية الحالة. حاول مرة اخرى.', - 'success' => 'تم حذف تسمية الحالة بنجاح.' - ), + 'success' => 'تم حذف تسمية الحالة بنجاح.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'لا يمكن اخراج هذه الأصول لأي شخص.', 'deployable' => 'يمكن اخراج هذه الأصول. بعد تعيينهم، سيتم اعطاءها الحالة تم التوزيع.', 'archived' => 'لا اخراج هذه الأصول، ولن تظهر إلا في المؤرشفة. وهذا مفيد للاحتفاظ بالمعلومات عن الأصول لأغراض الميزانية / التاريخية وايضا الاحتفاظ بها خارج قائمة الأصول اليومية.', 'pending' => 'لا يمكن بعد اخراج هذه الأصول لأي شخص، غالبا ما تستخدم للأصول اللتي قيد الصيانة، ولكن من المتوقع أن تعود إلى الاستخدام.', - ), + ], -); +]; diff --git a/resources/lang/ar/admin/statuslabels/table.php b/resources/lang/ar/admin/statuslabels/table.php index 5435406090..571b5bc60b 100644 --- a/resources/lang/ar/admin/statuslabels/table.php +++ b/resources/lang/ar/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'حول تسميات الحالة', 'archived' => 'مؤرشف', 'create' => 'إنشاء تسمية الحالة', @@ -16,4 +16,4 @@ return array( 'title' => 'تسميات الحالة', 'undeployable' => 'غير قابل للتوزيع', 'update' => 'تحديث تسمية الحالة', -); +]; diff --git a/resources/lang/ar/admin/suppliers/message.php b/resources/lang/ar/admin/suppliers/message.php index 9b93fe799d..eb16ea38b1 100644 --- a/resources/lang/ar/admin/suppliers/message.php +++ b/resources/lang/ar/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'المورد غير مجود.', - - 'create' => array( + 'create' => [ 'error' => 'لم يتم إنشاء المورد، الرجاء المحاولة مرة أخرى.', - 'success' => 'تم إنشاء المورد بنجاح.' - ), + 'success' => 'تم إنشاء المورد بنجاح.', + ], - 'update' => array( + 'update' => [ 'error' => 'لم يتم تحديث المورد، يرجى إعادة المحاولة', - 'success' => 'تم تحديث المورد بنجاح.' - ), + 'success' => 'تم تحديث المورد بنجاح.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا المورد؟', 'error' => 'حدثت مشكلة أثناء حذف المورد. حاول مرة اخرى.', 'success' => 'تم حذف المورد بنجاح.', 'assoc_assets' => 'هذا المورد مرتبط حاليا مع :asset_count من الأصول على الاقل ولا يمكن حذفه. الرجاء تحديث الأصول لكي لا تشير الى هذا المورد ثم حاول مرة أخرى. ', 'assoc_licenses' => 'هذا المورد مرتبط حاليا مع :licenses_count من التراخيص ولا يمكن حذفه. الرجاء تحديث التراخيص الخاصة بك لكي لا تشير الى هذا المورد وحاول مرة أخرى. ', 'assoc_maintenances' => 'هذا المورد مرتبط حاليا مع :asset_maintenances_count من سندات صيانة الأصول ولا يمكن حذفه. الرجاء تحديث سندات صيانة الأصول الخاصة بك لكي لا تشير الى هذا المورد وحاول مرة أخرى. ', - ) + ], -); +]; diff --git a/resources/lang/ar/admin/suppliers/table.php b/resources/lang/ar/admin/suppliers/table.php index 6d27b60ecb..9db9f96074 100644 --- a/resources/lang/ar/admin/suppliers/table.php +++ b/resources/lang/ar/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'حول الموردين', 'about_suppliers_text' => 'يتم استخدام الموردين لتتبع مصدر العناصر', 'address' => 'عنوان المورد', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'عرض الأصول لـ', 'zip' => 'الرمز البريدي', -); +]; diff --git a/resources/lang/ar/admin/users/general.php b/resources/lang/ar/admin/users/general.php index 52c7e11df2..7a4fd46404 100644 --- a/resources/lang/ar/admin/users/general.php +++ b/resources/lang/ar/admin/users/general.php @@ -1,7 +1,6 @@ 'هذا المستخدم تسجيل الدخول', 'activated_disabled_help_text' => 'لا يمكنك تعديل حالة التنشيط لحسابك الخاص.', 'assets_user' => 'الأصول التي تم اخراجها إلى :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'تعديل المستخدم', 'filetype_info' => 'انواع صيغ الملفات المسوح بها هي png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'الأرشيف الخاص بـ :name', - 'info' => 'معلومات', + 'info' => 'معلومات', 'restore_user' => 'انقر هنا لاستعادتها.', 'last_login' => 'آخر دخول للمستخدم', 'ldap_config_text' => 'يمكن العثور على إعدادات تهيئة لداب المشرف> الإعدادات. سيتم تعيين الموقع (اختياري) المحدد لجميع المستخدمين الذين تم استيرادهم.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'تسمح إعدادات المشرف الحالية بإنفاذ انتقائي للمصادقة الثنائية.', 'two_factor_enrolled' => '2FA الجهاز المسجلين', 'two_factor_active' => '2FA نشط', - ); + ]; diff --git a/resources/lang/ar/admin/users/message.php b/resources/lang/ar/admin/users/message.php index f6aab5ad60..e3ca753752 100644 --- a/resources/lang/ar/admin/users/message.php +++ b/resources/lang/ar/admin/users/message.php @@ -1,6 +1,6 @@ 'لقد قبلت هذا الأصل بنجاح.', 'declined' => 'لقد رفضت هذا الأصل بنجاح.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'لم يتم تكوين دمج لداب لهذا التثبيت.', 'password_resets_sent' => 'تم إرسال رابط إعادة تعيين كلمة المرور للمستخدمين المحددين الذين تم تفعيلهم ولديهم عناوين بريد إلكتروني صالحة.', - - 'success' => array( + 'success' => [ 'create' => 'تم إنشاء المستخدم بنجاح.', 'update' => 'تم تعديل المستخدم بنجاح.', 'update_bulk' => 'تم تحديث المستخدمين بنجاح!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'تم إلغاء التعليق عن المستخدم بنجاح.', 'restored' => 'تم استعادة المستخدم بنجاح.', 'import' => 'تم استيراد المستخدمين بنجاح.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'حدث خطأ ما أثناء إنشاء هذا المستخدم. حاول مرة أخرى.', 'update' => 'حدث خطأ أثناء تحديث هذا المستخدم. حاول مرة أخرى.', 'delete' => 'حدث خطأ ما أثناء حذف هذا المستخدم. حاول مرة أخرى.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'تعذر البحث في خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP.
الخطأ من خادم LDAP:', 'ldap_could_not_get_entries' => 'تعذر الحصول على إدخالات من خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP.
الخطأ من خادم LDAP:', 'password_ldap' => 'تتم إدارة كلمة المرور لهذا الحساب بواسطة لداب / أكتيف ديركتوري. يرجى الاتصال بقسم تقنية المعلومات لتغيير كلمة المرور.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'لم يتم حذف الملف. حاول مرة اخرى.', 'success' => 'تم حذف الملف بنجاح.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'لم يتم تحميل الملف. حاول مرة اخرى.', 'success' => 'تم تحميل الملف بنجاح.', 'nofiles' => 'لم تحدد أية ملفات للتحميل', 'invalidfiles' => 'واحد أو أكثر من الملفات كبير جدا أو هو نوع ملف غير مسموح به. أنواع الملفات المسموح بها هي ينغ و جيف و جبغ و دوك و دوك و بدف و تكست.', - ), + ], -); +]; diff --git a/resources/lang/ar/admin/users/table.php b/resources/lang/ar/admin/users/table.php index b1ae39f024..7c57896489 100644 --- a/resources/lang/ar/admin/users/table.php +++ b/resources/lang/ar/admin/users/table.php @@ -1,6 +1,6 @@ 'نشط', 'allow' => 'السماح', 'checkedout' => 'الأصول', @@ -28,11 +28,11 @@ return array( 'show_current' => 'عرض المستخدمين الحاليين', 'show_deleted' => 'عرض المستخدمين المحذوفين', 'title' => 'المسمى الوظيفي', - 'to_restore_them' => 'لاستعادتها.', + 'to_restore_them' => 'لاستعادتها.', 'updateuser' => 'تحديث المستخدم', 'username' => 'اسم المستخدم', - 'user_deleted_text' => 'تم وضع علامة على هذا المستخدم على أنه محذوف.', + 'user_deleted_text' => 'تم وضع علامة على هذا المستخدم على أنه محذوف.', 'username_note' => '(يستخدم فقط للربط مع الـ Active Directory وليس لغرض تسجيل الدخول.)', 'cloneuser' => 'نسخ المستخدم', 'viewusers' => 'عرض المستخدمين', -); +]; diff --git a/resources/lang/ar/auth/general.php b/resources/lang/ar/auth/general.php index 5cdd5221fc..79b895012b 100644 --- a/resources/lang/ar/auth/general.php +++ b/resources/lang/ar/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ar/auth/message.php b/resources/lang/ar/auth/message.php index d668422b5b..9aa2f118ee 100644 --- a/resources/lang/ar/auth/message.php +++ b/resources/lang/ar/auth/message.php @@ -1,6 +1,6 @@ 'حساب بهذا البريد الإلكتروني موجود مسبقا.', 'account_not_found' => 'اسم المستخدم أو كلمة المرور غير صحيحة.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'تم حظر حساب المستخدم هذا.', 'throttle' => 'هناك عدد كبير جدا من محاولات تسجيل الدخول الفاشلة. يرجى المحاولة مرة أخرى خلال :minutes دقيقة.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'جهازك مسجل مسبقا.', 'success' => 'قمت بتسجيل الدخول بنجاح.', 'code_required' => 'رمز Two-factor مطلوب.', 'invalid_code' => 'رمز Two-factor غير صالح.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'حدثت مشكلة أثناء محاولة تسجيل دخولك، الرجاء إعادة المحاولة.', 'success' => 'قمت بتسجيل الدخول بنجاح.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'حدثت مشكلة أثناء محاولة تسجيل دخولك، الرجاء إعادة المحاولة.', 'success' => 'قمت بتسجيل الدخول بنجاح.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'حدثت مشكلة أثناء محاولة إنشاء حسابك، يرجى إعادة المحاولة.', 'success' => 'تم إنشاء الحساب بنجاح.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'حدثت مشكلة أثناء محاولة الحصول على رمز إعادة تعيين كلمة المرور، الرجاء إعادة المحاولة.', 'success' => 'إذا كان عنوان البريد الإلكتروني هذا موجود في نظامنا، تم إرسال بريد إلكتروني لاسترداد كلمة المرور.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'حدثت مشكلة أثناء محاولة إعادة تعيين كلمة المرور، الرجاء إعادة المحاولة.', 'success' => 'تمت إعادة تعيين كلمة المرور بنجاح.', - ), + ], - -); +]; diff --git a/resources/lang/ar/button.php b/resources/lang/ar/button.php index e53c573472..fabb8f834c 100644 --- a/resources/lang/ar/button.php +++ b/resources/lang/ar/button.php @@ -1,6 +1,6 @@ 'الإجراءات', 'add' => 'إضافة جديد', 'cancel' => 'إلغاء', @@ -11,7 +11,7 @@ return array( 'request' => 'طلب', 'submit' => 'إرسال', 'upload' => 'رفع', - 'select_file' => 'حدد ملف ...', + 'select_file' => 'حدد ملف ...', 'select_files' => 'إختيار ملف...', 'generate_labels' => '{1} انشاء تسميات [2,*] توليد تسميات', -); +]; diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php index 12c5516642..0d1ddd5de9 100644 --- a/resources/lang/ar/general.php +++ b/resources/lang/ar/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'المٌدخل', 'user_requests_count' => 'الطلبات', 'city' => 'المدينة', - 'click_here' => 'انقر هنا', + 'click_here' => 'انقر هنا', 'clear_selection' => 'مسح التحديد', 'companies' => 'الشركات', 'company' => 'شركة', 'component' => 'مكون', 'components' => 'المكونات', - 'complete' => 'اكتمال', + 'complete' => 'اكتمال', 'consumable' => 'مستهلكات', 'consumables' => 'المواد الاستهلاكية', 'country' => 'الدولة', diff --git a/resources/lang/ar/help.php b/resources/lang/ar/help.php index 7c2b8ae7b0..8b912823d6 100644 --- a/resources/lang/ar/help.php +++ b/resources/lang/ar/help.php @@ -1,6 +1,6 @@ "المزيد من المعلومات", + 'more_info_title' => 'المزيد من المعلومات', - "audit_help" => "التحقق من هذا المربع سيؤدي إلى تعديل سجل الأصول لعكس هذا الموقع الجديد. تركه غير محدد سيلاحظ ببساطة الموقع في سجل المراجعة.

لاحظ أن هذا الأصل تم التحقق منه، فهو لن يغير موقع الشخص أو الأصل أو الموقع الذي يتم التحقق منه إليه.", + 'audit_help' => 'التحقق من هذا المربع سيؤدي إلى تعديل سجل الأصول لعكس هذا الموقع الجديد. تركه غير محدد سيلاحظ ببساطة الموقع في سجل المراجعة.

لاحظ أن هذا الأصل تم التحقق منه، فهو لن يغير موقع الشخص أو الأصل أو الموقع الذي يتم التحقق منه إليه.', 'assets' => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'يمكنك إعداد استهلاك الأصول لاستهلاك الأصول بناء على الاستهلاك الثابت للقيمة.', - - -); +]; diff --git a/resources/lang/ar/mail.php b/resources/lang/ar/mail.php index 772be1861e..cc471e1f9c 100644 --- a/resources/lang/ar/mail.php +++ b/resources/lang/ar/mail.php @@ -1,6 +1,6 @@ 'ألغى المستخدم طلب عنصر على الموقع', 'a_user_requested' => 'طلب مستخدم عنصر على الموقع', 'accessory_name' => 'اسم الملحق:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'تذكير: تاريخ تحقق :name يقترب من الموعد النهائي', 'Expected_Checkin_Date' => 'من المقرر أن يتم التحقق من الأصول التي تم إخراجها إليك في :date', - 'your_assets' => 'عرض الأصول الخاصة بك' -); + 'your_assets' => 'عرض الأصول الخاصة بك', +]; diff --git a/resources/lang/ar/pagination.php b/resources/lang/ar/pagination.php index ca1d84b247..d91edb046e 100644 --- a/resources/lang/ar/pagination.php +++ b/resources/lang/ar/pagination.php @@ -1,6 +1,6 @@ 'التالي;raquo&', -); +]; diff --git a/resources/lang/ar/passwords.php b/resources/lang/ar/passwords.php index 54e1ff9258..218aa83e85 100644 --- a/resources/lang/ar/passwords.php +++ b/resources/lang/ar/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'تم إرسال رابط كلمة المرور الخاصة بك!', 'user' => 'لم يتم العثور على اسم مستخدم فعّال مرتبط بعنوان ذلك البريد الالكتروني.', ]; - diff --git a/resources/lang/ar/reminders.php b/resources/lang/ar/reminders.php index 9f5848a50c..d877288ada 100644 --- a/resources/lang/ar/reminders.php +++ b/resources/lang/ar/reminders.php @@ -1,6 +1,6 @@ "كلمة المرور يجب أن تتكون من ستة خانات وتكون متطابقة مع خانة التأكيد.", + 'password' => 'كلمة المرور يجب أن تتكون من ستة خانات وتكون متطابقة مع خانة التأكيد.', - "user" => "إسم المستخدم أو كلمة المرور غير صحيحة", + 'user' => 'إسم المستخدم أو كلمة المرور غير صحيحة', - "token" => "رمز إعادة ضبط كلمة المرور غير مقبول.", + 'token' => 'رمز إعادة ضبط كلمة المرور غير مقبول.', - "sent" => "إذا وجد بريد إلكتروني مطابق، تم إرسال التذكير بكلمة المرور!", + 'sent' => 'إذا وجد بريد إلكتروني مطابق، تم إرسال التذكير بكلمة المرور!', -); +]; diff --git a/resources/lang/ar/table.php b/resources/lang/ar/table.php index ee7428d7c0..0135a3044a 100644 --- a/resources/lang/ar/table.php +++ b/resources/lang/ar/table.php @@ -1,10 +1,10 @@ 'الإجراءات', 'action' => 'الإجراء', 'by' => 'بواسطة', 'item' => 'عنصر', -); +]; diff --git a/resources/lang/ar/validation.php b/resources/lang/ar/validation.php index b0b0769767..9e5cfaa73e 100644 --- a/resources/lang/ar/validation.php +++ b/resources/lang/ar/validation.php @@ -1,6 +1,6 @@ 'لقد تم أخذ :attribute مسبقا.', 'uploaded' => 'لقد فشل تحميل :attribute.', 'url' => 'ان تنسيق :attribute غير صالح.', - "unique_undeleted" => ":attribute يجب ان تكون فريدة.", + 'unique_undeleted' => ':attribute يجب ان تكون فريدة.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "يحتوي الحقل :attribute على حرف غير مسموح به.", - "email_array" => "عنوان بريد إلكتروني واحد أو أكثر غير صالح.", - "hashed_pass" => "كلمة المرور الحالية غير صحيحة", + 'alpha_space' => 'يحتوي الحقل :attribute على حرف غير مسموح به.', + 'email_array' => 'عنوان بريد إلكتروني واحد أو أكثر غير صالح.', + 'hashed_pass' => 'كلمة المرور الحالية غير صحيحة', 'dumbpwd' => 'كلمة المرور هذه شائعة جدا.', - "statuslabel_type" => "يجب تحديد نوع تسمية حالة صالح", + 'statuslabel_type' => 'يجب تحديد نوع تسمية حالة صالح', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/bg/admin/accessories/general.php b/resources/lang/bg/admin/accessories/general.php index b9cd2d55ec..ac1f1262e8 100644 --- a/resources/lang/bg/admin/accessories/general.php +++ b/resources/lang/bg/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Категория аксесоари', 'accessory_name' => 'Аксесоар', 'checkout' => 'Отписване на аксесоар', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Използване на EULA по подразбиране.', 'use_default_eula_disabled' => 'Използване на EULA по подразбиране Няма EULA по подразбиране. Добавете я в Настройки.', -); +]; diff --git a/resources/lang/bg/admin/accessories/message.php b/resources/lang/bg/admin/accessories/message.php index 5101415a34..6931c0c9e9 100644 --- a/resources/lang/bg/admin/accessories/message.php +++ b/resources/lang/bg/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Аксесоарът [:id] не съществува.', 'assoc_users' => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.', - 'create' => array( + 'create' => [ 'error' => 'Аксесоарът не беше създаден. Моля опитайте отново.', - 'success' => 'Аксесоарът създаден успешно.' - ), + 'success' => 'Аксесоарът създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Аксесоарът не беше обновен. Моля опитайте отново.', - 'success' => 'Аксесоарът обновен успешно.' - ), + 'success' => 'Аксесоарът обновен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че искате да изтриете този аксесоар?', 'error' => 'Възникна проблем при изтриването на този аксесоар. Моля опитайте отново.', - 'success' => 'Аксесоарът бе изтрит успешно.' - ), + 'success' => 'Аксесоарът бе изтрит успешно.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Аксесоарът не беше изписан. Моля опитайте отново.', 'success' => 'Аксесоарът изписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ), + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Аксесоарът не беше вписан. Моля опитайте отново.', 'success' => 'Аксесоарът вписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ) + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - -); +]; diff --git a/resources/lang/bg/admin/accessories/table.php b/resources/lang/bg/admin/accessories/table.php index 93badac4b7..d8f24c5f07 100644 --- a/resources/lang/bg/admin/accessories/table.php +++ b/resources/lang/bg/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Сваляне на CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Сваляне на CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Утвърждаване', 'title' => 'Аксесоар', - -); +]; diff --git a/resources/lang/bg/admin/asset_maintenances/form.php b/resources/lang/bg/admin/asset_maintenances/form.php index 6c038d272c..6c64424ff3 100644 --- a/resources/lang/bg/admin/asset_maintenances/form.php +++ b/resources/lang/bg/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Време за поддръжка на актив (в дни)', 'notes' => 'Бележки', 'update' => 'Редакция на поддръжка на актив', - 'create' => 'Създаване на поддръжка на актив' + 'create' => 'Създаване на поддръжка на актив', ]; diff --git a/resources/lang/bg/admin/asset_maintenances/message.php b/resources/lang/bg/admin/asset_maintenances/message.php index e0471376cb..3c885424e7 100644 --- a/resources/lang/bg/admin/asset_maintenances/message.php +++ b/resources/lang/bg/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Потвърдете изтриването на поддръжката на актив.', 'error' => 'Проблем при изтриването на поддръжка на актив. Моля опитайте отново.', - 'success' => 'Поддръжката на актив изтрита успешно.' + 'success' => 'Поддръжката на актив изтрита успешно.', ], 'create' => [ 'error' => 'Поддръжката на актив не бе създадена. Моля опитайте отново.', - 'success' => 'Поддръжката на актив създадена успешно.' + 'success' => 'Поддръжката на актив създадена успешно.', ], 'edit' => [ 'error' => 'Поддръжката на активите не бе редактирана. Моля, опитайте отново.', - 'success' => 'Активирането на активите бе редактирано успешно.' + 'success' => 'Активирането на активите бе редактирано успешно.', ], 'asset_maintenance_incomplete' => 'Все още неприключила', 'warranty' => 'Гаранция', 'not_warranty' => 'Без гаранция', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/bg/admin/asset_maintenances/table.php b/resources/lang/bg/admin/asset_maintenances/table.php index b1c37c3ab2..56d197430a 100644 --- a/resources/lang/bg/admin/asset_maintenances/table.php +++ b/resources/lang/bg/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Поддръжка на активи', 'asset_name' => 'Име на Актив', 'is_warranty' => 'Гаранция', - 'dl_csv' => 'Сваляне на CSV' + 'dl_csv' => 'Сваляне на CSV', ]; diff --git a/resources/lang/bg/admin/categories/general.php b/resources/lang/bg/admin/categories/general.php index 1de78f6eb0..bc1be43830 100644 --- a/resources/lang/bg/admin/categories/general.php +++ b/resources/lang/bg/admin/categories/general.php @@ -1,6 +1,6 @@ 'Категории на активи', 'category_name' => 'Име на категория', 'checkin_email' => 'Изпращане на email до потребителя при вписване/изписване на активи.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Използване на EULA по подразбиране.', 'use_default_eula_disabled' => 'Използване на EULA по подразбиране Няма EULA по подразбиране. Добавете я в Настройки.', -); +]; diff --git a/resources/lang/bg/admin/categories/message.php b/resources/lang/bg/admin/categories/message.php index fb6fef505b..2fbf4069a5 100644 --- a/resources/lang/bg/admin/categories/message.php +++ b/resources/lang/bg/admin/categories/message.php @@ -1,25 +1,25 @@ 'Категорията не съществува.', 'assoc_models' => 'Тази категория е свързана с поне един модел или не може да бъде изтрита Моля проверете за модели, които все още се препращат към тази категория и опитайте отново.', 'assoc_items' => 'Тази категория е свързана с поне един :asset_type или не може да бъде изтрита Моля проверете за :asset_type, които все още се препращат към тази категория и опитайте отново.', - 'create' => array( + 'create' => [ 'error' => 'Категорията не беше създадена. Моля опитайте отново.', - 'success' => 'Категорията е създадена.' - ), + 'success' => 'Категорията е създадена.', + ], - 'update' => array( + 'update' => [ 'error' => 'Категорията не беше обновена. Моля опитайте отново', - 'success' => 'Категорията е обновена успешно.' - ), + 'success' => 'Категорията е обновена успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Желаете ли да изтриете тази категория?', 'error' => 'Проблем при изтриване на категорията. Моля опитайте отново.', - 'success' => 'Категорията бе изтрита успешно.' - ) + 'success' => 'Категорията бе изтрита успешно.', + ], -); +]; diff --git a/resources/lang/bg/admin/categories/table.php b/resources/lang/bg/admin/categories/table.php index dc254499f5..2e10303330 100644 --- a/resources/lang/bg/admin/categories/table.php +++ b/resources/lang/bg/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Горна категория', 'require_acceptance' => 'Утвърждаване', 'title' => 'Категория на актива', -); +]; diff --git a/resources/lang/bg/admin/companies/general.php b/resources/lang/bg/admin/companies/general.php index e0249c669b..e3602579d4 100644 --- a/resources/lang/bg/admin/companies/general.php +++ b/resources/lang/bg/admin/companies/general.php @@ -1,4 +1,5 @@ 'Изберете компания', ]; diff --git a/resources/lang/bg/admin/companies/message.php b/resources/lang/bg/admin/companies/message.php index 1bdb61ed65..6e2976c8a3 100644 --- a/resources/lang/bg/admin/companies/message.php +++ b/resources/lang/bg/admin/companies/message.php @@ -1,18 +1,19 @@ 'Компанията не съществува.', 'assoc_users' => 'Тази компания е свързана с поне един модел или не може да бъде изтрита. Моля проверете за модели, които все още се препращат към тази компания и опитайте отново.', - 'create' => array( + 'create' => [ 'error' => 'Компанията не беше създадена, моля опитайте отново.', - 'success' => 'Компанията създадена успешно.' - ), - 'update' => array( + 'success' => 'Компанията създадена успешно.', + ], + 'update' => [ 'error' => 'Компанията не беше обновена, моля опитайте отново.', - 'success' => 'Компанията обновена успешно.' - ), - 'delete' => array( + 'success' => 'Компанията обновена успешно.', + ], + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете тази компания?', 'error' => 'Възникна проблем при изтриването на компанията. Моля опитайте отново.', - 'success' => 'Компанията бе изтрита успешно.' - ) -); + 'success' => 'Компанията бе изтрита успешно.', + ], +]; diff --git a/resources/lang/bg/admin/companies/table.php b/resources/lang/bg/admin/companies/table.php index aba85f2313..fcb76b1f12 100644 --- a/resources/lang/bg/admin/companies/table.php +++ b/resources/lang/bg/admin/companies/table.php @@ -1,9 +1,10 @@ 'Компании', 'create' => 'Създаване на компания', 'title' => 'Компания', 'update' => 'Редакция на комания', 'name' => 'Име на компания', 'id' => 'ID', -); +]; diff --git a/resources/lang/bg/admin/components/general.php b/resources/lang/bg/admin/components/general.php index b55bbc5ae0..65378ad060 100644 --- a/resources/lang/bg/admin/components/general.php +++ b/resources/lang/bg/admin/components/general.php @@ -1,6 +1,6 @@ 'Име на компонент', 'checkin' => 'Вписване на компонент', 'checkout' => 'Изписване на компонент', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Оставащо', 'total' => 'Общо', 'update' => 'Обновяване на компонент', -); +]; diff --git a/resources/lang/bg/admin/components/message.php b/resources/lang/bg/admin/components/message.php index 1a83a345f3..a7b59418c4 100644 --- a/resources/lang/bg/admin/components/message.php +++ b/resources/lang/bg/admin/components/message.php @@ -1,36 +1,35 @@ 'Компонентът не съществува.', - 'create' => array( + 'create' => [ 'error' => 'Компонентът не беше създаден, моля опитайте отново.', - 'success' => 'Компонентът създаден успешно.' - ), + 'success' => 'Компонентът създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Компонентът не беше обновен, моля опитайте отново.', - 'success' => 'Компонентът обновен успешно.' - ), + 'success' => 'Компонентът обновен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете този компонент?', 'error' => 'Възникна проблем при изтриването на компонента. Моля опитайте отново.', - 'success' => 'Компонентът бе изтрит успешно.' - ), + 'success' => 'Компонентът бе изтрит успешно.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Компонентът не беше отписан, моля опитайте отново.', 'success' => 'Компонентът отписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ), + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Компонентът не беше вписан, моля опитайте отново.', 'success' => 'Компонентът вписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ) + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - -); +]; diff --git a/resources/lang/bg/admin/components/table.php b/resources/lang/bg/admin/components/table.php index c2e9422e2f..fbec5f15a7 100644 --- a/resources/lang/bg/admin/components/table.php +++ b/resources/lang/bg/admin/components/table.php @@ -1,5 +1,5 @@ 'Име на компонент.', -); +]; diff --git a/resources/lang/bg/admin/consumables/general.php b/resources/lang/bg/admin/consumables/general.php index 5792f67ffc..306cb5e087 100644 --- a/resources/lang/bg/admin/consumables/general.php +++ b/resources/lang/bg/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Отписване на консумативи към потребител', 'consumable_name' => 'Консуматив', 'create' => 'Създаване на консуматив', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Остава', 'total' => 'Oбщо', 'update' => 'Обновяване на консуматив', -); +]; diff --git a/resources/lang/bg/admin/consumables/message.php b/resources/lang/bg/admin/consumables/message.php index a1e21eea01..2b5b62e7a8 100644 --- a/resources/lang/bg/admin/consumables/message.php +++ b/resources/lang/bg/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Консуматива не съществува.', - 'create' => array( + 'create' => [ 'error' => 'Консумативът не беше създаден. Моля опитайте отново.', - 'success' => 'Консумативът създаден успешно.' - ), + 'success' => 'Консумативът създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Консумативът не беше обновен. Моля опитайте отново.', - 'success' => 'Консумативът обновен успешно.' - ), + 'success' => 'Консумативът обновен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Желаете ли изтриване на консуматива?', 'error' => 'Проблем при изтриването на консуматива. Моля опитайте отново.', - 'success' => 'Консумативът изтрит успешно.' - ), + 'success' => 'Консумативът изтрит успешно.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Консумативът не беше изписан. Моля опитайте отново.', 'success' => 'Консумативът изписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ), + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Консумативът не беше вписан. Моля опитайте отново.', 'success' => 'Консумативът вписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' - ) + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + ], - -); +]; diff --git a/resources/lang/bg/admin/consumables/table.php b/resources/lang/bg/admin/consumables/table.php index 423e43d5fa..f6b882207e 100644 --- a/resources/lang/bg/admin/consumables/table.php +++ b/resources/lang/bg/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Консуматив', -); +]; diff --git a/resources/lang/bg/admin/custom_fields/general.php b/resources/lang/bg/admin/custom_fields/general.php index 4e195565a6..cb5a16ffae 100644 --- a/resources/lang/bg/admin/custom_fields/general.php +++ b/resources/lang/bg/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Потребителски полета', 'field' => 'Поле', 'about_fieldsets_title' => 'Относно Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Ново персонализирано поле', 'value_encrypted' => 'Стойността на това поле е криптирана в базата данни. Само администратор потребители ще бъде в състояние да видят дешифрираната стойност', 'show_in_email' => 'Да се включи ли стойността на това поле в електронната поща, изпращана към потребителите? Криптираните полета не могат да бъдат включвани в изпращаните електронни пощи.', -); +]; diff --git a/resources/lang/bg/admin/custom_fields/message.php b/resources/lang/bg/admin/custom_fields/message.php index a578f4fd13..67a028bf20 100644 --- a/resources/lang/bg/admin/custom_fields/message.php +++ b/resources/lang/bg/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Това поле не съществува.', 'already_added' => 'Вече е добавено поле', - 'create' => array( + 'create' => [ 'error' => 'Поле не беше създадено, моля опитайте отново.', 'success' => 'Поле създадено успешно.', - 'assoc_success' => 'Поле успешно добавено към fieldset.' - ), + 'assoc_success' => 'Поле успешно добавено към fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Полето не беше актуализирано, моля опитайте отново', - 'success' => 'Поле актуализирано успешно.' - ), + 'success' => 'Поле актуализирано успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете това поле?', 'error' => 'Възникна проблем при изтриването на това поле. Моля, опитайте отново.', 'success' => 'Полето бе изтрито успешно.', 'in_use' => 'Полето все още се използва.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Полето не съществува', - 'create' => array( + 'create' => [ 'error' => 'Fieldset не беше създаден, моля опитайте отново.', - 'success' => 'Fieldset създаден успешно.' - ), + 'success' => 'Fieldset създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset не беше актуализиран, моля опитайте отново', - 'success' => 'Fieldset актуализиран успешно.' - ), + 'success' => 'Fieldset актуализиран успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете този fieldset?', 'error' => 'Възникна проблем при изтриването на този fieldset. Моля, опитайте отново.', 'success' => 'Fieldset бе изтрит успешно.', 'in_use' => 'Fieldset все още се използва.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/bg/admin/departments/message.php b/resources/lang/bg/admin/departments/message.php index a0e8c5c8a9..7c91b13349 100644 --- a/resources/lang/bg/admin/departments/message.php +++ b/resources/lang/bg/admin/departments/message.php @@ -1,21 +1,21 @@ 'Департаментът не съществува.', 'assoc_users' => 'Този отдел понастоящем е свързан с поне един потребител и не може да бъде изтрит. Моля, актуализирайте потребителите си, за да не препращате към този отдел и опитайте отново.', - 'create' => array( + 'create' => [ 'error' => 'Отделът не е създаден, моля, опитайте отново.', - 'success' => 'Отделът е създаден успешно.' - ), - 'update' => array( + 'success' => 'Отделът е създаден успешно.', + ], + 'update' => [ 'error' => 'Отделът не е актуализиран, моля, опитайте отново', - 'success' => 'Отделът се актуализира успешно.' - ), - 'delete' => array( + 'success' => 'Отделът се актуализира успешно.', + ], + 'delete' => [ 'confirm' => 'Наистина ли искате да изтриете този отдел?', 'error' => 'Имаше проблем с изтриването на отдела. Моля, опитайте отново.', - 'success' => 'Отделът бе изтрит успешно.' - ) + 'success' => 'Отделът бе изтрит успешно.', + ], -); +]; diff --git a/resources/lang/bg/admin/departments/table.php b/resources/lang/bg/admin/departments/table.php index 3771364aea..3d21ccb74d 100644 --- a/resources/lang/bg/admin/departments/table.php +++ b/resources/lang/bg/admin/departments/table.php @@ -1,6 +1,6 @@ 'ИД№', 'name' => 'Име на отдел', @@ -8,4 +8,4 @@ return array( 'location' => 'Местоположение', 'create' => 'Създайте отдела', 'update' => 'Отдел за актуализиране', - ); + ]; diff --git a/resources/lang/bg/admin/depreciations/general.php b/resources/lang/bg/admin/depreciations/general.php index d555b4bc47..7fd6a938b1 100644 --- a/resources/lang/bg/admin/depreciations/general.php +++ b/resources/lang/bg/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Относно амортизацията на активи', 'about_depreciations' => 'Тук можете да конфигурирате линейна амортизация на активи във времето.', 'asset_depreciations' => 'Амортизация на активи', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Брой месеци', 'update' => 'Обновяване на амортизация', -); +]; diff --git a/resources/lang/bg/admin/depreciations/message.php b/resources/lang/bg/admin/depreciations/message.php index e633844a7c..dd48e5fcd3 100644 --- a/resources/lang/bg/admin/depreciations/message.php +++ b/resources/lang/bg/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Амортизацията не съществува.', 'assoc_users' => 'Тази амортизация е асоциирана с един или повече модели и не може да бъде изтрита. Моля изтрийте моделите и опитайте отново.', - - 'create' => array( + 'create' => [ 'error' => 'Класът на амортизация не беше създаден. Моля опитайте отново.', - 'success' => 'Класът на амортизация създаден успешно.' - ), + 'success' => 'Класът на амортизация създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Класът на амортизация не беше обновен. Моля опитайте отново.', - 'success' => 'Класът на амортизация обновен успешно.' - ), + 'success' => 'Класът на амортизация обновен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете изтриване на класът на амортизация?', 'error' => 'Проблем при изтриването на класа на амортизация. Моля опитайте отново.', - 'success' => 'Класът на амортизация изтрит успешно.' - ) + 'success' => 'Класът на амортизация изтрит успешно.', + ], -); +]; diff --git a/resources/lang/bg/admin/depreciations/table.php b/resources/lang/bg/admin/depreciations/table.php index c78f0d5997..30f130dda6 100644 --- a/resources/lang/bg/admin/depreciations/table.php +++ b/resources/lang/bg/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Месеци', 'term' => 'Срок', 'title' => 'Име', -); +]; diff --git a/resources/lang/bg/admin/groups/message.php b/resources/lang/bg/admin/groups/message.php index d27a62e61c..b301735ff2 100644 --- a/resources/lang/bg/admin/groups/message.php +++ b/resources/lang/bg/admin/groups/message.php @@ -1,22 +1,22 @@ 'Групата вече съществува!', 'group_not_found' => 'Групата [:id] не съществува.', 'group_name_required' => 'Полето име е задължително', - 'success' => array( + 'success' => [ 'create' => 'Групата създадена успешно.', 'update' => 'Групата обновена успешно.', 'delete' => 'Групата изтрита успешно.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете групата?', 'create' => 'Проблем при създаване на групата. Моля опитайте отново.', 'update' => 'Проблем при обновяването на групата. Моля опитайте отново.', 'delete' => 'Проблем при изтриване на групата. Моля опитайте отново.', - ), + ], -); +]; diff --git a/resources/lang/bg/admin/groups/table.php b/resources/lang/bg/admin/groups/table.php index 3e8b453ba3..b7fc6c39ea 100644 --- a/resources/lang/bg/admin/groups/table.php +++ b/resources/lang/bg/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Име', 'users' => 'Брой потребители', -); +]; diff --git a/resources/lang/bg/admin/groups/titles.php b/resources/lang/bg/admin/groups/titles.php index 28d541b5aa..468e607d3c 100644 --- a/resources/lang/bg/admin/groups/titles.php +++ b/resources/lang/bg/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Относно групи', 'about_groups' => 'Групите се използват за обобщаване на потребителските разрешения', 'group_management' => 'Управление на групи', @@ -11,4 +11,4 @@ return array( 'allow' => 'Разрешаване', 'deny' => 'Отказ', -); +]; diff --git a/resources/lang/bg/admin/hardware/form.php b/resources/lang/bg/admin/hardware/form.php index ac3fcfef33..266aa13db7 100644 --- a/resources/lang/bg/admin/hardware/form.php +++ b/resources/lang/bg/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Потвърдете масовото изтриване на активи', +return [ + 'bulk_delete' => 'Потвърдете масовото изтриване на активи', 'bulk_delete_help' => 'Прегледайте активите, маркирани за масово изтриване. Веднъж изтрити, активите могат да бъдат възстановени, но те вече няма да бъдат асоциирани с потребителите, на които са изписани в момента.', 'bulk_delete_warn' => 'Ще бъдат изтрити :asset_count актива.', - 'bulk_update' => 'Масово обновяване на активи', - 'bulk_update_help' => 'Тук можете да обновите множество активи едновременно. Попълнете единствено полетата, които желаете да промените. Всички празни полета няма да бъдат променени.', - 'bulk_update_warn' => 'Ще бъдат променени записите за :asset_count актива.', + 'bulk_update' => 'Масово обновяване на активи', + 'bulk_update_help' => 'Тук можете да обновите множество активи едновременно. Попълнете единствено полетата, които желаете да промените. Всички празни полета няма да бъдат променени.', + 'bulk_update_warn' => 'Ще бъдат променени записите за :asset_count актива.', 'checkedout_to' => 'Изписано на', 'checkout_date' => 'Дата на изписване', 'checkin_date' => 'Дата на вписване', @@ -38,7 +38,6 @@ return array( 'tag' => 'Инвентарен номер', 'update' => 'Обновяване на актив', 'warranty' => 'Гаранция', - 'warranty_expires' => 'Гаранцията изтича', + 'warranty_expires' => 'Гаранцията изтича', 'years' => 'години', -) -; +]; diff --git a/resources/lang/bg/admin/hardware/general.php b/resources/lang/bg/admin/hardware/general.php index 4155a6028f..879c621a9c 100644 --- a/resources/lang/bg/admin/hardware/general.php +++ b/resources/lang/bg/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Относно активи', 'about_assets_text' => 'Активите са елементи, проследен от сериен номер или етикет. По-често, те са елементи с висока стойност, където идентифицирането на специфичен елемент е от значение.', - 'archived' => 'Архивиран', + 'archived' => 'Архивиран', 'asset' => 'Актив', 'bulk_checkout' => 'Изписване на активи', 'checkin' => 'Връщане на актив', @@ -19,4 +19,4 @@ return array( 'pending' => 'Предстоящ', 'undeployable' => 'Не може да бъде предоставян', 'view' => 'Преглед на актив', -); +]; diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php index da196f6f35..e4e416ae8c 100644 --- a/resources/lang/bg/admin/hardware/message.php +++ b/resources/lang/bg/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Внимание: Този актив е маркиран като невъзможен за предоставяне. Ако статусът е променен, моля обновете актива.', 'does_not_exist' => 'Активът не съществува.', 'does_not_exist_or_not_requestable' => 'Добър опит. Активът не съществува или не може а бъде предоставян.', 'assoc_users' => 'Активът е изписан на потребител и не може да бъде изтрит. Моля впишете го обратно и след това опитайте да го изтриете отново.', - 'create' => array( + 'create' => [ 'error' => 'Активът не беше създаден. Моля опитайте отново.', - 'success' => 'Активът създаден успешно.' - ), + 'success' => 'Активът създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Активът не беше обновен. Моля опитайте отново.', 'success' => 'Активът обновен успешно.', 'nothing_updated' => 'Няма избрани полета, съответно нищо не беше обновено.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Активът не беше възстановен. Моля опитайте отново.', - 'success' => 'Активът възстановен успешно.' - ), + 'success' => 'Активът възстановен успешно.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Одитът на активи бе неуспешен. Моля, опитайте отново.', - 'success' => 'Активният одит бе успешно регистриран.' - ), + 'success' => 'Активният одит бе успешно регистриран.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлът не беше изтрит. Моля опитайте отново.', 'success' => 'Файлът изтрит успешно.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Качването неуспешно. Моля опитайте отново.', 'success' => 'Качването успешно.', 'nofiles' => 'Не сте избрали файлове за качване или са твърде големи.', 'invalidfiles' => 'Един или повече файлове са твърде големи или с непозволен тип. Разрешените файлови типове за качване са png, gif, jpg, doc, docx, pdf и txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Някои елементи не бяха въведени правилно.', 'errorDetail' => 'Следните елементи не бяха въведени поради грешки.', - 'success' => "Вашият файл беше въведен.", - 'file_delete_success' => "Вашият файл беше изтрит успешно.", - 'file_delete_error' => "Файлът не е в състояние да бъде изтрит", - ), + 'success' => 'Вашият файл беше въведен.', + 'file_delete_success' => 'Вашият файл беше изтрит успешно.', + 'file_delete_error' => 'Файлът не е в състояние да бъде изтрит', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете изтриване на актива?', 'error' => 'Проблем при изтриване на актива. Моля опитайте отново.', 'nothing_updated' => 'Няма избрани активи, така че нищо не бе изтрито.', - 'success' => 'Активът е изтрит успешно.' - ), + 'success' => 'Активът е изтрит успешно.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Активът не беше изписан. Моля опитайте отново.', 'success' => 'Активът изписан успешно.', 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', 'not_available' => 'Този актив не е наличен за отписване!', - 'no_assets_selected' => 'Трябва да изберете поне един елемент към списъка' - ), + 'no_assets_selected' => 'Трябва да изберете поне един елемент към списъка', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Активът не беше вписан. Моля опитайте отново.', 'success' => 'Активът вписан успешно.', 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', 'already_checked_in' => 'Активът е вече вписан.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Активът не беше изискан. Моля опитайте отново.', 'success' => 'Активът изискан успешно.', - 'canceled' => 'Заявка за отписване отказана успешно' - ) + 'canceled' => 'Заявка за отписване отказана успешно', + ], -); +]; diff --git a/resources/lang/bg/admin/hardware/table.php b/resources/lang/bg/admin/hardware/table.php index b8ff045cd1..d1f3e8a10c 100644 --- a/resources/lang/bg/admin/hardware/table.php +++ b/resources/lang/bg/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Инвентарен номер', 'asset_model' => 'Модел', @@ -20,6 +20,6 @@ return array( 'title' => 'Актив ', 'image' => 'Изображение на устройството', 'days_without_acceptance' => 'Дни без да е предаден', - 'monthly_depreciation' => 'Месечна Амортизация' + 'monthly_depreciation' => 'Месечна Амортизация', -); +]; diff --git a/resources/lang/bg/admin/kits/general.php b/resources/lang/bg/admin/kits/general.php index 30d1fccfaf..49b2271c34 100644 --- a/resources/lang/bg/admin/kits/general.php +++ b/resources/lang/bg/admin/kits/general.php @@ -1,6 +1,6 @@ 'Отностно предварително дефинирани комплекти', 'about_kits_text' => 'Предварително дефинираните комплекти Ви позволяват да изпишете група от артикули (активи, лицензи и др.) на избран потребител. Това може да бъде полезно, когато изписвате еднакви артикули в комплект.', 'checkout' => 'Изпиши Комплект ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Няма достатъчно налични бройки от :consumable за изписване. Не достигат :qty . ', 'none_accessory' => 'Няма достатъчно налични бройки от :accessory за изписване. Не достигат :qty . ', -); +]; diff --git a/resources/lang/bg/admin/licenses/form.php b/resources/lang/bg/admin/licenses/form.php index daa5c1d599..dfb41a6e44 100644 --- a/resources/lang/bg/admin/licenses/form.php +++ b/resources/lang/bg/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Актив', 'checkin' => 'Вписване', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Лиценз към e-mail', 'to_name' => 'Лиценз към име', 'update' => 'Обновяване на лиценз', - 'checkout_help' => 'Можете да изпишете лиценз към конкретен хардуер или потребител. Един лиценз може да бъде изписан едновременно и на хардуер и на потребител, но потребителя трябва да бъде собственик на съответния хардуерен актив.' -); + 'checkout_help' => 'Можете да изпишете лиценз към конкретен хардуер или потребител. Един лиценз може да бъде изписан едновременно и на хардуер и на потребител, но потребителя трябва да бъде собственик на съответния хардуерен актив.', +]; diff --git a/resources/lang/bg/admin/licenses/general.php b/resources/lang/bg/admin/licenses/general.php index 9ad54be10a..8db59146e3 100644 --- a/resources/lang/bg/admin/licenses/general.php +++ b/resources/lang/bg/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Относно лицензи', 'about_licenses' => 'Лицензите се използват за проследяване на софтуер. Те имат определен брой места, които могат да бъдат отписани към лица', 'checkin' => 'Вписване на потребителски лиценз', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Софтуерни лицензи', 'user' => 'Потребител', 'view' => 'Преглед на лиценз', -); +]; diff --git a/resources/lang/bg/admin/licenses/message.php b/resources/lang/bg/admin/licenses/message.php index 7b1806aaa6..856e2e4b5e 100644 --- a/resources/lang/bg/admin/licenses/message.php +++ b/resources/lang/bg/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Лицензът не съществува.', 'user_does_not_exist' => 'Потребителят не съществува.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Трябва да изберете актив или потребител, но не и двете.', 'not_found' => 'Лиценът не е намерен', - - 'create' => array( + 'create' => [ 'error' => 'Лицензът не беше създаден. Моля, опитайте отново.', - 'success' => 'Лицензът е създаден.' - ), + 'success' => 'Лицензът е създаден.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлът не е изтрит. Моля, опитайте отново.', 'success' => 'Файлът е изтрит.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Файлът (файловете) не е качен. Моля, опитайте отново.', 'success' => 'Файлът (файловете) е качен.', 'nofiles' => 'Не сте избрали файл за качване или файлът, който се опитвате да качите е твърде голям', 'invalidfiles' => 'Един или повече от вашите файлове е твърде голям или е забранен тип файл. Разрешените типове файл са png, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, и lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Лицензът не беше обновен. Моля, опитайте отново', - 'success' => 'Лицензът е обновен.' - ), + 'success' => 'Лицензът е обновен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че искате да изтриете този лиценз?', 'error' => 'Възникна проблем при изтриването на този лиценз. Моля, опитайте отново.', - 'success' => 'Лицензът е изтрит.' - ), + 'success' => 'Лицензът е изтрит.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Възникна проблем при изписването на лиценза. Моля, опитайте отново.', - 'success' => 'Лицензът е изписан' - ), + 'success' => 'Лицензът е изписан', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Възникна проблем при вписването на лиценза. Моля, опитайте отново.', - 'success' => 'Лицензът е вписан' - ), + 'success' => 'Лицензът е вписан', + ], -); +]; diff --git a/resources/lang/bg/admin/licenses/table.php b/resources/lang/bg/admin/licenses/table.php index b20e680ca5..90cfd128de 100644 --- a/resources/lang/bg/admin/licenses/table.php +++ b/resources/lang/bg/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Предоставен на', 'checkout' => 'Предоставяне', @@ -14,4 +14,4 @@ return array( 'serial' => 'Сериен номер', 'title' => 'Лиценз', -); +]; diff --git a/resources/lang/bg/admin/locations/message.php b/resources/lang/bg/admin/locations/message.php index ae9564195b..1e2997358a 100644 --- a/resources/lang/bg/admin/locations/message.php +++ b/resources/lang/bg/admin/locations/message.php @@ -1,27 +1,26 @@ 'Местоположението не съществува.', 'assoc_users' => 'Местоположението е свързано с поне един потребител и не може да бъде изтрито. Моля, актуализирайте потребителите, така че да не са свързани с това местоположение и опитайте отново. ', 'assoc_assets' => 'Местоположението е свързано с поне един актив и не може да бъде изтрито. Моля, актуализирайте активите, така че да не са свързани с това местоположение и опитайте отново. ', 'assoc_child_loc' => 'В избраното местоположение е присъединено едно или повече местоположения. Моля преместете ги в друго и опитайте отново.', - - 'create' => array( + 'create' => [ 'error' => 'Местоположението не е създадено. Моля, опитайте отново.', - 'success' => 'Местоположението е създадено.' - ), + 'success' => 'Местоположението е създадено.', + ], - 'update' => array( + 'update' => [ 'error' => 'Местоположението не е обновено. Моля, опитайте отново', - 'success' => 'Местоположението е обновено.' - ), + 'success' => 'Местоположението е обновено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че искате да изтриете това местоположение?', 'error' => 'Възникна проблем при изтриване на местоположението. Моля, опитайте отново.', - 'success' => 'Местоположението е изтрито.' - ) + 'success' => 'Местоположението е изтрито.', + ], -); +]; diff --git a/resources/lang/bg/admin/locations/table.php b/resources/lang/bg/admin/locations/table.php index c84b17eb91..a833ebcd85 100644 --- a/resources/lang/bg/admin/locations/table.php +++ b/resources/lang/bg/admin/locations/table.php @@ -1,6 +1,6 @@ 'Относно местоположения', 'about_locations' => 'Местоположения се използват за проследяване на информация за местоположението за потребители, активи и други елементи', 'assets_rtd' => 'Активи', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Присъединено към', 'currency' => 'Валута на местоположението', 'ldap_ou' => 'Търсене в LDAP OU', - ); + ]; diff --git a/resources/lang/bg/admin/manufacturers/message.php b/resources/lang/bg/admin/manufacturers/message.php index 36ce40de1e..3c6a2de171 100644 --- a/resources/lang/bg/admin/manufacturers/message.php +++ b/resources/lang/bg/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Несъществуващ производител.', 'assoc_users' => 'Този производител е асоцииран с поне един от моделите и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този производител и опитайте отново. ', - 'create' => array( + 'create' => [ 'error' => 'Производителят не беше създаден. Моля, опитайте отново.', - 'success' => 'Производителят е създаден.' - ), + 'success' => 'Производителят е създаден.', + ], - 'update' => array( + 'update' => [ 'error' => 'Производителят не е обновен. Моля, опитайте отново', - 'success' => 'Производителят е обновен.' - ), + 'success' => 'Производителят е обновен.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Производителят не беше възстановен. Моля, опитайте отново', - 'success' => 'Производителят възстановен успешно.' - ), + 'success' => 'Производителят възстановен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че искате да изтриете този производител?', 'error' => 'Възникна проблем при изтриването на проиводителя. Моля, опитайте отново.', - 'success' => 'Производителят е изтрит.' - ) + 'success' => 'Производителят е изтрит.', + ], -); +]; diff --git a/resources/lang/bg/admin/manufacturers/table.php b/resources/lang/bg/admin/manufacturers/table.php index c7a478c5cb..f7ba68cadf 100644 --- a/resources/lang/bg/admin/manufacturers/table.php +++ b/resources/lang/bg/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Относно производителите', 'about_manufacturers_text' => 'Производителите са компаниите, които създават вашите активи. Можете да трупате важна информация на контакти за поддръжка относно тях тук, която ще бъде показана на страницата за подробности на активи.', 'asset_manufacturers' => 'Производители', @@ -13,4 +13,4 @@ return array( 'update' => 'Обновяване на производител', 'url' => 'URL адрес', -); +]; diff --git a/resources/lang/bg/admin/models/general.php b/resources/lang/bg/admin/models/general.php index 6efb2be9ae..8a3abef6ee 100644 --- a/resources/lang/bg/admin/models/general.php +++ b/resources/lang/bg/admin/models/general.php @@ -1,6 +1,6 @@ 'Относно модели на актив', 'about_models_text' => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.', 'deleted' => 'Моделът беше изтрит. Възстановяване.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Ще бъдат изтрити :model_count модели на активи.', 'restore' => 'Възстановяване на модел', 'requestable' => 'Потребителите могат да поискат този модел', - 'show_mac_address' => 'Визуализиране на поле за MAC адрес в активите за този модел', + 'show_mac_address' => 'Визуализиране на поле за MAC адрес в активите за този модел', 'view_deleted' => 'Преглед на изтритите', 'view_models' => 'Преглед на моделите', 'fieldset' => 'Полета', 'no_custom_field' => 'Няма потребителски полета', 'add_default_values' => 'Добавяне на стойности по подразбиране', -); +]; diff --git a/resources/lang/bg/admin/models/message.php b/resources/lang/bg/admin/models/message.php index 5315483d53..9ee1f47644 100644 --- a/resources/lang/bg/admin/models/message.php +++ b/resources/lang/bg/admin/models/message.php @@ -1,42 +1,41 @@ 'Моделът не съществува.', 'assoc_users' => 'Този модел е асоцииран с един или повече активи и не може да бъде изтрит. Моля изтрийте активите и опитайте отново.', - - 'create' => array( + 'create' => [ 'error' => 'Моделът не беше създаден. Моля опитайте отново.', 'success' => 'Моделът създаден успешно.', 'duplicate_set' => 'Актив с това име, производител и номер на модел вече е въведен.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Моделът не беше обновен. Моля опитайте отново.', - 'success' => 'Моделът обновен успешно.' - ), + 'success' => 'Моделът обновен успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Желаете ли изтриване на модела?', 'error' => 'Проблем при изтриване на модела. Моля опитайте отново.', - 'success' => 'Моделът изтрит успешно.' - ), + 'success' => 'Моделът изтрит успешно.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Моделът не беше възстановен. Моля опитайте отново.', - 'success' => 'Моделът възстановен успешно.' - ), + 'success' => 'Моделът възстановен успешно.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Няма полета, който да са се променили, така че нищо не е осъвременено.', - 'success' => 'Моделите са осъвременени.' - ), + 'success' => 'Моделите са осъвременени.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Няма избрани модели, така че нищо не бе изтрито.', 'success' => ':success_count модела бяха изтрити!', - 'success_partial' => ':success_count модела бяха изтрити, но :fail_count не бяха, тъй като към тях има асоциирани активи.' - ), + 'success_partial' => ':success_count модела бяха изтрити, но :fail_count не бяха, тъй като към тях има асоциирани активи.', + ], -); +]; diff --git a/resources/lang/bg/admin/models/table.php b/resources/lang/bg/admin/models/table.php index 017c1635b9..0dd2ae07d9 100644 --- a/resources/lang/bg/admin/models/table.php +++ b/resources/lang/bg/admin/models/table.php @@ -1,6 +1,6 @@ 'Създаване на модел на актив', 'created_at' => 'Създаден в', @@ -14,4 +14,4 @@ return array( 'update' => 'Обновяване на модел на актив', 'clone' => 'Копиране на модел', 'edit' => 'Редакция на модел', -); +]; diff --git a/resources/lang/bg/admin/reports/general.php b/resources/lang/bg/admin/reports/general.php index 5ef88db056..189f1b6766 100644 --- a/resources/lang/bg/admin/reports/general.php +++ b/resources/lang/bg/admin/reports/general.php @@ -1,5 +1,5 @@ 'Изберете опциите, които желаете за справката за активи.' -); +return [ + 'info' => 'Изберете опциите, които желаете за справката за активи.', +]; diff --git a/resources/lang/bg/admin/reports/message.php b/resources/lang/bg/admin/reports/message.php index ededaa0dea..9c777833e3 100644 --- a/resources/lang/bg/admin/reports/message.php +++ b/resources/lang/bg/admin/reports/message.php @@ -1,5 +1,5 @@ 'Трябва да изберете поне една опция.' -); +return [ + 'error' => 'Трябва да изберете поне една опция.', +]; diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php index b4032d29fe..5a111053b5 100644 --- a/resources/lang/bg/admin/settings/general.php +++ b/resources/lang/bg/admin/settings/general.php @@ -1,12 +1,12 @@ 'Активна директория', 'ad_domain' => 'Домейн на активна директория', 'ad_domain_help' => 'Това е понякога еднакво с вашия email домейн, но не винаги.', 'ad_append_domain_label' => 'Добави името на домейна', 'ad_append_domain' => 'Добави името на домейна към потребителското име', - 'ad_append_domain_help' => 'От потребителя не се изисква да въвежда "username@domain.local", достатъчно е да напише само "username".' , + 'ad_append_domain_help' => 'От потребителя не се изисква да въвежда "username@domain.local", достатъчно е да напише само "username".', 'admin_cc_email' => 'CC електронна поща', 'admin_cc_email_help' => 'Въведете допълнителни електронни адреси, ако желаете да се изпраща копие на електронните пощи при вписване и изписване на активи.', 'is_ad' => 'Това е активна директория на сървър', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Изтичаш праг на известия (в дни)', 'alert_inv_threshold' => 'Праг на известия за запаси', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID на активи', 'audit_interval' => 'Одитен интервал', 'audit_interval_help' => 'Ако се изисква редовно да извършвате физически одит на активите си, въведете интервала в месеци.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Въведете двуфакторен код', 'two_factor_config_complete' => 'Подаване на код', 'two_factor_enabled_edit_not_allowed' => 'Вашият администратор не разрешава да редактирате тази настройка.', - 'two_factor_enrollment_text' => "Двуфакторово удостоверяване се изисква, но вашето устройство не е било регистрирано още. Отворете Google Authenticator и сканирайте QR кода по-долу за да регистрирате вашето устройство. След като сте записани вашето устройство, въведете кода по-долу", + 'two_factor_enrollment_text' => 'Двуфакторово удостоверяване се изисква, но вашето устройство не е било регистрирано още. Отворете Google Authenticator и сканирайте QR кода по-долу за да регистрирате вашето устройство. След като сте записани вашето устройство, въведете кода по-долу', 'require_accept_signature' => 'Изисква подпис', 'require_accept_signature_help_text' => 'Разрешаването на тази функция ще изисква от потребителите да се подпишат физически за приемане на даден актив.', 'left' => 'ляво', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Отмятането на този чек, ще задължи ползването на уникални сериини номера на артикулите', 'zerofill_count' => 'Дължина на етикети на актив, включително zerofill', 'username_format_help' => 'Тази настройка се изпозлва само при импортиране, ако потребителя не е въведен и ние трябва да му генерираме потребителско име.', -); +]; diff --git a/resources/lang/bg/admin/settings/message.php b/resources/lang/bg/admin/settings/message.php index 93a58c1286..52725af5f3 100644 --- a/resources/lang/bg/admin/settings/message.php +++ b/resources/lang/bg/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Възникна грешка по време на актуализацията. ', - 'success' => 'Настройките са актуализирани успешно.' - ), - 'backup' => array( + 'success' => 'Настройките са актуализирани успешно.', + ], + 'backup' => [ 'delete_confirm' => 'Желаете ли изтриването на този архивен файл? Действието е окончателно.', 'file_deleted' => 'Архивният файл беше изтрит успешно.', 'generated' => 'Нов архивен файл беше създаден успешно.', 'file_not_found' => 'Архивният файл не беше открит на сървъра.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Възникна грешка при пречистване. ', 'validation_failed' => 'Потвърждението ви за пречистване не неправилно. Моля напишете думата "DELETE" в клетката за потвърждаване.', - 'success' => 'Изтрити записи успешно премахнати.' - ), + 'success' => 'Изтрити записи успешно премахнати.', + ], -); +]; diff --git a/resources/lang/bg/admin/statuslabels/message.php b/resources/lang/bg/admin/statuslabels/message.php index b05605bcfc..f35051c883 100644 --- a/resources/lang/bg/admin/statuslabels/message.php +++ b/resources/lang/bg/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Етикет за статус не съществува.', 'assoc_assets' => 'Този етикет за статус е свързан с най-малко един актив и не може да бъде изтрит. Моля актуализирайте вашите активи да не се прехвърлят към този статус и опитайте отново.', - - 'create' => array( + 'create' => [ 'error' => 'Етикет за статус не беше създаден, моля опитайте отново.', - 'success' => 'Етикет за статус създаден успешно.' - ), + 'success' => 'Етикет за статус създаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Етикет за статус не беше актуализиран, моля опитайте отново.', - 'success' => 'Етикет за статус актуализиран успешно.' - ), + 'success' => 'Етикет за статус актуализиран успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че желаете да изтриете този етикет за статус?', 'error' => 'Имаше проблем при изтриването на етикета за статус. Моля опитайте отново.', - 'success' => 'Етикета за статус бе изтрит успешно.' - ), + 'success' => 'Етикета за статус бе изтрит успешно.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Тези активи не могат да бъдат възлагани на никого.', 'deployable' => 'Тези активи могат да бъдат проверени. След като бъдат присвоени, те ще поемат мета статус на Deployed.', 'archived' => 'Тези активи не могат да бъдат отметнати и ще се показват само в архивирания изглед. Това е полезно за запазване на информация за активи за бюджетиране / исторически цели, но задържането им извън ежедневния списък на активите.', 'pending' => 'Тези активи все още не могат да бъдат прехвърляни на никого, често използвани за артикули, които са предназначени за ремонт, но се очаква да се върнат в обръщение.', - ), + ], -); +]; diff --git a/resources/lang/bg/admin/statuslabels/table.php b/resources/lang/bg/admin/statuslabels/table.php index 466d67ea6e..51bfba9193 100644 --- a/resources/lang/bg/admin/statuslabels/table.php +++ b/resources/lang/bg/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Относно статус етикетите', 'archived' => 'Архивирани', 'create' => 'Създаване на статус етикет', @@ -16,4 +16,4 @@ return array( 'title' => 'Заглавия на статуси', 'undeployable' => 'Не може да бъде предоставян', 'update' => 'Обновяване на статус', -); +]; diff --git a/resources/lang/bg/admin/suppliers/message.php b/resources/lang/bg/admin/suppliers/message.php index 8d8fc41a1b..7af413bd28 100644 --- a/resources/lang/bg/admin/suppliers/message.php +++ b/resources/lang/bg/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Несъществуващ доставчик.', - - 'create' => array( + 'create' => [ 'error' => 'Доставчикът не беше създаден. Моля, опитайте отново.', - 'success' => 'Доставчикът е създаден.' - ), + 'success' => 'Доставчикът е създаден.', + ], - 'update' => array( + 'update' => [ 'error' => 'Достъвчикът не беше обновен. Моля, опитайте отново', - 'success' => 'Доставчикът е обновен.' - ), + 'success' => 'Доставчикът е обновен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Сигурни ли сте, че искате да изтриете този доставчик?', 'error' => 'Възникна проблем при изтриване на доставчика. Моля, опитайте отново.', 'success' => 'Доставчикът е изтрит.', 'assoc_assets' => 'Този доставчик е текущо асоцииран с :asset_count актива и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този доставчик и опитайте отново. ', 'assoc_licenses' => 'Този доставчик е текущо асоцииран с :licenses_count лиценза и не може да бъде изтрит. Моля, променете връзките на лицензите по отношение на този доставчик и опитайте отново. ', 'assoc_maintenances' => 'Този доставчик е текущо асоцииран с :asset_maintenances_count инвентаризации и не може да бъде изтрит. Моля, променете връзките на инвентаризациите по отношение на този доставчик и опитайте отново. ', - ) + ], -); +]; diff --git a/resources/lang/bg/admin/suppliers/table.php b/resources/lang/bg/admin/suppliers/table.php index fe63f76380..3fe2909808 100644 --- a/resources/lang/bg/admin/suppliers/table.php +++ b/resources/lang/bg/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Относно доставчици', 'about_suppliers_text' => 'Доставчици се използват за проследяване на източника на елементи', 'address' => 'Адрес на доставчика', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Преглед на активите за', 'zip' => 'Пощенски код', -); +]; diff --git a/resources/lang/bg/admin/users/general.php b/resources/lang/bg/admin/users/general.php index 3470b2661b..c8ecce45d1 100644 --- a/resources/lang/bg/admin/users/general.php +++ b/resources/lang/bg/admin/users/general.php @@ -1,7 +1,6 @@ 'Този потребител може да се логне', 'activated_disabled_help_text' => 'Не можете да редактирате статуса на активация на собствения си профил.', 'assets_user' => 'Активи предадени на :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Редактиране на потребител', 'filetype_info' => 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.', 'history_user' => 'История за :name', - 'info' => 'Информация', + 'info' => 'Информация', 'restore_user' => 'Кликнете тук, за да ги възстановите.', 'last_login' => 'Последен достъп до системата', 'ldap_config_text' => 'LDAP конфигурационните настройки могат да бъдат намерени в Admin > Settings. Избраното (по изобр) местоположение ще бъде настроено за всички въведени потребители.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Текущите настройки на администратор позволяват избирателно прилагане на двуфакторова автентификация. ', 'two_factor_enrolled' => '2FA устройство записано', 'two_factor_active' => '2FA Активно', - ); + ]; diff --git a/resources/lang/bg/admin/users/message.php b/resources/lang/bg/admin/users/message.php index 81f63f63f3..ede3188f17 100644 --- a/resources/lang/bg/admin/users/message.php +++ b/resources/lang/bg/admin/users/message.php @@ -1,6 +1,6 @@ 'Активът беше приет.', 'declined' => 'Активът беше отказан.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Интеграцията с LDAP не е конфигурирана за тази инсталация.', 'password_resets_sent' => 'Избраните потребители, които са активирани и имат валиден е-майл адрес им беше изпратен линк за смяна на парола.', - - 'success' => array( + 'success' => [ 'create' => 'Потребителят е създаден.', 'update' => 'Потребителят е обновен.', 'update_bulk' => 'Потребителите бяха обновени успешно!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Потребителят активиран успешно.', 'restored' => 'Потребителят е възстановен.', 'import' => 'Потребителите заредени успешно.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Възникна проблем при създаването на този потребител. Моля, опитайте отново.', 'update' => 'Възникна проблем при обновяването на този потребител. Моля, опитайте отново.', 'delete' => 'Възникна проблем при изтриването на този потребител. Моля, опитайте отново.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра: ', 'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра:', 'password_ldap' => 'Паролата за този профил се управлява от LDAP / Active Directory. Моля, свържете се с вашия ИТ отдел, за да промените паролата си.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлът не е изтрит. Моля, опитайте отново.', 'success' => 'Файлът е изтрит.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Проблем при качването на файл/овете. Моля опитайте отново.', 'success' => 'Файл/овете качени успешно.', 'nofiles' => 'Не сте избрали файлове за качване', 'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.', - ), + ], -); +]; diff --git a/resources/lang/bg/admin/users/table.php b/resources/lang/bg/admin/users/table.php index e97ac8285a..02f2e66c04 100644 --- a/resources/lang/bg/admin/users/table.php +++ b/resources/lang/bg/admin/users/table.php @@ -1,6 +1,6 @@ 'Активен', 'allow' => 'Разрешаване', 'checkedout' => 'Активи', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Преглед на текущите потребители', 'show_deleted' => 'Преглед на изтритите потребители', 'title' => 'Титла', - 'to_restore_them' => 'да ги възстановите.', + 'to_restore_them' => 'да ги възстановите.', 'updateuser' => 'Обновяване на потребител', 'username' => 'Потребителско име', - 'user_deleted_text' => 'Потребителят бе маркиран като изтрит.', + 'user_deleted_text' => 'Потребителят бе маркиран като изтрит.', 'username_note' => '(Използва се за достъп до Active Directory, а не за вход.)', 'cloneuser' => 'Копиране на потребител', 'viewusers' => 'Преглед на потребителите', -); +]; diff --git a/resources/lang/bg/auth/general.php b/resources/lang/bg/auth/general.php index 37f8666cba..927981f529 100644 --- a/resources/lang/bg/auth/general.php +++ b/resources/lang/bg/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Въведете вашето потребителско име за да получите линк за смяна на парола.', 'username_help_bottom' => 'Вашето потребителско име и е-майл адрес може да са еднакви или да не са, зависимост от вашата конфигурация. Ако не помните вашето потребителско име се свържете с Администратора.

Потребители които нямат въведен е-майл адрес няма да получат линк за смяна на парола. ', ]; - diff --git a/resources/lang/bg/auth/message.php b/resources/lang/bg/auth/message.php index de37bd615d..b24b482254 100644 --- a/resources/lang/bg/auth/message.php +++ b/resources/lang/bg/auth/message.php @@ -1,6 +1,6 @@ 'Потребител с този email вече е регистриран.', 'account_not_found' => 'Невалиден потребител или парола.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Потребителят е неактивен.', 'throttle' => 'Твърде много грешни опити. Моля опитайте отново след :minutes минути.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Вашето устройство е вече вписано.', 'success' => 'Вие влязохте успешно.', 'code_required' => 'Необходим е код за двуфакторова идентификация.', 'invalid_code' => 'Кода за двуфакторна идентификация е невалиден.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Проблем при входа в системата. Моля опитайте отново.', 'success' => 'Успешен вход в системата.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Имаше проблем при излизане от системата, моля опитайте отново.', 'success' => 'Вие излязохте успешно.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Проблем при създаването на потребителя. Моля опитайте отново.', 'success' => 'Потребителят създаден успешно.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Проблем при извличането на код за възстановяване на паролата. Моля опитайте отново.', 'success' => 'Ако този е-майл е в нашата система, ще получите линк за възстановяване на паролата.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Проблем при промяна на паролата. Моля опитайте отново.', 'success' => 'Паролата променена успешно.', - ), + ], - -); +]; diff --git a/resources/lang/bg/button.php b/resources/lang/bg/button.php index ef6b2c517b..b2229026c5 100644 --- a/resources/lang/bg/button.php +++ b/resources/lang/bg/button.php @@ -1,6 +1,6 @@ 'Действия', 'add' => 'Добави нов', 'cancel' => 'Отказ', @@ -11,7 +11,7 @@ return array( 'request' => 'Заявка', 'submit' => 'Потвърди', 'upload' => 'Качване', - 'select_file' => 'Изберете файл...', + 'select_file' => 'Изберете файл...', 'select_files' => 'Изберете файлове...', 'generate_labels' => '{1} Генерирай Етикет|[2,*] Генерирай Етикети', -); +]; diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php index 060f818e54..7547bfb43d 100644 --- a/resources/lang/bg/general.php +++ b/resources/lang/bg/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Вписвания', 'user_requests_count' => 'Заявки', 'city' => 'Град', - 'click_here' => 'Натиснете тук', + 'click_here' => 'Натиснете тук', 'clear_selection' => 'Изчистване на селектираното', 'companies' => 'Компании', 'company' => 'Компания', 'component' => 'Компонент', 'components' => 'Компоненти', - 'complete' => 'Завърши', + 'complete' => 'Завърши', 'consumable' => 'Консуматив', 'consumables' => 'Консумативи', 'country' => 'Държава', diff --git a/resources/lang/bg/help.php b/resources/lang/bg/help.php index 3fc47f0b02..547178b246 100644 --- a/resources/lang/bg/help.php +++ b/resources/lang/bg/help.php @@ -1,6 +1,6 @@ "Допълнителна информация", + 'more_info_title' => 'Допълнителна информация', - "audit_help" => "Отмятането на това поле, ще редактира записа, за да се отрази новото местоположение. Оставайки това поле без отметка ще се отрази местоположението на актива само при одит.

Ако актива е изписан няма да се смени леговата локация.", + 'audit_help' => 'Отмятането на това поле, ще редактира записа, за да се отрази новото местоположение. Оставайки това поле без отметка ще се отрази местоположението на актива само при одит.

Ако актива е изписан няма да се смени леговата локация.', 'assets' => 'Дълготрайни материални активи (ДМА), за кратко активи, се приемат всички материални ресурси на предприятието, които се използват повече от един отчетен период (за стопански и други цели). Проследават се по техния сериен или инвентарен номер.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Може да нагласите амортизация базирана на линеен метод.', - - -); +]; diff --git a/resources/lang/bg/mail.php b/resources/lang/bg/mail.php index 649dd4edcc..a21417f6c1 100644 --- a/resources/lang/bg/mail.php +++ b/resources/lang/bg/mail.php @@ -1,6 +1,6 @@ 'Потребител е отменил заявка за елемент в уебсайта', 'a_user_requested' => 'Потребител е направил заявка за елемент в уебсайта', 'accessory_name' => 'Име на аксесоар:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Очакван рапорт за вписване на актив', 'Expected_Checkin_Notification' => 'Напомняне: :name крайната дата за вписване наближава', 'Expected_Checkin_Date' => 'Наближава срока за връщане на актив който е заведен на Вас, трябва да се върна на :date', - 'your_assets' => 'Преглед на вашите активи' -); + 'your_assets' => 'Преглед на вашите активи', +]; diff --git a/resources/lang/bg/pagination.php b/resources/lang/bg/pagination.php index d8d1c2028f..ab4281cb85 100644 --- a/resources/lang/bg/pagination.php +++ b/resources/lang/bg/pagination.php @@ -1,6 +1,6 @@ 'Следваща »', -); +]; diff --git a/resources/lang/bg/passwords.php b/resources/lang/bg/passwords.php index 081c7edbf6..06f3eed4d7 100644 --- a/resources/lang/bg/passwords.php +++ b/resources/lang/bg/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Линк към вашата парола бе изпратен!', 'user' => 'Не са намерени активни потребители с този е-майл.', ]; - diff --git a/resources/lang/bg/reminders.php b/resources/lang/bg/reminders.php index ef8cbc6a4b..b0d8e0da4f 100644 --- a/resources/lang/bg/reminders.php +++ b/resources/lang/bg/reminders.php @@ -1,6 +1,6 @@ "Паролата трябва да бъде поне 6 символа и да съвпада с потвърждението.", + 'password' => 'Паролата трябва да бъде поне 6 символа и да съвпада с потвърждението.', - "user" => "Грешно потребителско име или имейл адрес", + 'user' => 'Грешно потребителско име или имейл адрес', - "token" => "Връзката за възстановяване на паролата е невалидна.", + 'token' => 'Връзката за възстановяване на паролата е невалидна.', - "sent" => "Ако е зададен email, на потребителя ще бъде изпратена връзка за възстановяване на паролата.", + 'sent' => 'Ако е зададен email, на потребителя ще бъде изпратена връзка за възстановяване на паролата.', -); +]; diff --git a/resources/lang/bg/table.php b/resources/lang/bg/table.php index 8f4b409245..4430abb87e 100644 --- a/resources/lang/bg/table.php +++ b/resources/lang/bg/table.php @@ -1,10 +1,10 @@ 'Действия', 'action' => 'Действие', 'by' => 'От', 'item' => 'Информация', -); +]; diff --git a/resources/lang/bg/validation.php b/resources/lang/bg/validation.php index 841f3a48bd..273c4a9a4b 100644 --- a/resources/lang/bg/validation.php +++ b/resources/lang/bg/validation.php @@ -1,6 +1,6 @@ ':attribute вече е вписан.', 'uploaded' => 'Атрибутът: не успя да качи.', 'url' => 'Форматът на :attribute е невалиден.', - "unique_undeleted" => ":attribute трябва да бъде уникален.", + 'unique_undeleted' => ':attribute трябва да бъде уникален.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Полето атрибут: съдържа знак, който не е разрешен.", - "email_array" => "Един или повече имейл адреси са невалидни.", - "hashed_pass" => "Текущата ви парола е неправилна", + 'alpha_space' => 'Полето атрибут: съдържа знак, който не е разрешен.', + 'email_array' => 'Един или повече имейл адреси са невалидни.', + 'hashed_pass' => 'Текущата ви парола е неправилна', 'dumbpwd' => 'Тази парола е твърде често срещана.', - "statuslabel_type" => "Трябва да изберете валиден тип етикет на състоянието", + 'statuslabel_type' => 'Трябва да изберете валиден тип етикет на състоянието', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/cs/admin/accessories/general.php b/resources/lang/cs/admin/accessories/general.php index bb7c198b6b..d62fd219b4 100644 --- a/resources/lang/cs/admin/accessories/general.php +++ b/resources/lang/cs/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorie příslušenství', 'accessory_name' => 'Název příslušenství', 'checkout' => 'Předat příslušenství', @@ -18,4 +18,4 @@ return array( 'use_default_eula_disabled' => 'Použít výchozí EULA. Žádná výchozí EULA nenastavena. Zadejte novou v nastevení.', -); +]; diff --git a/resources/lang/cs/admin/accessories/message.php b/resources/lang/cs/admin/accessories/message.php index 970859beb4..d3d53cdc94 100644 --- a/resources/lang/cs/admin/accessories/message.php +++ b/resources/lang/cs/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Tato kategorie má nyní :count položek k předání uživatelům. Zkontrolujte převzetí příslušenství a zkuste to znovu. ', - 'create' => array( + 'create' => [ 'error' => 'Doplněk nebyl vytvořen, prosím zkuste to znovu.', - 'success' => 'Doplněk byl úspěšně vytvořen.' - ), + 'success' => 'Doplněk byl úspěšně vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Doplněk nebyl upraven, prosím zkuste to znovu', - 'success' => 'Doplněk byl úspěšně upraven.' - ), + 'success' => 'Doplněk byl úspěšně upraven.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jste si jisti, že chcete odstranit toto příslušenství?', 'error' => 'Vyskytl se problém při mazání kategorie. Zkuste to znovu prosím.', - 'success' => 'Příslušenství bylo úspěšně odstraněno.' - ), + 'success' => 'Příslušenství bylo úspěšně odstraněno.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Příslušenství nebylo převzato, zkuste to znovu', 'success' => 'Příslušenství úspěšně předáno.', - 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.' - ), + 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Příslušenství nebylo převzato, zkuste to znovu', 'success' => 'Příslušenství úspěšně předáno.', - 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.' - ) + 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.', + ], - -); +]; diff --git a/resources/lang/cs/admin/accessories/table.php b/resources/lang/cs/admin/accessories/table.php index f2773f3e88..68fcb44a04 100644 --- a/resources/lang/cs/admin/accessories/table.php +++ b/resources/lang/cs/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Stáhnout CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Stáhnout CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Přijetí', 'title' => 'Název příslušenství', - -); +]; diff --git a/resources/lang/cs/admin/asset_maintenances/form.php b/resources/lang/cs/admin/asset_maintenances/form.php index 86d2d92504..0f583aeb5b 100644 --- a/resources/lang/cs/admin/asset_maintenances/form.php +++ b/resources/lang/cs/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dnů', 'notes' => 'Poznámky', 'update' => 'Aktualizace', - 'create' => 'Vytvořit' + 'create' => 'Vytvořit', ]; diff --git a/resources/lang/cs/admin/asset_maintenances/message.php b/resources/lang/cs/admin/asset_maintenances/message.php index 6a88e49ff0..4f682e260d 100644 --- a/resources/lang/cs/admin/asset_maintenances/message.php +++ b/resources/lang/cs/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Opravdu si přejete smazat tuto údržbu?', 'error' => 'Při odstraňování údržby nastala chyba. Zkuste to prosím znovu.', - 'success' => 'Údržba zařízení byla úspěšně odstraněna.' + 'success' => 'Údržba zařízení byla úspěšně odstraněna.', ], 'create' => [ 'error' => 'Údržbu zařízení se nepodařilo vytvořit, zkuste to prosím znovu.', - 'success' => 'Údržba zařízení byla v pořádku vytvořena.' + 'success' => 'Údržba zařízení byla v pořádku vytvořena.', ], 'edit' => [ 'error' => 'Údržba majetku nebyla upravena, zkuste to prosím znovu.', - 'success' => 'Údržba majetku byla úspěšně upravena.' + 'success' => 'Údržba majetku byla úspěšně upravena.', ], 'asset_maintenance_incomplete' => 'Prozatím nedokončeno', 'warranty' => 'Záruka', 'not_warranty' => 'Bez záruky', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/cs/admin/asset_maintenances/table.php b/resources/lang/cs/admin/asset_maintenances/table.php index baf0564a9d..ee850483a8 100644 --- a/resources/lang/cs/admin/asset_maintenances/table.php +++ b/resources/lang/cs/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Údržba zařízení', 'asset_name' => 'Název majetku', 'is_warranty' => 'Záruka', - 'dl_csv' => 'Stáhnout CSV' + 'dl_csv' => 'Stáhnout CSV', ]; diff --git a/resources/lang/cs/admin/categories/general.php b/resources/lang/cs/admin/categories/general.php index ced06fc859..0aa77f5805 100644 --- a/resources/lang/cs/admin/categories/general.php +++ b/resources/lang/cs/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorie majetku', 'category_name' => 'Jméno kategorie', 'checkin_email' => 'Při naskladnění/vyskladnění poslat uživateli e-mail.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Použijte raději primární výchozí EULA.', 'use_default_eula_disabled' => 'Použijte raději primární výchozí EULA. Nenalezena primární výchozí EULA. Přidejte ji v Nastaveních prosím.', -); +]; diff --git a/resources/lang/cs/admin/categories/message.php b/resources/lang/cs/admin/categories/message.php index 2970ef9af8..b3f589e536 100644 --- a/resources/lang/cs/admin/categories/message.php +++ b/resources/lang/cs/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorie neexistuje.', 'assoc_models' => 'Tato kategorie obsahuje nejméně jeden model majetku a nemůže být proto odstraněna. Změňte kategorii v dotyčných modelech majetku a zkuste to znovu. ', 'assoc_items' => 'Tato kategorie obsahuje nejméně jeden :asset_type a nemůže být proto odstraněna. Změňte kategorii v dotyčných :asset_type a zkuste to znovu. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorie nebyla vytvořena, zkuste to znovu prosím.', - 'success' => 'Kategorie byla úspěšně vytvořena.' - ), + 'success' => 'Kategorie byla úspěšně vytvořena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorie nebyla aktualizována, zkuste to znovu prosím', - 'success' => 'Kategorie aktualizována úspěšně.' - ), + 'success' => 'Kategorie aktualizována úspěšně.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu chcete smazat tuto kategorii na trvalo?', 'error' => 'Vyskytl se problém při mazání kategorie. Zkuste to znovu prosím.', - 'success' => 'Kategorie byla úspěšně smazána.' - ) + 'success' => 'Kategorie byla úspěšně smazána.', + ], -); +]; diff --git a/resources/lang/cs/admin/categories/table.php b/resources/lang/cs/admin/categories/table.php index 834a6349b2..fdd4765c57 100644 --- a/resources/lang/cs/admin/categories/table.php +++ b/resources/lang/cs/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Nadřazená složka', 'require_acceptance' => 'Míra souhlasu', 'title' => 'Jméno kategorie majetku', -); +]; diff --git a/resources/lang/cs/admin/companies/general.php b/resources/lang/cs/admin/companies/general.php index a64e22d43a..6aa4064e94 100644 --- a/resources/lang/cs/admin/companies/general.php +++ b/resources/lang/cs/admin/companies/general.php @@ -1,4 +1,5 @@ 'Zvolte společnost', ]; diff --git a/resources/lang/cs/admin/companies/message.php b/resources/lang/cs/admin/companies/message.php index 7e143d3221..e4071aeb8a 100644 --- a/resources/lang/cs/admin/companies/message.php +++ b/resources/lang/cs/admin/companies/message.php @@ -1,18 +1,19 @@ 'Společnost nebyla založena.', 'assoc_users' => 'Tato společnost je právě přiřazena alespoň k jednomu modelu majetku a nemůže tak být odstraněna. Odeberte její vazbu z patřičných modelů a akci opakujte. ', - 'create' => array( + 'create' => [ 'error' => 'Společnost nebyla založena, zkuste to znovu.', - 'success' => 'Společnost byla v pořádku založena.' - ), - 'update' => array( + 'success' => 'Společnost byla v pořádku založena.', + ], + 'update' => [ 'error' => 'Společnost se nepodařilo upravit, zkuste to prosím znovu', - 'success' => 'Společnost byla v pořádku upravena.' - ), - 'delete' => array( + 'success' => 'Společnost byla v pořádku upravena.', + ], + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit tuto společnost?', 'error' => 'Nepodařilo se nám zvolenou společnost odstranit. Zkuste to prosím znovu.', - 'success' => 'Společnost byla v pořádku odstraněna.' - ) -); + 'success' => 'Společnost byla v pořádku odstraněna.', + ], +]; diff --git a/resources/lang/cs/admin/companies/table.php b/resources/lang/cs/admin/companies/table.php index d32e49bf2a..713192f2e1 100644 --- a/resources/lang/cs/admin/companies/table.php +++ b/resources/lang/cs/admin/companies/table.php @@ -1,9 +1,10 @@ 'Společnosti', 'create' => 'Založit společnost', 'title' => 'Společnost', 'update' => 'Upravit společnost', 'name' => 'Název společnosti', 'id' => 'ID', -); +]; diff --git a/resources/lang/cs/admin/components/general.php b/resources/lang/cs/admin/components/general.php index f6f248a861..563a912d30 100644 --- a/resources/lang/cs/admin/components/general.php +++ b/resources/lang/cs/admin/components/general.php @@ -1,6 +1,6 @@ 'Název dílu', 'checkin' => 'Převzít díl', 'checkout' => 'Předat díl', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Zbývá', 'total' => 'Celkem', 'update' => 'Upravit díl', -); +]; diff --git a/resources/lang/cs/admin/components/message.php b/resources/lang/cs/admin/components/message.php index 35730112ef..f1c9aae8f4 100644 --- a/resources/lang/cs/admin/components/message.php +++ b/resources/lang/cs/admin/components/message.php @@ -1,36 +1,35 @@ 'Takový díl neexistuje.', - 'create' => array( + 'create' => [ 'error' => 'Nepodařilo se vytvořit díl, zkuste to prosím znovu.', - 'success' => 'Díl byl v pořádku vytvořen.' - ), + 'success' => 'Díl byl v pořádku vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Nepodařilo se upravit díl, zkuste to prosím znovu', - 'success' => 'Díl byl v pořádku upraven.' - ), + 'success' => 'Díl byl v pořádku upraven.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit tento díl?', 'error' => 'Nepodařilo se díl odstranit. Zkuste to prosím později.', - 'success' => 'Díl byl v pořádku odstraněn.' - ), + 'success' => 'Díl byl v pořádku odstraněn.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Díl se nepodařilo předat, zkuste to prosím znovu', 'success' => 'Díl byl v pořádku předán.', - 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.' - ), + 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Díl se nepodařilo převzít, zkuste to prosím znovu', 'success' => 'Díl byl v pořádku převzat.', - 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.' - ) + 'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.', + ], - -); +]; diff --git a/resources/lang/cs/admin/components/table.php b/resources/lang/cs/admin/components/table.php index c14bedce2d..b366c8fbca 100644 --- a/resources/lang/cs/admin/components/table.php +++ b/resources/lang/cs/admin/components/table.php @@ -1,5 +1,5 @@ 'Název komponenty', -); +]; diff --git a/resources/lang/cs/admin/consumables/general.php b/resources/lang/cs/admin/consumables/general.php index ea4ce1c3d1..f496b6f8b9 100644 --- a/resources/lang/cs/admin/consumables/general.php +++ b/resources/lang/cs/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Výdej spotřebního materiálu uživateli', 'consumable_name' => 'Název sp. materiálu', 'create' => 'Vytvořit sp. materiál', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Zbývá', 'total' => 'Celkem', 'update' => 'Upravit sp. materiál', -); +]; diff --git a/resources/lang/cs/admin/consumables/message.php b/resources/lang/cs/admin/consumables/message.php index ab98153e2e..d851dd383a 100644 --- a/resources/lang/cs/admin/consumables/message.php +++ b/resources/lang/cs/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Spotřební materiál nebyl nalezen.', - 'create' => array( + 'create' => [ 'error' => 'Spotřební materiál se nepodařilo vytvořit, pokuste se o to znovu.', - 'success' => 'Spotřební materiál byl úspěšně vytvořen.' - ), + 'success' => 'Spotřební materiál byl úspěšně vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Spotřební materiál se nepodařilo upravit, pokuste se o to znovu', - 'success' => 'Spotřební materiál byl v pořádku upraven.' - ), + 'success' => 'Spotřební materiál byl v pořádku upraven.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit tento spotřební materiál?', 'error' => 'Nepodařilo se nám spotřební materiál odstranit. Zkuste to prosím znovu.', - 'success' => 'Spotřební materiál byl v pořádku odstraněn.' - ), + 'success' => 'Spotřební materiál byl v pořádku odstraněn.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Spotřební materiál se nepodařilo přidělit, pokuste se o to znovu', 'success' => 'Spotřební materiál byl v pořádku přidělen.', - 'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.' - ), + 'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Spotřební materiál se nepodařilo převzít, pokuste se o to znovu', 'success' => 'Spotřební materiál byl v pořádku převzat.', - 'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.' - ) + 'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.', + ], - -); +]; diff --git a/resources/lang/cs/admin/consumables/table.php b/resources/lang/cs/admin/consumables/table.php index ec84a6ac79..14650c021f 100644 --- a/resources/lang/cs/admin/consumables/table.php +++ b/resources/lang/cs/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Název', -); +]; diff --git a/resources/lang/cs/admin/custom_fields/general.php b/resources/lang/cs/admin/custom_fields/general.php index b7de109359..7a5f113e33 100644 --- a/resources/lang/cs/admin/custom_fields/general.php +++ b/resources/lang/cs/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Vlastní pole', 'field' => 'Pole', 'about_fieldsets_title' => 'O sadách polí', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nové vlastní pole', 'value_encrypted' => 'Hodnota tohoto pole je zašifrována v databázi. Pouze administrátoři budou moci zobrazit dešifrovanou hodnotu', 'show_in_email' => 'Zahrnout hodnotu této kolonky do e-mailu o vyskladnění pro uživatele? Šifrované kolonky nemohou být součástí e-mailů.', -); +]; diff --git a/resources/lang/cs/admin/custom_fields/message.php b/resources/lang/cs/admin/custom_fields/message.php index 72a065acb4..f19663b1c9 100644 --- a/resources/lang/cs/admin/custom_fields/message.php +++ b/resources/lang/cs/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Takové pole neexistuje.', 'already_added' => 'Takové pole již existuje', - 'create' => array( + 'create' => [ 'error' => 'Pole se nepodařilo přidat, pokuste se o to znovu.', 'success' => 'Pole se v pořádku vytvořilo.', - 'assoc_success' => 'Pole se v pořádku přidalo do sady.' - ), + 'assoc_success' => 'Pole se v pořádku přidalo do sady.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pole se nepodařilo upravit, pokuste se o to znovu', - 'success' => 'Pole v pořádku upraveno.' - ), + 'success' => 'Pole v pořádku upraveno.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit toto pole?', 'error' => 'Nepodařilo se nám pole odstranit. Zkuste to prosím znovu.', 'success' => 'Pole bylo v pořádku odstraněno.', 'in_use' => 'Toto pole je stále používané.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset neexistuje', - 'create' => array( + 'create' => [ 'error' => 'Sadu se nám nepodařilo vytvořit, pokuste se o to znovu.', - 'success' => 'Sada byla úspěšně vytvořena.' - ), + 'success' => 'Sada byla úspěšně vytvořena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Sadu se nám nepodařilo upravit, pokuste se o to znovu', - 'success' => 'Sada byla v pořádku upravena.' - ), + 'success' => 'Sada byla v pořádku upravena.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit celou tuto sadu?', 'error' => 'Nepodařilo se nám sadu odstranit. Zkuste to prosím znovu.', 'success' => 'Sada byla v pořádku odstraněna.', 'in_use' => 'Sada je stále užívána.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/cs/admin/departments/message.php b/resources/lang/cs/admin/departments/message.php index c2f1f1452f..edd653c0b8 100644 --- a/resources/lang/cs/admin/departments/message.php +++ b/resources/lang/cs/admin/departments/message.php @@ -1,21 +1,21 @@ 'Oddělení neexistuje.', 'assoc_users' => 'Toto oddělení je momentálně přiřazeno alespoň jednomu uživateli a nelze jej smazat. Aktualizujte své uživatele tak, aby již neodkázali na toto oddělení a zkuste to znovu.', - 'create' => array( + 'create' => [ 'error' => 'Oddělení nebylo vytvořeno, zkuste to prosím znovu.', - 'success' => 'Oddělení bylo úspěšně vytvořeno.' - ), - 'update' => array( + 'success' => 'Oddělení bylo úspěšně vytvořeno.', + ], + 'update' => [ 'error' => 'Oddělení nebylo aktualizováno, zkuste to prosím znovu', - 'success' => 'Oddělení se úspěšně aktualizovalo.' - ), - 'delete' => array( + 'success' => 'Oddělení se úspěšně aktualizovalo.', + ], + 'delete' => [ 'confirm' => 'Opravdu chcete smazat toto oddělení?', 'error' => 'Byl problém odstranit oddělení. Prosím zkuste to znovu.', - 'success' => 'Oddělení bylo úspěšně smazáno.' - ) + 'success' => 'Oddělení bylo úspěšně smazáno.', + ], -); +]; diff --git a/resources/lang/cs/admin/departments/table.php b/resources/lang/cs/admin/departments/table.php index 057b2eaf5c..c23c348bec 100644 --- a/resources/lang/cs/admin/departments/table.php +++ b/resources/lang/cs/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Název Oddělení', @@ -8,4 +8,4 @@ return array( 'location' => 'Umístění', 'create' => 'Vytvořit Oddělení', 'update' => 'Aktualizovat Oddělení', - ); + ]; diff --git a/resources/lang/cs/admin/depreciations/general.php b/resources/lang/cs/admin/depreciations/general.php index 12ffa64ad7..2e3496ac1e 100644 --- a/resources/lang/cs/admin/depreciations/general.php +++ b/resources/lang/cs/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'O amortizaci majetku', 'about_depreciations' => 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.', 'asset_depreciations' => 'Amortizace majetku', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Počet měsíců', 'update' => 'Aktualizovat amortizaci', -); +]; diff --git a/resources/lang/cs/admin/depreciations/message.php b/resources/lang/cs/admin/depreciations/message.php index 3981249497..b435f3d17a 100644 --- a/resources/lang/cs/admin/depreciations/message.php +++ b/resources/lang/cs/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Amortizační skupina neexistuje.', 'assoc_users' => 'Tato amortizace je momentálně spojena s jedním nebo více modely a nemůže být smazáno. Prosím smažte tyto modely a pak to zkuste znovu. ', - - 'create' => array( + 'create' => [ 'error' => 'Skupina amrotizace nebyla vytvořena, zkuste to znovu. :(', - 'success' => 'Skupina amrotizace úspěšně vytvořena. :)' - ), + 'success' => 'Skupina amrotizace úspěšně vytvořena. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Skupina amrotizace nebyla aktualizována, zkuste to znovu', - 'success' => 'Skupina amrotizace úspěšně aktualizována.' - ), + 'success' => 'Skupina amrotizace úspěšně aktualizována.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu chcete smazat tuto skupinu amrotizace?', 'error' => 'Vyskytl se problém při mazání skupiny amrotizace. Zkuste to znovu.', - 'success' => 'Skupina amrotizace byla úspěšně smazána.' - ) + 'success' => 'Skupina amrotizace byla úspěšně smazána.', + ], -); +]; diff --git a/resources/lang/cs/admin/depreciations/table.php b/resources/lang/cs/admin/depreciations/table.php index d1167891eb..eb7a799fe7 100644 --- a/resources/lang/cs/admin/depreciations/table.php +++ b/resources/lang/cs/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Měsíců', 'term' => 'Podmínka', 'title' => 'Název ', -); +]; diff --git a/resources/lang/cs/admin/groups/message.php b/resources/lang/cs/admin/groups/message.php index 08724d2bc5..796bcc69f1 100644 --- a/resources/lang/cs/admin/groups/message.php +++ b/resources/lang/cs/admin/groups/message.php @@ -1,22 +1,22 @@ 'Skupina již existuje!', 'group_not_found' => 'Skupina [:id] neexistuje.', 'group_name_required' => 'Název je vyžadován', - 'success' => array( + 'success' => [ 'create' => 'Skupina byla úspěšně vytvořena.', 'update' => 'Skupina byla úspěšně upravena.', 'delete' => 'Skupina byla úspěšně odstraněna.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Určitě chcete odstranit tuto skupinu?', 'create' => 'Vyskytl se problém s vytvářením skupiny. Zkuste to znovu.', 'update' => 'Vyskytl se problém s aktualizací skupiny. Zkuste to znovu.', 'delete' => 'Vyskytl se problém se smazáním skupiny. Zkuste to znovu.', - ), + ], -); +]; diff --git a/resources/lang/cs/admin/groups/table.php b/resources/lang/cs/admin/groups/table.php index 679f6d52ff..7326a64537 100644 --- a/resources/lang/cs/admin/groups/table.php +++ b/resources/lang/cs/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Název', 'users' => '# z uživatelů', -); +]; diff --git a/resources/lang/cs/admin/groups/titles.php b/resources/lang/cs/admin/groups/titles.php index 73ff79f4f0..71a60341e3 100644 --- a/resources/lang/cs/admin/groups/titles.php +++ b/resources/lang/cs/admin/groups/titles.php @@ -1,6 +1,6 @@ 'O skupinách', 'about_groups' => 'Skupiny se používají ke zobecnění uživatelských oprávnění.', 'group_management' => 'Správa skupin', @@ -11,4 +11,4 @@ return array( 'allow' => 'Povolit', 'deny' => 'Zakázat', -); +]; diff --git a/resources/lang/cs/admin/hardware/form.php b/resources/lang/cs/admin/hardware/form.php index b55b5062d2..5c7a726abc 100644 --- a/resources/lang/cs/admin/hardware/form.php +++ b/resources/lang/cs/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Potvrzení hromadného odstranění majetku', +return [ + 'bulk_delete' => 'Potvrzení hromadného odstranění majetku', 'bulk_delete_help' => 'Zkontrolujte seznam odstraňovaného majetku níže. Jakmile jej potvrdíte, nebude možné tento majetek obnovit a budou zrušeny i vazby na uživatele, kteří jej měli v držení.', 'bulk_delete_warn' => 'Chystáte se odstranit :asset_count položek majetku.', - 'bulk_update' => 'Hromadná aktualizace majetku', - 'bulk_update_help' => 'Tento formulář umožňuje hromadnou editaci majetku. Vyplňte pouze položky, které chcete změnit. Jakékoliv prázné položky zůstanou nezměněny. ', - 'bulk_update_warn' => 'Budou se editovat vlastnosti :asset_count assets.', + 'bulk_update' => 'Hromadná aktualizace majetku', + 'bulk_update_help' => 'Tento formulář umožňuje hromadnou editaci majetku. Vyplňte pouze položky, které chcete změnit. Jakékoliv prázné položky zůstanou nezměněny. ', + 'bulk_update_warn' => 'Budou se editovat vlastnosti :asset_count assets.', 'checkedout_to' => 'Vydané komu', 'checkout_date' => 'Datum vydání', 'checkin_date' => 'Datum převzetí', @@ -38,7 +38,6 @@ return array( 'tag' => 'Označení majetku', 'update' => 'Úprava majetku', 'warranty' => 'Záruka', - 'warranty_expires' => 'Záruka končí', + 'warranty_expires' => 'Záruka končí', 'years' => 'roky', -) -; +]; diff --git a/resources/lang/cs/admin/hardware/general.php b/resources/lang/cs/admin/hardware/general.php index 9f85bfd815..93e4863b84 100644 --- a/resources/lang/cs/admin/hardware/general.php +++ b/resources/lang/cs/admin/hardware/general.php @@ -1,9 +1,9 @@ 'O majetku', 'about_assets_text' => 'Majetky jsou položky sledované sériovým číslem nebo značkou. Mají tendenci mít vyšší hodnotou, tam kde je důležitá identifikace určité položky.', - 'archived' => 'Archivováno', + 'archived' => 'Archivováno', 'asset' => 'Majetek', 'bulk_checkout' => 'Vyskladnit majetek', 'checkin' => 'Převzít majetek', @@ -19,4 +19,4 @@ return array( 'pending' => 'Čekající', 'undeployable' => 'Nepřiřaditelné', 'view' => 'Zobrazit majetek', -); +]; diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php index 8fd101c078..77eddf7675 100644 --- a/resources/lang/cs/admin/hardware/message.php +++ b/resources/lang/cs/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Varování: Toto zařízení bylo označeno jako momentálně nepřiřaditelné. Pokud se na jeho stavu něco změnilo, upravte jej.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Hezký pokus, ale majetek buď neexistuje, nebo není možné jej převzít.', 'assoc_users' => 'Majetek je předán svému uživateli a nelze jej odstranit. Před odstraněním jej nejprve převezměte. ', - 'create' => array( + 'create' => [ 'error' => 'Majetek se nepodařilo vytvořit, zkuste to prosím znovu.', - 'success' => 'Majetek byl v pořádku vytvořen.' - ), + 'success' => 'Majetek byl v pořádku vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Majetek se nepodařilo upravit, zkuste to prosím znovu', 'success' => 'Majetek úspěšně aktualizován.', 'nothing_updated' => 'Nebyla zvolena žádná pole, nic se tedy neupravilo.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Majetek se nepodařilo obnovit, zkuste to prosím později', - 'success' => 'Majetek byl v pořádku obnoven.' - ), + 'success' => 'Majetek byl v pořádku obnoven.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audit majetku byl neúspěšný. Prosím zkuste to znovu.', - 'success' => 'Audit aktiv byl úspěšně zaznamenáván.' - ), + 'success' => 'Audit aktiv byl úspěšně zaznamenáván.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Soubor se nesmazal, prosím zkuste to znovu.', 'success' => 'Soubor byl úspěšně smazán.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Soubor(y) se nepodařilo nahrát, zkuste to prosím znovu.', 'success' => 'Soubor(y) byly v pořádku nahrány.', 'nofiles' => 'K nahrání jste nevybrali žádný, nebo příliš velký soubor', 'invalidfiles' => 'Jeden nebo více označených souborů je příliš velkých nebo nejsou podporované. Povolenými příponami jsou png, gif, pdf a txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Některé položky nebyly správně importovány.', 'errorDetail' => 'Následující položky nebyly importovány kvůli chybám.', - 'success' => "Váš soubor byl importován", - 'file_delete_success' => "Váš soubor byl úspěšně odstraněn", - 'file_delete_error' => "Soubor nelze odstranit", - ), + 'success' => 'Váš soubor byl importován', + 'file_delete_success' => 'Váš soubor byl úspěšně odstraněn', + 'file_delete_error' => 'Soubor nelze odstranit', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete tento majetek odstranit?', 'error' => 'Nepodařilo se nám tento majetek odstranit. Zkuste to prosím znovu.', 'nothing_updated' => 'Žádný majetek nebyl vybrán, takže nic nebylo odstraněno.', - 'success' => 'Majetek byl úspěšně smazán.' - ), + 'success' => 'Majetek byl úspěšně smazán.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Majetek nebyl předán, zkuste to prosím znovu', 'success' => 'Majetek byl v pořádku předán.', 'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.', 'not_available' => 'Tento majetek není k dispozici pro výdej!', - 'no_assets_selected' => 'Je třeba vybrat ze seznamu alespoň jeden majetek' - ), + 'no_assets_selected' => 'Je třeba vybrat ze seznamu alespoň jeden majetek', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Majetek nebyl převzat. Zkuste to prosím znovu', 'success' => 'Majetek byl v pořádku převzat.', 'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.', 'already_checked_in' => 'Tento majetek je již předaný.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Majetek nebyl vyžádán, zkuste to prosím znovu', 'success' => 'Vyžádání majetku proběhlo v pořádku.', - 'canceled' => 'Požadavek na výdej byl úspěšně zrušen' - ) + 'canceled' => 'Požadavek na výdej byl úspěšně zrušen', + ], -); +]; diff --git a/resources/lang/cs/admin/hardware/table.php b/resources/lang/cs/admin/hardware/table.php index 11a89142fd..fa9dd8093c 100644 --- a/resources/lang/cs/admin/hardware/table.php +++ b/resources/lang/cs/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Označení majetku', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Majetek ', 'image' => 'Obrázek zařízení', 'days_without_acceptance' => 'Dní bez schválení', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/cs/admin/kits/general.php b/resources/lang/cs/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/cs/admin/kits/general.php +++ b/resources/lang/cs/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/cs/admin/licenses/form.php b/resources/lang/cs/admin/licenses/form.php index e3d9b9a084..85e756856a 100644 --- a/resources/lang/cs/admin/licenses/form.php +++ b/resources/lang/cs/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Majetek', 'checkin' => 'Příjem', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Registrováno na Email', 'to_name' => 'Registrace na jméno', 'update' => 'Úprava licence', - 'checkout_help' => 'Licence musí být přidělena majetku nebo uživateli. Pokud zvolíte obojí, uživatel zvoleného majetku musí souhlasit se zvoleným uživatelem.' -); + 'checkout_help' => 'Licence musí být přidělena majetku nebo uživateli. Pokud zvolíte obojí, uživatel zvoleného majetku musí souhlasit se zvoleným uživatelem.', +]; diff --git a/resources/lang/cs/admin/licenses/general.php b/resources/lang/cs/admin/licenses/general.php index c2b56ec195..40c24f88f8 100644 --- a/resources/lang/cs/admin/licenses/general.php +++ b/resources/lang/cs/admin/licenses/general.php @@ -1,6 +1,6 @@ 'O licencích', 'about_licenses' => 'Licence jsou používány ke sledování softwaru. Mají stanovený počet uživatelských licencí, které mohou být přiděleny jednotlivcům', 'checkin' => 'Převzít jednu licenci', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Softwarové licence', 'user' => 'Uživatel', 'view' => 'Ukaž licenci', -); +]; diff --git a/resources/lang/cs/admin/licenses/message.php b/resources/lang/cs/admin/licenses/message.php index 086fbaa9ae..20db101332 100644 --- a/resources/lang/cs/admin/licenses/message.php +++ b/resources/lang/cs/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licence neexistuje.', 'user_does_not_exist' => 'Uživatel neexistuje.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Musíte vybrat aktivum nebo uživatele, ale ne obojí.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licence nebyla vytvořena, zkuste to prosím znovu.', - 'success' => 'Licence byla úspěšně vytvořena.' - ), + 'success' => 'Licence byla úspěšně vytvořena.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Soubor se nepodařilo smazat. Prosím zkuste to znovu.', 'success' => 'Soubor byl úspěšně smazán.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Soubor(y) se nepodařilo nahrát. Prosím zkuste to znovu.', 'success' => 'Soubor(y) byly v pořádku nahrány.', 'nofiles' => 'K nahrání jste nevybrali žádný, nebo příliš velký soubor', 'invalidfiles' => 'Jeden nebo více označených souborů je příliš velkých nebo nejsou podporované. Povolenými příponami jsou png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, a lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licence nebyla aktualizována, zkuste to prosím znovu', - 'success' => 'Licence byla úspěšně aktualizována.' - ), + 'success' => 'Licence byla úspěšně aktualizována.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jste si jisti, že chcete odstranit tuto licenci?', 'error' => 'Vyskytl se problém při mazání licence. Zkuste to znovu prosím.', - 'success' => 'Licence byla úspěšně smazána.' - ), + 'success' => 'Licence byla úspěšně smazána.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Vyskytl se problém při výdeji licence. Zkuste to znovu prosím.', - 'success' => 'Licence byla úspěšně vydána' - ), + 'success' => 'Licence byla úspěšně vydána', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Vyskytl se problém při ověřování licence. Zkuste to znovu prosím.', - 'success' => 'Licence byla úspěšně zkontrolována' - ), + 'success' => 'Licence byla úspěšně zkontrolována', + ], -); +]; diff --git a/resources/lang/cs/admin/licenses/table.php b/resources/lang/cs/admin/licenses/table.php index ea0538d372..b097714d98 100644 --- a/resources/lang/cs/admin/licenses/table.php +++ b/resources/lang/cs/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Přiděleno', 'checkout' => 'Stav', @@ -14,4 +14,4 @@ return array( 'serial' => 'Sériové číslo', 'title' => 'Licence', -); +]; diff --git a/resources/lang/cs/admin/locations/message.php b/resources/lang/cs/admin/locations/message.php index 55d776091d..0777338857 100644 --- a/resources/lang/cs/admin/locations/message.php +++ b/resources/lang/cs/admin/locations/message.php @@ -1,27 +1,26 @@ 'Místo neexistuje.', 'assoc_users' => 'Toto umístění je spojeno s alespoň jedním uživatelem a nemůže být smazáno. Aktualizujte uživatele aby nenáleželi k tomuto umístění a zkuste to znovu. ', 'assoc_assets' => 'Toto umístění je spojeno s alespoň jedním majetkem a nemůže být smazáno. Aktualizujte majetky tak aby nenáleželi k tomuto umístění a zkuste to znovu. ', 'assoc_child_loc' => 'Toto umístění je nadřazené alespoň jednomu umístění a nelze jej smazat. Aktualizujte své umístění tak, aby na toto umístění již neodkazovalo a zkuste to znovu. ', - - 'create' => array( + 'create' => [ 'error' => 'Místo nebylo vytvořeno, zkuste to znovu prosím.', - 'success' => 'Místo bylo úspěšně vytvořeno.' - ), + 'success' => 'Místo bylo úspěšně vytvořeno.', + ], - 'update' => array( + 'update' => [ 'error' => 'Místo nebylo aktualizováno, zkuste to znovu prosím', - 'success' => 'Místo úspěšně aktualizováno.' - ), + 'success' => 'Místo úspěšně aktualizováno.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si želáte vymazat tohle místo na trvalo?', 'error' => 'Vyskytl se problém při mazání místa. Zkuste to znovu prosím.', - 'success' => 'Místo bylo úspěšně smazáno.' - ) + 'success' => 'Místo bylo úspěšně smazáno.', + ], -); +]; diff --git a/resources/lang/cs/admin/locations/table.php b/resources/lang/cs/admin/locations/table.php index e78ecc70b4..536313a685 100644 --- a/resources/lang/cs/admin/locations/table.php +++ b/resources/lang/cs/admin/locations/table.php @@ -1,6 +1,6 @@ 'O umístěních', 'about_locations' => 'Umístění se používá ke sledování informací o poloze uživatelů, majetku a dalších položek', 'assets_rtd' => 'Zařízení', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Nadřazené', 'currency' => 'Měna', 'ldap_ou' => 'LDAP Vyhledat OU', - ); + ]; diff --git a/resources/lang/cs/admin/manufacturers/message.php b/resources/lang/cs/admin/manufacturers/message.php index be73b254ee..733442e302 100644 --- a/resources/lang/cs/admin/manufacturers/message.php +++ b/resources/lang/cs/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Výrobce neexistuje.', 'assoc_users' => 'Tento výrobce je uveden minimálně u jednoho modelu a nemůže být smazán. Odstraňte výrobce z modelů a zkuste to znovu. ', - 'create' => array( + 'create' => [ 'error' => 'Výrobce nebyl vytvořen, zkuste to znovu.', - 'success' => 'Výrobce úspěšně vytvořen.' - ), + 'success' => 'Výrobce úspěšně vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Výrobce nebyl vytvořen, zkuste to znovu', - 'success' => 'Výrobce úspěšně vytvořen.' - ), + 'success' => 'Výrobce úspěšně vytvořen.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Výrobce nebyl obnoven, zkuste to znovu', - 'success' => 'Výrobce úspěšně obnoven.' - ), + 'success' => 'Výrobce úspěšně obnoven.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu chcete smazat tohoto výrobce?', 'error' => 'Vyskytl se problém se smazáním výrobce. Zkuste to znovu.', - 'success' => 'Výrobce byl úspěšně smazán.' - ) + 'success' => 'Výrobce byl úspěšně smazán.', + ], -); +]; diff --git a/resources/lang/cs/admin/manufacturers/table.php b/resources/lang/cs/admin/manufacturers/table.php index 4254e895a7..fb38a817a9 100644 --- a/resources/lang/cs/admin/manufacturers/table.php +++ b/resources/lang/cs/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'O výrobcích', 'about_manufacturers_text' => 'Výrobci jsou společnosti, které vytvářejí váš majetek. Zde můžete uložit důležitá kontaktní informace o podpoře, která se zobrazí na stránkách s podrobnostmi o majetku.', 'asset_manufacturers' => 'Výrobci', @@ -13,4 +13,4 @@ return array( 'update' => 'Upravit Výrobce', 'url' => 'URL', -); +]; diff --git a/resources/lang/cs/admin/models/general.php b/resources/lang/cs/admin/models/general.php index d4adf0306f..a7fe2793cb 100644 --- a/resources/lang/cs/admin/models/general.php +++ b/resources/lang/cs/admin/models/general.php @@ -1,6 +1,6 @@ 'O modelech majetku', 'about_models_text' => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.', 'deleted' => 'Model byl vymazán. Klikněte sem pro jeho obnovení.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Chystáte se smazat :model_count asset models.', 'restore' => 'Obnovení Modelu', 'requestable' => 'Uživatelé můžou požádat o tento model', - 'show_mac_address' => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu', + 'show_mac_address' => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu', 'view_deleted' => 'Zobrazit smazané', 'view_models' => 'Zobrazit Modely', 'fieldset' => 'Sada polí', 'no_custom_field' => 'Bez vlastních polí', 'add_default_values' => 'Přidat výchozí hodnoty', -); +]; diff --git a/resources/lang/cs/admin/models/message.php b/resources/lang/cs/admin/models/message.php index 421bf5625e..655ddaccdc 100644 --- a/resources/lang/cs/admin/models/message.php +++ b/resources/lang/cs/admin/models/message.php @@ -1,42 +1,41 @@ 'Model neexistuje.', 'assoc_users' => 'Tento model je spojen s alespoň jedním majetkem a nemůže být smazán. Prosím smažte tyto majetky a pak to zkuste znovu. ', - - 'create' => array( + 'create' => [ 'error' => 'Model nebyl vytvořen, zkuste to znovu.', 'success' => 'Model byl úspěšně vytvořen.', 'duplicate_set' => 'Model majetku s tímto názvem, výrobcem a číslem modelu již existuje.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model nebyl aktualizován, zkuste to prosím znovu', - 'success' => 'Model byl úspěšně aktualizován.' - ), + 'success' => 'Model byl úspěšně aktualizován.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete tento model majetku odstranit?', 'error' => 'Vyskytl se problém se smazáním modelu. Zkuste to znovu.', - 'success' => 'Model byl úspěšně smazán.' - ), + 'success' => 'Model byl úspěšně smazán.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model nebyl obnoven, zkuste to prosím znovu', - 'success' => 'Model byl úspěšně obnoven.' - ), + 'success' => 'Model byl úspěšně obnoven.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Žádné pole nebyly změněny, takže nic nebylo aktualizováno.', - 'success' => 'Modely byly aktualizovány.' - ), + 'success' => 'Modely byly aktualizovány.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nebyly vybrány žádné modely, takže nebylo nic smazáno.', 'success' => ':success_count modelů smazáno!', - 'success_partial' => ':success_count modelů smazáno, ale :fail_count nebylo možné smazat protože pořád mají přiřazený majetek.' - ), + 'success_partial' => ':success_count modelů smazáno, ale :fail_count nebylo možné smazat protože pořád mají přiřazený majetek.', + ], -); +]; diff --git a/resources/lang/cs/admin/models/table.php b/resources/lang/cs/admin/models/table.php index 93a38bf48c..7548d57ee2 100644 --- a/resources/lang/cs/admin/models/table.php +++ b/resources/lang/cs/admin/models/table.php @@ -1,6 +1,6 @@ 'Vytvořit vzor majetku', 'created_at' => 'Vytvořeno', @@ -14,4 +14,4 @@ return array( 'update' => 'Upravit vzor majetku', 'clone' => 'Kopíruj modelovou řadu', 'edit' => 'Edituj model', -); +]; diff --git a/resources/lang/cs/admin/reports/general.php b/resources/lang/cs/admin/reports/general.php index b1fa2f36ec..ddfc4f9827 100644 --- a/resources/lang/cs/admin/reports/general.php +++ b/resources/lang/cs/admin/reports/general.php @@ -1,5 +1,5 @@ 'Zvolte možnosti zprávy o majetku.' -); +return [ + 'info' => 'Zvolte možnosti zprávy o majetku.', +]; diff --git a/resources/lang/cs/admin/reports/message.php b/resources/lang/cs/admin/reports/message.php index 6457338c1f..3c2485d7cd 100644 --- a/resources/lang/cs/admin/reports/message.php +++ b/resources/lang/cs/admin/reports/message.php @@ -1,5 +1,5 @@ 'Musíte vybrat alespoň jednu možnost.' -); +return [ + 'error' => 'Musíte vybrat alespoň jednu možnost.', +]; diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php index 70695ba7f1..24e89f8b3d 100644 --- a/resources/lang/cs/admin/settings/general.php +++ b/resources/lang/cs/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Doména služby Active Directory', 'ad_domain_help' => 'Toto je někdy stejné jako vaše emailová doména, ale ne vždy.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Ve skryté kopii', 'admin_cc_email_help' => 'Chcete-li poslat kopii e-mailů pro check-in / checkout, které jsou uživatelům zaslány na další e-mailový účet, zadejte je zde. V opačném případě nechte toto pole prázdné.', 'is_ad' => 'Toto je server služby Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Mez upozornění na vypršení (ve dnech)', 'alert_inv_threshold' => 'Mez upozornění skladu', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID majetku', 'audit_interval' => 'Interval auditu', 'audit_interval_help' => 'Pokud budete muset pravidelně fyzicky kontrolovat svůj majetek, zadejte interval v měsících.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Zadejte dvoufaktorový kód', 'two_factor_config_complete' => 'Odeslat kód', 'two_factor_enabled_edit_not_allowed' => 'Váš administrátor vám nedovolil upravit toto nastavení.', - 'two_factor_enrollment_text' => "Je vyžadováno dvoufaktorové ověření, nicméně vaše zařízení ještě nebylo zaregistrováno. Otevřete aplikaci Google Authenticator a oskenujte níže uvedený QR kód pro registraci vašeho zařízení. Jakmile zaregistrujete své zařízení, zadejte níže uvedený kód", + 'two_factor_enrollment_text' => 'Je vyžadováno dvoufaktorové ověření, nicméně vaše zařízení ještě nebylo zaregistrováno. Otevřete aplikaci Google Authenticator a oskenujte níže uvedený QR kód pro registraci vašeho zařízení. Jakmile zaregistrujete své zařízení, zadejte níže uvedený kód', 'require_accept_signature' => 'Požadovat podpis', 'require_accept_signature_help_text' => 'Aktivace této funkce bude vyžadovat, aby se uživatelé fyzicky přihlásili k přijetí určitého materiálu.', 'left' => 'vlevo', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Zaškrtnutím tohoto políčka bude vynucena jedinečnost seriových čísel položek majetku', 'zerofill_count' => 'Délka značek majetku včetně zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/cs/admin/settings/message.php b/resources/lang/cs/admin/settings/message.php index d550b7b973..90dd3be852 100644 --- a/resources/lang/cs/admin/settings/message.php +++ b/resources/lang/cs/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Vyskytla se chyba při aktualizaci. ', - 'success' => 'Nastavení úspěšně uloženo.' - ), - 'backup' => array( + 'success' => 'Nastavení úspěšně uloženo.', + ], + 'backup' => [ 'delete_confirm' => 'Opravdu chcete vymazat tento záložní soubor? Tuto akci nelze vrátit zpět. ', 'file_deleted' => 'Záložní soubor byl úspěšně smazán. ', 'generated' => 'Byla úspěšně vytvořena nová záloha.', 'file_not_found' => 'Tento záložní soubor nebyl na serveru nalezen.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Během čištění došlo k chybě. ', 'validation_failed' => 'Vaše potvrzení o čištění je nesprávné. Zadejte prosím slovo "DELETE" do potvrzovacího rámečku.', - 'success' => 'Vymazané záznamy byly úspěšně vyčištěny.' - ), + 'success' => 'Vymazané záznamy byly úspěšně vyčištěny.', + ], -); +]; diff --git a/resources/lang/cs/admin/statuslabels/message.php b/resources/lang/cs/admin/statuslabels/message.php index f7fa8c59ef..e2a0be24cc 100644 --- a/resources/lang/cs/admin/statuslabels/message.php +++ b/resources/lang/cs/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Stavový štítek neexistuje.', 'assoc_assets' => 'Tento stavový štítek je právě přiřazena alespoň k jednomu modelu majetku a nemůže tak být odstraněn. Odeberte jeho vazbu z patřičných modelů a akci opakujte. ', - - 'create' => array( + 'create' => [ 'error' => 'Stavový štítek nebyl vytvořen, zkuste to prosím znovu.', - 'success' => 'Stavový štítek byl úspěšně vytvořen.' - ), + 'success' => 'Stavový štítek byl úspěšně vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Stavový štítek nebyl aktualizován, zkuste to prosím znovu', - 'success' => 'Stavový štítek byl úspěšně aktualizován.' - ), + 'success' => 'Stavový štítek byl úspěšně aktualizován.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit tento stavový štítek?', 'error' => 'Vyskytl se problém při mazání datového štítku. Zkuste to znovu prosím.', - 'success' => 'Stavový štítek byl úspěšně smazán.' - ), + 'success' => 'Stavový štítek byl úspěšně smazán.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Tyto prostředky nelze nikomu přiřadit.', 'deployable' => 'Tyto aktiva je možné zkontrolovat. Jakmile budou přiděleny, převezmou status meta Deployed.', 'archived' => 'Tyto prostředky nelze odhlásit a zobrazí se pouze v zobrazení Archivováno. To je užitečné pro uchovávání informací o prostředcích pro účely rozpočtování / historických účelů, ale jejich uchování mimo denní seznam aktiv.', 'pending' => 'Tento majetek zatím nemůže být přiřazen nikomu, často používanému pro položky, které jsou určeny k opravě, ale očekává se, že se vrátí do oběhu.', - ), + ], -); +]; diff --git a/resources/lang/cs/admin/statuslabels/table.php b/resources/lang/cs/admin/statuslabels/table.php index 3fb3c0f178..73f31484e7 100644 --- a/resources/lang/cs/admin/statuslabels/table.php +++ b/resources/lang/cs/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'O označení stavu', 'archived' => 'Archivováno', 'create' => 'Vytvořit označení stavu', @@ -16,4 +16,4 @@ return array( 'title' => 'Označení stavu', 'undeployable' => 'Nemožné připravit', 'update' => 'Upravit označení stavu', -); +]; diff --git a/resources/lang/cs/admin/suppliers/message.php b/resources/lang/cs/admin/suppliers/message.php index 39a8ab17c9..4844f42307 100644 --- a/resources/lang/cs/admin/suppliers/message.php +++ b/resources/lang/cs/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Dodavatel neexistuje.', - - 'create' => array( + 'create' => [ 'error' => 'Dodavatel nebyl vytvořen, zkuste to prosím znovu.', - 'success' => 'Dodavatel úspěšně vytvořen.' - ), + 'success' => 'Dodavatel úspěšně vytvořen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dodavatel nebyl aktualizován, zkuste to prosím znovu', - 'success' => 'Dodavatel úspěšně aktualizován.' - ), + 'success' => 'Dodavatel úspěšně aktualizován.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Opravdu si přejete odstranit tohoto dodavatele?', 'error' => 'Vyskytl se problém při mazání dodavatele. Zkuste to prosím znovu.', 'success' => 'Dodavatel byl úspěšně smazán.', 'assoc_assets' => 'Tento dodavatel je v současné době přiřazen k :asset_count položkám majetku a nelze jej smazat. Aktualizujte svůj majetek tak, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ', 'assoc_licenses' => 'Tento dodavatel je v současné době spojen s :licenses_count licencemi a nelze jej smazat. Aktualizujte prosím své licence, abyste již tento dodavatel nebyl přiřazen a zkuste to znovu. ', 'assoc_maintenances' => 'Tento dodavatel je v současné době spojen s údržbou :asset_maintenances_count položek majetku a nemůže být smazán. Aktualizujte prosím údržbu vašeho majetku, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ', - ) + ], -); +]; diff --git a/resources/lang/cs/admin/suppliers/table.php b/resources/lang/cs/admin/suppliers/table.php index d671c33c1c..39e0cfd1a7 100644 --- a/resources/lang/cs/admin/suppliers/table.php +++ b/resources/lang/cs/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'O dodavatelích', 'about_suppliers_text' => 'Dodavatelé se používají ke sledování zdroje položek', 'address' => 'Adresa dodavatele', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Zobrazit majetky pro', 'zip' => 'PSČ', -); +]; diff --git a/resources/lang/cs/admin/users/general.php b/resources/lang/cs/admin/users/general.php index 7e0a2f3199..73505d887b 100644 --- a/resources/lang/cs/admin/users/general.php +++ b/resources/lang/cs/admin/users/general.php @@ -1,7 +1,6 @@ 'Tento uživatel se může přihlásit', 'activated_disabled_help_text' => 'Nelze upravit stav aktivace pro svůj vlastní účet.', 'assets_user' => 'Majetky přiřazené :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Upravit uživatele', 'filetype_info' => 'Povolené přílohy: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Historie:', - 'info' => 'Informace', + 'info' => 'Informace', 'restore_user' => 'Klikněte zde pro obnovení.', 'last_login' => 'Poslední přihlášení', 'ldap_config_text' => 'Nastavení konfigurace LDAP lze nalézt v menu Správce> Nastavení. Vybrané (volitelně) místo bude nastaven pro všechny importované uživatele.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Vaše současná nastavení administrátora umožňují selektivní vynucení dvoufaktorového ověřování. ', 'two_factor_enrolled' => 'Přihlášeno zařízení 2FA ', 'two_factor_active' => '2FA aktivní ', - ); + ]; diff --git a/resources/lang/cs/admin/users/message.php b/resources/lang/cs/admin/users/message.php index eef2263c74..fcbc537542 100644 --- a/resources/lang/cs/admin/users/message.php +++ b/resources/lang/cs/admin/users/message.php @@ -1,6 +1,6 @@ 'Úspěšně jste přijali tento majetek.', 'declined' => 'Úspěšně jste odmítli tento majetek.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integrace LDAP nebyla pro tuto instalaci nakonfigurována.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Uživatel byl úspěšně vytvořen.', 'update' => 'Uživatel byl úspěšně aktualizován.', 'update_bulk' => 'Uživatelé byli úspěšně aktualizováni!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Uživatel byl úspěšně zrušen.', 'restored' => 'Uživatel byl úspěšně obnoven.', 'import' => 'Uživatelé úspěšně naimportování.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Vyskytl se problém při vytvářením uživatele. Zkuste to znovu.', 'update' => 'Vyskytl se problém při aktualizování uživatele. Zkuste to znovu.', 'delete' => 'Vyskytl se problém při mazání uživatele. Zkuste to znovu.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nelze vyhledat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP.
Chyba serveru LDAP:', 'ldap_could_not_get_entries' => 'Nelze získat záznamy ze serveru LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP.
Chyba serveru LDAP:', 'password_ldap' => 'Heslo pro tento účet je spravováno serverem LDAP / Active Directory. Obraťte se na oddělení IT a změňte heslo.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Soubor se nepodařilo smazat. Prosím zkuste to znovu.', 'success' => 'Soubor byl úspěšně smazán.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Soubor(y) se nepodařilo nahrát. Prosím zkuste to znovu.', 'success' => 'Soubor(y) byly v pořádku nahrány.', 'nofiles' => 'Nevybrali jste žádné soubory pro nahrávání', 'invalidfiles' => 'Jeden nebo více označených souborů je příliš velkých nebo nejsou podporované. Povolenými příponami jsou png, gif, jpg, doc, docx, pdf a txt.', - ), + ], -); +]; diff --git a/resources/lang/cs/admin/users/table.php b/resources/lang/cs/admin/users/table.php index 9e5234312f..3eb9cc5a02 100644 --- a/resources/lang/cs/admin/users/table.php +++ b/resources/lang/cs/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktivní', 'allow' => 'Povolit', 'checkedout' => 'Zařízení', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Zobraz aktuální uživatele', 'show_deleted' => 'Zobraz smazané uživatele', 'title' => 'Název', - 'to_restore_them' => 'obnovit.', + 'to_restore_them' => 'obnovit.', 'updateuser' => 'Aktualizace uživatele', 'username' => 'Uživatelské jméno', - 'user_deleted_text' => 'Tento uživatel byl označen jako smazaný.', + 'user_deleted_text' => 'Tento uživatel byl označen jako smazaný.', 'username_note' => '(Použije se pouze pro vazbu služby Active Directory, nikoliv pro přihlášení.)', 'cloneuser' => 'Duplikuj uživatele', 'viewusers' => 'Zobrazit uživatele', -); +]; diff --git a/resources/lang/cs/auth/general.php b/resources/lang/cs/auth/general.php index 353705db3e..e555a68af6 100644 --- a/resources/lang/cs/auth/general.php +++ b/resources/lang/cs/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/cs/auth/message.php b/resources/lang/cs/auth/message.php index 7739a84b5d..960787f3de 100644 --- a/resources/lang/cs/auth/message.php +++ b/resources/lang/cs/auth/message.php @@ -1,6 +1,6 @@ 'Účet s tímto emailem již existuje.', 'account_not_found' => 'Neexistující uživatel nebo chybné heslo!', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Uživatelský účet je zablokován.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Vyskytl se problém při přihlášení, zkuste to znovu.', 'success' => 'Došlo k úspěšnému přihlášení.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Vyskytl se problém při vytváření účtu, zkuste to znovu.', 'success' => 'Účet úspěšně vytvořen.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Vyskytl se problém při získávání kódu pro reset hesla, zkuste to znovu.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Vyskytl se problém při resetování hesla, zkuste to znovu.', 'success' => 'Vaše heslo bylo úspěšně resetováno.', - ), + ], - -); +]; diff --git a/resources/lang/cs/button.php b/resources/lang/cs/button.php index ba04aa86da..7aa703368e 100644 --- a/resources/lang/cs/button.php +++ b/resources/lang/cs/button.php @@ -1,6 +1,6 @@ 'Akce', 'add' => 'Přidej nový', 'cancel' => 'Zrušit', @@ -11,7 +11,7 @@ return array( 'request' => 'Požadavek', 'submit' => 'Odeslat', 'upload' => 'Nahrát', - 'select_file' => 'Vybrat soubor...', + 'select_file' => 'Vybrat soubor...', 'select_files' => 'Vybrat soubory…', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php index 1c4942bc53..a978a53119 100644 --- a/resources/lang/cs/general.php +++ b/resources/lang/cs/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Naskladnění', 'user_requests_count' => 'Požadavky', 'city' => 'Město', - 'click_here' => 'Klikněte zde', + 'click_here' => 'Klikněte zde', 'clear_selection' => 'Vyprázdnit výběr', 'companies' => 'Firmy', 'company' => 'Společnost', 'component' => 'Komponent', 'components' => 'Komponenty', - 'complete' => 'Dokončit', + 'complete' => 'Dokončit', 'consumable' => 'Spotřební materiál', 'consumables' => 'Spotřební materiál', 'country' => 'Země', diff --git a/resources/lang/cs/help.php b/resources/lang/cs/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/cs/help.php +++ b/resources/lang/cs/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/cs/mail.php b/resources/lang/cs/mail.php index e0ca4dd214..094191f78e 100644 --- a/resources/lang/cs/mail.php +++ b/resources/lang/cs/mail.php @@ -1,6 +1,6 @@ 'Uživatel zrušil žádost o položku na webu', 'a_user_requested' => 'Uživatel požádal o položku na webu', 'accessory_name' => 'Název příslušenství:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/cs/pagination.php b/resources/lang/cs/pagination.php index cde6554830..d0051fae48 100644 --- a/resources/lang/cs/pagination.php +++ b/resources/lang/cs/pagination.php @@ -1,6 +1,6 @@ 'Další »', -); +]; diff --git a/resources/lang/cs/passwords.php b/resources/lang/cs/passwords.php index e854b3a8b2..61ed745cd8 100644 --- a/resources/lang/cs/passwords.php +++ b/resources/lang/cs/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Váš odkaz s heslem byl odeslán!', 'user' => 'Nebyl nalezen žádný aktivní uživatel s takovým e-mailem.', ]; - diff --git a/resources/lang/cs/reminders.php b/resources/lang/cs/reminders.php index eb0594e2e4..b0b54d3021 100644 --- a/resources/lang/cs/reminders.php +++ b/resources/lang/cs/reminders.php @@ -1,6 +1,6 @@ "Heslo musí mít šest znaků a schodovat se s potvrzujícím heslem.", + 'password' => 'Heslo musí mít šest znaků a schodovat se s potvrzujícím heslem.', - "user" => "Uživatelské jméno nebo email je chybný", + 'user' => 'Uživatelské jméno nebo email je chybný', - "token" => "Tento token pro reset hesla je neplatný.", + 'token' => 'Tento token pro reset hesla je neplatný.', - "sent" => "Pokud byl email nalezen, tak bylo heslo zasláno!", + 'sent' => 'Pokud byl email nalezen, tak bylo heslo zasláno!', -); +]; diff --git a/resources/lang/cs/table.php b/resources/lang/cs/table.php index 3ab875403a..eb0134bd1a 100644 --- a/resources/lang/cs/table.php +++ b/resources/lang/cs/table.php @@ -1,10 +1,10 @@ 'Akce', 'action' => 'Akce', 'by' => 'Vytvořil', 'item' => 'Položka', -); +]; diff --git a/resources/lang/cs/validation.php b/resources/lang/cs/validation.php index f82ecbd3e4..c1f0326af9 100644 --- a/resources/lang/cs/validation.php +++ b/resources/lang/cs/validation.php @@ -1,6 +1,6 @@ ':attribute byl již vybrán.', 'uploaded' => 'Atribut: se nepodařilo nahrát.', 'url' => 'Formát :attribute je neplatný.', - "unique_undeleted" => "Je třeba, aby se :attribute neopakoval.", + 'unique_undeleted' => 'Je třeba, aby se :attribute neopakoval.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Pole atributu: atribut obsahuje znak, který není povolen.", - "email_array" => "Jedna nebo více e-mailových adres je neplatná.", - "hashed_pass" => "Vaše současné heslo je nesprávné", + 'alpha_space' => 'Pole atributu: atribut obsahuje znak, který není povolen.', + 'email_array' => 'Jedna nebo více e-mailových adres je neplatná.', + 'hashed_pass' => 'Vaše současné heslo je nesprávné', 'dumbpwd' => 'Toto heslo je příliš běžné.', - "statuslabel_type" => "Musíte vybrat platný typ štítku stavu", + 'statuslabel_type' => 'Musíte vybrat platný typ štítku stavu', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/cy/admin/accessories/general.php b/resources/lang/cy/admin/accessories/general.php index c89cfa68e6..4fcd47a8a1 100644 --- a/resources/lang/cy/admin/accessories/general.php +++ b/resources/lang/cy/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categori Ategolyn', 'accessory_name' => 'Enw Ategolyn', 'checkout' => 'Cofnodi ategolyn allan', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Defnyddio\'r prif CTDT diofyn yn lle.', 'use_default_eula_disabled' => 'Defnyddio\'r CTDT diofn yn lle\'r un presennol.Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch un yn gosodiadau os gwelwch yn dda.', -); +]; diff --git a/resources/lang/cy/admin/accessories/message.php b/resources/lang/cy/admin/accessories/message.php index 0a5be51aa2..39d27c4971 100644 --- a/resources/lang/cy/admin/accessories/message.php +++ b/resources/lang/cy/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Mae\'r ategolyn yma hefo :count eitem wedi nodi allan i defnyddwyr. Nodwch yr ategolion yn ol i fewn ac yna ceisiwch eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd yr ategolyn, ceisiwch eto o.g.y.dd.', - 'success' => 'Ategolyn wedi creu yn llwyddiannus.' - ), + 'success' => 'Ategolyn wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd yr ategolyn, ceisiwch eto o.g.y.dd', - 'success' => 'Diweddarwyd yr ategolyn yn llwyddiannus.' - ), + 'success' => 'Diweddarwyd yr ategolyn yn llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r eitem hwn?', 'error' => 'Nid oedd yn bosib dileu\'r eitem. Ceisiwch eto o.g.y.dd.', - 'success' => 'Ategolyn wedi dileu yn llwyddiannus.' - ), + 'success' => 'Ategolyn wedi dileu yn llwyddiannus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ategolyn heb ei nodi allan, ceisiwch eto o. g. y. dd', 'success' => 'Ategolyn wedi nodi allan yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.' - ), + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nid oedd yn bosib nodi\'r ategolyn i fewn, ceisiwch eto o.g.y.dd', 'success' => 'Ategolyn wedi nodi i fewn yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.' - ) + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.', + ], - -); +]; diff --git a/resources/lang/cy/admin/accessories/table.php b/resources/lang/cy/admin/accessories/table.php index 7774723e28..d78f4c7561 100644 --- a/resources/lang/cy/admin/accessories/table.php +++ b/resources/lang/cy/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Lawrlwytho CSV', - 'eula_text' => 'CTDT', +return [ + 'dl_csv' => 'Lawrlwytho CSV', + 'eula_text' => 'CTDT', 'id' => 'Rhif Unigryw', 'require_acceptance' => 'Derbyn', 'title' => 'Enw Ategolyn', - -); +]; diff --git a/resources/lang/cy/admin/asset_maintenances/form.php b/resources/lang/cy/admin/asset_maintenances/form.php index 4d531097c3..d8760d6fec 100644 --- a/resources/lang/cy/admin/asset_maintenances/form.php +++ b/resources/lang/cy/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dyddiau', 'notes' => 'Nodiadau', 'update' => 'Diweddaru', - 'create' => 'Creu' + 'create' => 'Creu', ]; diff --git a/resources/lang/cy/admin/asset_maintenances/message.php b/resources/lang/cy/admin/asset_maintenances/message.php index e9b5d40b01..5ae5f9b118 100644 --- a/resources/lang/cy/admin/asset_maintenances/message.php +++ b/resources/lang/cy/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r cofnod cynnal a chadw yma?', 'error' => 'Nid oedd yn bosib dileu\'r nodyn cynnal a chadw. Ceisiwch eto o.g.y.dd.', - 'success' => 'Nodyn cynnal a chadw wedi\'i dileu\'n llwyddiannus.' + 'success' => 'Nodyn cynnal a chadw wedi\'i dileu\'n llwyddiannus.', ], 'create' => [ 'error' => 'Ni crewyd y cofnod cynnal a chadw, ceisiwch eto o.g.y.dd.', - 'success' => 'Nodyn cynnal a chadw wedi\'i greu\'n llwyddiannus.' + 'success' => 'Nodyn cynnal a chadw wedi\'i greu\'n llwyddiannus.', ], 'edit' => [ 'error' => 'Wedi methu newid y cofnod cynnal a chadw, ceisiwch eto o.g.y.dd.', - 'success' => 'Nodyn cynnal a chadw wedi\'i diweddaru\'n llwyddiannus.' + 'success' => 'Nodyn cynnal a chadw wedi\'i diweddaru\'n llwyddiannus.', ], 'asset_maintenance_incomplete' => 'Heb cwbwlhau eto', 'warranty' => 'Warant', 'not_warranty' => 'Dim Warant', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/cy/admin/asset_maintenances/table.php b/resources/lang/cy/admin/asset_maintenances/table.php index 14bd62fc78..6b16bb3592 100644 --- a/resources/lang/cy/admin/asset_maintenances/table.php +++ b/resources/lang/cy/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Cynnal a chadw Ased', 'asset_name' => 'Enw Ased', 'is_warranty' => 'Warant', - 'dl_csv' => 'Lawrlwytho CSV' + 'dl_csv' => 'Lawrlwytho CSV', ]; diff --git a/resources/lang/cy/admin/categories/general.php b/resources/lang/cy/admin/categories/general.php index 8026111dbb..18cf9a7bad 100644 --- a/resources/lang/cy/admin/categories/general.php +++ b/resources/lang/cy/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categoriau Asedau', 'category_name' => 'Enw categori', 'checkin_email' => 'Gyrru ebost i defnyddiwr wrth nodi fewn/allan.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Defnyddio\'r prif CTDT diofyn yn lle.', 'use_default_eula_disabled' => 'Defnyddio\'r CTDT diofyn yn lle\'r un presennol.Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch yn ynj gosodiadau os gwelwch yn dda.', -); +]; diff --git a/resources/lang/cy/admin/categories/message.php b/resources/lang/cy/admin/categories/message.php index 44f3e21732..835eef22c5 100644 --- a/resources/lang/cy/admin/categories/message.php +++ b/resources/lang/cy/admin/categories/message.php @@ -1,25 +1,25 @@ 'Categori ddim yn bodoli.', 'assoc_models' => 'Mae\'r categori yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y categori yma ac yna ceisiwch eto. ', 'assoc_items' => 'Mae\'r categori yma wedi perthnasu i :asset_type a nid yw\'n bosib dileu. Diweddarwch eich :asset_type i beidio cyfeirio at y categori yma ac yna ceisiwch eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y categori, ceisiwch eto o. g. y. dd.', - 'success' => 'Categori wedi creu\'n llwyddiannus.' - ), + 'success' => 'Categori wedi creu\'n llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y categori, ceisiwch eto o. g. y. dd', - 'success' => 'Categori wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Categori wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r categori yma?', 'error' => 'Nid oedd yn bosib dileu\'r categori. Ceisiwch eto o.g.y.dd.', - 'success' => 'Categori wedi dileu\'n llwyddiannus.' - ) + 'success' => 'Categori wedi dileu\'n llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/categories/table.php b/resources/lang/cy/admin/categories/table.php index 904f424d4f..7e338b65ed 100644 --- a/resources/lang/cy/admin/categories/table.php +++ b/resources/lang/cy/admin/categories/table.php @@ -1,10 +1,10 @@ 'CTDT', +return [ + 'eula_text' => 'CTDT', 'id' => 'Rhif Unigryw', 'parent' => 'Rhiant', 'require_acceptance' => 'Derbyn', 'title' => 'Enw Categori Ased', -); +]; diff --git a/resources/lang/cy/admin/companies/general.php b/resources/lang/cy/admin/companies/general.php index 09ae336298..3c4aae0e3b 100644 --- a/resources/lang/cy/admin/companies/general.php +++ b/resources/lang/cy/admin/companies/general.php @@ -1,4 +1,5 @@ 'Dewis Cwmni', ]; diff --git a/resources/lang/cy/admin/companies/message.php b/resources/lang/cy/admin/companies/message.php index 69bbc99613..c30ca40463 100644 --- a/resources/lang/cy/admin/companies/message.php +++ b/resources/lang/cy/admin/companies/message.php @@ -1,18 +1,19 @@ 'Nid ywr cwmni\'n bodoli.', 'assoc_users' => 'Mae\'r cwmni yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y cwmni yma ac yna ceisiwch eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y cwmni, ceisiwch eto o. g. y. dd.', - 'success' => 'Cwmni wedi creu yn llwyddiannus.' - ), - 'update' => array( + 'success' => 'Cwmni wedi creu yn llwyddiannus.', + ], + 'update' => [ 'error' => 'Ni diweddarwyd y cwmni, ceisiwch eto o. g. y. dd', - 'success' => 'Cwmni wedi diweddaru\'n llwyddiannus.' - ), - 'delete' => array( + 'success' => 'Cwmni wedi diweddaru\'n llwyddiannus.', + ], + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r cwmni yma?', 'error' => 'Nid oedd yn bosib dileu\'r cwmni. Ceisiwch eto o. g. y. dd.', - 'success' => 'Cwmni wedi dileu\'n llwyddiannus.' - ) -); + 'success' => 'Cwmni wedi dileu\'n llwyddiannus.', + ], +]; diff --git a/resources/lang/cy/admin/companies/table.php b/resources/lang/cy/admin/companies/table.php index 9c8b28797e..30de684498 100644 --- a/resources/lang/cy/admin/companies/table.php +++ b/resources/lang/cy/admin/companies/table.php @@ -1,9 +1,10 @@ 'Cwmniau', 'create' => 'Creu Cwmni', 'title' => 'Cwmni', 'update' => 'Diweddaru Cwmni', 'name' => 'Enw Cwmni', 'id' => 'Rhif Unigryw', -); +]; diff --git a/resources/lang/cy/admin/components/general.php b/resources/lang/cy/admin/components/general.php index 1685f85492..94b91b0856 100644 --- a/resources/lang/cy/admin/components/general.php +++ b/resources/lang/cy/admin/components/general.php @@ -1,6 +1,6 @@ 'Enw Cydran', 'checkin' => 'Nodi\'r gydran allan', 'checkout' => 'Nodi\'r gydran allan', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Yn weddill', 'total' => 'Cyfanswm', 'update' => 'Diweddaru Cydran', -); +]; diff --git a/resources/lang/cy/admin/components/message.php b/resources/lang/cy/admin/components/message.php index fbd08cf4e3..fbb0dfa864 100644 --- a/resources/lang/cy/admin/components/message.php +++ b/resources/lang/cy/admin/components/message.php @@ -1,36 +1,35 @@ 'Nid ywr cydran yn bodoli.', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y cydran, ceisiwch eto o. g. y. dd.', - 'success' => 'Cydran wedi creu yn llwyddiannus.' - ), + 'success' => 'Cydran wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni ddiweddarwyd y cydran, ceisiwch eto o. g. y. dd', - 'success' => 'Diweddarwyd y gydran yn llwyddiannus.' - ), + 'success' => 'Diweddarwyd y gydran yn llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r cydran yma?', 'error' => 'Nid oedd yn bosib dileu\'r cydran. Ceisiwch eto o. g. y. dd.', - 'success' => 'Cydran wedi dileu\'n llwyddiannus.' - ), + 'success' => 'Cydran wedi dileu\'n llwyddiannus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Cydran heb ei nodi allan, ceisiwch eto o. g. y. dd', 'success' => 'Cydran wedi nodi allan yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.' - ), + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Cydran heb ei nodi i fewn, ceisiwch eto o. g. y. dd', 'success' => 'Cydran wedi nodi i fewn yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.' - ) + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.', + ], - -); +]; diff --git a/resources/lang/cy/admin/components/table.php b/resources/lang/cy/admin/components/table.php index 81a643c8e5..87a9343d0d 100644 --- a/resources/lang/cy/admin/components/table.php +++ b/resources/lang/cy/admin/components/table.php @@ -1,5 +1,5 @@ 'Enw Cydran', -); +]; diff --git a/resources/lang/cy/admin/consumables/general.php b/resources/lang/cy/admin/consumables/general.php index 4efaf8e9e2..281c884c6f 100644 --- a/resources/lang/cy/admin/consumables/general.php +++ b/resources/lang/cy/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Nodi nwydd traul allan i defnyddiwr', 'consumable_name' => 'Enw nwydd traul', 'create' => 'Creu nwydd traul', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Yn weddill', 'total' => 'Cyfanswm', 'update' => 'Diweddaru nwydd traul', -); +]; diff --git a/resources/lang/cy/admin/consumables/message.php b/resources/lang/cy/admin/consumables/message.php index df0a02f33d..6e62b269ca 100644 --- a/resources/lang/cy/admin/consumables/message.php +++ b/resources/lang/cy/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Nid yw\'r nwydd traul yn bodoli.', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y nwydd traul, ceisiwch eto o. g. y. dd.', - 'success' => 'Nwydd traul wedi creu yn llwyddiannus.' - ), + 'success' => 'Nwydd traul wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y nwydd traul, ceisiwch eto o. g. y. dd', - 'success' => 'Nwydd traul wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Nwydd traul wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r nwydd traul yma?', 'error' => 'Nid oedd yn bosib dileu\'r nwydd traul. Ceisiwch eto o. g. y. dd.', - 'success' => 'Nwydd traul wedi dileu\'n llwyddiannus.' - ), + 'success' => 'Nwydd traul wedi dileu\'n llwyddiannus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Nwydd traul heb ei nodi allan, ceisiwch eto o. g. y. dd', 'success' => 'Nwydd traul wedi nodi allan yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.' - ), + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nwydd traul heb ei nodi i fewn, ceisiwch eto o. g. y. dd', 'success' => 'Nwydd traul wedi nodi i fewn yn llwyddiannus.', - 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.' - ) + 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.', + ], - -); +]; diff --git a/resources/lang/cy/admin/consumables/table.php b/resources/lang/cy/admin/consumables/table.php index aeb9d73cd6..68860baba3 100644 --- a/resources/lang/cy/admin/consumables/table.php +++ b/resources/lang/cy/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Enw nwydd traul', -); +]; diff --git a/resources/lang/cy/admin/custom_fields/general.php b/resources/lang/cy/admin/custom_fields/general.php index f0be0553b0..6598392406 100644 --- a/resources/lang/cy/admin/custom_fields/general.php +++ b/resources/lang/cy/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Meysydd addasedig', 'field' => 'Meysydd', 'about_fieldsets_title' => 'Amdan grwpiau meysydd', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Maes Addasedig newydd', 'value_encrypted' => 'Mae gwerth y maes hwn wedi\'i amgryptio yn y gronfa ddata. Dim ond defnyddwyr gweinyddol fydd yn gallu gweld y gwerth wedi\'i ddadgryptio', 'show_in_email' => 'Cynnwys gwerth y maes hwn mewn e-byst talu a anfonir at y defnyddiwr? Ni ellir cynnwys meysydd wedi\'u hamgryptio mewn e-byst.', -); +]; diff --git a/resources/lang/cy/admin/custom_fields/message.php b/resources/lang/cy/admin/custom_fields/message.php index b2f2ed6fb5..728bdd68eb 100644 --- a/resources/lang/cy/admin/custom_fields/message.php +++ b/resources/lang/cy/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Nid yw\'r maes yn bodoli.', 'already_added' => 'Maes eisoes yn bodoli', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y maes, ceisiwch eto o. g. y. dd.', 'success' => 'Maes wedi creu yn llwyddiannus.', - 'assoc_success' => 'Maes wedi ychwanegu\'n llwyddiannus ir set maes.' - ), + 'assoc_success' => 'Maes wedi ychwanegu\'n llwyddiannus ir set maes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y maes, ceisiwch eto o. g. y. dd', - 'success' => 'Maes wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Maes wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r maes yma?', 'error' => 'Nid oedd yn bosib dileu\'r maes. Ceisiwch eto o. g. y. dd.', 'success' => 'Maes wedi dileu\'n llwyddiannus.', 'in_use' => 'Maes mewn defnydd.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Nid yw\'r set maes yn bodoli', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y set maes, ceisiwch eto o. g. y. dd.', - 'success' => 'Set maes wedi creu yn llwyddiannus.' - ), + 'success' => 'Set maes wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y set maes, ceisiwch eto o. g. y. dd', - 'success' => 'Set maes wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Set maes wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r set maes yma?', 'error' => 'Nid oedd yn bosib dileu\'r set maes. Ceisiwch eto o. g. y. dd.', 'success' => 'Set maes wedi dileu\'n llwyddiannus.', 'in_use' => 'Set maes mewn defnydd.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/cy/admin/departments/message.php b/resources/lang/cy/admin/departments/message.php index 2da6466ee0..73dc5f2e36 100644 --- a/resources/lang/cy/admin/departments/message.php +++ b/resources/lang/cy/admin/departments/message.php @@ -1,21 +1,21 @@ 'Nid yw\'r adran yn bodoli.', 'assoc_users' => 'Mae\'r adran yma wedi perthnasu i oleiaf un defnyddiwr a nid yw\'n bosib dileu. Diweddarwch eich defnyddwyr i beidio cyfeirio at yr adran yma ac yna ceisiwch eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd yr adran, ceisiwch eto o. g. y. dd.', - 'success' => 'Adran wedi creu yn llwyddiannus.' - ), - 'update' => array( + 'success' => 'Adran wedi creu yn llwyddiannus.', + ], + 'update' => [ 'error' => 'Ni diweddarwyd yr adran, ceisiwch eto o. g. y. dd', - 'success' => 'Adran wedi diweddaru\'n llwyddiannus.' - ), - 'delete' => array( + 'success' => 'Adran wedi diweddaru\'n llwyddiannus.', + ], + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r adran yma?', 'error' => 'Nid oedd yn bosib dileu\'r adran. Ceisiwch eto o. g. y. dd.', - 'success' => 'Adran wedi dileu\'n llwyddiannus.' - ) + 'success' => 'Adran wedi dileu\'n llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/departments/table.php b/resources/lang/cy/admin/departments/table.php index 4ad726d2c3..6467161076 100644 --- a/resources/lang/cy/admin/departments/table.php +++ b/resources/lang/cy/admin/departments/table.php @@ -1,6 +1,6 @@ 'Rhif Unigryw', 'name' => 'Enw Adran', @@ -8,4 +8,4 @@ return array( 'location' => 'Lleoliad', 'create' => 'Creu Adran', 'update' => 'Diweddaru Adran', - ); + ]; diff --git a/resources/lang/cy/admin/depreciations/general.php b/resources/lang/cy/admin/depreciations/general.php index 43b8af8d53..5624f9dd4c 100644 --- a/resources/lang/cy/admin/depreciations/general.php +++ b/resources/lang/cy/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Amdan Dibrisiant Asedau', 'about_depreciations' => 'Cewch creu mathau o dibrisiant i dibrisio asedau yn seiliedig ar dibrisiant llinell syth.', 'asset_depreciations' => 'Dibrisiant Asedau', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Nifer o Fisoedd', 'update' => 'Diweddaru Dibrisiant', -); +]; diff --git a/resources/lang/cy/admin/depreciations/message.php b/resources/lang/cy/admin/depreciations/message.php index 89ee67191e..cf2ad109a7 100644 --- a/resources/lang/cy/admin/depreciations/message.php +++ b/resources/lang/cy/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Nid yw\'r dosbarth yma o dibrsiant yn bodoli.', 'assoc_users' => 'Mae\'r dibrisiantyma wedi perthnasu hefo un neu mwy o modelau a nid oes modd i\'w dileu. Fydd rhaid dileu\'r modelau ac yna trio eto. ', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y dosbarth dibrisiant, ceisiwch eto o. g. y. dd. :(', - 'success' => 'Dosbarth dibrisiant wedi\'i creu yn llwyddiannus. :)' - ), + 'success' => 'Dosbarth dibrisiant wedi\'i creu yn llwyddiannus. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y dosbarth dibrisiant, ceisiwch eto o. g. y. dd', - 'success' => 'Dosbarth dibrisiant wedi\'i diweddaru yn llwyddiannus.' - ), + 'success' => 'Dosbarth dibrisiant wedi\'i diweddaru yn llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r dosbarth dibrisiant yma?', 'error' => 'Nid oedd yn bosib dileu\'r dosbarth dibrisiant. Ceisiwch eto o. g. y. dd.', - 'success' => 'Dosbarth dibrisiant wedi\'i dileu yn llwyddiannus.' - ) + 'success' => 'Dosbarth dibrisiant wedi\'i dileu yn llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/depreciations/table.php b/resources/lang/cy/admin/depreciations/table.php index 4a5a6b97dd..f19c2bb047 100644 --- a/resources/lang/cy/admin/depreciations/table.php +++ b/resources/lang/cy/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'Rhif Unigryw', 'months' => 'Misoedd', 'term' => 'Cyfnod', 'title' => 'Enw ', -); +]; diff --git a/resources/lang/cy/admin/groups/message.php b/resources/lang/cy/admin/groups/message.php index e0ee41d447..53f5e6b6aa 100644 --- a/resources/lang/cy/admin/groups/message.php +++ b/resources/lang/cy/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grwp yn bodoli yn barod!', 'group_not_found' => 'Nid yw grwp [:id] yn bodoli.', 'group_name_required' => 'Mae angen llenwi\'r maes enw', - 'success' => array( + 'success' => [ 'create' => 'Wedi llwyddo i creu\'r grwp.', 'update' => 'Wedi llwyddo i diweddaru\'r grwp.', 'delete' => 'Wedi llwyddo i dileu\'r grwp.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r grwp yma?', 'create' => 'Roedd problem wrth ceisio creu\'r grwp. Ceisiwch eto o. g. y. dd.', 'update' => 'Roedd problem wrth ceisio diweddaru\'r grwp. Ceisiwch eto o. g. y. dd.', 'delete' => 'Roedd problem wrth ceisio dileu\'r grwp. Ceisiwch eto o. g. y. dd.', - ), + ], -); +]; diff --git a/resources/lang/cy/admin/groups/table.php b/resources/lang/cy/admin/groups/table.php index 120d4e53cc..039a11f02c 100644 --- a/resources/lang/cy/admin/groups/table.php +++ b/resources/lang/cy/admin/groups/table.php @@ -1,9 +1,9 @@ 'Rhif Unigryw', 'name' => 'Enw', 'users' => '# o defnyddwyr', -); +]; diff --git a/resources/lang/cy/admin/groups/titles.php b/resources/lang/cy/admin/groups/titles.php index b9dc3d96b7..f1ecc856e4 100644 --- a/resources/lang/cy/admin/groups/titles.php +++ b/resources/lang/cy/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Amdan Grwpiau', 'about_groups' => 'Defnyddir grwpiau i gosod hawliau defnyddwyr.', 'group_management' => 'Rheoli Grwpiau', @@ -11,4 +11,4 @@ return array( 'allow' => 'Caniatau', 'deny' => 'Gwrthod', -); +]; diff --git a/resources/lang/cy/admin/hardware/form.php b/resources/lang/cy/admin/hardware/form.php index 4f88a2ee02..b3ea39d393 100644 --- a/resources/lang/cy/admin/hardware/form.php +++ b/resources/lang/cy/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Cadarnahu Dileu Nifer o Asedau', +return [ + 'bulk_delete' => 'Cadarnahu Dileu Nifer o Asedau', 'bulk_delete_help' => 'Adolygwch yr asedau ar gyfer dileu isod. Ar ôl eu dileu, gellir adfer yr asedau hyn, ond ni fyddant yn gysylltiedig mwyach ag unrhyw ddefnyddwyr y maent wedi\'u neilltuo iddynt ar hyn o bryd.', 'bulk_delete_warn' => 'Rydych am dileu :asset_count assets.', - 'bulk_update' => 'Diweddaru Nifer o Asedau', - 'bulk_update_help' => 'Mae\'r ffurflen hon yn caniatáu ichi ddiweddaru nifer o asedau ar unwaith. Llenwch y meysydd sydd angen i chi eu newid yn unig. Bydd unrhyw bwlch a adewir yn wag yn aros yr un fath. ', - 'bulk_update_warn' => 'Rydych am newid manylder am :asset_count o asedau.', + 'bulk_update' => 'Diweddaru Nifer o Asedau', + 'bulk_update_help' => 'Mae\'r ffurflen hon yn caniatáu ichi ddiweddaru nifer o asedau ar unwaith. Llenwch y meysydd sydd angen i chi eu newid yn unig. Bydd unrhyw bwlch a adewir yn wag yn aros yr un fath. ', + 'bulk_update_warn' => 'Rydych am newid manylder am :asset_count o asedau.', 'checkedout_to' => 'Wedi aseinio i', 'checkout_date' => 'Dyddiad allan', 'checkin_date' => 'Dyddian i mewn', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tag Ased', 'update' => 'Diweddaru Ased', 'warranty' => 'Warant', - 'warranty_expires' => 'Warrant yn dod I ben', + 'warranty_expires' => 'Warrant yn dod I ben', 'years' => 'blynyddoedd', -) -; +]; diff --git a/resources/lang/cy/admin/hardware/general.php b/resources/lang/cy/admin/hardware/general.php index 2b0eb98c5c..e047f918e2 100644 --- a/resources/lang/cy/admin/hardware/general.php +++ b/resources/lang/cy/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Amdan Asedau', 'about_assets_text' => 'Mae asedau wedi tracio trwy rhif cofrestru neu rhif ased. Maen yn tueddu fod yn eitemau gwerthfawr lle mae adnabod offer penodol yn bwysig.', - 'archived' => 'Archifwyd', + 'archived' => 'Archifwyd', 'asset' => 'Ased', 'bulk_checkout' => 'Nodi Asedau Allan', 'checkin' => 'Nodi Asedau I Mewn', @@ -19,4 +19,4 @@ return array( 'pending' => 'Yn disgwl', 'undeployable' => 'Dim ar gael', 'view' => 'Gweld Ased', -); +]; diff --git a/resources/lang/cy/admin/hardware/message.php b/resources/lang/cy/admin/hardware/message.php index e97618930a..99ee05e7a3 100644 --- a/resources/lang/cy/admin/hardware/message.php +++ b/resources/lang/cy/admin/hardware/message.php @@ -1,6 +1,6 @@ ' Rhybudd: Mae\'r ased hwn wedi\'i nodi fel un na ellir ei ddefnyddio ar hyn o bryd. Os yw\'r statws hwn wedi newid, diweddarwch statws yr ased.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Ymdrech da. Nid yw\'r ased yma yn bodoli neu ar gael.', 'assoc_users' => 'Ar hyn o bryd mae\'r ased yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr ased yn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd yr ased, ceisiwch eto o. g. y. dd. :(', - 'success' => 'Ased wedi creu yn llwyddiannus. :)' - ), + 'success' => 'Ased wedi creu yn llwyddiannus. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd yr assed, ceisiwch eto o. g. y. dd', 'success' => 'Ased wedi diweddaru\'n llwyddiannus.', 'nothing_updated' => 'Dim newid mewn manylder, felly dim byd wedi\'i diweddaru.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Nid oedd yn bosib adfer yr ased, ceisiwch eto o. g. y. dd', - 'success' => 'Ased wedi adfer yn llwyddiannus.' - ), + 'success' => 'Ased wedi adfer yn llwyddiannus.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Roedd archwiliad asedau yn aflwyddiannus. Ceisiwch eto o. g. y. dd.', - 'success' => 'Cofnodwyd archwiliad asedau yn llwyddiannus.' - ), + 'success' => 'Cofnodwyd archwiliad asedau yn llwyddiannus.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ffeil heb ei ddileu. Ceisiwch eto o.g.y.dd.', 'success' => 'Ffeil wedi dileu yn llwyddiannus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ffeil(iau) heb ei uwchlwytho. Ceisiwch eto o. g. y. dd.', 'success' => 'Ffeil(iau) wedi uwchlwytho yn llwyddiannus.', 'nofiles' => 'Ni wnaethoch chi ddewis unrhyw ffeiliau i\'w uwchlwytho, neu mae\'r ffeil rydych chi\'n ceisio ei huwchlwytho yn rhy fawr', 'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Rhai eitemau heb ei mewnforio\'n gywir.', 'errorDetail' => 'Ni fewnforiwyd yr eitemau canlynol oherwydd gwallau.', 'success' => "Mae'ch ffeil wedi'i mewnforio", 'file_delete_success' => "Mae eich ffeil wedi'i dileu yn llwyddiannus", 'file_delete_error' => "Nid oedd yn bosib dileu'r ffeil", - ), + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r ased yma?', 'error' => 'Roedd problem wrth ceisio dileu\'r ased. Ceisiwch eto o. g. y. dd.', 'nothing_updated' => 'Dim asedau wedi dewis, felly dim byd wedi\'i dileu.', - 'success' => 'Ased wedi dileu\'n llwyddiannus.' - ), + 'success' => 'Ased wedi dileu\'n llwyddiannus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ased heb ei nodi fel allan, ceisiwch eto o. g. y. dd', 'success' => 'Ased wedi nodi fel allan yn llwyddiannus.', 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.', 'not_available' => 'Nid yw\'r ased yma ar gael i\'w defnyddio!', - 'no_assets_selected' => 'Rhaid i chi ddewis o leiaf un ased o\'r rhestr' - ), + 'no_assets_selected' => 'Rhaid i chi ddewis o leiaf un ased o\'r rhestr', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ased heb ei nodi i mewn, ceisiwch eto o. g. y. dd', 'success' => 'Ased wedi nodi i mewn yn llwyddiannus.', 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.', 'already_checked_in' => 'Ased wedi nodi i mewn yn gywir.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Nid oedd cais am yr ased, ceisiwch eto o. g. y. dd', 'success' => 'Cais am ased yn llwyddiannus.', - 'canceled' => 'Wedi llwydo i canslo cais am ased' - ) + 'canceled' => 'Wedi llwydo i canslo cais am ased', + ], -); +]; diff --git a/resources/lang/cy/admin/hardware/table.php b/resources/lang/cy/admin/hardware/table.php index 5455d50c39..44f3b324ba 100644 --- a/resources/lang/cy/admin/hardware/table.php +++ b/resources/lang/cy/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Rhif Ased (tag)', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Ased ', 'image' => 'Delwedd Dyfais', 'days_without_acceptance' => 'Diwrnodau Heb Derbyn', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/cy/admin/kits/general.php b/resources/lang/cy/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/cy/admin/kits/general.php +++ b/resources/lang/cy/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/cy/admin/licenses/form.php b/resources/lang/cy/admin/licenses/form.php index 5cec85c6f0..7fc5e41b16 100644 --- a/resources/lang/cy/admin/licenses/form.php +++ b/resources/lang/cy/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Ased', 'checkin' => 'Nodi i mewn', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Ebost wedi trwyddedu', 'to_name' => 'Enw wedi trwyddedu', 'update' => 'Diweddaru Trwydded', - 'checkout_help' => 'Fedrwch nodi trwydded allan yn erbyn ased neu person. Fedrwch dewis y ddau ond rhaid i\'r person cydfynd hefo perchenog yr ased.' -); + 'checkout_help' => 'Fedrwch nodi trwydded allan yn erbyn ased neu person. Fedrwch dewis y ddau ond rhaid i\'r person cydfynd hefo perchenog yr ased.', +]; diff --git a/resources/lang/cy/admin/licenses/general.php b/resources/lang/cy/admin/licenses/general.php index 188dc06251..69a07d9fd5 100644 --- a/resources/lang/cy/admin/licenses/general.php +++ b/resources/lang/cy/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Amdan trwyddedau', 'about_licenses' => 'Mae trwyddedau yn tracio feddalwedd. May yna nifer o seddi fedrwch nodi yn erbyn unigolion', 'checkin' => 'Nodi sedd trwydded i fewn', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Trwyddedau Meddalwedd', 'user' => 'Defnyddiwr', 'view' => 'Gweld Trwydded', -); +]; diff --git a/resources/lang/cy/admin/licenses/message.php b/resources/lang/cy/admin/licenses/message.php index d9862b0371..470bafa041 100644 --- a/resources/lang/cy/admin/licenses/message.php +++ b/resources/lang/cy/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Nid yw\'r trwydded yn bodoli.', 'user_does_not_exist' => 'Nid yw\'r defnyddiwr yn bodoli.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Rhaid i chi ddewis ased neu defnyddiwr ond nid y ddau.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y trwydded, ceisiwch eto o. g. y. dd.', - 'success' => 'Trwydded wedi creu yn llwyddiannus.' - ), + 'success' => 'Trwydded wedi creu yn llwyddiannus.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ffeil heb ei ddileu. Ceisiwch eto o. g. y. dd.', 'success' => 'Ffeil wedi dileu yn llwyddiannus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ffeil(iau) heb ei uwchlwytho. Ceisiwch eto o. g. y. dd.', 'success' => 'Ffeil(iau) wedi uwchlwytho yn llwyddiannus.', 'nofiles' => 'Ni wnaethoch chi ddewis unrhyw ffeiliau i\'w uwchlwytho, neu mae\'r ffeil rydych chi\'n ceisio ei huwchlwytho yn rhy fawr', 'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y trwydded, ceisiwch eto o. g. y. dd', - 'success' => 'Trwydded wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Trwydded wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r trwydded yma?', 'error' => 'Nid oedd yn bosib dileu\'r trwydded. Ceisiwch eto o. g. y. dd.', - 'success' => 'Trwydded wedi dileu yn llwyddiannus.' - ), + 'success' => 'Trwydded wedi dileu yn llwyddiannus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Nid oedd yn bosib nodi\'r trwydded allan. Ceisiwch eto o. g. y. dd.', - 'success' => 'Trwydded wedi nodi allan yn llwyddiannus' - ), + 'success' => 'Trwydded wedi nodi allan yn llwyddiannus', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nid oedd yn bosib nodi\'r trwydded i mewn. Ceisiwch eto o. g. y. dd.', - 'success' => 'Trwydded wedi nodi i fewn yn llwyddiannus' - ), + 'success' => 'Trwydded wedi nodi i fewn yn llwyddiannus', + ], -); +]; diff --git a/resources/lang/cy/admin/licenses/table.php b/resources/lang/cy/admin/licenses/table.php index 07166b8f64..472e842a45 100644 --- a/resources/lang/cy/admin/licenses/table.php +++ b/resources/lang/cy/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Wedi Neilltuo i', 'checkout' => 'Mewn/Allan', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Trwydded', -); +]; diff --git a/resources/lang/cy/admin/locations/message.php b/resources/lang/cy/admin/locations/message.php index 5db2381d6a..381b8c017c 100644 --- a/resources/lang/cy/admin/locations/message.php +++ b/resources/lang/cy/admin/locations/message.php @@ -1,27 +1,26 @@ 'Nid yw\'r lleoliad yn bodoli.', 'assoc_users' => 'Mae\'r lleoliad yma wedi perthnasu i oleiaf un defnyddiwr a nid yw\'n bosib dileu. Diweddarwch eich defnyddwyr i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ', 'assoc_assets' => 'Mae\'r lleoliad yma wedi perthnasu i oleiaf un ased a nid yw\'n bosib dileu. Diweddarwch eich asedau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ', 'assoc_child_loc' => 'Mae\'r lleoliad yma yn rhiant i oleiaf un lleoliad a nid yw\'n bosib dileu. Diweddarwch eich lleoliadau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y lleoliad, ceisiwch eto o.g.y.dd.', - 'success' => 'Lleoliad wedi creu yn llwyddiannus.' - ), + 'success' => 'Lleoliad wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y lleoliad, ceisiwch eto o.g.y.dd', - 'success' => 'Lleoliad wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Lleoliad wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r lleoliad yma?', 'error' => 'Nid oedd yn bosib dileu\'r lleoliad. Ceisiwch eto o.g.y.dd.', - 'success' => 'Lleoliad wedi dileu\'n llwyddiannus.' - ) + 'success' => 'Lleoliad wedi dileu\'n llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/locations/table.php b/resources/lang/cy/admin/locations/table.php index b49d70fc25..5572dd8390 100644 --- a/resources/lang/cy/admin/locations/table.php +++ b/resources/lang/cy/admin/locations/table.php @@ -1,6 +1,6 @@ 'Amdan Lleoliadau', 'about_locations' => 'Defnyddir lleoliadau i cofnodi manylder lleoliad ar gyfer defnyddwyr, asedau a eitemau eraill', 'assets_rtd' => 'Asedau', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Rhiant', 'currency' => 'Arian y Lleoliad', 'ldap_ou' => 'OU a denyddir wrth chwilio LDAP', - ); + ]; diff --git a/resources/lang/cy/admin/manufacturers/message.php b/resources/lang/cy/admin/manufacturers/message.php index 80ff96369a..2ac3071b84 100644 --- a/resources/lang/cy/admin/manufacturers/message.php +++ b/resources/lang/cy/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Nid yw\'r gwneuthyrwr yn bodoli.', 'assoc_users' => 'Mae\'r gwneuthyrwr yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y gwneuthyrwr yma ac yna ceisiwch eto. ', - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd ygwneuthyrwr, ceisiwch eto o. g. y. dd.', - 'success' => 'Gwneuthyrwr wedi creu yn llwyddiannus.' - ), + 'success' => 'Gwneuthyrwr wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y gwneuthyrwr, ceisiwch eto o. g. y. dd', - 'success' => 'Gwneuthyrwr wedi diweddaru yn llwyddiannus.' - ), + 'success' => 'Gwneuthyrwr wedi diweddaru yn llwyddiannus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Nid oedd yn bosib adfer y gwneuthyrwr, ceisiwch eto o. g. y. dd', - 'success' => 'Gwneuthyrwr wedi adfer yn llwyddiannus.' - ), + 'success' => 'Gwneuthyrwr wedi adfer yn llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r gwneuthyrwr yma?', 'error' => 'Roedd problem wrth ceisio dileu\'r gwneuthyrwr. Ceisiwch eto o. g. y. dd.', - 'success' => 'Gwneuthyrwr wedi dileu\'n llwyddiannus.' - ) + 'success' => 'Gwneuthyrwr wedi dileu\'n llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/manufacturers/table.php b/resources/lang/cy/admin/manufacturers/table.php index b9c1dd7c7a..a3dab9b305 100644 --- a/resources/lang/cy/admin/manufacturers/table.php +++ b/resources/lang/cy/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Amdan Gwneuthyrwyr', 'about_manufacturers_text' => 'Gwneuthurwyr yw\'r cwmnïau sy\'n creu eich asedau. Gallwch ddod o hyd i wybodaeth bwysig amdanynt yma, a fydd yn cael ei harddangos ar eich tudalennau manylion asedau.', 'asset_manufacturers' => 'Gwneuthyrwyr Asedau', @@ -13,4 +13,4 @@ return array( 'update' => 'Diweddaru Gwneuthyrwr', 'url' => 'URL', -); +]; diff --git a/resources/lang/cy/admin/models/general.php b/resources/lang/cy/admin/models/general.php index d8b9ba7b01..645a53163e 100644 --- a/resources/lang/cy/admin/models/general.php +++ b/resources/lang/cy/admin/models/general.php @@ -1,6 +1,6 @@ 'Amdan Modelau', 'about_models_text' => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.', 'deleted' => 'Mae\'r model yma wedi dileu. Cliciwch yma i\'w adfer.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Rydych am dileu :model_count o asedau.', 'restore' => 'Adfer Model', 'requestable' => 'Gellir defnyddwyr gwneud cais am yr ased yma', - 'show_mac_address' => 'Dangos cyfeiriad MAC yn asedau o\'r model yma', + 'show_mac_address' => 'Dangos cyfeiriad MAC yn asedau o\'r model yma', 'view_deleted' => 'Wedi Dileu', 'view_models' => 'Gweld Modelau', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Defnyddio meysydd addasedig', 'add_default_values' => 'Ychwanegu gwerthoedd diofyn', -); +]; diff --git a/resources/lang/cy/admin/models/message.php b/resources/lang/cy/admin/models/message.php index 0a25c9960c..ec74d804d1 100644 --- a/resources/lang/cy/admin/models/message.php +++ b/resources/lang/cy/admin/models/message.php @@ -1,42 +1,41 @@ 'Nid yw\'r model yn bodoli.', 'assoc_users' => 'Mae\'r model yma wedi perthnasu hefo un neu mwy o asedau. Fydd rhaid dileu\'r asedau ac yna trio eto. ', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y model, ceisiwch eto o.g.y.dd.', 'success' => 'Model wedi creu yn llwyddiannus.', 'duplicate_set' => 'Mae model ased hefo\'r enw, gwneuthyrwr a rhif model yn bodoli yn barod.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y model, ceisiwch eto o.g.y.dd', - 'success' => 'Model wedi diweddaru\'n llwyddiannus.' - ), + 'success' => 'Model wedi diweddaru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r model ased yma?', 'error' => 'Nid oedd yn bosib dileu\'r model. Ceisiwch eto o.g.y.dd.', - 'success' => 'Model wedi dileu\'n llwyddiannus.' - ), + 'success' => 'Model wedi dileu\'n llwyddiannus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Nid oedd yn bosib adfer y model, ceisiwch eto o.g.y.dd', - 'success' => 'Model wedi adfer yn llwyddiannus.' - ), + 'success' => 'Model wedi adfer yn llwyddiannus.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Dim newid mewn manylder, felly dim byd i diweddaru.', - 'success' => 'Modelau wedi diweddaru.' - ), + 'success' => 'Modelau wedi diweddaru.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Dim modelau wedi dewis, felly dim byd i\'w ddileu.', 'success' => ':success_count model(au) wedi dileu!', - 'success_partial' => ':success_count model(au) wedi\'i dileu, :fail_count heb eu ddileu gan bod asedau wedi perthnasu iddo.' - ), + 'success_partial' => ':success_count model(au) wedi\'i dileu, :fail_count heb eu ddileu gan bod asedau wedi perthnasu iddo.', + ], -); +]; diff --git a/resources/lang/cy/admin/models/table.php b/resources/lang/cy/admin/models/table.php index 03a72f5569..8a5da431e6 100644 --- a/resources/lang/cy/admin/models/table.php +++ b/resources/lang/cy/admin/models/table.php @@ -1,6 +1,6 @@ 'Creu Model Ased', 'created_at' => 'Crëwyd', @@ -14,4 +14,4 @@ return array( 'update' => 'Diweddaru Model Ased', 'clone' => 'Dyblygu Model', 'edit' => 'Newid Model', -); +]; diff --git a/resources/lang/cy/admin/reports/general.php b/resources/lang/cy/admin/reports/general.php index 3483e68ca4..8dab494f21 100644 --- a/resources/lang/cy/admin/reports/general.php +++ b/resources/lang/cy/admin/reports/general.php @@ -1,5 +1,5 @@ 'Dewiswch yr opsiynau rydych chi eu heisiau ar gyfer eich adroddiad ased.' -); +return [ + 'info' => 'Dewiswch yr opsiynau rydych chi eu heisiau ar gyfer eich adroddiad ased.', +]; diff --git a/resources/lang/cy/admin/reports/message.php b/resources/lang/cy/admin/reports/message.php index 9864b0924a..930a086809 100644 --- a/resources/lang/cy/admin/reports/message.php +++ b/resources/lang/cy/admin/reports/message.php @@ -1,5 +1,5 @@ 'Rhaid i chi ddewis o leiaf un opsiwn.' -); +return [ + 'error' => 'Rhaid i chi ddewis o leiaf un opsiwn.', +]; diff --git a/resources/lang/cy/admin/settings/general.php b/resources/lang/cy/admin/settings/general.php index 9605de2304..757dfa3542 100644 --- a/resources/lang/cy/admin/settings/general.php +++ b/resources/lang/cy/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Parth Active Directory', 'ad_domain_help' => 'Ar adegau yn debyg i parth eich cyfeiriad ebost, ond dim pob tro.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Ebost', 'admin_cc_email_help' => 'Os ydych am i cyfrif ebost derbyn copi o negeseuon i ddefnyddwyr wrth nodi asdedau allan i defnyddwyr ac yn ol i fewn rhowch o yma. Fel arall, gadewch yn wag.', 'is_ad' => 'Mae hwn yn Server Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Trothwy Rhybuddion sy\'n Dod i Ben (mewn dyddiau)', 'alert_inv_threshold' => 'Trothwy Rhybudd Rhestr', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Rhifau Unigryw Asedau', 'audit_interval' => 'Cyfnod Awdit', 'audit_interval_help' => 'Os ydych angen gwneud awdit ffisegol, rhowch y cyfnod mewn misoedd.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Bydd gwirio\'r blwch hwn yn gorfodi cyfyngiad unigryw ar gyfresi asedau', 'zerofill_count' => 'Hyd y tagiau asedau, gan gynnwys zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/cy/admin/settings/message.php b/resources/lang/cy/admin/settings/message.php index 1b4bc42ae8..4fd00d0c62 100644 --- a/resources/lang/cy/admin/settings/message.php +++ b/resources/lang/cy/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Gwall wedi digwydd wrth diweddaru. ', - 'success' => 'Gosodiadau wedi diweddaru\'n llwyddiannus.' - ), - 'backup' => array( + 'success' => 'Gosodiadau wedi diweddaru\'n llwyddiannus.', + ], + 'backup' => [ 'delete_confirm' => 'Ydych yn dymuno dileu y ffeil copi wrth gefn yma? Nid oes modd adfer ar ol dileu. ', 'file_deleted' => 'Wedi llwydo i ddileu y ffeil copi wrth gefn. ', 'generated' => 'Wedi llwyddo i greu ffeil copi wrth gefn.', 'file_not_found' => 'Wedi methu darganfod y ffeil copi wrth gefn ar y server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Gwall wedi digwydd wrth glirio. ', 'validation_failed' => 'Mae eich cadarnhad i clirio yn anghywir. Teipiwch y gair "DELETE" yn y bocs cadarnhad.', - 'success' => 'Cofnodion wedi clirio\'n llwyddiannus.' - ), + 'success' => 'Cofnodion wedi clirio\'n llwyddiannus.', + ], -); +]; diff --git a/resources/lang/cy/admin/statuslabels/message.php b/resources/lang/cy/admin/statuslabels/message.php index cf26d34c1c..d62b133df4 100644 --- a/resources/lang/cy/admin/statuslabels/message.php +++ b/resources/lang/cy/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Nid ywr label Statws yma yn bodoli.', 'assoc_assets' => 'Mae\'r label statws yma wedi perthnasu i oleiaf un ased a nid yw\'n bosib dileu. Diweddarwch eich asedau i beidio cyfeirio at y label yma ac yna ceisiwch eto. ', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y label statws, ceisiwch eto o. g. y. dd.', - 'success' => 'Label wedi creu yn llwyddiannus.' - ), + 'success' => 'Label wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni diweddarwyd y label statws, ceisiwch eto o. g. y. dd', - 'success' => 'Label wedi diweddaru yn llwyddiannus.' - ), + 'success' => 'Label wedi diweddaru yn llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r label yma?', 'error' => 'Nid oedd yn bosib dileu\'r label statws. Ceisiwch eto o. g. y. dd.', - 'success' => 'Label wedi dileu\'n llwyddiannus.' - ), + 'success' => 'Label wedi dileu\'n llwyddiannus.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Nid yw\'n bosib clustnodi\'r ased yma I ddefnyddwyr.', 'deployable' => 'Mae\'r asedau yma ar gael i\'w defnyddio. Unwaith y cânt eu haseinio, byddant yn cymryd statws meta Mewn Defnydd.', 'archived' => 'Ni ellir newid statws yr asedau hyn, dim ond yn yr olygfa archifedig y byddant yn ymddangos. Mae hyn yn ddefnyddiol ar gyfer cadw gwybodaeth am asedau at ddibenion cyllidebu / hanesyddol ond eu cadw allan o\'r rhestr asedau o ddydd i ddydd.', 'pending' => 'Ni ellir aseinio\'r asedau hyn i unrhyw un eto, ddefnyddir yn aml ar gyfer eitemau sydd allan i\'w hatgyweirio, ond y disgwylir iddynt ddychwelyd i\'w cylchrediad.', - ), + ], -); +]; diff --git a/resources/lang/cy/admin/statuslabels/table.php b/resources/lang/cy/admin/statuslabels/table.php index 8bbb0b95c8..d7677ff346 100644 --- a/resources/lang/cy/admin/statuslabels/table.php +++ b/resources/lang/cy/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Amdan Labeli Statws', 'archived' => 'Archifwyd', 'create' => 'Creu Label Statws', @@ -16,4 +16,4 @@ return array( 'title' => 'Labeli Statws', 'undeployable' => 'Dim ar gael', 'update' => 'Diweddaru Label Statws', -); +]; diff --git a/resources/lang/cy/admin/suppliers/message.php b/resources/lang/cy/admin/suppliers/message.php index c34e4a99e2..192b8e8e18 100644 --- a/resources/lang/cy/admin/suppliers/message.php +++ b/resources/lang/cy/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Nid yw\'r cyflenwr yn bodoli.', - - 'create' => array( + 'create' => [ 'error' => 'Ni crewyd y cyflenwr, ceisiwch eto o. g. y. dd.', - 'success' => 'Cyflenwr wedi creu yn llwyddiannus.' - ), + 'success' => 'Cyflenwr wedi creu yn llwyddiannus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ni ddiweddarwyd y cyflenwr, ceisiwch eto o. g. y. dd', - 'success' => 'Cyflenwr wedi diweddru\'n llwyddiannus.' - ), + 'success' => 'Cyflenwr wedi diweddru\'n llwyddiannus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r cyflenwr yma?', 'error' => 'Roedd problem wrth ceisio dileu\'r cyflenwr. Ceisiwch eto o. g. y. dd.', 'success' => 'Cyflenwr wedi dileu\'n llwyddiannus.', 'assoc_assets' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig ag :asset_count asset(s) ac ni ellir ei ddileu. Diweddarwch eich asedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhowch cynnig arall arni. ', 'assoc_licenses' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig â :licenses_count trwydded(au) ac ni ellir eu dileu. Diweddarwch eich trwyddedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhoi cynnig arall arni. ', 'assoc_maintenances' => 'Ar hyn o bryd mae\'r cyflenwr hwn yn gysylltiedig â :asset_maintenances_count maint (au) asedau ac ni ellir ei ddileu. Diweddarwch eich cynhaliaeth asedau i beidio â chyfeirio\'r cyflenwr hwn mwyach a rhoi cynnig arall arni. ', - ) + ], -); +]; diff --git a/resources/lang/cy/admin/suppliers/table.php b/resources/lang/cy/admin/suppliers/table.php index c32dd6e3ba..efc14f093d 100644 --- a/resources/lang/cy/admin/suppliers/table.php +++ b/resources/lang/cy/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Amdan cyflenwyr', 'about_suppliers_text' => 'Defnyddir cyflenwyr i olrhain ffynhonnell eitemau', 'address' => 'Cyfeiriad Cyflenwr', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Gweld asedau ar gyfer', 'zip' => 'Côd Post', -); +]; diff --git a/resources/lang/cy/admin/users/general.php b/resources/lang/cy/admin/users/general.php index d599c57d66..f92157db21 100644 --- a/resources/lang/cy/admin/users/general.php +++ b/resources/lang/cy/admin/users/general.php @@ -1,7 +1,6 @@ 'Fedrith y defnyddiwr yma mewngofnodi', 'activated_disabled_help_text' => 'Nid yw\'n bosib newid statws eich cyfrif.', 'assets_user' => 'Asedu wedi aseinio i :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Golygu Defnyddiwr', 'filetype_info' => 'Math o ffeiliau a caniateir yw png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, a rar.', 'history_user' => 'Hanes ar gyfer :name', - 'info' => 'Gwybodaeth', + 'info' => 'Gwybodaeth', 'restore_user' => 'Cliciwch yma yw adfer.', 'last_login' => 'Mewngofnodi Diwethaf', 'ldap_config_text' => 'Gweler Gweinyddiaeth > Gosodiadau am gosodiadau LDAP. Mae\'r lleoliad (dewisol) yn cael ei osod am unrhyw defnyddwyr sydd yn cael ei mewnforio.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Mae eich gosodiadau admin yn caniatau gorfodaeth dewisol o dilysiant dau-factor. ', 'two_factor_enrolled' => 'Dyfais D2F Wedi Ymuno ', 'two_factor_active' => 'D2F Weithredol ', - ); + ]; diff --git a/resources/lang/cy/admin/users/message.php b/resources/lang/cy/admin/users/message.php index b64ceb78c8..f75acea533 100644 --- a/resources/lang/cy/admin/users/message.php +++ b/resources/lang/cy/admin/users/message.php @@ -1,6 +1,6 @@ 'Rydych wedi llwyddo I dderbyn yr ased yma.', 'declined' => 'Rydych wedi llwyddo I wrthod yr ased yma.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Nid ywr gosodiadau I dilysu trwy LDAP wedi gosod ar y system.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Wedi llwyddo i greu defnyddiwr.', 'update' => 'Wedi llwyddo i diweddaru defnyddiwr.', 'update_bulk' => 'Wedi lwyddo i diweddaru defnyddwyr!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Wedi llwyddo i anwahardd defnyddiwr.', 'restored' => 'Wedi adfer y defnyddiwr yn llwyddiannus.', 'import' => 'Defnyddwyr wedi mewnforio\'n llwyddiannus.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Roedd problem wrth ceisio creu\'r defnyddiwr. Ceisiwch eto o. g. y. dd.', 'update' => 'Roedd problem wrth ceisio diweddaru\'r defnyddiwr. Ceisiwch eto o. g. y. dd.', 'delete' => 'Roedd problem wrth ceisio dileu\'r defnyddiwr. Ceisiwch eto o. g. y. dd.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Wedi methu cyraedd y server LDAP. Gwiriwch eich gosodiadau LDAP.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Wedi methu llwytho data trwy LDAP. Gwiriwch eich gosodiadau LDAP.
Error from LDAP Server:', 'password_ldap' => 'Mae eich cyfrinair wedi\'i rheoli trwy LDAP/Active Directory. Cysylltwch a\'r Adran TGCh i\'w newid. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ffeil heb ei ddileu. Ceisiwch eto o. g. y. dd.', 'success' => 'Ffeil wedi dileu yn llwyddiannus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ffeil(iau) heb ei uwchlwytho. Ceisiwch eto o. g. y. dd.', 'success' => 'Ffeil(iau) wedi uwchlwytho yn llwyddiannus.', 'nofiles' => 'Nid ydych wedi dewis unrhyw ffeiliau i\'w uwchlwytho', 'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.', - ), + ], -); +]; diff --git a/resources/lang/cy/admin/users/table.php b/resources/lang/cy/admin/users/table.php index 3edbf14a51..0b8bdea292 100644 --- a/resources/lang/cy/admin/users/table.php +++ b/resources/lang/cy/admin/users/table.php @@ -1,6 +1,6 @@ 'Gweithredol', 'allow' => 'Caniatau', 'checkedout' => 'Asedau', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Dangos Defnyddwyr Presennol', 'show_deleted' => 'Dangos Defnyddwyr sydd wedi\'i dileu', 'title' => 'Teitl', - 'to_restore_them' => 'i adfer nhw.', + 'to_restore_them' => 'i adfer nhw.', 'updateuser' => 'Diweddaru Defnyddiwr', 'username' => 'Enw defnyddiwr', - 'user_deleted_text' => 'Mae\'r defnyddiwr hwn wedi\'i farcio fel un sydd wedi\'i ddileu.', + 'user_deleted_text' => 'Mae\'r defnyddiwr hwn wedi\'i farcio fel un sydd wedi\'i ddileu.', 'username_note' => '(Wedi defnyddio ar gyfer clymu i Active Directory yn unig, nid ar gyfer mewngofnodi.)', 'cloneuser' => 'Dyblygu Defnyddiwr', 'viewusers' => 'Gweld Defnyddwyr', -); +]; diff --git a/resources/lang/cy/auth/general.php b/resources/lang/cy/auth/general.php index 0da5b6f680..b581e7c566 100644 --- a/resources/lang/cy/auth/general.php +++ b/resources/lang/cy/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/cy/auth/message.php b/resources/lang/cy/auth/message.php index d7a1da0cd7..d963fedb65 100644 --- a/resources/lang/cy/auth/message.php +++ b/resources/lang/cy/auth/message.php @@ -1,6 +1,6 @@ 'Mae cyfrif hefo\'r cyfeiriad ebost yma yn bodoli yn barod.', 'account_not_found' => 'Mae eich enw defnyddiwr neu gyfrinair yn anghywir.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Mae\'r cyfrif defnyddiwr hwn wedi\'i atal.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Roedd yna broblem wrth i chi fewngofnodi. Rhowch gynnig arall arni so gwelwch yn dda.', 'success' => 'Rydych wedi llwydo i fewngofnodi.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Roedd yna broblem wrth creu eich cyfrif, rhowch gynnig arall arni so gwelwch yn dda.', 'success' => 'Cyfrif wedi\'i creu yn llwyddiannus.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Roedd yna broblem wrth ceisio cael côd newid cyfrinair, rhowch gynnig arall arni so gwelwch yn dda.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Roedd yna broblem wrth ceisio newid cyfrinair, rhowch gynnig arall arni so gwelwch yn dda.', 'success' => 'Mae eich cyfrinair wedi\'i ailosod yn llwyddiannus.', - ), + ], - -); +]; diff --git a/resources/lang/cy/button.php b/resources/lang/cy/button.php index c1797a7d94..d208c7e6bd 100644 --- a/resources/lang/cy/button.php +++ b/resources/lang/cy/button.php @@ -1,6 +1,6 @@ 'Gweithredoedd', 'add' => 'Ychwanegu newydd', 'cancel' => 'Canslo', @@ -11,7 +11,7 @@ return array( 'request' => 'Gofynnwyd amdano', 'submit' => 'Cyflwyno', 'upload' => 'Uwchlwytho', - 'select_file' => 'Dewis ffeil...', + 'select_file' => 'Dewis ffeil...', 'select_files' => 'Dewis ffeiliau...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/cy/general.php b/resources/lang/cy/general.php index 475e463475..1b8dfaa4ed 100644 --- a/resources/lang/cy/general.php +++ b/resources/lang/cy/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Sawl i mewn', 'user_requests_count' => 'Ceisiadau', 'city' => 'Dinas', - 'click_here' => 'Cliciwch yma', + 'click_here' => 'Cliciwch yma', 'clear_selection' => 'Clirio Dewis', 'companies' => 'Cwmniau', 'company' => 'Cwmni', 'component' => 'Cydran', 'components' => 'Cydrannau', - 'complete' => 'Wedi cwbwlhau', + 'complete' => 'Wedi cwbwlhau', 'consumable' => 'Nwyddau traul', 'consumables' => 'Nwyddau traul', 'country' => 'Gwlad', diff --git a/resources/lang/cy/help.php b/resources/lang/cy/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/cy/help.php +++ b/resources/lang/cy/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/cy/mail.php b/resources/lang/cy/mail.php index 0f9491485f..14c93b1753 100644 --- a/resources/lang/cy/mail.php +++ b/resources/lang/cy/mail.php @@ -1,6 +1,6 @@ 'Mae defnyddiwr wedi canslo cais am eitem ar y wefan', 'a_user_requested' => 'Mae defnyddiwr wedi gwneud cais am eitem ar y wefan', 'accessory_name' => 'Enw Ategolyn:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/cy/pagination.php b/resources/lang/cy/pagination.php index d19552bb69..8b1bd1eeac 100644 --- a/resources/lang/cy/pagination.php +++ b/resources/lang/cy/pagination.php @@ -1,6 +1,6 @@ 'Nesaf »', -); +]; diff --git a/resources/lang/cy/passwords.php b/resources/lang/cy/passwords.php index d11784b25e..15105163b6 100644 --- a/resources/lang/cy/passwords.php +++ b/resources/lang/cy/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Mae eich linc cyfrinair wedi\'i yrru!', 'user' => 'Dim defnyddiwr wedi\'i ddarganfod hefo\'r cyfeiriad ebost yna.', ]; - diff --git a/resources/lang/cy/reminders.php b/resources/lang/cy/reminders.php index 2ee9ffcaf5..74f75872a1 100644 --- a/resources/lang/cy/reminders.php +++ b/resources/lang/cy/reminders.php @@ -1,6 +1,6 @@ "Rhaid i cyfrineiriau fod yn chwe nod ac cyfateb i'r cadarnhad.", + 'password' => "Rhaid i cyfrineiriau fod yn chwe nod ac cyfateb i'r cadarnhad.", - "user" => "Enw defnyddiwr neu cyfrinair yn anghywir", + 'user' => 'Enw defnyddiwr neu cyfrinair yn anghywir', - "token" => "Nid yw'r tocyn ail-osod cyfrinair yma yn ddilys.", + 'token' => "Nid yw'r tocyn ail-osod cyfrinair yma yn ddilys.", - "sent" => "Os yw'r cyfeiriad ebost yn ddilys, cewch nodyn atgoffa!", + 'sent' => "Os yw'r cyfeiriad ebost yn ddilys, cewch nodyn atgoffa!", -); +]; diff --git a/resources/lang/cy/table.php b/resources/lang/cy/table.php index e89dc4391d..805a77ba87 100644 --- a/resources/lang/cy/table.php +++ b/resources/lang/cy/table.php @@ -1,10 +1,10 @@ 'Gweithredoedd', 'action' => 'Gweithred', 'by' => 'Erbyn', 'item' => 'Eitem', -); +]; diff --git a/resources/lang/cy/validation.php b/resources/lang/cy/validation.php index cf0c36846a..5a3a12a615 100644 --- a/resources/lang/cy/validation.php +++ b/resources/lang/cy/validation.php @@ -1,6 +1,6 @@ 'Mae\'r :attribute wedi cymeryd yn barod.', 'uploaded' => 'Mae\'r :attribute wedi fethu uwchlwytho.', 'url' => 'Mae fformat :attribute yn annilys.', - "unique_undeleted" => "Rhaid i'r :attribute bod yn unigryw.", + 'unique_undeleted' => "Rhaid i'r :attribute bod yn unigryw.", /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -115,10 +114,10 @@ return array( 'custom' => [ 'alpha_space' => "Mae'r maes :attribute yn cynnwys cymeriad na chaniateir.", - "email_array" => "Mae un neu fwy o gyfeiriadau e-bost yn annilys.", - "hashed_pass" => "Mae eich cyfrinair cyfredol yn anghywir", + 'email_array' => 'Mae un neu fwy o gyfeiriadau e-bost yn annilys.', + 'hashed_pass' => 'Mae eich cyfrinair cyfredol yn anghywir', 'dumbpwd' => 'Mae\'r cyfrinair hwnnw\'n rhy gyffredin.', - "statuslabel_type" => "Rhaid i chi ddewis math label statws dilys", + 'statuslabel_type' => 'Rhaid i chi ddewis math label statws dilys', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/da/admin/accessories/general.php b/resources/lang/da/admin/accessories/general.php index 5be1f1c1d1..91039d261b 100644 --- a/resources/lang/da/admin/accessories/general.php +++ b/resources/lang/da/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Tilbehør Kategori', 'accessory_name' => 'Tilbehør Navn', 'checkout' => 'Tjek tilbehør ud', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Brug den primære standard slutbrugerlicens i stedet for.', 'use_default_eula_disabled' => 'Brug den primære standard slutbrugerlicens i stedet for. Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.', -); +]; diff --git a/resources/lang/da/admin/accessories/message.php b/resources/lang/da/admin/accessories/message.php index 829220a585..2d583e0653 100644 --- a/resources/lang/da/admin/accessories/message.php +++ b/resources/lang/da/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Tilbehøret [:id] findes ikke.', 'assoc_users' => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.', - 'create' => array( + 'create' => [ 'error' => 'Tilbehøret blev ikke oprettet, prøv venligst igen.', - 'success' => 'Tilbehøret blev oprettet.' - ), + 'success' => 'Tilbehøret blev oprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tilbehøret blev ikke opdateret, prøv venligst igen', - 'success' => 'Tilbehøret blev opdateret med success.' - ), + 'success' => 'Tilbehøret blev opdateret med success.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette dette tilbehør?', 'error' => 'Der opstod et problem under sletning af tilbehøret. Prøv venligst igen.', - 'success' => 'Tilbehøret blev slettet med success.' - ), + 'success' => 'Tilbehøret blev slettet med success.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tilbehør blev ikke tjekket ud, prøv igen', 'success' => 'Tilbehør er tjekket ud.', - 'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.' - ), + 'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tilbehør blev ikke tjekket ind, prøv igen', 'success' => 'Tilbehør er tjekket ind.', - 'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.' - ) + 'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.', + ], - -); +]; diff --git a/resources/lang/da/admin/accessories/table.php b/resources/lang/da/admin/accessories/table.php index 7298f8e58b..b197fb5813 100644 --- a/resources/lang/da/admin/accessories/table.php +++ b/resources/lang/da/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Hent CSV', - 'eula_text' => 'Slutbrugerlicens', +return [ + 'dl_csv' => 'Hent CSV', + 'eula_text' => 'Slutbrugerlicens', 'id' => 'ID', 'require_acceptance' => 'Accept', 'title' => 'Tilbehør Navn', - -); +]; diff --git a/resources/lang/da/admin/asset_maintenances/form.php b/resources/lang/da/admin/asset_maintenances/form.php index cbc11d3549..20630be1d2 100644 --- a/resources/lang/da/admin/asset_maintenances/form.php +++ b/resources/lang/da/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dage', 'notes' => 'Noter', 'update' => 'Opdatering', - 'create' => 'Opret' + 'create' => 'Opret', ]; diff --git a/resources/lang/da/admin/asset_maintenances/message.php b/resources/lang/da/admin/asset_maintenances/message.php index 3e544b2d92..97c4b1c9e1 100644 --- a/resources/lang/da/admin/asset_maintenances/message.php +++ b/resources/lang/da/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Er du sikker på du vil slette dette aktivs vedligeholdelse?', 'error' => 'Der opstod et problem under sletning af aktivets vedligeholdelse. Prøv venligst igen.', - 'success' => 'Aktivets vedligeholdelse blev slettet med succes.' + 'success' => 'Aktivets vedligeholdelse blev slettet med succes.', ], 'create' => [ 'error' => 'Aktivets vedligeholdelse blev ikke oprettet, prøv venligst igen.', - 'success' => 'Aktivets vedligeholdelse blev oprettet med succes.' + 'success' => 'Aktivets vedligeholdelse blev oprettet med succes.', ], 'edit' => [ 'error' => 'Asset Maintenance var ikke redigeret, prøv igen.', - 'success' => 'Asset Maintenance redigeres med succes.' + 'success' => 'Asset Maintenance redigeres med succes.', ], 'asset_maintenance_incomplete' => 'Ikke afsluttet endnu', 'warranty' => 'Garanti', 'not_warranty' => 'Ingen garanti', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/da/admin/asset_maintenances/table.php b/resources/lang/da/admin/asset_maintenances/table.php index 8b713e9a79..cabd80d079 100644 --- a/resources/lang/da/admin/asset_maintenances/table.php +++ b/resources/lang/da/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Aktivnavn', 'is_warranty' => 'Garanti', - 'dl_csv' => 'Hent CSV' + 'dl_csv' => 'Hent CSV', ]; diff --git a/resources/lang/da/admin/categories/general.php b/resources/lang/da/admin/categories/general.php index 243c99c0ae..bd65512f16 100644 --- a/resources/lang/da/admin/categories/general.php +++ b/resources/lang/da/admin/categories/general.php @@ -1,6 +1,6 @@ 'Aktiver Kategorier', 'category_name' => 'Kategorinavn', 'checkin_email' => 'Send e-mail til bruger ved tjek ind/ud.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Brug den primære standard slutbrugerlicens i stedet for.', 'use_default_eula_disabled' => 'Brug den primære standard slutbrugerlicens i stedet for. Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.', -); +]; diff --git a/resources/lang/da/admin/categories/message.php b/resources/lang/da/admin/categories/message.php index 6b26b7dc1c..8e28b61212 100644 --- a/resources/lang/da/admin/categories/message.php +++ b/resources/lang/da/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorien eksisterer ikke.', 'assoc_models' => 'Denne kategori er i øjeblikket associeret med mindst en model og kan ikke slettes. Opdater venligst dine modeller, så de ikke længere refererer til denne kategori og prøv igen. ', 'assoc_items' => 'Denne kategori er i øjeblikket associeret med mindst en :asset_type og kan ikke slettes. Opdater venligst din :asset_type, så de ikke længere refererer til denne kategori og prøv igen. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorien blev ikke oprettet, prøv igen.', - 'success' => 'Kategorien blev oprettet.' - ), + 'success' => 'Kategorien blev oprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorien blev ikke opdateret, prøv igen', - 'success' => 'Kategorien blev opdateret.' - ), + 'success' => 'Kategorien blev opdateret.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne kategori?', 'error' => 'Der opstod et problem under sletning af kategorien. Prøv igen.', - 'success' => 'Kategorien blev slettet.' - ) + 'success' => 'Kategorien blev slettet.', + ], -); +]; diff --git a/resources/lang/da/admin/categories/table.php b/resources/lang/da/admin/categories/table.php index c5052545e9..8491f2892d 100644 --- a/resources/lang/da/admin/categories/table.php +++ b/resources/lang/da/admin/categories/table.php @@ -1,10 +1,10 @@ 'Slutbrugerlicens', +return [ + 'eula_text' => 'Slutbrugerlicens', 'id' => 'ID', 'parent' => 'Forælder', 'require_acceptance' => 'Accept', 'title' => 'Aktiv Kategorinavn', -); +]; diff --git a/resources/lang/da/admin/companies/general.php b/resources/lang/da/admin/companies/general.php index 55fadacdb5..0c69df457c 100644 --- a/resources/lang/da/admin/companies/general.php +++ b/resources/lang/da/admin/companies/general.php @@ -1,4 +1,5 @@ 'Vælg firma', ]; diff --git a/resources/lang/da/admin/companies/message.php b/resources/lang/da/admin/companies/message.php index 001838bb52..96c3acaf06 100644 --- a/resources/lang/da/admin/companies/message.php +++ b/resources/lang/da/admin/companies/message.php @@ -1,18 +1,19 @@ 'Virksomheden eksisterer ikke.', 'assoc_users' => 'Denne virksomhed er knyttet til mindst én model og kan ikke slettes. Opdater venligst dine modeller for at ikke længere henvise til dette selskab, og prøv igen. ', - 'create' => array( + 'create' => [ 'error' => 'Virksomheden blev ikke oprettet, prøve igen.', - 'success' => 'Virksomhed oprettet.' - ), - 'update' => array( + 'success' => 'Virksomhed oprettet.', + ], + 'update' => [ 'error' => 'Virksomheden blev ikke opdateret, prøv igen', - 'success' => 'Virksomheden blev opdateret.' - ), - 'delete' => array( + 'success' => 'Virksomheden blev opdateret.', + ], + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette denne virksomhed?', 'error' => 'Der opstod et problem under sletning af virksomheden. Prøv igen.', - 'success' => 'Virksomheden blev slettet.' - ) -); + 'success' => 'Virksomheden blev slettet.', + ], +]; diff --git a/resources/lang/da/admin/companies/table.php b/resources/lang/da/admin/companies/table.php index b1294dc9bd..e8a61aa217 100644 --- a/resources/lang/da/admin/companies/table.php +++ b/resources/lang/da/admin/companies/table.php @@ -1,9 +1,10 @@ 'Virksomheder', 'create' => 'Oprette virksomhed', 'title' => 'Virksomheden', 'update' => 'Opdater virksomhed', 'name' => 'Virksomhedens navn', 'id' => 'ID', -); +]; diff --git a/resources/lang/da/admin/components/general.php b/resources/lang/da/admin/components/general.php index 531e82dafd..93d8c9c120 100644 --- a/resources/lang/da/admin/components/general.php +++ b/resources/lang/da/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponentnavn', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Komponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Resterende', 'total' => 'Total', 'update' => 'Opdater Komponent', -); +]; diff --git a/resources/lang/da/admin/components/message.php b/resources/lang/da/admin/components/message.php index e095b0841e..3598f848d0 100644 --- a/resources/lang/da/admin/components/message.php +++ b/resources/lang/da/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponent eksisterer ikke.', - 'create' => array( + 'create' => [ 'error' => 'Komponent blev ikke oprettet, prøv igen.', - 'success' => 'Komponent oprettet med succes.' - ), + 'success' => 'Komponent oprettet med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponent blev ikke opdateret, prøv igen', - 'success' => 'Komponent opdateret med succes.' - ), + 'success' => 'Komponent opdateret med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette denne komponent?', 'error' => 'Der opstod et problem ved at slette komponenten. Prøv igen.', - 'success' => 'Komponenten blev slettet korrekt.' - ), + 'success' => 'Komponenten blev slettet korrekt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponent blev ikke tjekket ud, prøv igen', 'success' => 'Komponent tjekket ud med succes.', - 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.' - ), + 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponent blev ikke tjekket ind, prøv igen', 'success' => 'Komponent tjekket ind med succes.', - 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.' - ) + 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', + ], - -); +]; diff --git a/resources/lang/da/admin/components/table.php b/resources/lang/da/admin/components/table.php index f2692003d6..bad963d325 100644 --- a/resources/lang/da/admin/components/table.php +++ b/resources/lang/da/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentnavn', -); +]; diff --git a/resources/lang/da/admin/consumables/general.php b/resources/lang/da/admin/consumables/general.php index 4363e9fa4e..5084d1fb25 100644 --- a/resources/lang/da/admin/consumables/general.php +++ b/resources/lang/da/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout forbrugsvarer til bruger', 'consumable_name' => 'Forbrugelighedsnavn', 'create' => 'Opret forbrugsstoffer', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Resterende', 'total' => 'Total', 'update' => 'Opdater forbrugsstoffer', -); +]; diff --git a/resources/lang/da/admin/consumables/message.php b/resources/lang/da/admin/consumables/message.php index bddde98446..36984da608 100644 --- a/resources/lang/da/admin/consumables/message.php +++ b/resources/lang/da/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Forbrugsstoffer findes ikke.', - 'create' => array( + 'create' => [ 'error' => 'Forbruget er ikke oprettet, prøv igen.', - 'success' => 'Forbrugsvarer oprettes med succes.' - ), + 'success' => 'Forbrugsvarer oprettes med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Forbruget blev ikke opdateret, prøv igen', - 'success' => 'Forbrugsstoffer opdateret med succes.' - ), + 'success' => 'Forbrugsstoffer opdateret med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du ønsker at slette denne forbrugsstof?', 'error' => 'Der opstod et problem ved at slette forbruget. Prøv igen.', - 'success' => 'Forbruget blev slettet.' - ), + 'success' => 'Forbruget blev slettet.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Forbruget blev ikke tjekket ud, prøv igen', 'success' => 'Forbrugsmaterialet tjekket ud med succes.', - 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.' - ), + 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Forbruget blev ikke tjekket ind, prøv igen', 'success' => 'Forbrugsstoffer kontrolleres med succes.', - 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.' - ) + 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', + ], - -); +]; diff --git a/resources/lang/da/admin/consumables/table.php b/resources/lang/da/admin/consumables/table.php index f0a5114804..9d89081a6c 100644 --- a/resources/lang/da/admin/consumables/table.php +++ b/resources/lang/da/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Forbrugelighedsnavn', -); +]; diff --git a/resources/lang/da/admin/custom_fields/general.php b/resources/lang/da/admin/custom_fields/general.php index 91af5f146f..72608cb170 100644 --- a/resources/lang/da/admin/custom_fields/general.php +++ b/resources/lang/da/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Brugerdefinerede felter', 'field' => 'Felt', 'about_fieldsets_title' => 'Om Feltsæt', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nyt Brugerdefinerede Felt', 'value_encrypted' => 'Værdien af dette felt er krypteret i databasen. Kun admins vil være i stand til at se den krypteret værdi', 'show_in_email' => 'Inkludér værdien af ​​dette felt i tjekud-e-mail til brugeren? Krypterede felter kan ikke medtages i e-mails.', -); +]; diff --git a/resources/lang/da/admin/custom_fields/message.php b/resources/lang/da/admin/custom_fields/message.php index 9022a2b891..98c8a28d13 100644 --- a/resources/lang/da/admin/custom_fields/message.php +++ b/resources/lang/da/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Dette felt findes ikke.', 'already_added' => 'Feltet allerede tilføjet', - 'create' => array( + 'create' => [ 'error' => 'Feltet blev ikke oprettet, prøve igen.', 'success' => 'Feltet oprettet.', - 'assoc_success' => 'Felt tilføjet til feltsættet.' - ), + 'assoc_success' => 'Felt tilføjet til feltsættet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feltet blev ikke opdateret, prøv igen', - 'success' => 'Feltet opdateret.' - ), + 'success' => 'Feltet opdateret.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på du ønsker at slette feltet?', 'error' => 'Der opstod et problem under sletning af feltet. Prøv venligst igen.', 'success' => 'Feltet blev slettet.', 'in_use' => 'Feltet er stadig i brug.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Feltsættet findes ikke', - 'create' => array( + 'create' => [ 'error' => 'Feltsættet blev ikke opdateret, prøv igen.', - 'success' => 'Feltsættet oprettet.' - ), + 'success' => 'Feltsættet oprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feltsættet blev ikke opdateret, prøv igen', - 'success' => 'Feltsættet opdateret.' - ), + 'success' => 'Feltsættet opdateret.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette dette feltsæt?', 'error' => 'Der opstod et problem under sletning af feltsættet. Prøv venligst igen.', 'success' => 'Feltsættet blev slettet.', 'in_use' => 'Feltsættet er stadig i brug.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/da/admin/departments/message.php b/resources/lang/da/admin/departments/message.php index 3544802299..f743a5320a 100644 --- a/resources/lang/da/admin/departments/message.php +++ b/resources/lang/da/admin/departments/message.php @@ -1,21 +1,21 @@ 'Afdeling findes ikke.', 'assoc_users' => 'Denne afdeling er i øjeblikket knyttet til mindst én bruger og kan ikke slettes. Opdater venligst dine brugere for at ikke længere referere til denne afdeling, og prøv igen. ', - 'create' => array( + 'create' => [ 'error' => 'Afdelingen blev ikke oprettet, prøve igen.', - 'success' => 'Afdeling oprettet.' - ), - 'update' => array( + 'success' => 'Afdeling oprettet.', + ], + 'update' => [ 'error' => 'Afdelingen blev ikke opdateret, prøv igen', - 'success' => 'Afdeling opdateret.' - ), - 'delete' => array( + 'success' => 'Afdeling opdateret.', + ], + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette denne afdeling?', 'error' => 'Der var et problem sletningen af afdelingen. Prøv venligst igen.', - 'success' => 'Afdelingen blev slettet.' - ) + 'success' => 'Afdelingen blev slettet.', + ], -); +]; diff --git a/resources/lang/da/admin/departments/table.php b/resources/lang/da/admin/departments/table.php index 651cbbea28..2b3bea8d07 100644 --- a/resources/lang/da/admin/departments/table.php +++ b/resources/lang/da/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Afdelingsnavn', @@ -8,4 +8,4 @@ return array( 'location' => 'Placering', 'create' => 'Oprette afdeling', 'update' => 'Opdater afdeling', - ); + ]; diff --git a/resources/lang/da/admin/depreciations/general.php b/resources/lang/da/admin/depreciations/general.php index b05b0d503b..2fa70f1dd9 100644 --- a/resources/lang/da/admin/depreciations/general.php +++ b/resources/lang/da/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Omkring Aktiv Afskrivninger', 'about_depreciations' => 'Du kan sætte aktiv afskrivninger til at afskrive aktiver baseret på lineære afskrivninger.', 'asset_depreciations' => 'Aktiv Afskrivninger', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Antal måneder', 'update' => 'Opdater Afskrivninger', -); +]; diff --git a/resources/lang/da/admin/depreciations/message.php b/resources/lang/da/admin/depreciations/message.php index 25dd5c3276..33672e7d48 100644 --- a/resources/lang/da/admin/depreciations/message.php +++ b/resources/lang/da/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Afskrivningsklasse eksisterer ikke.', 'assoc_users' => 'Denne afskrivning er pt. forbundet med en eller flere modeller og kan derfor ikke slettes. Slet modellerne og prøv igen.', - - 'create' => array( + 'create' => [ 'error' => 'Afskrivningsklasse blev ikke oprettet, prøv igen.', - 'success' => 'Afskrivningsklasse blev oprettet.' - ), + 'success' => 'Afskrivningsklasse blev oprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Afskrivningsklasse blev ikke opdateret, prøv igen.', - 'success' => 'Afskrivningsklasse blev opdateret.' - ), + 'success' => 'Afskrivningsklasse blev opdateret.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne afskrivningsklasse?', 'error' => 'Der var et problem ved sletning af afskrivningsklasse. Prøv igen.', - 'success' => 'Afskrivningsklassen blev slettet.' - ) + 'success' => 'Afskrivningsklassen blev slettet.', + ], -); +]; diff --git a/resources/lang/da/admin/depreciations/table.php b/resources/lang/da/admin/depreciations/table.php index e8e3a9f879..a0bbf1b698 100644 --- a/resources/lang/da/admin/depreciations/table.php +++ b/resources/lang/da/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Måneder', 'term' => 'Term', 'title' => 'Navn ', -); +]; diff --git a/resources/lang/da/admin/groups/message.php b/resources/lang/da/admin/groups/message.php index af83daa1c4..c83324f379 100644 --- a/resources/lang/da/admin/groups/message.php +++ b/resources/lang/da/admin/groups/message.php @@ -1,22 +1,22 @@ 'Gruppen eksisterer allerede!', 'group_not_found' => 'Gruppen [:id] eksisterer ikke.', 'group_name_required' => 'Navnefeltet er påkrævet', - 'success' => array( + 'success' => [ 'create' => 'Gruppen er oprettet.', 'update' => 'Gruppen er opdateret.', 'delete' => 'Gruppen er slettet.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette gruppen?', 'create' => 'Der var et problem ved oprettelse af gruppen. Prøv igen.', 'update' => 'Der var et problem ved opdatering af gruppen. Prøv igen.', 'delete' => 'Der var et problem ved sletning af gruppen. Prøv igen.', - ), + ], -); +]; diff --git a/resources/lang/da/admin/groups/table.php b/resources/lang/da/admin/groups/table.php index 2ec6895683..920d6838f9 100644 --- a/resources/lang/da/admin/groups/table.php +++ b/resources/lang/da/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Navn', 'users' => '# af Brugere', -); +]; diff --git a/resources/lang/da/admin/groups/titles.php b/resources/lang/da/admin/groups/titles.php index 549c36058a..745dea31eb 100644 --- a/resources/lang/da/admin/groups/titles.php +++ b/resources/lang/da/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Om grupper', 'about_groups' => 'Grupper bruges til at generalisere brugertilladelser.', 'group_management' => 'Gruppehåndtering', @@ -11,4 +11,4 @@ return array( 'allow' => 'Tillad', 'deny' => 'Afvis', -); +]; diff --git a/resources/lang/da/admin/hardware/form.php b/resources/lang/da/admin/hardware/form.php index 53108c25b7..a60f2dbfb9 100644 --- a/resources/lang/da/admin/hardware/form.php +++ b/resources/lang/da/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Bekræft massefortegnelser', +return [ + 'bulk_delete' => 'Bekræft massefortegnelser', 'bulk_delete_help' => 'Gennemgå aktiver for massesletning nedenfor. Disse aktiver kan gendannes når slettet, men de vil ikke længere være forbundet med eventuelle brugere, de i øjeblikket er tildelt.', 'bulk_delete_warn' => 'Du er i gang med at slette :asset_count aktiver.', - 'bulk_update' => 'Masseopdater Aktiver', - 'bulk_update_help' => 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.', - 'bulk_update_warn' => 'Du er i færd med at redigere egenskaber på :asset_count aktiver.', + 'bulk_update' => 'Masseopdater Aktiver', + 'bulk_update_help' => 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.', + 'bulk_update_warn' => 'Du er i færd med at redigere egenskaber på :asset_count aktiver.', 'checkedout_to' => 'Tjekket Ud Til', 'checkout_date' => 'Tjekket Ud Dato', 'checkin_date' => 'Tjekket Ind Dato', @@ -38,7 +38,6 @@ return array( 'tag' => 'Aktiv mærkat', 'update' => 'Aktiv Opdatering', 'warranty' => 'Garanti', - 'warranty_expires' => 'Garantiudløb', + 'warranty_expires' => 'Garantiudløb', 'years' => 'år', -) -; +]; diff --git a/resources/lang/da/admin/hardware/general.php b/resources/lang/da/admin/hardware/general.php index 70ca3f0b5e..e7f2b1f46c 100644 --- a/resources/lang/da/admin/hardware/general.php +++ b/resources/lang/da/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Om aktiver', 'about_assets_text' => 'Aktiver er poster sporet af serienummer eller aktiv tag. De har tendens til at være højere værdi elementer, hvor identifikation af en bestemt genstand betyder noget.', - 'archived' => 'arkiverede', + 'archived' => 'arkiverede', 'asset' => 'Asset', 'bulk_checkout' => 'Udtjek aktiv', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Verserende', 'undeployable' => 'Undeployable', 'view' => 'Se aktiv', -); +]; diff --git a/resources/lang/da/admin/hardware/message.php b/resources/lang/da/admin/hardware/message.php index e7d586b677..1080db71f9 100644 --- a/resources/lang/da/admin/hardware/message.php +++ b/resources/lang/da/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Advarsel: Dette aktiv er blevet markeret som uudnytteligt. Hvis denne status er ændret, skal du opdatere aktivstatus.', 'does_not_exist' => 'Asset eksisterer ikke.', 'does_not_exist_or_not_requestable' => 'Godt forsøgt. Det pågældende aktiv eksisterer ikke eller kan ikke anmodes om.', 'assoc_users' => 'Dette aktiv er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller aktivet først, og prøv derefter at slette igen.', - 'create' => array( + 'create' => [ 'error' => 'Akten blev ikke oprettet, prøv igen. :(', - 'success' => 'Aktivet blev oprettet med succes. :)' - ), + 'success' => 'Aktivet blev oprettet med succes. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Akten blev ikke opdateret, prøv igen', 'success' => 'Asset opdateret med succes.', 'nothing_updated' => 'Ingen felter blev valgt, så intet blev opdateret.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Akten blev ikke gendannet, prøv igen', - 'success' => 'Asset restaureret med succes.' - ), + 'success' => 'Asset restaureret med succes.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Assetrevision mislykkedes. Prøv igen.', - 'success' => 'Asset audit succesfuldt logget.' - ), + 'success' => 'Asset audit succesfuldt logget.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen er ikke slettet. Prøv igen.', 'success' => 'Filen er slettet korrekt.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) ikke uploadet. Prøv igen.', 'success' => 'Fil (er), der blev uploadet korrekt.', 'nofiles' => 'Du valgte ikke nogen filer til upload, eller filen du forsøger at uploade er for stor', 'invalidfiles' => 'En eller flere af dine filer er for store eller er en filtype, der ikke er tilladt. Tilladte filtyper er png, gif, jpg, doc, docx, pdf og txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Nogle elementer importerede ikke korrekt.', 'errorDetail' => 'Følgende elementer blev ikke importeret på grund af fejl.', - 'success' => "Din fil er blevet importeret", - 'file_delete_success' => "Din fil er blevet slettet korrekt", - 'file_delete_error' => "Filen kunne ikke slettes", - ), + 'success' => 'Din fil er blevet importeret', + 'file_delete_success' => 'Din fil er blevet slettet korrekt', + 'file_delete_error' => 'Filen kunne ikke slettes', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette dette aktiv?', 'error' => 'Der opstod et problem ved at slette aktivet. Prøv igen.', 'nothing_updated' => 'Ingen aktiver blev valgt, så intet blev slettet.', - 'success' => 'Aktivet blev slettet med succes.' - ), + 'success' => 'Aktivet blev slettet med succes.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Akten blev ikke tjekket ud, prøv igen', 'success' => 'Asset tjekket ud med succes.', 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', 'not_available' => 'Det aktiv er ikke tilgængeligt for kassen!', - 'no_assets_selected' => 'Du skal vælge mindst ét aktiv fra listen' - ), + 'no_assets_selected' => 'Du skal vælge mindst ét aktiv fra listen', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Akten blev ikke tjekket ind, prøv igen', 'success' => 'Asset tjekket ind med succes.', 'user_does_not_exist' => 'Denne bruger er ugyldig. Prøv igen.', 'already_checked_in' => 'Det aktiv er allerede kontrolleret.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Akten blev ikke anmodet om, prøv igen', 'success' => 'Akten blev bedt om succes.', - 'canceled' => 'Afbestillingsanmodningen er aflyst' - ) + 'canceled' => 'Afbestillingsanmodningen er aflyst', + ], -); +]; diff --git a/resources/lang/da/admin/hardware/table.php b/resources/lang/da/admin/hardware/table.php index e6fb15bcf7..cc1481399b 100644 --- a/resources/lang/da/admin/hardware/table.php +++ b/resources/lang/da/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset', 'image' => 'Enhedsbillede', 'days_without_acceptance' => 'Dage uden accept', - 'monthly_depreciation' => 'Månedlig afskrivning' + 'monthly_depreciation' => 'Månedlig afskrivning', -); +]; diff --git a/resources/lang/da/admin/kits/general.php b/resources/lang/da/admin/kits/general.php index e9cd9af913..ac36f4a42b 100644 --- a/resources/lang/da/admin/kits/general.php +++ b/resources/lang/da/admin/kits/general.php @@ -1,6 +1,6 @@ 'Om Foruddefinerede Kits', 'about_kits_text' => 'Foruddefinerede Kits lader dig hurtigt tjekke en samling af varer (aktiver, licenser osv.) til en bruger. Dette kan være nyttigt, når din onboarding proces er konsekvent på tværs af mange brugere, og alle brugere modtager de samme elementer.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Der er ikke nok tilgængelige enheder af :consumable til checkout. :qty er påkrævet. ', 'none_accessory' => 'Der er ikke nok tilgængelige enheder :accessory til checkout. :qty er påkrævet. ', -); +]; diff --git a/resources/lang/da/admin/licenses/form.php b/resources/lang/da/admin/licenses/form.php index f65a504ad1..33ff88b27d 100644 --- a/resources/lang/da/admin/licenses/form.php +++ b/resources/lang/da/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenseret til Email', 'to_name' => 'Licenseret til Navn', 'update' => 'Opdater licens', - 'checkout_help' => 'Du skal tjekke en licens ud til et hardware aktiv eller en person. Du kan vælge begge dele, men ejeren af aktivet skal svare til den person, du tjekker aktivet ud til.' -); + 'checkout_help' => 'Du skal tjekke en licens ud til et hardware aktiv eller en person. Du kan vælge begge dele, men ejeren af aktivet skal svare til den person, du tjekker aktivet ud til.', +]; diff --git a/resources/lang/da/admin/licenses/general.php b/resources/lang/da/admin/licenses/general.php index b8c500395e..1e9b67f2d5 100644 --- a/resources/lang/da/admin/licenses/general.php +++ b/resources/lang/da/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Om licenser', 'about_licenses' => 'Licenser bruges til at spore software. De har et bestemt antal pladser, der kan tjekkes ud til enkeltpersoner', 'checkin' => 'Checkin Licenssæde', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Softwarelicenser', 'user' => 'Bruger', 'view' => 'Se licens', -); +]; diff --git a/resources/lang/da/admin/licenses/message.php b/resources/lang/da/admin/licenses/message.php index 69108831ff..65382a2418 100644 --- a/resources/lang/da/admin/licenses/message.php +++ b/resources/lang/da/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licens eksistere ikke.', 'user_does_not_exist' => 'Bruger eksisterer ikke.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Du skal vælge et aktiv eller en bruger, men ikke begge.', 'not_found' => 'Licens blev ikke fundet', - - 'create' => array( + 'create' => [ 'error' => 'Licensen blev ikke oprettet, prøv igen.', - 'success' => 'Licensen er oprettet med succes.' - ), + 'success' => 'Licensen er oprettet med succes.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen er ikke slettet. Prøv igen.', 'success' => 'Filen er slettet korrekt.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) ikke uploadet. Prøv igen.', 'success' => 'Fil (er), der blev uploadet korrekt.', 'nofiles' => 'Du valgte ikke nogen filer til upload, eller filen du forsøger at uploade er for stor', 'invalidfiles' => 'En eller flere af dine filer er for store eller er en filtype, der ikke er tilladt. Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml og lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licensen blev ikke opdateret, prøv igen', - 'success' => 'Licensen opdateres med succes.' - ), + 'success' => 'Licensen opdateres med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette denne licens?', 'error' => 'Der opstod et problem ved at slette licensen. Prøv igen.', - 'success' => 'Licensen blev slettet korrekt.' - ), + 'success' => 'Licensen blev slettet korrekt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Der var et problem med at tjekke licensen. Prøv igen.', - 'success' => 'Licensen blev tjekket ud med succes' - ), + 'success' => 'Licensen blev tjekket ud med succes', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Der var et problem at kontrollere licensen. Prøv igen.', - 'success' => 'Licensen blev tjekket ind med succes' - ), + 'success' => 'Licensen blev tjekket ind med succes', + ], -); +]; diff --git a/resources/lang/da/admin/licenses/table.php b/resources/lang/da/admin/licenses/table.php index ec7d8d23b3..cc56f817fe 100644 --- a/resources/lang/da/admin/licenses/table.php +++ b/resources/lang/da/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Tildelt', 'checkout' => 'Ind ud', @@ -14,4 +14,4 @@ return array( 'serial' => 'Seriel', 'title' => 'Licens', -); +]; diff --git a/resources/lang/da/admin/locations/message.php b/resources/lang/da/admin/locations/message.php index 974c111250..0358aab282 100644 --- a/resources/lang/da/admin/locations/message.php +++ b/resources/lang/da/admin/locations/message.php @@ -1,27 +1,26 @@ 'Beliggenhed findes ikke.', 'assoc_users' => 'Denne placering er i øjeblikket forbundet med mindst en bruger og kan ikke slettes. Opdater dine brugere for ikke længere at henvise til denne placering, og prøv igen.', 'assoc_assets' => 'Denne placering er i øjeblikket forbundet med mindst ét ​​aktiv og kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen.', 'assoc_child_loc' => 'Denne placering er for øjeblikket forælder på mindst et barns placering og kan ikke slettes. Opdater dine placeringer for ikke længere at henvise til denne placering, og prøv igen.', - - 'create' => array( + 'create' => [ 'error' => 'Placeringen blev ikke oprettet, prøv igen.', - 'success' => 'Placering oprettet med succes.' - ), + 'success' => 'Placering oprettet med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Placeringen blev ikke opdateret, prøv igen', - 'success' => 'Placering opdateret med succes.' - ), + 'success' => 'Placering opdateret med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette denne placering?', 'error' => 'Der opstod et problem ved at slette placeringen. Prøv igen.', - 'success' => 'Placeringen blev slettet korrekt.' - ) + 'success' => 'Placeringen blev slettet korrekt.', + ], -); +]; diff --git a/resources/lang/da/admin/locations/table.php b/resources/lang/da/admin/locations/table.php index cff01f76d6..1aa3656a37 100644 --- a/resources/lang/da/admin/locations/table.php +++ b/resources/lang/da/admin/locations/table.php @@ -1,6 +1,6 @@ 'Om steder', 'about_locations' => 'Steder bruges til at spore placeringsoplysninger for brugere, aktiver og andre elementer', 'assets_rtd' => 'Aktiver', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Forældre', 'currency' => 'Beliggenhed Valuta', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/da/admin/manufacturers/message.php b/resources/lang/da/admin/manufacturers/message.php index 7376b2b1a0..22a17f2bac 100644 --- a/resources/lang/da/admin/manufacturers/message.php +++ b/resources/lang/da/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Fabrikant eksistere ikke.', 'assoc_users' => 'Denne producent er i øjeblikket forbundet med mindst en model og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne producent, og prøv igen.', - 'create' => array( + 'create' => [ 'error' => 'Producenten blev ikke oprettet, prøv igen.', - 'success' => 'Producenten blev oprettet med succes.' - ), + 'success' => 'Producenten blev oprettet med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Producenten blev ikke opdateret, prøv igen', - 'success' => 'Producent opdateret med succes.' - ), + 'success' => 'Producent opdateret med succes.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Producenten blev ikke gendannet, prøv igen', - 'success' => 'Producenten blev genoprettet med succes.' - ), + 'success' => 'Producenten blev genoprettet med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette denne producent?', 'error' => 'Der opstod et problem ved at slette producenten. Prøv igen.', - 'success' => 'Fabrikanten blev slettet med succes.' - ) + 'success' => 'Fabrikanten blev slettet med succes.', + ], -); +]; diff --git a/resources/lang/da/admin/manufacturers/table.php b/resources/lang/da/admin/manufacturers/table.php index 782e75aa9b..42eadd4425 100644 --- a/resources/lang/da/admin/manufacturers/table.php +++ b/resources/lang/da/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Om producenterne', 'about_manufacturers_text' => 'Producenter er de virksomheder, der skaber dine aktiver. Du kan gemme vigtige supportkontaktoplysninger om dem her, som vil blive vist på dine detaljerede sider.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Opdater Fabrikant', 'url' => 'URL', -); +]; diff --git a/resources/lang/da/admin/models/general.php b/resources/lang/da/admin/models/general.php index 7061dc38df..e6fd566323 100644 --- a/resources/lang/da/admin/models/general.php +++ b/resources/lang/da/admin/models/general.php @@ -1,6 +1,6 @@ 'Om aktiv modeller', 'about_models_text' => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.', 'deleted' => 'Denne model er blevet slettet. Klik her for at gendanne den.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Du er ved at slette :model_count aktivmodeller.', 'restore' => 'Gendanne Model', 'requestable' => 'Brugere kan anmode om denne model', - 'show_mac_address' => 'Vis MAC adressefelt i aktiver i denne model', + 'show_mac_address' => 'Vis MAC adressefelt i aktiver i denne model', 'view_deleted' => 'Se slettet', 'view_models' => 'Se modeller', 'fieldset' => 'Feltsæt', 'no_custom_field' => 'Ingen brugerdefinerede felter', 'add_default_values' => 'Tilføj defaultværdier', -); +]; diff --git a/resources/lang/da/admin/models/message.php b/resources/lang/da/admin/models/message.php index 53382a3c1a..30e618c788 100644 --- a/resources/lang/da/admin/models/message.php +++ b/resources/lang/da/admin/models/message.php @@ -1,42 +1,41 @@ 'Model findes ikke.', 'assoc_users' => 'Denne model er knyttet til en eller flere aktiver og ikke kan slettes. Slet venligst aktiver, og prøv derefter at slette igen. ', - - 'create' => array( + 'create' => [ 'error' => 'Modellen blev ikke oprettet, prøve igen.', 'success' => 'Model oprettet.', 'duplicate_set' => 'Der findes allerede en model med det navn, producent og modelnummer eksisterer allerede.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modellen blev ikke opdateret, prøv igen', - 'success' => 'Model opdateret.' - ), + 'success' => 'Model opdateret.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette dette aktiv model?', 'error' => 'Der opstod et problem under sletning af modellen. Prøv venligst igen.', - 'success' => 'Modellen blev slettet.' - ), + 'success' => 'Modellen blev slettet.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modellen blev ikke gendannet, prøv igen', - 'success' => 'Model gendannet.' - ), + 'success' => 'Model gendannet.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ingen felter blev ændret, så intet er blevet opdateret.', - 'success' => 'Modeller opdateret.' - ), + 'success' => 'Modeller opdateret.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ingen modeller blev valgt, så intet blev slettet.', 'success' => ':success_count model(ler) slettet!', - 'success_partial' => ':success_count model(ler) blev slettet; men :fail_count kunne ikke slettes fordi de stadig har aktiver knyttet til sig.' - ), + 'success_partial' => ':success_count model(ler) blev slettet; men :fail_count kunne ikke slettes fordi de stadig har aktiver knyttet til sig.', + ], -); +]; diff --git a/resources/lang/da/admin/models/table.php b/resources/lang/da/admin/models/table.php index bfc0c4f7db..408bc7eec1 100644 --- a/resources/lang/da/admin/models/table.php +++ b/resources/lang/da/admin/models/table.php @@ -1,6 +1,6 @@ 'Oprette aktiv Model', 'created_at' => 'Oprettet af', @@ -14,4 +14,4 @@ return array( 'update' => 'Opdatere aktiv model', 'clone' => 'Klon model', 'edit' => 'Redigere model', -); +]; diff --git a/resources/lang/da/admin/reports/general.php b/resources/lang/da/admin/reports/general.php index 8cd4d15225..15e776cce1 100644 --- a/resources/lang/da/admin/reports/general.php +++ b/resources/lang/da/admin/reports/general.php @@ -1,5 +1,5 @@ 'Vælg de ønskede muligheder for din aktivrapport.' -); +return [ + 'info' => 'Vælg de ønskede muligheder for din aktivrapport.', +]; diff --git a/resources/lang/da/admin/reports/message.php b/resources/lang/da/admin/reports/message.php index 4df74bf0b2..a8b23c1fdd 100644 --- a/resources/lang/da/admin/reports/message.php +++ b/resources/lang/da/admin/reports/message.php @@ -1,5 +1,5 @@ 'Du skal vælge mindst en mulighed.' -); +return [ + 'error' => 'Du skal vælge mindst en mulighed.', +]; diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php index 615338f3eb..abe87cea42 100644 --- a/resources/lang/da/admin/settings/general.php +++ b/resources/lang/da/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domæne', 'ad_domain_help' => 'Dette er nogle gange det samme som dit e-mail-domæne, men ikke altid.', 'ad_append_domain_label' => 'Tilføj domænenavn', 'ad_append_domain' => 'Tilføj domænenavn til feltet brugernavn', - 'ad_append_domain_help' => 'Brugeren er ikke forpligtet til at skrive "username@domain.local", de kan bare skrive "brugernavn".' , + 'ad_append_domain_help' => 'Brugeren er ikke forpligtet til at skrive "username@domain.local", de kan bare skrive "brugernavn".', 'admin_cc_email' => 'CC email', 'admin_cc_email_help' => 'Hvis du vil sende en kopi af checkin/checkout emails som er sendt til brugere til en ekstra email konto, så tilføj den her. Ellers efterlad feltet tomt.', 'is_ad' => 'Dette er en Active Directory-server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Udløbsvarsel Threshold (i dage)', 'alert_inv_threshold' => 'Lagervarsletærskel', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Aktiv-id\'er', 'audit_interval' => 'Revisionsinterval', 'audit_interval_help' => 'Hvis du skal regelmæssigt kontrollere dine aktiver fysisk, skal du indtaste intervallet i måneder.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Indtast tofaktorkode', 'two_factor_config_complete' => 'Indsend kode', 'two_factor_enabled_edit_not_allowed' => 'Din administrator tillader ikke dig at redigere denne indstilling.', - 'two_factor_enrollment_text' => "To faktor godkendelse er påkrævet, men din enhed er endnu ikke blevet tilmeldt. Åbn din Google Authenticator-app og scan QR-koden nedenfor for at tilmelde din enhed. Når du har tilmeldt din enhed, skal du indtaste koden nedenfor", + 'two_factor_enrollment_text' => 'To faktor godkendelse er påkrævet, men din enhed er endnu ikke blevet tilmeldt. Åbn din Google Authenticator-app og scan QR-koden nedenfor for at tilmelde din enhed. Når du har tilmeldt din enhed, skal du indtaste koden nedenfor', 'require_accept_signature' => 'Kræver Signatur', 'require_accept_signature_help_text' => 'Aktivering af denne funktion kræver, at brugerne fysisk logger af ved at acceptere et aktiv.', 'left' => 'venstre', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Markering af denne boks medfører en unik begrænsning af aktivserier', 'zerofill_count' => 'Længde af aktivetiketter, herunder zerofill', 'username_format_help' => 'Denne indstilling vil kun blive brugt af importprocessen, hvis et brugernavn ikke er angivet, og vi er nødt til at generere et brugernavn til dig.', -); +]; diff --git a/resources/lang/da/admin/settings/message.php b/resources/lang/da/admin/settings/message.php index 7f1ad32622..340963a5b8 100644 --- a/resources/lang/da/admin/settings/message.php +++ b/resources/lang/da/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Der opstod en fejl under opdatering. ', - 'success' => 'Indstillinger opdateret med succes.' - ), - 'backup' => array( + 'success' => 'Indstillinger opdateret med succes.', + ], + 'backup' => [ 'delete_confirm' => 'Er du sikker på, at du vil slette denne sikkerhedskopieringsfil? Denne handling kan ikke fortrydes.', 'file_deleted' => 'Sikkerhedsfilen blev slettet korrekt.', 'generated' => 'En ny sikkerhedskopieringsfil blev oprettet.', 'file_not_found' => 'Denne backup-fil kunne ikke findes på serveren.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Der opstod en fejl under udrensning.', 'validation_failed' => 'Din udrensningsbekræftelse er forkert. Indtast ordet "DELETE" i bekræftelsesboksen.', - 'success' => 'Slettet arkiver, der er renset for succes.' - ), + 'success' => 'Slettet arkiver, der er renset for succes.', + ], -); +]; diff --git a/resources/lang/da/admin/statuslabels/message.php b/resources/lang/da/admin/statuslabels/message.php index 655e67440c..afea109224 100644 --- a/resources/lang/da/admin/statuslabels/message.php +++ b/resources/lang/da/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Statuslabel eksisterer ikke.', 'assoc_assets' => 'Dette statusmærke er i øjeblikket forbundet med mindst én aktiv og kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne status, og prøv igen.', - - 'create' => array( + 'create' => [ 'error' => 'Statuslabel blev ikke oprettet, prøv igen.', - 'success' => 'Status Label oprettes med succes.' - ), + 'success' => 'Status Label oprettes med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statuslabel blev ikke opdateret, prøv igen', - 'success' => 'Statuslabel opdateret med succes.' - ), + 'success' => 'Statuslabel opdateret med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du vil slette denne statuslabel?', 'error' => 'Der opstod et problem ved at slette statusetiketten. Prøv igen.', - 'success' => 'Statusmærket blev slettet.' - ), + 'success' => 'Statusmærket blev slettet.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Disse aktiver kan ikke tildeles nogen.', 'deployable' => 'Disse aktiver kan tjekkes ud. Når de er tildelt, antager de en metastatus på Deployed.', 'archived' => 'Disse aktiver kan ikke tjekkes ud, og vises kun i arkiveret visning. Dette er nyttigt for at bevare oplysninger om aktiver til budgettering / historiske formål, men bevare dem ud af den daglige aktivliste.', 'pending' => 'Disse aktiver kan endnu ikke tildeles nogen, der ofte bruges til genstande, der er ude til reparation, men forventes at vende tilbage til omløb.', - ), + ], -); +]; diff --git a/resources/lang/da/admin/statuslabels/table.php b/resources/lang/da/admin/statuslabels/table.php index afea668ede..4f5a7bf1b1 100644 --- a/resources/lang/da/admin/statuslabels/table.php +++ b/resources/lang/da/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Om status labels', 'archived' => 'arkiverede', 'create' => 'Opret status label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status labels', 'undeployable' => 'Undeployable', 'update' => 'Opdater status label', -); +]; diff --git a/resources/lang/da/admin/suppliers/message.php b/resources/lang/da/admin/suppliers/message.php index d806c29987..0615478a67 100644 --- a/resources/lang/da/admin/suppliers/message.php +++ b/resources/lang/da/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Leverandør findes ikke.', - - 'create' => array( + 'create' => [ 'error' => 'Leverandøren blev ikke oprettet, prøv igen.', - 'success' => 'Leverandør oprettet med succes.' - ), + 'success' => 'Leverandør oprettet med succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Leverandøren blev ikke opdateret, prøv igen', - 'success' => 'Leverandør opdateret med succes.' - ), + 'success' => 'Leverandør opdateret med succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på, at du ønsker at slette denne leverandør?', 'error' => 'Der opstod et problem ved at slette leverandøren. Prøv igen.', 'success' => 'Leverandøren blev slettet med succes.', 'assoc_assets' => 'Denne placering er i øjeblikket forbundet med :asset_count(s) kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen. ', 'assoc_licenses' => 'Denne leverandør er i øjeblikket forbundet med :licenses_count(s) og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne leverandør, og prøv igen. ', 'assoc_maintenances' => 'Denne leverandør er i øjeblikket forbundet med :asset_maintenances_count aktiv vedligeholdelse(r) og kan ikke slettes. Opdater din aktiv vedligeholdelse så der ikke længere refereres til denne leverandør og prøv igen. ', - ) + ], -); +]; diff --git a/resources/lang/da/admin/suppliers/table.php b/resources/lang/da/admin/suppliers/table.php index 1411966c48..4e18845600 100644 --- a/resources/lang/da/admin/suppliers/table.php +++ b/resources/lang/da/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Om leverandører', 'about_suppliers_text' => 'Leverandører bruges til at spore kilden til varer', 'address' => 'Leverandøradresse', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Se aktiver for', 'zip' => 'Postnummer', -); +]; diff --git a/resources/lang/da/admin/users/general.php b/resources/lang/da/admin/users/general.php index d1bbeccb34..9a02fb270d 100644 --- a/resources/lang/da/admin/users/general.php +++ b/resources/lang/da/admin/users/general.php @@ -1,7 +1,6 @@ 'Denne bruger kan logge ind', 'activated_disabled_help_text' => 'Du kan ikke redigere rettigheder for din egen konto.', 'assets_user' => 'Aktiver tildelt :navn', @@ -13,7 +12,7 @@ return array( 'edit' => 'Redigér bruger', 'filetype_info' => 'Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip og rar.', 'history_user' => 'Historie for: navn', - 'info' => 'Information', + 'info' => 'Information', 'restore_user' => 'Klik her for at gendanne dem.', 'last_login' => 'Sidste Login', 'ldap_config_text' => 'LDAP-konfigurationsindstillinger kan findes Admin> Indstillinger. Den (valgfrie) valgte placering vil blive indstillet for alle importerede brugere.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Dine nuværende administratorindstillinger tillader selektiv håndhævelse af tofaktors godkendelse.', 'two_factor_enrolled' => '2FA Device Enrolled', 'two_factor_active' => '2FA aktiv ', - ); + ]; diff --git a/resources/lang/da/admin/users/message.php b/resources/lang/da/admin/users/message.php index 6dd88d3127..7f68880c30 100644 --- a/resources/lang/da/admin/users/message.php +++ b/resources/lang/da/admin/users/message.php @@ -1,6 +1,6 @@ 'Du har godkendt dette aktiv.', 'declined' => 'Du har afvist dette aktiv.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP-integration er ikke konfigureret til denne installation.', 'password_resets_sent' => 'De valgte brugere, der er aktiveret og har en gyldig e-mail-adresser, har fået tilsendt et link til nulstilling af adgangskode.', - - 'success' => array( + 'success' => [ 'create' => 'Bruger blev oprettet.', 'update' => 'Bruger blev opdateret.', 'update_bulk' => 'Brugere blev opdateret!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Bruger blev succesløst afbrudt.', 'restored' => 'Bruger blev genoprettet.', 'import' => 'Brugere importeres med succes.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Der opstod et problem, der skabte brugeren. Prøv igen.', 'update' => 'Der opstod et problem, der opdaterede brugeren. Prøv igen.', 'delete' => 'Der opstod et problem ved at slette brugeren. Prøv igen.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Kunne ikke søge på LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Error fra LDAP-server:', 'ldap_could_not_get_entries' => 'Kunne ikke få poster fra LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Error fra LDAP-server:', 'password_ldap' => 'Adgangskoden til denne konto administreres af LDAP / Active Directory. Kontakt din it-afdeling for at ændre dit kodeord.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen er ikke slettet. Prøv igen.', 'success' => 'Filen er slettet korrekt.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) ikke uploadet. Prøv igen.', 'success' => 'Fil (er), der blev uploadet korrekt.', 'nofiles' => 'Du valgte ikke nogen filer til upload', 'invalidfiles' => 'En eller flere af dine filer er for store eller er en filtype, der ikke er tilladt. Tilladte filtyper er png, gif, jpg, doc, docx, pdf og txt.', - ), + ], -); +]; diff --git a/resources/lang/da/admin/users/table.php b/resources/lang/da/admin/users/table.php index ffb1f30c31..0b8cc24cb6 100644 --- a/resources/lang/da/admin/users/table.php +++ b/resources/lang/da/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktiv', 'allow' => 'Tillad', 'checkedout' => 'Aktiver', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Vis nuværende brugere', 'show_deleted' => 'Vis slettede brugere', 'title' => 'Titel', - 'to_restore_them' => 'at genoprette dem.', + 'to_restore_them' => 'at genoprette dem.', 'updateuser' => 'Opdatere bruger', 'username' => 'Brugernavn', - 'user_deleted_text' => 'Denne bruger er blevet markeret som slettede.', + 'user_deleted_text' => 'Denne bruger er blevet markeret som slettede.', 'username_note' => '(Dette bruges kun til Active Directory-binding, ikke til login.)', 'cloneuser' => 'Klon bruger', 'viewusers' => 'Se brugere', -); +]; diff --git a/resources/lang/da/auth/general.php b/resources/lang/da/auth/general.php index 759c2396c2..a77fe75e12 100644 --- a/resources/lang/da/auth/general.php +++ b/resources/lang/da/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Indtast dit brugernavn for at få tilsendt et link til nulstilling af adgangskoden.', 'username_help_bottom' => 'Dit brugernavn og din emailadresse kan være den samme; men din konfiguration kan kæve at de er forskellige. Hvis du ikke kan huske dit brugernavn, så kontakt administratoren.

Brugernavne uden tilhørende emailadresse vil ikke få tilsendt mail med link til reset af kodeord. ', ]; - diff --git a/resources/lang/da/auth/message.php b/resources/lang/da/auth/message.php index 57e99b7f1b..1f83da7bd4 100644 --- a/resources/lang/da/auth/message.php +++ b/resources/lang/da/auth/message.php @@ -1,6 +1,6 @@ 'En konto med denne e-mail eksisterer allerede.', 'account_not_found' => 'Brugernavn eller kodeord er forkert.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Denne brugerkonto er blokeret.', 'throttle' => 'For mange mislykkede loginforsøg. Prøv igen om : minutter minutter.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Din enhed er allerede tilmeldt.', 'success' => 'Du er blevet logget ind.', 'code_required' => 'To-faktor-kode er påkrævet.', 'invalid_code' => 'To-faktor kode er ugyldig.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Der opstod et problem, ved forsøg på at logge dig ind, prøv igen.', 'success' => 'Du er blevet logget ind.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Der opstod et problem under forsøget på at logge dig ud, prøv venligst igen.', 'success' => 'Du har logget ud.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Der opstod et problem, ved forsøg på at oprette din konto, prøv igen.', 'success' => 'Konto oprettet med succes.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Der opstod et problem, ved forsøg på at nulstille din adgangkode, prøv igen.', 'success' => 'Hvis e-mail-adressen findes i vores system, er en mail med gendannelse af adgangskode blevet sendt.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Der opstod et problem, ved forsøg på at nulstille din adgangskode, prøv venligst igen.', 'success' => 'Din adgangskode er blevet nulstillet.', - ), + ], - -); +]; diff --git a/resources/lang/da/button.php b/resources/lang/da/button.php index f29496bc21..2f54616a05 100644 --- a/resources/lang/da/button.php +++ b/resources/lang/da/button.php @@ -1,6 +1,6 @@ 'Handlinger', 'add' => 'Tilføj Ny', 'cancel' => 'Annuller', @@ -11,7 +11,7 @@ return array( 'request' => 'Anmodning', 'submit' => 'Send', 'upload' => 'Upload', - 'select_file' => 'Vælg fil ...', + 'select_file' => 'Vælg fil ...', 'select_files' => 'Vælg filer...', 'generate_labels' => '{1} Generer etiketter [2,*] Generer etiketter', -); +]; diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php index 8b52275742..97bd48b41c 100644 --- a/resources/lang/da/general.php +++ b/resources/lang/da/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Forespørgsler', 'city' => 'By', - 'click_here' => 'Klik her', + 'click_here' => 'Klik her', 'clear_selection' => 'Ryd valg', 'companies' => 'Selskaber', 'company' => 'Selskab', 'component' => 'Komponent', 'components' => 'Komponenter', - 'complete' => 'Komplet', + 'complete' => 'Komplet', 'consumable' => 'forbrugsmateriale', 'consumables' => 'Forbrugsstoffer', 'country' => 'Land', diff --git a/resources/lang/da/help.php b/resources/lang/da/help.php index 66eb1bde9e..35f5f68611 100644 --- a/resources/lang/da/help.php +++ b/resources/lang/da/help.php @@ -1,6 +1,6 @@ "Mere information", + 'more_info_title' => 'Mere information', - "audit_help" => "Afkrydsning af dette felt vil redigere aktivposten så den afspejler denne nye placering. Ingen markering angiver blot, placeringen i revisionsloggen.

Bemærk, at hvis dette aktiv er tjekkes ud, det vil ikke ændre placeringen af personen, aktivet eller placeringen, det er tjekket ud til.", + 'audit_help' => 'Afkrydsning af dette felt vil redigere aktivposten så den afspejler denne nye placering. Ingen markering angiver blot, placeringen i revisionsloggen.

Bemærk, at hvis dette aktiv er tjekkes ud, det vil ikke ændre placeringen af personen, aktivet eller placeringen, det er tjekket ud til.', 'assets' => 'Aktiver er elementer sporet efter serienummer eller aktiv tag. De har tendens til at være elementer af højere værdi, hvor identificering af en bestemt genstand betyder noget.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Du kan sætte aktivafskrivninger til at afskrive aktiver som lineære afskrivninger.', - - -); +]; diff --git a/resources/lang/da/mail.php b/resources/lang/da/mail.php index d065074c0b..f6a711b204 100644 --- a/resources/lang/da/mail.php +++ b/resources/lang/da/mail.php @@ -1,6 +1,6 @@ 'En bruger har annulleret en vareforespørgsel på hjemmesiden', 'a_user_requested' => 'En bruger har anmodet om et emne på hjemmesiden', 'accessory_name' => 'Tilbehør Navn:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Forventet asset checkin rapport', 'Expected_Checkin_Notification' => 'Påmindelse: :name checkin deadline nærmer sig', 'Expected_Checkin_Date' => 'Et asset tjekket ud til dig skal tjekkes tilbage den :date', - 'your_assets' => 'Se dine assets' -); + 'your_assets' => 'Se dine assets', +]; diff --git a/resources/lang/da/pagination.php b/resources/lang/da/pagination.php index 6e20cbfa38..93753491af 100644 --- a/resources/lang/da/pagination.php +++ b/resources/lang/da/pagination.php @@ -1,6 +1,6 @@ 'Næste »', -); +]; diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php index 3c866fd31e..ed64d8822f 100644 --- a/resources/lang/da/passwords.php +++ b/resources/lang/da/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Dit adgangskode link er blevet sendt!', 'user' => 'Der er ikke fundet nogen aktiv bruger med denne email.', ]; - diff --git a/resources/lang/da/reminders.php b/resources/lang/da/reminders.php index 0158281a88..c8e248456d 100644 --- a/resources/lang/da/reminders.php +++ b/resources/lang/da/reminders.php @@ -1,6 +1,6 @@ "Adgangskoder skal være seks tegn og svare til bekræftelsen.", + 'password' => 'Adgangskoder skal være seks tegn og svare til bekræftelsen.', - "user" => "Brugernavn eller email adresse er forkert", + 'user' => 'Brugernavn eller email adresse er forkert', - "token" => "Denne adgangskode nulstillingstoken er ugyldig.", + 'token' => 'Denne adgangskode nulstillingstoken er ugyldig.', - "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!", + 'sent' => 'Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!', -); +]; diff --git a/resources/lang/da/table.php b/resources/lang/da/table.php index 922b8e82bf..7b7e096cf0 100644 --- a/resources/lang/da/table.php +++ b/resources/lang/da/table.php @@ -1,10 +1,10 @@ 'Handlinger', 'action' => 'Handling', 'by' => 'Af', 'item' => 'Emne', -); +]; diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php index f3fb5ea86f..9c9bf27f34 100644 --- a/resources/lang/da/validation.php +++ b/resources/lang/da/validation.php @@ -1,6 +1,6 @@ ':attribute er allerede taget.', 'uploaded' => 'Attributtet kunne ikke uploades.', 'url' => ':attribute formatet er ugyldigt.', - "unique_undeleted" => ":attribute skal være unik.", + 'unique_undeleted' => ':attribute skal være unik.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Attributfeltet indeholder et tegn, der ikke er tilladt.", - "email_array" => "En eller flere e-mailadresser er ugyldige.", - "hashed_pass" => "Din nuværende adgangskode er forkert", + 'alpha_space' => 'Attributfeltet indeholder et tegn, der ikke er tilladt.', + 'email_array' => 'En eller flere e-mailadresser er ugyldige.', + 'hashed_pass' => 'Din nuværende adgangskode er forkert', 'dumbpwd' => 'Denne adgangskode er for almindelig.', - "statuslabel_type" => "Du skal vælge en gyldig statusetiketype", + 'statuslabel_type' => 'Du skal vælge en gyldig statusetiketype', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/de/admin/accessories/general.php b/resources/lang/de/admin/accessories/general.php index 8909c16c95..e242dc2b49 100644 --- a/resources/lang/de/admin/accessories/general.php +++ b/resources/lang/de/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Zubehörkategorie', 'accessory_name' => 'Zubehör-Name', 'checkout' => 'Zubehör herausgeben', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Die Standard EULA stattdessen verwenden.', 'use_default_eula_disabled' => 'Die Standard EULA stattdessen verwenden. Keine Standard EULA definiert. Bitte fügen Sie eine in den Einstellungen hinzu.', -); +]; diff --git a/resources/lang/de/admin/accessories/message.php b/resources/lang/de/admin/accessories/message.php index deb865ec6d..3684715778 100644 --- a/resources/lang/de/admin/accessories/message.php +++ b/resources/lang/de/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Das Zubehör [:id] existiert nicht.', 'assoc_users' => 'Dieses Zubehör ist derzeit an :count Benutzern zur Verwendung ausgegeben worden. Bitte buchen Sie das Zubehör wieder ein und versuchen es dann erneut. ', - 'create' => array( + 'create' => [ 'error' => 'Zubehör wurde nicht erstellt, bitte versuchen Sie es erneut.', - 'success' => 'Zubehör erfolgreich angelegt.' - ), + 'success' => 'Zubehör erfolgreich angelegt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Zubehör wurde nicht aktualisiert, bitte versuchen Sie es erneut', - 'success' => 'Zubehör wurde erfolgreich aktualisiert.' - ), + 'success' => 'Zubehör wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie dieses Zubehör löschen möchten?', 'error' => 'Beim Löschen dieses Zubehörs ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.', - 'success' => 'Das Zubehör wurde erfolgreich gelöscht.' - ), + 'success' => 'Das Zubehör wurde erfolgreich gelöscht.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Zubehör konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut', 'success' => 'Zubehör erfolgreich herausgegeben.', - 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.' - ), + 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Das Zubehör wurde nicht erfolgreich zurückgenommen. Bitte versuchen Sie es erneut', 'success' => 'Zubehör erfolgreich zurückgenommen.', - 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.' - ) + 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', + ], - -); +]; diff --git a/resources/lang/de/admin/accessories/table.php b/resources/lang/de/admin/accessories/table.php index af01edf6b1..4ab1fe40e3 100644 --- a/resources/lang/de/admin/accessories/table.php +++ b/resources/lang/de/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV Herunterladen', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'CSV Herunterladen', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Zustimmung', 'title' => 'Zubehör Name', - -); +]; diff --git a/resources/lang/de/admin/asset_maintenances/form.php b/resources/lang/de/admin/asset_maintenances/form.php index 73111e98d2..3907c29577 100644 --- a/resources/lang/de/admin/asset_maintenances/form.php +++ b/resources/lang/de/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tage', 'notes' => 'Anmerkungen', 'update' => 'Aktualisieren', - 'create' => 'Erstellen' + 'create' => 'Erstellen', ]; diff --git a/resources/lang/de/admin/asset_maintenances/message.php b/resources/lang/de/admin/asset_maintenances/message.php index 5abad2dbec..9cf9319b8c 100644 --- a/resources/lang/de/admin/asset_maintenances/message.php +++ b/resources/lang/de/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Möchten Sie die Wartung wirklich löschen?', 'error' => 'Es gab Probleme beim Löschen der Wartung. Bitte versuchen Sie es erneut.', - 'success' => 'Die Wartung wurde erfolgreich gelöscht.' + 'success' => 'Die Wartung wurde erfolgreich gelöscht.', ], 'create' => [ 'error' => 'Wartung wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Wartung erfolgreich erstellt.' + 'success' => 'Wartung erfolgreich erstellt.', ], 'edit' => [ 'error' => 'Die Wartung wurde nicht bearbeitet, bitte versuchen Sie es erneut.', - 'success' => 'Wartung wurde erfolgreich bearbeitet.' + 'success' => 'Wartung wurde erfolgreich bearbeitet.', ], 'asset_maintenance_incomplete' => 'Nicht vollständig ausgefüllt', 'warranty' => 'Garantie', 'not_warranty' => 'keine Garantie', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/de/admin/asset_maintenances/table.php b/resources/lang/de/admin/asset_maintenances/table.php index 091ab4f409..44635dfadf 100644 --- a/resources/lang/de/admin/asset_maintenances/table.php +++ b/resources/lang/de/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Wartungen', 'asset_name' => 'Asset Name', 'is_warranty' => 'Garantie', - 'dl_csv' => 'CSV Herunterladen' + 'dl_csv' => 'CSV Herunterladen', ]; diff --git a/resources/lang/de/admin/categories/general.php b/resources/lang/de/admin/categories/general.php index 0b9c00f4cc..871bd70e9e 100644 --- a/resources/lang/de/admin/categories/general.php +++ b/resources/lang/de/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset-Kategorien', 'category_name' => 'Kategoriename', 'checkin_email' => 'Beim Checkin/Checkout eine E-Mail an den Benutzer senden.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Die Standard EULA stattdessen verwenden.', 'use_default_eula_disabled' => 'Die Standard-EULA verwenden. Es wurde keine Standard-EULA definiert. Bitte fügen Sie eine in den Einstellungen hinzu.', -); +]; diff --git a/resources/lang/de/admin/categories/message.php b/resources/lang/de/admin/categories/message.php index 7d8e28a195..303788021c 100644 --- a/resources/lang/de/admin/categories/message.php +++ b/resources/lang/de/admin/categories/message.php @@ -1,25 +1,25 @@ 'Diese Kategorie existiert nicht.', 'assoc_models' => 'Diese Kategorie kann nicht gelöscht werden da sie bereits einem Modell zugewiesen ist. Bitte entfernen Sie diese Kategorie von Ihren Modellen und versuchen Sie es erneut. ', 'assoc_items' => 'Diese Kategorie kann nicht gelöscht werden da sie bereits mit einem :asset_type verbunden ist. Bitte trennen Sie diese Kategorie von Ihrem :asset_type und versuchen Sie es erneut. ', - 'create' => array( + 'create' => [ 'error' => 'Die Kategorie konnte nicht erstellt werden, bitte versuchen sie es erneut.', - 'success' => 'Die Kategorie wurde erfolgreich erstellt.' - ), + 'success' => 'Die Kategorie wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Die Kategorie konnte nicht aktualisiert werden, bitte versuchen Sie es erneut', - 'success' => 'Die Kategorie wurde erfolgreich aktualisiert.' - ), + 'success' => 'Die Kategorie wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Kategorie löschen wollen?', 'error' => 'Beim Löschen der Kategorie ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.', - 'success' => 'Die Kategorie wurde erfolgreich gelöscht.' - ) + 'success' => 'Die Kategorie wurde erfolgreich gelöscht.', + ], -); +]; diff --git a/resources/lang/de/admin/categories/table.php b/resources/lang/de/admin/categories/table.php index 5adea5eab2..e3ebbe7b96 100644 --- a/resources/lang/de/admin/categories/table.php +++ b/resources/lang/de/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Übergeordneten', 'require_acceptance' => 'Zustimmung', 'title' => 'Name der Asset-Kategorie', -); +]; diff --git a/resources/lang/de/admin/companies/general.php b/resources/lang/de/admin/companies/general.php index f29e2de89a..e42b298525 100644 --- a/resources/lang/de/admin/companies/general.php +++ b/resources/lang/de/admin/companies/general.php @@ -1,4 +1,5 @@ 'Firma auswählen', ]; diff --git a/resources/lang/de/admin/companies/message.php b/resources/lang/de/admin/companies/message.php index d993cd9834..b6c0d5d80f 100644 --- a/resources/lang/de/admin/companies/message.php +++ b/resources/lang/de/admin/companies/message.php @@ -1,18 +1,19 @@ 'Firma existiert nicht.', 'assoc_users' => 'Diese Firma ist mit mindestens einem Modell verknüpft und kann nicht gelöscht werden. Bitte ändere die Modelle um die Verknüpfung zu lösen. ', - 'create' => array( + 'create' => [ 'error' => 'Firma wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Firma wurde erfolgreich angelegt.' - ), - 'update' => array( + 'success' => 'Firma wurde erfolgreich angelegt.', + ], + 'update' => [ 'error' => 'Firma wurde nicht geändert, bitte versuchen Sie es erneut', - 'success' => 'Firma erfolgreich geändert.' - ), - 'delete' => array( + 'success' => 'Firma erfolgreich geändert.', + ], + 'delete' => [ 'confirm' => 'Sind Sie sich sicher, dass Sie diese Firma löschen wollen?', 'error' => 'Es gab ein Problem beim Löschen der Firma. Bitte versuchen Sie es erneut.', - 'success' => 'Die Firma wurde erfolgreich gelöscht.' - ) -); + 'success' => 'Die Firma wurde erfolgreich gelöscht.', + ], +]; diff --git a/resources/lang/de/admin/companies/table.php b/resources/lang/de/admin/companies/table.php index 34b116a5e5..cbe5eba98a 100644 --- a/resources/lang/de/admin/companies/table.php +++ b/resources/lang/de/admin/companies/table.php @@ -1,9 +1,10 @@ 'Firmen', 'create' => 'Firma erstellen', 'title' => 'Firma', 'update' => 'Firma bearbeiten', 'name' => 'Firmenname', 'id' => 'ID', -); +]; diff --git a/resources/lang/de/admin/components/general.php b/resources/lang/de/admin/components/general.php index 7094318204..7add9f0520 100644 --- a/resources/lang/de/admin/components/general.php +++ b/resources/lang/de/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponentenname', 'checkin' => 'Komponente zurücknehmen', 'checkout' => 'Komponente herausgeben', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Verbleibend', 'total' => 'Gesamt', 'update' => 'Komponente aktualisieren', -); +]; diff --git a/resources/lang/de/admin/components/message.php b/resources/lang/de/admin/components/message.php index d7dd2a0cfe..7783a97172 100644 --- a/resources/lang/de/admin/components/message.php +++ b/resources/lang/de/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponente existiert nicht.', - 'create' => array( + 'create' => [ 'error' => 'Komponente wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Komponente wurde erfolgreich erstellt.' - ), + 'success' => 'Komponente wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponente wurde nicht geändert. Bitte versuchen Sie es erneut', - 'success' => 'Komponente erfolgreich geändert.' - ), + 'success' => 'Komponente erfolgreich geändert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Komponente löschen möchten?', 'error' => 'Beim Löschen der Komponente ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.', - 'success' => 'Die Komponente wurde erfolgreich gelöscht.' - ), + 'success' => 'Die Komponente wurde erfolgreich gelöscht.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponente konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut', 'success' => 'Komponente wurde erfolgreich herausgegeben.', - 'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.' - ), + 'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuchen Sie es noch einmal.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponente konnte nicht zurückgenommen werden. Bitte versuchen Sie es erneut', 'success' => 'Komponente wurde erfolgreich zurückgenommen.', - 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.' - ) + 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', + ], - -); +]; diff --git a/resources/lang/de/admin/components/table.php b/resources/lang/de/admin/components/table.php index 4a94833aa0..9271a80b9b 100644 --- a/resources/lang/de/admin/components/table.php +++ b/resources/lang/de/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentenname', -); +]; diff --git a/resources/lang/de/admin/consumables/general.php b/resources/lang/de/admin/consumables/general.php index 4d3fd225b4..4b94464e36 100644 --- a/resources/lang/de/admin/consumables/general.php +++ b/resources/lang/de/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Verbrauchsmaterial an Benutzer herausgeben', 'consumable_name' => 'Name des Verbrauchsmaterials', 'create' => 'Verbrauchsmaterial erstellen', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Verbleibend', 'total' => 'Gesamt', 'update' => 'Verbrauchsmaterial bearbeiten', -); +]; diff --git a/resources/lang/de/admin/consumables/message.php b/resources/lang/de/admin/consumables/message.php index 67c116ff90..bed01f17f1 100644 --- a/resources/lang/de/admin/consumables/message.php +++ b/resources/lang/de/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Verbrauchsmaterial existiert nicht.', - 'create' => array( + 'create' => [ 'error' => 'Verbrauchsmaterial konnte nicht angelegt werden. Bitte versuchen Sie es erneut.', - 'success' => 'Verbrauchsmaterial erfolgreich angelegt.' - ), + 'success' => 'Verbrauchsmaterial erfolgreich angelegt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Verbrauchsmaterial konnte nicht aktualisiert werden. Bitte versuchen Sie es erneut', - 'success' => 'Verbrauchsmaterial erfolgreich aktualisiert.' - ), + 'success' => 'Verbrauchsmaterial erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie dieses Verbrauchsmaterial löschen möchten?', 'error' => 'Es gab Probleme beim Löschen des Verbrauchsmaterials. Bitte versuchen Sie es erneut.', - 'success' => 'Das Verbrauchsmaterial wurde erfolgreich gelöscht.' - ), + 'success' => 'Das Verbrauchsmaterial wurde erfolgreich gelöscht.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Das Verbrauchsmaterial wurde nicht herausgegeben. Bitte versuchen Sie es erneut', 'success' => 'Verbrauchsmaterial wurde erfolgreich herausgegeben.', - 'user_does_not_exist' => 'Der angegebene Benutzer ist ungültig. Bitte versuchen Sie es erneut.' - ), + 'user_does_not_exist' => 'Der angegebene Benutzer ist ungültig. Bitte versuchen Sie es erneut.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Das Verbrauchsmaterial konnte nicht zurückgenommen werden. Bitte versuchen Sie es erneut', 'success' => 'Verbrauchsmaterial wurde erfolgreich zurückgenommen.', - 'user_does_not_exist' => 'Der angegebene Benutzer existiert nicht. Bitte versuchen Sie es erneut.' - ) + 'user_does_not_exist' => 'Der angegebene Benutzer existiert nicht. Bitte versuchen Sie es erneut.', + ], - -); +]; diff --git a/resources/lang/de/admin/consumables/table.php b/resources/lang/de/admin/consumables/table.php index 57b001fe88..cb9df0d586 100644 --- a/resources/lang/de/admin/consumables/table.php +++ b/resources/lang/de/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Name des Verbrauchsmaterials', -); +]; diff --git a/resources/lang/de/admin/custom_fields/general.php b/resources/lang/de/admin/custom_fields/general.php index b1da418af7..831994a760 100644 --- a/resources/lang/de/admin/custom_fields/general.php +++ b/resources/lang/de/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Benutzerdefinierte Felder', 'field' => 'Feld', 'about_fieldsets_title' => 'Über Feldsätze', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Neues benutzerdefiniertes Feld', 'value_encrypted' => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen', 'show_in_email' => 'Feld miteinbeziehen bei Herausgabe-Emails an die Benutzer? Verschlüsselte Felder können nicht miteinbezogen werden.', -); +]; diff --git a/resources/lang/de/admin/custom_fields/message.php b/resources/lang/de/admin/custom_fields/message.php index d85086d6e0..b27ae3aa31 100644 --- a/resources/lang/de/admin/custom_fields/message.php +++ b/resources/lang/de/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Dieses Feld existiert nicht.', 'already_added' => 'Feld wurde bereits hinzugefügt', - 'create' => array( + 'create' => [ 'error' => 'Feld wurde nicht erstellt. Bitte versuchen Sie es erneut.', 'success' => 'Feld wurde erfolgreich erstellt.', - 'assoc_success' => 'Feld wurde erfolgreich zum Feldsatz hinzugefügt.' - ), + 'assoc_success' => 'Feld wurde erfolgreich zum Feldsatz hinzugefügt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feld wurde nicht aktualisiert. Bitte versuchen Sie es erneut', - 'success' => 'Feld wurde erfolgreich aktualisiert.' - ), + 'success' => 'Feld wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie dieses Feld löschen möchten?', 'error' => 'Beim Löschen des Felds ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'success' => 'Das Feld wurde erfolgreich gelöscht.', 'in_use' => 'Dieses Feld wird derzeit noch verwendet.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Feldsatz existiert nicht', - 'create' => array( + 'create' => [ 'error' => 'Feldsatz wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Feldsatz wurde erfolgreich erstellt.' - ), + 'success' => 'Feldsatz wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feldsatz wurde nicht aktualisiert. Bitte versuchen Sie es erneut.', - 'success' => 'Feldsatz wurde erfolgreich aktualisiert.' - ), + 'success' => 'Feldsatz wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diesen Feldsatz löschen möchten?', 'error' => 'Beim Löschen des Feldsatzes ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'success' => 'Der Feldsatz wurde erfolgreich gelöscht.', 'in_use' => 'Dieser Feldsatz wird derzeit noch verwendet.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/de/admin/departments/message.php b/resources/lang/de/admin/departments/message.php index 4148327419..7b22a8d480 100644 --- a/resources/lang/de/admin/departments/message.php +++ b/resources/lang/de/admin/departments/message.php @@ -1,21 +1,21 @@ 'Diese Abteilung existiert nicht.', 'assoc_users' => 'Diese Abteilung ist mindestens einem Benutzer zugewiesen und kann nicht gelöscht werden. Bitte entfernen Sie die Abteilungszuweisung bei den jeweiligen Benutzern und versuchen Sie es erneut diese Abteilung zu entfernen. ', - 'create' => array( + 'create' => [ 'error' => 'Abteilung wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Abteilung wurde erfolgreich erstellt.' - ), - 'update' => array( + 'success' => 'Abteilung wurde erfolgreich erstellt.', + ], + 'update' => [ 'error' => 'Abteilung wurde nicht aktualisiert. Bitte versuchen Sie es erneut', - 'success' => 'Abteilung wurde erfolgreich aktualisiert.' - ), - 'delete' => array( + 'success' => 'Abteilung wurde erfolgreich aktualisiert.', + ], + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Abteilung löschen möchten?', 'error' => 'Beim Löschen der Abteilung ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', - 'success' => 'Die Abteilung wurde erfolgreich gelöscht.' - ) + 'success' => 'Die Abteilung wurde erfolgreich gelöscht.', + ], -); +]; diff --git a/resources/lang/de/admin/departments/table.php b/resources/lang/de/admin/departments/table.php index d5dad4472e..469cb6a4d8 100644 --- a/resources/lang/de/admin/departments/table.php +++ b/resources/lang/de/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Name der Abteilung', @@ -8,4 +8,4 @@ return array( 'location' => 'Standort', 'create' => 'Abteilung erstellen', 'update' => 'Abteilung aktualisieren', - ); + ]; diff --git a/resources/lang/de/admin/depreciations/general.php b/resources/lang/de/admin/depreciations/general.php index a6aead1864..ed937636f2 100644 --- a/resources/lang/de/admin/depreciations/general.php +++ b/resources/lang/de/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Über Asset-Abschreibungen', 'about_depreciations' => 'Sie können Asset-Abschreibungen einrichten, um Assets linear abzuschreiben.', 'asset_depreciations' => 'Asset-Abschreibungen', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Anzahl der Monate', 'update' => 'Abschreibung aktualisieren', -); +]; diff --git a/resources/lang/de/admin/depreciations/message.php b/resources/lang/de/admin/depreciations/message.php index cbfa3d0f8b..3632aaa288 100644 --- a/resources/lang/de/admin/depreciations/message.php +++ b/resources/lang/de/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Die Abschreibungsklasse existiert nicht.', 'assoc_users' => 'Diese Abschreibung ist derzeit einem oder mehreren Modellen zugeordnet und kann nicht gelöscht werden. Bitte löschen Sie erst die Modelle und versuchen es dann erneut. ', - - 'create' => array( + 'create' => [ 'error' => 'Abschreibungsklasse wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Abschreibungsklasse wurde erfolgreich erstellt.' - ), + 'success' => 'Abschreibungsklasse wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Abschreibungsklasse wurde nicht aktualisiert. Bitte versuchen Sie es erneut', - 'success' => 'Abschreibungsklasse wurde erfolgreich aktualisiert.' - ), + 'success' => 'Abschreibungsklasse wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Abschreibungsklasse löschen wollen?', 'error' => 'Beim Löschen der Abschreibungsklasse ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.', - 'success' => 'Die Abschreibungsklasse wurde erfolgreich gelöscht.' - ) + 'success' => 'Die Abschreibungsklasse wurde erfolgreich gelöscht.', + ], -); +]; diff --git a/resources/lang/de/admin/depreciations/table.php b/resources/lang/de/admin/depreciations/table.php index aa54d08237..f1f7a9d174 100644 --- a/resources/lang/de/admin/depreciations/table.php +++ b/resources/lang/de/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Monate', 'term' => 'Laufzeit', 'title' => 'Name ', -); +]; diff --git a/resources/lang/de/admin/groups/message.php b/resources/lang/de/admin/groups/message.php index 45de4e6ac6..edc3a40809 100644 --- a/resources/lang/de/admin/groups/message.php +++ b/resources/lang/de/admin/groups/message.php @@ -1,22 +1,22 @@ 'Gruppe existiert bereits!', 'group_not_found' => 'Gruppe [: Id] existiert nicht.', 'group_name_required' => '"Name" darf nicht leer sein', - 'success' => array( + 'success' => [ 'create' => 'Die Gruppe wurde erfolgreich erstellt.', 'update' => 'Die Gruppe wurde erfolgreich geändert.', 'delete' => 'Die Gruppe wurde erfolgreich gelöscht.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie die Gruppe löschen wollen?', 'create' => 'Beim Erstellen der Gruppe ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'update' => 'Beim Aktualisieren der Gruppe ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'delete' => 'Beim Löschen der Gruppe ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', - ), + ], -); +]; diff --git a/resources/lang/de/admin/groups/table.php b/resources/lang/de/admin/groups/table.php index f856be365b..ed3458d67f 100644 --- a/resources/lang/de/admin/groups/table.php +++ b/resources/lang/de/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# von Benutzern', -); +]; diff --git a/resources/lang/de/admin/groups/titles.php b/resources/lang/de/admin/groups/titles.php index 1b824dff5e..bbe3907e50 100644 --- a/resources/lang/de/admin/groups/titles.php +++ b/resources/lang/de/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Über Gruppen', 'about_groups' => 'Gruppen werden verwendet, um die Benutzerberechtigungen zu verallgemeinern.', 'group_management' => 'Gruppenverwaltung', @@ -11,4 +11,4 @@ return array( 'allow' => 'Erlauben', 'deny' => 'Nicht erlauben', -); +]; diff --git a/resources/lang/de/admin/hardware/form.php b/resources/lang/de/admin/hardware/form.php index f21e117f9c..a8b8c29493 100644 --- a/resources/lang/de/admin/hardware/form.php +++ b/resources/lang/de/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Massenlöschung von Assets bestätigen', +return [ + 'bulk_delete' => 'Massenlöschung von Assets bestätigen', 'bulk_delete_help' => 'Überprüfen Sie die nachfolgenden Assets für die Massenlöschung. Sobald diese gelöscht sind, können diese zwar wiederhergestellt werden, sind aber dem aktuellen Nutzer nicht mehr zugeordnet.', 'bulk_delete_warn' => 'Sie sind im Begriff :asset_count Assets zu löschen.', - 'bulk_update' => 'Massenaktualisierung von Assets', - 'bulk_update_help' => 'Diese Eingabemaske erlaubt Ihnen die Aktualisierung von mehrere Assets zugleich. Füllen Sie die Felder aus welche Sie ändern möchten. Alle leeren Felder bleiben unverändert. ', - 'bulk_update_warn' => 'Sie sind dabei die Eigenschaften von :asset_count Assets zu bearbeiten.', + 'bulk_update' => 'Massenaktualisierung von Assets', + 'bulk_update_help' => 'Diese Eingabemaske erlaubt Ihnen die Aktualisierung von mehrere Assets zugleich. Füllen Sie die Felder aus welche Sie ändern möchten. Alle leeren Felder bleiben unverändert. ', + 'bulk_update_warn' => 'Sie sind dabei die Eigenschaften von :asset_count Assets zu bearbeiten.', 'checkedout_to' => 'Herausgegeben an', 'checkout_date' => 'Herausgabedatum', 'checkin_date' => 'Rücknahmedatum', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset ID', 'update' => 'Asset Update', 'warranty' => 'Garantie', - 'warranty_expires' => 'Garantie Ablaufdatum', + 'warranty_expires' => 'Garantie Ablaufdatum', 'years' => 'Jahre', -) -; +]; diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php index 0e1a40c904..44681ca954 100644 --- a/resources/lang/de/admin/hardware/general.php +++ b/resources/lang/de/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Über Assets', 'about_assets_text' => 'Assets sind Gegenstände die durch eine Seriennummer oder Bezeichnung identifiziert werden. Meistens sind diese von höherem Wert, wobei es Sinn macht diese spezifisch zu kennzeichnen.', - 'archived' => 'Archiviert', + 'archived' => 'Archiviert', 'asset' => 'Asset', 'bulk_checkout' => 'Assets herausgeben', 'checkin' => 'Asset zurücknehmen', @@ -19,4 +19,4 @@ return array( 'pending' => 'Ausstehend', 'undeployable' => 'Nicht einsetzbar', 'view' => 'Asset ansehen', -); +]; diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php index 53ee0f8600..91b9cf202f 100644 --- a/resources/lang/de/admin/hardware/message.php +++ b/resources/lang/de/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Achtung:Dieses Asset wurde kürzlich als nicht verteilbar markiert. Falls sich dieser Status verändert hat, aktualisieren Sie bitte den Asset Status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Netter Versuch. Dieses Asset existiert nicht oder ist nicht anforderbar.', 'assoc_users' => 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ', - 'create' => array( + 'create' => [ 'error' => 'Asset wurde nicht erstellt. Bitte versuchen Sie es erneut. :(', - 'success' => 'Asset wurde erfolgreich erstellt. :)' - ), + 'success' => 'Asset wurde erfolgreich erstellt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset wurde nicht aktualisiert. Bitte versuchen Sie es erneut', 'success' => 'Asset wurde erfolgreich aktualisiert.', 'nothing_updated' => 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset wurde nicht wiederhergestellt, bitte versuchen Sie es noch einmal', - 'success' => 'Asset erfolgreich wiederhergestellt.' - ), + 'success' => 'Asset erfolgreich wiederhergestellt.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset Audit war nicht erfolgreich. Bitte versuche es erneut.', - 'success' => 'Asset-Audit erfolgreich protokolliert.' - ), + 'success' => 'Asset-Audit erfolgreich protokolliert.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datei wurde nicht gelöscht. Bitte versuchen Sie es erneut.', 'success' => 'Datei erfolgreich gelöscht.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datei(en) wurde(n) nicht hochgeladen. Bitte versuchen Sie es erneut.', 'success' => 'Datei(en) erfolgreich hochgeladen.', 'nofiles' => 'Es wurde keine Datei zum Hochladen ausgewählt, oder die Datei ist zu groß', 'invalidfiles' => 'Eine oder mehrere Ihrer Dateien sind zu groß oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Einige Elemente wurden nicht korrekt importiert.', 'errorDetail' => 'Die folgenden Elemente wurden aufgrund von Fehlern nicht importiert.', - 'success' => "Ihre Datei wurde importiert", - 'file_delete_success' => "Die Datei wurde erfolgreich gelöscht", - 'file_delete_error' => "Die Datei konnte nicht gelöscht werden", - ), + 'success' => 'Ihre Datei wurde importiert', + 'file_delete_success' => 'Die Datei wurde erfolgreich gelöscht', + 'file_delete_error' => 'Die Datei konnte nicht gelöscht werden', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?', 'error' => 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'nothing_updated' => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts gelöscht.', - 'success' => 'Dieses Asset wurde erfolgreich entfernt.' - ), + 'success' => 'Dieses Asset wurde erfolgreich entfernt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut', 'success' => 'Asset wurde erfolgreich herausgegeben.', 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', 'not_available' => 'Dieses Asset kann nicht herausgegeben werden!', - 'no_assets_selected' => 'Mind. 1 Eintrag muss ausgewählt werden' - ), + 'no_assets_selected' => 'Mind. 1 Eintrag muss ausgewählt werden', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset konnte nicht zurückgenommen werden. Bitte versuchen Sie es erneut', 'success' => 'Asset wurde erfolgreich zurückgenommen.', 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', 'already_checked_in' => 'Dieses Asset ist bereits zurückgenommen.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Das Asset wurde nicht angefordert, bitte versuchen Sie es erneut', 'success' => 'Asset erfolgreich angefordert.', - 'canceled' => 'Herausgabe erfolgreich abgebrochen' - ) + 'canceled' => 'Herausgabe erfolgreich abgebrochen', + ], -); +]; diff --git a/resources/lang/de/admin/hardware/table.php b/resources/lang/de/admin/hardware/table.php index 5335395ea6..44b02e7bf9 100644 --- a/resources/lang/de/admin/hardware/table.php +++ b/resources/lang/de/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Modell', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Geräte-Bild', 'days_without_acceptance' => 'Tage ohne Akzeptierung', - 'monthly_depreciation' => 'Monatliche Abschreibung' + 'monthly_depreciation' => 'Monatliche Abschreibung', -); +]; diff --git a/resources/lang/de/admin/kits/general.php b/resources/lang/de/admin/kits/general.php index 8e617b249e..140c62f856 100644 --- a/resources/lang/de/admin/kits/general.php +++ b/resources/lang/de/admin/kits/general.php @@ -1,6 +1,6 @@ 'Über vordefinierte Kits', 'about_kits_text' => 'Mit vordefinierten Kits können Sie schnell eine Sammlung von Elementen (Assets, Lizenzen, etc.) an einen Benutzer ausgeben. Dies kann hilfreich sein, wenn Ihr Onboarding-Prozess über viele Nutzer hinweg einheitlich ist und alle Nutzer die gleichen Artikel erhalten.', 'checkout' => 'Kit herausgeben ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Es gibt nicht genügend verfügbare Einheiten von :consumable zum Herausgeben. :qty sind erforderlich. ', 'none_accessory' => 'Es gibt nicht genügend verfügbare Einheiten von :accessory zum Herausgeben. :qty werden benötigt. ', -); +]; diff --git a/resources/lang/de/admin/licenses/form.php b/resources/lang/de/admin/licenses/form.php index 49a5410dea..ecc98db914 100644 --- a/resources/lang/de/admin/licenses/form.php +++ b/resources/lang/de/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Zurücknehmen', @@ -18,5 +18,5 @@ return array( 'to_email' => 'E-Mail des Lizenzerwerbers', 'to_name' => 'Name des Lizenzerwerbers', 'update' => 'Lizenz aktualisieren', - 'checkout_help' => 'Du musst eine Lizenz an einen Gegenstand oder eine Person herausgeben. Du kannst beides auswählen, allerdings muss der Besitzer des Gegenstands mit der Person übereinstimmen an die du den Gegenstand herausgibst.' -); + 'checkout_help' => 'Du musst eine Lizenz an einen Gegenstand oder eine Person herausgeben. Du kannst beides auswählen, allerdings muss der Besitzer des Gegenstands mit der Person übereinstimmen an die du den Gegenstand herausgibst.', +]; diff --git a/resources/lang/de/admin/licenses/general.php b/resources/lang/de/admin/licenses/general.php index f3876cd869..43e0c3d1cf 100644 --- a/resources/lang/de/admin/licenses/general.php +++ b/resources/lang/de/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Über Lizenzen', 'about_licenses' => 'Lizenzen werden verwendet, um Software zu verfolgen. Sie haben eine bestimmte Anzahl von Plätzen, die an Einzelpersonen ausgegeben werden können', 'checkin' => 'Lizenzaktivierung zurücknehmen', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Lizenzen', 'user' => 'Nutzer', 'view' => 'Lizenz ansehen', -); +]; diff --git a/resources/lang/de/admin/licenses/message.php b/resources/lang/de/admin/licenses/message.php index 70ab9ca1a6..de254ca118 100644 --- a/resources/lang/de/admin/licenses/message.php +++ b/resources/lang/de/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Die Lizenz existiert nicht.', 'user_does_not_exist' => 'Benutzer existiert nicht.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Sie müssen ein Asset oder einen Benutzer auswählen, aber nicht beides.', 'not_found' => 'Lizenz nicht gefunden', - - 'create' => array( + 'create' => [ 'error' => 'Lizenz wurde nicht erstellt, bitte versuchen Sie es erneut.', - 'success' => 'Die Lizenz wurde erfolgreich erstellt.' - ), + 'success' => 'Die Lizenz wurde erfolgreich erstellt.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datei wurde nicht gelöscht. Bitte versuchen Sie es erneut.', 'success' => 'Datei erfolgreich gelöscht.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datei(en) wurden nicht hochgeladen. Bitte versuchen Sie es erneut.', 'success' => 'Datei(en) erfolgreich hochgeladen.', 'nofiles' => 'Sie haben keine Datei zum Hochladen ausgewählt oder die Datei, die Sie hochladen möchten, ist zu groß', 'invalidfiles' => 'Eine oder mehrere Ihrer Dateien sind zu groß oder ist ein Dateityp, der nicht zulässig ist. Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml und lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Die Lizenz wurde nicht aktualisiert, bitte versuchen Sie es erneut', - 'success' => 'Die Lizenz wurde erfolgreich aktualisiert.' - ), + 'success' => 'Die Lizenz wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Lizenz löschen wollen?', 'error' => 'Beim Löschen der Lizenz ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.', - 'success' => 'Die Lizenz wurde erfolgreich gelöscht.' - ), + 'success' => 'Die Lizenz wurde erfolgreich gelöscht.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Lizenz wurde nicht herausgegeben, bitte versuchen Sie es erneut.', - 'success' => 'Lizenz wurde erfolgreich herausgegeben' - ), + 'success' => 'Lizenz wurde erfolgreich herausgegeben', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Lizenz wurde nicht zurückgenommen, bitte versuchen Sie es erneut.', - 'success' => 'Die Lizenz wurde erfolgreich zurückgenommen' - ), + 'success' => 'Die Lizenz wurde erfolgreich zurückgenommen', + ], -); +]; diff --git a/resources/lang/de/admin/licenses/table.php b/resources/lang/de/admin/licenses/table.php index bd12760a6e..1c5025bf4e 100644 --- a/resources/lang/de/admin/licenses/table.php +++ b/resources/lang/de/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Zugewiesen an', 'checkout' => 'Zurücknehmen/Herausgeben', @@ -14,4 +14,4 @@ return array( 'serial' => 'Seriennummer', 'title' => 'Lizenz', -); +]; diff --git a/resources/lang/de/admin/locations/message.php b/resources/lang/de/admin/locations/message.php index 91c5182398..c88f77c729 100644 --- a/resources/lang/de/admin/locations/message.php +++ b/resources/lang/de/admin/locations/message.php @@ -1,27 +1,26 @@ 'Der Standort ist nicht vorhanden.', 'assoc_users' => 'Dieser Standort ist mindestens einem Benutzer zugewiesen und kann nicht gelöscht werden. Bitte entfernen Sie die Standortzuweisung bei den jeweiligen Benutzern und versuchen Sie es erneut diesen Standort zu entfernen. ', 'assoc_assets' => 'Dieser Standort ist mindestens einem Gegenstand zugewiesen und kann nicht gelöscht werden. Bitte entfernen Sie die Standortzuweisung bei den jeweiligen Gegenständen und versuchen Sie es erneut diesen Standort zu entfernen. ', 'assoc_child_loc' => 'Dieser Ort ist mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte Orte aktualisieren, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ', - - 'create' => array( + 'create' => [ 'error' => 'Standort wurde nicht erstellt, bitte versuchen Sie es erneut.', - 'success' => 'Standort erfolgreich erstellt.' - ), + 'success' => 'Standort erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Standort wurde nicht aktualisiert, bitte erneut versuchen', - 'success' => 'Standort erfolgreich aktualisiert.' - ), + 'success' => 'Standort erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Möchten Sie diesen Standort wirklich entfernen?', 'error' => 'Es gab einen Fehler beim Löschen des Standorts. Bitte erneut versuchen.', - 'success' => 'Der Standort wurde erfolgreich gelöscht.' - ) + 'success' => 'Der Standort wurde erfolgreich gelöscht.', + ], -); +]; diff --git a/resources/lang/de/admin/locations/table.php b/resources/lang/de/admin/locations/table.php index f7475b63a2..09a8fd1440 100644 --- a/resources/lang/de/admin/locations/table.php +++ b/resources/lang/de/admin/locations/table.php @@ -1,6 +1,6 @@ 'Über Standorte', 'about_locations' => 'Standorte werden verwendet, um Standortinformationen für Benutzer, Assets und andere Elemente zu verfolgen', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Übergeordneter Standort', 'currency' => 'Landeswährung', 'ldap_ou' => 'LDAP OU Suche', - ); + ]; diff --git a/resources/lang/de/admin/manufacturers/message.php b/resources/lang/de/admin/manufacturers/message.php index 16aa38f4ba..75a6e31dfa 100644 --- a/resources/lang/de/admin/manufacturers/message.php +++ b/resources/lang/de/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Hersteller existiert nicht.', 'assoc_users' => 'Dieser Hersteller ist bereits mit einem Model verknüpft und kann nicht gelöscht werden. Bitte trennen sie Ihre Modelle von diesem Hersteller und versuchen Sie es Erneut.', - 'create' => array( + 'create' => [ 'error' => 'Der Hersteller konnte nicht erstellt werden, bitte versuchen sie es erneut.', - 'success' => 'Der Hersteller wurde erfolgreich erstellt.' - ), + 'success' => 'Der Hersteller wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Der Hersteller konnte nicht aktualisiert werden, bitte versuchen sie es erneut', - 'success' => 'Der Hersteller wurde erfolgreich erstellt.' - ), + 'success' => 'Der Hersteller wurde erfolgreich erstellt.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Der Hersteller wurde nicht wiederhergestellt. Bitte versuchen Sie es erneut', - 'success' => 'Hersteller wurde erfolgreich wiederhergestellt.' - ), + 'success' => 'Hersteller wurde erfolgreich wiederhergestellt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind sie sicher, dass sie diesen Hersteller löschen wollen?', 'error' => 'Beim löschen des Herstellers ist ein Problem aufgetreten. Bitte versuchen sie es erneut.', - 'success' => 'Der Hersteller wurde erfolgreich gelöscht.' - ) + 'success' => 'Der Hersteller wurde erfolgreich gelöscht.', + ], -); +]; diff --git a/resources/lang/de/admin/manufacturers/table.php b/resources/lang/de/admin/manufacturers/table.php index 648c50cffe..6063c8b3e8 100644 --- a/resources/lang/de/admin/manufacturers/table.php +++ b/resources/lang/de/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Über Hersteller', 'about_manufacturers_text' => 'Hersteller sind Firmen, die ihre Assets herstellen. Hier können Sie wichtige Supportkontakte eintragen, welche in den Assetdetails angezeigt werden.', 'asset_manufacturers' => 'Asset Hersteller', @@ -13,4 +13,4 @@ return array( 'update' => 'Hersteller aktualisieren', 'url' => 'URL', -); +]; diff --git a/resources/lang/de/admin/models/general.php b/resources/lang/de/admin/models/general.php index a88f8630f9..6dfda51630 100644 --- a/resources/lang/de/admin/models/general.php +++ b/resources/lang/de/admin/models/general.php @@ -1,6 +1,6 @@ 'Über Asset-Modelle', 'about_models_text' => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.', 'deleted' => 'Dieses Modell wurde gelöscht.klicken Sie hier um es Wiederzuherstellen.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.', 'restore' => 'Modell wiederherstellen', 'requestable' => 'Benutzer können dieses Modell anfordern', - 'show_mac_address' => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell', + 'show_mac_address' => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell', 'view_deleted' => 'Gelöschte anzeigen', 'view_models' => 'Modelle anzeigen', 'fieldset' => 'Feldsatz', 'no_custom_field' => 'Keine benutzerdefinierten Felder', 'add_default_values' => 'Füge Standardwerte hinzu', -); +]; diff --git a/resources/lang/de/admin/models/message.php b/resources/lang/de/admin/models/message.php index 2c58b2bdbd..465a9d1466 100644 --- a/resources/lang/de/admin/models/message.php +++ b/resources/lang/de/admin/models/message.php @@ -1,42 +1,41 @@ 'Modell existiert nicht.', 'assoc_users' => 'Dieses Modell ist zur Zeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut das Modell zu löschen. ', - - 'create' => array( + 'create' => [ 'error' => 'Modell wurde nicht erstellt. Bitte versuch es noch einmal.', 'success' => 'Modell wurde erfolgreich erstellt.', 'duplicate_set' => 'Ein Asset-Modell mit diesem Namen, Hersteller und Modell Nummer existiert bereits.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modell wurde nicht aktualisiert. Bitte versuch es noch einmal', - 'success' => 'Modell wurde erfolgreich aktualisiert.' - ), + 'success' => 'Modell wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie dieses Asset-Modell löschen möchten?', 'error' => 'Beim Löschen des Modell ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.', - 'success' => 'Das Modell wurde erfolgreich gelöscht.' - ), + 'success' => 'Das Modell wurde erfolgreich gelöscht.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Das Modell konnte nicht Wiederhergestellt werden, bitte versuchen Sie es erneut', - 'success' => 'Das Modell wurde erfolgreich Wiederhergestellt.' - ), + 'success' => 'Das Modell wurde erfolgreich Wiederhergestellt.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.', - 'success' => 'Modelle aktualisiert.' - ), + 'success' => 'Modelle aktualisiert.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Es wurden keine Modelle ausgewählt. Somit wurde auch nichts gelöscht.', 'success' => ':success_count Modell(e) gelöscht!', - 'success_partial' => ':success_count Modell(e) wurden gelöscht. Jedochen konnten :fail_count nicht gelöscht werden, da ihnen noch Assets zugeordnet sind.' - ), + 'success_partial' => ':success_count Modell(e) wurden gelöscht. Jedochen konnten :fail_count nicht gelöscht werden, da ihnen noch Assets zugeordnet sind.', + ], -); +]; diff --git a/resources/lang/de/admin/models/table.php b/resources/lang/de/admin/models/table.php index ebf8e7c636..27c89355dc 100644 --- a/resources/lang/de/admin/models/table.php +++ b/resources/lang/de/admin/models/table.php @@ -1,6 +1,6 @@ 'Asset-Modell erstellen', 'created_at' => 'Erstellt am', @@ -14,4 +14,4 @@ return array( 'update' => 'Asset Modell aktualisieren', 'clone' => 'Modell duplizieren', 'edit' => 'Modell bearbeiten', -); +]; diff --git a/resources/lang/de/admin/reports/general.php b/resources/lang/de/admin/reports/general.php index 09a4987b6e..bae4e5cd66 100644 --- a/resources/lang/de/admin/reports/general.php +++ b/resources/lang/de/admin/reports/general.php @@ -1,5 +1,5 @@ 'Wähle eine Option für deinen Asset Bericht.' -); +return [ + 'info' => 'Wähle eine Option für deinen Asset Bericht.', +]; diff --git a/resources/lang/de/admin/reports/message.php b/resources/lang/de/admin/reports/message.php index 55e5d295f4..951250399e 100644 --- a/resources/lang/de/admin/reports/message.php +++ b/resources/lang/de/admin/reports/message.php @@ -1,5 +1,5 @@ 'Sie müssen mindestens eine Option auswählen.' -); +return [ + 'error' => 'Sie müssen mindestens eine Option auswählen.', +]; diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php index 1c1cf00c2c..93f833d1f7 100644 --- a/resources/lang/de/admin/settings/general.php +++ b/resources/lang/de/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory Domäne', 'ad_domain_help' => 'Meistens dieselbe wie die E-Mail Domäne.', 'ad_append_domain_label' => 'Domänenname anhängen', 'ad_append_domain' => 'Domänenname an das Feld Benutzername anhängen', - 'ad_append_domain_help' => 'Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.' , + 'ad_append_domain_help' => 'Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'Wenn Sie eine Kopie der Rücknahme- / Herausgabe-E-Mails, die an Benutzer gehen auch an zusätzliche E-Mail-Empfänger versenden möchten, geben Sie sie hier ein. Ansonsten lassen Sie dieses Feld leer.', 'is_ad' => 'Dies ist ein Active Directory Server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ablauf Alarmschwelle (in Tagen)', 'alert_inv_threshold' => 'Inventar Alarmschwelle', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Auditintervall', 'audit_interval_help' => 'Wenn Sie Ihre Assets regelmäßig physisch überprüfen müssen, geben Sie das Intervall in Monaten ein.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Zwei-Faktor Code eingeben', 'two_factor_config_complete' => 'Code absenden', 'two_factor_enabled_edit_not_allowed' => 'Der Administrator erlaubt nicht, diese Einstellung zu ändern.', - 'two_factor_enrollment_text' => "Zwei-Faktor-Authentifizierung ist erforderlich, Ihr Gerät wurde jedoch noch nicht hinzugefügt. Öffnen Sie die Google Authenticator App und scannen Sie den QR-Code unterhalb um Ihr Gerät hinzuzufügen. Geben Sie anschließend den Code ein", + 'two_factor_enrollment_text' => 'Zwei-Faktor-Authentifizierung ist erforderlich, Ihr Gerät wurde jedoch noch nicht hinzugefügt. Öffnen Sie die Google Authenticator App und scannen Sie den QR-Code unterhalb um Ihr Gerät hinzuzufügen. Geben Sie anschließend den Code ein', 'require_accept_signature' => 'Signatur erforderlich', 'require_accept_signature_help_text' => 'Wenn aktiviert, wird eine physische Unterschrift durch den Benutzer notwendig, der das Asset erhält.', 'left' => 'links', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Wenn dieses Kontrollkästchen aktiviert wird, müssen Seriennummern von Assets eindeutig sein', 'zerofill_count' => 'Länge der Asset Tags, inklusive zerofill', 'username_format_help' => 'Diese Einstellung wird nur beim Import benutzt, wenn kein Benutzername angegeben wurde und ein Benutzername generiert werden muss.', -); +]; diff --git a/resources/lang/de/admin/settings/message.php b/resources/lang/de/admin/settings/message.php index 177e3185e4..46f92c1f8b 100644 --- a/resources/lang/de/admin/settings/message.php +++ b/resources/lang/de/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Während der Aktualisierung ist ein Fehler aufgetreten. ', - 'success' => 'Die Einstellungen wurden erfolgreich aktualisiert.' - ), - 'backup' => array( + 'success' => 'Die Einstellungen wurden erfolgreich aktualisiert.', + ], + 'backup' => [ 'delete_confirm' => 'Backup Datei wirklich löschen? Aktion kann nicht rückgängig gemacht werden. ', 'file_deleted' => 'Backup Datei erfolgreich gelöscht. ', 'generated' => 'Backup Datei erfolgreich erstellt.', 'file_not_found' => 'Backup Datei konnte nicht gefunden werden.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Beim Bereinigen ist ein Fehler augetreten. ', 'validation_failed' => 'Falsche Bereinigungsbestätigung. Bitte geben Sie das Wort "DELETE" im Bestätigungsfeld ein.', - 'success' => 'Gelöschte Einträge erfolgreich bereinigt.' - ), + 'success' => 'Gelöschte Einträge erfolgreich bereinigt.', + ], -); +]; diff --git a/resources/lang/de/admin/statuslabels/message.php b/resources/lang/de/admin/statuslabels/message.php index 4b884ac12a..1c0e12355f 100644 --- a/resources/lang/de/admin/statuslabels/message.php +++ b/resources/lang/de/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Diese Statusbezeichnung existiert nicht.', 'assoc_assets' => 'Auf diese Statusbezeichnung bezieht sich momentan mindestens ein Asset und kann daher nicht gelöscht werden. Bitte sorgen Sie dafür, dass sich kein Asset mehr auf diese Statusbezeichnung bezieht und versuchen Sie es erneut. ', - - 'create' => array( + 'create' => [ 'error' => 'Statusbezeichnung wurde nicht erstellt. Bitte versuchen Sie es erneut.', - 'success' => 'Statusbezeichnung wurde erfolgreich erstellt.' - ), + 'success' => 'Statusbezeichnung wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statusbezeichnung wurde nicht aktualisiert. Bitte versuchen Sie es erneut.', - 'success' => 'Statusbezeichnung wurde erfolgreich aktualisiert.' - ), + 'success' => 'Statusbezeichnung wurde erfolgreich aktualisiert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diese Statusbezeichnung löschen wollen?', 'error' => 'Es trat ein Fehler beim Löschen der Statusbezeichnung auf. Bitte versuchen Sie es erneut.', - 'success' => 'Die Statusbezeichnung wurde erfolgreich gelöscht.' - ), + 'success' => 'Die Statusbezeichnung wurde erfolgreich gelöscht.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Diese Assets können niemandem zugeordnet werden.', 'deployable' => 'Diese Vermögenswerte können ausgecheckt werden. Sobald sie zugewiesen sind, werden sie einen Meta-Status von Deployed annehmen.', 'archived' => 'Diese Assets können nicht ausgecheckt werden und erscheinen nur in der Ansicht "Archiviert". Dies ist nützlich, um Informationen zu Assets für Budgetierungs- / historische Zwecke beizubehalten, aber sie aus der täglichen Assetliste herauszuhalten.', 'pending' => 'Diese Vermögenswerte können noch niemandem zugewiesen werden, die oft für Gegenstände verwendet werden, die nicht repariert werden können, aber voraussichtlich in den Kreislauf zurückkehren werden.', - ), + ], -); +]; diff --git a/resources/lang/de/admin/statuslabels/table.php b/resources/lang/de/admin/statuslabels/table.php index 3a0b7df319..2dd8984506 100644 --- a/resources/lang/de/admin/statuslabels/table.php +++ b/resources/lang/de/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Info Statusbezeichnung', 'archived' => 'Archiviert', 'create' => 'Statusbezeichnung erstellen', @@ -16,4 +16,4 @@ return array( 'title' => 'Statusbezeichnungen', 'undeployable' => 'Nicht einsetzbar', 'update' => 'Statusbezeichnung bearbeiten', -); +]; diff --git a/resources/lang/de/admin/suppliers/message.php b/resources/lang/de/admin/suppliers/message.php index e4342c1deb..ea40eb8e97 100644 --- a/resources/lang/de/admin/suppliers/message.php +++ b/resources/lang/de/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Lieferant ist nicht vorhanden.', - - 'create' => array( + 'create' => [ 'error' => 'Lieferant wurde nicht erstellt, bitte versuchen Sie es erneut.', - 'success' => 'Lieferant wurde erfolgreich erstellt.' - ), + 'success' => 'Lieferant wurde erfolgreich erstellt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lieferant wurde nicht bearbeitet, bitte versuchen Sie es erneut', - 'success' => 'Lieferant wurde erfolgreich bearbeitet.' - ), + 'success' => 'Lieferant wurde erfolgreich bearbeitet.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sind Sie sicher, dass Sie diesen Lieferanten löschen möchten?', 'error' => 'Beim löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'success' => 'Lieferant wurde erfolgreich gelöscht.', 'assoc_assets' => 'Dieser Lieferant ist derzeit :asset_count Asset(s) zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Assets so, dass sie nicht mehr auf diesen Lieferant verweisen und versuchen Sie es erneut. ', 'assoc_licenses' => 'Dieser Lieferant ist derzeit mit :licenses_count Lizenze(n) verknüpft und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Lizenzen so, dass sie nicht mehr auf diesen Lieferant verweisen und versuchen Sie es erneut. ', 'assoc_maintenances' => 'Diese Lieferant ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diesen Lieferant zu verweisen und versuchen Sie es erneut. ', - ) + ], -); +]; diff --git a/resources/lang/de/admin/suppliers/table.php b/resources/lang/de/admin/suppliers/table.php index fb275f9d90..af6839bcdf 100644 --- a/resources/lang/de/admin/suppliers/table.php +++ b/resources/lang/de/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Lieferanten', 'about_suppliers_text' => 'Lieferanten werden verwendet, um die Herkunft der Artikel verfolgen', 'address' => 'Lieferantenadressen', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Assets anschauen von', 'zip' => 'Postleitzahl', -); +]; diff --git a/resources/lang/de/admin/users/general.php b/resources/lang/de/admin/users/general.php index fe67e610b3..5f9045ec3a 100644 --- a/resources/lang/de/admin/users/general.php +++ b/resources/lang/de/admin/users/general.php @@ -1,7 +1,6 @@ 'Der Nutzer kann sich einloggen', 'activated_disabled_help_text' => 'Sie können den Aktiverungsstatus für Ihren eigenen Account nicht ändern.', 'assets_user' => 'Assets zugewiesen an :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Benutzer bearbeiten', 'filetype_info' => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, und rar.', 'history_user' => 'Historie von :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klicken Sie hier, um sie wiederherzustellen.', 'last_login' => 'Letzte Anmeldung', 'ldap_config_text' => 'Die LDAP Konfigurations Einstellungen finden Sie hier Admin -> Einstellungen. Der (optional) wählbare Standort wird für alle importierten Benutzer gesetzt.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der zwei-Faktor-Authentifizierung. ', 'two_factor_enrolled' => '2FA Gerät eingeschrieben ', 'two_factor_active' => '2FA aktiv ', - ); + ]; diff --git a/resources/lang/de/admin/users/message.php b/resources/lang/de/admin/users/message.php index 2a87c36b82..cb6001d571 100644 --- a/resources/lang/de/admin/users/message.php +++ b/resources/lang/de/admin/users/message.php @@ -1,6 +1,6 @@ 'Sie haben diesen Gegenstand erfolgreich angenommen.', 'declined' => 'Sie haben diesen Gegenstand abgelehnt.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP Integration wurde für diese Installation nicht konfiguriert.', 'password_resets_sent' => 'Den ausgewählten Benutzern, die aktiviert sind und eine gültige E-Mail-Adresse haben, wurde ein Link zum Zurücksetzen des Passworts gesendet.', - - 'success' => array( + 'success' => [ 'create' => 'Benutzer wurde erfolgreich erstellt.', 'update' => 'Benutzer wurde erfolgreich bearbeitet.', 'update_bulk' => 'Benutzer erfolgreich geändert!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Der Benutzer wurde erfolgreich reaktiviert.', 'restored' => 'Benutzer wurde erfolgreich wiederhergestellt.', 'import' => 'Benutzer erfolgreich Importiert.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.', 'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.', 'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:', 'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:', 'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktieren Sie Ihre IT-Abteilung, um Ihr Passwort zu ändern. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datei nicht gelöscht. Bitte versuchen Sie es nochmals.', 'success' => 'Datei erfolgreich gelöscht.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datei(en) wurden nicht erfolgreich hochgeladen. Bitte versuchen Sie es nochmals.', 'success' => 'Datei(en) wurden erfolgreich hochgeladen.', 'nofiles' => 'Sie haben keine Dateien zum Hochladen ausgewählt.', 'invalidfiles' => 'Eine oder mehrere Ihrer Dateien ist zu groß oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.', - ), + ], -); +]; diff --git a/resources/lang/de/admin/users/table.php b/resources/lang/de/admin/users/table.php index 23555dea2e..8e3f0718f3 100644 --- a/resources/lang/de/admin/users/table.php +++ b/resources/lang/de/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Erlauben', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Zeige aktuelle Benutzer', 'show_deleted' => 'Zeige gelöschte Benutzer', 'title' => 'Titel', - 'to_restore_them' => 'zum Wiederherstellen.', + 'to_restore_them' => 'zum Wiederherstellen.', 'updateuser' => 'Benutzer aktualisieren', 'username' => 'Benutzername', - 'user_deleted_text' => 'Dieser Benutzer wurde als gelöscht markiert.', + 'user_deleted_text' => 'Dieser Benutzer wurde als gelöscht markiert.', 'username_note' => '(Dies wird für den Bind an das Active Directory benutzt, nicht für die Anmeldung.)', 'cloneuser' => 'Benutzer kopieren', 'viewusers' => 'Benutzer anzeigen', -); +]; diff --git a/resources/lang/de/auth/general.php b/resources/lang/de/auth/general.php index 7b8ba3dd71..68f35c3512 100644 --- a/resources/lang/de/auth/general.php +++ b/resources/lang/de/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Benutzernamen eingeben, um einen Link zum Zurücksetzen des Passwortes per E-Mail zu erhalten.', 'username_help_bottom' => 'Abhängig von der Konfiguration, kann der Benutzername identisch mit ihrer E-Mailadresse sein. Falls Sie ihren Benutzernamen vergessen haben, kontaktieren Sie ihren Administrator.

Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes. ', ]; - diff --git a/resources/lang/de/auth/message.php b/resources/lang/de/auth/message.php index 7644588275..993c0bc4b5 100644 --- a/resources/lang/de/auth/message.php +++ b/resources/lang/de/auth/message.php @@ -1,6 +1,6 @@ 'Ein Konto mit dieser Email-Adresse existiert bereits.', 'account_not_found' => 'Benutzername oder Passwort sind nicht korrekt.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Dieses Benutzerkonto wurde ausgeschlossen.', 'throttle' => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuchen Sie es in :minutes Minuten erneut.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Ihr Gerät ist bereits eingeschrieben.', 'success' => 'Sie haben sich erfolgreich eingeloggt.', 'code_required' => 'Zwei-Faktor-Code ist erforderlich.', 'invalid_code' => 'Zwei-Faktor-Code ist ungültig.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Bei der Anmeldung ist ein Problem aufgetreten, bitte versuchen Sie es erneut.', 'success' => 'Sie haben sich erfolgreich eingeloggt.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Beim Ausloggen ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.', 'success' => 'Sie haben sich erfolgreich abgemeldet.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Bei der Erstellung Ihres Kontos ist ein Problem aufgetreten, bitte versuchen Sie es erneut.', 'success' => 'Die Erstellung des Kontos war erfolgreich.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Beim abrufen des Codes zur Passwortzurücksetzung ist ein Fehler aufgetreten, bitte versuchen sie es erneut.', 'success' => 'Wenn diese E-Mail-Adresse in unserem System existiert, wurde eine E-Mail zum Wiederherstellen des Passworts gesendet.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Beim zurücksetzen Ihres Passworts ist ein Fehler aufgetreten, bitte versuchen sie es erneut.', 'success' => 'Ihr Passwort wurde erfolgreich zurückgesetzt.', - ), + ], - -); +]; diff --git a/resources/lang/de/button.php b/resources/lang/de/button.php index 88e31e9f90..e5cec543a7 100644 --- a/resources/lang/de/button.php +++ b/resources/lang/de/button.php @@ -1,6 +1,6 @@ 'Aktionen', 'add' => 'Hinzufügen', 'cancel' => 'Abbrechen', @@ -11,7 +11,7 @@ return array( 'request' => 'Anfragen', 'submit' => 'Abschicken', 'upload' => 'Hochladen', - 'select_file' => 'Datei auswählen...', + 'select_file' => 'Datei auswählen...', 'select_files' => 'Dateien auswählen...', 'generate_labels' => '{1} Label generieren|[2,*] Labels generieren', -); +]; diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php index 34290c88de..7fc9da1b88 100644 --- a/resources/lang/de/general.php +++ b/resources/lang/de/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Rücknahmen', 'user_requests_count' => 'Anfragen', 'city' => 'Stadt', - 'click_here' => 'Hier klicken', + 'click_here' => 'Hier klicken', 'clear_selection' => 'Auswahl löschen', 'companies' => 'Firmen', 'company' => 'Firma', 'component' => 'Komponente', 'components' => 'Komponenten', - 'complete' => 'Vollständig', + 'complete' => 'Vollständig', 'consumable' => 'Verbrauchsmaterial', 'consumables' => 'Verbrauchsmaterialien', 'country' => 'Land', diff --git a/resources/lang/de/help.php b/resources/lang/de/help.php index 720901afcc..7917ea94ed 100644 --- a/resources/lang/de/help.php +++ b/resources/lang/de/help.php @@ -1,6 +1,6 @@ "Mehr Informationen", + 'more_info_title' => 'Mehr Informationen', - "audit_help" => "Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird nur der Ort im Audit-Log angezeigt.

Falls das Asset ausgecheckt ist, ändert sich nicht die Position der Person, des Assets oder der Position, an der es ausgecheckt wird.", + 'audit_help' => 'Mit dem aktivieren dieser Option wird der Asset-Datensatz an diesen neuen Ort angepasst. Wenn diese Option nicht aktiviert wird, wird nur der Ort im Audit-Log angezeigt.

Falls das Asset ausgecheckt ist, ändert sich nicht die Position der Person, des Assets oder der Position, an der es ausgecheckt wird.', 'assets' => 'Assets sind Elemente, die mit Seriennummer oder einem Asset-Tag versehen sind. Sie sind meist höhere Werte, bei denen die Identifizierung eines bestimmten Gegenstands von Bedeutung ist.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Sie können Asset-Abschreibungen einrichten, um Assets linear abzuschreiben.', - - -); +]; diff --git a/resources/lang/de/mail.php b/resources/lang/de/mail.php index 6d2aa652ff..ecfda9e08f 100644 --- a/resources/lang/de/mail.php +++ b/resources/lang/de/mail.php @@ -1,6 +1,6 @@ 'Eine Geräte-Anfrage auf der Webseite wurde vom Benutzer abgebrochen', 'a_user_requested' => 'Ein Benutzer hat ein Gerät auf der Webseite angefordert', 'accessory_name' => 'Zubehör Name:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Bericht über erwartete Asset Rückgaben', 'Expected_Checkin_Notification' => 'Erinnerung: :name Rückgabedatum nähert sich', 'Expected_Checkin_Date' => 'Ihr ausgebuchtes Asset ist fällig zur Rückgabe am :date', - 'your_assets' => 'Ihre Assets anzeigen' -); + 'your_assets' => 'Ihre Assets anzeigen', +]; diff --git a/resources/lang/de/pagination.php b/resources/lang/de/pagination.php index dd9049034f..aba8621c7d 100644 --- a/resources/lang/de/pagination.php +++ b/resources/lang/de/pagination.php @@ -1,6 +1,6 @@ 'Vor »', -); +]; diff --git a/resources/lang/de/passwords.php b/resources/lang/de/passwords.php index 85ae522d0d..4aa8bee550 100644 --- a/resources/lang/de/passwords.php +++ b/resources/lang/de/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Ihr Link wurde verschickt!', 'user' => 'Kein passender aktiver Nutzer mit dieser E-Mail gefunden.', ]; - diff --git a/resources/lang/de/reminders.php b/resources/lang/de/reminders.php index 42a628f958..5527e10990 100644 --- a/resources/lang/de/reminders.php +++ b/resources/lang/de/reminders.php @@ -1,6 +1,6 @@ "Das Passwort muss Sechs Zeichen haben und übereinstimmen.", + 'password' => 'Das Passwort muss Sechs Zeichen haben und übereinstimmen.', - "user" => "Benutzername oder Email-Adresse sind falsch", + 'user' => 'Benutzername oder Email-Adresse sind falsch', - "token" => "Das Token um das Passwort zurückzusetzen ist ungültig.", + 'token' => 'Das Token um das Passwort zurückzusetzen ist ungültig.', - "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!", + 'sent' => 'Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!', -); +]; diff --git a/resources/lang/de/table.php b/resources/lang/de/table.php index 9203ca8c68..151e94e6f9 100644 --- a/resources/lang/de/table.php +++ b/resources/lang/de/table.php @@ -1,10 +1,10 @@ 'Aktionen', 'action' => 'Aktion', 'by' => 'Von', 'item' => 'Gegenstand', -); +]; diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index 5d2021a70c..7b5fbca1e3 100644 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -1,6 +1,6 @@ ':attribute schon benutzt.', 'uploaded' => ':attribute konnte nicht hochgeladen werden.', 'url' => ':attribute Format ist ungültig.', - "unique_undeleted" => "Die Variable :attribute muss eindeutig sein.", + 'unique_undeleted' => 'Die Variable :attribute muss eindeutig sein.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Das :attribute Feld enthält ein nicht erlaubtes Zeichen.", - "email_array" => "Eine oder mehrere Email Adressen sind ungültig.", - "hashed_pass" => "Ihr derzeitiges Passwort ist nicht korrekt", + 'alpha_space' => 'Das :attribute Feld enthält ein nicht erlaubtes Zeichen.', + 'email_array' => 'Eine oder mehrere Email Adressen sind ungültig.', + 'hashed_pass' => 'Ihr derzeitiges Passwort ist nicht korrekt', 'dumbpwd' => 'Das Passwort ist zu gebräuchlich.', - "statuslabel_type" => "Sie müssen einen gültigen Statuslabel-Typ auswählen", + 'statuslabel_type' => 'Sie müssen einen gültigen Statuslabel-Typ auswählen', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/el/admin/accessories/general.php b/resources/lang/el/admin/accessories/general.php index bd09f65ab5..a55bc4da20 100644 --- a/resources/lang/el/admin/accessories/general.php +++ b/resources/lang/el/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Κατηγορία αξεσουάρ', 'accessory_name' => 'Όνομα ανταλλακτικού', 'checkout' => 'Checkout αξεσουάρ', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Χρησιμοποιήστε την προεπιλεγμένη primary EULA.', 'use_default_eula_disabled' => 'Χρησιμοποιήστε την κύρια προεπιλεγμένη EULA instead. καμία κύρια προεπιλεγμένη άδεια χρήσης τελικού χρήστη δεν έχει οριστεί. Παρακαλείσθε να προσθέσετε μία στις ρυθμίσεις.', -); +]; diff --git a/resources/lang/el/admin/accessories/message.php b/resources/lang/el/admin/accessories/message.php index f1b6cf4485..da5354d803 100644 --- a/resources/lang/el/admin/accessories/message.php +++ b/resources/lang/el/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Το εξάρτημα δεν υπάρχει.', 'assoc_users' => 'Αυτό το εξάρτημα διαθέτει: τα στοιχεία καταμέτρησης που ελέγχθηκαν στους χρήστες. Ελέγξτε τα εξαρτήματα και δοκιμάστε ξανά.', - 'create' => array( + 'create' => [ 'error' => 'Το εξάρτημα δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.', - 'success' => 'Το εξάρτημα δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Το εξάρτημα δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Το εξάρτημα δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Το εξάρτημα ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Το εξάρτημα ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το εξάρτημα;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας το αξεσουάρ. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Το εξάρτημα διαγράφηκε με επιτυχία.' - ), + 'success' => 'Το εξάρτημα διαγράφηκε με επιτυχία.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Το αξεσουάρ δεν έχει ελεγχθεί, δοκιμάστε ξανά', 'success' => 'Το αξεσουάρ ολοκληρώθηκε με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.' - ), + 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Το αξεσουάρ δεν έχει συνδεθεί, δοκιμάστε ξανά', 'success' => 'Το αξεσουάρ ολοκληρώθηκε με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.' - ) + 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.', + ], - -); +]; diff --git a/resources/lang/el/admin/accessories/table.php b/resources/lang/el/admin/accessories/table.php index 75595b87ff..bf1444b1cf 100644 --- a/resources/lang/el/admin/accessories/table.php +++ b/resources/lang/el/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Κατεβάστε το CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Κατεβάστε το CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Αποδοχή', 'title' => 'Όνομα ανταλλακτικού', - -); +]; diff --git a/resources/lang/el/admin/asset_maintenances/form.php b/resources/lang/el/admin/asset_maintenances/form.php index c26efc1ddd..454de4bea3 100644 --- a/resources/lang/el/admin/asset_maintenances/form.php +++ b/resources/lang/el/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Ημέρες', 'notes' => 'Σημειώσεις', 'update' => 'Ενημέρωση', - 'create' => 'Δημιουργία' + 'create' => 'Δημιουργία', ]; diff --git a/resources/lang/el/admin/asset_maintenances/message.php b/resources/lang/el/admin/asset_maintenances/message.php index 4f3ba225be..e9f2973f0f 100644 --- a/resources/lang/el/admin/asset_maintenances/message.php +++ b/resources/lang/el/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη συντήρηση παγίου;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας την συντήρηση παγίου. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η συντήρηση παγίου διαγράφηκε με επιτυχία.' + 'success' => 'Η συντήρηση παγίου διαγράφηκε με επιτυχία.', ], 'create' => [ 'error' => 'Η συντήρηση του παγίου δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.', - 'success' => 'Επιτυχής δημιουργία συντήρησης παγίου.' + 'success' => 'Επιτυχής δημιουργία συντήρησης παγίου.', ], 'edit' => [ 'error' => 'Η συντήρηση του ενεργητικού δεν έχει επεξεργαστεί, δοκιμάστε ξανά.', - 'success' => 'Η συντήρηση του ενεργητικού έγινε με επιτυχία.' + 'success' => 'Η συντήρηση του ενεργητικού έγινε με επιτυχία.', ], 'asset_maintenance_incomplete' => 'Δεν ολοκληρώθηκε ακόμη', 'warranty' => 'Εγγύηση', 'not_warranty' => 'Δεν υπάρχει εγγύηση', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/el/admin/asset_maintenances/table.php b/resources/lang/el/admin/asset_maintenances/table.php index f61b201893..da7a65c252 100644 --- a/resources/lang/el/admin/asset_maintenances/table.php +++ b/resources/lang/el/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Συντήρηση Παγίου', 'asset_name' => 'Όνομα του περιουσιακού στοιχείου', 'is_warranty' => 'Εγγύηση', - 'dl_csv' => 'Κατεβάστε το CSV' + 'dl_csv' => 'Κατεβάστε το CSV', ]; diff --git a/resources/lang/el/admin/categories/general.php b/resources/lang/el/admin/categories/general.php index b6780e9e4d..6dbf0c7196 100644 --- a/resources/lang/el/admin/categories/general.php +++ b/resources/lang/el/admin/categories/general.php @@ -1,6 +1,6 @@ 'Κατηγορίες στοιχείων παγίων', 'category_name' => 'Όνομα κατηγορίας', 'checkin_email' => 'Αποστολή email στον χρήστη κατά την χρέωση/αποδέσμευση.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Χρησιμοποιήστε την προεπιλεγμένη primary EULA.', 'use_default_eula_disabled' => 'Χρησιμοποιήστε την αρχική προεπιλεγμένη άδεια EULA αντί. Δεν έχει οριστεί αρχική προεπιλεγμένη ευχέρεια EULA. Προσθέστε μία από τις Ρυθμίσεις.', -); +]; diff --git a/resources/lang/el/admin/categories/message.php b/resources/lang/el/admin/categories/message.php index bede79ccd9..81be4afe15 100644 --- a/resources/lang/el/admin/categories/message.php +++ b/resources/lang/el/admin/categories/message.php @@ -1,25 +1,25 @@ 'Κατηγορία δεν υπάρχει.', 'assoc_models' => 'Αυτή η κατηγορία συσχετίζεται επί του παρόντος με τουλάχιστον ένα μοντέλο και δεν μπορεί να διαγραφεί. Ενημερώστε τα μοντέλα σας ώστε να μην αναφέρονται πλέον στην κατηγορία αυτή και δοκιμάστε ξανά.', 'assoc_items' => 'Αυτή η κατηγορία συσχετίζεται προς το παρόν με τουλάχιστον ένα: asset_type και δεν μπορεί να διαγραφεί. Ενημερώστε το στοιχείο: asset_type ώστε να μην αναφέρεται πλέον αυτή η κατηγορία και δοκιμάστε ξανά.', - 'create' => array( + 'create' => [ 'error' => 'Η κατηγορία δεν δημιουργήθηκε, παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η κατηγορία δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Η κατηγορία δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Η κατηγορία δεν ενημερώθηκε, παρακαλώ δοκιμάστε ξανά', - 'success' => 'Η κατηγορία ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Η κατηγορία ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την κατηγορία;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας αυτή την κατηγορία. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η κατηγορία διαγράφηκε με επιτυχία.' - ) + 'success' => 'Η κατηγορία διαγράφηκε με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/categories/table.php b/resources/lang/el/admin/categories/table.php index 4fd0d2d2f8..7d19d7633e 100644 --- a/resources/lang/el/admin/categories/table.php +++ b/resources/lang/el/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Γονικός', 'require_acceptance' => 'Αποδοχή', 'title' => 'Ονομασία Κατηγορίας Παγίων', -); +]; diff --git a/resources/lang/el/admin/companies/general.php b/resources/lang/el/admin/companies/general.php index 04ec3db4e2..1449010aed 100644 --- a/resources/lang/el/admin/companies/general.php +++ b/resources/lang/el/admin/companies/general.php @@ -1,4 +1,5 @@ 'Επιλογή εταιρείας', ]; diff --git a/resources/lang/el/admin/companies/message.php b/resources/lang/el/admin/companies/message.php index fd28b50ca1..deaa94e81a 100644 --- a/resources/lang/el/admin/companies/message.php +++ b/resources/lang/el/admin/companies/message.php @@ -1,18 +1,19 @@ 'Αυτή η εταιρεία δεν υπάρχει.', 'assoc_users' => 'Αυτή η εταιρεία συσχετίζεται προς το παρόν με τουλάχιστον ένα μοντέλο και δεν μπορεί να διαγραφεί. Ενημερώστε τα μοντέλα σας ώστε να μην αναφέρονται πλέον στην εν λόγω εταιρεία και δοκιμάστε ξανά.', - 'create' => array( + 'create' => [ 'error' => 'Η εταιρεία δεν δημιουργήθηκε, παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η εταιρεία δημιουργήθηκε με επιτυχία.' - ), - 'update' => array( + 'success' => 'Η εταιρεία δημιουργήθηκε με επιτυχία.', + ], + 'update' => [ 'error' => 'Η εταιρεία δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Η εταιρεία ενημερώθηκε με επιτυχία.' - ), - 'delete' => array( + 'success' => 'Η εταιρεία ενημερώθηκε με επιτυχία.', + ], + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την εταιρεία;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας την εταιρεία. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η εταιρεία έχει διαγραφεί με επιτυχία.' - ) -); + 'success' => 'Η εταιρεία έχει διαγραφεί με επιτυχία.', + ], +]; diff --git a/resources/lang/el/admin/companies/table.php b/resources/lang/el/admin/companies/table.php index 96a21de680..c4ce1d5f99 100644 --- a/resources/lang/el/admin/companies/table.php +++ b/resources/lang/el/admin/companies/table.php @@ -1,9 +1,10 @@ 'Εταιρείες', 'create' => 'Δημιουργία Εταιρείας', 'title' => 'Εταιρεία', 'update' => 'Αναβάθμιση Εταιρείας', 'name' => 'Επωνυμία εταιρείας', 'id' => 'ID', -); +]; diff --git a/resources/lang/el/admin/components/general.php b/resources/lang/el/admin/components/general.php index acb3e05bbd..3cfa759f3c 100644 --- a/resources/lang/el/admin/components/general.php +++ b/resources/lang/el/admin/components/general.php @@ -1,6 +1,6 @@ 'Όνομα στοιχείου', 'checkin' => 'Ελέγξτε το στοιχείο', 'checkout' => 'Συστατικό ελέγχου', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Απομένουν', 'total' => 'Σύνολο', 'update' => 'Αναβάθμιση εξαρτήματος', -); +]; diff --git a/resources/lang/el/admin/components/message.php b/resources/lang/el/admin/components/message.php index 79bd1a0c92..fdfd9c2734 100644 --- a/resources/lang/el/admin/components/message.php +++ b/resources/lang/el/admin/components/message.php @@ -1,36 +1,35 @@ 'Το στοιχείο δεν υπάρχει.', - 'create' => array( + 'create' => [ 'error' => 'Το στοιχείο δεν δημιουργήθηκε, δοκιμάστε ξανά.', - 'success' => 'Το στοιχείο ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Το στοιχείο ενημερώθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Το στοιχείο δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Το στοιχείο ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Το στοιχείο ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το εξάρτημα;', 'error' => 'Παρουσιάστηκε ένα ζήτημα κατάργησης του στοιχείου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Το εξάρτημα έχει διαγραφεί με επιτυχία.' - ), + 'success' => 'Το εξάρτημα έχει διαγραφεί με επιτυχία.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Το στοιχείο δεν έχει ελεγχθεί, δοκιμάστε ξανά', 'success' => 'Η συνιστώσα ολοκληρώθηκε με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.' - ), + 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Το στοιχείο δεν έχει επιλεγεί, δοκιμάστε ξανά', 'success' => 'Το στοιχείο ελέγχου ολοκληρώθηκε με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.' - ) + 'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', + ], - -); +]; diff --git a/resources/lang/el/admin/components/table.php b/resources/lang/el/admin/components/table.php index b52fa562b0..c0a48cd4d0 100644 --- a/resources/lang/el/admin/components/table.php +++ b/resources/lang/el/admin/components/table.php @@ -1,5 +1,5 @@ 'Όνομα στοιχείου', -); +]; diff --git a/resources/lang/el/admin/consumables/general.php b/resources/lang/el/admin/consumables/general.php index f14b68f1f9..5b922690ff 100644 --- a/resources/lang/el/admin/consumables/general.php +++ b/resources/lang/el/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Έλεγχος κατανάλωσης σε χρήστη', 'consumable_name' => 'Όνομα αναλώσιμου', 'create' => 'Δημιουργία αναλώσιμου', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Απομένουν', 'total' => 'Σύνολο', 'update' => 'Ενημέρωση αναλώσιμων', -); +]; diff --git a/resources/lang/el/admin/consumables/message.php b/resources/lang/el/admin/consumables/message.php index b1a5562653..da651e3135 100644 --- a/resources/lang/el/admin/consumables/message.php +++ b/resources/lang/el/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Το αναλώσιμο δεν υπάρχει.', - 'create' => array( + 'create' => [ 'error' => 'Δεν δημιουργήθηκε αναλώσιμο, δοκιμάστε ξανά.', - 'success' => 'Το αναλώσιμο δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Το αναλώσιμο δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Το αναλώσιμο δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Το αναλώσιμο ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Το αναλώσιμο ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αναλώσιμο;', 'error' => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή του αναλώσιμου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Το αναλώσιμο έχει διαγραφεί με επιτυχία.' - ), + 'success' => 'Το αναλώσιμο έχει διαγραφεί με επιτυχία.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Το αναλώσιμο δεν έχει ελεγχθεί, δοκιμάστε ξανά', 'success' => 'Το αναλώσιμο ελεγχόταν με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.' - ), + 'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Το αναλώσιμο δεν έχει επιλεγεί, δοκιμάστε ξανά', 'success' => 'Το αναλώσιμο ελεγχόταν με επιτυχία.', - 'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.' - ) + 'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', + ], - -); +]; diff --git a/resources/lang/el/admin/consumables/table.php b/resources/lang/el/admin/consumables/table.php index e77fca2774..3e7cb71e95 100644 --- a/resources/lang/el/admin/consumables/table.php +++ b/resources/lang/el/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Όνομα αναλώσιμου', -); +]; diff --git a/resources/lang/el/admin/custom_fields/general.php b/resources/lang/el/admin/custom_fields/general.php index e9b70e6373..b0cfbad4b7 100644 --- a/resources/lang/el/admin/custom_fields/general.php +++ b/resources/lang/el/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Προσαρμοσμένα πεδία', 'field' => 'Πεδίο', 'about_fieldsets_title' => 'Σχετικά με τα σύνολα πεδίων', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Νέο προσαρμοσμένο πεδίο', 'value_encrypted' => 'Η τιμή αυτού του πεδίου είναι κρυπτογραφημένη στη βάση δεδομένων. Μόνο οι διαχειριστές θα μπορούν να δουν την αποκρυπτογραφημένη τιμή', 'show_in_email' => 'Να περιλαμβάνεται η τιμή αυτού του πεδίου στα emails χρέωσης ου αποστέλονται στους χρήστες; Κρυπτογραφημένα πεδία δεν μπορούν να περιληφθούν σε emails.', -); +]; diff --git a/resources/lang/el/admin/custom_fields/message.php b/resources/lang/el/admin/custom_fields/message.php index cc0eea7899..d8ed11416b 100644 --- a/resources/lang/el/admin/custom_fields/message.php +++ b/resources/lang/el/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Αυτό το πεδίο δεν υπάρχει.', 'already_added' => 'Το πεδίο έχει ήδη προσθέσει', - 'create' => array( + 'create' => [ 'error' => 'Το πεδία δεν δημιουργήθηκαν, παρακαλώ προσπαθήστε ξανά.', 'success' => 'Το πεδίο δημιουργήθηκε με επιτυχία.', - 'assoc_success' => 'Το πεδίο προστέθηκε με επιτυχία στο fieldset.' - ), + 'assoc_success' => 'Το πεδίο προστέθηκε με επιτυχία στο fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Το πεδίο δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Το πεδίο ενημερώθηκε επιτυχώς.' - ), + 'success' => 'Το πεδίο ενημερώθηκε επιτυχώς.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το πεδίο;', 'error' => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή του πεδίου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'success' => 'Το πεδίο διαγράφηκε με επιτυχία.', 'in_use' => 'Το πεδίο παραμένει σε χρήση.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Το πεδίο δεν υπάρχει', - 'create' => array( + 'create' => [ 'error' => 'Το Fieldset δεν δημιουργήθηκε, δοκιμάστε ξανά.', - 'success' => 'Το σύνολο των πεδίων δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Το σύνολο των πεδίων δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Το Fieldset δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Το σύνολο των πεδίων ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Το σύνολο των πεδίων ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το σύνολο πεδίων;', 'error' => 'Παρουσιάστηκε ένα ζήτημα κατάργησης του πεδίου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'success' => 'Το πεδίο πεδίου διαγράφηκε με επιτυχία.', 'in_use' => 'Το σύνολο των πεδίων παραμένουν σε χρήση.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/el/admin/departments/message.php b/resources/lang/el/admin/departments/message.php index 1bd4817ea3..5da6006cc9 100644 --- a/resources/lang/el/admin/departments/message.php +++ b/resources/lang/el/admin/departments/message.php @@ -1,21 +1,21 @@ 'Τμήμα δεν υπάρχει.', 'assoc_users' => 'Αυτό το τμήμα σχετίζεται προς το παρόν με τουλάχιστον έναν χρήστη και δεν μπορεί να διαγραφεί. Ενημερώστε τους χρήστες σας ώστε να μην αναφέρονται πλέον στο τμήμα αυτό και προσπαθήστε ξανά.', - 'create' => array( + 'create' => [ 'error' => 'Τμήμα δεν δημιουργήθηκε, δοκιμάστε ξανά.', - 'success' => 'Τμήμα δημιουργήθηκε με επιτυχία.' - ), - 'update' => array( + 'success' => 'Τμήμα δημιουργήθηκε με επιτυχία.', + ], + 'update' => [ 'error' => 'Τμήμα δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Τμήμα ενημερώθηκε με επιτυχία.' - ), - 'delete' => array( + 'success' => 'Τμήμα ενημερώθηκε με επιτυχία.', + ], + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το τμήμα;', 'error' => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή του τμήματος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Το τμήμα διαγράφηκε με επιτυχία.' - ) + 'success' => 'Το τμήμα διαγράφηκε με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/departments/table.php b/resources/lang/el/admin/departments/table.php index 98dfc63be6..de5313a54e 100644 --- a/resources/lang/el/admin/departments/table.php +++ b/resources/lang/el/admin/departments/table.php @@ -1,6 +1,6 @@ 'ταυτότητα', 'name' => 'όνομα τμήματος', @@ -8,4 +8,4 @@ return array( 'location' => 'Τοποθεσία', 'create' => 'Δημιουργία τμήματος', 'update' => 'Ενημέρωση Τμήματος', - ); + ]; diff --git a/resources/lang/el/admin/depreciations/general.php b/resources/lang/el/admin/depreciations/general.php index c3afb57ba5..dbde844ef0 100644 --- a/resources/lang/el/admin/depreciations/general.php +++ b/resources/lang/el/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Για αποσβέσεις παγίου', 'about_depreciations' => 'Μπορείτε να ορίσετε αποσβέσεις του περιουσιακού στοιχείου προκειμένου να γίνει απόσβεση περιουσιακών στοιχείων βάσει σταθερής απόσβεσης.', 'asset_depreciations' => 'Αποσβέσεις περιουσιακών στοιχείων', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Αριθμός των μηνών', 'update' => 'Ενημέρωση αποσβέσεων', -); +]; diff --git a/resources/lang/el/admin/depreciations/message.php b/resources/lang/el/admin/depreciations/message.php index f9de51300a..0aa25badce 100644 --- a/resources/lang/el/admin/depreciations/message.php +++ b/resources/lang/el/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Αποσβέσεις κλάση δεν υπάρχει.', 'assoc_users' => 'Αυτή η απόσβεση είναι επί του παρόντος σχετίζεται με ένα ή περισσότερα μοντέλα και δεν μπορεί να διαγραφεί. Παρακαλώ διαγράψτε τα μοντέλα, και, στη συνέχεια, προσπαθήστε να διαγράψετε ξανά. ', - - 'create' => array( + 'create' => [ 'error' => 'Δεν δημιουργήθηκε κλάση απόσβεσης, δοκιμάστε ξανά. :(', - 'success' => 'Η κατηγορία απόσβεσης δημιουργήθηκε με επιτυχία. :)' - ), + 'success' => 'Η κατηγορία απόσβεσης δημιουργήθηκε με επιτυχία. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Η κατηγορία απόσβεσης δεν ενημερώθηκε, δοκιμάστε ξανά', - 'success' => 'Η τάξη απόσβεσης ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Η τάξη απόσβεσης ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την κατηγορία απόσβεσης;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας την τάξη αποσβέσεων. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η τάξη αποσβέσεων διαγράφηκε με επιτυχία.' - ) + 'success' => 'Η τάξη αποσβέσεων διαγράφηκε με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/depreciations/table.php b/resources/lang/el/admin/depreciations/table.php index 680359f80d..fc5815da8b 100644 --- a/resources/lang/el/admin/depreciations/table.php +++ b/resources/lang/el/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Μήνες', 'term' => 'Όρος', 'title' => 'Όνομα ', -); +]; diff --git a/resources/lang/el/admin/groups/message.php b/resources/lang/el/admin/groups/message.php index 0baa3f3e0a..57f93ce746 100644 --- a/resources/lang/el/admin/groups/message.php +++ b/resources/lang/el/admin/groups/message.php @@ -1,22 +1,22 @@ 'Η ομάδα υπάρχει ήδη!', 'group_not_found' => 'Ομάδα [: Αναγνωριστικό] δεν υπάρχει.', 'group_name_required' => 'Το όνομα του πεδίου είναι απαραίτητο', - 'success' => array( + 'success' => [ 'create' => 'Η ομάδα δημιουργήθηκε με επιτυχία.', 'update' => 'Ομάδα ενημερώθηκε με επιτυχία.', 'delete' => 'Η ομάδα διαγράφηκε επιτυχώς.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι επιθυμείτε την διαγραφή της ομάδας;', 'create' => 'Υπήρξε ένα ζήτημα διαγράφοντας την ομάδα. Παρακαλώ δοκιμάστε ξανά.', 'update' => 'Υπήρξε ένα ζήτημα ενημερώνοντας την ομάδα. Παρακαλώ δοκιμάστε ξανά.', 'delete' => 'Υπήρξε ένα ζήτημα διαγράφοντας την ομάδα. Παρακαλώ δοκιμάστε ξανά.', - ), + ], -); +]; diff --git a/resources/lang/el/admin/groups/table.php b/resources/lang/el/admin/groups/table.php index dda91c4d14..3784985b44 100644 --- a/resources/lang/el/admin/groups/table.php +++ b/resources/lang/el/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Όνομα', 'users' => '# των χρηστών', -); +]; diff --git a/resources/lang/el/admin/groups/titles.php b/resources/lang/el/admin/groups/titles.php index 557d7ffa85..374fa95e2c 100644 --- a/resources/lang/el/admin/groups/titles.php +++ b/resources/lang/el/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Σχετικά με τις ομάδες', 'about_groups' => 'Οι ομάδες χρησιμοποιούνται για να γενικεύσουν τα δικαιώματα του χρήστη.', 'group_management' => 'Διαχείριση ομάδων', @@ -11,4 +11,4 @@ return array( 'allow' => 'Να επιτραπεί', 'deny' => 'Άρνηση', -); +]; diff --git a/resources/lang/el/admin/hardware/form.php b/resources/lang/el/admin/hardware/form.php index 5203c82814..0bc97fbfaa 100644 --- a/resources/lang/el/admin/hardware/form.php +++ b/resources/lang/el/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Επιβεβαιώστε μαζική διαγραφή περιουσιακών στοιχείων', +return [ + 'bulk_delete' => 'Επιβεβαιώστε μαζική διαγραφή περιουσιακών στοιχείων', 'bulk_delete_help' => 'Εξετάστε τα περιουσιακά στοιχεία για μαζική διαγραφή παρακάτω. Μόλις διαγραφεί, αυτά τα περιουσιακά στοιχεία μπορούν να αποκατασταθούν, αλλά αυτά δεν θα είναι πλέον συσχετιζόμενα με οποιοσδήποτε χρήστη που τους έχει ανατεθεί.', 'bulk_delete_warn' => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.', - 'bulk_update' => 'Μαζική ενημέρωση παγίων', - 'bulk_update_help' => 'Αυτή η φόρμα επιτρέπει την ενημέρωση πολλαπλών παγίων ταυτόχρονα. Μόνο συμπληρώστε τα πεδία που θέλετε να αλλάξετε. Οποιαδήποτε πεδίο αριστερά μείνει κενό θα παραμείνει ως αμετάβλητο. ', - 'bulk_update_warn' => 'Είστε έτοιμοι να επεξεργαστείτε τις ιδιότητες του: asset_count περιουσιακών στοιχείων.', + 'bulk_update' => 'Μαζική ενημέρωση παγίων', + 'bulk_update_help' => 'Αυτή η φόρμα επιτρέπει την ενημέρωση πολλαπλών παγίων ταυτόχρονα. Μόνο συμπληρώστε τα πεδία που θέλετε να αλλάξετε. Οποιαδήποτε πεδίο αριστερά μείνει κενό θα παραμείνει ως αμετάβλητο. ', + 'bulk_update_warn' => 'Είστε έτοιμοι να επεξεργαστείτε τις ιδιότητες του: asset_count περιουσιακών στοιχείων.', 'checkedout_to' => 'Ανάθεση σε', 'checkout_date' => 'Ημερομηνία αποχώρησης', 'checkin_date' => 'Ημερομηνία άφιξης', @@ -38,7 +38,6 @@ return array( 'tag' => 'Ετικέτα πόρων', 'update' => 'Ενημέρωση παγίου', 'warranty' => 'Εγγύηση', - 'warranty_expires' => 'Λήξη Εγγύησης', + 'warranty_expires' => 'Λήξη Εγγύησης', 'years' => 'έτη', -) -; +]; diff --git a/resources/lang/el/admin/hardware/general.php b/resources/lang/el/admin/hardware/general.php index e0b30af0d2..8a876010dc 100644 --- a/resources/lang/el/admin/hardware/general.php +++ b/resources/lang/el/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Σχετικά με τα πάγια', 'about_assets_text' => 'Τα στοιχεία ενεργητικού είναι στοιχεία που παρακολουθούνται με αύξοντα αριθμό ή ετικέτα στοιχείων. Έχουν την τάση να είναι στοιχεία υψηλότερης αξίας, όπου ο εντοπισμός ενός συγκεκριμένου στοιχείου έχει σημασία.', - 'archived' => 'Αρχειοθετημένα', + 'archived' => 'Αρχειοθετημένα', 'asset' => 'Πάγιο', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Εκκρεμεί', 'undeployable' => 'Μη διανέμεται', 'view' => 'Προβολή παγίου', -); +]; diff --git a/resources/lang/el/admin/hardware/message.php b/resources/lang/el/admin/hardware/message.php index 16e9209700..e5dce0c031 100644 --- a/resources/lang/el/admin/hardware/message.php +++ b/resources/lang/el/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: Το περιουσιακό αυτό στοιχείο έχει επισημανθεί ως επί του παρόντος undeployable. Εάν αυτή η κατάσταση έχει αλλάξει, παρακαλούμε να ενημερώσετε την κατάσταση των περιουσιακών στοιχείων.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Καλή προσπάθεια. Το στοιχείο αυτό δεν υπάρχει ή δεν απαιτείται.', 'assoc_users' => 'Αυτό το στοιχείο είναι συνήθως αποσυνδεδεμένο από έναν χρήστη και δεν μπορεί να διαγραφεί. Ελέγξτε πρώτα το στοιχείο και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.', - 'create' => array( + 'create' => [ 'error' => 'Το περιουσιακού στοιχείο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά. :(', - 'success' => 'Το πάγιο δημιουργήθηκε επιτυχώς' - ), + 'success' => 'Το πάγιο δημιουργήθηκε επιτυχώς', + ], - 'update' => array( + 'update' => [ 'error' => 'Το πάγιο δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', 'success' => 'Τα περιουσιακά στοιχεία ενημερώθηκαν επιτυχώς.', 'nothing_updated' => 'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν ενημερώθηκε.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Το ενεργητικό δεν έχει αποκατασταθεί, δοκιμάστε ξανά', - 'success' => 'Τα πάγια επαναφέρθηκαν επιτυχώς.' - ), + 'success' => 'Τα πάγια επαναφέρθηκαν επιτυχώς.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Ο έλεγχος στοιχείων ενεργητικού ήταν ανεπιτυχής. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Ο έλεγχος περιουσιακών στοιχείων ολοκληρώθηκε με επιτυχία.' - ), + 'success' => 'Ο έλεγχος περιουσιακών στοιχείων ολοκληρώθηκε με επιτυχία.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Το αρχείο δεν έχει διαγραφεί. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Το αρχείο διαγράφηκε με επιτυχία.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Τα αρχεία δεν μεταφορτώθηκαν. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Τα αρχεία ενημερώθηκαν με επιτυχία.', 'nofiles' => 'Δεν έχετε επιλέξει οποιαδήποτε αρχείο για μεταφόρτωση ή το αρχείο που προσπαθείτε να φορτώσετε είναι πάρα πολύ μεγάλο', 'invalidfiles' => 'Ένα ή περισσότερα από τα αρχεία σας είναι πολύ μεγάλα ή είναι τύπου αρχείου που δεν επιτρέπεται. Τα επιτρεπόμενα αρχεία τύπου png, gif, jpg, doc, docx, pdf και txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Ορισμένα στοιχεία δεν έχουν εισαχθεί σωστά.', 'errorDetail' => 'Τα παρακάτω στοιχεία δεν εισήχθησαν εξαιτίας σφαλμάτων.', - 'success' => "Το αρχείο σας έχει εισαχθεί", - 'file_delete_success' => "Το αρχείο σας έχει διαγραφεί με επιτυχία", - 'file_delete_error' => "Το αρχείο δεν μπόρεσε να διαγραφεί", - ), + 'success' => 'Το αρχείο σας έχει εισαχθεί', + 'file_delete_success' => 'Το αρχείο σας έχει διαγραφεί με επιτυχία', + 'file_delete_error' => 'Το αρχείο δεν μπόρεσε να διαγραφεί', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το πάγιο;', 'error' => 'Παρουσιάστηκε ένα ζήτημα κατάργησης του στοιχείου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'nothing_updated' => 'Δεν επιλέχθηκαν στοιχεία ενεργητικού, οπότε τίποτα δεν διαγράφηκε.', - 'success' => 'Το πάγιο διαγράφηκε με επιτυχία.' - ), + 'success' => 'Το πάγιο διαγράφηκε με επιτυχία.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Το περιουσιακό στοιχείο δεν έχει ελεγχθεί, δοκιμάστε ξανά', 'success' => 'Το ενεργητικό ολοκληρώθηκε με επιτυχία.', 'user_does_not_exist' => 'Αυτός ο χρήστης είναι άκυρος. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'not_available' => 'Αυτό το πάγιο δεν είναι διαθέσιμο για την ολοκλήρωση της παραγγελίας!', - 'no_assets_selected' => 'Πρέπει να επιλέξετε τουλάχιστον ένα στοιχείο προς δημοσίευση.' - ), + 'no_assets_selected' => 'Πρέπει να επιλέξετε τουλάχιστον ένα στοιχείο προς δημοσίευση.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Το στοιχείο δεν έχει επιλεγεί, δοκιμάστε ξανά', 'success' => 'Το ενεργό στοιχείο ολοκληρώθηκε με επιτυχία.', 'user_does_not_exist' => 'Αυτός ο χρήστης δεν υπάρχει. Παρακαλώ δοκιμάστε ξανά.', 'already_checked_in' => 'Το στοιχείο αυτό έχει ήδη ελεγχθεί.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Το στοιχείο δεν ζητήθηκε, δοκιμάστε ξανά', 'success' => 'Τα πάγια ενημερώθηκαν επιτυχώς.', - 'canceled' => 'Η αίτηση πληρωμής ακυρώθηκε με επιτυχία' - ) + 'canceled' => 'Η αίτηση πληρωμής ακυρώθηκε με επιτυχία', + ], -); +]; diff --git a/resources/lang/el/admin/hardware/table.php b/resources/lang/el/admin/hardware/table.php index cb8f3f1808..446ee29122 100644 --- a/resources/lang/el/admin/hardware/table.php +++ b/resources/lang/el/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Ετικέτα πόρων', 'asset_model' => 'Μοντέλο', @@ -20,6 +20,6 @@ return array( 'title' => 'Πάγιο ', 'image' => 'Φωτογραφία συσκευής', 'days_without_acceptance' => 'Ημέρες χωρίς αποδοχή', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/el/admin/kits/general.php b/resources/lang/el/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/el/admin/kits/general.php +++ b/resources/lang/el/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/el/admin/licenses/form.php b/resources/lang/el/admin/licenses/form.php index 253f71151f..787c01c165 100644 --- a/resources/lang/el/admin/licenses/form.php +++ b/resources/lang/el/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Πάγιο', 'checkin' => 'Μεταβίβαση ελέγχου', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Αδειοδότηση σε ηλεκτρονικό ταχυδρομείο', 'to_name' => 'Αδειοδοτείται στο όνομα', 'update' => 'Ενημέρωση άδειας', - 'checkout_help' => 'Πρέπει να ελέγξετε μια άδεια χρήσης σε ένα υλικό υλικό ή ένα άτομο. Μπορείτε να επιλέξετε και τα δύο, αλλά ο κάτοχος του στοιχείου πρέπει να ταιριάζει με το άτομο στο οποίο ελέγχετε το στοιχείο.' -); + 'checkout_help' => 'Πρέπει να ελέγξετε μια άδεια χρήσης σε ένα υλικό υλικό ή ένα άτομο. Μπορείτε να επιλέξετε και τα δύο, αλλά ο κάτοχος του στοιχείου πρέπει να ταιριάζει με το άτομο στο οποίο ελέγχετε το στοιχείο.', +]; diff --git a/resources/lang/el/admin/licenses/general.php b/resources/lang/el/admin/licenses/general.php index da8988b326..e605a160fa 100644 --- a/resources/lang/el/admin/licenses/general.php +++ b/resources/lang/el/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Σχετικά με τις άδειες', 'about_licenses' => 'Οι άδειες χρησιμοποιούνται για την παρακολούθηση του λογισμικού. Έχουν καθορισμένο αριθμό καθισμάτων που μπορούν να ελέγχονται σε άτομα', 'checkin' => 'Checkin άδεια', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Άδειες λογισμικού', 'user' => 'Χρήστης', 'view' => 'Προβολή άδειας', -); +]; diff --git a/resources/lang/el/admin/licenses/message.php b/resources/lang/el/admin/licenses/message.php index 9cafdcb84a..eda14ca3c9 100644 --- a/resources/lang/el/admin/licenses/message.php +++ b/resources/lang/el/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Δεν υπάρχει άδεια χρήσης.', 'user_does_not_exist' => 'Ο χρήστης δεν υπάρχει.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Πρέπει να επιλέξετε ένα στοιχείο ή έναν χρήστη, αλλά όχι και τα δύο.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Η άδεια δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.', - 'success' => 'Η άδεια δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Η άδεια δημιουργήθηκε με επιτυχία.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ο φάκελος έχει διαγραφεί. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Το αρχείο διαγράφηκε με επιτυχία.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Τα αρχεία δεν μεταφορτώθηκαν. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Τα αρχεία ενημερώθηκαν με επιτυχία.', 'nofiles' => 'Δεν επιλέξατε κανένα αρχείο για μεταφόρτωση ή το αρχείο που προσπαθείτε να μεταφορτώσετε είναι πολύ μεγάλο', 'invalidfiles' => 'Ένα ή περισσότερα από τα αρχεία σας είναι πολύ μεγάλα ή είναι τύπου αρχείου που δεν επιτρέπεται. Οι επιτρεπόμενοι τύποι αρχείων είναι png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml και lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Η άδεια δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Η άδεια ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Η άδεια ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την άδεια;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας την άδεια. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η άδεια διαγράφηκε επιτυχώς.' - ), + 'success' => 'Η άδεια διαγράφηκε επιτυχώς.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Παρουσιάστηκε πρόβλημα κατά την εξακρίβωση της άδειας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Η άδεια εκτυπώθηκε με επιτυχία' - ), + 'success' => 'Η άδεια εκτυπώθηκε με επιτυχία', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Παρουσιάστηκε ένα ζήτημα ελέγχου της άδειας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Η άδεια έχει ελεγχθεί με επιτυχία' - ), + 'success' => 'Η άδεια έχει ελεγχθεί με επιτυχία', + ], -); +]; diff --git a/resources/lang/el/admin/licenses/table.php b/resources/lang/el/admin/licenses/table.php index aa9873c92e..378f0b592d 100644 --- a/resources/lang/el/admin/licenses/table.php +++ b/resources/lang/el/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Ανατέθηκε στον', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Σειριακός', 'title' => 'Άδεια Χρήσεως', -); +]; diff --git a/resources/lang/el/admin/locations/message.php b/resources/lang/el/admin/locations/message.php index b7beb4ec1e..a640dcdd56 100644 --- a/resources/lang/el/admin/locations/message.php +++ b/resources/lang/el/admin/locations/message.php @@ -1,27 +1,26 @@ 'Η τοποθεσία δεν υπάρχει.', 'assoc_users' => 'Αυτή η θέση είναι επί του παρόντος σχετίζεται με τουλάχιστον ένα χρήστη και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τους χρήστες σας να μην αναφέρονται σε αυτήν τη θέση και δοκιμάστε ξανά. ', 'assoc_assets' => 'Αυτή η τοποθεσία συσχετίζεται προς το παρόν με τουλάχιστον ένα στοιχείο και δεν μπορεί να διαγραφεί. Ενημερώστε τα στοιχεία σας ώστε να μην αναφέρονται πλέον στην τοποθεσία αυτή και να προσπαθήσετε ξανά.', 'assoc_child_loc' => 'Αυτή η τοποθεσία είναι αυτήν τη στιγμή γονέας τουλάχιστον μιας τοποθεσίας παιδιού και δεν μπορεί να διαγραφεί. Ενημερώστε τις τοποθεσίες σας ώστε να μην αναφέρονται πλέον σε αυτήν την τοποθεσία και δοκιμάστε ξανά.', - - 'create' => array( + 'create' => [ 'error' => 'Η τοποθεσία δεν έχει δημιουργηθεί, δοκιμάστε ξανά.', - 'success' => 'Η τοποθεσία δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Η τοποθεσία δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Η τοποθεσία δεν έχει δημιουργηθεί, δοκιμάστε ξανά', - 'success' => 'Η τοποθεσία αναβαθμίστηκε επιτυχώς.' - ), + 'success' => 'Η τοποθεσία αναβαθμίστηκε επιτυχώς.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τοποθεσία;', 'error' => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της τοποθεσίας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', - 'success' => 'Η τοποθεσία διαγράφηκε με επιτυχία.' - ) + 'success' => 'Η τοποθεσία διαγράφηκε με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/locations/table.php b/resources/lang/el/admin/locations/table.php index f208a3969d..848182a7a0 100644 --- a/resources/lang/el/admin/locations/table.php +++ b/resources/lang/el/admin/locations/table.php @@ -1,6 +1,6 @@ 'Σχετικά με τις τοποθεσίες', 'about_locations' => 'Οι τοποθεσίες χρησιμοποιούνται για την παρακολούθηση πληροφοριών τοποθεσίας για χρήστες, στοιχεία ενεργητικού και άλλα στοιχεία', 'assets_rtd' => 'Πάγια', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Μητρική εταιρεία', 'currency' => 'Τοπικό νόμισμα', 'ldap_ou' => 'LDAP Αναζήτηση OU', - ); + ]; diff --git a/resources/lang/el/admin/manufacturers/message.php b/resources/lang/el/admin/manufacturers/message.php index f2ce522307..75d4bce980 100644 --- a/resources/lang/el/admin/manufacturers/message.php +++ b/resources/lang/el/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Κατασκευαστής δεν υπάρχει.', 'assoc_users' => 'Αυτό κατασκευαστής σχετίζεται με τουλάχιστον ένα μοντέλο και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τα μοντέλα σας προκειμένου να μην αναφέρονται σε αυτόν τον κατασκευαστή και δοκιμάστε ξανά. ', - 'create' => array( + 'create' => [ 'error' => 'Ο κατασκευαστής δεν δημιουργήθηκε, δοκιμάστε ξανά.', - 'success' => 'Ο κατασκευαστής δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Ο κατασκευαστής δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ο κατασκευαστής δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Ο κατασκευαστής ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Ο κατασκευαστής ενημερώθηκε με επιτυχία.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ο κατασκευαστής δεν αποκαταστάθηκε. Δοκιμάστε ξανά', - 'success' => 'Ο κατασκευαστής δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Ο κατασκευαστής δημιουργήθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον κατασκευαστή;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας τον κατασκευαστή. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Ο Κατασκευαστής διαγράφηκε με επιτυχία.' - ) + 'success' => 'Ο Κατασκευαστής διαγράφηκε με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/manufacturers/table.php b/resources/lang/el/admin/manufacturers/table.php index 02e516162f..579dd0d043 100644 --- a/resources/lang/el/admin/manufacturers/table.php +++ b/resources/lang/el/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Σχετικά με τους κατασκευαστές', 'about_manufacturers_text' => 'Οι κατασκευαστές είναι οι εταιρείες που δημιουργούν τα περιουσιακά σας στοιχεία. Μπορείτε να αποθηκεύσετε εδώ σημαντικές πληροφορίες επικοινωνίας σχετικά με αυτές, οι οποίες θα εμφανίζονται στις σελίδες λεπτομερειών του ενεργητικού σας.', 'asset_manufacturers' => 'Κατασκευαστές περιουσιακών στοιχείων', @@ -13,4 +13,4 @@ return array( 'update' => 'Ενημέρωση Κατασκευαστή', 'url' => 'URL', -); +]; diff --git a/resources/lang/el/admin/models/general.php b/resources/lang/el/admin/models/general.php index 18e7a734f8..08a2124b94 100644 --- a/resources/lang/el/admin/models/general.php +++ b/resources/lang/el/admin/models/general.php @@ -1,6 +1,6 @@ 'Σχετικά με τους τύπους παγίων', 'about_models_text' => 'Τα μοντέλα περιουσιακών στοιχείων είναι ένας τρόπος για να ομαδοποιήσετε ταυτόσημα περιουσιακά στοιχεία "MBP 2013", "IPhone 6s" κ.λπ.', 'deleted' => 'Αυτό το μοντέλο έχει διαγραφεί. Κάντε κλικ εδώ για να την επαναφέρετε.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.', 'restore' => 'Επαναφορά μοντέλου', 'requestable' => 'Οι χρήστες μπορούν να αιτηθούν το μοντέλο', - 'show_mac_address' => 'Εμφάνιση MAC διευθύνσεων πεδίου σε περιουσιακά στοιχεία σε αυτό το μοντέλο', + 'show_mac_address' => 'Εμφάνιση MAC διευθύνσεων πεδίου σε περιουσιακά στοιχεία σε αυτό το μοντέλο', 'view_deleted' => 'Εμφάνιση διεγραμμένων', 'view_models' => 'Προβολή μοντέλων', 'fieldset' => 'Σύνολο πεδίων', 'no_custom_field' => 'Δεν υπάρχουν προσαρμοσμένα πεδία', 'add_default_values' => 'Προσθέστε προεπιλεγμένες τιμές', -); +]; diff --git a/resources/lang/el/admin/models/message.php b/resources/lang/el/admin/models/message.php index 1afea35d6e..7cbd4a2092 100644 --- a/resources/lang/el/admin/models/message.php +++ b/resources/lang/el/admin/models/message.php @@ -1,42 +1,41 @@ 'Το μοντέλο δεν υπάρχει.', 'assoc_users' => 'Αυτό το μοντέλο συσχετίζεται επί του παρόντος με ένα ή περισσότερα στοιχεία και δεν μπορεί να διαγραφεί. Διαγράψτε τα στοιχεία και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.', - - 'create' => array( + 'create' => [ 'error' => 'Το μοντέλο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.', 'success' => 'Το μοντέλο δημιουργήθηκε με επιτυχία.', 'duplicate_set' => 'Ένα μοντέλο στοιχείων ενεργητικού με αυτό το όνομα, τον κατασκευαστή και τον αριθμό μοντέλου υπάρχει ήδη.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Μοντέλο δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Το μοντέλο ενημερώθηκε επιτυχώς.' - ), + 'success' => 'Το μοντέλο ενημερώθηκε επιτυχώς.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το περιουσιακό μοντέλο;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας αυτό το μοντέλο. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Το μοντέλο διαγράφηκε με επιτυχία.' - ), + 'success' => 'Το μοντέλο διαγράφηκε με επιτυχία.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Το μοντέλο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Το μοντέλο επαναφέρθηκε με επιτυχία.' - ), + 'success' => 'Το μοντέλο επαναφέρθηκε με επιτυχία.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Δεν άλλαξαν πεδία, επομένως τίποτα δεν ενημερώθηκε.', - 'success' => 'Τα μοντέλα ενημερώθηκαν.' - ), + 'success' => 'Τα μοντέλα ενημερώθηκαν.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν διαγράφηκε.', 'success' => ':success_count model(s) Διαγράφηκε!', - 'success_partial' => ':success_count model(s) μοντέλα διαγράφηκαν, ωστόσο το :fail_count δεν μπόρεσε να διαγραφεί επειδή εξακολουθούν να έχουν στοιχεία που σχετίζονται με αυτά.' - ), + 'success_partial' => ':success_count model(s) μοντέλα διαγράφηκαν, ωστόσο το :fail_count δεν μπόρεσε να διαγραφεί επειδή εξακολουθούν να έχουν στοιχεία που σχετίζονται με αυτά.', + ], -); +]; diff --git a/resources/lang/el/admin/models/table.php b/resources/lang/el/admin/models/table.php index 529085546a..27a489a829 100644 --- a/resources/lang/el/admin/models/table.php +++ b/resources/lang/el/admin/models/table.php @@ -1,6 +1,6 @@ 'Δημιουργία περιουσιακού στοιχείου μοντέλου', 'created_at' => 'Δημιουργήθηκε στις', @@ -14,4 +14,4 @@ return array( 'update' => 'Ενημέρωση παγίου μοντέλου', 'clone' => 'Κλώνος μοντέλο', 'edit' => 'Επεξεργασία μοντέλου', -); +]; diff --git a/resources/lang/el/admin/reports/general.php b/resources/lang/el/admin/reports/general.php index ebba66f457..dbbf587f6e 100644 --- a/resources/lang/el/admin/reports/general.php +++ b/resources/lang/el/admin/reports/general.php @@ -1,5 +1,5 @@ 'Επιλέξτε τις επιλογές που θέλετε για την αναφορά των παγίων σας.' -); +return [ + 'info' => 'Επιλέξτε τις επιλογές που θέλετε για την αναφορά των παγίων σας.', +]; diff --git a/resources/lang/el/admin/reports/message.php b/resources/lang/el/admin/reports/message.php index 8113d019e5..9b4c89c0cb 100644 --- a/resources/lang/el/admin/reports/message.php +++ b/resources/lang/el/admin/reports/message.php @@ -1,5 +1,5 @@ 'Πρέπει να επιλέξετε τουλάχιστον μία επιλογή.' -); +return [ + 'error' => 'Πρέπει να επιλέξετε τουλάχιστον μία επιλογή.', +]; diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php index cffed4b5fa..0bc8fe2739 100644 --- a/resources/lang/el/admin/settings/general.php +++ b/resources/lang/el/admin/settings/general.php @@ -1,12 +1,12 @@ 'Υπηρεσία καταλόγου Active Directory', 'ad_domain' => 'Τομέα Active Directory', 'ad_domain_help' => 'Αυτό είναι μερικές φορές το ίδιο με τον τομέα ηλεκτρονικού ταχυδρομείου σας, αλλά όχι πάντα.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Επασύναψη email', 'admin_cc_email_help' => 'Εάν θέλετε να στείλετε ένα αντίγραφο checkin/checkout emails που αποστέλλονται στους χρήστες σε έναν επιπλέον λογαριασμό email, εισαγάγετέ το εδώ. Διαφορετικά, αφήστε αυτό το πεδίο κενό.', 'is_ad' => 'Αυτός είναι ένας διακομιστής υπηρεσίας καταλόγου Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ελάχιστο όριο λήξης ειδοποιήσεων (σε ημέρες)', 'alert_inv_threshold' => 'Ειδοποιήση ορίου αποθήκης', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Στοιχεία ταυτότητας περιουσιακών στοιχείων', 'audit_interval' => 'Διάρκεια ελέγχου', 'audit_interval_help' => 'Αν απαιτείται να ελέγχετε τακτικά τα πάγια σας, εισάγετε το διάστημα σε μήνες.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Εισαγάγετε τον κωδικό δύο συντελεστών', 'two_factor_config_complete' => 'Υποβολή Κωδικού', 'two_factor_enabled_edit_not_allowed' => 'Ο διαχειριστής σας δεν σας επιτρέπει να επεξεργαστείτε αυτήν τη ρύθμιση.', - 'two_factor_enrollment_text' => "Απαιτείται έλεγχος ταυτότητας δύο παραγόντων, ωστόσο η συσκευή σας δεν έχει εγγραφεί ακόμα. Ανοίξτε την εφαρμογή Google Authenticator και σαρώστε τον παρακάτω κωδικό QR για να εγγραφείτε στη συσκευή σας. Μόλις εγγραφείτε στη συσκευή σας, πληκτρολογήστε τον παρακάτω κώδικα", + 'two_factor_enrollment_text' => 'Απαιτείται έλεγχος ταυτότητας δύο παραγόντων, ωστόσο η συσκευή σας δεν έχει εγγραφεί ακόμα. Ανοίξτε την εφαρμογή Google Authenticator και σαρώστε τον παρακάτω κωδικό QR για να εγγραφείτε στη συσκευή σας. Μόλις εγγραφείτε στη συσκευή σας, πληκτρολογήστε τον παρακάτω κώδικα', 'require_accept_signature' => 'Απαιτείται υπογραφή', 'require_accept_signature_help_text' => 'Η ενεργοποίηση αυτής της λειτουργίας θα απαιτεί από τους χρήστες να αποδεχθούν φυσικά την αποδοχή ενός στοιχείου.', 'left' => 'αριστερά', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Με την επιλογή αυτή θα επιβληθεί ο περιορισμός μοναδικότητας σειριακού αριθμού στα πάγια', 'zerofill_count' => 'Μήκος ετικετών ενεργητικού, συμπεριλαμβανομένου του zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/el/admin/settings/message.php b/resources/lang/el/admin/settings/message.php index 230530b478..2b2d7e1cf8 100644 --- a/resources/lang/el/admin/settings/message.php +++ b/resources/lang/el/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Παρουσιάστηκε ένα σφάλμα κατά την ενημέρωση. ', - 'success' => 'Οι ρυθμίσεις αναβαθμίστηκαν επιτυχώς.' - ), - 'backup' => array( + 'success' => 'Οι ρυθμίσεις αναβαθμίστηκαν επιτυχώς.', + ], + 'backup' => [ 'delete_confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αρχείο αντιγράφων ασφαλείας; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί. ', 'file_deleted' => 'Το αντίγραφο ασφαλείας διαγράφηκε επιτυχώς. ', 'generated' => 'Δημιουργήθηκε με επιτυχία ένα νέο αρχείο δημιουργίας αντιγράφων ασφαλείας.', 'file_not_found' => 'Αυτό το αρχείο αντιγράφων ασφαλείας δεν βρέθηκε στο διακομιστή.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Παρουσιάστηκε ένα σφάλμα κατά την εκκαθάριση. ', 'validation_failed' => 'Η επιβεβαίωση καθαρισμού είναι εσφαλμένη. Παρακαλούμε πληκτρολογήστε τη λέξη «Διαγραφή» στο πλαίσιο επιβεβαίωσης.', - 'success' => 'Οι διαγραμμένες εγγραφές καθαρίστηκαν με επιτυχία.' - ), + 'success' => 'Οι διαγραμμένες εγγραφές καθαρίστηκαν με επιτυχία.', + ], -); +]; diff --git a/resources/lang/el/admin/statuslabels/message.php b/resources/lang/el/admin/statuslabels/message.php index f29cec5f04..912397e36c 100644 --- a/resources/lang/el/admin/statuslabels/message.php +++ b/resources/lang/el/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Η ετικέτα κατάστασης δεν υπάρχει.', 'assoc_assets' => 'Αυτή η ετικέτα κατάστασης συσχετίζεται επί του παρόντος με ένα τουλάχιστον στοιχείο και δεν μπορεί να διαγραφεί. Ενημερώστε τα στοιχεία σας ώστε να μην αναφέρονται πλέον στην κατάσταση αυτή και να προσπαθήσετε ξανά.', - - 'create' => array( + 'create' => [ 'error' => 'Δεν δημιουργήθηκε η ετικέτα κατάστασης, δοκιμάστε ξανά.', - 'success' => 'Η ετικέτα κατάστασης δημιουργήθηκε με επιτυχία.' - ), + 'success' => 'Η ετικέτα κατάστασης δημιουργήθηκε με επιτυχία.', + ], - 'update' => array( + 'update' => [ 'error' => 'Η Ετικέτα κατάστασης δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά', - 'success' => 'Η ετικέτα κατάστασης ενημερώθηκε με επιτυχία.' - ), + 'success' => 'Η ετικέτα κατάστασης ενημερώθηκε με επιτυχία.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την ετικέτα κατάστασης;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας την ετικέτα κατάστασης. Παρακαλώ δοκιμάστε ξανά.', - 'success' => 'Η ετικέτα κατάστασης διαγράφηκε με επιτυχία.' - ), + 'success' => 'Η ετικέτα κατάστασης διαγράφηκε με επιτυχία.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Αυτά τα στοιχεία ενεργητικού δεν μπορούν να αποδοθούν σε κανέναν.', 'deployable' => 'Αυτά τα περιουσιακά στοιχεία μπορούν να ελεγχθούν. Μόλις οριστούν, θα αναλάβουν μετα-κατάσταση Deployed.', 'archived' => 'Αυτά τα στοιχεία δεν μπορούν να εξακριβωθούν και θα εμφανιστούν μόνο στην προβολή Αρχειοθετημένη. Αυτό είναι χρήσιμο για τη διατήρηση πληροφοριών σχετικά με τα περιουσιακά στοιχεία για την κατάρτιση προϋπολογισμού / ιστορικούς σκοπούς, αλλά για τη διατήρησή τους εκτός της καθημερινής λίστας στοιχείων.', 'pending' => 'Αυτά τα στοιχεία ενεργητικού δεν μπορούν να αποδοθούν σε κανέναν, συχνά χρησιμοποιούμενα για αντικείμενα που πρόκειται να επισκευαστούν, αλλά αναμένεται να επιστρέψουν στην κυκλοφορία.', - ), + ], -); +]; diff --git a/resources/lang/el/admin/statuslabels/table.php b/resources/lang/el/admin/statuslabels/table.php index bc1dc4e678..71c3e4c02e 100644 --- a/resources/lang/el/admin/statuslabels/table.php +++ b/resources/lang/el/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Σχετικά με το καθεστώς ετικετών', 'archived' => 'Αρχειοθετημένα', 'create' => 'Δημιουργία ετικέτας κατάστασης', @@ -16,4 +16,4 @@ return array( 'title' => 'Ετικέτα Κατάστασης', 'undeployable' => 'Μη διανέμεται', 'update' => 'Ενημέρωση κατάστασης ετικέτα', -); +]; diff --git a/resources/lang/el/admin/suppliers/message.php b/resources/lang/el/admin/suppliers/message.php index e2e6062f82..c50c6217f7 100644 --- a/resources/lang/el/admin/suppliers/message.php +++ b/resources/lang/el/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Προμηθευτής δεν υπάρχει.', - - 'create' => array( + 'create' => [ 'error' => 'Ο προμηθευτής δεν δημιουργήθηκε, δοκιμάστε ξανά.', - 'success' => 'Ο προμηθευτής δημιουργήθηκε επιτυχώς.' - ), + 'success' => 'Ο προμηθευτής δημιουργήθηκε επιτυχώς.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ο προμηθευτής δεν επικαιροποιήθηκε, παρακαλώ δοκιμάστε ξανά', - 'success' => 'Οι προμηθευτές ανανεώθηκαν επιτυχώς.' - ), + 'success' => 'Οι προμηθευτές ανανεώθηκαν επιτυχώς.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό τον προμηθευτή;', 'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας τον προμηθευτή. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Ο προμηθευτής διαγράφηκε επιτυχώς.', 'assoc_assets' => 'Αυτός ο προμηθευτής συσχετίζεται με τουλάχιστον ένα asset και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τα asset σας να μην αναφέρονται σε αυτόν τον προμηθευτή και δοκιμάστε ξανά. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/el/admin/suppliers/table.php b/resources/lang/el/admin/suppliers/table.php index 9ef866e5fb..2590d8a2c1 100644 --- a/resources/lang/el/admin/suppliers/table.php +++ b/resources/lang/el/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Σχετικά με τους προμηθευτές', 'about_suppliers_text' => 'Οι προμηθευτές χρησιμοποιούνται για την παρακολούθηση της προέλευσης των αντικειμένων', 'address' => 'Διεύθυνση προμηθευτή', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Προβολή παγίων για', 'zip' => 'Ταχυδρομικός Κώδικας', -); +]; diff --git a/resources/lang/el/admin/users/general.php b/resources/lang/el/admin/users/general.php index 9a41943ecf..2002ebcbda 100644 --- a/resources/lang/el/admin/users/general.php +++ b/resources/lang/el/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Περιουσιακά στοιχεία που έχει αντιστοιχιστεί σε: όνομα', @@ -13,7 +12,7 @@ return array( 'edit' => 'Επεξεργασία χρήστη', 'filetype_info' => 'Επιτρεπόμενοι τύποι αρχείων είναι png, gif, jpg, jpeg, doc, docx, pdf, txt, zip και rar.', 'history_user' => 'Ιστορικό: όνομα', - 'info' => 'Πληροφορίες', + 'info' => 'Πληροφορίες', 'restore_user' => 'Κάντε κλικ εδώ για να τα επαναφέρετε.', 'last_login' => 'Τελευταία σύνδεση', 'ldap_config_text' => 'Οι ρυθμίσεις διαμόρφωσης LDAP μπορούν να βρεθούν στο στοιχείο Διαχειριστής> Ρυθμίσεις. Η (επιλεγμένη) επιλεγμένη τοποθεσία θα οριστεί για όλους τους εισαγόμενους χρήστες.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Οι τρέχουσες ρυθμίσεις διαχειριστή επιτρέπουν την επιλεκτική εφαρμογή ελέγχου ταυτότητας δύο παραγόντων.', 'two_factor_enrolled' => 'Συσκευή εγγραφής 2FA', 'two_factor_active' => '2FA Active', - ); + ]; diff --git a/resources/lang/el/admin/users/message.php b/resources/lang/el/admin/users/message.php index fe0f821c4e..eea68915c0 100644 --- a/resources/lang/el/admin/users/message.php +++ b/resources/lang/el/admin/users/message.php @@ -1,6 +1,6 @@ 'Έχετε αποδεχθεί με επιτυχία αυτό το πάγιο.', 'declined' => 'Έχετε απορρίψει επιτυχώς αυτό το στοιχείο.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Η ενσωμάτωση LDAP δεν έχει ρυθμιστεί για αυτήν την εγκατάσταση.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Ο χρήστης δημιουργήθηκε με επιτυχία.', 'update' => 'Ο χρήστης ενημερώθηκε με επιτυχία.', 'update_bulk' => 'Οι χρήστες ενημερώθηκαν με επιτυχία!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Ο χρήστης καταργήθηκε με επιτυχία.', 'restored' => 'Ο Χρήστης επαναφέρθηκε με επιτυχία.', 'import' => 'Οι χρήστες εισήχθησαν με επιτυχία.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Παρουσιάστηκε ένα πρόβλημα δημιουργίας του χρήστη. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'update' => 'Παρουσιάστηκε ένα πρόβλημα ενημέρωσης του χρήστη. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', 'delete' => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή του χρήστη. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Δεν ήταν δυνατή η αναζήτηση στον διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP.
Ερώτηση από διακομιστή LDAP:', 'ldap_could_not_get_entries' => 'Δεν ήταν δυνατή η λήψη καταχωρήσεων από το διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP.
Ερώτηση από διακομιστή LDAP:', 'password_ldap' => 'Ο κωδικός πρόσβασης για αυτόν τον λογαριασμό γίνεται από το LDAP / Active Directory. Επικοινωνήστε με το τμήμα πληροφορικής σας για να αλλάξετε τον κωδικό πρόσβασής σας.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Το αρχείο δεν έχει διαγραφεί. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Το αρχείο διαγράφηκε με επιτυχία.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Τα αρχεία δεν μεταφορτώθηκαν. Παρακαλώ δοκιμάστε ξανά.', 'success' => 'Τα αρχεία ενημερώθηκαν με επιτυχία.', 'nofiles' => 'Δεν έχετε επιλέξει κανένα αρχείο για ενημέρωση', 'invalidfiles' => 'Ένα ή περισσότερα από τα αρχεία σας είναι πολύ μεγάλα ή είναι τύπου αρχείου που δεν επιτρέπεται. Τα επιτρεπόμενα αρχεία τύπου png, gif, jpg, doc, docx, pdf και txt.', - ), + ], -); +]; diff --git a/resources/lang/el/admin/users/table.php b/resources/lang/el/admin/users/table.php index c9b156c374..2948f1b4c8 100644 --- a/resources/lang/el/admin/users/table.php +++ b/resources/lang/el/admin/users/table.php @@ -1,6 +1,6 @@ 'Ενεργό', 'allow' => 'Να επιτραπεί', 'checkedout' => 'Πάγια', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Προβολή τρέχωντων χρηστών', 'show_deleted' => 'Εμφάνιση διαγραμμένων χρηστών', 'title' => 'Τίτλος', - 'to_restore_them' => 'για την αποκατάστασή τους.', + 'to_restore_them' => 'για την αποκατάστασή τους.', 'updateuser' => 'Ενημέρωση χρήστη', 'username' => 'Όνομα χρήστη', - 'user_deleted_text' => 'Αυτός ο χρήστης έχει επισημανθεί ως διαγραμμένος.', + 'user_deleted_text' => 'Αυτός ο χρήστης έχει επισημανθεί ως διαγραμμένος.', 'username_note' => '(Αυτό χρησιμοποιείται για τη σύνδεση της υπηρεσίας καταλόγου Active Directory μόνο, όχι για σύνδεση.)', 'cloneuser' => 'Κλώνος χρήστη', 'viewusers' => 'Εμφάνιση χρηστών', -); +]; diff --git a/resources/lang/el/auth/general.php b/resources/lang/el/auth/general.php index 5e7077c2fa..f1d519a3ba 100644 --- a/resources/lang/el/auth/general.php +++ b/resources/lang/el/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/el/auth/message.php b/resources/lang/el/auth/message.php index 3ccb9f58de..08f3527533 100644 --- a/resources/lang/el/auth/message.php +++ b/resources/lang/el/auth/message.php @@ -1,6 +1,6 @@ 'Υπάρχει ήδη λογαριασμός με το ίδιο email.', 'account_not_found' => 'Το όνομα χρήστη ή ο κωδικός πρόσβασης είναι εσφαλμένα.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Αυτός ο λογαριασμός χρήστη έχει απαγορευτεί.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Υπήρχε ένα πρόβλημα ενώ προσπαθείτε να συνδεθείτε, παρακαλώ προσπαθήστε ξανά.', 'success' => 'Έχετε συνδεθεί επιτυχώς.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Παρουσιάστηκε πρόβλημα κατά την προσπάθεια δημιουργίας του λογαριασμού σας, δοκιμάστε ξανά.', 'success' => 'Ο λογαριασμός δημιουργήθηκε επιτυχώς.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Παρουσιάστηκε πρόβλημα κατά την προσπάθεια λήψης νέου κωδικού πρόσβασης κωδικού πρόσβασης, δοκιμάστε ξανά.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Υπήρχε ένα πρόβλημα ενώ προσπαθούσατε να επαναγέρετε τον κωδικό σας, παρακαλώ προσπαθήστε ξανά.', 'success' => 'Έχει γίνει επαναφορά του κωδικού πρόσβασής σας με επιτυχία.', - ), + ], - -); +]; diff --git a/resources/lang/el/button.php b/resources/lang/el/button.php index 949a2c097a..fef22d437a 100644 --- a/resources/lang/el/button.php +++ b/resources/lang/el/button.php @@ -1,6 +1,6 @@ 'Ενέργειες', 'add' => 'Προσθήκη Νέου', 'cancel' => 'Ακύρωση', @@ -11,7 +11,7 @@ return array( 'request' => 'Αίτημα', 'submit' => 'Υποβολή', 'upload' => 'Μεταφόρτωση', - 'select_file' => 'Επιλέξτε Αρχείο ...', + 'select_file' => 'Επιλέξτε Αρχείο ...', 'select_files' => 'Επιλογή αρχείων...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php index 1885895b0f..59ac7bb684 100644 --- a/resources/lang/el/general.php +++ b/resources/lang/el/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Αιτήματα', 'city' => 'Πόλη', - 'click_here' => 'Κάντε κλικ ΕΔΩ', + 'click_here' => 'Κάντε κλικ ΕΔΩ', 'clear_selection' => 'Καθαρισμός Επιλογής', 'companies' => 'Εταιρείες', 'company' => 'Εταιρεία', 'component' => 'Συστατικό', 'components' => 'Συστατικά', - 'complete' => 'Πλήρης', + 'complete' => 'Πλήρης', 'consumable' => 'Καταναλώσιμος', 'consumables' => 'Αναλώσιμα', 'country' => 'Χώρα', diff --git a/resources/lang/el/help.php b/resources/lang/el/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/el/help.php +++ b/resources/lang/el/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/el/mail.php b/resources/lang/el/mail.php index e301fef50a..c02d69c677 100644 --- a/resources/lang/el/mail.php +++ b/resources/lang/el/mail.php @@ -1,6 +1,6 @@ 'Ένας χρήστης έχει ακυρώσει μια αίτηση στοιχείο στην ιστοσελίδα', 'a_user_requested' => 'Ο χρήστης έχει ζητήσει ένα στοιχείο στην ιστοσελίδα', 'accessory_name' => 'Όνομα ανταλλακτικού:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/el/pagination.php b/resources/lang/el/pagination.php index a4fea4c5b5..2f08e29a60 100644 --- a/resources/lang/el/pagination.php +++ b/resources/lang/el/pagination.php @@ -1,6 +1,6 @@ 'Επόμενο »?', -); +]; diff --git a/resources/lang/el/passwords.php b/resources/lang/el/passwords.php index 1b63f68a5f..f98a94dc63 100644 --- a/resources/lang/el/passwords.php +++ b/resources/lang/el/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Ο σύνδεσμος κωδικού πρόσβασης σας έχει σταλεί!', 'user' => 'Δεν βρέθηκε ενεργός χρήστης με αυτό το email.', ]; - diff --git a/resources/lang/el/reminders.php b/resources/lang/el/reminders.php index 5d8811ffda..f254ca8da8 100644 --- a/resources/lang/el/reminders.php +++ b/resources/lang/el/reminders.php @@ -1,6 +1,6 @@ "Οι κωδικοί πρόσβασης πρέπει να είναι έξι χαρακτήρες και να ταιριάζουν με την επιβεβαίωση.", + 'password' => 'Οι κωδικοί πρόσβασης πρέπει να είναι έξι χαρακτήρες και να ταιριάζουν με την επιβεβαίωση.', - "user" => "Το όνομα χρήστη ή η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι εσφαλμένη", + 'user' => 'Το όνομα χρήστη ή η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι εσφαλμένη', - "token" => "Αυτό το διακριτικό επαναφοράς κωδικού πρόσβασης δεν είναι έγκυρο.", + 'token' => 'Αυτό το διακριτικό επαναφοράς κωδικού πρόσβασης δεν είναι έγκυρο.', - "sent" => "Εάν βρεθεί μια αντίστοιχη διεύθυνση ηλεκτρονικού ταχυδρομείου, μια υπενθύμιση κωδικού πρόσβασης έχει σταλεί!", + 'sent' => 'Εάν βρεθεί μια αντίστοιχη διεύθυνση ηλεκτρονικού ταχυδρομείου, μια υπενθύμιση κωδικού πρόσβασης έχει σταλεί!', -); +]; diff --git a/resources/lang/el/table.php b/resources/lang/el/table.php index 717fdcf1bb..e40c16e999 100644 --- a/resources/lang/el/table.php +++ b/resources/lang/el/table.php @@ -1,10 +1,10 @@ 'Ενέργειες', 'action' => 'Ενέργεια', 'by' => 'Από', 'item' => 'Αντικείμενο', -); +]; diff --git a/resources/lang/el/validation.php b/resources/lang/el/validation.php index 917fe3ceaa..724f7636a9 100644 --- a/resources/lang/el/validation.php +++ b/resources/lang/el/validation.php @@ -1,6 +1,6 @@ 'Το χαρακτηριστικό: έχει ήδη ληφθεί.', 'uploaded' => 'Το χαρακτηριστικό:: απέτυχε να μεταφορτωθεί.', 'url' => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.', - "unique_undeleted" => "Το :χαρακτηριστικό πρέπει να είναι μοναδικό.", + 'unique_undeleted' => 'Το :χαρακτηριστικό πρέπει να είναι μοναδικό.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Το πεδίο ιδιοτήτων: περιέχει ένα χαρακτήρα που δεν επιτρέπεται.", - "email_array" => "Μία ή περισσότερες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες.", - "hashed_pass" => "Ο τρέχων κωδικός πρόσβασης είναι εσφαλμένος", + 'alpha_space' => 'Το πεδίο ιδιοτήτων: περιέχει ένα χαρακτήρα που δεν επιτρέπεται.', + 'email_array' => 'Μία ή περισσότερες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες.', + 'hashed_pass' => 'Ο τρέχων κωδικός πρόσβασης είναι εσφαλμένος', 'dumbpwd' => 'Αυτός ο κωδικός πρόσβασης είναι πολύ συνηθισμένος.', - "statuslabel_type" => "Πρέπει να επιλέξετε έναν έγκυρο τύπο ετικέτας κατάστασης", + 'statuslabel_type' => 'Πρέπει να επιλέξετε έναν έγκυρο τύπο ετικέτας κατάστασης', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/en-GB/admin/accessories/general.php b/resources/lang/en-GB/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/en-GB/admin/accessories/general.php +++ b/resources/lang/en-GB/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/en-GB/admin/accessories/message.php b/resources/lang/en-GB/admin/accessories/message.php index 8fef268853..ba7429f9d3 100644 --- a/resources/lang/en-GB/admin/accessories/message.php +++ b/resources/lang/en-GB/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' - ), + 'success' => 'Accessory created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' - ), + 'success' => 'Accessory updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en-GB/admin/accessories/table.php b/resources/lang/en-GB/admin/accessories/table.php index e02d9f22e4..69c4d46aab 100644 --- a/resources/lang/en-GB/admin/accessories/table.php +++ b/resources/lang/en-GB/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Accessory Name', - -); +]; diff --git a/resources/lang/en-GB/admin/asset_maintenances/form.php b/resources/lang/en-GB/admin/asset_maintenances/form.php index 785d06b08f..0ac541ba91 100644 --- a/resources/lang/en-GB/admin/asset_maintenances/form.php +++ b/resources/lang/en-GB/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', 'notes' => 'Notes', 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'create' => 'Create Asset Maintenance', ]; diff --git a/resources/lang/en-GB/admin/asset_maintenances/message.php b/resources/lang/en-GB/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/en-GB/admin/asset_maintenances/message.php +++ b/resources/lang/en-GB/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/en-GB/admin/asset_maintenances/table.php b/resources/lang/en-GB/admin/asset_maintenances/table.php index f3a6be60f9..3ba895038d 100644 --- a/resources/lang/en-GB/admin/asset_maintenances/table.php +++ b/resources/lang/en-GB/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/en-GB/admin/categories/general.php b/resources/lang/en-GB/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/en-GB/admin/categories/general.php +++ b/resources/lang/en-GB/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/en-GB/admin/categories/message.php b/resources/lang/en-GB/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/en-GB/admin/categories/message.php +++ b/resources/lang/en-GB/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/categories/table.php b/resources/lang/en-GB/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/en-GB/admin/categories/table.php +++ b/resources/lang/en-GB/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/en-GB/admin/companies/general.php b/resources/lang/en-GB/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/en-GB/admin/companies/general.php +++ b/resources/lang/en-GB/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/en-GB/admin/companies/message.php b/resources/lang/en-GB/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/en-GB/admin/companies/message.php +++ b/resources/lang/en-GB/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/en-GB/admin/companies/table.php b/resources/lang/en-GB/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/en-GB/admin/companies/table.php +++ b/resources/lang/en-GB/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/en-GB/admin/components/general.php b/resources/lang/en-GB/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/en-GB/admin/components/general.php +++ b/resources/lang/en-GB/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/en-GB/admin/components/message.php b/resources/lang/en-GB/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/en-GB/admin/components/message.php +++ b/resources/lang/en-GB/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en-GB/admin/components/table.php b/resources/lang/en-GB/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/en-GB/admin/components/table.php +++ b/resources/lang/en-GB/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/en-GB/admin/consumables/general.php b/resources/lang/en-GB/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/en-GB/admin/consumables/general.php +++ b/resources/lang/en-GB/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/en-GB/admin/consumables/message.php b/resources/lang/en-GB/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/en-GB/admin/consumables/message.php +++ b/resources/lang/en-GB/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en-GB/admin/consumables/table.php b/resources/lang/en-GB/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/en-GB/admin/consumables/table.php +++ b/resources/lang/en-GB/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/en-GB/admin/custom_fields/general.php b/resources/lang/en-GB/admin/custom_fields/general.php index 72a191ef98..5af2dcc006 100644 --- a/resources/lang/en-GB/admin/custom_fields/general.php +++ b/resources/lang/en-GB/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/en-GB/admin/custom_fields/message.php b/resources/lang/en-GB/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/en-GB/admin/custom_fields/message.php +++ b/resources/lang/en-GB/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/en-GB/admin/departments/message.php b/resources/lang/en-GB/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/en-GB/admin/departments/message.php +++ b/resources/lang/en-GB/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/departments/table.php b/resources/lang/en-GB/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/en-GB/admin/departments/table.php +++ b/resources/lang/en-GB/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/en-GB/admin/depreciations/general.php b/resources/lang/en-GB/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/en-GB/admin/depreciations/general.php +++ b/resources/lang/en-GB/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/en-GB/admin/depreciations/message.php b/resources/lang/en-GB/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/en-GB/admin/depreciations/message.php +++ b/resources/lang/en-GB/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/depreciations/table.php b/resources/lang/en-GB/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/en-GB/admin/depreciations/table.php +++ b/resources/lang/en-GB/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/en-GB/admin/groups/message.php b/resources/lang/en-GB/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/en-GB/admin/groups/message.php +++ b/resources/lang/en-GB/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/en-GB/admin/groups/table.php b/resources/lang/en-GB/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/en-GB/admin/groups/table.php +++ b/resources/lang/en-GB/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/en-GB/admin/groups/titles.php b/resources/lang/en-GB/admin/groups/titles.php index c78522ad46..9b0c2ff36f 100644 --- a/resources/lang/en-GB/admin/groups/titles.php +++ b/resources/lang/en-GB/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalise user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/en-GB/admin/hardware/form.php b/resources/lang/en-GB/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/en-GB/admin/hardware/form.php +++ b/resources/lang/en-GB/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/en-GB/admin/hardware/general.php +++ b/resources/lang/en-GB/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/en-GB/admin/hardware/message.php +++ b/resources/lang/en-GB/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/en-GB/admin/hardware/table.php b/resources/lang/en-GB/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/en-GB/admin/hardware/table.php +++ b/resources/lang/en-GB/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/en-GB/admin/kits/general.php b/resources/lang/en-GB/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/en-GB/admin/kits/general.php +++ b/resources/lang/en-GB/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/en-GB/admin/licenses/form.php b/resources/lang/en-GB/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/en-GB/admin/licenses/form.php +++ b/resources/lang/en-GB/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/en-GB/admin/licenses/general.php b/resources/lang/en-GB/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/en-GB/admin/licenses/general.php +++ b/resources/lang/en-GB/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/en-GB/admin/licenses/message.php b/resources/lang/en-GB/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/en-GB/admin/licenses/message.php +++ b/resources/lang/en-GB/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/en-GB/admin/licenses/table.php b/resources/lang/en-GB/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/en-GB/admin/licenses/table.php +++ b/resources/lang/en-GB/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/en-GB/admin/locations/message.php b/resources/lang/en-GB/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/en-GB/admin/locations/message.php +++ b/resources/lang/en-GB/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/locations/table.php b/resources/lang/en-GB/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/en-GB/admin/locations/table.php +++ b/resources/lang/en-GB/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/en-GB/admin/manufacturers/message.php b/resources/lang/en-GB/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/en-GB/admin/manufacturers/message.php +++ b/resources/lang/en-GB/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/manufacturers/table.php b/resources/lang/en-GB/admin/manufacturers/table.php index 418ddea1eb..bc38228ac0 100644 --- a/resources/lang/en-GB/admin/manufacturers/table.php +++ b/resources/lang/en-GB/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Asset Manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/en-GB/admin/models/general.php b/resources/lang/en-GB/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/en-GB/admin/models/general.php +++ b/resources/lang/en-GB/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/en-GB/admin/models/message.php b/resources/lang/en-GB/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/en-GB/admin/models/message.php +++ b/resources/lang/en-GB/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/models/table.php b/resources/lang/en-GB/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/en-GB/admin/models/table.php +++ b/resources/lang/en-GB/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/en-GB/admin/reports/general.php b/resources/lang/en-GB/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/en-GB/admin/reports/general.php +++ b/resources/lang/en-GB/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/en-GB/admin/reports/message.php b/resources/lang/en-GB/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/en-GB/admin/reports/message.php +++ b/resources/lang/en-GB/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php index ef0684f2a1..53b20e382b 100644 --- a/resources/lang/en-GB/admin/settings/general.php +++ b/resources/lang/en-GB/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Ticking this box will enforce a uniqueness constraint on asset serial numbers', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/en-GB/admin/settings/message.php b/resources/lang/en-GB/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/en-GB/admin/settings/message.php +++ b/resources/lang/en-GB/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/en-GB/admin/statuslabels/message.php b/resources/lang/en-GB/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/en-GB/admin/statuslabels/message.php +++ b/resources/lang/en-GB/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/en-GB/admin/statuslabels/table.php b/resources/lang/en-GB/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/en-GB/admin/statuslabels/table.php +++ b/resources/lang/en-GB/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/en-GB/admin/suppliers/message.php b/resources/lang/en-GB/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/en-GB/admin/suppliers/message.php +++ b/resources/lang/en-GB/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/en-GB/admin/suppliers/table.php b/resources/lang/en-GB/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/en-GB/admin/suppliers/table.php +++ b/resources/lang/en-GB/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/en-GB/admin/users/general.php b/resources/lang/en-GB/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/en-GB/admin/users/general.php +++ b/resources/lang/en-GB/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/en-GB/admin/users/message.php b/resources/lang/en-GB/admin/users/message.php index 65a75b08c2..7ab0854f92 100644 --- a/resources/lang/en-GB/admin/users/message.php +++ b/resources/lang/en-GB/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/en-GB/admin/users/table.php b/resources/lang/en-GB/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/en-GB/admin/users/table.php +++ b/resources/lang/en-GB/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/en-GB/auth/general.php b/resources/lang/en-GB/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/en-GB/auth/general.php +++ b/resources/lang/en-GB/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/en-GB/auth/message.php b/resources/lang/en-GB/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/en-GB/auth/message.php +++ b/resources/lang/en-GB/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/en-GB/button.php b/resources/lang/en-GB/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/en-GB/button.php +++ b/resources/lang/en-GB/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 7f5ad9e90a..b26a01f69b 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/en-GB/help.php b/resources/lang/en-GB/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/en-GB/help.php +++ b/resources/lang/en-GB/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/en-GB/mail.php b/resources/lang/en-GB/mail.php index 92c0d51b38..8f2f2d5093 100644 --- a/resources/lang/en-GB/mail.php +++ b/resources/lang/en-GB/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/en-GB/pagination.php b/resources/lang/en-GB/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/en-GB/pagination.php +++ b/resources/lang/en-GB/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/en-GB/passwords.php b/resources/lang/en-GB/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/en-GB/passwords.php +++ b/resources/lang/en-GB/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/en-GB/reminders.php b/resources/lang/en-GB/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/en-GB/reminders.php +++ b/resources/lang/en-GB/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/en-GB/table.php b/resources/lang/en-GB/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/en-GB/table.php +++ b/resources/lang/en-GB/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/en-GB/validation.php +++ b/resources/lang/en-GB/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/en-ID/admin/accessories/general.php b/resources/lang/en-ID/admin/accessories/general.php index 0dfa64429c..5f6bc72993 100644 --- a/resources/lang/en-ID/admin/accessories/general.php +++ b/resources/lang/en-ID/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategori Aksesoris', 'accessory_name' => 'Nama Aksesoris', 'checkout' => 'Keluarkan Aksesoris', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Gunakan standar primer EULA gantinya.', 'use_default_eula_disabled' => ' Gunakan EULA standar utama sebagai gantinya. Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.', -); +]; diff --git a/resources/lang/en-ID/admin/accessories/message.php b/resources/lang/en-ID/admin/accessories/message.php index ccd4ad1ea6..64563973f5 100644 --- a/resources/lang/en-ID/admin/accessories/message.php +++ b/resources/lang/en-ID/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Aksesori tidak dapat dibuat, silahkan coba kembali.', - 'success' => 'Aksesori berhasil dibuat.' - ), + 'success' => 'Aksesori berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Aksesori tidak dapat diperbaharui, silahkan coba kembali', - 'success' => 'Aksesori berhasil diperbaharui.' - ), + 'success' => 'Aksesori berhasil diperbaharui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin ingin menghapus aksesoris ini?', 'error' => 'Ada masalah untuk mengahpus aksesoris ini. Silahkan coba lagi.', - 'success' => 'Aksessoris ini berhasil dihapus.' - ), + 'success' => 'Aksessoris ini berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aksesori belum diperiksa, silakan coba lagi', 'success' => 'Aksesori berhasil diperiksa.', - 'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.' - ), + 'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aksesori belum diperiksa, silakan coba lagi', 'success' => 'Aksesori berhasil diperiksa.', - 'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.' - ) + 'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.', + ], - -); +]; diff --git a/resources/lang/en-ID/admin/accessories/table.php b/resources/lang/en-ID/admin/accessories/table.php index fe36d202a9..362648e29e 100644 --- a/resources/lang/en-ID/admin/accessories/table.php +++ b/resources/lang/en-ID/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Unduh CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Unduh CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Penerimaan', 'title' => 'Nama Aksesoris', - -); +]; diff --git a/resources/lang/en-ID/admin/asset_maintenances/form.php b/resources/lang/en-ID/admin/asset_maintenances/form.php index 095d05bd6e..4f59ee6405 100644 --- a/resources/lang/en-ID/admin/asset_maintenances/form.php +++ b/resources/lang/en-ID/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Waktu Maintenance aset (dalam hari)', 'notes' => 'Catatan', 'update' => 'Update Maintenance Aset', - 'create' => 'Erstellen' + 'create' => 'Erstellen', ]; diff --git a/resources/lang/en-ID/admin/asset_maintenances/message.php b/resources/lang/en-ID/admin/asset_maintenances/message.php index ec9552cae9..7347d9fdd2 100644 --- a/resources/lang/en-ID/admin/asset_maintenances/message.php +++ b/resources/lang/en-ID/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus pemeliharaan aset ini?', 'error' => 'Ada masalah menghapus pemeliharaan aset. Silakan coba lagi.', - 'success' => 'Pemeliharaan aset berhasil dihapus.' + 'success' => 'Pemeliharaan aset berhasil dihapus.', ], 'create' => [ 'error' => 'Pemeliharaan Aset gagal dibuat, silakan coba lagi.', - 'success' => 'Pemeliharaan Aset berhasil dibuat.' + 'success' => 'Pemeliharaan Aset berhasil dibuat.', ], 'edit' => [ 'error' => 'Pemeliharaan Aset gagal dirubah, silakan coba lagi.', - 'success' => 'Pemeliharaan Aset berhasil dirubah.' + 'success' => 'Pemeliharaan Aset berhasil dirubah.', ], 'asset_maintenance_incomplete' => 'Belum selesai', 'warranty' => 'Jaminan', 'not_warranty' => 'Tidak ada Jaminan', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/en-ID/admin/asset_maintenances/table.php b/resources/lang/en-ID/admin/asset_maintenances/table.php index 600429b236..9ad5646004 100644 --- a/resources/lang/en-ID/admin/asset_maintenances/table.php +++ b/resources/lang/en-ID/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Pemeliharaan Aset', 'asset_name' => 'Nama Aset', 'is_warranty' => 'Jaminan', - 'dl_csv' => 'Unduh CSV' + 'dl_csv' => 'Unduh CSV', ]; diff --git a/resources/lang/en-ID/admin/categories/general.php b/resources/lang/en-ID/admin/categories/general.php index 13df77cf59..36cfda52c2 100644 --- a/resources/lang/en-ID/admin/categories/general.php +++ b/resources/lang/en-ID/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategori Aset', 'category_name' => 'Nama Kategori', 'checkin_email' => 'Kirim email ke pengguna saat checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Gunakan standar primer EULA gantinya.', 'use_default_eula_disabled' => ' Gunakan EULA standar utama sebagai gantinya. Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.', -); +]; diff --git a/resources/lang/en-ID/admin/categories/message.php b/resources/lang/en-ID/admin/categories/message.php index e90c0d8a58..450d100331 100644 --- a/resources/lang/en-ID/admin/categories/message.php +++ b/resources/lang/en-ID/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategori tidak ada.', 'assoc_models' => 'Kategori ini saat ini terkait dengan setidaknya satu model dan tidak dapat dihapus. Silahkan update model Anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ', 'assoc_items' => 'Kategori ini saat ini terkait dengan setidaknya satu: jenis aset dan tidak dapat dihapus. Silahkan perbarui : Asset_TYPE untuk tidak lagi referensi kategori ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Kategori gagal dibuat, silahkan coba lagi.', - 'success' => 'Kategori Berhasil dibuat.' - ), + 'success' => 'Kategori Berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategori gagal diupdate, silahkan coba lagi', - 'success' => 'Kategori berhasil diupdate.' - ), + 'success' => 'Kategori berhasil diupdate.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus kategori ini?', 'error' => 'Ada masalah saat menghapus kategori. Silakan coba lagi.', - 'success' => 'Kategori berhasil dihapus.' - ) + 'success' => 'Kategori berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/categories/table.php b/resources/lang/en-ID/admin/categories/table.php index a89c42a40a..182bb6605b 100644 --- a/resources/lang/en-ID/admin/categories/table.php +++ b/resources/lang/en-ID/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Induk', 'require_acceptance' => 'Penerimaan', 'title' => 'Nama Kategori Aset', -); +]; diff --git a/resources/lang/en-ID/admin/companies/general.php b/resources/lang/en-ID/admin/companies/general.php index 935a433c9d..ced5aa68b1 100644 --- a/resources/lang/en-ID/admin/companies/general.php +++ b/resources/lang/en-ID/admin/companies/general.php @@ -1,4 +1,5 @@ 'Pilih Perusahaan', ]; diff --git a/resources/lang/en-ID/admin/companies/message.php b/resources/lang/en-ID/admin/companies/message.php index 2513cc8319..85a236b1ec 100644 --- a/resources/lang/en-ID/admin/companies/message.php +++ b/resources/lang/en-ID/admin/companies/message.php @@ -1,18 +1,19 @@ 'Perusahaan tidak ada.', 'assoc_users' => 'Kategori ini saat ini terkait dengan setidaknya satu model dan tidak dapat dihapus. Silahkan perbaharui model Anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Perusahaan tidak Tersimapn, Coba lagi.', - 'success' => 'Perusahaan sukses dibuat.' - ), - 'update' => array( + 'success' => 'Perusahaan sukses dibuat.', + ], + 'update' => [ 'error' => 'Perusahaan tidak diperbaharui, coba lagi', - 'success' => 'Perusahaan sukses diperbaharui.' - ), - 'delete' => array( + 'success' => 'Perusahaan sukses diperbaharui.', + ], + 'delete' => [ 'confirm' => 'Anda yakin ingin menghapus perusahaan ini?', 'error' => 'Ada masalah menghapus perusahaan. Silakan coba lagi.', - 'success' => 'Perusahaan berhasil dihapus.' - ) -); + 'success' => 'Perusahaan berhasil dihapus.', + ], +]; diff --git a/resources/lang/en-ID/admin/companies/table.php b/resources/lang/en-ID/admin/companies/table.php index a18f0dddba..1c8c11b8fe 100644 --- a/resources/lang/en-ID/admin/companies/table.php +++ b/resources/lang/en-ID/admin/companies/table.php @@ -1,9 +1,10 @@ 'Perusahaan', 'create' => 'Buat Perusahaan', 'title' => 'Perusahaan', 'update' => 'Perbaharui Perusahaan', 'name' => 'Nama Perusahaan', 'id' => 'ID', -); +]; diff --git a/resources/lang/en-ID/admin/components/general.php b/resources/lang/en-ID/admin/components/general.php index fe356c0f41..daa243b259 100644 --- a/resources/lang/en-ID/admin/components/general.php +++ b/resources/lang/en-ID/admin/components/general.php @@ -1,6 +1,6 @@ 'Nama Komponen', 'checkin' => 'Komponen Masuk', 'checkout' => 'Komponen Keluar', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Sisa', 'total' => 'Total', 'update' => 'Perbaharui Komponen', -); +]; diff --git a/resources/lang/en-ID/admin/components/message.php b/resources/lang/en-ID/admin/components/message.php index 1cf5256a01..62e0c6597f 100644 --- a/resources/lang/en-ID/admin/components/message.php +++ b/resources/lang/en-ID/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponen tidak ada.', - 'create' => array( + 'create' => [ 'error' => 'Komponen belum dibuat, silahkan coba lagi.', - 'success' => 'Komponen berhasil dibuat.' - ), + 'success' => 'Komponen berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponen gagal diubah, silahkan coba lagi', - 'success' => 'Komponen berhasil diubah.' - ), + 'success' => 'Komponen berhasil diubah.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin akan mengahpus komponen ini?', 'error' => 'Ada masalah untuk hapus komponen, silahkan coba kembali.', - 'success' => 'Komponen berhasil dihapus.' - ), + 'success' => 'Komponen berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponen tidak bisa dikeluarkan, silahkan coba kembali', 'success' => 'Komponen berhasil dikeluarkan.', - 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.' - ), + 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponen tidak bisa dimasukan, silahkan coba lagi', 'success' => 'Komponen berhasil dimasukan.', - 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.' - ) + 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.', + ], - -); +]; diff --git a/resources/lang/en-ID/admin/components/table.php b/resources/lang/en-ID/admin/components/table.php index a370845bf3..ec49357d02 100644 --- a/resources/lang/en-ID/admin/components/table.php +++ b/resources/lang/en-ID/admin/components/table.php @@ -1,5 +1,5 @@ 'Nama Komponen', -); +]; diff --git a/resources/lang/en-ID/admin/consumables/general.php b/resources/lang/en-ID/admin/consumables/general.php index 3cc2dcc073..6ad09714f3 100644 --- a/resources/lang/en-ID/admin/consumables/general.php +++ b/resources/lang/en-ID/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Periksa Comsumable ke pengguna', 'consumable_name' => 'Nama Consumable', 'create' => 'Buat Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Tersisa', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/en-ID/admin/consumables/message.php b/resources/lang/en-ID/admin/consumables/message.php index d1d176ad56..a040161da4 100644 --- a/resources/lang/en-ID/admin/consumables/message.php +++ b/resources/lang/en-ID/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable Tidak ada.', - 'create' => array( + 'create' => [ 'error' => 'Consumable gagal dibuat, silahkan coba lagi.', - 'success' => 'Consumable berhasil dibuat.' - ), + 'success' => 'Consumable berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable gagal diupdate, silahkan coba lagi', - 'success' => 'Consumable berhasil diupdate.' - ), + 'success' => 'Consumable berhasil diupdate.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus Consumable ini?', 'error' => 'Ada masalah menghapus Consumable. Silakan coba lagi.', - 'success' => 'Consumable berhasil dihapus.' - ), + 'success' => 'Consumable berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable tidak diperiksa, silakan coba lagi', 'success' => 'Consumable berhasil diperiksa.', - 'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.' - ), + 'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable tidak diperiksa, silakan coba lagi', 'success' => 'Consumable berhasil di-check in.', - 'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.' - ) + 'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.', + ], - -); +]; diff --git a/resources/lang/en-ID/admin/consumables/table.php b/resources/lang/en-ID/admin/consumables/table.php index 319387a745..cb0507972f 100644 --- a/resources/lang/en-ID/admin/consumables/table.php +++ b/resources/lang/en-ID/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nama Konsumable', -); +]; diff --git a/resources/lang/en-ID/admin/custom_fields/general.php b/resources/lang/en-ID/admin/custom_fields/general.php index 9c2eef11c8..84fa743e06 100644 --- a/resources/lang/en-ID/admin/custom_fields/general.php +++ b/resources/lang/en-ID/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Bidang Kustom', 'field' => 'Bidang', 'about_fieldsets_title' => 'Tentang Fieldsets', @@ -30,4 +30,4 @@ return array( 'create_field' => 'Kostum field baru', 'value_encrypted' => 'Nilai field ini dienkripsi dalam database. Hanya pengguna admin yang bisa melihat nilai dekripsi', 'show_in_email' => 'Sertakan nilai bidang ini dalam semua email keluar yang dikirim ke pengguna? Bidang yang terenkripsi tidak dapat disertakan dalam email.', -); +]; diff --git a/resources/lang/en-ID/admin/custom_fields/message.php b/resources/lang/en-ID/admin/custom_fields/message.php index 60d5408e84..fd9c5e7762 100644 --- a/resources/lang/en-ID/admin/custom_fields/message.php +++ b/resources/lang/en-ID/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Bidang tersebut tidak tersedia.', 'already_added' => 'Bidang sudah ditambahkan', - 'create' => array( + 'create' => [ 'error' => 'Bidang gagal dibuat, silahkan coba lagi.', 'success' => 'Kategori Berhasil dibuat.', - 'assoc_success' => 'Kategori berhasil ditambahkan ke fieldset.' - ), + 'assoc_success' => 'Kategori berhasil ditambahkan ke fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategori gagal diupdate, silahkan coba lagi', - 'success' => 'Kategori Berhasil dibuat.' - ), + 'success' => 'Kategori Berhasil dibuat.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus kategori ini?', 'error' => 'Terjadi masalah saat menghapus kategori. Silahkan coba lagi.', 'success' => 'Kategori berhasil dihapus.', 'in_use' => 'Kategori masih digunakan.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Kategori tidak ada', - 'create' => array( + 'create' => [ 'error' => 'Kategori gagal dibuat, silahkan coba lagi.', - 'success' => 'Kategori Berhasil dibuat.' - ), + 'success' => 'Kategori Berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategori gagal diupdate, silahkan coba lagi', - 'success' => 'Kategori Berhasil diperbarui.' - ), + 'success' => 'Kategori Berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus kategori ini?', 'error' => 'Terjadi masalah saat menghapus kategori. Silahkan coba lagi.', 'success' => 'Kategori berhasil dihapus.', 'in_use' => 'Kategori masih digunakan.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/en-ID/admin/departments/message.php b/resources/lang/en-ID/admin/departments/message.php index 10c6f3ce59..a9f256004d 100644 --- a/resources/lang/en-ID/admin/departments/message.php +++ b/resources/lang/en-ID/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departemen tidak ada.', 'assoc_users' => 'Saat ini kategori ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Silahkan perbaharui model Anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Komponen belum dibuat, silahkan coba lagi.', - 'success' => 'Komponen berhasil dibuat.' - ), - 'update' => array( + 'success' => 'Komponen berhasil dibuat.', + ], + 'update' => [ 'error' => 'Komponen belum diperbaharui, silahkan coba lagi', - 'success' => 'Komponen berhasil dibuat.' - ), - 'delete' => array( + 'success' => 'Komponen berhasil dibuat.', + ], + 'delete' => [ 'confirm' => 'Anda yakin akan mengahpus komponen ini?', 'error' => 'Ada masalah untuk hapus komponen, silahkan coba kembali.', - 'success' => 'Komponen berhasil dihapus.' - ) + 'success' => 'Komponen berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/departments/table.php b/resources/lang/en-ID/admin/departments/table.php index 5e237e234c..d9b3f86242 100644 --- a/resources/lang/en-ID/admin/departments/table.php +++ b/resources/lang/en-ID/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nama departemen', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokasi', 'create' => 'Buat Departemen', 'update' => 'Perbarui Departemen', - ); + ]; diff --git a/resources/lang/en-ID/admin/depreciations/general.php b/resources/lang/en-ID/admin/depreciations/general.php index 4c391019a4..ca716e652f 100644 --- a/resources/lang/en-ID/admin/depreciations/general.php +++ b/resources/lang/en-ID/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Tentang Penyusutan Aset', 'about_depreciations' => 'Anda dapat mengatur depresiasi aset berdasarkan straight-line depreciation.', 'asset_depreciations' => 'Penyusutan Aset', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Jumlah Bulan', 'update' => 'Perbarui pengurangan', -); +]; diff --git a/resources/lang/en-ID/admin/depreciations/message.php b/resources/lang/en-ID/admin/depreciations/message.php index 7059d102d7..4126a06375 100644 --- a/resources/lang/en-ID/admin/depreciations/message.php +++ b/resources/lang/en-ID/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Kelas penyusutan tidak ada.', 'assoc_users' => 'Penyusutan ini terkait dengan satu atau lebih model dan tidak dapat dihapus. Hapus model, dan kemudian coba hapus lagi. ', - - 'create' => array( + 'create' => [ 'error' => 'Kelas depresiasi gagal dibuat, silakan coba lagi. :(', - 'success' => 'Kelas penyusutan berhasil dibuat. :)' - ), + 'success' => 'Kelas penyusutan berhasil dibuat. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Kelas depresiasi gagal diperbarui, silakan coba lagi', - 'success' => 'Kelas penyusutan berhasil diperbarui.' - ), + 'success' => 'Kelas penyusutan berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus kelas depresiasi ini?', 'error' => 'Ada masalah menghapus kelas penyusutan. Silakan coba lagi.', - 'success' => 'Kelas depresiasi berhasil dihapus.' - ) + 'success' => 'Kelas depresiasi berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/depreciations/table.php b/resources/lang/en-ID/admin/depreciations/table.php index b2c92b0641..90a58d596a 100644 --- a/resources/lang/en-ID/admin/depreciations/table.php +++ b/resources/lang/en-ID/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Bulan', 'term' => 'Term', 'title' => 'Nama ', -); +]; diff --git a/resources/lang/en-ID/admin/groups/message.php b/resources/lang/en-ID/admin/groups/message.php index 8c399400ab..19138d2c7a 100644 --- a/resources/lang/en-ID/admin/groups/message.php +++ b/resources/lang/en-ID/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grup sudah ada!', 'group_not_found' => 'Group [:id] tidak ada.', 'group_name_required' => 'Nama field diperlukan', - 'success' => array( + 'success' => [ 'create' => 'Group berhasil dibuat.', 'update' => 'Grup berhasil diperbarui.', 'delete' => 'Grup berhasil dihapus.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus grup ini?', 'create' => 'Ada masalah saat membuat Grup. Silakan coba lagi.', 'update' => 'Ada masalah saat memperbarui Grup. Silakan coba lagi.', 'delete' => 'Ada masalah saat menghapus grup. Silakan coba lagi.', - ), + ], -); +]; diff --git a/resources/lang/en-ID/admin/groups/table.php b/resources/lang/en-ID/admin/groups/table.php index 226fb86336..8b7bdcde48 100644 --- a/resources/lang/en-ID/admin/groups/table.php +++ b/resources/lang/en-ID/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nama', 'users' => '# Pengguna', -); +]; diff --git a/resources/lang/en-ID/admin/groups/titles.php b/resources/lang/en-ID/admin/groups/titles.php index fbebd80a19..31313d0b4b 100644 --- a/resources/lang/en-ID/admin/groups/titles.php +++ b/resources/lang/en-ID/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Tentang grup', 'about_groups' => 'Grup digunakan untuk menyamaratakan izin pengguna.', 'group_management' => 'Manajemen grup', @@ -11,4 +11,4 @@ return array( 'allow' => 'Diijinkan', 'deny' => 'Dilarang', -); +]; diff --git a/resources/lang/en-ID/admin/hardware/form.php b/resources/lang/en-ID/admin/hardware/form.php index a39a28cb3d..350d1a08c1 100644 --- a/resources/lang/en-ID/admin/hardware/form.php +++ b/resources/lang/en-ID/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Konfirmasi hapus semua aset', +return [ + 'bulk_delete' => 'Konfirmasi hapus semua aset', 'bulk_delete_help' => 'Tinjau aset untuk penghapusan massal di bawah ini. Setelah dihapus, aset ini dapat dipulihkan, namun tidak akan dikaitkan lagi dengan pengguna yang saat ini mereka tentukan.', 'bulk_delete_warn' => 'Anda akan menghapus :asset_count assets.', - 'bulk_update' => 'Perbarui Aset secara massal', - 'bulk_update_help' => 'Formulir ini memungkinkan Anda untuk memperbarui beberapa aset sekaligus. Hanya mengisi kolom yang Anda butuhkan untuk mengubah. Setiap bidang dibiarkan kosong tidak berubah. ', - 'bulk_update_warn' => 'Anda akan mengedit properti :asset_count aset.', + 'bulk_update' => 'Perbarui Aset secara massal', + 'bulk_update_help' => 'Formulir ini memungkinkan Anda untuk memperbarui beberapa aset sekaligus. Hanya mengisi kolom yang Anda butuhkan untuk mengubah. Setiap bidang dibiarkan kosong tidak berubah. ', + 'bulk_update_warn' => 'Anda akan mengedit properti :asset_count aset.', 'checkedout_to' => 'Checkout ke', 'checkout_date' => 'Tanggal Check out', 'checkin_date' => 'Tanggal Check in', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tag Aset', 'update' => 'Perbarui aset', 'warranty' => 'Garansi', - 'warranty_expires' => 'Garansi kadaluarsa', + 'warranty_expires' => 'Garansi kadaluarsa', 'years' => 'tahun', -) -; +]; diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php index 9d673e8acb..5521cebf15 100644 --- a/resources/lang/en-ID/admin/hardware/general.php +++ b/resources/lang/en-ID/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Tentang Aset', 'about_assets_text' => 'Aset adalah item yang dilacak dengan nomor seri atau tag aset. Mereka cenderung menjadi item nilai lebih tinggi di mana mengidentifikasi item tertentu yang penting.', - 'archived' => 'Diarsipkan', + 'archived' => 'Diarsipkan', 'asset' => 'Aset', 'bulk_checkout' => 'Pengeluaran Aset', 'checkin' => 'Mendaftar aset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Tertunda', 'undeployable' => 'Tidak dapat disebarkan', 'view' => 'Lihat aset', -); +]; diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php index a0cff672ca..47cf4875b3 100644 --- a/resources/lang/en-ID/admin/hardware/message.php +++ b/resources/lang/en-ID/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Peringatan:Aset ini telah ditandai karena saat ini tidak dapat dipasangkan lagi. Jika status ini telah berubah, harap perbarui status aset.', 'does_not_exist' => 'Aset tidak ada.', 'does_not_exist_or_not_requestable' => 'Percobaan yang bagus Aset itu tidak ada atau tidak dapat diminta.', 'assoc_users' => 'Aset ini saat ini diperiksa ke pengguna dan tidak dapat dihapus. Harap periksa dulu asetnya, lalu coba hapus lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Aset tidak dibuat, coba lagi. :(', - 'success' => 'Aset berhasil dibuat. :)' - ), + 'success' => 'Aset berhasil dibuat. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Aset tidak diperbarui, coba lagi', 'success' => 'Aset Berhasil diperbarui.', 'nothing_updated' => 'Tidak ada kategori yang dipilih, jadi tidak ada yang diperbarui.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Aset tidak dikembalikan, coba lagi', - 'success' => 'Aset Berhasil dikembalikan.' - ), + 'success' => 'Aset Berhasil dikembalikan.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audit aset tidak berhasil. Silahkan coba lagi.', - 'success' => 'Audit aset berhasil dimasuki.' - ), + 'success' => 'Audit aset berhasil dimasuki.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Berkas tidak terhapus. Silahkan coba lagi.', 'success' => 'File berhasil dihapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas(s) tidak diunggah. Silahkan coba lagi.', 'success' => 'Berkas(s) berhasil diunggah.', 'nofiles' => 'Anda tidak memilih file untuk diunggah, atau file yang ingin Anda unggah terlalu besar', 'invalidfiles' => 'Satu atau lebih berkas anda terlalu besar atau jenis berkas tidak dibolehkan. Jenis berkas yang dibolehkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Beberapa item tidak diimpor dengan benar.', 'errorDetail' => 'Item berikut tidak diimpor karena kesalahan.', - 'success' => "File Anda telah diimpor", - 'file_delete_success' => "File anda telah berhasil dihapus", - 'file_delete_error' => "File tidak dapat dihapus", - ), + 'success' => 'File Anda telah diimpor', + 'file_delete_success' => 'File anda telah berhasil dihapus', + 'file_delete_error' => 'File tidak dapat dihapus', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Yakin ingin menghapus aset ini?', 'error' => 'Terjadi masalah saat menghapus aset. Silahkan coba lagi.', 'nothing_updated' => 'Tidak ada aset yang dipilih, jadi tidak ada yang diperbarui.', - 'success' => 'Aset berhasil dihapus.' - ), + 'success' => 'Aset berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aset tidak dapat diperiksa, silahkan coba lagi', 'success' => 'Aset berhasil diperiksa.', 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.', 'not_available' => 'Aset itu tersebut tidak tersedia untuk checkout!', - 'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar' - ), + 'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aset tidak dicek, coba lagi', 'success' => 'Aset berhasil dicek.', 'user_does_not_exist' => 'Pengguna tidak cocok. Silahkan coba lagi.', 'already_checked_in' => 'Aset tersebut sudah diperiksa.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Aset tidak dikembalikan, coba lagi', 'success' => 'Aset Berhasil dikembalikan.', - 'canceled' => 'Permintaan checkout berhasil dibatalkan' - ) + 'canceled' => 'Permintaan checkout berhasil dibatalkan', + ], -); +]; diff --git a/resources/lang/en-ID/admin/hardware/table.php b/resources/lang/en-ID/admin/hardware/table.php index 12669c0e7c..4ec35338a3 100644 --- a/resources/lang/en-ID/admin/hardware/table.php +++ b/resources/lang/en-ID/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Tag Aset', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Aset ', 'image' => 'Perangkat Gambar', 'days_without_acceptance' => 'Hari tanpa penerimaan', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/en-ID/admin/kits/general.php b/resources/lang/en-ID/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/en-ID/admin/kits/general.php +++ b/resources/lang/en-ID/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/en-ID/admin/licenses/form.php b/resources/lang/en-ID/admin/licenses/form.php index fb66a7ab1b..71636121ae 100644 --- a/resources/lang/en-ID/admin/licenses/form.php +++ b/resources/lang/en-ID/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Aset', 'checkin' => 'Mendaftar', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Berlisensi untuk Email', 'to_name' => 'Berlisensi untuk nama', 'update' => 'Perbarui Lisensi', - 'checkout_help' => 'Anda harus memeriksa lisensi ke aset perangkat keras atau seseorang. Anda dapat memilih keduanya, namun pemilik aset harus sama dengan orang yang Anda periksa dari aset tersebut.' -); + 'checkout_help' => 'Anda harus memeriksa lisensi ke aset perangkat keras atau seseorang. Anda dapat memilih keduanya, namun pemilik aset harus sama dengan orang yang Anda periksa dari aset tersebut.', +]; diff --git a/resources/lang/en-ID/admin/licenses/general.php b/resources/lang/en-ID/admin/licenses/general.php index b1abe81765..3740cb9f73 100644 --- a/resources/lang/en-ID/admin/licenses/general.php +++ b/resources/lang/en-ID/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Tentang Lisensi', 'about_licenses' => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah seat tertentu yang bisa diperiksa ke individu', 'checkin' => 'Daftar lisensi seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Lisensi perangkat lunak', 'user' => 'Pengguna', 'view' => 'Lihat lisensi', -); +]; diff --git a/resources/lang/en-ID/admin/licenses/message.php b/resources/lang/en-ID/admin/licenses/message.php index 6cb6562526..a2b6394b62 100644 --- a/resources/lang/en-ID/admin/licenses/message.php +++ b/resources/lang/en-ID/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisensi tidak ada.', 'user_does_not_exist' => 'Pengguna tidak ada.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Anda harus memilih aset atau pengguna, namun tidak keduanya.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Lisensi gagal dibuat, silahkan coba lagi.', - 'success' => 'Lisensi Berhasil dibuat.' - ), + 'success' => 'Lisensi Berhasil dibuat.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File tidak terhapus Silahkan coba lagi.', 'success' => 'File berhasil dihapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas(s) tidak diunggah. Silahkan coba lagi.', 'success' => 'Berkas(s) berhasil diunggah.', 'nofiles' => 'Anda tidak memilih file untuk diunggah, atau file yang ingin Anda unggah terlalu besar', 'invalidfiles' => 'Satu atau lebih berkas anda terlalu besar atau jenis berkas tidak dibolehkan. Jenis berkas yang dibolehkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lisensi gagal dibuat, silahkan coba lagi', - 'success' => 'Lisensi Berhasil dibuat.' - ), + 'success' => 'Lisensi Berhasil dibuat.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin ingin menghapus lisensi ini?', 'error' => 'Terjadi masalah saat menghapus lisensi. Silahkan coba lagi.', - 'success' => 'Lisensi berhasil dihapus.' - ), + 'success' => 'Lisensi berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Terjadi masalah saat menghapus lisensi. Silahkan coba lagi.', - 'success' => 'Lisensi berhasil diperiksa' - ), + 'success' => 'Lisensi berhasil diperiksa', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Terjadi masalah saat menghapus lisensi. Silahkan coba lagi.', - 'success' => 'Lisensi berhasil diperiksa' - ), + 'success' => 'Lisensi berhasil diperiksa', + ], -); +]; diff --git a/resources/lang/en-ID/admin/licenses/table.php b/resources/lang/en-ID/admin/licenses/table.php index 9a435223ec..58db6a9e73 100644 --- a/resources/lang/en-ID/admin/licenses/table.php +++ b/resources/lang/en-ID/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Ditugaskan untuk', 'checkout' => 'Masuk/keluar', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Lisensi', -); +]; diff --git a/resources/lang/en-ID/admin/locations/message.php b/resources/lang/en-ID/admin/locations/message.php index 763eb0e56b..595effc86e 100644 --- a/resources/lang/en-ID/admin/locations/message.php +++ b/resources/lang/en-ID/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokasi tidak ada.', 'assoc_users' => 'Saat ini kategori ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Silahkan perbaharui pengguna anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ', 'assoc_assets' => 'Saat ini kategori ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Silahkan perbaharui pengguna anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ', 'assoc_child_loc' => 'Lokasi ini saat ini merupakan induk dari setidaknya satu lokasi anak dan tidak dapat dihapus. Perbarui lokasi Anda agar tidak lagi merujuk lokasi ini dan coba lagi. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokasi tidak dibuat, coba lagi.', - 'success' => 'Lokasi berhasil dibuat.' - ), + 'success' => 'Lokasi berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokasi tidak diperbarui, silakan coba lagi', - 'success' => 'Lokasi berhasil diperbarui.' - ), + 'success' => 'Lokasi berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah anda yakin ingin menghapus lokasi ini?', 'error' => 'Terjadi masalah saat menghapus lokasi. Silahkan coba lagi.', - 'success' => 'Lokasi telah berhasil dihapus.' - ) + 'success' => 'Lokasi telah berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/locations/table.php b/resources/lang/en-ID/admin/locations/table.php index 3e4259a271..4d0898b3b4 100644 --- a/resources/lang/en-ID/admin/locations/table.php +++ b/resources/lang/en-ID/admin/locations/table.php @@ -1,6 +1,6 @@ 'Tentang Lokasi', 'about_locations' => 'Lokasi digunakan untuk melacak informasi lokasi bagi pengguna, aset, dan item lainnya', 'assets_rtd' => 'Aset', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Induk', 'currency' => 'Mata Uang Lokasi', 'ldap_ou' => 'LDAP Cari OU', - ); + ]; diff --git a/resources/lang/en-ID/admin/manufacturers/message.php b/resources/lang/en-ID/admin/manufacturers/message.php index 80fc1fa8bf..c909041b8c 100644 --- a/resources/lang/en-ID/admin/manufacturers/message.php +++ b/resources/lang/en-ID/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Produsen tidak ada.', 'assoc_users' => 'Produsen ini saat ini terkait dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda agar tidak lagi mereferensikan produsen ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Produsen tidak dibuat, silahkan dicoba lagi.', - 'success' => 'Produsen berhasil dibuat.' - ), + 'success' => 'Produsen berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Produsen tidak diperbarui, silahkan coba lagi', - 'success' => 'Produsen berhasil diperbarui.' - ), + 'success' => 'Produsen berhasil diperbarui.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Pabrikan tidak dapat dipulihkan, silakan coba kembali', - 'success' => 'Pabrikan berhasil dipulihkan.' - ), + 'success' => 'Pabrikan berhasil dipulihkan.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin ingin menghapus produsen ini?', 'error' => 'Terjadi masalah saat menghapus produsen. Silahkan coba lagi.', - 'success' => 'Produsen berhasil dihapus.' - ) + 'success' => 'Produsen berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/manufacturers/table.php b/resources/lang/en-ID/admin/manufacturers/table.php index 6920c5459e..bffb9a0c13 100644 --- a/resources/lang/en-ID/admin/manufacturers/table.php +++ b/resources/lang/en-ID/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Tentang produsen', 'about_manufacturers_text' => 'Produsen adalah perusahaan yang menciptakan aset Anda. Anda dapat menyimpan informasi kontak pendukung penting tentang mereka di sini, yang akan ditampilkan di halaman detail aset Anda.', 'asset_manufacturers' => 'Produsen aset', @@ -13,4 +13,4 @@ return array( 'update' => 'Perbarui produsen', 'url' => 'URL', -); +]; diff --git a/resources/lang/en-ID/admin/models/general.php b/resources/lang/en-ID/admin/models/general.php index ae294895df..21cf9ca3d4 100644 --- a/resources/lang/en-ID/admin/models/general.php +++ b/resources/lang/en-ID/admin/models/general.php @@ -1,6 +1,6 @@ 'Tentang Model Aset', 'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.', 'deleted' => 'Model ini telah dihapus. Klik di sini untuk memulihkannya.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Anda akan menghapus: model aset model_count.', 'restore' => 'Kembalikan model', 'requestable' => 'Pengguna dapat meminta model ini', - 'show_mac_address' => 'Tampilkan bidang alamat MAC dalam aset model ini', + 'show_mac_address' => 'Tampilkan bidang alamat MAC dalam aset model ini', 'view_deleted' => 'View dihapus', 'view_models' => 'Lihat model', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Tidak ada bidang khusus', 'add_default_values' => 'Tambah nilai default', -); +]; diff --git a/resources/lang/en-ID/admin/models/message.php b/resources/lang/en-ID/admin/models/message.php index 995b58d058..93a141b519 100644 --- a/resources/lang/en-ID/admin/models/message.php +++ b/resources/lang/en-ID/admin/models/message.php @@ -1,42 +1,41 @@ 'Model tidak ada.', 'assoc_users' => 'Model ini saat ini dikaitkan dengan satu atau lebih aset dan tidak dapat dihapus. Harap hapus asetnya, lalu coba hapus lagi. ', - - 'create' => array( + 'create' => [ 'error' => 'Model tidak dibuat, silahkan dicoba lagi.', 'success' => 'Model berhasil dibuat.', 'duplicate_set' => 'Model aset dengan nama, nama produsen dan nomor model yang sudah ada.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model tidak diperbarui, silahkan dicoba lagi', - 'success' => 'Model berhasil diperbarui.' - ), + 'success' => 'Model berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Yakin ingin menghapus model aset ini?', 'error' => 'Terjadi masalah saat menghapus model. Silahkan coba lagi.', - 'success' => 'Model berhasil dihapus.' - ), + 'success' => 'Model berhasil dihapus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Aset tidak dikembalikan, coba lagi', - 'success' => 'Model berhasil dikembalikan.' - ), + 'success' => 'Model berhasil dikembalikan.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Tidak ada bidang yang berubah, jadi tidak ada yang diperbarui.', - 'success' => 'Model diperbarui.' - ), + 'success' => 'Model diperbarui.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Tidak ada model yang dipilih, jadi tidak ada yang dihapus.', 'success' => ':success_count model(s) dihapus!', - 'success_partial' => ':success_count model(s) telah dihapus, namun: fail_count tidak dapat dihapus karena mereka masih memiliki aset yang terkait dengannya.' - ), + 'success_partial' => ':success_count model(s) telah dihapus, namun: fail_count tidak dapat dihapus karena mereka masih memiliki aset yang terkait dengannya.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/models/table.php b/resources/lang/en-ID/admin/models/table.php index 362f11721e..b66c2c749f 100644 --- a/resources/lang/en-ID/admin/models/table.php +++ b/resources/lang/en-ID/admin/models/table.php @@ -1,6 +1,6 @@ 'Buat Model Aset', 'created_at' => 'Dibuat di', @@ -14,4 +14,4 @@ return array( 'update' => 'Perbarui model aset', 'clone' => 'Gandakan model', 'edit' => 'Ubah model', -); +]; diff --git a/resources/lang/en-ID/admin/reports/general.php b/resources/lang/en-ID/admin/reports/general.php index 94e8a85068..75c1d01588 100644 --- a/resources/lang/en-ID/admin/reports/general.php +++ b/resources/lang/en-ID/admin/reports/general.php @@ -1,5 +1,5 @@ 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.' -); +return [ + 'info' => 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.', +]; diff --git a/resources/lang/en-ID/admin/reports/message.php b/resources/lang/en-ID/admin/reports/message.php index 1ef096520e..f94ab75ed2 100644 --- a/resources/lang/en-ID/admin/reports/message.php +++ b/resources/lang/en-ID/admin/reports/message.php @@ -1,5 +1,5 @@ 'Anda harus memilih setidaknya satu pilihan.' -); +return [ + 'error' => 'Anda harus memilih setidaknya satu pilihan.', +]; diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php index 27430f484c..c313b638cb 100644 --- a/resources/lang/en-ID/admin/settings/general.php +++ b/resources/lang/en-ID/admin/settings/general.php @@ -1,12 +1,12 @@ 'Direktori Berkas', 'ad_domain' => 'Domain Direktori Aktif', 'ad_domain_help' => 'Terkadang ini sama dengan domain email anda, tapi tidak selalu.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Tembusan Email', 'admin_cc_email_help' => 'Jika Anda ingin mengirim salinan email checkin / checkout yang dikirimkan ke pengguna akun email tambahan, masukkan di sini. Jika tidak, biarkan bidang ini kosong.', 'is_ad' => 'Ini adalah server aktif direktori', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ambang batas waktu kadaluwarsa (dalam beberapa hari)', 'alert_inv_threshold' => 'Ambang Batas Invertaris', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID Aset', 'audit_interval' => 'Memeriksa perbedaan', 'audit_interval_help' => 'Jika anda diminta untuk melakukan audit aset secara fisik dengan teratur, maka masukkan selang waktu dalam beberapa bulan.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Masukkan Kode Dua Faktor', 'two_factor_config_complete' => 'Kirim Kode', 'two_factor_enabled_edit_not_allowed' => 'Administrator anda tidak mengizinkan anda untuk mengedit pengaturan ini.', - 'two_factor_enrollment_text' => "Diperlukan dua faktor otentikasi, namun perangkat anda belum terdaftar. Buka aplikasi Google Authenticator anda dan pindai kode QR dibawah ini untuk mendaftarkan perangkat anda. Setelah perangkat anda terdaftar, masukkan kode dibawah ini", + 'two_factor_enrollment_text' => 'Diperlukan dua faktor otentikasi, namun perangkat anda belum terdaftar. Buka aplikasi Google Authenticator anda dan pindai kode QR dibawah ini untuk mendaftarkan perangkat anda. Setelah perangkat anda terdaftar, masukkan kode dibawah ini', 'require_accept_signature' => 'Membutuhkan Tanda Tangan', 'require_accept_signature_help_text' => 'Mengaktifkan fitur ini akan mengharuskan pengguna secara fisik menandatangani untuk menerima aset.', 'left' => 'kiri', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Menandai boks ini akan membuat adanya batasan keunikan pada tiap nomor seri aset', 'zerofill_count' => 'Panjang tag aset, termasuk isian kosong', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/en-ID/admin/settings/message.php b/resources/lang/en-ID/admin/settings/message.php index 276e29491f..51960823e2 100644 --- a/resources/lang/en-ID/admin/settings/message.php +++ b/resources/lang/en-ID/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Terjadi kesalahan saat memperbarui. ', - 'success' => 'Pengaturan berhasil diperbarui.' - ), - 'backup' => array( + 'success' => 'Pengaturan berhasil diperbarui.', + ], + 'backup' => [ 'delete_confirm' => 'Apakah anda yakin ingin menghapus berkas cadangan ini? Tindakan ini tidak dibatalkan. ', 'file_deleted' => 'Berkas cadangan berhasil dihapus. ', 'generated' => 'Berkas cadangan baru berhasil dibuat.', 'file_not_found' => 'Berkas cadangan itu tidak dapat ditemukan di peladen.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Terjadi kesalahan saat membersihkan. ', 'validation_failed' => 'Konfirmasi pembersihan Anda salah Ketikkan kata "HAPUS" di kotak konfirmasi.', - 'success' => 'Catatan yang dihapus berhasil dibersihkan.' - ), + 'success' => 'Catatan yang dihapus berhasil dibersihkan.', + ], -); +]; diff --git a/resources/lang/en-ID/admin/statuslabels/message.php b/resources/lang/en-ID/admin/statuslabels/message.php index c01ddf61c6..2b42b4a51a 100644 --- a/resources/lang/en-ID/admin/statuslabels/message.php +++ b/resources/lang/en-ID/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Label Status tidak tersedia.', 'assoc_assets' => 'Label status ini dikaitkan dengan setidaknya satu aset dan tidak dapat dihapus. Harap perbarui aset anda agar tidak merujuk pada status ini dan coba lagi. ', - - 'create' => array( + 'create' => [ 'error' => 'Label status gagal dibuat, silahkan coba lagi.', - 'success' => 'Label status berhasil dibuat.' - ), + 'success' => 'Label status berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Label status gagal diperbarui, silahkan coba lagi', - 'success' => 'Label status berhasil diperbarui.' - ), + 'success' => 'Label status berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah anda yakin ingin menghapus Label Status ini?', 'error' => 'Terjadi masalah saat menghapus Label Status. Silahkan coba lagi.', - 'success' => 'Label Status berhasil dihapus.' - ), + 'success' => 'Label Status berhasil dihapus.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Aset ini tidak dapat diberikan kepada siapapun.', 'deployable' => 'Aset ini bisa diperiksa. Begitu mereka ditetapkan, mereka akan menganggap status meta Deployed.', 'archived' => 'Aset ini tidak dapat diperiksa, dan hanya akan muncul di tampilan Arsip. Ini berguna untuk menyimpan informasi tentang aset untuk tujuan anggaran / sejarah namun menjauhkan mereka dari daftar aset sehari-hari.', 'pending' => 'Aset ini belum bisa diberikan kepada siapapun, sering digunakan untuk barang yang sedang diperbaiki, namun diperkirakan akan kembali beredar.', - ), + ], -); +]; diff --git a/resources/lang/en-ID/admin/statuslabels/table.php b/resources/lang/en-ID/admin/statuslabels/table.php index 4ae772ca9d..c8f15b22e3 100644 --- a/resources/lang/en-ID/admin/statuslabels/table.php +++ b/resources/lang/en-ID/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Tentang Label Status', 'archived' => 'Diarsipkan', 'create' => 'Buat label status', @@ -16,4 +16,4 @@ return array( 'title' => 'Label status', 'undeployable' => 'Tidak dapat disebarkan', 'update' => 'Perbarui label status', -); +]; diff --git a/resources/lang/en-ID/admin/suppliers/message.php b/resources/lang/en-ID/admin/suppliers/message.php index cf6ef66e60..0b64d3f3ef 100644 --- a/resources/lang/en-ID/admin/suppliers/message.php +++ b/resources/lang/en-ID/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Pemasok tidak ada.', - - 'create' => array( + 'create' => [ 'error' => 'Pemasok belum dibuat, silahkan coba lagi.', - 'success' => 'Pemasok berhasil dibuat.' - ), + 'success' => 'Pemasok berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pemasok tidak diperbarui, silakan coba lagi', - 'success' => 'Pemasok berhasil diperbarui.' - ), + 'success' => 'Pemasok berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Yakin ingin menghapus pemasok ini?', 'error' => 'Terjadi masalah saat menghapus pemasok. Silahkan coba lagi.', 'success' => 'Pemasok berhasil dihapus.', 'assoc_assets' => 'Pemasok saat ini terkait dengan :asset_count asset(s) aset dan tidak dapat dihapus. Harap perbarui aset Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', 'assoc_licenses' => 'Saat ini Pemasok terkait dengan :licenses_count licences(s) dan tidak dapat dihapus. Harap perbarui lisensi Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', 'assoc_maintenances' => 'Pemasok saat ini terkait dengan :asset_maintenances_count asset maintenances(s) dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi mereferensikan pemasok ini dan coba lagi. ', - ) + ], -); +]; diff --git a/resources/lang/en-ID/admin/suppliers/table.php b/resources/lang/en-ID/admin/suppliers/table.php index 979b2bc040..1eb128bf8e 100644 --- a/resources/lang/en-ID/admin/suppliers/table.php +++ b/resources/lang/en-ID/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Tentang Pemasok', 'about_suppliers_text' => 'Pemasok digunakan untuk melacak sumber barang', 'address' => 'Alamat pemasok', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Lihat Aset untuk', 'zip' => 'Kode pos', -); +]; diff --git a/resources/lang/en-ID/admin/users/general.php b/resources/lang/en-ID/admin/users/general.php index ebeb177243..1202de1c4d 100644 --- a/resources/lang/en-ID/admin/users/general.php +++ b/resources/lang/en-ID/admin/users/general.php @@ -1,7 +1,6 @@ 'Pengguna ini dapat masuk', 'activated_disabled_help_text' => 'Anda tidak dapat menyunting status aktivasi akun anda sendiri.', 'assets_user' => 'Aset ditetapkan untuk :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Sunting Pengguna', 'filetype_info' => 'Tipe file yang dibolehkan png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Riwayat untuk :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klik disini untuk mengembalikan mereka.', 'last_login' => 'Masuk terakhir', 'ldap_config_text' => 'Pengaturan konfigurasi LDAP dapat ditemukan di Admin > Pengaturan. Lokasi pilihan (opsional) akan di atur untuk semua pengguna yang diimpor.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Pengaturan admin anda saat ini membolehkan pelaksanaan otentifikasi dua-faktor secara selektif. ', 'two_factor_enrolled' => 'Perangkat 2FA Terdaftar ', 'two_factor_active' => '2FA Aktif ', - ); + ]; diff --git a/resources/lang/en-ID/admin/users/message.php b/resources/lang/en-ID/admin/users/message.php index d247a4e5f5..04367599fe 100644 --- a/resources/lang/en-ID/admin/users/message.php +++ b/resources/lang/en-ID/admin/users/message.php @@ -1,6 +1,6 @@ 'Anda sudah berhasil menerima aset ini.', 'declined' => 'Anda sudah berhasil menolak aset ini.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integrasi LDAP sudah tidak dikonfigurasikan untuk instalasi ini.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Pengguna berhasil dibuat.', 'update' => 'Pengguna berhasil diperbarui.', 'update_bulk' => 'Pengguna berhasil diperbarui!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Pengguna berhasil tidak ditangguhkan.', 'restored' => 'Pengguna berhasil dikembalikan.', 'import' => 'Pengguna berhasil diimpor.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Terjadi masalah saat membuat pengguna. Silahkan coba lagi.', 'update' => 'Terjadi masalah saat memperbarui pengguna. Silahkan coba lagi.', 'delete' => 'Terjadi masalah saat menghapus pengguna. Silahkan coba lagi.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Tidak dapat mencari peladen LDAP. Silahkan periksa konfigurasi peladen LDAP anda di berkas konfigurasi LDAP.
Kesalahan dari peladen LDAP:', 'ldap_could_not_get_entries' => 'Tidak bisa mendapatkan entri dari peladen LDAP. Silakan periksa konfigurasi peladen LDAP Anda di berkas konfigurasi LDAP.
Kesalahan dari peladen LDAP:', 'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP/Direktori Aktif. Silakan hubungi departemen IT Anda untuk mengubah kata sandi Anda. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Berkas tidak terhapus. Silahkan coba lagi.', 'success' => 'Berkas berhasil dihapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas(s) tidak diunggah. Silahkan coba lagi.', 'success' => 'Berkas(s) berhasil diunggah.', 'nofiles' => 'Anda tidak memilih berkas apa pun untuk diunggah', 'invalidfiles' => 'Satu atau lebih berkas anda terlalu besar atau jenis berkas tidak dibolehkan. Jenis berkas yang dibolehkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], -); +]; diff --git a/resources/lang/en-ID/admin/users/table.php b/resources/lang/en-ID/admin/users/table.php index 848080ec01..e788d40919 100644 --- a/resources/lang/en-ID/admin/users/table.php +++ b/resources/lang/en-ID/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktif', 'allow' => 'Izinkan', 'checkedout' => 'Aset', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Tampilkan pengguna saat ini', 'show_deleted' => 'Tampilkan pengguna yang dihapus', 'title' => 'Judul', - 'to_restore_them' => 'untuk mengembalikan mereka.', + 'to_restore_them' => 'untuk mengembalikan mereka.', 'updateuser' => 'Perbarui pengguna', 'username' => 'Nama pengguna', - 'user_deleted_text' => 'Pengguna ini sudah ditandai sebagai sudah terhapus.', + 'user_deleted_text' => 'Pengguna ini sudah ditandai sebagai sudah terhapus.', 'username_note' => '(Ini hanya digunakan untuk mengikat Direktori Aktif saja, bukan untuk login.)', 'cloneuser' => 'Gandakan pengguna', 'viewusers' => 'Tampilkan pengguna', -); +]; diff --git a/resources/lang/en-ID/auth/general.php b/resources/lang/en-ID/auth/general.php index a8b89c5e5e..14696ccaaf 100644 --- a/resources/lang/en-ID/auth/general.php +++ b/resources/lang/en-ID/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/en-ID/auth/message.php b/resources/lang/en-ID/auth/message.php index e4c6902e57..bb0cea8cab 100644 --- a/resources/lang/en-ID/auth/message.php +++ b/resources/lang/en-ID/auth/message.php @@ -1,6 +1,6 @@ 'Akun dengan surel ini sudah ada.', 'account_not_found' => 'Nama pengguna atau kata sandi salah.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Akun pengguna ini diblokir.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Terjadi kesalahan saat mencoba masuk, silahkan coba lagi.', 'success' => 'Anda sudah berhasil masuk.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Terjadi kesalahan saat mencoba buat akun anda, silahkan coba lagi.', 'success' => 'Akun berhasil dibuat.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Terjadi kesalahan saat mencoba mendapatkan kode kata sandi atur ulang, silahkan coba lagi.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Terjadi kesalahan saat mencoba atur ulang kata sandi anda, silahkan coba lagi.', 'success' => 'Kata sandi anda sudah berhasil di atur ulang.', - ), + ], - -); +]; diff --git a/resources/lang/en-ID/button.php b/resources/lang/en-ID/button.php index 32dc18c090..6f2fdb0de1 100644 --- a/resources/lang/en-ID/button.php +++ b/resources/lang/en-ID/button.php @@ -1,6 +1,6 @@ 'Tindakan', 'add' => 'Tambah Baru', 'cancel' => 'Batal', @@ -11,7 +11,7 @@ return array( 'request' => 'Permintaan', 'submit' => 'Kirim', 'upload' => 'Unggah', - 'select_file' => 'Pilih Berkas...', + 'select_file' => 'Pilih Berkas...', 'select_files' => 'Pilih file...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php index 3d6b7d62ca..0ff5592c50 100644 --- a/resources/lang/en-ID/general.php +++ b/resources/lang/en-ID/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Masuk', 'user_requests_count' => 'Permintaan', 'city' => 'Kota', - 'click_here' => 'Klik disini', + 'click_here' => 'Klik disini', 'clear_selection' => 'Hapus yang dipilih', 'companies' => 'Perusahaan', 'company' => 'Perusahaan', 'component' => 'Komponen', 'components' => 'Komponen', - 'complete' => 'Lengkap', + 'complete' => 'Lengkap', 'consumable' => 'Dapat dikonsumsi', 'consumables' => 'Dapat dikonsumsi', 'country' => 'Negara', diff --git a/resources/lang/en-ID/help.php b/resources/lang/en-ID/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/en-ID/help.php +++ b/resources/lang/en-ID/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/en-ID/mail.php b/resources/lang/en-ID/mail.php index 22b0e8f670..c1612d7ccd 100644 --- a/resources/lang/en-ID/mail.php +++ b/resources/lang/en-ID/mail.php @@ -1,6 +1,6 @@ 'Pengguna sudah membatalkan permintaan item di situs web', 'a_user_requested' => 'Pengguna sudah meminta sebuah item di situs web', 'accessory_name' => 'Nama Aksesoris:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/en-ID/pagination.php b/resources/lang/en-ID/pagination.php index af0f8ece41..edf0d05c55 100644 --- a/resources/lang/en-ID/pagination.php +++ b/resources/lang/en-ID/pagination.php @@ -1,6 +1,6 @@ 'Selanjutnya »', -); +]; diff --git a/resources/lang/en-ID/passwords.php b/resources/lang/en-ID/passwords.php index 6436de71f8..cb751400d1 100644 --- a/resources/lang/en-ID/passwords.php +++ b/resources/lang/en-ID/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Tautan kata sandi anda sudah dikirim!', 'user' => 'Tidak ada satupun pengguna aktif yang menggunakan email ini.', ]; - diff --git a/resources/lang/en-ID/reminders.php b/resources/lang/en-ID/reminders.php index 99a3e4dda1..b047c30612 100644 --- a/resources/lang/en-ID/reminders.php +++ b/resources/lang/en-ID/reminders.php @@ -1,6 +1,6 @@ "Kata sandi harus ada enam karakter dan sesuai dengan konfirmasi.", + 'password' => 'Kata sandi harus ada enam karakter dan sesuai dengan konfirmasi.', - "user" => "Nama pengguna atau alamat surel salah", + 'user' => 'Nama pengguna atau alamat surel salah', - "token" => "Token atur ulang kata sandi ini tidak valid.", + 'token' => 'Token atur ulang kata sandi ini tidak valid.', - "sent" => "Jika alamat surel yang sesuai ditemukan, pengingat kata sandi sudah dikirim!", + 'sent' => 'Jika alamat surel yang sesuai ditemukan, pengingat kata sandi sudah dikirim!', -); +]; diff --git a/resources/lang/en-ID/table.php b/resources/lang/en-ID/table.php index ee00630a60..81702e8a88 100644 --- a/resources/lang/en-ID/table.php +++ b/resources/lang/en-ID/table.php @@ -1,10 +1,10 @@ 'Tindakan', 'action' => 'Langkah', 'by' => 'Oleh', 'item' => 'Item', -); +]; diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php index 640024ffc7..ccc9ff9086 100644 --- a/resources/lang/en-ID/validation.php +++ b/resources/lang/en-ID/validation.php @@ -1,6 +1,6 @@ ':attribute sudah pernah digunakan.', 'uploaded' => ':attribute gagal di-upload.', 'url' => 'Format :attribute tidaklah benar.', - "unique_undeleted" => ":attribute haruslah unik.", + 'unique_undeleted' => ':attribute haruslah unik.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Kolom :attribute mengandung karakter yang dilarang.", - "email_array" => "Satu atau lebih alamat surel tidak valid.", - "hashed_pass" => "Kata sandi anda saat ini salah", + 'alpha_space' => 'Kolom :attribute mengandung karakter yang dilarang.', + 'email_array' => 'Satu atau lebih alamat surel tidak valid.', + 'hashed_pass' => 'Kata sandi anda saat ini salah', 'dumbpwd' => 'Kata sandi itu terlalu umum.', - "statuslabel_type" => "Anda harus pilih jenis label status yang valid", + 'statuslabel_type' => 'Anda harus pilih jenis label status yang valid', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/en/admin/accessories/general.php b/resources/lang/en/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/en/admin/accessories/general.php +++ b/resources/lang/en/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/en/admin/accessories/message.php +++ b/resources/lang/en/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en/admin/accessories/table.php b/resources/lang/en/admin/accessories/table.php index e02d9f22e4..69c4d46aab 100644 --- a/resources/lang/en/admin/accessories/table.php +++ b/resources/lang/en/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Accessory Name', - -); +]; diff --git a/resources/lang/en/admin/asset_maintenances/form.php b/resources/lang/en/admin/asset_maintenances/form.php index 785d06b08f..0ac541ba91 100644 --- a/resources/lang/en/admin/asset_maintenances/form.php +++ b/resources/lang/en/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', 'notes' => 'Notes', 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'create' => 'Create Asset Maintenance', ]; diff --git a/resources/lang/en/admin/asset_maintenances/message.php b/resources/lang/en/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/en/admin/asset_maintenances/message.php +++ b/resources/lang/en/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/en/admin/asset_maintenances/table.php b/resources/lang/en/admin/asset_maintenances/table.php index f3a6be60f9..3ba895038d 100644 --- a/resources/lang/en/admin/asset_maintenances/table.php +++ b/resources/lang/en/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/en/admin/categories/general.php +++ b/resources/lang/en/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/en/admin/categories/message.php b/resources/lang/en/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/en/admin/categories/message.php +++ b/resources/lang/en/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en/admin/categories/table.php b/resources/lang/en/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/en/admin/categories/table.php +++ b/resources/lang/en/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/en/admin/companies/general.php +++ b/resources/lang/en/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/en/admin/companies/message.php b/resources/lang/en/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/en/admin/companies/message.php +++ b/resources/lang/en/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/en/admin/companies/table.php b/resources/lang/en/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/en/admin/companies/table.php +++ b/resources/lang/en/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/en/admin/components/general.php +++ b/resources/lang/en/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/en/admin/components/message.php b/resources/lang/en/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/en/admin/components/message.php +++ b/resources/lang/en/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en/admin/components/table.php b/resources/lang/en/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/en/admin/components/table.php +++ b/resources/lang/en/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/en/admin/consumables/general.php b/resources/lang/en/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/en/admin/consumables/general.php +++ b/resources/lang/en/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/en/admin/consumables/message.php b/resources/lang/en/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/en/admin/consumables/message.php +++ b/resources/lang/en/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/en/admin/consumables/table.php b/resources/lang/en/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/en/admin/consumables/table.php +++ b/resources/lang/en/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php index e602de4fd3..0fb90a5079 100644 --- a/resources/lang/en/admin/custom_fields/general.php +++ b/resources/lang/en/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/en/admin/custom_fields/message.php b/resources/lang/en/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/en/admin/custom_fields/message.php +++ b/resources/lang/en/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/en/admin/departments/message.php b/resources/lang/en/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/en/admin/departments/message.php +++ b/resources/lang/en/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en/admin/departments/table.php b/resources/lang/en/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/en/admin/departments/table.php +++ b/resources/lang/en/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/en/admin/depreciations/general.php b/resources/lang/en/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/en/admin/depreciations/general.php +++ b/resources/lang/en/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/en/admin/depreciations/message.php b/resources/lang/en/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/en/admin/depreciations/message.php +++ b/resources/lang/en/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en/admin/depreciations/table.php b/resources/lang/en/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/en/admin/depreciations/table.php +++ b/resources/lang/en/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/en/admin/groups/message.php b/resources/lang/en/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/en/admin/groups/message.php +++ b/resources/lang/en/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/en/admin/groups/table.php b/resources/lang/en/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/en/admin/groups/table.php +++ b/resources/lang/en/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/en/admin/groups/titles.php b/resources/lang/en/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/en/admin/groups/titles.php +++ b/resources/lang/en/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/en/admin/hardware/form.php b/resources/lang/en/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/en/admin/hardware/form.php +++ b/resources/lang/en/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/en/admin/hardware/table.php b/resources/lang/en/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/en/admin/hardware/table.php +++ b/resources/lang/en/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/en/admin/kits/general.php b/resources/lang/en/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/en/admin/kits/general.php +++ b/resources/lang/en/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/en/admin/licenses/form.php b/resources/lang/en/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/en/admin/licenses/form.php +++ b/resources/lang/en/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/en/admin/licenses/general.php +++ b/resources/lang/en/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/en/admin/licenses/message.php b/resources/lang/en/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/en/admin/licenses/message.php +++ b/resources/lang/en/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/en/admin/licenses/table.php b/resources/lang/en/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/en/admin/licenses/table.php +++ b/resources/lang/en/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/en/admin/locations/message.php b/resources/lang/en/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/en/admin/locations/message.php +++ b/resources/lang/en/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en/admin/locations/table.php b/resources/lang/en/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/en/admin/locations/table.php +++ b/resources/lang/en/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/en/admin/manufacturers/message.php b/resources/lang/en/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/en/admin/manufacturers/message.php +++ b/resources/lang/en/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/en/admin/manufacturers/table.php b/resources/lang/en/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/en/admin/manufacturers/table.php +++ b/resources/lang/en/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/en/admin/models/general.php b/resources/lang/en/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/en/admin/models/general.php +++ b/resources/lang/en/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/en/admin/models/message.php b/resources/lang/en/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/en/admin/models/message.php +++ b/resources/lang/en/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/en/admin/models/table.php b/resources/lang/en/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/en/admin/models/table.php +++ b/resources/lang/en/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/en/admin/reports/general.php b/resources/lang/en/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/en/admin/reports/general.php +++ b/resources/lang/en/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/en/admin/reports/message.php b/resources/lang/en/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/en/admin/reports/message.php +++ b/resources/lang/en/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/en/admin/settings/message.php +++ b/resources/lang/en/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/en/admin/statuslabels/message.php b/resources/lang/en/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/en/admin/statuslabels/message.php +++ b/resources/lang/en/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/en/admin/statuslabels/table.php b/resources/lang/en/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/en/admin/statuslabels/table.php +++ b/resources/lang/en/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/en/admin/suppliers/message.php b/resources/lang/en/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/en/admin/suppliers/message.php +++ b/resources/lang/en/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/en/admin/suppliers/table.php b/resources/lang/en/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/en/admin/suppliers/table.php +++ b/resources/lang/en/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index 874ab9e901..c859e63a2d 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -15,9 +15,7 @@ return array( 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', 'password_reset_sent' => 'A password reset link has been sent to :email!', - - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -28,9 +26,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -45,18 +43,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/en/admin/users/table.php b/resources/lang/en/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/en/admin/users/table.php +++ b/resources/lang/en/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/en/auth/general.php b/resources/lang/en/auth/general.php index 78b6780927..03994da05d 100644 --- a/resources/lang/en/auth/general.php +++ b/resources/lang/en/auth/general.php @@ -13,4 +13,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/en/auth/message.php b/resources/lang/en/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/en/auth/message.php +++ b/resources/lang/en/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index 27131e5fc6..12bda167b3 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,8 +11,8 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', 'send_password_link' => 'Send Password Reset Link', -); +]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/en/help.php b/resources/lang/en/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/en/help.php +++ b/resources/lang/en/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index c34123ed74..6471289e00 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/en/reminders.php b/resources/lang/en/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/en/reminders.php +++ b/resources/lang/en/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/en/table.php b/resources/lang/en/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/en/table.php +++ b/resources/lang/en/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 4ece7d41c7..afec9934b3 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", - "non_circular" => "The :attribute must not create a circular reference.", + 'unique_undeleted' => 'The :attribute must be unique.', + 'non_circular' => 'The :attribute must not create a circular reference.', /* |-------------------------------------------------------------------------- @@ -102,7 +102,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -115,11 +114,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -135,4 +134,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/es-CO/admin/accessories/general.php b/resources/lang/es-CO/admin/accessories/general.php index 619cd9c1e5..c8b1449ae2 100644 --- a/resources/lang/es-CO/admin/accessories/general.php +++ b/resources/lang/es-CO/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', 'checkout' => 'Retirar Accesorio', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'En su lugar, use el EULA por defecto.', 'use_default_eula_disabled' => 'En su lugar, use el EULA por defecto. No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.', -); +]; diff --git a/resources/lang/es-CO/admin/accessories/message.php b/resources/lang/es-CO/admin/accessories/message.php index 806ce547a5..5a2c11c2fc 100644 --- a/resources/lang/es-CO/admin/accessories/message.php +++ b/resources/lang/es-CO/admin/accessories/message.php @@ -1,37 +1,36 @@ 'El accesorio [:id] no existe.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', - 'create' => array( + 'create' => [ 'error' => 'Accesorio no fue creado, por favor vuelva a intentarlo.', - 'success' => 'Accesorio creado satisfactoriamente.' - ), + 'success' => 'Accesorio creado satisfactoriamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'Accesorio no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Accesorio creado satisfactoriamente.' - ), + 'success' => 'Accesorio creado satisfactoriamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer borrar este accesorio?', 'error' => 'Hubo un problema eliminando el accesorio. Por favor, inténtalo de nuevo.', - 'success' => 'El accesorio ha sido borrado con éxito.' - ), + 'success' => 'El accesorio ha sido borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El accesorio no fue retirado, por favor vuelva a intentarlo', 'success' => 'Accesorio retirado correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El accesorio no fue agregado, favor vuelva a intentarlo', 'success' => 'Accesorio devuelto correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-CO/admin/accessories/table.php b/resources/lang/es-CO/admin/accessories/table.php index 071d960418..dbb4990af0 100644 --- a/resources/lang/es-CO/admin/accessories/table.php +++ b/resources/lang/es-CO/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Descargar CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Descargar CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre de accesorio', - -); +]; diff --git a/resources/lang/es-CO/admin/asset_maintenances/form.php b/resources/lang/es-CO/admin/asset_maintenances/form.php index 22cfe26eda..32102d875f 100644 --- a/resources/lang/es-CO/admin/asset_maintenances/form.php +++ b/resources/lang/es-CO/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dias', 'notes' => 'Notas', 'update' => 'Actualizar', - 'create' => 'Crear' + 'create' => 'Crear', ]; diff --git a/resources/lang/es-CO/admin/asset_maintenances/message.php b/resources/lang/es-CO/admin/asset_maintenances/message.php index 7aa4b657b8..d08da52388 100644 --- a/resources/lang/es-CO/admin/asset_maintenances/message.php +++ b/resources/lang/es-CO/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar este mantenimiento de activo?', 'error' => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor intentelo nuevamente.', - 'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.' + 'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.', ], 'create' => [ 'error' => 'Mantenimiento de Activos no fue creado, por favor intentelo de nuevo.', - 'success' => 'Mantenimiento de Activo creado correctamente.' + 'success' => 'Mantenimiento de Activo creado correctamente.', ], 'edit' => [ 'error' => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.', - 'success' => 'Mantenimiento de activo editado con éxito.' + 'success' => 'Mantenimiento de activo editado con éxito.', ], 'asset_maintenance_incomplete' => 'Sin Completar', 'warranty' => 'Garantía', 'not_warranty' => 'Sin Garantía', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/es-CO/admin/asset_maintenances/table.php b/resources/lang/es-CO/admin/asset_maintenances/table.php index 30bb777969..acc72367c9 100644 --- a/resources/lang/es-CO/admin/asset_maintenances/table.php +++ b/resources/lang/es-CO/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Mantenimiento de Activos', 'asset_name' => 'Nombre del Activo', 'is_warranty' => 'Garantía', - 'dl_csv' => 'Descargar CSV' + 'dl_csv' => 'Descargar CSV', ]; diff --git a/resources/lang/es-CO/admin/categories/general.php b/resources/lang/es-CO/admin/categories/general.php index db7b638e17..10d03d72ed 100644 --- a/resources/lang/es-CO/admin/categories/general.php +++ b/resources/lang/es-CO/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorías de Equipos', 'category_name' => 'Nombre de la Categoría', 'checkin_email' => 'Enviar un correo al usuario al asignar/desasignar.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Usa la licencia primaria predeterminada en su lugar.', 'use_default_eula_disabled' => 'Usa la licencia primaria predeterminada en su lugar. No se ha establecido ninguna licencia primaria predeterminada. Por favor, añade una en las Configuraciones.', -); +]; diff --git a/resources/lang/es-CO/admin/categories/message.php b/resources/lang/es-CO/admin/categories/message.php index d0536f8f77..4e76d2aa91 100644 --- a/resources/lang/es-CO/admin/categories/message.php +++ b/resources/lang/es-CO/admin/categories/message.php @@ -1,25 +1,25 @@ 'La categoría no existe.', 'assoc_models' => 'Esta categoría está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualiza tus modelos para no referenciar más esta categoría e inténtalo de nuevo. ', 'assoc_items' => 'Esta categoría está actualmente asociada con al menos un :asset_type y no puede ser eliminada. Por favor actualiza tus :asset_type para no referenciar más esta categoría e inténtalo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La categoría no fue creada, por favor inténtalo de nuevo.', - 'success' => 'Categoría creada con éxito.' - ), + 'success' => 'Categoría creada con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se actualizó, por favor, inténtalo de nuevo', - 'success' => 'Categoría actualizada con éxito.' - ), + 'success' => 'Categoría actualizada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar esta categoría?', 'error' => 'Hubo un problema eliminando la categoría. Por favor, inténtalo de nuevo.', - 'success' => 'La categoría fue eliminada con éxito.' - ) + 'success' => 'La categoría fue eliminada con éxito.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/categories/table.php b/resources/lang/es-CO/admin/categories/table.php index 55ac255e5f..4aed25ab70 100644 --- a/resources/lang/es-CO/admin/categories/table.php +++ b/resources/lang/es-CO/admin/categories/table.php @@ -1,10 +1,10 @@ 'Licencia', +return [ + 'eula_text' => 'Licencia', 'id' => 'ID', 'parent' => 'Padre', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre de Categoría del Equipo', -); +]; diff --git a/resources/lang/es-CO/admin/companies/general.php b/resources/lang/es-CO/admin/companies/general.php index 12c7636dbf..185b820c0d 100644 --- a/resources/lang/es-CO/admin/companies/general.php +++ b/resources/lang/es-CO/admin/companies/general.php @@ -1,4 +1,5 @@ 'Seleccionar Compañía', ]; diff --git a/resources/lang/es-CO/admin/companies/message.php b/resources/lang/es-CO/admin/companies/message.php index 201249e352..7701734ed4 100644 --- a/resources/lang/es-CO/admin/companies/message.php +++ b/resources/lang/es-CO/admin/companies/message.php @@ -1,18 +1,19 @@ 'La Compañía no existe.', 'assoc_users' => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualiza tus modelos para no referenciar más esta compañía e inténtalo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La compañía no fue creada, por favor, inténtalo de nuevo.', - 'success' => 'La compañía fue creada con éxito.' - ), - 'update' => array( + 'success' => 'La compañía fue creada con éxito.', + ], + 'update' => [ 'error' => 'La compañía no fue actualizada, por favor, inténtalo de nuevo', - 'success' => 'Compañía actualizada con éxito.' - ), - 'delete' => array( + 'success' => 'Compañía actualizada con éxito.', + ], + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres eliminar esta compañía?', 'error' => 'Hubo un problema eliminando la compañía. Por favor, inténtalo de nuevo.', - 'success' => 'La compañía fue eliminada con éxito.' - ) -); + 'success' => 'La compañía fue eliminada con éxito.', + ], +]; diff --git a/resources/lang/es-CO/admin/companies/table.php b/resources/lang/es-CO/admin/companies/table.php index 7b3301aad8..37a5f8315c 100644 --- a/resources/lang/es-CO/admin/companies/table.php +++ b/resources/lang/es-CO/admin/companies/table.php @@ -1,9 +1,10 @@ 'Compañías', 'create' => 'Crear Compañía', 'title' => 'Compañía', 'update' => 'Actualizar Compañía', 'name' => 'Nombre de Compañía', 'id' => 'ID', -); +]; diff --git a/resources/lang/es-CO/admin/components/general.php b/resources/lang/es-CO/admin/components/general.php index 271344e965..43ef07097f 100644 --- a/resources/lang/es-CO/admin/components/general.php +++ b/resources/lang/es-CO/admin/components/general.php @@ -1,6 +1,6 @@ 'Nombre de Componente', 'checkin' => 'Registrar Componente', 'checkout' => 'Retirar Componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Componente', -); +]; diff --git a/resources/lang/es-CO/admin/components/message.php b/resources/lang/es-CO/admin/components/message.php index 81125e81be..f8b1f5aed8 100644 --- a/resources/lang/es-CO/admin/components/message.php +++ b/resources/lang/es-CO/admin/components/message.php @@ -1,36 +1,35 @@ 'El componente no existe.', - 'create' => array( + 'create' => [ 'error' => 'El componente no fue creado, por favor inténtalo de nuevo.', - 'success' => 'Componente creado con éxito.' - ), + 'success' => 'Componente creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El componente no se actualizó, por favor inténtalo de nuevo', - 'success' => 'Componente actualizado con éxito.' - ), + 'success' => 'Componente actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar este componente?', 'error' => 'Hubo un problema eliminando el componente. Por favor, inténtalo de nuevo.', - 'success' => 'El componente fue eliminado con éxito.' - ), + 'success' => 'El componente fue eliminado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El componente no fue retirado, por favor, inténtalo de nuevo', 'success' => 'Componente retirado con éxito.', - 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El componente no fue registrado, por favor inténtalo de nuevo', 'success' => 'Componente registrado con éxito.', - 'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-CO/admin/components/table.php b/resources/lang/es-CO/admin/components/table.php index 72f0b866d2..0b91d345ae 100644 --- a/resources/lang/es-CO/admin/components/table.php +++ b/resources/lang/es-CO/admin/components/table.php @@ -1,5 +1,5 @@ 'Nombre del Componente', -); +]; diff --git a/resources/lang/es-CO/admin/consumables/general.php b/resources/lang/es-CO/admin/consumables/general.php index e464586323..eb3c462eda 100644 --- a/resources/lang/es-CO/admin/consumables/general.php +++ b/resources/lang/es-CO/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Retirar Consumible al Usuario', 'consumable_name' => 'Nombre del Consumible', 'create' => 'Crear Consumible', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Consumibles', -); +]; diff --git a/resources/lang/es-CO/admin/consumables/message.php b/resources/lang/es-CO/admin/consumables/message.php index c1762b0ff1..4d32948346 100644 --- a/resources/lang/es-CO/admin/consumables/message.php +++ b/resources/lang/es-CO/admin/consumables/message.php @@ -1,36 +1,35 @@ 'El consumible no existe.', - 'create' => array( + 'create' => [ 'error' => 'El consumible no fue creado, por favor, inténtalo de nuevo.', - 'success' => 'Consumible creado con éxito.' - ), + 'success' => 'Consumible creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumible no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Consumible actualizado con éxito.' - ), + 'success' => 'Consumible actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres eliminar este consumible?', 'error' => 'Hubo un problema al eliminar este consumible. Por favor inténtalo de nuevo.', - 'success' => 'El consumible fue eliminado con éxito.' - ), + 'success' => 'El consumible fue eliminado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El consumible no fue retirado, por favor, inténtalo de nuevo', 'success' => 'Consumible retirado con éxito.', - 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumible no fue registrado, por favor, inténtelo de nuevo', 'success' => 'Consumible fue registrado con éxito.', - 'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-CO/admin/consumables/table.php b/resources/lang/es-CO/admin/consumables/table.php index befcfc511b..db8f55deab 100644 --- a/resources/lang/es-CO/admin/consumables/table.php +++ b/resources/lang/es-CO/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nombre del Consumible', -); +]; diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php index e77a4223a5..2c0a68d69c 100644 --- a/resources/lang/es-CO/admin/custom_fields/general.php +++ b/resources/lang/es-CO/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos Personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Acerca de los Grupos de Campos Personalizados (Fieldsets)', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuevo Campo Personalizado', 'value_encrypted' => 'El valor de este campo está encriptado en la base de datos. Sólo los administradores pueden ver el valor desencriptado', 'show_in_email' => '¿Incluir el valor de este campo en las notificaciones por correo de asignaciones de activos? Ten en cuenta que los campos encriptados no se pueden incluir en los correos electrónicos.', -); +]; diff --git a/resources/lang/es-CO/admin/custom_fields/message.php b/resources/lang/es-CO/admin/custom_fields/message.php index b7a28ebfce..4eaf180ac2 100644 --- a/resources/lang/es-CO/admin/custom_fields/message.php +++ b/resources/lang/es-CO/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'El campo no existe.', 'already_added' => 'El campo ya fue añadido', - 'create' => array( + 'create' => [ 'error' => 'El campo no fue creado, por favor, inténtalo de nuevo.', 'success' => 'Campo creado con éxito.', - 'assoc_success' => 'Campo agregado al fieldset con éxito.' - ), + 'assoc_success' => 'Campo agregado al fieldset con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El campo no fue actualizado, por favor inténtalo de nuevo', - 'success' => 'Campo actualizado con éxito.' - ), + 'success' => 'Campo actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres eliminar este campo?', 'error' => 'Hubo un problema al eliminar el campo. Por favor inténtalo de nuevo.', 'success' => 'Este campo fue eliminado con éxito.', 'in_use' => 'El campo aún está en uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'El fieldset no existe', - 'create' => array( + 'create' => [ 'error' => 'El fieldset no fue creado, por favor inténtalo de nuevo.', - 'success' => 'Fieldset creado con éxito.' - ), + 'success' => 'Fieldset creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El fieldset no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Fieldset actualizado con éxito.' - ), + 'success' => 'Fieldset actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres eliminar este fieldset?', 'error' => 'Hubo un problema al eliminar este fieldset. Por favor inténtalo de nuevo.', 'success' => 'El fieldset fue eliminado con éxito.', 'in_use' => 'El fieldset está aún en uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/es-CO/admin/departments/message.php b/resources/lang/es-CO/admin/departments/message.php index 7ac9a2a517..420ce31347 100644 --- a/resources/lang/es-CO/admin/departments/message.php +++ b/resources/lang/es-CO/admin/departments/message.php @@ -1,21 +1,21 @@ 'El departamento no existe.', 'assoc_users' => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualiza tus usuarios para no referenciar más este departamento e inténtalo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El departamento no fue creado, por favor, inténtalo de nuevo.', - 'success' => 'Departamento fue creado con éxito.' - ), - 'update' => array( + 'success' => 'Departamento fue creado con éxito.', + ], + 'update' => [ 'error' => 'El departamento no fue actualizado, por favor inténtalo de nuevo', - 'success' => 'Departamento actualizado con éxito.' - ), - 'delete' => array( + 'success' => 'Departamento actualizado con éxito.', + ], + 'delete' => [ 'confirm' => '¿estás seguro de que quieres eliminar este departamento?', 'error' => 'Hubo un problema al eliminar este departamento. Por favor inténtalo de nuevo.', - 'success' => 'El departamento fue eliminado con éxito.' - ) + 'success' => 'El departamento fue eliminado con éxito.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/departments/table.php b/resources/lang/es-CO/admin/departments/table.php index 2db6cacad2..16d6e72182 100644 --- a/resources/lang/es-CO/admin/departments/table.php +++ b/resources/lang/es-CO/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nombre de Departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Ubicación', 'create' => 'Crear Departamento', 'update' => 'Actualizar Departamento', - ); + ]; diff --git a/resources/lang/es-CO/admin/depreciations/general.php b/resources/lang/es-CO/admin/depreciations/general.php index e370c0101d..9eba2c65b1 100644 --- a/resources/lang/es-CO/admin/depreciations/general.php +++ b/resources/lang/es-CO/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Acerca de Depreciaciones de Equipos', 'about_depreciations' => 'Puedes establecer las depreciaciones de equipos para depreciar los equipos basados en una depreciación en línea recta.', 'asset_depreciations' => 'Depreciación de Equipos', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Número de Meses', 'update' => 'Actualizar Depreciación', -); +]; diff --git a/resources/lang/es-CO/admin/depreciations/message.php b/resources/lang/es-CO/admin/depreciations/message.php index d64306e1b6..c366fdbc83 100644 --- a/resources/lang/es-CO/admin/depreciations/message.php +++ b/resources/lang/es-CO/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'La clase de depreciación no existe.', 'assoc_users' => 'Esta depreciación está actualmente asociada con uno o mas modelos y no puede ser eliminada. Por favor, elimina los modelos y luego intenta borrarlas de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'La clase de depreciación no fue creada, por favor, inténtalo de nuevo. :(', - 'success' => 'La clase de depreciación fue creada con éxito. :)' - ), + 'success' => 'La clase de depreciación fue creada con éxito. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'La clase de depreciación no fue actualizada, por favor, inténtalo de nuevo', - 'success' => 'La clase de depreciación fue creada con éxito.' - ), + 'success' => 'La clase de depreciación fue creada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar esta clase de depreciación?', 'error' => 'Ha sucedido un error eliminando la clase de depreciación, por favor intente de nuevo.', - 'success' => 'La clase de depreciación fue eliminada con éxito.' - ) + 'success' => 'La clase de depreciación fue eliminada con éxito.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/depreciations/table.php b/resources/lang/es-CO/admin/depreciations/table.php index d0e2f193cc..9bfffc19a4 100644 --- a/resources/lang/es-CO/admin/depreciations/table.php +++ b/resources/lang/es-CO/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meses', 'term' => 'Termina', 'title' => 'Nombre ', -); +]; diff --git a/resources/lang/es-CO/admin/groups/message.php b/resources/lang/es-CO/admin/groups/message.php index 4b7f99ca54..7eff45a9cc 100644 --- a/resources/lang/es-CO/admin/groups/message.php +++ b/resources/lang/es-CO/admin/groups/message.php @@ -1,22 +1,22 @@ 'El grupo ya existe!', 'group_not_found' => 'El grupo [:id] no existe.', 'group_name_required' => 'El campo nombre es obligatorio', - 'success' => array( + 'success' => [ 'create' => 'Grupo creado.', 'update' => 'Grupo actualizado.', 'delete' => 'Grupo eliminado.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Seguroq que quieres Eliminar grupo?', 'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.', 'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.', 'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.', - ), + ], -); +]; diff --git a/resources/lang/es-CO/admin/groups/table.php b/resources/lang/es-CO/admin/groups/table.php index c002d06ba8..bc09ef1ea6 100644 --- a/resources/lang/es-CO/admin/groups/table.php +++ b/resources/lang/es-CO/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Nombre', 'users' => '# de Usuarios', -); +]; diff --git a/resources/lang/es-CO/admin/groups/titles.php b/resources/lang/es-CO/admin/groups/titles.php index c9d6ca4a6d..07611a0bd2 100644 --- a/resources/lang/es-CO/admin/groups/titles.php +++ b/resources/lang/es-CO/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Acerca de los grupos', 'about_groups' => 'Los Grupos son usados para generar permisos de usuarios.', 'group_management' => 'Gestión de Grupos', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Denegar', -); +]; diff --git a/resources/lang/es-CO/admin/hardware/form.php b/resources/lang/es-CO/admin/hardware/form.php index 2efd5b2b17..7ab36d1397 100644 --- a/resources/lang/es-CO/admin/hardware/form.php +++ b/resources/lang/es-CO/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirma la Eliminación Masiva de Equipos', +return [ + 'bulk_delete' => 'Confirma la Eliminación Masiva de Equipos', 'bulk_delete_help' => 'Revisar los equipos para eliminación masiva. Una vez eliminados, esos equipos pueden ser restaurados, pero no volverán a estar asociados a ninguno de los usuarios a los que estén asignados actualmente.', 'bulk_delete_warn' => 'Estás a punto de eliminar :asset_count equipos.', - 'bulk_update' => 'Actualización masiva de Equipos', - 'bulk_update_help' => 'Este formulario te permite actualizar múltiples equipos simultáneamente. Solo debes completar los campos que quieres modificar. Todo campo en blanco permanecerá sin cambios. ', - 'bulk_update_warn' => 'Estás a punto de editar las propiedades de :asset_count equipos.', + 'bulk_update' => 'Actualización masiva de Equipos', + 'bulk_update_help' => 'Este formulario te permite actualizar múltiples equipos simultáneamente. Solo debes completar los campos que quieres modificar. Todo campo en blanco permanecerá sin cambios. ', + 'bulk_update_warn' => 'Estás a punto de editar las propiedades de :asset_count equipos.', 'checkedout_to' => 'Asignado a', 'checkout_date' => 'Fecha de asignación', 'checkin_date' => 'Fecha de devolución', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etiqueta del Equipo', 'update' => 'Actualizar Equipo', 'warranty' => 'Garantía', - 'warranty_expires' => 'Vencimiento de Garantía', + 'warranty_expires' => 'Vencimiento de Garantía', 'years' => 'años', -) -; +]; diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php index 9cfefa86a6..5e6648e8ea 100644 --- a/resources/lang/es-CO/admin/hardware/general.php +++ b/resources/lang/es-CO/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Acerca de los Equipos', 'about_assets_text' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', - 'archived' => 'Archivado', + 'archived' => 'Archivado', 'asset' => 'Equipo', 'bulk_checkout' => 'Asignar Equipos', 'checkin' => 'Devolver Equipo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Equipos Pendiente', 'undeployable' => 'No desplegable', 'view' => 'Ver Equipo', -); +]; diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php index e44f976105..eec8f1966c 100644 --- a/resources/lang/es-CO/admin/hardware/message.php +++ b/resources/lang/es-CO/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Atención: Este equipo está marcado como no isntalabre. Si no es correcto, actualiza su estado.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.', 'assoc_users' => 'Equipo asignado a un usuario, no se puede eliminar.', - 'create' => array( + 'create' => [ 'error' => 'Equipo no creado, intentalo de nuevo. :(', - 'success' => 'Equipo creado. :)' - ), + 'success' => 'Equipo creado. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Equipo no actualizado, intentalo de nuevo', 'success' => 'Equipo actualizado.', 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'El equipo no fue restaurado, por favor intente nuevamente', - 'success' => 'Equipo restaurado correctamente.' - ), + 'success' => 'Equipo restaurado correctamente.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'La auditoría de activos no tuvo éxito. Vuelve a intentarlo.', - 'success' => 'Auditoría de activos registrada correctamente.' - ), + 'success' => 'Auditoría de activos registrada correctamente.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Algunos elementos no se pudieron importar correctamente.', 'errorDetail' => 'Estos elementos no pudieron importarse debido a errores.', - 'success' => "Tu archivo ha sido importado", - 'file_delete_success' => "Tu archivo ha sido eliminado con éxito", - 'file_delete_error' => "No pudimos eliminar tu archivo", - ), + 'success' => 'Tu archivo ha sido importado', + 'file_delete_success' => 'Tu archivo ha sido eliminado con éxito', + 'file_delete_error' => 'No pudimos eliminar tu archivo', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar el equipo?', 'error' => 'Equipo no eliminado, intentalo de nuevo.', 'nothing_updated' => 'No se seleccionaron los activos, por lo que no se eliminó nada.', - 'success' => 'Equipo eliminado.' - ), + 'success' => 'Equipo eliminado.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', 'success' => 'Equipo asignado.', 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.', 'not_available' => '¡Ese equipo no está disponible para asignar!', - 'no_assets_selected' => 'Debes seleccionar al menos un equipo de la lista' - ), + 'no_assets_selected' => 'Debes seleccionar al menos un equipo de la lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El equipo no pudo ser asignado, por favor inténtalo de nuevo', 'success' => 'El equipo fue asignado exitosamente.', 'user_does_not_exist' => 'Es usuario es invalido, por favor inténtalo de nuevo.', 'already_checked_in' => 'El equipo ya ha sido devuelto.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'El equipo no pudo ser solicitado, por favor inténtalo de nuevo', 'success' => 'El equipos fue solicitado exitosamente.', - 'canceled' => 'La solicitud de asignación fue cancelada de forma exitosa' - ) + 'canceled' => 'La solicitud de asignación fue cancelada de forma exitosa', + ], -); +]; diff --git a/resources/lang/es-CO/admin/hardware/table.php b/resources/lang/es-CO/admin/hardware/table.php index c6b15cab13..347034a086 100644 --- a/resources/lang/es-CO/admin/hardware/table.php +++ b/resources/lang/es-CO/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etiqueta de equipo', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Equipo ', 'image' => 'Imagen de dispositivo', 'days_without_acceptance' => 'Días Sin Aceptación', - 'monthly_depreciation' => 'Depreciación mensual' + 'monthly_depreciation' => 'Depreciación mensual', -); +]; diff --git a/resources/lang/es-CO/admin/kits/general.php b/resources/lang/es-CO/admin/kits/general.php index 06039317a1..5dd3c2ab19 100644 --- a/resources/lang/es-CO/admin/kits/general.php +++ b/resources/lang/es-CO/admin/kits/general.php @@ -1,6 +1,6 @@ 'Acerca de kits predefinidos', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Asignar kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/es-CO/admin/licenses/form.php b/resources/lang/es-CO/admin/licenses/form.php index 3724e53dbd..f3e5a1e494 100644 --- a/resources/lang/es-CO/admin/licenses/form.php +++ b/resources/lang/es-CO/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Equipo', 'checkin' => 'Quita', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Registrado a Email', 'to_name' => 'Registrado a Nombre', 'update' => 'Actualizar Licencia', - 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.' -); + 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.', +]; diff --git a/resources/lang/es-CO/admin/licenses/general.php b/resources/lang/es-CO/admin/licenses/general.php index 8a5d6db90e..43a147dcf4 100644 --- a/resources/lang/es-CO/admin/licenses/general.php +++ b/resources/lang/es-CO/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Acerca de licencias', 'about_licenses' => 'Las licencias son para identificar software. Tienen un número específico de asientos que pueden ser asignados a individuos', 'checkin' => 'Quitar Instalación', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licencias Software', 'user' => 'Usuario', 'view' => 'Ver Licencias', -); +]; diff --git a/resources/lang/es-CO/admin/licenses/message.php b/resources/lang/es-CO/admin/licenses/message.php index cab4de5b63..e196a0f548 100644 --- a/resources/lang/es-CO/admin/licenses/message.php +++ b/resources/lang/es-CO/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Categoría inexistente.', 'user_does_not_exist' => 'Usuario inexistente.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.', 'not_found' => 'Licencia no encontrada', - - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, intentalo de nuevo.', - 'success' => 'Categoría creada correctamente.' - ), + 'success' => 'Categoría creada correctamente.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se ha actualizado, intentalo de nuevo.', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de eliminar esta categoría?', 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', - 'success' => 'Categoría eliminada.' - ), + 'success' => 'Categoría eliminada.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', - 'success' => 'Equipo asignado.' - ), + 'success' => 'Equipo asignado.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', - 'success' => 'Equipo quitado correctamente.' - ), + 'success' => 'Equipo quitado correctamente.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/licenses/table.php b/resources/lang/es-CO/admin/licenses/table.php index c5b82e4147..9c4d797c4a 100644 --- a/resources/lang/es-CO/admin/licenses/table.php +++ b/resources/lang/es-CO/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Asignada a', 'checkout' => 'Quita/Asigna', @@ -14,4 +14,4 @@ return array( 'serial' => 'N. Serie', 'title' => 'Categoría de equipo', -); +]; diff --git a/resources/lang/es-CO/admin/locations/message.php b/resources/lang/es-CO/admin/locations/message.php index a733569bc3..acc99a1381 100644 --- a/resources/lang/es-CO/admin/locations/message.php +++ b/resources/lang/es-CO/admin/locations/message.php @@ -1,27 +1,26 @@ 'Ubicación inexistente.', 'assoc_users' => 'La ubicación esta asociada con al menos un usuario, por lo que no puede eliminarse. Actualiza la información de tus usuarios para que no la usen, e inténtalo de nuevo. ', 'assoc_assets' => 'La ubicación esta asociada con al menos un equipo, por lo que no puede eliminarse. Por favor actualiza la información de tus equipos para que no la usen, e inténtalo de nuevo. ', 'assoc_child_loc' => 'La ubicación esta asociada con al menos una ubicación hija, por lo que no puede eliminarse. Actualiza la información de tus ubicaciones para desasociarlas, e inténtalo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'La ubicación no pudo ser creada, por favor inténtalo de nuevo.', - 'success' => 'La ubicación fue creada exitosamente.' - ), + 'success' => 'La ubicación fue creada exitosamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'La ubicación no pudo ser actualizada, por favor inténtalo de nuevo', - 'success' => 'La ubicación fue actualizada exitosamente.' - ), + 'success' => 'La ubicación fue actualizada exitosamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar esta ubicación?', 'error' => 'Hubo un problema eliminando la ubicación. Por favor, inténtalo de nuevo.', - 'success' => 'La ubicación fue eliminada exitosamente.' - ) + 'success' => 'La ubicación fue eliminada exitosamente.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/locations/table.php b/resources/lang/es-CO/admin/locations/table.php index de553c5f76..80150950e1 100644 --- a/resources/lang/es-CO/admin/locations/table.php +++ b/resources/lang/es-CO/admin/locations/table.php @@ -1,6 +1,6 @@ 'Acerca de Ubicaciones', 'about_locations' => 'Las Ubicaciones son utilizadas para hacer seguimiento de la información de ubicación de usuarios, equipos, y otros items', 'assets_rtd' => 'Equipos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Ubicación Padre', 'currency' => 'Moneda de ubicación', 'ldap_ou' => 'OU de búsqueda LDAP', - ); + ]; diff --git a/resources/lang/es-CO/admin/manufacturers/message.php b/resources/lang/es-CO/admin/manufacturers/message.php index 4a78b56349..6b2b37a9e3 100644 --- a/resources/lang/es-CO/admin/manufacturers/message.php +++ b/resources/lang/es-CO/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Fabricante inexistente.', 'assoc_users' => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado', - 'create' => array( + 'create' => [ 'error' => 'Fabricante no creado, Intentalo de nuevo.', - 'success' => 'Fabricante creado.' - ), + 'success' => 'Fabricante creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fabricante no actualizado, Intentalo de nuevo', - 'success' => 'Fabricante actualizado.' - ), + 'success' => 'Fabricante actualizado.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El fabricante no fue restaurado, intente de nuevo', - 'success' => 'Fabricante restaurado con éxito.' - ), + 'success' => 'Fabricante restaurado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar Fabricante?', 'error' => 'Hubo un problema eliminando el fabricante. Por favor, inténtalo de nuevo.', - 'success' => 'Fabricante Eliminado.' - ) + 'success' => 'Fabricante Eliminado.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/manufacturers/table.php b/resources/lang/es-CO/admin/manufacturers/table.php index 972d33b71b..77c22bcc82 100644 --- a/resources/lang/es-CO/admin/manufacturers/table.php +++ b/resources/lang/es-CO/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre fabricantes', 'about_manufacturers_text' => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto sobre ellos, que se mostrará en sus páginas de detalle de activos.', 'asset_manufacturers' => 'Fabricantes', @@ -13,4 +13,4 @@ return array( 'update' => 'Actualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/es-CO/admin/models/general.php b/resources/lang/es-CO/admin/models/general.php index 0e02e00aec..90bca950ad 100644 --- a/resources/lang/es-CO/admin/models/general.php +++ b/resources/lang/es-CO/admin/models/general.php @@ -1,6 +1,6 @@ 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Los usuarios pueden solicitar este modelo', - 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', + 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', 'view_deleted' => 'Ver Borrados', 'view_models' => 'Ver Modelos', 'fieldset' => 'Grupos de campo', 'no_custom_field' => 'No hay campos personalizados', 'add_default_values' => 'Agregar valores predeterminados', -); +]; diff --git a/resources/lang/es-CO/admin/models/message.php b/resources/lang/es-CO/admin/models/message.php index bc244948d0..f28759a645 100644 --- a/resources/lang/es-CO/admin/models/message.php +++ b/resources/lang/es-CO/admin/models/message.php @@ -1,42 +1,41 @@ 'Modelo inexistente.', 'assoc_users' => 'Este modelo está asociado a uno o más equipos actualmente, por lo que no puede ser eliminado. Por favor elimina los equipos asociados, e inténtalo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'El modelo no fue creado, por favor inténtalo de nuevo.', 'success' => 'El modelo fue creado exitosamente.', 'duplicate_set' => 'Ya existe un modelo de equipo con el mismo nombre, fabricante y número de modelo.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'El modelo no pudo ser actualizado, por favor inténtalo de nuevo', - 'success' => 'El modelo fue actualizado exitosamente.' - ), + 'success' => 'El modelo fue actualizado exitosamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar este modelo de equipo?', 'error' => 'Hubo un problema eliminando el modelo. Por favor, inténtalo de nuevo.', - 'success' => 'El modelo fue eliminado exitosamente.' - ), + 'success' => 'El modelo fue eliminado exitosamente.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El modelo no pudo ser restaurado, por favor inténtalo de nuevo', - 'success' => 'El modelo fue restaurado exitosamente.' - ), + 'success' => 'El modelo fue restaurado exitosamente.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ningún campo ha cambiado, no hay nada que actualizar.', - 'success' => 'Los modelos fueron actualizados.' - ), + 'success' => 'Los modelos fueron actualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ningún modelo fue seleccionado, no se eliminó nada.', 'success' => '¡:success_count modelo(s) eliminado(s)!', - 'success_partial' => ':success_count modelos fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen equipos asociados a ellos.' - ), + 'success_partial' => ':success_count modelos fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen equipos asociados a ellos.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/models/table.php b/resources/lang/es-CO/admin/models/table.php index 2352df53cc..6827817fbb 100644 --- a/resources/lang/es-CO/admin/models/table.php +++ b/resources/lang/es-CO/admin/models/table.php @@ -1,6 +1,6 @@ 'Crear Modelo de Equipo', 'created_at' => 'Creado el', @@ -14,4 +14,4 @@ return array( 'update' => 'Actualizar Modelo de Equipo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/es-CO/admin/reports/general.php b/resources/lang/es-CO/admin/reports/general.php index f6251cdbf3..9b9d3baad9 100644 --- a/resources/lang/es-CO/admin/reports/general.php +++ b/resources/lang/es-CO/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecciona las opciones de tu informe de Equipos.' -); +return [ + 'info' => 'Selecciona las opciones de tu informe de Equipos.', +]; diff --git a/resources/lang/es-CO/admin/reports/message.php b/resources/lang/es-CO/admin/reports/message.php index a8f61aa993..a5bd885673 100644 --- a/resources/lang/es-CO/admin/reports/message.php +++ b/resources/lang/es-CO/admin/reports/message.php @@ -1,5 +1,5 @@ 'Debes seleccionar al menos UNA opción.' -); +return [ + 'error' => 'Debes seleccionar al menos UNA opción.', +]; diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php index 595528d794..a80f30cd76 100644 --- a/resources/lang/es-CO/admin/settings/general.php +++ b/resources/lang/es-CO/admin/settings/general.php @@ -1,12 +1,12 @@ 'Directorio Activo', 'ad_domain' => 'Dominio del Directorio Activo', 'ad_domain_help' => 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.', 'ad_append_domain_label' => 'Añadir nombre de dominio', 'ad_append_domain' => 'Añadir nombre de dominio al campo de nombre de usuario', - 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".' , + 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".', 'admin_cc_email' => 'Email CC', 'admin_cc_email_help' => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.', 'is_ad' => 'Este es un servidor de Directorio Activo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Limite de alertas de expiración (en días)', 'alert_inv_threshold' => 'Umbral de alerta del inventario', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDs de Recurso', 'audit_interval' => 'Intervalo de auditoría', 'audit_interval_help' => 'Si tiene que auditar físicamente sus activos periódicamente, ingrese el intervalo en meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ingrese código de verificación en dos pasos', 'two_factor_config_complete' => 'Enviar código', 'two_factor_enabled_edit_not_allowed' => 'El administrador no permite modificar esta configuración.', - 'two_factor_enrollment_text' => "Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo", + 'two_factor_enrollment_text' => 'Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo', 'require_accept_signature' => 'Requerir Firma', 'require_accept_signature_help_text' => 'Para activar esta función se requiere que los usuarios firmen fisicamente aceptando el activo.', 'left' => 'izquierda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Al marcar esta casilla se forzarán números de serie únicos a los activos', 'zerofill_count' => 'Longitud de etiquetas de activos, incluyendo relleno de ceros', 'username_format_help' => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.', -); +]; diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php index 3980dcd7a8..7c5c53f248 100644 --- a/resources/lang/es-CO/admin/settings/message.php +++ b/resources/lang/es-CO/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ha ocurrido un error al actualizar. ', - 'success' => 'Parámetros actualizados correctamente.' - ), - 'backup' => array( + 'success' => 'Parámetros actualizados correctamente.', + ], + 'backup' => [ 'delete_confirm' => 'Está seguro que desea eliminar este archivo de respaldo? Esta acción no puede ser revertida. ', 'file_deleted' => 'El archivo de respaldo fue eliminado satisfactoriamente. ', 'generated' => 'Un nuevo archivo de respaldo fue creado satisfactoriamente.', 'file_not_found' => 'El archivo de respaldo no se ha encontrado en el servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ', 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.', - 'success' => 'Registros eliminados correctamente purgados.' - ), + 'success' => 'Registros eliminados correctamente purgados.', + ], -); +]; diff --git a/resources/lang/es-CO/admin/statuslabels/message.php b/resources/lang/es-CO/admin/statuslabels/message.php index ed01a8eecf..338bfce955 100644 --- a/resources/lang/es-CO/admin/statuslabels/message.php +++ b/resources/lang/es-CO/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Etiqueta de Estado inexistente.', 'assoc_assets' => 'Esta etiqueta de estado está asociada con al menos un equipo actualmente, por lo que no puede ser eliminada. Por favor actualiza tus equipos para que no hagan uso de esta etiqueta, e inténtalo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'La etiqueta de estado no pudo ser creada, por favor inténtalo de nuevo.', - 'success' => 'La etiqueta de estado fue creada exitosamente.' - ), + 'success' => 'La etiqueta de estado fue creada exitosamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'La etiqueta de estado no pudo ser actualizada, por favor inténtalo de nuevo', - 'success' => 'La etiqueta de estado fue actualizada exitosamente.' - ), + 'success' => 'La etiqueta de estado fue actualizada exitosamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estas seguro(a) de que quieres eliminar esta etiqueta de estado?', 'error' => 'Hubo un problema al eliminar la etiqueta de estado. Por favor inténtalo de nuevo.', - 'success' => 'La etiqueta de estado fue eliminada de forma exitosa.' - ), + 'success' => 'La etiqueta de estado fue eliminada de forma exitosa.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Estos equipos no pueden ser asignados.', 'deployable' => 'Estos equipos pueden ser asignados. Una vez estén asignados, asumirán el meta estado de Asignado.', 'archived' => 'Estos equipos no pueden ser asignados, y solo se mostrarán en la vista de Archivados. Esto es útil para retener información sobre equipos por razones de presupuesto/revisión histórica, mientras están fuera de la lista de equipos del día a día.', 'pending' => 'Estos equipos no pueden ser asignados, suele usarse para ítems que están en reparación, o que se espera que regresen a circulación eventualmente.', - ), + ], -); +]; diff --git a/resources/lang/es-CO/admin/statuslabels/table.php b/resources/lang/es-CO/admin/statuslabels/table.php index b653859bdc..929cdf8155 100644 --- a/resources/lang/es-CO/admin/statuslabels/table.php +++ b/resources/lang/es-CO/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Acerca de las Etiquetas de Estado', 'archived' => 'Archivado', 'create' => 'Crear Etiqueta de Estado', @@ -16,4 +16,4 @@ return array( 'title' => 'Etiquetas de Estado', 'undeployable' => 'No desplegable', 'update' => 'Actualizar Etiqueta de Estado', -); +]; diff --git a/resources/lang/es-CO/admin/suppliers/message.php b/resources/lang/es-CO/admin/suppliers/message.php index 8956e1ff62..f5dca9750c 100644 --- a/resources/lang/es-CO/admin/suppliers/message.php +++ b/resources/lang/es-CO/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Proveedor does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Proveedor no creado, Intentalo de nuevo.', - 'success' => 'Proveedor creado.' - ), + 'success' => 'Proveedor creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proveedor no actualizado, Intentalo de nuevo', - 'success' => 'Proveedor actualizado.' - ), + 'success' => 'Proveedor actualizado.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de querer eliminar este Proveedor?', 'error' => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.', 'success' => 'Proveedor eliminado.', 'assoc_assets' => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ', 'assoc_licenses' => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser eliminado. Por favor, actualiza tus licencias para no referenciar este proveedor e inténtalo de nuevo. ', 'assoc_maintenances' => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ', - ) + ], -); +]; diff --git a/resources/lang/es-CO/admin/suppliers/table.php b/resources/lang/es-CO/admin/suppliers/table.php index f576b2d372..d488c5b409 100644 --- a/resources/lang/es-CO/admin/suppliers/table.php +++ b/resources/lang/es-CO/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Acerca de Proveedores', 'about_suppliers_text' => 'Los Proveedores son utilizados para hacer seguimiento de la fuente de los items', 'address' => 'Dirección del Proveedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Equipos para', 'zip' => 'Código Postal', -); +]; diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php index 221c9d4dc9..863f5405c0 100644 --- a/resources/lang/es-CO/admin/users/general.php +++ b/resources/lang/es-CO/admin/users/general.php @@ -1,7 +1,6 @@ 'Este usuario puede ingresar', 'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.', 'assets_user' => 'Equipos asignados a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Usuario', 'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.', 'history_user' => 'Historial de :name', - 'info' => 'Información', + 'info' => 'Información', 'restore_user' => 'Haga clic aquí para restaurarlos.', 'last_login' => 'Último acceso', 'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ', 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ', 'two_factor_active' => '2FA Activo ', - ); + ]; diff --git a/resources/lang/es-CO/admin/users/message.php b/resources/lang/es-CO/admin/users/message.php index 56d0931192..62c97bd43c 100644 --- a/resources/lang/es-CO/admin/users/message.php +++ b/resources/lang/es-CO/admin/users/message.php @@ -1,6 +1,6 @@ 'Ha aceptado con éxito este equipo.', 'declined' => 'Ha declinado con éxito este equipo.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'La integración con LDAP no ha sido configurada para esta instalación.', 'password_resets_sent' => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.', - - 'success' => array( + 'success' => [ 'create' => 'Usuario correctamente creado.', 'update' => 'Usuario correctamente actualizado.', 'update_bulk' => 'Usuarios correctamente actualizados!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Usuario correctamente no suspendido.', 'restored' => 'Usuario correctamente restaurado.', 'import' => 'Usuarios importados correctamente.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.', 'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.', 'delete' => 'Ha habido un problema eliminando el Usuario. Intentalo de nuevo.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningún archivo para subir', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], -); +]; diff --git a/resources/lang/es-CO/admin/users/table.php b/resources/lang/es-CO/admin/users/table.php index 39593505f0..18e7aed405 100644 --- a/resources/lang/es-CO/admin/users/table.php +++ b/resources/lang/es-CO/admin/users/table.php @@ -1,6 +1,6 @@ 'Activo', 'allow' => 'Permitir', 'checkedout' => 'Equipos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar usuarios actuales', 'show_deleted' => 'Mostrar usuarios eliminados', 'title' => 'Puesto', - 'to_restore_them' => 'para restaurarlos.', + 'to_restore_them' => 'para restaurarlos.', 'updateuser' => 'Actualizar Usuario', 'username' => 'Usuario', - 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', + 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', 'username_note' => '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)', 'cloneuser' => 'Clonar Usuario', 'viewusers' => 'Ver Usuarios', -); +]; diff --git a/resources/lang/es-CO/auth/general.php b/resources/lang/es-CO/auth/general.php index b5b4790d31..3f405395d6 100644 --- a/resources/lang/es-CO/auth/general.php +++ b/resources/lang/es-CO/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Ingresa tu nombre de usuario para enviar un enlace de restablecimiento de contraseña.', 'username_help_bottom' => 'Tu nombre de usuario y correo electrónico pueden ser el mismo, pero puede que no lo sean, dependiendo de tu configuración. Si no recuerdas tu nombre de usuario, ponte en contacto con el administrador.

A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará link de cambio de contraseña. ', ]; - diff --git a/resources/lang/es-CO/auth/message.php b/resources/lang/es-CO/auth/message.php index f2df4b9830..c8dcf706a5 100644 --- a/resources/lang/es-CO/auth/message.php +++ b/resources/lang/es-CO/auth/message.php @@ -1,6 +1,6 @@ 'Ya existe un usuario con este e-mail.', 'account_not_found' => 'El nombre de usuario o contraseña es incorrecta.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Este usuario ha sido expulsado.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Ha habido un problema al iniciar sesión. Por favor, vuelve a intentarlo.', 'success' => 'has iniciado sesión correctamente.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Ha habido un problema al crear la cuenta. Por favor, vuelve a intentarlo.', 'success' => 'Cuenta creada correctamente.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'El password ha sido reseteado correctamente.', - ), + ], - -); +]; diff --git a/resources/lang/es-CO/button.php b/resources/lang/es-CO/button.php index db4c6d38f9..ada3bfd590 100644 --- a/resources/lang/es-CO/button.php +++ b/resources/lang/es-CO/button.php @@ -1,6 +1,6 @@ 'Acciones', 'add' => 'Agregar nuevo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitud', 'submit' => 'Enviar', 'upload' => 'Subir', - 'select_file' => 'Seleccionar Archivo...', + 'select_file' => 'Seleccionar Archivo...', 'select_files' => 'Selecciona Archivos...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php index ae188c2151..de464df1f8 100644 --- a/resources/lang/es-CO/general.php +++ b/resources/lang/es-CO/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Dar de Alta', 'user_requests_count' => 'Solicitudes', 'city' => 'Ciudad', - 'click_here' => 'Haz clic aquí', + 'click_here' => 'Haz clic aquí', 'clear_selection' => 'Borrar selección', 'companies' => 'Compañías', 'company' => 'Empresa', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'Pais', diff --git a/resources/lang/es-CO/help.php b/resources/lang/es-CO/help.php index d2326dec74..c364915314 100644 --- a/resources/lang/es-CO/help.php +++ b/resources/lang/es-CO/help.php @@ -1,6 +1,6 @@ "Más información", + 'more_info_title' => 'Más información', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/es-CO/mail.php b/resources/lang/es-CO/mail.php index b1b7ffde70..b02a5792b2 100644 --- a/resources/lang/es-CO/mail.php +++ b/resources/lang/es-CO/mail.php @@ -1,6 +1,6 @@ 'El usuario ha cancelado el item solicitado en la pagina Web', 'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web', 'accessory_name' => 'Nombre de accesorio:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución', 'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date', - 'your_assets' => 'Ver tus activos' -); + 'your_assets' => 'Ver tus activos', +]; diff --git a/resources/lang/es-CO/pagination.php b/resources/lang/es-CO/pagination.php index 9cbe91da30..72a72392ab 100644 --- a/resources/lang/es-CO/pagination.php +++ b/resources/lang/es-CO/pagination.php @@ -1,6 +1,6 @@ 'Siguiente »', -); +]; diff --git a/resources/lang/es-CO/passwords.php b/resources/lang/es-CO/passwords.php index c0bc9b79b2..1455a40942 100644 --- a/resources/lang/es-CO/passwords.php +++ b/resources/lang/es-CO/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'El link de la contraseña ha sido enviada!', 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.', ]; - diff --git a/resources/lang/es-CO/reminders.php b/resources/lang/es-CO/reminders.php index 0f168fec4b..6c058e6782 100644 --- a/resources/lang/es-CO/reminders.php +++ b/resources/lang/es-CO/reminders.php @@ -1,6 +1,6 @@ "Los passwords deben tener mínimo 6 caracteres y coincidir.", + 'password' => 'Los passwords deben tener mínimo 6 caracteres y coincidir.', - "user" => "Usuario o E-Mail incorrectos", + 'user' => 'Usuario o E-Mail incorrectos', - "token" => "El token para resetear el password no es válido.", + 'token' => 'El token para resetear el password no es válido.', - "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!", + 'sent' => 'Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!', -); +]; diff --git a/resources/lang/es-CO/table.php b/resources/lang/es-CO/table.php index 1ad5301590..b48767314f 100644 --- a/resources/lang/es-CO/table.php +++ b/resources/lang/es-CO/table.php @@ -1,10 +1,10 @@ 'Acciones', 'action' => 'Acción', 'by' => 'Por', 'item' => 'Item', -); +]; diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php index dfd7068339..2ebbb86771 100644 --- a/resources/lang/es-CO/validation.php +++ b/resources/lang/es-CO/validation.php @@ -1,6 +1,6 @@ ':attribute ya ha sido introducido.', 'uploaded' => 'El atributo: no se pudo cargar.', 'url' => ':attribute formato incorrecto.', - "unique_undeleted" => "El :atrribute debe ser único.", + 'unique_undeleted' => 'El :atrribute debe ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "El campo: atributo contiene un carácter que no está permitido.", - "email_array" => "Una o más direcciones de correo electrónico no es válida.", - "hashed_pass" => "Tu contraseña actual es incorrecta", + 'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.', + 'email_array' => 'Una o más direcciones de correo electrónico no es válida.', + 'hashed_pass' => 'Tu contraseña actual es incorrecta', 'dumbpwd' => 'Esa contraseña es muy común.', - "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido.", + 'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/es-ES/admin/accessories/general.php b/resources/lang/es-ES/admin/accessories/general.php index 3da0c9ac83..c2cbb39543 100644 --- a/resources/lang/es-ES/admin/accessories/general.php +++ b/resources/lang/es-ES/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', 'checkout' => 'Checkout Accesorio', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'En su lugar, use el EULA por defecto.', 'use_default_eula_disabled' => 'En su lugar, use el EULA por defecto. No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.', -); +]; diff --git a/resources/lang/es-ES/admin/accessories/message.php b/resources/lang/es-ES/admin/accessories/message.php index 4fedcf1d3f..fb42594494 100644 --- a/resources/lang/es-ES/admin/accessories/message.php +++ b/resources/lang/es-ES/admin/accessories/message.php @@ -1,37 +1,36 @@ 'El accesorio [:id] no existe.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', - 'create' => array( + 'create' => [ 'error' => 'El accesorio no fue creado, por favor, inténtalo de nuevo.', - 'success' => 'Accesorio creado correctamente.' - ), + 'success' => 'Accesorio creado correctamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El accesorio no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Accesorio actualizado correctamente.' - ), + 'success' => 'Accesorio actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estas seguro de borrar este accesorio?', 'error' => 'Ha habido un problema eliminando este accesorio. Intentalo de nuevo.', - 'success' => 'El accesorio fue borrado con éxito.' - ), + 'success' => 'El accesorio fue borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El accesorio no fue retirado, por favor vuelva a intentarlo', 'success' => 'Accesorio retirado correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El accesorio no fue agregado, favor vuelva a intentarlo', 'success' => 'Accesorio devuelto correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-ES/admin/accessories/table.php b/resources/lang/es-ES/admin/accessories/table.php index d9ae14e265..dcc2fc8b99 100644 --- a/resources/lang/es-ES/admin/accessories/table.php +++ b/resources/lang/es-ES/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Descargar CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Descargar CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre accesorio', - -); +]; diff --git a/resources/lang/es-ES/admin/asset_maintenances/form.php b/resources/lang/es-ES/admin/asset_maintenances/form.php index 7d367a06e9..396fd0890c 100644 --- a/resources/lang/es-ES/admin/asset_maintenances/form.php +++ b/resources/lang/es-ES/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tiempo de Mantenimiento de Equipo (en días)', 'notes' => 'Notas', 'update' => 'Actualizar Mantenimiento de Equipo', - 'create' => 'Crear Mantenimiento de Equipo' + 'create' => 'Crear Mantenimiento de Equipo', ]; diff --git a/resources/lang/es-ES/admin/asset_maintenances/message.php b/resources/lang/es-ES/admin/asset_maintenances/message.php index dc09777877..4a3ca6c73b 100644 --- a/resources/lang/es-ES/admin/asset_maintenances/message.php +++ b/resources/lang/es-ES/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar este mantenimiento de equipo?', 'error' => 'Hubo un problema al eliminar el mantenimiento de equipo. Por favor intente nuevamente.', - 'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.' + 'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.', ], 'create' => [ 'error' => 'El Mantenimiento de Equipo no fue creado, por favor intente nuevamente.', - 'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.' + 'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.', ], 'edit' => [ 'error' => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.', - 'success' => 'Mantenimiento de activo editado con éxito.' + 'success' => 'Mantenimiento de activo editado con éxito.', ], 'asset_maintenance_incomplete' => 'Sin Completar', 'warranty' => 'Garantía', 'not_warranty' => 'Sin Garantía', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/es-ES/admin/asset_maintenances/table.php b/resources/lang/es-ES/admin/asset_maintenances/table.php index f63124dd19..473e3ef34e 100644 --- a/resources/lang/es-ES/admin/asset_maintenances/table.php +++ b/resources/lang/es-ES/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Mantenimiento de Equipo', 'asset_name' => 'Nombre del Equipo', 'is_warranty' => 'Garantía', - 'dl_csv' => 'Descargar CSV' + 'dl_csv' => 'Descargar CSV', ]; diff --git a/resources/lang/es-ES/admin/categories/general.php b/resources/lang/es-ES/admin/categories/general.php index cee2b85b16..d8c428c589 100644 --- a/resources/lang/es-ES/admin/categories/general.php +++ b/resources/lang/es-ES/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorias', 'category_name' => 'Categoría', 'checkin_email' => 'Enviar un correo al usuario al asignar/desasignar.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'En su lugar, use el EULA por defecto.', 'use_default_eula_disabled' => 'En su lugar, use el EULA por defecto. No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.', -); +]; diff --git a/resources/lang/es-ES/admin/categories/message.php b/resources/lang/es-ES/admin/categories/message.php index 4878c7950d..f7366d9091 100644 --- a/resources/lang/es-ES/admin/categories/message.php +++ b/resources/lang/es-ES/admin/categories/message.php @@ -1,25 +1,25 @@ 'Categoría inexistente.', 'assoc_models' => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada. ', 'assoc_items' => 'Esta categoría está actualmente asociada con al menos uno: asset_type y no se puede eliminar. Por favor actualice su: asset_type para ya no hacer referencia a esta categoría e inténtelo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, intentalo de nuevo.', - 'success' => 'Categoría creada correctamente.' - ), + 'success' => 'Categoría creada correctamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se ha actualizado, intentalo de nuevo.', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de eliminar esta categoría?', 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', - 'success' => 'Categoría eliminada.' - ) + 'success' => 'Categoría eliminada.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/categories/table.php b/resources/lang/es-ES/admin/categories/table.php index 441e322fcc..e19e256ea9 100644 --- a/resources/lang/es-ES/admin/categories/table.php +++ b/resources/lang/es-ES/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Padre', 'require_acceptance' => 'Aceptación', 'title' => 'Categoría de equipo', -); +]; diff --git a/resources/lang/es-ES/admin/companies/general.php b/resources/lang/es-ES/admin/companies/general.php index 95427d69ea..452a36e230 100644 --- a/resources/lang/es-ES/admin/companies/general.php +++ b/resources/lang/es-ES/admin/companies/general.php @@ -1,4 +1,5 @@ 'Seleccionar compañía', ]; diff --git a/resources/lang/es-ES/admin/companies/message.php b/resources/lang/es-ES/admin/companies/message.php index a1bc7db6ff..a4b7ef6faf 100644 --- a/resources/lang/es-ES/admin/companies/message.php +++ b/resources/lang/es-ES/admin/companies/message.php @@ -1,18 +1,19 @@ 'La compañía no existe.', 'assoc_users' => 'Esta compañía ya está asociada con al menos un modelo y no puede eliminarse. Por favor, actualiza tus modelos para no referenciar esta compañía de nuevo y prueba otra vez. ', - 'create' => array( + 'create' => [ 'error' => 'Esta compañía no ha sido creada, por favor pruebe de nuevo.', - 'success' => 'Compañía creada satisfactoriamente.' - ), - 'update' => array( + 'success' => 'Compañía creada satisfactoriamente.', + ], + 'update' => [ 'error' => 'Compañía no actualizada, por favor inténtelo de nuevo', - 'success' => 'Compañía actualizada correctamente.' - ), - 'delete' => array( + 'success' => 'Compañía actualizada correctamente.', + ], + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar esta compañía?', 'error' => 'Hubo un problema eliminando esta compañía. Inténtelo de nuevo.', - 'success' => 'Esta compañía se eliminó satisfactoriamente.' - ) -); + 'success' => 'Esta compañía se eliminó satisfactoriamente.', + ], +]; diff --git a/resources/lang/es-ES/admin/companies/table.php b/resources/lang/es-ES/admin/companies/table.php index 7b3301aad8..37a5f8315c 100644 --- a/resources/lang/es-ES/admin/companies/table.php +++ b/resources/lang/es-ES/admin/companies/table.php @@ -1,9 +1,10 @@ 'Compañías', 'create' => 'Crear Compañía', 'title' => 'Compañía', 'update' => 'Actualizar Compañía', 'name' => 'Nombre de Compañía', 'id' => 'ID', -); +]; diff --git a/resources/lang/es-ES/admin/components/general.php b/resources/lang/es-ES/admin/components/general.php index 033bf16648..88916fc462 100644 --- a/resources/lang/es-ES/admin/components/general.php +++ b/resources/lang/es-ES/admin/components/general.php @@ -1,6 +1,6 @@ 'Nombre de Componente', 'checkin' => 'Checkin Componente', 'checkout' => 'Checkout Componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Componente', -); +]; diff --git a/resources/lang/es-ES/admin/components/message.php b/resources/lang/es-ES/admin/components/message.php index fb8de539ce..571aa8f15c 100644 --- a/resources/lang/es-ES/admin/components/message.php +++ b/resources/lang/es-ES/admin/components/message.php @@ -1,36 +1,35 @@ 'El componente no existe.', - 'create' => array( + 'create' => [ 'error' => 'El componente no fuè creado, intentalo de nuevo.', - 'success' => 'El componente se creò satisfactoriamente.' - ), + 'success' => 'El componente se creò satisfactoriamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El componente no se actualizò, intentalo de nuevo', - 'success' => 'Componente actualizado satisfactoriamente.' - ), + 'success' => 'Componente actualizado satisfactoriamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estàs seguro de que quieres borrar este componente?', 'error' => 'Hubo un problema al querer borrar el componente, intentalo de nuevo.', - 'success' => 'El componente fue borrado satisfactoriamente.' - ), + 'success' => 'El componente fue borrado satisfactoriamente.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El componente no hizo check out, intentalo de nuevo', 'success' => 'Check out del componente satisfactorio.', - 'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.' - ), + 'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El componente no fue checked in, intentalo de nuevo', 'success' => 'Check in de componente satisfactorio.', - 'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.' - ) + 'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-ES/admin/components/table.php b/resources/lang/es-ES/admin/components/table.php index 92a95311ab..4ad99c61e4 100644 --- a/resources/lang/es-ES/admin/components/table.php +++ b/resources/lang/es-ES/admin/components/table.php @@ -1,5 +1,5 @@ 'Nombre de Componente', -); +]; diff --git a/resources/lang/es-ES/admin/consumables/general.php b/resources/lang/es-ES/admin/consumables/general.php index 3b2249f8af..31b106dd4c 100644 --- a/resources/lang/es-ES/admin/consumables/general.php +++ b/resources/lang/es-ES/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout de consumible a usuario', 'consumable_name' => 'Nombre del Consumible', 'create' => 'Crear Consumible', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Consumible', -); +]; diff --git a/resources/lang/es-ES/admin/consumables/message.php b/resources/lang/es-ES/admin/consumables/message.php index ad6c4421f9..a0af213bb5 100644 --- a/resources/lang/es-ES/admin/consumables/message.php +++ b/resources/lang/es-ES/admin/consumables/message.php @@ -1,36 +1,35 @@ 'El consumible no existe.', - 'create' => array( + 'create' => [ 'error' => 'El consumible no fue creado, por favor intente nuevamente.', - 'success' => 'Consumible creado con éxito.' - ), + 'success' => 'Consumible creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El consumible no fue subido, por favor intente nuevamente', - 'success' => 'El consumible fue subido con éxito.' - ), + 'success' => 'El consumible fue subido con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar este consumible?', 'error' => 'Hubo un error al borrar este consumible. Por favor intente nuevamente.', - 'success' => 'El consumible ha sido eliminado correctamente.' - ), + 'success' => 'El consumible ha sido eliminado correctamente.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumible no fue retirado, por favor, inténtelo de nuevo', 'success' => 'Consumible fue retirado satisfactoriamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumible no fue ingresado, por favor, inténtelo de nuevo', 'success' => 'Consumible fue ingresado satisfactoriamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-ES/admin/consumables/table.php b/resources/lang/es-ES/admin/consumables/table.php index befcfc511b..db8f55deab 100644 --- a/resources/lang/es-ES/admin/consumables/table.php +++ b/resources/lang/es-ES/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nombre del Consumible', -); +]; diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php index f3f2c58932..595fa3d7d8 100644 --- a/resources/lang/es-ES/admin/custom_fields/general.php +++ b/resources/lang/es-ES/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Acerca de los campos personalizados', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuevo campo personalizado', 'value_encrypted' => 'El valor de este campo está encriptado en la base de datos. Solo los administradores pueden ver el valor desencriptado', 'show_in_email' => '¿Incluir el valor de este campo en las notificaciones por correo de asignaciones de activos? Ten en cuenta que los campos encriptados no se pueden incluir en los correos electrónicos.', -); +]; diff --git a/resources/lang/es-ES/admin/custom_fields/message.php b/resources/lang/es-ES/admin/custom_fields/message.php index 26c077f490..2602b68900 100644 --- a/resources/lang/es-ES/admin/custom_fields/message.php +++ b/resources/lang/es-ES/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'El campo no existe.', 'already_added' => 'El campo ya fue añadido', - 'create' => array( + 'create' => [ 'error' => 'Campo no creado, por favor, inténtalo de nuevo.', 'success' => 'Campo creado correctamente.', - 'assoc_success' => 'Campo correctamente añadido al grupo.' - ), + 'assoc_success' => 'Campo correctamente añadido al grupo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Campo no actualizado, por favor inténtelo de nuevo', - 'success' => 'Campo actualizado correctamente.' - ), + 'success' => 'Campo actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar este campo?', 'error' => 'Hubo un problema al eliminar el campo. Inténtelo de nuevo.', 'success' => 'El campo se eliminó correctamente.', 'in_use' => 'El campo está aún en uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'El conjunto de campos no existe', - 'create' => array( + 'create' => [ 'error' => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.', - 'success' => 'Grupo de campos creado satisfactoriamente.' - ), + 'success' => 'Grupo de campos creado satisfactoriamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El Grupo de campos no ha sido actualizado, por favor inténtelo de nuevo', - 'success' => 'Grupo de campos actualizado correctamente.' - ), + 'success' => 'Grupo de campos actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar el grupo de campos?', 'error' => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.', 'success' => 'El grupo de campos se eliminó correctamente.', 'in_use' => 'El grupo de campos está aún en uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/es-ES/admin/departments/message.php b/resources/lang/es-ES/admin/departments/message.php index fc0c0f4b41..9f433bd4f5 100644 --- a/resources/lang/es-ES/admin/departments/message.php +++ b/resources/lang/es-ES/admin/departments/message.php @@ -1,21 +1,21 @@ 'El departamento no existe.', 'assoc_users' => 'Esta localización está actualmente asociada con al menos un usuario y no puede ser eliminada, Por favor verifique que ningún usuario haga referencia a esta localización e intente de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El departamento no fue creado, por favor intente de nuevo.', - 'success' => 'Departamento creado con éxito.' - ), - 'update' => array( + 'success' => 'Departamento creado con éxito.', + ], + 'update' => [ 'error' => 'El departamento no se actualizó, por favor intente de nuevo', - 'success' => 'Departamento actualizado con éxito.' - ), - 'delete' => array( + 'success' => 'Departamento actualizado con éxito.', + ], + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar este departamento?', 'error' => 'Hubo un problema al eliminar el departamento. Inténtalo de nuevo.', - 'success' => 'El departamento ha sido borrado exitosamente' - ) + 'success' => 'El departamento ha sido borrado exitosamente', + ], -); +]; diff --git a/resources/lang/es-ES/admin/departments/table.php b/resources/lang/es-ES/admin/departments/table.php index 05abf227d5..f608860b27 100644 --- a/resources/lang/es-ES/admin/departments/table.php +++ b/resources/lang/es-ES/admin/departments/table.php @@ -1,6 +1,6 @@ 'CARNÉ DE IDENTIDAD', 'name' => 'Nombre de Departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Ubicación', 'create' => 'Crear departamento', 'update' => 'Departamento de actualización', - ); + ]; diff --git a/resources/lang/es-ES/admin/depreciations/general.php b/resources/lang/es-ES/admin/depreciations/general.php index f5c6d6e9fd..f5f35588ab 100644 --- a/resources/lang/es-ES/admin/depreciations/general.php +++ b/resources/lang/es-ES/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Info Amortización Equipos', 'about_depreciations' => 'Puedes configurar clases de amortización para amortizar equipos de forma lineal.', 'asset_depreciations' => 'Amortizaciones', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Meses', 'update' => 'Actualizar Amortización', -); +]; diff --git a/resources/lang/es-ES/admin/depreciations/message.php b/resources/lang/es-ES/admin/depreciations/message.php index a5dd1791b6..5e1d8e489d 100644 --- a/resources/lang/es-ES/admin/depreciations/message.php +++ b/resources/lang/es-ES/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Clase de amortización inexistente.', 'assoc_users' => 'Esta amortización está asociada a uno o más modelos y no puede ser eliminada.', - - 'create' => array( + 'create' => [ 'error' => 'Amortización no creada, intentalo de nuevo. :(', - 'success' => 'Amortización creada correctamente. :)' - ), + 'success' => 'Amortización creada correctamente. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Amortización no actualizada, intentalo de nuevo.', - 'success' => 'Amortización actualizada correctamente.' - ), + 'success' => 'Amortización actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estas seguro que quieres eliminar la Amortización?', 'error' => 'Amortización no eliminada, intentalo de nuevo.', - 'success' => 'Amortización eliminada correctamente.' - ) + 'success' => 'Amortización eliminada correctamente.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/depreciations/table.php b/resources/lang/es-ES/admin/depreciations/table.php index d0e2f193cc..9bfffc19a4 100644 --- a/resources/lang/es-ES/admin/depreciations/table.php +++ b/resources/lang/es-ES/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meses', 'term' => 'Termina', 'title' => 'Nombre ', -); +]; diff --git a/resources/lang/es-ES/admin/groups/message.php b/resources/lang/es-ES/admin/groups/message.php index 4b7f99ca54..7eff45a9cc 100644 --- a/resources/lang/es-ES/admin/groups/message.php +++ b/resources/lang/es-ES/admin/groups/message.php @@ -1,22 +1,22 @@ 'El grupo ya existe!', 'group_not_found' => 'El grupo [:id] no existe.', 'group_name_required' => 'El campo nombre es obligatorio', - 'success' => array( + 'success' => [ 'create' => 'Grupo creado.', 'update' => 'Grupo actualizado.', 'delete' => 'Grupo eliminado.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Seguroq que quieres Eliminar grupo?', 'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.', 'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.', 'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.', - ), + ], -); +]; diff --git a/resources/lang/es-ES/admin/groups/table.php b/resources/lang/es-ES/admin/groups/table.php index c002d06ba8..bc09ef1ea6 100644 --- a/resources/lang/es-ES/admin/groups/table.php +++ b/resources/lang/es-ES/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Nombre', 'users' => '# de Usuarios', -); +]; diff --git a/resources/lang/es-ES/admin/groups/titles.php b/resources/lang/es-ES/admin/groups/titles.php index c9d6ca4a6d..07611a0bd2 100644 --- a/resources/lang/es-ES/admin/groups/titles.php +++ b/resources/lang/es-ES/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Acerca de los grupos', 'about_groups' => 'Los Grupos son usados para generar permisos de usuarios.', 'group_management' => 'Gestión de Grupos', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Denegar', -); +]; diff --git a/resources/lang/es-ES/admin/hardware/form.php b/resources/lang/es-ES/admin/hardware/form.php index fe4084e3c7..d0cf18574e 100644 --- a/resources/lang/es-ES/admin/hardware/form.php +++ b/resources/lang/es-ES/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmar eliminación masiva de bienes', +return [ + 'bulk_delete' => 'Confirmar eliminación masiva de bienes', 'bulk_delete_help' => 'Revisar los bienes para eliminación masiva. Una vez eliminados, esos bienes pueden ser restaurados, pero no volverán a estar asociados con ningún usuario a los que esté asignado.', 'bulk_delete_warn' => 'Está a punto de borrar :asset_count.', - 'bulk_update' => 'Actualización masiva de Equipos', - 'bulk_update_help' => 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ', - 'bulk_update_warn' => 'Esta a punto de editar las propiedades de :asset_count equipos.', + 'bulk_update' => 'Actualización masiva de Equipos', + 'bulk_update_help' => 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ', + 'bulk_update_warn' => 'Esta a punto de editar las propiedades de :asset_count equipos.', 'checkedout_to' => 'Asignado a', 'checkout_date' => 'Fecha de asignación', 'checkin_date' => 'Fecha de devolución', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etiqueta', 'update' => 'Actualizar Equipo', 'warranty' => 'Garantía', - 'warranty_expires' => 'Vencimiento de la Garantía', + 'warranty_expires' => 'Vencimiento de la Garantía', 'years' => 'años', -) -; +]; diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php index 84162120c8..a80910ee6c 100644 --- a/resources/lang/es-ES/admin/hardware/general.php +++ b/resources/lang/es-ES/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Acerca de Activos', 'about_assets_text' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', - 'archived' => 'Archivado', + 'archived' => 'Archivado', 'asset' => 'Equipo', 'bulk_checkout' => 'Activos Asignados', 'checkin' => 'Quitar Equipo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pendiente', 'undeployable' => 'No desplegable', 'view' => 'Ver Equipo', -); +]; diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php index 589416d8b0..c676038c3e 100644 --- a/resources/lang/es-ES/admin/hardware/message.php +++ b/resources/lang/es-ES/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Atención: Este equipo está marcado como no isntalabre. Si no es correcto, actualiza su estado.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.', 'assoc_users' => 'Equipo asignado a un usuario, no se puede eliminar.', - 'create' => array( + 'create' => [ 'error' => 'Equipo no creado, intentalo de nuevo. :(', - 'success' => 'Equipo creado. :)' - ), + 'success' => 'Equipo creado. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Equipo no actualizado, intentalo de nuevo', 'success' => 'Equipo actualizado.', 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'El equipo no fue restaurado, por favor intente nuevamente', - 'success' => 'Equipo restaurado correctamente.' - ), + 'success' => 'Equipo restaurado correctamente.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'La auditoría de activos no tuvo éxito. Vuelve a intentarlo.', - 'success' => 'Auditoría de activos registrada correctamente.' - ), + 'success' => 'Auditoría de activos registrada correctamente.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Algunos elementos no se pudieron importar correctamente.', 'errorDetail' => 'Estos elementos no pudieron importarse debido a errores.', - 'success' => "Tu archivo ha sido importado", - 'file_delete_success' => "Tu archivo ha sido eliminado con éxito", - 'file_delete_error' => "No pudimos eliminar tu archivo", - ), + 'success' => 'Tu archivo ha sido importado', + 'file_delete_success' => 'Tu archivo ha sido eliminado con éxito', + 'file_delete_error' => 'No pudimos eliminar tu archivo', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar el equipo?', 'error' => 'Equipo no eliminado, intentalo de nuevo.', 'nothing_updated' => 'No se seleccionaron los activos, por lo que no se eliminó nada.', - 'success' => 'Equipo eliminado.' - ), + 'success' => 'Equipo eliminado.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', 'success' => 'Equipo asignado.', 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', 'not_available' => '¡Ese artículo no está disponible para retirada!', - 'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista' - ), + 'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', 'success' => 'Equipo quitado correctamente.', 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', 'already_checked_in' => 'Ese activo ya se quito.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Bien no solicitado, por favor inténtelo de nuevo', 'success' => 'Bien solicitado correctamente.', - 'canceled' => 'Solicitud de retirada cancelada con éxito' - ) + 'canceled' => 'Solicitud de retirada cancelada con éxito', + ], -); +]; diff --git a/resources/lang/es-ES/admin/hardware/table.php b/resources/lang/es-ES/admin/hardware/table.php index dcea84a5f5..a458fd7a09 100644 --- a/resources/lang/es-ES/admin/hardware/table.php +++ b/resources/lang/es-ES/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etiqueta', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Equipo ', 'image' => 'Imagen de dispositivo', 'days_without_acceptance' => 'Días Sin Aceptación', - 'monthly_depreciation' => 'Depreciación mensual' + 'monthly_depreciation' => 'Depreciación mensual', -); +]; diff --git a/resources/lang/es-ES/admin/kits/general.php b/resources/lang/es-ES/admin/kits/general.php index 06039317a1..5dd3c2ab19 100644 --- a/resources/lang/es-ES/admin/kits/general.php +++ b/resources/lang/es-ES/admin/kits/general.php @@ -1,6 +1,6 @@ 'Acerca de kits predefinidos', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Asignar kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/es-ES/admin/licenses/form.php b/resources/lang/es-ES/admin/licenses/form.php index 3724e53dbd..f3e5a1e494 100644 --- a/resources/lang/es-ES/admin/licenses/form.php +++ b/resources/lang/es-ES/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Equipo', 'checkin' => 'Quita', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Registrado a Email', 'to_name' => 'Registrado a Nombre', 'update' => 'Actualizar Licencia', - 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.' -); + 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.', +]; diff --git a/resources/lang/es-ES/admin/licenses/general.php b/resources/lang/es-ES/admin/licenses/general.php index 8a5d6db90e..43a147dcf4 100644 --- a/resources/lang/es-ES/admin/licenses/general.php +++ b/resources/lang/es-ES/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Acerca de licencias', 'about_licenses' => 'Las licencias son para identificar software. Tienen un número específico de asientos que pueden ser asignados a individuos', 'checkin' => 'Quitar Instalación', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licencias Software', 'user' => 'Usuario', 'view' => 'Ver Licencias', -); +]; diff --git a/resources/lang/es-ES/admin/licenses/message.php b/resources/lang/es-ES/admin/licenses/message.php index cab4de5b63..e196a0f548 100644 --- a/resources/lang/es-ES/admin/licenses/message.php +++ b/resources/lang/es-ES/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Categoría inexistente.', 'user_does_not_exist' => 'Usuario inexistente.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.', 'not_found' => 'Licencia no encontrada', - - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, intentalo de nuevo.', - 'success' => 'Categoría creada correctamente.' - ), + 'success' => 'Categoría creada correctamente.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se ha actualizado, intentalo de nuevo.', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de eliminar esta categoría?', 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', - 'success' => 'Categoría eliminada.' - ), + 'success' => 'Categoría eliminada.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', - 'success' => 'Equipo asignado.' - ), + 'success' => 'Equipo asignado.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', - 'success' => 'Equipo quitado correctamente.' - ), + 'success' => 'Equipo quitado correctamente.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/licenses/table.php b/resources/lang/es-ES/admin/licenses/table.php index c5b82e4147..9c4d797c4a 100644 --- a/resources/lang/es-ES/admin/licenses/table.php +++ b/resources/lang/es-ES/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Asignada a', 'checkout' => 'Quita/Asigna', @@ -14,4 +14,4 @@ return array( 'serial' => 'N. Serie', 'title' => 'Categoría de equipo', -); +]; diff --git a/resources/lang/es-ES/admin/locations/message.php b/resources/lang/es-ES/admin/locations/message.php index 80fb8e1d24..a9d9bf9ad0 100644 --- a/resources/lang/es-ES/admin/locations/message.php +++ b/resources/lang/es-ES/admin/locations/message.php @@ -1,27 +1,26 @@ 'Localización no existente.', 'assoc_users' => 'Esta localización está asignada al menos a un usuario y no puede ser eliminada. ', 'assoc_assets' => 'Esta ubicacion se encuentra actualmente asociada con por lo menos un activo y no puede ser eliminada. Por favor, actualice sus activos para no referenciar esta ubicacion e intentelo de nuevo. ', 'assoc_child_loc' => 'Esta ubicacion actualmente esta asociada con al menos una ubicacion hija y no puede ser eliminada. Por favor, actualice sus ubicaciones para no referenciar esta ubicacion e intentelo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'Localización no creada, Intentalo de nuevo.', - 'success' => 'Localización creada.' - ), + 'success' => 'Localización creada.', + ], - 'update' => array( + 'update' => [ 'error' => 'Localización no actualizada, Intentalo de nuevo', - 'success' => 'Localización actualizada.' - ), + 'success' => 'Localización actualizada.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar esta ubicación?', 'error' => 'Localización no eliminada por un problema. Intentalo de nuevo.', - 'success' => 'Localización eliminada.' - ) + 'success' => 'Localización eliminada.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/locations/table.php b/resources/lang/es-ES/admin/locations/table.php index 1e2569bfa5..001aa43eb8 100644 --- a/resources/lang/es-ES/admin/locations/table.php +++ b/resources/lang/es-ES/admin/locations/table.php @@ -1,6 +1,6 @@ 'Acerca de ubicaciones', 'about_locations' => 'Las Ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, bienes, y otros items', 'assets_rtd' => 'Equipos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Padre', 'currency' => 'Divisa de la Localización', 'ldap_ou' => 'Búsqueda LDAP OU', - ); + ]; diff --git a/resources/lang/es-ES/admin/manufacturers/message.php b/resources/lang/es-ES/admin/manufacturers/message.php index 4a78b56349..6b2b37a9e3 100644 --- a/resources/lang/es-ES/admin/manufacturers/message.php +++ b/resources/lang/es-ES/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Fabricante inexistente.', 'assoc_users' => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado', - 'create' => array( + 'create' => [ 'error' => 'Fabricante no creado, Intentalo de nuevo.', - 'success' => 'Fabricante creado.' - ), + 'success' => 'Fabricante creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fabricante no actualizado, Intentalo de nuevo', - 'success' => 'Fabricante actualizado.' - ), + 'success' => 'Fabricante actualizado.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El fabricante no fue restaurado, intente de nuevo', - 'success' => 'Fabricante restaurado con éxito.' - ), + 'success' => 'Fabricante restaurado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar Fabricante?', 'error' => 'Hubo un problema eliminando el fabricante. Por favor, inténtalo de nuevo.', - 'success' => 'Fabricante Eliminado.' - ) + 'success' => 'Fabricante Eliminado.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/manufacturers/table.php b/resources/lang/es-ES/admin/manufacturers/table.php index 972d33b71b..77c22bcc82 100644 --- a/resources/lang/es-ES/admin/manufacturers/table.php +++ b/resources/lang/es-ES/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre fabricantes', 'about_manufacturers_text' => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto sobre ellos, que se mostrará en sus páginas de detalle de activos.', 'asset_manufacturers' => 'Fabricantes', @@ -13,4 +13,4 @@ return array( 'update' => 'Actualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/es-ES/admin/models/general.php b/resources/lang/es-ES/admin/models/general.php index 0e02e00aec..90bca950ad 100644 --- a/resources/lang/es-ES/admin/models/general.php +++ b/resources/lang/es-ES/admin/models/general.php @@ -1,6 +1,6 @@ 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Los usuarios pueden solicitar este modelo', - 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', + 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', 'view_deleted' => 'Ver Borrados', 'view_models' => 'Ver Modelos', 'fieldset' => 'Grupos de campo', 'no_custom_field' => 'No hay campos personalizados', 'add_default_values' => 'Agregar valores predeterminados', -); +]; diff --git a/resources/lang/es-ES/admin/models/message.php b/resources/lang/es-ES/admin/models/message.php index 53bea1807a..e02a72157b 100644 --- a/resources/lang/es-ES/admin/models/message.php +++ b/resources/lang/es-ES/admin/models/message.php @@ -1,42 +1,41 @@ 'Modelo inexistente.', 'assoc_users' => 'Este modelo está asignado a uno o más equipos y no puede ser eliminado', - - 'create' => array( + 'create' => [ 'error' => 'Modelo no creado, Intentalo de nuevo.', 'success' => 'Modelo creado.', 'duplicate_set' => 'Un modelo de activo con ese nombre, fabricante y número de modelo ya existe.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modelo no actualizado, Intentalo de nuevo', - 'success' => 'Modelo actualizado.' - ), + 'success' => 'Modelo actualizado.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de querer eliminar el Modelo?', 'error' => 'Ha habido un problema al eliminar el Modelo. Intentalo de nuevo.', - 'success' => 'Modelo eliminado.' - ), + 'success' => 'Modelo eliminado.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El modelo no fue restaurado, por favor intente nuevamente', - 'success' => 'Modelo restaurado exitosamente.' - ), + 'success' => 'Modelo restaurado exitosamente.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - 'success' => 'Modelos actualizados.' - ), + 'success' => 'Modelos actualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ningún modelo fue seleccionado, así que nada fue eliminado.', 'success' => '¡:success_count modelo(s) eliminado(s)!', - 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.' - ), + 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/models/table.php b/resources/lang/es-ES/admin/models/table.php index 23298d575a..8507319731 100644 --- a/resources/lang/es-ES/admin/models/table.php +++ b/resources/lang/es-ES/admin/models/table.php @@ -1,6 +1,6 @@ 'Crear Modelo Equipo', 'created_at' => 'Creado el', @@ -14,4 +14,4 @@ return array( 'update' => 'Actualizar Modelo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/es-ES/admin/reports/general.php b/resources/lang/es-ES/admin/reports/general.php index f6251cdbf3..9b9d3baad9 100644 --- a/resources/lang/es-ES/admin/reports/general.php +++ b/resources/lang/es-ES/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecciona las opciones de tu informe de Equipos.' -); +return [ + 'info' => 'Selecciona las opciones de tu informe de Equipos.', +]; diff --git a/resources/lang/es-ES/admin/reports/message.php b/resources/lang/es-ES/admin/reports/message.php index a8f61aa993..a5bd885673 100644 --- a/resources/lang/es-ES/admin/reports/message.php +++ b/resources/lang/es-ES/admin/reports/message.php @@ -1,5 +1,5 @@ 'Debes seleccionar al menos UNA opción.' -); +return [ + 'error' => 'Debes seleccionar al menos UNA opción.', +]; diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php index 595528d794..a80f30cd76 100644 --- a/resources/lang/es-ES/admin/settings/general.php +++ b/resources/lang/es-ES/admin/settings/general.php @@ -1,12 +1,12 @@ 'Directorio Activo', 'ad_domain' => 'Dominio del Directorio Activo', 'ad_domain_help' => 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.', 'ad_append_domain_label' => 'Añadir nombre de dominio', 'ad_append_domain' => 'Añadir nombre de dominio al campo de nombre de usuario', - 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".' , + 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".', 'admin_cc_email' => 'Email CC', 'admin_cc_email_help' => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.', 'is_ad' => 'Este es un servidor de Directorio Activo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Limite de alertas de expiración (en días)', 'alert_inv_threshold' => 'Umbral de alerta del inventario', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDs de Recurso', 'audit_interval' => 'Intervalo de auditoría', 'audit_interval_help' => 'Si tiene que auditar físicamente sus activos periódicamente, ingrese el intervalo en meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ingrese código de verificación en dos pasos', 'two_factor_config_complete' => 'Enviar código', 'two_factor_enabled_edit_not_allowed' => 'El administrador no permite modificar esta configuración.', - 'two_factor_enrollment_text' => "Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo", + 'two_factor_enrollment_text' => 'Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo', 'require_accept_signature' => 'Requerir Firma', 'require_accept_signature_help_text' => 'Para activar esta función se requiere que los usuarios firmen fisicamente aceptando el activo.', 'left' => 'izquierda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Al marcar esta casilla se forzarán números de serie únicos a los activos', 'zerofill_count' => 'Longitud de etiquetas de activos, incluyendo relleno de ceros', 'username_format_help' => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.', -); +]; diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php index 3980dcd7a8..7c5c53f248 100644 --- a/resources/lang/es-ES/admin/settings/message.php +++ b/resources/lang/es-ES/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ha ocurrido un error al actualizar. ', - 'success' => 'Parámetros actualizados correctamente.' - ), - 'backup' => array( + 'success' => 'Parámetros actualizados correctamente.', + ], + 'backup' => [ 'delete_confirm' => 'Está seguro que desea eliminar este archivo de respaldo? Esta acción no puede ser revertida. ', 'file_deleted' => 'El archivo de respaldo fue eliminado satisfactoriamente. ', 'generated' => 'Un nuevo archivo de respaldo fue creado satisfactoriamente.', 'file_not_found' => 'El archivo de respaldo no se ha encontrado en el servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ', 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.', - 'success' => 'Registros eliminados correctamente purgados.' - ), + 'success' => 'Registros eliminados correctamente purgados.', + ], -); +]; diff --git a/resources/lang/es-ES/admin/statuslabels/message.php b/resources/lang/es-ES/admin/statuslabels/message.php index c158f22b1a..363a163e69 100644 --- a/resources/lang/es-ES/admin/statuslabels/message.php +++ b/resources/lang/es-ES/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Etiqueta de estado no existe.', 'assoc_assets' => 'Esta etiqueta de estado esta actualmente asociado con al menos un activo y no se puede eliminar. Por favor actualice sus activos para ya no hacer referencia a este estado y vuelva a intentarlo. ', - - 'create' => array( + 'create' => [ 'error' => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.', - 'success' => 'Etiqueta de estado fue creada exitosamente.' - ), + 'success' => 'Etiqueta de estado fue creada exitosamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'Etiqueta de estado no se ha actualizado, por favor, inténtelo de nuevo', - 'success' => 'Etiqueta de estado fue actualizada exitosamente.' - ), + 'success' => 'Etiqueta de estado fue actualizada exitosamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar esta etiqueta de estado?', 'error' => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.', - 'success' => 'La etiqueta de estado se ha eliminado exitosamente.' - ), + 'success' => 'La etiqueta de estado se ha eliminado exitosamente.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Estos activos no pueden asignarse a nadie.', 'deployable' => 'Estos activos se pueden desproteger. Una vez que se les asigna, asumirán un estado meta de Deployed.', 'archived' => 'Estos activos no pueden desprotegerse y solo aparecerán en la vista Archivada. Esto es útil para retener información sobre activos para presupuestos / propósitos históricos, pero mantenerlos fuera de la lista de activos del día a día.', 'pending' => 'Estos activos aún no se pueden asignar a nadie, a menudo se utilizan para artículos que están pendientes de reparación, pero se espera que vuelvan a la circulación.', - ), + ], -); +]; diff --git a/resources/lang/es-ES/admin/statuslabels/table.php b/resources/lang/es-ES/admin/statuslabels/table.php index 4aa57fc6e7..5b5d33b11f 100644 --- a/resources/lang/es-ES/admin/statuslabels/table.php +++ b/resources/lang/es-ES/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Info Etiquetas Estado', 'archived' => 'Archivado', 'create' => 'Crear Etiqueta Estado', @@ -16,4 +16,4 @@ return array( 'title' => 'Etiquetas Estado', 'undeployable' => 'No desplegable', 'update' => 'Actualizar Etiqueta Estado', -); +]; diff --git a/resources/lang/es-ES/admin/suppliers/message.php b/resources/lang/es-ES/admin/suppliers/message.php index 8956e1ff62..f5dca9750c 100644 --- a/resources/lang/es-ES/admin/suppliers/message.php +++ b/resources/lang/es-ES/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Proveedor does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Proveedor no creado, Intentalo de nuevo.', - 'success' => 'Proveedor creado.' - ), + 'success' => 'Proveedor creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proveedor no actualizado, Intentalo de nuevo', - 'success' => 'Proveedor actualizado.' - ), + 'success' => 'Proveedor actualizado.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de querer eliminar este Proveedor?', 'error' => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.', 'success' => 'Proveedor eliminado.', 'assoc_assets' => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ', 'assoc_licenses' => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser eliminado. Por favor, actualiza tus licencias para no referenciar este proveedor e inténtalo de nuevo. ', 'assoc_maintenances' => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ', - ) + ], -); +]; diff --git a/resources/lang/es-ES/admin/suppliers/table.php b/resources/lang/es-ES/admin/suppliers/table.php index f576b2d372..d488c5b409 100644 --- a/resources/lang/es-ES/admin/suppliers/table.php +++ b/resources/lang/es-ES/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Acerca de Proveedores', 'about_suppliers_text' => 'Los Proveedores son utilizados para hacer seguimiento de la fuente de los items', 'address' => 'Dirección del Proveedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Equipos para', 'zip' => 'Código Postal', -); +]; diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php index 221c9d4dc9..863f5405c0 100644 --- a/resources/lang/es-ES/admin/users/general.php +++ b/resources/lang/es-ES/admin/users/general.php @@ -1,7 +1,6 @@ 'Este usuario puede ingresar', 'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.', 'assets_user' => 'Equipos asignados a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Usuario', 'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.', 'history_user' => 'Historial de :name', - 'info' => 'Información', + 'info' => 'Información', 'restore_user' => 'Haga clic aquí para restaurarlos.', 'last_login' => 'Último acceso', 'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ', 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ', 'two_factor_active' => '2FA Activo ', - ); + ]; diff --git a/resources/lang/es-ES/admin/users/message.php b/resources/lang/es-ES/admin/users/message.php index 56d0931192..62c97bd43c 100644 --- a/resources/lang/es-ES/admin/users/message.php +++ b/resources/lang/es-ES/admin/users/message.php @@ -1,6 +1,6 @@ 'Ha aceptado con éxito este equipo.', 'declined' => 'Ha declinado con éxito este equipo.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'La integración con LDAP no ha sido configurada para esta instalación.', 'password_resets_sent' => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.', - - 'success' => array( + 'success' => [ 'create' => 'Usuario correctamente creado.', 'update' => 'Usuario correctamente actualizado.', 'update_bulk' => 'Usuarios correctamente actualizados!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Usuario correctamente no suspendido.', 'restored' => 'Usuario correctamente restaurado.', 'import' => 'Usuarios importados correctamente.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.', 'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.', 'delete' => 'Ha habido un problema eliminando el Usuario. Intentalo de nuevo.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningún archivo para subir', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], -); +]; diff --git a/resources/lang/es-ES/admin/users/table.php b/resources/lang/es-ES/admin/users/table.php index 81db6c7894..7949961974 100644 --- a/resources/lang/es-ES/admin/users/table.php +++ b/resources/lang/es-ES/admin/users/table.php @@ -1,6 +1,6 @@ 'Activo', 'allow' => 'Permitir', 'checkedout' => 'Equipos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar usuarios actuales', 'show_deleted' => 'Mostrar usuarios eliminados', 'title' => 'Puesto', - 'to_restore_them' => 'para restaurarlos.', + 'to_restore_them' => 'para restaurarlos.', 'updateuser' => 'Actualizar Usuario', 'username' => 'Usuario', - 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', + 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', 'username_note' => '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)', 'cloneuser' => 'Clonar Usuario', 'viewusers' => 'Ver Usuarios', -); +]; diff --git a/resources/lang/es-ES/auth/general.php b/resources/lang/es-ES/auth/general.php index 1f433edb22..c96e38d173 100644 --- a/resources/lang/es-ES/auth/general.php +++ b/resources/lang/es-ES/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Introduzca su nombre de usuario para enviar un enlace de restablecimiento de contraseña.', 'username_help_bottom' => 'Tu nombre de usuario y dirección de correo electrónico puede ser el mismo, pero puede que no lo sea, dependiendo de tu configuración. Si no puede recordar su nombre de usuario, póngase en contacto con su administrador.

A los usuarios sin una dirección de correo electrónico asociada no se enviará por correo electrónico un enlace de restablecimiento de contraseña. ', ]; - diff --git a/resources/lang/es-ES/auth/message.php b/resources/lang/es-ES/auth/message.php index f2df4b9830..c8dcf706a5 100644 --- a/resources/lang/es-ES/auth/message.php +++ b/resources/lang/es-ES/auth/message.php @@ -1,6 +1,6 @@ 'Ya existe un usuario con este e-mail.', 'account_not_found' => 'El nombre de usuario o contraseña es incorrecta.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Este usuario ha sido expulsado.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Ha habido un problema al iniciar sesión. Por favor, vuelve a intentarlo.', 'success' => 'has iniciado sesión correctamente.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Ha habido un problema al crear la cuenta. Por favor, vuelve a intentarlo.', 'success' => 'Cuenta creada correctamente.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'El password ha sido reseteado correctamente.', - ), + ], - -); +]; diff --git a/resources/lang/es-ES/button.php b/resources/lang/es-ES/button.php index db4c6d38f9..ada3bfd590 100644 --- a/resources/lang/es-ES/button.php +++ b/resources/lang/es-ES/button.php @@ -1,6 +1,6 @@ 'Acciones', 'add' => 'Agregar nuevo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitud', 'submit' => 'Enviar', 'upload' => 'Subir', - 'select_file' => 'Seleccionar Archivo...', + 'select_file' => 'Seleccionar Archivo...', 'select_files' => 'Selecciona Archivos...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index 26b8e90049..7bc4758538 100644 --- a/resources/lang/es-ES/general.php +++ b/resources/lang/es-ES/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Dar de Alta', 'user_requests_count' => 'Solicitudes', 'city' => 'Ciudad', - 'click_here' => 'Pulsa aquí', + 'click_here' => 'Pulsa aquí', 'clear_selection' => 'Eliminar Selección', 'companies' => 'Empresas', 'company' => 'Empresa', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'Pais', diff --git a/resources/lang/es-ES/help.php b/resources/lang/es-ES/help.php index d2326dec74..c364915314 100644 --- a/resources/lang/es-ES/help.php +++ b/resources/lang/es-ES/help.php @@ -1,6 +1,6 @@ "Más información", + 'more_info_title' => 'Más información', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/es-ES/mail.php b/resources/lang/es-ES/mail.php index b1b7ffde70..b02a5792b2 100644 --- a/resources/lang/es-ES/mail.php +++ b/resources/lang/es-ES/mail.php @@ -1,6 +1,6 @@ 'El usuario ha cancelado el item solicitado en la pagina Web', 'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web', 'accessory_name' => 'Nombre de accesorio:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución', 'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date', - 'your_assets' => 'Ver tus activos' -); + 'your_assets' => 'Ver tus activos', +]; diff --git a/resources/lang/es-ES/pagination.php b/resources/lang/es-ES/pagination.php index 9cbe91da30..72a72392ab 100644 --- a/resources/lang/es-ES/pagination.php +++ b/resources/lang/es-ES/pagination.php @@ -1,6 +1,6 @@ 'Siguiente »', -); +]; diff --git a/resources/lang/es-ES/passwords.php b/resources/lang/es-ES/passwords.php index c0bc9b79b2..1455a40942 100644 --- a/resources/lang/es-ES/passwords.php +++ b/resources/lang/es-ES/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'El link de la contraseña ha sido enviada!', 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.', ]; - diff --git a/resources/lang/es-ES/reminders.php b/resources/lang/es-ES/reminders.php index 0f168fec4b..6c058e6782 100644 --- a/resources/lang/es-ES/reminders.php +++ b/resources/lang/es-ES/reminders.php @@ -1,6 +1,6 @@ "Los passwords deben tener mínimo 6 caracteres y coincidir.", + 'password' => 'Los passwords deben tener mínimo 6 caracteres y coincidir.', - "user" => "Usuario o E-Mail incorrectos", + 'user' => 'Usuario o E-Mail incorrectos', - "token" => "El token para resetear el password no es válido.", + 'token' => 'El token para resetear el password no es válido.', - "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!", + 'sent' => 'Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!', -); +]; diff --git a/resources/lang/es-ES/table.php b/resources/lang/es-ES/table.php index 1ad5301590..b48767314f 100644 --- a/resources/lang/es-ES/table.php +++ b/resources/lang/es-ES/table.php @@ -1,10 +1,10 @@ 'Acciones', 'action' => 'Acción', 'by' => 'Por', 'item' => 'Item', -); +]; diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php index dfd7068339..2ebbb86771 100644 --- a/resources/lang/es-ES/validation.php +++ b/resources/lang/es-ES/validation.php @@ -1,6 +1,6 @@ ':attribute ya ha sido introducido.', 'uploaded' => 'El atributo: no se pudo cargar.', 'url' => ':attribute formato incorrecto.', - "unique_undeleted" => "El :atrribute debe ser único.", + 'unique_undeleted' => 'El :atrribute debe ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "El campo: atributo contiene un carácter que no está permitido.", - "email_array" => "Una o más direcciones de correo electrónico no es válida.", - "hashed_pass" => "Tu contraseña actual es incorrecta", + 'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.', + 'email_array' => 'Una o más direcciones de correo electrónico no es válida.', + 'hashed_pass' => 'Tu contraseña actual es incorrecta', 'dumbpwd' => 'Esa contraseña es muy común.', - "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido.", + 'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/es-MX/admin/accessories/general.php b/resources/lang/es-MX/admin/accessories/general.php index 3da0c9ac83..c2cbb39543 100644 --- a/resources/lang/es-MX/admin/accessories/general.php +++ b/resources/lang/es-MX/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', 'checkout' => 'Checkout Accesorio', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'En su lugar, use el EULA por defecto.', 'use_default_eula_disabled' => 'En su lugar, use el EULA por defecto. No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.', -); +]; diff --git a/resources/lang/es-MX/admin/accessories/message.php b/resources/lang/es-MX/admin/accessories/message.php index 4fedcf1d3f..fb42594494 100644 --- a/resources/lang/es-MX/admin/accessories/message.php +++ b/resources/lang/es-MX/admin/accessories/message.php @@ -1,37 +1,36 @@ 'El accesorio [:id] no existe.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', - 'create' => array( + 'create' => [ 'error' => 'El accesorio no fue creado, por favor, inténtalo de nuevo.', - 'success' => 'Accesorio creado correctamente.' - ), + 'success' => 'Accesorio creado correctamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El accesorio no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Accesorio actualizado correctamente.' - ), + 'success' => 'Accesorio actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estas seguro de borrar este accesorio?', 'error' => 'Ha habido un problema eliminando este accesorio. Intentalo de nuevo.', - 'success' => 'El accesorio fue borrado con éxito.' - ), + 'success' => 'El accesorio fue borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El accesorio no fue retirado, por favor vuelva a intentarlo', 'success' => 'Accesorio retirado correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El accesorio no fue agregado, favor vuelva a intentarlo', 'success' => 'Accesorio devuelto correctamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-MX/admin/accessories/table.php b/resources/lang/es-MX/admin/accessories/table.php index d9ae14e265..dcc2fc8b99 100644 --- a/resources/lang/es-MX/admin/accessories/table.php +++ b/resources/lang/es-MX/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Descargar CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Descargar CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre accesorio', - -); +]; diff --git a/resources/lang/es-MX/admin/asset_maintenances/form.php b/resources/lang/es-MX/admin/asset_maintenances/form.php index 7d367a06e9..396fd0890c 100644 --- a/resources/lang/es-MX/admin/asset_maintenances/form.php +++ b/resources/lang/es-MX/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tiempo de Mantenimiento de Equipo (en días)', 'notes' => 'Notas', 'update' => 'Actualizar Mantenimiento de Equipo', - 'create' => 'Crear Mantenimiento de Equipo' + 'create' => 'Crear Mantenimiento de Equipo', ]; diff --git a/resources/lang/es-MX/admin/asset_maintenances/message.php b/resources/lang/es-MX/admin/asset_maintenances/message.php index dc09777877..4a3ca6c73b 100644 --- a/resources/lang/es-MX/admin/asset_maintenances/message.php +++ b/resources/lang/es-MX/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar este mantenimiento de equipo?', 'error' => 'Hubo un problema al eliminar el mantenimiento de equipo. Por favor intente nuevamente.', - 'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.' + 'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.', ], 'create' => [ 'error' => 'El Mantenimiento de Equipo no fue creado, por favor intente nuevamente.', - 'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.' + 'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.', ], 'edit' => [ 'error' => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.', - 'success' => 'Mantenimiento de activo editado con éxito.' + 'success' => 'Mantenimiento de activo editado con éxito.', ], 'asset_maintenance_incomplete' => 'Sin Completar', 'warranty' => 'Garantía', 'not_warranty' => 'Sin Garantía', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/es-MX/admin/asset_maintenances/table.php b/resources/lang/es-MX/admin/asset_maintenances/table.php index f63124dd19..473e3ef34e 100644 --- a/resources/lang/es-MX/admin/asset_maintenances/table.php +++ b/resources/lang/es-MX/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Mantenimiento de Equipo', 'asset_name' => 'Nombre del Equipo', 'is_warranty' => 'Garantía', - 'dl_csv' => 'Descargar CSV' + 'dl_csv' => 'Descargar CSV', ]; diff --git a/resources/lang/es-MX/admin/categories/general.php b/resources/lang/es-MX/admin/categories/general.php index 4c7d977ebb..77dc7876c4 100644 --- a/resources/lang/es-MX/admin/categories/general.php +++ b/resources/lang/es-MX/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorias', 'category_name' => 'Categoría', 'checkin_email' => 'Enviar un correo al usuario al asignar/desasignar.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'En su lugar, use el EULA por defecto.', 'use_default_eula_disabled' => 'En su lugar, use el EULA por defecto. No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.', -); +]; diff --git a/resources/lang/es-MX/admin/categories/message.php b/resources/lang/es-MX/admin/categories/message.php index 4878c7950d..f7366d9091 100644 --- a/resources/lang/es-MX/admin/categories/message.php +++ b/resources/lang/es-MX/admin/categories/message.php @@ -1,25 +1,25 @@ 'Categoría inexistente.', 'assoc_models' => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada. ', 'assoc_items' => 'Esta categoría está actualmente asociada con al menos uno: asset_type y no se puede eliminar. Por favor actualice su: asset_type para ya no hacer referencia a esta categoría e inténtelo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, intentalo de nuevo.', - 'success' => 'Categoría creada correctamente.' - ), + 'success' => 'Categoría creada correctamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se ha actualizado, intentalo de nuevo.', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de eliminar esta categoría?', 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', - 'success' => 'Categoría eliminada.' - ) + 'success' => 'Categoría eliminada.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/categories/table.php b/resources/lang/es-MX/admin/categories/table.php index 441e322fcc..e19e256ea9 100644 --- a/resources/lang/es-MX/admin/categories/table.php +++ b/resources/lang/es-MX/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Padre', 'require_acceptance' => 'Aceptación', 'title' => 'Categoría de equipo', -); +]; diff --git a/resources/lang/es-MX/admin/companies/general.php b/resources/lang/es-MX/admin/companies/general.php index 95427d69ea..452a36e230 100644 --- a/resources/lang/es-MX/admin/companies/general.php +++ b/resources/lang/es-MX/admin/companies/general.php @@ -1,4 +1,5 @@ 'Seleccionar compañía', ]; diff --git a/resources/lang/es-MX/admin/companies/message.php b/resources/lang/es-MX/admin/companies/message.php index a1bc7db6ff..a4b7ef6faf 100644 --- a/resources/lang/es-MX/admin/companies/message.php +++ b/resources/lang/es-MX/admin/companies/message.php @@ -1,18 +1,19 @@ 'La compañía no existe.', 'assoc_users' => 'Esta compañía ya está asociada con al menos un modelo y no puede eliminarse. Por favor, actualiza tus modelos para no referenciar esta compañía de nuevo y prueba otra vez. ', - 'create' => array( + 'create' => [ 'error' => 'Esta compañía no ha sido creada, por favor pruebe de nuevo.', - 'success' => 'Compañía creada satisfactoriamente.' - ), - 'update' => array( + 'success' => 'Compañía creada satisfactoriamente.', + ], + 'update' => [ 'error' => 'Compañía no actualizada, por favor inténtelo de nuevo', - 'success' => 'Compañía actualizada correctamente.' - ), - 'delete' => array( + 'success' => 'Compañía actualizada correctamente.', + ], + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar esta compañía?', 'error' => 'Hubo un problema eliminando esta compañía. Inténtelo de nuevo.', - 'success' => 'Esta compañía se eliminó satisfactoriamente.' - ) -); + 'success' => 'Esta compañía se eliminó satisfactoriamente.', + ], +]; diff --git a/resources/lang/es-MX/admin/companies/table.php b/resources/lang/es-MX/admin/companies/table.php index 7b3301aad8..37a5f8315c 100644 --- a/resources/lang/es-MX/admin/companies/table.php +++ b/resources/lang/es-MX/admin/companies/table.php @@ -1,9 +1,10 @@ 'Compañías', 'create' => 'Crear Compañía', 'title' => 'Compañía', 'update' => 'Actualizar Compañía', 'name' => 'Nombre de Compañía', 'id' => 'ID', -); +]; diff --git a/resources/lang/es-MX/admin/components/general.php b/resources/lang/es-MX/admin/components/general.php index 033bf16648..88916fc462 100644 --- a/resources/lang/es-MX/admin/components/general.php +++ b/resources/lang/es-MX/admin/components/general.php @@ -1,6 +1,6 @@ 'Nombre de Componente', 'checkin' => 'Checkin Componente', 'checkout' => 'Checkout Componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Componente', -); +]; diff --git a/resources/lang/es-MX/admin/components/message.php b/resources/lang/es-MX/admin/components/message.php index fb8de539ce..571aa8f15c 100644 --- a/resources/lang/es-MX/admin/components/message.php +++ b/resources/lang/es-MX/admin/components/message.php @@ -1,36 +1,35 @@ 'El componente no existe.', - 'create' => array( + 'create' => [ 'error' => 'El componente no fuè creado, intentalo de nuevo.', - 'success' => 'El componente se creò satisfactoriamente.' - ), + 'success' => 'El componente se creò satisfactoriamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El componente no se actualizò, intentalo de nuevo', - 'success' => 'Componente actualizado satisfactoriamente.' - ), + 'success' => 'Componente actualizado satisfactoriamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estàs seguro de que quieres borrar este componente?', 'error' => 'Hubo un problema al querer borrar el componente, intentalo de nuevo.', - 'success' => 'El componente fue borrado satisfactoriamente.' - ), + 'success' => 'El componente fue borrado satisfactoriamente.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El componente no hizo check out, intentalo de nuevo', 'success' => 'Check out del componente satisfactorio.', - 'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.' - ), + 'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El componente no fue checked in, intentalo de nuevo', 'success' => 'Check in de componente satisfactorio.', - 'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.' - ) + 'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-MX/admin/components/table.php b/resources/lang/es-MX/admin/components/table.php index 92a95311ab..4ad99c61e4 100644 --- a/resources/lang/es-MX/admin/components/table.php +++ b/resources/lang/es-MX/admin/components/table.php @@ -1,5 +1,5 @@ 'Nombre de Componente', -); +]; diff --git a/resources/lang/es-MX/admin/consumables/general.php b/resources/lang/es-MX/admin/consumables/general.php index 3b2249f8af..31b106dd4c 100644 --- a/resources/lang/es-MX/admin/consumables/general.php +++ b/resources/lang/es-MX/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout de consumible a usuario', 'consumable_name' => 'Nombre del Consumible', 'create' => 'Crear Consumible', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Consumible', -); +]; diff --git a/resources/lang/es-MX/admin/consumables/message.php b/resources/lang/es-MX/admin/consumables/message.php index ad6c4421f9..a0af213bb5 100644 --- a/resources/lang/es-MX/admin/consumables/message.php +++ b/resources/lang/es-MX/admin/consumables/message.php @@ -1,36 +1,35 @@ 'El consumible no existe.', - 'create' => array( + 'create' => [ 'error' => 'El consumible no fue creado, por favor intente nuevamente.', - 'success' => 'Consumible creado con éxito.' - ), + 'success' => 'Consumible creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El consumible no fue subido, por favor intente nuevamente', - 'success' => 'El consumible fue subido con éxito.' - ), + 'success' => 'El consumible fue subido con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar este consumible?', 'error' => 'Hubo un error al borrar este consumible. Por favor intente nuevamente.', - 'success' => 'El consumible ha sido eliminado correctamente.' - ), + 'success' => 'El consumible ha sido eliminado correctamente.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumible no fue retirado, por favor, inténtelo de nuevo', 'success' => 'Consumible fue retirado satisfactoriamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumible no fue ingresado, por favor, inténtelo de nuevo', 'success' => 'Consumible fue ingresado satisfactoriamente.', - 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-MX/admin/consumables/table.php b/resources/lang/es-MX/admin/consumables/table.php index befcfc511b..db8f55deab 100644 --- a/resources/lang/es-MX/admin/consumables/table.php +++ b/resources/lang/es-MX/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nombre del Consumible', -); +]; diff --git a/resources/lang/es-MX/admin/custom_fields/general.php b/resources/lang/es-MX/admin/custom_fields/general.php index 864606e23e..0b6fd7ac8a 100644 --- a/resources/lang/es-MX/admin/custom_fields/general.php +++ b/resources/lang/es-MX/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Acerca de los campos personalizados', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuevo campo personalizado', 'value_encrypted' => 'El valor de este campo está encriptado en la base de datos. Solo los administradores pueden ver el valor desencriptado', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/es-MX/admin/custom_fields/message.php b/resources/lang/es-MX/admin/custom_fields/message.php index 26c077f490..2602b68900 100644 --- a/resources/lang/es-MX/admin/custom_fields/message.php +++ b/resources/lang/es-MX/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'El campo no existe.', 'already_added' => 'El campo ya fue añadido', - 'create' => array( + 'create' => [ 'error' => 'Campo no creado, por favor, inténtalo de nuevo.', 'success' => 'Campo creado correctamente.', - 'assoc_success' => 'Campo correctamente añadido al grupo.' - ), + 'assoc_success' => 'Campo correctamente añadido al grupo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Campo no actualizado, por favor inténtelo de nuevo', - 'success' => 'Campo actualizado correctamente.' - ), + 'success' => 'Campo actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar este campo?', 'error' => 'Hubo un problema al eliminar el campo. Inténtelo de nuevo.', 'success' => 'El campo se eliminó correctamente.', 'in_use' => 'El campo está aún en uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'El conjunto de campos no existe', - 'create' => array( + 'create' => [ 'error' => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.', - 'success' => 'Grupo de campos creado satisfactoriamente.' - ), + 'success' => 'Grupo de campos creado satisfactoriamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'El Grupo de campos no ha sido actualizado, por favor inténtelo de nuevo', - 'success' => 'Grupo de campos actualizado correctamente.' - ), + 'success' => 'Grupo de campos actualizado correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Seguro que quieres eliminar el grupo de campos?', 'error' => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.', 'success' => 'El grupo de campos se eliminó correctamente.', 'in_use' => 'El grupo de campos está aún en uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/es-MX/admin/departments/message.php b/resources/lang/es-MX/admin/departments/message.php index fc0c0f4b41..9f433bd4f5 100644 --- a/resources/lang/es-MX/admin/departments/message.php +++ b/resources/lang/es-MX/admin/departments/message.php @@ -1,21 +1,21 @@ 'El departamento no existe.', 'assoc_users' => 'Esta localización está actualmente asociada con al menos un usuario y no puede ser eliminada, Por favor verifique que ningún usuario haga referencia a esta localización e intente de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El departamento no fue creado, por favor intente de nuevo.', - 'success' => 'Departamento creado con éxito.' - ), - 'update' => array( + 'success' => 'Departamento creado con éxito.', + ], + 'update' => [ 'error' => 'El departamento no se actualizó, por favor intente de nuevo', - 'success' => 'Departamento actualizado con éxito.' - ), - 'delete' => array( + 'success' => 'Departamento actualizado con éxito.', + ], + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas eliminar este departamento?', 'error' => 'Hubo un problema al eliminar el departamento. Inténtalo de nuevo.', - 'success' => 'El departamento ha sido borrado exitosamente' - ) + 'success' => 'El departamento ha sido borrado exitosamente', + ], -); +]; diff --git a/resources/lang/es-MX/admin/departments/table.php b/resources/lang/es-MX/admin/departments/table.php index 05abf227d5..f608860b27 100644 --- a/resources/lang/es-MX/admin/departments/table.php +++ b/resources/lang/es-MX/admin/departments/table.php @@ -1,6 +1,6 @@ 'CARNÉ DE IDENTIDAD', 'name' => 'Nombre de Departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Ubicación', 'create' => 'Crear departamento', 'update' => 'Departamento de actualización', - ); + ]; diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php index f5c6d6e9fd..f5f35588ab 100644 --- a/resources/lang/es-MX/admin/depreciations/general.php +++ b/resources/lang/es-MX/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Info Amortización Equipos', 'about_depreciations' => 'Puedes configurar clases de amortización para amortizar equipos de forma lineal.', 'asset_depreciations' => 'Amortizaciones', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Meses', 'update' => 'Actualizar Amortización', -); +]; diff --git a/resources/lang/es-MX/admin/depreciations/message.php b/resources/lang/es-MX/admin/depreciations/message.php index a5dd1791b6..5e1d8e489d 100644 --- a/resources/lang/es-MX/admin/depreciations/message.php +++ b/resources/lang/es-MX/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Clase de amortización inexistente.', 'assoc_users' => 'Esta amortización está asociada a uno o más modelos y no puede ser eliminada.', - - 'create' => array( + 'create' => [ 'error' => 'Amortización no creada, intentalo de nuevo. :(', - 'success' => 'Amortización creada correctamente. :)' - ), + 'success' => 'Amortización creada correctamente. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Amortización no actualizada, intentalo de nuevo.', - 'success' => 'Amortización actualizada correctamente.' - ), + 'success' => 'Amortización actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estas seguro que quieres eliminar la Amortización?', 'error' => 'Amortización no eliminada, intentalo de nuevo.', - 'success' => 'Amortización eliminada correctamente.' - ) + 'success' => 'Amortización eliminada correctamente.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/depreciations/table.php b/resources/lang/es-MX/admin/depreciations/table.php index d0e2f193cc..9bfffc19a4 100644 --- a/resources/lang/es-MX/admin/depreciations/table.php +++ b/resources/lang/es-MX/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meses', 'term' => 'Termina', 'title' => 'Nombre ', -); +]; diff --git a/resources/lang/es-MX/admin/groups/message.php b/resources/lang/es-MX/admin/groups/message.php index 4b7f99ca54..7eff45a9cc 100644 --- a/resources/lang/es-MX/admin/groups/message.php +++ b/resources/lang/es-MX/admin/groups/message.php @@ -1,22 +1,22 @@ 'El grupo ya existe!', 'group_not_found' => 'El grupo [:id] no existe.', 'group_name_required' => 'El campo nombre es obligatorio', - 'success' => array( + 'success' => [ 'create' => 'Grupo creado.', 'update' => 'Grupo actualizado.', 'delete' => 'Grupo eliminado.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Seguroq que quieres Eliminar grupo?', 'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.', 'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.', 'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.', - ), + ], -); +]; diff --git a/resources/lang/es-MX/admin/groups/table.php b/resources/lang/es-MX/admin/groups/table.php index c002d06ba8..bc09ef1ea6 100644 --- a/resources/lang/es-MX/admin/groups/table.php +++ b/resources/lang/es-MX/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Nombre', 'users' => '# de Usuarios', -); +]; diff --git a/resources/lang/es-MX/admin/groups/titles.php b/resources/lang/es-MX/admin/groups/titles.php index c9d6ca4a6d..07611a0bd2 100644 --- a/resources/lang/es-MX/admin/groups/titles.php +++ b/resources/lang/es-MX/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Acerca de los grupos', 'about_groups' => 'Los Grupos son usados para generar permisos de usuarios.', 'group_management' => 'Gestión de Grupos', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Denegar', -); +]; diff --git a/resources/lang/es-MX/admin/hardware/form.php b/resources/lang/es-MX/admin/hardware/form.php index fe4084e3c7..d0cf18574e 100644 --- a/resources/lang/es-MX/admin/hardware/form.php +++ b/resources/lang/es-MX/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmar eliminación masiva de bienes', +return [ + 'bulk_delete' => 'Confirmar eliminación masiva de bienes', 'bulk_delete_help' => 'Revisar los bienes para eliminación masiva. Una vez eliminados, esos bienes pueden ser restaurados, pero no volverán a estar asociados con ningún usuario a los que esté asignado.', 'bulk_delete_warn' => 'Está a punto de borrar :asset_count.', - 'bulk_update' => 'Actualización masiva de Equipos', - 'bulk_update_help' => 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ', - 'bulk_update_warn' => 'Esta a punto de editar las propiedades de :asset_count equipos.', + 'bulk_update' => 'Actualización masiva de Equipos', + 'bulk_update_help' => 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ', + 'bulk_update_warn' => 'Esta a punto de editar las propiedades de :asset_count equipos.', 'checkedout_to' => 'Asignado a', 'checkout_date' => 'Fecha de asignación', 'checkin_date' => 'Fecha de devolución', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etiqueta', 'update' => 'Actualizar Equipo', 'warranty' => 'Garantía', - 'warranty_expires' => 'Vencimiento de la Garantía', + 'warranty_expires' => 'Vencimiento de la Garantía', 'years' => 'años', -) -; +]; diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php index ecca912712..0547326e3b 100644 --- a/resources/lang/es-MX/admin/hardware/general.php +++ b/resources/lang/es-MX/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Acerca de Activos', 'about_assets_text' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', - 'archived' => 'Archivado', + 'archived' => 'Archivado', 'asset' => 'Equipo', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Quitar Equipo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pendiente', 'undeployable' => 'No desplegable', 'view' => 'Ver Equipo', -); +]; diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php index 589416d8b0..c676038c3e 100644 --- a/resources/lang/es-MX/admin/hardware/message.php +++ b/resources/lang/es-MX/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Atención: Este equipo está marcado como no isntalabre. Si no es correcto, actualiza su estado.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.', 'assoc_users' => 'Equipo asignado a un usuario, no se puede eliminar.', - 'create' => array( + 'create' => [ 'error' => 'Equipo no creado, intentalo de nuevo. :(', - 'success' => 'Equipo creado. :)' - ), + 'success' => 'Equipo creado. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Equipo no actualizado, intentalo de nuevo', 'success' => 'Equipo actualizado.', 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'El equipo no fue restaurado, por favor intente nuevamente', - 'success' => 'Equipo restaurado correctamente.' - ), + 'success' => 'Equipo restaurado correctamente.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'La auditoría de activos no tuvo éxito. Vuelve a intentarlo.', - 'success' => 'Auditoría de activos registrada correctamente.' - ), + 'success' => 'Auditoría de activos registrada correctamente.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Algunos elementos no se pudieron importar correctamente.', 'errorDetail' => 'Estos elementos no pudieron importarse debido a errores.', - 'success' => "Tu archivo ha sido importado", - 'file_delete_success' => "Tu archivo ha sido eliminado con éxito", - 'file_delete_error' => "No pudimos eliminar tu archivo", - ), + 'success' => 'Tu archivo ha sido importado', + 'file_delete_success' => 'Tu archivo ha sido eliminado con éxito', + 'file_delete_error' => 'No pudimos eliminar tu archivo', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar el equipo?', 'error' => 'Equipo no eliminado, intentalo de nuevo.', 'nothing_updated' => 'No se seleccionaron los activos, por lo que no se eliminó nada.', - 'success' => 'Equipo eliminado.' - ), + 'success' => 'Equipo eliminado.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', 'success' => 'Equipo asignado.', 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', 'not_available' => '¡Ese artículo no está disponible para retirada!', - 'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista' - ), + 'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', 'success' => 'Equipo quitado correctamente.', 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', 'already_checked_in' => 'Ese activo ya se quito.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Bien no solicitado, por favor inténtelo de nuevo', 'success' => 'Bien solicitado correctamente.', - 'canceled' => 'Solicitud de retirada cancelada con éxito' - ) + 'canceled' => 'Solicitud de retirada cancelada con éxito', + ], -); +]; diff --git a/resources/lang/es-MX/admin/hardware/table.php b/resources/lang/es-MX/admin/hardware/table.php index 987f2405b2..db0595360d 100644 --- a/resources/lang/es-MX/admin/hardware/table.php +++ b/resources/lang/es-MX/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etiqueta', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Equipo ', 'image' => 'Imagen de dispositivo', 'days_without_acceptance' => 'Días Sin Aceptación', - 'monthly_depreciation' => 'Depreciación Mensual' + 'monthly_depreciation' => 'Depreciación Mensual', -); +]; diff --git a/resources/lang/es-MX/admin/kits/general.php b/resources/lang/es-MX/admin/kits/general.php index f3b2f4cced..13f5da03f6 100644 --- a/resources/lang/es-MX/admin/kits/general.php +++ b/resources/lang/es-MX/admin/kits/general.php @@ -1,6 +1,6 @@ 'Acerca de kits predefinidos', 'about_kits_text' => 'Kits predefinidos le permiten revisar rápidamente un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación es consistente entre muchos usuarios y todos los usuarios reciben los mismos artículos.', 'checkout' => 'Asignar kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'No hay suficientes unidades disponibles de :consumable para asignar. :qty son requeridas. ', 'none_accessory' => 'No hay suficientes unidades disponibles de :accesory para asignar. :qty son requeridas. ', -); +]; diff --git a/resources/lang/es-MX/admin/licenses/form.php b/resources/lang/es-MX/admin/licenses/form.php index 3724e53dbd..f3e5a1e494 100644 --- a/resources/lang/es-MX/admin/licenses/form.php +++ b/resources/lang/es-MX/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Equipo', 'checkin' => 'Quita', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Registrado a Email', 'to_name' => 'Registrado a Nombre', 'update' => 'Actualizar Licencia', - 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.' -); + 'checkout_help' => 'Puedes asignar la licencia a un equipo a a un usuario. Puedes seleccionarlos a ambos, pero el dueño de la licencia debe ser el mismo usuario al que asignes el equipo.', +]; diff --git a/resources/lang/es-MX/admin/licenses/general.php b/resources/lang/es-MX/admin/licenses/general.php index 8a5d6db90e..43a147dcf4 100644 --- a/resources/lang/es-MX/admin/licenses/general.php +++ b/resources/lang/es-MX/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Acerca de licencias', 'about_licenses' => 'Las licencias son para identificar software. Tienen un número específico de asientos que pueden ser asignados a individuos', 'checkin' => 'Quitar Instalación', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licencias Software', 'user' => 'Usuario', 'view' => 'Ver Licencias', -); +]; diff --git a/resources/lang/es-MX/admin/licenses/message.php b/resources/lang/es-MX/admin/licenses/message.php index cab4de5b63..e196a0f548 100644 --- a/resources/lang/es-MX/admin/licenses/message.php +++ b/resources/lang/es-MX/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Categoría inexistente.', 'user_does_not_exist' => 'Usuario inexistente.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.', 'not_found' => 'Licencia no encontrada', - - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, intentalo de nuevo.', - 'success' => 'Categoría creada correctamente.' - ), + 'success' => 'Categoría creada correctamente.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no se ha actualizado, intentalo de nuevo.', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de eliminar esta categoría?', 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', - 'success' => 'Categoría eliminada.' - ), + 'success' => 'Categoría eliminada.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no asignado, intentalo de nuevo', - 'success' => 'Equipo asignado.' - ), + 'success' => 'Equipo asignado.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', - 'success' => 'Equipo quitado correctamente.' - ), + 'success' => 'Equipo quitado correctamente.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/licenses/table.php b/resources/lang/es-MX/admin/licenses/table.php index c5b82e4147..9c4d797c4a 100644 --- a/resources/lang/es-MX/admin/licenses/table.php +++ b/resources/lang/es-MX/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Asignada a', 'checkout' => 'Quita/Asigna', @@ -14,4 +14,4 @@ return array( 'serial' => 'N. Serie', 'title' => 'Categoría de equipo', -); +]; diff --git a/resources/lang/es-MX/admin/locations/message.php b/resources/lang/es-MX/admin/locations/message.php index 80fb8e1d24..a9d9bf9ad0 100644 --- a/resources/lang/es-MX/admin/locations/message.php +++ b/resources/lang/es-MX/admin/locations/message.php @@ -1,27 +1,26 @@ 'Localización no existente.', 'assoc_users' => 'Esta localización está asignada al menos a un usuario y no puede ser eliminada. ', 'assoc_assets' => 'Esta ubicacion se encuentra actualmente asociada con por lo menos un activo y no puede ser eliminada. Por favor, actualice sus activos para no referenciar esta ubicacion e intentelo de nuevo. ', 'assoc_child_loc' => 'Esta ubicacion actualmente esta asociada con al menos una ubicacion hija y no puede ser eliminada. Por favor, actualice sus ubicaciones para no referenciar esta ubicacion e intentelo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'Localización no creada, Intentalo de nuevo.', - 'success' => 'Localización creada.' - ), + 'success' => 'Localización creada.', + ], - 'update' => array( + 'update' => [ 'error' => 'Localización no actualizada, Intentalo de nuevo', - 'success' => 'Localización actualizada.' - ), + 'success' => 'Localización actualizada.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar esta ubicación?', 'error' => 'Localización no eliminada por un problema. Intentalo de nuevo.', - 'success' => 'Localización eliminada.' - ) + 'success' => 'Localización eliminada.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/locations/table.php b/resources/lang/es-MX/admin/locations/table.php index 1e2569bfa5..001aa43eb8 100644 --- a/resources/lang/es-MX/admin/locations/table.php +++ b/resources/lang/es-MX/admin/locations/table.php @@ -1,6 +1,6 @@ 'Acerca de ubicaciones', 'about_locations' => 'Las Ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, bienes, y otros items', 'assets_rtd' => 'Equipos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Padre', 'currency' => 'Divisa de la Localización', 'ldap_ou' => 'Búsqueda LDAP OU', - ); + ]; diff --git a/resources/lang/es-MX/admin/manufacturers/message.php b/resources/lang/es-MX/admin/manufacturers/message.php index 4a78b56349..6b2b37a9e3 100644 --- a/resources/lang/es-MX/admin/manufacturers/message.php +++ b/resources/lang/es-MX/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Fabricante inexistente.', 'assoc_users' => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado', - 'create' => array( + 'create' => [ 'error' => 'Fabricante no creado, Intentalo de nuevo.', - 'success' => 'Fabricante creado.' - ), + 'success' => 'Fabricante creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fabricante no actualizado, Intentalo de nuevo', - 'success' => 'Fabricante actualizado.' - ), + 'success' => 'Fabricante actualizado.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El fabricante no fue restaurado, intente de nuevo', - 'success' => 'Fabricante restaurado con éxito.' - ), + 'success' => 'Fabricante restaurado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro que quieres eliminar Fabricante?', 'error' => 'Hubo un problema eliminando el fabricante. Por favor, inténtalo de nuevo.', - 'success' => 'Fabricante Eliminado.' - ) + 'success' => 'Fabricante Eliminado.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/manufacturers/table.php b/resources/lang/es-MX/admin/manufacturers/table.php index 972d33b71b..77c22bcc82 100644 --- a/resources/lang/es-MX/admin/manufacturers/table.php +++ b/resources/lang/es-MX/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre fabricantes', 'about_manufacturers_text' => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto sobre ellos, que se mostrará en sus páginas de detalle de activos.', 'asset_manufacturers' => 'Fabricantes', @@ -13,4 +13,4 @@ return array( 'update' => 'Actualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/es-MX/admin/models/general.php b/resources/lang/es-MX/admin/models/general.php index 17d912d97e..3f7b53f569 100644 --- a/resources/lang/es-MX/admin/models/general.php +++ b/resources/lang/es-MX/admin/models/general.php @@ -1,6 +1,6 @@ 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Los usuarios pueden solicitar este modelo', - 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', + 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', 'view_deleted' => 'Ver Borrados', 'view_models' => 'Ver Modelos', 'fieldset' => 'Grupos de campo', 'no_custom_field' => 'No hay campos personalizados', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/es-MX/admin/models/message.php b/resources/lang/es-MX/admin/models/message.php index 53bea1807a..e02a72157b 100644 --- a/resources/lang/es-MX/admin/models/message.php +++ b/resources/lang/es-MX/admin/models/message.php @@ -1,42 +1,41 @@ 'Modelo inexistente.', 'assoc_users' => 'Este modelo está asignado a uno o más equipos y no puede ser eliminado', - - 'create' => array( + 'create' => [ 'error' => 'Modelo no creado, Intentalo de nuevo.', 'success' => 'Modelo creado.', 'duplicate_set' => 'Un modelo de activo con ese nombre, fabricante y número de modelo ya existe.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modelo no actualizado, Intentalo de nuevo', - 'success' => 'Modelo actualizado.' - ), + 'success' => 'Modelo actualizado.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de querer eliminar el Modelo?', 'error' => 'Ha habido un problema al eliminar el Modelo. Intentalo de nuevo.', - 'success' => 'Modelo eliminado.' - ), + 'success' => 'Modelo eliminado.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El modelo no fue restaurado, por favor intente nuevamente', - 'success' => 'Modelo restaurado exitosamente.' - ), + 'success' => 'Modelo restaurado exitosamente.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - 'success' => 'Modelos actualizados.' - ), + 'success' => 'Modelos actualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ningún modelo fue seleccionado, así que nada fue eliminado.', 'success' => '¡:success_count modelo(s) eliminado(s)!', - 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.' - ), + 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/models/table.php b/resources/lang/es-MX/admin/models/table.php index 23298d575a..8507319731 100644 --- a/resources/lang/es-MX/admin/models/table.php +++ b/resources/lang/es-MX/admin/models/table.php @@ -1,6 +1,6 @@ 'Crear Modelo Equipo', 'created_at' => 'Creado el', @@ -14,4 +14,4 @@ return array( 'update' => 'Actualizar Modelo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/es-MX/admin/reports/general.php b/resources/lang/es-MX/admin/reports/general.php index f6251cdbf3..9b9d3baad9 100644 --- a/resources/lang/es-MX/admin/reports/general.php +++ b/resources/lang/es-MX/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecciona las opciones de tu informe de Equipos.' -); +return [ + 'info' => 'Selecciona las opciones de tu informe de Equipos.', +]; diff --git a/resources/lang/es-MX/admin/reports/message.php b/resources/lang/es-MX/admin/reports/message.php index a8f61aa993..a5bd885673 100644 --- a/resources/lang/es-MX/admin/reports/message.php +++ b/resources/lang/es-MX/admin/reports/message.php @@ -1,5 +1,5 @@ 'Debes seleccionar al menos UNA opción.' -); +return [ + 'error' => 'Debes seleccionar al menos UNA opción.', +]; diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php index bfff840077..fab50f01b5 100644 --- a/resources/lang/es-MX/admin/settings/general.php +++ b/resources/lang/es-MX/admin/settings/general.php @@ -1,12 +1,12 @@ 'Directorio Activo', 'ad_domain' => 'Dominio del Directorio Activo', 'ad_domain_help' => 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.', 'ad_append_domain_label' => 'Añadir nombre de dominio', 'ad_append_domain' => 'Asignar nombre de dominio al campo del nombre de usuario', - 'ad_append_domain_help' => 'No se requiere que el usuario escriba "username@dominio.empresa", ellos podrán, simplemente digitar su nombre de usuario "username".' , + 'ad_append_domain_help' => 'No se requiere que el usuario escriba "username@dominio.empresa", ellos podrán, simplemente digitar su nombre de usuario "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Este es un servidor de Directorio Activo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Limite de alertas de expiración (en días)', 'alert_inv_threshold' => 'Umbral de alerta del inventario', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDs de Recurso', 'audit_interval' => 'Intervalo de auditoría', 'audit_interval_help' => 'Si tiene que auditar físicamente sus activos periódicamente, ingrese el intervalo en meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ingrese código de verificación en dos pasos', 'two_factor_config_complete' => 'Enviar código', 'two_factor_enabled_edit_not_allowed' => 'El administrador no permite modificar esta configuración.', - 'two_factor_enrollment_text' => "Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo", + 'two_factor_enrollment_text' => 'Autenticación de doble factor se requiere, sin embargo el dispositivo no ha inscrito todavía. Abra la aplicación Google Authenticator y escanear el código QR a continuación para inscribir a su dispositivo. Una vez que haya inscrito su dispositivo, introduzca el código de abajo', 'require_accept_signature' => 'Requerir Firma', 'require_accept_signature_help_text' => 'Para activar esta función se requiere que los usuarios firmen fisicamente aceptando el activo.', 'left' => 'izquierda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Al marcar esta casilla se aplicará una restricción única en los seriales de los equipos', 'zerofill_count' => 'Longitud de etiquetas de activos, incluyendo relleno de ceros', 'username_format_help' => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.', -); +]; diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php index 3980dcd7a8..7c5c53f248 100644 --- a/resources/lang/es-MX/admin/settings/message.php +++ b/resources/lang/es-MX/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ha ocurrido un error al actualizar. ', - 'success' => 'Parámetros actualizados correctamente.' - ), - 'backup' => array( + 'success' => 'Parámetros actualizados correctamente.', + ], + 'backup' => [ 'delete_confirm' => 'Está seguro que desea eliminar este archivo de respaldo? Esta acción no puede ser revertida. ', 'file_deleted' => 'El archivo de respaldo fue eliminado satisfactoriamente. ', 'generated' => 'Un nuevo archivo de respaldo fue creado satisfactoriamente.', 'file_not_found' => 'El archivo de respaldo no se ha encontrado en el servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ', 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.', - 'success' => 'Registros eliminados correctamente purgados.' - ), + 'success' => 'Registros eliminados correctamente purgados.', + ], -); +]; diff --git a/resources/lang/es-MX/admin/statuslabels/message.php b/resources/lang/es-MX/admin/statuslabels/message.php index c158f22b1a..363a163e69 100644 --- a/resources/lang/es-MX/admin/statuslabels/message.php +++ b/resources/lang/es-MX/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Etiqueta de estado no existe.', 'assoc_assets' => 'Esta etiqueta de estado esta actualmente asociado con al menos un activo y no se puede eliminar. Por favor actualice sus activos para ya no hacer referencia a este estado y vuelva a intentarlo. ', - - 'create' => array( + 'create' => [ 'error' => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.', - 'success' => 'Etiqueta de estado fue creada exitosamente.' - ), + 'success' => 'Etiqueta de estado fue creada exitosamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'Etiqueta de estado no se ha actualizado, por favor, inténtelo de nuevo', - 'success' => 'Etiqueta de estado fue actualizada exitosamente.' - ), + 'success' => 'Etiqueta de estado fue actualizada exitosamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que desea eliminar esta etiqueta de estado?', 'error' => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.', - 'success' => 'La etiqueta de estado se ha eliminado exitosamente.' - ), + 'success' => 'La etiqueta de estado se ha eliminado exitosamente.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Estos activos no pueden asignarse a nadie.', 'deployable' => 'Estos activos se pueden desproteger. Una vez que se les asigna, asumirán un estado meta de Deployed.', 'archived' => 'Estos activos no pueden desprotegerse y solo aparecerán en la vista Archivada. Esto es útil para retener información sobre activos para presupuestos / propósitos históricos, pero mantenerlos fuera de la lista de activos del día a día.', 'pending' => 'Estos activos aún no se pueden asignar a nadie, a menudo se utilizan para artículos que están pendientes de reparación, pero se espera que vuelvan a la circulación.', - ), + ], -); +]; diff --git a/resources/lang/es-MX/admin/statuslabels/table.php b/resources/lang/es-MX/admin/statuslabels/table.php index 4aa57fc6e7..5b5d33b11f 100644 --- a/resources/lang/es-MX/admin/statuslabels/table.php +++ b/resources/lang/es-MX/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Info Etiquetas Estado', 'archived' => 'Archivado', 'create' => 'Crear Etiqueta Estado', @@ -16,4 +16,4 @@ return array( 'title' => 'Etiquetas Estado', 'undeployable' => 'No desplegable', 'update' => 'Actualizar Etiqueta Estado', -); +]; diff --git a/resources/lang/es-MX/admin/suppliers/message.php b/resources/lang/es-MX/admin/suppliers/message.php index 8956e1ff62..f5dca9750c 100644 --- a/resources/lang/es-MX/admin/suppliers/message.php +++ b/resources/lang/es-MX/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Proveedor does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Proveedor no creado, Intentalo de nuevo.', - 'success' => 'Proveedor creado.' - ), + 'success' => 'Proveedor creado.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proveedor no actualizado, Intentalo de nuevo', - 'success' => 'Proveedor actualizado.' - ), + 'success' => 'Proveedor actualizado.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Estás seguro de querer eliminar este Proveedor?', 'error' => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.', 'success' => 'Proveedor eliminado.', 'assoc_assets' => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ', 'assoc_licenses' => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser eliminado. Por favor, actualiza tus licencias para no referenciar este proveedor e inténtalo de nuevo. ', 'assoc_maintenances' => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ', - ) + ], -); +]; diff --git a/resources/lang/es-MX/admin/suppliers/table.php b/resources/lang/es-MX/admin/suppliers/table.php index f576b2d372..d488c5b409 100644 --- a/resources/lang/es-MX/admin/suppliers/table.php +++ b/resources/lang/es-MX/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Acerca de Proveedores', 'about_suppliers_text' => 'Los Proveedores son utilizados para hacer seguimiento de la fuente de los items', 'address' => 'Dirección del Proveedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Equipos para', 'zip' => 'Código Postal', -); +]; diff --git a/resources/lang/es-MX/admin/users/general.php b/resources/lang/es-MX/admin/users/general.php index ac492aa97d..655a825d17 100644 --- a/resources/lang/es-MX/admin/users/general.php +++ b/resources/lang/es-MX/admin/users/general.php @@ -1,7 +1,6 @@ 'Este usuario puede iniciar sesión', 'activated_disabled_help_text' => 'No puedes editar el estado de activación para tu propia cuenta.', 'assets_user' => 'Equipos asignados a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Usuario', 'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.', 'history_user' => 'Historial de :name', - 'info' => 'Información', + 'info' => 'Información', 'restore_user' => 'Haga clic aquí para restaurarlos.', 'last_login' => 'Último acceso', 'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ', 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ', 'two_factor_active' => '2FA Activo ', - ); + ]; diff --git a/resources/lang/es-MX/admin/users/message.php b/resources/lang/es-MX/admin/users/message.php index 8cbde9484e..daefa507bf 100644 --- a/resources/lang/es-MX/admin/users/message.php +++ b/resources/lang/es-MX/admin/users/message.php @@ -1,6 +1,6 @@ 'Ha aceptado con éxito este equipo.', 'declined' => 'Ha declinado con éxito este equipo.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'La integración con LDAP no ha sido configurada para esta instalación.', 'password_resets_sent' => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.', - - 'success' => array( + 'success' => [ 'create' => 'Usuario correctamente creado.', 'update' => 'Usuario correctamente actualizado.', 'update_bulk' => 'Usuarios correctamente actualizados!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Usuario correctamente no suspendido.', 'restored' => 'Usuario correctamente restaurado.', 'import' => 'Usuarios importados correctamente.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.', 'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.', 'delete' => 'Ha habido un problema eliminando el Usuario. Intentalo de nuevo.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo eliminado correctamente.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.', 'success' => 'Archivo(s) cargado correctamente.', 'nofiles' => 'No ha seleccionado ningún archivo para subir', 'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.', - ), + ], -); +]; diff --git a/resources/lang/es-MX/admin/users/table.php b/resources/lang/es-MX/admin/users/table.php index 81db6c7894..7949961974 100644 --- a/resources/lang/es-MX/admin/users/table.php +++ b/resources/lang/es-MX/admin/users/table.php @@ -1,6 +1,6 @@ 'Activo', 'allow' => 'Permitir', 'checkedout' => 'Equipos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar usuarios actuales', 'show_deleted' => 'Mostrar usuarios eliminados', 'title' => 'Puesto', - 'to_restore_them' => 'para restaurarlos.', + 'to_restore_them' => 'para restaurarlos.', 'updateuser' => 'Actualizar Usuario', 'username' => 'Usuario', - 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', + 'user_deleted_text' => 'Este usuario ha sido marcado como eliminado.', 'username_note' => '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)', 'cloneuser' => 'Clonar Usuario', 'viewusers' => 'Ver Usuarios', -); +]; diff --git a/resources/lang/es-MX/auth/general.php b/resources/lang/es-MX/auth/general.php index 7c7e20f65d..1737c3e964 100644 --- a/resources/lang/es-MX/auth/general.php +++ b/resources/lang/es-MX/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Introduzca su nombre de usuario para enviar un enlace de restablecimiento de contraseña.', 'username_help_bottom' => 'Tu nombre de usuario y dirección de correo electrónico puede ser el mismo, pero puede que no lo sea, dependiendo de tu configuración. Si no puede recordar su nombre de usuario, póngase en contacto con su administrador.

Los nombres de usuario sin un correo electrónico asociado no recibirá un correo electrónico con un enlace de restablecimiento de contraseña. ', ]; - diff --git a/resources/lang/es-MX/auth/message.php b/resources/lang/es-MX/auth/message.php index cbd6454182..e92129e2b1 100644 --- a/resources/lang/es-MX/auth/message.php +++ b/resources/lang/es-MX/auth/message.php @@ -1,6 +1,6 @@ 'Ya existe un usuario con este e-mail.', 'account_not_found' => 'El nombre de usuario o contraseña es incorrecta.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Este usuario ha sido expulsado.', 'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor, inténtalo de nuevo en :minutes minutos.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Su dispositivo ya está inscrito.', 'success' => '¡Hola! Haz iniciado sesión correctamente.', 'code_required' => 'El código de dos factores es necesario.', 'invalid_code' => 'El código de dos factores no es válido.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Ha habido un problema al iniciar sesión. Por favor, vuelve a intentarlo.', 'success' => 'has iniciado sesión correctamente.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Hubo un problema al intentar cerrar la sesión, por favor inténtelo de nuevo.', 'success' => 'Se ha cerrado sesión correctamente.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Ha habido un problema al crear la cuenta. Por favor, vuelve a intentarlo.', 'success' => 'Cuenta creada correctamente.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'Si esa dirección de correo electrónico existe en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.', 'success' => 'El password ha sido reseteado correctamente.', - ), + ], - -); +]; diff --git a/resources/lang/es-MX/button.php b/resources/lang/es-MX/button.php index a840417c24..a50d2e8128 100644 --- a/resources/lang/es-MX/button.php +++ b/resources/lang/es-MX/button.php @@ -1,6 +1,6 @@ 'Acciones', 'add' => 'Agregar nuevo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitud', 'submit' => 'Enviar', 'upload' => 'Subir', - 'select_file' => 'Seleccionar Archivo...', + 'select_file' => 'Seleccionar Archivo...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generar Etiqueta|[2,*] Generar Etiquetas', -); +]; diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php index 429713fd70..128f81a19c 100644 --- a/resources/lang/es-MX/general.php +++ b/resources/lang/es-MX/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Ciudad', - 'click_here' => 'Pulsa aquí', + 'click_here' => 'Pulsa aquí', 'clear_selection' => 'Eliminar Selección', 'companies' => 'Empresas', 'company' => 'Empresa', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'Pais', diff --git a/resources/lang/es-MX/help.php b/resources/lang/es-MX/help.php index e1eb6e4748..0b4fa13e5b 100644 --- a/resources/lang/es-MX/help.php +++ b/resources/lang/es-MX/help.php @@ -1,6 +1,6 @@ "Más información", + 'more_info_title' => 'Más información', - "audit_help" => "Al marcar esta casilla se editará el activo para reflejar esta nueva ubicación. Dejarla desmarcada simplemente anotará la ubicación en la auditoría.

Tenga en cuenta que este activo está asignado, no se cambiará la ubicación de la persona, activo o ubicación de donde está asignado.", + 'audit_help' => 'Al marcar esta casilla se editará el activo para reflejar esta nueva ubicación. Dejarla desmarcada simplemente anotará la ubicación en la auditoría.

Tenga en cuenta que este activo está asignado, no se cambiará la ubicación de la persona, activo o ubicación de donde está asignado.', 'assets' => 'Los activos son elementos rastreados por número de serie o etiqueta de activos. Suelen ser artículos de alto valor donde la identificación del activo importa.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Puede configurar depreciaciones de activos para depreciar activos basados en una depreciación lineal.', - - -); +]; diff --git a/resources/lang/es-MX/mail.php b/resources/lang/es-MX/mail.php index 3521cc993d..60b085ed88 100644 --- a/resources/lang/es-MX/mail.php +++ b/resources/lang/es-MX/mail.php @@ -1,6 +1,6 @@ 'El usuario ha cancelado el item solicitado en la pagina Web', 'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web', 'accessory_name' => 'Nombre de accesorio:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Informe de devolución de activo esperado', 'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución', 'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date', - 'your_assets' => 'Ver tus activos' -); + 'your_assets' => 'Ver tus activos', +]; diff --git a/resources/lang/es-MX/pagination.php b/resources/lang/es-MX/pagination.php index 9cbe91da30..72a72392ab 100644 --- a/resources/lang/es-MX/pagination.php +++ b/resources/lang/es-MX/pagination.php @@ -1,6 +1,6 @@ 'Siguiente »', -); +]; diff --git a/resources/lang/es-MX/passwords.php b/resources/lang/es-MX/passwords.php index c0bc9b79b2..1455a40942 100644 --- a/resources/lang/es-MX/passwords.php +++ b/resources/lang/es-MX/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'El link de la contraseña ha sido enviada!', 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.', ]; - diff --git a/resources/lang/es-MX/reminders.php b/resources/lang/es-MX/reminders.php index 0f168fec4b..6c058e6782 100644 --- a/resources/lang/es-MX/reminders.php +++ b/resources/lang/es-MX/reminders.php @@ -1,6 +1,6 @@ "Los passwords deben tener mínimo 6 caracteres y coincidir.", + 'password' => 'Los passwords deben tener mínimo 6 caracteres y coincidir.', - "user" => "Usuario o E-Mail incorrectos", + 'user' => 'Usuario o E-Mail incorrectos', - "token" => "El token para resetear el password no es válido.", + 'token' => 'El token para resetear el password no es válido.', - "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!", + 'sent' => 'Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!', -); +]; diff --git a/resources/lang/es-MX/table.php b/resources/lang/es-MX/table.php index 1ad5301590..b48767314f 100644 --- a/resources/lang/es-MX/table.php +++ b/resources/lang/es-MX/table.php @@ -1,10 +1,10 @@ 'Acciones', 'action' => 'Acción', 'by' => 'Por', 'item' => 'Item', -); +]; diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php index dfd7068339..2ebbb86771 100644 --- a/resources/lang/es-MX/validation.php +++ b/resources/lang/es-MX/validation.php @@ -1,6 +1,6 @@ ':attribute ya ha sido introducido.', 'uploaded' => 'El atributo: no se pudo cargar.', 'url' => ':attribute formato incorrecto.', - "unique_undeleted" => "El :atrribute debe ser único.", + 'unique_undeleted' => 'El :atrribute debe ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "El campo: atributo contiene un carácter que no está permitido.", - "email_array" => "Una o más direcciones de correo electrónico no es válida.", - "hashed_pass" => "Tu contraseña actual es incorrecta", + 'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.', + 'email_array' => 'Una o más direcciones de correo electrónico no es válida.', + 'hashed_pass' => 'Tu contraseña actual es incorrecta', 'dumbpwd' => 'Esa contraseña es muy común.', - "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido.", + 'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/es-VE/admin/accessories/general.php b/resources/lang/es-VE/admin/accessories/general.php index e972a7f8a7..e8b08a07eb 100644 --- a/resources/lang/es-VE/admin/accessories/general.php +++ b/resources/lang/es-VE/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoría de Accesorios', 'accessory_name' => 'Nombre de Accesorio', 'checkout' => 'Accesorio de Salida', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Usa la licencia primaria por defecto en su lugar.', 'use_default_eula_disabled' => 'Usa la licencia primaria por defecto en su lugar. No se ha establecido una licencia primaria por defecto. Por favor, añade una en las configuraciones.', -); +]; diff --git a/resources/lang/es-VE/admin/accessories/message.php b/resources/lang/es-VE/admin/accessories/message.php index 508ec2255f..9d6399f1ba 100644 --- a/resources/lang/es-VE/admin/accessories/message.php +++ b/resources/lang/es-VE/admin/accessories/message.php @@ -1,37 +1,36 @@ 'El accesorio [:id] no existe.', 'assoc_users' => 'El accesorio actual tiene :count elementos entregados a usuarios. Por favor ingresa los accesorios e intenta de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El accesorio no se creó, inténtalo de nuevo.', - 'success' => 'El accesorio se ha creado con éxito.' - ), + 'success' => 'El accesorio se ha creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El accesorio no se actualizó, inténtalo de nuevo', - 'success' => 'El accesorio se ha actualizado con éxito.' - ), + 'success' => 'El accesorio se ha actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro que deseas borrar este accesorio?', 'error' => 'Hubo un problema borrando este accesorio. Por favor inténtalo nuevamente.', - 'success' => 'El accesorio se ha borrado con éxito.' - ), + 'success' => 'El accesorio se ha borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Equipo no ha sido retirado, inténtalo de nuevo', 'success' => 'El accesorio se ha retirado exitosamente.', - 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.' - ), + 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El accesorio no fue ingresado, por favor inténtalo de nuevo', 'success' => 'El accesorio se ha ingresado con éxito.', - 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.' - ) + 'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-VE/admin/accessories/table.php b/resources/lang/es-VE/admin/accessories/table.php index c9de508b90..5ab949f66a 100644 --- a/resources/lang/es-VE/admin/accessories/table.php +++ b/resources/lang/es-VE/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Descargar CSV', - 'eula_text' => 'Licencia', +return [ + 'dl_csv' => 'Descargar CSV', + 'eula_text' => 'Licencia', 'id' => 'Identificación', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre del Accesorio', - -); +]; diff --git a/resources/lang/es-VE/admin/asset_maintenances/form.php b/resources/lang/es-VE/admin/asset_maintenances/form.php index d048dc08de..3cfe40fb15 100644 --- a/resources/lang/es-VE/admin/asset_maintenances/form.php +++ b/resources/lang/es-VE/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Días', 'notes' => 'Notas', 'update' => 'Actualizar', - 'create' => 'Crear' + 'create' => 'Crear', ]; diff --git a/resources/lang/es-VE/admin/asset_maintenances/message.php b/resources/lang/es-VE/admin/asset_maintenances/message.php index e10b1a5188..3085dbbf1d 100644 --- a/resources/lang/es-VE/admin/asset_maintenances/message.php +++ b/resources/lang/es-VE/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar el mantenimiento de este activo?', 'error' => 'Hubo un problema borrando el mantenimiento del activo. Por favor, inténtalo de nuevo.', - 'success' => 'El mantenimiento de activo fue eliminado con éxito.' + 'success' => 'El mantenimiento de activo fue eliminado con éxito.', ], 'create' => [ 'error' => 'El Mantenimiento de Activo no se ha creado, por favor inténtalo de nuevo.', - 'success' => 'Mantenimiento de Activo creado con éxito.' + 'success' => 'Mantenimiento de Activo creado con éxito.', ], 'edit' => [ 'error' => 'El Mantenimiento de Activo no se ha editado, por favor inténtalo de nuevo.', - 'success' => 'Mantenimiento de Activo editado con éxito.' + 'success' => 'Mantenimiento de Activo editado con éxito.', ], 'asset_maintenance_incomplete' => 'No se ha completado aún', 'warranty' => 'Garantía', 'not_warranty' => 'Sin Garantía', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/es-VE/admin/asset_maintenances/table.php b/resources/lang/es-VE/admin/asset_maintenances/table.php index eef3aab041..628c4bb8fe 100644 --- a/resources/lang/es-VE/admin/asset_maintenances/table.php +++ b/resources/lang/es-VE/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Mantenimiento de Activo', 'asset_name' => 'Nombre de Activo', 'is_warranty' => 'Garantía', - 'dl_csv' => 'Descargar CSV' + 'dl_csv' => 'Descargar CSV', ]; diff --git a/resources/lang/es-VE/admin/categories/general.php b/resources/lang/es-VE/admin/categories/general.php index 8b4798699d..6dec025964 100644 --- a/resources/lang/es-VE/admin/categories/general.php +++ b/resources/lang/es-VE/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorías de Activos', 'category_name' => 'Nombre de la Categoría', 'checkin_email' => 'Enviar un correo al usuario al asignar/desasignar.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Usa la licencia primaria por defecto en su lugar.', 'use_default_eula_disabled' => 'Usa la licencia primaria por defecto en su lugar. No se ha establecido una licencia primaria por defecto. Por favor, añade una en las configuraciones.', -); +]; diff --git a/resources/lang/es-VE/admin/categories/message.php b/resources/lang/es-VE/admin/categories/message.php index 890dca5023..7c6bd9f664 100644 --- a/resources/lang/es-VE/admin/categories/message.php +++ b/resources/lang/es-VE/admin/categories/message.php @@ -1,25 +1,25 @@ 'Esta categoría no existe.', 'assoc_models' => 'Esta categoría está actualmente asociada con al menos un modelo y no puede ser borrada. Por favor, actualiza tus modelos para no referenciar esta categoría e inténtalo de nuevo. ', 'assoc_items' => 'Esta categoría está asociada con al menos un :asset_type y no puede ser borrada. Por favor actualiza tus :asset_type para no referenciar más esta categoría e inténtelo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La categoría no se ha creado, inténtalo de nuevo.', - 'success' => 'La categoría ha sido creada con éxito.' - ), + 'success' => 'La categoría ha sido creada con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'La categoría no fue actualizada, por favor inténtalo de nuevo', - 'success' => 'Categoría actualizada correctamente.' - ), + 'success' => 'Categoría actualizada correctamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar está categoría?', 'error' => 'Hubo un problema borrando esta categoría, por favor inténtelo nuevamente.', - 'success' => 'La categoría se ha eliminado con éxito.' - ) + 'success' => 'La categoría se ha eliminado con éxito.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/categories/table.php b/resources/lang/es-VE/admin/categories/table.php index c88311d15a..341833eb98 100644 --- a/resources/lang/es-VE/admin/categories/table.php +++ b/resources/lang/es-VE/admin/categories/table.php @@ -1,10 +1,10 @@ 'Licencia', +return [ + 'eula_text' => 'Licencia', 'id' => 'Identificación', 'parent' => 'Padre', 'require_acceptance' => 'Aceptación', 'title' => 'Nombre de la Categoría de Activo', -); +]; diff --git a/resources/lang/es-VE/admin/companies/general.php b/resources/lang/es-VE/admin/companies/general.php index 12c7636dbf..185b820c0d 100644 --- a/resources/lang/es-VE/admin/companies/general.php +++ b/resources/lang/es-VE/admin/companies/general.php @@ -1,4 +1,5 @@ 'Seleccionar Compañía', ]; diff --git a/resources/lang/es-VE/admin/companies/message.php b/resources/lang/es-VE/admin/companies/message.php index 8069d530e6..dd9da459fd 100644 --- a/resources/lang/es-VE/admin/companies/message.php +++ b/resources/lang/es-VE/admin/companies/message.php @@ -1,18 +1,19 @@ 'La compañía no existe.', 'assoc_users' => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor, actualiza tus modelos para no referenciar más esta compañía e inténtalo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'La compañía no ha sido creada, por favor intente de nuevo.', - 'success' => 'Compañía creada con éxito.' - ), - 'update' => array( + 'success' => 'Compañía creada con éxito.', + ], + 'update' => [ 'error' => 'La compañía no se ha actualizado, por favor inténtelo de nuevo', - 'success' => 'Compañía actualizada correctamente.' - ), - 'delete' => array( + 'success' => 'Compañía actualizada correctamente.', + ], + 'delete' => [ 'confirm' => '¿Estás seguro que deseas borrar esta compañía?', 'error' => 'Hubo un problema borrando la compañía. Por favor inténtelo de nuevo.', - 'success' => 'La compañía se ha borrado con éxito.' - ) -); + 'success' => 'La compañía se ha borrado con éxito.', + ], +]; diff --git a/resources/lang/es-VE/admin/companies/table.php b/resources/lang/es-VE/admin/companies/table.php index f70a3e99d0..6821c1bac1 100644 --- a/resources/lang/es-VE/admin/companies/table.php +++ b/resources/lang/es-VE/admin/companies/table.php @@ -1,9 +1,10 @@ 'Compañías', 'create' => 'Crear Compañía', 'title' => 'Compañía', 'update' => 'Actualizar Compañía', 'name' => 'Nombre de Compañía', 'id' => 'Identificación', -); +]; diff --git a/resources/lang/es-VE/admin/components/general.php b/resources/lang/es-VE/admin/components/general.php index 3340ee34e5..06faccf1da 100644 --- a/resources/lang/es-VE/admin/components/general.php +++ b/resources/lang/es-VE/admin/components/general.php @@ -1,6 +1,6 @@ 'Nombre de Componente', 'checkin' => 'Ingreso de Componente', 'checkout' => 'Salida de Componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Componente', -); +]; diff --git a/resources/lang/es-VE/admin/components/message.php b/resources/lang/es-VE/admin/components/message.php index 23407f80df..f907bc4fad 100644 --- a/resources/lang/es-VE/admin/components/message.php +++ b/resources/lang/es-VE/admin/components/message.php @@ -1,36 +1,35 @@ 'El componente no existe.', - 'create' => array( + 'create' => [ 'error' => 'El componente no se ha creado, por favor inténtalo de nuevo.', - 'success' => 'Componente creado con éxito.' - ), + 'success' => 'Componente creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El componente no se ha actualizado, por favor inténtalo de nuevo', - 'success' => 'Componente actualizado con éxito.' - ), + 'success' => 'Componente actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar este componente?', 'error' => 'Hubo un problema al borrar el componente. Por favor inténtalo de nuevo.', - 'success' => 'El componente se ha borrado con éxito.' - ), + 'success' => 'El componente se ha borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El componente no se ha retirado, inténtelo de nuevo', 'success' => 'El componente se ha retirado con éxito.', - 'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.' - ), + 'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El componente no se ha ingresado, por favor inténtalo de nuevo', 'success' => 'Componente ingresado con éxito.', - 'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.' - ) + 'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-VE/admin/components/table.php b/resources/lang/es-VE/admin/components/table.php index 72f0b866d2..0b91d345ae 100644 --- a/resources/lang/es-VE/admin/components/table.php +++ b/resources/lang/es-VE/admin/components/table.php @@ -1,5 +1,5 @@ 'Nombre del Componente', -); +]; diff --git a/resources/lang/es-VE/admin/consumables/general.php b/resources/lang/es-VE/admin/consumables/general.php index 0f50c6194d..6ef4b9dca6 100644 --- a/resources/lang/es-VE/admin/consumables/general.php +++ b/resources/lang/es-VE/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Salida de Consumible al Usuario', 'consumable_name' => 'Nombre del Consumible', 'create' => 'Crear Consumible', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Consumible', -); +]; diff --git a/resources/lang/es-VE/admin/consumables/message.php b/resources/lang/es-VE/admin/consumables/message.php index 73a21639ec..dab1161384 100644 --- a/resources/lang/es-VE/admin/consumables/message.php +++ b/resources/lang/es-VE/admin/consumables/message.php @@ -1,36 +1,35 @@ 'El consumible no existe.', - 'create' => array( + 'create' => [ 'error' => 'El consumible no fue creado, por favor inténtalo de nuevo.', - 'success' => 'Consumible creado con éxito.' - ), + 'success' => 'Consumible creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El consumible no fue actualizado, por favor inténtalo de nuevo', - 'success' => 'Consumible actualizado con éxito.' - ), + 'success' => 'Consumible actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que deseas borrar este consumible?', 'error' => 'Hubo un problema borrando el consumible. Por favor inténtalo de nuevo.', - 'success' => 'El consumible fue borrado con éxito.' - ), + 'success' => 'El consumible fue borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El consumible no fue retirado, por favor inténtelo de nuevo', 'success' => 'El consumible fue retirado con éxito.', - 'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.' - ), + 'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El consumible no fue ingresado, por favor, inténtelo de nuevo', 'success' => 'El consumible fue ingresado con éxito.', - 'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.' - ) + 'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.', + ], - -); +]; diff --git a/resources/lang/es-VE/admin/consumables/table.php b/resources/lang/es-VE/admin/consumables/table.php index befcfc511b..db8f55deab 100644 --- a/resources/lang/es-VE/admin/consumables/table.php +++ b/resources/lang/es-VE/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nombre del Consumible', -); +]; diff --git a/resources/lang/es-VE/admin/custom_fields/general.php b/resources/lang/es-VE/admin/custom_fields/general.php index a2ef26bda9..fc9fa53972 100644 --- a/resources/lang/es-VE/admin/custom_fields/general.php +++ b/resources/lang/es-VE/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos Personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Acerca de Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuevo Campo Personalizado', 'value_encrypted' => 'El valor de este campo está encriptado en la base de datos. Sólo los administradores podrán ver el valor desencriptado', 'show_in_email' => '¿Incluirá el valor de este campo en las notificaciones por correo de asignaciones de activos? Ten en cuenta que los campos cifrados no se pueden incluir en los correos electrónicos.', -); +]; diff --git a/resources/lang/es-VE/admin/custom_fields/message.php b/resources/lang/es-VE/admin/custom_fields/message.php index f3ffbeb6c1..8e281839bf 100644 --- a/resources/lang/es-VE/admin/custom_fields/message.php +++ b/resources/lang/es-VE/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'El campo no existe.', 'already_added' => 'El campo ya fue agregado', - 'create' => array( + 'create' => [ 'error' => 'El campo no fue creado, por favor inténtalo de nuevo.', 'success' => 'Campo creado con éxito.', - 'assoc_success' => 'Campo añadido al Fieldset con éxito.' - ), + 'assoc_success' => 'Campo añadido al Fieldset con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El campo no se ha actualizado, por favor, inténtelo de nuevo', - 'success' => 'Campo actualizado con éxito.' - ), + 'success' => 'Campo actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer borrar este campo?', 'error' => 'Hubo un problema al borrar el campo. Por favor, inténtelo de nuevo.', 'success' => 'El campo fue borrado con éxito.', 'in_use' => 'Campo aún en uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'No existe el Fieldset', - 'create' => array( + 'create' => [ 'error' => 'No se ha creado el Fieldset, por favor, inténtelo de nuevo.', - 'success' => 'Fieldset creado con éxito.' - ), + 'success' => 'Fieldset creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El Fieldset no ha sido actualizado, por favor, inténtelo de nuevo', - 'success' => 'Fieldset actualizado con éxito.' - ), + 'success' => 'Fieldset actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer eliminar este campo?', 'error' => 'Hubo un problema al eliminar el Fieldset. Por favor, inténtelo de nuevo.', 'success' => 'El Fieldset ha sido borrado con éxito.', 'in_use' => 'Este Fieldset aún está en uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/es-VE/admin/departments/message.php b/resources/lang/es-VE/admin/departments/message.php index 4b040d99d9..e1097796a8 100644 --- a/resources/lang/es-VE/admin/departments/message.php +++ b/resources/lang/es-VE/admin/departments/message.php @@ -1,21 +1,21 @@ 'El departamento no existe.', 'assoc_users' => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser borrado. Por favor actualiza tus usuarios para no referenciar este departamento e inténtelo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El departamento no fue creado, por favor, inténtelo de nuevo.', - 'success' => 'Departamento creado con éxito.' - ), - 'update' => array( + 'success' => 'Departamento creado con éxito.', + ], + 'update' => [ 'error' => 'El departamento no se ha actualizado, por favor, inténtelo de nuevo', - 'success' => 'El departamento fue actualizado con éxito.' - ), - 'delete' => array( + 'success' => 'El departamento fue actualizado con éxito.', + ], + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar este departamento?', 'error' => 'Hubo un problema al borrar el departamento. Por favor, inténtelo de nuevo.', - 'success' => 'El departamento ha sido borrado con éxito.' - ) + 'success' => 'El departamento ha sido borrado con éxito.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/departments/table.php b/resources/lang/es-VE/admin/departments/table.php index 87fce07403..ace0eba0a7 100644 --- a/resources/lang/es-VE/admin/departments/table.php +++ b/resources/lang/es-VE/admin/departments/table.php @@ -1,6 +1,6 @@ 'Identificación', 'name' => 'Nombre de Departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Ubicación', 'create' => 'Crear departamento', 'update' => 'Actualizar Departamento', - ); + ]; diff --git a/resources/lang/es-VE/admin/depreciations/general.php b/resources/lang/es-VE/admin/depreciations/general.php index 48306c3433..dbe8fedcb1 100644 --- a/resources/lang/es-VE/admin/depreciations/general.php +++ b/resources/lang/es-VE/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Sobre Depreciación de Activos', 'about_depreciations' => 'Puedes configurar la depreciación de activos para depreciar activos basados en una depreciación en línea recta.', 'asset_depreciations' => 'Depreciación de Activos', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Número de Meses', 'update' => 'Actualizar Depreciación', -); +]; diff --git a/resources/lang/es-VE/admin/depreciations/message.php b/resources/lang/es-VE/admin/depreciations/message.php index c30b55a1b7..f057fcda2d 100644 --- a/resources/lang/es-VE/admin/depreciations/message.php +++ b/resources/lang/es-VE/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'La clase de depreciación no existe.', 'assoc_users' => 'La depreciación está actualmente asociada a uno o más modelos y no puede ser borrada. Por favor, borra los modelos y luego inténtalo nuevamente. ', - - 'create' => array( + 'create' => [ 'error' => 'La clase de depreciación no ha sido creada, por favor, inténtalo de nuevo. :(', - 'success' => 'La clase de depreciación creada con éxito. :)' - ), + 'success' => 'La clase de depreciación creada con éxito. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'La clase de depreciación no fue actualizada, por favor, inténtalo de nuevo', - 'success' => 'La clase de depreciación ha sido actualizada con éxito.' - ), + 'success' => 'La clase de depreciación ha sido actualizada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar esta clase de depreciación?', 'error' => 'Hubo un problema borrando la clase de depreciación. Por favor inténtalo de nuevo.', - 'success' => 'La clase de depreciación ha sido actualizada con éxito.' - ) + 'success' => 'La clase de depreciación ha sido actualizada con éxito.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/depreciations/table.php b/resources/lang/es-VE/admin/depreciations/table.php index 78453a049c..31fc336829 100644 --- a/resources/lang/es-VE/admin/depreciations/table.php +++ b/resources/lang/es-VE/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'Identificación', 'months' => 'Meses', 'term' => 'Duración', 'title' => 'Nombre ', -); +]; diff --git a/resources/lang/es-VE/admin/groups/message.php b/resources/lang/es-VE/admin/groups/message.php index db8f2a14a1..515cb8d474 100644 --- a/resources/lang/es-VE/admin/groups/message.php +++ b/resources/lang/es-VE/admin/groups/message.php @@ -1,22 +1,22 @@ '¡El grupo ya existe!', 'group_not_found' => 'El grupo [:id] no existe.', 'group_name_required' => 'El nombre del campo es necesario', - 'success' => array( + 'success' => [ 'create' => 'Grupo creado con éxito.', 'update' => 'Grupo actualizado con éxito.', 'delete' => 'Grupo borrado con éxito.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer borrar este grupo?', 'create' => 'Hubo un problema al crear el grupo, por favor, inténtalo de nuevo.', 'update' => 'Hubo un problema al actualizar el grupo, por favor, inténtalo de nuevo.', 'delete' => 'Hubo un problema al borrar el grupo, por favor, inténtalo de nuevo.', - ), + ], -); +]; diff --git a/resources/lang/es-VE/admin/groups/table.php b/resources/lang/es-VE/admin/groups/table.php index 88c182b7bd..6e18ef81c5 100644 --- a/resources/lang/es-VE/admin/groups/table.php +++ b/resources/lang/es-VE/admin/groups/table.php @@ -1,9 +1,9 @@ 'Identificación', 'name' => 'Nombre', 'users' => '# de Usuarios', -); +]; diff --git a/resources/lang/es-VE/admin/groups/titles.php b/resources/lang/es-VE/admin/groups/titles.php index fa2ed72f70..aa541e2b69 100644 --- a/resources/lang/es-VE/admin/groups/titles.php +++ b/resources/lang/es-VE/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Acerca de los Grupos', 'about_groups' => 'Los grupos son usados para generalizar permisos de usuario.', 'group_management' => 'Administración de Grupo', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Denegar', -); +]; diff --git a/resources/lang/es-VE/admin/hardware/form.php b/resources/lang/es-VE/admin/hardware/form.php index b90be5c180..f441e551a7 100644 --- a/resources/lang/es-VE/admin/hardware/form.php +++ b/resources/lang/es-VE/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmar Eliminación Masiva de Activos', +return [ + 'bulk_delete' => 'Confirmar Eliminación Masiva de Activos', 'bulk_delete_help' => 'Revisa los activos para eliminación masiva abajo. Una vez borrados, estos activos pueden ser restaurados, pero no estarán asociados con ningún usuario al que estén asignados actualmente.', 'bulk_delete_warn' => 'Vas a eliminar :asset_count activos.', - 'bulk_update' => 'Actualización Masiva de Activos', - 'bulk_update_help' => 'Este formulario te permite actualizar múltiples activos de una vez. Sólo llena los campos que necesites cambiar. Cualquier campo dejado en blanco permanecerá sin cambios. ', - 'bulk_update_warn' => 'Estás a punto de editar las propiedades de :asset_count activos.', + 'bulk_update' => 'Actualización Masiva de Activos', + 'bulk_update_help' => 'Este formulario te permite actualizar múltiples activos de una vez. Sólo llena los campos que necesites cambiar. Cualquier campo dejado en blanco permanecerá sin cambios. ', + 'bulk_update_warn' => 'Estás a punto de editar las propiedades de :asset_count activos.', 'checkedout_to' => 'Asignado A', 'checkout_date' => 'Fecha de Salida', 'checkin_date' => 'Fecha de Ingreso', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etiqueta de Activo', 'update' => 'Actualizar Activo', 'warranty' => 'Garantía', - 'warranty_expires' => 'La garantía vence', + 'warranty_expires' => 'La garantía vence', 'years' => 'años', -) -; +]; diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php index bc882acc3c..f2ad99e2c6 100644 --- a/resources/lang/es-VE/admin/hardware/general.php +++ b/resources/lang/es-VE/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Acerca de Activos', 'about_assets_text' => 'Los activos son seguidos mediante el número del serial o la etiqueta del activo. Tienden a ser objetos de mayor valor en los que identificar un objeto específico importa.', - 'archived' => 'Archivado', + 'archived' => 'Archivado', 'asset' => 'Activo', 'bulk_checkout' => 'Activos Asignados', 'checkin' => 'Ingresar Activo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pendiente', 'undeployable' => 'No enviable', 'view' => 'Ver Activo', -); +]; diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php index 10ef52135b..5e5bb51b81 100644 --- a/resources/lang/es-VE/admin/hardware/message.php +++ b/resources/lang/es-VE/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Advertencia: este activo ha sido marcado actualmente como no enviable. Si este estado cambia, por favor actualiza el estado de activos.', 'does_not_exist' => 'El activo no existe.', 'does_not_exist_or_not_requestable' => 'Buen intento. Ese activo no existe o no es solicitable.', 'assoc_users' => 'Este activo está actualmente asignado a un usuario y no puede ser borrado. Por favor, revisa el activo primero y luego intenta borrarlo. ', - 'create' => array( + 'create' => [ 'error' => 'El activo no ha sido creado, por favor, inténtelo de nuevo. :(', - 'success' => 'Activo creado con éxito. :)' - ), + 'success' => 'Activo creado con éxito. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Activo no ha sido actualizado, por favor, inténtelo de nuevo', 'success' => 'Activo actualizado con éxito.', 'nothing_updated' => 'Ningún campo fue seleccionado, así que nada se actualizó.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'El activo no fue restaurado, por favor, inténtalo de nuevo', - 'success' => 'Activo restaurado correctamente.' - ), + 'success' => 'Activo restaurado correctamente.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'La auditoria de activo no tuvo éxito. Inténtalo de nuevo.', - 'success' => 'Audoría de activo registrada con éxito.' - ), + 'success' => 'Audoría de activo registrada con éxito.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.', 'success' => 'Archivo borrado con éxito.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.', 'success' => 'Archivo(s) cargado(s) con éxito.', 'nofiles' => 'No seleccionaste ningún archivo para actualizar, o el archivo que estás intentando cargar es demasiado grande', 'invalidfiles' => 'Uno o más de tus archivos es demasiado grande o es de un tipo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf, y txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Algunos de los elementos no se importaron correctamente.', 'errorDetail' => 'Lo siguientes elementos no se importaron debido a errores.', - 'success' => "Tu archivo ha sido importado", - 'file_delete_success' => "Tu archivo ha sido eliminado con éxito", - 'file_delete_error' => "El archivo no se pudo eliminar", - ), + 'success' => 'Tu archivo ha sido importado', + 'file_delete_success' => 'Tu archivo ha sido eliminado con éxito', + 'file_delete_error' => 'El archivo no se pudo eliminar', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar este archivo?', 'error' => 'Ha habido un problema eliminando el activo. Por favor, inténtelo de nuevo.', 'nothing_updated' => 'Ningún activo se seleccionó, así que nada fue borrado.', - 'success' => 'El activo fue borrado con éxito.' - ), + 'success' => 'El activo fue borrado con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'El activo no se ha asignado, por favor, inténtelo de nuevo', 'success' => 'Activo asignado con éxito.', 'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.', 'not_available' => '¡Ese activo no está disponible para retirar!', - 'no_assets_selected' => 'Debes seleccionar al menos un activo de la lista' - ), + 'no_assets_selected' => 'Debes seleccionar al menos un activo de la lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'El activo no se ha registrado, por favor, inténtelo de nuevo', 'success' => 'Activo registrado con éxito.', 'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.', 'already_checked_in' => 'Ese activo ya ha sido registrado.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'El activo no fue solicitado, por favor, inténtalo de nuevo', 'success' => 'Activo solicitado correctamente.', - 'canceled' => 'Solicitud de asignación cancelada con éxito' - ) + 'canceled' => 'Solicitud de asignación cancelada con éxito', + ], -); +]; diff --git a/resources/lang/es-VE/admin/hardware/table.php b/resources/lang/es-VE/admin/hardware/table.php index 92c37038f7..0b0e4f66bd 100644 --- a/resources/lang/es-VE/admin/hardware/table.php +++ b/resources/lang/es-VE/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etiqueta de Activo', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Activo ', 'image' => 'Imagen de dispositivo', 'days_without_acceptance' => 'Días sin Aceptación', - 'monthly_depreciation' => 'Depreciación mensual' + 'monthly_depreciation' => 'Depreciación mensual', -); +]; diff --git a/resources/lang/es-VE/admin/kits/general.php b/resources/lang/es-VE/admin/kits/general.php index 06039317a1..5dd3c2ab19 100644 --- a/resources/lang/es-VE/admin/kits/general.php +++ b/resources/lang/es-VE/admin/kits/general.php @@ -1,6 +1,6 @@ 'Acerca de kits predefinidos', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Asignar kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/es-VE/admin/licenses/form.php b/resources/lang/es-VE/admin/licenses/form.php index 48e4c03009..241a845e5c 100644 --- a/resources/lang/es-VE/admin/licenses/form.php +++ b/resources/lang/es-VE/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Activo', 'checkin' => 'Registro', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenciado al Correo Electrónico', 'to_name' => 'Licenciado a Nombre', 'update' => 'Actualizar Licencia', - 'checkout_help' => 'Debes asignar una licencia a un activo de hardware o a una persona. Puedes seleccionar ambos pero el dueño del activo debe coincidir con la persona a la que le registras el activo.' -); + 'checkout_help' => 'Debes asignar una licencia a un activo de hardware o a una persona. Puedes seleccionar ambos pero el dueño del activo debe coincidir con la persona a la que le registras el activo.', +]; diff --git a/resources/lang/es-VE/admin/licenses/general.php b/resources/lang/es-VE/admin/licenses/general.php index b6cacb89b1..d945026cb3 100644 --- a/resources/lang/es-VE/admin/licenses/general.php +++ b/resources/lang/es-VE/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Acerca de las Licencias', 'about_licenses' => 'Las licencias son usadas para rastrear el software. Tienen un número específico de puestos que pueden ser asignados a individuos', 'checkin' => 'Registrar Puestos de Licencia', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licencias de Software', 'user' => 'Usuario', 'view' => 'Ver Licencia', -); +]; diff --git a/resources/lang/es-VE/admin/licenses/message.php b/resources/lang/es-VE/admin/licenses/message.php index c26967d057..eba705c70f 100644 --- a/resources/lang/es-VE/admin/licenses/message.php +++ b/resources/lang/es-VE/admin/licenses/message.php @@ -1,6 +1,6 @@ 'La licencia no existe.', 'user_does_not_exist' => 'El usuario no existe.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Debes seleccionar un activo o un usuario, pero no ambos.', 'not_found' => 'Licencia no encontrada', - - 'create' => array( + 'create' => [ 'error' => 'La licencia no se ha creado, inténtelo de nuevo.', - 'success' => 'Licencia creada con éxito.' - ), + 'success' => 'Licencia creada con éxito.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.', 'success' => 'Archivo borrado con éxito.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.', 'success' => 'Archivo(s) cargado(s) con éxito.', 'nofiles' => 'No ha seleccionado ningun archivo para ser cargado, o el archivo que seleccionó es demasiado grande', 'invalidfiles' => 'Uno o más de tus archivos son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'La licencia no se ha actualizado, inténtalo de nuevo', - 'success' => 'Licencia actualizada con éxito.' - ), + 'success' => 'Licencia actualizada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer borrar esta licencia?', 'error' => 'Hubo un problema al borrar la licencia. Por favor, inténtalo de nuevo.', - 'success' => 'La licencia fue eliminada con éxito.' - ), + 'success' => 'La licencia fue eliminada con éxito.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Hubo un problema asignando la licencia. Por favor, inténtelo de nuevo.', - 'success' => 'La licencia fue asignada con éxito' - ), + 'success' => 'La licencia fue asignada con éxito', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Hubo un problema registrando la licencia. Por favor, inténtalo de nuevo.', - 'success' => 'La licencia fue registrada con éxito' - ), + 'success' => 'La licencia fue registrada con éxito', + ], -); +]; diff --git a/resources/lang/es-VE/admin/licenses/table.php b/resources/lang/es-VE/admin/licenses/table.php index 7f83898354..da34e861b3 100644 --- a/resources/lang/es-VE/admin/licenses/table.php +++ b/resources/lang/es-VE/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Asignado A', 'checkout' => 'Registrado / Asignado', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Licencia', -); +]; diff --git a/resources/lang/es-VE/admin/locations/message.php b/resources/lang/es-VE/admin/locations/message.php index 9f3f45b82c..e372f99bd4 100644 --- a/resources/lang/es-VE/admin/locations/message.php +++ b/resources/lang/es-VE/admin/locations/message.php @@ -1,27 +1,26 @@ 'La ubicación no existe.', 'assoc_users' => 'Esta ubicación está actualmente asociada con al menos un usuario y no puede ser borrada. Por favor actualiza tus usuarios para no referenciar más esta ubicación e inténtalo de nuevo. ', 'assoc_assets' => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser borrada. Por favor actualiza tus activos para no referenciar más esta ubicación e inténtalo de nuevo. ', 'assoc_child_loc' => 'Esta ubicación es actualmente padre al menos una ubicación hija y no puede ser borrada. Por favor actualiza tus ubicaciones para no referenciar más esta ubicación e inténtalo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'La ubicación no fue creada, por favor, inténtelo de nuevo.', - 'success' => 'Ubicación creada con éxito.' - ), + 'success' => 'Ubicación creada con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'La ubicación no fue actualizada, por favor inténtelo de nuevo', - 'success' => 'La ubicación fue actualizada con éxito.' - ), + 'success' => 'La ubicación fue actualizada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Está seguro que querer borrar esta ubicación?', 'error' => 'Hubo un problema borrando la ubicación. Por favor, inténtalo de nuevo.', - 'success' => 'La ubicación fue borrada con exito.' - ) + 'success' => 'La ubicación fue borrada con exito.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/locations/table.php b/resources/lang/es-VE/admin/locations/table.php index d044e4d320..c11504ed69 100644 --- a/resources/lang/es-VE/admin/locations/table.php +++ b/resources/lang/es-VE/admin/locations/table.php @@ -1,6 +1,6 @@ 'Acerca de las Ubicaciones', 'about_locations' => 'Las ubicaciones son usadas para seguir la información de la ubicación de usuarios, activos, y otros objetos', 'assets_rtd' => 'Activos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Padre', 'currency' => 'Divisa de la Ubicación', 'ldap_ou' => 'Búsqueda LDAP OU', - ); + ]; diff --git a/resources/lang/es-VE/admin/manufacturers/message.php b/resources/lang/es-VE/admin/manufacturers/message.php index 653e931eb3..e304e25795 100644 --- a/resources/lang/es-VE/admin/manufacturers/message.php +++ b/resources/lang/es-VE/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'El fabricante no existe.', 'assoc_users' => 'Este fabricante está actualmente asociado con al menos un modelo y no puede ser borrado. Por favor, actualiza tus modelos para no referenciar este fabricante e inténtelo de nuevo. ', - 'create' => array( + 'create' => [ 'error' => 'El fabricante no ha sido creado, por favor, inténtalo de nuevo.', - 'success' => 'Fabricante creado con éxito.' - ), + 'success' => 'Fabricante creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El fabricante no ha sido actualizado, por favor, inténtelo de nuevo', - 'success' => 'Fabricante actualizado con éxito.' - ), + 'success' => 'Fabricante actualizado con éxito.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El fabricante no fue restaurado, intente de nuevo', - 'success' => 'Fabricante restaurado con éxito.' - ), + 'success' => 'Fabricante restaurado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer borrar este fabricante?', 'error' => 'Hubo un problema borrando el fabricante. Por favor, inténtalo de nuevo.', - 'success' => 'Fabricante borrado con éxito.' - ) + 'success' => 'Fabricante borrado con éxito.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/manufacturers/table.php b/resources/lang/es-VE/admin/manufacturers/table.php index 05ad749aa8..27ff4e40f7 100644 --- a/resources/lang/es-VE/admin/manufacturers/table.php +++ b/resources/lang/es-VE/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre Fabricantes', 'about_manufacturers_text' => 'Los fabricantes son las compañías que crean tus activos. Puedes guardar información importante de soporte aquí, que será mostrado en la páginas de detalles de tu activo.', 'asset_manufacturers' => 'Fabricantes de Activos', @@ -13,4 +13,4 @@ return array( 'update' => 'Actualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/es-VE/admin/models/general.php b/resources/lang/es-VE/admin/models/general.php index 3b9b1299bd..92e527b0eb 100644 --- a/resources/lang/es-VE/admin/models/general.php +++ b/resources/lang/es-VE/admin/models/general.php @@ -1,6 +1,6 @@ 'Acerca de los Modelos de Activos', 'about_models_text' => 'Los Modelos de Activos son un grupo de activos idénticos. "MBP 2013", "iPhone 6S", etc.', 'deleted' => 'Este modelo ha sido borrado. Click aquí para restaurarlo.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Estás a punto de borrar :model_count modelos de activo.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Los usuarios pueden solicitar este modelo', - 'show_mac_address' => 'Mostrar campo de dirección MAC en activos en este modelo', + 'show_mac_address' => 'Mostrar campo de dirección MAC en activos en este modelo', 'view_deleted' => 'Ver Borrados', 'view_models' => 'Ver Modelos', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Sin campos personalizados', 'add_default_values' => 'Agregar valores predeterminados', -); +]; diff --git a/resources/lang/es-VE/admin/models/message.php b/resources/lang/es-VE/admin/models/message.php index 45183d6621..064ac3c92c 100644 --- a/resources/lang/es-VE/admin/models/message.php +++ b/resources/lang/es-VE/admin/models/message.php @@ -1,42 +1,41 @@ 'El modelo no existe.', 'assoc_users' => 'Este modelo está asignado a uno o más activos y no puede ser eliminado. Por favor, borra los activos y luego intenta borrarlo nuevamente. ', - - 'create' => array( + 'create' => [ 'error' => 'El modelo no fue creado, por favor inténtalo de nuevo.', 'success' => 'Modelo creado con éxito.', 'duplicate_set' => 'Un modelo de activo con ese nombre, fabricante y número de modelo ya existe.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'El modelo no fue actualizado, por favor, inténtalo de nuevo', - 'success' => 'Modelo actualizado con éxito.' - ), + 'success' => 'Modelo actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar este modelo de activo?', 'error' => 'Hubo un problema borrando el modelo. Por favor inténtalo de nuevo.', - 'success' => 'El modelo fue borrado con éxito.' - ), + 'success' => 'El modelo fue borrado con éxito.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'El modelo no fue restaurado, por favor inténtalo de nuevo', - 'success' => 'Modelo restaurado con éxito.' - ), + 'success' => 'Modelo restaurado con éxito.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ningún cambio fue cambiado, así que nada se actualizó.', - 'success' => 'Modelos actualizados.' - ), + 'success' => 'Modelos actualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ningún modelo fue seleccionado, así que nada fue eliminado.', 'success' => '¡:success_count modelo(s) eliminado(s)!', - 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.' - ), + 'success_partial' => ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/models/table.php b/resources/lang/es-VE/admin/models/table.php index 6e8e0ee46a..a0b989c834 100644 --- a/resources/lang/es-VE/admin/models/table.php +++ b/resources/lang/es-VE/admin/models/table.php @@ -1,6 +1,6 @@ 'Crear Modelo de Activo', 'created_at' => 'Creado el', @@ -14,4 +14,4 @@ return array( 'update' => 'Actualizar Modelo de Activo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/es-VE/admin/reports/general.php b/resources/lang/es-VE/admin/reports/general.php index 3b22703bd8..67e8764e01 100644 --- a/resources/lang/es-VE/admin/reports/general.php +++ b/resources/lang/es-VE/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecciona que opciones quieres para tu informe de activos.' -); +return [ + 'info' => 'Selecciona que opciones quieres para tu informe de activos.', +]; diff --git a/resources/lang/es-VE/admin/reports/message.php b/resources/lang/es-VE/admin/reports/message.php index a8f61aa993..a5bd885673 100644 --- a/resources/lang/es-VE/admin/reports/message.php +++ b/resources/lang/es-VE/admin/reports/message.php @@ -1,5 +1,5 @@ 'Debes seleccionar al menos UNA opción.' -); +return [ + 'error' => 'Debes seleccionar al menos UNA opción.', +]; diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php index 529241ddd7..5516e68606 100644 --- a/resources/lang/es-VE/admin/settings/general.php +++ b/resources/lang/es-VE/admin/settings/general.php @@ -1,12 +1,12 @@ 'Directorio Activo', 'ad_domain' => 'Dominio del Directorio Activo', 'ad_domain_help' => 'Este es a veces el mismo que el correo electrónico de dominio, pero no siempre.', 'ad_append_domain_label' => 'Añadir nombre de dominio', 'ad_append_domain' => 'Añadir nombre de dominio al campo de nombre de usuario', - 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".' , + 'ad_append_domain_help' => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".', 'admin_cc_email' => 'Email CC', 'admin_cc_email_help' => 'Si deseas enviar una notificación por correo electrónico de las asignaciones de activos que se envían a los usuarios a una cuenta adicional, ingrésela aquí. De lo contrario, deja este campo en blanco.', 'is_ad' => 'Este es un servidor de Directorio Activo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Limite de alertas de expiración (en días)', 'alert_inv_threshold' => 'Umbral de alerta del inventario', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDs de activos', 'audit_interval' => 'Intervalo de Auditoría', 'audit_interval_help' => 'Si tienes la obligación de auditar física y regularmente tus activos, ingresa el intervalo en meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ingrese Código de Verificación en dos pasos', 'two_factor_config_complete' => 'Enviar Código', 'two_factor_enabled_edit_not_allowed' => 'Tu administrador no te permite editar esta configuración.', - 'two_factor_enrollment_text' => "La autenticación de dos pasos es necesaria, sin embargo, tu dispositivo no ha sido inscrito aún. Abre tu aplicación de Autenticador de Google y escanea el código QR abajo para registrar tu dispositivo. Una vez hayas registrado tu dispositivo, introduce el código abajo", + 'two_factor_enrollment_text' => 'La autenticación de dos pasos es necesaria, sin embargo, tu dispositivo no ha sido inscrito aún. Abre tu aplicación de Autenticador de Google y escanea el código QR abajo para registrar tu dispositivo. Una vez hayas registrado tu dispositivo, introduce el código abajo', 'require_accept_signature' => 'Requerir Firma', 'require_accept_signature_help_text' => 'Habilitar esta función requerirá a los usuarios firmar físicamente al aceptar un activo.', 'left' => 'izquierda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Al marcar esta casilla se forzarán números de serie únicos a los activos', 'zerofill_count' => 'Longitud de las etiquetas de activos, incluyendo relleno de ceros', 'username_format_help' => 'Esta configuración sólo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario para usted.', -); +]; diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php index 6646cee61b..82d2159c6c 100644 --- a/resources/lang/es-VE/admin/settings/message.php +++ b/resources/lang/es-VE/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Un error ha ocurrido mientras se actualizaba. ', - 'success' => 'Configuraciones actualizados con éxito.' - ), - 'backup' => array( + 'success' => 'Configuraciones actualizados con éxito.', + ], + 'backup' => [ 'delete_confirm' => '¿Estás seguro de que quieres eliminar este archivo de respaldo? Esta acción no puede deshacerse. ', 'file_deleted' => 'El archivo de respaldo fue eliminado satisfactoriamente. ', 'generated' => 'Un nuevo archivo de respaldo ha sido creado con éxito.', 'file_not_found' => 'El archivo de respaldo no puede ser encontrado en el servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ', 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.', - 'success' => 'Registros de borrado purgados correctamente.' - ), + 'success' => 'Registros de borrado purgados correctamente.', + ], -); +]; diff --git a/resources/lang/es-VE/admin/statuslabels/message.php b/resources/lang/es-VE/admin/statuslabels/message.php index 9af6cdaf6b..7ee0c432ff 100644 --- a/resources/lang/es-VE/admin/statuslabels/message.php +++ b/resources/lang/es-VE/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Etiqueta de estado no existe.', 'assoc_assets' => 'Esta etiqueta de estado está actualmente asociado con al menos un Activo y no puede ser borrada. Por favor, actualiza tus activos para no referenciar más este estado e inténtalo de nuevo. ', - - 'create' => array( + 'create' => [ 'error' => 'La etiqueta de estado no fue creada, por favor, inténtalo de nuevo.', - 'success' => 'La etiqueta de estado fue creada con éxito.' - ), + 'success' => 'La etiqueta de estado fue creada con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'La etiqueta de estado no fue actualizada, por favor, inténtelo de nuevo', - 'success' => 'La etiqueta de estado fue actualizada con éxito.' - ), + 'success' => 'La etiqueta de estado fue actualizada con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de querer eliminar esta etiqueta de estado?', 'error' => 'Huno un problema borrando la etiqueta de estado. Por favor, inténtalo de nuevo.', - 'success' => 'La etiqueta de estado se ha eliminado con éxito.' - ), + 'success' => 'La etiqueta de estado se ha eliminado con éxito.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Estos activos no pueden asignarse a nadie.', 'deployable' => 'Estos activos pueden ser retirados. Una vez hayan sido asignados, asumirán el metaestado de Desplegados.', 'archived' => 'Estos activos no pueden ser asignados, y sólo se mostrarán en la vista archivada. Esto es útil para retener información acerca de activos para propósitos históricos o de presupuesto, pero manteniéndolos fuera de la lista de activos del día a día.', 'pending' => 'Estos activos no pueden ser asignados a nadie aún, usados a menudo para artículos que son para reparar pero se espera que vuelvan a circulación.', - ), + ], -); +]; diff --git a/resources/lang/es-VE/admin/statuslabels/table.php b/resources/lang/es-VE/admin/statuslabels/table.php index b747204564..0fc2577fcc 100644 --- a/resources/lang/es-VE/admin/statuslabels/table.php +++ b/resources/lang/es-VE/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Acerca de los estados de etiqueta', 'archived' => 'Archivado', 'create' => 'Crear estado de etiqueta', @@ -16,4 +16,4 @@ return array( 'title' => 'Etiquetas de Estado', 'undeployable' => 'No desplegable', 'update' => 'Actualizar Etiqueta de Estado', -); +]; diff --git a/resources/lang/es-VE/admin/suppliers/message.php b/resources/lang/es-VE/admin/suppliers/message.php index b9c411724a..fa93ebd503 100644 --- a/resources/lang/es-VE/admin/suppliers/message.php +++ b/resources/lang/es-VE/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'El proveedor no existe.', - - 'create' => array( + 'create' => [ 'error' => 'El proveedor no ha sido creado, inténtalo de nuevo.', - 'success' => 'Proveedor creado con éxito.' - ), + 'success' => 'Proveedor creado con éxito.', + ], - 'update' => array( + 'update' => [ 'error' => 'El proveedor no ha sido actualizado, por favor, inténtalo de nuevo', - 'success' => 'Proveedor actualizado con éxito.' - ), + 'success' => 'Proveedor actualizado con éxito.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '¿Estás seguro de que quieres borrar este proveedor?', 'error' => 'Hubo un problema borrando el proveedor. Por favor, inténtalo de nuevo.', 'success' => 'El proveedor fue eliminado con éxito.', 'assoc_assets' => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser borrado. Por favor, actualiza tus activos para no referenciar más este proveedor e inténtalo de nuevo. ', 'assoc_licenses' => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser borrado. Por favor, actualiza tus licencias para no referenciar más este proveedor e inténtalo de nuevo. ', 'assoc_maintenances' => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ', - ) + ], -); +]; diff --git a/resources/lang/es-VE/admin/suppliers/table.php b/resources/lang/es-VE/admin/suppliers/table.php index a6ed1f9a43..b3e059595a 100644 --- a/resources/lang/es-VE/admin/suppliers/table.php +++ b/resources/lang/es-VE/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Acerca de los Proveedores', 'about_suppliers_text' => 'Los proveedores son utilizados para seguir la fuente de los artículos', 'address' => 'Dirección del Proveedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Activos para', 'zip' => 'Código Postal', -); +]; diff --git a/resources/lang/es-VE/admin/users/general.php b/resources/lang/es-VE/admin/users/general.php index b7592e9497..4f6b04faa5 100644 --- a/resources/lang/es-VE/admin/users/general.php +++ b/resources/lang/es-VE/admin/users/general.php @@ -1,7 +1,6 @@ 'Este usuario puede ingresar', 'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.', 'assets_user' => 'Activos asignados a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Usuario', 'filetype_info' => 'Los tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.', 'history_user' => 'Historial para :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Haga clic aquí para restaurarlos.', 'last_login' => 'Último Inicio de Sesión', 'ldap_config_text' => 'Los parámetros de configuración LDAP pueden ser encontrados en Admin > Settings. La ubicación (opcional) seleccionada será establecida para todos los usuarios importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Tus configuraciones de administrador actuales permiten cumplimiento selectivo de autenticación de dos factores. ', 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ', 'two_factor_active' => '2FA activo ', - ); + ]; diff --git a/resources/lang/es-VE/admin/users/message.php b/resources/lang/es-VE/admin/users/message.php index b6b99fff2c..6cafb39059 100644 --- a/resources/lang/es-VE/admin/users/message.php +++ b/resources/lang/es-VE/admin/users/message.php @@ -1,6 +1,6 @@ 'Has aceptado este activo con éxito.', 'declined' => 'Has rechazado este activo con éxito.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'La integración LDAP no ha sido configurada para esta instalación.', 'password_resets_sent' => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.', - - 'success' => array( + 'success' => [ 'create' => 'El usuario fue creado con éxito.', 'update' => 'El usuario fue actualizado con éxito.', 'update_bulk' => '¡Los usuarios fueron actualizados con éxito!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Usuario des-suspendido con éxito.', 'restored' => 'Usuario restaurado con éxito.', 'import' => 'Usuarios importados con éxito.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Hubo un problema creando el usuario. Por favor, inténtalo de nuevo.', 'update' => 'Hubo un problema actualizando al usuario. Por favor, inténtalo de nuevo.', 'delete' => 'Hubo un problema borrando el usuario. Por favor, inténtalo de nuevo.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'No se pudo buscar el servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP.
Error del servidor LDAP:', 'ldap_could_not_get_entries' => 'No se pudieron obtener las entradas del servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP.
Error del servidor LDAP:', 'password_ldap' => 'La contraseña para esta cuenta es manejada por LDAP/Active Directory. Por favor contacta a tu departamento de IT para cambiar tu contraseña. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.', 'success' => 'Archivo borrado con éxito.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.', 'success' => 'Archivo(s) cargado(s) con éxito.', 'nofiles' => 'No ha seleccionado ningún archivo para subir', 'invalidfiles' => 'Uno o más de tus archivos es demasiado grande o es de un tipo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf, y txt.', - ), + ], -); +]; diff --git a/resources/lang/es-VE/admin/users/table.php b/resources/lang/es-VE/admin/users/table.php index d22567c018..74dcb2a3ec 100644 --- a/resources/lang/es-VE/admin/users/table.php +++ b/resources/lang/es-VE/admin/users/table.php @@ -1,6 +1,6 @@ 'Activo', 'allow' => 'Permitir', 'checkedout' => 'Activos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar Usuarios Actuales', 'show_deleted' => 'Mostrar Usuarios Eliminados', 'title' => 'Título', - 'to_restore_them' => 'para restaurarlos.', + 'to_restore_them' => 'para restaurarlos.', 'updateuser' => 'Actualizar Usuario', 'username' => 'Nombre de usuario', - 'user_deleted_text' => 'Este usuario ha sido marcado como borrado.', + 'user_deleted_text' => 'Este usuario ha sido marcado como borrado.', 'username_note' => '(Esto es usado sólo para el enlace de Active Directory, no para iniciar sesión.)', 'cloneuser' => 'Clonar Usuario', 'viewusers' => 'Ver Usuarios', -); +]; diff --git a/resources/lang/es-VE/auth/general.php b/resources/lang/es-VE/auth/general.php index 725e90f93f..fb5c9f44a2 100644 --- a/resources/lang/es-VE/auth/general.php +++ b/resources/lang/es-VE/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Introduzca su nombre de usuario para enviar un enlace de restablecimiento de contraseña.', 'username_help_bottom' => 'Tu nombre de usuario y dirección de correo electrónico puede ser el mismo, pero puede que no lo sea, dependiendo de tu configuración. Si no puede recordar su nombre de usuario, póngase en contacto con su administrador.

A los usuarios sin una dirección de correo electrónico asociada no se enviará por correo electrónico un enlace de restablecimiento de contraseña. ', ]; - diff --git a/resources/lang/es-VE/auth/message.php b/resources/lang/es-VE/auth/message.php index ae04514ed9..655c11c61f 100644 --- a/resources/lang/es-VE/auth/message.php +++ b/resources/lang/es-VE/auth/message.php @@ -1,6 +1,6 @@ 'Una cuenta con este correo ya existe.', 'account_not_found' => 'El nombre de usuario o la contraseña son incorrectos.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'La cuenta de este usuario está bloqueada.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Hubo un problema mientras se intentaba iniciar su sesión, por favor inténtelo de nuevo.', 'success' => 'Has iniciado sesión con éxito.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Hubo un problema mientras se creaba la cuenta, por favor inténtalo de nuevo.', 'success' => 'Cuenta creada con éxito.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Hubo un problema al intentar obtener un código para restablecer la contraseña, inténtalo de nuevo.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ha habido un problema mientras se intentaba restablecer tu contraseña, por favor, inténtalo de nuevo.', 'success' => 'Tu contraseña ha sido reiniciada con éxito.', - ), + ], - -); +]; diff --git a/resources/lang/es-VE/button.php b/resources/lang/es-VE/button.php index aae5903096..f0446ba2fe 100644 --- a/resources/lang/es-VE/button.php +++ b/resources/lang/es-VE/button.php @@ -1,6 +1,6 @@ 'Acciones', 'add' => 'Añadir Nuevo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitar', 'submit' => 'Enviar', 'upload' => 'Cargar', - 'select_file' => 'Seleccionar Archivo...', + 'select_file' => 'Seleccionar Archivo...', 'select_files' => 'Selecciona Archivos...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php index fbf363a479..27c36fe9ab 100644 --- a/resources/lang/es-VE/general.php +++ b/resources/lang/es-VE/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Dar de Alta', 'user_requests_count' => 'Solicitudes', 'city' => 'Ciudad', - 'click_here' => 'Click aquí', + 'click_here' => 'Click aquí', 'clear_selection' => 'Limpiar selección', 'companies' => 'Compañías', 'company' => 'Compañía', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'País', diff --git a/resources/lang/es-VE/help.php b/resources/lang/es-VE/help.php index d2326dec74..c364915314 100644 --- a/resources/lang/es-VE/help.php +++ b/resources/lang/es-VE/help.php @@ -1,6 +1,6 @@ "Más información", + 'more_info_title' => 'Más información', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/es-VE/mail.php b/resources/lang/es-VE/mail.php index c1bd8429d4..2712ef6cdf 100644 --- a/resources/lang/es-VE/mail.php +++ b/resources/lang/es-VE/mail.php @@ -1,6 +1,6 @@ 'Un usuario ha cancelado una solicitud de articulo en el sitio web', 'a_user_requested' => 'Un usuario ha solicitado un artículo en el sitio web', 'accessory_name' => 'Nombre del Accesorio:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución', 'Expected_Checkin_Date' => 'Un activo asignado a ti debe ser devuelto en :date', - 'your_assets' => 'Ver tus activos' -); + 'your_assets' => 'Ver tus activos', +]; diff --git a/resources/lang/es-VE/pagination.php b/resources/lang/es-VE/pagination.php index 9cbe91da30..72a72392ab 100644 --- a/resources/lang/es-VE/pagination.php +++ b/resources/lang/es-VE/pagination.php @@ -1,6 +1,6 @@ 'Siguiente »', -); +]; diff --git a/resources/lang/es-VE/passwords.php b/resources/lang/es-VE/passwords.php index 314b9dc874..d6dfa82794 100644 --- a/resources/lang/es-VE/passwords.php +++ b/resources/lang/es-VE/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => '¡El enlace de tu contraseña ha sido enviado!', 'user' => 'No se encontró ningún usuario activo con este correo electrónico.', ]; - diff --git a/resources/lang/es-VE/reminders.php b/resources/lang/es-VE/reminders.php index bd89801d78..6ebde031a1 100644 --- a/resources/lang/es-VE/reminders.php +++ b/resources/lang/es-VE/reminders.php @@ -1,6 +1,6 @@ "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.", + 'password' => 'Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.', - "user" => "El nombre de usuario o la dirección de correo son incorrectos", + 'user' => 'El nombre de usuario o la dirección de correo son incorrectos', - "token" => "Esta token para restablecer la contraseña es inválido.", + 'token' => 'Esta token para restablecer la contraseña es inválido.', - "sent" => "Si se encontró un correo electrónico coincide, ¡un recordatorio de contraseña fue enviado!", + 'sent' => 'Si se encontró un correo electrónico coincide, ¡un recordatorio de contraseña fue enviado!', -); +]; diff --git a/resources/lang/es-VE/table.php b/resources/lang/es-VE/table.php index f59a30b934..837c12cad4 100644 --- a/resources/lang/es-VE/table.php +++ b/resources/lang/es-VE/table.php @@ -1,10 +1,10 @@ 'Acciones', 'action' => 'Acción', 'by' => 'Por', 'item' => 'Artículo', -); +]; diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php index cf36988df0..1bb618db8d 100644 --- a/resources/lang/es-VE/validation.php +++ b/resources/lang/es-VE/validation.php @@ -1,6 +1,6 @@ 'El :attribute ya está en uso.', 'uploaded' => 'El :attribute fallo al cargar.', 'url' => 'El formato :attribute es inválido.', - "unique_undeleted" => "El :atrribute debe ser único.", + 'unique_undeleted' => 'El :atrribute debe ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "El campo :attribute contiene un caracter que no está permitido.", - "email_array" => "Una o más direcciones de correo electrónico no son válidas.", - "hashed_pass" => "Tu contraseña actual es incorrecta", + 'alpha_space' => 'El campo :attribute contiene un caracter que no está permitido.', + 'email_array' => 'Una o más direcciones de correo electrónico no son válidas.', + 'hashed_pass' => 'Tu contraseña actual es incorrecta', 'dumbpwd' => 'Esa contraseña es muy común.', - "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido", + 'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/et/admin/accessories/general.php b/resources/lang/et/admin/accessories/general.php index 35358be164..e47ebcf519 100644 --- a/resources/lang/et/admin/accessories/general.php +++ b/resources/lang/et/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Lisatarvikute kategooria', 'accessory_name' => 'Lisaseade Nimi', 'checkout' => 'Checkout Lisavarustus', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Selle asemel kasutage primaarset EULA vaikimisi.', 'use_default_eula_disabled' => 'Võtke kasutusele esmane vaikimisi EULA-d. Ükski esmane vaikimisi EULA ei ole määratud. Lisage see üksus valikut Seaded.', -); +]; diff --git a/resources/lang/et/admin/accessories/message.php b/resources/lang/et/admin/accessories/message.php index 8ecf60c1c5..b723f49a0e 100644 --- a/resources/lang/et/admin/accessories/message.php +++ b/resources/lang/et/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'See lisavarustus on praegu: kasutajate poolt kontrollitud arvude arv. Palun kontrollige tarvikuid ja proovige uuesti.', - 'create' => array( + 'create' => [ 'error' => 'Lisatarvikut ei loodud, proovige uuesti.', - 'success' => 'Lisavarustus loodi edukalt.' - ), + 'success' => 'Lisavarustus loodi edukalt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lisatarvikut ei värskendatud. Proovige uuesti', - 'success' => 'Lisatarvikut uuendati edukalt.' - ), + 'success' => 'Lisatarvikut uuendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite seda lisaseadet kustutada?', 'error' => 'Aksessuaar eemaldati. Palun proovi uuesti.', - 'success' => 'Lisaseade kustutati edukalt.' - ), + 'success' => 'Lisaseade kustutati edukalt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Lisatarvikut ei kontrollitud, palun proovige uuesti', 'success' => 'Lisaseade edukalt kontrollitud.', - 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.' - ), + 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Lisatarvikut ei olnud märgitud, palun proovige uuesti', 'success' => 'Lisaseade kontrollitud edukalt.', - 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.' - ) + 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.', + ], - -); +]; diff --git a/resources/lang/et/admin/accessories/table.php b/resources/lang/et/admin/accessories/table.php index 7b64c8f2cb..347a49756a 100644 --- a/resources/lang/et/admin/accessories/table.php +++ b/resources/lang/et/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Laadige alla CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Laadige alla CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Vastuvõtmine', 'title' => 'Lisaseade Nimi', - -); +]; diff --git a/resources/lang/et/admin/asset_maintenances/form.php b/resources/lang/et/admin/asset_maintenances/form.php index 325db108db..8e586cfaeb 100644 --- a/resources/lang/et/admin/asset_maintenances/form.php +++ b/resources/lang/et/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Päevad', 'notes' => 'Märkused', 'update' => 'Uuenda', - 'create' => 'Loo' + 'create' => 'Loo', ]; diff --git a/resources/lang/et/admin/asset_maintenances/message.php b/resources/lang/et/admin/asset_maintenances/message.php index 283b3b8c5b..6914d2eec8 100644 --- a/resources/lang/et/admin/asset_maintenances/message.php +++ b/resources/lang/et/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite seda vara hooldust kustutada?', 'error' => 'Seal oli probleem, kustutades vara hooldust. Palun proovi uuesti.', - 'success' => 'Varade hooldus kustutati edukalt.' + 'success' => 'Varade hooldus kustutati edukalt.', ], 'create' => [ 'error' => 'Varahooldust ei loodud, proovige uuesti.', - 'success' => 'Varade hooldus on edukalt loodud.' + 'success' => 'Varade hooldus on edukalt loodud.', ], 'edit' => [ 'error' => 'Varade hooldust ei muudetud, palun proovi uuesti.', - 'success' => 'Varahoiatus on edukalt muudetud.' + 'success' => 'Varahoiatus on edukalt muudetud.', ], 'asset_maintenance_incomplete' => 'Veel pole veel lõpetatud', 'warranty' => 'Garantii', 'not_warranty' => 'Mitte garantii', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/et/admin/asset_maintenances/table.php b/resources/lang/et/admin/asset_maintenances/table.php index f2d384ece9..77d1a61a19 100644 --- a/resources/lang/et/admin/asset_maintenances/table.php +++ b/resources/lang/et/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Varade hooldus', 'asset_name' => 'Vara nimi', 'is_warranty' => 'Garantii', - 'dl_csv' => 'Laadige alla CSV' + 'dl_csv' => 'Laadige alla CSV', ]; diff --git a/resources/lang/et/admin/categories/general.php b/resources/lang/et/admin/categories/general.php index 8395c89601..0c735774d8 100644 --- a/resources/lang/et/admin/categories/general.php +++ b/resources/lang/et/admin/categories/general.php @@ -1,6 +1,6 @@ 'Vahendite kategooriad', 'category_name' => 'Kategooria nimi', 'checkin_email' => 'Saada kasutajale e-kiri vara liikumise kohta.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Kasuta hoopis peamist vaikimisi EULA-t.', 'use_default_eula_disabled' => 'Kasuta hoopis peamist vaikimisi EULAt. Peamine vaikumisi EULA puudub. Lisa see seadete alt.', -); +]; diff --git a/resources/lang/et/admin/categories/message.php b/resources/lang/et/admin/categories/message.php index b4c15d7cfb..4002201b41 100644 --- a/resources/lang/et/admin/categories/message.php +++ b/resources/lang/et/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategooria puudub.', 'assoc_models' => 'Selle kategooriaga on seotud vähemalt üks mudel ja seda ei saa kustutada. Palun uuendage oma mudeleid, et need ei kasutaks seda kategooriat ning seejärel proovige uuesti. ', 'assoc_items' => 'Selle kategooriaga on seotud vähemalt üks :asset_type ja seda ei saa kustutada. Palun uuendage oma :asset_typr, et too ei kasutaks seda kategooriat ning seejärel proovige uuesti. ', - 'create' => array( + 'create' => [ 'error' => 'Kategooriat ei loodud, proovi uuesti.', - 'success' => 'Kategooria loomine õnnestus.' - ), + 'success' => 'Kategooria loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategooriat ei uuendatud, proovige uuesti', - 'success' => 'Kategooria uuendamine õnnestus.' - ), + 'success' => 'Kategooria uuendamine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle kategooria kustutada?', 'error' => 'Kategooria kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Kategooria kustutamine õnnestus.' - ) + 'success' => 'Kategooria kustutamine õnnestus.', + ], -); +]; diff --git a/resources/lang/et/admin/categories/table.php b/resources/lang/et/admin/categories/table.php index 99087be26b..555230cc0b 100644 --- a/resources/lang/et/admin/categories/table.php +++ b/resources/lang/et/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Vanem', 'require_acceptance' => 'Vastuvõtmine', 'title' => 'Vahendi kategooria nimi', -); +]; diff --git a/resources/lang/et/admin/companies/general.php b/resources/lang/et/admin/companies/general.php index a6237cb863..97eacedbcd 100644 --- a/resources/lang/et/admin/companies/general.php +++ b/resources/lang/et/admin/companies/general.php @@ -1,4 +1,5 @@ 'Vali ettevõte', ]; diff --git a/resources/lang/et/admin/companies/message.php b/resources/lang/et/admin/companies/message.php index c2132d1614..61afe1486e 100644 --- a/resources/lang/et/admin/companies/message.php +++ b/resources/lang/et/admin/companies/message.php @@ -1,18 +1,19 @@ 'Ettevõtet pole olemas.', 'assoc_users' => 'Selle ettevõttega on seotud vähemalt üks mudel ja seda ei saa kustutada. Palun uuenda oma mudeleid, et need ei kasutaks seda ettevõtet ning seejärel proovi uuesti. ', - 'create' => array( + 'create' => [ 'error' => 'Ettevõtet ei loodud, proovi uuesti.', - 'success' => 'Ettevõtte loomine õnnestus.' - ), - 'update' => array( + 'success' => 'Ettevõtte loomine õnnestus.', + ], + 'update' => [ 'error' => 'Ettevõtet ei uuendatud, proovige uuesti', - 'success' => 'Ettevõtte uuendamine õnnestus.' - ), - 'delete' => array( + 'success' => 'Ettevõtte uuendamine õnnestus.', + ], + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle ettevõtte kustutada?', 'error' => 'Ettevõtte kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Ettevõtte kustutamine õnnestus.' - ) -); + 'success' => 'Ettevõtte kustutamine õnnestus.', + ], +]; diff --git a/resources/lang/et/admin/companies/table.php b/resources/lang/et/admin/companies/table.php index 26e92078ff..ddf14f5583 100644 --- a/resources/lang/et/admin/companies/table.php +++ b/resources/lang/et/admin/companies/table.php @@ -1,9 +1,10 @@ 'Ettevõtted', 'create' => 'Uus ettevõte', 'title' => 'Ettevõte', 'update' => 'Muuda ettevõtet', 'name' => 'Ettevõtte nimi', 'id' => 'ID', -); +]; diff --git a/resources/lang/et/admin/components/general.php b/resources/lang/et/admin/components/general.php index 9c4e3e4ca8..b45566d9db 100644 --- a/resources/lang/et/admin/components/general.php +++ b/resources/lang/et/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponendi nimi', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Alles', 'total' => 'Kokku', 'update' => 'Muuda komponenti', -); +]; diff --git a/resources/lang/et/admin/components/message.php b/resources/lang/et/admin/components/message.php index 05d537d93f..bbfc165823 100644 --- a/resources/lang/et/admin/components/message.php +++ b/resources/lang/et/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenti pole olemas.', - 'create' => array( + 'create' => [ 'error' => 'Komponenti ei loodud, proovi uuesti.', - 'success' => 'Komponendi loomine õnnestus.' - ), + 'success' => 'Komponendi loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenti ei värskendatud, proovige uuesti', - 'success' => 'Komponendi muutmine õnnestus.' - ), + 'success' => 'Komponendi muutmine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle komponendi kustutada?', 'error' => 'Komponendi kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Komponendi kustutamine õnnestus.' - ), + 'success' => 'Komponendi kustutamine õnnestus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponenti ei kontrollitud, palun proovige uuesti', 'success' => 'Komponent on edukalt välja võetud.', - 'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.' - ), + 'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponent ei olnud märgitud, palun proovige uuesti', 'success' => 'Komponent on edukalt registreeritud.', - 'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.' - ) + 'user_does_not_exist' => 'Vale kasutaja. Palun proovi uuesti.', + ], - -); +]; diff --git a/resources/lang/et/admin/components/table.php b/resources/lang/et/admin/components/table.php index 36944b8c1c..7d105a2d3f 100644 --- a/resources/lang/et/admin/components/table.php +++ b/resources/lang/et/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponendi nimi', -); +]; diff --git a/resources/lang/et/admin/consumables/general.php b/resources/lang/et/admin/consumables/general.php index b6009300bd..b76c3be5d5 100644 --- a/resources/lang/et/admin/consumables/general.php +++ b/resources/lang/et/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Kasutaja saab tellimuse', 'consumable_name' => 'Kuluvahendi nimi', 'create' => 'Loo tarbitav', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Alles', 'total' => 'Kokku', 'update' => 'Muuda kuluvahendit', -); +]; diff --git a/resources/lang/et/admin/consumables/message.php b/resources/lang/et/admin/consumables/message.php index 9176787adb..c7f39a0425 100644 --- a/resources/lang/et/admin/consumables/message.php +++ b/resources/lang/et/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Kuluvahendit pole olemas.', - 'create' => array( + 'create' => [ 'error' => 'Kuluvahendit ei loodud, proovi uuesti.', - 'success' => 'Kuluvahendi loomine õnnestus.' - ), + 'success' => 'Kuluvahendi loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kuluvahendit ei muudetud, proovi uuesti', - 'success' => 'Kuluvahendi muutmine õnnestus.' - ), + 'success' => 'Kuluvahendi muutmine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle kuluvahendi kustutada?', 'error' => 'Kuluvahendi kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Kuluvahendi kustutamine õnnestus.' - ), + 'success' => 'Kuluvahendi kustutamine õnnestus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tarbitavat ei kontrollitud, proovige uuesti', 'success' => 'Tarbitav kontrollitud edukalt.', - 'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.' - ), + 'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tarbitavat ei märgitud, proovige uuesti', 'success' => 'Tarbitav kontrollitud edukalt.', - 'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.' - ) + 'user_does_not_exist' => 'See kasutaja ei sobi. Palun proovi uuesti.', + ], - -); +]; diff --git a/resources/lang/et/admin/consumables/table.php b/resources/lang/et/admin/consumables/table.php index 645034d0ff..3cea52000e 100644 --- a/resources/lang/et/admin/consumables/table.php +++ b/resources/lang/et/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Kulutatav nimi', -); +]; diff --git a/resources/lang/et/admin/custom_fields/general.php b/resources/lang/et/admin/custom_fields/general.php index bf231eb8b9..5a779d6fca 100644 --- a/resources/lang/et/admin/custom_fields/general.php +++ b/resources/lang/et/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Kohandatud väljad', 'field' => 'Väli', 'about_fieldsets_title' => 'Andmeväljade kohta', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Uus kohandatud väli', 'value_encrypted' => 'Selle välja väärtust krüpteeritakse andmebaasis. Dežrooveeritud väärtust saab vaadata ainult administraatoritel', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/et/admin/custom_fields/message.php b/resources/lang/et/admin/custom_fields/message.php index 07ba549bf6..895aec55b7 100644 --- a/resources/lang/et/admin/custom_fields/message.php +++ b/resources/lang/et/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Seda välja ei eksisteeri.', 'already_added' => 'Väli on juba lisatud', - 'create' => array( + 'create' => [ 'error' => 'Väli ei loodud, proovige uuesti.', 'success' => 'Väli loodi edukalt.', - 'assoc_success' => 'Väli edukalt lisatud fieldset\'i.' - ), + 'assoc_success' => 'Väli edukalt lisatud fieldset\'i.', + ], - 'update' => array( + 'update' => [ 'error' => 'Väli ei värskendatud, proovige uuesti', - 'success' => 'Väli värskendati edukalt.' - ), + 'success' => 'Väli värskendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite kustutada selle välja?', 'error' => 'Välja jäeti välja küsimus. Palun proovi uuesti.', 'success' => 'Väli kustutati edukalt.', 'in_use' => 'Väli on endiselt kasutusel.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset ei ole olemas', - 'create' => array( + 'create' => [ 'error' => 'Fieldset ei loodud, proovige uuesti.', - 'success' => 'Fieldset loodud edukalt.' - ), + 'success' => 'Fieldset loodud edukalt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset ei värskendatud, proovige uuesti', - 'success' => 'Fieldset uuendati edukalt.' - ), + 'success' => 'Fieldset uuendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite kustutada selle väljadestiivi?', 'error' => 'Väljaku seade kustutati. Palun proovi uuesti.', 'success' => 'Väljatrükk on edukalt kustutatud.', 'in_use' => 'Fieldset on endiselt kasutusel.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/et/admin/departments/message.php b/resources/lang/et/admin/departments/message.php index d35ddff313..2a33c149bc 100644 --- a/resources/lang/et/admin/departments/message.php +++ b/resources/lang/et/admin/departments/message.php @@ -1,21 +1,21 @@ 'Osakonda ei eksisteeri.', 'assoc_users' => 'See osakond on praegu seotud vähemalt ühe kasutajaga ja seda ei saa kustutada. Palun uuendage oma kasutajaid, et enam seda osakonda viideteta, ja proovige uuesti.', - 'create' => array( + 'create' => [ 'error' => 'Osakonda ei loodud, proovige uuesti.', - 'success' => 'Osakond loodi edukalt.' - ), - 'update' => array( + 'success' => 'Osakond loodi edukalt.', + ], + 'update' => [ 'error' => 'Osakonda ei värskendatud, proovige uuesti', - 'success' => 'Osakond uuendati edukalt.' - ), - 'delete' => array( + 'success' => 'Osakond uuendati edukalt.', + ], + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite selle osakonna kustutada?', 'error' => 'Osakonna kustutamisel tekkis küsimus. Palun proovi uuesti.', - 'success' => 'Osakond kustutati edukalt.' - ) + 'success' => 'Osakond kustutati edukalt.', + ], -); +]; diff --git a/resources/lang/et/admin/departments/table.php b/resources/lang/et/admin/departments/table.php index e9565e3925..2255e45f30 100644 --- a/resources/lang/et/admin/departments/table.php +++ b/resources/lang/et/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Osakonna nimi', @@ -8,4 +8,4 @@ return array( 'location' => 'Asukoht', 'create' => 'Loo osakond', 'update' => 'Uuenda osakonda', - ); + ]; diff --git a/resources/lang/et/admin/depreciations/general.php b/resources/lang/et/admin/depreciations/general.php index 5ab20d172f..db85afe764 100644 --- a/resources/lang/et/admin/depreciations/general.php +++ b/resources/lang/et/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Varade kadumiste kohta', 'about_depreciations' => 'Võite varade amortisatsiooni seadistada, et varasid amortiseerida lineaarsel kulumil.', 'asset_depreciations' => 'Varade kahanemine', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Kuude arv', 'update' => 'Kulumi ajakohastamine', -); +]; diff --git a/resources/lang/et/admin/depreciations/message.php b/resources/lang/et/admin/depreciations/message.php index e38c009ca0..1a2e2bc707 100644 --- a/resources/lang/et/admin/depreciations/message.php +++ b/resources/lang/et/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Amortisatsiooniklassi ei ole olemas.', 'assoc_users' => 'See amortisatsioon on praegu seotud ühe või mitme mudeliga ja seda ei saa kustutada. Palun kustutage mudelid ja proovige uuesti kustutada.', - - 'create' => array( + 'create' => [ 'error' => 'Amortisatsiooniklassi ei loodud, proovige uuesti. :(', - 'success' => 'Amortisatsiooniklass loodi edukalt. :)' - ), + 'success' => 'Amortisatsiooniklass loodi edukalt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Amortisatsiooni klassi ei värskendatud, proovige uuesti', - 'success' => 'Amortisatsiooniklass uuendati edukalt.' - ), + 'success' => 'Amortisatsiooniklass uuendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite selle amortisatsiooni klassi kustutada?', 'error' => 'Amortisatsiooniklassi kustutati. Palun proovi uuesti.', - 'success' => 'Amortisatsiooniklass kustutati edukalt.' - ) + 'success' => 'Amortisatsiooniklass kustutati edukalt.', + ], -); +]; diff --git a/resources/lang/et/admin/depreciations/table.php b/resources/lang/et/admin/depreciations/table.php index a296da9db2..7a124ec7b6 100644 --- a/resources/lang/et/admin/depreciations/table.php +++ b/resources/lang/et/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Kuud', 'term' => 'Tähtaeg', 'title' => 'Nimi', -); +]; diff --git a/resources/lang/et/admin/groups/message.php b/resources/lang/et/admin/groups/message.php index 8336fed222..80ed71e03c 100644 --- a/resources/lang/et/admin/groups/message.php +++ b/resources/lang/et/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grupp on juba olemas!', 'group_not_found' => 'Rühma [: id] ei ole olemas.', 'group_name_required' => 'Nimi on kohustuslik', - 'success' => array( + 'success' => [ 'create' => 'Grupi loomine õnnestus.', 'update' => 'Grupi uuendamine õnnestus.', 'delete' => 'Grupi kustutamine õnnestus.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oled sa kindel, et soovid selle grupi kustutada?', 'create' => 'Grupi loomisel tekkis probleem. Palun proovi uuesti.', 'update' => 'Grupi uuendamisel tekkis probleem. Palun proovi uuesti.', 'delete' => 'Grupi kustutamisel tekkis probleem. Palun proovi uuesti.', - ), + ], -); +]; diff --git a/resources/lang/et/admin/groups/table.php b/resources/lang/et/admin/groups/table.php index 05154b76c6..588ee3283c 100644 --- a/resources/lang/et/admin/groups/table.php +++ b/resources/lang/et/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nimi', 'users' => 'Kasutajate hulk', -); +]; diff --git a/resources/lang/et/admin/groups/titles.php b/resources/lang/et/admin/groups/titles.php index 3b8ccaa798..ef402d2aea 100644 --- a/resources/lang/et/admin/groups/titles.php +++ b/resources/lang/et/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Gruppidest', 'about_groups' => 'Gruppe kastatakse kasutajaõiguste koondamiseks.', 'group_management' => 'Gruppide haldus', @@ -11,4 +11,4 @@ return array( 'allow' => 'Luba', 'deny' => 'Keela', -); +]; diff --git a/resources/lang/et/admin/hardware/form.php b/resources/lang/et/admin/hardware/form.php index adfd7b30fe..5a5dbe1bc7 100644 --- a/resources/lang/et/admin/hardware/form.php +++ b/resources/lang/et/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Kinnita kahendite hulgi kustutamine', +return [ + 'bulk_delete' => 'Kinnita kahendite hulgi kustutamine', 'bulk_delete_help' => 'Kontrolli alltoodud vahendid hulgi kustutamiseks. Kui oled need kustutanud, võib neid veel taastada, kuid neid ei saa enam seostada kasutajatega, kellega nad hetkel seotud on.', 'bulk_delete_warn' => 'Sa hakkad kustsutama :asset_count vahendit.', - 'bulk_update' => 'Uuenduste hulgihaldus', - 'bulk_update_help' => 'See vorm võimaldab teil korraga mitme vara värskendada. Täitke ainult väljad, mida tuleb muuta. Kõik tühjad tühikud jäävad muutmata.', - 'bulk_update_warn' => 'Olete muutma vara omaduste omadust: asset_count.', + 'bulk_update' => 'Uuenduste hulgihaldus', + 'bulk_update_help' => 'See vorm võimaldab teil korraga mitme vara värskendada. Täitke ainult väljad, mida tuleb muuta. Kõik tühjad tühikud jäävad muutmata.', + 'bulk_update_warn' => 'Olete muutma vara omaduste omadust: asset_count.', 'checkedout_to' => 'Välja antud', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Kuupäev', @@ -38,7 +38,6 @@ return array( 'tag' => 'Varade silt', 'update' => 'Varade värskendamine', 'warranty' => 'Garantii', - 'warranty_expires' => 'Garantii aegub', + 'warranty_expires' => 'Garantii aegub', 'years' => 'aastat', -) -; +]; diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php index f41152d424..17fc08e345 100644 --- a/resources/lang/et/admin/hardware/general.php +++ b/resources/lang/et/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Vahenditest', 'about_assets_text' => 'Varad on üksused, mida jälgitakse seerianumbri või vara tag. Need kipuvad olema kõrgema väärtusega esemed, kus konkreetse üksuse kindlakstegemine on oluline.', - 'archived' => 'Arhiveeritud', + 'archived' => 'Arhiveeritud', 'asset' => 'Vahend', 'bulk_checkout' => 'Vara kasutusele võtt', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Ootel', 'undeployable' => 'Unustamatu', 'view' => 'Vaata vahendit', -); +]; diff --git a/resources/lang/et/admin/hardware/message.php b/resources/lang/et/admin/hardware/message.php index de2a6ad995..33e2988245 100644 --- a/resources/lang/et/admin/hardware/message.php +++ b/resources/lang/et/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Teenindus: See vara on märgitud kui praegu kasutatav. Kui see olek on muutunud, palun värskendage vara olekut.', 'does_not_exist' => 'Vahend puudub.', 'does_not_exist_or_not_requestable' => 'Hea katse. Seda vara ei eksisteeri või see ei ole kohustuslik.', 'assoc_users' => 'Seda vara kontrollitakse kasutajale praegu ja seda ei saa kustutada. Esmalt kontrollige varast ja proovige seejärel uuesti kustutada.', - 'create' => array( + 'create' => [ 'error' => 'Vahendit ei loodud, palun proovi uuesti. :(', - 'success' => 'Vahendi loomine õnnestus. :)' - ), + 'success' => 'Vahendi loomine õnnestus. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Vara ei värskendatud, proovige uuesti', 'success' => 'Vara värskendati edukalt', 'nothing_updated' => 'Pole ühtegi välju valitud, nii et midagi ei uuendatud.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Vara ei taastatud, palun proovi uuesti', - 'success' => 'Varad on edukalt taastatud.' - ), + 'success' => 'Varad on edukalt taastatud.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Varade auditi ebaõnnestus. Palun proovi uuesti.', - 'success' => 'Varakontrolli sisselogimisel.' - ), + 'success' => 'Varakontrolli sisselogimisel.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Faili pole kustutatud. Palun proovi uuesti.', 'success' => 'Fail edukalt kustutatud.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Faili (d) pole üles laaditud. Palun proovi uuesti.', 'success' => 'Fail (id) edukalt üles laaditud.', 'nofiles' => 'Te ei valinud üleslaadimiseks ühtegi faili või fail, mille üritate üles laadida, on liiga suur', 'invalidfiles' => 'Üks või mitu teie faili on liiga suured või failitüüp pole lubatud. Lubatud failitüübid on png, gif, jpg, doc, docx, pdf ja txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Mõned üksused ei impordinud õigesti.', 'errorDetail' => 'Järgmisi punkte ei imporditud vigade tõttu.', - 'success' => "Teie fail on imporditud", - 'file_delete_success' => "Teie fail on edukalt kustutatud", - 'file_delete_error' => "Faili ei saanud kustutada", - ), + 'success' => 'Teie fail on imporditud', + 'file_delete_success' => 'Teie fail on edukalt kustutatud', + 'file_delete_error' => 'Faili ei saanud kustutada', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite selle vara kustutada?', 'error' => 'Viga kustutas. Palun proovi uuesti.', 'nothing_updated' => 'Varasid ei valitud, nii et midagi ei kustutatud.', - 'success' => 'Varasus kustutati edukalt.' - ), + 'success' => 'Varasus kustutati edukalt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Varasid ei kontrollitud, proovige uuesti', 'success' => 'Varad võeti edukalt välja.', 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.', 'not_available' => 'See vara pole kontrollimiseks saadaval!', - 'no_assets_selected' => 'Sa pead valima vähemalt ühe kirje nimekirjast' - ), + 'no_assets_selected' => 'Sa pead valima vähemalt ühe kirje nimekirjast', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Vara ei olnud märgitud, palun proovi uuesti', 'success' => 'Vara on edukalt kontrollitud', 'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.', 'already_checked_in' => 'See vara on juba sisse registreeritud.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Vara ei taotletud, proovige uuesti', 'success' => 'Vara taotletud edukalt.', - 'canceled' => 'Checkout taotlus on edukalt tühistatud' - ) + 'canceled' => 'Checkout taotlus on edukalt tühistatud', + ], -); +]; diff --git a/resources/lang/et/admin/hardware/table.php b/resources/lang/et/admin/hardware/table.php index 3ae0b1e166..2d244a1b3c 100644 --- a/resources/lang/et/admin/hardware/table.php +++ b/resources/lang/et/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Varade silt', 'asset_model' => 'Mudel', @@ -20,6 +20,6 @@ return array( 'title' => 'Vara', 'image' => 'Seadme pilt', 'days_without_acceptance' => 'Päeva ilma vastuvõtmiseta', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/et/admin/kits/general.php b/resources/lang/et/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/et/admin/kits/general.php +++ b/resources/lang/et/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/et/admin/licenses/form.php b/resources/lang/et/admin/licenses/form.php index dd91100962..97ee5f04db 100644 --- a/resources/lang/et/admin/licenses/form.php +++ b/resources/lang/et/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Vahend', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Litsenseeritud e-mailile', 'to_name' => 'Litsenseeritud nimele', 'update' => 'Muuda litsentsi', - 'checkout_help' => 'Peate litsentsi kontrollima riistvara vara või isiku jaoks. Võite valida mõlemad, kuid vara omanik peab sobima selle isikuga, kellele vara kontrollitakse.' -); + 'checkout_help' => 'Peate litsentsi kontrollima riistvara vara või isiku jaoks. Võite valida mõlemad, kuid vara omanik peab sobima selle isikuga, kellele vara kontrollitakse.', +]; diff --git a/resources/lang/et/admin/licenses/general.php b/resources/lang/et/admin/licenses/general.php index c8322c5cbc..9c3d845f13 100644 --- a/resources/lang/et/admin/licenses/general.php +++ b/resources/lang/et/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Litsentside kohta', 'about_licenses' => 'Litsentse kasutatakse tarkvara jälgimiseks. Neil on kindlaksmääratud arv istekohti, mida saab üksikisikutele kontrollida', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Tarkvara litsentsid', 'user' => 'Kasutaja', 'view' => 'Vaadake litsentsi', -); +]; diff --git a/resources/lang/et/admin/licenses/message.php b/resources/lang/et/admin/licenses/message.php index 19b00a9144..aad3bc7532 100644 --- a/resources/lang/et/admin/licenses/message.php +++ b/resources/lang/et/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Luba pole olemas.', 'user_does_not_exist' => 'Kasutajat ei eksisteeri.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Peate valima vara või kasutaja, kuid mitte mõlemad.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Litsentsi ei loodud, proovige uuesti.', - 'success' => 'Litsents on edukalt loodud.' - ), + 'success' => 'Litsents on edukalt loodud.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Faili pole kustutatud. Palun proovi uuesti.', 'success' => 'Fail edukalt kustutatud.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Faili (d) pole üles laaditud. Palun proovi uuesti.', 'success' => 'Fail (id) edukalt üles laaditud.', 'nofiles' => 'Te ei valinud üleslaadimiseks ühtegi faili või fail, mille üritate üles laadida, on liiga suur', 'invalidfiles' => 'Üks või mitu teie faili on liiga suured või failitüüp pole lubatud. Lubatud failitüübid on png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml ja lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Litsentsi ei värskendatud, proovige uuesti', - 'success' => 'Litsents värskendati edukalt.' - ), + 'success' => 'Litsents värskendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite selle litsentsi kustutada?', 'error' => 'Litsentsi kustutati. Palun proovi uuesti.', - 'success' => 'Litsents kustutati edukalt.' - ), + 'success' => 'Litsents kustutati edukalt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Litsentsi kontrollides oli küsimus. Palun proovi uuesti.', - 'success' => 'Litsents oli edukalt välja võetud' - ), + 'success' => 'Litsents oli edukalt välja võetud', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Litsentsis kontrolliti probleemi. Palun proovi uuesti.', - 'success' => 'Litsents märgiti edukalt' - ), + 'success' => 'Litsents märgiti edukalt', + ], -); +]; diff --git a/resources/lang/et/admin/licenses/table.php b/resources/lang/et/admin/licenses/table.php index 6d45f29899..c59631e339 100644 --- a/resources/lang/et/admin/licenses/table.php +++ b/resources/lang/et/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Määratud', 'checkout' => 'Sees väljas', @@ -14,4 +14,4 @@ return array( 'serial' => 'Seerianumber', 'title' => 'Litsents', -); +]; diff --git a/resources/lang/et/admin/locations/message.php b/resources/lang/et/admin/locations/message.php index 3a6605c540..66d161ad5a 100644 --- a/resources/lang/et/admin/locations/message.php +++ b/resources/lang/et/admin/locations/message.php @@ -1,27 +1,26 @@ 'Asukohta ei eksisteeri.', 'assoc_users' => 'Selle asukohaga on seotud vähemalt üks kasutaja ja seda ei saa kustutada. Palun uuenda oma kasutajaid nii, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ', 'assoc_assets' => 'Selle asukohaga on seotud vähemalt üks vahend ja seda ei saa kustutada. Palun uuenda oma vahendeid, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ', 'assoc_child_loc' => 'Sel asukohal on hetkel all-asukohti ja seda ei saa kustutada. Palun uuenda oma asukohti nii, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ', - - 'create' => array( + 'create' => [ 'error' => 'Asukohta ei loodud, palun proovi uuesti.', - 'success' => 'Asukoha loomine õnnestus.' - ), + 'success' => 'Asukoha loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Asukohta ei uuendatud, palun proovi uuesti', - 'success' => 'Asukoha uuendamine õnnestus.' - ), + 'success' => 'Asukoha uuendamine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oled sa kindel, et soovid selle asukoha kustutada?', 'error' => 'Asukoha kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Asukoha kustutamine õnnestus.' - ) + 'success' => 'Asukoha kustutamine õnnestus.', + ], -); +]; diff --git a/resources/lang/et/admin/locations/table.php b/resources/lang/et/admin/locations/table.php index b085847bd2..988495e47d 100644 --- a/resources/lang/et/admin/locations/table.php +++ b/resources/lang/et/admin/locations/table.php @@ -1,6 +1,6 @@ 'Asukohtadest', 'about_locations' => 'Asukohti kasutatakse selleks, et jälgida kasutajate, vahendite ja muude asjade liikumist', 'assets_rtd' => 'Vahendid', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Vanem', 'currency' => 'Asukoha valuuta', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/et/admin/manufacturers/message.php b/resources/lang/et/admin/manufacturers/message.php index 319596b6a1..3df36844dc 100644 --- a/resources/lang/et/admin/manufacturers/message.php +++ b/resources/lang/et/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Tootjat ei eksisteeri.', 'assoc_users' => 'Selle tootjaga on seotud vähemalt üks mudel ja seda ei saa kustutada. Palun uuenda oma mudeleid, et need ei kasutaks seda tootjat ning seejärel proovi uuesti. ', - 'create' => array( + 'create' => [ 'error' => 'Tootjat ei loodud, proovi uuesti.', - 'success' => 'Tootja loomine õnnestus.' - ), + 'success' => 'Tootja loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tootjat ei uuendatud, palun proovi uuesti', - 'success' => 'Tootja uuendamine õnnestus.' - ), + 'success' => 'Tootja uuendamine õnnestus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle tootja kustutada?', 'error' => 'Tootja kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Tootja kustutamine õnnestus.' - ) + 'success' => 'Tootja kustutamine õnnestus.', + ], -); +]; diff --git a/resources/lang/et/admin/manufacturers/table.php b/resources/lang/et/admin/manufacturers/table.php index 6205b8cfd4..b37fb977c9 100644 --- a/resources/lang/et/admin/manufacturers/table.php +++ b/resources/lang/et/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Tootjatest', 'about_manufacturers_text' => 'Tootjad on need ettevõtted, kes sinu vahendid on tootnud. Sa võid siin hoida enda jaoks olulisi tootja kasutajatoe kontakte, mida kuvatakse vahendite detailide juures.', 'asset_manufacturers' => 'Vahendite tootjad', @@ -13,4 +13,4 @@ return array( 'update' => 'Uuenda tootjat', 'url' => 'URL', -); +]; diff --git a/resources/lang/et/admin/models/general.php b/resources/lang/et/admin/models/general.php index e4aa1e0128..b2bab7bafa 100644 --- a/resources/lang/et/admin/models/general.php +++ b/resources/lang/et/admin/models/general.php @@ -1,6 +1,6 @@ 'Mudelitest', 'about_models_text' => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.', 'deleted' => 'See mudel on kustutatud. Kliki siin selle taastamiseks.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Taasta mudel', 'requestable' => 'Kasutajad võivad seda mudelit tellida', - 'show_mac_address' => 'Näita sellel mudelil MAC aadressi välja', + 'show_mac_address' => 'Näita sellel mudelil MAC aadressi välja', 'view_deleted' => 'Näita kustutatud', 'view_models' => 'Vaata mudeleid', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Ei ole lisavälju', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/et/admin/models/message.php b/resources/lang/et/admin/models/message.php index ae95c2c9e9..63a95e1cec 100644 --- a/resources/lang/et/admin/models/message.php +++ b/resources/lang/et/admin/models/message.php @@ -1,42 +1,41 @@ 'Mudelit pole olemas.', 'assoc_users' => 'See mudel on seostus ühe või mitme vahendiga ja seda ei saa kustutada. Palun kustuta vahendid ja seejärel proovi uuesti kustutada. ', - - 'create' => array( + 'create' => [ 'error' => 'Mudelit ei loodud, proovi uuesti.', 'success' => 'Mudeli loomine õnnestus.', 'duplicate_set' => 'Sellise nime, tootja ja mudeli numbriga mudel on juba olemas.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Mudelit ei uuendatud, proovige uuesti', - 'success' => 'Mudeli uuendamine õnnestus.' - ), + 'success' => 'Mudeli uuendamine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle mudeli kustutada?', 'error' => 'Mudeli kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Mudeli kustutamine õnnestus.' - ), + 'success' => 'Mudeli kustutamine õnnestus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Mudeli taastamine ei õnnestunud, proovi uuesti', - 'success' => 'Mudeli taastamine õnnestus.' - ), + 'success' => 'Mudeli taastamine õnnestus.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Pole ühtegi välju muudetud, mistõttu ei uuendatud midagi.', - 'success' => 'Mudelid on uuendatud.' - ), + 'success' => 'Mudelid on uuendatud.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Mudeleid ei valitud, nii et midagi ei kustutatud.', 'success' => ':success_count mudel(it) kustutatud!', - 'success_partial' => ':success_count mudel(it) kustutati, kuid :fail_count ei õnnestunud kustutada kuna nendega on ikka veel vara seotud.' - ), + 'success_partial' => ':success_count mudel(it) kustutati, kuid :fail_count ei õnnestunud kustutada kuna nendega on ikka veel vara seotud.', + ], -); +]; diff --git a/resources/lang/et/admin/models/table.php b/resources/lang/et/admin/models/table.php index 949b9d2f14..9536c9e050 100644 --- a/resources/lang/et/admin/models/table.php +++ b/resources/lang/et/admin/models/table.php @@ -1,6 +1,6 @@ 'Uus mudel', 'created_at' => 'Loodud', @@ -14,4 +14,4 @@ return array( 'update' => 'Uuenda mudelit', 'clone' => 'Klooni mudel', 'edit' => 'Muuda mudelit', -); +]; diff --git a/resources/lang/et/admin/reports/general.php b/resources/lang/et/admin/reports/general.php index 3837e95181..c1f86b793f 100644 --- a/resources/lang/et/admin/reports/general.php +++ b/resources/lang/et/admin/reports/general.php @@ -1,5 +1,5 @@ 'Valige oma varade aruandele vajalikud valikud.' -); +return [ + 'info' => 'Valige oma varade aruandele vajalikud valikud.', +]; diff --git a/resources/lang/et/admin/reports/message.php b/resources/lang/et/admin/reports/message.php index 2b38dab4f1..dcddb03492 100644 --- a/resources/lang/et/admin/reports/message.php +++ b/resources/lang/et/admin/reports/message.php @@ -1,5 +1,5 @@ 'Peate valima vähemalt ühe variandi.' -); +return [ + 'error' => 'Peate valima vähemalt ühe variandi.', +]; diff --git a/resources/lang/et/admin/settings/general.php b/resources/lang/et/admin/settings/general.php index 924c9e2646..3eeaa46fd6 100644 --- a/resources/lang/et/admin/settings/general.php +++ b/resources/lang/et/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domeen', 'ad_domain_help' => 'See on mõnikord sama kui teie e-posti domeen, kuid mitte alati.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC e-mail', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'See on Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Aegumatu häiretaseme künnis (päevades)', 'alert_inv_threshold' => 'Inventari hoiatuslävi', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Varade ID-d', 'audit_interval' => 'Auditi intervall', 'audit_interval_help' => 'Kui teil on kohustus kontrollida oma vara füüsiliselt, sisestage intervall kuude kaupa.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Sisestage kahe faktori kood', 'two_factor_config_complete' => 'Esita koodeks', 'two_factor_enabled_edit_not_allowed' => 'Teie administraator ei luba seda sätet muuta.', - 'two_factor_enrollment_text' => "Vaja on kahte tegurit, kuid teie seadet ei ole veel registreeritud. Avage oma Google Authenticatori rakendus ja skannige oma seadme registreerimiseks allolevat QR-koodi. Kui olete oma seadme sisestanud, sisestage allolev kood", + 'two_factor_enrollment_text' => 'Vaja on kahte tegurit, kuid teie seadet ei ole veel registreeritud. Avage oma Google Authenticatori rakendus ja skannige oma seadme registreerimiseks allolevat QR-koodi. Kui olete oma seadme sisestanud, sisestage allolev kood', 'require_accept_signature' => 'Nõuda allkirja', 'require_accept_signature_help_text' => 'Selle funktsiooni lubamine nõuab, et kasutajad võtaksid vara füüsiliselt alla.', 'left' => 'lahkus', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Varasiltide, sealhulgas zerofilli pikkus', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/et/admin/settings/message.php b/resources/lang/et/admin/settings/message.php index 9a0e3c4843..945f94927e 100644 --- a/resources/lang/et/admin/settings/message.php +++ b/resources/lang/et/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Uuendamise ajal on ilmnenud viga.', - 'success' => 'Seaded uuendati edukalt.' - ), - 'backup' => array( + 'success' => 'Seaded uuendati edukalt.', + ], + 'backup' => [ 'delete_confirm' => 'Kas olete kindel, et soovite varundamisfaili kustutada? Seda toimingut ei saa tagasi võtta.', 'file_deleted' => 'Varundusfail kustutati edukalt.', 'generated' => 'Uus varundamisfail loodi edukalt.', 'file_not_found' => 'Seda varundamisfaili ei leitud serverist.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Puhastamise ajal on tekkinud viga.', 'validation_failed' => 'Teie puhta kinnitus on vale. Palun sisestage kinnituskastes sõna "DELETE".', - 'success' => 'Kustutatud andmed on edukalt puhastatud.' - ), + 'success' => 'Kustutatud andmed on edukalt puhastatud.', + ], -); +]; diff --git a/resources/lang/et/admin/statuslabels/message.php b/resources/lang/et/admin/statuslabels/message.php index f46c5421e5..f28b697cf5 100644 --- a/resources/lang/et/admin/statuslabels/message.php +++ b/resources/lang/et/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Olekumärki pole olemas.', 'assoc_assets' => 'See olekuala märgis on praegu seotud vähemalt ühe varaga ja seda ei saa kustutada. Palun uuendage oma vara, et seda olekut enam mitte näidata, ja proovige uuesti.', - - 'create' => array( + 'create' => [ 'error' => 'Olekumärki ei loodud, proovige uuesti.', - 'success' => 'Olekuriba loodud edukalt.' - ), + 'success' => 'Olekuriba loodud edukalt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Oleku märgist ei värskendatud, proovige uuesti', - 'success' => 'Oleku märgis uuendati edukalt.' - ), + 'success' => 'Oleku märgis uuendati edukalt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas olete kindel, et soovite selle oleku märgendi kustutada?', 'error' => 'Staatuse märgi kustutamisel tekkis probleem. Palun proovi uuesti.', - 'success' => 'Staatuse märgis kustutati edukalt.' - ), + 'success' => 'Staatuse märgis kustutati edukalt.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Neid varasid ei saa kellelegi anda.', 'deployable' => 'Neid varasid saab kontrollida. Kui need on määratud, eeldatakse, et nad on meta-olekuga kasutatud.', 'archived' => 'Neid varasid ei saa kontrollida ja need kuvatakse ainult arhiivitud vaates. See on kasulik, kui säilitada teavet varade kohta eelarve koostamiseks / ajalooliste eesmärkide saavutamiseks, kuid hoida neid igapäevase varade loendist välja.', 'pending' => 'Neid varasid ei saa veel kellelegi määrata, neid kasutatakse sageli esemete puhul, mis remonti vajavad, kuid eeldatavalt ringlusse.', - ), + ], -); +]; diff --git a/resources/lang/et/admin/statuslabels/table.php b/resources/lang/et/admin/statuslabels/table.php index a4c1d6eda4..d504af2d92 100644 --- a/resources/lang/et/admin/statuslabels/table.php +++ b/resources/lang/et/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Staatuse siltidest', 'archived' => 'Arhiveeritud', 'create' => 'Uus staatuse silt', @@ -16,4 +16,4 @@ return array( 'title' => 'Staatuse sildid', 'undeployable' => 'Unustamatu', 'update' => 'Uuenda staatuse silti', -); +]; diff --git a/resources/lang/et/admin/suppliers/message.php b/resources/lang/et/admin/suppliers/message.php index db1a9997ec..b286f2a46c 100644 --- a/resources/lang/et/admin/suppliers/message.php +++ b/resources/lang/et/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Tarnijat ei eksisteeri.', - - 'create' => array( + 'create' => [ 'error' => 'Tarnijat ei loodud, palun proovi uuesti.', - 'success' => 'Tarnija loomine õnnestus.' - ), + 'success' => 'Tarnija loomine õnnestus.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tarnijat ei uuendatud, palun proovi uuesti', - 'success' => 'Tarnija uuendamine õnnestus.' - ), + 'success' => 'Tarnija uuendamine õnnestus.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kas oled kindel, et soovid selle tarnija kustutada?', 'error' => 'Tarnija kustutamisel tekkis probleem. Palun proovi uuesti.', 'success' => 'Tarnija kustutamine õnnestus.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/et/admin/suppliers/table.php b/resources/lang/et/admin/suppliers/table.php index 4e517b55ee..ce76963bd9 100644 --- a/resources/lang/et/admin/suppliers/table.php +++ b/resources/lang/et/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Tarnijatest', 'about_suppliers_text' => 'Tarnijaid kasutatakse selleks, et jälgida asjade hankimise allikaid', 'address' => 'Tarnija aadress', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Vaata vahendeid', 'zip' => 'Postiindeks', -); +]; diff --git a/resources/lang/et/admin/users/general.php b/resources/lang/et/admin/users/general.php index f49e4ee797..b4f22b99c1 100644 --- a/resources/lang/et/admin/users/general.php +++ b/resources/lang/et/admin/users/general.php @@ -1,7 +1,6 @@ 'kasutaja saab sisse logida', 'activated_disabled_help_text' => 'Te ei saa iseenda konto aktiveerimis staatust muuta.', 'assets_user' => 'Kasutajaga :nimi seotud vahendid', @@ -13,7 +12,7 @@ return array( 'edit' => 'Muuda kasutajat', 'filetype_info' => 'Lubatud failitüübid on png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, ja rar.', 'history_user' => 'Kasutaja :name ajalugu', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Nende taastamiseks klõpsake siin.', 'last_login' => 'Viimane sisselogimine', 'ldap_config_text' => 'LDAP-i konfiguratsiooniseadeid saab leida Admin> Seaded. (Valikuline) valitud asukoht määratakse kõigi imporditud kasutajate jaoks.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Sinu praegused admin seaded lubavad kahe-astmelist autantimis jõustada valikulselt. ', 'two_factor_enrolled' => '2FA-seade on registreeritud', 'two_factor_active' => '2FA aktiivne ', - ); + ]; diff --git a/resources/lang/et/admin/users/message.php b/resources/lang/et/admin/users/message.php index 22427c1df9..2a773495e8 100644 --- a/resources/lang/et/admin/users/message.php +++ b/resources/lang/et/admin/users/message.php @@ -1,6 +1,6 @@ 'Oled selle vahendi edukalt vastu võtnud.', 'declined' => 'Oled selle vahendi tagasi lükanud.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP-i integreerimine pole selle installi jaoks konfigureeritud.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Kasutaja loomine õnnestus.', 'update' => 'Kasutaja uuendamine õnnestus.', 'update_bulk' => 'Kasutajate uuendamine õnnestus!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Kasutaja oli ebaõnnestunud.', 'restored' => 'Kasutaja taastamine õnnestus.', 'import' => 'Kasutajate importimine õnnestus.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Kasutaja loomisel tekkis probleem. Palun proovi uuesti.', 'update' => 'Kasutaja uuendamisel tekkis probleem. Palun proovi uuesti.', 'delete' => 'Kasutaja kustutamisel tekkis probleem. Palun proovi uuesti.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAP-serverit ei õnnestunud otsida. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis.
Viga LDAP serverist:', 'ldap_could_not_get_entries' => 'LDAP-serverisse tehtud sissekandeid ei saanud. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis.
Viga LDAP serverist:', 'password_ldap' => 'Selle konto parooli haldab LDAP / Active Directory. Parooli muutmiseks võtke ühendust oma IT-osakonnaga.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Faili ei kustustatud. Palun proovi uuesti.', 'success' => 'Fail kustutati.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fail(e) ei laetud üles. Palun proovi uuesti.', 'success' => 'Fail(id) laeti edukalt üles.', 'nofiles' => 'Sa ei valinud üles laadimiseks ühtegi faili', 'invalidfiles' => 'Üks või mitu sibu failidest on kas liigas uured või ei ole lubatud tüüpi. Lobatud tüübid on png, gif, jpg, doc, docx, pdf, ja txt.', - ), + ], -); +]; diff --git a/resources/lang/et/admin/users/table.php b/resources/lang/et/admin/users/table.php index 7cd3f0a5db..2bc964c467 100644 --- a/resources/lang/et/admin/users/table.php +++ b/resources/lang/et/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktiivne', 'allow' => 'Luba', 'checkedout' => 'Vahendid', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Näita praegusi kasutajaid', 'show_deleted' => 'Näita kustutatud kasutajaid', 'title' => 'Pealkiri', - 'to_restore_them' => 'neid taastada.', + 'to_restore_them' => 'neid taastada.', 'updateuser' => 'Uuenda kasutajat', 'username' => 'Kasutajanimi', - 'user_deleted_text' => 'See kasutaja on märgitud kustutatuks.', + 'user_deleted_text' => 'See kasutaja on märgitud kustutatuks.', 'username_note' => '(Seda kasutatakse ainult Active Directory sidumisel, mitte sisselogimiseks.)', 'cloneuser' => 'Klooni kasutaja', 'viewusers' => 'Vaata kasutajaid', -); +]; diff --git a/resources/lang/et/auth/general.php b/resources/lang/et/auth/general.php index 63bb1052c9..d04ee11587 100644 --- a/resources/lang/et/auth/general.php +++ b/resources/lang/et/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/et/auth/message.php b/resources/lang/et/auth/message.php index 13b42f352a..8272525cb6 100644 --- a/resources/lang/et/auth/message.php +++ b/resources/lang/et/auth/message.php @@ -1,6 +1,6 @@ 'Selle e-posti aadress on juba olemas.', 'account_not_found' => 'Kasutajanimi või parool on vale.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'See kasutajakonto on keelatud.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Kui proovisite sisse logida, ilmnes probleem, proovige uuesti.', 'success' => 'Sa oled edukalt sisse loginud.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Konto loomise proovimisel tekkis probleem, proovige uuesti.', 'success' => 'Konto edukalt loodud.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Uuesti parooli koodi proovimisel proovige uuesti proovida.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Parooli lähtestamise ajal ilmnes probleem, proovige uuesti.', 'success' => 'Teie parool on edukalt lähtestatud.', - ), + ], - -); +]; diff --git a/resources/lang/et/button.php b/resources/lang/et/button.php index 9feedb82de..f641b28cdd 100644 --- a/resources/lang/et/button.php +++ b/resources/lang/et/button.php @@ -1,6 +1,6 @@ 'Tegevused', 'add' => 'Lisa uus', 'cancel' => 'Loobu', @@ -11,7 +11,7 @@ return array( 'request' => 'Päring', 'submit' => 'Kinnita', 'upload' => 'Lae üles', - 'select_file' => 'Vali fail...', + 'select_file' => 'Vali fail...', 'select_files' => 'Vali failid...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php index f5dea1a957..17e1897b0d 100644 --- a/resources/lang/et/general.php +++ b/resources/lang/et/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Taotlused', 'city' => 'Linn', - 'click_here' => 'Kliki siia', + 'click_here' => 'Kliki siia', 'clear_selection' => 'Ära vali midagi', 'companies' => 'Ettevõtted', 'company' => 'Ettevõte', 'component' => 'Komponent', 'components' => 'Komponendid', - 'complete' => 'Tehtud', + 'complete' => 'Tehtud', 'consumable' => 'Kulutatav', 'consumables' => 'Kulumaterjalid', 'country' => 'Riik', diff --git a/resources/lang/et/help.php b/resources/lang/et/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/et/help.php +++ b/resources/lang/et/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/et/mail.php b/resources/lang/et/mail.php index 527ce6f8c0..6c18ab9d7b 100644 --- a/resources/lang/et/mail.php +++ b/resources/lang/et/mail.php @@ -1,6 +1,6 @@ 'Kasutaja on veebisaidil tühistanud üksuse taotluse', 'a_user_requested' => 'Kasutaja on taotlenud üksuse veebisaidil', 'accessory_name' => 'Lisaseade Nimi:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/et/pagination.php b/resources/lang/et/pagination.php index b650121e07..8b1c0ad626 100644 --- a/resources/lang/et/pagination.php +++ b/resources/lang/et/pagination.php @@ -1,6 +1,6 @@ 'Järgmine »', -); +]; diff --git a/resources/lang/et/passwords.php b/resources/lang/et/passwords.php index e3739fb63c..e46d6f49a4 100644 --- a/resources/lang/et/passwords.php +++ b/resources/lang/et/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Sinu paroolilink on saadetud!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/et/reminders.php b/resources/lang/et/reminders.php index 0b5a4802c4..01e9fb7433 100644 --- a/resources/lang/et/reminders.php +++ b/resources/lang/et/reminders.php @@ -1,6 +1,6 @@ "Parool peab olema kuus tähemärki ja peab klappima kinnitusega.", + 'password' => 'Parool peab olema kuus tähemärki ja peab klappima kinnitusega.', - "user" => "Kasutajanimi või parool on vale", + 'user' => 'Kasutajanimi või parool on vale', - "token" => "See parooli taastamise kood on vale.", + 'token' => 'See parooli taastamise kood on vale.', - "sent" => "Kui me leidsime klappiva e-maili aadressi, siis saatsime sellele parooli meeldetuletuse!", + 'sent' => 'Kui me leidsime klappiva e-maili aadressi, siis saatsime sellele parooli meeldetuletuse!', -); +]; diff --git a/resources/lang/et/table.php b/resources/lang/et/table.php index 8618018389..559dd10575 100644 --- a/resources/lang/et/table.php +++ b/resources/lang/et/table.php @@ -1,10 +1,10 @@ 'Tegevused', 'action' => 'Tegevus', 'by' => 'Kes', 'item' => 'Kirje', -); +]; diff --git a/resources/lang/et/validation.php b/resources/lang/et/validation.php index db1e4a306b..f4981894cf 100644 --- a/resources/lang/et/validation.php +++ b/resources/lang/et/validation.php @@ -1,6 +1,6 @@ 'Atribuut: on juba võetud.', 'uploaded' => 'Atribuut ei õnnestunud üles laadida.', 'url' => 'Atribuudivorming on vale.', - "unique_undeleted" => ":attribute peab olema ainulaadne.", + 'unique_undeleted' => ':attribute peab olema ainulaadne.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Atribuudi väli sisaldab märk, mis pole lubatud.", - "email_array" => "Üks või mitu e-posti aadressi on kehtetu.", - "hashed_pass" => "Teie praegune parool on vale", + 'alpha_space' => 'Atribuudi väli sisaldab märk, mis pole lubatud.', + 'email_array' => 'Üks või mitu e-posti aadressi on kehtetu.', + 'hashed_pass' => 'Teie praegune parool on vale', 'dumbpwd' => 'See parool on liiga levinud.', - "statuslabel_type" => "Peate valima kehtiva olekutüübi tüübi", + 'statuslabel_type' => 'Peate valima kehtiva olekutüübi tüübi', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/fa/admin/accessories/general.php b/resources/lang/fa/admin/accessories/general.php index f03dcfe35b..9f8c3d3a97 100644 --- a/resources/lang/fa/admin/accessories/general.php +++ b/resources/lang/fa/admin/accessories/general.php @@ -1,6 +1,6 @@ 'دسته بندی لوازم جانبی', 'accessory_name' => 'نام وسیله', 'checkout' => 'چک کردن وسیله', @@ -19,4 +19,4 @@ return array( 'use_default_eula_disabled' => 'از پیشفرض اولیه EULA استفاده کنید.هیچ پیشفرضی اولیه ای تنظیم نشده است در تنظیمات اضافه کنید', -); +]; diff --git a/resources/lang/fa/admin/accessories/message.php b/resources/lang/fa/admin/accessories/message.php index 29adb4f39f..e62b5df4bc 100644 --- a/resources/lang/fa/admin/accessories/message.php +++ b/resources/lang/fa/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'این وسیله هم اکنون:آیتم های چک شده به کاربران را حساب کنید.لطفا در لوازم جانبی چک کنید و دوباره امتحان کنید', - 'create' => array( + 'create' => [ 'error' => 'وسیله ایجاد نشد.لطفا دوباره امتحان کنید.', - 'success' => 'وسیله با موفقیت ایجاد شد' - ), + 'success' => 'وسیله با موفقیت ایجاد شد', + ], - 'update' => array( + 'update' => [ 'error' => 'وسیله به روزرسانی نشد لطفا دوباره امتحان کنید', - 'success' => 'وسیله با موفقیت به روزرسانی شد.' - ), + 'success' => 'وسیله با موفقیت به روزرسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمئن هستید می خواهید این وسیله حذف شود?', 'error' => 'اشکال در حذف دسته بندی.لطفا دوباره امتحان کنید.', - 'success' => 'دسته بندی با موفقیت حذف شد.' - ), + 'success' => 'دسته بندی با موفقیت حذف شد.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'وسیله چک نشده بود. لطفا دوباره امتحان کنید', 'success' => 'وسیله با موفقیت چک شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است. لطفا دوباره امتحان کنید.' - ), + 'user_does_not_exist' => 'کاربر نامعتبر است. لطفا دوباره امتحان کنید.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'وسیله چک نشده.لطفا دوباره امتحان کنید', 'success' => 'وسیله با موفقیت چک شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' - ) + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + ], - -); +]; diff --git a/resources/lang/fa/admin/accessories/table.php b/resources/lang/fa/admin/accessories/table.php index 7a668abed3..6da7ec167c 100644 --- a/resources/lang/fa/admin/accessories/table.php +++ b/resources/lang/fa/admin/accessories/table.php @@ -1,11 +1,10 @@ 'دانلود CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'دانلود CSV', + 'eula_text' => 'EULA', 'id' => 'شناسه', 'require_acceptance' => 'پذیرش', 'title' => 'نام وسیله', - -); +]; diff --git a/resources/lang/fa/admin/asset_maintenances/form.php b/resources/lang/fa/admin/asset_maintenances/form.php index 5bdd36be86..d90091f557 100644 --- a/resources/lang/fa/admin/asset_maintenances/form.php +++ b/resources/lang/fa/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'روزها', 'notes' => 'یادداشت ها', 'update' => 'بروزرسانی', - 'create' => 'ایجاد' + 'create' => 'ایجاد', ]; diff --git a/resources/lang/fa/admin/asset_maintenances/message.php b/resources/lang/fa/admin/asset_maintenances/message.php index 3bd1fed08a..ebef5994e4 100644 --- a/resources/lang/fa/admin/asset_maintenances/message.php +++ b/resources/lang/fa/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'آیا مطمئن هستید می خواهید این وسیله حذف شود؟', 'error' => 'اشکال در حذف نگهداشت دارایی.لطفا دوباره امتحان کنید.', - 'success' => 'نگهدارنده دارایی با موفقیت حذف شد.' + 'success' => 'نگهدارنده دارایی با موفقیت حذف شد.', ], 'create' => [ 'error' => 'نگهداشت دارایی ایجاد نشد.لطفا دوباره امتحان کنید', - 'success' => 'نگهدارنده دارایی با موفقیت ایجاد شد.' + 'success' => 'نگهدارنده دارایی با موفقیت ایجاد شد.', ], 'edit' => [ 'error' => 'تعمیر و نگهداری دارایی ویرایش نشد، لطفا دوباره امتحان کنید', - 'success' => 'تعمیر و نگهداری دارایی با موفقیت ویرایش شد' + 'success' => 'تعمیر و نگهداری دارایی با موفقیت ویرایش شد', ], 'asset_maintenance_incomplete' => 'هنوز تکمیل نشده', 'warranty' => 'ضمانت', 'not_warranty' => 'بدون ضمانت', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/fa/admin/asset_maintenances/table.php b/resources/lang/fa/admin/asset_maintenances/table.php index 87c598dd69..f8d7b81c7b 100644 --- a/resources/lang/fa/admin/asset_maintenances/table.php +++ b/resources/lang/fa/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'نگهداشت دارایی', 'asset_name' => 'نام دارایی', 'is_warranty' => 'ضمانت', - 'dl_csv' => 'دانلود CSV' + 'dl_csv' => 'دانلود CSV', ]; diff --git a/resources/lang/fa/admin/categories/general.php b/resources/lang/fa/admin/categories/general.php index b5e4cf4c44..93f06d6433 100644 --- a/resources/lang/fa/admin/categories/general.php +++ b/resources/lang/fa/admin/categories/general.php @@ -1,6 +1,6 @@ 'دسته بندی های دارایی', 'category_name' => 'نام دسته بندی', 'checkin_email' => 'ارسال ایمیل به کاربر در تحویل و استرداد.', @@ -21,4 +21,4 @@ return array( 'use_default_eula_disabled' => 'از پیشفرض اولیه EULA استفاده کنید.هیچ پیشفرضی اولیه ای تنظیم نشده است در تنظیمات اضافه کنید.', -); +]; diff --git a/resources/lang/fa/admin/categories/message.php b/resources/lang/fa/admin/categories/message.php index 212853273d..8ebf861e84 100644 --- a/resources/lang/fa/admin/categories/message.php +++ b/resources/lang/fa/admin/categories/message.php @@ -1,25 +1,25 @@ 'دسته بندی موجود نیست.', 'assoc_models' => 'این گروه در حال حاضر همراه با حداقل یک مدل است و قادر به حذف نمی شود. لطفا بروز مدل های خود را به دیگر مرجع این رده و دوباره امتحان کنید. ', 'assoc_items' => 'این گروه در حال حاضر همراه با حداقل یکی است: asset_type و قادر به حذف نمی شود. لطفا به روز رسانی خود را: asset_type دیگر این گروه مرجع و دوباره امتحان کنید. ', - 'create' => array( + 'create' => [ 'error' => 'دسته ایجاد نشد ،دوباره امتحان کنید.', - 'success' => 'دسته با موفقیت ایجاد شد.' - ), + 'success' => 'دسته با موفقیت ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'دسته بندی به روزرسانی نشد.لطفا دوباره تلاش کنید.', - 'success' => 'دسته بندی با موفقیت به روزرسانی شد.' - ), + 'success' => 'دسته بندی با موفقیت به روزرسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا از حذف این دسته بندی اطمینان دارید؟', 'error' => 'اشکال در حذف دسته بندی.لطفا دوباره تلاش کنید.', - 'success' => 'دسته بندی با موفقیت حذف شد.' - ) + 'success' => 'دسته بندی با موفقیت حذف شد.', + ], -); +]; diff --git a/resources/lang/fa/admin/categories/table.php b/resources/lang/fa/admin/categories/table.php index 1245f641dc..c537140024 100644 --- a/resources/lang/fa/admin/categories/table.php +++ b/resources/lang/fa/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'شناسه', 'parent' => 'مجموعه پدر', 'require_acceptance' => 'پذیرش', 'title' => 'نام دسته دارایی', -); +]; diff --git a/resources/lang/fa/admin/companies/general.php b/resources/lang/fa/admin/companies/general.php index 6e16c7181c..16ff7f3e08 100644 --- a/resources/lang/fa/admin/companies/general.php +++ b/resources/lang/fa/admin/companies/general.php @@ -1,4 +1,5 @@ 'انتخاب شرکت', ]; diff --git a/resources/lang/fa/admin/companies/message.php b/resources/lang/fa/admin/companies/message.php index 8742a64ed4..cdd95976e7 100644 --- a/resources/lang/fa/admin/companies/message.php +++ b/resources/lang/fa/admin/companies/message.php @@ -1,18 +1,19 @@ 'شرکت وجود ندارد.', 'assoc_users' => 'این دسته بندی هم اکنون حداقل با یک مدل شریک است و نمیتوان حذف کرد.لطفا مدل های خود را به روزرسانی کنید تا این دسته بندی را ارجاع ندهند و دوباره امتحان کنید. ', - 'create' => array( + 'create' => [ 'error' => 'شرکت ایجاد نشد،دوباره سعی کنید.', - 'success' => 'شرکت ایجاد شد.' - ), - 'update' => array( + 'success' => 'شرکت ایجاد شد.', + ], + 'update' => [ 'error' => 'شرکت ایجاد نشد،دوباره سعی کنید', - 'success' => 'شرکت آپدیت شد.' - ), - 'delete' => array( + 'success' => 'شرکت آپدیت شد.', + ], + 'delete' => [ 'confirm' => 'آیا مطمعن هستید میخواهید این شرکت را پاک کنید؟', 'error' => 'موضوع شرکت حذف شد. لطفا دوباره سعی کنید.', - 'success' => 'این شرکت پاک شد.' - ) -); + 'success' => 'این شرکت پاک شد.', + ], +]; diff --git a/resources/lang/fa/admin/companies/table.php b/resources/lang/fa/admin/companies/table.php index 8aa082e0a7..d807a5c082 100644 --- a/resources/lang/fa/admin/companies/table.php +++ b/resources/lang/fa/admin/companies/table.php @@ -1,9 +1,10 @@ 'شرکت ها', 'create' => 'ایجاد شرکت', 'title' => 'شرکت', 'update' => 'بروزرسانی شرکت', 'name' => 'نام شرکت', 'id' => 'شناسه', -); +]; diff --git a/resources/lang/fa/admin/components/general.php b/resources/lang/fa/admin/components/general.php index ccb278cf62..915affd681 100644 --- a/resources/lang/fa/admin/components/general.php +++ b/resources/lang/fa/admin/components/general.php @@ -1,6 +1,6 @@ 'نام اجزا', 'checkin' => 'کامپوننت قفل های دسترسی', 'checkout' => 'کامپیوننت پرداخت', @@ -12,4 +12,4 @@ return array( 'remaining' => 'یاقیمانده', 'total' => 'مجموع', 'update' => 'بروزرسانی کامپیوننت', -); +]; diff --git a/resources/lang/fa/admin/components/message.php b/resources/lang/fa/admin/components/message.php index 2b1763119a..5bed1c076c 100644 --- a/resources/lang/fa/admin/components/message.php +++ b/resources/lang/fa/admin/components/message.php @@ -1,36 +1,35 @@ 'جزء وجود ندارد.', - 'create' => array( + 'create' => [ 'error' => 'شرکت ایجاد نشد،دوباره سعی کنید.', - 'success' => 'کامپیوننت ایجاد شد.' - ), + 'success' => 'کامپیوننت ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'کامپیوننت ایجاد نشد،دوباره سعی کنید', - 'success' => 'کامپیوننت ایجاد شد.' - ), + 'success' => 'کامپیوننت ایجاد شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمعن هستید میخواهید این کامپیوننت را پاک کنید؟?', 'error' => 'موضوع کامپوننت حذف شد. لطفا دوباره سعی کنید.', - 'success' => 'کامپیوننت حذف شد.' - ), + 'success' => 'کامپیوننت حذف شد.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'کامپیوننت پرداخت نشد ، دوباره سعی کنید.', 'success' => 'کامپیوننت پرداخت شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' - ), + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'کامپیوننت بررسی نشد ، دوباره سعی کنید', 'success' => 'کامپیوننت بررسی شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' - ) + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + ], - -); +]; diff --git a/resources/lang/fa/admin/components/table.php b/resources/lang/fa/admin/components/table.php index a75a64f4fc..0b6fb27ac3 100644 --- a/resources/lang/fa/admin/components/table.php +++ b/resources/lang/fa/admin/components/table.php @@ -1,5 +1,5 @@ 'نام کامپیوننت', -); +]; diff --git a/resources/lang/fa/admin/consumables/general.php b/resources/lang/fa/admin/consumables/general.php index c7e25f26b1..c7da1cdd58 100644 --- a/resources/lang/fa/admin/consumables/general.php +++ b/resources/lang/fa/admin/consumables/general.php @@ -1,6 +1,6 @@ 'پرداخت هزینه قابل مصرف به کاربر', 'consumable_name' => 'نام های مصرفی', 'create' => 'ایجاد مواد مصرفی', @@ -8,4 +8,4 @@ return array( 'remaining' => 'یاقیمانده', 'total' => 'مجموع', 'update' => 'به روز رسانی لوازم مصرفي', -); +]; diff --git a/resources/lang/fa/admin/consumables/message.php b/resources/lang/fa/admin/consumables/message.php index d7e2d482ef..18f9d0c6d7 100644 --- a/resources/lang/fa/admin/consumables/message.php +++ b/resources/lang/fa/admin/consumables/message.php @@ -1,36 +1,35 @@ 'مواد مصرفی یافت نشد.', - 'create' => array( + 'create' => [ 'error' => 'لوازم مصرفي ایجاد نشد, لطفا دوباره سعی کنید.', - 'success' => 'مواد مصرفی ایجاد شد.' - ), + 'success' => 'مواد مصرفی ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'لوازم مصرفي بروز رسانی نشد, لطفا دوباره سعی کنید', - 'success' => 'لوازم مصرفي با موفقیت به روز رسانی شد.' - ), + 'success' => 'لوازم مصرفي با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمعنید که می خواهید این ماده مصرفی را حذف کنید؟', 'error' => 'یک مشکل در حذف کردن ماده مصرفی وجود دارد،دوباره سعی کنید.', - 'success' => 'مواد مصرفی حذف شد.' - ), + 'success' => 'مواد مصرفی حذف شد.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'مواد مصرفی بررسی نشد ، دوباره سعی کنید.', 'success' => 'مواد مصرفی بررسی شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' - ), + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'مواد مصرفی بررسی نشد ، دوباره سعی کنید', 'success' => 'مواد مصرفی بررسی شد.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' - ) + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + ], - -); +]; diff --git a/resources/lang/fa/admin/consumables/table.php b/resources/lang/fa/admin/consumables/table.php index 7843a11335..58ed7d0f0a 100644 --- a/resources/lang/fa/admin/consumables/table.php +++ b/resources/lang/fa/admin/consumables/table.php @@ -1,5 +1,5 @@ 'نام های مصرفی', -); +]; diff --git a/resources/lang/fa/admin/custom_fields/general.php b/resources/lang/fa/admin/custom_fields/general.php index 894e9c9cf8..a67e004c3a 100644 --- a/resources/lang/fa/admin/custom_fields/general.php +++ b/resources/lang/fa/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'فیلدهای سفارشی', 'field' => 'فیلد', 'about_fieldsets_title' => 'درباره ی تنظیمات فیلد', @@ -29,4 +29,4 @@ return array( 'create_field' => 'فیلد سفارشی جدید', 'value_encrypted' => 'ارزش این فیلد در پایگاه داده رمزگذاری شده است. فقط کاربران مدیریت قادر به مشاهده مقدار رمزگشایی خواهند شد', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/fa/admin/custom_fields/message.php b/resources/lang/fa/admin/custom_fields/message.php index 043d4a4224..78c59f3468 100644 --- a/resources/lang/fa/admin/custom_fields/message.php +++ b/resources/lang/fa/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'این زمینه وجود ندارد.', 'already_added' => 'زمینه اضافه شده است', - 'create' => array( + 'create' => [ 'error' => 'فیلد ایجاد نشده است، لطفا دوباره تلاش کنید.', 'success' => 'فیلد با موفقیت ایجاد شد.', - 'assoc_success' => 'فیلد با موفقیت به تنظیمات فیلد اضافه شد.' - ), + 'assoc_success' => 'فیلد با موفقیت به تنظیمات فیلد اضافه شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'فیلد به روز رسانی نشده است، لطفا دوباره تلاش کنید', - 'success' => 'فیلد با موفقیت به روز رسانی شد.' - ), + 'success' => 'فیلد با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این فیلد را حذف کنید؟', 'error' => 'در حذف کردن این فیلد مشکلی وجود داشت. لطفا دوباره تلاش کنید.', 'success' => 'فیلد با موفقیت حذف شد.', 'in_use' => 'فیلد همچنان در حال استفاده است.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset وجود ندارد', - 'create' => array( + 'create' => [ 'error' => 'تنظیمات فیلد ایجاد نشده است، لطفا دوباره تلاش کنید.', - 'success' => 'تنظیمات فیلد با موفقیت ایجاد شد.' - ), + 'success' => 'تنظیمات فیلد با موفقیت ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'تنظیمات فیلد به روز رسانی نشده است، لطفا دوباره تلاش کنید', - 'success' => 'تنظیمات فیلد به موفقیت به روز رسانی شد.' - ), + 'success' => 'تنظیمات فیلد به موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این تنظیمات فیلد را حذف کنید؟', 'error' => 'در حذف کردن تنظیمات فیلد مشکلی وجود داشت. لطفا دوباره تلاش کنید.', 'success' => 'تنظیمات فیلد با موفقیت حذف شد.', 'in_use' => 'تنظیمات فیلد همچنان در حال استفاده است.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/fa/admin/departments/message.php b/resources/lang/fa/admin/departments/message.php index 9978e55c02..89af7aff9f 100644 --- a/resources/lang/fa/admin/departments/message.php +++ b/resources/lang/fa/admin/departments/message.php @@ -1,21 +1,21 @@ 'اداره وجود ندارد', 'assoc_users' => 'این بخش در حال حاضر حداقل با یک کاربر مرتبط است و نمی تواند حذف شود. لطفا کاربران خود را به دیگران مراجعه کنید و دوباره امتحان کنید.', - 'create' => array( + 'create' => [ 'error' => 'وزارت ایجاد نشد، لطفا دوباره امتحان کنید', - 'success' => 'گروه با موفقیت ساخت' - ), - 'update' => array( + 'success' => 'گروه با موفقیت ساخت', + ], + 'update' => [ 'error' => 'وزارت به روز نشده است، لطفا دوباره امتحان کنید', - 'success' => 'بخش با موفقیت به روز شد' - ), - 'delete' => array( + 'success' => 'بخش با موفقیت به روز شد', + ], + 'delete' => [ 'confirm' => 'آیا مطمئن هستید که می خواهید این بخش را حذف کنید؟', 'error' => 'یک مسئله حذف بخش وجود داشت. لطفا دوباره تلاش کنید.', - 'success' => 'بخش با موفقیت حذف شد.' - ) + 'success' => 'بخش با موفقیت حذف شد.', + ], -); +]; diff --git a/resources/lang/fa/admin/departments/table.php b/resources/lang/fa/admin/departments/table.php index 0a117388e5..6213684858 100644 --- a/resources/lang/fa/admin/departments/table.php +++ b/resources/lang/fa/admin/departments/table.php @@ -1,6 +1,6 @@ 'شناسه', 'name' => 'اسم دپارتمان', @@ -8,4 +8,4 @@ return array( 'location' => 'محل', 'create' => 'ایجاد گروه', 'update' => 'به روز رسانی گروه', - ); + ]; diff --git a/resources/lang/fa/admin/depreciations/general.php b/resources/lang/fa/admin/depreciations/general.php index 56c390e709..f48f75a9c1 100644 --- a/resources/lang/fa/admin/depreciations/general.php +++ b/resources/lang/fa/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'درباره ی استهلاک دارایی', 'about_depreciations' => 'شما می توانید استهلاک دارایی را فعال کنید تا دارایی ها را بر اساس استهلاک خطی مستقیم، کم بهاء کنید.', 'asset_depreciations' => 'استهلاک دارایی', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'تعداد ماه ها', 'update' => 'کمبود به روزرسانی', -); +]; diff --git a/resources/lang/fa/admin/depreciations/message.php b/resources/lang/fa/admin/depreciations/message.php index c2b0ebe919..8a486c6df4 100644 --- a/resources/lang/fa/admin/depreciations/message.php +++ b/resources/lang/fa/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'دسته ی استهلاک وجود ندارد.', 'assoc_users' => 'این استهلاک در حال حاضر همراه با یک یا چند مدل دیگر است و نمی تواند حذف شود. لطفا یکی از مدل ها را حذف کنید و سپس برای حذف کردن دوباره تلاش کنید. ', - - 'create' => array( + 'create' => [ 'error' => 'دسته ی استهلاک ساخته نشده بود، لطفا دوباره تلاش کنید. :(', - 'success' => 'دسته ی استهلاک با موفقیت ساخته شد :)' - ), + 'success' => 'دسته ی استهلاک با موفقیت ساخته شد :)', + ], - 'update' => array( + 'update' => [ 'error' => 'دسته ی استهلاک به روز رسانی نشده بود، لطفا دوباره تلاش کنید', - 'success' => 'دسته ی استهلاک با موفقیت به روز رسانی شد.' - ), + 'success' => 'دسته ی استهلاک با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این دسته ی استهلاک را حذف کنید؟', 'error' => 'در حذف کردن دسته ی استهلاک مشکلی وجود داشت. لطفا دوباره تلاش کنید.', - 'success' => 'دسته ی استهلاک با موفقیت حذف شد.' - ) + 'success' => 'دسته ی استهلاک با موفقیت حذف شد.', + ], -); +]; diff --git a/resources/lang/fa/admin/depreciations/table.php b/resources/lang/fa/admin/depreciations/table.php index fb37d727cb..4a3ea568dc 100644 --- a/resources/lang/fa/admin/depreciations/table.php +++ b/resources/lang/fa/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'شناسه', 'months' => 'ماه ها', 'term' => 'مدت زمان', 'title' => 'نام ', -); +]; diff --git a/resources/lang/fa/admin/groups/message.php b/resources/lang/fa/admin/groups/message.php index 54bbc8a9d7..bfb100352d 100644 --- a/resources/lang/fa/admin/groups/message.php +++ b/resources/lang/fa/admin/groups/message.php @@ -1,22 +1,22 @@ 'گروه در حال حاضر وجود دارد!', 'group_not_found' => 'گروه [: شناسه] وجود ندارد.', 'group_name_required' => 'نام زمینه مورد نیاز است', - 'success' => array( + 'success' => [ 'create' => 'گروه با موفقیت ایجاد شد.', 'update' => 'گروه با موفقیت بروز شد.', 'delete' => 'گروه با موفقیت حذف شد.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمئن هستید که می خواهید این گروه را حذف کنید؟', 'create' => 'اشکال در ایجاد گروه.لطفا دوباره تلاش کنید.', 'update' => 'اشکال در به روزرسانی گروه .لطفا دوباره تلاش کنید.', 'delete' => 'اشکال در حذف گروه.لطفا دوباره تلاش کنید.', - ), + ], -); +]; diff --git a/resources/lang/fa/admin/groups/table.php b/resources/lang/fa/admin/groups/table.php index b8bd06a644..7dca16813e 100644 --- a/resources/lang/fa/admin/groups/table.php +++ b/resources/lang/fa/admin/groups/table.php @@ -1,9 +1,9 @@ 'شناسه', 'name' => 'نام', 'users' => '# از کاربران', -); +]; diff --git a/resources/lang/fa/admin/groups/titles.php b/resources/lang/fa/admin/groups/titles.php index 95931ccb9b..0b01cd5cb1 100644 --- a/resources/lang/fa/admin/groups/titles.php +++ b/resources/lang/fa/admin/groups/titles.php @@ -1,6 +1,6 @@ 'درباره گروه ها', 'about_groups' => 'گروه ها برای تعمیم مجوز کاربر استفاده می شوند.', 'group_management' => 'مدیریت گروه', @@ -11,4 +11,4 @@ return array( 'allow' => 'اجازه می دهد', 'deny' => 'رد کردن', -); +]; diff --git a/resources/lang/fa/admin/hardware/form.php b/resources/lang/fa/admin/hardware/form.php index 551162e599..fbc9f28c1e 100644 --- a/resources/lang/fa/admin/hardware/form.php +++ b/resources/lang/fa/admin/hardware/form.php @@ -1,12 +1,12 @@ 'تأیید دارایی های حذف فله', +return [ + 'bulk_delete' => 'تأیید دارایی های حذف فله', 'bulk_delete_help' => 'بررسی دارایی برای حذف فله زیر کلیک کنید. به محض حذف این دارایی ها را می توان ترمیم کرد، اما ان ها دیگر قابل دسترسی با یوزر های دیگر نیستند.', 'bulk_delete_warn' => 'شما در حال حذف: دارایی های تعداد دارایی.', - 'bulk_update' => 'به روز رسانی دارایی های فله', - 'bulk_update_help' => 'این فرم برای به روز رسانی دارایی های متعدد در یک بار را به شما اجازه می دهد. تنها قسمت ها نیاز به تغییر را پر کنید. هر زمینه های خالی سمت چپ بدون تغییر باقی می ماند. ', - 'bulk_update_warn' => 'شما در حال ادیت مشخصات : ', + 'bulk_update' => 'به روز رسانی دارایی های فله', + 'bulk_update_help' => 'این فرم برای به روز رسانی دارایی های متعدد در یک بار را به شما اجازه می دهد. تنها قسمت ها نیاز به تغییر را پر کنید. هر زمینه های خالی سمت چپ بدون تغییر باقی می ماند. ', + 'bulk_update_warn' => 'شما در حال ادیت مشخصات : ', 'checkedout_to' => 'تحویل شده به ', @@ -52,7 +52,6 @@ return array( 'update' => 'به روز رسانی دارایی ', 'warranty' => 'گارانتی', - 'warranty_expires' => 'انقضای ضمانت', + 'warranty_expires' => 'انقضای ضمانت', 'years' => 'سال ها', -) -; +]; diff --git a/resources/lang/fa/admin/hardware/general.php b/resources/lang/fa/admin/hardware/general.php index ccd54537c8..fe5750348e 100644 --- a/resources/lang/fa/admin/hardware/general.php +++ b/resources/lang/fa/admin/hardware/general.php @@ -1,9 +1,9 @@ 'درباره دارایی ها', 'about_assets_text' => 'دارایی ها مواردی هستند که توسط شماره سریال یا برچسب دارایی دنبال می شوند. آنها تمایل دارند که مقادیر ارزش بیشتری داشته باشند که در آن شناسایی یک مورد خاص موردنیاز باشد.', - 'archived' => 'بایگانی شد', + 'archived' => 'بایگانی شد', 'asset' => 'دارایی', 'bulk_checkout' => 'خروج دارایی ها', 'checkin' => 'دارایی checkin', @@ -20,4 +20,4 @@ return array( 'undeployable' => 'غیرقابل گسترش', 'view' => 'نمایش دارایی ها ', -); +]; diff --git a/resources/lang/fa/admin/hardware/message.php b/resources/lang/fa/admin/hardware/message.php index 3754e0baa7..fe6ca0e146 100644 --- a/resources/lang/fa/admin/hardware/message.php +++ b/resources/lang/fa/admin/hardware/message.php @@ -1,82 +1,80 @@ ' اخطار: این دارایی به برانگیز گزارش شده است که در حال حاضر undeployable. اگر این وضعیت تغییر کرده است، لطفا به روز رسانی وضعیت دارایی.', 'does_not_exist' => 'دارایی وجود ندارد.', 'does_not_exist_or_not_requestable' => 'دوباره تلاش کنید . این دارایی وجود ندارد.', 'assoc_users' => 'این دارایی در حال حاضر به یک کاربر چک کردن و پاک نمی شود. لطفا دارایی در اولین بار چک کنید، و سپس سعی کنید دوباره حذف کنید.', - 'create' => array( + 'create' => [ 'error' => 'دارایی ساخته نشده است، لطفا دوباره تلاش کنید.', - 'success' => 'دارایی موفقیت ایجاد شده است. :)' - ), + 'success' => 'دارایی موفقیت ایجاد شده است. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'دارایی به روز نیست، لطفا دوباره امتحان کنید', 'success' => 'دارایی ها با موفقیت به روز رسانی.', 'nothing_updated' => 'هیچ زمینه، انتخاب شدند تا هیچ چیز به روز شد.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'دارایی بازیابی نشد، لطفا دوباره تلاش کنید', - 'success' => 'دارایی با موفقیت بازیابی شد.' - ), + 'success' => 'دارایی با موفقیت بازیابی شد.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'ممیزی دارایی ناموفق بود. لطفا دوباره تلاش کنید.', - 'success' => 'حسابرسی املاک با موفقیت وارد شد' - ), + 'success' => 'حسابرسی املاک با موفقیت وارد شد', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'فایل حذف نمی شود. لطفا دوباره تلاش کنید.', 'success' => 'فایل با موفقیت حذف شده است.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'فایل) آپلود نیست. لطفا دوباره تلاش کنید.', 'success' => 'فایل (موفقیت آپلود شد.', 'nofiles' => 'شما هر فایل برای آپلود انتخاب کنید، و یا فایل شما در حال تلاش برای آپلود بیش از حد بزرگ است', 'invalidfiles' => 'یک یا بیشتر از فایل های خود را بیش از حد بزرگ است یا یک نوع فایل است که مجاز است. انواع فایل های مجاز عبارتند از PNG، GIF، JPG، DOC، DOCX، PDF، TXT و.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'بعضی از موارد به درستی وارد نشدند.', 'errorDetail' => 'موارد زیر به علت خطا وارد نشده است.', - 'success' => "فایل شما وارد شده است", - 'file_delete_success' => "فایل شما با موفقیت حذف شده است", - 'file_delete_error' => "فایل قابل حذف نشد", - ), + 'success' => 'فایل شما وارد شده است', + 'file_delete_success' => 'فایل شما با موفقیت حذف شده است', + 'file_delete_error' => 'فایل قابل حذف نشد', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این تنظیمات دارایی را حذف کنید؟', 'error' => 'اشکال در حذف دارایی.لطفا دوباره تلاش کنید.', 'nothing_updated' => 'هیچ دارایی انتخاب نشده بود، بنابراین هیچ چیز حذف نشد.', - 'success' => 'دارایی با موفقیت حذف شد.' - ), + 'success' => 'دارایی با موفقیت حذف شد.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید', 'success' => 'دارایی را بررسی کنید موفقیت.', 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', 'not_available' => 'این دارایی برای پرداخت در دسترس نیست!', - 'no_assets_selected' => 'شما حداقل باید یک دارایی از لیست انتخاب کنید' - ), + 'no_assets_selected' => 'شما حداقل باید یک دارایی از لیست انتخاب کنید', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید', 'success' => 'دارایی ها با موفقیت در بررسی.', 'user_does_not_exist' => 'آن کاربر نامعتبر است. لطفا دوباره سعی کنید.', 'already_checked_in' => 'دارایی ها که در حال حاضر انتخاب شده است.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'دارایی شد درخواست نمی کند، لطفا دوباره امتحان کنید', 'success' => 'دارایی موفقیت درخواست شده است.', - 'canceled' => 'درخواست پرداخت با موفقیت لغو شد' - ) + 'canceled' => 'درخواست پرداخت با موفقیت لغو شد', + ], -); +]; diff --git a/resources/lang/fa/admin/hardware/table.php b/resources/lang/fa/admin/hardware/table.php index 145f581abf..3d55cc9219 100644 --- a/resources/lang/fa/admin/hardware/table.php +++ b/resources/lang/fa/admin/hardware/table.php @@ -1,6 +1,6 @@ 'برچسب دارایی', 'asset_model' => 'مدل', @@ -21,6 +21,6 @@ return array( 'image' => 'دستگاه تصویر ', 'days_without_acceptance' => 'روز بدون پذیرش', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/fa/admin/kits/general.php b/resources/lang/fa/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/fa/admin/kits/general.php +++ b/resources/lang/fa/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/fa/admin/licenses/form.php b/resources/lang/fa/admin/licenses/form.php index 2b23cc5c52..44e8aa92b3 100644 --- a/resources/lang/fa/admin/licenses/form.php +++ b/resources/lang/fa/admin/licenses/form.php @@ -1,6 +1,6 @@ 'دارایی', 'checkin' => 'چک در', @@ -25,5 +25,5 @@ return array( 'to_email' => ' مجوز به ایمیل', 'to_name' => 'مجوز به نام', 'update' => 'به روز رسانی مجوز', - 'checkout_help' => 'شما باید یک مجوز به یک دارایی سخت افزار و یا یک شخص را بررسی کنید. شما می توانید هر دو را انتخاب کنید، اما مالک دارایی باید شخص شما چک کردن دارایی به مطابقت.' -); + 'checkout_help' => 'شما باید یک مجوز به یک دارایی سخت افزار و یا یک شخص را بررسی کنید. شما می توانید هر دو را انتخاب کنید، اما مالک دارایی باید شخص شما چک کردن دارایی به مطابقت.', +]; diff --git a/resources/lang/fa/admin/licenses/general.php b/resources/lang/fa/admin/licenses/general.php index d404a47f95..92a9fc8580 100644 --- a/resources/lang/fa/admin/licenses/general.php +++ b/resources/lang/fa/admin/licenses/general.php @@ -1,6 +1,6 @@ 'درباره مجوزها', 'about_licenses' => 'مجوز برای پیگیری نرم افزار استفاده می شود. آنها دارای تعداد مشخصی از صندلی هایی هستند که می توانند به افراد منتقل شوند', 'checkin' => 'بررسی صندلی مجوز', @@ -19,4 +19,4 @@ return array( 'software_licenses' => 'گواهی نامه های نرم افزاری', 'user' => 'کاربر', 'view' => 'مشاهده توافق‌نامه', -); +]; diff --git a/resources/lang/fa/admin/licenses/message.php b/resources/lang/fa/admin/licenses/message.php index 4deeed7fe2..57603f8c0f 100644 --- a/resources/lang/fa/admin/licenses/message.php +++ b/resources/lang/fa/admin/licenses/message.php @@ -1,6 +1,6 @@ 'مجوز وجود ندارد.', 'user_does_not_exist' => 'کاربر وجود ندارد.', @@ -11,43 +11,42 @@ return array( 'select_asset_or_person' => 'شما باید دارایی یا یک کاربر را انتخاب کنید، اما نه هر دو.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'مجوز ایجاد نمی شد، لطفا دوباره امتحان کنید.', - 'success' => 'مجوز ایجاد نمی شد، لطفا دوباره امتحان کنید.مجوز ایجاد نمی شد، لطفا دوباممجوز موفقیت ایجاد شده است.اد شده است.ره امتحان کنید.' - ), + 'success' => 'مجوز ایجاد نمی شد، لطفا دوباره امتحان کنید.مجوز ایجاد نمی شد، لطفا دوباممجوز موفقیت ایجاد شده است.اد شده است.ره امتحان کنید.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'فایل حذف نمی شود. لطفا دوباره تلاش کنید.', 'success' => 'فایل با موفقیت حذف شده است.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'فایل) آپلود نیست. لطفا دوباره تلاش کنید.', 'success' => 'فایل (موفقیت آپلود شد.', 'nofiles' => 'شما هر فایل برای آپلود انتخاب کنید، و یا فایل شما در حال تلاش برای آپلود بیش از حد بزرگ است', 'invalidfiles' => 'یک یا چند فایل شما بیش از حد بزرگ است و یا یک نوع فایل است که مجاز نیست. انواع فایلهای مجاز PNG، GIF، JPG، JPEG، DOC، DOCX، PDF، TXT، ZIP، RAR، RTF، XML و LIC است.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'مجوز به روز رسانی نمی شد، لطفا دوباره امتحان کنید', - 'success' => 'مجوز موفقیت به روز شد.' - ), + 'success' => 'مجوز موفقیت به روز شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که میخواهید حذف این مجوز؟', 'error' => 'بود یک موضوع حذف مجوز وجود دارد. لطفا دوباره تلاش کنید.', - 'success' => 'مجوز موفقیت حذف شد.' - ), + 'success' => 'مجوز موفقیت حذف شد.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'بود یک موضوع چک کردن مجوز وجود دارد. لطفا دوباره تلاش کنید.', - 'success' => 'مجوز خارج بررسی شد موفقیت' - ), + 'success' => 'مجوز خارج بررسی شد موفقیت', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'بود یک موضوع چک کردن در مجوز وجود دارد. لطفا دوباره تلاش کنید.', - 'success' => 'مجوز بررسی شده با موفقیت' - ), + 'success' => 'مجوز بررسی شده با موفقیت', + ], -); +]; diff --git a/resources/lang/fa/admin/licenses/table.php b/resources/lang/fa/admin/licenses/table.php index f65de425f8..b34951b131 100644 --- a/resources/lang/fa/admin/licenses/table.php +++ b/resources/lang/fa/admin/licenses/table.php @@ -1,6 +1,6 @@ 'اختصاص داده شده به', 'checkout' => '/ خارج', @@ -15,4 +15,4 @@ return array( 'serial' => 'سریال', 'title' => 'توافق‌نامه', -); +]; diff --git a/resources/lang/fa/admin/locations/message.php b/resources/lang/fa/admin/locations/message.php index afef0885a0..6ac5c3c2b8 100644 --- a/resources/lang/fa/admin/locations/message.php +++ b/resources/lang/fa/admin/locations/message.php @@ -1,27 +1,26 @@ 'مکان وجود ندارد.', 'assoc_users' => 'این مکان در حال حاضر با حداقل یک کاربر در ارتباط است و نمی تواند حذف شود. لطفا کاربران خود را به روز رسانی به دیگر مرجع این مکان و دوباره امتحان کنید. ', 'assoc_assets' => 'این مکان در حال حاضر همراه با حداقل یک دارایی است و قادر به حذف نمی شود. لطفا بروز دارایی های خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ', 'assoc_child_loc' => 'این مکان در حال حاضر پدر و مادر کودک حداقل یک مکان است و قادر به حذف نمی شود. لطفا به روز رسانی مکان خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ', - - 'create' => array( + 'create' => [ 'error' => 'مکان ایجاد نشد،دوباره سعی کنید.', - 'success' => 'مکان با موفقیت ایجاد شد.' - ), + 'success' => 'مکان با موفقیت ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'مکان بروزرسانی نشد،دوباره سعی کنید', - 'success' => 'مکان با موفقیت به روز رسانی شد.' - ), + 'success' => 'مکان با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمئن هستید که می خواهید این مکان را حذف کنید؟', 'error' => 'یک مشکل در حذف مکان وجود دارد،دوباره سعی کنید.', - 'success' => 'این مکان با موفقیت حذف شد.' - ) + 'success' => 'این مکان با موفقیت حذف شد.', + ], -); +]; diff --git a/resources/lang/fa/admin/locations/table.php b/resources/lang/fa/admin/locations/table.php index 825aca1cc4..cb8be16cfc 100644 --- a/resources/lang/fa/admin/locations/table.php +++ b/resources/lang/fa/admin/locations/table.php @@ -1,6 +1,6 @@ 'درباره مکانها', 'about_locations' => 'مکان ها برای ردیابی اطلاعات مکان برای کاربران، دارایی ها و موارد دیگر استفاده می شوند', 'assets_rtd' => 'دارایی ها', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -21,4 +21,4 @@ return array( 'parent' => 'مجموعه پدر', 'currency' => 'مکان ارز', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/fa/admin/manufacturers/message.php b/resources/lang/fa/admin/manufacturers/message.php index e0d17bf5c8..06183edb3b 100644 --- a/resources/lang/fa/admin/manufacturers/message.php +++ b/resources/lang/fa/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'تولید کننده وجود ندارد.', 'assoc_users' => 'این تولید کننده در حال حاضر با حداقل یک مدل همراه است و نمی تواند حذف شود. لطفا مدل های خود را به دیگر مرجع این تولید کننده به روز رسانی کنید و دوباره امتحان کنید.', - 'create' => array( + 'create' => [ 'error' => 'تولید کننده ایجاد نشد، لطفا دوباره امتحان کنید.', - 'success' => 'تولید کننده موفقیت ایجاد شد.' - ), + 'success' => 'تولید کننده موفقیت ایجاد شد.', + ], - 'update' => array( + 'update' => [ 'error' => 'تولید کننده به روز رسانی نشد، لطفا دوباره امتحان کنید', - 'success' => 'تولید کننده موفقیت به روز رسانی شد.' - ), + 'success' => 'تولید کننده موفقیت به روز رسانی شد.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که میخواهید این تولید کننده را حذف کنید؟', 'error' => 'مسئله ای در حذف سازنده وجود دارد. لطفا دوباره تلاش کنید.', - 'success' => 'تولید کننده با موفقیت حذف شد.' - ) + 'success' => 'تولید کننده با موفقیت حذف شد.', + ], -); +]; diff --git a/resources/lang/fa/admin/manufacturers/table.php b/resources/lang/fa/admin/manufacturers/table.php index 95874ad341..7d156627ec 100644 --- a/resources/lang/fa/admin/manufacturers/table.php +++ b/resources/lang/fa/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'درباره تولید کنندگان', 'about_manufacturers_text' => 'تولید کنندگان شرکت هایی هستند که دارایی شما را ایجاد می کنند. شما می توانید اطلاعات تماس مهم پشتیبانی در مورد آنها را در اینجا ذخیره کنید، که در صفحات جزئیات دارایی شما نمایش داده می شود.', 'asset_manufacturers' => 'تولید کنندگان دارایی', @@ -13,4 +13,4 @@ return array( 'update' => 'به روز رسانی تولیدکننده', 'url' => 'نشانی اینترنتی', -); +]; diff --git a/resources/lang/fa/admin/models/general.php b/resources/lang/fa/admin/models/general.php index f73f67f62c..c6aa189cd8 100644 --- a/resources/lang/fa/admin/models/general.php +++ b/resources/lang/fa/admin/models/general.php @@ -1,6 +1,6 @@ 'درباره مدل های دارایی', 'about_models_text' => 'مدل های دارایی یک راه برای گروه بندی دارایی های یکسان هستند. "MBP 2013"، "IPhone 6s" و غیره', 'deleted' => 'این مدل حذف شده است. اینجا برای بازگرداندن کلیک کنید it.', @@ -9,11 +9,11 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'بازیابی مدل', 'requestable' => 'کاربران ممکن است از این مدل درخواست کنند', - 'show_mac_address' => 'نمایش قسمت آدرس MAC در دارایی در این مدل', + 'show_mac_address' => 'نمایش قسمت آدرس MAC در دارایی در این مدل', 'view_deleted' => 'دیدن پاک شده ها', 'view_models' => 'دیدن مدل ها', 'fieldset' => 'تنظیمات فیلد', 'no_custom_field' => 'بدون زمینه های سفارشی ', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/fa/admin/models/message.php b/resources/lang/fa/admin/models/message.php index 1b7d46a15e..2a35b2b0e0 100644 --- a/resources/lang/fa/admin/models/message.php +++ b/resources/lang/fa/admin/models/message.php @@ -1,42 +1,41 @@ 'مدل موجود نیست.', 'assoc_users' => 'این مدل در حال حاضر همراه یک یا بیشتر از یک دارایی است و نمی تواند حذف شود. لطفا دارایی ها را حذف کنید و سپس برای حذف کردن مجددا تلاش کنید. ', - - 'create' => array( + 'create' => [ 'error' => 'مدل ساخته نشده است، لطفا دوباره تلاش کنید.', 'success' => 'مدل با موفقیت ساخته شد.', 'duplicate_set' => 'یک مدل دارایی با آن نام، سازنده و شماره ی مدل در حال حاضر موجود است.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'مدل به روزرسانی نشده است، لطفا دوباره تلاش کنید', - 'success' => 'مدل با موفقیت به روز رسانی شد.' - ), + 'success' => 'مدل با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این مدل دارایی را حذف کنید؟', 'error' => 'در زمان حذف کردن مدل، مشکلی وجود داشت. لطفا دوباره تلاش کنید.', - 'success' => 'مدل با موفقیت حذف شد.' - ), + 'success' => 'مدل با موفقیت حذف شد.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'مدل بازیابی نشد، لطفا دوباره تلاش کنید', - 'success' => 'مدل با موفقیت بازیابی شد.' - ), + 'success' => 'مدل با موفقیت بازیابی شد.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'هیچ فیلدی تغییر نکرده بود، بنابراین چیزی به روز نشد.', - 'success' => 'مدل های به روز شده' - ), + 'success' => 'مدل های به روز شده', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/fa/admin/models/table.php b/resources/lang/fa/admin/models/table.php index f88c2667f6..2d78739d62 100644 --- a/resources/lang/fa/admin/models/table.php +++ b/resources/lang/fa/admin/models/table.php @@ -1,6 +1,6 @@ 'ایجاد مدل دارایی', 'created_at' => 'ایجاد شده در', @@ -14,4 +14,4 @@ return array( 'update' => 'بروزسانی مدل دارایی', 'clone' => 'مدل شگرف', 'edit' => 'تغییر مدل', -); +]; diff --git a/resources/lang/fa/admin/reports/general.php b/resources/lang/fa/admin/reports/general.php index e74ee76975..7c5b3f228b 100644 --- a/resources/lang/fa/admin/reports/general.php +++ b/resources/lang/fa/admin/reports/general.php @@ -1,5 +1,5 @@ 'گزینه ای را که برای گزارش دارایی خود میخواهید انتخاب کنید .' -); +return [ + 'info' => 'گزینه ای را که برای گزارش دارایی خود میخواهید انتخاب کنید .', +]; diff --git a/resources/lang/fa/admin/reports/message.php b/resources/lang/fa/admin/reports/message.php index aaa007263c..c3dafee068 100644 --- a/resources/lang/fa/admin/reports/message.php +++ b/resources/lang/fa/admin/reports/message.php @@ -1,5 +1,5 @@ 'شما باید حداقل یک گزینه را انتخاب کنید.' -); +return [ + 'error' => 'شما باید حداقل یک گزینه را انتخاب کنید.', +]; diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php index 3c6fdea0ed..d163fb3312 100644 --- a/resources/lang/fa/admin/settings/general.php +++ b/resources/lang/fa/admin/settings/general.php @@ -1,12 +1,12 @@ 'دایرکتوری فعال', 'ad_domain' => 'دامنه فعال دایرکتوری', 'ad_domain_help' => 'این گاهی اوقات دامنه ایمیل شماست اما همیشه اینطور نیست.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'این سرور Active Directory است', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'آستانه ی انقضای هشدارها( به روز)', 'alert_inv_threshold' => 'فهرست آستانه ی هشدار', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID حساب', 'audit_interval' => 'فاصله حسابرسی', 'audit_interval_help' => 'اگر شما ملزم هستید که به طور منظم از دارایی های خود حسابرسی کنید، فاصله را در ماه وارد کنید.', @@ -214,7 +214,7 @@ return array( 'two_factor_enter_code' => 'کد دو فاکتور را وارد کنید', 'two_factor_config_complete' => 'ارسال کد', 'two_factor_enabled_edit_not_allowed' => 'سرپرست شما اجازه نمی دهد که این تنظیم را ویرایش کنید.', - 'two_factor_enrollment_text' => "احراز هویت دو عامل لازم است، اما دستگاه شما هنوز ثبت نشده است. برنامه Google Authenticator خود را باز کنید و کد QR زیر را برای ثبت نام دستگاه خود اسکن کنید. هنگامی که دستگاه خود را ثبت نام کردید، کد زیر را وارد کنید", + 'two_factor_enrollment_text' => 'احراز هویت دو عامل لازم است، اما دستگاه شما هنوز ثبت نشده است. برنامه Google Authenticator خود را باز کنید و کد QR زیر را برای ثبت نام دستگاه خود اسکن کنید. هنگامی که دستگاه خود را ثبت نام کردید، کد زیر را وارد کنید', 'require_accept_signature' => 'امضا لازم است', 'require_accept_signature_help_text' => 'فعال کردن این ویژگی، کاربران را مجبور به فیزیکی در پذیرش یک دارایی می کند.', 'left' => 'چپ', @@ -227,4 +227,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'طول برچسب دارایی، از جمله zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/fa/admin/settings/message.php b/resources/lang/fa/admin/settings/message.php index 9c92a453ae..df43bde1cc 100644 --- a/resources/lang/fa/admin/settings/message.php +++ b/resources/lang/fa/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'در حین به روزرسانی خطایی رخ داد. ', - 'success' => 'تنظیمات با موفقیت به روزرسانی شد.' - ), - 'backup' => array( + 'success' => 'تنظیمات با موفقیت به روزرسانی شد.', + ], + 'backup' => [ 'delete_confirm' => 'آیا شما مطمئن هستید که می خواهید این فایل پشتیبانی را حذف کنید؟ این کار برگشت ناپذیر است. ', 'file_deleted' => 'فایل پشتیبانی با موفقیت حذف شد. ', 'generated' => 'یک فایل پشتیبانی جدید با موفقیت ساخته شد.', 'file_not_found' => 'فایل پشتیبانی بر روی سرور یافت نمی شود.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'در حین پاکسازی خطایی رخ داد. ', 'validation_failed' => 'تایید پاکسازی ناصحیح است. لطفا کلمه ی "حذف" را در جعبه ی تاییدیه تایپ کنید.', - 'success' => 'سوابق حذف شده با موفقیت پاکسازی شده اند.' - ), + 'success' => 'سوابق حذف شده با موفقیت پاکسازی شده اند.', + ], -); +]; diff --git a/resources/lang/fa/admin/statuslabels/message.php b/resources/lang/fa/admin/statuslabels/message.php index 6b268236ce..a373c3638a 100644 --- a/resources/lang/fa/admin/statuslabels/message.php +++ b/resources/lang/fa/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'برچسب وضعیت موجود نیست', 'assoc_assets' => 'این برچسب وضعیت در حال حاضر حداقل با یک دارایی همراه است و نمی تواند حذف شود. لطفا دارایی های خود را به روز کنید تا دیگر این وضعیت را رد نکنید و دوباره امتحان کنید.', - - 'create' => array( + 'create' => [ 'error' => 'برچسب وضعیت ایجاد نشد، لطفا دوباره امتحان کنید', - 'success' => 'برچسب وضعیت با موفقیت ایجاد شد' - ), + 'success' => 'برچسب وضعیت با موفقیت ایجاد شد', + ], - 'update' => array( + 'update' => [ 'error' => 'برچسب وضعیت به روز نشده است، لطفا دوباره امتحان کنید', - 'success' => 'برچسب وضعیت با موفقیت به روز شد.' - ), + 'success' => 'برچسب وضعیت با موفقیت به روز شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا مطمئنید که میخواهید این برچسب وضعیت را حذف کنید؟', 'error' => 'یک مسئله حذف برچسب وضعیت وجود داشت. لطفا دوباره تلاش کنید.', - 'success' => 'برچسب وضعیت با موفقیت حذف شد.' - ), + 'success' => 'برچسب وضعیت با موفقیت حذف شد.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'این دارایی ها را نمی توان به کسی اختصاص داد.', 'deployable' => 'این دارایی ها را می توان بررسی کرد. هنگامی که آنها اختصاص داده می شوند، آنها متا وضعیت Deployed را در نظر می گیرند.', 'archived' => 'این دارایی ها قابل چک نیست و فقط در نمای Archived نمایش داده می شوند. این امر برای حفظ اطلاعات مربوط به دارایی ها برای بودجه بندی / اهداف تاریخی مفید است اما نگه داشتن آنها از فهرست دارایی روزمره.', 'pending' => 'این دارایی ها هنوز نمی توانند به هر کسی اختصاص داده شوند، که اغلب برای مواردی که برای تعمیر وجود دارد، مورد استفاده قرار می گیرند، اما انتظار می رود که به گردش درآید.', - ), + ], -); +]; diff --git a/resources/lang/fa/admin/statuslabels/table.php b/resources/lang/fa/admin/statuslabels/table.php index 94bef55219..0a77a503f5 100644 --- a/resources/lang/fa/admin/statuslabels/table.php +++ b/resources/lang/fa/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'درباره ی برچسب های وضعیت', 'archived' => 'آرشیو', 'create' => 'ساخت برچسب وضعیت', @@ -16,4 +16,4 @@ return array( 'title' => 'برچسب های وضعیت', 'undeployable' => 'غیرقابل گسترش', 'update' => 'به روزرسانی برچسب وضعیت', -); +]; diff --git a/resources/lang/fa/admin/suppliers/message.php b/resources/lang/fa/admin/suppliers/message.php index b6dc9fd01d..6a29c90ac1 100644 --- a/resources/lang/fa/admin/suppliers/message.php +++ b/resources/lang/fa/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'تامین کننده وجود ندارد.', - - 'create' => array( + 'create' => [ 'error' => 'تامین کننده ایجاد نشد, لطفا دوباره سعی کنید.', - 'success' => 'تامین کننده با موفقیت ایجاد شده.' - ), + 'success' => 'تامین کننده با موفقیت ایجاد شده.', + ], - 'update' => array( + 'update' => [ 'error' => 'تامین کننده آپدیت نشد, لطفا دوباره سعی کنید', - 'success' => 'کارپرداز با موفقیت به روز رسانی شد.' - ), + 'success' => 'کارپرداز با موفقیت به روز رسانی شد.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'آیا شما مطمئن هستید که می خواهید این کارپرداز را حذف کنید؟', 'error' => 'در حذف کردن این کارپرداز مشکلی وجود داشت. لطفا دوباره تلاش کنید.', 'success' => 'کارپرداز با موفقیت حذف شد.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/fa/admin/suppliers/table.php b/resources/lang/fa/admin/suppliers/table.php index 7fc677e49e..4e89deccbe 100644 --- a/resources/lang/fa/admin/suppliers/table.php +++ b/resources/lang/fa/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'درباره تامین کنندگان', 'about_suppliers_text' => 'تامین کنندگان برای ردیابی منبع مورد استفاده قرار می گیرند', 'address' => 'آدرس تأمین کننده', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'نمایش دارایی برای', 'zip' => 'کد پستی', -); +]; diff --git a/resources/lang/fa/admin/users/general.php b/resources/lang/fa/admin/users/general.php index 8b51e799bf..9528d9e6da 100644 --- a/resources/lang/fa/admin/users/general.php +++ b/resources/lang/fa/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'دارایی ها محول شده به :', @@ -13,7 +12,7 @@ return array( 'edit' => 'ویرایش کاربر', 'filetype_info' => 'پسوند های مجاز:png, gif, jpg, jpeg, doc, docx, pdf, txt, zip,Rar', 'history_user' => 'تاریخچه برای:', - 'info' => 'اطلاعات', + 'info' => 'اطلاعات', 'restore_user' => 'برای بازسازی آنها اینجا کلیک کنید.', 'last_login' => 'آخرین ورود', 'ldap_config_text' => 'تنظشیمات تاییدیه LDPA در فولدر app/config در فایلی به نام idap.php وجود دارد.مکان مشخص شده برای تمامی کاربران وارد شده تنظیم میشود.شما نیاز دارید که حداقل یه مکان را اضافه کرده باشید تا بتوانید از این ویژگی استفاده کنید.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'تنظیمات مدیریت فعلی شما اجازه اجرای مجدد احراز هویت دو عامل را می دهد.', 'two_factor_enrolled' => 'دستگاه 2FA ثبت شده است', 'two_factor_active' => '2FA فعال', - ); + ]; diff --git a/resources/lang/fa/admin/users/message.php b/resources/lang/fa/admin/users/message.php index 0718cfeaf1..de1a337e1f 100644 --- a/resources/lang/fa/admin/users/message.php +++ b/resources/lang/fa/admin/users/message.php @@ -1,6 +1,6 @@ 'دارایی با موفقیت پذیرفته شد.', 'declined' => 'شما با موفقیت این دارایی را به کاهش دادید.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAPبرای این نصب و راه اندازی پیکربندی نشده است.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'کاربر با موفقیت ایجاد شد.', 'update' => 'کاربر با موفقیت به روز شد.', 'update_bulk' => 'کاربران با موفقیت به روز شد!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'تعلیق کاربر با موفقیت متوقف شد.', 'restored' => 'کابر با موفقیت بازگردانی شد.', 'import' => 'کاربران با موفقیت وارد شدند.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'اشکال در ایجاد کاربر.لطفا دوباره تلاش کنید.', 'update' => 'اشکال در به روزرسانی کاربر.لطفا دوباره تلاش کنید.', 'delete' => 'اشکال در حذف کاربر.لطفا دوباره تلاش کنید.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'جستجو در سرور LDPA انجام نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.
اشکال از سرور LDPA:', 'ldap_could_not_get_entries' => 'مجوز از سرور LDPA گرفته نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.
اشکال از سرور LDPA:', 'password_ldap' => 'رمز عبور این حساب توسط LDAP / Active Directory مدیریت می شود. برای تغییر رمز عبور خود، لطفا با بخش IT خود تماس بگیرید.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'فایل حذف نشد.لطفا دوباره تلاش کنید.', 'success' => 'نقش با موفقیت حذف شد.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'فایل(ها) بارگذاری نشدند.لطفا دوباره تلاش کنید.', 'success' => 'فایل(ها) با موفقیت بارگذاری شدند.', 'nofiles' => 'شما هیچ فایلی برای بارگذاری انتخاب نکرده اید.', 'invalidfiles' => 'یک یا چندی از فایل های شما با پسوند غیرمجاز هستند.پسوند های مجاز شامل:png, gif, jpg, doc, docx, pdf و text می باشند.', - ), + ], -); +]; diff --git a/resources/lang/fa/admin/users/table.php b/resources/lang/fa/admin/users/table.php index a1d13245a5..9ec9f001eb 100644 --- a/resources/lang/fa/admin/users/table.php +++ b/resources/lang/fa/admin/users/table.php @@ -1,6 +1,6 @@ 'فعال کردن', 'allow' => 'مجاز کردن', 'checkedout' => 'دارایی ها', @@ -28,11 +28,11 @@ return array( 'show_current' => 'نمایش کابران کنونی', 'show_deleted' => 'نمایش کاربران حذف شده', 'title' => 'عنوان', - 'to_restore_them' => 'برای بازگرداندن آنها.', + 'to_restore_them' => 'برای بازگرداندن آنها.', 'updateuser' => 'به روز رسانی کاربر', 'username' => 'نام کاربری', - 'user_deleted_text' => 'این کاربر به عنوان حذف شده است.', + 'user_deleted_text' => 'این کاربر به عنوان حذف شده است.', 'username_note' => '(این فقط برای فعال سازی راهنمای اتصال است ،نه برای وارد شدن)', 'cloneuser' => ' کاربر کلون', 'viewusers' => 'مشاهده کاربران', -); +]; diff --git a/resources/lang/fa/auth/general.php b/resources/lang/fa/auth/general.php index a3b059db31..9d35e4a63b 100644 --- a/resources/lang/fa/auth/general.php +++ b/resources/lang/fa/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/fa/auth/message.php b/resources/lang/fa/auth/message.php index bbf3a8f3ca..daa73f2b69 100644 --- a/resources/lang/fa/auth/message.php +++ b/resources/lang/fa/auth/message.php @@ -1,6 +1,6 @@ 'یک حساب با این ایمیل در حال حاضر وجود دارد.', 'account_not_found' => 'نام کاربری یا رمز عبور اشتباه است.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'این حساب کاربری ممنوع است.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'مشکلی در حین تلاش به شما در ورود به سیستم وجود دارد، لطفا دوباره امتحان کنید.', 'success' => 'شما با موفقیت وارد شدید.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'هنگام تلاش برای ایجاد حساب مشکلی روی داد، لطفا دوباره امتحان کنید.', 'success' => 'حساب با موفقیت ایجاد شد.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'یک مشکل هنگام دریافت کد تنظیم مجدد رمز عبور وجود دارد، لطفا دوباره امتحان کنید.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'مشکلی برای تنظیم مجدد رمز عبور خود وجود دارد، لطفا دوباره امتحان کنید.', 'success' => 'رمز عبور خود را با موفقیت بازنشانی شد.', - ), + ], - -); +]; diff --git a/resources/lang/fa/button.php b/resources/lang/fa/button.php index ccbdd651ba..23d008dd33 100644 --- a/resources/lang/fa/button.php +++ b/resources/lang/fa/button.php @@ -1,6 +1,6 @@ 'اقدامات', 'add' => 'افزودن جدید', 'cancel' => 'انصراف', @@ -11,7 +11,7 @@ return array( 'request' => 'درخواست', 'submit' => 'ثبت کردن', 'upload' => 'بارگزاری', - 'select_file' => 'فایل را انتخاب کنید...', + 'select_file' => 'فایل را انتخاب کنید...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php index 11207e34db..3aec724cf2 100644 --- a/resources/lang/fa/general.php +++ b/resources/lang/fa/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'پذیرش', 'user_requests_count' => 'درخواست ها', 'city' => 'شهر', - 'click_here' => 'اینجا کلیک کنید', + 'click_here' => 'اینجا کلیک کنید', 'clear_selection' => 'انتخاب هیچ کدام', 'companies' => 'شرکت ها', 'company' => 'شرکت', 'component' => 'کامپوننت', 'components' => 'کامپوننت ها', - 'complete' => 'تکمیل', + 'complete' => 'تکمیل', 'consumable' => 'قابل مصرف', 'consumables' => 'اقلام قابل مصرف', 'country' => 'كشور', diff --git a/resources/lang/fa/help.php b/resources/lang/fa/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/fa/help.php +++ b/resources/lang/fa/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/fa/mail.php b/resources/lang/fa/mail.php index 04b7c9f254..d6f49546a8 100644 --- a/resources/lang/fa/mail.php +++ b/resources/lang/fa/mail.php @@ -1,6 +1,6 @@ 'یک کاربر یک درخواست اقساط در وب سایت را لغو کرده است', 'a_user_requested' => 'یک کاربر یک مورد را در وبسایت درخواست کرده است', 'accessory_name' => 'نام لوازم جانبی:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/fa/pagination.php b/resources/lang/fa/pagination.php index 99c8b69767..b349bc1842 100644 --- a/resources/lang/fa/pagination.php +++ b/resources/lang/fa/pagination.php @@ -1,6 +1,6 @@ 'بعدی & raquo؛', -); +]; diff --git a/resources/lang/fa/passwords.php b/resources/lang/fa/passwords.php index a8cbcbfba4..597645f993 100644 --- a/resources/lang/fa/passwords.php +++ b/resources/lang/fa/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'لینک رمز عبور شما ارسال شده است!', 'user' => 'هیچ کاربر فعالی با این آدرس ایمیل یافت نشد.', ]; - diff --git a/resources/lang/fa/reminders.php b/resources/lang/fa/reminders.php index 9c46ca8606..b68e707e5b 100644 --- a/resources/lang/fa/reminders.php +++ b/resources/lang/fa/reminders.php @@ -1,6 +1,6 @@ "کلمه عبور باید شش کاراکتر باشد و مطابقت با تایید آن. -", + 'password' => 'کلمه عبور باید شش کاراکتر باشد و مطابقت با تایید آن. +', - "user" => "نام کاربری یا آدرس ایمیل اشتباه است", + 'user' => 'نام کاربری یا آدرس ایمیل اشتباه است', - "token" => " تنظیم مجدد رمز عبور این نشانه نامعتبر است. -", + 'token' => ' تنظیم مجدد رمز عبور این نشانه نامعتبر است. +', - "sent" => "اگر یک آدرس ایمیل تطبیق پیدا شد، یک یادآوری رمز عبور ارسال شده است! -", + 'sent' => 'اگر یک آدرس ایمیل تطبیق پیدا شد، یک یادآوری رمز عبور ارسال شده است! +', -); +]; diff --git a/resources/lang/fa/table.php b/resources/lang/fa/table.php index da8c8add04..f62e9cd725 100644 --- a/resources/lang/fa/table.php +++ b/resources/lang/fa/table.php @@ -1,10 +1,10 @@ 'فعالیت ها', 'action' => 'فعالیت', 'by' => 'توسط', 'item' => 'مورد', -); +]; diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php index 583796e74a..99e2e1fa20 100644 --- a/resources/lang/fa/validation.php +++ b/resources/lang/fa/validation.php @@ -1,6 +1,6 @@ 'ویژگی در حال حاضر گرفته شده است.', 'uploaded' => 'ویژگی: attribute failed to upload.', 'url' => 'شکل ویژگی نامعتبر است.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "فیلد attribute شامل یک شخصیت است که مجاز نیست.", - "email_array" => "یک یا چند آدرس ایمیل نامعتبر است", - "hashed_pass" => "رمز عبور فعلی شما اشتباه است", + 'alpha_space' => 'فیلد attribute شامل یک شخصیت است که مجاز نیست.', + 'email_array' => 'یک یا چند آدرس ایمیل نامعتبر است', + 'hashed_pass' => 'رمز عبور فعلی شما اشتباه است', 'dumbpwd' => 'این رمز عبور خیلی رایج است', - "statuslabel_type" => "شما باید نوع برچسب معتبر را انتخاب کنید", + 'statuslabel_type' => 'شما باید نوع برچسب معتبر را انتخاب کنید', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/fi/admin/accessories/general.php b/resources/lang/fi/admin/accessories/general.php index a5e7bdc7b6..ddf28d7e0e 100644 --- a/resources/lang/fi/admin/accessories/general.php +++ b/resources/lang/fi/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategoria', 'accessory_name' => 'Oheistarvikkeen nimi', 'checkout' => 'Oheistarvikkeen luovutus', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Käytä yleisiä käyttöehtoja.', 'use_default_eula_disabled' => 'Käytä yleisiä käyttöehtoja. Et ole vielä määritellyt yleisiä käyttöehtoja, voit lisätä ne asetuksista.', -); +]; diff --git a/resources/lang/fi/admin/accessories/message.php b/resources/lang/fi/admin/accessories/message.php index 539b984b7c..f63395ced3 100644 --- a/resources/lang/fi/admin/accessories/message.php +++ b/resources/lang/fi/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Oheistarviketta [:id] ei ole.', 'assoc_users' => 'Oheistarviketta on tällä hetkellä luovutettuna :count nimikettä käyttäjille. Tarkista oheistarvikkeiden tila ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Oheistarviketta ei luotu, yritä uudelleen.', - 'success' => 'Oheistarvike on luotu.' - ), + 'success' => 'Oheistarvike on luotu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Oheistarviketta ei päivitetty, yritä uudelleen', - 'success' => 'Oheistarvike päivitettiin onnistuneesti.' - ), + 'success' => 'Oheistarvike päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän oheistarvikkeen?', 'error' => 'Oheistarvikkeen poistaminen ei onnistunut. Yritä uudelleen.', - 'success' => 'Oheistarvike poistettiin onnistuneesti.' - ), + 'success' => 'Oheistarvike poistettiin onnistuneesti.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Oheistarviketta ei luovutettu, yritä uudelleen', 'success' => 'Oheistarvike luovutettiin onnistuneesti.', - 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.' - ), + 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Oheistarviketta ei palautettu, yritä uudelleen', 'success' => 'Oheistarvike palautettiin onnistuneesti.', - 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.' - ) + 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.', + ], - -); +]; diff --git a/resources/lang/fi/admin/accessories/table.php b/resources/lang/fi/admin/accessories/table.php index 5498f668b4..d5dc248cb0 100644 --- a/resources/lang/fi/admin/accessories/table.php +++ b/resources/lang/fi/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Lataa CSV', - 'eula_text' => 'Käyttöehdot', +return [ + 'dl_csv' => 'Lataa CSV', + 'eula_text' => 'Käyttöehdot', 'id' => 'Tunnus', 'require_acceptance' => 'Hyväksyminen', 'title' => 'Oheistarvikkeen nimi', - -); +]; diff --git a/resources/lang/fi/admin/asset_maintenances/form.php b/resources/lang/fi/admin/asset_maintenances/form.php index 79c3999c1c..b01db8fbdc 100644 --- a/resources/lang/fi/admin/asset_maintenances/form.php +++ b/resources/lang/fi/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Päivää', 'notes' => 'Muistiinpanot', 'update' => 'Päivitä', - 'create' => 'Luo' + 'create' => 'Luo', ]; diff --git a/resources/lang/fi/admin/asset_maintenances/message.php b/resources/lang/fi/admin/asset_maintenances/message.php index 4625d2672b..542b13ebf7 100644 --- a/resources/lang/fi/admin/asset_maintenances/message.php +++ b/resources/lang/fi/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän huollon?', 'error' => 'Huollon poistamisessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Huolto poistettu.' + 'success' => 'Huolto poistettu.', ], 'create' => [ 'error' => 'Huoltoa ei luotu, yritä uudelleen.', - 'success' => 'Huollon kirjaus onnistui.' + 'success' => 'Huollon kirjaus onnistui.', ], 'edit' => [ 'error' => 'Huoltoa ei muokattu, yritä uudelleen.', - 'success' => 'Huollon muokkaus onnistui.' + 'success' => 'Huollon muokkaus onnistui.', ], 'asset_maintenance_incomplete' => 'Ei vielä valmis', 'warranty' => 'Takuu', 'not_warranty' => 'Takuu päättynyt', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/fi/admin/asset_maintenances/table.php b/resources/lang/fi/admin/asset_maintenances/table.php index 89b46e81c4..2f1840d35c 100644 --- a/resources/lang/fi/admin/asset_maintenances/table.php +++ b/resources/lang/fi/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Laitteen huolto', 'asset_name' => 'Laitteen nimi', 'is_warranty' => 'Takuu', - 'dl_csv' => 'Lataa CSV' + 'dl_csv' => 'Lataa CSV', ]; diff --git a/resources/lang/fi/admin/categories/general.php b/resources/lang/fi/admin/categories/general.php index d725ffd3ae..a44a9b0466 100644 --- a/resources/lang/fi/admin/categories/general.php +++ b/resources/lang/fi/admin/categories/general.php @@ -1,6 +1,6 @@ 'Laitekategoriat', 'category_name' => 'Kategorian nimi', 'checkin_email' => 'Lähetä käyttäjälle sähköposti palautuksesta/luovutuksesta.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Käytä yleisiä käyttöehtoja.', 'use_default_eula_disabled' => 'Käytä yleisiä käyttöehtoja. Yleisiä käyttöehtoja ei ole määritetty. Voit lisätä ne asetuksista.', -); +]; diff --git a/resources/lang/fi/admin/categories/message.php b/resources/lang/fi/admin/categories/message.php index 81f9591d73..af53cd9e9e 100644 --- a/resources/lang/fi/admin/categories/message.php +++ b/resources/lang/fi/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategoriaa ei löydy.', 'assoc_models' => 'Kategoriaan on tällä hetkellä liitettynä vähintään yksi malli, eikä sitä voi poistaa. Päivitä mallejasi, jotta ne eivät enää viittaa tähän kategoriaan ja yritä uudelleen. ', 'assoc_items' => 'Tähän kategoriaan on yhdistettynä vähintään yksi :asset_type ja sitä ei voi poistaa. Poista :asset_type viittaus tähän kategoriaan ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Kategoriaa ei luotu, yritä uudelleen.', - 'success' => 'Kategoria luotiin onnistuneesti.' - ), + 'success' => 'Kategoria luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategoriaa ei päivitetty, yritä uudelleen', - 'success' => 'Kategoria päivitettiin onnistuneesti.' - ), + 'success' => 'Kategoria päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän kategorian?', 'error' => 'Kategorian poistossa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Kategoria poistettiin onnistuneesti.' - ) + 'success' => 'Kategoria poistettiin onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/categories/table.php b/resources/lang/fi/admin/categories/table.php index 901c9ac533..d4a8e7a657 100644 --- a/resources/lang/fi/admin/categories/table.php +++ b/resources/lang/fi/admin/categories/table.php @@ -1,10 +1,10 @@ 'Käyttöehdot', +return [ + 'eula_text' => 'Käyttöehdot', 'id' => 'Tunnus', 'parent' => 'Ylempi', 'require_acceptance' => 'Hyväksyminen', 'title' => 'Laitekategorian nimi', -); +]; diff --git a/resources/lang/fi/admin/companies/general.php b/resources/lang/fi/admin/companies/general.php index 7bedf6d560..9302df61ce 100644 --- a/resources/lang/fi/admin/companies/general.php +++ b/resources/lang/fi/admin/companies/general.php @@ -1,4 +1,5 @@ 'Valitse yritys', ]; diff --git a/resources/lang/fi/admin/companies/message.php b/resources/lang/fi/admin/companies/message.php index 829c09b987..2f35fd541d 100644 --- a/resources/lang/fi/admin/companies/message.php +++ b/resources/lang/fi/admin/companies/message.php @@ -1,18 +1,19 @@ 'Yritystä ei ole.', 'assoc_users' => 'Yritys on liitettynä vähintään yhteen malliin, eikä sitä voida poistaa. Poista malleista viittaus kyseiseen yritykseen ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Yritystä ei luotu, yritä uudelleen.', - 'success' => 'Yritys luotiin onnistuneesti.' - ), - 'update' => array( + 'success' => 'Yritys luotiin onnistuneesti.', + ], + 'update' => [ 'error' => 'Yritystä ei päivitetty, yritä uudelleen', - 'success' => 'Yritys päivitettiin onnistuneesti.' - ), - 'delete' => array( + 'success' => 'Yritys päivitettiin onnistuneesti.', + ], + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän yrityksen?', 'error' => 'Yrityksen poistamisessa tapahtui jotain. Yritä uudelleen.', - 'success' => 'Yritys poistettiin onnistuneesti.' - ) -); + 'success' => 'Yritys poistettiin onnistuneesti.', + ], +]; diff --git a/resources/lang/fi/admin/companies/table.php b/resources/lang/fi/admin/companies/table.php index b8aedebd0e..946313e998 100644 --- a/resources/lang/fi/admin/companies/table.php +++ b/resources/lang/fi/admin/companies/table.php @@ -1,9 +1,10 @@ 'Yritykset', 'create' => 'Luo yritys', 'title' => 'Yritys', 'update' => 'Päivitä yritys', 'name' => 'Yrityksen nimi', 'id' => 'ID', -); +]; diff --git a/resources/lang/fi/admin/components/general.php b/resources/lang/fi/admin/components/general.php index c99efc61eb..3589f88be5 100644 --- a/resources/lang/fi/admin/components/general.php +++ b/resources/lang/fi/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponentin nimi', 'checkin' => 'Palauta komponentti', 'checkout' => 'Luovuta komponentti', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Jäljellä', 'total' => 'Yhteensä', 'update' => 'Päivitä komponentti', -); +]; diff --git a/resources/lang/fi/admin/components/message.php b/resources/lang/fi/admin/components/message.php index 3eb759fa0c..4b3346db1c 100644 --- a/resources/lang/fi/admin/components/message.php +++ b/resources/lang/fi/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenttia ei ole olemassa.', - 'create' => array( + 'create' => [ 'error' => 'Komponenttia ei luotu, yritä uudelleen.', - 'success' => 'Komponentti on luotu onnistuneesti.' - ), + 'success' => 'Komponentti on luotu onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenttia ei ole päivitetty, yritä uudelleen', - 'success' => 'Komponentti on päivitetty onnistuneesti.' - ), + 'success' => 'Komponentti on päivitetty onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän komponentin?', 'error' => 'Komponentti poisto ei onnistunut. Yritä uudelleen.', - 'success' => 'Komponentti poistettiin.' - ), + 'success' => 'Komponentti poistettiin.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponenttia ei luovutettu, yritä uudelleen', 'success' => 'Komponentin luovutus onnistui.', - 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.' - ), + 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenttia ei palautettu, yritä uudelleen', 'success' => 'Komponentti palautettiin onnistuneesti.', - 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.' - ) + 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.', + ], - -); +]; diff --git a/resources/lang/fi/admin/components/table.php b/resources/lang/fi/admin/components/table.php index 35f96552da..95dddc5f21 100644 --- a/resources/lang/fi/admin/components/table.php +++ b/resources/lang/fi/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentin nimi', -); +]; diff --git a/resources/lang/fi/admin/consumables/general.php b/resources/lang/fi/admin/consumables/general.php index 978e14f08a..27b25af6ee 100644 --- a/resources/lang/fi/admin/consumables/general.php +++ b/resources/lang/fi/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Luovuta kulutustarvike käyttäjälle', 'consumable_name' => 'Kulutustarvikkeen nimi', 'create' => 'Luo kulutustarvike', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Jäljellä', 'total' => 'Yhteensä', 'update' => 'Päivitä kulutustarvike', -); +]; diff --git a/resources/lang/fi/admin/consumables/message.php b/resources/lang/fi/admin/consumables/message.php index bb69e00a46..6b97205948 100644 --- a/resources/lang/fi/admin/consumables/message.php +++ b/resources/lang/fi/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Kulutustarviketta ei ole.', - 'create' => array( + 'create' => [ 'error' => 'Kulutustarviketta ei luotu, yritä uudelleen.', - 'success' => 'Kulutustarvike luotiin onnistuneesti.' - ), + 'success' => 'Kulutustarvike luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kulutustarviketta ei päivitetty, yritä uudelleen', - 'success' => 'Kulutustarvike päivitettiin onnistuneesti.' - ), + 'success' => 'Kulutustarvike päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän kulutustarvikkeen?', 'error' => 'Kulutustarvikkeen poistamisessa oli ongelma. Yritä uudelleen.', - 'success' => 'Kulutustarvike poistettiin onnistuneesti.' - ), + 'success' => 'Kulutustarvike poistettiin onnistuneesti.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kulutustarviketta ei luovutettu, yritä uudelleen', 'success' => 'Kulutustarvike luovutettiin.', - 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.' - ), + 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kulutustarviketta ei palautettu, yritä uudelleen', 'success' => 'Kulutustarvike palautettiin.', - 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.' - ) + 'user_does_not_exist' => 'Kyseinen käyttäjä on virheellinen. Yritä uudelleen.', + ], - -); +]; diff --git a/resources/lang/fi/admin/consumables/table.php b/resources/lang/fi/admin/consumables/table.php index 22a79036e3..510815d7bf 100644 --- a/resources/lang/fi/admin/consumables/table.php +++ b/resources/lang/fi/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Kulutustarvikkeen nimi', -); +]; diff --git a/resources/lang/fi/admin/custom_fields/general.php b/resources/lang/fi/admin/custom_fields/general.php index 66b1969585..750340ff56 100644 --- a/resources/lang/fi/admin/custom_fields/general.php +++ b/resources/lang/fi/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Mukautetut kentät', 'field' => 'Kenttä', 'about_fieldsets_title' => 'Tietoja kenttäsarjoista', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Uusi mukautettu kenttä', 'value_encrypted' => 'Kentän arvo salataan tietokannassa. Vain järjestelmänvalvojat voivat tarkastella purettua arvoa', 'show_in_email' => 'Käytetäänkö kentän arvoa käyttäjälle lähetettävissä luovutus-sähköposteissa? Salattuja kenttiä ei voi lisätä sähköposteihin.', -); +]; diff --git a/resources/lang/fi/admin/custom_fields/message.php b/resources/lang/fi/admin/custom_fields/message.php index 9540976b77..b3c040d6ba 100644 --- a/resources/lang/fi/admin/custom_fields/message.php +++ b/resources/lang/fi/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Tätä kenttää ei ole.', 'already_added' => 'Kentässä jo lisätty', - 'create' => array( + 'create' => [ 'error' => 'Kenttää ei luotu, yritä uudelleen.', 'success' => 'Kenttä luotiin onnistuneesti.', - 'assoc_success' => 'Kenttä lisättiin onnistuneesti kenttäsarjaan.' - ), + 'assoc_success' => 'Kenttä lisättiin onnistuneesti kenttäsarjaan.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kenttä ei päivittynyt, yritä uudelleen', - 'success' => 'Kenttä päivitettiin onnistuneesti.' - ), + 'success' => 'Kenttä päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän kentän?', 'error' => 'Kentässä on ollut ongelma. Yritä uudelleen.', 'success' => 'Kenttä poistettiin onnistuneesti.', 'in_use' => 'Kenttä on edelleen käytössä.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Kenttäsarjaa ei ole', - 'create' => array( + 'create' => [ 'error' => 'Kenttäsarjaa ei luotu, yritä uudelleen.', - 'success' => 'Kenttäsarja luotu onnistuneesti.' - ), + 'success' => 'Kenttäsarja luotu onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kenttäsarjaa ei päivitetty, yritä uudelleen', - 'success' => 'Kenttäsarja päivitettiin onnistuneesti.' - ), + 'success' => 'Kenttäsarja päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän kenttäsarjan?', 'error' => 'Kenttäsarjan poistamisessa tapahtui virhe. Yritä uudelleen.', 'success' => 'Kenttäsarja poistettiin onnistuneesti.', 'in_use' => 'Kenttäsarja on edelleen käytössä.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/fi/admin/departments/message.php b/resources/lang/fi/admin/departments/message.php index c240721799..5851d889cd 100644 --- a/resources/lang/fi/admin/departments/message.php +++ b/resources/lang/fi/admin/departments/message.php @@ -1,21 +1,21 @@ 'Osastoa ei ole olemassa.', 'assoc_users' => 'Tällä osastolla on tällä hetkellä vähintään yksi käyttäjä, eikä sitä voi poistaa. Poista käyttäjiltä viitaus tähän osastoon ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Osastoa ei luotu, yritä uudelleen.', - 'success' => 'Osasto luotiin onnistuneesti.' - ), - 'update' => array( + 'success' => 'Osasto luotiin onnistuneesti.', + ], + 'update' => [ 'error' => 'Osastoa ei päivitetty, yritä uudelleen', - 'success' => 'Osasto päivitettiin onnistuneesti.' - ), - 'delete' => array( + 'success' => 'Osasto päivitettiin onnistuneesti.', + ], + 'delete' => [ 'confirm' => 'Haluatko varmasti poistaa tämän osaston?', 'error' => 'Osaston poistamisessa tapahtui jotain. Yritä uudelleen.', - 'success' => 'Osasto poistettiin onnistuneesti.' - ) + 'success' => 'Osasto poistettiin onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/departments/table.php b/resources/lang/fi/admin/departments/table.php index 62bc975f9b..e56e67260a 100644 --- a/resources/lang/fi/admin/departments/table.php +++ b/resources/lang/fi/admin/departments/table.php @@ -1,6 +1,6 @@ 'Tunnus', 'name' => 'Osaston nimi', @@ -8,4 +8,4 @@ return array( 'location' => 'Sijainti', 'create' => 'Luo osasto', 'update' => 'Päivitä osasto', - ); + ]; diff --git a/resources/lang/fi/admin/depreciations/general.php b/resources/lang/fi/admin/depreciations/general.php index ee4e3d242e..80eec3d9a9 100644 --- a/resources/lang/fi/admin/depreciations/general.php +++ b/resources/lang/fi/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Lisätietoja laitteiden poistoista', 'about_depreciations' => 'Voit määrittää laitteelle poistoluokan poistaaksesi laitteen laitekannastasi määritetyn ajan jälkeen.', 'asset_depreciations' => 'Laitteiden poistot', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Kuukausien lukumäärä', 'update' => 'Päivitä poistot', -); +]; diff --git a/resources/lang/fi/admin/depreciations/message.php b/resources/lang/fi/admin/depreciations/message.php index 6d7e36606a..22be6d6189 100644 --- a/resources/lang/fi/admin/depreciations/message.php +++ b/resources/lang/fi/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Poistoluokkaa ei löydy.', 'assoc_users' => 'Tämä poisto on määritetty käyttöön yhdelle tai useammalle mallille eikä sitä voida poistaa. Poista kaikki mallit ja yritä uudelleen. ', - - 'create' => array( + 'create' => [ 'error' => 'Poistoluokkaa ei luotu, yritä uudelleen. :(', - 'success' => 'Poistoluokka luotiin onnistuneesti. :)' - ), + 'success' => 'Poistoluokka luotiin onnistuneesti. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Poistoluokkaa ei päivitetty, yritä uudelleen', - 'success' => 'Poistoluokka päivitettiin onnistuneesti.' - ), + 'success' => 'Poistoluokka päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän poistoluokan?', 'error' => 'Poistoluokan poistamisessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Poistoluokka poistettiin onnistuneesti.' - ) + 'success' => 'Poistoluokka poistettiin onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/depreciations/table.php b/resources/lang/fi/admin/depreciations/table.php index db1466c664..ab150b39c7 100644 --- a/resources/lang/fi/admin/depreciations/table.php +++ b/resources/lang/fi/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'Tunnus', 'months' => 'Kuukautta', 'term' => 'Ajanjakso', 'title' => 'Nimi ', -); +]; diff --git a/resources/lang/fi/admin/groups/message.php b/resources/lang/fi/admin/groups/message.php index 1e2272b76d..349b5d889a 100644 --- a/resources/lang/fi/admin/groups/message.php +++ b/resources/lang/fi/admin/groups/message.php @@ -1,22 +1,22 @@ 'Ryhmä on jo olemassa!', 'group_not_found' => 'Ryhmää [:id] ei löydy.', 'group_name_required' => 'Nimi on pakollinen', - 'success' => array( + 'success' => [ 'create' => 'Ryhmä luotiin onnistuneesti.', 'update' => 'Ryhmä päivitettiin onnistuneesti.', 'delete' => 'Ryhmä poistettiin onnistuneesti.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän ryhmän?', 'create' => 'Ryhmän luonnissa tapahtui virhe. Yritä uudelleen.', 'update' => 'Ryhmän päivityksessä tapahtui virhe. Yritä uudelleen.', 'delete' => 'Ryhmän poistossa tapahtui virhe. Yritä uudelleen.', - ), + ], -); +]; diff --git a/resources/lang/fi/admin/groups/table.php b/resources/lang/fi/admin/groups/table.php index b32fc05a3a..78b9114e3d 100644 --- a/resources/lang/fi/admin/groups/table.php +++ b/resources/lang/fi/admin/groups/table.php @@ -1,9 +1,9 @@ 'Tunnus', 'name' => 'Nimi', 'users' => 'Käyttäjien lkm', -); +]; diff --git a/resources/lang/fi/admin/groups/titles.php b/resources/lang/fi/admin/groups/titles.php index b4c3f893fd..4f8308d790 100644 --- a/resources/lang/fi/admin/groups/titles.php +++ b/resources/lang/fi/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Tietoja ryhmistä', 'about_groups' => 'Ryhmien avulla voit yhdenmukaistaa käyttöoikeudet.', 'group_management' => 'Ryhmienhallinta', @@ -11,4 +11,4 @@ return array( 'allow' => 'Salli', 'deny' => 'Estä', -); +]; diff --git a/resources/lang/fi/admin/hardware/form.php b/resources/lang/fi/admin/hardware/form.php index 743d4435df..b01ba08565 100644 --- a/resources/lang/fi/admin/hardware/form.php +++ b/resources/lang/fi/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Vahvista laitteiden massapoisto', +return [ + 'bulk_delete' => 'Vahvista laitteiden massapoisto', 'bulk_delete_help' => 'Tarkasta alla olevat massapoistettavat laitteet. Kun nämä laitteet on poistettu, ne voidaan palauttaa, mutta niitä ei enää yhdistetä niihin käyttäjiin, joille ne on tällä hetkellä luovutettuna.', 'bulk_delete_warn' => 'Olet poistamassa :asset_count laitetta.', - 'bulk_update' => 'Massapäivitä laitteita', - 'bulk_update_help' => 'Tämän lomakkeen avulla voit päivittää useita laitteita kerralla. Täytä vain ne kentät joita haluat muuttaa. Tyhjäksi jätettyjä kenttiä ei päivitetä. ', - 'bulk_update_warn' => 'Olet päivittämässä :asset_count laitteen ominaisuuksia.', + 'bulk_update' => 'Massapäivitä laitteita', + 'bulk_update_help' => 'Tämän lomakkeen avulla voit päivittää useita laitteita kerralla. Täytä vain ne kentät joita haluat muuttaa. Tyhjäksi jätettyjä kenttiä ei päivitetä. ', + 'bulk_update_warn' => 'Olet päivittämässä :asset_count laitteen ominaisuuksia.', 'checkedout_to' => 'Luovutettuna', 'checkout_date' => 'Luovutuspäivä', 'checkin_date' => 'Palautuspäivä', @@ -38,7 +38,6 @@ return array( 'tag' => 'Laitetunniste', 'update' => 'Päivitä laite', 'warranty' => 'Takuu', - 'warranty_expires' => 'Takuu päättyy', + 'warranty_expires' => 'Takuu päättyy', 'years' => 'vuotta', -) -; +]; diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php index c793da7945..832d5fd7e8 100644 --- a/resources/lang/fi/admin/hardware/general.php +++ b/resources/lang/fi/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Tietoja laitteista', 'about_assets_text' => 'Laitteita ovat nimikeitä joita seurataan sarjanumeron tai laitetunnisteen avulla. Laitteiksi määritellään yleensä arvokkaampaa omaisuutta, joiden tunnistaminen yksilöllisesti on tärkeää. Pienemmät laitteet voi määrittää lisävarusteiksi.', - 'archived' => 'Arkistoitu', + 'archived' => 'Arkistoitu', 'asset' => 'Laite', 'bulk_checkout' => 'Laitteiden luovutus', 'checkin' => 'Palauta laite', @@ -19,4 +19,4 @@ return array( 'pending' => 'Odottaa', 'undeployable' => 'Ei käytettävissä', 'view' => 'Näytä laite', -); +]; diff --git a/resources/lang/fi/admin/hardware/message.php b/resources/lang/fi/admin/hardware/message.php index 8d20b68196..96470acccb 100644 --- a/resources/lang/fi/admin/hardware/message.php +++ b/resources/lang/fi/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Varoitus: Tämä laite ei ole käytettävävissä. Jos laitteen tila on muuttunut, päivitä laitteen tila sen asetuksista.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Hyvä yritys. Tätä laitetta ei ole tai se ei ole pyydettävissä.', 'assoc_users' => 'Tämä laite on luovutettu käyttäjälle joten sitä ei voida poistaa. Palauta laite ensin käyttäjältä ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Laitetta ei luotu, yritä uudelleen. :(', - 'success' => 'Laite luotiin onnistuneesti. :)' - ), + 'success' => 'Laite luotiin onnistuneesti. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Laitetta ei päivitetty, yritä uudelleen', 'success' => 'Laite päivitetty onnistuneesti.', 'nothing_updated' => 'Mitään kenttiä ei valittu, joten mitään ei päivitetty.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Laitetta ei palautettu, ole hyvä ja yritä uudelleen', - 'success' => 'Laite palautettiin onnistuneesti.' - ), + 'success' => 'Laite palautettiin onnistuneesti.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Laitteen tarkastus epäonnistui. Yritä uudelleen.', - 'success' => 'Laitteen tarkastus kirjattu.' - ), + 'success' => 'Laitteen tarkastus kirjattu.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tiedostoa ei poistettu. Ole hyvä ja yritä uudelleen.', 'success' => 'Tiedosto poistettiin onnistuneesti.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tiedostoja ei lähetetty. Ole hyvä ja yritä uudelleen.', 'success' => 'Tiedostot lähetettiin onnistuneesti.', 'nofiles' => 'Et ole valinnut lähetettäviä tiedostoja tai lataamasi tiedosto on liian suuri', 'invalidfiles' => 'Yksi tai useampia tiedostoja on liian iso tai sen tiedostotyyppi ei ole sallittu. Sallitut tiedostotyypit ovat png, gif, jpg, doc, docx, pdf, ja txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Joitakin nimikkeitä ei tuotu oikein.', 'errorDetail' => 'Seuraavia nimikkeitä ei tuotu virheiden vuoksi.', - 'success' => "Tiedostosi on tuotu", - 'file_delete_success' => "Tiedosto on poistettu onnistuneesti", - 'file_delete_error' => "Tiedostoa ei voitu poistaa", - ), + 'success' => 'Tiedostosi on tuotu', + 'file_delete_success' => 'Tiedosto on poistettu onnistuneesti', + 'file_delete_error' => 'Tiedostoa ei voitu poistaa', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän laitteen?', 'error' => 'Laitteen poistamisessa tapahtui virhe. Yritä uudelleen.', 'nothing_updated' => 'Laitetta ei ollut valittuna, joten mitään ei poistettu.', - 'success' => 'Laite poistettu onnistuneesti.' - ), + 'success' => 'Laite poistettu onnistuneesti.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Laitteen luovutus epäonnistui, yritä uudelleen', 'success' => 'Laite luovutettu onnistuneesti.', 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.', 'not_available' => 'Laite ei ole luovutettavissa!', - 'no_assets_selected' => 'Valitse ainakin yksi laite listasta' - ), + 'no_assets_selected' => 'Valitse ainakin yksi laite listasta', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Laitteen palautus epäonnistui, yritä uudelleen', 'success' => 'Laite palautettu onnistuneesti.', 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.', 'already_checked_in' => 'Tämä laite on jo palautettu.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Laitetta ei pyydetty, yritä uudelleen', 'success' => 'Laitteen pyytäminen onnistui.', - 'canceled' => 'Luovutus-pyyntö peruutettiin onnistuneesti' - ) + 'canceled' => 'Luovutus-pyyntö peruutettiin onnistuneesti', + ], -); +]; diff --git a/resources/lang/fi/admin/hardware/table.php b/resources/lang/fi/admin/hardware/table.php index b5137a9e86..52c9bd99b9 100644 --- a/resources/lang/fi/admin/hardware/table.php +++ b/resources/lang/fi/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Laitetunniste', 'asset_model' => 'Malli', @@ -20,6 +20,6 @@ return array( 'title' => 'Laite ', 'image' => 'Laitteen kuva', 'days_without_acceptance' => 'Päiviä ilman hyväksymistä', - 'monthly_depreciation' => 'Kuukautinen poisto' + 'monthly_depreciation' => 'Kuukautinen poisto', -); +]; diff --git a/resources/lang/fi/admin/kits/general.php b/resources/lang/fi/admin/kits/general.php index 0b97d6cfe8..b6662f7b52 100644 --- a/resources/lang/fi/admin/kits/general.php +++ b/resources/lang/fi/admin/kits/general.php @@ -1,6 +1,6 @@ 'Tietoja sarjoista', 'about_kits_text' => 'Sarjat tekevät useiden nimikkeiden luovuttamisesta nopeaa ja näppärää. Sarjoista on siis hyötyä vaikkapa kun uusille käyttäjille jaetaan kaikille samankaltaiset varusteet (laitteita, lisävarusteita, lisenssejä).', 'checkout' => 'Luovuta sarja ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Kulutustarviketta :consumable ei ole riittävästi vapaana, :qty tarvittaisiin. ', 'none_accessory' => 'Oheistarviketta :accessory ei ole riittävästi vapaana, :qty tarvittaisiin. ', -); +]; diff --git a/resources/lang/fi/admin/licenses/form.php b/resources/lang/fi/admin/licenses/form.php index 15550557e5..380805c977 100644 --- a/resources/lang/fi/admin/licenses/form.php +++ b/resources/lang/fi/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Laite', 'checkin' => 'Palauta', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Lisenssille määritetty sähköpostiosoite', 'to_name' => 'Lisenssille määritetty nimi', 'update' => 'Päivitä lisenssi', - 'checkout_help' => 'Lisenssi tulee luovuttaa laitteelle tai henkilölle. Voit valita molemmat, mutta laitteen omistajan tulee täsmätä lisenssin omistajaan.' -); + 'checkout_help' => 'Lisenssi tulee luovuttaa laitteelle tai henkilölle. Voit valita molemmat, mutta laitteen omistajan tulee täsmätä lisenssin omistajaan.', +]; diff --git a/resources/lang/fi/admin/licenses/general.php b/resources/lang/fi/admin/licenses/general.php index c6ade5fe44..0b20fd405e 100644 --- a/resources/lang/fi/admin/licenses/general.php +++ b/resources/lang/fi/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Tietoja lisensseistä', 'about_licenses' => 'Ohjelmistojen seurantaan käytetään lisenssejä. Lisenssejä on rajattu määrä asennettavaksi', 'checkin' => 'Palauta lisenssi', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Ohjelmistolisenssit', 'user' => 'Käyttäjä', 'view' => 'Näytä lisenssi', -); +]; diff --git a/resources/lang/fi/admin/licenses/message.php b/resources/lang/fi/admin/licenses/message.php index 94a37e7682..7690fb56cf 100644 --- a/resources/lang/fi/admin/licenses/message.php +++ b/resources/lang/fi/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisenssiä ei löydy.', 'user_does_not_exist' => 'Käyttäjää ei löydy.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Sinun on valittava laite tai käyttäjä, mutta ei molempia.', 'not_found' => 'Lisenssiä ei löydy', - - 'create' => array( + 'create' => [ 'error' => 'Lisenssiä ei luotu, yritä uudelleen.', - 'success' => 'Lisenssi luotiin onnistuneesti.' - ), + 'success' => 'Lisenssi luotiin onnistuneesti.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tiedostoa ei poistettu. Ole hyvä ja yritä uudelleen.', 'success' => 'Tiedosto poistettiin onnistuneesti.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tiedostoja ei lähetetty. Ole hyvä ja yritä uudelleen.', 'success' => 'Tiedostot lähetettiin onnistuneesti.', 'nofiles' => 'Et ole valinnut lähetettäviä tiedostoja tai lataamasi tiedosto on liian suuri', 'invalidfiles' => 'Yksi tai useampi tiedosto on liian suuri tai tiedostotyyppiä jota ei sallita. Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml ja lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lisenssiä ei päivitetty, yritä uudelleen', - 'success' => 'Lisenssi päivitettiin onnistuneesti.' - ), + 'success' => 'Lisenssi päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän lisenssin?', 'error' => 'Lisenssin poistamisessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Lisenssi poistettiin onnistuneesti.' - ), + 'success' => 'Lisenssi poistettiin onnistuneesti.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Lisenssin luovutuksessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Lisenssi luovutettiin onnistuneesti' - ), + 'success' => 'Lisenssi luovutettiin onnistuneesti', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Lisenssin palautuksessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Lisenssi palautettiin onnistuneesti' - ), + 'success' => 'Lisenssi palautettiin onnistuneesti', + ], -); +]; diff --git a/resources/lang/fi/admin/licenses/table.php b/resources/lang/fi/admin/licenses/table.php index ebe9e0d07b..3575925be7 100644 --- a/resources/lang/fi/admin/licenses/table.php +++ b/resources/lang/fi/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Luovutettu', 'checkout' => 'Toiminto', @@ -14,4 +14,4 @@ return array( 'serial' => 'Sarjanumero', 'title' => 'Lisenssi', -); +]; diff --git a/resources/lang/fi/admin/locations/message.php b/resources/lang/fi/admin/locations/message.php index 14d4a3d395..5cbed2b7c8 100644 --- a/resources/lang/fi/admin/locations/message.php +++ b/resources/lang/fi/admin/locations/message.php @@ -1,27 +1,26 @@ 'Sijaintia ei löydy.', 'assoc_users' => 'Sijainti on määritetty käyttöön yhdelle tai useammalle käyttäjälle joten sitä ei voida poistaa. Poista sijainti käytöstä kaikilta käyttäjiltä ja yritä uudelleen. ', 'assoc_assets' => 'Sijaintiin on tällä hetkellä liitettynä vähintään yksi laite, eikä sitä voi poistaa. Poista viittaus sijantiin ja yritä uudelleen. ', 'assoc_child_loc' => 'Tämä sijainti on ylempi toiselle sijainnille eikä sitä voi poistaa. Päivitä sijainnit, jotta et enää viitata tähän sijaintiin ja yritä uudelleen. ', - - 'create' => array( + 'create' => [ 'error' => 'Sijaintia ei luotu, yritä uudelleen.', - 'success' => 'Sijainti luotiin onnistuneesti.' - ), + 'success' => 'Sijainti luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Sijaintia ei päivitetty, yritä uudelleen', - 'success' => 'Sijainti päivitettiin onnistuneesti.' - ), + 'success' => 'Sijainti päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän sijainnin?', 'error' => 'Sijainnin poistossa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Sijainti poistettiin onnistuneesti.' - ) + 'success' => 'Sijainti poistettiin onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/locations/table.php b/resources/lang/fi/admin/locations/table.php index 28cff6b460..67dc7ca816 100644 --- a/resources/lang/fi/admin/locations/table.php +++ b/resources/lang/fi/admin/locations/table.php @@ -1,6 +1,6 @@ 'Tietoa sijainneista', 'about_locations' => 'Sijaintia käytetään käyttäjien, laitteiden ja muiden nimikkeiden sijainnin seurantaan', 'assets_rtd' => 'Laitteet', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Ylempi', 'currency' => 'Valuutta', 'ldap_ou' => 'LDAP-haun OU', - ); + ]; diff --git a/resources/lang/fi/admin/manufacturers/message.php b/resources/lang/fi/admin/manufacturers/message.php index ab14fdaff2..cce1a64ad8 100644 --- a/resources/lang/fi/admin/manufacturers/message.php +++ b/resources/lang/fi/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Valmistajaa ei löydy.', 'assoc_users' => 'Valmistaja on määritetty käyttöön yhdelle tai useammalle mallille joten sitä ei voida poistaa. Poista valmistaja käytöstä kaikilta malleilta ja yritä uudelleen. ', - 'create' => array( + 'create' => [ 'error' => 'Valmistajaa ei luotu, ole hyvä ja yritä uudelleen.', - 'success' => 'Valmistaja luotiin onnistuneesti.' - ), + 'success' => 'Valmistaja luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Valmistajaa ei päivitetty, ole hyvä ja yritä uudelleen', - 'success' => 'Valmistaja päivitettiin onnistuneesti.' - ), + 'success' => 'Valmistaja päivitettiin onnistuneesti.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Valmistajaa ei palautettu, ole hyvä ja yritä uudelleen', - 'success' => 'Valmistaja palautettu onnistuneesti.' - ), + 'success' => 'Valmistaja palautettu onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän valmistajan?', 'error' => 'Valmistajan poistamisessa tapahtui virhe. Ole hyvä ja yritä uudelleen.', - 'success' => 'Valmistaja poistettiin onnistuneesti.' - ) + 'success' => 'Valmistaja poistettiin onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/manufacturers/table.php b/resources/lang/fi/admin/manufacturers/table.php index ec3e0b8e0f..15dff37ddf 100644 --- a/resources/lang/fi/admin/manufacturers/table.php +++ b/resources/lang/fi/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Tietoja valmistajista', 'about_manufacturers_text' => 'Valmistajat ovat yrityksiä, jotka valmistavat laitteesi. Voit tallentaa tähän tärkeitä yhteystietoja, jotka näkyvät laitteen sivulla.', 'asset_manufacturers' => 'Laitevalmistajat', @@ -13,4 +13,4 @@ return array( 'update' => 'Päivitä valmistaja', 'url' => 'URL', -); +]; diff --git a/resources/lang/fi/admin/models/general.php b/resources/lang/fi/admin/models/general.php index 20962a6713..8cdca9361a 100644 --- a/resources/lang/fi/admin/models/general.php +++ b/resources/lang/fi/admin/models/general.php @@ -1,6 +1,6 @@ 'Tietoja laitemalleista', 'about_models_text' => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.', 'deleted' => 'Tämä malli on poistettu. Vaihda tästä palauttaaksesi sen.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Olet poistamassa :model_count laitemallia.', 'restore' => 'Palauta malli', 'requestable' => 'Käyttäjät voivat pyytää tätä mallia', - 'show_mac_address' => 'Näytä MAC-osoitekenttä tämän mallin laitteille', + 'show_mac_address' => 'Näytä MAC-osoitekenttä tämän mallin laitteille', 'view_deleted' => 'Näytä poistetut', 'view_models' => 'Näytä mallit', 'fieldset' => 'Kenttäsarja', 'no_custom_field' => 'Ei mukautettuja kenttiä', 'add_default_values' => 'Lisää oletusarvot', -); +]; diff --git a/resources/lang/fi/admin/models/message.php b/resources/lang/fi/admin/models/message.php index 4f1d10bbc8..e3d49fb909 100644 --- a/resources/lang/fi/admin/models/message.php +++ b/resources/lang/fi/admin/models/message.php @@ -1,42 +1,41 @@ 'Malli ei löydy.', 'assoc_users' => 'Tämä malli on käytössä yhdellä tai useammalla laitteella joten sitä ei voida poistaa. Poista malli käytöstä kaikilta laitteilta ja yritä uudelleen. ', - - 'create' => array( + 'create' => [ 'error' => 'Mallia ei luotu, yritä uudelleen.', 'success' => 'Malli luotiin onnistuneesti.', 'duplicate_set' => 'Tämän nimen, valmistajan ja mallinumeron omaava laitemalli on jo olemassa.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Mallia ei päivitetty, yritä uudelleen', - 'success' => 'Malli päivitettiin onnistuneesti.' - ), + 'success' => 'Malli päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän laitemallin?', 'error' => 'Laitemallin poistossa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Malli poistettiin onnistuneesti.' - ), + 'success' => 'Malli poistettiin onnistuneesti.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Mallia ei voitu palauttaa, yritä uudelleen', - 'success' => 'Mallin palautus onnistui.' - ), + 'success' => 'Mallin palautus onnistui.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Mitään kentistä ei ollut muutettu, joten mitään ei päivitetty.', - 'success' => 'Mallit päivitetty.' - ), + 'success' => 'Mallit päivitetty.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ei malleja valittuna, mitään ei poistettu.', 'success' => ':success_count malli(a) poistettu!', - 'success_partial' => ':success_count malli(a) poistettiin, mutta :fail_count ei voitu poistaa, koska niillä on vielä niihin liittyviä laitteita.' - ), + 'success_partial' => ':success_count malli(a) poistettiin, mutta :fail_count ei voitu poistaa, koska niillä on vielä niihin liittyviä laitteita.', + ], -); +]; diff --git a/resources/lang/fi/admin/models/table.php b/resources/lang/fi/admin/models/table.php index 4e9202cc40..097f9cd6a6 100644 --- a/resources/lang/fi/admin/models/table.php +++ b/resources/lang/fi/admin/models/table.php @@ -1,6 +1,6 @@ 'Uusi laitemalli', 'created_at' => 'Luontiaika', @@ -14,4 +14,4 @@ return array( 'update' => 'Päivitä laitemalli', 'clone' => 'Monista malli', 'edit' => 'Muokkaa mallia', -); +]; diff --git a/resources/lang/fi/admin/reports/general.php b/resources/lang/fi/admin/reports/general.php index da007d24db..3bfdb5fc7a 100644 --- a/resources/lang/fi/admin/reports/general.php +++ b/resources/lang/fi/admin/reports/general.php @@ -1,5 +1,5 @@ 'Valitse vaihtoehdot jotka haluat laiteraportillesi.' -); +return [ + 'info' => 'Valitse vaihtoehdot jotka haluat laiteraportillesi.', +]; diff --git a/resources/lang/fi/admin/reports/message.php b/resources/lang/fi/admin/reports/message.php index 3fcab0d17d..9321302dd3 100644 --- a/resources/lang/fi/admin/reports/message.php +++ b/resources/lang/fi/admin/reports/message.php @@ -1,5 +1,5 @@ 'Sinun tulee valita ainakin YKSI vaihtoehto.' -); +return [ + 'error' => 'Sinun tulee valita ainakin YKSI vaihtoehto.', +]; diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php index 28e4cc306e..b8c5f4d34c 100644 --- a/resources/lang/fi/admin/settings/general.php +++ b/resources/lang/fi/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory -toimialue', 'ad_domain_help' => 'Tämä on joskus sama kuin sähköpostiosoitteesi loppuosa, mutta ei aina.', 'ad_append_domain_label' => 'Lisää toimialueen nimi loppuun', 'ad_append_domain' => 'Lisää toimialueen nimi käyttäjänimikentän loppuun', - 'ad_append_domain_help' => 'Käyttäjätunnusta ei tarvitse kirjoittaa muodossa "käyttätunnus@domain.local", pelkkä "käyttäjätunnus" riittää.' , + 'ad_append_domain_help' => 'Käyttäjätunnusta ei tarvitse kirjoittaa muodossa "käyttätunnus@domain.local", pelkkä "käyttäjätunnus" riittää.', 'admin_cc_email' => 'Kopio sähköpostiosoite', 'admin_cc_email_help' => 'Mikäli haluat lähettää erilliseen sähköpostiosoitteeseen kopion käyttäjälle lähetettävästä sähköposti-ilmoituksesta palautuksiin/luovutuksiin liittyen, syötä se tähän. Muussa tapauksessa jätä kenttä tyhjäksi.', 'is_ad' => 'Käytössä on Active Directory -palvelin', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Kynnys ilmoituksille vanhentuvista (päivinä)', 'alert_inv_threshold' => 'Varaston hälytysraja', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Laitetunnisteet', 'audit_interval' => 'Tarkastusväli', 'audit_interval_help' => 'Jos sinun on säännöllisesti tarkastettava laitteesi, anna aikaväli kuukausina.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Syötä MFA koodi', 'two_factor_config_complete' => 'Lähetä koodi', 'two_factor_enabled_edit_not_allowed' => 'Järjestelmänvalvoja ei salli sinun muokata tätä asetusta.', - 'two_factor_enrollment_text' => "Kaksivaiheinen tunnistautuminen vaaditaan, mutta et ole rekisteröinyt itsellesi laitetta. Avaa Google Authenticator -sovellus ja skannaa alla oleva QR-koodi rekisteröidäksesi laitteesi. Kun olet rekisteröinyt laitteesi, kirjoita koodi", + 'two_factor_enrollment_text' => 'Kaksivaiheinen tunnistautuminen vaaditaan, mutta et ole rekisteröinyt itsellesi laitetta. Avaa Google Authenticator -sovellus ja skannaa alla oleva QR-koodi rekisteröidäksesi laitteesi. Kun olet rekisteröinyt laitteesi, kirjoita koodi', 'require_accept_signature' => 'Vaadi allekirjoitus', 'require_accept_signature_help_text' => 'Tämän ominaisuuden ottaminen käyttöön edellyttää käyttäjiltä allekirjoitusta hyväksymisen yhteydessä.', 'left' => 'vasen', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Vaadi laitteilta yksilölliset sarjanumerot', 'zerofill_count' => 'Laitetunnisteen pituus, mukaan lukien nollat', 'username_format_help' => 'Käytetään tietoja tuodessa, jos käyttäjänimeä ei ole annettu ja nimitietojen perusteella on luotava käyttäjälle käyttäjätunnus.', -); +]; diff --git a/resources/lang/fi/admin/settings/message.php b/resources/lang/fi/admin/settings/message.php index 0d3d969185..0f29ee5a4e 100644 --- a/resources/lang/fi/admin/settings/message.php +++ b/resources/lang/fi/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Päivityksessä tapahtui virhe. ', - 'success' => 'Asetukset päivitettiin onnistuneesti.' - ), - 'backup' => array( + 'success' => 'Asetukset päivitettiin onnistuneesti.', + ], + 'backup' => [ 'delete_confirm' => 'Haluatko varmasti poistaa tämän varmuuskopiotiedoston? Tätä toimintoa ei voi kumota.', 'file_deleted' => 'Varmuuskopiotiedosto on poistettu onnistuneesti.', 'generated' => 'Uusi varmuuskopiotiedosto luotiin onnistuneesti.', 'file_not_found' => 'Tätä varmuuskopiotiedostoa ei löytynyt palvelimelta.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Virhe on ilmennyt puhdistuksen aikana.', 'validation_failed' => 'Puhdistusvahvistus on virheellinen. Kirjoita vahvistusruutuun sana "DELETE".', - 'success' => 'Poistetut tietueet puhdistettu onnistuneesti.' - ), + 'success' => 'Poistetut tietueet puhdistettu onnistuneesti.', + ], -); +]; diff --git a/resources/lang/fi/admin/statuslabels/message.php b/resources/lang/fi/admin/statuslabels/message.php index 9c80de175b..e2937f9aba 100644 --- a/resources/lang/fi/admin/statuslabels/message.php +++ b/resources/lang/fi/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Tilamerkintää ei löydy.', 'assoc_assets' => 'Tilamerkintä on määritetty käyttöön yhdelle tai useammalle laitteelle joten sitä ei voida poistaa. Poista tilamerkintä käytöstä kaikilta laitteilta ja yritä uudelleen. ', - - 'create' => array( + 'create' => [ 'error' => 'Tilamerkintää ei luotu, yritä uudelleen.', - 'success' => 'Tilamerkintä luotiin onnistuneesti.' - ), + 'success' => 'Tilamerkintä luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tilamerkintää ei päivitetty, yritä uudelleen', - 'success' => 'Tilamerkintä päivitettiin onnistuneesti.' - ), + 'success' => 'Tilamerkintä päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän tilamerkinnän?', 'error' => 'Tilamerkinnän poistamisessa tapahtui virhe. Yritä uudelleen.', - 'success' => 'Tilamerkintä poistettiin onnistuneesti.' - ), + 'success' => 'Tilamerkintä poistettiin onnistuneesti.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Näitä laitteita ei voida luovuttaa kenellekään.', 'deployable' => 'Nämä laitteet voidaan luovuttaa. Kun ne on luovutettu, ne saavat tilamerkinnän Käyttöönotettu.', 'archived' => 'Näitä laitteita ei voi luovuttaa, ja ne näkyvät vain Arkistoitu-näkymässä. Tämä on hyödyllistä, kun säilytetään tietoja laitteista budjetointiin / historiallisiin tarkoituksiin.', 'pending' => 'Näitä laitteita ei voida vielä antaa kenellekään. Käytä vaikka laitteille jotka ovat korjauksessa, mutta joiden odotetaan palaavan käyttöön.', - ), + ], -); +]; diff --git a/resources/lang/fi/admin/statuslabels/table.php b/resources/lang/fi/admin/statuslabels/table.php index 07c3a9802d..6cb24b03a1 100644 --- a/resources/lang/fi/admin/statuslabels/table.php +++ b/resources/lang/fi/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Tietoja tilamerkinnöistä', 'archived' => 'Arkistoitu', 'create' => 'Uusi tilamerkintä', @@ -16,4 +16,4 @@ return array( 'title' => 'Tilamerkinnät', 'undeployable' => 'Ei käytettävissä', 'update' => 'Päivitä tilamerkinnät', -); +]; diff --git a/resources/lang/fi/admin/suppliers/message.php b/resources/lang/fi/admin/suppliers/message.php index 0b5cb2c203..b8e4507af4 100644 --- a/resources/lang/fi/admin/suppliers/message.php +++ b/resources/lang/fi/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Toimittajaa ei löydy.', - - 'create' => array( + 'create' => [ 'error' => 'Toimittajaa ei luotu, yritä uudelleen.', - 'success' => 'Toimittaja luotiin onnistuneesti.' - ), + 'success' => 'Toimittaja luotiin onnistuneesti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Toimittajaa ei päivitetty, yritä uudelleen', - 'success' => 'Toimittaja päivitettiin onnistuneesti.' - ), + 'success' => 'Toimittaja päivitettiin onnistuneesti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Oletko varma että haluat poistaa tämän toimittajan?', 'error' => 'Toimittajan poistossa tapahtui virhe. Yritä uudelleen.', 'success' => 'Toimittaja poistettiin onnistuneesti.', 'assoc_assets' => 'Tähän toimittajaan liittyy tällä hetkellä :asset_count laitetta ja sitä ei voi poistaa. Ole hyvä ja päivitä laitteet, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ', 'assoc_licenses' => 'Tähän toimittajaan liittyy tällä hetkellä :licenses_count lisenssiä ja sitä ei voi poistaa. Ole hyvä ja päivitä lisenssit, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ', 'assoc_maintenances' => 'Tähän toimittajaan liittyy tällä hetkellä :asset_maintenances_count huoltoa ja sitä ei voi poistaa. Ole hyvä ja päivitä huoltotietosi , poista viittaukset tähän toimittajaan ja yritä uudelleen. ', - ) + ], -); +]; diff --git a/resources/lang/fi/admin/suppliers/table.php b/resources/lang/fi/admin/suppliers/table.php index 9f3a14464f..8fbcc28a82 100644 --- a/resources/lang/fi/admin/suppliers/table.php +++ b/resources/lang/fi/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Tietoa toimittajista', 'about_suppliers_text' => 'Toimittajien avulla seurataan nimikkeiden lähdettä', 'address' => 'Toimittajan osoite', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Laitteet kohteella', 'zip' => 'Postinumero', -); +]; diff --git a/resources/lang/fi/admin/users/general.php b/resources/lang/fi/admin/users/general.php index cfde4e2cc5..a37d41c864 100644 --- a/resources/lang/fi/admin/users/general.php +++ b/resources/lang/fi/admin/users/general.php @@ -1,7 +1,6 @@ 'Salli kirjautuminen', 'activated_disabled_help_text' => 'Et voi muokata oman tilisi aktivoinnin tilaa.', 'assets_user' => 'Käyttäjälle :name luovutetut laitteet', @@ -13,7 +12,7 @@ return array( 'edit' => 'Muokkaa käyttäjää', 'filetype_info' => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, txt, zip ja rar.', 'history_user' => 'Historia käyttäjälle :name', - 'info' => 'Tiedot', + 'info' => 'Tiedot', 'restore_user' => 'Klikkaa tästä palauttaaksesi ne.', 'last_login' => 'Viimeisin kirjautuminen', 'ldap_config_text' => 'LDAP-asetukset löytyvät kohdasta Järjestelmänvalvoja> Asetukset. Valittu (valinnainen) sijainti määritetään kaikille tuodulle käyttäjälle.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Nykyiset järjestelmänvalvojan asetukset mahdollistavat kaksivaiheisen tunnistautumisen käyttöönoton valituille käyttäjille. ', 'two_factor_enrolled' => 'MFA-laite ilmoittautunut mukaan ', 'two_factor_active' => 'MFA aktiivinen', - ); + ]; diff --git a/resources/lang/fi/admin/users/message.php b/resources/lang/fi/admin/users/message.php index b88b73dccc..0e3b83977f 100644 --- a/resources/lang/fi/admin/users/message.php +++ b/resources/lang/fi/admin/users/message.php @@ -1,6 +1,6 @@ 'Olet hyväksynyt tämän laitteen.', 'declined' => 'Olet onnistuneesti hylännyt tämän laitteen.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP-integraatiota ei ole määritetty tähän asennukseen.', 'password_resets_sent' => 'Salasanan resetointilinkki on lähetetty niille käyttäjille, joille on määritetty voimassa oleva sähköpostiosoite.', - - 'success' => array( + 'success' => [ 'create' => 'Käyttäjä luotiin onnistuneesti.', 'update' => 'Käyttäjä päivitettiin onnistuneesti.', 'update_bulk' => 'Käyttäjät päivitettiin onnistuneesti!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Käyttäjän jäädytys poistettiin onnistuneesti.', 'restored' => 'Käyttäjä palautettiin onnistuneesti.', 'import' => 'Käyttäjät tuotiin onnistuneesti.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Käyttäjä luonnissa tapahtui virhe. Yritä uudelleen.', 'update' => 'Käyttäjän päivityksessä tapahtui virhe. Yritä uudelleen.', 'delete' => 'Käyttäjän poistamisessa tapahtui virhe. Yritä uudelleen.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Haku LDAP-palvelimelta ei onnistunut ei voitu hakea. Tarkista LDAP-palvelimen määritys.
LDAP-palvelimen virhe:', 'ldap_could_not_get_entries' => 'LDAP-palvelimelta ei palautunut kohteita. Tarkista LDAP-palvelimen määritys.
LDAP-palvelimen virhe:', 'password_ldap' => 'Tätä salasanaa hallinnoi LDAP / Active Directory. Vaihda salasanasi IT-osastolla.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tiedostoa ei ole poistettu. Yritä uudelleen.', 'success' => 'Tiedosto onnistuneesti poistettu.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tiedostoja ei ole ladattu. Yritä uudelleen.', 'success' => 'Tiedostot lähetettiin onnistuneesti.', 'nofiles' => 'Et valinnut yhtään tiedostoa lähetettäväksi', 'invalidfiles' => 'Yksi tai useampi tiedosto on liian suuri tai on tiedostotyyppi, jota ei sallita. Sallitut tiedostotyypit ovat png, gif, jpg, doc, docx, pdf ja txt.', - ), + ], -); +]; diff --git a/resources/lang/fi/admin/users/table.php b/resources/lang/fi/admin/users/table.php index 8be3870c01..65c9c39729 100644 --- a/resources/lang/fi/admin/users/table.php +++ b/resources/lang/fi/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktiivinen', 'allow' => 'Salli', 'checkedout' => 'Laitteet', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Näytä nykyiset käyttäjät', 'show_deleted' => 'Näytä poistetut käyttäjät', 'title' => 'Titteli', - 'to_restore_them' => 'palauttaa ne.', + 'to_restore_them' => 'palauttaa ne.', 'updateuser' => 'Päivitä käyttäjä', 'username' => 'Käyttäjätunnus', - 'user_deleted_text' => 'Tämä käyttäjä on merkitty poistetuksi.', + 'user_deleted_text' => 'Tämä käyttäjä on merkitty poistetuksi.', 'username_note' => '(Tätä käytetään vain Active Directory synkronointiin, ei kirjautumista varten.)', 'cloneuser' => 'Monista käyttäjä', 'viewusers' => 'Näytä käyttäjät', -); +]; diff --git a/resources/lang/fi/auth/general.php b/resources/lang/fi/auth/general.php index 671324e57b..0a7ec12621 100644 --- a/resources/lang/fi/auth/general.php +++ b/resources/lang/fi/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Palauttaaksesi salasanasi sähköpostilla, anna käyttäjätunnuksesi.', 'username_help_bottom' => 'Käyttäjätunnuksesi ja sähköpostiosoitteesi voivat olla samoja, mutta eivät välttämättä. Jos et muista käyttäjätunnustasi, ota yhteyttä järjestelmänvalvojaan.

Käyttäjätunnuksille, joilla ei ole liitettyä sähköpostiosoitetta, ei voida lähettää sähköpostiin salasanan vaihtamislinkkiä. ', ]; - diff --git a/resources/lang/fi/auth/message.php b/resources/lang/fi/auth/message.php index 52cdbcd82e..7292a71d9b 100644 --- a/resources/lang/fi/auth/message.php +++ b/resources/lang/fi/auth/message.php @@ -1,6 +1,6 @@ 'Tällä sähköpostiosoitteella löytyy jo käyttäjätili.', 'account_not_found' => 'Käyttäjänimi tai salasana on virheellinen.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Käyttäjätili on estetty.', 'throttle' => 'Liian monta kirjautumisyritystä. Yritä uudelleen :minutes minuutin kuluttua.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Laitteesi on jo käytössä.', 'success' => 'Sisäänkirjautuminen onnistui.', 'code_required' => 'MFA koodi on pakollinen.', 'invalid_code' => 'MFA koodi on virheellinen.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Sisäänkirjautumisessa tapahtui virhe, yritä uudelleen.', 'success' => 'Sisäänkirjautuminen onnistui.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Sisäänkirjautumisessa tapahtui virhe, yritä uudelleen.', 'success' => 'Olet kirjautunut ulos.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Käyttäjätilin luonnissa tapahtui virhe, yritä uudelleen.', 'success' => 'Käyttäjätili luotu onnistuneesti.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Salasanan nollauksessa tapahtui virhe, yritä uudelleen.', 'success' => 'Jos sähköpostiosoite on järjestelmässä, salasanan palautus sähköposti on lähetetty.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Salasanan nollauksessa tapahtui virhe, yritä uudelleen.', 'success' => 'Salasana on nollattu onnistuneesti.', - ), + ], - -); +]; diff --git a/resources/lang/fi/button.php b/resources/lang/fi/button.php index ca3daeeae5..3535183473 100644 --- a/resources/lang/fi/button.php +++ b/resources/lang/fi/button.php @@ -1,6 +1,6 @@ 'Toiminnot', 'add' => 'Lisää uusi', 'cancel' => 'Peruuta', @@ -11,7 +11,7 @@ return array( 'request' => 'Pyydä', 'submit' => 'Lähetä', 'upload' => 'Lähetä', - 'select_file' => 'Valitse tiedosto...', + 'select_file' => 'Valitse tiedosto...', 'select_files' => 'Valitse tiedostot...', 'generate_labels' => '{1} Luo tunniste |[2, *] Luo tunnisteet', -); +]; diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php index ed9179aefb..8ae0dcd02c 100644 --- a/resources/lang/fi/general.php +++ b/resources/lang/fi/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Palautukset', 'user_requests_count' => 'Pyynnöt', 'city' => 'Kaupunki', - 'click_here' => 'Klikkaa tästä', + 'click_here' => 'Klikkaa tästä', 'clear_selection' => 'Tyhjennä valinta', 'companies' => 'Yritykset', 'company' => 'Yritys', 'component' => 'Komponentti', 'components' => 'Komponentit', - 'complete' => 'Valmis', + 'complete' => 'Valmis', 'consumable' => 'Kulutustarvike', 'consumables' => 'Kulutustarvikkeet', 'country' => 'Maa', diff --git a/resources/lang/fi/help.php b/resources/lang/fi/help.php index 0891688bb6..a96523e577 100644 --- a/resources/lang/fi/help.php +++ b/resources/lang/fi/help.php @@ -1,6 +1,6 @@ "Lisätietoa", + 'more_info_title' => 'Lisätietoa', - "audit_help" => "Tämän valitseminen muuttaa laitetiedot vastaamaan uutta sijaintia. Jos sitä ei ole valittu, sijainti kirjataan vain lokiin.

Huomaa, että jos laite on jo luovutettuna, tämä ei muuta sen henkilön, tai laitteen sijaintia mihin se on luovutettuna.", + 'audit_help' => 'Tämän valitseminen muuttaa laitetiedot vastaamaan uutta sijaintia. Jos sitä ei ole valittu, sijainti kirjataan vain lokiin.

Huomaa, että jos laite on jo luovutettuna, tämä ei muuta sen henkilön, tai laitteen sijaintia mihin se on luovutettuna.', 'assets' => 'Laitteet ovat nimmeitä joita seurataan sarjanumeron tai laitetunnisteen avulla. Laitteiksi määritellään yleensä arvokkaampaa omaisuutta, joiden tunnistaminen yksilöllisesti on tärkeää.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Voit määrittää laitteille poistoja poistaaksesi omaisuuden arvoa suoraviivaisesti laskien.', - - -); +]; diff --git a/resources/lang/fi/mail.php b/resources/lang/fi/mail.php index 255057d297..053f86c29f 100644 --- a/resources/lang/fi/mail.php +++ b/resources/lang/fi/mail.php @@ -1,6 +1,6 @@ 'Käyttäjä on peruuttanut nimikkeen pyynnön sivustolla', 'a_user_requested' => 'Käyttäjä on pyytänyt nimikettä sivustolla', 'accessory_name' => 'Oheistarvikkeen nimi:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Odotettujen palautuspäivien raportti', 'Expected_Checkin_Notification' => 'Muistutus: :name palautuspäivä lähestyy', 'Expected_Checkin_Date' => 'Sinulle luovutettu laite on määrä palauttaa takaisin :date', - 'your_assets' => 'Omat laitteesi' -); + 'your_assets' => 'Omat laitteesi', +]; diff --git a/resources/lang/fi/pagination.php b/resources/lang/fi/pagination.php index f295a20187..5ca66655f6 100644 --- a/resources/lang/fi/pagination.php +++ b/resources/lang/fi/pagination.php @@ -1,6 +1,6 @@ 'Seuraava »', -); +]; diff --git a/resources/lang/fi/passwords.php b/resources/lang/fi/passwords.php index 59c5b1b347..6c0b8c389e 100644 --- a/resources/lang/fi/passwords.php +++ b/resources/lang/fi/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Salasanalinkki on lähetetty!', 'user' => 'Sähköpostille ei löytynyt käyttäjää.', ]; - diff --git a/resources/lang/fi/reminders.php b/resources/lang/fi/reminders.php index 1704e52668..74d9ca9d8f 100644 --- a/resources/lang/fi/reminders.php +++ b/resources/lang/fi/reminders.php @@ -1,6 +1,6 @@ "Salasanan tulee olla 6 merkkiä pitkä ja sen tulee täsmätä vahvistukseen.", + 'password' => 'Salasanan tulee olla 6 merkkiä pitkä ja sen tulee täsmätä vahvistukseen.', - "user" => "Käyttäjätunnus tai sähköpostiosoite on virheellinen", + 'user' => 'Käyttäjätunnus tai sähköpostiosoite on virheellinen', - "token" => "Tämä salasanan nollauspoletti on virheellinen.", + 'token' => 'Tämä salasanan nollauspoletti on virheellinen.', - "sent" => "Jos sähköpostiosoite löytyi, salasanan muistutusviesti lähetettiin!", + 'sent' => 'Jos sähköpostiosoite löytyi, salasanan muistutusviesti lähetettiin!', -); +]; diff --git a/resources/lang/fi/table.php b/resources/lang/fi/table.php index 5b07f4713c..556de6ebb1 100644 --- a/resources/lang/fi/table.php +++ b/resources/lang/fi/table.php @@ -1,10 +1,10 @@ 'Toiminnot', 'action' => 'Toiminto', 'by' => 'Suorittaja', 'item' => 'Nimike', -); +]; diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php index cc0e183d0c..dc3b01972e 100644 --- a/resources/lang/fi/validation.php +++ b/resources/lang/fi/validation.php @@ -1,6 +1,6 @@ ':attribute on jo käytössä.', 'uploaded' => ':attribute -kenttää ei onnistuttu lähettämään.', 'url' => ':attribute muotoilu on virheellinen.', - "unique_undeleted" => ":attribute on oltava ainutlaatuinen.", + 'unique_undeleted' => ':attribute on oltava ainutlaatuinen.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute -kenttä sisältää merkin, jota ei sallita.", - "email_array" => "Yksi tai useampi sähköpostiosoite on virheellinen.", - "hashed_pass" => "Nykyinen salasanasi on virheellinen", + 'alpha_space' => ':attribute -kenttä sisältää merkin, jota ei sallita.', + 'email_array' => 'Yksi tai useampi sähköpostiosoite on virheellinen.', + 'hashed_pass' => 'Nykyinen salasanasi on virheellinen', 'dumbpwd' => 'Salasana on liian yleinen.', - "statuslabel_type" => "Sinun on valittava kelvollinen tilamerkintätyyppi", + 'statuslabel_type' => 'Sinun on valittava kelvollinen tilamerkintätyyppi', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/fil/admin/accessories/general.php b/resources/lang/fil/admin/accessories/general.php index 7c353d3629..30133d646e 100644 --- a/resources/lang/fil/admin/accessories/general.php +++ b/resources/lang/fil/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Ang Katergorya sa Aksesorya', 'accessory_name' => 'Ang Pangalan ng Aksesorya', 'checkout' => 'I-checkout ang Aksesorya', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Sa halip ay gamitin ang ang pangunahing default ng EULA.', 'use_default_eula_disabled' => 'Sa halip ay gumamit ng pangunahing default na EULA. Walang pangunahing default na EULA na nai-set. Paki-dagdag ng isa sa mga setting.', -); +]; diff --git a/resources/lang/fil/admin/accessories/message.php b/resources/lang/fil/admin/accessories/message.php index 4c25713a2f..17a079386c 100644 --- a/resources/lang/fil/admin/accessories/message.php +++ b/resources/lang/fil/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Ang aksesoryang ito ay kasalukuyang mayroong :pag-check out sa pag-kwenta ng mga aytem sa mga gumagamit o user. Paki-tingnan sa mga aksesorya at subukang muli. ', - 'create' => array( + 'create' => [ 'error' => 'Ang aksesorya ay hindi naisagawa, mangyaring subukan muli.', - 'success' => 'Ang aksesorya ay matagumpay na nailikha.' - ), + 'success' => 'Ang aksesorya ay matagumpay na nailikha.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang aksesorya ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang aksesorya ay matagumpay na nai-upadate.' - ), + 'success' => 'Ang aksesorya ay matagumpay na nai-upadate.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang aksesoryang ito?', 'error' => 'Mayroong isyu sa pagdelete ng aksesorya. Mangyaring subukang muli.', - 'success' => 'Ang aksesorya ay matagumpay na nai-delete.' - ), + 'success' => 'Ang aksesorya ay matagumpay na nai-delete.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ang aksesorya ay hindi na-check out, mangyaring subukang muli', 'success' => 'Ang aksesorya ay matagumoay na nai-check out.', - 'user_does_not_exist' => 'Ang user na iyon ay hindi tama. Mangyaring subukang muli.' - ), + 'user_does_not_exist' => 'Ang user na iyon ay hindi tama. Mangyaring subukang muli.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ang aksesorya ay hindi nai-check in, mangyaring subukang muli', 'success' => 'Ang aksesorya ay matagumpay na nai-check in.', - 'user_does_not_exist' => 'Ang ang user na iyon ay hindi tama. Mangyaring subukang muli.' - ) + 'user_does_not_exist' => 'Ang ang user na iyon ay hindi tama. Mangyaring subukang muli.', + ], - -); +]; diff --git a/resources/lang/fil/admin/accessories/table.php b/resources/lang/fil/admin/accessories/table.php index 6a11d59383..dc26f0c921 100644 --- a/resources/lang/fil/admin/accessories/table.php +++ b/resources/lang/fil/admin/accessories/table.php @@ -1,11 +1,10 @@ 'I-download ang CSV', - 'eula_text' => 'Ang EULA', +return [ + 'dl_csv' => 'I-download ang CSV', + 'eula_text' => 'Ang EULA', 'id' => 'Ang ID', 'require_acceptance' => 'Ang Pagtanggap', 'title' => 'Ang Pangalan ng Aksesorya', - -); +]; diff --git a/resources/lang/fil/admin/asset_maintenances/form.php b/resources/lang/fil/admin/asset_maintenances/form.php index c800b1753b..9d2a340884 100644 --- a/resources/lang/fil/admin/asset_maintenances/form.php +++ b/resources/lang/fil/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Mga Araw', 'notes' => 'Mga Palatandaan', 'update' => 'I-update', - 'create' => 'Magsagawa' + 'create' => 'Magsagawa', ]; diff --git a/resources/lang/fil/admin/asset_maintenances/message.php b/resources/lang/fil/admin/asset_maintenances/message.php index 4785205f1a..26751cd5a9 100644 --- a/resources/lang/fil/admin/asset_maintenances/message.php +++ b/resources/lang/fil/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang asset maintenance na ito?', 'error' => 'May natagpuang isyu sa pag-delete ng asset maintenance. Mangyaring subukang muli.', - 'success' => 'Ang asset maintenance ay matagumpay na nai-delete.' + 'success' => 'Ang asset maintenance ay matagumpay na nai-delete.', ], 'create' => [ 'error' => 'Ang Asset Maintenace ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Matagumpay na naisagawa ang Asset Maintenance.' + 'success' => 'Matagumpay na naisagawa ang Asset Maintenance.', ], 'edit' => [ 'error' => 'Ang Asset Maintenace ay hindi na-edit, mangyaring subukang muli.', - 'success' => 'Ang Asset Maintenance ay matagumay nang na-edit.' + 'success' => 'Ang Asset Maintenance ay matagumay nang na-edit.', ], 'asset_maintenance_incomplete' => 'Hindi pa nakompleto', 'warranty' => 'Ang warantiya', 'not_warranty' => 'Hindi Warantiya', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/fil/admin/asset_maintenances/table.php b/resources/lang/fil/admin/asset_maintenances/table.php index 53c84ce789..6ab7b89117 100644 --- a/resources/lang/fil/admin/asset_maintenances/table.php +++ b/resources/lang/fil/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Ang Asset Maintenance', 'asset_name' => 'Ang Pangalan ng Asset', 'is_warranty' => 'Ang Warantiya', - 'dl_csv' => 'I-download ang CSV' + 'dl_csv' => 'I-download ang CSV', ]; diff --git a/resources/lang/fil/admin/categories/general.php b/resources/lang/fil/admin/categories/general.php index 9c76faa691..277e485ad2 100644 --- a/resources/lang/fil/admin/categories/general.php +++ b/resources/lang/fil/admin/categories/general.php @@ -1,6 +1,6 @@ 'Ang mga Kategorya ng Asset', 'category_name' => 'Ang Pangalan ng Kategorya', 'checkin_email' => 'Padalhan ng email yung user pag mag-checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Sa halip ay gamitin ang ang pangunahing default ng EULA.', 'use_default_eula_disabled' => 'Sa halip ay gumamit ng pangunahing default na EULA. Walang pangunahing default na EULA na nai-set. Paki-dagdag ng isa sa mga setting.', -); +]; diff --git a/resources/lang/fil/admin/categories/message.php b/resources/lang/fil/admin/categories/message.php index 88f8534c82..e3e8cf4a34 100644 --- a/resources/lang/fil/admin/categories/message.php +++ b/resources/lang/fil/admin/categories/message.php @@ -1,25 +1,25 @@ 'Hindi umiiral ang mga kategoryang ito.', 'assoc_models' => 'Ang kategorya ay kasalukuyang naiugnay sa hindi bumaba sa isang modelo at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga modelo upang hindi na mag-reperens sa katergoryang ito at muling subukan. ', 'assoc_items' => 'Ang kategoryang ito ay kasalukuyang naiugnay sa hindi bumaba sa isang : asset_type at hindi maaaring mai-delete. Mangyaring i-update ang iyong asset :asset_type para hindi na magreperens sa kategoryang ito at muling subukan. ', - 'create' => array( + 'create' => [ 'error' => 'Hindi naisagawa ang kategoryang ito, mangyaring subukang muli.', - 'success' => 'Matagumpay na naisagwa ang kategorya.' - ), + 'success' => 'Matagumpay na naisagwa ang kategorya.', + ], - 'update' => array( + 'update' => [ 'error' => 'Hindi na-update ang kategorya, mangyaring subukang muli', - 'success' => 'Matagumpay na nai-update ang kategorya.' - ), + 'success' => 'Matagumpay na nai-update ang kategorya.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang kategoryang ito?', 'error' => 'Mayroong isyu sa pag-delete ng kategoryan. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang kategorya.' - ) + 'success' => 'Matagumpay na nai-delete ang kategorya.', + ], -); +]; diff --git a/resources/lang/fil/admin/categories/table.php b/resources/lang/fil/admin/categories/table.php index 31c5137547..e313d6ad37 100644 --- a/resources/lang/fil/admin/categories/table.php +++ b/resources/lang/fil/admin/categories/table.php @@ -1,10 +1,10 @@ 'Ang EULA', +return [ + 'eula_text' => 'Ang EULA', 'id' => 'Ang ID', 'parent' => 'Pinagmulan', 'require_acceptance' => 'Ang Pagtanggap', 'title' => 'Ang Pangalan ng Kategorya ng Asset', -); +]; diff --git a/resources/lang/fil/admin/companies/general.php b/resources/lang/fil/admin/companies/general.php index 15371ce343..e491f846c3 100644 --- a/resources/lang/fil/admin/companies/general.php +++ b/resources/lang/fil/admin/companies/general.php @@ -1,4 +1,5 @@ 'Pumili ng Kumpanya', ]; diff --git a/resources/lang/fil/admin/companies/message.php b/resources/lang/fil/admin/companies/message.php index dab7d69443..f74c9a0932 100644 --- a/resources/lang/fil/admin/companies/message.php +++ b/resources/lang/fil/admin/companies/message.php @@ -1,18 +1,19 @@ 'Ang Kumpanya ay hindi umiiral.', 'assoc_users' => 'Ang kategoryang ito ay kasalukuyang naiugnay sa hindi bumaba sa isang modelo at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga modelo upang hindi na magreperens sa kumpanyang ito at paki-subok muli. ', - 'create' => array( + 'create' => [ 'error' => 'Ang kumpanya ay hindi naisagawa, magyaring subukang muli.', - 'success' => 'Ang kumpanya ay matagumpay na naisagawa.' - ), - 'update' => array( + 'success' => 'Ang kumpanya ay matagumpay na naisagawa.', + ], + 'update' => [ 'error' => 'Ang kumpanya ay hindi nai-update, magyaring subukang muli', - 'success' => 'Ang kumpanya ay matagumpay na nai-update.' - ), - 'delete' => array( + 'success' => 'Ang kumpanya ay matagumpay na nai-update.', + ], + 'delete' => [ 'confirm' => 'Sigurado kaba na i-delete mo ang kumpanyang ito?', 'error' => 'Mayroong isyu sa pag-delete ng kumpanya. Mangayaring subukang muli.', - 'success' => 'Ang kompayang ito ay matagumpay na nailikha.' - ) -); + 'success' => 'Ang kompayang ito ay matagumpay na nailikha.', + ], +]; diff --git a/resources/lang/fil/admin/companies/table.php b/resources/lang/fil/admin/companies/table.php index aaf6307764..a09aad754b 100644 --- a/resources/lang/fil/admin/companies/table.php +++ b/resources/lang/fil/admin/companies/table.php @@ -1,9 +1,10 @@ 'Ang mga kumpanya', 'create' => 'Magsagawa ng Kumpanya', 'title' => 'Ang kumpanya', 'update' => 'I-update ang Kumpanya', 'name' => 'Ang Pangalan ng Kumpanya', 'id' => 'Ang ID', -); +]; diff --git a/resources/lang/fil/admin/components/general.php b/resources/lang/fil/admin/components/general.php index b373aa38b5..a3c8398501 100644 --- a/resources/lang/fil/admin/components/general.php +++ b/resources/lang/fil/admin/components/general.php @@ -1,6 +1,6 @@ 'Ang Pangalan ng Komponent', 'checkin' => 'I-checkin ang Komponent', 'checkout' => 'I-checkout ang Komponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Ang Natitira', 'total' => 'Ang Kabuuan', 'update' => 'I-update ang Komponent', -); +]; diff --git a/resources/lang/fil/admin/components/message.php b/resources/lang/fil/admin/components/message.php index 1d18089b96..75c749eaae 100644 --- a/resources/lang/fil/admin/components/message.php +++ b/resources/lang/fil/admin/components/message.php @@ -1,36 +1,35 @@ 'Ang komponent na ito ay hindi umiiral.', - 'create' => array( + 'create' => [ 'error' => 'Ang komponent ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang komponent ay matagumpay na naisagawa.' - ), + 'success' => 'Ang komponent ay matagumpay na naisagawa.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang komponent ay hindi nai-update, manyaring subukang muli', - 'success' => 'Ang komponent ay matagumpay na naisagawa.' - ), + 'success' => 'Ang komponent ay matagumpay na naisagawa.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang komponent na ito?', 'error' => 'Mayroong isyu sa pag-delete ng komponent. Mangayring subukang muli.', - 'success' => 'Ang komponent ay matagumpay na naisagawa.' - ), + 'success' => 'Ang komponent ay matagumpay na naisagawa.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ang komponent ay hindi nai-check out, mangyaring subukang muli', 'success' => 'Ang komponent ay matagukpay nang nai-check out.', - 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.' - ), + 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ang kompnent ay hindi nai-check in, mangyaring subukang muli', 'success' => 'Ang komponent ay matagumpay na nai-check in.', - 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.' - ) + 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', + ], - -); +]; diff --git a/resources/lang/fil/admin/components/table.php b/resources/lang/fil/admin/components/table.php index 2fa5af0998..215bf0a52d 100644 --- a/resources/lang/fil/admin/components/table.php +++ b/resources/lang/fil/admin/components/table.php @@ -1,5 +1,5 @@ 'Ang Pangalan ng Komponent', -); +]; diff --git a/resources/lang/fil/admin/consumables/general.php b/resources/lang/fil/admin/consumables/general.php index 4686f8888b..4020306758 100644 --- a/resources/lang/fil/admin/consumables/general.php +++ b/resources/lang/fil/admin/consumables/general.php @@ -1,6 +1,6 @@ 'I-checkout ang Consumable sa User', 'consumable_name' => 'Ang Pangalan ng Consumable', 'create' => 'Magsagawa ng Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Ang natitira', 'total' => 'Ang Kabuuan', 'update' => 'I-update ang Consumable', -); +]; diff --git a/resources/lang/fil/admin/consumables/message.php b/resources/lang/fil/admin/consumables/message.php index 6bfce0c757..1fe7799fee 100644 --- a/resources/lang/fil/admin/consumables/message.php +++ b/resources/lang/fil/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Ang consumable ay hindi umiiral.', - 'create' => array( + 'create' => [ 'error' => 'Ang consumable ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang consumable ay matagumpay na nai-likha.' - ), + 'success' => 'Ang consumable ay matagumpay na nai-likha.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang consumable ay hindi nai-update, manyaring subukang muli', - 'success' => 'Ang consumable ay matagumpay na nai-update.' - ), + 'success' => 'Ang consumable ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na i-delete mo ang consumable na ito?', 'error' => 'Mayroong isyu sa pag-delete ng consumable. Mangayaring subukang muli.', - 'success' => 'Ang consumable na ito ay matagumpay na nai-delete.' - ), + 'success' => 'Ang consumable na ito ay matagumpay na nai-delete.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ang consumable ay hindi nai-check out, mangyaring subukang muli', 'success' => 'Ang consumable ay matagumpay na nai-check out.', - 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.' - ), + 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ang consumable ay hindi nai-check in, mangyaring subukang muli', 'success' => 'Ang consumable ay matagumpay na nai-check in.', - 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.' - ) + 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', + ], - -); +]; diff --git a/resources/lang/fil/admin/consumables/table.php b/resources/lang/fil/admin/consumables/table.php index 6e380528b0..b60f18612d 100644 --- a/resources/lang/fil/admin/consumables/table.php +++ b/resources/lang/fil/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Ang Pangalan ng Consumable', -); +]; diff --git a/resources/lang/fil/admin/custom_fields/general.php b/resources/lang/fil/admin/custom_fields/general.php index c81d6fecf0..25880d686c 100644 --- a/resources/lang/fil/admin/custom_fields/general.php +++ b/resources/lang/fil/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'I-kuston ang mga Fields', 'field' => 'Ang Field', 'about_fieldsets_title' => 'Ang Tungkol sa Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Ang Bagong Custom Field', 'value_encrypted' => 'Ang balyu ng field na ito ay naka-encrypt sa database. Ang admin na mga gumagamit lamang ang maaaring maka-tanaw sa na-decrypt na balyu', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/fil/admin/custom_fields/message.php b/resources/lang/fil/admin/custom_fields/message.php index 06c9834f6a..c77035ae66 100644 --- a/resources/lang/fil/admin/custom_fields/message.php +++ b/resources/lang/fil/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Ang field ay hindi umiiral.', 'already_added' => 'Ang field ay naidagdag na', - 'create' => array( + 'create' => [ 'error' => 'Ang field ay hindi naisagawa, mangyaring subukang muli.', 'success' => 'Ang field ay matagumpay na naisagawa.', - 'assoc_success' => 'Ang field ay matagumpay na naidagdag sa fieldset.' - ), + 'assoc_success' => 'Ang field ay matagumpay na naidagdag sa fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang field ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang field ay matagumpay na nai-update.' - ), + 'success' => 'Ang field ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang field na ito?', 'error' => 'Mayroong isyu sa pag-delete ng field. Mangyaring subukang muli.', 'success' => 'Matagumpay na nai-delete ang field.', 'in_use' => 'Ang field ay kasalukuyang ginagamit.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Ang fieldset ay hindi umiiral', - 'create' => array( + 'create' => [ 'error' => 'Ang fieldset ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang fieldset ay matagumpay na naisagawa.' - ), + 'success' => 'Ang fieldset ay matagumpay na naisagawa.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang fieldset ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang fieldset ay matagumpay na nai-update.' - ), + 'success' => 'Ang fieldset ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang fieldset na ito?', 'error' => 'Mayroong isyu sa pag-delete ng fieldset. Mangyaring subukang muli.', 'success' => 'Matagumpay na nai-delete ang fieldset.', 'in_use' => 'Ang fieldset ay kasalukuyang ginagamit.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/fil/admin/departments/message.php b/resources/lang/fil/admin/departments/message.php index 0f4f85046c..9d76e15757 100644 --- a/resources/lang/fil/admin/departments/message.php +++ b/resources/lang/fil/admin/departments/message.php @@ -1,21 +1,21 @@ 'Ang departamento ay hindi umiiral.', 'assoc_users' => 'Ang departamentong ito ay kasalukuyang naiugnay sa hindi bumaba sa isang user at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga user upang hindi na magreperens sa departamentong ito at paki-subok muli. ', - 'create' => array( + 'create' => [ 'error' => 'Ang departamento ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang departamento ay matagumpay na naisagawa.' - ), - 'update' => array( + 'success' => 'Ang departamento ay matagumpay na naisagawa.', + ], + 'update' => [ 'error' => 'Ang departamento ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang departamento ay matagumpay na nai-update.' - ), - 'delete' => array( + 'success' => 'Ang departamento ay matagumpay na nai-update.', + ], + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang departamentong ito?', 'error' => 'Mayroong isyu sa pag-delete ng departamento. Mangayring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang departamento.' - ) + 'success' => 'Matagumpay na nai-delete ang departamento.', + ], -); +]; diff --git a/resources/lang/fil/admin/departments/table.php b/resources/lang/fil/admin/departments/table.php index afd6364f32..7ef9077d52 100644 --- a/resources/lang/fil/admin/departments/table.php +++ b/resources/lang/fil/admin/departments/table.php @@ -1,6 +1,6 @@ 'Ang ID', 'name' => 'Ang Pangalan ng Departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Ang Lokasyon', 'create' => 'Magsagawa ng Departamento', 'update' => 'I-update ang Departamento', - ); + ]; diff --git a/resources/lang/fil/admin/depreciations/general.php b/resources/lang/fil/admin/depreciations/general.php index cab1d42ba7..a71875d68a 100644 --- a/resources/lang/fil/admin/depreciations/general.php +++ b/resources/lang/fil/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Tungkol sa Depresasyon ng Asset', 'about_depreciations' => 'Pwede kang mag-set up ng depresasyon para mai-depreciate ang mga asset basi sa straight-line depreciation.', 'asset_depreciations' => 'Ang Depresasyon ng Asset', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Ang Bilang ng mga Buwan', 'update' => 'I-update ang Depresasyon', -); +]; diff --git a/resources/lang/fil/admin/depreciations/message.php b/resources/lang/fil/admin/depreciations/message.php index 54fa9bb103..25af752031 100644 --- a/resources/lang/fil/admin/depreciations/message.php +++ b/resources/lang/fil/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Ang klase ng depresasyon ay hindi umiiral.', 'assoc_users' => 'Ang depresasyong ito ay kasalukuyang nai-ugnay sa isa o higit pang mga modelo at hindi maaaring mai-delete. Paki-delete ng mga model na ito, at pagkatapos subukang i-delete muli. ', - - 'create' => array( + 'create' => [ 'error' => 'Ang klase ng depresasyon ay hindi naisagawa, mangayring subukang muli. :(', - 'success' => 'Ang klase ng depresayon ang matagumpay na nai-likha. :)' - ), + 'success' => 'Ang klase ng depresayon ang matagumpay na nai-likha. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang klase ng depresasyon ay hindi nai-update, mangayring subukang muli', - 'success' => 'Ang klase ng depresayon ang matagumpay na nai-update.' - ), + 'success' => 'Ang klase ng depresayon ang matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang klase ng depresasyong ito?', 'error' => 'Mayroong isyu sa pag-delete ng kalse ng depresasyon. Mangayring subukang muli.', - 'success' => 'Ang klase ng depresayon ang matagumpay na nai-delete.' - ) + 'success' => 'Ang klase ng depresayon ang matagumpay na nai-delete.', + ], -); +]; diff --git a/resources/lang/fil/admin/depreciations/table.php b/resources/lang/fil/admin/depreciations/table.php index 3180b3cab6..0f064943c1 100644 --- a/resources/lang/fil/admin/depreciations/table.php +++ b/resources/lang/fil/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'Ang ID', 'months' => 'Mga Buwan', 'term' => 'Ang Termino', 'title' => 'Ang Pangalan ', -); +]; diff --git a/resources/lang/fil/admin/groups/message.php b/resources/lang/fil/admin/groups/message.php index 8ccbe709c0..b66e69e139 100644 --- a/resources/lang/fil/admin/groups/message.php +++ b/resources/lang/fil/admin/groups/message.php @@ -1,22 +1,22 @@ 'Ang grupo ay umiiral na!', 'group_not_found' => 'Ang grupo [:id] ay hindi umiiral.', 'group_name_required' => 'Ang pangalan ng field ay kinakailangan', - 'success' => array( + 'success' => [ 'create' => 'Ang grupo ay matagumpay na nalikha.', 'update' => 'Ang grupo ay matagumpay na nai-update.', 'delete' => 'Ang grupo ay matagumpay na nai-delete.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang grupong ito?', 'create' => 'Mayroong isyu sa pagsagawa ng grupo. Mangyaring subukang muli.', 'update' => 'Mayroong isyu sa pag-update sa grupo. Mangyaring subukang muli.', 'delete' => 'Mayroong isyu sa pag-delete ng grupo. Mangyaring subukang muli.', - ), + ], -); +]; diff --git a/resources/lang/fil/admin/groups/table.php b/resources/lang/fil/admin/groups/table.php index bf29a9d082..9bcbeec9ab 100644 --- a/resources/lang/fil/admin/groups/table.php +++ b/resources/lang/fil/admin/groups/table.php @@ -1,9 +1,9 @@ 'Ang Id', 'name' => 'Ang Pangalan', 'users' => '# ng mga Gumagamit', -); +]; diff --git a/resources/lang/fil/admin/groups/titles.php b/resources/lang/fil/admin/groups/titles.php index d577f44f86..a8b087088e 100644 --- a/resources/lang/fil/admin/groups/titles.php +++ b/resources/lang/fil/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa mga Grupo', 'about_groups' => 'Ang mga grupo ay ginagamit para mag-generalize ng mga pahintulot sa gumagamit.', 'group_management' => 'Ang Pamamahala ng Grupo', @@ -11,4 +11,4 @@ return array( 'allow' => 'Magbigay Pahintulot', 'deny' => 'Tanggihan', -); +]; diff --git a/resources/lang/fil/admin/hardware/form.php b/resources/lang/fil/admin/hardware/form.php index bc55207d55..1d4f6920cc 100644 --- a/resources/lang/fil/admin/hardware/form.php +++ b/resources/lang/fil/admin/hardware/form.php @@ -1,12 +1,12 @@ 'I-kumperma ang Maramihang Pagdelete ng mga Assets', +return [ + 'bulk_delete' => 'I-kumperma ang Maramihang Pagdelete ng mga Assets', 'bulk_delete_help' => 'Surrin ang mga asset para sa maramihing pagdelete sa ibaba. Kapag nai-delete na, ang mga asset na ito ay pwedeng maibalik sa dati, pero hindi na ito maiugnay sa kahit sinong user na nakatalaga nito.', 'bulk_delete_warn' => 'Ikaw ay mag-delete ng :asset_count na mga asset.', - 'bulk_update' => 'Ang Maramihang Asset na Nai-update', - 'bulk_update_help' => 'Ang form na ito ay nagbibigay sa iyo ng pahintulot para mag-update ng maramihang asset nang sabay-sabay. Lagyan lamang ang mga field na gusto mong baguhin. Anumang mga field na blangko ay mananatiling walang pagbabago. ', - 'bulk_update_warn' => 'Ikaw ay mag-delete ng :asset_count assets.', + 'bulk_update' => 'Ang Maramihang Asset na Nai-update', + 'bulk_update_help' => 'Ang form na ito ay nagbibigay sa iyo ng pahintulot para mag-update ng maramihang asset nang sabay-sabay. Lagyan lamang ang mga field na gusto mong baguhin. Anumang mga field na blangko ay mananatiling walang pagbabago. ', + 'bulk_update_warn' => 'Ikaw ay mag-delete ng :asset_count assets.', 'checkedout_to' => 'I-check Out Sa', 'checkout_date' => 'Ang Petsa ng Pagcheck-out', 'checkin_date' => 'Ang Petsa ng Pag-checkin', @@ -38,7 +38,6 @@ return array( 'tag' => 'Ang Tag ng Asset', 'update' => 'Ang Update sa Asset', 'warranty' => 'Ang Warantiya', - 'warranty_expires' => 'Nag-expire na ang Warantiya', + 'warranty_expires' => 'Nag-expire na ang Warantiya', 'years' => 'mga taon', -) -; +]; diff --git a/resources/lang/fil/admin/hardware/general.php b/resources/lang/fil/admin/hardware/general.php index 7e51774edc..0241ca8721 100644 --- a/resources/lang/fil/admin/hardware/general.php +++ b/resources/lang/fil/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Ang Tungkol sa mga Asset', 'about_assets_text' => 'Ang mga asset ay mga aytem na sinubaybayan ng serial number o tag ng asset. May mga posiilidad na ito ay mataas na balyu ng mga aytem kung saan tinitingna ang partikular na mga aytem.', - 'archived' => 'Ang Archive', + 'archived' => 'Ang Archive', 'asset' => 'Ang Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'I-checkin ang Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Hindi pa nasimulan', 'undeployable' => 'Hindi pwedeng i-deploy', 'view' => 'Tingnan ang Asset', -); +]; diff --git a/resources/lang/fil/admin/hardware/message.php b/resources/lang/fil/admin/hardware/message.php index 16297b0d63..588ceb9c23 100644 --- a/resources/lang/fil/admin/hardware/message.php +++ b/resources/lang/fil/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Babala: Ang asset na ito ay kasalukuyang namarkahan bilang hindi pwedeng mai-deploy.. Kung nabago na ang katayuang ito, paki-update ng katayuan ng asset.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Magaling na pagsubok. Ang asset na iyon ay hindi umiiral o hindi pwedeng i-rekwest.', 'assoc_users' => 'Ang asset na ito ay kasalukuyang nai-check out sa isang user at hindi na maaaring mai-delete. Mangyaring suriin muna ang asset, at pagkatapos subukang i-delete muli. ', - 'create' => array( + 'create' => [ 'error' => 'Ang asset ay hindi naisagawa, mangyaring subukang muli. :(', - 'success' => 'Ang asset ay matagumpay na naisagawa. :)' - ), + 'success' => 'Ang asset ay matagumpay na naisagawa. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang asset ay hindi nai-update, mangyaring subukang muli', 'success' => 'Ang asset ay matagumpay na nai-update.', 'nothing_updated' => 'Walang napiling mga fields, kaya walang nai-update.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ang asset ay hindi naibalik sa dati, mangyaring subukang muli', - 'success' => 'Ang asset ay matagumpay nang naibalik sa dati.' - ), + 'success' => 'Ang asset ay matagumpay nang naibalik sa dati.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Ang audit ng asset ay hindi nagtagumpay. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-log ang audit ng asset.' - ), + 'success' => 'Matagumpay na nai-log ang audit ng asset.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ang file ay hindi nai-delete. Mangyaring subukang muli.', 'success' => 'Ang file ay matagumpay nang nai-delete.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ang file(s) ay hindi nai-upload. Mangyaring subukang muli.', 'success' => 'Ang file(s) ay matagumpay na nai-upload.', 'nofiles' => 'Hindi ka pumili ng maga files para sa i-upload, o ang file na gusto mong i-upload ay masyadong malaki', 'invalidfiles' => 'Ang isa o higit sa iyong mga file ay masyadong malaki o isang uri ng file na hindi pinapayagan. Ang mga pinapayagang mga file ay ang png, gif, jpg, doc, docx, pdf, at txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Ang iilang mga aytem ay hindi nai-import ng tama.', 'errorDetail' => 'Ang mga sumusunod na mga Aytem ay hindi na-import dahil sa mga error.', - 'success' => "Ang iyong file ay na-import na", - 'file_delete_success' => "Ang iyong file ay matagumpay nang nai-upload", - 'file_delete_error' => "Ang file ay hindi mai-delete", - ), + 'success' => 'Ang iyong file ay na-import na', + 'file_delete_success' => 'Ang iyong file ay matagumpay nang nai-upload', + 'file_delete_error' => 'Ang file ay hindi mai-delete', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang asset na ito?', 'error' => 'Mayroong isyu sa pag-delete ng asset. Mangyaring subukang muli.', 'nothing_updated' => 'Walang napiling mga asset, kaya walang nai-delete.', - 'success' => 'Matagumpay na nai-delete ang asset.' - ), + 'success' => 'Matagumpay na nai-delete ang asset.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ang asset ay hindi nai-check out, mangyaring subukang muli', 'success' => 'Matagumpay na nai-check out ang asset.', 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', 'not_available' => 'Ang asset ay hindi pwedeng mai-checkout!', - 'no_assets_selected' => 'Dapat kang pumili ng kahit isang asset mula sa listahan' - ), + 'no_assets_selected' => 'Dapat kang pumili ng kahit isang asset mula sa listahan', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ang asset ay hindi nai-check in, mangyaring subukang muli', 'success' => 'Ang asset ay matagumpay na nai-check in.', 'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.', 'already_checked_in' => 'Ang asset ay nai-check in na.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Ang asset ay hindi nai-rekwest, mangyaring subukang muli', 'success' => 'Matagumpay na nai-rekwest ang asset.', - 'canceled' => 'Ang rekwest sa pag-checkout ay matagumpay na nakansela' - ) + 'canceled' => 'Ang rekwest sa pag-checkout ay matagumpay na nakansela', + ], -); +]; diff --git a/resources/lang/fil/admin/hardware/table.php b/resources/lang/fil/admin/hardware/table.php index 8bfd3920f4..cc52c0ced4 100644 --- a/resources/lang/fil/admin/hardware/table.php +++ b/resources/lang/fil/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Ang Tag ng Asset', 'asset_model' => 'Ang Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Ang Asset ', 'image' => 'Ang Imahe ng Device', 'days_without_acceptance' => 'Ang mga Araw na Walang Pagtanggap', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/fil/admin/kits/general.php b/resources/lang/fil/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/fil/admin/kits/general.php +++ b/resources/lang/fil/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/fil/admin/licenses/form.php b/resources/lang/fil/admin/licenses/form.php index 4c7e23e9e2..acccdc714f 100644 --- a/resources/lang/fil/admin/licenses/form.php +++ b/resources/lang/fil/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Ang Asset', 'checkin' => 'I-checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Ang Lisensya para Makapag-email', 'to_name' => 'Ang Lisensya para sa Pangalan', 'update' => 'I-update ang Lisensya', - 'checkout_help' => 'Dapat mong suriin ang isang lisensya na naipalabas sa asset ng hardware o sa isang tao. Pwedeng mong piliin ang dalawa, pero ang may-ari ng asset ay dapat na tumugma sa taong iyong tinitingnan ang asset nai-out sa.' -); + 'checkout_help' => 'Dapat mong suriin ang isang lisensya na naipalabas sa asset ng hardware o sa isang tao. Pwedeng mong piliin ang dalawa, pero ang may-ari ng asset ay dapat na tumugma sa taong iyong tinitingnan ang asset nai-out sa.', +]; diff --git a/resources/lang/fil/admin/licenses/general.php b/resources/lang/fil/admin/licenses/general.php index 866da0e8cd..ee83152d5d 100644 --- a/resources/lang/fil/admin/licenses/general.php +++ b/resources/lang/fil/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa mga Lisensya', 'about_licenses' => 'Ang mga lisensya ay ay ginagamit para subaybayan ang software. Mayrron itong tuloy na mga numero ng seats na pwedeng i-check out sa mga indibidwal', 'checkin' => 'I-checkin ang Lisensya ng Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Ang mga Lisenysa ng Software', 'user' => 'Ang gumagamit', 'view' => 'Tingnan ang Lisensya', -); +]; diff --git a/resources/lang/fil/admin/licenses/message.php b/resources/lang/fil/admin/licenses/message.php index ac6855ce67..9ed29a60ff 100644 --- a/resources/lang/fil/admin/licenses/message.php +++ b/resources/lang/fil/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Ang lisensya ay hindi umiiral.', 'user_does_not_exist' => 'Ang gumagamit ay hindi umiiral.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Dapat kang pumili ng isang asset o isang user, pero hindi ang dalawa.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Ang lisensya ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang lisensya ay matagumpay na naisagawa.' - ), + 'success' => 'Ang lisensya ay matagumpay na naisagawa.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ang file ay hindi nai-delete. Mangyaring subukang muli.', 'success' => 'Ang file ay matagumpay nang nai-delete.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ang file(s) ay hindi nai-upload. Mangyaring subukang muli.', 'success' => 'Ang file(s) ay matagumpay na nai-upload.', 'nofiles' => 'Hindi ka pumili ng maga files para sa i-upload, o ang file na gusto mong i-upload ay masyadong malaki', 'invalidfiles' => 'Ang isa o higit sa iyong mga file ay masyadong malaki o isang uri ng file na hindi pinapayagan. Ang mga pinapayagang mga file ay ang png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Ang lisensya ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang lisensya ay matagumpay na nai-update.' - ), + 'success' => 'Ang lisensya ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang lisensyang ito?', 'error' => 'Mayroong isyu sa pag-delete ng lisensya. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang lisensya.' - ), + 'success' => 'Matagumpay na nai-delete ang lisensya.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Mayroong isyu sa pag-check out ng lisensya. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-check out ang lisensya' - ), + 'success' => 'Matagumpay na nai-check out ang lisensya', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Mayroong isyu sa pag-check in ng lisensya. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-check in ang lisensya' - ), + 'success' => 'Matagumpay na nai-check in ang lisensya', + ], -); +]; diff --git a/resources/lang/fil/admin/licenses/table.php b/resources/lang/fil/admin/licenses/table.php index 5a5ca511f3..abdbfc7610 100644 --- a/resources/lang/fil/admin/licenses/table.php +++ b/resources/lang/fil/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Nakatalaga Sa', 'checkout' => 'Papasok/Palabas', @@ -14,4 +14,4 @@ return array( 'serial' => 'Ang Seryal', 'title' => 'Ang Lisensya', -); +]; diff --git a/resources/lang/fil/admin/locations/message.php b/resources/lang/fil/admin/locations/message.php index 1ab245958f..f00d6da1ff 100644 --- a/resources/lang/fil/admin/locations/message.php +++ b/resources/lang/fil/admin/locations/message.php @@ -1,27 +1,26 @@ 'Ang lokasyon ay hindi umiiral.', 'assoc_users' => 'Ang lokasyong ito ay kasalukuyang naiugnay sa hindi bumaba sa isang user at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga user upang hindi na magreperens sa lokasyong ito at paki-subok muli. ', 'assoc_assets' => 'Ang lokasyong ito ay kasalukuyang naiugnay sa hindi bumaba sa isang asset at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga asset upang hindi na magreperens sa lokasyong ito at paki-subok muli. ', 'assoc_child_loc' => 'Ang lokasyong ito ay kasalukuyang pinagmumulan sa hindi bumaba sa lokasyon isang bata at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga lokasyon upang hindi na magreperens sa lokasyong ito at paki-subok muli. ', - - 'create' => array( + 'create' => [ 'error' => 'Ang lokasyon ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang lokasyon ay matagumpay na naisagawa.' - ), + 'success' => 'Ang lokasyon ay matagumpay na naisagawa.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang lokasyon ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang lokasyon ay matagumpay na nai-update.' - ), + 'success' => 'Ang lokasyon ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang lokasyong ito?', 'error' => 'Mayroong isyu sa pag-delete ng lokasyon. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang lokasyon.' - ) + 'success' => 'Matagumpay na nai-delete ang lokasyon.', + ], -); +]; diff --git a/resources/lang/fil/admin/locations/table.php b/resources/lang/fil/admin/locations/table.php index 07bb79b992..f7e6acba0a 100644 --- a/resources/lang/fil/admin/locations/table.php +++ b/resources/lang/fil/admin/locations/table.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa mga Lokasyon', 'about_locations' => 'Ang lokasyon ay ginagamit para magsubaybay sa lokasyon ng impormasyon para sa mga gumagamit, mga asset, at iba pang mga aytem', 'assets_rtd' => 'Ang mga asset', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Ang Pinagmulan', 'currency' => 'Ang Salapi ng Lugar', 'ldap_ou' => 'Ang LDAP Search OU', - ); + ]; diff --git a/resources/lang/fil/admin/manufacturers/message.php b/resources/lang/fil/admin/manufacturers/message.php index 4be4d7ae1e..873ea8d4ae 100644 --- a/resources/lang/fil/admin/manufacturers/message.php +++ b/resources/lang/fil/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Ang Tagapagsagawa ay hindi umiiral.', 'assoc_users' => 'Ang tagapagsagawa ay kasalukuyang naiugnay sa hindi bumaba sa isang modelo at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga modelo upang hindi na mag-reperens sa tagapagsagawang ito at paki-subokang muli. ', - 'create' => array( + 'create' => [ 'error' => 'Ang tagapagsagawa ay hindi nailikha, mangyaring subukang muli.', - 'success' => 'Matagumpay na nailikha ang tagapagsagawa.' - ), + 'success' => 'Matagumpay na nailikha ang tagapagsagawa.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang tagapagsagawa ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Matagumpay na nai-update ang tagapagsagawa.' - ), + 'success' => 'Matagumpay na nai-update ang tagapagsagawa.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ang tagapagsagawa ay hindi naibalik sa dati, mangyaring subukan muli', - 'success' => 'Matagumpay na naibalik sa dati ang tagapagsagawa.' - ), + 'success' => 'Matagumpay na naibalik sa dati ang tagapagsagawa.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang tagapagsagawang ito?', 'error' => 'Mayroong isyu sa pag-delete ng tagapagsagawa. Mangayaring subukang muli.', - 'success' => 'Ang Tagapagsagawa na ito ay matagumpay na nai-delete.' - ) + 'success' => 'Ang Tagapagsagawa na ito ay matagumpay na nai-delete.', + ], -); +]; diff --git a/resources/lang/fil/admin/manufacturers/table.php b/resources/lang/fil/admin/manufacturers/table.php index 9ab1201c1a..fef65910c3 100644 --- a/resources/lang/fil/admin/manufacturers/table.php +++ b/resources/lang/fil/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa Tagapagsagawa', 'about_manufacturers_text' => 'Ang mga Tagapagsagawa ay ang mga kompanyang nagsagawa ng iyong mga asset. Maaari kang mag-imbak ng mga mahalagang impormasyon tungkol sa kontak para sa suporta dito, na maaaring ipakita sa pahina ng mga detalye ng iyong asset.', 'asset_manufacturers' => 'Ang mga Tagapagsagawa ng Asset', @@ -13,4 +13,4 @@ return array( 'update' => 'I-update ang Tagapagsagawa', 'url' => 'Ang URL', -); +]; diff --git a/resources/lang/fil/admin/models/general.php b/resources/lang/fil/admin/models/general.php index 2e0a1f430c..e494ba183d 100644 --- a/resources/lang/fil/admin/models/general.php +++ b/resources/lang/fil/admin/models/general.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa mga Modelo ng Asset', 'about_models_text' => 'Ang mga Modelo ng Asset ay isang paraan para i-grupo ang magkakaparehong mga asset. "MBP 2013", "IPhone 6s", atbp.', 'deleted' => 'Ang modelong ito ay nai-delete na. I-klik dito para maibalik sa dati.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Ikaw ay mag-delete ng :model_count mga modelo ng asset.', 'restore' => 'Ibalik sa dati ang Modelo', 'requestable' => 'Ang mga gumagamit ay pwedeng mag-rekwest ng modelong ito', - 'show_mac_address' => 'Ipakita ang field MAC address sa mga asset ng modelong ito', + 'show_mac_address' => 'Ipakita ang field MAC address sa mga asset ng modelong ito', 'view_deleted' => 'Tingnan ang mga Nai-delete na', 'view_models' => 'Tingnan ang mga Modelo', 'fieldset' => 'Ang Fieldset', 'no_custom_field' => 'Walang nai-kustom na mga field', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/fil/admin/models/message.php b/resources/lang/fil/admin/models/message.php index b5022bffde..ed9bf348ba 100644 --- a/resources/lang/fil/admin/models/message.php +++ b/resources/lang/fil/admin/models/message.php @@ -1,42 +1,41 @@ 'Ang modelo ay hindi umiiral.', 'assoc_users' => 'Ang modelong ito ay kasalukuyang nai-ugnay sa isa o higit pang mga asset at hindi maaaring mai-delete. Paki-delete ng mga model na ito, at pagkatapos subukang i-delete muli. ', - - 'create' => array( + 'create' => [ 'error' => 'Ang modelo ay hindi naisagawa, mangyaring subukang muli.', 'success' => 'Ang modelo ay matagumpay na naisagawa.', 'duplicate_set' => 'Ang modelo ng asset na may ganyang pangalan, ang tagapagsagawa at ang modelo ay umiiral na.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Ang modelo ay hindi nai-update, mangyaring subukang muli', - 'success' => 'Ang modelo ay matagumpay na nai-update.' - ), + 'success' => 'Ang modelo ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang modelo ng asset?', 'error' => 'Mayroong isyu sa pag-delete ng modelo. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang modelo.' - ), + 'success' => 'Matagumpay na nai-delete ang modelo.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ang modelo ay hindi naibalik sa dati, mangyaring subukang muli', - 'success' => 'Ang modelo ay matagumpay na naibalik.' - ), + 'success' => 'Ang modelo ay matagumpay na naibalik.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Walang nabagong mga field, kaya walang nai-update.', - 'success' => 'Ang mga modelo ay naiupdate na.' - ), + 'success' => 'Ang mga modelo ay naiupdate na.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Walang napiling mga model, kaya walang nai-delete.', 'success' => ':success_count model(s) na-delete na!', - 'success_partial' => ':success_count ang mga modelo ay na-delete na, gayunpaman ::success_count ang mga modelo ay hindi mai-delete dahil sa mayron pa silang asset na naiuugnay sa kanila.' - ), + 'success_partial' => ':success_count ang mga modelo ay na-delete na, gayunpaman ::success_count ang mga modelo ay hindi mai-delete dahil sa mayron pa silang asset na naiuugnay sa kanila.', + ], -); +]; diff --git a/resources/lang/fil/admin/models/table.php b/resources/lang/fil/admin/models/table.php index 72592e8d86..1b496272eb 100644 --- a/resources/lang/fil/admin/models/table.php +++ b/resources/lang/fil/admin/models/table.php @@ -1,6 +1,6 @@ 'Magsagawa ng Modelo ng Asset', 'created_at' => 'Naisagawa sa', @@ -14,4 +14,4 @@ return array( 'update' => 'I-update ang Modelo ng Asset', 'clone' => 'I-clone ang Modelo', 'edit' => 'I-edit ang Modelo', -); +]; diff --git a/resources/lang/fil/admin/reports/general.php b/resources/lang/fil/admin/reports/general.php index 0b7e5a46b5..5ca5e02af3 100644 --- a/resources/lang/fil/admin/reports/general.php +++ b/resources/lang/fil/admin/reports/general.php @@ -1,5 +1,5 @@ 'Pumili ng opsyon na gusto mo para sa iyong report sa asset.' -); +return [ + 'info' => 'Pumili ng opsyon na gusto mo para sa iyong report sa asset.', +]; diff --git a/resources/lang/fil/admin/reports/message.php b/resources/lang/fil/admin/reports/message.php index da2b5e1978..f7ca736c7c 100644 --- a/resources/lang/fil/admin/reports/message.php +++ b/resources/lang/fil/admin/reports/message.php @@ -1,5 +1,5 @@ 'Kinakailangan mong pumili ng kahit ISANG opsyon.' -); +return [ + 'error' => 'Kinakailangan mong pumili ng kahit ISANG opsyon.', +]; diff --git a/resources/lang/fil/admin/settings/general.php b/resources/lang/fil/admin/settings/general.php index 23c3affe73..b74dce3e52 100644 --- a/resources/lang/fil/admin/settings/general.php +++ b/resources/lang/fil/admin/settings/general.php @@ -1,12 +1,12 @@ 'Ang Aktibong Direktorya', 'ad_domain' => 'Ang Aktibong Direktorya ng domain', 'ad_domain_help' => 'Ito ay minsan kapareho ng iyong email domain, pero hindi permanente.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Ito ay isang server ng Aktibong Direktorya', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ang Alerts Threshold ay Mag-expire (sa iilang araw)', 'alert_inv_threshold' => 'Ang Threshold ng Inventory Alert', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Ang mga ID ng asset', 'audit_interval' => 'Ang Pagitan ng Audit', 'audit_interval_help' => 'Kung ikaw ay kinakailangan na regular na magbilang ng iyomg mga pag-aari, ilagay ang agwat sa buwan.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'I-enter ang Two-Factor Code', 'two_factor_config_complete' => 'I-submit ang Code', 'two_factor_enabled_edit_not_allowed' => 'Ang iyong tagapangasiwa ay hindi magpapahintulot sa iyo na i-edit ang mga setting na ito.', - 'two_factor_enrollment_text' => "Ang Two factor authentication ay kinakailangan, gayunpaman ang iyong device ay hindi ma na-enroll. Buksan mo ang itong Google Authenticator app at i-scan ang QR code sa ibaba para ma-enroll ang iyong device. Kapag na-enroll na ang device. i-enter ang code sa ibaba", + 'two_factor_enrollment_text' => 'Ang Two factor authentication ay kinakailangan, gayunpaman ang iyong device ay hindi ma na-enroll. Buksan mo ang itong Google Authenticator app at i-scan ang QR code sa ibaba para ma-enroll ang iyong device. Kapag na-enroll na ang device. i-enter ang code sa ibaba', 'require_accept_signature' => 'Nangangailangan ng Pag-lagda', 'require_accept_signature_help_text' => 'Sa pagpapagana ng katangian nito ay nangangailangan sa mga gumagamit na pisikal na mag-sign off sa pagtanggap ng isang asset.', 'left' => 'kaliwa', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Ang haba ng mga tags ng asset, kabilang ang zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/fil/admin/settings/message.php b/resources/lang/fil/admin/settings/message.php index a8294c4d58..0eb04475d1 100644 --- a/resources/lang/fil/admin/settings/message.php +++ b/resources/lang/fil/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'May naganap na error habang nag-update. ', - 'success' => 'Matagumpay na nai-update ang mga setting.' - ), - 'backup' => array( + 'success' => 'Matagumpay na nai-update ang mga setting.', + ], + 'backup' => [ 'delete_confirm' => 'Sigurado kaba na gusto mong i-delete ang back-up file na ito? Ang aksyong ito ay hindi pwedeng maibalik. ', 'file_deleted' => 'Ang back-up file ay matagumpay na nai-delete. ', 'generated' => 'Ang bagong back-up file ay matagumpay na nai-sagawa.', 'file_not_found' => 'Ang back-up file na iyon ay hindi makita sa serber.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ang error ay nagyari habang nag-purge. ', 'validation_failed' => 'Ang iyong kompermasyon sa purge ay hindi tama. Mangyaring i-type ang salitang "DELETE" sa confirmation box.', - 'success' => 'Matagumpay na nai-purge ang nai-delete na rekords.' - ), + 'success' => 'Matagumpay na nai-purge ang nai-delete na rekords.', + ], -); +]; diff --git a/resources/lang/fil/admin/statuslabels/message.php b/resources/lang/fil/admin/statuslabels/message.php index 215a7b255b..021a9e0674 100644 --- a/resources/lang/fil/admin/statuslabels/message.php +++ b/resources/lang/fil/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Ang Status Label ay hindi umiiral.', 'assoc_assets' => 'Ang Status Label na ito ay kasalukuyang nai-ugnay sa hindi bumaba sa isang Asset at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga asset upang hindi na magreperens sa katayuan at paki-subok muli. ', - - 'create' => array( + 'create' => [ 'error' => 'Ang Status Label ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Ang Status Label ay matagumpay na nai-likha.' - ), + 'success' => 'Ang Status Label ay matagumpay na nai-likha.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ang Status Label ay hindi nai-update, manyaring subukang muli', - 'success' => 'Ang Status Label ay matagumpay na nai-update.' - ), + 'success' => 'Ang Status Label ay matagumpay na nai-update.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang Status Label na ito?', 'error' => 'Mayroong isyu sa pag-delete ng Status Label. Mangyaring subukang muli.', - 'success' => 'Matagumpay na nai-delete ang Status Label.' - ), + 'success' => 'Matagumpay na nai-delete ang Status Label.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ang mga asset na ito ay hindi maaaring maitalaga sa sinuman.', 'deployable' => 'Ang asset na ito ay pwedeng mai-check out. Kapag naitalaga na sila, sila ay pwede magpalagay ng meta status ng Nai-deploy.', 'archived' => 'Ang mga asset na ito ay hindi maaaring mai-check out, at maipakita lamang sa Archived view. Ito ay kapakipakinabang sa pagpapanatili ng impormasyon tungkol sa mga asset para sa budgeting/historic na layunin ngunit ang pagpapanatili nito mula sa pang-araw-araw na listahan ng asset.', 'pending' => 'Ang mga asset na ito ay hindi maaaring ma-italaga sa sinuman, kadalasang ginagamit para sa mga aytem naipalabas para sa pagkumpuni, ngunit inaasahang magbalik sa sirkulasyon.', - ), + ], -); +]; diff --git a/resources/lang/fil/admin/statuslabels/table.php b/resources/lang/fil/admin/statuslabels/table.php index 16f1ec6b14..2e24f861f9 100644 --- a/resources/lang/fil/admin/statuslabels/table.php +++ b/resources/lang/fil/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Tungkol sa Label ng Katayuan', 'archived' => 'Nailagay na sa Archive', 'create' => 'Magsagawa ng Label ng Katayuan', @@ -16,4 +16,4 @@ return array( 'title' => 'Ang mga Label ng Katayuan', 'undeployable' => 'Hindi pwedeng i-deploy', 'update' => 'I-update ang Label ng Katayuan', -); +]; diff --git a/resources/lang/fil/admin/suppliers/message.php b/resources/lang/fil/admin/suppliers/message.php index cabaff70c5..fe0a43ba0d 100644 --- a/resources/lang/fil/admin/suppliers/message.php +++ b/resources/lang/fil/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Hindi umiiral ang tagapagsuplay.', - - 'create' => array( + 'create' => [ 'error' => 'Ang tagapagsuplay ay hindi naisagawa, mangyaring subukang muli.', - 'success' => 'Matagumpay na naisagawa nga tagapagsuplay.' - ), + 'success' => 'Matagumpay na naisagawa nga tagapagsuplay.', + ], - 'update' => array( + 'update' => [ 'error' => 'Hindi nai-update ang tagapagsuplay, mangyaring subukang muli', - 'success' => 'Matagumpay na nai-update ang tagapagsuplay.' - ), + 'success' => 'Matagumpay na nai-update ang tagapagsuplay.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigurado kaba na gusto mong i-delete ang tagapagsuplay na ito?', 'error' => 'Mayroong isyu sa pag-delete ng tagapagsuplay. Mangyaring subukang muli.', 'success' => 'Matagumpay na nai-delete ang tagapagsuplay.', 'assoc_assets' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :asset_count asset(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong mga asset upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', 'assoc_licenses' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :licenses_count licences(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong mga lisensya upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', 'assoc_maintenances' => 'Ang tagapagsuplay ay kasalukuyang naiugnay sa :asset_maintenances_count asset maintenances(s) at hindi maaaring mai-delete. Manyaring i-update ang iyong asset maintenances upang hindi na magreperens sa tagapagsuplay na ito at pakisubok muli. ', - ) + ], -); +]; diff --git a/resources/lang/fil/admin/suppliers/table.php b/resources/lang/fil/admin/suppliers/table.php index 0661ddc4b5..8d93df99ed 100644 --- a/resources/lang/fil/admin/suppliers/table.php +++ b/resources/lang/fil/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Ang Tungkol sa Tagapagsuplay', 'about_suppliers_text' => 'Ang mga tagapagsuplay ay may kakayahang magsubabay sa pinagmulan ng mga aytem', 'address' => 'Ang Address ng Tagapagsuplay', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Tingnan ang mga Asset para sa', 'zip' => 'Ang Postal Code', -); +]; diff --git a/resources/lang/fil/admin/users/general.php b/resources/lang/fil/admin/users/general.php index 3dc521ec70..1944401b9c 100644 --- a/resources/lang/fil/admin/users/general.php +++ b/resources/lang/fil/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Ang mga asset na nakatalaga sa :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'I-edit ang Gumamit', 'filetype_info' => 'Ang mga pinapayagang uri ng file ay png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, at rar.', 'history_user' => 'Ang kasaysayan para sa :name', - 'info' => 'Impormasyon', + 'info' => 'Impormasyon', 'restore_user' => 'I-klik dito upang maibalik ang mga ito.', 'last_login' => 'Ang Huling Pag-login', 'ldap_config_text' => 'Pwedeng makita ang configuration settings ng LDAP Admin > Settings. Ang (opsyonal) napiling lokasyon ay itatakda para sa lahat ng mga na-import na mga gumagamit o user.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Ang iyong kasalukuyang mga admin settings ay napapahintulot ng selektibong pagpapatupad ng two-factor authentication. ', 'two_factor_enrolled' => 'Ang Na-enroll na 2FA Device ', 'two_factor_active' => 'Ang 2FA Active ', - ); + ]; diff --git a/resources/lang/fil/admin/users/message.php b/resources/lang/fil/admin/users/message.php index a01dc1f97c..ad2924fc54 100644 --- a/resources/lang/fil/admin/users/message.php +++ b/resources/lang/fil/admin/users/message.php @@ -1,6 +1,6 @@ 'Matagumpay mong natanggap ang asset na ito.', 'declined' => 'Matagumpay mong hindi tinaggap ang asset na ito.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Ang integrasyon ng LDAP ay hindi nai-configure sa pag-install na ito.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Ang user ay matagumpay na nalikha.', 'update' => 'Ang user ay matagumpay na nai-update.', 'update_bulk' => 'Ang mga user ay matagumpay nai-update!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Ang user ay matagumpay na hindi na sinuspende.', 'restored' => 'Ang user ay matagumpay na naibalik sa dati.', 'import' => 'Ang mga user ay matagumpay nang na-import.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Mayroong isyu sa pagsagawa ng user. Mangyaring subukang muli.', 'update' => 'Mayroong isyu sa pag-update sa user. Mangyaring subukang muli.', 'delete' => 'Mayroong isyu sa pag-delete ng user. Mangyaring subukang muli.', @@ -44,18 +43,18 @@ return array( 'ldap_could_not_search' => 'Hindi makapaghanap ng serber ng LDAP. Mangyaring suriin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file.
may error mula sa Serber ng LDAP:', 'ldap_could_not_get_entries' => 'Hindi makakuha ng entry mula sa serber ng LDAP. Mangyaring surrin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file.
May-error mula sa Serber ng LDAP:', 'password_ldap' => 'Ang password sa account na ito ay pinamahalaan ng LDAP/Actibong Direktorya. Mangyaring komontak sa iyong IT department para baguhin ang iyong password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ang file ay hindi nai-delete. Mangyaring subukang muli.', 'success' => 'Ang file ay matagumpay nang nai-delete.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ang file(s) ay hindi nai-upload. Mangyaring subukang muli.', 'success' => 'Ang file(s) ay matagumpay na nai-upload.', 'nofiles' => 'Hindi ka pumili ng kahit anong mga file para i-upload', 'invalidfiles' => 'Ang isa o higit sa iyong mga file ay masyadong malaki o isang uri ng file na hindi pinapayagan. Ang mga pinapayagang mga file ay ang png, gif, jpg, doc, docx, pdf, at txt.', - ), + ], -); +]; diff --git a/resources/lang/fil/admin/users/table.php b/resources/lang/fil/admin/users/table.php index 4d7467222c..4ef2b7aa84 100644 --- a/resources/lang/fil/admin/users/table.php +++ b/resources/lang/fil/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktibo', 'allow' => 'Pahintulutan', 'checkedout' => 'Ang mga asset', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Ipakita ang Kasalukuyang mga User', 'show_deleted' => 'Ipakita ang Nai-delete na mga User', 'title' => 'Ang Pamagat', - 'to_restore_them' => 'upang ibalik sa dati.', + 'to_restore_them' => 'upang ibalik sa dati.', 'updateuser' => 'I-update ang User', 'username' => 'Ang pangalan ng gumagamit', - 'user_deleted_text' => 'Ang user na ito ay namarkahang nai-delete na.', + 'user_deleted_text' => 'Ang user na ito ay namarkahang nai-delete na.', 'username_note' => '(Ito ay ginagamit para sa Aktibong binding ng Direktorya lamang, hindi sa login.)', 'cloneuser' => 'I-clone ang User', 'viewusers' => 'Tingnan ang mga Gumagamit', -); +]; diff --git a/resources/lang/fil/auth/general.php b/resources/lang/fil/auth/general.php index a06a3da443..a28f540c0c 100644 --- a/resources/lang/fil/auth/general.php +++ b/resources/lang/fil/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/fil/auth/message.php b/resources/lang/fil/auth/message.php index 778b1f83b2..62baf21acd 100644 --- a/resources/lang/fil/auth/message.php +++ b/resources/lang/fil/auth/message.php @@ -1,6 +1,6 @@ 'Ang account na may ganitong email ay umiiral na.', 'account_not_found' => 'Ang pangalan ng gumagamit o password ay hindi wasto.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ang account ng user na ito ay nai-ban.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Maayroong problema habang sunusubukang i-login ka, mangyaring subukang muli.', 'success' => 'Ikaw ay matagumay na naka-log in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Mayoong problema habang sinusubukang isagawa ang iyong account, mangyaring subukang muli.', 'success' => 'Matagumpay na naisagawa ang account.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Mayroong problema habang sinusubukang kunin ang code sa pag-reset ng password, mangyaring subukang muli.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Mayroong problema habang sunusubukang i-reset ang iyong password, mangyaring subukang muli.', 'success' => 'Ang iyong password ay nai-reset na.', - ), + ], - -); +]; diff --git a/resources/lang/fil/button.php b/resources/lang/fil/button.php index 98ac40d89f..66d35b2fd8 100644 --- a/resources/lang/fil/button.php +++ b/resources/lang/fil/button.php @@ -1,6 +1,6 @@ 'Ang mga aksyon', 'add' => 'Magdagdag ng bago', 'cancel' => 'I-kansela', @@ -11,7 +11,7 @@ return array( 'request' => 'Mga Rekwest', 'submit' => 'I-sumita', 'upload' => 'I-upload', - 'select_file' => 'Pumili ng File...', + 'select_file' => 'Pumili ng File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/fil/general.php b/resources/lang/fil/general.php index 19544ae972..18f765fe83 100644 --- a/resources/lang/fil/general.php +++ b/resources/lang/fil/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Siyudad', - 'click_here' => 'Mag-klik dito', + 'click_here' => 'Mag-klik dito', 'clear_selection' => 'I-clear ang Seleksyon', 'companies' => 'Ang mga kompanya', 'company' => 'Ang kompanya', 'component' => 'Ang Komponent', 'components' => 'Ang mga komponent', - 'complete' => 'Nakompleto na', + 'complete' => 'Nakompleto na', 'consumable' => 'Pwedeng Ikonsumo', 'consumables' => 'Mga pwedeng ikonsumo', 'country' => 'Ang Bansa', diff --git a/resources/lang/fil/help.php b/resources/lang/fil/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/fil/help.php +++ b/resources/lang/fil/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/fil/mail.php b/resources/lang/fil/mail.php index fa91723a81..daa345740d 100644 --- a/resources/lang/fil/mail.php +++ b/resources/lang/fil/mail.php @@ -1,6 +1,6 @@ 'Ang gumagamit o user ay nag-kansela ng rekwest na aytem sa website', 'a_user_requested' => 'Ang gumagamit ay nag-rekwest ng aytem sa website', 'accessory_name' => 'Ang Pangalan ng Aksesorya:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/fil/pagination.php b/resources/lang/fil/pagination.php index f54812313a..199ef19195 100644 --- a/resources/lang/fil/pagination.php +++ b/resources/lang/fil/pagination.php @@ -1,6 +1,6 @@ 'Susunod »', -); +]; diff --git a/resources/lang/fil/passwords.php b/resources/lang/fil/passwords.php index 64b8d4936d..6a7009c67c 100644 --- a/resources/lang/fil/passwords.php +++ b/resources/lang/fil/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Nai-send na ang link ng iyong password!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/fil/reminders.php b/resources/lang/fil/reminders.php index 698f5ccb32..b2e8d66adc 100644 --- a/resources/lang/fil/reminders.php +++ b/resources/lang/fil/reminders.php @@ -1,6 +1,6 @@ "Dapat na may 6 na mga karakter ang password at tumugma sa kumpirmasyon.", + 'password' => 'Dapat na may 6 na mga karakter ang password at tumugma sa kumpirmasyon.', - "user" => "Ang username o ang email address ay hindi tama", + 'user' => 'Ang username o ang email address ay hindi tama', - "token" => "Hindi balido ang password rest token na ito.", + 'token' => 'Hindi balido ang password rest token na ito.', - "sent" => "Kapag mayroong nakita na tumugmanang email address, ang paalala sa password ay nai-send na!", + 'sent' => 'Kapag mayroong nakita na tumugmanang email address, ang paalala sa password ay nai-send na!', -); +]; diff --git a/resources/lang/fil/table.php b/resources/lang/fil/table.php index f41bf7b0a2..4005abfc3b 100644 --- a/resources/lang/fil/table.php +++ b/resources/lang/fil/table.php @@ -1,10 +1,10 @@ 'Ang mga aksyon', 'action' => 'Ang aksyon', 'by' => 'Batay sa', 'item' => 'Ang Aytem', -); +]; diff --git a/resources/lang/fil/validation.php b/resources/lang/fil/validation.php index 36b62caee9..0366c64fce 100644 --- a/resources/lang/fil/validation.php +++ b/resources/lang/fil/validation.php @@ -1,6 +1,6 @@ 'Ang :katangian ay nakuha na.', 'uploaded' => 'Ang :katangian ay hindi nagtagumpay sa pag-upload.', 'url' => 'Ang :pormat ng katangian ng pormat ay hindi balido.', - "unique_undeleted" => "Ang :katangian ay dapat na natatangi.", + 'unique_undeleted' => 'Ang :katangian ay dapat na natatangi.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Ang :field ng katangian ay naglalaman ng karakter na hindi pinapayagan.", - "email_array" => "Imbalido ang isa o higit pang mga email address.", - "hashed_pass" => "Ang iyong kasalukuyang password ay hindi wasto", + 'alpha_space' => 'Ang :field ng katangian ay naglalaman ng karakter na hindi pinapayagan.', + 'email_array' => 'Imbalido ang isa o higit pang mga email address.', + 'hashed_pass' => 'Ang iyong kasalukuyang password ay hindi wasto', 'dumbpwd' => 'Ang password ay sobrang pangkaraniwan.', - "statuslabel_type" => "Kinakailangang pumili ng balidong uri ng label ng estado", + 'statuslabel_type' => 'Kinakailangang pumili ng balidong uri ng label ng estado', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/fr/admin/accessories/general.php b/resources/lang/fr/admin/accessories/general.php index 5760313657..541e303fa8 100644 --- a/resources/lang/fr/admin/accessories/general.php +++ b/resources/lang/fr/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Catégorie d\'accessoire', 'accessory_name' => 'Nom de l\'accessoire', 'checkout' => 'Attribuer l\'accessoire', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Utiliser la license primaire par défaut à la place.', 'use_default_eula_disabled' => 'Utilisez la license par défaut à la place. Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".', -); +]; diff --git a/resources/lang/fr/admin/accessories/message.php b/resources/lang/fr/admin/accessories/message.php index 7091783f3c..3a84374622 100644 --- a/resources/lang/fr/admin/accessories/message.php +++ b/resources/lang/fr/admin/accessories/message.php @@ -1,37 +1,36 @@ 'L\'accessoire [:id] n\'existe pas.', 'assoc_users' => 'Cet accessoire à présentement des items d\'attribué à des utilisateurs. S\'il vous plaît vérifier l\'accessoire et veuillez réessayer. ', - 'create' => array( + 'create' => [ 'error' => 'L\'accessoire n\'a pas été créé, veuillez réessayer.', - 'success' => 'L\'accessoire a bien été créé.' - ), + 'success' => 'L\'accessoire a bien été créé.', + ], - 'update' => array( + 'update' => [ 'error' => 'L\'accessoire n\'a pas été mis-à-jour, veuillez réessayer', - 'success' => 'L\'accessoire a bien été mis-à-jour.' - ), + 'success' => 'L\'accessoire a bien été mis-à-jour.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer cet accessoire ?', 'error' => 'Un problème est survenu durant la suppression de l\'accessoire. Merci d\'essayer à nouveau.', - 'success' => 'L\'accessoire a bien été supprimé.' - ), + 'success' => 'L\'accessoire a bien été supprimé.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Cet accessoire n\'est pas attribué. Veuillez réessayer', 'success' => 'Accessoire attribué correctement.', - 'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.' - ), + 'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Cet accessoire n\'a pas été dissocié, veuillez réessayer', 'success' => 'Accessoire dissocié correctement.', - 'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.' - ) + 'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.', + ], - -); +]; diff --git a/resources/lang/fr/admin/accessories/table.php b/resources/lang/fr/admin/accessories/table.php index 2aa514a079..69192ec0f5 100644 --- a/resources/lang/fr/admin/accessories/table.php +++ b/resources/lang/fr/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Télécharger en CSV', - 'eula_text' => 'Licence d\'utilisation', +return [ + 'dl_csv' => 'Télécharger en CSV', + 'eula_text' => 'Licence d\'utilisation', 'id' => 'ID', 'require_acceptance' => 'Acceptation', 'title' => 'Nom de l\'accessoire', - -); +]; diff --git a/resources/lang/fr/admin/asset_maintenances/form.php b/resources/lang/fr/admin/asset_maintenances/form.php index 374ae092e9..6012510046 100644 --- a/resources/lang/fr/admin/asset_maintenances/form.php +++ b/resources/lang/fr/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Durée de l\'entretien (en jours)', 'notes' => 'Notes', 'update' => 'Modification des types entretiens d\'actifs', - 'create' => 'Création de type d\'entretien d\'actif' + 'create' => 'Création de type d\'entretien d\'actif', ]; diff --git a/resources/lang/fr/admin/asset_maintenances/message.php b/resources/lang/fr/admin/asset_maintenances/message.php index 476a0fb6ed..9a2f140dd4 100644 --- a/resources/lang/fr/admin/asset_maintenances/message.php +++ b/resources/lang/fr/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Êtes-vous certain de vouloir supprimer ce type d\'entretien d\'actif ?', 'error' => 'Il y a eu un problème lors de la suppression du type d\'entretien d\'actif. Veuillez réessayer.', - 'success' => 'Le type d\'entretien d\'actif a été supprimé correctement.' + 'success' => 'Le type d\'entretien d\'actif a été supprimé correctement.', ], 'create' => [ 'error' => 'Le type d\'entretien d\'actif n\'a pas été créé, veuillez réessayer.', - 'success' => 'Le type d\'entretien d\'actif a été créé correctement.' + 'success' => 'Le type d\'entretien d\'actif a été créé correctement.', ], 'edit' => [ 'error' => 'La gestion des actifs n\'a pas été modifiée, veuillez réessayer.', - 'success' => 'Asset Maintenance modifié avec succès.' + 'success' => 'Asset Maintenance modifié avec succès.', ], 'asset_maintenance_incomplete' => 'Pas encore complété', 'warranty' => 'Garantie', 'not_warranty' => 'Non garantie', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/fr/admin/asset_maintenances/table.php b/resources/lang/fr/admin/asset_maintenances/table.php index 449cb9a430..4f425b0f57 100644 --- a/resources/lang/fr/admin/asset_maintenances/table.php +++ b/resources/lang/fr/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Entretien d\'actifs', 'asset_name' => 'Désignation de l\'item', 'is_warranty' => 'Garantie', - 'dl_csv' => 'Télécharger en CSV' + 'dl_csv' => 'Télécharger en CSV', ]; diff --git a/resources/lang/fr/admin/categories/general.php b/resources/lang/fr/admin/categories/general.php index 7b7501fd00..881c1b595e 100644 --- a/resources/lang/fr/admin/categories/general.php +++ b/resources/lang/fr/admin/categories/general.php @@ -1,6 +1,6 @@ 'Catégories', 'category_name' => 'Catégorie', 'checkin_email' => 'Envoyer un courriel à l\'utilisateur lors de l\'association/dissociation.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Utiliser la license primaire par défaut à la place.', 'use_default_eula_disabled' => 'Utilisez la licence par défaut à la place. Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".', -); +]; diff --git a/resources/lang/fr/admin/categories/message.php b/resources/lang/fr/admin/categories/message.php index f3a543a181..99ca569293 100644 --- a/resources/lang/fr/admin/categories/message.php +++ b/resources/lang/fr/admin/categories/message.php @@ -1,25 +1,25 @@ 'Cette catégorie n\'existe pas.', 'assoc_models' => 'Cette catégorie est actuellement associée à au moins un modèle et ne peut pas être supprimée. Merci de mettre à jour les modèles afin de ne plus référencer cette catégorie et essayez à nouveau. ', 'assoc_items' => 'Cette catégorie est actuellement associée à au moins un :asset_type et ne peut pas être supprimée. Merci de mettre à jour les :asset_type afin de ne plus référencer cette catégorie et essayez à nouveau. ', - 'create' => array( + 'create' => [ 'error' => 'Cette catégorie n\'a pas été créée, veuillez réessayer.', - 'success' => 'Catégorie créée correctement.' - ), + 'success' => 'Catégorie créée correctement.', + ], - 'update' => array( + 'update' => [ 'error' => 'Catégorie n\'a pas été actualisée, veuillez réessayer', - 'success' => 'Catégorie actualisée correctement.' - ), + 'success' => 'Catégorie actualisée correctement.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer cette catégorie?', 'error' => 'Il y a eu un problème en supprimant cette catégorie. Veuillez réessayer.', - 'success' => 'Cette catégorie a été supprimée correctement.' - ) + 'success' => 'Cette catégorie a été supprimée correctement.', + ], -); +]; diff --git a/resources/lang/fr/admin/categories/table.php b/resources/lang/fr/admin/categories/table.php index 1cb48579e4..366784c02e 100644 --- a/resources/lang/fr/admin/categories/table.php +++ b/resources/lang/fr/admin/categories/table.php @@ -1,10 +1,10 @@ 'Licence d\'utilisation', +return [ + 'eula_text' => 'Licence d\'utilisation', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptation', 'title' => 'Nom de Catégorie', -); +]; diff --git a/resources/lang/fr/admin/companies/general.php b/resources/lang/fr/admin/companies/general.php index d8dd2dbf58..9459146458 100644 --- a/resources/lang/fr/admin/companies/general.php +++ b/resources/lang/fr/admin/companies/general.php @@ -1,4 +1,5 @@ 'Sélectionnez une compagnie', ]; diff --git a/resources/lang/fr/admin/companies/message.php b/resources/lang/fr/admin/companies/message.php index b0f2ef6e58..554a419925 100644 --- a/resources/lang/fr/admin/companies/message.php +++ b/resources/lang/fr/admin/companies/message.php @@ -1,18 +1,19 @@ 'La compagnie n\'existe pas.', 'assoc_users' => 'Cette compagnie est actuellement associée à au moins un modèle et ne peut être supprimée. veuillez actualiser vos modèles afin de ne plus référencer cette compagnie et ressayer. ', - 'create' => array( + 'create' => [ 'error' => 'La compagnie n\'a pas été créé, veuillez réessayer.', - 'success' => 'La compagnie a bien été créée.' - ), - 'update' => array( + 'success' => 'La compagnie a bien été créée.', + ], + 'update' => [ 'error' => 'La compagnie n\'a pas été actualisée, veuillez réessayer', - 'success' => 'La compagnie a bien été actualisée.' - ), - 'delete' => array( + 'success' => 'La compagnie a bien été actualisée.', + ], + 'delete' => [ 'confirm' => 'Êtes-vous sur de vouloir supprimer cette compagnie ?', 'error' => 'Il y a eu un problème lors de la suppression de cette compagnie. Veuillez réessayer.', - 'success' => 'La compagnie a bien été supprimée.' - ) -); + 'success' => 'La compagnie a bien été supprimée.', + ], +]; diff --git a/resources/lang/fr/admin/companies/table.php b/resources/lang/fr/admin/companies/table.php index 90bb58e151..306a6bf789 100644 --- a/resources/lang/fr/admin/companies/table.php +++ b/resources/lang/fr/admin/companies/table.php @@ -1,9 +1,10 @@ 'Compagnies', 'create' => 'Créer une compagnie', 'title' => 'Compagnie', 'update' => 'Actualiser une compagnie', 'name' => 'Nom de la compagnie', 'id' => 'ID', -); +]; diff --git a/resources/lang/fr/admin/components/general.php b/resources/lang/fr/admin/components/general.php index dcea9b0d51..639a5075ec 100644 --- a/resources/lang/fr/admin/components/general.php +++ b/resources/lang/fr/admin/components/general.php @@ -1,6 +1,6 @@ 'Nom du composant', 'checkin' => 'Dissocier un composant', 'checkout' => 'Attribuer un composant', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restant', 'total' => 'Total', 'update' => 'Mettre à jour un composant', -); +]; diff --git a/resources/lang/fr/admin/components/message.php b/resources/lang/fr/admin/components/message.php index 650626e937..8e24d8b7ec 100644 --- a/resources/lang/fr/admin/components/message.php +++ b/resources/lang/fr/admin/components/message.php @@ -1,36 +1,35 @@ 'Le composant n\'existe pas.', - 'create' => array( + 'create' => [ 'error' => 'Le composant n\'a pas été créé, merci d\'essayer à nouveau.', - 'success' => 'Le composant a bien été créé.' - ), + 'success' => 'Le composant a bien été créé.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le composant n\'a pas été mis à jour, merci d\'essayer à nouveau', - 'success' => 'Le composant a bien été mis à jour.' - ), + 'success' => 'Le composant a bien été mis à jour.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer ce composant?', 'error' => 'Un problème est survenu durant la suppression de ce composant. Merci d\'essayer à nouveau.', - 'success' => 'Le composant a bien été supprimé.' - ), + 'success' => 'Le composant a bien été supprimé.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Le composant n\'a pas été libéré, merci d\'essayer à nouveau', 'success' => 'Le composant a bien été libéré.', - 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.' - ), + 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Le composant n\'a pas été réceptionné, merci d\'essayer à nouveau', 'success' => 'Le composant a bien été réceptionné.', - 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.' - ) + 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.', + ], - -); +]; diff --git a/resources/lang/fr/admin/components/table.php b/resources/lang/fr/admin/components/table.php index 3d5d825990..c16096f995 100644 --- a/resources/lang/fr/admin/components/table.php +++ b/resources/lang/fr/admin/components/table.php @@ -1,5 +1,5 @@ 'Nom du composant', -); +]; diff --git a/resources/lang/fr/admin/consumables/general.php b/resources/lang/fr/admin/consumables/general.php index 5f53f1e473..8e6e3a2c10 100644 --- a/resources/lang/fr/admin/consumables/general.php +++ b/resources/lang/fr/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Attribuer une fourniture à un utilisateur', 'consumable_name' => 'Nom de la fourniture', 'create' => 'Créer une fourniture', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Quantité restante', 'total' => 'Total', 'update' => 'Actualiser la fourniture', -); +]; diff --git a/resources/lang/fr/admin/consumables/message.php b/resources/lang/fr/admin/consumables/message.php index eb9412ff7f..81f19d2475 100644 --- a/resources/lang/fr/admin/consumables/message.php +++ b/resources/lang/fr/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Cette fourniture n\'existe pas.', - 'create' => array( + 'create' => [ 'error' => 'La fourniture n\'a pas été créé, veuillez réessayer.', - 'success' => 'La fourniture a été créé correctement.' - ), + 'success' => 'La fourniture a été créé correctement.', + ], - 'update' => array( + 'update' => [ 'error' => 'La fourniture n\'a pas été actualisé, veuillez réessayer', - 'success' => 'La fourniture a été actualisé correctement.' - ), + 'success' => 'La fourniture a été actualisé correctement.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous certain de vouloir détruire cette fourniture ?', 'error' => 'Il y a eu un problème en détruisant la fourniture. Veuillez réessayer.', - 'success' => 'La fourniture a été détruite correctement.' - ), + 'success' => 'La fourniture a été détruite correctement.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'La fourniture n\'a pas été attribué correctement, veuillez réessayer', 'success' => 'La fourniture a été attribué correctement.', - 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.' - ), + 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'La fourniture n\'a pas été dissocié correctement, veuillez réessayer', 'success' => 'La fourniture à été dissocié correctement.', - 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.' - ) + 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', + ], - -); +]; diff --git a/resources/lang/fr/admin/consumables/table.php b/resources/lang/fr/admin/consumables/table.php index c47cd0e7fa..3a08939663 100644 --- a/resources/lang/fr/admin/consumables/table.php +++ b/resources/lang/fr/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nom de la fourniture', -); +]; diff --git a/resources/lang/fr/admin/custom_fields/general.php b/resources/lang/fr/admin/custom_fields/general.php index b3c9538bdc..34e8058670 100644 --- a/resources/lang/fr/admin/custom_fields/general.php +++ b/resources/lang/fr/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Champs personnalisés', 'field' => 'Champ', 'about_fieldsets_title' => 'A propos des fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nouveau champ personnalisé', 'value_encrypted' => 'La valeur de ce champ est chiffrée dans la base de donnée. Seuls les administrateurs seront capable de voir les données déchiffrées', 'show_in_email' => 'Inclure la valeur de ce champ dans les e-mails envoyés à l\'utilisateur? Les champs cryptés ne peuvent pas être inclus dans les e-mails.', -); +]; diff --git a/resources/lang/fr/admin/custom_fields/message.php b/resources/lang/fr/admin/custom_fields/message.php index 2496cbb682..f98f2584a6 100644 --- a/resources/lang/fr/admin/custom_fields/message.php +++ b/resources/lang/fr/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Ce champ n\'existe pas.', 'already_added' => 'Le champ a déjà été ajouté', - 'create' => array( + 'create' => [ 'error' => 'Le champ n\'a pas été créé, veuillez réessayer.', 'success' => 'Le champ a bien été créé.', - 'assoc_success' => 'Le champ a bien été ajouté au fieldset.' - ), + 'assoc_success' => 'Le champ a bien été ajouté au fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le champ n\'a pas été actualisé, veuillez réessayer', - 'success' => 'Le champ a bien été actualisé.' - ), + 'success' => 'Le champ a bien été actualisé.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce champ ?', 'error' => 'Un problème a eu lien pendant la suppression du champ. Veuillez réessayer.', 'success' => 'Le champ a bien été supprimé.', 'in_use' => 'Le champ est actuellement en utilisation.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset n\'existe pas', - 'create' => array( + 'create' => [ 'error' => 'Le fieldset n\'a pas pur être créé, veuillez réessayer.', - 'success' => 'Le Fieldset a bien été créé.' - ), + 'success' => 'Le Fieldset a bien été créé.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le fieldset n\'a pas été actualisé, veuillez réessayer', - 'success' => 'Le fieldset a bien été actualisé.' - ), + 'success' => 'Le fieldset a bien été actualisé.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce fieldset ?', 'error' => 'Un problème a eu lien pendant la suppression du fieldset. Veuillez réessayer.', 'success' => 'Le fieldset a bien été supprimé.', 'in_use' => 'Le fieldset est actuellement utilisé.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/fr/admin/departments/message.php b/resources/lang/fr/admin/departments/message.php index 8e1a8b4a1f..f469d635ab 100644 --- a/resources/lang/fr/admin/departments/message.php +++ b/resources/lang/fr/admin/departments/message.php @@ -1,21 +1,21 @@ 'Le département n\'existe pas.', 'assoc_users' => 'Ce service est actuellement associé à au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus référencer ce service et réessayer.', - 'create' => array( + 'create' => [ 'error' => 'Le département n\'a pas été créé. Veuillez réessayer.', - 'success' => 'Département créé avec succès.' - ), - 'update' => array( + 'success' => 'Département créé avec succès.', + ], + 'update' => [ 'error' => 'Le département n\'a pas été mis à jour. Veuillez réessayer.', - 'success' => 'Département mis à jour avec succès.' - ), - 'delete' => array( + 'success' => 'Département mis à jour avec succès.', + ], + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce département?', 'error' => 'Il y avait un problème de suppression du département. Veuillez réessayer.', - 'success' => 'Le département a été supprimé avec succès.' - ) + 'success' => 'Le département a été supprimé avec succès.', + ], -); +]; diff --git a/resources/lang/fr/admin/departments/table.php b/resources/lang/fr/admin/departments/table.php index 81f12064ee..d0ebedaa0f 100644 --- a/resources/lang/fr/admin/departments/table.php +++ b/resources/lang/fr/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nom du département', @@ -8,4 +8,4 @@ return array( 'location' => 'Emplacement', 'create' => 'Créer un département', 'update' => 'Mise à jour Département', - ); + ]; diff --git a/resources/lang/fr/admin/depreciations/general.php b/resources/lang/fr/admin/depreciations/general.php index 1ca3e3a8ba..f3bed046a5 100644 --- a/resources/lang/fr/admin/depreciations/general.php +++ b/resources/lang/fr/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'A propos des Amortissements', 'about_depreciations' => 'Vous pouvez configurer les amortissements de vos biens basés sur l\'amortissement linéaire.', 'asset_depreciations' => 'Amortissements', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Mois', 'update' => 'Actualiser l\'amortissement', -); +]; diff --git a/resources/lang/fr/admin/depreciations/message.php b/resources/lang/fr/admin/depreciations/message.php index 7d5db20966..091a2ec74e 100644 --- a/resources/lang/fr/admin/depreciations/message.php +++ b/resources/lang/fr/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Cette classe d\'amortissement n\'existe pas.', 'assoc_users' => 'Cet amortissement est associé à un ou plusieurs modèles et ne peut être supprimé. Veuillez supprimer les modèles et réessayer. ', - - 'create' => array( + 'create' => [ 'error' => 'La classe d\'amortissement n\'a pas été créée, veuillez réessayer. :(', - 'success' => 'La classe d\'amortissement a été créée correctement. :)' - ), + 'success' => 'La classe d\'amortissement a été créée correctement. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'La classe d\'amortissement n\'a pas été actualisée, veuillez réessayer', - 'success' => 'La classe d\'amortissement a été actualisée correctement.' - ), + 'success' => 'La classe d\'amortissement a été actualisée correctement.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer cette classe d\'amortissement?', 'error' => 'Il y a eu un problème en supprimant cette classe d\'amortissement. Veuillez réessayer.', - 'success' => 'La classe d\'amortissement a été supprimée correctement.' - ) + 'success' => 'La classe d\'amortissement a été supprimée correctement.', + ], -); +]; diff --git a/resources/lang/fr/admin/depreciations/table.php b/resources/lang/fr/admin/depreciations/table.php index 29c01eadb6..76776270f6 100644 --- a/resources/lang/fr/admin/depreciations/table.php +++ b/resources/lang/fr/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Mois', 'term' => 'Terme', 'title' => 'Nom ', -); +]; diff --git a/resources/lang/fr/admin/groups/message.php b/resources/lang/fr/admin/groups/message.php index a374bf8c39..43e2aef8e6 100644 --- a/resources/lang/fr/admin/groups/message.php +++ b/resources/lang/fr/admin/groups/message.php @@ -1,22 +1,22 @@ 'Ce groupe existe déjà!', 'group_not_found' => 'Ce groupe [:id] n\'existe pas.', 'group_name_required' => 'Le champ nom est obligatoire.', - 'success' => array( + 'success' => [ 'create' => 'Ce groupe a été créé correctement.', 'update' => 'Ce groupe a été actualisé correctement.', 'delete' => 'Ce groupe a été supprimé correctement.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer ce groupe?', 'create' => 'Il y a eu un problème en créant le groupe. Veuillez réessayer.', 'update' => 'Il y a eu un problème en actualisant le groupe. Veuillez réessayer.', 'delete' => 'Il y a eu un problème en supprimant le groupe. Veuillez réessayer.', - ), + ], -); +]; diff --git a/resources/lang/fr/admin/groups/table.php b/resources/lang/fr/admin/groups/table.php index 4462aa38ab..d0e4bb5dde 100644 --- a/resources/lang/fr/admin/groups/table.php +++ b/resources/lang/fr/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Nom', 'users' => '# d\' Utilisateurs', -); +]; diff --git a/resources/lang/fr/admin/groups/titles.php b/resources/lang/fr/admin/groups/titles.php index d58de14fde..2f242837cd 100644 --- a/resources/lang/fr/admin/groups/titles.php +++ b/resources/lang/fr/admin/groups/titles.php @@ -1,6 +1,6 @@ 'A propos des groupes', 'about_groups' => 'Les groupes sont utilisés pour mettre en commun les permissions des utilisateurs.', 'group_management' => 'Gestion des Groupes', @@ -11,4 +11,4 @@ return array( 'allow' => 'Autoriser', 'deny' => 'Refuser', -); +]; diff --git a/resources/lang/fr/admin/hardware/form.php b/resources/lang/fr/admin/hardware/form.php index 093c1ed5c9..726d685690 100644 --- a/resources/lang/fr/admin/hardware/form.php +++ b/resources/lang/fr/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmez la suppression du lot d\'objets', +return [ + 'bulk_delete' => 'Confirmez la suppression du lot d\'objets', 'bulk_delete_help' => 'Vérifiez les objets ci-dessous pour la suppression du lot. Une fois supprimés, ces objets peuvent être restaurés, mais ils ne seront plus associés avec les utilisateurs auxquels ils sont actuellement assignés.', 'bulk_delete_warn' => 'Vous allez supprimer :asset_count objets.', - 'bulk_update' => 'Mise à jour en bloc d\'actifs', - 'bulk_update_help' => 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Seulement remplir les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ', - 'bulk_update_warn' => 'Vous êtes sur le point de modifier les propriétés de l\'actif :asset_count .', + 'bulk_update' => 'Mise à jour en bloc d\'actifs', + 'bulk_update_help' => 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Seulement remplir les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ', + 'bulk_update_warn' => 'Vous êtes sur le point de modifier les propriétés de l\'actif :asset_count .', 'checkedout_to' => 'Extrait vers', 'checkout_date' => 'Date d\'attribution', 'checkin_date' => 'Date de dissociation', @@ -38,7 +38,6 @@ return array( 'tag' => 'Numéro d\'inventaire', 'update' => 'Mise à jour de l\'actif', 'warranty' => 'Garantie', - 'warranty_expires' => 'Expiration de garantie', + 'warranty_expires' => 'Expiration de garantie', 'years' => 'années', -) -; +]; diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php index 534db7eaa4..d975bf8f88 100644 --- a/resources/lang/fr/admin/hardware/general.php +++ b/resources/lang/fr/admin/hardware/general.php @@ -1,9 +1,9 @@ 'A propos des actifs', 'about_assets_text' => 'Les actifs sont des éléments suivis par le numéro de série ou l\'étiquette de l\'actif. Ils ont tendance à être des éléments de valeur supérieure où l\'identification d\'un élément spécifique importe.', - 'archived' => 'Retiré', + 'archived' => 'Retiré', 'asset' => 'Biens', 'bulk_checkout' => 'Attribuer les actifs', 'checkin' => 'Retour des Biens', @@ -19,4 +19,4 @@ return array( 'pending' => 'En attente', 'undeployable' => 'Non déployable', 'view' => 'Voir le Bien', -); +]; diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php index df198cf74c..65dc6fb83c 100644 --- a/resources/lang/fr/admin/hardware/message.php +++ b/resources/lang/fr/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Attention: Ce bien a été marqué non déployable. Si ce statut a changé, veuillez l\'actualiser.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Cet actif n\'existe pas ou ne peux pas être réquisitionné.', 'assoc_users' => 'Ce bien est marqué sorti par un utilisateur et ne peut être supprimé. Veuillez d\'abord cliquer sur Retour de Biens, et réessayer.', - 'create' => array( + 'create' => [ 'error' => 'Ce bien n\'a pas été créé, veuillez réessayer. :(', - 'success' => 'Bien créé correctement. :)' - ), + 'success' => 'Bien créé correctement. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ce bien n\'a pas été actualisé, veuillez réessayer', 'success' => 'Bien actualisé correctement.', 'nothing_updated' => 'Aucun champ n\'a été sélectionné, rien n\'a été actualisé.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'L\'actif n\'a pas été restauré, veuillez réessayer', - 'success' => 'Actif restauré correctement.' - ), + 'success' => 'Actif restauré correctement.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audit des actifs n\'a pas réussi. Veuillez réessayer.', - 'success' => 'Audit des actifs consigné avec succès.' - ), + 'success' => 'Audit des actifs consigné avec succès.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Le fichier n\'a pas été détruit. Veuillez réessayer.', 'success' => 'Fichier détruit correctement.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Le(s) fichier(s) n\'ont pas pu être téléversé. Veuillez réessayer.', 'success' => 'Le(s) fichier(s) ont été téléversé correctement.', 'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléchargement ou le fichier que vous essayez de télécharger est trop gros', 'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop gros, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Certains éléments n\'ont pas été correctement importés.', 'errorDetail' => 'Les éléments suivants n\'ont pas été importés à cause d\'erreurs.', - 'success' => "Votre fichier a bien été importé", - 'file_delete_success' => "Votre fichier a été correctement supprimé", - 'file_delete_error' => "Le fichier n’a pas pu être supprimé", - ), + 'success' => 'Votre fichier a bien été importé', + 'file_delete_success' => 'Votre fichier a été correctement supprimé', + 'file_delete_error' => 'Le fichier n’a pas pu être supprimé', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer ce bien?', 'error' => 'Il y a eu un problème en supprimant ce bien. Veuillez réessayer.', 'nothing_updated' => 'Aucun actif n\'a été sélectionné, donc rien n\'a été supprimé.', - 'success' => 'Ce bien a été supprimé correctement.' - ), + 'success' => 'Ce bien a été supprimé correctement.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ce bien n\'a pas été sorti, veuillez réessayer', 'success' => 'Ce bien a été sorti correctement.', 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', 'not_available' => 'Ce bien n\'est pas disponible pour être sorti!', - 'no_assets_selected' => 'Vous devez sélectionner au moins un élément de la liste' - ), + 'no_assets_selected' => 'Vous devez sélectionner au moins un élément de la liste', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ce bien n\'a pas été retourné, veuillez réessayer', 'success' => 'Ce bien a été retourné correctement.', 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', 'already_checked_in' => 'Ce bien est déjà dissocié.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Le bien n\'a pas été demandé, merci d\'essayer à nouveau', 'success' => 'Le bien a été demandé correctement.', - 'canceled' => 'La demande de paiement a été annulée' - ) + 'canceled' => 'La demande de paiement a été annulée', + ], -); +]; diff --git a/resources/lang/fr/admin/hardware/table.php b/resources/lang/fr/admin/hardware/table.php index fd7bad1f83..d947f09fd3 100644 --- a/resources/lang/fr/admin/hardware/table.php +++ b/resources/lang/fr/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Étiquette de l\'actif', 'asset_model' => 'Modèle', @@ -20,6 +20,6 @@ return array( 'title' => 'Actif ', 'image' => 'Image', 'days_without_acceptance' => 'Jours sans acceptation', - 'monthly_depreciation' => 'Dépréciation mensuelle' + 'monthly_depreciation' => 'Dépréciation mensuelle', -); +]; diff --git a/resources/lang/fr/admin/kits/general.php b/resources/lang/fr/admin/kits/general.php index 95b845195b..df2b39d555 100644 --- a/resources/lang/fr/admin/kits/general.php +++ b/resources/lang/fr/admin/kits/general.php @@ -1,6 +1,6 @@ 'À propos des kits prédéfinis', 'about_kits_text' => 'Les kits prédéfinis vous permettent d\'associer rapidement une collection d\'éléments (matériels, licences, etc.) à un utilisateur. Cela peut être utile lorsque votre processus d\'intégration est cohérent entre plusieurs utilisateurs et que tous les utilisateurs reçoivent les mêmes éléments.', 'checkout' => 'Associer le kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Il n\'y a pas assez d\'unités disponibles de :consumable pour associer. :qty sont nécessaires. ', 'none_accessory' => 'Il n\'y a pas assez d\'unités disponibles de :accessory pour associer. :qty sont nécessaires. ', -); +]; diff --git a/resources/lang/fr/admin/licenses/form.php b/resources/lang/fr/admin/licenses/form.php index 20c17dba57..71dc371202 100644 --- a/resources/lang/fr/admin/licenses/form.php +++ b/resources/lang/fr/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Actif', 'checkin' => 'Dissocier', @@ -18,5 +18,5 @@ return array( 'to_email' => 'E-mail de la licence', 'to_name' => 'Nom de la licence', 'update' => 'Mise à jour de la licence', - 'checkout_help' => 'Vous devez associer une licence à un matériel ou une personne. Vous pouvez sélectionner les deux, mais le propriétaire de l\'actif doit correspondre à la personne que vous associez.' -); + 'checkout_help' => 'Vous devez associer une licence à un matériel ou une personne. Vous pouvez sélectionner les deux, mais le propriétaire de l\'actif doit correspondre à la personne que vous associez.', +]; diff --git a/resources/lang/fr/admin/licenses/general.php b/resources/lang/fr/admin/licenses/general.php index ed20681369..9436ab586b 100644 --- a/resources/lang/fr/admin/licenses/general.php +++ b/resources/lang/fr/admin/licenses/general.php @@ -1,6 +1,6 @@ 'A propos des licences', 'about_licenses' => 'Les licences sont utilisées pour suivre les logiciels. Ils ont un certain nombre d\'attribution pouvant être associés individuellement', 'checkin' => 'Libérer la licence multiposte', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licences de logiciel', 'user' => 'Utilisateur', 'view' => 'Voir la licence', -); +]; diff --git a/resources/lang/fr/admin/licenses/message.php b/resources/lang/fr/admin/licenses/message.php index cc24b775aa..ea58c1e216 100644 --- a/resources/lang/fr/admin/licenses/message.php +++ b/resources/lang/fr/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Cette catégorie n\'existe pas.', 'user_does_not_exist' => 'L\'utilisateur n\'existe pas.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Vous devez sélectionner un actif ou un utilisateur, mais pas les deux.', 'not_found' => 'Licence introuvable', - - 'create' => array( + 'create' => [ 'error' => 'Cette catégorie n\'a pas été créée, veuillez réessayer.', - 'success' => 'Catégorie créée correctement.' - ), + 'success' => 'Catégorie créée correctement.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Le fichier n\'a pas pu être supprimé. Merci de réessayer.', 'success' => 'Le fichier a bien été supprimé.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Le(s) fichier(s) n\'a pas pu être uploadé. Merci de réessayer.', 'success' => 'Le(s) fichier(s) a bien été uploadé.', 'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléchargement ou le fichier que vous essayez de télécharger est trop gros', 'invalidfiles' => 'Un ou plusieurs de vos fichiers est trop grand ou le type de fichier n\'est pas autorisé. Les différents types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf, txt, zip, rar et rtf.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Cette catégorie n\'a pas été actualisée, veuillez réessayer.', - 'success' => 'Catégorie actualisée correctement.' - ), + 'success' => 'Catégorie actualisée correctement.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer cette catégorie?', 'error' => 'Il y a eu un problème en supprimant cette catégorie. Veuillez réessayer.', - 'success' => 'Cette catégorie a été supprimée correctement.' - ), + 'success' => 'Cette catégorie a été supprimée correctement.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Un problème a eu lieu pendant l\'association de la licence. Veuillez essayer à nouveau.', - 'success' => 'La licence a été associée avec succès' - ), + 'success' => 'La licence a été associée avec succès', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Un problème a eu lieu pendant la dissociation de la licence. Veuillez essayer à nouveau.', - 'success' => 'La licence a été dissociée avec succès' - ), + 'success' => 'La licence a été dissociée avec succès', + ], -); +]; diff --git a/resources/lang/fr/admin/licenses/table.php b/resources/lang/fr/admin/licenses/table.php index 0f25b4e18e..73cc60403f 100644 --- a/resources/lang/fr/admin/licenses/table.php +++ b/resources/lang/fr/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Affecté à', 'checkout' => 'Affecter/Libérer', @@ -14,4 +14,4 @@ return array( 'serial' => 'Numéro de série', 'title' => 'Licence', -); +]; diff --git a/resources/lang/fr/admin/locations/message.php b/resources/lang/fr/admin/locations/message.php index 2ffb7b1f9a..81e4d07dfc 100644 --- a/resources/lang/fr/admin/locations/message.php +++ b/resources/lang/fr/admin/locations/message.php @@ -1,27 +1,26 @@ 'Le lieu n\'existe pas.', 'assoc_users' => 'Ce lieu est actuellement associé avec au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à ce lieu et essayez à nouveau. ', 'assoc_assets' => 'Cet emplacement est actuellement associé à au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à cet emplacement et réessayez. ', 'assoc_child_loc' => 'Cet emplacement est actuellement le parent d\'au moins un sous emplacement et ne peut pas être supprimé . S\'il vous plaît mettre à jour vos emplacement pour ne plus le référencer et réessayez. ', - - 'create' => array( + 'create' => [ 'error' => 'Le lieu n\'a pas été créé, veuillez essayer à nouveau.', - 'success' => 'Le lieu a été créé avec succès.' - ), + 'success' => 'Le lieu a été créé avec succès.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le lieu n\'a pas été mis à jour, veuillez essayer à nouveau', - 'success' => 'Le lieu a été mis à jour avec succès.' - ), + 'success' => 'Le lieu a été mis à jour avec succès.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce lieu ?', 'error' => 'Un problème a eu lieu pendant la suppression du lieu. Veuillez essayer à nouveau.', - 'success' => 'Le lieu a été supprimé avec succès.' - ) + 'success' => 'Le lieu a été supprimé avec succès.', + ], -); +]; diff --git a/resources/lang/fr/admin/locations/table.php b/resources/lang/fr/admin/locations/table.php index 3cf2378200..7fdce48ac1 100644 --- a/resources/lang/fr/admin/locations/table.php +++ b/resources/lang/fr/admin/locations/table.php @@ -1,6 +1,6 @@ 'A propos des emplacements', 'about_locations' => 'Les lieux sont utilisés pour suivre les informations de localisation des utilisateurs, des actifs et d\'autres éléments', 'assets_rtd' => 'Biens', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Devise de l\'emplacement', 'ldap_ou' => 'Recherche LDAP', - ); + ]; diff --git a/resources/lang/fr/admin/manufacturers/message.php b/resources/lang/fr/admin/manufacturers/message.php index 5b0a9d3b61..3f566dd9f6 100644 --- a/resources/lang/fr/admin/manufacturers/message.php +++ b/resources/lang/fr/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Le fabricant n\'existe pas.', 'assoc_users' => 'Ce fabricant est actuellement associé avec au moins un modèle et ne peut pas être supprimé. Veuillez mettre à jour les modèles pour ne plus référencer un fabricant et essayer à nouveau. ', - 'create' => array( + 'create' => [ 'error' => 'Le fabricant n\'a pas été créé, veuillez essayer à nouveau.', - 'success' => 'Le fabricant a été créé avec succès.' - ), + 'success' => 'Le fabricant a été créé avec succès.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le fabricant n\'a pas été mis à jour, veuillez essayer à nouveau', - 'success' => 'Le fabricant a été mis à jour avec succès.' - ), + 'success' => 'Le fabricant a été mis à jour avec succès.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Le fabricant n\'a pas été restauré, veuillez réessayer', - 'success' => 'Fabricant restauré avec succès.' - ), + 'success' => 'Fabricant restauré avec succès.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce fabricant ?', 'error' => 'Un problème a eu lieu pendant la suppression du fabricant. Veuillez essayer à nouveau.', - 'success' => 'Le fabricant a été supprimé avec succès.' - ) + 'success' => 'Le fabricant a été supprimé avec succès.', + ], -); +]; diff --git a/resources/lang/fr/admin/manufacturers/table.php b/resources/lang/fr/admin/manufacturers/table.php index 64cc317101..9fff3a10ce 100644 --- a/resources/lang/fr/admin/manufacturers/table.php +++ b/resources/lang/fr/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'A propos des fabricants', 'about_manufacturers_text' => 'Les fabricants sont les entreprises qui créent vos actifs. Vous pouvez stocker ici des informations importantes sur les contacts de support, qui seront affichées sur les pages de détails de votre actif.', 'asset_manufacturers' => 'Fabricants d\'actif', @@ -13,4 +13,4 @@ return array( 'update' => 'Mettre à jour le fabricant', 'url' => 'URL', -); +]; diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php index 9251389273..d8d9f65275 100644 --- a/resources/lang/fr/admin/models/general.php +++ b/resources/lang/fr/admin/models/general.php @@ -1,6 +1,6 @@ 'A propos des modèles actifs', 'about_models_text' => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.', 'deleted' => 'Ce modèle a été détruit. Cliquez ici pour le restaurer.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Vous êtes sur le points de suppimer :model_count modèles d\'actifs.', 'restore' => 'Restaurer le modèle', 'requestable' => 'Les utilisateurs peuvent demander ce modèle', - 'show_mac_address' => 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif', + 'show_mac_address' => 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif', 'view_deleted' => 'Voir les modèles détruits', 'view_models' => 'Voir les différents modèles', 'fieldset' => 'Ensemble de champs', 'no_custom_field' => 'Pas de champs personnalisés', 'add_default_values' => 'Ajouter des valeurs par défaut', -); +]; diff --git a/resources/lang/fr/admin/models/message.php b/resources/lang/fr/admin/models/message.php index 28ac0152c4..bc8f8511cb 100644 --- a/resources/lang/fr/admin/models/message.php +++ b/resources/lang/fr/admin/models/message.php @@ -1,42 +1,41 @@ 'Le modèle n\'existe pas.', 'assoc_users' => 'Ce modèle est actuellement associé à au moins un actif et ne peut pas être supprimé. Veuillez supprimer les actifs associés et essayer à nouveau. ', - - 'create' => array( + 'create' => [ 'error' => 'Le modèle n\'a pas été créé, veuillez essayer à nouveau.', 'success' => 'Le modèle a été créé avec succès.', 'duplicate_set' => 'Un modèle d\'actif avec ce nom, fabricant et modèle existe déjà.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Le modèle n\'a pas été mis à jour, veuillez essayer à nouveau', - 'success' => 'Le modèle a été mis à jour avec succès.' - ), + 'success' => 'Le modèle a été mis à jour avec succès.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce modèle d\'actif ?', 'error' => 'Un problème a eu lieu pendant la suppression du modèle. Veuillez essayer à nouveau.', - 'success' => 'Le modèle a été supprimé avec succès.' - ), + 'success' => 'Le modèle a été supprimé avec succès.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Le modèle d\'actif n\'a pas été restauré, veuillez réessayer', - 'success' => 'Modèle d\'actif restauré correctement.' - ), + 'success' => 'Modèle d\'actif restauré correctement.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Aucun champ n\'a été changé, donc rien n\'a été mis à jour.', - 'success' => 'Modèles mis à jour.' - ), + 'success' => 'Modèles mis à jour.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Aucun modèle n\'a été sélectionné, donc rien n\'a été supprimé.', 'success' => ': modèle(s) succes_count supprimé(s) !', - 'success_partial' => ': les modèles success_count ont été supprimés, cependant : fail_count n\'a pas pu être supprimé car ils ont toujours des ressources associées.' - ), + 'success_partial' => ': les modèles success_count ont été supprimés, cependant : fail_count n\'a pas pu être supprimé car ils ont toujours des ressources associées.', + ], -); +]; diff --git a/resources/lang/fr/admin/models/table.php b/resources/lang/fr/admin/models/table.php index 727ba77e1b..48d8aca1d5 100644 --- a/resources/lang/fr/admin/models/table.php +++ b/resources/lang/fr/admin/models/table.php @@ -1,6 +1,6 @@ 'Créer un modèle d\'actif', 'created_at' => 'Créé le', @@ -14,4 +14,4 @@ return array( 'update' => 'Mettre à jour le modèle d\'actif', 'clone' => 'Cloner le modèle', 'edit' => 'Éditer le modèle', -); +]; diff --git a/resources/lang/fr/admin/reports/general.php b/resources/lang/fr/admin/reports/general.php index 6c99148589..172c881dac 100644 --- a/resources/lang/fr/admin/reports/general.php +++ b/resources/lang/fr/admin/reports/general.php @@ -1,5 +1,5 @@ 'Sélectionnez les options que vous souhaitez pour votre rapport d\'actifs.' -); +return [ + 'info' => 'Sélectionnez les options que vous souhaitez pour votre rapport d\'actifs.', +]; diff --git a/resources/lang/fr/admin/reports/message.php b/resources/lang/fr/admin/reports/message.php index cdfedcc5bc..041503a070 100644 --- a/resources/lang/fr/admin/reports/message.php +++ b/resources/lang/fr/admin/reports/message.php @@ -1,5 +1,5 @@ 'Vous devez sélectionner au moins UNE option.' -); +return [ + 'error' => 'Vous devez sélectionner au moins UNE option.', +]; diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php index b8ad64161e..7452f34229 100644 --- a/resources/lang/fr/admin/settings/general.php +++ b/resources/lang/fr/admin/settings/general.php @@ -1,12 +1,12 @@ 'Service d\'annuaire', 'ad_domain' => 'Domaine du service d\'annuaire', 'ad_domain_help' => 'C\'est parfois le même que votre domaine d\'e-mail, mais pas toujours.', 'ad_append_domain_label' => 'Ajouter un nom de domaine', 'ad_append_domain' => 'Ajouter le nom de domaine au champ nom d\'utilisateur', - 'ad_append_domain_help' => 'L\'utilisateur n\'est pas obligé d\'écrire "username@domain.local", il peut juste taper "username".' , + 'ad_append_domain_help' => 'L\'utilisateur n\'est pas obligé d\'écrire "username@domain.local", il peut juste taper "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'Si vous souhaitez envoyer une copie des courriels d\'association/dissociation qui sont envoyés aux utilisateurs à un compte de messagerie supplémentaire, entrez-le ici. Sinon, laissez ce champ vide.', 'is_ad' => 'C\'est un serveur Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Seuil d\'expiration des alertes (en jours)', 'alert_inv_threshold' => 'Seuil d\'alerte d\'inventaire', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID de l\'actif', 'audit_interval' => 'Intervalle d\'audit', 'audit_interval_help' => 'Si vous devez régulièrement vérifier physiquement vos actifs, entrez l\'intervalle en mois.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Entre le code à deux facteurs', 'two_factor_config_complete' => 'Soumettre le code', 'two_factor_enabled_edit_not_allowed' => 'Votre administrateur ne vous permet pas de modifier ce paramètre.', - 'two_factor_enrollment_text' => "L’authentification à deux facteurs est nécessaire, mais votre appareil n’a pas encore été inscrit. Ouvrez votre application Google Authenticator et scanner le code QR ci-dessous pour inscrire votre appareil. Une fois que vous avez inscrit votre appareil, saisissez le code ci-dessous", + 'two_factor_enrollment_text' => 'L’authentification à deux facteurs est nécessaire, mais votre appareil n’a pas encore été inscrit. Ouvrez votre application Google Authenticator et scanner le code QR ci-dessous pour inscrire votre appareil. Une fois que vous avez inscrit votre appareil, saisissez le code ci-dessous', 'require_accept_signature' => 'Exiger la signature', 'require_accept_signature_help_text' => 'L\'activation de cette fonctionnalité nécessite que les utilisateurs signent physiquement l\'acceptation de cet actif.', 'left' => 'gauche', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Cocher cette case forcera une contrainte d\'unicité sur les identifiants d\'actif', 'zerofill_count' => 'Longueur des étiquettes de bien, incluant le remplissage de zéros', 'username_format_help' => 'Ce paramètre ne sera utilisé par le processus d\'importation que si un nom d\'utilisateur n\'est pas fourni et que nous devons générer un nom d\'utilisateur pour vous.', -); +]; diff --git a/resources/lang/fr/admin/settings/message.php b/resources/lang/fr/admin/settings/message.php index 998b15ff56..48eef5c048 100644 --- a/resources/lang/fr/admin/settings/message.php +++ b/resources/lang/fr/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Une erreur a eu lieu pendant la mise à jour. ', - 'success' => 'Les paramètres ont été mis à jour avec succès.' - ), - 'backup' => array( + 'success' => 'Les paramètres ont été mis à jour avec succès.', + ], + 'backup' => [ 'delete_confirm' => 'Êtes-vous certain de vouloir supprimer ce fichier de sauvegarde ? Cette action ne peut pas être annulée. ', 'file_deleted' => 'Le fichier de sauvegarde a été supprimé correctement. ', 'generated' => 'Un nouveau fichier de sauvegarde a été créé correctement.', 'file_not_found' => 'Ce fichier de sauvegarde n\'a pas pu être trouvé sur le serveur .', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Une erreur est survenue durant la purge. ', 'validation_failed' => 'Votre confirmation de purge est incorrecte. Merci d\'écrire le mot "DELETE" dans la fenêtre de confirmation.', - 'success' => 'Les enregistrements supprimés ont bien été purgés.' - ), + 'success' => 'Les enregistrements supprimés ont bien été purgés.', + ], -); +]; diff --git a/resources/lang/fr/admin/statuslabels/message.php b/resources/lang/fr/admin/statuslabels/message.php index 066be3b276..e8d4fcc0a8 100644 --- a/resources/lang/fr/admin/statuslabels/message.php +++ b/resources/lang/fr/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'L\'étiquette de statut n\'existe pas.', 'assoc_assets' => 'Cette étiquette de statut est actuellement associée avec au moins un bien et ne peut être supprimée. Merci de mettre à jour vos biens pour ne plus référencer ce statut et essayez à nouveau. ', - - 'create' => array( + 'create' => [ 'error' => 'L\'étiquette de statut n\'a pas été créée, merci d\'essayer à nouveau.', - 'success' => 'L\'étiquette de statut a bien été créée.' - ), + 'success' => 'L\'étiquette de statut a bien été créée.', + ], - 'update' => array( + 'update' => [ 'error' => 'L\'étiquette de statut n\'a pas été mise à jour, merci de réessayer', - 'success' => 'L\'étiquette de statut a bien été mise à jour.' - ), + 'success' => 'L\'étiquette de statut a bien été mise à jour.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Etes-vous sûr de vouloir supprimer cette étiquette de statut?', 'error' => 'Un problème est survenu durant la suppression de cette étiquette de statut. Merci d\'essayer à nouveau.', - 'success' => 'L\'étiquette de statut a bien été supprimée.' - ), + 'success' => 'L\'étiquette de statut a bien été supprimée.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ces actifs ne peuvent être attribués à personne.', 'deployable' => 'Ces actifs peuvent être extraits. Une fois qu\'ils sont assignés, ils supposeront un statut méta de Deployed.', 'archived' => 'Ces éléments ne peuvent pas être extraits et ne s\'afficheront que dans la vue Archivée. Ceci est utile pour conserver des informations sur les actifs à des fins budgétaires / historiques, mais les garder hors de la liste des actifs au jour le jour.', 'pending' => 'Ces actifs ne peuvent pas encore être attribués à qui que ce soit, souvent utilisés pour des articles en réparation, mais qui devraient revenir à la circulation.', - ), + ], -); +]; diff --git a/resources/lang/fr/admin/statuslabels/table.php b/resources/lang/fr/admin/statuslabels/table.php index 0ef604e3b5..0f4832dbae 100644 --- a/resources/lang/fr/admin/statuslabels/table.php +++ b/resources/lang/fr/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'À propos des étiquettes de statut', 'archived' => 'Retiré', 'create' => 'Créé une étiquette de statut', @@ -16,4 +16,4 @@ return array( 'title' => 'Étiquette de statut', 'undeployable' => 'Non déployable', 'update' => 'Mettre à jour l\'étiquette de statut', -); +]; diff --git a/resources/lang/fr/admin/suppliers/message.php b/resources/lang/fr/admin/suppliers/message.php index f657bd5beb..540e3f7bc8 100644 --- a/resources/lang/fr/admin/suppliers/message.php +++ b/resources/lang/fr/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Le fournisseur n\'existe pas.', - - 'create' => array( + 'create' => [ 'error' => 'Le fournisseur n\'a pas été créé, veuillez essayer à nouveau.', - 'success' => 'Le fournisseur a été créé avec succès.' - ), + 'success' => 'Le fournisseur a été créé avec succès.', + ], - 'update' => array( + 'update' => [ 'error' => 'Le fournisseur n\'a pas été mis à jour, veuillez essayer à nouveau', - 'success' => 'Le fournisseur a été mis à jour avec succès.' - ), + 'success' => 'Le fournisseur a été mis à jour avec succès.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Êtes-vous sûr de vouloir supprimer ce fournisseur ?', 'error' => 'Un problème a eu lieu pendant la suppression du fournisseur. Veuillez essayer à nouveau.', 'success' => 'Le fournisseur a été supprimé avec succès.', 'assoc_assets' => 'Ce fournisseur est actuellement associé au matériel :asset_count et ne peut être supprimé. Veuillez actualiser votre matériel pour ne plus référencer ce fournisseur et réessayer. ', 'assoc_licenses' => 'Ce fournisseur est actuellement associé aux licences :licence_count et ne peut être supprimé. Veuillez actualiser vos licences pour ne plus référencer ce fournisseur et réessayer. ', 'assoc_maintenances' => 'Ce fournisseur est actuellement associé à la maintenance de matériel :asset_maintenance_count et ne peut être supprimé. Veuillez actualiser votre maintenance de matériel pour ne plus référencer ce fournisseur et réessayer. ', - ) + ], -); +]; diff --git a/resources/lang/fr/admin/suppliers/table.php b/resources/lang/fr/admin/suppliers/table.php index b7bbded713..4f2a87b54a 100644 --- a/resources/lang/fr/admin/suppliers/table.php +++ b/resources/lang/fr/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'A propos des fournisseurs', 'about_suppliers_text' => 'Les fournisseurs sont utilisés pour suivre la source des articles', 'address' => 'Adresse du fournisseur', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Voir les actifs pour', 'zip' => 'Code postal', -); +]; diff --git a/resources/lang/fr/admin/users/general.php b/resources/lang/fr/admin/users/general.php index aa659bed47..6e29cdbff7 100644 --- a/resources/lang/fr/admin/users/general.php +++ b/resources/lang/fr/admin/users/general.php @@ -1,7 +1,6 @@ 'Cet utilisateur peut se connecter', 'activated_disabled_help_text' => 'Vous ne pouvez pas modifier l\'état de votre propre compte.', 'assets_user' => 'Actifs associés avec :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Modifier l\'utilisateur', 'filetype_info' => 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Historique pour :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Cliquez ici pour les restaurer.', 'last_login' => 'Dernière connexion', 'ldap_config_text' => 'Les paramètres de configuration LDAP se trouvent sous Admin > Réglages. La localisation sélectionnée (optionnelle) sera définie pour tous les utilisateurs importés.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Vos paramètres administratifs actuels permettent une application sélective de l\'authentification à deux facteurs. ', 'two_factor_enrolled' => 'Dispositif à deux facteurs inscrit ', 'two_factor_active' => 'Activation des deux facteurs ', - ); + ]; diff --git a/resources/lang/fr/admin/users/message.php b/resources/lang/fr/admin/users/message.php index 9734aaaa95..252353ee91 100644 --- a/resources/lang/fr/admin/users/message.php +++ b/resources/lang/fr/admin/users/message.php @@ -1,6 +1,6 @@ 'Vous avez accepté cet actif.', 'declined' => 'Vous avez refusé cet actif.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'L\'intégration LDAP n\'a pas été configuré pour cette installation .', 'password_resets_sent' => 'Les utilisateurs sélectionnés qui sont activés et ont une adresse e-mail valide ont reçu un lien de réinitialisation du mot de passe.', - - 'success' => array( + 'success' => [ 'create' => 'L’utilisateur a été créé avec succès.', 'update' => 'L’utilisateur a été mis à jour avec succès.', 'update_bulk' => 'Utilisateurs mis à jour avec succès !', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'L’utilisateur a été activé avec succès.', 'restored' => 'L’utilisateur a été restauré avec succès.', 'import' => 'Les utilisateurs ont été importés correctement.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Un problème a eu lieu pendant la création de l\'utilisateur. Veuillez essayer à nouveau.', 'update' => 'Un problème a eu lieu pendant la mise à jour de l\'utilisateur. Veuillez essayer à nouveau.', 'delete' => 'Un problème a eu lieu pendant la suppression de l\'utilisateur. Veuillez essayer à nouveau.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Impossible de rechercher le serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP :', 'ldap_could_not_get_entries' => 'Impossible d\'obtenir les entrées du serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP :', 'password_ldap' => 'Le mot de passe de ce compte est géré par LDAP / Active Directory. Veuillez contacter votre service informatique pour changer votre mot de passe.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Le fichier n\'a pas pu être supprimé. Veuillez réessayer.', 'success' => 'Le fichier a été supprimé correctement.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Le(s) fichier(s) n\'ont pas pu être téléversé. Veuillez réessayer.', 'success' => 'Le(s) fichier(s) ont été téléversé correctement.', 'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléversement', 'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop gros, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.', - ), + ], -); +]; diff --git a/resources/lang/fr/admin/users/table.php b/resources/lang/fr/admin/users/table.php index 09999c4d5f..66ee2510cb 100644 --- a/resources/lang/fr/admin/users/table.php +++ b/resources/lang/fr/admin/users/table.php @@ -1,6 +1,6 @@ 'Actif', 'allow' => 'Autoriser', 'checkedout' => 'Actifs', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Afficher les utilisateurs actifs', 'show_deleted' => 'Afficher les utilisateurs supprimés', 'title' => 'Titre', - 'to_restore_them' => 'pour les restaurer.', + 'to_restore_them' => 'pour les restaurer.', 'updateuser' => 'Mettre à jour l\'utilisateur', 'username' => 'Nom d\'utilisateur', - 'user_deleted_text' => 'Cet utilisateur a été marqué comme supprimé.', + 'user_deleted_text' => 'Cet utilisateur a été marqué comme supprimé.', 'username_note' => '( Ceci est utilisé pour la liaison ne Active Directory , pas pour la connexion. )', 'cloneuser' => 'Cloner l\'utilisateur', 'viewusers' => 'Voir les utilisateurs', -); +]; diff --git a/resources/lang/fr/auth/general.php b/resources/lang/fr/auth/general.php index 2a12f8352e..31748fc3d8 100644 --- a/resources/lang/fr/auth/general.php +++ b/resources/lang/fr/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Entrez votre nom d\'utilisateur pour recevoir un lien de réinitialisation du mot de passe.', 'username_help_bottom' => 'Votre nom d\'utilisateur et votre adresse e-mail peuvent être les mêmes, mais peuvent ne pas l\'être, selon votre configuration. Si vous ne pouvez pas vous souvenir de votre nom d\'utilisateur, contactez votre administrateur.

Les noms d\'utilisateur sans adresse e-mail associée ne seront pas envoyés par e-mail un lien de réinitialisation du mot de passe. ', ]; - diff --git a/resources/lang/fr/auth/message.php b/resources/lang/fr/auth/message.php index 60a8ef1610..4d1b4dfa64 100644 --- a/resources/lang/fr/auth/message.php +++ b/resources/lang/fr/auth/message.php @@ -1,6 +1,6 @@ 'Un compte avec cet e-mail existe déjà.', 'account_not_found' => 'Nom d\'usager ou mot de passe incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ce compte est banni.', 'throttle' => 'Trop de tentatives de connexion échouées. Veuillez réessayer dans :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Votre appareil est déjà inscrit.', 'success' => 'Vous êtes bien connecté.', 'code_required' => 'Le code à deux facteurs est requis.', 'invalid_code' => 'Le code à deux facteurs est invalide.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Un problème a eu lieu pendant votre connexion, veuillez essayer à nouveau.', 'success' => 'Vous avez été connecté avec succès.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Il y a eu un problème en essayant de vous déconnecter, veuillez réessayer.', 'success' => 'Vous êtes déconnecté avec succès.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Un problème a eu lieu pendant la création de votre compte, veuillez essayer à nouveau.', 'success' => 'Le compte a été créé avec succès.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Un problème a eu lieu pendant la récupération du code de réinitialisation de mot de passe, veuillez essayer à nouveau.', 'success' => 'Si cette adresse email existe dans notre système, un e-mail de récupération de mot de passe a été envoyé.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Un problème a eu lieu pendant la réinitialisation de votre mot de passe, veuillez essayer à nouveau.', 'success' => 'Votre mot de passe a été réinitialisé avec succès.', - ), + ], - -); +]; diff --git a/resources/lang/fr/button.php b/resources/lang/fr/button.php index 09aff4e822..c978aa0f47 100644 --- a/resources/lang/fr/button.php +++ b/resources/lang/fr/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Ajouter', 'cancel' => 'Annuler', @@ -11,7 +11,7 @@ return array( 'request' => 'Requête ', 'submit' => 'Soumettre', 'upload' => 'Uploader', - 'select_file' => 'Sélectionner un fichier...', + 'select_file' => 'Sélectionner un fichier...', 'select_files' => 'Sélectionnez les fichiers ...', 'generate_labels' => '{1} Générer une étiquette|[2,*] Générer des étiquettes', -); +]; diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php index da943d04a4..6af49daf3d 100644 --- a/resources/lang/fr/general.php +++ b/resources/lang/fr/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Dissociations', 'user_requests_count' => 'Demandes', 'city' => 'Ville', - 'click_here' => 'Cliquez ici', + 'click_here' => 'Cliquez ici', 'clear_selection' => 'Effacer la sélection', 'companies' => 'Compagnies', 'company' => 'Compagnie', 'component' => 'Composant', 'components' => 'Composants', - 'complete' => 'Terminé', + 'complete' => 'Terminé', 'consumable' => 'Fourniture', 'consumables' => 'Fournitures', 'country' => 'Pays', diff --git a/resources/lang/fr/help.php b/resources/lang/fr/help.php index e9759a7a6d..4eec68e541 100644 --- a/resources/lang/fr/help.php +++ b/resources/lang/fr/help.php @@ -1,6 +1,6 @@ "Plus d'info", + 'more_info_title' => "Plus d'info", - "audit_help" => "Cocher cette case va modifier l'enregistrement de la ressource pour refléter ce nouvel emplacement. Laisser décoché notera simplement l'emplacement dans le journal d'audit.

Notez que cette ressource est vérifiée, elle ne changera pas l'emplacement de la personne, de la ressource ou de l'emplacement où elle est vérifiée.", + 'audit_help' => "Cocher cette case va modifier l'enregistrement de la ressource pour refléter ce nouvel emplacement. Laisser décoché notera simplement l'emplacement dans le journal d'audit.

Notez que cette ressource est vérifiée, elle ne changera pas l'emplacement de la personne, de la ressource ou de l'emplacement où elle est vérifiée.", 'assets' => 'Les actifs sont des éléments suivis par le numéro de série ou la balise d\'actif. Ils ont tendance à être des éléments de valeur plus élevée lorsque l\'identification d\'un élément spécifique importe.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Vous pouvez mettre en place des amortissements d’actifs pour déprécier les matériels en fonction de la dépréciation linéaire.', - - -); +]; diff --git a/resources/lang/fr/mail.php b/resources/lang/fr/mail.php index bf5bd44737..5a940c938d 100644 --- a/resources/lang/fr/mail.php +++ b/resources/lang/fr/mail.php @@ -1,6 +1,6 @@ 'Un utilisateur a annulé une commande d’article sur le site Web', 'a_user_requested' => 'Un utilisateur a commandé un article sur le site Web', 'accessory_name' => 'Nom de l’accessoire :', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Rapport de vérification de matériel attendu', 'Expected_Checkin_Notification' => 'Rappel : la date limite de vérification de :name approche', 'Expected_Checkin_Date' => 'Un matériel que vous avez emprunté doit être vérifié à nouveau le :date', - 'your_assets' => 'Voir vos matériels' -); + 'your_assets' => 'Voir vos matériels', +]; diff --git a/resources/lang/fr/pagination.php b/resources/lang/fr/pagination.php index 76976c0ef4..a564b040cb 100644 --- a/resources/lang/fr/pagination.php +++ b/resources/lang/fr/pagination.php @@ -1,6 +1,6 @@ 'Suivant »', -); +]; diff --git a/resources/lang/fr/passwords.php b/resources/lang/fr/passwords.php index 5c8c96b70e..b51072f62d 100644 --- a/resources/lang/fr/passwords.php +++ b/resources/lang/fr/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Le lien vers votre mot de passe a bien été envoyé!', 'user' => 'Aucun utilisateur actif correspondant trouvé avec ce courriel.', ]; - diff --git a/resources/lang/fr/reminders.php b/resources/lang/fr/reminders.php index 5ed7858d6c..8526dd1f93 100644 --- a/resources/lang/fr/reminders.php +++ b/resources/lang/fr/reminders.php @@ -1,6 +1,6 @@ "Les mots de passe doivent contenir six caractères et correspondre à la confirmation.", + 'password' => 'Les mots de passe doivent contenir six caractères et correspondre à la confirmation.', - "user" => "Le nom d'utilisateur ou l'e-mail est incorrect", + 'user' => "Le nom d'utilisateur ou l'e-mail est incorrect", - "token" => "Ce jeton de réinitialisation est invalide.", + 'token' => 'Ce jeton de réinitialisation est invalide.', - "sent" => "Si votre adresse e-mail est trouvée, un rappel de mot de passe a été envoyé !", + 'sent' => 'Si votre adresse e-mail est trouvée, un rappel de mot de passe a été envoyé !', -); +]; diff --git a/resources/lang/fr/table.php b/resources/lang/fr/table.php index eecc764682..8f913d462b 100644 --- a/resources/lang/fr/table.php +++ b/resources/lang/fr/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'Par', 'item' => 'Item', -); +]; diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index 226e9649c8..ddd90f4655 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -1,6 +1,6 @@ 'Cet-te :attribute a déjà été pris-e.', 'uploaded' => 'L\'attribut: n\'a pas pu télécharger.', 'url' => 'Le format de cet-te :attribute est invalide.', - "unique_undeleted" => ":attribute doit être unique.", + 'unique_undeleted' => ':attribute doit être unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -115,10 +114,10 @@ return array( 'custom' => [ 'alpha_space' => "Le champ d'attribut: contient un caractère qui n'est pas autorisé.", - "email_array" => "Une ou plusieurs adresses électroniques sont invalides.", - "hashed_pass" => "Votre mot de passe actuel est incorrect", + 'email_array' => 'Une ou plusieurs adresses électroniques sont invalides.', + 'hashed_pass' => 'Votre mot de passe actuel est incorrect', 'dumbpwd' => 'Ce mot de passe est trop commun.', - "statuslabel_type" => "Vous devez sélectionner un type d'étiquette de statut valide", + 'statuslabel_type' => "Vous devez sélectionner un type d'étiquette de statut valide", ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ga-IE/admin/accessories/general.php b/resources/lang/ga-IE/admin/accessories/general.php index 1d72028720..e40883ef94 100644 --- a/resources/lang/ga-IE/admin/accessories/general.php +++ b/resources/lang/ga-IE/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Catagóir Cúlpháirtí', 'accessory_name' => 'Ainm Cúlpháirtí', 'checkout' => 'Seiceáil Cúlpháirtí', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Bain úsáid as an réamhshocraithe réamhshocrú EULA ina ionad.', 'use_default_eula_disabled' => 'Cuir an príomh-réamhshocraithe EULA in ionad. Níl aon réamhshocraithe EULA leagtha síos. Cuir ceann amháin i Socruithe le do thoil.', -); +]; diff --git a/resources/lang/ga-IE/admin/accessories/message.php b/resources/lang/ga-IE/admin/accessories/message.php index d7f58c60c7..0e6e53730b 100644 --- a/resources/lang/ga-IE/admin/accessories/message.php +++ b/resources/lang/ga-IE/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Tá an accessory seo faoi láthair: cuntais a sheiceáil le húsáideoirí. Seiceáil na gabhálais agus déan iarracht arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an accessory, déan iarracht arís.', - 'success' => 'Rinneadh an cúlpháirtí a chruthú go rathúil.' - ), + 'success' => 'Rinneadh an cúlpháirtí a chruthú go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an accessory, déan iarracht arís', - 'success' => 'Tugadh suas chun dáta an cúlpháirtí go rathúil' - ), + 'success' => 'Tugadh suas chun dáta an cúlpháirtí go rathúil', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an accessory seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an accessory. Arís, le d\'thoil.', - 'success' => 'Scriosadh an cúlpháirtí go rathúil.' - ), + 'success' => 'Scriosadh an cúlpháirtí go rathúil.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Níor seiceáladh an Cúntóir amach, déan iarracht arís', 'success' => 'Rinne an cúntóir a sheiceáil go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ), + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Níor seiceáladh an cúntóir isteach, déan iarracht arís', 'success' => 'Faireacán seiceáil go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ) + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - -); +]; diff --git a/resources/lang/ga-IE/admin/accessories/table.php b/resources/lang/ga-IE/admin/accessories/table.php index fa1701724f..eedda31870 100644 --- a/resources/lang/ga-IE/admin/accessories/table.php +++ b/resources/lang/ga-IE/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Íoslódáil CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Íoslódáil CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Glacadh', 'title' => 'Ainm Cúlpháirtí', - -); +]; diff --git a/resources/lang/ga-IE/admin/asset_maintenances/form.php b/resources/lang/ga-IE/admin/asset_maintenances/form.php index 8eae40a843..cc83aad00c 100644 --- a/resources/lang/ga-IE/admin/asset_maintenances/form.php +++ b/resources/lang/ga-IE/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Laethanta', 'notes' => 'Nótaí', 'update' => 'Nuashonrú', - 'create' => 'Cruthaigh' + 'create' => 'Cruthaigh', ]; diff --git a/resources/lang/ga-IE/admin/asset_maintenances/message.php b/resources/lang/ga-IE/admin/asset_maintenances/message.php index 1187eac4bc..6fad483e4f 100644 --- a/resources/lang/ga-IE/admin/asset_maintenances/message.php +++ b/resources/lang/ga-IE/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an cothabháil sócmhainne seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an cothabháil sócmhainne. Arís, le d\'thoil.', - 'success' => 'Scriosadh an cothabháil sócmhainne go rathúil.' + 'success' => 'Scriosadh an cothabháil sócmhainne go rathúil.', ], 'create' => [ 'error' => 'Níor cruthaíodh Cothabháil Sócmhainní, déan iarracht arís.', - 'success' => 'Cruthaíodh Cothabháil Sócmhainní go rathúil.' + 'success' => 'Cruthaíodh Cothabháil Sócmhainní go rathúil.', ], 'edit' => [ 'error' => 'Níor eagraíodh Cothabháil Sócmhainní, déan iarracht arís.', - 'success' => 'Eagraíodh Cothabháil Sócmhainní go rathúil.' + 'success' => 'Eagraíodh Cothabháil Sócmhainní go rathúil.', ], 'asset_maintenance_incomplete' => 'Gan Críochnú Ach', 'warranty' => 'Bharántas', 'not_warranty' => 'Gan Bharántas', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ga-IE/admin/asset_maintenances/table.php b/resources/lang/ga-IE/admin/asset_maintenances/table.php index b0c8790913..520d35e0af 100644 --- a/resources/lang/ga-IE/admin/asset_maintenances/table.php +++ b/resources/lang/ga-IE/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Cothabháil Sócmhainní', 'asset_name' => 'Ainm Sócmhainne', 'is_warranty' => 'Bharántas', - 'dl_csv' => 'Íoslódáil CSV' + 'dl_csv' => 'Íoslódáil CSV', ]; diff --git a/resources/lang/ga-IE/admin/categories/general.php b/resources/lang/ga-IE/admin/categories/general.php index 4b236ebea2..74732ae03b 100644 --- a/resources/lang/ga-IE/admin/categories/general.php +++ b/resources/lang/ga-IE/admin/categories/general.php @@ -1,6 +1,6 @@ 'Catagóirí Sócmhainne', 'category_name' => 'Ainm Chatagóir', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Bain úsáid as an réamhshocraithe réamhshocrú EULA ina ionad.', 'use_default_eula_disabled' => 'Cuir an príomh-réamhshocraithe EULA in ionad. Níl aon réamhshocraithe EULA leagtha síos. Cuir ceann amháin i Socruithe le do thoil.', -); +]; diff --git a/resources/lang/ga-IE/admin/categories/message.php b/resources/lang/ga-IE/admin/categories/message.php index 374feec79e..bcae3abd2f 100644 --- a/resources/lang/ga-IE/admin/categories/message.php +++ b/resources/lang/ga-IE/admin/categories/message.php @@ -1,25 +1,25 @@ 'Níl an chatagóir ann.', 'assoc_models' => 'Tá an chatagóir seo bainteach le múnla amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do chuid samhlacha le haon tagairt don chatagóir seo a thuilleadh agus déan iarracht arís.', 'assoc_items' => 'Tá an chatagóir seo bainteach le ceann amháin ar a laghad: asset_type agus ní féidir é a scriosadh. Nuashonraigh do: asset_type chun tagairt a dhéanamh don chatagóir seo a thuilleadh agus déan iarracht arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an chatagóir, déan iarracht arís.', - 'success' => 'Catagóir a cruthaíodh go rathúil.' - ), + 'success' => 'Catagóir a cruthaíodh go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an chatagóir, déan iarracht arís', - 'success' => 'Catagóir nuashonraithe go rathúil.' - ), + 'success' => 'Catagóir nuashonraithe go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an chatagóir seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an chatagóir. Arís, le d\'thoil.', - 'success' => 'Scriosadh an catagóir go rathúil.' - ) + 'success' => 'Scriosadh an catagóir go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/categories/table.php b/resources/lang/ga-IE/admin/categories/table.php index 133117b6a6..774e58472a 100644 --- a/resources/lang/ga-IE/admin/categories/table.php +++ b/resources/lang/ga-IE/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Tuismitheoir', 'require_acceptance' => 'Glacadh', 'title' => 'Ainm Chatagóir Sócmhainní', -); +]; diff --git a/resources/lang/ga-IE/admin/companies/general.php b/resources/lang/ga-IE/admin/companies/general.php index 93a1ef660c..52d7ef8bfa 100644 --- a/resources/lang/ga-IE/admin/companies/general.php +++ b/resources/lang/ga-IE/admin/companies/general.php @@ -1,4 +1,5 @@ 'Roghnaigh Cuideachta', ]; diff --git a/resources/lang/ga-IE/admin/companies/message.php b/resources/lang/ga-IE/admin/companies/message.php index 8dd107faab..6cfe869c9d 100644 --- a/resources/lang/ga-IE/admin/companies/message.php +++ b/resources/lang/ga-IE/admin/companies/message.php @@ -1,18 +1,19 @@ 'Níl an chuideachta ann.', 'assoc_users' => 'Tá baint ag an gcuideachta seo faoi láthair le múnla amháin ar a laghad agus ní féidir é a scriosadh. Déan do chuid múnlaí a thabhairt cothrom le dáta gan tagairt a dhéanamh don chuideachta seo agus déan iarracht arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an chuideachta, déan iarracht arís.', - 'success' => 'Cruthaíodh an chuideachta go rathúil.' - ), - 'update' => array( + 'success' => 'Cruthaíodh an chuideachta go rathúil.', + ], + 'update' => [ 'error' => 'Níor nuashonraíodh an chuideachta, déan iarracht arís', - 'success' => 'Cuideachta nuashonraithe go rathúil.' - ), - 'delete' => array( + 'success' => 'Cuideachta nuashonraithe go rathúil.', + ], + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an chuideachta seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an chuideachta. Arís, le d\'thoil.', - 'success' => 'Scriosadh an Chuideachta go rathúil.' - ) -); + 'success' => 'Scriosadh an Chuideachta go rathúil.', + ], +]; diff --git a/resources/lang/ga-IE/admin/companies/table.php b/resources/lang/ga-IE/admin/companies/table.php index 86d0d62ef7..6888ec3eb2 100644 --- a/resources/lang/ga-IE/admin/companies/table.php +++ b/resources/lang/ga-IE/admin/companies/table.php @@ -1,9 +1,10 @@ 'Cuideachtaí', 'create' => 'Cruthaigh Cuideachta', 'title' => 'Cuideachta', 'update' => 'Cuideachta Nuashonraithe', 'name' => 'Ainm na Cuideachta', 'id' => 'ID', -); +]; diff --git a/resources/lang/ga-IE/admin/components/general.php b/resources/lang/ga-IE/admin/components/general.php index 83e3f4e358..0ca4f919ba 100644 --- a/resources/lang/ga-IE/admin/components/general.php +++ b/resources/lang/ga-IE/admin/components/general.php @@ -1,6 +1,6 @@ 'Ainm an Chomhpháirt', 'checkin' => 'Comhpháirt Checkin', 'checkout' => 'Comhpháirt Seiceáil', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Ag fágáil', 'total' => 'Iomlán', 'update' => 'Comhpháirt Nuashonraithe', -); +]; diff --git a/resources/lang/ga-IE/admin/components/message.php b/resources/lang/ga-IE/admin/components/message.php index c84b014629..e8b09bf930 100644 --- a/resources/lang/ga-IE/admin/components/message.php +++ b/resources/lang/ga-IE/admin/components/message.php @@ -1,36 +1,35 @@ 'Níl an comhpháirt ann.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an comhpháirt, déan iarracht arís.', - 'success' => 'Comhpháirt cruthaithe go rathúil.' - ), + 'success' => 'Comhpháirt cruthaithe go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an comhpháirt, déan iarracht arís', - 'success' => 'Comhpháirt nuashonraithe go rathúil.' - ), + 'success' => 'Comhpháirt nuashonraithe go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an comhábhar seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an chomhpháirt. Arís, le d\'thoil.', - 'success' => 'Scriosadh an comhpháirt go rathúil.' - ), + 'success' => 'Scriosadh an comhpháirt go rathúil.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Níor sheiceáil amach an comhpháirt, déan iarracht arís', 'success' => 'Seiceáil amach an comhpháirt go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ), + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Níor sheiceáil an comhpháirt isteach, déan iarracht arís', 'success' => 'Seiceáil ar an gcomhpháirt go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ) + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - -); +]; diff --git a/resources/lang/ga-IE/admin/components/table.php b/resources/lang/ga-IE/admin/components/table.php index 28119e5ea5..0c9d727fd1 100644 --- a/resources/lang/ga-IE/admin/components/table.php +++ b/resources/lang/ga-IE/admin/components/table.php @@ -1,5 +1,5 @@ 'Ainm an Chomhpháirt', -); +]; diff --git a/resources/lang/ga-IE/admin/consumables/general.php b/resources/lang/ga-IE/admin/consumables/general.php index 01c8a60dfa..1ba1222e97 100644 --- a/resources/lang/ga-IE/admin/consumables/general.php +++ b/resources/lang/ga-IE/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Seiceáil Inbhuanaithe don Úsáideoir', 'consumable_name' => 'Ainm Inchaite', 'create' => 'Cruthaigh Tomhaltach', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Ag fágáil', 'total' => 'Iomlán', 'update' => 'Nuashonrú Inchaite', -); +]; diff --git a/resources/lang/ga-IE/admin/consumables/message.php b/resources/lang/ga-IE/admin/consumables/message.php index b6add857ad..dec1d8e513 100644 --- a/resources/lang/ga-IE/admin/consumables/message.php +++ b/resources/lang/ga-IE/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Níl inbhuanaithe ann.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh inbhuanaithe, déan iarracht arís.', - 'success' => 'Inbhuanaithe a cruthaíodh go rathúil.' - ), + 'success' => 'Inbhuanaithe a cruthaíodh go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh inmhuirearaithe, déan iarracht arís', - 'success' => 'Nuashonraithe go rathúil.' - ), + 'success' => 'Nuashonraithe go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an t-inchaite seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an inchaite. Arís, le d\'thoil.', - 'success' => 'Scriosadh an inchaite go rathúil.' - ), + 'success' => 'Scriosadh an inchaite go rathúil.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Níor sheiceáil amach an méid inmhuirearaithe, déan iarracht arís', 'success' => 'Seiceáil inbhuanaithe go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ), + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Níor rinneadh seiceáil inmhuirearaithe, déan iarracht arís', 'success' => 'Seiceáil inbhuanaithe go rathúil.', - 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.' - ) + 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', + ], - -); +]; diff --git a/resources/lang/ga-IE/admin/consumables/table.php b/resources/lang/ga-IE/admin/consumables/table.php index e009ee1d04..8338f7f9ee 100644 --- a/resources/lang/ga-IE/admin/consumables/table.php +++ b/resources/lang/ga-IE/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Ainm Inchaite', -); +]; diff --git a/resources/lang/ga-IE/admin/custom_fields/general.php b/resources/lang/ga-IE/admin/custom_fields/general.php index b1c0295e74..9d51013cbb 100644 --- a/resources/lang/ga-IE/admin/custom_fields/general.php +++ b/resources/lang/ga-IE/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Réimsí Saincheaptha', 'field' => 'Gort', 'about_fieldsets_title' => 'Maidir Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Réimse Nua Chustaim', 'value_encrypted' => 'Tá luach an réimse seo criptithe sa bhunachar sonraí. Ní bheidh ach úsáideoirí riaracháin in ann an luach díchriptithe a fheiceáil', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/ga-IE/admin/custom_fields/message.php b/resources/lang/ga-IE/admin/custom_fields/message.php index 98eeebcc6e..c244324116 100644 --- a/resources/lang/ga-IE/admin/custom_fields/message.php +++ b/resources/lang/ga-IE/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Níl an réimse sin ann.', 'already_added' => 'Réimse curtha cheana féin', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh réimse, déan iarracht arís.', 'success' => 'Réimse cruthaithe go rathúil.', - 'assoc_success' => 'Réimse curtha leis go rathúil go rathúil.' - ), + 'assoc_success' => 'Réimse curtha leis go rathúil go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an réimse, déan iarracht arís', - 'success' => 'Réimse cothrom le dáta go rathúil' - ), + 'success' => 'Réimse cothrom le dáta go rathúil', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an réimse seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an réimse. Arís, le d\'thoil.', 'success' => 'Scriosadh an réimse go rathúil.', 'in_use' => 'Tá réimse fós in úsáid.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Ní bhíonn Fieldset ann', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh Fieldset, déan iarracht arís.', - 'success' => 'Cruthaíodh Fieldset go rathúil.' - ), + 'success' => 'Cruthaíodh Fieldset go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor cuireadh nuashonrú ar Fieldset, déan iarracht arís', - 'success' => 'Fieldset uasdátú go rathúil.' - ), + 'success' => 'Fieldset uasdátú go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte go dteastaíonn uait an teip seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an slí. Arís, le d\'thoil.', 'success' => 'Scriosadh an frithbhealach go rathúil.', 'in_use' => 'Tá Fieldset fós in úsáid.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ga-IE/admin/departments/message.php b/resources/lang/ga-IE/admin/departments/message.php index 0b152002ea..f9dcea632f 100644 --- a/resources/lang/ga-IE/admin/departments/message.php +++ b/resources/lang/ga-IE/admin/departments/message.php @@ -1,21 +1,21 @@ 'Níl an Roinn ann.', 'assoc_users' => 'Tá an roinn seo bainteach le húsáid amháin ar a laghad agus ní féidir é a scriosadh. Déan do úsáideoirí a thabhairt cothrom le dáta gan tagairt a dhéanamh don roinn seo a thuilleadh agus déan iarracht arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an Roinn, déan iarracht arís.', - 'success' => 'Chruthaigh an Roinn go rathúil.' - ), - 'update' => array( + 'success' => 'Chruthaigh an Roinn go rathúil.', + ], + 'update' => [ 'error' => 'Níor nuashonraíodh an Roinn, déan iarracht arís', - 'success' => 'Rinne an Roinn cothrom le dáta go rath' - ), - 'delete' => array( + 'success' => 'Rinne an Roinn cothrom le dáta go rath', + ], + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an roinn seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an roinn. Arís, le d\'thoil.', - 'success' => 'Scriosadh an roinn go rathúil.' - ) + 'success' => 'Scriosadh an roinn go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/departments/table.php b/resources/lang/ga-IE/admin/departments/table.php index b4af1edd58..6779c44117 100644 --- a/resources/lang/ga-IE/admin/departments/table.php +++ b/resources/lang/ga-IE/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Ainm na Roinne', @@ -8,4 +8,4 @@ return array( 'location' => 'Suíomh', 'create' => 'Cruthaigh an Roinn', 'update' => 'An Roinn Nuashonraithe', - ); + ]; diff --git a/resources/lang/ga-IE/admin/depreciations/general.php b/resources/lang/ga-IE/admin/depreciations/general.php index 3d8e6d867c..ad04513ad3 100644 --- a/resources/lang/ga-IE/admin/depreciations/general.php +++ b/resources/lang/ga-IE/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Maidir le Dímheas Sócmhainní', 'about_depreciations' => 'Is féidir leat dímheasanna sócmhainní a bhunú chun sócmhainní a dhímheas bunaithe ar dhímheas díreach líne.', 'asset_depreciations' => 'Dímheas Sócmhainní', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Líon na Míonna', 'update' => 'Dímheas Nuashonraigh', -); +]; diff --git a/resources/lang/ga-IE/admin/depreciations/message.php b/resources/lang/ga-IE/admin/depreciations/message.php index b1cebaa239..f2b2c6f5c8 100644 --- a/resources/lang/ga-IE/admin/depreciations/message.php +++ b/resources/lang/ga-IE/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Níl an rang dímheasa ann.', 'assoc_users' => 'Tá an dímheas seo bainteach le samhlacha amháin nó níos mó faoi láthair agus ní féidir í a scriosadh. Scrios na samhlacha, agus ansin déan iarracht a scriosadh arís.', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh rang dímheasa, déan iarracht arís. :(', - 'success' => 'An rang dímheasa a cruthaíodh go rathúil. :)' - ), + 'success' => 'An rang dímheasa a cruthaíodh go rathúil. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an rang dímheasa, déan iarracht arís', - 'success' => 'Rang dímheasta cothrom le dáta go rathúil.' - ), + 'success' => 'Rang dímheasta cothrom le dáta go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an rang dímheasa seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an rang dímheasa. Arís, le d\'thoil.', - 'success' => 'Scriosadh an rang dímheasa go rathúil.' - ) + 'success' => 'Scriosadh an rang dímheasa go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/depreciations/table.php b/resources/lang/ga-IE/admin/depreciations/table.php index 9689e785c2..5683cdd3b3 100644 --- a/resources/lang/ga-IE/admin/depreciations/table.php +++ b/resources/lang/ga-IE/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Míonna', 'term' => 'Téarma', 'title' => 'Ainm', -); +]; diff --git a/resources/lang/ga-IE/admin/groups/message.php b/resources/lang/ga-IE/admin/groups/message.php index 1589ad531f..3ec84b7565 100644 --- a/resources/lang/ga-IE/admin/groups/message.php +++ b/resources/lang/ga-IE/admin/groups/message.php @@ -1,22 +1,22 @@ 'Tá grúpa ann cheana!', 'group_not_found' => 'Níl grúpa [: id] ann.', 'group_name_required' => 'Tá an réimse ainmnithe ag teastáil', - 'success' => array( + 'success' => [ 'create' => 'Rinneadh an grúpa a chruthú go rathúil.', 'update' => 'Rinneadh an grúpa cothrom le dáta go rathúil', 'delete' => 'Bhí an grúpa scriosta go rathúil.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an grúpa seo a scriosadh?', 'create' => 'Bhí ceist ann a chruthaigh an grúpa. Arís, le d\'thoil.', 'update' => 'Bhí ceist ann ag nuashonrú an ghrúpa. Arís, le d\'thoil.', 'delete' => 'Bhí ceist ann a scriosadh an grúpa. Arís, le d\'thoil.', - ), + ], -); +]; diff --git a/resources/lang/ga-IE/admin/groups/table.php b/resources/lang/ga-IE/admin/groups/table.php index 0aa1d498b5..66a8fcf54b 100644 --- a/resources/lang/ga-IE/admin/groups/table.php +++ b/resources/lang/ga-IE/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Ainm', 'users' => '# Úsáideoirí', -); +]; diff --git a/resources/lang/ga-IE/admin/groups/titles.php b/resources/lang/ga-IE/admin/groups/titles.php index a89b78677f..894ec54b21 100644 --- a/resources/lang/ga-IE/admin/groups/titles.php +++ b/resources/lang/ga-IE/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Maidir Grúpaí', 'about_groups' => 'Úsáidtear grúpaí chun ceadanna úsáideora a ghinearálú.', 'group_management' => 'Bainistíocht Grúpa', @@ -11,4 +11,4 @@ return array( 'allow' => 'Ceadaigh', 'deny' => 'Diúltaigh', -); +]; diff --git a/resources/lang/ga-IE/admin/hardware/form.php b/resources/lang/ga-IE/admin/hardware/form.php index a7ae891c6d..b8e267b255 100644 --- a/resources/lang/ga-IE/admin/hardware/form.php +++ b/resources/lang/ga-IE/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Dearbhaigh Bulk Sócmhainní a Scriosadh', +return [ + 'bulk_delete' => 'Dearbhaigh Bulk Sócmhainní a Scriosadh', 'bulk_delete_help' => 'Athbhreithniú a dhéanamh ar na sócmhainní le haghaidh scriosadh mórchóir thíos. Nuair a bheidh sé scriosta, is féidir na sócmhainní seo a chur ar ais, ach ní bheidh baint acu le haon úsáideoirí a bhfuil siad á sannadh faoi láthair.', 'bulk_delete_warn' => 'Tá tú ar tí a scriosadh: sócmhainní asset_count.', - 'bulk_update' => 'Sócmhainní Nuashonraithe Bulc', - 'bulk_update_help' => 'Ceadaíonn an fhoirm seo duit il-sócmhainní a thabhairt cothrom le dáta ag an am céanna. Líon isteach na réimsí is gá duit a athrú ach amháin. Ní dhéanfar aon réimsí fágtha gan athrú.', - 'bulk_update_warn' => 'Tá tú ar tí na hairíonna a bhaineann le: sócmhainní asset_count a chur in eagar.', + 'bulk_update' => 'Sócmhainní Nuashonraithe Bulc', + 'bulk_update_help' => 'Ceadaíonn an fhoirm seo duit il-sócmhainní a thabhairt cothrom le dáta ag an am céanna. Líon isteach na réimsí is gá duit a athrú ach amháin. Ní dhéanfar aon réimsí fágtha gan athrú.', + 'bulk_update_warn' => 'Tá tú ar tí na hairíonna a bhaineann le: sócmhainní asset_count a chur in eagar.', 'checkedout_to' => 'Seiceáil Amach Chun', 'checkout_date' => 'Dáta Seiceáil', 'checkin_date' => 'Dáta Checkin', @@ -38,7 +38,6 @@ return array( 'tag' => 'Clib Sócmhainní', 'update' => 'Nuashonrú Sócmhainní', 'warranty' => 'Bharántas', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'blianta', -) -; +]; diff --git a/resources/lang/ga-IE/admin/hardware/general.php b/resources/lang/ga-IE/admin/hardware/general.php index 21bce112a3..1e2cc40485 100644 --- a/resources/lang/ga-IE/admin/hardware/general.php +++ b/resources/lang/ga-IE/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Maidir Sócmhainní', 'about_assets_text' => 'Déantar míreanna a rianú trí shraithuimhir nó ar chlib sócmhainne. Is iondúil go n-éireoidh siad le hítimí ar luach níos airde a bhaineann le hábhair shonracha a aithint.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Sócmhainn', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Sócmhainn Checkin', @@ -19,4 +19,4 @@ return array( 'pending' => 'Ar feitheamh', 'undeployable' => 'Neamhfhostaithe', 'view' => 'Féach Sócmhainn', -); +]; diff --git a/resources/lang/ga-IE/admin/hardware/message.php b/resources/lang/ga-IE/admin/hardware/message.php index f8a7ff5f94..858dbd50e3 100644 --- a/resources/lang/ga-IE/admin/hardware/message.php +++ b/resources/lang/ga-IE/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Marradh: Tá an tsócmhainn seo marcáilte mar atá inghníomhaithe faoi láthair. Má d\'athraigh an stádas seo, déan an stádas sócmhainne a nuashonrú.', 'does_not_exist' => 'Níl sócmhainn ann.', 'does_not_exist_or_not_requestable' => 'Iarracht deas. Níl an tsócmhainn sin ann nó níl sé inghlactha.', 'assoc_users' => 'Faoi láthair déanfar an tsócmhainn seo a sheiceáil chuig úsáideoir agus ní féidir é a scriosadh. Déan seiceáil ar an tsócmhainn sa chéad uair, agus déan iarracht ansin scriosadh arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh sócmhainn, déan iarracht arís. :(', - 'success' => 'Cruthaíodh sócmhainn go rathúil. :)' - ), + 'success' => 'Cruthaíodh sócmhainn go rathúil. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor tugadh nuashonrú ar an tsócmhainn, déan iarracht arís', 'success' => 'Nuashonraíodh sócmhainn go rathúil', 'nothing_updated' => 'Níor roghnaíodh réimsí ar bith, mar sin níor nuashonraíodh aon rud.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Níor cuireadh an tsócmhainn ar ais, déan iarracht arís', - 'success' => 'Aisghabháil sócmhainne go rathúil.' - ), + 'success' => 'Aisghabháil sócmhainne go rathúil.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Níor éirigh leis an iniúchadh sócmhainne. Arís, le d\'thoil.', - 'success' => 'Iniúchadh sócmhainne logáilte go rathúil.' - ), + 'success' => 'Iniúchadh sócmhainne logáilte go rathúil.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ní scriosadh an comhad. Arís, le d\'thoil.', 'success' => 'Comhad a scriosadh go rathúil', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Comhad (í) nach bhfuil uaslódáil. Arís, le d\'thoil.', 'success' => 'Comhad (í) uaslódáil go rathúil.', 'nofiles' => 'Níor roghnaigh tú comhaid ar bith le híoslódáil, nó tá an comhad a bhfuil tú ag iarraidh uaslódáil ró-mhór', 'invalidfiles' => 'Tá ceann amháin nó níos mó de do chuid comhad ró-mhór nó is comhad í nach bhfuil ceadaithe. Tá píopaí comhaid a cheadaítear png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Níor iompórtáil roinnt míreanna i gceart.', 'errorDetail' => 'Níor allmhairíodh na Míreanna seo a leanas mar gheall ar earráidí.', - 'success' => "Tá do chomhad iompórtáilte", - 'file_delete_success' => "Tá do chomhad scriosta go rathúil", - 'file_delete_error' => "Níorbh fhéidir an comhad a scriosadh", - ), + 'success' => 'Tá do chomhad iompórtáilte', + 'file_delete_success' => 'Tá do chomhad scriosta go rathúil', + 'file_delete_error' => 'Níorbh fhéidir an comhad a scriosadh', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an tsócmhainn seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an tsócmhainn. Arís, le d\'thoil.', 'nothing_updated' => 'Níor roghnaíodh aon sócmhainní, mar sin níor scriosadh aon rud.', - 'success' => 'Scriosadh an tsócmhainn go rathúil.' - ), + 'success' => 'Scriosadh an tsócmhainn go rathúil.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Níor sheiceáil amach an tsócmhainn, déan iarracht arís', 'success' => 'Seiceáil sheiceáil amach go rathúil.', 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', 'not_available' => 'Níl an tsócmhainn sin ar fáil le haghaidh seiceáil!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Níor seiceáladh an tsócmhainn, déan iarracht arís', 'success' => 'Seiceáil seiceáil go rathúil.', 'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.', 'already_checked_in' => 'Déantar an sócmhainn sin a sheiceáil cheana féin.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Níor iarradh sócmhainn, déan iarracht arís', 'success' => 'D\'iarr sócmhainn go rathúil.', - 'canceled' => 'Iarrtar ar iarraidh seiceáil go rathúil' - ) + 'canceled' => 'Iarrtar ar iarraidh seiceáil go rathúil', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/hardware/table.php b/resources/lang/ga-IE/admin/hardware/table.php index d2cb536b31..010d7f55f1 100644 --- a/resources/lang/ga-IE/admin/hardware/table.php +++ b/resources/lang/ga-IE/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Clib Sócmhainní', 'asset_model' => 'Mionsamhail', @@ -20,6 +20,6 @@ return array( 'title' => 'Sócmhainn', 'image' => 'Íomhá Gléas', 'days_without_acceptance' => 'Laethanta Gan Glactha', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/ga-IE/admin/kits/general.php b/resources/lang/ga-IE/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ga-IE/admin/kits/general.php +++ b/resources/lang/ga-IE/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ga-IE/admin/licenses/form.php b/resources/lang/ga-IE/admin/licenses/form.php index b3a6bf37d4..31ea971f2f 100644 --- a/resources/lang/ga-IE/admin/licenses/form.php +++ b/resources/lang/ga-IE/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Sócmhainn', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Ceadúnaithe chuig R-phost', 'to_name' => 'Ainm Ceadúnaithe', 'update' => 'Ceadúnas Nuashonraithe', - 'checkout_help' => 'Ní mór duit ceadúnas a sheiceáil amach do shócmhainn chrua-earraí nó do dhuine. Is féidir leat an dá rogha a roghnú, ach ní mór d\'úinéir na sócmhainne a mheaitseáil leis an duine a bhfuil tú ag seiceáil ar an tsócmhainn.' -); + 'checkout_help' => 'Ní mór duit ceadúnas a sheiceáil amach do shócmhainn chrua-earraí nó do dhuine. Is féidir leat an dá rogha a roghnú, ach ní mór d\'úinéir na sócmhainne a mheaitseáil leis an duine a bhfuil tú ag seiceáil ar an tsócmhainn.', +]; diff --git a/resources/lang/ga-IE/admin/licenses/general.php b/resources/lang/ga-IE/admin/licenses/general.php index b67eda5593..59a421a4a0 100644 --- a/resources/lang/ga-IE/admin/licenses/general.php +++ b/resources/lang/ga-IE/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Maidir Ceadúnais', 'about_licenses' => 'Úsáidtear ceadúnais chun bogearraí a rianú. Tá líon áirithe suíochán acu ar féidir iad a sheiceáil amach do dhaoine aonair', 'checkin' => 'Suíochán Ceadúnas Checkin', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Ceadúnais Bogearraí', 'user' => 'Úsáideoir', 'view' => 'Féach ar an gCeadúnas', -); +]; diff --git a/resources/lang/ga-IE/admin/licenses/message.php b/resources/lang/ga-IE/admin/licenses/message.php index 0f880e3ee8..30a695f8e7 100644 --- a/resources/lang/ga-IE/admin/licenses/message.php +++ b/resources/lang/ga-IE/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Níl an ceadúnas ann.', 'user_does_not_exist' => 'Níl an t-úsáideoir ann.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Ní mór duit sócmhainn nó úsáideoir a roghnú, ach níl an dá cheann.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an ceadúnas, déan iarracht arís.', - 'success' => 'Cruthaíodh ceadúnas go rathúil.' - ), + 'success' => 'Cruthaíodh ceadúnas go rathúil.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ní scriosadh an comhad. Arís, le d\'thoil.', 'success' => 'Comhad a scriosadh go rathúil', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Comhad (í) nach bhfuil uaslódáil. Arís, le d\'thoil.', 'success' => 'Comhad (í) uaslódáil go rathúil.', 'nofiles' => 'Níor roghnaigh tú comhaid ar bith le híoslódáil, nó tá an comhad a bhfuil tú ag iarraidh uaslódáil ró-mhór', 'invalidfiles' => 'Tá ceann amháin nó níos mó de do chuid comhad ró-mhór nó is comhad í nach bhfuil ceadaithe. Is iad píopaí comhaid a cheadaítear png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an ceadúnas, déan iarracht arís', - 'success' => 'Tugadh ceadúnas chun dáta go rathúil' - ), + 'success' => 'Tugadh ceadúnas chun dáta go rathúil', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an ceadúnas seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an ceadúnas. Arís, le d\'thoil.', - 'success' => 'Scriosadh an ceadúnas go rathúil.' - ), + 'success' => 'Scriosadh an ceadúnas go rathúil.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Bhí ceist ann a sheiceáil amach an ceadúnas. Arís, le d\'thoil.', - 'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil' - ), + 'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Bhí ceist ann a sheiceáil sa cheadúnas. Arís, le d\'thoil.', - 'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil' - ), + 'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/licenses/table.php b/resources/lang/ga-IE/admin/licenses/table.php index a019bbdacd..29cb907ac1 100644 --- a/resources/lang/ga-IE/admin/licenses/table.php +++ b/resources/lang/ga-IE/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Sannadh Chun', 'checkout' => 'In / Amach', @@ -14,4 +14,4 @@ return array( 'serial' => 'Sraithuimhir', 'title' => 'Ceadúnas', -); +]; diff --git a/resources/lang/ga-IE/admin/locations/message.php b/resources/lang/ga-IE/admin/locations/message.php index f67de4aba0..cb121a0171 100644 --- a/resources/lang/ga-IE/admin/locations/message.php +++ b/resources/lang/ga-IE/admin/locations/message.php @@ -1,27 +1,26 @@ 'Níl an suíomh ann.', 'assoc_users' => 'Tá an suíomh seo bainteach le húsáid amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh d\'úsáideoirí an t-ionad seo a thuilleadh agus déan iarracht arís.', 'assoc_assets' => 'Tá an suíomh seo bainteach le sócmhainn amháin ar a laghad agus ní féidir é a scriosadh. Déan do sócmhainní a thabhairt cothrom le dáta gan tagairt a dhéanamh don áit seo agus déan iarracht arís.', 'assoc_child_loc' => 'Faoi láthair tá an suíomh seo ina tuismitheoir ar a laghad ar shuíomh leanbh amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do láithreacha le do thoil gan tagairt a dhéanamh don suíomh seo agus déan iarracht arís.', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an suíomh, déan iarracht arís.', - 'success' => 'Suíomh cruthaithe go rathúil.' - ), + 'success' => 'Suíomh cruthaithe go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an suíomh, déan iarracht arís', - 'success' => 'Suíomh curtha chun dáta go rathúil.' - ), + 'success' => 'Suíomh curtha chun dáta go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an suíomh seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an suíomh. Arís, le d\'thoil.', - 'success' => 'Scriosadh an suíomh go rathúil.' - ) + 'success' => 'Scriosadh an suíomh go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/locations/table.php b/resources/lang/ga-IE/admin/locations/table.php index ad24735d92..2c1682c341 100644 --- a/resources/lang/ga-IE/admin/locations/table.php +++ b/resources/lang/ga-IE/admin/locations/table.php @@ -1,6 +1,6 @@ 'Maidir Suímh', 'about_locations' => 'Úsáidtear suíomhanna chun faisnéis suímh a rianú d\'úsáideoirí, do shócmhainní agus d\'earraí eile', 'assets_rtd' => 'Sócmhainní', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Tuismitheoir', 'currency' => 'Airgeadra Suímh', 'ldap_ou' => 'OL Cuardaigh LDAP', - ); + ]; diff --git a/resources/lang/ga-IE/admin/manufacturers/message.php b/resources/lang/ga-IE/admin/manufacturers/message.php index e861d4b6de..7e488c52f1 100644 --- a/resources/lang/ga-IE/admin/manufacturers/message.php +++ b/resources/lang/ga-IE/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Níl an monaróir ann.', 'assoc_users' => 'Tá baint ag an monaróir seo faoi láthair le múnla amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do chuid samhlacha le do thoil gan tagairt a dhéanamh don monaróir seo agus déan iarracht arís.', - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an monaróir, déan iarracht arís.', - 'success' => 'Cruthaigh an monaróir go rathúil.' - ), + 'success' => 'Cruthaigh an monaróir go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an monaróir, déan iarracht arís', - 'success' => 'Déantar an monaróir chun cinn go rathúil.' - ), + 'success' => 'Déantar an monaróir chun cinn go rathúil.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an monaróir seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an monaróir. Arís, le d\'thoil.', - 'success' => 'Scriosadh an Monaróir go rathúil.' - ) + 'success' => 'Scriosadh an Monaróir go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/manufacturers/table.php b/resources/lang/ga-IE/admin/manufacturers/table.php index 612719dc26..4576c7a57c 100644 --- a/resources/lang/ga-IE/admin/manufacturers/table.php +++ b/resources/lang/ga-IE/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Maidir le monaróirí', 'about_manufacturers_text' => 'Is iad na monaróirí na cuideachtaí a chruthaíonn do shócmhainní. Is féidir leat eolas teagmhála tacaíochta tábhachtach a stóráil anseo, a thaispeántar ar leathanaigh sonraí na sócmhainne.', 'asset_manufacturers' => 'Déantóirí Sócmhainní', @@ -13,4 +13,4 @@ return array( 'update' => 'Déantóir Nuashonraithe', 'url' => 'URL', -); +]; diff --git a/resources/lang/ga-IE/admin/models/general.php b/resources/lang/ga-IE/admin/models/general.php index 5f11e910bb..2faf9f326e 100644 --- a/resources/lang/ga-IE/admin/models/general.php +++ b/resources/lang/ga-IE/admin/models/general.php @@ -1,6 +1,6 @@ 'Maidir le Múnlaí Sócmhainne', 'about_models_text' => 'Tá modhanna sócmhainne ina bhealach chun sócmhainní comhionanna a ghrúpáil. "MBP 2013", "iPhone 6s", etc.', 'deleted' => 'Scriosadh an múnla seo. Cliceáil anseo chun é a chur ar ais.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Múnla Athchóirigh', 'requestable' => 'Féadfaidh úsáideoirí an tsamhail seo a iarraidh', - 'show_mac_address' => 'Taispeáin réimse seoladh MAC i sócmhainní sa mhúnla seo', + 'show_mac_address' => 'Taispeáin réimse seoladh MAC i sócmhainní sa mhúnla seo', 'view_deleted' => 'Féach Scriosta', 'view_models' => 'Amharc ar Mhúnlaí', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Uimh réimsí saincheaptha', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/ga-IE/admin/models/message.php b/resources/lang/ga-IE/admin/models/message.php index 2162bd5166..742bac47e3 100644 --- a/resources/lang/ga-IE/admin/models/message.php +++ b/resources/lang/ga-IE/admin/models/message.php @@ -1,42 +1,41 @@ 'Níl múnla ann.', 'assoc_users' => 'Tá an tsamhail seo bainteach le sócmhainní amháin nó níos mó faoi láthair agus ní féidir é a scriosadh. Scrios na sócmhainní, agus ansin déan iarracht a scriosadh arís.', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an tsamhail, déan iarracht arís.', 'success' => 'Múnla cruthaithe go rathúil.', 'duplicate_set' => 'Tá múnla sócmhainne leis an ainm sin, an monaróir agus an uimhir samhail ann cheana féin.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an tsamhail, déan iarracht arís', - 'success' => 'Modúl nuashonraithe go rathúil' - ), + 'success' => 'Modúl nuashonraithe go rathúil', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an tsamhail sócmhainne seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an tsamhail. Arís, le d\'thoil.', - 'success' => 'Scriosadh an tsamhail go rathúil.' - ), + 'success' => 'Scriosadh an tsamhail go rathúil.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Níor athchóiríodh an tsamhail, déan iarracht arís', - 'success' => 'Múnla curtha ar ais go rathúil.' - ), + 'success' => 'Múnla curtha ar ais go rathúil.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Níor athraíodh aon réimsí, mar sin níor nuashonraíodh aon rud.', - 'success' => 'Modhanna nuashonraithe.' - ), + 'success' => 'Modhanna nuashonraithe.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/models/table.php b/resources/lang/ga-IE/admin/models/table.php index 7566b2741a..83f2e72531 100644 --- a/resources/lang/ga-IE/admin/models/table.php +++ b/resources/lang/ga-IE/admin/models/table.php @@ -1,6 +1,6 @@ 'Cruthaigh Samhail Sócmhainne', 'created_at' => 'Cruthaithe ag', @@ -14,4 +14,4 @@ return array( 'update' => 'Nuashonraigh an tSamhail Sócmhainní', 'clone' => 'Samhail Clón', 'edit' => 'Modúl a Athrú', -); +]; diff --git a/resources/lang/ga-IE/admin/reports/general.php b/resources/lang/ga-IE/admin/reports/general.php index 3ebd37aad8..88d7c990ae 100644 --- a/resources/lang/ga-IE/admin/reports/general.php +++ b/resources/lang/ga-IE/admin/reports/general.php @@ -1,5 +1,5 @@ 'Roghnaigh na roghanna atá uait as do thuairisc sócmhainne.' -); +return [ + 'info' => 'Roghnaigh na roghanna atá uait as do thuairisc sócmhainne.', +]; diff --git a/resources/lang/ga-IE/admin/reports/message.php b/resources/lang/ga-IE/admin/reports/message.php index 3e9771f629..3106f66354 100644 --- a/resources/lang/ga-IE/admin/reports/message.php +++ b/resources/lang/ga-IE/admin/reports/message.php @@ -1,5 +1,5 @@ 'Ní mór duit rogha AMHÁIN ar a laghad a roghnú.' -); +return [ + 'error' => 'Ní mór duit rogha AMHÁIN ar a laghad a roghnú.', +]; diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php index 4d5d36a06e..faabdcfafb 100644 --- a/resources/lang/ga-IE/admin/settings/general.php +++ b/resources/lang/ga-IE/admin/settings/general.php @@ -1,12 +1,12 @@ 'Eolaire Gníomhach', 'ad_domain' => 'Fearann ​​Eolaire Gníomhach', 'ad_domain_help' => 'Tá sé seo mar an gcéanna le do r-phost, ach ní i gcónaí.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Is freastalaí Gníomhach Eolaire é seo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Tairseach Alerts ag dul in éag (i laethanta)', 'alert_inv_threshold' => 'Tairseach Alert Fardail', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDanna Sócmhainní', 'audit_interval' => 'Agallamh Iniúchta', 'audit_interval_help' => 'Más gá duit do chuid sócmhainní a iniúchadh go rialta, cuir isteach an t-eatramh i mí.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Fad na clibeanna sócmhainne, lena n-áirítear zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ga-IE/admin/settings/message.php b/resources/lang/ga-IE/admin/settings/message.php index afbeab1ac7..723f868759 100644 --- a/resources/lang/ga-IE/admin/settings/message.php +++ b/resources/lang/ga-IE/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Tharla earráid agus é ag nuashonrú.', - 'success' => 'Nuashonraigh na socruithe go rathúil.' - ), - 'backup' => array( + 'success' => 'Nuashonraigh na socruithe go rathúil.', + ], + 'backup' => [ 'delete_confirm' => 'An bhfuil tú cinnte gur mhaith leat an comhad cúltaca seo a scriosadh? Ní féidir an gníomh seo a dhíbirt.', 'file_deleted' => 'Scriosadh an comhad cúltaca go rathúil.', 'generated' => 'Rinneadh comhad cúltaca nua a chruthú go rathúil.', 'file_not_found' => 'Níorbh fhéidir an comhad cúltaca sin a fháil ar an bhfreastalaí.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Tharla earráid agus í ag puráil.', 'validation_failed' => 'Tá do dheimhniú purge mícheart. Scríobh an focal "DELETE" sa bhosca daingnithe.', - 'success' => 'Taifid arna scriosadh go rathúil.' - ), + 'success' => 'Taifid arna scriosadh go rathúil.', + ], -); +]; diff --git a/resources/lang/ga-IE/admin/statuslabels/message.php b/resources/lang/ga-IE/admin/statuslabels/message.php index a3a448aa86..6b9a327acb 100644 --- a/resources/lang/ga-IE/admin/statuslabels/message.php +++ b/resources/lang/ga-IE/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Níl Lipéad Stádas ann.', 'assoc_assets' => 'Tá an Lipéad Stádas seo bainteach le Sócmhainn amháin ar a laghad agus ní féidir é a scriosadh. Déan do sócmhainní a thabhairt cothrom le dáta gan tagairt a dhéanamh don stádas seo agus déan iarracht arís.', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh Lipéad Stádas, déan iarracht arís.', - 'success' => 'Lipéad Stádas a cruthaíodh go rathúil.' - ), + 'success' => 'Lipéad Stádas a cruthaíodh go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh Lipéad Stádas, déan iarracht arís', - 'success' => 'Lipéad Stádas curtha chun dáta go rathúil.' - ), + 'success' => 'Lipéad Stádas curtha chun dáta go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an Lipéad Stádas seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an Lipéad Stádas. Arís, le d\'thoil.', - 'success' => 'Scriosadh an Lipéad Stádas go rathúil.' - ), + 'success' => 'Scriosadh an Lipéad Stádas go rathúil.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ní féidir na sócmhainní sin a shannadh do dhuine ar bith.', 'deployable' => 'Is féidir na sócmhainní sin a sheiceáil amach. Nuair a bheidh siad sannta, glacfaidh siad meitreo stádas de Deployed.', 'archived' => 'Ní féidir na sócmhainní sin a sheiceáil amach, agus ní thaispeánfar iad ach san amharc Cartlann. Tá sé seo úsáideach le faisnéis a choinneáil faoi shócmhainní le haghaidh buiséid / cuspóirí stairiúla ach iad a choinneáil amach as an liosta sócmhainne ó lá go lá.', 'pending' => 'Ní féidir na sócmhainní sin a shannadh go fóill d\'aon duine, a úsáidtear go minic le haghaidh míreanna atá le deisiú, ach táthar ag súil go dtiocfaidh siad ar ais chuig an gcúrsaíocht.', - ), + ], -); +]; diff --git a/resources/lang/ga-IE/admin/statuslabels/table.php b/resources/lang/ga-IE/admin/statuslabels/table.php index 78565d2893..0f7c90c3fd 100644 --- a/resources/lang/ga-IE/admin/statuslabels/table.php +++ b/resources/lang/ga-IE/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Maidir Lipéid Stádas', 'archived' => 'Archived', 'create' => 'Lipéad Stádas a Chruthaigh', @@ -16,4 +16,4 @@ return array( 'title' => 'Lipéid Stádas', 'undeployable' => 'Neamhfhostaithe', 'update' => 'Lipéad Stádas Nuashonraithe', -); +]; diff --git a/resources/lang/ga-IE/admin/suppliers/message.php b/resources/lang/ga-IE/admin/suppliers/message.php index a6d944d663..4a6f3c58ce 100644 --- a/resources/lang/ga-IE/admin/suppliers/message.php +++ b/resources/lang/ga-IE/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Níl an soláthraí ann.', - - 'create' => array( + 'create' => [ 'error' => 'Níor cruthaíodh an tsoláthraí, déan iarracht arís.', - 'success' => 'An soláthraí a cruthaíodh go rathúil.' - ), + 'success' => 'An soláthraí a cruthaíodh go rathúil.', + ], - 'update' => array( + 'update' => [ 'error' => 'Níor nuashonraíodh an tsoláthraí, déan iarracht arís', - 'success' => 'Soláthraíodh an soláthraí go rathúil.' - ), + 'success' => 'Soláthraíodh an soláthraí go rathúil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'An bhfuil tú cinnte gur mian leat an soláthraí seo a scriosadh?', 'error' => 'Bhí ceist ann a scriosadh an soláthraí. Arís, le d\'thoil.', 'success' => 'Scriosadh an tsoláthraí go rathúil.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ga-IE/admin/suppliers/table.php b/resources/lang/ga-IE/admin/suppliers/table.php index c1879f52f2..0833911a3f 100644 --- a/resources/lang/ga-IE/admin/suppliers/table.php +++ b/resources/lang/ga-IE/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Maidir Soláthraithe', 'about_suppliers_text' => 'Úsáidtear soláthraithe chun foinse na n-ítimí a rianú', 'address' => 'Seoladh an tSoláthraithe', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Féach Sócmhainní le haghaidh', 'zip' => 'Cód Poist', -); +]; diff --git a/resources/lang/ga-IE/admin/users/general.php b/resources/lang/ga-IE/admin/users/general.php index 1350ddfcdc..e32d11ab56 100644 --- a/resources/lang/ga-IE/admin/users/general.php +++ b/resources/lang/ga-IE/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Sócmhainní a shanntar do: ainm', @@ -13,7 +12,7 @@ return array( 'edit' => 'Athraigh Úsáideoir', 'filetype_info' => 'Is iad píopaí comhaid a cheadaítear png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Stair le haghaidh: ainm', - 'info' => 'Eolas', + 'info' => 'Eolas', 'restore_user' => 'Cliceáil anseo chun iad a athchóiriú.', 'last_login' => 'Logáil isteach deireanach', 'ldap_config_text' => 'Is féidir suímh chumraíochta LDAP a fháil Admin> Settings. Socrófar an suíomh roghnaithe (roghnach) do gach úsáideoir a allmhairítear.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Ceadaíonn do shuímh riaracháin reatha forfheidhmiú roghnach fíordheimhnithe dhá fhachtóir.', 'two_factor_enrolled' => 'Gléas 2FA Cláraithe', 'two_factor_active' => '2FA Gníomhach', - ); + ]; diff --git a/resources/lang/ga-IE/admin/users/message.php b/resources/lang/ga-IE/admin/users/message.php index 4f927a0793..f970496eb7 100644 --- a/resources/lang/ga-IE/admin/users/message.php +++ b/resources/lang/ga-IE/admin/users/message.php @@ -1,6 +1,6 @@ 'Ghlac tú leis an tsócmhainn seo go rathúil.', 'declined' => 'Dhiúltaigh tú an tsócmhainn seo go rathúil.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Níl cumasc LDAP cumraithe don suiteáil seo.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Úsáideadh an t-úsáideoir go rathúil.', 'update' => 'Rinneadh an nuashonrú ar an úsáideoir.', 'update_bulk' => 'Tugadh cothrom le dáta d\'úsáideoirí!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Rinneadh an t-úsáideoir a neamhshlánú go rathúil.', 'restored' => 'Cuireadh an t-úsáideoir ar ais go rathúil.', 'import' => 'Allmhairítear úsáideoirí go rathúil.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Bhí ceist ann a chruthaigh an t-úsáideoir. Arís, le d\'thoil.', 'update' => 'Bhí ceist ann ag nuashonrú an úsáideora. Arís, le d\'thoil.', 'delete' => 'Bhí ceist ann a scriosadh an t-úsáideoir. Arís, le d\'thoil.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Níorbh fhéidir an freastalaí LDAP a chuardach. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP.
Error ó Freastalaí LDAP:', 'ldap_could_not_get_entries' => 'Níorbh fhéidir iontrálacha a fháil ón fhreastalaí LDAP. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP.
Error ó Freastalaí LDAP:', 'password_ldap' => 'Bainistíonn LDAP / Active Directory an focal faire don chuntas seo. Téigh i dteagmháil le do roinn TF chun do phasfhocal a athrú.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ní scriosadh an comhad. Arís, le d\'thoil.', 'success' => 'Comhad a scriosadh go rathúil', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Comhad (í) nach bhfuil uaslódáil. Arís, le d\'thoil.', 'success' => 'Comhad (í) uaslódáil go rathúil.', 'nofiles' => 'Níor roghnaigh tú aon chomhaid le híoslódáil', 'invalidfiles' => 'Tá ceann amháin nó níos mó de do chuid comhad ró-mhór nó is comhad í nach bhfuil ceadaithe. Tá píopaí comhaid a cheadaítear png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/ga-IE/admin/users/table.php b/resources/lang/ga-IE/admin/users/table.php index 632b66b17e..0f068e6b84 100644 --- a/resources/lang/ga-IE/admin/users/table.php +++ b/resources/lang/ga-IE/admin/users/table.php @@ -1,6 +1,6 @@ 'Gníomhach', 'allow' => 'Ceadaigh', 'checkedout' => 'Sócmhainní', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Taispeáin Úsáideoirí Reatha', 'show_deleted' => 'Taispeáin Úsáideoirí Scriosta', 'title' => 'Teideal', - 'to_restore_them' => 'iad a chur ar ais.', + 'to_restore_them' => 'iad a chur ar ais.', 'updateuser' => 'Nuashonraigh Úsáideoir', 'username' => 'Ainm Úsáideora', - 'user_deleted_text' => 'Marcáladh an t-úsáideoir seo mar a scriosadh é.', + 'user_deleted_text' => 'Marcáladh an t-úsáideoir seo mar a scriosadh é.', 'username_note' => '(Úsáidtear é seo le haghaidh Eolaire Gníomhach a cheanglaíonn ach amháin, gan logáil isteach.)', 'cloneuser' => 'Úsáideoir Clón', 'viewusers' => 'Féach ar Úsáideoirí', -); +]; diff --git a/resources/lang/ga-IE/auth/general.php b/resources/lang/ga-IE/auth/general.php index 3e7949be29..0717eb1c6d 100644 --- a/resources/lang/ga-IE/auth/general.php +++ b/resources/lang/ga-IE/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ga-IE/auth/message.php b/resources/lang/ga-IE/auth/message.php index eb65acf4cd..1c1619ab7b 100644 --- a/resources/lang/ga-IE/auth/message.php +++ b/resources/lang/ga-IE/auth/message.php @@ -1,6 +1,6 @@ 'Tá cuntas leis an ríomhphost seo ann cheana féin.', 'account_not_found' => 'Tá an t-ainm úsáideora nó an focal faire mícheart.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Tá toirmeasc ar an gcuntas úsáideora seo.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Bhí fadhb ann agus tú ag iarraidh logáil isteach, déan iarracht arís.', 'success' => 'Rinne tú logáil isteach go rathúil.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Bhí fadhb ann agus tú ag iarraidh do chuntas a chruthú, déan iarracht arís.', 'success' => 'Cruthaigh an cuntas go rathúil.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Bhí fadhb ann agus tú ag iarraidh cód pasfhocal a athshocrú, déan iarracht arís.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Bhí fadhb ann agus tú ag iarraidh an focal faire a athshocrú, déan iarracht arís.', 'success' => 'D\'athshocraigh do phasfhocal go rathúil.', - ), + ], - -); +]; diff --git a/resources/lang/ga-IE/button.php b/resources/lang/ga-IE/button.php index ad7f140b8d..cb3407f56e 100644 --- a/resources/lang/ga-IE/button.php +++ b/resources/lang/ga-IE/button.php @@ -1,6 +1,6 @@ 'Gníomhartha', 'add' => 'Cuir Nua', 'cancel' => 'Cealaigh', @@ -11,7 +11,7 @@ return array( 'request' => 'Iarratas', 'submit' => 'Cuir isteach', 'upload' => 'Uaslódáil', - 'select_file' => 'Roghnaigh Comhad ...', + 'select_file' => 'Roghnaigh Comhad ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php index 11f443cf87..7483e27b69 100644 --- a/resources/lang/ga-IE/general.php +++ b/resources/lang/ga-IE/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Cathair', - 'click_here' => 'Cliceáil anseo', + 'click_here' => 'Cliceáil anseo', 'clear_selection' => 'Clear Selection', 'companies' => 'Cuideachtaí', 'company' => 'Cuideachta', 'component' => 'Comhpháirt', 'components' => 'Comhpháirteanna', - 'complete' => 'Comhlánaigh', + 'complete' => 'Comhlánaigh', 'consumable' => 'Inchaite', 'consumables' => 'Tomhaltáin', 'country' => 'Tír', diff --git a/resources/lang/ga-IE/help.php b/resources/lang/ga-IE/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ga-IE/help.php +++ b/resources/lang/ga-IE/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ga-IE/mail.php b/resources/lang/ga-IE/mail.php index 7de88efc71..7aa5716871 100644 --- a/resources/lang/ga-IE/mail.php +++ b/resources/lang/ga-IE/mail.php @@ -1,6 +1,6 @@ 'Tá úsáideoir tar éis iarratas ar mhír a chealú ar an láithreán gréasáin', 'a_user_requested' => 'D\'iarr úsáideoir mír ar an láithreán gréasáin', 'accessory_name' => 'Ainm Cúlpháirtí:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ga-IE/pagination.php b/resources/lang/ga-IE/pagination.php index f87284fc96..57e96ea0c5 100644 --- a/resources/lang/ga-IE/pagination.php +++ b/resources/lang/ga-IE/pagination.php @@ -1,6 +1,6 @@ 'Ar Aghaidh »', -); +]; diff --git a/resources/lang/ga-IE/passwords.php b/resources/lang/ga-IE/passwords.php index 9a3b7fe48a..ad611b3c45 100644 --- a/resources/lang/ga-IE/passwords.php +++ b/resources/lang/ga-IE/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Cuireadh nasc do phasfhocal isteach!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/ga-IE/reminders.php b/resources/lang/ga-IE/reminders.php index 718229999d..00013b907b 100644 --- a/resources/lang/ga-IE/reminders.php +++ b/resources/lang/ga-IE/reminders.php @@ -1,6 +1,6 @@ "Ní mór go mbeadh sé carachtair ar na focail agus an dearbhú a mheaitseáil.", + 'password' => 'Ní mór go mbeadh sé carachtair ar na focail agus an dearbhú a mheaitseáil.', - "user" => "Tá ainm úsáideora nó seoladh ríomhphoist mícheart", + 'user' => 'Tá ainm úsáideora nó seoladh ríomhphoist mícheart', - "token" => "Tá an tocsa athshocrú focal faire seo neamhbhailí.", + 'token' => 'Tá an tocsa athshocrú focal faire seo neamhbhailí.', - "sent" => "Má aimsíodh seoladh ríomhphoist meaitseála, cuireadh meabhrúchán phasfhocal isteach!", + 'sent' => 'Má aimsíodh seoladh ríomhphoist meaitseála, cuireadh meabhrúchán phasfhocal isteach!', -); +]; diff --git a/resources/lang/ga-IE/table.php b/resources/lang/ga-IE/table.php index 4a40275971..be1a554585 100644 --- a/resources/lang/ga-IE/table.php +++ b/resources/lang/ga-IE/table.php @@ -1,10 +1,10 @@ 'Gníomhartha', 'action' => 'Gníomh', 'by' => 'De réir', 'item' => 'Mír', -); +]; diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php index f1c5a174be..a95da5b287 100644 --- a/resources/lang/ga-IE/validation.php +++ b/resources/lang/ga-IE/validation.php @@ -1,6 +1,6 @@ 'An: tá tréith déanta cheana féin.', 'uploaded' => 'The: theip ar an tréith a uaslódáil.', 'url' => 'Tá an fhormáid tréithbhail neamhbhailí.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "An: sa réimse tréith tá carachtar nach bhfuil ceadaithe.", - "email_array" => "Tá seoltaí ríomhphoist amháin nó níos mó neamhbhailí.", - "hashed_pass" => "Tá do phasfhocal reatha mícheart", + 'alpha_space' => 'An: sa réimse tréith tá carachtar nach bhfuil ceadaithe.', + 'email_array' => 'Tá seoltaí ríomhphoist amháin nó níos mó neamhbhailí.', + 'hashed_pass' => 'Tá do phasfhocal reatha mícheart', 'dumbpwd' => 'Tá an focal faire sin ró-choitianta.', - "statuslabel_type" => "Ní mór duit cineál lipéad stádas bailí a roghnú", + 'statuslabel_type' => 'Ní mór duit cineál lipéad stádas bailí a roghnú', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/he/admin/accessories/general.php b/resources/lang/he/admin/accessories/general.php index a546cb5c22..d511c3be79 100644 --- a/resources/lang/he/admin/accessories/general.php +++ b/resources/lang/he/admin/accessories/general.php @@ -1,6 +1,6 @@ 'סוג האביזר', 'accessory_name' => 'שם אביזר', 'checkout' => 'נפק עזר', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'במקום זאת, השתמש ב- ברירת המחדל הראשית EULA.', 'use_default_eula_disabled' => ' השתמש ב- EULA ברירת המחדל הראשוני במקום. לא נקבעה ברירת המחדל הראשית של הסכם הרישיון למשתמש קצה. הוסף אחד בהגדרות.', -); +]; diff --git a/resources/lang/he/admin/accessories/message.php b/resources/lang/he/admin/accessories/message.php index 7b3c5281ea..74c20f3a62 100644 --- a/resources/lang/he/admin/accessories/message.php +++ b/resources/lang/he/admin/accessories/message.php @@ -1,38 +1,37 @@ 'האביזר [:id] לא קיים.', 'assoc_users' => 'קיימות :count יחידות מונפקות מאבזר זה אצל משתמשים. אנא החזר את האבזרים ונסה שנית. ', - 'create' => array( + 'create' => [ 'error' => 'האבזר לא נוצר, אנא נסה שנית.', - 'success' => 'אביזר נוצר בהצלחה.' - ), + 'success' => 'אביזר נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'האבזר לא עודכן, אנא נסה שנית', - 'success' => 'אביזר עודכן בהצלחה.' - ), + 'success' => 'אביזר עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך לשמור את האבזר?', 'error' => 'ישנה בעיה במחיקת האבזר. אנא נסה שנית.', - 'success' => 'האבזר נמחק בהצלחה.' - ), + 'success' => 'האבזר נמחק בהצלחה.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'האבזר לא הונפק, אנא נסה שנית', 'success' => 'האבזר הונפק בהצלחה.', - 'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.' - ), + 'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'האבזר לא הוחזר, אנא נסה שנית', 'success' => 'האבזר הוחזר בהצלחה.', - 'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.' - ) + 'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.', + ], - -); +]; diff --git a/resources/lang/he/admin/accessories/table.php b/resources/lang/he/admin/accessories/table.php index 3f593720ef..10c859bd4e 100644 --- a/resources/lang/he/admin/accessories/table.php +++ b/resources/lang/he/admin/accessories/table.php @@ -1,11 +1,10 @@ 'הורדה כ-CSV', - 'eula_text' => 'רשיון שימוש', +return [ + 'dl_csv' => 'הורדה כ-CSV', + 'eula_text' => 'רשיון שימוש', 'id' => 'מזהה', 'require_acceptance' => 'קבלה', 'title' => 'שם אבזר', - -); +]; diff --git a/resources/lang/he/admin/asset_maintenances/form.php b/resources/lang/he/admin/asset_maintenances/form.php index deb1b77821..136a9f4e9f 100644 --- a/resources/lang/he/admin/asset_maintenances/form.php +++ b/resources/lang/he/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'ימים', 'notes' => 'הערות', 'update' => 'עדכון', - 'create' => 'לִיצוֹר' + 'create' => 'לִיצוֹר', ]; diff --git a/resources/lang/he/admin/asset_maintenances/message.php b/resources/lang/he/admin/asset_maintenances/message.php index e5969dc5d6..911527a389 100644 --- a/resources/lang/he/admin/asset_maintenances/message.php +++ b/resources/lang/he/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את תחזוקת הנכס?', 'error' => 'היתה בעיה במחיקת הנכס. בבקשה נסה שוב.', - 'success' => 'תחזוקת הנכס נמחקה בהצלחה.' + 'success' => 'תחזוקת הנכס נמחקה בהצלחה.', ], 'create' => [ 'error' => 'תחזוקת הנכסים לא נוצרה, נסה שוב.', - 'success' => 'תחזוקת הנכסים נוצרה בהצלחה.' + 'success' => 'תחזוקת הנכסים נוצרה בהצלחה.', ], 'edit' => [ 'error' => 'תחזוקת הנכסים לא נערכה, נסה שוב.', - 'success' => 'תחזוקת הנכסים נערכה בהצלחה.' + 'success' => 'תחזוקת הנכסים נערכה בהצלחה.', ], 'asset_maintenance_incomplete' => 'לא הושלם עדיין', 'warranty' => 'אחריות', 'not_warranty' => 'ללא אחריות', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/he/admin/asset_maintenances/table.php b/resources/lang/he/admin/asset_maintenances/table.php index 8ca43f0960..7c57c3b109 100644 --- a/resources/lang/he/admin/asset_maintenances/table.php +++ b/resources/lang/he/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'תחזוקת נכס', 'asset_name' => 'שם הנכס', 'is_warranty' => 'אחריות', - 'dl_csv' => 'להוריד CSV' + 'dl_csv' => 'להוריד CSV', ]; diff --git a/resources/lang/he/admin/categories/general.php b/resources/lang/he/admin/categories/general.php index 2a2f292296..fc7e617225 100644 --- a/resources/lang/he/admin/categories/general.php +++ b/resources/lang/he/admin/categories/general.php @@ -1,6 +1,6 @@ 'קטגוריות נכסים', 'category_name' => 'שם קטגוריה', 'checkin_email' => 'שלח דוא״ל למשתמש בעת הנפקה/החזרה.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'במקום זאת, השתמש ב- ברירת המחדל הראשית EULA.', 'use_default_eula_disabled' => ' השתמש ב- EULA ברירת המחדל הראשוני במקום. לא נקבעה ברירת המחדל הראשית של הסכם הרישיון למשתמש קצה. הוסף אחד בהגדרות.', -); +]; diff --git a/resources/lang/he/admin/categories/message.php b/resources/lang/he/admin/categories/message.php index 0508d5310b..4c9986208e 100644 --- a/resources/lang/he/admin/categories/message.php +++ b/resources/lang/he/admin/categories/message.php @@ -1,25 +1,25 @@ 'קטגוריה לא קיימת.', 'assoc_models' => 'קטגוריה זו משויכת כרגע לדגם אחד לפחות ולא ניתן למחוק אותה. אנא עדכן את הדגמים שלך כדי לא להתייחס עוד לקטגוריה זו ונסה שוב.', 'assoc_items' => 'קטגוריה זו משויכת כרגע עם לפחות אחד: type_type ולא ניתן למחוק אותה. עדכן את: הנכס_ typepe כדי לא להתייחס עוד לקטגוריה זו ונסה שוב.', - 'create' => array( + 'create' => [ 'error' => 'הקטגוריה לא נוצרה, נסה שוב.', - 'success' => 'קטגוריה נוצר בהצלחה.' - ), + 'success' => 'קטגוריה נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'הקטגוריה לא עודכנה, נסה שוב', - 'success' => 'קטגוריה עודכנה בהצלחה.' - ), + 'success' => 'קטגוריה עודכנה בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק קטגוריה זו?', 'error' => 'היתה בעיה במחיקת הקטגוריה. בבקשה נסה שוב.', - 'success' => 'הקטגוריה נמחקה בהצלחה.' - ) + 'success' => 'הקטגוריה נמחקה בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/categories/table.php b/resources/lang/he/admin/categories/table.php index 660d037c78..face17a94a 100644 --- a/resources/lang/he/admin/categories/table.php +++ b/resources/lang/he/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'תְעוּדַת זֶהוּת', 'parent' => 'הוֹרֶה', 'require_acceptance' => 'קַבָּלָה', 'title' => 'שם קטגוריה של נכס', -); +]; diff --git a/resources/lang/he/admin/companies/general.php b/resources/lang/he/admin/companies/general.php index cb3f75fb95..4cfb050066 100644 --- a/resources/lang/he/admin/companies/general.php +++ b/resources/lang/he/admin/companies/general.php @@ -1,4 +1,5 @@ 'בחר חברה', ]; diff --git a/resources/lang/he/admin/companies/message.php b/resources/lang/he/admin/companies/message.php index 04a50ddfd9..c94ec98312 100644 --- a/resources/lang/he/admin/companies/message.php +++ b/resources/lang/he/admin/companies/message.php @@ -1,18 +1,19 @@ 'החברה לא קיימת.', 'assoc_users' => 'חברה זו קשורה כרגע עם דגם אחד לפחות ואינה ניתנת למחיקה. אנא עדכן את המודלים שלך כדי לא להפנות עוד לחברה זו ונסה שוב.', - 'create' => array( + 'create' => [ 'error' => 'החברה לא נוצרה, נסה שוב.', - 'success' => 'החברה יצרה בהצלחה.' - ), - 'update' => array( + 'success' => 'החברה יצרה בהצלחה.', + ], + 'update' => [ 'error' => 'החברה לא עודכנה, נסה שוב', - 'success' => 'החברה עודכנה בהצלחה.' - ), - 'delete' => array( + 'success' => 'החברה עודכנה בהצלחה.', + ], + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק חברה זו?', 'error' => 'היתה בעיה במחיקת החברה. בבקשה נסה שוב.', - 'success' => 'החברה נמחקה בהצלחה.' - ) -); + 'success' => 'החברה נמחקה בהצלחה.', + ], +]; diff --git a/resources/lang/he/admin/companies/table.php b/resources/lang/he/admin/companies/table.php index c924060bf2..68c72a9fda 100644 --- a/resources/lang/he/admin/companies/table.php +++ b/resources/lang/he/admin/companies/table.php @@ -1,9 +1,10 @@ 'חברות', 'create' => 'צור חברה', 'title' => 'חֶברָה', 'update' => 'עדכון החברה', 'name' => 'שם החברה', 'id' => 'תְעוּדַת זֶהוּת', -); +]; diff --git a/resources/lang/he/admin/components/general.php b/resources/lang/he/admin/components/general.php index d7a924e490..5453a05499 100644 --- a/resources/lang/he/admin/components/general.php +++ b/resources/lang/he/admin/components/general.php @@ -1,6 +1,6 @@ 'שם רכיב', 'checkin' => 'רכיב Checkin', 'checkout' => 'רכיב Checkout', @@ -12,4 +12,4 @@ return array( 'remaining' => 'נוֹתָר', 'total' => 'סה"כ', 'update' => 'עדכון רכיב', -); +]; diff --git a/resources/lang/he/admin/components/message.php b/resources/lang/he/admin/components/message.php index 32cb4c4fec..faf94e6212 100644 --- a/resources/lang/he/admin/components/message.php +++ b/resources/lang/he/admin/components/message.php @@ -1,36 +1,35 @@ 'הרכיב אינו קיים.', - 'create' => array( + 'create' => [ 'error' => 'הרכיב לא נוצר, נסה שוב.', - 'success' => 'הרכיב נוצר בהצלחה.' - ), + 'success' => 'הרכיב נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'הרכיב לא עודכן, נסה שוב', - 'success' => 'הרכיב עודכן בהצלחה.' - ), + 'success' => 'הרכיב עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק רכיב זה?', 'error' => 'הייתה בעיה במחיקת הרכיב. בבקשה נסה שוב.', - 'success' => 'הרכיב נמחק בהצלחה.' - ), + 'success' => 'הרכיב נמחק בהצלחה.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'הרכיב לא נבדק, נסה שוב', 'success' => 'רכיב הוצא בהצלחה.', - 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.' - ), + 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'הרכיב לא נבדק, נסה שוב', 'success' => 'רכיב נבדק בהצלחה.', - 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.' - ) + 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', + ], - -); +]; diff --git a/resources/lang/he/admin/components/table.php b/resources/lang/he/admin/components/table.php index c027a774ea..a8b1d9363e 100644 --- a/resources/lang/he/admin/components/table.php +++ b/resources/lang/he/admin/components/table.php @@ -1,5 +1,5 @@ 'שם רכיב', -); +]; diff --git a/resources/lang/he/admin/consumables/general.php b/resources/lang/he/admin/consumables/general.php index 85ab42b327..6c3d34ef0d 100644 --- a/resources/lang/he/admin/consumables/general.php +++ b/resources/lang/he/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout מתכלה למשתמש', 'consumable_name' => 'שם מתכלה', 'create' => 'צור מתכלים', @@ -8,4 +8,4 @@ return array( 'remaining' => 'נוֹתָר', 'total' => 'סה"כ', 'update' => 'עדכון מתכלה', -); +]; diff --git a/resources/lang/he/admin/consumables/message.php b/resources/lang/he/admin/consumables/message.php index d4c2a78cf1..4b79c19fde 100644 --- a/resources/lang/he/admin/consumables/message.php +++ b/resources/lang/he/admin/consumables/message.php @@ -1,36 +1,35 @@ 'הצריכה אינה קיימת.', - 'create' => array( + 'create' => [ 'error' => 'הצריכה לא נוצרה, נסה שוב.', - 'success' => 'הצריכה נוצרה בהצלחה.' - ), + 'success' => 'הצריכה נוצרה בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'הצריכה לא עודכנה, נסה שוב', - 'success' => 'הצריכה עודכנה בהצלחה.' - ), + 'success' => 'הצריכה עודכנה בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את הפריט המתכלה הזה?', 'error' => 'היתה בעיה במחיקת המתכלים. בבקשה נסה שוב.', - 'success' => 'המתכלים נמחקו בהצלחה.' - ), + 'success' => 'המתכלים נמחקו בהצלחה.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'הצריכה לא נבדקה, נסה שוב', 'success' => 'הצריכה נשללה בהצלחה.', - 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.' - ), + 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'הצריכה לא נבדקה, נסה שוב', 'success' => 'הצריכה נבדקה בהצלחה.', - 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.' - ) + 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', + ], - -); +]; diff --git a/resources/lang/he/admin/consumables/table.php b/resources/lang/he/admin/consumables/table.php index b472b647f1..def9483826 100644 --- a/resources/lang/he/admin/consumables/table.php +++ b/resources/lang/he/admin/consumables/table.php @@ -1,5 +1,5 @@ 'שם מתכלה', -); +]; diff --git a/resources/lang/he/admin/custom_fields/general.php b/resources/lang/he/admin/custom_fields/general.php index d3c2a40b90..ea18bc7c35 100644 --- a/resources/lang/he/admin/custom_fields/general.php +++ b/resources/lang/he/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'שדות מותאמים אישית', 'field' => 'שדה', 'about_fieldsets_title' => 'אודות שדות', @@ -29,4 +29,4 @@ return array( 'create_field' => 'שדה מותאם אישית חדש', 'value_encrypted' => 'הערך של שדה זה מוצפן במסד הנתונים. רק משתמשי מנהל יוכלו להציג את הערך המפוענח', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/he/admin/custom_fields/message.php b/resources/lang/he/admin/custom_fields/message.php index 57276c107e..a6dd83d3af 100644 --- a/resources/lang/he/admin/custom_fields/message.php +++ b/resources/lang/he/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'שדה זה אינו קיים.', 'already_added' => 'השדה כבר נוסף', - 'create' => array( + 'create' => [ 'error' => 'שדה לא נוצר, נסה שוב.', 'success' => 'שדה נוצר בהצלחה.', - 'assoc_success' => 'שדה נוסף בהצלחה ל- fieldset.' - ), + 'assoc_success' => 'שדה נוסף בהצלחה ל- fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'השדה לא עודכן, נסה שוב', - 'success' => 'שדה עודכן בהצלחה.' - ), + 'success' => 'שדה עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק שדה זה?', 'error' => 'הייתה בעיה במחיקת השדה. בבקשה נסה שוב.', 'success' => 'השדה נמחק בהצלחה.', 'in_use' => 'שדה עדיין בשימוש.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset אינו קיים', - 'create' => array( + 'create' => [ 'error' => 'Fieldset לא נוצר, נסה שוב.', - 'success' => 'Fieldset נוצר בהצלחה.' - ), + 'success' => 'Fieldset נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset לא עודכן, נסה שוב', - 'success' => 'Fieldset עודכן בהצלחה.' - ), + 'success' => 'Fieldset עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את השדה הזה?', 'error' => 'היתה בעיה במחיקת השדה. בבקשה נסה שוב.', 'success' => 'ה- fieldset נמחק בהצלחה.', 'in_use' => 'Fieldset עדיין בשימוש.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/he/admin/departments/message.php b/resources/lang/he/admin/departments/message.php index feafc938c4..ddfc029744 100644 --- a/resources/lang/he/admin/departments/message.php +++ b/resources/lang/he/admin/departments/message.php @@ -1,21 +1,21 @@ 'המחלקה לא קיימת.', 'assoc_users' => 'מחלקה זו משויכת כרגע למשתמש אחד לפחות ולא ניתן למחוק אותה. עדכן את המשתמשים שלך כדי לא להפנות עוד למחלקה זו ונסה שוב.', - 'create' => array( + 'create' => [ 'error' => 'המחלקה לא נוצרה, נסה שוב.', - 'success' => 'המחלקה נוצרה בהצלחה.' - ), - 'update' => array( + 'success' => 'המחלקה נוצרה בהצלחה.', + ], + 'update' => [ 'error' => 'המחלקה לא עודכנה, נסה שוב', - 'success' => 'המחלקה עודכנה בהצלחה.' - ), - 'delete' => array( + 'success' => 'המחלקה עודכנה בהצלחה.', + ], + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק מחלקה זו?', 'error' => 'היתה בעיה במחיקת המחלקה. בבקשה נסה שוב.', - 'success' => 'המחלקה נמחקה בהצלחה.' - ) + 'success' => 'המחלקה נמחקה בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/departments/table.php b/resources/lang/he/admin/departments/table.php index 7fe6ec4d65..0c20c24fb8 100644 --- a/resources/lang/he/admin/departments/table.php +++ b/resources/lang/he/admin/departments/table.php @@ -1,6 +1,6 @@ 'תְעוּדַת זֶהוּת', 'name' => 'שם מחלקה', @@ -8,4 +8,4 @@ return array( 'location' => 'מקום', 'create' => 'יצירת המחלקה', 'update' => 'עדכון המחלקה', - ); + ]; diff --git a/resources/lang/he/admin/depreciations/general.php b/resources/lang/he/admin/depreciations/general.php index 0594da3f09..2ab968882e 100644 --- a/resources/lang/he/admin/depreciations/general.php +++ b/resources/lang/he/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'על פחת נכסים', 'about_depreciations' => 'ניתן להגדיר פחתונות נכסים כדי לפחת נכסים על בסיס פחת קו ישר.', 'asset_depreciations' => 'פחת נכסים', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'מספר החודשים', 'update' => 'עדכון פחת', -); +]; diff --git a/resources/lang/he/admin/depreciations/message.php b/resources/lang/he/admin/depreciations/message.php index c92f6b92bb..831690ff2e 100644 --- a/resources/lang/he/admin/depreciations/message.php +++ b/resources/lang/he/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'שיעור פחת אינו קיים.', 'assoc_users' => 'פחת זה משויך כרגע עם דגם אחד או יותר ולא ניתן למחוק אותו. מחק את המודלים ולאחר מכן נסה למחוק שוב.', - - 'create' => array( + 'create' => [ 'error' => 'מחלקת הפחת לא נוצרה, נסה שוב. You', - 'success' => 'מחלקת הפחת נוצרה בהצלחה. :)' - ), + 'success' => 'מחלקת הפחת נוצרה בהצלחה. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'שיעור הפחת לא עודכן, נסה שוב', - 'success' => 'שיעור הפחת עודכן בהצלחה.' - ), + 'success' => 'שיעור הפחת עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את שיעור הפחת הזה?', 'error' => 'אירעה בעיה במחיקת שיעור הפחת. בבקשה נסה שוב.', - 'success' => 'מחלקת הפחת נמחקה בהצלחה.' - ) + 'success' => 'מחלקת הפחת נמחקה בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/depreciations/table.php b/resources/lang/he/admin/depreciations/table.php index 837178928d..800512aa12 100644 --- a/resources/lang/he/admin/depreciations/table.php +++ b/resources/lang/he/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'תְעוּדַת זֶהוּת', 'months' => 'חודשים', 'term' => 'טווח', 'title' => 'שֵׁם', -); +]; diff --git a/resources/lang/he/admin/groups/message.php b/resources/lang/he/admin/groups/message.php index 949d1754a6..6dca3166e3 100644 --- a/resources/lang/he/admin/groups/message.php +++ b/resources/lang/he/admin/groups/message.php @@ -1,22 +1,22 @@ 'הקבוצה כבר קיימת!', 'group_not_found' => 'קבוצה [: id] לא קיימת.', 'group_name_required' => 'שדה השדה נדרש', - 'success' => array( + 'success' => [ 'create' => 'הקבוצה נוצרה בהצלחה.', 'update' => 'הקבוצה עודכנה בהצלחה.', 'delete' => 'הקבוצה נמחקה בהצלחה.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק קבוצה זו?', 'create' => 'היתה בעיה ביצירת הקבוצה. בבקשה נסה שוב.', 'update' => 'היתה בעיה בעדכון הקבוצה. בבקשה נסה שוב.', 'delete' => 'הייתה בעיה במחיקת הקבוצה. בבקשה נסה שוב.', - ), + ], -); +]; diff --git a/resources/lang/he/admin/groups/table.php b/resources/lang/he/admin/groups/table.php index 1da80b0ece..cbae1aa04e 100644 --- a/resources/lang/he/admin/groups/table.php +++ b/resources/lang/he/admin/groups/table.php @@ -1,9 +1,9 @@ 'תְעוּדַת זֶהוּת', 'name' => 'שֵׁם', 'users' => '# משתמשים', -); +]; diff --git a/resources/lang/he/admin/groups/titles.php b/resources/lang/he/admin/groups/titles.php index 6a8a012b75..6365ee2630 100644 --- a/resources/lang/he/admin/groups/titles.php +++ b/resources/lang/he/admin/groups/titles.php @@ -1,6 +1,6 @@ 'על קבוצות', 'about_groups' => 'קבוצות משמשות להכללת הרשאות משתמש.', 'group_management' => 'ניהול קבוצה', @@ -11,4 +11,4 @@ return array( 'allow' => 'להתיר', 'deny' => 'לְהַכּחִישׁ', -); +]; diff --git a/resources/lang/he/admin/hardware/form.php b/resources/lang/he/admin/hardware/form.php index 674da12297..b38222f305 100644 --- a/resources/lang/he/admin/hardware/form.php +++ b/resources/lang/he/admin/hardware/form.php @@ -1,12 +1,12 @@ 'אשר מחיקה גורפת של נכסים', +return [ + 'bulk_delete' => 'אשר מחיקה גורפת של נכסים', 'bulk_delete_help' => 'עיין בנכסים למחיקה בכמות גדולה בהמשך. לאחר המחיקה, ניתן לשחזר נכסים אלה, אך הם לא יהיו משויכים עוד עם משתמשים שאליהם הם מוקצים כעת.', 'bulk_delete_warn' => 'אתה עומד למחוק את הנכסים: asset_count.', - 'bulk_update' => 'עדכון גורפת נכסים', - 'bulk_update_help' => 'טופס זה מאפשר לך לעדכן מספר נכסים בבת אחת. מלא רק את השדות שאתה צריך לשנות. כל השדות שנותרו ריקים יישארו ללא שינוי.', - 'bulk_update_warn' => 'אתה עומד לערוך את המאפיינים של: asset_count נכסים.', + 'bulk_update' => 'עדכון גורפת נכסים', + 'bulk_update_help' => 'טופס זה מאפשר לך לעדכן מספר נכסים בבת אחת. מלא רק את השדות שאתה צריך לשנות. כל השדות שנותרו ריקים יישארו ללא שינוי.', + 'bulk_update_warn' => 'אתה עומד לערוך את המאפיינים של: asset_count נכסים.', 'checkedout_to' => 'הוצא אל', 'checkout_date' => 'תבדוק את התאריך', 'checkin_date' => 'תאריך הגעה', @@ -38,7 +38,6 @@ return array( 'tag' => 'תג נכס', 'update' => 'עדכון נכס', 'warranty' => 'אַחֲרָיוּת', - 'warranty_expires' => 'תפוגת האחריות', + 'warranty_expires' => 'תפוגת האחריות', 'years' => 'שנים', -) -; +]; diff --git a/resources/lang/he/admin/hardware/general.php b/resources/lang/he/admin/hardware/general.php index bd466f3bee..e3555b6df6 100644 --- a/resources/lang/he/admin/hardware/general.php +++ b/resources/lang/he/admin/hardware/general.php @@ -1,9 +1,9 @@ 'על נכסים', 'about_assets_text' => 'נכסים הם פריטים במעקב לפי מספר סידורי או תג נכס. הם נוטים להיות פריטים בעלי ערך גבוה יותר, כאשר מזהים פריטים ספציפיים.', - 'archived' => 'בארכיון', + 'archived' => 'בארכיון', 'asset' => 'נכס', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'רכוש', @@ -19,4 +19,4 @@ return array( 'pending' => 'ממתין ל', 'undeployable' => 'לא ניתן לפריסה', 'view' => 'הצג נכס', -); +]; diff --git a/resources/lang/he/admin/hardware/message.php b/resources/lang/he/admin/hardware/message.php index 3f0c68d501..5adf897190 100644 --- a/resources/lang/he/admin/hardware/message.php +++ b/resources/lang/he/admin/hardware/message.php @@ -1,82 +1,80 @@ ' אזהרה: הנכס הזה סומן כבלתי ניתן לפריסה כעת. אם סטטוס זה השתנה, עדכן את סטטוס הנכס.', 'does_not_exist' => 'הנכס אינו קיים.', 'does_not_exist_or_not_requestable' => 'ניסיון יפה. נכס זה אינו קיים או שאינו ניתן לביצוע.', 'assoc_users' => 'הנכס הזה מסומן כרגע למשתמש ולא ניתן למחוק אותו. בדוק תחילה את הנכס ולאחר מכן נסה למחוק שוב.', - 'create' => array( + 'create' => [ 'error' => 'הנכס לא נוצר, נסה שוב. You', - 'success' => 'הנכס נוצר בהצלחה. :)' - ), + 'success' => 'הנכס נוצר בהצלחה. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'הנכס לא עודכן, נסה שוב', 'success' => 'הנכס עודכן בהצלחה.', 'nothing_updated' => 'לא נבחרו שדות, ולכן דבר לא עודכן.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'הנכס לא שוחזר, נסה שוב', - 'success' => 'הנכס שוחזר בהצלחה.' - ), + 'success' => 'הנכס שוחזר בהצלחה.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'ביקורת הנכסים נכשלה. בבקשה נסה שוב.', - 'success' => 'ביקורת נכסים נרשמה בהצלחה.' - ), + 'success' => 'ביקורת נכסים נרשמה בהצלחה.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'הקובץ לא נמחק. בבקשה נסה שוב.', 'success' => 'הקובץ נמחק בהצלחה.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'הקובץ לא הועלה. בבקשה נסה שוב.', 'success' => 'הקבצים הועלו בהצלחה.', 'nofiles' => 'לא בחרת קבצים להעלאה, או שהקובץ שאתה מנסה להעלות גדול מדי', 'invalidfiles' => 'אחד או יותר מהקבצים שלך גדול מדי או שהוא סוג קובץ שאינו מותר. סוגי קבצים מותרים הם png, gif, jpg, doc, docx, pdf ו- txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'פריטים מסוימים לא ייבאו כראוי.', 'errorDetail' => 'הפריטים הבאים לא יובאו בגלל שגיאות.', - 'success' => "הקובץ שלך יובא", - 'file_delete_success' => "הקובץ שלך נמחק בהצלחה", - 'file_delete_error' => "לא ניתן היה למחוק את הקובץ", - ), + 'success' => 'הקובץ שלך יובא', + 'file_delete_success' => 'הקובץ שלך נמחק בהצלחה', + 'file_delete_error' => 'לא ניתן היה למחוק את הקובץ', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את הנכס הזה?', 'error' => 'היתה בעיה במחיקת הנכס. בבקשה נסה שוב.', 'nothing_updated' => 'לא נבחרו נכסים ולכן לא נמחק דבר.', - 'success' => 'הנכס נמחק בהצלחה.' - ), + 'success' => 'הנכס נמחק בהצלחה.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'הנכס לא נבדק, נסה שוב', 'success' => 'הנכס הוצא בהצלחה.', 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', 'not_available' => 'הנכס הזה אינו זמין לקופה!', - 'no_assets_selected' => 'עליך לבחור לפחות בנכס אחד מהרשימה' - ), + 'no_assets_selected' => 'עליך לבחור לפחות בנכס אחד מהרשימה', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'הנכס לא נבדק, נסה שוב', 'success' => 'הנכס נבדק בהצלחה.', 'user_does_not_exist' => 'משתמש זה אינו חוקי. בבקשה נסה שוב.', 'already_checked_in' => 'הנכס כבר נבדק.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'הנכס לא התבקש, נסה שוב', 'success' => 'הנכס המבוקש בהצלחה.', - 'canceled' => 'בקשת התשלום בוטלה בהצלחה' - ) + 'canceled' => 'בקשת התשלום בוטלה בהצלחה', + ], -); +]; diff --git a/resources/lang/he/admin/hardware/table.php b/resources/lang/he/admin/hardware/table.php index 65fcc88692..0b58a498d8 100644 --- a/resources/lang/he/admin/hardware/table.php +++ b/resources/lang/he/admin/hardware/table.php @@ -1,6 +1,6 @@ 'תג נכס', 'asset_model' => 'דֶגֶם', @@ -20,6 +20,6 @@ return array( 'title' => 'נכס', 'image' => 'תמונה של מכשיר', 'days_without_acceptance' => 'ימים ללא קבלה', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/he/admin/kits/general.php b/resources/lang/he/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/he/admin/kits/general.php +++ b/resources/lang/he/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/he/admin/licenses/form.php b/resources/lang/he/admin/licenses/form.php index 555bda7704..3ecb7fc0a4 100644 --- a/resources/lang/he/admin/licenses/form.php +++ b/resources/lang/he/admin/licenses/form.php @@ -1,6 +1,6 @@ 'נכס', 'checkin' => 'קבלה', @@ -18,5 +18,5 @@ return array( 'to_email' => 'מורשה לדוא"ל', 'to_name' => 'מורשה לשם', 'update' => 'עדכון רשיון', - 'checkout_help' => 'עליך לבדוק רשיון לנכס חומרה או לאדם. תוכל לבחור את שניהם, אך הבעלים של הנכס חייב להתאים לאדם שאליו אתה בודק את הנכס.' -); + 'checkout_help' => 'עליך לבדוק רשיון לנכס חומרה או לאדם. תוכל לבחור את שניהם, אך הבעלים של הנכס חייב להתאים לאדם שאליו אתה בודק את הנכס.', +]; diff --git a/resources/lang/he/admin/licenses/general.php b/resources/lang/he/admin/licenses/general.php index 7e968671ab..b76e40ca9b 100644 --- a/resources/lang/he/admin/licenses/general.php +++ b/resources/lang/he/admin/licenses/general.php @@ -1,6 +1,6 @@ 'על רישיונות', 'about_licenses' => 'רשיונות משמשים למעקב אחר תוכנה. יש להם מספר מסוים של מושבים כי ניתן לבדוק את הפרטים', 'checkin' => 'רישיון רישיון', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'רשיונות תוכנה', 'user' => 'מִשׁתַמֵשׁ', 'view' => 'הצג רישיון', -); +]; diff --git a/resources/lang/he/admin/licenses/message.php b/resources/lang/he/admin/licenses/message.php index 75df157e4e..eeea6dfe0b 100644 --- a/resources/lang/he/admin/licenses/message.php +++ b/resources/lang/he/admin/licenses/message.php @@ -1,6 +1,6 @@ 'הרישיון אינו קיים.', 'user_does_not_exist' => 'משתמש לא קיים.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'עליך לבחור נכס או משתמש, אך לא את שניהם.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'הרישיון לא נוצר, נסה שוב.', - 'success' => 'הרישיון נוצר בהצלחה.' - ), + 'success' => 'הרישיון נוצר בהצלחה.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'הקובץ לא נמחק. בבקשה נסה שוב.', 'success' => 'הקובץ נמחק בהצלחה.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'הקובץ לא הועלה. בבקשה נסה שוב.', 'success' => 'הקבצים הועלו בהצלחה.', 'nofiles' => 'לא בחרת קבצים להעלאה, או שהקובץ שאתה מנסה להעלות גדול מדי', 'invalidfiles' => 'אחד או יותר מהקבצים שלך גדול מדי או שהוא סוג קובץ שאינו מותר. סוגי קבצים מותרים הם png, gif, jpg, jpeg, docx, pdf, txt, zip, rar, rtf, XML ו- lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'הרישיון לא עודכן, נסה שוב', - 'success' => 'הרישיון עודכן בהצלחה.' - ), + 'success' => 'הרישיון עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק רישיון זה?', 'error' => 'היתה בעיה במחיקת הרישיון. בבקשה נסה שוב.', - 'success' => 'הרישיון נמחק בהצלחה.' - ), + 'success' => 'הרישיון נמחק בהצלחה.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'היתה בעיה לבדוק את הרישיון. בבקשה נסה שוב.', - 'success' => 'הרשיון נבדק בהצלחה' - ), + 'success' => 'הרשיון נבדק בהצלחה', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'היתה בעיה בבדיקת הרישיון. בבקשה נסה שוב.', - 'success' => 'הרישיון נבדק בהצלחה' - ), + 'success' => 'הרישיון נבדק בהצלחה', + ], -); +]; diff --git a/resources/lang/he/admin/licenses/table.php b/resources/lang/he/admin/licenses/table.php index 7008536d2a..def23c22e2 100644 --- a/resources/lang/he/admin/licenses/table.php +++ b/resources/lang/he/admin/licenses/table.php @@ -1,6 +1,6 @@ 'מוקצה ל-', 'checkout' => 'ניפוק/החזרה', @@ -14,4 +14,4 @@ return array( 'serial' => 'מספר סידורי', 'title' => 'רישיון', -); +]; diff --git a/resources/lang/he/admin/locations/message.php b/resources/lang/he/admin/locations/message.php index f35788b9a0..1b30379473 100644 --- a/resources/lang/he/admin/locations/message.php +++ b/resources/lang/he/admin/locations/message.php @@ -1,27 +1,26 @@ 'המיקום אינו קיים.', 'assoc_users' => 'המיקום משויך לפחות למשתמש אחד ולכן לא ניתן למחוק אותו. אנא עדכן את המשתמשים כך שלא יהיה אף משתמש משויך למיקום זה ונסה שנית. ', 'assoc_assets' => 'המיקום משויך לפחות לפריט אחד ולכן לא ניתן למחוק אותו. אנא עדכן את הפריטים כך שלא יהיה אף פריט משויך למיקום זה ונסה שנית. ', 'assoc_child_loc' => 'למיקום זה מוגדרים תתי-מיקומים ולכן לא ניתן למחוק אותו. אנא עדכן את המיקומים כך שלא שמיקום זה לא יכיל תתי מיקומים ונסה שנית. ', - - 'create' => array( + 'create' => [ 'error' => 'המיקום לא נוצר, אנא נסה שנית.', - 'success' => 'המיקום נוצר בהצלחה.' - ), + 'success' => 'המיקום נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'המיקום לא עודכן, אנא נסה שנית', - 'success' => 'המיקום עודכן בהצלחה.' - ), + 'success' => 'המיקום עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את המיקום?', 'error' => 'אירעה תקלה במחיקת המיקום. אנא נסה שנית.', - 'success' => 'המיקום נמחק בהצלחה.' - ) + 'success' => 'המיקום נמחק בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/locations/table.php b/resources/lang/he/admin/locations/table.php index 35b31a1ef9..8e81f33098 100644 --- a/resources/lang/he/admin/locations/table.php +++ b/resources/lang/he/admin/locations/table.php @@ -1,6 +1,6 @@ 'אודות מיקומים', 'about_locations' => 'מיקומים משמשים למעקב אחר נתוני מיקום עבור משתמשים, נכסים ופריטים אחרים', 'assets_rtd' => 'נכסים', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'הוֹרֶה', 'currency' => 'מטבע מיקום', 'ldap_ou' => 'חיפוש OD של LDAP', - ); + ]; diff --git a/resources/lang/he/admin/manufacturers/message.php b/resources/lang/he/admin/manufacturers/message.php index 200f079ccd..48dfa0a86c 100644 --- a/resources/lang/he/admin/manufacturers/message.php +++ b/resources/lang/he/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'היצרן אינו קיים.', 'assoc_users' => 'יצרן זה משויך כרגע עם דגם אחד לפחות ולא ניתן למחוק אותו. אנא עדכן את הדגמים שלך כדי לא להתייחס עוד ליצרן זה ונסה שוב.', - 'create' => array( + 'create' => [ 'error' => 'היצרן לא נוצר, נסה שוב.', - 'success' => 'היצרן נוצר בהצלחה.' - ), + 'success' => 'היצרן נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'היצרן לא עודכן, נסה שוב', - 'success' => 'היצרן עודכן בהצלחה.' - ), + 'success' => 'היצרן עודכן בהצלחה.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'היצרן לא שוחזר, נסה שוב', - 'success' => 'היצרן שוחזר בהצלחה.' - ), + 'success' => 'היצרן שוחזר בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק יצרן זה?', 'error' => 'אירעה בעיה במחיקת היצרן. בבקשה נסה שוב.', - 'success' => 'היצרן נמחק בהצלחה.' - ) + 'success' => 'היצרן נמחק בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/manufacturers/table.php b/resources/lang/he/admin/manufacturers/table.php index d788333f4e..c0c52dbb5f 100644 --- a/resources/lang/he/admin/manufacturers/table.php +++ b/resources/lang/he/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'על היצרנים', 'about_manufacturers_text' => 'היצרנים הן החברות שיוצרות את הנכסים שלך. תוכל לאחסן כאן פרטים חשובים ליצירת קשר עם התמיכה, שתוצג בדפי פרטי הנכס שלך.', 'asset_manufacturers' => 'יצרני נכסים', @@ -13,4 +13,4 @@ return array( 'update' => 'עדכון היצרן', 'url' => 'כתובת אתר', -); +]; diff --git a/resources/lang/he/admin/models/general.php b/resources/lang/he/admin/models/general.php index 4c41b1684a..3417dfcd22 100644 --- a/resources/lang/he/admin/models/general.php +++ b/resources/lang/he/admin/models/general.php @@ -1,6 +1,6 @@ 'על מודלים הנכסים', 'about_models_text' => 'מודלים של נכסים הם דרך לקבץ נכסים זהים. "MBP 2013", "iPhone 6s", וכו \'', 'deleted' => 'מודל זה נמחק. לחץ כאן כדי לשחזר אותו .', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'שחזור מודל', 'requestable' => 'משתמשים רשאים לבקש מודל זה', - 'show_mac_address' => 'הצג שדה כתובת MAC בנכסים במודל זה', + 'show_mac_address' => 'הצג שדה כתובת MAC בנכסים במודל זה', 'view_deleted' => 'הצג נמחק', 'view_models' => 'הצג דגמים', 'fieldset' => 'קבוצת שדות', 'no_custom_field' => 'אין שדות מותאמים אישית', 'add_default_values' => 'הוספת ערכי בררת מחדל', -); +]; diff --git a/resources/lang/he/admin/models/message.php b/resources/lang/he/admin/models/message.php index 227ba73f87..ac63db716f 100644 --- a/resources/lang/he/admin/models/message.php +++ b/resources/lang/he/admin/models/message.php @@ -1,42 +1,41 @@ 'המודל אינו קיים.', 'assoc_users' => 'מודל זה משויך כרגע לנכס אחד או יותר ולא ניתן למחוק אותו. מחק את הנכסים ולאחר מכן נסה למחוק שוב.', - - 'create' => array( + 'create' => [ 'error' => 'המודל לא נוצר, נסה שוב.', 'success' => 'המודל נוצר בהצלחה.', 'duplicate_set' => 'כבר קיים מודל נכסים עם שם, יצרן ומספר דגם זה.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'המודל לא עודכן, נסה שוב', - 'success' => 'המודל עודכן בהצלחה.' - ), + 'success' => 'המודל עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק מודל נכס זה?', 'error' => 'הייתה בעיה במחיקת המודל. בבקשה נסה שוב.', - 'success' => 'המודל נמחק בהצלחה.' - ), + 'success' => 'המודל נמחק בהצלחה.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'המודל לא שוחזר, נסה שוב', - 'success' => 'המודל שוחזר בהצלחה.' - ), + 'success' => 'המודל שוחזר בהצלחה.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'לא השתנו שדות, ולכן שום דבר לא עודכן.', - 'success' => 'המודלים עודכנו.' - ), + 'success' => 'המודלים עודכנו.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'לא נבחרו מודלים, לכן לא נמחק שום דבר.', 'success' => ':success_count מודלים נמחקו!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/he/admin/models/table.php b/resources/lang/he/admin/models/table.php index f43f0d4be2..567be071ce 100644 --- a/resources/lang/he/admin/models/table.php +++ b/resources/lang/he/admin/models/table.php @@ -1,6 +1,6 @@ 'יצירת מודל נכס', 'created_at' => 'נוצר ב', @@ -14,4 +14,4 @@ return array( 'update' => 'עדכון דגם הנכס', 'clone' => 'שיבוט המודל', 'edit' => 'עריכת מודל', -); +]; diff --git a/resources/lang/he/admin/reports/general.php b/resources/lang/he/admin/reports/general.php index a11e748694..1aa091bc38 100644 --- a/resources/lang/he/admin/reports/general.php +++ b/resources/lang/he/admin/reports/general.php @@ -1,5 +1,5 @@ 'בחר את האפשרויות הרצויות עבור דוח הנכס שלך.' -); +return [ + 'info' => 'בחר את האפשרויות הרצויות עבור דוח הנכס שלך.', +]; diff --git a/resources/lang/he/admin/reports/message.php b/resources/lang/he/admin/reports/message.php index be69bd1c03..301dda0531 100644 --- a/resources/lang/he/admin/reports/message.php +++ b/resources/lang/he/admin/reports/message.php @@ -1,5 +1,5 @@ 'עליך לבחור לפחות אפשרות אחת.' -); +return [ + 'error' => 'עליך לבחור לפחות אפשרות אחת.', +]; diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php index da2da4ee7c..eb230f9f87 100644 --- a/resources/lang/he/admin/settings/general.php +++ b/resources/lang/he/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'תחום Active Directory', 'ad_domain_help' => 'לפעמים זה זהה לדומיין הדוא"ל שלך, אך לא תמיד.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'זהו שרת Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'התראות שפג תוקפן (בימים)', 'alert_inv_threshold' => 'סף התראה על מלאי', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'מזהי נכסים', 'audit_interval' => 'מרווח ביקורת', 'audit_interval_help' => 'אם אתה נדרש באופן קבוע לביקורת פיזית של הנכסים שלך, הזן את מרווח בחודשים.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'הזן קוד שני פקטורים', 'two_factor_config_complete' => 'שלח קוד', 'two_factor_enabled_edit_not_allowed' => 'מנהל המערכת אינו מאפשר לך לערוך הגדרה זו.', - 'two_factor_enrollment_text' => "יש צורך באימות שני גורמים, אך המכשיר עדיין לא נרשם. פתח את אפליקציית המאמת של Google וסרוק את קוד QR שלהלן כדי לרשום את המכשיר שלך. לאחר שתירשם את המכשיר, הזן את הקוד הבא", + 'two_factor_enrollment_text' => 'יש צורך באימות שני גורמים, אך המכשיר עדיין לא נרשם. פתח את אפליקציית המאמת של Google וסרוק את קוד QR שלהלן כדי לרשום את המכשיר שלך. לאחר שתירשם את המכשיר, הזן את הקוד הבא', 'require_accept_signature' => 'דרוש חתימה', 'require_accept_signature_help_text' => 'הפעלת תכונה זו תדרוש ממשתמשים להיכנס פיזית בעת קבלת נכס.', 'left' => 'שמאלה', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'אורך תגי הנכסים, כולל zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/he/admin/settings/message.php b/resources/lang/he/admin/settings/message.php index 3c7f73fc9e..32516a2ed9 100644 --- a/resources/lang/he/admin/settings/message.php +++ b/resources/lang/he/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'אירעה שגיאה בעת העדכון.', - 'success' => 'ההגדרות עודכנו בהצלחה.' - ), - 'backup' => array( + 'success' => 'ההגדרות עודכנו בהצלחה.', + ], + 'backup' => [ 'delete_confirm' => 'האם אתה בטוח שברצונך למחוק קובץ גיבוי זה? לא ניתן לבטל פעולה זו.', 'file_deleted' => 'קובץ הגיבוי נמחק בהצלחה.', 'generated' => 'קובץ גיבוי חדש נוצר בהצלחה.', 'file_not_found' => 'קובץ גיבוי זה לא נמצא בשרת.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'אירעה שגיאה בעת הטיהור.', 'validation_failed' => 'אישור הטיהור שלך שגוי. הקלד את המילה "DELETE" בתיבת האישור.', - 'success' => 'רשומות נמחקו בהצלחה.' - ), + 'success' => 'רשומות נמחקו בהצלחה.', + ], -); +]; diff --git a/resources/lang/he/admin/statuslabels/message.php b/resources/lang/he/admin/statuslabels/message.php index f67a701199..8a0df3b5f2 100644 --- a/resources/lang/he/admin/statuslabels/message.php +++ b/resources/lang/he/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'תווית הסטטוס אינה קיימת.', 'assoc_assets' => 'תווית סטטוס זו משויכת כעת לנכס אחד לפחות ולא ניתן למחוק אותה. עדכן את הנכסים שלך כדי לא להתייחס עוד לסטטוס זה ונסה שוב.', - - 'create' => array( + 'create' => [ 'error' => 'תווית הסטטוס לא נוצרה, נסה שוב.', - 'success' => 'תווית המצב נוצרה בהצלחה.' - ), + 'success' => 'תווית המצב נוצרה בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'תווית הסטטוס לא עודכנה, נסה שוב', - 'success' => 'תווית הסטטוס עודכנה בהצלחה.' - ), + 'success' => 'תווית הסטטוס עודכנה בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק את תווית המצב הזו?', 'error' => 'הייתה בעיה במחיקת תווית המצב. בבקשה נסה שוב.', - 'success' => 'תווית הסטטוס נמחקה בהצלחה.' - ), + 'success' => 'תווית הסטטוס נמחקה בהצלחה.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'לא ניתן להקצות נכסים אלה לאף אחד.', 'deployable' => 'ניתן לבדוק את הנכסים האלה. לאחר הקצאתן, הן יקבלו סטטוס meta של פורסמו .', 'archived' => 'לא ניתן לבדוק את הנכסים האלה, והם יופיעו רק בתצוגה המפורטת בארכיון. אפשרות זו שימושית לשמירת מידע על נכסים לצורך תקצוב / מטרות היסטוריות, אך שמירה על רשימת הנכסים היומיומית.', 'pending' => 'נכסים אלה עדיין לא ניתן להקצות לאף אחד, משמש לעתים קרובות עבור פריטים כי הם לתיקון, אבל הם צפויים לחזור למחזור.', - ), + ], -); +]; diff --git a/resources/lang/he/admin/statuslabels/table.php b/resources/lang/he/admin/statuslabels/table.php index 9a198c69ef..7e10c3fdba 100644 --- a/resources/lang/he/admin/statuslabels/table.php +++ b/resources/lang/he/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'על תוויות סטטוס', 'archived' => 'בארכיון', 'create' => 'צור תווית סטטוס', @@ -16,4 +16,4 @@ return array( 'title' => 'תוויות סטטוס', 'undeployable' => 'לא ניתן לפריסה', 'update' => 'עדכון תווית סטטוס', -); +]; diff --git a/resources/lang/he/admin/suppliers/message.php b/resources/lang/he/admin/suppliers/message.php index 3df2684ff7..81e2b31407 100644 --- a/resources/lang/he/admin/suppliers/message.php +++ b/resources/lang/he/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'הספק אינו קיים.', - - 'create' => array( + 'create' => [ 'error' => 'הספק לא נוצר, נסה שוב.', - 'success' => 'הספק נוצר בהצלחה.' - ), + 'success' => 'הספק נוצר בהצלחה.', + ], - 'update' => array( + 'update' => [ 'error' => 'הספק לא עודכן, נסה שוב', - 'success' => 'הספק עודכן בהצלחה.' - ), + 'success' => 'הספק עודכן בהצלחה.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'האם אתה בטוח שברצונך למחוק ספק זה?', 'error' => 'היתה בעיה במחיקת הספק. בבקשה נסה שוב.', 'success' => 'הספק נמחק בהצלחה.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/he/admin/suppliers/table.php b/resources/lang/he/admin/suppliers/table.php index a20090edfd..ed80b34e4c 100644 --- a/resources/lang/he/admin/suppliers/table.php +++ b/resources/lang/he/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'על הספקים', 'about_suppliers_text' => 'הספקים משמשים כדי לעקוב אחר המקור של פריטים', 'address' => 'כתובת הספק', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'הצג נכסים עבור', 'zip' => 'מיקוד', -); +]; diff --git a/resources/lang/he/admin/users/general.php b/resources/lang/he/admin/users/general.php index a865ccca8c..d58a514e76 100644 --- a/resources/lang/he/admin/users/general.php +++ b/resources/lang/he/admin/users/general.php @@ -1,7 +1,6 @@ 'משתמש זה יכול להיכנס', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'נכסים שהוקצו ל: שם', @@ -13,7 +12,7 @@ return array( 'edit' => 'ערוך משתמש', 'filetype_info' => 'סוגי קבצים מותרים הם png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, ו rar.', 'history_user' => 'היסטוריה עבור: שם', - 'info' => 'מידע', + 'info' => 'מידע', 'restore_user' => 'לחץ כאן כדי לשחזר אותם.', 'last_login' => 'כניסה אחרונה', 'ldap_config_text' => 'הגדרות תצורה של LDAP נמצאות \'מנהל\'> \'הגדרות\'. המיקום הנבחר (אופציונלי) ייקבע עבור כל המשתמשים המיובאים.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'הגדרות מנהל המערכת הנוכחיות מאפשרות אכיפה סלקטיבית של אימות דו-גורמי.', 'two_factor_enrolled' => 'רשם מכשיר 2FA', 'two_factor_active' => '2FA פעיל', - ); + ]; diff --git a/resources/lang/he/admin/users/message.php b/resources/lang/he/admin/users/message.php index 4bda60b4fc..30be737763 100644 --- a/resources/lang/he/admin/users/message.php +++ b/resources/lang/he/admin/users/message.php @@ -1,6 +1,6 @@ 'קיבלת בהצלחה את הנכס הזה.', 'declined' => 'דחיית את הנכס הזה בהצלחה.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'שילוב LDAP לא הוגדר עבור התקנה זו.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'המשתמש נוצר בהצלחה.', 'update' => 'המשתמש עודכן בהצלחה.', 'update_bulk' => 'המשתמשים עודכנו בהצלחה!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'המשתמש בוטל בהצלחה.', 'restored' => 'המשתמש שוחזר בהצלחה.', 'import' => 'המשתמשים יובאו בהצלחה.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'היתה בעיה ביצירת המשתמש. בבקשה נסה שוב.', 'update' => 'היתה בעיה בעדכון המשתמש. בבקשה נסה שוב.', 'delete' => 'היתה בעיה במחיקת המשתמש. בבקשה נסה שוב.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'לא ניתן לחפש בשרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP.
שגיאה משרת LDAP:', 'ldap_could_not_get_entries' => 'לא ניתן לקבל רשומות משרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP.
שגיאה משרת LDAP:', 'password_ldap' => 'הסיסמה עבור חשבון זה מנוהלת על ידי LDAP / Active Directory. צור קשר עם מחלקת ה- IT כדי לשנות את הסיסמה שלך.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'הקובץ לא נמחק. בבקשה נסה שוב.', 'success' => 'הקובץ נמחק בהצלחה.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'הקובץ לא הועלה. בבקשה נסה שוב.', 'success' => 'הקבצים הועלו בהצלחה.', 'nofiles' => 'לא בחרת קבצים להעלאה', 'invalidfiles' => 'אחד או יותר מהקבצים שלך גדול מדי או שהוא סוג קובץ שאינו מותר. סוגי קבצים מותרים הם png, gif, jpg, doc, docx, pdf ו- txt.', - ), + ], -); +]; diff --git a/resources/lang/he/admin/users/table.php b/resources/lang/he/admin/users/table.php index 4bc0620e04..6f86aeb903 100644 --- a/resources/lang/he/admin/users/table.php +++ b/resources/lang/he/admin/users/table.php @@ -1,6 +1,6 @@ 'פָּעִיל', 'allow' => 'להתיר', 'checkedout' => 'נכסים', @@ -28,11 +28,11 @@ return array( 'show_current' => 'הצג משתמשים נוכחיים', 'show_deleted' => 'הצג משתמשים שנמחקו', 'title' => 'כותרת', - 'to_restore_them' => 'כדי לשחזר אותם.', + 'to_restore_them' => 'כדי לשחזר אותם.', 'updateuser' => 'עדכן משתמש', 'username' => 'שם משתמש', - 'user_deleted_text' => 'משתמש זה סומן כממחק.', + 'user_deleted_text' => 'משתמש זה סומן כממחק.', 'username_note' => '(זה משמש רק עבור Active Directory מחייב, לא עבור התחברות.)', 'cloneuser' => 'משתמש משוכפל', 'viewusers' => 'הצג משתמשים', -); +]; diff --git a/resources/lang/he/auth/general.php b/resources/lang/he/auth/general.php index 961f491c03..0053393efd 100644 --- a/resources/lang/he/auth/general.php +++ b/resources/lang/he/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'נא למלא את שם המשתמש לשליחת הודעת דוא״ל עם קישור לאיפוס ססמה.', 'username_help_bottom' => 'שם המשתמש וכתובת הדוא״ל שלך עשויים להיות זהים, אך גם עשויים שלא, תלוי בהגדרות שלך. אם לא הצלחת להיזכר בשם המשתמש שלך, מוטב ליצור קשר עם הנהלת המערכת.

שמות משתמשים שלא שויכה להם כתובת דוא״ל לא יקבלו הודעות עם קישור לאיפוס ססמה. ', ]; - diff --git a/resources/lang/he/auth/message.php b/resources/lang/he/auth/message.php index e2052809c4..08d352e1da 100644 --- a/resources/lang/he/auth/message.php +++ b/resources/lang/he/auth/message.php @@ -1,6 +1,6 @@ 'כבר קיים חשבון עם האימייל הזה.', 'account_not_found' => 'שם המשתמש או הסיסמה שגויים.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'חשבון משתמש זה מוחרם.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'אירעה בעיה בעת ניסיון להתחבר אליך, נסה שוב.', 'success' => 'התחברת בהצלחה.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'אירעה בעיה בעת ניסיון ליצור את חשבונך, נסה שוב.', 'success' => 'החשבון נוצר בהצלחה.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'אירעה בעיה בעת ניסיון לקבל קוד סיסמה לאיפוס, נסה שוב.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'אירעה בעיה בעת ניסיון לאפס את הסיסמה שלך, נסה שוב.', 'success' => 'הסיסמה שלך אופסה בהצלחה.', - ), + ], - -); +]; diff --git a/resources/lang/he/button.php b/resources/lang/he/button.php index 4669b476f4..de93ec55d8 100644 --- a/resources/lang/he/button.php +++ b/resources/lang/he/button.php @@ -1,6 +1,6 @@ 'פעולות', 'add' => 'הוסף חדש', 'cancel' => 'לְבַטֵל', @@ -11,7 +11,7 @@ return array( 'request' => 'בַּקָשָׁה', 'submit' => 'שלח', 'upload' => 'העלה', - 'select_file' => 'בחר קובץ...', + 'select_file' => 'בחר קובץ...', 'select_files' => 'בחר קבצים...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php index 187ae3ddfe..611243b0a8 100644 --- a/resources/lang/he/general.php +++ b/resources/lang/he/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'עִיר', - 'click_here' => 'לחץ כאן', + 'click_here' => 'לחץ כאן', 'clear_selection' => 'Clear Selection', 'companies' => 'חברות', 'company' => 'חֶברָה', 'component' => 'רְכִיב', 'components' => 'רכיבים', - 'complete' => 'לְהַשְׁלִים', + 'complete' => 'לְהַשְׁלִים', 'consumable' => 'מתכלים', 'consumables' => 'מתכלים', 'country' => 'מדינה', diff --git a/resources/lang/he/help.php b/resources/lang/he/help.php index 01ccd997b3..8908f1962f 100644 --- a/resources/lang/he/help.php +++ b/resources/lang/he/help.php @@ -1,6 +1,6 @@ "מידע נוסף", + 'more_info_title' => 'מידע נוסף', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'נכסים הם פריטים במעקב לפי מספר סידורי או תג נכס. הם נוטים להיות פריטים בעלי ערך גבוה יותר במקרים בהם זיהוי של פריט מסוים חשוב.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/he/mail.php b/resources/lang/he/mail.php index 5c237f0ad3..db031f1781 100644 --- a/resources/lang/he/mail.php +++ b/resources/lang/he/mail.php @@ -1,6 +1,6 @@ 'משתמש ביטל בקשת פריט באתר', 'a_user_requested' => 'משתמש ביקש פריט באתר', 'accessory_name' => 'שם אביזר:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/he/pagination.php b/resources/lang/he/pagination.php index 58c1f0bab9..2e4633d301 100644 --- a/resources/lang/he/pagination.php +++ b/resources/lang/he/pagination.php @@ -1,6 +1,6 @@ 'הבא »', -); +]; diff --git a/resources/lang/he/passwords.php b/resources/lang/he/passwords.php index 646a2ca138..726010501b 100644 --- a/resources/lang/he/passwords.php +++ b/resources/lang/he/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'קישור הסיסמה שלך נשלח!', 'user' => 'לא נמצע משתמש פעיל עם דוא״ל הזה.', ]; - diff --git a/resources/lang/he/reminders.php b/resources/lang/he/reminders.php index 7c21931a18..1cdceac9ff 100644 --- a/resources/lang/he/reminders.php +++ b/resources/lang/he/reminders.php @@ -1,6 +1,6 @@ "סיסמאות חייבות להיות שש תווים ולהתאים את האישור.", + 'password' => 'סיסמאות חייבות להיות שש תווים ולהתאים את האישור.', - "user" => "שם המשתמש או כתובת האימייל שגויים", + 'user' => 'שם המשתמש או כתובת האימייל שגויים', - "token" => "אסימון איפוס הסיסמה אינו חוקי.", + 'token' => 'אסימון איפוס הסיסמה אינו חוקי.', - "sent" => "אם נמצאה כתובת דוא\"ל תואמת, נשלחה תזכורת סיסמא!", + 'sent' => 'אם נמצאה כתובת דוא"ל תואמת, נשלחה תזכורת סיסמא!', -); +]; diff --git a/resources/lang/he/table.php b/resources/lang/he/table.php index 333594d698..e79cf576ca 100644 --- a/resources/lang/he/table.php +++ b/resources/lang/he/table.php @@ -1,10 +1,10 @@ 'פעולות', 'action' => 'פעולה', 'by' => 'על ידי', 'item' => 'פריט', -); +]; diff --git a/resources/lang/he/validation.php b/resources/lang/he/validation.php index a0fa84841e..c1e4ba77ed 100644 --- a/resources/lang/he/validation.php +++ b/resources/lang/he/validation.php @@ -1,6 +1,6 @@ 'התכונה: כבר נלקחה.', 'uploaded' => 'התכונה: נכשלה.', 'url' => 'תבנית התכונה: אינה חוקית.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "השדה: מאפיין מכיל תו שאינו מותר.", - "email_array" => "כתובת אימייל אחת או יותר אינה חוקית.", - "hashed_pass" => "הסיסמה הנוכחית שלך שגויה", + 'alpha_space' => 'השדה: מאפיין מכיל תו שאינו מותר.', + 'email_array' => 'כתובת אימייל אחת או יותר אינה חוקית.', + 'hashed_pass' => 'הסיסמה הנוכחית שלך שגויה', 'dumbpwd' => 'סיסמה זו נפוצה מדי.', - "statuslabel_type" => "עליך לבחור סוג תווית סטטוס חוקי", + 'statuslabel_type' => 'עליך לבחור סוג תווית סטטוס חוקי', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/hr/admin/accessories/general.php b/resources/lang/hr/admin/accessories/general.php index cb409fd1ed..0acf91a37b 100644 --- a/resources/lang/hr/admin/accessories/general.php +++ b/resources/lang/hr/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorija dodatne opreme', 'accessory_name' => 'Naziv dodatne opreme', 'checkout' => 'Dodatna oprema za naplatu', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Umjesto toga upotrijebite primarnu postavku EULA.', 'use_default_eula_disabled' => 'Uporedi primarnu zadanu EULA. Nije postavljena primarna zadana EULA. Dodajte jednu u Postavke.', -); +]; diff --git a/resources/lang/hr/admin/accessories/message.php b/resources/lang/hr/admin/accessories/message.php index 58418733c0..b0d78279a3 100644 --- a/resources/lang/hr/admin/accessories/message.php +++ b/resources/lang/hr/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Ovaj pribor trenutačno ima: brojčanu stavku označenu korisnicima. Provjerite pribor i pokušajte ponovo.', - 'create' => array( + 'create' => [ 'error' => 'Dodatak nije izrađen, pokušajte ponovo.', - 'success' => 'Dodatak je uspješno izrađen.' - ), + 'success' => 'Dodatak je uspješno izrađen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dodatak nije ažuriran, pokušajte ponovo', - 'success' => 'Dodatak je uspješno ažuriran.' - ), + 'success' => 'Dodatak je uspješno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj dodatak?', 'error' => 'Došlo je do problema s brisanjem dodatne opreme. Molim te pokušaj ponovno.', - 'success' => 'Dodatak je uspješno izbrisan.' - ), + 'success' => 'Dodatak je uspješno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Dodatak nije provjeren, pokušajte ponovo', 'success' => 'Usluga je uspješno provjerena.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ), + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Dodatna oprema nije prijavljena, pokušajte ponovo', 'success' => 'Pristup je uspješno prijavljen.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ) + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - -); +]; diff --git a/resources/lang/hr/admin/accessories/table.php b/resources/lang/hr/admin/accessories/table.php index 49d9574cf5..6d3361566c 100644 --- a/resources/lang/hr/admin/accessories/table.php +++ b/resources/lang/hr/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Preuzmite CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Preuzmite CSV', + 'eula_text' => 'EULA', 'id' => 'iskaznica', 'require_acceptance' => 'Prihvaćanje', 'title' => 'Naziv dodatne opreme', - -); +]; diff --git a/resources/lang/hr/admin/asset_maintenances/form.php b/resources/lang/hr/admin/asset_maintenances/form.php index 8e8ad59200..0adb6e9ff4 100644 --- a/resources/lang/hr/admin/asset_maintenances/form.php +++ b/resources/lang/hr/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'dana', 'notes' => 'Bilješke', 'update' => 'Ažuriraj', - 'create' => 'Stvoriti' + 'create' => 'Stvoriti', ]; diff --git a/resources/lang/hr/admin/asset_maintenances/message.php b/resources/lang/hr/admin/asset_maintenances/message.php index c75d7f84a6..dd471bffd1 100644 --- a/resources/lang/hr/admin/asset_maintenances/message.php +++ b/resources/lang/hr/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovo održavanje imovine?', 'error' => 'Došlo je do problema s brisanjem održavanja imovine. Molim te pokušaj ponovno.', - 'success' => 'Održavanje imovine uspješno je izbrisano.' + 'success' => 'Održavanje imovine uspješno je izbrisano.', ], 'create' => [ 'error' => 'Održavanje imovine nije izrađeno, pokušajte ponovo.', - 'success' => 'Uspješno održavanje imovine.' + 'success' => 'Uspješno održavanje imovine.', ], 'edit' => [ 'error' => 'Održavanje imovine nije uređeno, pokušajte ponovo.', - 'success' => 'Održavanje imovine uspješno je uređeno.' + 'success' => 'Održavanje imovine uspješno je uređeno.', ], 'asset_maintenance_incomplete' => 'Nije još dovršeno', 'warranty' => 'garancija', 'not_warranty' => 'Nije jamstvo', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/hr/admin/asset_maintenances/table.php b/resources/lang/hr/admin/asset_maintenances/table.php index f5ae6a0943..945beaa914 100644 --- a/resources/lang/hr/admin/asset_maintenances/table.php +++ b/resources/lang/hr/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Održavanje imovine', 'asset_name' => 'Naziv imovine', 'is_warranty' => 'garancija', - 'dl_csv' => 'Preuzmite CSV' + 'dl_csv' => 'Preuzmite CSV', ]; diff --git a/resources/lang/hr/admin/categories/general.php b/resources/lang/hr/admin/categories/general.php index 6277e2c8dd..ca278def17 100644 --- a/resources/lang/hr/admin/categories/general.php +++ b/resources/lang/hr/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorije sredstava', 'category_name' => 'Naziv kategorije', 'checkin_email' => 'Pošalji e-mail korisniku prilikom checkin/checkout-a.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Umjesto toga upotrijebite primarnu postavku EULA.', 'use_default_eula_disabled' => 'Uporedi primarnu zadanu EULA. Nije postavljena primarna zadana EULA. Dodajte jednu u Postavke.', -); +]; diff --git a/resources/lang/hr/admin/categories/message.php b/resources/lang/hr/admin/categories/message.php index ec51a8307c..4a9ba233ab 100644 --- a/resources/lang/hr/admin/categories/message.php +++ b/resources/lang/hr/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorija ne postoji.', 'assoc_models' => 'Ova je kategorija trenutno povezana s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da više ne referiraju ovu kategoriju i pokušajte ponovno.', 'assoc_items' => 'Ova je kategorija trenutno povezana s najmanje jednim: asset_type i ne može se izbrisati. Ažurirajte svoj: asset_type da više ne referirate ovu kategoriju i pokušajte ponovo.', - 'create' => array( + 'create' => [ 'error' => 'Kategorija nije izrađena, pokušajte ponovo.', - 'success' => 'Kategorija je uspješno izrađena.' - ), + 'success' => 'Kategorija je uspješno izrađena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorija nije ažurirana, pokušajte ponovo', - 'success' => 'Kategorija je uspješno ažurirana.' - ), + 'success' => 'Kategorija je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu kategoriju?', 'error' => 'Došlo je do problema s brisanjem kategorije. Molim te pokušaj ponovno.', - 'success' => 'Kategorija je uspješno izbrisana.' - ) + 'success' => 'Kategorija je uspješno izbrisana.', + ], -); +]; diff --git a/resources/lang/hr/admin/categories/table.php b/resources/lang/hr/admin/categories/table.php index de6575477b..ebd755411a 100644 --- a/resources/lang/hr/admin/categories/table.php +++ b/resources/lang/hr/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'iskaznica', 'parent' => 'Roditelj', 'require_acceptance' => 'Prihvaćanje', 'title' => 'Naziv kategorije imovine', -); +]; diff --git a/resources/lang/hr/admin/companies/general.php b/resources/lang/hr/admin/companies/general.php index 0bba47e4ed..cd2d04186f 100644 --- a/resources/lang/hr/admin/companies/general.php +++ b/resources/lang/hr/admin/companies/general.php @@ -1,4 +1,5 @@ 'Odaberite tvrtku', ]; diff --git a/resources/lang/hr/admin/companies/message.php b/resources/lang/hr/admin/companies/message.php index 33175fe6e5..54feab6740 100644 --- a/resources/lang/hr/admin/companies/message.php +++ b/resources/lang/hr/admin/companies/message.php @@ -1,18 +1,19 @@ 'Tvrtka ne postoji.', 'assoc_users' => 'Tvrtka je trenutno povezana s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da se više ne referiraju na tu tvrtku i pokušajte ponovno.', - 'create' => array( + 'create' => [ 'error' => 'Tvrtka nije izrađena, pokušajte ponovo.', - 'success' => 'Tvrtka je uspješno stvorena.' - ), - 'update' => array( + 'success' => 'Tvrtka je uspješno stvorena.', + ], + 'update' => [ 'error' => 'Tvrtka nije ažurirana, pokušajte ponovo', - 'success' => 'Tvrtka je uspješno ažurirana.' - ), - 'delete' => array( + 'success' => 'Tvrtka je uspješno ažurirana.', + ], + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu tvrtku?', 'error' => 'Došlo je do problema s brisanjem tvrtke. Molim te pokušaj ponovno.', - 'success' => 'Tvrtka je uspješno izbrisana.' - ) -); + 'success' => 'Tvrtka je uspješno izbrisana.', + ], +]; diff --git a/resources/lang/hr/admin/companies/table.php b/resources/lang/hr/admin/companies/table.php index d9b67f44b1..747cfd2afe 100644 --- a/resources/lang/hr/admin/companies/table.php +++ b/resources/lang/hr/admin/companies/table.php @@ -1,9 +1,10 @@ 'Tvrtke', 'create' => 'Stvorite tvrtku', 'title' => 'Društvo', 'update' => 'Ažuriraj tvrtku', 'name' => 'Naziv tvrtke', 'id' => 'iskaznica', -); +]; diff --git a/resources/lang/hr/admin/components/general.php b/resources/lang/hr/admin/components/general.php index ddcfa760f5..4390fd2379 100644 --- a/resources/lang/hr/admin/components/general.php +++ b/resources/lang/hr/admin/components/general.php @@ -1,6 +1,6 @@ 'Naziv komponente', 'checkin' => 'Komponenta za provjeru', 'checkout' => 'Komponenta za provjeru', @@ -12,4 +12,4 @@ return array( 'remaining' => 'ostali', 'total' => 'ukupno', 'update' => 'Ažuriraj komponentu', -); +]; diff --git a/resources/lang/hr/admin/components/message.php b/resources/lang/hr/admin/components/message.php index a687bec21b..53479071e3 100644 --- a/resources/lang/hr/admin/components/message.php +++ b/resources/lang/hr/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenta ne postoji.', - 'create' => array( + 'create' => [ 'error' => 'Komponenta nije izrađena, pokušajte ponovo.', - 'success' => 'Komponenta je uspješno izrađena.' - ), + 'success' => 'Komponenta je uspješno izrađena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenta nije ažurirana, pokušajte ponovo', - 'success' => 'Komponenta je uspješno ažurirana.' - ), + 'success' => 'Komponenta je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu komponentu?', 'error' => 'Došlo je do problema s brisanjem komponente. Molim te pokušaj ponovno.', - 'success' => 'Komponenta je uspješno izbrisana.' - ), + 'success' => 'Komponenta je uspješno izbrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponenta nije provjerena, pokušajte ponovo', 'success' => 'Komponenta je uspješno provjerena.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ), + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenta nije prijavljena, pokušajte ponovo', 'success' => 'Komponenta je uspješno prijavljena.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ) + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - -); +]; diff --git a/resources/lang/hr/admin/components/table.php b/resources/lang/hr/admin/components/table.php index ce4c5edb94..544ba7538a 100644 --- a/resources/lang/hr/admin/components/table.php +++ b/resources/lang/hr/admin/components/table.php @@ -1,5 +1,5 @@ 'Naziv komponente', -); +]; diff --git a/resources/lang/hr/admin/consumables/general.php b/resources/lang/hr/admin/consumables/general.php index d69d9c3cba..5e7abc25c4 100644 --- a/resources/lang/hr/admin/consumables/general.php +++ b/resources/lang/hr/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Naplata potrošnog za korisnika', 'consumable_name' => 'Potrošni naziv', 'create' => 'Napravite potrošni', @@ -8,4 +8,4 @@ return array( 'remaining' => 'ostali', 'total' => 'ukupno', 'update' => 'Ažuriraj potrošnju', -); +]; diff --git a/resources/lang/hr/admin/consumables/message.php b/resources/lang/hr/admin/consumables/message.php index a0420ff270..ffdcc94c2f 100644 --- a/resources/lang/hr/admin/consumables/message.php +++ b/resources/lang/hr/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Potrošnja ne postoji.', - 'create' => array( + 'create' => [ 'error' => 'Potrošnja nije izrađena, pokušajte ponovo.', - 'success' => 'Potrošnja je uspješno stvorena.' - ), + 'success' => 'Potrošnja je uspješno stvorena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Potrošnja nije ažurirana, pokušajte ponovo', - 'success' => 'Potrošni proizvodi su uspješno ažurirani.' - ), + 'success' => 'Potrošni proizvodi su uspješno ažurirani.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj potrošni materijal?', 'error' => 'Došlo je do problema s brisanjem potrošnog materijala. Molim te pokušaj ponovno.', - 'success' => 'Potrošni materijal je uspješno izbrisan.' - ), + 'success' => 'Potrošni materijal je uspješno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Potrošnja nije provjerena, pokušajte ponovo', 'success' => 'Isporuka potrošnog materijala uspješno je provjerena.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ), + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Potrošnja nije provjerena, pokušajte ponovo', 'success' => 'Potrošni materijal uspješno je provjeren.', - 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.' - ) + 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', + ], - -); +]; diff --git a/resources/lang/hr/admin/consumables/table.php b/resources/lang/hr/admin/consumables/table.php index 9634eb3505..e92de0f124 100644 --- a/resources/lang/hr/admin/consumables/table.php +++ b/resources/lang/hr/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Potrošni naziv', -); +]; diff --git a/resources/lang/hr/admin/custom_fields/general.php b/resources/lang/hr/admin/custom_fields/general.php index 0eda1a82bc..60fb242e13 100644 --- a/resources/lang/hr/admin/custom_fields/general.php +++ b/resources/lang/hr/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Prilagođena polja', 'field' => 'Polje', 'about_fieldsets_title' => 'O karticama Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Novi prilagođeni polje', 'value_encrypted' => 'Vrijednost ovog polja je šifrirana u bazi podataka. Samo administratori administratora moći će vidjeti dešifriranu vrijednost', 'show_in_email' => 'Prikazati vrijednost ovog polja u checkout e-mailovima koji se šalju korisnicima? Enkriptirana polja se ne mogu prikazati u e-mailovima.', -); +]; diff --git a/resources/lang/hr/admin/custom_fields/message.php b/resources/lang/hr/admin/custom_fields/message.php index 69f4a3777e..d0061d09d8 100644 --- a/resources/lang/hr/admin/custom_fields/message.php +++ b/resources/lang/hr/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'To polje ne postoji.', 'already_added' => 'Polje je već dodano', - 'create' => array( + 'create' => [ 'error' => 'Polje nije izrađeno, pokušajte ponovo.', 'success' => 'Polje je uspješno izrađeno.', - 'assoc_success' => 'Polje je uspješno dodano u fieldset.' - ), + 'assoc_success' => 'Polje je uspješno dodano u fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Polje nije ažurirano, pokušajte ponovo', - 'success' => 'Polje je uspješno ažurirano.' - ), + 'success' => 'Polje je uspješno ažurirano.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovo polje?', 'error' => 'Došlo je do problema s brisanjem polja. Molim te pokušaj ponovno.', 'success' => 'Polje je uspješno obrisano.', 'in_use' => 'Polje je još u upotrebi.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset ne postoji', - 'create' => array( + 'create' => [ 'error' => 'Fieldset nije izrađen, pokušajte ponovo.', - 'success' => 'Fieldset je uspješno izrađen.' - ), + 'success' => 'Fieldset je uspješno izrađen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset nije ažuriran, pokušajte ponovo', - 'success' => 'Fieldset je uspješno ažuriran.' - ), + 'success' => 'Fieldset je uspješno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu grupu polja?', 'error' => 'Došlo je do problema s brisanjem fieldseta. Molim te pokušaj ponovno.', 'success' => 'Fieldset je uspješno izbrisan.', 'in_use' => 'Fieldset je još uvijek u upotrebi.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/hr/admin/departments/message.php b/resources/lang/hr/admin/departments/message.php index f436920cfa..c775be74f4 100644 --- a/resources/lang/hr/admin/departments/message.php +++ b/resources/lang/hr/admin/departments/message.php @@ -1,21 +1,21 @@ 'Odjel ne postoji.', 'assoc_users' => 'Ovaj je odjel trenutačno povezan s barem jednim korisnikom i ne može se izbrisati. Ažurirajte svoje korisnike da više ne referiraju ovaj odjeljak i pokušajte ponovo.', - 'create' => array( + 'create' => [ 'error' => 'Odjel nije izrađen, pokušajte ponovo.', - 'success' => 'Odjel je uspješno izrađen.' - ), - 'update' => array( + 'success' => 'Odjel je uspješno izrađen.', + ], + 'update' => [ 'error' => 'Odjel nije ažuriran, pokušajte ponovo', - 'success' => 'Odjel je uspješno ažuriran.' - ), - 'delete' => array( + 'success' => 'Odjel je uspješno ažuriran.', + ], + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati taj odjel?', 'error' => 'Došlo je do problema s brisanjem odjela. Molim te pokušaj ponovno.', - 'success' => 'Odjel je uspješno izbrisan.' - ) + 'success' => 'Odjel je uspješno izbrisan.', + ], -); +]; diff --git a/resources/lang/hr/admin/departments/table.php b/resources/lang/hr/admin/departments/table.php index a8c218e4dc..ecc2294ef5 100644 --- a/resources/lang/hr/admin/departments/table.php +++ b/resources/lang/hr/admin/departments/table.php @@ -1,6 +1,6 @@ 'iskaznica', 'name' => 'Naziv odjela', @@ -8,4 +8,4 @@ return array( 'location' => 'Mjesto', 'create' => 'Izradi odjel', 'update' => 'Odjel za ažuriranje', - ); + ]; diff --git a/resources/lang/hr/admin/depreciations/general.php b/resources/lang/hr/admin/depreciations/general.php index be9c5019a8..95c38f0a13 100644 --- a/resources/lang/hr/admin/depreciations/general.php +++ b/resources/lang/hr/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'O amortizacijama imovine', 'about_depreciations' => 'Možete postaviti amortizaciju imovine za amortizaciju imovine na temelju linearne amortizacije.', 'asset_depreciations' => 'Deprecijacija imovine', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Broj mjeseci', 'update' => 'Ažuriraj amortizaciju', -); +]; diff --git a/resources/lang/hr/admin/depreciations/message.php b/resources/lang/hr/admin/depreciations/message.php index a17e5b83ad..8a4573d52b 100644 --- a/resources/lang/hr/admin/depreciations/message.php +++ b/resources/lang/hr/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Klasa amortizacije ne postoji.', 'assoc_users' => 'Ta je amortizacija trenutno povezana s jednim ili više modela i ne može se izbrisati. Izbrišite modele i pokušajte ponovno izbrisati.', - - 'create' => array( + 'create' => [ 'error' => 'Klasa amortizacije nije izrađena, pokušajte ponovo. :(', - 'success' => 'Klasa amortizacije uspješno je stvorena. :)' - ), + 'success' => 'Klasa amortizacije uspješno je stvorena. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Klasa amortizacije nije ažurirana, pokušajte ponovo', - 'success' => 'Klasa amortizacije uspješno je ažurirana.' - ), + 'success' => 'Klasa amortizacije uspješno je ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu klasu amortizacije?', 'error' => 'Došlo je do problema s brisanjem klase amortizacije. Molim te pokušaj ponovno.', - 'success' => 'Klasa amortizacije uspješno je izbrisana.' - ) + 'success' => 'Klasa amortizacije uspješno je izbrisana.', + ], -); +]; diff --git a/resources/lang/hr/admin/depreciations/table.php b/resources/lang/hr/admin/depreciations/table.php index 5ae73dc3e6..ef8a97bfe0 100644 --- a/resources/lang/hr/admin/depreciations/table.php +++ b/resources/lang/hr/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'iskaznica', 'months' => 'mjeseci', 'term' => 'Termin', 'title' => 'Ime', -); +]; diff --git a/resources/lang/hr/admin/groups/message.php b/resources/lang/hr/admin/groups/message.php index a4ada9dcf0..b9da851e31 100644 --- a/resources/lang/hr/admin/groups/message.php +++ b/resources/lang/hr/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grupa već postoji!', 'group_not_found' => 'Grupa [: id] ne postoji.', 'group_name_required' => 'Polje naziva je obavezno', - 'success' => array( + 'success' => [ 'create' => 'Grupa je uspješno stvorena.', 'update' => 'Grupa je uspješno ažurirana.', 'delete' => 'Grupa je uspješno izbrisana.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu grupu?', 'create' => 'Došlo je do problema u stvaranju grupe. Molim te pokušaj ponovno.', 'update' => 'Došlo je do problema s ažuriranjem grupe. Molim te pokušaj ponovno.', 'delete' => 'Došlo je do problema s brisanjem grupe. Molim te pokušaj ponovno.', - ), + ], -); +]; diff --git a/resources/lang/hr/admin/groups/table.php b/resources/lang/hr/admin/groups/table.php index b19ab48fdb..00e9337205 100644 --- a/resources/lang/hr/admin/groups/table.php +++ b/resources/lang/hr/admin/groups/table.php @@ -1,9 +1,9 @@ 'Iskaznica', 'name' => 'Ime', 'users' => '# korisnika', -); +]; diff --git a/resources/lang/hr/admin/groups/titles.php b/resources/lang/hr/admin/groups/titles.php index 0e123478ae..821abc3f69 100644 --- a/resources/lang/hr/admin/groups/titles.php +++ b/resources/lang/hr/admin/groups/titles.php @@ -1,6 +1,6 @@ 'O grupama', 'about_groups' => 'Grupe se koriste za generaliziranje korisničkih dozvola.', 'group_management' => 'Upravljanje grupom', @@ -11,4 +11,4 @@ return array( 'allow' => 'dopustiti', 'deny' => 'poreći', -); +]; diff --git a/resources/lang/hr/admin/hardware/form.php b/resources/lang/hr/admin/hardware/form.php index af2fb7e260..bd8ab7f1f6 100644 --- a/resources/lang/hr/admin/hardware/form.php +++ b/resources/lang/hr/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Potvrda opcije brisanja brisanja', +return [ + 'bulk_delete' => 'Potvrda opcije brisanja brisanja', 'bulk_delete_help' => 'U nastavku pregledajte materijale za skupnu brisanje. Nakon što se izbrisati, ta se sredstva mogu vratiti, ali više neće biti povezana s korisnicima kojima su trenutačno dodijeljeni.', 'bulk_delete_warn' => 'Izbrisat ćete: asset_count assets.', - 'bulk_update' => 'Skupna aktivacija ažuriranja', - 'bulk_update_help' => 'Ovaj vam obrazac omogućuje ažuriranje više imovine odjednom. Popunite polja koja su vam potrebna za promjenu. Sva polja koja su ostala prazna ostat će nepromijenjena.', - 'bulk_update_warn' => 'Namjeravate urediti svojstva: imovine asset_count.', + 'bulk_update' => 'Skupna aktivacija ažuriranja', + 'bulk_update_help' => 'Ovaj vam obrazac omogućuje ažuriranje više imovine odjednom. Popunite polja koja su vam potrebna za promjenu. Sva polja koja su ostala prazna ostat će nepromijenjena.', + 'bulk_update_warn' => 'Namjeravate urediti svojstva: imovine asset_count.', 'checkedout_to' => 'Provjereno', 'checkout_date' => 'Datum kupnje', 'checkin_date' => 'Datum čekanja', @@ -38,7 +38,6 @@ return array( 'tag' => 'Oznaka imovine', 'update' => 'Ažuriranje aktiva', 'warranty' => 'garancija', - 'warranty_expires' => 'Jamstvo istječe', + 'warranty_expires' => 'Jamstvo istječe', 'years' => 'godina', -) -; +]; diff --git a/resources/lang/hr/admin/hardware/general.php b/resources/lang/hr/admin/hardware/general.php index 6ec15bc376..6829370964 100644 --- a/resources/lang/hr/admin/hardware/general.php +++ b/resources/lang/hr/admin/hardware/general.php @@ -1,9 +1,9 @@ 'O imovini', 'about_assets_text' => 'Imovina je stavka koja se prati serijskim brojem ili oznakom imovine. Oni imaju tendenciju da se stavke više vrijednosti gdje je identificiranje određenog predmeta pitanjima.', - 'archived' => 'Arhivirano', + 'archived' => 'Arhivirano', 'asset' => 'Imovina', 'bulk_checkout' => 'Provjera imovine', 'checkin' => 'Provjera imovine', @@ -19,4 +19,4 @@ return array( 'pending' => 'U tijeku', 'undeployable' => 'Undeployable', 'view' => 'Prikaz opcije Asset', -); +]; diff --git a/resources/lang/hr/admin/hardware/message.php b/resources/lang/hr/admin/hardware/message.php index 7da3fbe3d9..50b114acfb 100644 --- a/resources/lang/hr/admin/hardware/message.php +++ b/resources/lang/hr/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Upozorenje: Ova je snimka označena kao trenutno nedjeljiva. Ako se ovaj status promijenio, ažurirajte status aktive.', 'does_not_exist' => 'Imovina ne postoji.', 'does_not_exist_or_not_requestable' => 'Dobar pokušaj. Ta imovina ne postoji ili nije potrebna.', 'assoc_users' => 'Ovaj je entitet trenutno provjeren korisniku i ne može se izbrisati. Najprije provjerite snimljeni materijal, a zatim pokušajte ponovo ukloniti.', - 'create' => array( + 'create' => [ 'error' => 'Imovina nije izrađena, pokušajte ponovo. :(', - 'success' => 'Imovina je uspješno izrađena. :)' - ), + 'success' => 'Imovina je uspješno izrađena. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Imovina nije ažurirana, pokušajte ponovo', 'success' => 'Imovina je uspješno ažurirana.', 'nothing_updated' => 'Nije odabrano nijedno polje, tako da ništa nije ažurirano.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Imovina nije obnovljena, pokušajte ponovo', - 'success' => 'Imovina je uspješno obnovljena.' - ), + 'success' => 'Imovina je uspješno obnovljena.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Revizija imovine nije uspjela. Molim te pokušaj ponovno.', - 'success' => 'Uspjeh uspješno prijavljen.' - ), + 'success' => 'Uspjeh uspješno prijavljen.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka nije izbrisana. Molim te pokušaj ponovno.', 'success' => 'Datoteka je uspješno obrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteke nisu prenesene. Molim te pokušaj ponovno.', 'success' => 'Datoteke su uspješno učitane.', 'nofiles' => 'Niste odabrali nijednu datoteku za prijenos ili je datoteka koju pokušavate prenijeti prevelika', 'invalidfiles' => 'Jedna ili više datoteka je prevelika ili je vrsta datoteke koja nije dopuštena. Dopuštene vrste datoteka su png, gif, jpg, doc, docx, pdf i txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Neke stavke nisu pravilno uvezene.', 'errorDetail' => 'Sljedeće stavke nisu uvezene zbog pogrešaka.', - 'success' => "Vaša je datoteka uvezena", - 'file_delete_success' => "Vaša je datoteka uspješno izbrisana", - 'file_delete_error' => "Datoteka nije mogla biti izbrisana", - ), + 'success' => 'Vaša je datoteka uvezena', + 'file_delete_success' => 'Vaša je datoteka uspješno izbrisana', + 'file_delete_error' => 'Datoteka nije mogla biti izbrisana', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj materijal?', 'error' => 'Došlo je do problema s brisanjem imovine. Molim te pokušaj ponovno.', 'nothing_updated' => 'Nijedna imovina nije odabrana, tako da ništa nije izbrisano.', - 'success' => 'Imovina je uspješno obrisana.' - ), + 'success' => 'Imovina je uspješno obrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Imovina nije odjavljena, pokušajte ponovo', 'success' => 'Asset je uspješno provjeren.', 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', 'not_available' => 'Taj materijal nije dostupan za naplatu!', - 'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa' - ), + 'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Prijava nije provjerena. Pokušajte ponovo', 'success' => 'Asset je uspješno prijavio.', 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.', 'already_checked_in' => 'Taj je entitet već prijavljen.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Imovina nije zatražena, pokušajte ponovo', 'success' => 'Imovina je uspješno zatražena.', - 'canceled' => 'Zahtjev za uplatu uspješno je otkazan' - ) + 'canceled' => 'Zahtjev za uplatu uspješno je otkazan', + ], -); +]; diff --git a/resources/lang/hr/admin/hardware/table.php b/resources/lang/hr/admin/hardware/table.php index f547609bf9..f316df3123 100644 --- a/resources/lang/hr/admin/hardware/table.php +++ b/resources/lang/hr/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Oznaka imovine', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Imovina', 'image' => 'Slika uređaja', 'days_without_acceptance' => 'Dani bez prihvaćanja', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/hr/admin/kits/general.php b/resources/lang/hr/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/hr/admin/kits/general.php +++ b/resources/lang/hr/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/hr/admin/licenses/form.php b/resources/lang/hr/admin/licenses/form.php index 9a4f85475a..49fe09ec3b 100644 --- a/resources/lang/hr/admin/licenses/form.php +++ b/resources/lang/hr/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Imovina', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licencirano na e-poštu', 'to_name' => 'Licencirano za ime', 'update' => 'Ažuriraj licencu', - 'checkout_help' => 'Morate provjeriti licencu na hardversku imovinu ili osobu. Možete odabrati oboje, ali vlasnik imovine mora odgovarati osobi kojoj provjeravate imovinu.' -); + 'checkout_help' => 'Morate provjeriti licencu na hardversku imovinu ili osobu. Možete odabrati oboje, ali vlasnik imovine mora odgovarati osobi kojoj provjeravate imovinu.', +]; diff --git a/resources/lang/hr/admin/licenses/general.php b/resources/lang/hr/admin/licenses/general.php index b7f844a7eb..1cfa6733dc 100644 --- a/resources/lang/hr/admin/licenses/general.php +++ b/resources/lang/hr/admin/licenses/general.php @@ -1,6 +1,6 @@ 'O licencama', 'about_licenses' => 'Licence se koriste za praćenje softvera. Imaju određeni broj mjesta koja se mogu provjeriti pojedincima', 'checkin' => 'Provjerite mjesto licence', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licence za softver', 'user' => 'Korisnik', 'view' => 'Pogledajte licencu', -); +]; diff --git a/resources/lang/hr/admin/licenses/message.php b/resources/lang/hr/admin/licenses/message.php index 81b47a868f..03681ae22a 100644 --- a/resources/lang/hr/admin/licenses/message.php +++ b/resources/lang/hr/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licenca ne postoji.', 'user_does_not_exist' => 'Korisnik ne postoji.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Morate odabrati neku vrstu imovine ili korisnika, ali ne oboje.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licenca nije izrađena, pokušajte ponovo.', - 'success' => 'Licenca je uspješno stvorena.' - ), + 'success' => 'Licenca je uspješno stvorena.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka nije izbrisana. Molim te pokušaj ponovno.', 'success' => 'Datoteka je uspješno obrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteke nisu prenesene. Molim te pokušaj ponovno.', 'success' => 'Datoteke su uspješno učitane.', 'nofiles' => 'Niste odabrali nijednu datoteku za prijenos ili je datoteka koju pokušavate prenijeti prevelika', 'invalidfiles' => 'Jedna ili više datoteka je prevelika ili je vrsta datoteke koja nije dopuštena. Dopuštene vrste datoteka su png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml i lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licenca nije ažurirana, pokušajte ponovo', - 'success' => 'Licenca je uspješno ažurirana.' - ), + 'success' => 'Licenca je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu licencu?', 'error' => 'Došlo je do problema s brisanjem licence. Molim te pokušaj ponovno.', - 'success' => 'Licenca je uspješno obrisana.' - ), + 'success' => 'Licenca je uspješno obrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Došlo je do problema prilikom provjere licence. Molim te pokušaj ponovno.', - 'success' => 'Licenca je uspješno provjerena' - ), + 'success' => 'Licenca je uspješno provjerena', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'U licenci se provjeravala problem. Molim te pokušaj ponovno.', - 'success' => 'Licenca je uspješno provjerena' - ), + 'success' => 'Licenca je uspješno provjerena', + ], -); +]; diff --git a/resources/lang/hr/admin/licenses/table.php b/resources/lang/hr/admin/licenses/table.php index a593efd17a..3a1a1b303c 100644 --- a/resources/lang/hr/admin/licenses/table.php +++ b/resources/lang/hr/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Dodijeljena', 'checkout' => 'In / Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serijski', 'title' => 'licenca', -); +]; diff --git a/resources/lang/hr/admin/locations/message.php b/resources/lang/hr/admin/locations/message.php index ded1508d53..396698a129 100644 --- a/resources/lang/hr/admin/locations/message.php +++ b/resources/lang/hr/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokacija ne postoji.', 'assoc_users' => 'Ta je lokacija trenutačno povezana s barem jednim korisnikom i ne može se izbrisati. Ažurirajte korisnike da više ne referiraju ovu lokaciju i pokušajte ponovno.', 'assoc_assets' => 'Ta je lokacija trenutačno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte svoju imovinu da više ne referira na tu lokaciju i pokušajte ponovno.', 'assoc_child_loc' => 'Ta je lokacija trenutačno roditelj najmanje jedne lokacije za djecu i ne može se izbrisati. Ažurirajte svoje lokacije da više ne referiraju ovu lokaciju i pokušajte ponovo.', - - 'create' => array( + 'create' => [ 'error' => 'Lokacija nije izrađena, pokušajte ponovo.', - 'success' => 'Lokacija je uspješno izrađena.' - ), + 'success' => 'Lokacija je uspješno izrađena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokacija nije ažurirana, pokušajte ponovo', - 'success' => 'Lokacija je uspješno ažurirana.' - ), + 'success' => 'Lokacija je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati tu lokaciju?', 'error' => 'Došlo je do problema s brisanjem lokacije. Molim te pokušaj ponovno.', - 'success' => 'Lokacija je uspješno obrisana.' - ) + 'success' => 'Lokacija je uspješno obrisana.', + ], -); +]; diff --git a/resources/lang/hr/admin/locations/table.php b/resources/lang/hr/admin/locations/table.php index 39535147f4..6a613aa223 100644 --- a/resources/lang/hr/admin/locations/table.php +++ b/resources/lang/hr/admin/locations/table.php @@ -1,6 +1,6 @@ 'O mjestima', 'about_locations' => 'Lokacije se upotrebljavaju za praćenje podataka o lokaciji korisnika, imovine i ostalih stavki', 'assets_rtd' => 'Imovina', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Roditelj', 'currency' => 'Valuta lokacije', 'ldap_ou' => 'LDAP pretraživanje OU', - ); + ]; diff --git a/resources/lang/hr/admin/manufacturers/message.php b/resources/lang/hr/admin/manufacturers/message.php index 5ea24c9ce3..daa7c9cf6c 100644 --- a/resources/lang/hr/admin/manufacturers/message.php +++ b/resources/lang/hr/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Proizvođač ne postoji.', 'assoc_users' => 'Ovaj je proizvođač trenutno povezan s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da više ne referiraju ovog proizvođača i pokušajte ponovno.', - 'create' => array( + 'create' => [ 'error' => 'Proizvođač nije izrađen, pokušajte ponovo.', - 'success' => 'Proizvođač je uspješno izrađen.' - ), + 'success' => 'Proizvođač je uspješno izrađen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proizvođač nije ažuriran, pokušajte ponovo', - 'success' => 'Proizvođač je uspješno ažuriran.' - ), + 'success' => 'Proizvođač je uspješno ažuriran.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Proizvođač nije obnovljen, molim pokušajte ponovo', - 'success' => 'Proizvođač je uspješno obnovljen.' - ), + 'success' => 'Proizvođač je uspješno obnovljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovog proizvođača?', 'error' => 'Došlo je do problema s brisanjem proizvođača. Molim te pokušaj ponovno.', - 'success' => 'Proizvođač je uspješno izbrisan.' - ) + 'success' => 'Proizvođač je uspješno izbrisan.', + ], -); +]; diff --git a/resources/lang/hr/admin/manufacturers/table.php b/resources/lang/hr/admin/manufacturers/table.php index b9041bd74c..1325d5bd26 100644 --- a/resources/lang/hr/admin/manufacturers/table.php +++ b/resources/lang/hr/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'O proizvođačima', 'about_manufacturers_text' => 'Proizvođači su tvrtke koje stvaraju vašu imovinu. Ovdje možete pohraniti važne informacije o kontaktima o podršci koja će se prikazati na vašim stranicama s pojedinostima o imovini.', 'asset_manufacturers' => 'Prodavači imovine', @@ -13,4 +13,4 @@ return array( 'update' => 'Ažuriraj proizvođača', 'url' => 'URL', -); +]; diff --git a/resources/lang/hr/admin/models/general.php b/resources/lang/hr/admin/models/general.php index 52fb79a16c..93e487b8c9 100644 --- a/resources/lang/hr/admin/models/general.php +++ b/resources/lang/hr/admin/models/general.php @@ -1,6 +1,6 @@ 'O modelu imovine', 'about_models_text' => 'Modeli imovine su način grupiranja identične imovine. "MBP 2013", "IPhone 6s" itd.', 'deleted' => 'Ovaj je model izbrisan. Kliknite ovdje da biste ga vratili.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Izbrisati ćete :model_count model(a) imovine.', 'restore' => 'Vraćanje modela', 'requestable' => 'Korisnici mogu zatražiti ovaj model', - 'show_mac_address' => 'Prikaži polje MAC adrese u imovini ovog modela', + 'show_mac_address' => 'Prikaži polje MAC adrese u imovini ovog modela', 'view_deleted' => 'Prikaži izbrisano', 'view_models' => 'Pogledajte modele', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Nema prilagođenih polja', 'add_default_values' => 'Dodajte zadane vrijednosti', -); +]; diff --git a/resources/lang/hr/admin/models/message.php b/resources/lang/hr/admin/models/message.php index 6e3a15a2be..a88eddd849 100644 --- a/resources/lang/hr/admin/models/message.php +++ b/resources/lang/hr/admin/models/message.php @@ -1,42 +1,41 @@ 'Model ne postoji.', 'assoc_users' => 'Ovaj je model trenutno povezan s jednom ili više imovine i ne može se izbrisati. Izbrišite imovinu pa pokušajte ponovo ukloniti.', - - 'create' => array( + 'create' => [ 'error' => 'Model nije izrađen, pokušajte ponovo.', 'success' => 'Model je uspješno izrađen.', 'duplicate_set' => 'Model imovine s tim nazivom, proizvođačem i brojem modela već postoji.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model nije ažuriran, pokušajte ponovo', - 'success' => 'Model je uspješno ažuriran.' - ), + 'success' => 'Model je uspješno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj model sredstva?', 'error' => 'Došlo je do problema s brisanjem modela. Molim te pokušaj ponovno.', - 'success' => 'Model je uspješno izbrisan.' - ), + 'success' => 'Model je uspješno izbrisan.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model nije obnovljen, pokušajte ponovo', - 'success' => 'Model je uspješno obnovljen.' - ), + 'success' => 'Model je uspješno obnovljen.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nijedna polja nisu promijenjena, tako da ništa nije ažurirano.', - 'success' => 'Modeli su ažurirani.' - ), + 'success' => 'Modeli su ažurirani.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nijedan model nije odabran, tako da ništa nije izbrisano.', 'success' => ':success_count model(a) izbrisan(o)!', - 'success_partial' => ':success_count model(a) je izbrisano, no :fail_count nije bilo moguće izbrisati jer još uvijek imaju imovinu povezanu s njima.' - ), + 'success_partial' => ':success_count model(a) je izbrisano, no :fail_count nije bilo moguće izbrisati jer još uvijek imaju imovinu povezanu s njima.', + ], -); +]; diff --git a/resources/lang/hr/admin/models/table.php b/resources/lang/hr/admin/models/table.php index 97ab9555a5..340212abe5 100644 --- a/resources/lang/hr/admin/models/table.php +++ b/resources/lang/hr/admin/models/table.php @@ -1,6 +1,6 @@ 'Izradi model aktive', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Ažuriraj model aktive', 'clone' => 'Klon model', 'edit' => 'Uredi model', -); +]; diff --git a/resources/lang/hr/admin/reports/general.php b/resources/lang/hr/admin/reports/general.php index 5f5ac0d430..ccab13e859 100644 --- a/resources/lang/hr/admin/reports/general.php +++ b/resources/lang/hr/admin/reports/general.php @@ -1,5 +1,5 @@ 'Odaberite željene opcije za izvješće o imovini.' -); +return [ + 'info' => 'Odaberite željene opcije za izvješće o imovini.', +]; diff --git a/resources/lang/hr/admin/reports/message.php b/resources/lang/hr/admin/reports/message.php index 827fb0f52e..0b20d52624 100644 --- a/resources/lang/hr/admin/reports/message.php +++ b/resources/lang/hr/admin/reports/message.php @@ -1,5 +1,5 @@ 'Morate odabrati barem jednu opciju.' -); +return [ + 'error' => 'Morate odabrati barem jednu opciju.', +]; diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php index ecff18b8c2..e1cc39c161 100644 --- a/resources/lang/hr/admin/settings/general.php +++ b/resources/lang/hr/admin/settings/general.php @@ -1,12 +1,12 @@ 'Aktivni direktorij', 'ad_domain' => 'Domena Active Directory', 'ad_domain_help' => 'Ovo je ponekad isto kao i vaša domena e-pošte, ali ne uvijek.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Kopija e-pošte (CC)', 'admin_cc_email_help' => 'Ako želite poslati kopiju checkin/checkout poruka e-pošte koje se šalju korisnicima na dodatni račun e-pošte, unesite ga ovdje. U suprotnom ostavite ovo polje prazno.', 'is_ad' => 'Ovo je poslužitelj Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Prag prekoračenja upozorenja (u danima)', 'alert_inv_threshold' => 'Prag upozorenja inventara', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID atributi', 'audit_interval' => 'Interval revizije', 'audit_interval_help' => 'Ako morate redovito fizički provjeravati svoju imovinu, unesite interval u mjesecima.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Unesite dvoznamenkasti kôd', 'two_factor_config_complete' => 'Pošaljite šifru', 'two_factor_enabled_edit_not_allowed' => 'Vaš administrator vam ne dopušta uređivanje ove postavke.', - 'two_factor_enrollment_text' => "Potrebna je autentikacija dva faktora, međutim vaš uređaj još nije upisan. Otvorite aplikaciju Google autentifikator i skenirajte QR kôd u nastavku da biste registrirali svoj uređaj. Nakon što upišete uređaj, unesite kôd u nastavku", + 'two_factor_enrollment_text' => 'Potrebna je autentikacija dva faktora, međutim vaš uređaj još nije upisan. Otvorite aplikaciju Google autentifikator i skenirajte QR kôd u nastavku da biste registrirali svoj uređaj. Nakon što upišete uređaj, unesite kôd u nastavku', 'require_accept_signature' => 'Potražite potpis', 'require_accept_signature_help_text' => 'Ako omogućite tu značajku, korisnici će se morati fizički odjaviti pri prihvaćanju imovine.', 'left' => 'lijevo', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Uključivanje ovog checkbox-a će osigurati jedinstvenost serijskih brojeva imovine', 'zerofill_count' => 'Duljina oznaka za imovinu, uključujući nulte punjenje', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/hr/admin/settings/message.php b/resources/lang/hr/admin/settings/message.php index 60e1324480..c7da2c7abb 100644 --- a/resources/lang/hr/admin/settings/message.php +++ b/resources/lang/hr/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Došlo je do pogreške prilikom ažuriranja.', - 'success' => 'Postavke su uspješno ažurirane.' - ), - 'backup' => array( + 'success' => 'Postavke su uspješno ažurirane.', + ], + 'backup' => [ 'delete_confirm' => 'Jeste li sigurni da želite izbrisati tu sigurnosnu datoteku? Ta se radnja ne može poništiti.', 'file_deleted' => 'Sigurnosna kopija datoteke je uspješno izbrisana.', 'generated' => 'Nova sigurnosna kopija datoteke uspješno je stvorena.', 'file_not_found' => 'Ta se sigurnosna kopija datoteke nije mogla pronaći na poslužitelju.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Došlo je do pogreške prilikom čišćenja.', 'validation_failed' => 'Vaša potvrda o čišćenju nije točna. Upišite riječ "DELETE" u okvir potvrde.', - 'success' => 'Izbrisana su evidencija uspješno očišćena.' - ), + 'success' => 'Izbrisana su evidencija uspješno očišćena.', + ], -); +]; diff --git a/resources/lang/hr/admin/statuslabels/message.php b/resources/lang/hr/admin/statuslabels/message.php index 320bdafa56..08b281dbcd 100644 --- a/resources/lang/hr/admin/statuslabels/message.php +++ b/resources/lang/hr/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Oznaka statusa ne postoji.', 'assoc_assets' => 'Ova Statusna oznaka trenutačno je povezana s barem jednom Assetom i ne može se izbrisati. Ažurirajte svoju aktivu da više ne referira na taj status i pokušajte ponovo.', - - 'create' => array( + 'create' => [ 'error' => 'Oznaka statusa nije izrađena, pokušajte ponovo.', - 'success' => 'Oznaka statusa uspješno je izrađena.' - ), + 'success' => 'Oznaka statusa uspješno je izrađena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Oznaka statusa nije ažurirana, pokušajte ponovo', - 'success' => 'Oznaka statusa uspješno je ažurirana.' - ), + 'success' => 'Oznaka statusa uspješno je ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu oznaku statusa?', 'error' => 'Došlo je do problema s brisanjem oznake stanja. Molim te pokušaj ponovno.', - 'success' => 'Oznaka statusa uspješno je izbrisana.' - ), + 'success' => 'Oznaka statusa uspješno je izbrisana.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ova se imovina ne može dodijeliti nikome.', 'deployable' => 'Ova se imovina može provjeriti. Nakon dodjeljivanja, oni će preuzeti meta status Deployed.', 'archived' => 'Ove se imovine ne može izbrisati, a prikazat će se samo u arhiviranom vlasničkom pregledu. To je korisno za zadržavanje informacija o imovini za proračunsko / povijesne svrhe, ali ih ne bi smjelo ostati iz dnevnog popisa imovine.', 'pending' => 'Ovu imovinu još se ne može dodijeliti nikome, često se koristi za predmete koji se vraćaju na popravak, ali se očekuje povratak u promet.', - ), + ], -); +]; diff --git a/resources/lang/hr/admin/statuslabels/table.php b/resources/lang/hr/admin/statuslabels/table.php index 57d2f34fd8..2a4fdac9d1 100644 --- a/resources/lang/hr/admin/statuslabels/table.php +++ b/resources/lang/hr/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'O oznakama statusa', 'archived' => 'Arhivirano', 'create' => 'Stvaranje oznake statusa', @@ -16,4 +16,4 @@ return array( 'title' => 'Oznake statusa', 'undeployable' => 'Undeployable', 'update' => 'Ažuriranje oznake statusa', -); +]; diff --git a/resources/lang/hr/admin/suppliers/message.php b/resources/lang/hr/admin/suppliers/message.php index 1ceb394456..7e0f70c481 100644 --- a/resources/lang/hr/admin/suppliers/message.php +++ b/resources/lang/hr/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Dobavljač ne postoji.', - - 'create' => array( + 'create' => [ 'error' => 'Dobavljač nije izrađen, pokušajte ponovo.', - 'success' => 'Dobavljač je uspješno izrađen.' - ), + 'success' => 'Dobavljač je uspješno izrađen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dobavljač nije ažuriran, pokušajte ponovo', - 'success' => 'Dobavljač je uspješno ažuriran.' - ), + 'success' => 'Dobavljač je uspješno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovog dobavljača?', 'error' => 'Došlo je do problema s brisanjem dobavljača. Molim te pokušaj ponovno.', 'success' => 'Dobavljač je uspješno izbrisan.', 'assoc_assets' => 'Ovaj dobavljač je trenutno povezan sa :asset_count komadom/a imovine i ne može se izbrisati. Molimo ažurirajte imovinu tako da više ne bude povezana sa ovim dobavljačem i pokušajte ponovo. ', 'assoc_licenses' => 'Ovaj dobavljač je trenutno povezan sa :licenses_count licencom/ama i ne može se izbrisati. Molimo ažurirajte licence tako da više ne budu povezane sa ovim dobavljačem i pokušajte ponovo. ', 'assoc_maintenances' => 'Ovaj dobavljač je trenutno povezan sa :asset_maintenences_count slučajem/evima održavanja imovine i ne može se izbrisati. Molimo ažurirajte slučajeve održavanja imovine tako da više ne budu povezani sa ovim dobavljačem i pokušajte ponovo. ', - ) + ], -); +]; diff --git a/resources/lang/hr/admin/suppliers/table.php b/resources/lang/hr/admin/suppliers/table.php index 1b1f0414d0..a7881479bf 100644 --- a/resources/lang/hr/admin/suppliers/table.php +++ b/resources/lang/hr/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'O Dobavljačima', 'about_suppliers_text' => 'Dobavljači se koriste za praćenje izvora predmeta', 'address' => 'Adresa dobavljača', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Prikaži opcije za', 'zip' => 'Poštanski broj', -); +]; diff --git a/resources/lang/hr/admin/users/general.php b/resources/lang/hr/admin/users/general.php index ee95a1e3d3..7459d7e6e3 100644 --- a/resources/lang/hr/admin/users/general.php +++ b/resources/lang/hr/admin/users/general.php @@ -1,7 +1,6 @@ 'Ovaj korisnik se može prijaviti', 'activated_disabled_help_text' => 'Ne možete mijenjati status aktivacije za svoj vlastiti račun.', 'assets_user' => 'Imovina dodijeljena za: ime', @@ -13,7 +12,7 @@ return array( 'edit' => 'Uređivanje korisnika', 'filetype_info' => 'Dopuštene vrste datoteka su png, gif, jpg, jpeg, doc, docx, pdf, txt, zip i rar.', 'history_user' => 'Povijest za: ime', - 'info' => 'Informacije', + 'info' => 'Informacije', 'restore_user' => 'Kliknite ovdje da biste ih vratili.', 'last_login' => 'Zadnja prijava', 'ldap_config_text' => 'Postavke LDAP konfiguracije mogu se pronaći u Administrator> Postavke. Odabrana lokacija (opcionalno) bit će postavljena za sve uvezene korisnike.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Vaše trenutačne postavke administracije omogućuju selektivnu provedbu autentikacije dvogritera.', 'two_factor_enrolled' => '2FA uređaj upisan', 'two_factor_active' => '2FA aktivno', - ); + ]; diff --git a/resources/lang/hr/admin/users/message.php b/resources/lang/hr/admin/users/message.php index c5d093ba55..640a2b7874 100644 --- a/resources/lang/hr/admin/users/message.php +++ b/resources/lang/hr/admin/users/message.php @@ -1,6 +1,6 @@ 'Uspješno ste prihvatili ovaj materijal.', 'declined' => 'Uspješno ste odbili ovaj materijal.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integracija nije konfigurirana za ovu instalaciju.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Korisnik je uspješno izrađen.', 'update' => 'Korisnik je uspješno ažuriran.', 'update_bulk' => 'Korisnici su uspješno ažurirani!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Korisnik je uspješno suspendiran.', 'restored' => 'Korisnik je uspješno obnovljen.', 'import' => 'Korisnici su uspješno uvezeni.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Pojavio se problem pri stvaranju korisnika. Molim te pokušaj ponovno.', 'update' => 'Došlo je do problema s ažuriranjem korisnika. Molim te pokušaj ponovno.', 'delete' => 'Došlo je do problema s brisanjem korisnika. Molim te pokušaj ponovno.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nije moguće pretražiti LDAP poslužitelj. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci.
Preku s LDAP poslužitelja:', 'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti unose s LDAP poslužitelja. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci.
Preku s LDAP poslužitelja:', 'password_ldap' => 'Lozinku za ovaj račun upravlja LDAP / Active Directory. Obratite se IT odjelu za promjenu zaporke.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka nije izbrisana. Molim te pokušaj ponovno.', 'success' => 'Datoteka je uspješno obrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteke nisu prenesene. Molim te pokušaj ponovno.', 'success' => 'Datoteke su uspješno učitane.', 'nofiles' => 'Niste odabrali nijednu datoteku za prijenos', 'invalidfiles' => 'Jedna ili više datoteka je prevelika ili je vrsta datoteke koja nije dopuštena. Dopuštene vrste datoteka su png, gif, jpg, doc, docx, pdf i txt.', - ), + ], -); +]; diff --git a/resources/lang/hr/admin/users/table.php b/resources/lang/hr/admin/users/table.php index db3c15d6a8..f1006bd5f3 100644 --- a/resources/lang/hr/admin/users/table.php +++ b/resources/lang/hr/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktivan', 'allow' => 'dopustiti', 'checkedout' => 'Imovina', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Prikaži trenutne korisnike', 'show_deleted' => 'Prikaži izbrisane korisnike', 'title' => 'Titula', - 'to_restore_them' => 'vratiti ih.', + 'to_restore_them' => 'vratiti ih.', 'updateuser' => 'Ažuriranje korisnika', 'username' => 'Korisničko ime', - 'user_deleted_text' => 'Ovaj je korisnik označen kao izbrisan.', + 'user_deleted_text' => 'Ovaj je korisnik označen kao izbrisan.', 'username_note' => '(Ovo se upotrebljava samo za veze u sustavu Active Directory, a ne za prijavu.)', 'cloneuser' => 'Korisnik klona', 'viewusers' => 'Prikaži korisnike', -); +]; diff --git a/resources/lang/hr/auth/general.php b/resources/lang/hr/auth/general.php index 526f34ae8f..dbfe6915ba 100644 --- a/resources/lang/hr/auth/general.php +++ b/resources/lang/hr/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/hr/auth/message.php b/resources/lang/hr/auth/message.php index 6380626ac2..5b851aa29c 100644 --- a/resources/lang/hr/auth/message.php +++ b/resources/lang/hr/auth/message.php @@ -1,6 +1,6 @@ 'Račun s ovom e-porukom već postoji.', 'account_not_found' => 'Korisničko ime ili zaporka nisu točni.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ovaj je korisnički račun zabranjen.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Došlo je do problema prilikom pokušaja prijavljivanja, pokušajte ponovo.', 'success' => 'Uspješno ste se prijavili.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Došlo je do problema prilikom pokušaja izrade računa, pokušajte ponovo.', 'success' => 'Račun je uspješno izrađen.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Pojavio se problem prilikom pokušaja ponovnog unosa zaporke, pokušajte ponovo.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Pokušavao je poništiti zaporku, pokušajte ponovo.', 'success' => 'Vaša je lozinka uspješno vraćena.', - ), + ], - -); +]; diff --git a/resources/lang/hr/button.php b/resources/lang/hr/button.php index 839f1decc8..60bfbec39c 100644 --- a/resources/lang/hr/button.php +++ b/resources/lang/hr/button.php @@ -1,6 +1,6 @@ 'akcije', 'add' => 'Dodaj novi', 'cancel' => 'Otkazati', @@ -11,7 +11,7 @@ return array( 'request' => 'Zahtjev', 'submit' => 'podnijeti', 'upload' => 'Postavi', - 'select_file' => 'Odaberite datoteku ...', + 'select_file' => 'Odaberite datoteku ...', 'select_files' => 'Odaberite datoteke...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php index c9c499a323..964c9b5a16 100644 --- a/resources/lang/hr/general.php +++ b/resources/lang/hr/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Prijave', 'user_requests_count' => 'Zahtjevi', 'city' => 'Grad', - 'click_here' => 'Kliknite ovdje', + 'click_here' => 'Kliknite ovdje', 'clear_selection' => 'Očisti odabir', 'companies' => 'Tvrtke', 'company' => 'Društvo', 'component' => 'sastavni dio', 'components' => 'komponente', - 'complete' => 'potpun', + 'complete' => 'potpun', 'consumable' => 'potrošni', 'consumables' => 'Potrošni', 'country' => 'Zemlja', diff --git a/resources/lang/hr/help.php b/resources/lang/hr/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/hr/help.php +++ b/resources/lang/hr/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/hr/mail.php b/resources/lang/hr/mail.php index f38e0df788..cb36f653bc 100644 --- a/resources/lang/hr/mail.php +++ b/resources/lang/hr/mail.php @@ -1,6 +1,6 @@ 'Korisnik je otkazao zahtjev za stavkom na web mjestu', 'a_user_requested' => 'Korisnik je zatražio stavku na web mjestu', 'accessory_name' => 'Naziv dodatne opreme:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/hr/pagination.php b/resources/lang/hr/pagination.php index e2ceb371ee..565404778e 100644 --- a/resources/lang/hr/pagination.php +++ b/resources/lang/hr/pagination.php @@ -1,6 +1,6 @@ 'Sljedeća »', -); +]; diff --git a/resources/lang/hr/passwords.php b/resources/lang/hr/passwords.php index 0283facd51..684cf8d4b8 100644 --- a/resources/lang/hr/passwords.php +++ b/resources/lang/hr/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Veza lozinke je poslana!', 'user' => 'Nije pronađen niti jedan aktivni korisnik sa tim e-mailom.', ]; - diff --git a/resources/lang/hr/reminders.php b/resources/lang/hr/reminders.php index d0c15f75ef..a780389019 100644 --- a/resources/lang/hr/reminders.php +++ b/resources/lang/hr/reminders.php @@ -1,6 +1,6 @@ "Zaporke moraju imati šest znakova i odgovarati potvrdi.", + 'password' => 'Zaporke moraju imati šest znakova i odgovarati potvrdi.', - "user" => "Korisničko ime ili e-adresa nisu točni", + 'user' => 'Korisničko ime ili e-adresa nisu točni', - "token" => "Token za resetiranje lozinke nije valjan.", + 'token' => 'Token za resetiranje lozinke nije valjan.', - "sent" => "Ako je pronađena odgovarajuća adresa e-pošte, podsjetnik za lozinku je poslan!", + 'sent' => 'Ako je pronađena odgovarajuća adresa e-pošte, podsjetnik za lozinku je poslan!', -); +]; diff --git a/resources/lang/hr/table.php b/resources/lang/hr/table.php index cdff01e3ab..e59033181f 100644 --- a/resources/lang/hr/table.php +++ b/resources/lang/hr/table.php @@ -1,10 +1,10 @@ 'akcije', 'action' => 'Akcijski', 'by' => 'Po', 'item' => 'Artikal', -); +]; diff --git a/resources/lang/hr/validation.php b/resources/lang/hr/validation.php index e8c6e0131d..ee94d21299 100644 --- a/resources/lang/hr/validation.php +++ b/resources/lang/hr/validation.php @@ -1,6 +1,6 @@ 'The: atribut je već snimljen.', 'uploaded' => 'Atribut nije prenesen.', 'url' => 'Format atributa nije važeći.', - "unique_undeleted" => ":attribute mora biti jedinstven.", + 'unique_undeleted' => ':attribute mora biti jedinstven.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Polje atributa sadrži znak koji nije dopušten.", - "email_array" => "Jedna ili više adresa e-pošte nije važeća.", - "hashed_pass" => "Vaša trenutačna zaporka nije točna", + 'alpha_space' => 'Polje atributa sadrži znak koji nije dopušten.', + 'email_array' => 'Jedna ili više adresa e-pošte nije važeća.', + 'hashed_pass' => 'Vaša trenutačna zaporka nije točna', 'dumbpwd' => 'Ta je lozinka prečestna.', - "statuslabel_type" => "Morate odabrati valjanu vrstu oznake statusa", + 'statuslabel_type' => 'Morate odabrati valjanu vrstu oznake statusa', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/hu/admin/accessories/general.php b/resources/lang/hu/admin/accessories/general.php index 9b4e1888bf..4757a240c8 100644 --- a/resources/lang/hu/admin/accessories/general.php +++ b/resources/lang/hu/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Tartozék kategória', 'accessory_name' => 'Tartozék neve', 'checkout' => 'Kiadott tartozék', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Használja inkább az alapértelmezett EULA-t.', 'use_default_eula_disabled' => 'Használja inkább az alapértelmezett EULA-t. Nincs alapértelmezett EULA beállítva. Kérem adjon hozzá egyet a Beállításokban!', -); +]; diff --git a/resources/lang/hu/admin/accessories/message.php b/resources/lang/hu/admin/accessories/message.php index 0795e5dfa9..8c89235ca7 100644 --- a/resources/lang/hu/admin/accessories/message.php +++ b/resources/lang/hu/admin/accessories/message.php @@ -1,37 +1,36 @@ 'A tartozék [:id] nem létezik.', 'assoc_users' => 'Ebből a tartozékból jelenleg :count db van kiadva felhasználóknak. Kérem vegyen vissza tartozékot és próbálja újra! ', - 'create' => array( + 'create' => [ 'error' => 'A tartozék nem jött létre, kérem, próbálja újra!', - 'success' => 'A tartozék sikeresen létrejött.' - ), + 'success' => 'A tartozék sikeresen létrejött.', + ], - 'update' => array( + 'update' => [ 'error' => 'A tartozékot nem sikerült frissíteni, kérem, próbálja újra!', - 'success' => 'A tartozék sikeresen frissült.' - ), + 'success' => 'A tartozék sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni akarja ezt a tartozékot?', 'error' => 'A tartozék törlése közben probléma merült fel, kérjük, próbálja újra!', - 'success' => 'A tartozék sikeresen törlődött.' - ), + 'success' => 'A tartozék sikeresen törlődött.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'A tartozékot nem sikerült kiadni, kérem, próbálja újra!', 'success' => 'A tartozék sikeresen kiadva.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!' - ), + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'A tartozékot nem sikerült visszavenni, kérem, próbálja újra!', 'success' => 'A tartozék sikeresen visszavéve.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!' - ) + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!', + ], - -); +]; diff --git a/resources/lang/hu/admin/accessories/table.php b/resources/lang/hu/admin/accessories/table.php index 687a0d3b7d..a44f781a95 100644 --- a/resources/lang/hu/admin/accessories/table.php +++ b/resources/lang/hu/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV letöltése', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'CSV letöltése', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Elfogad', 'title' => 'Tartozék neve', - -); +]; diff --git a/resources/lang/hu/admin/asset_maintenances/form.php b/resources/lang/hu/admin/asset_maintenances/form.php index 991c1c3a30..b62170dcf0 100644 --- a/resources/lang/hu/admin/asset_maintenances/form.php +++ b/resources/lang/hu/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Napok', 'notes' => 'Megjegyzések', 'update' => 'Frissít', - 'create' => 'Létrehoz' + 'create' => 'Létrehoz', ]; diff --git a/resources/lang/hu/admin/asset_maintenances/message.php b/resources/lang/hu/admin/asset_maintenances/message.php index 4b6d2b9018..77a8db3a2b 100644 --- a/resources/lang/hu/admin/asset_maintenances/message.php +++ b/resources/lang/hu/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Biztosan törli ezt a z eszköz karbantartást?', 'error' => 'Volt egy kérés az eszköz karbantartás törlésére. Kérjük, próbálja meg újra.', - 'success' => 'Az eszköz karbantartás sikeresen törölve lett.' + 'success' => 'Az eszköz karbantartás sikeresen törölve lett.', ], 'create' => [ 'error' => 'Eszköz karbantartás nem jött létre, próbálja meg újra.', - 'success' => 'Eszköz karbantartás sikeresen létrejött.' + 'success' => 'Eszköz karbantartás sikeresen létrejött.', ], 'edit' => [ 'error' => 'Az Eszközkarbantartást nem szerkesztették, próbálkozzon újra.', - 'success' => 'Az Eszközkarbantartás sikeresen szerkesztett.' + 'success' => 'Az Eszközkarbantartás sikeresen szerkesztett.', ], 'asset_maintenance_incomplete' => 'Nincs kitöltve teljesen', 'warranty' => 'Garancia', 'not_warranty' => 'Nem garancia', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/hu/admin/asset_maintenances/table.php b/resources/lang/hu/admin/asset_maintenances/table.php index 304d2d9b9c..2269d5d862 100644 --- a/resources/lang/hu/admin/asset_maintenances/table.php +++ b/resources/lang/hu/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Eszköz karbantartások', 'asset_name' => 'Eszköz neve', 'is_warranty' => 'Garancia', - 'dl_csv' => 'CSV letöltése' + 'dl_csv' => 'CSV letöltése', ]; diff --git a/resources/lang/hu/admin/categories/general.php b/resources/lang/hu/admin/categories/general.php index eecd2c3d2a..9aeb221b9e 100644 --- a/resources/lang/hu/admin/categories/general.php +++ b/resources/lang/hu/admin/categories/general.php @@ -1,6 +1,6 @@ 'Eszköz kategóriák', 'category_name' => 'Kategória név', 'checkin_email' => 'E-mail küldése a felhasználónak, eszköz kiadás / visszavétel esetén.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Használja inkább az alapértelmezett EULA-t.', 'use_default_eula_disabled' => 'Használja inkább az alapértelmezett EULA-t. Nincs alapértelmezett EULA beállítva. Kérem adjon hozzá egyet a Beállításokban.', -); +]; diff --git a/resources/lang/hu/admin/categories/message.php b/resources/lang/hu/admin/categories/message.php index dd5774709d..1506d86caa 100644 --- a/resources/lang/hu/admin/categories/message.php +++ b/resources/lang/hu/admin/categories/message.php @@ -1,25 +1,25 @@ 'A kategória nem létezik.', 'assoc_models' => 'Ez a kategória jelenleg legalább egy modellhez kapcsolódik, és nem törölhető. Kérjük, frissítse a modelleket, hogy ne hivatkozzon erre a kategóriára, és próbálja újra.', 'assoc_items' => 'Ez a kategória jelenleg legalább egy: asset_type-hez van társítva, és nem törölhető. Kérjük, frissítse a: asset_type-t, hogy ne hivatkozzon erre a kategóriára és próbálja újra.', - 'create' => array( + 'create' => [ 'error' => 'Nem sikerült a kategória létrehozása, kérjük, próbálja újra.', - 'success' => 'Sikeresen létrehozta a kategóriát.' - ), + 'success' => 'Sikeresen létrehozta a kategóriát.', + ], - 'update' => array( + 'update' => [ 'error' => 'Nem sikerült a kategória módosítása, kérjük, próbálja újra', - 'success' => 'Sikeresen módosította a kategóriát.' - ), + 'success' => 'Sikeresen módosította a kategóriát.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztos benne, hogy törölni szeretné a kategóriát?', 'error' => 'A kategória törlése közben probléma merült fel, kérjük, próbálja újra.', - 'success' => 'Sikeresen törölte a kategóriát.' - ) + 'success' => 'Sikeresen törölte a kategóriát.', + ], -); +]; diff --git a/resources/lang/hu/admin/categories/table.php b/resources/lang/hu/admin/categories/table.php index b2ed76340e..713216cf4f 100644 --- a/resources/lang/hu/admin/categories/table.php +++ b/resources/lang/hu/admin/categories/table.php @@ -1,10 +1,10 @@ 'Végfelhasználói engedély', +return [ + 'eula_text' => 'Végfelhasználói engedély', 'id' => 'ID', 'parent' => 'Szülő', 'require_acceptance' => 'Elfogadás', 'title' => 'Eszköz-kategória neve', -); +]; diff --git a/resources/lang/hu/admin/companies/general.php b/resources/lang/hu/admin/companies/general.php index 893ba5b74f..9e2c659556 100644 --- a/resources/lang/hu/admin/companies/general.php +++ b/resources/lang/hu/admin/companies/general.php @@ -1,4 +1,5 @@ 'Vállalat kiválasztása', ]; diff --git a/resources/lang/hu/admin/companies/message.php b/resources/lang/hu/admin/companies/message.php index ddbe0e826a..00e1fab145 100644 --- a/resources/lang/hu/admin/companies/message.php +++ b/resources/lang/hu/admin/companies/message.php @@ -1,18 +1,19 @@ 'A vállalat nem létezik.', 'assoc_users' => 'Ez a vállalat jelenleg legalább egy modellel társítva van, így nem lehet törölni. Kérjük, frissítse a modellt úgy, hogy ne hivatkozzon erre a vállalatra, és próbálkozzon újra. ', - 'create' => array( + 'create' => [ 'error' => 'A vállalat nem jött létre, próbálkozz újra.', - 'success' => 'Vállalat sikeresen létrehozva.' - ), - 'update' => array( + 'success' => 'Vállalat sikeresen létrehozva.', + ], + 'update' => [ 'error' => 'A vállalat nem frissült, próbálkozz újra', - 'success' => 'A vállalat sikereresen frissítve.' - ), - 'delete' => array( + 'success' => 'A vállalat sikereresen frissítve.', + ], + 'delete' => [ 'confirm' => 'Biztosan törölni szeretnéd a vállalatot?', 'error' => 'Probléma támadt a vállalat törlésével. Próbálkozz újra.', - 'success' => 'A vállalat sikeresen törölve lett.' - ) -); + 'success' => 'A vállalat sikeresen törölve lett.', + ], +]; diff --git a/resources/lang/hu/admin/companies/table.php b/resources/lang/hu/admin/companies/table.php index 580327cc5c..cfc0c21553 100644 --- a/resources/lang/hu/admin/companies/table.php +++ b/resources/lang/hu/admin/companies/table.php @@ -1,9 +1,10 @@ 'Cégek', 'create' => 'Vállalat létrehozása', 'title' => 'Társág', 'update' => 'Társaság frissítése', 'name' => 'A cég neve', 'id' => 'ID', -); +]; diff --git a/resources/lang/hu/admin/components/general.php b/resources/lang/hu/admin/components/general.php index 0719ca75e3..3a793a55a8 100644 --- a/resources/lang/hu/admin/components/general.php +++ b/resources/lang/hu/admin/components/general.php @@ -1,6 +1,6 @@ 'Alkatrész név', 'checkin' => 'Visszavett alkatrész', 'checkout' => 'Kiadott Alkatrész', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Fennmaradó', 'total' => 'Összesen', 'update' => 'Alkatrész frissítés', -); +]; diff --git a/resources/lang/hu/admin/components/message.php b/resources/lang/hu/admin/components/message.php index 87dfdfb4fe..d6ec94f42c 100644 --- a/resources/lang/hu/admin/components/message.php +++ b/resources/lang/hu/admin/components/message.php @@ -1,36 +1,35 @@ 'Az alkatrész nem létezik.', - 'create' => array( + 'create' => [ 'error' => 'Összetevő nem jött létre, próbálkozz újra.', - 'success' => 'Az alkatrész sikeresen létrejött.' - ), + 'success' => 'Az alkatrész sikeresen létrejött.', + ], - 'update' => array( + 'update' => [ 'error' => 'Az alkatrész nem frissült, próbálkozz újra', - 'success' => 'Az alkatrész sikeresen létrejött.' - ), + 'success' => 'Az alkatrész sikeresen létrejött.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretnéd az alkatrészt?', 'error' => 'Probléma támadt a vállalat törlésével. Próbálkozz újra.', - 'success' => 'Az alkatrész sikeresen törlődött.' - ), + 'success' => 'Az alkatrész sikeresen törlődött.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Az alkatrész nem lett kiadva, próbálkozz újra', 'success' => 'Az alkatrész sikeresen kiadva.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.' - ), + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Az alkatrész nem lett visszavéve, próbálkozz újra', 'success' => 'Az alkatrész sikeresen visszavéve.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.' - ) + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.', + ], - -); +]; diff --git a/resources/lang/hu/admin/components/table.php b/resources/lang/hu/admin/components/table.php index 10897f9cf4..a7696e9ad4 100644 --- a/resources/lang/hu/admin/components/table.php +++ b/resources/lang/hu/admin/components/table.php @@ -1,5 +1,5 @@ 'Alkatrész név', -); +]; diff --git a/resources/lang/hu/admin/consumables/general.php b/resources/lang/hu/admin/consumables/general.php index db4dced03c..e68686eeea 100644 --- a/resources/lang/hu/admin/consumables/general.php +++ b/resources/lang/hu/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Felhasználónak szállítható', 'consumable_name' => 'Kellék Neve', 'create' => 'Kellék létrehozva', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Fennmaradó', 'total' => 'Összesen', 'update' => 'Kellék frissítése', -); +]; diff --git a/resources/lang/hu/admin/consumables/message.php b/resources/lang/hu/admin/consumables/message.php index 366b413f46..e848dc93c3 100644 --- a/resources/lang/hu/admin/consumables/message.php +++ b/resources/lang/hu/admin/consumables/message.php @@ -1,36 +1,35 @@ 'A fogyóeszköz nem létezik.', - 'create' => array( + 'create' => [ 'error' => 'A kellék nem jött létre, kérlek próbáld meg újra.', - 'success' => 'A Kellékek sikeresen létrejött.' - ), + 'success' => 'A Kellékek sikeresen létrejött.', + ], - 'update' => array( + 'update' => [ 'error' => 'A kellék nem frissült, kérlek próbáld meg újra', - 'success' => 'A Kellékek sikeresen frissítve.' - ), + 'success' => 'A Kellékek sikeresen frissítve.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törli ezt a kelléket?', 'error' => 'Probléma támadt a kellék törlésével. Próbálkozz újra.', - 'success' => 'A kellék sikeresen törölve lett.' - ), + 'success' => 'A kellék sikeresen törölve lett.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'A kellék nem lett kiadva, próbálkozz újra', 'success' => 'A kellék sikeresen kiadva.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.' - ), + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'A kellék nem lett visszavéve, próbálkozz újra', 'success' => 'A kellék sikeresen visszavéve.', - 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.' - ) + 'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra.', + ], - -); +]; diff --git a/resources/lang/hu/admin/consumables/table.php b/resources/lang/hu/admin/consumables/table.php index 0a907a0a16..8e62bd6492 100644 --- a/resources/lang/hu/admin/consumables/table.php +++ b/resources/lang/hu/admin/consumables/table.php @@ -1,5 +1,5 @@ 'A fogyóeszköz neve', -); +]; diff --git a/resources/lang/hu/admin/custom_fields/general.php b/resources/lang/hu/admin/custom_fields/general.php index 78b956e275..6c035853a2 100644 --- a/resources/lang/hu/admin/custom_fields/general.php +++ b/resources/lang/hu/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Egyéni mezők', 'field' => 'Mező', 'about_fieldsets_title' => 'A mezőcsoportokról', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Új egyéni mező', 'value_encrypted' => 'A mező értéke titkosítva van az adatbázisban. Csak az adminisztrátor felhasználók láthatják a dekódolt értéket', 'show_in_email' => 'Szerepeljen ez a mező az eszköz kiadásakor a felhasználónak küldött emailben? A titkosított mezők nem szerepelhetnek az emailekben.', -); +]; diff --git a/resources/lang/hu/admin/custom_fields/message.php b/resources/lang/hu/admin/custom_fields/message.php index c59ad4ed95..d509f9e695 100644 --- a/resources/lang/hu/admin/custom_fields/message.php +++ b/resources/lang/hu/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'A rekordmező nem létezik.', 'already_added' => 'Mező már hozzáadva', - 'create' => array( + 'create' => [ 'error' => 'A mező nem lett létrehozva, próbálkozz újra.', 'success' => 'Mező sikeresen létrehozva.', - 'assoc_success' => 'Mező sikeresen hozzáadva a mezőcsoporthoz.' - ), + 'assoc_success' => 'Mező sikeresen hozzáadva a mezőcsoporthoz.', + ], - 'update' => array( + 'update' => [ 'error' => 'A mező nem lett frissítve, próbálkozz újra', - 'success' => 'A mező sikeresen frissítve.' - ), + 'success' => 'A mező sikeresen frissítve.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt a mezőt?', 'error' => 'Egy probléma támadt a mező törlése közben. Próbálkozz újra.', 'success' => 'A mező sikeresen törölve.', 'in_use' => 'A mező még használatban van.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'A Fieldset nem létezik', - 'create' => array( + 'create' => [ 'error' => 'A mezőcsoport nem lett létrehozva, próbálkozz újra.', - 'success' => 'Mezőcsoport sikeresen létrehozva.' - ), + 'success' => 'Mezőcsoport sikeresen létrehozva.', + ], - 'update' => array( + 'update' => [ 'error' => 'A mezőcsoport nem lett frissítve, próbálkozz újra', - 'success' => 'A mezőcsoport sikeresen frissítve.' - ), + 'success' => 'A mezőcsoport sikeresen frissítve.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt a mezőcsoportot?', 'error' => 'Egy probléma támadt a mezőcsoport törlése közben. Próbálkozz újra.', 'success' => 'A mezőcsoport sikeresen törölve.', 'in_use' => 'A mezőcsoport még használatban van.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/hu/admin/departments/message.php b/resources/lang/hu/admin/departments/message.php index 33f337e4e9..9c1bfd8106 100644 --- a/resources/lang/hu/admin/departments/message.php +++ b/resources/lang/hu/admin/departments/message.php @@ -1,21 +1,21 @@ 'A tanszék nem létezik.', 'assoc_users' => 'Ez a részleg jelenleg társított legalább egy felhasználót, és nem lehet törölni. Kérjük, frissítse a felhasználókat, hogy ne hivatkozzanak az osztályon, és próbálja újra.', - 'create' => array( + 'create' => [ 'error' => 'Osztály nem jött létre, próbálkozzon újra.', - 'success' => 'Osztály sikeresen létrehozva.' - ), - 'update' => array( + 'success' => 'Osztály sikeresen létrehozva.', + ], + 'update' => [ 'error' => 'A tanszék nem frissült, próbálkozzon újra', - 'success' => 'Osztály sikeresen frissült.' - ), - 'delete' => array( + 'success' => 'Osztály sikeresen frissült.', + ], + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt az osztályt?', 'error' => 'Hiba történt a részleg törlésével. Kérlek próbáld újra.', - 'success' => 'Az osztály sikeresen törölve lett.' - ) + 'success' => 'Az osztály sikeresen törölve lett.', + ], -); +]; diff --git a/resources/lang/hu/admin/departments/table.php b/resources/lang/hu/admin/departments/table.php index ca55ecba07..c7f03647e4 100644 --- a/resources/lang/hu/admin/departments/table.php +++ b/resources/lang/hu/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Osztály neve', @@ -8,4 +8,4 @@ return array( 'location' => 'Helyszín', 'create' => 'Osztály létrehozása', 'update' => 'Osztály frissítése', - ); + ]; diff --git a/resources/lang/hu/admin/depreciations/general.php b/resources/lang/hu/admin/depreciations/general.php index 911792cb38..d20d51aca9 100644 --- a/resources/lang/hu/admin/depreciations/general.php +++ b/resources/lang/hu/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Eszköz értékcsökkentésekről', 'about_depreciations' => 'Beállíthat az eszközökhöz, eszköz alapú lineáris értékcsökkentést.', 'asset_depreciations' => 'Eszköz értékcsökkenések', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Hónapok száma', 'update' => 'Értékcsökkenés frissítése', -); +]; diff --git a/resources/lang/hu/admin/depreciations/message.php b/resources/lang/hu/admin/depreciations/message.php index e595535c9e..e6032220ea 100644 --- a/resources/lang/hu/admin/depreciations/message.php +++ b/resources/lang/hu/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Értékcsökkentétsi kategória nem létezik.', 'assoc_users' => 'Ez az értékcsökkenés jelenleg társított egy vagy több modellhez, és nem törölhető. Kérjük, törölje a modellek, és próbálja meg ismét. ', - - 'create' => array( + 'create' => [ 'error' => 'Értékcsökkenési osztály nem jött létre, próbálkozz újra. :(', - 'success' => 'Az értékcsökkenési osztály sikeresen létrehozva. :-)' - ), + 'success' => 'Az értékcsökkenési osztály sikeresen létrehozva. :-)', + ], - 'update' => array( + 'update' => [ 'error' => 'Az értékcsökkenési osztály nem frissült, próbálkozz újra', - 'success' => 'Az értékcsökkenési osztály sikeresen frissítve.' - ), + 'success' => 'Az értékcsökkenési osztály sikeresen frissítve.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztos benne, hogy törli az értékcsökkenési osztályt?', 'error' => 'Probléma támadt az értékcsökkenési osztály törlésével. Próbálkozz újra.', - 'success' => 'Az értékcsökkenési osztály sikeresen törölve.' - ) + 'success' => 'Az értékcsökkenési osztály sikeresen törölve.', + ], -); +]; diff --git a/resources/lang/hu/admin/depreciations/table.php b/resources/lang/hu/admin/depreciations/table.php index f745072cba..d8ed030ef3 100644 --- a/resources/lang/hu/admin/depreciations/table.php +++ b/resources/lang/hu/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Hónapok', 'term' => 'Időszak', 'title' => 'Név ', -); +]; diff --git a/resources/lang/hu/admin/groups/message.php b/resources/lang/hu/admin/groups/message.php index b5feb9a9fa..95d4c8157d 100644 --- a/resources/lang/hu/admin/groups/message.php +++ b/resources/lang/hu/admin/groups/message.php @@ -1,22 +1,22 @@ 'A csoport már létezik!', 'group_not_found' => '[:id] csoport nem létezik.', 'group_name_required' => 'A név mező kötelező', - 'success' => array( + 'success' => [ 'create' => 'A csoport sikeresen létrehozva.', 'update' => 'A csoport sikeresen frissítve.', 'delete' => 'A csoport sikeresen törölve.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretnéd ezt a csoportot?', 'create' => 'Egy probléma támadt a csoport létrehozása közben. Próbálkozz újra.', 'update' => 'Egy probléma támadt a csoport frissítése közben. Próbálkozz újra.', 'delete' => 'Egy probléma támadt a csoport törlése közben. Próbálkozz újra.', - ), + ], -); +]; diff --git a/resources/lang/hu/admin/groups/table.php b/resources/lang/hu/admin/groups/table.php index 0f56a348b4..7545ad3178 100644 --- a/resources/lang/hu/admin/groups/table.php +++ b/resources/lang/hu/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Név', 'users' => '# -i felhasználó', -); +]; diff --git a/resources/lang/hu/admin/groups/titles.php b/resources/lang/hu/admin/groups/titles.php index 9294cd21a6..0da4172b3b 100644 --- a/resources/lang/hu/admin/groups/titles.php +++ b/resources/lang/hu/admin/groups/titles.php @@ -1,6 +1,6 @@ 'A csoportokról', 'about_groups' => 'A csoportokat a felhasználói jogosultságok általánosítására használják.', 'group_management' => 'Csoport kezelés', @@ -11,4 +11,4 @@ return array( 'allow' => 'Engedélyezés', 'deny' => 'Elutasítás', -); +]; diff --git a/resources/lang/hu/admin/hardware/form.php b/resources/lang/hu/admin/hardware/form.php index 036ce30029..64b0c17dfd 100644 --- a/resources/lang/hu/admin/hardware/form.php +++ b/resources/lang/hu/admin/hardware/form.php @@ -1,12 +1,12 @@ 'A tömeges törlési eszközök megerősítése', +return [ + 'bulk_delete' => 'A tömeges törlési eszközök megerősítése', 'bulk_delete_help' => 'Tömeges törléshez tekintse át az eszközöket. Ha törli az eszközöket, azok visszaállíthatók, de többé nem lesznek hozzárendelve a korábban hozzárendelt felhasználókhoz.', 'bulk_delete_warn' => 'Le akarod törölni a :asset_count eszközt.', - 'bulk_update' => 'Tömeges eszköz frissítés', - 'bulk_update_help' => 'Ez az űrlap segít frissíteni több eszközt egyszerre. Csak töltsd ki a változtatni kívánt mezőket. Mindent amit üresen hagysz az változatlan marad. ', - 'bulk_update_warn' => 'Meg akarod módosítani a(z) :asset_count eszköz tulajdonságait.', + 'bulk_update' => 'Tömeges eszköz frissítés', + 'bulk_update_help' => 'Ez az űrlap segít frissíteni több eszközt egyszerre. Csak töltsd ki a változtatni kívánt mezőket. Mindent amit üresen hagysz az változatlan marad. ', + 'bulk_update_warn' => 'Meg akarod módosítani a(z) :asset_count eszköz tulajdonságait.', 'checkedout_to' => 'Kiadva', 'checkout_date' => 'Kiadási dátum', 'checkin_date' => 'Visszavétel dátuma', @@ -38,7 +38,6 @@ return array( 'tag' => 'Eszköz azonosító', 'update' => 'Eszköz frissítés', 'warranty' => 'Garancia', - 'warranty_expires' => 'Jótállás érvényessége', + 'warranty_expires' => 'Jótállás érvényessége', 'years' => 'évek', -) -; +]; diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php index 46d2802de5..580ea321a8 100644 --- a/resources/lang/hu/admin/hardware/general.php +++ b/resources/lang/hu/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Az eszközökről', 'about_assets_text' => 'Az eszközök a sorszám vagy az eszközcímke által követett elemek. Ezek általában magasabb értékű termékek, amelyekben egy adott elem azonosítása fontos.', - 'archived' => 'Arhivált', + 'archived' => 'Arhivált', 'asset' => 'Eszköz', 'bulk_checkout' => 'Eszközök kiadása', 'checkin' => 'Eszköz visszavétele', @@ -19,4 +19,4 @@ return array( 'pending' => 'Függőben', 'undeployable' => 'Nem telepíthető', 'view' => 'Eszköz megtekintése', -); +]; diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php index ae1671f0a4..bed1803244 100644 --- a/resources/lang/hu/admin/hardware/message.php +++ b/resources/lang/hu/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Figyelem: Ez az eszköz pillanatnyilag nem kiadható. Ha ez a helyzet változott, kérjük, frissítse az eszköz állapotát.', 'does_not_exist' => 'Eszköz nem létezik.', 'does_not_exist_or_not_requestable' => 'Szép próbálkozás. Az eszköz nem létezik, vagy nem igényelhető.', 'assoc_users' => 'Ez az eszköz jelenleg ki van jelölve egy felhasználónak, és nem törölhető. Kérjük, először ellenőrizze az eszközt, majd próbálja meg újra törölni.', - 'create' => array( + 'create' => [ 'error' => 'Az eszköz nem jött létre, próbálkozzon újra. :(', - 'success' => 'Az eszköz sikeresen létrehozva. :)' - ), + 'success' => 'Az eszköz sikeresen létrehozva. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Az eszköz nem frissült, próbálkozzon újra', 'success' => 'Az eszköz sikeresen frissült.', 'nothing_updated' => 'Nem választottak ki mezőket, így semmi sem frissült.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Az eszköz nem állt helyre, kérjük, próbálkozzon újra', - 'success' => 'Az eszköz sikeresen visszaállítva.' - ), + 'success' => 'Az eszköz sikeresen visszaállítva.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Az eszközellenőrzés sikertelen volt. Kérlek próbáld újra.', - 'success' => 'Az eszközellenőrzés sikeresen be van jelentkezve.' - ), + 'success' => 'Az eszközellenőrzés sikeresen be van jelentkezve.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'A fájl nem törölve. Kérlek próbáld újra.', 'success' => 'A fájl sikeresen törölve.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fel nem töltött fájl (ok). Kérlek próbáld újra.', 'success' => 'Fájl (ok) sikeresen feltöltve.', 'nofiles' => 'Nem választottál fel fájlokat a feltöltéshez, vagy a fájl, amelyet feltölteni próbálsz, túl nagy', 'invalidfiles' => 'Egy vagy több fájl túl nagy vagy egy filetype, amely nem megengedett. Az engedélyezett fájltípusok png, gif, jpg, doc, docx, pdf és txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Egyes elemek nem importáltak helyesen.', 'errorDetail' => 'Az alábbi elemeket nem importálták hiba miatt.', - 'success' => "A fájlt importálta", - 'file_delete_success' => "A fájlt sikeresen törölték", - 'file_delete_error' => "A fájlt nem sikerült törölni", - ), + 'success' => 'A fájlt importálta', + 'file_delete_success' => 'A fájlt sikeresen törölték', + 'file_delete_error' => 'A fájlt nem sikerült törölni', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztos benne, hogy törli ezt az elemet?', 'error' => 'Hiba történt az eszköz törlése közben. Kérlek próbáld újra.', 'nothing_updated' => 'Nincsenek eszközök kijelölve, így semmit sem töröltek.', - 'success' => 'Az eszköz sikeresen törölve lett.' - ), + 'success' => 'Az eszköz sikeresen törölve lett.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Az eszköz nem lett kijelölve, próbáld újra', 'success' => 'A készlet sikeresen ki lett állítva.', 'user_does_not_exist' => 'Ez a felhasználó érvénytelen. Kérlek próbáld újra.', 'not_available' => 'Ez az eszköz nem áll rendelkezésre pénztárnál!', - 'no_assets_selected' => 'Ki kell választania legalább egy elemet a listából' - ), + 'no_assets_selected' => 'Ki kell választania legalább egy elemet a listából', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Az eszköz nem lett bejelölve, próbálkozzon újra', 'success' => 'Az Asset sikeresen ellenőrzött.', 'user_does_not_exist' => 'Ez a felhasználó érvénytelen. Kérlek próbáld újra.', 'already_checked_in' => 'Ez az eszköz már be van jelölve.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset nem kért, kérjük, próbálkozzon újra', 'success' => 'Az eszköz sikeresen kért.', - 'canceled' => 'A fizetési kérelem sikeresen törölve' - ) + 'canceled' => 'A fizetési kérelem sikeresen törölve', + ], -); +]; diff --git a/resources/lang/hu/admin/hardware/table.php b/resources/lang/hu/admin/hardware/table.php index 2d5aa45c96..09ff94ceda 100644 --- a/resources/lang/hu/admin/hardware/table.php +++ b/resources/lang/hu/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Eszköz cimke', 'asset_model' => 'Modell', @@ -20,6 +20,6 @@ return array( 'title' => 'Eszköz ', 'image' => 'Készülék kép', 'days_without_acceptance' => 'Nem elfogadás óta eltelt napok száma', - 'monthly_depreciation' => 'Havi értékcsökkenés' + 'monthly_depreciation' => 'Havi értékcsökkenés', -); +]; diff --git a/resources/lang/hu/admin/kits/general.php b/resources/lang/hu/admin/kits/general.php index b87b8f534d..16069e3679 100644 --- a/resources/lang/hu/admin/kits/general.php +++ b/resources/lang/hu/admin/kits/general.php @@ -1,6 +1,6 @@ 'Az előredefiniált csomagokról', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/hu/admin/licenses/form.php b/resources/lang/hu/admin/licenses/form.php index a31554a4c8..7ed91ddee9 100644 --- a/resources/lang/hu/admin/licenses/form.php +++ b/resources/lang/hu/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Eszköz', 'checkin' => 'Kiadás', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Engedélyezve e-mailre', 'to_name' => 'Engedélyezve a névhez', 'update' => 'Licenc frissítése', - 'checkout_help' => 'A licencet egy hardvereszközhöz vagy egy személyhez kell ellenőriznie. Kiválaszthatja mindkettőt, de az eszköz tulajdonosának meg kell egyeznie azzal a személlyel, akinek ellenőrizte az eszközt.' -); + 'checkout_help' => 'A licencet egy hardvereszközhöz vagy egy személyhez kell ellenőriznie. Kiválaszthatja mindkettőt, de az eszköz tulajdonosának meg kell egyeznie azzal a személlyel, akinek ellenőrizte az eszközt.', +]; diff --git a/resources/lang/hu/admin/licenses/general.php b/resources/lang/hu/admin/licenses/general.php index 8949db33c5..78f65a7b09 100644 --- a/resources/lang/hu/admin/licenses/general.php +++ b/resources/lang/hu/admin/licenses/general.php @@ -1,6 +1,6 @@ 'A licencekről', 'about_licenses' => 'Az engedélyeket a szoftverek nyomon követésére használják. Meghatározott számú ülőhellyel rendelkeznek, melyeket az egyéneknek lehet ellenőrizni', 'checkin' => 'Bevét engedély Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Szoftverlicencek', 'user' => 'használó', 'view' => 'Licenc megtekintése', -); +]; diff --git a/resources/lang/hu/admin/licenses/message.php b/resources/lang/hu/admin/licenses/message.php index 34b546e5c6..9ebe5fb09e 100644 --- a/resources/lang/hu/admin/licenses/message.php +++ b/resources/lang/hu/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Engedély nem létezik.', 'user_does_not_exist' => 'Felhasználó nem létezik.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Válasszon egy eszközt vagy egy felhasználót, de nem mindkettőt.', 'not_found' => 'Licensz nem található', - - 'create' => array( + 'create' => [ 'error' => 'A licenc nem jött létre, próbálkozzon újra.', - 'success' => 'A licenc sikeresen létrehozva.' - ), + 'success' => 'A licenc sikeresen létrehozva.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'A fájl nem törölve. Kérlek próbáld újra.', 'success' => 'A fájl sikeresen törölve.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fel nem töltött fájl (ok). Kérlek próbáld újra.', 'success' => 'Fájl (ok) sikeresen feltöltve.', 'nofiles' => 'Nem választottál fel fájlokat a feltöltéshez, vagy a fájl, amelyet feltölteni próbálsz, túl nagy', 'invalidfiles' => 'Egy vagy több fájl túl nagy vagy egy filetype, amely nem megengedett. Az engedélyezett fájltípusok png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml és lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'A licenc nem frissült, próbálkozzon újra', - 'success' => 'A licenc sikeresen frissült.' - ), + 'success' => 'A licenc sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt az engedélyt?', 'error' => 'Hiba történt az engedély törlése során. Kérlek próbáld újra.', - 'success' => 'Az engedélyt sikeresen törölték.' - ), + 'success' => 'Az engedélyt sikeresen törölték.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Hiba történt az engedély megvizsgálásakor. Kérlek próbáld újra.', - 'success' => 'Az engedélyt sikeresen kiállították' - ), + 'success' => 'Az engedélyt sikeresen kiállították', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Hiba történt az engedélyben. Kérlek próbáld újra.', - 'success' => 'Az engedélyt sikeresen ellenőrizték' - ), + 'success' => 'Az engedélyt sikeresen ellenőrizték', + ], -); +]; diff --git a/resources/lang/hu/admin/licenses/table.php b/resources/lang/hu/admin/licenses/table.php index d27414ad69..a95cb3d043 100644 --- a/resources/lang/hu/admin/licenses/table.php +++ b/resources/lang/hu/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Hozzárendelve', 'checkout' => 'Be/ki', @@ -14,4 +14,4 @@ return array( 'serial' => 'Sorozatszám', 'title' => 'Licensz', -); +]; diff --git a/resources/lang/hu/admin/locations/message.php b/resources/lang/hu/admin/locations/message.php index 0384d260d6..be3b6871f2 100644 --- a/resources/lang/hu/admin/locations/message.php +++ b/resources/lang/hu/admin/locations/message.php @@ -1,27 +1,26 @@ 'Hely nem létezik.', 'assoc_users' => 'Ehhez a helyhez jelenleg hozzá van rendelve legalább egy felhasználó és nem törölhető. Kérjük, frissítse a felhasználót aki hozzá volt rendelve ehhez a helyhez, és próbálja meg újra. ', 'assoc_assets' => 'Ez a hely jelenleg legalább egy eszközhöz társítva, és nem törölhető. Frissítse eszközeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.', 'assoc_child_loc' => 'Ez a hely jelenleg legalább egy gyermek helye szülője, és nem törölhető. Frissítse tartózkodási helyeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.', - - 'create' => array( + 'create' => [ 'error' => 'A helyszín nem jött létre, próbálkozzon újra.', - 'success' => 'A helyszín sikeresen létrehozva.' - ), + 'success' => 'A helyszín sikeresen létrehozva.', + ], - 'update' => array( + 'update' => [ 'error' => 'A helyszín nem frissült, próbálkozzon újra', - 'success' => 'A helyszín sikeresen frissült.' - ), + 'success' => 'A helyszín sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt a helyet?', 'error' => 'Hiba történt a helyszín törlése közben. Kérlek próbáld újra.', - 'success' => 'A helyszínt sikeresen törölték.' - ) + 'success' => 'A helyszínt sikeresen törölték.', + ], -); +]; diff --git a/resources/lang/hu/admin/locations/table.php b/resources/lang/hu/admin/locations/table.php index c2755f7aba..464e03d566 100644 --- a/resources/lang/hu/admin/locations/table.php +++ b/resources/lang/hu/admin/locations/table.php @@ -1,6 +1,6 @@ 'A Helyekről', 'about_locations' => 'A helyek a felhasználók, az eszközök és egyéb elemek helyadatait nyomon követik', 'assets_rtd' => 'Eszközök', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Szülő', 'currency' => 'Helyi valuta', 'ldap_ou' => 'LDAP keresés OU', - ); + ]; diff --git a/resources/lang/hu/admin/manufacturers/message.php b/resources/lang/hu/admin/manufacturers/message.php index 121ccb262b..5c24d21174 100644 --- a/resources/lang/hu/admin/manufacturers/message.php +++ b/resources/lang/hu/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Gyártó nem létezik.', 'assoc_users' => 'Ez a gyártó jelenleg legalább egy modellel társítva van, így nem lehet törölni. Kérjük, frissítse a modellt úgy, hogy ne hivatkozzon erre a gyártóra, és próbálkozzon újra. ', - 'create' => array( + 'create' => [ 'error' => 'Gyártó nem jött létre, próbálkozz újra.', - 'success' => 'Gyártó sikeresen létrehozva.' - ), + 'success' => 'Gyártó sikeresen létrehozva.', + ], - 'update' => array( + 'update' => [ 'error' => 'Gyártó nem lett frissítve, próbálkozz újra', - 'success' => 'Gyártó sikeresen frissítve.' - ), + 'success' => 'Gyártó sikeresen frissítve.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'A gyártó nem lett visszaállítva, próbálja újra', - 'success' => 'Gyártó sikeresen visszaállítva.' - ), + 'success' => 'Gyártó sikeresen visszaállítva.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretnéd ezt a gyártót?', 'error' => 'Probléma adódott a gyártó törlése közben. Próbálkozz újra.', - 'success' => 'A gyártó sikeresen törölve.' - ) + 'success' => 'A gyártó sikeresen törölve.', + ], -); +]; diff --git a/resources/lang/hu/admin/manufacturers/table.php b/resources/lang/hu/admin/manufacturers/table.php index bc3fc9f868..dd83e7f7a9 100644 --- a/resources/lang/hu/admin/manufacturers/table.php +++ b/resources/lang/hu/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'A gyártókról', 'about_manufacturers_text' => 'A gyártók azok a vállalatok, amelyek létrehozzák a vagyont. Itt fontos támogatási kapcsolattartási információkat tárolhatsz róluk, amelyek az eszköz részletes oldalain fognak megjelenni.', 'asset_manufacturers' => 'Eszköz gyártoi', @@ -13,4 +13,4 @@ return array( 'update' => 'Gyártó frissítése', 'url' => 'URL', -); +]; diff --git a/resources/lang/hu/admin/models/general.php b/resources/lang/hu/admin/models/general.php index 20f93147ba..80f18e2596 100644 --- a/resources/lang/hu/admin/models/general.php +++ b/resources/lang/hu/admin/models/general.php @@ -1,6 +1,6 @@ 'Az Asset Models-ról', 'about_models_text' => 'Az eszköz-modellek lehetővé teszik az azonos eszközök csoportosítását. "MBP 2013", "IPhone 6s" stb.', 'deleted' => 'Ez a modell törölve lett. Itt visszaállíthatod.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Törlődni fog :model_count eszköz modell.', 'restore' => 'Modell Visszaállítása', 'requestable' => 'A felhasználók kérhetik ezt a modellt', - 'show_mac_address' => 'Mutasd a MAC cím mezőt ennél az eszköznél', + 'show_mac_address' => 'Mutasd a MAC cím mezőt ennél az eszköznél', 'view_deleted' => 'Töröltek megtekintése', 'view_models' => 'Modellek megtekintése', 'fieldset' => 'Mezőcsoport', 'no_custom_field' => 'Nincsenek egyedi mezők', 'add_default_values' => 'Alapértelmezett érték megadása', -); +]; diff --git a/resources/lang/hu/admin/models/message.php b/resources/lang/hu/admin/models/message.php index 49d772f620..31395235d5 100644 --- a/resources/lang/hu/admin/models/message.php +++ b/resources/lang/hu/admin/models/message.php @@ -1,42 +1,41 @@ 'Modell nem létezik.', 'assoc_users' => 'Ez a modell jelenleg társított egy vagy több eszközhöz, és nem törölhető. Legyen szíves törölje az eszközt, és próbálja meg ismét a modell törlését. ', - - 'create' => array( + 'create' => [ 'error' => 'A model nem lett létrehozva. Próbálkozz újra.', 'success' => 'A modell sikeresen létrehozva.', 'duplicate_set' => 'Már létezik ilyen nevű eszközmodell, gyártó és modellszám.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'A modell nem frissült, próbálkozzon újra', - 'success' => 'A modell sikeresen frissült.' - ), + 'success' => 'A modell sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztos benne, hogy törli ezt az eszközmodellt?', 'error' => 'A modell törlését okozta. Kérlek próbáld újra.', - 'success' => 'A modell sikeresen törölve lett.' - ), + 'success' => 'A modell sikeresen törölve lett.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'A modell nem állt helyre, próbálkozzon újra', - 'success' => 'A modell sikeresen visszaállt.' - ), + 'success' => 'A modell sikeresen visszaállt.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nincsenek mezők megváltoztak, így semmi sem frissült.', - 'success' => 'Modellek frissítve.' - ), + 'success' => 'Modellek frissítve.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nem voltak eszközök kiválasztva, így semmi sem lett törölve.', 'success' => ':success_count eszköz(ök) törölve!', - 'success_partial' => ': success_count modell(ek) törlésre kerültek, azonban ennyit nem sikerült törölni: a fail_count , mert még hozzárendelt eszközökkel rendelkeznek.' - ), + 'success_partial' => ': success_count modell(ek) törlésre kerültek, azonban ennyit nem sikerült törölni: a fail_count , mert még hozzárendelt eszközökkel rendelkeznek.', + ], -); +]; diff --git a/resources/lang/hu/admin/models/table.php b/resources/lang/hu/admin/models/table.php index f84a59a3d7..20b00b8609 100644 --- a/resources/lang/hu/admin/models/table.php +++ b/resources/lang/hu/admin/models/table.php @@ -1,6 +1,6 @@ 'Eszköz modell létrehozása', 'created_at' => 'Létrehozva', @@ -14,4 +14,4 @@ return array( 'update' => 'Eszközmodell frissítése', 'clone' => 'Modell klónozása', 'edit' => 'Modell szerkesztése', -); +]; diff --git a/resources/lang/hu/admin/reports/general.php b/resources/lang/hu/admin/reports/general.php index a97eded839..6fc80d0212 100644 --- a/resources/lang/hu/admin/reports/general.php +++ b/resources/lang/hu/admin/reports/general.php @@ -1,5 +1,5 @@ 'Válaszon a lehetőségekből az eszköz riporthoz.' -); +return [ + 'info' => 'Válaszon a lehetőségekből az eszköz riporthoz.', +]; diff --git a/resources/lang/hu/admin/reports/message.php b/resources/lang/hu/admin/reports/message.php index 1cf848fbd7..0a145edbbb 100644 --- a/resources/lang/hu/admin/reports/message.php +++ b/resources/lang/hu/admin/reports/message.php @@ -1,5 +1,5 @@ 'Legalább egy lehetőséget kell választania.' -); +return [ + 'error' => 'Legalább egy lehetőséget kell választania.', +]; diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php index 614049eea8..9545a3c5ee 100644 --- a/resources/lang/hu/admin/settings/general.php +++ b/resources/lang/hu/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory tartomány', 'ad_domain_help' => 'Ez néha megegyezik az e-mail domainjével, de nem mindig.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Email másolat', 'admin_cc_email_help' => 'Ha azt szeretné, hogy a kiadáskor/visszavételkor a felhasználóknak küldött levél másolata egy másik címre is elmenjen, akkor írja be a címet ide. Ellenkező esetben hagyja szabadon a mezőt.', 'is_ad' => 'Ez egy Active Directory szerver', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'A figyelmeztetések lejárata küszöbérték (napokban)', 'alert_inv_threshold' => 'Leltár riasztási küszöb', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Eszköz ID', 'audit_interval' => 'Audit időtartam', 'audit_interval_help' => 'Ha rendszeres fizikai ellenőrzést igényel az eszközökkel, adja meg az intervallumot hónapokban.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Adja meg a két faktor kódot', 'two_factor_config_complete' => 'Kód küldése', 'two_factor_enabled_edit_not_allowed' => 'Az adminisztrátor nem teszi lehetővé a beállítás szerkesztését.', - 'two_factor_enrollment_text' => "Két tényező hitelesítésre van szükség, de a készülék még nem került bejegyzésre. Nyissa meg a Google Hitelesítő alkalmazást, és szkennelje be az alábbi QR-kódot a készülék regisztrálásához. Miután beírta a készüléket, adja meg az alábbi kódot", + 'two_factor_enrollment_text' => 'Két tényező hitelesítésre van szükség, de a készülék még nem került bejegyzésre. Nyissa meg a Google Hitelesítő alkalmazást, és szkennelje be az alábbi QR-kódot a készülék regisztrálásához. Miután beírta a készüléket, adja meg az alábbi kódot', 'require_accept_signature' => 'Aláírásra van szükség', 'require_accept_signature_help_text' => 'Ha engedélyezni szeretné ezt a funkciót, akkor a felhasználóknak fizikailag ki kell jelentkezniük egy eszköz elfogadásáról.', 'left' => 'balra', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Bejelölés esetén az eszközök széria számának egyedinek kell lenni', 'zerofill_count' => 'Az eszközcímkék hossza, beleértve a nem töltöt', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/hu/admin/settings/message.php b/resources/lang/hu/admin/settings/message.php index b20496deda..530a7fdb1a 100644 --- a/resources/lang/hu/admin/settings/message.php +++ b/resources/lang/hu/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Hiba történt frissítés közben. ', - 'success' => 'A beállítások sikeresen frissítve.' - ), - 'backup' => array( + 'success' => 'A beállítások sikeresen frissítve.', + ], + 'backup' => [ 'delete_confirm' => 'Biztosan törölni szeretné ezt a biztonsági másolatot? Ez a művelet nem vonható vissza.', 'file_deleted' => 'A biztonsági mentés sikeresen törölve lett.', 'generated' => 'Új biztonsági másolatot sikerült létrehozni.', 'file_not_found' => 'A biztonsági másolat nem található a kiszolgálón.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Hiba történt a tisztítás során.', 'validation_failed' => 'A tisztítás megerősítése helytelen. Kérjük, írja be a "DELETE" szót a megerősítő mezőbe.', - 'success' => 'A törölt rekordok sikeresen feltöltöttek.' - ), + 'success' => 'A törölt rekordok sikeresen feltöltöttek.', + ], -); +]; diff --git a/resources/lang/hu/admin/statuslabels/message.php b/resources/lang/hu/admin/statuslabels/message.php index 3b872f9f4e..82fd7bea83 100644 --- a/resources/lang/hu/admin/statuslabels/message.php +++ b/resources/lang/hu/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'A státusz-címke nem létezik.', 'assoc_assets' => 'Ez az Állapotjelző jelenleg legalább egy Assethez társítva, és nem törölhető. Kérjük, frissítse eszközeit, hogy ne hivatkozzon erre az állapotra, és próbálja újra.', - - 'create' => array( + 'create' => [ 'error' => 'A státusz-címke nem jött létre, próbálkozzon újra.', - 'success' => 'A státusz címke sikeresen létrehozva.' - ), + 'success' => 'A státusz címke sikeresen létrehozva.', + ], - 'update' => array( + 'update' => [ 'error' => 'A státusz-címke nem frissült, próbálkozzon újra', - 'success' => 'Az állapotjelző sikeresen frissült.' - ), + 'success' => 'Az állapotjelző sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztos benne, hogy törölni szeretné ezt az állapotjelzőt?', 'error' => 'Hiba történt az Állapotjelző törlésével. Kérlek próbáld újra.', - 'success' => 'Az Állapotjelző sikeresen törölve lett.' - ), + 'success' => 'Az Állapotjelző sikeresen törölve lett.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ezeket az eszközöket senkihez nem lehet hozzárendelni.', 'deployable' => 'Ezek az eszközök kiválaszthatók. Ha kijelölésre került, akkor a Deployed meta állapotát veszi fel.', 'archived' => 'Ezeket az eszközöket nem lehet kijelölni, és csak az Archivált nézetben jelenhetnek meg. Ez hasznos lehet az eszközökkel kapcsolatos információk megőrzésére költségvetés / történelmi célokra, de a napi eszközlista megtartásával.', 'pending' => 'Ezeket az eszközöket még nem lehet bárkihez hozzárendelni, gyakran azokat a tételeket használják, amelyek ki vannak javítva, de várhatóan visszatérnek a forgalomba.', - ), + ], -); +]; diff --git a/resources/lang/hu/admin/statuslabels/table.php b/resources/lang/hu/admin/statuslabels/table.php index 7f5bc3709b..6606282051 100644 --- a/resources/lang/hu/admin/statuslabels/table.php +++ b/resources/lang/hu/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'A státusz címkékről', 'archived' => 'Archivált', 'create' => 'Státusz címke létrehozása', @@ -16,4 +16,4 @@ return array( 'title' => 'Státusz címkék', 'undeployable' => 'Nem telepíthető', 'update' => 'Státusz címke frissítése', -); +]; diff --git a/resources/lang/hu/admin/suppliers/message.php b/resources/lang/hu/admin/suppliers/message.php index 340211aa40..ecd46a8c7f 100644 --- a/resources/lang/hu/admin/suppliers/message.php +++ b/resources/lang/hu/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Beszállító nem létezik.', - - 'create' => array( + 'create' => [ 'error' => 'Beszállító nem lett létrehozva, próbálja meg újra.', - 'success' => 'A szállító sikeresen létrejött.' - ), + 'success' => 'A szállító sikeresen létrejött.', + ], - 'update' => array( + 'update' => [ 'error' => 'Szállító nem frissült, próbálkozzon újra', - 'success' => 'Szállító sikeresen frissült.' - ), + 'success' => 'Szállító sikeresen frissült.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Biztosan törölni szeretné ezt a szállítót?', 'error' => 'A szállító törlését okozta. Kérlek próbáld újra.', 'success' => 'A szállító sikeresen törölve lett.', 'assoc_assets' => 'Ez a beszállító jelenleg :asset_count eszközhöz van társítva és nem törölhető. Kérem frissítse az eszközeit hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ', 'assoc_licenses' => 'Ez a beszállító jelenleg :asset_count licenszhez van társítva és nem törölhető. Kérem frissítse az licenszeit hogy ne hivatkozzonak erre a beszállítóra és próbálja újra. ', 'assoc_maintenances' => 'Ez a beszállító jelenleg :asset_maintenances_count eszköz karbantartáshoz van társítva és nem törölhető. Kérem frissítse az eszköz karbantartásait hogy ne hivatkozzon erre a beszállítóra és próbálja újra. ', - ) + ], -); +]; diff --git a/resources/lang/hu/admin/suppliers/table.php b/resources/lang/hu/admin/suppliers/table.php index 875f752644..7d021a715a 100644 --- a/resources/lang/hu/admin/suppliers/table.php +++ b/resources/lang/hu/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'A beszállítókról', 'about_suppliers_text' => 'A szállítók a tételek forrását nyomon követik', 'address' => 'Beszállító címe', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Eszközök megtekintése', 'zip' => 'Irányítószám', -); +]; diff --git a/resources/lang/hu/admin/users/general.php b/resources/lang/hu/admin/users/general.php index 0ebaab6cfe..c63929b7dc 100644 --- a/resources/lang/hu/admin/users/general.php +++ b/resources/lang/hu/admin/users/general.php @@ -1,7 +1,6 @@ 'A felhasználó beléphet', 'activated_disabled_help_text' => 'Saját felhasználói fiókjának a státuszát nem tudja módosítani.', 'assets_user' => 'Eszköz(ök) hozzárendelve: :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Felhasználó szerkesztése', 'filetype_info' => 'Az engedélyezett fájltípusok png, gif, jpg, jpeg, doc, docx, pdf, txt, zip és rar.', 'history_user' => 'Előzmények a következőhöz: név', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Kattintson ide a visszaállításhoz.', 'last_login' => 'Utolsó bejelentkezés', 'ldap_config_text' => 'Az LDAP konfigurációs beállításai megtalálhatók az Adminisztrálás> Beállítások menüben. Az (opcionális) kiválasztott hely minden importált felhasználó számára be lesz állítva.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'A jelenlegi adminisztrációs beállításai lehetővé teszik a kétütemű hitelesítés szelektív végrehajtását.', 'two_factor_enrolled' => '2FA eszköz beiratkozott', 'two_factor_active' => '2FA aktív', - ); + ]; diff --git a/resources/lang/hu/admin/users/message.php b/resources/lang/hu/admin/users/message.php index f0e94a13e0..3eaed77faf 100644 --- a/resources/lang/hu/admin/users/message.php +++ b/resources/lang/hu/admin/users/message.php @@ -1,6 +1,6 @@ 'Ön sikeresen elfogadta ezt az eszközt.', 'declined' => 'Az eszközt sikeresen csökkentetted.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Az LDAP integráció nem lett konfigurálva ehhez a telepítéshez.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'A felhasználó sikeresen létrejött.', 'update' => 'A felhasználó módosítása sikeresen megtörtént.', 'update_bulk' => 'A felhasználók sikeresen frissültek!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'A felhasználó sikeresen felfüggesztésre került.', 'restored' => 'A felhasználó sikeresen visszaállt.', 'import' => 'A felhasználók sikeresen importáltak.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Hiba történt a felhasználó létrehozásában. Kérlek próbáld újra.', 'update' => 'Hiba történt a felhasználó frissítésében. Kérlek próbáld újra.', 'delete' => 'A felhasználó törölte a problémát. Kérlek próbáld újra.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nem sikerült keresni az LDAP kiszolgálót. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban.
Az LDAP kiszolgáló hibája:', 'ldap_could_not_get_entries' => 'Nem sikerült bejegyzéseket szerezni az LDAP kiszolgálóról. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban.
Az LDAP kiszolgáló hibája:', 'password_ldap' => 'A fiókhoz tartozó jelszót az LDAP / Active Directory kezeli. Kérjük, lépjen kapcsolatba informatikai részlegével a jelszó megváltoztatásához.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'A fájl nem törölve. Kérlek próbáld újra.', 'success' => 'A fájl sikeresen törölve.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fel nem töltött fájl (ok). Kérlek próbáld újra.', 'success' => 'Fájl (ok) sikeresen feltöltve.', 'nofiles' => 'Nem választottál fel fájlokat a feltöltéshez', 'invalidfiles' => 'Egy vagy több fájl túl nagy vagy egy filetype, amely nem megengedett. Az engedélyezett fájltípusok png, gif, jpg, doc, docx, pdf és txt.', - ), + ], -); +]; diff --git a/resources/lang/hu/admin/users/table.php b/resources/lang/hu/admin/users/table.php index acdeac67b4..5e9af9b8a5 100644 --- a/resources/lang/hu/admin/users/table.php +++ b/resources/lang/hu/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktív', 'allow' => 'Engedélyezés', 'checkedout' => 'Eszközök', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Jelenlegi felhasználók megjelenítése', 'show_deleted' => 'A törölt felhasználók megjelenítése', 'title' => 'Cím', - 'to_restore_them' => 'visszaállítani őket.', + 'to_restore_them' => 'visszaállítani őket.', 'updateuser' => 'Felhasználó frissítése', 'username' => 'Felhasználónév', - 'user_deleted_text' => 'Ezt a felhasználót törölték.', + 'user_deleted_text' => 'Ezt a felhasználót törölték.', 'username_note' => '(Ez csak az Active Directory-kötéshez használható, nem pedig a bejelentkezéshez.)', 'cloneuser' => 'Klón felhasználó', 'viewusers' => 'Felhasználók megtekintése', -); +]; diff --git a/resources/lang/hu/auth/general.php b/resources/lang/hu/auth/general.php index 3b4500b154..e14f455f2e 100644 --- a/resources/lang/hu/auth/general.php +++ b/resources/lang/hu/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/hu/auth/message.php b/resources/lang/hu/auth/message.php index 22940fe493..3c002eac55 100644 --- a/resources/lang/hu/auth/message.php +++ b/resources/lang/hu/auth/message.php @@ -1,6 +1,6 @@ 'Már létezik ezzel az e-mail címmel felhasználó.', 'account_not_found' => 'A felhasználónév vagy a jelszó érvénytelen.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ez a felhasználó ki van tiltva.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Bejelentkezés közben probléma lépett fel, kérjük próbálja újra.', 'success' => 'Sikeresen bejelentkezett.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Felhasználói fiók létrehozása közben probléma lépett fel, kérjük próbálja újra.', 'success' => 'A felhasználói fiók sikeresen elkészült.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'A jelszó visszaállító kód kiküldése közben probléma lépett fel, kérjük próbálja újra.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Jelszó helyreállítás közben probléma lépett fel, kérjük próbálja újra.', 'success' => 'A jelszavát sikeresen helyreállította.', - ), + ], - -); +]; diff --git a/resources/lang/hu/button.php b/resources/lang/hu/button.php index 1d6f4522a0..17bc7f5ceb 100644 --- a/resources/lang/hu/button.php +++ b/resources/lang/hu/button.php @@ -1,6 +1,6 @@ 'Műveletek', 'add' => 'Új hozzáadása', 'cancel' => 'Vissza', @@ -11,7 +11,7 @@ return array( 'request' => 'Kérelem', 'submit' => 'Küldés', 'upload' => 'Feltöltés', - 'select_file' => 'Válaszd ki a fájlt...', + 'select_file' => 'Válaszd ki a fájlt...', 'select_files' => 'Fájl kiválasztása...', 'generate_labels' => '{1} Címke generálása|[2,*] Címkék generálása', -); +]; diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php index a9167e5164..c8d7f60a21 100644 --- a/resources/lang/hu/general.php +++ b/resources/lang/hu/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Visszavétek', 'user_requests_count' => 'Kérelmek', 'city' => 'Város', - 'click_here' => 'Kattints ide', + 'click_here' => 'Kattints ide', 'clear_selection' => 'Kijelölés törlése', 'companies' => 'Cégek', 'company' => 'Cég', 'component' => 'Alkatrész', 'components' => 'Alkatrészek', - 'complete' => 'teljes', + 'complete' => 'teljes', 'consumable' => 'Fogyóeszköz', 'consumables' => 'Fogyóeszközök', 'country' => 'Ország', diff --git a/resources/lang/hu/help.php b/resources/lang/hu/help.php index b411ba02b5..899cd5feab 100644 --- a/resources/lang/hu/help.php +++ b/resources/lang/hu/help.php @@ -1,6 +1,6 @@ "Több információ", + 'more_info_title' => 'Több információ', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/hu/mail.php b/resources/lang/hu/mail.php index f10e2147a3..f40fbe08eb 100644 --- a/resources/lang/hu/mail.php +++ b/resources/lang/hu/mail.php @@ -1,6 +1,6 @@ 'A felhasználó törölte az elemkérést a webhelyen', 'a_user_requested' => 'A felhasználó egy elemet kért a webhelyen', 'accessory_name' => 'Tartozéknév:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/hu/pagination.php b/resources/lang/hu/pagination.php index f0e03beb32..4011e9a5fe 100644 --- a/resources/lang/hu/pagination.php +++ b/resources/lang/hu/pagination.php @@ -1,6 +1,6 @@ 'Következő»', -); +]; diff --git a/resources/lang/hu/passwords.php b/resources/lang/hu/passwords.php index 58f693a0cb..3062f90f1e 100644 --- a/resources/lang/hu/passwords.php +++ b/resources/lang/hu/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'A jelszó linket elküldtük!', 'user' => 'Nem található aktív felhasználó a megadott email címmel.', ]; - diff --git a/resources/lang/hu/reminders.php b/resources/lang/hu/reminders.php index 2757eadae2..ee07e150d8 100644 --- a/resources/lang/hu/reminders.php +++ b/resources/lang/hu/reminders.php @@ -1,6 +1,6 @@ "A jelszónak 6 karakteresnek kell lennie és egyeznie kell a megerősítésével.", + 'password' => 'A jelszónak 6 karakteresnek kell lennie és egyeznie kell a megerősítésével.', - "user" => "A felhasználónév vagy az e-mail cím téves", + 'user' => 'A felhasználónév vagy az e-mail cím téves', - "token" => "Ez a jelszó visszaállítási kérelem érvénytelen.", + 'token' => 'Ez a jelszó visszaállítási kérelem érvénytelen.', - "sent" => "Ha megfelelő az email cím, egy jelszó emlékeztetőt küldünk!", + 'sent' => 'Ha megfelelő az email cím, egy jelszó emlékeztetőt küldünk!', -); +]; diff --git a/resources/lang/hu/table.php b/resources/lang/hu/table.php index 722b0a119e..f62e3231a5 100644 --- a/resources/lang/hu/table.php +++ b/resources/lang/hu/table.php @@ -1,10 +1,10 @@ 'Lehetőség', 'action' => 'Művelet', 'by' => 'Által', 'item' => 'Tétel', -); +]; diff --git a/resources/lang/hu/validation.php b/resources/lang/hu/validation.php index cd06091d5f..3b1cece936 100644 --- a/resources/lang/hu/validation.php +++ b/resources/lang/hu/validation.php @@ -1,6 +1,6 @@ 'A :attribute már foglalt.', 'uploaded' => 'A: attribútum nem sikerült feltölteni.', 'url' => 'Az :attribute formátuma érvénytelen.', - "unique_undeleted" => "A(z) :attribute egyedinek kell lennie.", + 'unique_undeleted' => 'A(z) :attribute egyedinek kell lennie.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "A: attribútum mező olyan karaktert tartalmaz, amely nem megengedett.", - "email_array" => "Egy vagy több e-mail cím érvénytelen.", - "hashed_pass" => "A jelenlegi jelszava helytelen", + 'alpha_space' => 'A: attribútum mező olyan karaktert tartalmaz, amely nem megengedett.', + 'email_array' => 'Egy vagy több e-mail cím érvénytelen.', + 'hashed_pass' => 'A jelenlegi jelszava helytelen', 'dumbpwd' => 'Ez a jelszó túl gyakori.', - "statuslabel_type" => "Meg kell határoznia egy érvényes állapotcímke típust", + 'statuslabel_type' => 'Meg kell határoznia egy érvényes állapotcímke típust', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/id/admin/accessories/general.php b/resources/lang/id/admin/accessories/general.php index 5e632c899e..1365917dcb 100644 --- a/resources/lang/id/admin/accessories/general.php +++ b/resources/lang/id/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategori Aksesori', 'accessory_name' => 'Nama Aksesori', 'checkout' => 'Aksesoris Keluar', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Gunakan primary default sebagai gantinya.', 'use_default_eula_disabled' => 'Gunakan primary default EULA sebagai gantinya. Tidak ada primary default yang diatur. Silahkan tambahkan di Pengaturan.', -); +]; diff --git a/resources/lang/id/admin/accessories/message.php b/resources/lang/id/admin/accessories/message.php index e6664a95d2..88281a9908 100644 --- a/resources/lang/id/admin/accessories/message.php +++ b/resources/lang/id/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Aksesori ini saat ini memiliki: count item yang dikeluarkan ke pengguna. Silakan periksa di aksesoris dan dan coba lagi. . Silakan periksa di aksesoris dan dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Aksesori gagal di buat, mohon ulangi kembali.', - 'success' => 'Aksesori sukses di buat.' - ), + 'success' => 'Aksesori sukses di buat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Aksesori gagal terbaharui, mohon ulangi kembali', - 'success' => 'Aksesori sukses terbaharui.' - ), + 'success' => 'Aksesori sukses terbaharui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah anda yakin menghapus aksesori ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan aksesori ini. Silahkan coba kembali.', - 'success' => 'Aksesori sukses terhapus.' - ), + 'success' => 'Aksesori sukses terhapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aksesori ini belum dikeluarkan, silahkan coba kembali', 'success' => 'Aksesori telah berhasil dikeluarkan.', - 'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.' - ), + 'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aksesoris belum masuk, silahkan coba kembali', 'success' => 'Aksesoris telah berhasil dimasukkan.', - 'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.' - ) + 'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.', + ], - -); +]; diff --git a/resources/lang/id/admin/accessories/table.php b/resources/lang/id/admin/accessories/table.php index 6b16894692..de7256728a 100644 --- a/resources/lang/id/admin/accessories/table.php +++ b/resources/lang/id/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Unduh CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Unduh CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Diterima', 'title' => 'Nama Aksesori', - -); +]; diff --git a/resources/lang/id/admin/asset_maintenances/form.php b/resources/lang/id/admin/asset_maintenances/form.php index 3f02d3db06..42d274d16a 100644 --- a/resources/lang/id/admin/asset_maintenances/form.php +++ b/resources/lang/id/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Waktu Pemeliharaan Aset (dalam hari)', 'notes' => 'Catatan', 'update' => 'Pembaharuan Pemeliharan Aset', - 'create' => 'Membuat Pemeliharan Aset' + 'create' => 'Membuat Pemeliharan Aset', ]; diff --git a/resources/lang/id/admin/asset_maintenances/message.php b/resources/lang/id/admin/asset_maintenances/message.php index e6f4f43bef..05c2b52fce 100644 --- a/resources/lang/id/admin/asset_maintenances/message.php +++ b/resources/lang/id/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Apakah anda yakin akan menghapus perawatan aset ini?', 'error' => 'Terdapat masalah ketika menghapus perawatan aset. Mohon coba kembali.', - 'success' => 'Perawatan aset telah sukses terhapus.' + 'success' => 'Perawatan aset telah sukses terhapus.', ], 'create' => [ 'error' => 'Perawatan aset gagal di buat, mohon ulangi kembali.', - 'success' => 'Perawatan aset telah sukses di buat.' + 'success' => 'Perawatan aset telah sukses di buat.', ], 'edit' => [ 'error' => 'Pemeliharaan Aset tidak diedit, coba lagi.', - 'success' => 'Pemeliharaan Aset berhasil diedit.' + 'success' => 'Pemeliharaan Aset berhasil diedit.', ], 'asset_maintenance_incomplete' => 'Belum selesai', 'warranty' => 'Garansi', 'not_warranty' => 'Tidak bergaransi', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/id/admin/asset_maintenances/table.php b/resources/lang/id/admin/asset_maintenances/table.php index 7104228a8d..436cc5bd65 100644 --- a/resources/lang/id/admin/asset_maintenances/table.php +++ b/resources/lang/id/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Pemeliharaan Aset', 'asset_name' => 'Nama Aset', 'is_warranty' => 'Garansi', - 'dl_csv' => 'Unduh CSV' + 'dl_csv' => 'Unduh CSV', ]; diff --git a/resources/lang/id/admin/categories/general.php b/resources/lang/id/admin/categories/general.php index 9435eca107..b0b5bfad18 100644 --- a/resources/lang/id/admin/categories/general.php +++ b/resources/lang/id/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategori Aset', 'category_name' => 'Nama Kategori', 'checkin_email' => 'Kirim email ke pengguna saat check in / checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Gunakan pilihan utama sebagai gantinya.', 'use_default_eula_disabled' => 'Gunakan pilihan EULA utama sebagai gantinya. Tidak ada pilihan utama yang diatur. Silahkan tambahkan di Pengaturan.', -); +]; diff --git a/resources/lang/id/admin/categories/message.php b/resources/lang/id/admin/categories/message.php index cfb4dc39b1..0e191b9c99 100644 --- a/resources/lang/id/admin/categories/message.php +++ b/resources/lang/id/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategori tidak ada.', 'assoc_models' => 'Kategori ini saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda yang tidak ada referensi dari kategori ini dan coba lagi. ', 'assoc_items' => 'Kategori ini saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda yang tidak ada referensi dari kategori ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Kategori belum terbuat, silahkan coba kembali.', - 'success' => 'Kategori telah berhasil dibuat.' - ), + 'success' => 'Kategori telah berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pembaharuan kategori tidak berhasil, silahkan coba kembali', - 'success' => 'Pembaharuan kategori berhasil.' - ), + 'success' => 'Pembaharuan kategori berhasil.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus kategori ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan kategori ini. Silahkan coba kembali.', - 'success' => 'Kategori telah berhasil dihapus.' - ) + 'success' => 'Kategori telah berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/id/admin/categories/table.php b/resources/lang/id/admin/categories/table.php index 26d16065cf..cd704f5735 100644 --- a/resources/lang/id/admin/categories/table.php +++ b/resources/lang/id/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Induk', 'require_acceptance' => 'Diterima', 'title' => 'Nama Kategori Aset', -); +]; diff --git a/resources/lang/id/admin/companies/general.php b/resources/lang/id/admin/companies/general.php index 935a433c9d..ced5aa68b1 100644 --- a/resources/lang/id/admin/companies/general.php +++ b/resources/lang/id/admin/companies/general.php @@ -1,4 +1,5 @@ 'Pilih Perusahaan', ]; diff --git a/resources/lang/id/admin/companies/message.php b/resources/lang/id/admin/companies/message.php index 8141c6cd11..1e3b255ac6 100644 --- a/resources/lang/id/admin/companies/message.php +++ b/resources/lang/id/admin/companies/message.php @@ -1,18 +1,19 @@ 'Perusahaan tidak ada.', 'assoc_users' => 'Perusahaan saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model anda yang tidak ada referensi dari perusahaan ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Perusahaan belum terbuat, silahkan coba kembali.', - 'success' => 'Perusahaan telah berhasil dibuat.' - ), - 'update' => array( + 'success' => 'Perusahaan telah berhasil dibuat.', + ], + 'update' => [ 'error' => 'Perusahaan belum terperbaharui, silahkan coba kembali', - 'success' => 'Perusahaan telah berhasil di perbarui.' - ), - 'delete' => array( + 'success' => 'Perusahaan telah berhasil di perbarui.', + ], + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus perusahaan ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan perusahaan ini. Silahkan coba kembali.', - 'success' => 'Perusahaan telah berhasil dihapus.' - ) -); + 'success' => 'Perusahaan telah berhasil dihapus.', + ], +]; diff --git a/resources/lang/id/admin/companies/table.php b/resources/lang/id/admin/companies/table.php index a812c1c6ac..9b57cfccda 100644 --- a/resources/lang/id/admin/companies/table.php +++ b/resources/lang/id/admin/companies/table.php @@ -1,9 +1,10 @@ 'Perusahaan', 'create' => 'Membuat perusahaan', 'title' => 'Perusahaan', 'update' => 'Perbarui Perusahaan', 'name' => 'Nama Perusahaan', 'id' => 'ID', -); +]; diff --git a/resources/lang/id/admin/components/general.php b/resources/lang/id/admin/components/general.php index cc582283b7..8bc904b64d 100644 --- a/resources/lang/id/admin/components/general.php +++ b/resources/lang/id/admin/components/general.php @@ -1,6 +1,6 @@ 'Nama Komponen', 'checkin' => 'Komponen Masuk', 'checkout' => 'Komponen Keluar', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Sisa', 'total' => 'Total', 'update' => 'Perbarui Komponen', -); +]; diff --git a/resources/lang/id/admin/components/message.php b/resources/lang/id/admin/components/message.php index 4adaea082d..144b9ea494 100644 --- a/resources/lang/id/admin/components/message.php +++ b/resources/lang/id/admin/components/message.php @@ -1,36 +1,35 @@ 'Tidak ada komponen.', - 'create' => array( + 'create' => [ 'error' => 'Komponen belum terbuat, silahkan coba kembali.', - 'success' => 'Komponen telah berhasil di buat.' - ), + 'success' => 'Komponen telah berhasil di buat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponen belum terperbarui, silahkan coba kembali', - 'success' => 'Komponen telah berhasil di perbarui.' - ), + 'success' => 'Komponen telah berhasil di perbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus komponen ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan komponen ini. Silahkan coba kembali.', - 'success' => 'Komponen telah berhasil dihapus.' - ), + 'success' => 'Komponen telah berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponen belum tertanda keluar, silahkan mencoba lagi', 'success' => 'Komponen telah sukses tertanda keluar.', - 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.' - ), + 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponen belum tertanda masuk, silahkan mencoba lagi', 'success' => 'Komponen telah sukses tertanda masuk.', - 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.' - ) + 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.', + ], - -); +]; diff --git a/resources/lang/id/admin/components/table.php b/resources/lang/id/admin/components/table.php index a370845bf3..ec49357d02 100644 --- a/resources/lang/id/admin/components/table.php +++ b/resources/lang/id/admin/components/table.php @@ -1,5 +1,5 @@ 'Nama Komponen', -); +]; diff --git a/resources/lang/id/admin/consumables/general.php b/resources/lang/id/admin/consumables/general.php index 19a26351ef..01e83253a5 100644 --- a/resources/lang/id/admin/consumables/general.php +++ b/resources/lang/id/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Periksa barang habis pakai ke Pengguna', 'consumable_name' => 'Nama Barang Habis Pakai', 'create' => 'Membuat Barang Habis Pakai', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Sisa', 'total' => 'Total', 'update' => 'Memperbarui Barang Habis Pakai', -); +]; diff --git a/resources/lang/id/admin/consumables/message.php b/resources/lang/id/admin/consumables/message.php index 8826d6700d..ba36e6a14e 100644 --- a/resources/lang/id/admin/consumables/message.php +++ b/resources/lang/id/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Barang Habis Pakai tidak terdaftar.', - 'create' => array( + 'create' => [ 'error' => 'Barang Habis Pakai tidak berhasil dibuat, silahkan mencoba lagi.', - 'success' => 'Barang Habis Pakai telah berhasil dibuat.' - ), + 'success' => 'Barang Habis Pakai telah berhasil dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Barang Habis Pakai tidak berhasil diperbarui, silahkan mencoba lagi', - 'success' => 'Barang Habis Pakai telah berhasil diperbarui.' - ), + 'success' => 'Barang Habis Pakai telah berhasil diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus Barang Habis Pakai ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan Barang Habis Pakai ini. Silahkan coba kembali.', - 'success' => 'Barang Habis Pakai telah berhasil dihapus.' - ), + 'success' => 'Barang Habis Pakai telah berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Barang Habis Pakai belum tertanda keluar, silahkan mencoba lagi', 'success' => 'Barang Habis Pakai telah sukses tertanda keluar.', - 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.' - ), + 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Barang Habis Pakai belum tertanda masuk, silahkan mencoba lagi', 'success' => 'Barang Habis Pakai telah sukses tertanda masuk.', - 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.' - ) + 'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.', + ], - -); +]; diff --git a/resources/lang/id/admin/consumables/table.php b/resources/lang/id/admin/consumables/table.php index 3910c64441..e87dfb3443 100644 --- a/resources/lang/id/admin/consumables/table.php +++ b/resources/lang/id/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nama Barang Habis Pakai', -); +]; diff --git a/resources/lang/id/admin/custom_fields/general.php b/resources/lang/id/admin/custom_fields/general.php index d485f25ea7..7af07efa6f 100644 --- a/resources/lang/id/admin/custom_fields/general.php +++ b/resources/lang/id/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Kolom Tambahan', 'field' => 'Kolom', 'about_fieldsets_title' => 'Tentang Set Kolom', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Tambah Kolom Ubahan', 'value_encrypted' => 'Nilai dari kolom ini di database dienkripsi. hanya pengguna admin yang bisa melihat nilai deskripsinya', 'show_in_email' => 'Sertakan nilai bidang ini dalam email checkout yang dikirim kepada pengguna? Bidang terenkripsi tidak dapat dimasukkan dalam email.', -); +]; diff --git a/resources/lang/id/admin/custom_fields/message.php b/resources/lang/id/admin/custom_fields/message.php index 5ad9eb4334..116397bcb4 100644 --- a/resources/lang/id/admin/custom_fields/message.php +++ b/resources/lang/id/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Field tersebut tidak ada.', 'already_added' => 'Field sudah di tambahkan', - 'create' => array( + 'create' => [ 'error' => 'Field gagal di buat, silahkan coba kembali.', 'success' => 'Field telah sukses di buat.', - 'assoc_success' => 'Field sukses di tambahkan ke fieldset.' - ), + 'assoc_success' => 'Field sukses di tambahkan ke fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field tidak terbaharui, silahkan coba kembali', - 'success' => 'Field sukses diperbarui.' - ), + 'success' => 'Field sukses diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus field ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan field ini. Silahkan coba kembali.', 'success' => 'Field telah berhasil dihapus.', 'in_use' => 'Field sedang digunakan.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset tidak ada', - 'create' => array( + 'create' => [ 'error' => 'Fieldset gagal di buat, silahkan coba kembali.', - 'success' => 'Fieldset telah sukses di buat.' - ), + 'success' => 'Fieldset telah sukses di buat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset tidak terbaharui, silahkan coba kembali', - 'success' => 'Fieldset sukses diperbarui.' - ), + 'success' => 'Fieldset sukses diperbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus fieldset ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan fieldset ini. Silahkan coba kembali.', 'success' => 'Fieldset telah berhasil dihapus.', 'in_use' => 'Fieldset sedang digunakan.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/id/admin/departments/message.php b/resources/lang/id/admin/departments/message.php index 4d53020053..d7b8e07e57 100644 --- a/resources/lang/id/admin/departments/message.php +++ b/resources/lang/id/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departemen tidak ada.', 'assoc_users' => 'Departemen ini saat ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Perbarui pengguna Anda untuk tidak lagi merujuk departemen ini dan coba lagi.', - 'create' => array( + 'create' => [ 'error' => 'Departemen tidak tercipta, silahkan dicoba lagi.', - 'success' => 'Departemen berhasil dibuat.' - ), - 'update' => array( + 'success' => 'Departemen berhasil dibuat.', + ], + 'update' => [ 'error' => 'Departemen tidak diperbarui, silakan coba lagi', - 'success' => 'Departemen berhasil diperbarui.' - ), - 'delete' => array( + 'success' => 'Departemen berhasil diperbarui.', + ], + 'delete' => [ 'confirm' => 'Yakin ingin menghapus departemen ini?', 'error' => 'Terjadi masalah saat menghapus departemen. Silahkan coba lagi', - 'success' => 'Departemen berhasil dihapus.' - ) + 'success' => 'Departemen berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/id/admin/departments/table.php b/resources/lang/id/admin/departments/table.php index a259294da5..272d333a03 100644 --- a/resources/lang/id/admin/departments/table.php +++ b/resources/lang/id/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'nama departemen', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokasi', 'create' => 'Buat Departemen', 'update' => 'Perbarui Departemen', - ); + ]; diff --git a/resources/lang/id/admin/depreciations/general.php b/resources/lang/id/admin/depreciations/general.php index bc5b0cb507..a4ce2f5f4b 100644 --- a/resources/lang/id/admin/depreciations/general.php +++ b/resources/lang/id/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Tentang Penyusutan Aset', 'about_depreciations' => 'Anda dapat mengatur penyusutan aset dengan perhitungan penyusutan garis lurus.', 'asset_depreciations' => 'Depresiasi Aset', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Jumlah bulan', 'update' => 'Perbaharui Penyusutan', -); +]; diff --git a/resources/lang/id/admin/depreciations/message.php b/resources/lang/id/admin/depreciations/message.php index 155eca8cfc..5d7711d5d2 100644 --- a/resources/lang/id/admin/depreciations/message.php +++ b/resources/lang/id/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Kelas penyusutan tidak ada.', 'assoc_users' => 'Penyusutan ini saat ini terkoneksi dengan satu atau lebih model dan tidak dapat di hapus. Silahkan hapus model tersebut lebih dahulu, kemudian coba ulangi kembali. ', - - 'create' => array( + 'create' => [ 'error' => 'Kelas penyusutan gagal dibuat, silahkan coba kembali', - 'success' => 'Kelas penyusutan sukses di buat' - ), + 'success' => 'Kelas penyusutan sukses di buat', + ], - 'update' => array( + 'update' => [ 'error' => 'Kelas penyusutan gagal di perbarui, silahkan coba kembali', - 'success' => 'Kelas penyusutan sukses di perbarui.' - ), + 'success' => 'Kelas penyusutan sukses di perbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus kelas penyusutan ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan kelas penyusutan. Silahkan coba kembali.', - 'success' => 'Kelas penyusutan sukses di hapus.' - ) + 'success' => 'Kelas penyusutan sukses di hapus.', + ], -); +]; diff --git a/resources/lang/id/admin/depreciations/table.php b/resources/lang/id/admin/depreciations/table.php index 20f1d1a5c0..509cf8a629 100644 --- a/resources/lang/id/admin/depreciations/table.php +++ b/resources/lang/id/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Bulan', 'term' => 'Syarat', 'title' => 'Nama ', -); +]; diff --git a/resources/lang/id/admin/groups/message.php b/resources/lang/id/admin/groups/message.php index a07902428f..72dbf68a04 100644 --- a/resources/lang/id/admin/groups/message.php +++ b/resources/lang/id/admin/groups/message.php @@ -1,22 +1,22 @@ 'Kelompok sudah ada!', 'group_not_found' => 'Kelompok [:id] tidak ada.', 'group_name_required' => 'Field nama di perlukan', - 'success' => array( + 'success' => [ 'create' => 'Sukses membuat kelompok.', 'update' => 'Sukses memperbarui kelompok.', 'delete' => 'Sukses menghapus kelompok.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin menghapus kelompok ini?', 'create' => 'Terdapat kesalahan ketika membuat kelompok. Silahkan coba kembali.', 'update' => 'Terdapat kesalahan ketika memperbarui kelompok. Silahkan coba kembali.', 'delete' => 'Terdapat kesalahan ketika menghapus kelompok. Silahkan coba kembali.', - ), + ], -); +]; diff --git a/resources/lang/id/admin/groups/table.php b/resources/lang/id/admin/groups/table.php index 226fb86336..8b7bdcde48 100644 --- a/resources/lang/id/admin/groups/table.php +++ b/resources/lang/id/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nama', 'users' => '# Pengguna', -); +]; diff --git a/resources/lang/id/admin/groups/titles.php b/resources/lang/id/admin/groups/titles.php index 94b25866ee..12acc7cd36 100644 --- a/resources/lang/id/admin/groups/titles.php +++ b/resources/lang/id/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Tentang Grup', 'about_groups' => 'Grup digunakan untuk menyamaratakan perizinan pengguna.', 'group_management' => 'Manajemen Kelompok', @@ -11,4 +11,4 @@ return array( 'allow' => 'Izin', 'deny' => 'Tolak', -); +]; diff --git a/resources/lang/id/admin/hardware/form.php b/resources/lang/id/admin/hardware/form.php index a5bd59e947..8ab77086a4 100644 --- a/resources/lang/id/admin/hardware/form.php +++ b/resources/lang/id/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Konfirmasi Penghapusan Aset dalam Jumlah Besar', +return [ + 'bulk_delete' => 'Konfirmasi Penghapusan Aset dalam Jumlah Besar', 'bulk_delete_help' => 'Meninjau aset untuk penghapusan massal di bawah ini. Setelah dihapus, aset-aset ini dapat dipulihkan, tetapi mereka tidak lagi akan dikaitkan dengan setiap pengguna yang mereka saat ini digunakan.', 'bulk_delete_warn' => 'Anda akan menghapus :asset_count aset.', - 'bulk_update' => 'Perbarui aset jumlah besar', - 'bulk_update_help' => 'Formulir ini mengizinkan anda untuk memperbarui kelipatan aset dalam sekali proses. Cukup isi di field yang hendak di rubah. Jika ada yang kosong tidak akan dirubah. ', - 'bulk_update_warn' => 'Anda akan menyunting :asset_count aset.', + 'bulk_update' => 'Perbarui aset jumlah besar', + 'bulk_update_help' => 'Formulir ini mengizinkan anda untuk memperbarui kelipatan aset dalam sekali proses. Cukup isi di field yang hendak di rubah. Jika ada yang kosong tidak akan dirubah. ', + 'bulk_update_warn' => 'Anda akan menyunting :asset_count aset.', 'checkedout_to' => 'Diberikan kepada', 'checkout_date' => 'Tanggal Pemberian', 'checkin_date' => 'Tanggal Pengembalian', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tag Aset', 'update' => 'Perbarui Aset', 'warranty' => 'Garansi', - 'warranty_expires' => 'Garansi Berakhir', + 'warranty_expires' => 'Garansi Berakhir', 'years' => 'tahun', -) -; +]; diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php index de3e1f85f1..1f6081df05 100644 --- a/resources/lang/id/admin/hardware/general.php +++ b/resources/lang/id/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Tentang Aset', 'about_assets_text' => 'Aset adalah barang yang dilacak dengan nomor seri atau tanda aset. Cenderung menjadi barang dengan nilai lebih tinggi dimana identifikasi barang secara spesifik berpengaruh.', - 'archived' => 'Diarsipkan', + 'archived' => 'Diarsipkan', 'asset' => 'Aset', 'bulk_checkout' => 'Pengeluaran Aset', 'checkin' => 'Pengembalian aset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Tunda', 'undeployable' => 'Tidak dapat digunakan', 'view' => 'Tampilkan aset', -); +]; diff --git a/resources/lang/id/admin/hardware/message.php b/resources/lang/id/admin/hardware/message.php index 26a3293049..6bb7e46abc 100644 --- a/resources/lang/id/admin/hardware/message.php +++ b/resources/lang/id/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Peringatan: Aset ini telah di tandai sebagai aset yang tak dapat digunakan. Jika status ini telah berubah, silahkan perbarui status aset.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Aset tersebut tidak terdaftar atau tidak dapat di minta.', 'assoc_users' => 'Aset ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek aset terlebih dahulu kemudian coba hapus kembali. ', - 'create' => array( + 'create' => [ 'error' => 'Aset gagal di buat, silahkan coba kembali', - 'success' => 'Sukses membuat aset' - ), + 'success' => 'Sukses membuat aset', + ], - 'update' => array( + 'update' => [ 'error' => 'Gagal perbarui aset, silahkan coba kembali', 'success' => 'Sukses perbarui aset.', 'nothing_updated' => 'Tidak ada kolom yang dipilih, jadi tidak ada yang diperbaharui.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Aset gagal dikembalikan, silahkan coba lagi', - 'success' => 'Aset berhasil dikembalikan.' - ), + 'success' => 'Aset berhasil dikembalikan.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audit aset tidak berhasil. Silahkan coba lagi', - 'success' => 'Audit aset berhasil login.' - ), + 'success' => 'Audit aset berhasil login.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Berkas tidak terhapus. Silahkan coba kembali.', 'success' => 'Berkas berhasil dihapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas gagal diunggah. Silahkan coba kembali.', 'success' => 'Berkas berhasil diunggah.', 'nofiles' => 'Anda belum memilih berkas untuk diunggah, atau berkas yang akan diunggah terlalu besar', 'invalidfiles' => 'Satu atau beberapa berkas Anda terlalu besar atau termasuk tipe berkas yang tidak diizinkan. Berkas yang diperbolehkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Beberapa item tidak terimpor dengan benar.', 'errorDetail' => 'Item berikut tidak terimpor karena ada kesalahan.', - 'success' => "Berkas Anda berhasil terimpor", - 'file_delete_success' => "File anda telah berhasil dihapus", - 'file_delete_error' => "File tidak bisa dihapus", - ), + 'success' => 'Berkas Anda berhasil terimpor', + 'file_delete_success' => 'File anda telah berhasil dihapus', + 'file_delete_error' => 'File tidak bisa dihapus', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus aset ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan aset. Silahkan coba kembali.', 'nothing_updated' => 'Tidak ada aset yang dipilih, jadi tidak ada yang dihapus.', - 'success' => 'Aset sukses terhapus.' - ), + 'success' => 'Aset sukses terhapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aset gagal di berikan, silahkan coba kembali', 'success' => 'Sukses memberikan aset.', 'user_does_not_exist' => 'Pengguna tersebut tidak terdaftar. Silahkan coba kembali.', 'not_available' => 'Aset tersebut tidak tersedia untuk checkout!', - 'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar' - ), + 'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aset gagal di terima, silahkan coba kembali', 'success' => 'Sukses menerima aset.', 'user_does_not_exist' => 'Pengguna tersebut tidak terdaftar. Silahkan coba kembali.', 'already_checked_in' => 'Aset tersebut telah di terima.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Aset gagal di minta, silahkan coba kembali', 'success' => 'Sukses meminta aset.', - 'canceled' => 'Permintaan pemeriksaan berhasil dibatalkan' - ) + 'canceled' => 'Permintaan pemeriksaan berhasil dibatalkan', + ], -); +]; diff --git a/resources/lang/id/admin/hardware/table.php b/resources/lang/id/admin/hardware/table.php index 9468063741..18438d792a 100644 --- a/resources/lang/id/admin/hardware/table.php +++ b/resources/lang/id/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Tag Aset', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Aset ', 'image' => 'Gambar Perangkat', 'days_without_acceptance' => 'Tanda Terima', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/id/admin/kits/general.php b/resources/lang/id/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/id/admin/kits/general.php +++ b/resources/lang/id/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/id/admin/licenses/form.php b/resources/lang/id/admin/licenses/form.php index a36b1435c2..4b921317cb 100644 --- a/resources/lang/id/admin/licenses/form.php +++ b/resources/lang/id/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Aset', 'checkin' => 'Masuk', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Berlisensi untuk Email', 'to_name' => 'Berlisensi untuk Nama', 'update' => 'Memperbarui lisensi', - 'checkout_help' => 'Anda harus memeriksa lisensi untuk aset perangkat keras atau seseorang. Anda dapat memilih keduanya, namun pemilik aset harus sesuai dengan orang yang Anda memeriksa aset.' -); + 'checkout_help' => 'Anda harus memeriksa lisensi untuk aset perangkat keras atau seseorang. Anda dapat memilih keduanya, namun pemilik aset harus sesuai dengan orang yang Anda memeriksa aset.', +]; diff --git a/resources/lang/id/admin/licenses/general.php b/resources/lang/id/admin/licenses/general.php index 22290291bc..a358d4938a 100644 --- a/resources/lang/id/admin/licenses/general.php +++ b/resources/lang/id/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Tentang Lisensi', 'about_licenses' => 'Lisensi digunakan untuk melacak perangkat lunak. Mereka memiliki sejumlah kursi yang bisa diperiksa ke individu', 'checkin' => 'Pemberian kapasitas lisensi', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Lisensi Perangkat Lunak', 'user' => 'Pengguna', 'view' => 'Tampilkan Lisensi', -); +]; diff --git a/resources/lang/id/admin/licenses/message.php b/resources/lang/id/admin/licenses/message.php index ba2ba85d15..202e86e870 100644 --- a/resources/lang/id/admin/licenses/message.php +++ b/resources/lang/id/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisensi tidak ada.', 'user_does_not_exist' => 'Pengguna tidak ada.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Anda harus memilih aset atau pengguna, namun tidak keduanya.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Gagal membuat lisensi, silahkan coba kembali.', - 'success' => 'Sukses membuat lisensi.' - ), + 'success' => 'Sukses membuat lisensi.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Berkas belum terhapus. Silahkan coba kembali.', 'success' => 'Berkas sukses di hapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas belum terunggah. Silakan coba kembali.', 'success' => 'Berkas sukses terunggah.', 'nofiles' => 'Anda belum memilih berkas untuk di unggah, atau berkas yang akan di unggah terlalu besar ukurannya', 'invalidfiles' => 'Satu atau lebih file Anda terlalu besar atau merupakan jenis filetype yang tidak diizinkan. Filetype yang diperbolehkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, dan lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Gagal memperbarui lisensi, silahkan coba kembali', - 'success' => 'Sukses perbarui lisensi.' - ), + 'success' => 'Sukses perbarui lisensi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus lisensi ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan lisensi ini. Silahkan coba kembali.', - 'success' => 'Lisensi telah berhasil dihapus.' - ), + 'success' => 'Lisensi telah berhasil dihapus.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Terdapat kesalahan pada saat pemberian lisensi ini. Silahkan coba kembali.', - 'success' => 'Lisensi telah berhasil diberikan' - ), + 'success' => 'Lisensi telah berhasil diberikan', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Terdapat kesalahan pada saat penerimaan lisensi ini. Silahkan coba kembali.', - 'success' => 'Lisensi telah berhasil diterima' - ), + 'success' => 'Lisensi telah berhasil diterima', + ], -); +]; diff --git a/resources/lang/id/admin/licenses/table.php b/resources/lang/id/admin/licenses/table.php index d836b5006f..93d7c1b985 100644 --- a/resources/lang/id/admin/licenses/table.php +++ b/resources/lang/id/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Diberikan kepada', 'checkout' => 'Masuk/Keluar', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Lisensi', -); +]; diff --git a/resources/lang/id/admin/locations/message.php b/resources/lang/id/admin/locations/message.php index 8dac83723e..43f5629052 100644 --- a/resources/lang/id/admin/locations/message.php +++ b/resources/lang/id/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokasi tidak ada.', 'assoc_users' => 'Lokasi saat ini dikaitkan dengan setidaknya oleh satu pengguna dan tidak dapat dihapus. Perbarui pengguna Anda yang tidak ada referensi dari lokasi ini dan coba lagi. ', 'assoc_assets' => 'Lokasi saat ini dikaitkan dengan setidaknya oleh satu aset dan tidak dapat dihapus. Perbarui aset Anda yang tidak ada referensi dari lokasi ini dan coba lagi. ', 'assoc_child_loc' => 'Lokasi saat ini digunakan oleh induk salah satu dari turunan lokasi dan tidak dapat di hapus. Mohon perbarui lokasi Anda ke yang tidak ada referensi dengan lokasi ini dan coba kembali. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokasi gagal di buat, mohon coba kebali.', - 'success' => 'Lokasi sukses di buat.' - ), + 'success' => 'Lokasi sukses di buat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokasi gagal di perbarui, mohon coba kembali', - 'success' => 'Lokasi sukses di perbarui.' - ), + 'success' => 'Lokasi sukses di perbarui.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus lokasi ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan lokasi ini. Silahkan coba kembali.', - 'success' => 'Lokasi telah berhasil dihapus.' - ) + 'success' => 'Lokasi telah berhasil dihapus.', + ], -); +]; diff --git a/resources/lang/id/admin/locations/table.php b/resources/lang/id/admin/locations/table.php index 262a115baa..4a225696f4 100644 --- a/resources/lang/id/admin/locations/table.php +++ b/resources/lang/id/admin/locations/table.php @@ -1,6 +1,6 @@ 'Tentang Lokasi', 'about_locations' => 'Lokasi digunakan untuk melacak informasi lokasi bagi pengguna, aset, dan item lainnya', 'assets_rtd' => 'Aset', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Induk', 'currency' => 'Lokasi Mata Uang', 'ldap_ou' => 'LDAP Cari OU', - ); + ]; diff --git a/resources/lang/id/admin/manufacturers/message.php b/resources/lang/id/admin/manufacturers/message.php index 6e58440395..139db01530 100644 --- a/resources/lang/id/admin/manufacturers/message.php +++ b/resources/lang/id/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Produsen tidak ada.', 'assoc_users' => 'Produsen ini saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda yang tidak ada referensi dari produsen ini dan coba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Produsen gagal di buat, silahkan coba kembali.', - 'success' => 'Produsen sukses di buat.' - ), + 'success' => 'Produsen sukses di buat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Produsen gagal di perbarui, silahkan coba kembali', - 'success' => 'Produsen sukses di perbarui.' - ), + 'success' => 'Produsen sukses di perbarui.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Pabrikan tidak dapat dipulihkan, silakan coba kembali', - 'success' => 'Pabrikan berhasil dipulihkan.' - ), + 'success' => 'Pabrikan berhasil dipulihkan.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus produsen ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan produsen. Silahkan coba kembali.', - 'success' => 'Produsen sukses di hapus.' - ) + 'success' => 'Produsen sukses di hapus.', + ], -); +]; diff --git a/resources/lang/id/admin/manufacturers/table.php b/resources/lang/id/admin/manufacturers/table.php index 7d79e858c1..5435b62944 100644 --- a/resources/lang/id/admin/manufacturers/table.php +++ b/resources/lang/id/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Tentang Manufaktur', 'about_manufacturers_text' => 'Pabrikan adalah perusahaan yang menciptakan aset Anda. Anda dapat menyimpan informasi kontak pendukung penting tentang mereka di sini, yang akan ditampilkan di halaman detail aset Anda.', 'asset_manufacturers' => 'Merek Aset', @@ -13,4 +13,4 @@ return array( 'update' => 'Perbarui Merek', 'url' => 'URL', -); +]; diff --git a/resources/lang/id/admin/models/general.php b/resources/lang/id/admin/models/general.php index 3c6f151db1..54702d1937 100644 --- a/resources/lang/id/admin/models/general.php +++ b/resources/lang/id/admin/models/general.php @@ -1,6 +1,6 @@ 'Tentang Model Aset', 'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.', 'deleted' => 'Model ini telah dihapus. Click di sini untuk memulihkan.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Anda akan menghapus :model_count asset models.', 'restore' => 'Mengembalikan Model', 'requestable' => 'Pengguna dapat meminta model ini', - 'show_mac_address' => 'Tampilkan alamat MAC di aset untuk model ini', + 'show_mac_address' => 'Tampilkan alamat MAC di aset untuk model ini', 'view_deleted' => 'Lihat yang Dihapus', 'view_models' => 'Lihat Model', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Field yang tidak bisa di rubah', 'add_default_values' => 'Tambah Nilai Default', -); +]; diff --git a/resources/lang/id/admin/models/message.php b/resources/lang/id/admin/models/message.php index 1e5e0fb672..e07061c1b6 100644 --- a/resources/lang/id/admin/models/message.php +++ b/resources/lang/id/admin/models/message.php @@ -1,42 +1,41 @@ 'Model tidak ada.', 'assoc_users' => 'Saat ini model tersebut terhubung dengan 1 atau lebih dengan aset dan tidak dapat di hapus. Silahkan hapus aset terlebih dahulu, kemudian coba hapus kembali. ', - - 'create' => array( + 'create' => [ 'error' => 'Model gagal di buat, silahkan coba kembali.', 'success' => 'Sukses mebuat model.', 'duplicate_set' => 'Model aset dengan nomor nama, produsen dan model yang sama sudah ada.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model gagal diperbarui, silahkan coba kembali', - 'success' => 'Sukses memperbarui Model.' - ), + 'success' => 'Sukses memperbarui Model.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin untuk menghapus model aset ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan model. Silahkan coba kembali.', - 'success' => 'Model sukses terhapus.' - ), + 'success' => 'Model sukses terhapus.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modal gagal di pulihkan, silahkan coba kembali', - 'success' => 'Sukses memulihkan model.' - ), + 'success' => 'Sukses memulihkan model.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Tidak ada bidang yang berubah, jadi tidak ada yang diperbarui.', - 'success' => 'Model diperbarui' - ), + 'success' => 'Model diperbarui', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Tidak ada model yang dipilih, jadi tidak ada yang dihapus.', 'success' => ':success_count model dihapus!', - 'success_partial' => ':success_count model telah dihapus, tetapi :fail_count tidak dapat dihapus karena masih memiliki aset yang terkait dengannya.' - ), + 'success_partial' => ':success_count model telah dihapus, tetapi :fail_count tidak dapat dihapus karena masih memiliki aset yang terkait dengannya.', + ], -); +]; diff --git a/resources/lang/id/admin/models/table.php b/resources/lang/id/admin/models/table.php index 481bc26797..b1ca62f8cf 100644 --- a/resources/lang/id/admin/models/table.php +++ b/resources/lang/id/admin/models/table.php @@ -1,6 +1,6 @@ 'Membuat Model aset', 'created_at' => 'Dibuat', @@ -14,4 +14,4 @@ return array( 'update' => 'Perbarui Model Aset', 'clone' => 'Duplikat Model', 'edit' => 'Sunting Model', -); +]; diff --git a/resources/lang/id/admin/reports/general.php b/resources/lang/id/admin/reports/general.php index 94e8a85068..75c1d01588 100644 --- a/resources/lang/id/admin/reports/general.php +++ b/resources/lang/id/admin/reports/general.php @@ -1,5 +1,5 @@ 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.' -); +return [ + 'info' => 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.', +]; diff --git a/resources/lang/id/admin/reports/message.php b/resources/lang/id/admin/reports/message.php index 32b5924ce8..7fb4d60b21 100644 --- a/resources/lang/id/admin/reports/message.php +++ b/resources/lang/id/admin/reports/message.php @@ -1,5 +1,5 @@ 'Anda harus memilik minimal SATU.' -); +return [ + 'error' => 'Anda harus memilik minimal SATU.', +]; diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php index 7212c9a0e1..8ca90ac54e 100644 --- a/resources/lang/id/admin/settings/general.php +++ b/resources/lang/id/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Domain Active Directory', 'ad_domain_help' => 'Hal ini kadang-kadang sama sebagai domain email Anda, tetapi tidak selalu.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Tembusan Email', 'admin_cc_email_help' => 'Jika Anda ingin mengirim salinan email checkin / checkout yang dikirimkan ke pengguna akun email tambahan, masukkan di sini. Jika tidak, biarkan bidang ini kosong.', 'is_ad' => 'Ini adalah server Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ambang batas pemberitahuan kadaluarsa (dalam hari)', 'alert_inv_threshold' => 'Ambang pemberitahuan persediaan', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Aset id', 'audit_interval' => 'Interval Audit', 'audit_interval_help' => 'Jika Anda diminta untuk secara teratur melakukan audit aset secara fisik, masukkan selang waktu dalam beberapa bulan.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Masukkan Kode Dua Faktor', 'two_factor_config_complete' => 'Kirim Kode', 'two_factor_enabled_edit_not_allowed' => 'Administrator Anda tidak mengizinkan Anda untuk mengedit pengaturan ini.', - 'two_factor_enrollment_text' => "Diperlukan dua faktor otentikasi, namun perangkat Anda belum terdaftar. Buka aplikasi Google Authenticator Anda dan pindai kode QR di bawah ini untuk mendaftarkan perangkat Anda. Setelah mendaftarkan perangkat Anda, masukkan kode di bawah ini", + 'two_factor_enrollment_text' => 'Diperlukan dua faktor otentikasi, namun perangkat Anda belum terdaftar. Buka aplikasi Google Authenticator Anda dan pindai kode QR di bawah ini untuk mendaftarkan perangkat Anda. Setelah mendaftarkan perangkat Anda, masukkan kode di bawah ini', 'require_accept_signature' => 'Membutuhkan tanda tangan', 'require_accept_signature_help_text' => 'Mengaktifkan fitur ini akan mengharuskan pengguna untuk secara fisik menandatangani untuk menerima aset.', 'left' => 'kiri', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Menandai boks ini akan membuat adanya batasan keunikan pada tiap nomor seri aset', 'zerofill_count' => 'Jarak tag aset, termasuk angka nol', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/id/admin/settings/message.php b/resources/lang/id/admin/settings/message.php index 500ff8732c..463f227a2d 100644 --- a/resources/lang/id/admin/settings/message.php +++ b/resources/lang/id/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Terdapat kesalahan ketika proses pembaharuan. ', - 'success' => 'Sukses perbarui pengaturan.' - ), - 'backup' => array( + 'success' => 'Sukses perbarui pengaturan.', + ], + 'backup' => [ 'delete_confirm' => 'Apakah anda yakin menghapus berkas cadangan ini? Tindakan ini tidak dapat di batalkan. ', 'file_deleted' => 'Sukses menghapus Berkas cadangan. ', 'generated' => 'Sukses membuat cadangan baru.', 'file_not_found' => 'Berkas cadangan tidak ditemukan di server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Terdapat kesalahan ketika proses pembersihan. ', 'validation_failed' => 'Konfirmasi pembersihan anda tidak tepat. Silahkan ketikan kata "DELETE" di kotak konfirmasi.', - 'success' => 'Sukses melakukan pembersihan data yang terhapus.' - ), + 'success' => 'Sukses melakukan pembersihan data yang terhapus.', + ], -); +]; diff --git a/resources/lang/id/admin/statuslabels/message.php b/resources/lang/id/admin/statuslabels/message.php index 1f6665527c..4b78785e3b 100644 --- a/resources/lang/id/admin/statuslabels/message.php +++ b/resources/lang/id/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Label status tidak ada.', 'assoc_assets' => 'Saat ini label status tersebut terhubung dengan 1 aset dan tidak dapat di hapus. Silahkan perbarui aset anda sehingga tidak terhubung dan kemudian coba kembali. ', - - 'create' => array( + 'create' => [ 'error' => 'Label status gagal di buat, silahkan coba lagi.', - 'success' => 'Sukses membuat status label.' - ), + 'success' => 'Sukses membuat status label.', + ], - 'update' => array( + 'update' => [ 'error' => 'Gagal perbarui label status, silahkan coba kembali', - 'success' => 'Sukses perbarui label status.' - ), + 'success' => 'Sukses perbarui label status.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda yakin untuk menghapus model label status ini?', 'error' => 'Terdapat kesalahan pada saat penghapusan label status ini. Silahkan coba kembali.', - 'success' => 'Sukses menghapus label status.' - ), + 'success' => 'Sukses menghapus label status.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Aset ini tidak dapat diberikan kepada siapapun.', 'deployable' => 'Aset ini bisa diperiksa. Begitu mereka ditugaskan, mereka akan mengambil status meta Deployed.', 'archived' => 'Aset ini tidak dapat diperiksa, dan hanya akan muncul di tampilan Arsip. Ini berguna untuk menyimpan informasi tentang aset untuk tujuan anggaran / sejarah namun menjauhkan mereka dari daftar aset sehari-hari.', 'pending' => 'Aset ini belum bisa diberikan kepada siapapun, sering digunakan untuk barang yang sedang diperbaiki, namun diperkirakan akan kembali beredar.', - ), + ], -); +]; diff --git a/resources/lang/id/admin/statuslabels/table.php b/resources/lang/id/admin/statuslabels/table.php index 091b852583..536ba12de0 100644 --- a/resources/lang/id/admin/statuslabels/table.php +++ b/resources/lang/id/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Tentang label status', 'archived' => 'Diarsipkan', 'create' => 'Membuat label status', @@ -16,4 +16,4 @@ return array( 'title' => 'Label Status', 'undeployable' => 'Tidak dapat digunakan', 'update' => 'Perbarui label status', -); +]; diff --git a/resources/lang/id/admin/suppliers/message.php b/resources/lang/id/admin/suppliers/message.php index eba2e3ca5b..74afc499cf 100644 --- a/resources/lang/id/admin/suppliers/message.php +++ b/resources/lang/id/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Pemasok tidak ada.', - - 'create' => array( + 'create' => [ 'error' => 'Pemasok gagal di buat, silahkan coba kembali.', - 'success' => 'Pemasok sukses dibuat.' - ), + 'success' => 'Pemasok sukses dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pemasok tidak di perbarui, silahkan coba kembali', - 'success' => 'Sukses perbarui pemasok.' - ), + 'success' => 'Sukses perbarui pemasok.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Apakah Anda yakin untuk menghapus pemasok ini?', 'error' => 'Terdapat masalah ketika menghapus pemasok. Silahkan coba kembali.', 'success' => 'Sukses menghapus pemasok.', 'assoc_assets' => 'Saat ini pemasok ini terkait dengan :asset_count aset dan tidak dapat dihapus. Harap perbarui aset Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', 'assoc_licenses' => 'Saat ini pemasok ini terkait dengan :licenses_count lisensi dan tidak dapat dihapus. Harap perbarui lisensi Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', 'assoc_maintenances' => 'Saat ini pemasok ini terkait dengan :asset_maintenances_count pemeliharaan aset dan tidak dapat dihapus. Harap perbarui pemeliharaan aset Anda agar tidak lagi menggunakan pemasok ini sebagai referensi dan silakan coba lagi. ', - ) + ], -); +]; diff --git a/resources/lang/id/admin/suppliers/table.php b/resources/lang/id/admin/suppliers/table.php index 2187b3aabe..b9e5299a77 100644 --- a/resources/lang/id/admin/suppliers/table.php +++ b/resources/lang/id/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Tentang Pemasok', 'about_suppliers_text' => 'Pemasok digunakan untuk melacak sumber barang', 'address' => 'Alamat pemasok', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Tampilkan Aset untuk', 'zip' => 'Kode Pos', -); +]; diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php index 6ed7bfe601..918bfaaaab 100644 --- a/resources/lang/id/admin/users/general.php +++ b/resources/lang/id/admin/users/general.php @@ -1,7 +1,6 @@ 'Pengguna ini dapat masuk', 'activated_disabled_help_text' => 'Anda tidak dapat menyunting status aktivasi akun anda sendiri.', 'assets_user' => 'Aset pada :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Sunting Pengguna', 'filetype_info' => 'Jenis berkas diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.', 'history_user' => 'Riwayat untuk :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klik di sini untuk mengembalikannya.', 'last_login' => 'Terakhir masuk', 'ldap_config_text' => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Pengaturan admin Anda saat ini memungkinkan penegakan dua faktor otentikasi selektif.', 'two_factor_enrolled' => 'Perangkat 2FA Terdaftar', 'two_factor_active' => '2FA Aktif', - ); + ]; diff --git a/resources/lang/id/admin/users/message.php b/resources/lang/id/admin/users/message.php index 543a8439fa..454a4a2a85 100644 --- a/resources/lang/id/admin/users/message.php +++ b/resources/lang/id/admin/users/message.php @@ -1,6 +1,6 @@ 'Anda sukses menerima aset ini.', 'declined' => 'Anda sukses menolak aset ini.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integrasi LDAP belum dikonfigurasi untuk instalasi ini.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Pengguna sukses di buat.', 'update' => 'Pengguna sukses di perbarui.', 'update_bulk' => 'Pengguna berhasil diperbarui!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Pengguna sukses tidak di tangguhkan.', 'restored' => 'Pengguna sukses di kembalikan.', 'import' => 'Sukses mengimpor pengguna.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Terdapat kesalahan ketika membuat pengguna. Silahkan coba kembali.', 'update' => 'Terdapat masalah ketika memperbarui pengguna. Silahkan coba kembali.', 'delete' => 'Terdapat masalah ketika menghapus pengguna. Silahkan coba kembali.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Gagal mencari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:', 'ldap_could_not_get_entries' => 'Gagal menerima catatan dari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:', 'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP / Active Directory. Silakan menghubungi departemen TI Anda untuk mengganti kata sandi Anda.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Berkas belum terhapus. Silahkan coba kembali.', 'success' => 'Berkas sukses di hapus.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Berkas belum terunggah. Silakan coba kembali.', 'success' => 'Berkas sukses terunggah.', 'nofiles' => 'Anda belum memilih berkas untuk di unggah', 'invalidfiles' => 'Satu atau lebih dari file Anda terlalu besar atau jenis berkas yang tidak diperbolehkan. Tipe file diizinkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], -); +]; diff --git a/resources/lang/id/admin/users/table.php b/resources/lang/id/admin/users/table.php index 143aa12b60..e3ba16c1d4 100644 --- a/resources/lang/id/admin/users/table.php +++ b/resources/lang/id/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktif', 'allow' => 'Izinkan', 'checkedout' => 'Aset', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Tampilkan pengguna saat ini', 'show_deleted' => 'Tampilkan pengguna yang di hapus', 'title' => 'Judul', - 'to_restore_them' => 'untuk mengembalikannya', + 'to_restore_them' => 'untuk mengembalikannya', 'updateuser' => 'Perbarui Pengguna', 'username' => 'Nama Pengguna', - 'user_deleted_text' => 'Pengguna ini telah ditandai sebagai telah dihapus.', + 'user_deleted_text' => 'Pengguna ini telah ditandai sebagai telah dihapus.', 'username_note' => '(Ini digunakan untuk mengikat Active Directory saja, bukan untuk login.)', 'cloneuser' => 'Klon pengguna', 'viewusers' => 'Tampilkan Pengguna', -); +]; diff --git a/resources/lang/id/auth/general.php b/resources/lang/id/auth/general.php index 8ffbd325e8..3c2889d304 100644 --- a/resources/lang/id/auth/general.php +++ b/resources/lang/id/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/id/auth/message.php b/resources/lang/id/auth/message.php index f7be4e5d39..d846a0d5d9 100644 --- a/resources/lang/id/auth/message.php +++ b/resources/lang/id/auth/message.php @@ -1,6 +1,6 @@ 'Akun dengan ini email telah digunakan.', 'account_not_found' => 'Nama pengguna atau sandi tidak benar.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Akun pengguna ini dilarang.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Terdapat kesalahan ketika anda mencoba masuk, silahkan coba kembali.', 'success' => 'Anda berhasil masuk.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Terdapat kesalahan ketika membuat akun anda, silahkan coba kembali.', 'success' => 'Akun berhasil dibuat.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Terdapat kesalahan ketika reset kode kata sandi anda, silahkan coba kembali.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Terdapat kesalahan ketika reset kata sandi anda, silahkan coba kembali.', 'success' => 'Password anda sudah berhasil di reset.', - ), + ], - -); +]; diff --git a/resources/lang/id/button.php b/resources/lang/id/button.php index 5eef160166..9e61816d82 100644 --- a/resources/lang/id/button.php +++ b/resources/lang/id/button.php @@ -1,6 +1,6 @@ 'Tindakan', 'add' => 'Tambah Baru', 'cancel' => 'Batalkan', @@ -11,7 +11,7 @@ return array( 'request' => 'Permintaan', 'submit' => 'Kirim', 'upload' => 'Unggah', - 'select_file' => 'Pilih file...', + 'select_file' => 'Pilih file...', 'select_files' => 'Pilih File...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php index f26b56a895..8c0fc3d3a4 100644 --- a/resources/lang/id/general.php +++ b/resources/lang/id/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Masuk', 'user_requests_count' => 'Permintaan', 'city' => 'Kota', - 'click_here' => 'Klik disini', + 'click_here' => 'Klik disini', 'clear_selection' => 'Bersihkan Pilihan', 'companies' => 'Perusahaan', 'company' => 'Perusahaan', 'component' => 'Komponen', 'components' => 'Komponen', - 'complete' => 'Lengkap', + 'complete' => 'Lengkap', 'consumable' => 'Barang Habis Pakai', 'consumables' => 'Barang Habis Pakai', 'country' => 'Negara', diff --git a/resources/lang/id/help.php b/resources/lang/id/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/id/help.php +++ b/resources/lang/id/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/id/mail.php b/resources/lang/id/mail.php index fbff63bce4..c3f414c6e3 100644 --- a/resources/lang/id/mail.php +++ b/resources/lang/id/mail.php @@ -1,6 +1,6 @@ 'Pengguna telah membatalkan permintaan item di situs web', 'a_user_requested' => 'Pengguna telah meminta item di situs web', 'accessory_name' => 'Nama Aksesori:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/id/pagination.php b/resources/lang/id/pagination.php index af0f8ece41..edf0d05c55 100644 --- a/resources/lang/id/pagination.php +++ b/resources/lang/id/pagination.php @@ -1,6 +1,6 @@ 'Selanjutnya »', -); +]; diff --git a/resources/lang/id/passwords.php b/resources/lang/id/passwords.php index 1e069a53ea..c6f6769282 100644 --- a/resources/lang/id/passwords.php +++ b/resources/lang/id/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Tautan sandi Anda telah dikirim!', 'user' => 'Tidak ada satupun pengguna aktif yang menggunakan email ini.', ]; - diff --git a/resources/lang/id/reminders.php b/resources/lang/id/reminders.php index ec797a949b..6e6e838c56 100644 --- a/resources/lang/id/reminders.php +++ b/resources/lang/id/reminders.php @@ -1,6 +1,6 @@ "Kata sandi harus 6 karakter dan sama.", + 'password' => 'Kata sandi harus 6 karakter dan sama.', - "user" => "Nama pengguna atau alamat email salah", + 'user' => 'Nama pengguna atau alamat email salah', - "token" => "Password reset token tidak valid.", + 'token' => 'Password reset token tidak valid.', - "sent" => "Jika alamat email yang cocok ditemukan, pengingat password telah dikirim!", + 'sent' => 'Jika alamat email yang cocok ditemukan, pengingat password telah dikirim!', -); +]; diff --git a/resources/lang/id/table.php b/resources/lang/id/table.php index c3c135e756..036b0ee0de 100644 --- a/resources/lang/id/table.php +++ b/resources/lang/id/table.php @@ -1,10 +1,10 @@ 'Tindakan', 'action' => 'Tindakan', 'by' => 'Oleh', 'item' => 'Item', -); +]; diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php index 1efb66d809..4a592fd588 100644 --- a/resources/lang/id/validation.php +++ b/resources/lang/id/validation.php @@ -1,6 +1,6 @@ ':attribute sudah digunakan.', 'uploaded' => 'Atribut: gagal diupload.', 'url' => 'Format :attribute tidak benar.', - "unique_undeleted" => ":attribute harus unik.", + 'unique_undeleted' => ':attribute harus unik.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Bidang atribut: berisi karakter yang tidak diizinkan.", - "email_array" => "Satu atau lebih alamat email tidak valid.", - "hashed_pass" => "Kata sandi Anda saat ini salah", + 'alpha_space' => 'Bidang atribut: berisi karakter yang tidak diizinkan.', + 'email_array' => 'Satu atau lebih alamat email tidak valid.', + 'hashed_pass' => 'Kata sandi Anda saat ini salah', 'dumbpwd' => 'Password itu terlalu umum', - "statuslabel_type" => "Anda harus memilih jenis label status yang valid", + 'statuslabel_type' => 'Anda harus memilih jenis label status yang valid', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/is/admin/accessories/general.php b/resources/lang/is/admin/accessories/general.php index 779e74ebf8..d40beeca2a 100644 --- a/resources/lang/is/admin/accessories/general.php +++ b/resources/lang/is/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Flokkur aukabúnaðs', 'accessory_name' => 'Nafn aukabúnaðs', 'checkout' => 'Afgreiða aukabúnað', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Notaðu frekar ', 'use_default_eula_disabled' => 'Notaðu frekar sjálfgefna notendaskilmálana.Sjálfgefnu notendaskilmálarnir eru ekki í notkun. Vinsamlegast bættu einhverjum notendaskilmálum við í undir "Stillingar"', -); +]; diff --git a/resources/lang/is/admin/accessories/message.php b/resources/lang/is/admin/accessories/message.php index a1e033f55e..712d2da070 100644 --- a/resources/lang/is/admin/accessories/message.php +++ b/resources/lang/is/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Þessi aukabúnaður er nú þegar: count items sem skráð eru á notendur. Vinsamlegast skráðu inn aukabúnaðinn og reyndu aftur! ', - 'create' => array( + 'create' => [ 'error' => 'Aukabúnaðurinn var ekki skráður, vinsamlegast reyndu aftur!', - 'success' => 'Aukabúnaðurinn var skráður.' - ), + 'success' => 'Aukabúnaðurinn var skráður.', + ], - 'update' => array( + 'update' => [ 'error' => 'Aukabúnaðurinn var ekki uppfærður, vinsamlegast reyndu aftur!', - 'success' => 'Aukabúnaðurinn var uppfærður.' - ), + 'success' => 'Aukabúnaðurinn var uppfærður.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Viltu örugglega eyða þessum tiltekna aukabúnaði?', 'error' => 'Það var eitthvað smá vesen að eyða aukabúnaðinum, vinsamlegast reyndu aftur.', - 'success' => 'Aukabúnaðinum var eytt.' - ), + 'success' => 'Aukabúnaðinum var eytt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aukabúnaður fór ekki í úttekt, vinsamlegast reyndu aftur!', 'success' => 'Aukabúnaður fór í úttekt.', - 'user_does_not_exist' => 'Notandinn er ónothæfur. Vinsamlegast reyndu aftur.' - ), + 'user_does_not_exist' => 'Notandinn er ónothæfur. Vinsamlegast reyndu aftur.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aukabúnaði var ekki skilað, vinsamlegast reyndu aftur!', 'success' => 'Aukabúnaði var skilað inn.', - 'user_does_not_exist' => 'Þessi notandi er ónothæfur, vinsamlegast reyndu aftur.' - ) + 'user_does_not_exist' => 'Þessi notandi er ónothæfur, vinsamlegast reyndu aftur.', + ], - -); +]; diff --git a/resources/lang/is/admin/accessories/table.php b/resources/lang/is/admin/accessories/table.php index 651fe6e95c..edd9db82ab 100644 --- a/resources/lang/is/admin/accessories/table.php +++ b/resources/lang/is/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Sækja CSV', - 'eula_text' => 'LSN', +return [ + 'dl_csv' => 'Sækja CSV', + 'eula_text' => 'LSN', 'id' => 'Auðkenni', 'require_acceptance' => 'Samþykki', 'title' => 'Nafn aukabúnaðar', - -); +]; diff --git a/resources/lang/is/admin/asset_maintenances/form.php b/resources/lang/is/admin/asset_maintenances/form.php index 40d0f0b659..438f2fdb4c 100644 --- a/resources/lang/is/admin/asset_maintenances/form.php +++ b/resources/lang/is/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dagar', 'notes' => 'Athugasemdir', 'update' => 'Uppfæra', - 'create' => 'Búa til' + 'create' => 'Búa til', ]; diff --git a/resources/lang/is/admin/asset_maintenances/message.php b/resources/lang/is/admin/asset_maintenances/message.php index 53414d0667..e32b21d60d 100644 --- a/resources/lang/is/admin/asset_maintenances/message.php +++ b/resources/lang/is/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Ekk klárað', 'warranty' => 'Ábyrgð', 'not_warranty' => 'Ekki ábyrgð', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/is/admin/asset_maintenances/table.php b/resources/lang/is/admin/asset_maintenances/table.php index b36696effb..8dbb029a3c 100644 --- a/resources/lang/is/admin/asset_maintenances/table.php +++ b/resources/lang/is/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Ábyrgð', - 'dl_csv' => 'Sækja CSV' + 'dl_csv' => 'Sækja CSV', ]; diff --git a/resources/lang/is/admin/categories/general.php b/resources/lang/is/admin/categories/general.php index eedea07f6f..7a6a1e71e9 100644 --- a/resources/lang/is/admin/categories/general.php +++ b/resources/lang/is/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Heiti Vöruflokks', 'checkin_email' => 'Senda tölvupóst til notenda til að skrá sig inn / út.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Notaðu frekar ', 'use_default_eula_disabled' => 'Notaðu frekar sjálfgefna notendaskilmálana.Sjálfgefnu notendaskilmálarnir eru ekki í notkun. Vinsamlegast bættu einhverjum notendaskilmálum við í undir "Stillingar"', -); +]; diff --git a/resources/lang/is/admin/categories/message.php b/resources/lang/is/admin/categories/message.php index 2a6b45b89f..ef81ffa101 100644 --- a/resources/lang/is/admin/categories/message.php +++ b/resources/lang/is/admin/categories/message.php @@ -1,25 +1,25 @@ 'Vöruflokkur er ekki til.', 'assoc_models' => 'Þessi vöruflokkur er tengdur við eitt módel og ekki er hægt að eyða honum. Vinsamlegast uppfærðu módelin, þannig að þau tengist ekki þessum vöruflokk og reyndu aftur. ', 'assoc_items' => 'Þessi vöruflokkur er tengdur við eina tegund búnaðar og ekki er hægt að eyða honum. Vinsamlegast uppfærðu tegund búnaðar (asset_type), þannig að þau tengist ekki þessum vöruflokk og reyndu aftur. ', - 'create' => array( + 'create' => [ 'error' => 'Vöruflokkur var ekki skráður, vinsamlegast reyndu aftur.', - 'success' => 'Vöruflokkur var stofnaður.' - ), + 'success' => 'Vöruflokkur var stofnaður.', + ], - 'update' => array( + 'update' => [ 'error' => 'Vöruflokkur var ekki uppfærður, vinsamlegast reyndu aftur', - 'success' => 'Vöruflokkur var uppfærður.' - ), + 'success' => 'Vöruflokkur var uppfærður.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ertu viss um að þú viljir eyða vöruflokk?', 'error' => 'Það var villa við að eyða vöruflokk. Vinsamlegast reyndu aftur.', - 'success' => 'Vöruflokk var eytt.' - ) + 'success' => 'Vöruflokk var eytt.', + ], -); +]; diff --git a/resources/lang/is/admin/categories/table.php b/resources/lang/is/admin/categories/table.php index 8209845522..9500a59393 100644 --- a/resources/lang/is/admin/categories/table.php +++ b/resources/lang/is/admin/categories/table.php @@ -1,10 +1,10 @@ 'Notendaskilmálar', +return [ + 'eula_text' => 'Notendaskilmálar', 'id' => 'Auðkenni', 'parent' => 'Yfir', 'require_acceptance' => 'Samþykki', 'title' => 'Flokkur búnaðar', -); +]; diff --git a/resources/lang/is/admin/companies/general.php b/resources/lang/is/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/is/admin/companies/general.php +++ b/resources/lang/is/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/is/admin/companies/message.php b/resources/lang/is/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/is/admin/companies/message.php +++ b/resources/lang/is/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/is/admin/companies/table.php b/resources/lang/is/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/is/admin/companies/table.php +++ b/resources/lang/is/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/is/admin/components/general.php b/resources/lang/is/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/is/admin/components/general.php +++ b/resources/lang/is/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/is/admin/components/message.php b/resources/lang/is/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/is/admin/components/message.php +++ b/resources/lang/is/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/is/admin/components/table.php b/resources/lang/is/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/is/admin/components/table.php +++ b/resources/lang/is/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/is/admin/consumables/general.php b/resources/lang/is/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/is/admin/consumables/general.php +++ b/resources/lang/is/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/is/admin/consumables/message.php b/resources/lang/is/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/is/admin/consumables/message.php +++ b/resources/lang/is/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/is/admin/consumables/table.php b/resources/lang/is/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/is/admin/consumables/table.php +++ b/resources/lang/is/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/is/admin/custom_fields/general.php b/resources/lang/is/admin/custom_fields/general.php index c8d2a70a71..011f983f77 100644 --- a/resources/lang/is/admin/custom_fields/general.php +++ b/resources/lang/is/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/is/admin/custom_fields/message.php b/resources/lang/is/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/is/admin/custom_fields/message.php +++ b/resources/lang/is/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/is/admin/departments/message.php b/resources/lang/is/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/is/admin/departments/message.php +++ b/resources/lang/is/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/is/admin/departments/table.php b/resources/lang/is/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/is/admin/departments/table.php +++ b/resources/lang/is/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/is/admin/depreciations/general.php b/resources/lang/is/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/is/admin/depreciations/general.php +++ b/resources/lang/is/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/is/admin/depreciations/message.php b/resources/lang/is/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/is/admin/depreciations/message.php +++ b/resources/lang/is/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/is/admin/depreciations/table.php b/resources/lang/is/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/is/admin/depreciations/table.php +++ b/resources/lang/is/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/is/admin/groups/message.php b/resources/lang/is/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/is/admin/groups/message.php +++ b/resources/lang/is/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/is/admin/groups/table.php b/resources/lang/is/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/is/admin/groups/table.php +++ b/resources/lang/is/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/is/admin/groups/titles.php b/resources/lang/is/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/is/admin/groups/titles.php +++ b/resources/lang/is/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/is/admin/hardware/form.php b/resources/lang/is/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/is/admin/hardware/form.php +++ b/resources/lang/is/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/is/admin/hardware/general.php b/resources/lang/is/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/is/admin/hardware/general.php +++ b/resources/lang/is/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/is/admin/hardware/message.php b/resources/lang/is/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/is/admin/hardware/message.php +++ b/resources/lang/is/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/is/admin/hardware/table.php b/resources/lang/is/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/is/admin/hardware/table.php +++ b/resources/lang/is/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/is/admin/kits/general.php b/resources/lang/is/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/is/admin/kits/general.php +++ b/resources/lang/is/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/is/admin/licenses/form.php b/resources/lang/is/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/is/admin/licenses/form.php +++ b/resources/lang/is/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/is/admin/licenses/general.php b/resources/lang/is/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/is/admin/licenses/general.php +++ b/resources/lang/is/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/is/admin/licenses/message.php b/resources/lang/is/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/is/admin/licenses/message.php +++ b/resources/lang/is/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/is/admin/licenses/table.php b/resources/lang/is/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/is/admin/licenses/table.php +++ b/resources/lang/is/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/is/admin/locations/message.php b/resources/lang/is/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/is/admin/locations/message.php +++ b/resources/lang/is/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/is/admin/locations/table.php b/resources/lang/is/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/is/admin/locations/table.php +++ b/resources/lang/is/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/is/admin/manufacturers/message.php b/resources/lang/is/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/is/admin/manufacturers/message.php +++ b/resources/lang/is/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/is/admin/manufacturers/table.php b/resources/lang/is/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/is/admin/manufacturers/table.php +++ b/resources/lang/is/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/is/admin/models/general.php b/resources/lang/is/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/is/admin/models/general.php +++ b/resources/lang/is/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/is/admin/models/message.php b/resources/lang/is/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/is/admin/models/message.php +++ b/resources/lang/is/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/is/admin/models/table.php b/resources/lang/is/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/is/admin/models/table.php +++ b/resources/lang/is/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/is/admin/reports/general.php b/resources/lang/is/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/is/admin/reports/general.php +++ b/resources/lang/is/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/is/admin/reports/message.php b/resources/lang/is/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/is/admin/reports/message.php +++ b/resources/lang/is/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/is/admin/settings/general.php b/resources/lang/is/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/is/admin/settings/general.php +++ b/resources/lang/is/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/is/admin/settings/message.php b/resources/lang/is/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/is/admin/settings/message.php +++ b/resources/lang/is/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/is/admin/statuslabels/message.php b/resources/lang/is/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/is/admin/statuslabels/message.php +++ b/resources/lang/is/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/is/admin/statuslabels/table.php b/resources/lang/is/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/is/admin/statuslabels/table.php +++ b/resources/lang/is/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/is/admin/suppliers/message.php b/resources/lang/is/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/is/admin/suppliers/message.php +++ b/resources/lang/is/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/is/admin/suppliers/table.php b/resources/lang/is/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/is/admin/suppliers/table.php +++ b/resources/lang/is/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/is/admin/users/general.php b/resources/lang/is/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/is/admin/users/general.php +++ b/resources/lang/is/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/is/admin/users/message.php b/resources/lang/is/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/is/admin/users/message.php +++ b/resources/lang/is/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/is/admin/users/table.php b/resources/lang/is/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/is/admin/users/table.php +++ b/resources/lang/is/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/is/auth/general.php b/resources/lang/is/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/is/auth/general.php +++ b/resources/lang/is/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/is/auth/message.php b/resources/lang/is/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/is/auth/message.php +++ b/resources/lang/is/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/is/button.php b/resources/lang/is/button.php index c75123f2e1..a18e1c9a86 100644 --- a/resources/lang/is/button.php +++ b/resources/lang/is/button.php @@ -1,6 +1,6 @@ 'Aðgerðir', 'add' => 'Bæta við nýjum', 'cancel' => 'Hætta við', @@ -11,7 +11,7 @@ return array( 'request' => 'Óska eftir', 'submit' => 'Staðfesta', 'upload' => 'Hlaða upp', - 'select_file' => 'Velja skrá...', + 'select_file' => 'Velja skrá...', 'select_files' => 'Velja skrár...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php index e40e5cf01c..6deab13c32 100644 --- a/resources/lang/is/general.php +++ b/resources/lang/is/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Borg', - 'click_here' => 'Smelltu hér', + 'click_here' => 'Smelltu hér', 'clear_selection' => 'Hreinsa val', 'companies' => 'Fyrirtæki', 'company' => 'Fyrirtæki', 'component' => 'Eining', 'components' => 'Einingar', - 'complete' => 'Lokið', + 'complete' => 'Lokið', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/is/help.php b/resources/lang/is/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/is/help.php +++ b/resources/lang/is/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/is/mail.php b/resources/lang/is/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/is/mail.php +++ b/resources/lang/is/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/is/pagination.php b/resources/lang/is/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/is/pagination.php +++ b/resources/lang/is/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/is/passwords.php b/resources/lang/is/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/is/passwords.php +++ b/resources/lang/is/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/is/reminders.php b/resources/lang/is/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/is/reminders.php +++ b/resources/lang/is/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/is/table.php b/resources/lang/is/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/is/table.php +++ b/resources/lang/is/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/is/validation.php b/resources/lang/is/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/is/validation.php +++ b/resources/lang/is/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/it/admin/accessories/general.php b/resources/lang/it/admin/accessories/general.php index 16433fffa3..17f83f3462 100644 --- a/resources/lang/it/admin/accessories/general.php +++ b/resources/lang/it/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoria Accessorio', 'accessory_name' => 'Nome Accessorio', 'checkout' => 'Checkout accessorio', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Usa L\'EULA predefinita invece.', 'use_default_eula_disabled' => 'Usa L\'EULA predefinita. Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.', -); +]; diff --git a/resources/lang/it/admin/accessories/message.php b/resources/lang/it/admin/accessories/message.php index bc912dca1f..179d0b7f73 100644 --- a/resources/lang/it/admin/accessories/message.php +++ b/resources/lang/it/admin/accessories/message.php @@ -1,37 +1,36 @@ 'L\'accessorio [:id] non esiste.', 'assoc_users' => 'Questo accessorio ha attualmente :count elementi controllati agli utenti. Si prega di controllare negli accessori e e riprovare. ', - 'create' => array( + 'create' => [ 'error' => 'L\'accessorio non è stato creato, si prega di riprovare.', - 'success' => 'Accessorio creato con successo.' - ), + 'success' => 'Accessorio creato con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'L\'accessorio non è stato aggiornato, si prega di riprovare', - 'success' => 'Accessorio aggiornato con successo.' - ), + 'success' => 'Accessorio aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare quest\'accessorio?', 'error' => 'Si è verificato un problema cercando di eliminare l\'accessorio. Si prega di riprovare.', - 'success' => 'L\'accessorio è stato eliminato con successo.' - ), + 'success' => 'L\'accessorio è stato eliminato con successo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'L\'accessorio non è stato estratto, si prega di riprovare', 'success' => 'Accessorio estratto con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ), + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'L\'accessorio non è stato controllato, si prega di riprovare', 'success' => 'Accessorio controllato con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ) + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - -); +]; diff --git a/resources/lang/it/admin/accessories/table.php b/resources/lang/it/admin/accessories/table.php index 80e733abe3..f08e107be4 100644 --- a/resources/lang/it/admin/accessories/table.php +++ b/resources/lang/it/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Scarica CSV', - 'eula_text' => 'ELUA', +return [ + 'dl_csv' => 'Scarica CSV', + 'eula_text' => 'ELUA', 'id' => 'ID', 'require_acceptance' => 'Accettazione', 'title' => 'Nome Accessorio', - -); +]; diff --git a/resources/lang/it/admin/asset_maintenances/form.php b/resources/lang/it/admin/asset_maintenances/form.php index 42db094a07..efcfebaf43 100644 --- a/resources/lang/it/admin/asset_maintenances/form.php +++ b/resources/lang/it/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tempo Manutenzione Prodotto (in giorni)', 'notes' => 'Note', 'update' => 'Aggiorna Manutenzione Prodotto', - 'create' => 'Crea Manutenzione Prodotto' + 'create' => 'Crea Manutenzione Prodotto', ]; diff --git a/resources/lang/it/admin/asset_maintenances/message.php b/resources/lang/it/admin/asset_maintenances/message.php index 137bb88852..5d36235a37 100644 --- a/resources/lang/it/admin/asset_maintenances/message.php +++ b/resources/lang/it/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questa manutenzione garanzia?', 'error' => 'C\'è stato un problema eliminando la manutenzione garanzia. Riprova.', - 'success' => 'Manutenzione prodotto eliminata con successo.' + 'success' => 'Manutenzione prodotto eliminata con successo.', ], 'create' => [ 'error' => 'Manutenzione prodotto non creata, riprova.', - 'success' => 'Manutenzione prodotto creata con successo.' + 'success' => 'Manutenzione prodotto creata con successo.', ], 'edit' => [ 'error' => 'La manutenzione degli asset non è stata modificata, riprova.', - 'success' => 'La manutenzione degli asset è stata modificata correttamente.' + 'success' => 'La manutenzione degli asset è stata modificata correttamente.', ], 'asset_maintenance_incomplete' => 'Non ancora completato', 'warranty' => 'Garanzia', 'not_warranty' => 'Senza garanzia', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/it/admin/asset_maintenances/table.php b/resources/lang/it/admin/asset_maintenances/table.php index f07221bfd4..107a0a62a9 100644 --- a/resources/lang/it/admin/asset_maintenances/table.php +++ b/resources/lang/it/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Manutenzione Prodotto', 'asset_name' => 'Nome prodotto', 'is_warranty' => 'Garanzia', - 'dl_csv' => 'Scarica CSV' + 'dl_csv' => 'Scarica CSV', ]; diff --git a/resources/lang/it/admin/categories/general.php b/resources/lang/it/admin/categories/general.php index c587ea7693..e1b65b9fc9 100644 --- a/resources/lang/it/admin/categories/general.php +++ b/resources/lang/it/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorie dei Beni', 'category_name' => 'Nome categoria', 'checkin_email' => 'Invia email all\'utente al ritiro / consegna.', @@ -20,4 +20,4 @@ return array( Usa L\'EULA predefinita invece.', 'use_default_eula_disabled' => 'Usa L\'EULA predefinita. Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.', -); +]; diff --git a/resources/lang/it/admin/categories/message.php b/resources/lang/it/admin/categories/message.php index b7328ef6e2..9f9128a250 100644 --- a/resources/lang/it/admin/categories/message.php +++ b/resources/lang/it/admin/categories/message.php @@ -1,25 +1,25 @@ 'La categoria non esiste.', 'assoc_models' => 'Questa categoria è attualmente associata ad almeno un modello pertanto non può essere eliminata. Aggiorna i tuoi modelli e riprova. ', 'assoc_items' => 'Questa categoria è attualmente associata ad almeno un :asset_type pertanto non può essere eliminata. Aggiorna il tuo :asset_type e riprova. ', - 'create' => array( + 'create' => [ 'error' => 'La categoria non è stata creata, si prega di riprovare.', - 'success' => 'Categoria creata con successo.' - ), + 'success' => 'Categoria creata con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'La categoria non è stata aggiornata, si prega di riprovare', - 'success' => 'Categoria aggiornata con successo.' - ), + 'success' => 'Categoria aggiornata con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questa categoria?', 'error' => 'Si è verificato un problema cercando di eliminare la categoria. Riprova.', - 'success' => 'La categoria è stata eliminata con successo.' - ) + 'success' => 'La categoria è stata eliminata con successo.', + ], -); +]; diff --git a/resources/lang/it/admin/categories/table.php b/resources/lang/it/admin/categories/table.php index 632694e6be..59c21e16df 100644 --- a/resources/lang/it/admin/categories/table.php +++ b/resources/lang/it/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Padre', 'require_acceptance' => 'Accettazione', 'title' => 'Nome Categoria Bene', -); +]; diff --git a/resources/lang/it/admin/companies/general.php b/resources/lang/it/admin/companies/general.php index 2bbea8475e..b2f9e4976b 100644 --- a/resources/lang/it/admin/companies/general.php +++ b/resources/lang/it/admin/companies/general.php @@ -1,4 +1,5 @@ 'Seleziona Azienda', ]; diff --git a/resources/lang/it/admin/companies/message.php b/resources/lang/it/admin/companies/message.php index a286a8fb65..8c87a41ad0 100644 --- a/resources/lang/it/admin/companies/message.php +++ b/resources/lang/it/admin/companies/message.php @@ -1,18 +1,19 @@ 'L\'azienda non esiste.', 'assoc_users' => 'Questa azienda è attualmente associata con almeno un modello e non può essere cancellata. Aggiorna i tuoi modelli perchè non facciano più riferimento a questa azienda e riprova. ', - 'create' => array( + 'create' => [ 'error' => 'L\'azienda non è stata creata, riprova.', - 'success' => 'Azienda creata con successo.' - ), - 'update' => array( + 'success' => 'Azienda creata con successo.', + ], + 'update' => [ 'error' => 'Azienda non aggiornata, riprova', - 'success' => 'Azienda aggiornata con successo.' - ), - 'delete' => array( + 'success' => 'Azienda aggiornata con successo.', + ], + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questa azienda?', 'error' => 'Si è verificato un problema eliminando l\'azienda. Riprova.', - 'success' => 'L\'azienda è stata cancellata con successo.' - ) -); + 'success' => 'L\'azienda è stata cancellata con successo.', + ], +]; diff --git a/resources/lang/it/admin/companies/table.php b/resources/lang/it/admin/companies/table.php index aa296ce6e8..309523628e 100644 --- a/resources/lang/it/admin/companies/table.php +++ b/resources/lang/it/admin/companies/table.php @@ -1,9 +1,10 @@ 'Aziende', 'create' => 'Crea Azienda', 'title' => 'Azienda', 'update' => 'Aggiorna Azienda', 'name' => 'Nome Azienda', 'id' => 'ID', -); +]; diff --git a/resources/lang/it/admin/components/general.php b/resources/lang/it/admin/components/general.php index 9d6b4ddd89..67acec6b41 100644 --- a/resources/lang/it/admin/components/general.php +++ b/resources/lang/it/admin/components/general.php @@ -1,6 +1,6 @@ 'Nome Componente', 'checkin' => 'Checkin Componente', 'checkout' => 'Checkout Componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Rimanenti', 'total' => 'Totale', 'update' => 'Aggiorna Componente', -); +]; diff --git a/resources/lang/it/admin/components/message.php b/resources/lang/it/admin/components/message.php index c7b42859e5..7a7a284a43 100644 --- a/resources/lang/it/admin/components/message.php +++ b/resources/lang/it/admin/components/message.php @@ -1,36 +1,35 @@ 'Il Componente non esiste.', - 'create' => array( + 'create' => [ 'error' => 'Il Componente non è stato creato, riprova.', - 'success' => 'Componente creato correttamente.' - ), + 'success' => 'Componente creato correttamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'Il Componente non è stato aggiornato, riprova', - 'success' => 'Componente aggiornato correttamente.' - ), + 'success' => 'Componente aggiornato correttamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questo Componente?', 'error' => 'Si è verificato un problema durante l\'eliminazione del componente. Riprova.', - 'success' => 'Il componente è stato eliminato correttamente.' - ), + 'success' => 'Il componente è stato eliminato correttamente.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Il Componente non è stato controllato, si prega di riprovare', 'success' => 'Componente controllato con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ), + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Il Componente non è stato controllato, si prega di riprovare', 'success' => 'Componente controllato con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ) + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - -); +]; diff --git a/resources/lang/it/admin/components/table.php b/resources/lang/it/admin/components/table.php index f8c4cea664..6f64dd4884 100644 --- a/resources/lang/it/admin/components/table.php +++ b/resources/lang/it/admin/components/table.php @@ -1,5 +1,5 @@ 'Nome Componente', -); +]; diff --git a/resources/lang/it/admin/consumables/general.php b/resources/lang/it/admin/consumables/general.php index 3f3a766459..4fbb36fb7a 100644 --- a/resources/lang/it/admin/consumables/general.php +++ b/resources/lang/it/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumabile all\'utente', 'consumable_name' => 'Nome Consumabile', 'create' => 'Crea Consumabile', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Rimanenti', 'total' => 'Totale', 'update' => 'Aggiorna Consumabile', -); +]; diff --git a/resources/lang/it/admin/consumables/message.php b/resources/lang/it/admin/consumables/message.php index 977dc0d151..f9ddfee0c4 100644 --- a/resources/lang/it/admin/consumables/message.php +++ b/resources/lang/it/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Il consumabile non esiste.', - 'create' => array( + 'create' => [ 'error' => 'Il consumabile non è stato creato, prova di nuovo.', - 'success' => 'Il consumabile è stato creato con successo.' - ), + 'success' => 'Il consumabile è stato creato con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Il consumabile non è stato aggiornato, prova di nuovo', - 'success' => 'Il consumabile è stato aggiornato con successo.' - ), + 'success' => 'Il consumabile è stato aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questo consumabile?', 'error' => 'C\'è stato un problema durante l\'eliminazione del consumabile. Prova di nuovo.', - 'success' => 'Il consumabile è stato cancellato con successo.' - ), + 'success' => 'Il consumabile è stato cancellato con successo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Il consumabile non è stato controllato, prova di nuovo', 'success' => 'Il consumabile è stato controllato con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ), + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Il consumabile non è stato controllato, prova di nuovo', 'success' => 'Il consumabile è stato controllato con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' - ) + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + ], - -); +]; diff --git a/resources/lang/it/admin/consumables/table.php b/resources/lang/it/admin/consumables/table.php index f1244e2405..af1004e24a 100644 --- a/resources/lang/it/admin/consumables/table.php +++ b/resources/lang/it/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nome Consumabile', -); +]; diff --git a/resources/lang/it/admin/custom_fields/general.php b/resources/lang/it/admin/custom_fields/general.php index 83a618f9e7..284516fbcb 100644 --- a/resources/lang/it/admin/custom_fields/general.php +++ b/resources/lang/it/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campi Personalizzati', 'field' => 'Campo', 'about_fieldsets_title' => 'Fileldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nuovo campo personalizzato', 'value_encrypted' => 'Il valore di questo campo viene crittografato nel database. Solo gli utenti amministratori saranno in grado di visualizzare il valore decrittografato', 'show_in_email' => 'Includere il valore di questo campo nelle e-mail di checkout inviate all\'utente? I campi crittografati non possono essere inclusi nelle e-mail.', -); +]; diff --git a/resources/lang/it/admin/custom_fields/message.php b/resources/lang/it/admin/custom_fields/message.php index 84c8a03306..4aa39b2d35 100644 --- a/resources/lang/it/admin/custom_fields/message.php +++ b/resources/lang/it/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Il campo non esiste.', 'already_added' => 'Campo già aggiunto', - 'create' => array( + 'create' => [ 'error' => 'Campo non creato, riprova.', 'success' => 'Campo creato con successo.', - 'assoc_success' => 'Campo aggiunto correttamente al fieldset.' - ), + 'assoc_success' => 'Campo aggiunto correttamente al fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Campo non aggiornato, riprova', - 'success' => 'Campo aggiornato con successo.' - ), + 'success' => 'Campo aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Si è sicuri di voler cancellare questo campo?', 'error' => 'C\'è stato un problema cancellando il campo. Riprova.', 'success' => 'Campo cancellato con successo.', 'in_use' => 'Campo ancora in uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset non esiste', - 'create' => array( + 'create' => [ 'error' => 'Il Fieldset non è stato creato, riprova.', - 'success' => 'Fieldset creato con successo.' - ), + 'success' => 'Fieldset creato con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Il Fieldset non è stato aggiornato, riprova', - 'success' => 'Fieldset aggiornato con successo.' - ), + 'success' => 'Fieldset aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Si è sicuri di voler cancellare questo fieldset?', 'error' => 'C\'è stato un problema cancellando il fieldset. Riprova.', 'success' => 'Fieldset cancellato con successo.', 'in_use' => 'Fieldset ancora in uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/it/admin/departments/message.php b/resources/lang/it/admin/departments/message.php index a3ca000fb1..a7f647fae4 100644 --- a/resources/lang/it/admin/departments/message.php +++ b/resources/lang/it/admin/departments/message.php @@ -1,21 +1,21 @@ 'Il dipartimento non esiste.', 'assoc_users' => 'Questo reparto è attualmente associato a almeno un utente e non può essere eliminato. Aggiorna i tuoi utenti per non fare più riferimento a questo reparto e riprovare.', - 'create' => array( + 'create' => [ 'error' => 'Il reparto non è stato creato, riprova.', - 'success' => 'Dipartimento creato con successo.' - ), - 'update' => array( + 'success' => 'Dipartimento creato con successo.', + ], + 'update' => [ 'error' => 'Dipartimento non è stato aggiornato, riprova', - 'success' => 'Dipartimento aggiornato con successo.' - ), - 'delete' => array( + 'success' => 'Dipartimento aggiornato con successo.', + ], + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questo reparto?', 'error' => 'Si è verificato un problema eliminando il reparto. Riprova.', - 'success' => 'Il reparto è stato eliminato correttamente.' - ) + 'success' => 'Il reparto è stato eliminato correttamente.', + ], -); +]; diff --git a/resources/lang/it/admin/departments/table.php b/resources/lang/it/admin/departments/table.php index 49deac78fc..d6dcfc8c47 100644 --- a/resources/lang/it/admin/departments/table.php +++ b/resources/lang/it/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nome Dipartimento', @@ -8,4 +8,4 @@ return array( 'location' => 'luogo', 'create' => 'Crea reparto', 'update' => 'Reparto aggiornamento', - ); + ]; diff --git a/resources/lang/it/admin/depreciations/general.php b/resources/lang/it/admin/depreciations/general.php index df68659f63..733a345655 100644 --- a/resources/lang/it/admin/depreciations/general.php +++ b/resources/lang/it/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Obsolescenza Asset', 'about_depreciations' => 'Puoi settare l\'obsolescenza di un Asset per deprezzarlo in base alle percentuale di Obsolescenza.', 'asset_depreciations' => 'Obsolescenza Asset', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Numero di Mesi', 'update' => 'Aggiorna l\'ammortamento', -); +]; diff --git a/resources/lang/it/admin/depreciations/message.php b/resources/lang/it/admin/depreciations/message.php index 0a1a770f49..de8e9c2a65 100644 --- a/resources/lang/it/admin/depreciations/message.php +++ b/resources/lang/it/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'La classe di Obsolescenza non esiste.', 'assoc_users' => 'Il tipo di obsolescenza è associato con una o più modelli e non può essere cancellato. Prima cancella i modelli correlati e poi riprova a cancellarlo.', - - 'create' => array( + 'create' => [ 'error' => 'La classe di Obsolescenza non è stata creata, riprova per favore. :(', - 'success' => 'La classe di Obsolescenza è stata creata correttamente. :)' - ), + 'success' => 'La classe di Obsolescenza è stata creata correttamente. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'La classe di Obsolescenza non è stata aggiornata, per favore riprova', - 'success' => 'La Classe di obsolescenza è stata aggiornate correttamente.' - ), + 'success' => 'La Classe di obsolescenza è stata aggiornate correttamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare la classe di obsolescenza?', 'error' => 'C\'è stato un problema durante la cancellazione della classe. Per favore riprova.', - 'success' => 'La classe è stata cancellata con successo.' - ) + 'success' => 'La classe è stata cancellata con successo.', + ], -); +]; diff --git a/resources/lang/it/admin/depreciations/table.php b/resources/lang/it/admin/depreciations/table.php index fd85f54bd1..02abf95074 100644 --- a/resources/lang/it/admin/depreciations/table.php +++ b/resources/lang/it/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Mesi', 'term' => 'Termine', 'title' => 'Nome ', -); +]; diff --git a/resources/lang/it/admin/groups/message.php b/resources/lang/it/admin/groups/message.php index 290b4bc2db..fa086506e5 100644 --- a/resources/lang/it/admin/groups/message.php +++ b/resources/lang/it/admin/groups/message.php @@ -1,22 +1,22 @@ 'Il gruppo esiste già!', 'group_not_found' => 'Il Gruppo [:id] non esiste.', 'group_name_required' => 'E\' richiesto il Nome del campo', - 'success' => array( + 'success' => [ 'create' => 'Il gruppo è stato creato con successo.', 'update' => 'Il gruppo è stato modificato con successo.', 'delete' => 'Il gruppo è stato cancellato con successo.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare il gruppo?', 'create' => 'C\'è stato un problema durante la creazione del gruppo. per favore riprova.', 'update' => 'C\'è stato un problema durante la modifica del gruppo. Riprova per favore.', 'delete' => 'C\'è stato un problema durante la cancellazione del gruppo. Riprova per favore.', - ), + ], -); +]; diff --git a/resources/lang/it/admin/groups/table.php b/resources/lang/it/admin/groups/table.php index cb114d16a1..d36201a6f0 100644 --- a/resources/lang/it/admin/groups/table.php +++ b/resources/lang/it/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nome', 'users' => 'N° di Utenti', -); +]; diff --git a/resources/lang/it/admin/groups/titles.php b/resources/lang/it/admin/groups/titles.php index 7ac8f60aa5..610ad8c9a2 100644 --- a/resources/lang/it/admin/groups/titles.php +++ b/resources/lang/it/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Informazioni sui gruppi', 'about_groups' => 'I gruppi sono usati per generalizzare i permessi degli utenti.', 'group_management' => 'Gestione Gruppo', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permetti', 'deny' => 'Rifiuta', -); +]; diff --git a/resources/lang/it/admin/hardware/form.php b/resources/lang/it/admin/hardware/form.php index bd56d74f40..f56b2a252e 100644 --- a/resources/lang/it/admin/hardware/form.php +++ b/resources/lang/it/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confermi elementi di eliminazione di massa', +return [ + 'bulk_delete' => 'Confermi elementi di eliminazione di massa', 'bulk_delete_help' => 'Rivedi gli assets sottostanti per la cancellazione massiva. Una volta cancellati, questi assets potranno essere ripristinati, ma non saranno più associati ad alcun utente cui siano attualmente assegnati.', 'bulk_delete_warn' => 'Stai per cancellare :asset_count assets.', - 'bulk_update' => 'Aggiornamento quantità beni', - 'bulk_update_help' => 'Questo modulo consente di aggiornare più risorse in una sola volta. Riempire solo i campi che è necessario cambiare. Tutti i campi lasciati vuoti rimarranno invariati. ', - 'bulk_update_warn' => 'Stai per modificare le proprietà di :asset_count beni.', + 'bulk_update' => 'Aggiornamento quantità beni', + 'bulk_update_help' => 'Questo modulo consente di aggiornare più risorse in una sola volta. Riempire solo i campi che è necessario cambiare. Tutti i campi lasciati vuoti rimarranno invariati. ', + 'bulk_update_warn' => 'Stai per modificare le proprietà di :asset_count beni.', 'checkedout_to' => 'Assegnato a', 'checkout_date' => 'Data di assegnazione', 'checkin_date' => 'Data di entrata', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etichetta bene', 'update' => 'Aggiornamento bene', 'warranty' => 'Garanzia', - 'warranty_expires' => 'Scadenza della garanzia', + 'warranty_expires' => 'Scadenza della garanzia', 'years' => 'anni', -) -; +]; diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php index 5a3a8bb0a0..e562867dcc 100644 --- a/resources/lang/it/admin/hardware/general.php +++ b/resources/lang/it/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Informazioni sugli asset', 'about_assets_text' => 'Gli asset sono elementi tracciati con il numero di serie o il tag di asset. Tendono ad essere oggetti di valore più elevato dove identificare un elemento specifico.', - 'archived' => 'Archiviato', + 'archived' => 'Archiviato', 'asset' => 'Asset', 'bulk_checkout' => 'Ritiro Asset', 'checkin' => 'Ingresso Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'In attesa', 'undeployable' => 'Non Distribuilbile', 'view' => 'Vedi Asset', -); +]; diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php index 378e3d27b7..c005324ae3 100644 --- a/resources/lang/it/admin/hardware/message.php +++ b/resources/lang/it/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Attenzione: Questo asset è stato marcato come non distribuibile. Se lo stato è cambiato,aggiorna lo stato dell\'asset.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Ci hai provato. Questo prodotto non esiste o non è disponibile.', 'assoc_users' => 'Questo asset è stato assegnato ad un Utente e non può essere cancellato. Per favore Riassegnalo in magazzino,e dopo riprova a cancellarlo.', - 'create' => array( + 'create' => [ 'error' => 'L\'asset non è stato creato, riprova per favore. :(', - 'success' => 'L\'asset è stato creato con successo. :)' - ), + 'success' => 'L\'asset è stato creato con successo. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Il bene non è stato aggiornato, si prega di riprovare', 'success' => 'Bene aggiornato con successo.', 'nothing_updated' => 'Non è stato selezionato nessun campo, nulla è stato aggiornato.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Il bene non è stato ripristinato, riprova', - 'success' => 'Bene ripristinato con successo.' - ), + 'success' => 'Bene ripristinato con successo.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'L\'audit del patrimonio non è riuscito. Riprova.', - 'success' => 'L\'audit di risorse si è registrato con successo.' - ), + 'success' => 'L\'audit di risorse si è registrato con successo.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File non cancellato. Riprova.', 'success' => 'File cancellato con successo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File non caricato/i. Riprova.', 'success' => 'File caricato/i con successo.', 'nofiles' => 'Non hai selezionato nessun file per il caricamento, oppure il file selezionato è troppo grande', 'invalidfiles' => 'Uno o più file è troppo grande o è un tipo di file non consentito. Tipi di file ammessi sono png, gif, jpg, doc, docx, pdf, txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Alcuni elementi non sono stati importati correttamente.', 'errorDetail' => 'Gli elementi seguenti non sono stati importati correttamente a causa di errori.', - 'success' => "Il file è stato importato con successo", - 'file_delete_success' => "Il file è stato cancellato con successo", - 'file_delete_error' => "Impossibile eliminare il file", - ), + 'success' => 'Il file è stato importato con successo', + 'file_delete_success' => 'Il file è stato cancellato con successo', + 'file_delete_error' => 'Impossibile eliminare il file', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questo bene?', 'error' => 'C\'è stato un problema durante la cancellazione del bene. Riprova per favore.', 'nothing_updated' => 'Nessun patrimonio è stato selezionato, quindi niente è stato eliminato.', - 'success' => 'Il bene è stato eliminato con successo.' - ), + 'success' => 'Il bene è stato eliminato con successo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Il bene non è stato estratto, per favore riprova', 'success' => 'Il bene è stato estratto con successo.', 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', 'not_available' => 'Questo prodotto non è disponibile per il checkout!', - 'no_assets_selected' => 'È necessario selezionare almeno una risorsa dall\'elenco' - ), + 'no_assets_selected' => 'È necessario selezionare almeno una risorsa dall\'elenco', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Il bene non è stato registrato, per favore riprova', 'success' => 'Il bene è stato registrato con successo.', 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', 'already_checked_in' => 'Il prodotto è già rientrato.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'L\'asset non è stato richiesto, si prega di riprovare', 'success' => 'Asset richiesto con successo.', - 'canceled' => 'Richiesta di checkout cancellata con successo' - ) + 'canceled' => 'Richiesta di checkout cancellata con successo', + ], -); +]; diff --git a/resources/lang/it/admin/hardware/table.php b/resources/lang/it/admin/hardware/table.php index 7d65a5e3b6..ef2c98733f 100644 --- a/resources/lang/it/admin/hardware/table.php +++ b/resources/lang/it/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etichetta bene', 'asset_model' => 'Modello', @@ -20,6 +20,6 @@ return array( 'title' => 'Bene ', 'image' => 'Immagine dispositivo', 'days_without_acceptance' => 'Giorni senza accettazione', - 'monthly_depreciation' => 'Ammortamento Mensile' + 'monthly_depreciation' => 'Ammortamento Mensile', -); +]; diff --git a/resources/lang/it/admin/kits/general.php b/resources/lang/it/admin/kits/general.php index 6d312214a2..5dac29c61d 100644 --- a/resources/lang/it/admin/kits/general.php +++ b/resources/lang/it/admin/kits/general.php @@ -1,6 +1,6 @@ 'Informazioni su Kit Predefiniti', 'about_kits_text' => 'I Kit Predefiniti ti permettono di assegnare rapidamente una collezione di prodotti (asset, licenze, ecc.) ad un utente. Può esserti d\'aiuto nel caso in cui devi assegnare lo stesso lotto di prodotti ad uno o più utenti allo stesso tempo.', 'checkout' => 'Assegna Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Non ci sono abbastanza consumabili disponibili da assegnare per :consumable. Ulteriori :qty sono richiesti. ', 'none_accessory' => 'Non ci sono abbastanza accessori disponibili da assegnare per :accessory. Ulteriori :qty sono richiesti. ', -); +]; diff --git a/resources/lang/it/admin/licenses/form.php b/resources/lang/it/admin/licenses/form.php index c25c85f6e4..8b4724b43e 100644 --- a/resources/lang/it/admin/licenses/form.php +++ b/resources/lang/it/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Bene', 'checkin' => 'Carica', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenza Email', 'to_name' => 'Licenza Nome', 'update' => 'Aggiornamento Licenze', - 'checkout_help' => 'È necessario verificare una licenza ad una bene hardware o una persona. È possibile selezionare, ma il proprietario del bene deve corrispondere alla persona che ha il bene fuori.' -); + 'checkout_help' => 'È necessario verificare una licenza ad una bene hardware o una persona. È possibile selezionare, ma il proprietario del bene deve corrispondere alla persona che ha il bene fuori.', +]; diff --git a/resources/lang/it/admin/licenses/general.php b/resources/lang/it/admin/licenses/general.php index cb1ef8b0e3..4465d219eb 100644 --- a/resources/lang/it/admin/licenses/general.php +++ b/resources/lang/it/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Informazioni sulle licenze', 'about_licenses' => 'Le licenze vengono utilizzate per monitorare il software. Hanno un numero specifico di posti che possono essere verificati agli individui', 'checkin' => 'Registrare Licenza Sede', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licenze Software', 'user' => 'Utente', 'view' => 'Mostra Licenza', -); +]; diff --git a/resources/lang/it/admin/licenses/message.php b/resources/lang/it/admin/licenses/message.php index c9da18d651..962ca4c5d9 100644 --- a/resources/lang/it/admin/licenses/message.php +++ b/resources/lang/it/admin/licenses/message.php @@ -1,6 +1,6 @@ 'La Licenza non esiste.', 'user_does_not_exist' => 'L\'utente non esiste.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'È necessario selezionare un\'attività o un utente, ma non entrambi.', 'not_found' => 'Licenza non trovata', - - 'create' => array( + 'create' => [ 'error' => 'La licenza non è stata creata, si prega di riprovare.', - 'success' => 'Licenza creata con successo.' - ), + 'success' => 'Licenza creata con successo.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File non cancellato. Riprova.', 'success' => 'File cancellato con successo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File non caricato/i. Riprova.', 'success' => 'File caricato/i con successo.', 'nofiles' => 'Non hai selezionato nessun file per il caricamento, oppure il file selezionato è troppo grande', 'invalidfiles' => 'Uno o più file sono troppo grandi o il formato del file non è consentito. I tipi di file consentiti sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, e lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'La licenza non è stata aggiornata, si prega di riprovare', - 'success' => 'Licenza aggiornata con successo.' - ), + 'success' => 'Licenza aggiornata con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questa licenza?', 'error' => 'C\'è stato un problema nell\'eliminazione della licenza. Riprova.', - 'success' => 'Licenza eliminata con successo.' - ), + 'success' => 'Licenza eliminata con successo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'C\'è stato un problema nell\'estrazione della licenza. Riprova.', - 'success' => 'La licenza è stata estratta con successo' - ), + 'success' => 'La licenza è stata estratta con successo', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'C\'è stato un problema nella registrazione della licenza. Riprova.', - 'success' => 'La licenza è stata registrata con successo' - ), + 'success' => 'La licenza è stata registrata con successo', + ], -); +]; diff --git a/resources/lang/it/admin/licenses/table.php b/resources/lang/it/admin/licenses/table.php index 53686fc427..bff22d00e9 100644 --- a/resources/lang/it/admin/licenses/table.php +++ b/resources/lang/it/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assegnato a', 'checkout' => 'Dentro/Fuori', @@ -14,4 +14,4 @@ return array( 'serial' => 'Seriale', 'title' => 'Licenza', -); +]; diff --git a/resources/lang/it/admin/locations/message.php b/resources/lang/it/admin/locations/message.php index 1c8eb75bdf..753a0a9365 100644 --- a/resources/lang/it/admin/locations/message.php +++ b/resources/lang/it/admin/locations/message.php @@ -1,27 +1,26 @@ 'La posizione non esiste.', 'assoc_users' => 'Questa posizione è associata ad almeno un utente e non può essere cancellata. Si prega di aggiornare i vostri utenti di riferimento e riprovare. ', 'assoc_assets' => 'Questa posizione è associata ad almeno un prodotto e non può essere cancellata. Si prega di aggiornare i vostri prodotti di riferimento e riprovare. ', 'assoc_child_loc' => 'Questa posizione è parente di almeno un\'altra posizione e non può essere cancellata. Si prega di aggiornare le vostre posizioni di riferimento e riprovare. ', - - 'create' => array( + 'create' => [ 'error' => 'La posizione non è stata creata, si prega di riprovare.', - 'success' => 'Posizione creata con successo.' - ), + 'success' => 'Posizione creata con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'La posizione non è stata aggiornata, si prega di riprovare', - 'success' => 'Posizione aggiornata con successo.' - ), + 'success' => 'Posizione aggiornata con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questa posizione?', 'error' => 'C\'è stato un problema nell\'eliminare la posizione. Riprova.', - 'success' => 'Posizione eliminata con successo.' - ) + 'success' => 'Posizione eliminata con successo.', + ], -); +]; diff --git a/resources/lang/it/admin/locations/table.php b/resources/lang/it/admin/locations/table.php index 18a65a0a86..e5d40e5053 100644 --- a/resources/lang/it/admin/locations/table.php +++ b/resources/lang/it/admin/locations/table.php @@ -1,6 +1,6 @@ 'Informazioni sulle posizioni', 'about_locations' => 'Le posizioni sono usate per tracciare la poszione degli utenti, degli asset, e di altri oggetti', 'assets_rtd' => 'Beni', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Genitore', 'currency' => 'Valuta della Posizione', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/it/admin/manufacturers/message.php b/resources/lang/it/admin/manufacturers/message.php index 316e202e87..81d548078a 100644 --- a/resources/lang/it/admin/manufacturers/message.php +++ b/resources/lang/it/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Il produttore non esiste.', 'assoc_users' => 'Questo produttore è attualmente associato con almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento e riprovare. ', - 'create' => array( + 'create' => [ 'error' => 'Il produttore non è stato creato, si prega di riprovare.', - 'success' => 'Produttore creato con successo.' - ), + 'success' => 'Produttore creato con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Il produttore non è stato aggiornato, riprova', - 'success' => 'Produttore aggiornato con successo.' - ), + 'success' => 'Produttore aggiornato con successo.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Il produttore non è stato ripristinato, per favore riprova', - 'success' => 'Produttore ripristinato con successo.' - ), + 'success' => 'Produttore ripristinato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questo produttore?', 'error' => 'C\'è stato un problema nell\'eliminazione del produttore. Riprova.', - 'success' => 'Il produttore è stato eliminato con successo.' - ) + 'success' => 'Il produttore è stato eliminato con successo.', + ], -); +]; diff --git a/resources/lang/it/admin/manufacturers/table.php b/resources/lang/it/admin/manufacturers/table.php index 484469cdcd..8a37db7d8c 100644 --- a/resources/lang/it/admin/manufacturers/table.php +++ b/resources/lang/it/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Informazioni sui produttori', 'about_manufacturers_text' => 'I produttori sono le aziende che creano i vostri beni. È possibile memorizzare qui importanti informazioni sui contatti di supporto, che verranno visualizzate nelle pagine dettagliate dei beni.', 'asset_manufacturers' => 'Produttori Bene', @@ -13,4 +13,4 @@ return array( 'update' => 'Aggiorna Produttore', 'url' => 'URL', -); +]; diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php index e2baa64e14..785223fb4e 100644 --- a/resources/lang/it/admin/models/general.php +++ b/resources/lang/it/admin/models/general.php @@ -1,6 +1,6 @@ 'Informazioni sui modelli di Asset', 'about_models_text' => 'I modelli sono un modo per raggruppare Asset identici. "MBP 2016", "IPhone 6s", etc.', 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Stai per cancellare :asset_count assets.', 'restore' => 'Ripristinare il modello', 'requestable' => 'Gli utenti possono richiedere questo modello', - 'show_mac_address' => 'Mostra MAC Address dei beni in questo modello', + 'show_mac_address' => 'Mostra MAC Address dei beni in questo modello', 'view_deleted' => 'Visualizza Eliminati', 'view_models' => 'Visualizza i modelli', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Nessun campo personalizzato', 'add_default_values' => 'Aggiungi valori predefiniti', -); +]; diff --git a/resources/lang/it/admin/models/message.php b/resources/lang/it/admin/models/message.php index 45fd0b3f42..94b70a60ae 100644 --- a/resources/lang/it/admin/models/message.php +++ b/resources/lang/it/admin/models/message.php @@ -1,42 +1,41 @@ 'Il modello non esiste.', 'assoc_users' => 'Questo modello è attualmente associato ad uno o più beni e non può essere eliminato. Eliminare i beni e poi provare a eliminare nuovamente. ', - - 'create' => array( + 'create' => [ 'error' => 'Il modello non è stato creato, si prega di riprovare.', 'success' => 'Modello creato con successo.', 'duplicate_set' => 'Un modello di prodotto con quel nome, produttore e numero di modello esiste già.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Il modello non è stato aggiornato, si prega di riprovare', - 'success' => 'Modello aggiornato con successo.' - ), + 'success' => 'Modello aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler eliminare questo modello?', 'error' => 'C\'è stato un problema durante la cancellazione del modello. Riprova per favore.', - 'success' => 'Modello cancellato con successo.' - ), + 'success' => 'Modello cancellato con successo.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Il modello non è stato ripristinato, si prega di riprovare', - 'success' => 'Modello ripristinato con successo.' - ), + 'success' => 'Modello ripristinato con successo.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nessun campo è stato modificato, quindi niente è stato aggiornato.', - 'success' => 'Modelli aggiornati.' - ), + 'success' => 'Modelli aggiornati.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Non sono stati selezionati modelli, quindi non è stato eliminato nulla.', 'success' => ':success_count modelli eliminati!', - 'success_partial' => ':success_count modelli sono stati eliminati, tuttavia non è stato possibile eliminare :fail_count modelli perché dispongono ancora di risorse associate.' - ), + 'success_partial' => ':success_count modelli sono stati eliminati, tuttavia non è stato possibile eliminare :fail_count modelli perché dispongono ancora di risorse associate.', + ], -); +]; diff --git a/resources/lang/it/admin/models/table.php b/resources/lang/it/admin/models/table.php index 6b60cac777..4d28d48a64 100644 --- a/resources/lang/it/admin/models/table.php +++ b/resources/lang/it/admin/models/table.php @@ -1,6 +1,6 @@ 'Creare Modello Bene', 'created_at' => 'Creato il', @@ -14,4 +14,4 @@ return array( 'update' => 'Aggiorna Modello Bene', 'clone' => 'Clona Modello', 'edit' => 'Modifica Modello', -); +]; diff --git a/resources/lang/it/admin/reports/general.php b/resources/lang/it/admin/reports/general.php index 4e695860ce..0be75d1bc5 100644 --- a/resources/lang/it/admin/reports/general.php +++ b/resources/lang/it/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selezionare le opzioni desiderate per il vostro report di beni.' -); +return [ + 'info' => 'Selezionare le opzioni desiderate per il vostro report di beni.', +]; diff --git a/resources/lang/it/admin/reports/message.php b/resources/lang/it/admin/reports/message.php index d9fd5dfc9f..a6d12c1a3c 100644 --- a/resources/lang/it/admin/reports/message.php +++ b/resources/lang/it/admin/reports/message.php @@ -1,5 +1,5 @@ 'È necessario selezionare almeno un\'opzione.' -); +return [ + 'error' => 'È necessario selezionare almeno un\'opzione.', +]; diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php index 169929aec5..9fcb465030 100644 --- a/resources/lang/it/admin/settings/general.php +++ b/resources/lang/it/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Dominio Active Directory', 'ad_domain_help' => 'Questo a volte è lo stesso del dominio email, ma non sempre.', 'ad_append_domain_label' => 'Aggiungi il dominio', 'ad_append_domain' => 'Aggiungi il dominio al campo username', - 'ad_append_domain_help' => 'L\'utente non è tenuto a scrivere "username@domain.local", può semplicemente digitare "username".' , + 'ad_append_domain_help' => 'L\'utente non è tenuto a scrivere "username@domain.local", può semplicemente digitare "username".', 'admin_cc_email' => 'Email CC', 'admin_cc_email_help' => 'Se desideri inviare una copia delle e-mail di consegna / ritiro che vengono inviate agli utenti a un altro account e-mail, inseriscile qui. Altrimenti, lascia questo campo vuoto.', 'is_ad' => 'Si tratta di un server Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Soglia di avviso di scadenza (in giorni)', 'alert_inv_threshold' => 'Soglia di avviso di inventario', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID Bene', 'audit_interval' => 'Intervallo di controllo', 'audit_interval_help' => 'Se sei tenuto a controllare regolarmente le risorse, inserisci l\'intervallo in mesi.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Selezionando questa casella viene forzato un vincolo di unicità sul seriale del bene', 'zerofill_count' => 'Lunghezza dei tag di asset, incluso zerofill', 'username_format_help' => 'Questa impostazione sarà usata dal processo di importazione solo se un nome utente non è fornito, e se è necessario creare un nome utente.', -); +]; diff --git a/resources/lang/it/admin/settings/message.php b/resources/lang/it/admin/settings/message.php index 484b9bbafe..5bed175eac 100644 --- a/resources/lang/it/admin/settings/message.php +++ b/resources/lang/it/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Si è verificato un errore durante l\'aggiornamento. ', - 'success' => 'Impostazioni aggiornate correttamente.' - ), - 'backup' => array( + 'success' => 'Impostazioni aggiornate correttamente.', + ], + 'backup' => [ 'delete_confirm' => 'Sei sicuro di voler cancellare questo file di backup? Questa operazione è irreversibile. ', 'file_deleted' => 'Il file di backup è stato cancellato con successo. ', 'generated' => 'Un nuovo file di backup è stato creato con successo.', 'file_not_found' => 'Quel file di backup non può essere trovato sul server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Si è verificato un errore durante la pulizia. ', 'validation_failed' => 'La conferma dell\'eliminazione non è corretta. Digita "DELETE" nel box di conferma.', - 'success' => 'I record cancellati sono stati correttamente eliminati.' - ), + 'success' => 'I record cancellati sono stati correttamente eliminati.', + ], -); +]; diff --git a/resources/lang/it/admin/statuslabels/message.php b/resources/lang/it/admin/statuslabels/message.php index 5b99807fc7..6b5c37102d 100644 --- a/resources/lang/it/admin/statuslabels/message.php +++ b/resources/lang/it/admin/statuslabels/message.php @@ -1,33 +1,32 @@ 'L\'etichetta di stato non esiste.', 'assoc_assets' => 'Questa etichetta di stato è attualmente associata ad almeno un Asset e non può essere cancellata. Per favore aggiorna i tuoi Asset per togliere i riferimenti a questo stato e riprova. ', - - 'create' => array( + 'create' => [ 'error' => 'Lo stato non è stato creato, per favore riprova.', - 'success' => 'Etichetta di stato creata correttamente.' - ), + 'success' => 'Etichetta di stato creata correttamente.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lo stato non è stato aggiornato, per favore riprova', - 'success' => 'Etichetta di stato aggiornata correttamente.' - ), + 'success' => 'Etichetta di stato aggiornata correttamente.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questo stato?', 'error' => 'C\'è stato un problema cancellando lo stato. Per favore riprova.', - 'success' => 'L\'etichetta di stato è stata cancellata correttamente.' - ), + 'success' => 'L\'etichetta di stato è stata cancellata correttamente.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Queste attività non possono essere assegnate a nessuno.', 'deployable' => 'Queste attività possono essere verificate. Una volta assegnati, assumono uno status meta di Deployed.', 'archived' => 'Queste attività non possono essere verificate e verranno visualizzate solo nella visualizzazione archiviata. Ciò è utile per conservare le informazioni sugli asset per finalità di bilancio o storiche ma mantenerle dall\'elenco delle attività quotidiane.', 'pending' => 'Queste attività non possono ancora essere assegnate a nessuno, spesso utilizzate per gli oggetti che sono fuori per la riparazione, ma si prevede di tornare alla circolazione.', - ), + ], -); +]; diff --git a/resources/lang/it/admin/statuslabels/table.php b/resources/lang/it/admin/statuslabels/table.php index c135852c04..b2aa36d1ad 100644 --- a/resources/lang/it/admin/statuslabels/table.php +++ b/resources/lang/it/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Informazioni sulle etichette di stato', 'archived' => 'Archiviato', 'create' => 'Crea Etichetta di Stato', @@ -16,4 +16,4 @@ return array( 'title' => 'Etichette di Stato', 'undeployable' => 'Non Distribuilbile', 'update' => 'Aggiorna Etichetta di Stato', -); +]; diff --git a/resources/lang/it/admin/suppliers/message.php b/resources/lang/it/admin/suppliers/message.php index fb78f23049..292134a748 100644 --- a/resources/lang/it/admin/suppliers/message.php +++ b/resources/lang/it/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Il fornitore non esiste.', - - 'create' => array( + 'create' => [ 'error' => 'Il fornitore non è stato creato, si prega di riprovare.', - 'success' => 'Fornitore creato con successo.' - ), + 'success' => 'Fornitore creato con successo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Il fornitore non è stato aggiornato, si prega di riprovare', - 'success' => 'Fornitore aggiornato con successo.' - ), + 'success' => 'Fornitore aggiornato con successo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sei sicuro di voler cancellare questo fornitore?', 'error' => 'C\'è stato un problema nell\'eliminazione del fornitore. Riprova.', 'success' => 'Fornitore eliminato con successo.', 'assoc_assets' => 'Questo fornitore è attualmente associato ad almeno un modello e non può essere eliminato. Si prega di aggiornare i modelli di riferimento e riprovare.', 'assoc_licenses' => 'Questo fornitore è attualmente associato a :licenses_count licenze e non può essere eliminato. Si prega di aggiornare le licenze in modo che non si colleghino a questo fornitore e riprova. ', 'assoc_maintenances' => 'Questo fornitore è attualmente associato con :asset_maintenances_count manutenzioni e non può essere cancellato. Aggiorna prima le manutenzioni per fare in modo che non referenzino questo fornitore e riprova. ', - ) + ], -); +]; diff --git a/resources/lang/it/admin/suppliers/table.php b/resources/lang/it/admin/suppliers/table.php index 8894c74c1d..74a07552f4 100644 --- a/resources/lang/it/admin/suppliers/table.php +++ b/resources/lang/it/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Informazioni sui fornitori', 'about_suppliers_text' => 'I fornitori vengono utilizzati per monitorare la fonte degli articoli', 'address' => 'Indirizzo fornitore', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Visualizza beni per', 'zip' => 'Codice Postale', -); +]; diff --git a/resources/lang/it/admin/users/general.php b/resources/lang/it/admin/users/general.php index 28a849f11f..c18610c907 100644 --- a/resources/lang/it/admin/users/general.php +++ b/resources/lang/it/admin/users/general.php @@ -1,7 +1,6 @@ 'Questo utente può effettuare il login', 'activated_disabled_help_text' => 'Non puoi modificare lo stato di attivazione del proprio account.', 'assets_user' => 'Bene assegnato a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Modifica Utente', 'filetype_info' => 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.', 'history_user' => 'Storico per :name', - 'info' => 'Informazioni', + 'info' => 'Informazioni', 'restore_user' => 'Clicca qui per ripristinarli.', 'last_login' => 'Ultimo accesso', 'ldap_config_text' => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La posizione selezionata (facoltativa) verrà impostata per tutti gli utenti importati.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Le impostazioni correnti di amministratore consentono l\'esecuzione selettiva dell\'autenticazione a due fattori.', 'two_factor_enrolled' => 'Apparecchio 2FA iscritto', 'two_factor_active' => '2FA attivo', - ); + ]; diff --git a/resources/lang/it/admin/users/message.php b/resources/lang/it/admin/users/message.php index 6c04cd5372..25bc7a980b 100644 --- a/resources/lang/it/admin/users/message.php +++ b/resources/lang/it/admin/users/message.php @@ -1,6 +1,6 @@ 'Hai accettato con successo questo prodotto.', 'declined' => 'Hai rifiutato con successo questo prodotto.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'L\'integrazione con LDAP non è stata configurata per questa installazione.', 'password_resets_sent' => 'È stato inviato un link agli utenti selezionati che sono attivati e hanno un indirizzo email valido, per reimpostare la password.', - - 'success' => array( + 'success' => [ 'create' => 'Utente creato con successo.', 'update' => 'Utente aggiornato con successo.', 'update_bulk' => 'Gli utenti sono stati aggiornati con successo!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Utente riabilitato con successo.', 'restored' => 'Utente ripristinato con successo.', 'import' => 'Utenti importati con successo.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'C\'è stato un problema durante la creazione dell\'utente. Per favore riprova.', 'update' => 'C\'è stato un problema durante l\'aggiornamento dell\'utente. Per favore riprova.', 'delete' => 'C\'è stato un problema durante la cancellazione dell\'utente. Riprova per favore.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Impossibile trovare il server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:', 'ldap_could_not_get_entries' => 'Impossibile ottenere voci dal server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:', 'password_ldap' => 'La password per questo account è gestita da LDAP / Active Directory. Per cambiare la tua password, contatta il tuo reparto IT.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File non cancellato. Riprova.', 'success' => 'File cancellato con successo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File non caricato/i. Riprova.', 'success' => 'File caricato/i con successo.', 'nofiles' => 'Non hai selezionato i file per il caricamento', 'invalidfiles' => 'Uno o più file è troppo grande o è un tipo di file non consentito. Tipi di file ammessi sono png, gif, jpg, doc, docx, pdf, txt.', - ), + ], -); +]; diff --git a/resources/lang/it/admin/users/table.php b/resources/lang/it/admin/users/table.php index af164d07c4..f2449270f2 100644 --- a/resources/lang/it/admin/users/table.php +++ b/resources/lang/it/admin/users/table.php @@ -1,6 +1,6 @@ 'Attivo', 'allow' => 'Consenti', 'checkedout' => 'Beni', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Visualizza utenti attuali', 'show_deleted' => 'Visualizza utenti eliminati', 'title' => 'Titolo', - 'to_restore_them' => 'per ripristinarli.', + 'to_restore_them' => 'per ripristinarli.', 'updateuser' => 'Aggiornamento utente', 'username' => 'Username', - 'user_deleted_text' => 'Questo utente è stato contrassegnato come eliminato.', + 'user_deleted_text' => 'Questo utente è stato contrassegnato come eliminato.', 'username_note' => '(Questo è usato solo per Active Directory vincolante, non per il login.)', 'cloneuser' => 'Clona Utente', 'viewusers' => 'Visualizza utenti', -); +]; diff --git a/resources/lang/it/auth/general.php b/resources/lang/it/auth/general.php index 2629ef875f..8501d725cd 100644 --- a/resources/lang/it/auth/general.php +++ b/resources/lang/it/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Inserisci il tuo nome utente per ricevere via email il link per reimpostare la password.', 'username_help_bottom' => 'Il tuo nome utente e indirizzo email possono essere gli stessi, ma potrebbe non essere così a seconda della tua configurazione. Se non riesci a ricordare il tuo nome utente, contatta l\'amministratore.

I nomi utente senza un indirizzo email associato non potranno ricevere via email il link di reimpostazione della password. ', ]; - diff --git a/resources/lang/it/auth/message.php b/resources/lang/it/auth/message.php index c5441a3fa3..3863433410 100644 --- a/resources/lang/it/auth/message.php +++ b/resources/lang/it/auth/message.php @@ -1,6 +1,6 @@ 'Un account con questa email già esiste.', 'account_not_found' => 'Nome utente o password non corretto.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Questo account è bannato.', 'throttle' => 'Troppi tentativi di login falliti. Per favore riprova entro :minutes minuti.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Il tuo dispositivo è già registrato.', 'success' => 'Accesso eseguito correttamente.', 'code_required' => 'Codice a due fattori richiesto.', 'invalid_code' => 'Codice a due fattori non valido.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'C\'è stato un problema durante il tentativo di accesso, riprova.', 'success' => 'Accesso eseguito correttamente.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'C\'è stato un problema durante il tentativo di logout, riprova per favore.', 'success' => 'Ti sei disconnesso con successo.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'C\'è stato un problema durante la creazione del tuo account, per favore riprova.', 'success' => 'Account creato con successo.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'C\'è stato un problema durante il tentativo di reset password, per favore riprova.', 'success' => 'Se l\'indirizzo email esiste nel nostro sistema, è stata inviata una email di recupero password.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'C\'è stato un problema durante il tentativo di reset password, per favore riprova.', 'success' => 'La tua password è stata resettata con successo.', - ), + ], - -); +]; diff --git a/resources/lang/it/button.php b/resources/lang/it/button.php index a0be68411b..200e64264c 100644 --- a/resources/lang/it/button.php +++ b/resources/lang/it/button.php @@ -1,6 +1,6 @@ 'Azioni', 'add' => 'Aggiungi Nuovo', 'cancel' => 'Annulla', @@ -11,7 +11,7 @@ return array( 'request' => 'Richiesta', 'submit' => 'Invia', 'upload' => 'Carica / Upload', - 'select_file' => 'Seleziona il file...', + 'select_file' => 'Seleziona il file...', 'select_files' => 'Seleziona i file...', 'generate_labels' => '{1} Genera Etichetta|[2,*] Genera Etichette', -); +]; diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php index 42f7a9fbae..092bf5040f 100644 --- a/resources/lang/it/general.php +++ b/resources/lang/it/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Consegne', 'user_requests_count' => 'Richieste', 'city' => 'Città', - 'click_here' => 'Clicca qui', + 'click_here' => 'Clicca qui', 'clear_selection' => 'Annulla selezione', 'companies' => 'Aziende', 'company' => 'Azienda', 'component' => 'Componente', 'components' => 'Componenti', - 'complete' => 'Completare', + 'complete' => 'Completare', 'consumable' => 'Consumabile', 'consumables' => 'Consumabili', 'country' => 'Paese', diff --git a/resources/lang/it/help.php b/resources/lang/it/help.php index 68ea28097e..b4574877e2 100644 --- a/resources/lang/it/help.php +++ b/resources/lang/it/help.php @@ -1,6 +1,6 @@ "Ulteriori Informazioni", + 'more_info_title' => 'Ulteriori Informazioni', - "audit_help" => "Selezionando questa casella verrà modificato l'asset per riflettere la nuova località, altrimenti verrà semplicemente menzionato nel registro di audit.

Se l'asset è già assegnato, non cambierà la località dell'utente, dell'asset o la località a cui è assegnato.", + 'audit_help' => "Selezionando questa casella verrà modificato l'asset per riflettere la nuova località, altrimenti verrà semplicemente menzionato nel registro di audit.

Se l'asset è già assegnato, non cambierà la località dell'utente, dell'asset o la località a cui è assegnato.", 'assets' => 'Assets sono elementi tracciati con il numero di serie o il tag. Tendono ad essere elementi di valore più elevato, ove è importante identificare un elemento specifico.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'È possibile impostare gli ammortamenti, per ammortizzare un asset secondo il criterio di calcolo a quote costanti.', - - -); +]; diff --git a/resources/lang/it/mail.php b/resources/lang/it/mail.php index 271a4f99da..965d4bfc1a 100644 --- a/resources/lang/it/mail.php +++ b/resources/lang/it/mail.php @@ -1,6 +1,6 @@ 'Un utente ha annullato una richiesta di articolo sul sito web', 'a_user_requested' => 'Un utente ha richiesto un elemento tramite il sito web', 'accessory_name' => 'Nome accessorio:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'Un asset assegnato a te deve essere ricontrollato il :date', - 'your_assets' => 'Visualizza i tuoi assets' -); + 'your_assets' => 'Visualizza i tuoi assets', +]; diff --git a/resources/lang/it/pagination.php b/resources/lang/it/pagination.php index b2c16356a9..c89990d342 100644 --- a/resources/lang/it/pagination.php +++ b/resources/lang/it/pagination.php @@ -1,6 +1,6 @@ 'Prossimo »', -); +]; diff --git a/resources/lang/it/passwords.php b/resources/lang/it/passwords.php index 197d6d7598..df3271a917 100644 --- a/resources/lang/it/passwords.php +++ b/resources/lang/it/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Il tuo collegamento password è stato inviato!', 'user' => 'Non risulta nessun utente attivo con questa email.', ]; - diff --git a/resources/lang/it/reminders.php b/resources/lang/it/reminders.php index d7d4c2ce97..b83c151b10 100644 --- a/resources/lang/it/reminders.php +++ b/resources/lang/it/reminders.php @@ -1,6 +1,6 @@ "Le passwords devono essere almeno di 6 caratteri e uguali alla conferma.", + 'password' => 'Le passwords devono essere almeno di 6 caratteri e uguali alla conferma.', - "user" => "Nome utente o indirizzo email non corretto", + 'user' => 'Nome utente o indirizzo email non corretto', - "token" => "Il token di reset password è invalido.", + 'token' => 'Il token di reset password è invalido.', - "sent" => "Se email è presente nel nostro database, la email di verifica sarà inviata!", + 'sent' => 'Se email è presente nel nostro database, la email di verifica sarà inviata!', -); +]; diff --git a/resources/lang/it/table.php b/resources/lang/it/table.php index 6a66ee8d4c..879c47968a 100644 --- a/resources/lang/it/table.php +++ b/resources/lang/it/table.php @@ -1,10 +1,10 @@ 'Azioni', 'action' => 'Azione', 'by' => 'per', 'item' => 'Oggetto', -); +]; diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php index 0144d52016..09c735b4a4 100644 --- a/resources/lang/it/validation.php +++ b/resources/lang/it/validation.php @@ -1,6 +1,6 @@ 'L\' :attribute è già stato preso.', 'uploaded' => 'L\'attributo: non è riuscito a caricare.', 'url' => 'Il formato dell\' :attribute è invalido.', - "unique_undeleted" => "L'attributo deve essere univoco.", + 'unique_undeleted' => "L'attributo deve essere univoco.", /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Il campo attributo contiene un carattere non consentito.", - "email_array" => "Uno o più indirizzi email non sono validi.", - "hashed_pass" => "La tua password corrente non è corretta", + 'alpha_space' => 'Il campo attributo contiene un carattere non consentito.', + 'email_array' => 'Uno o più indirizzi email non sono validi.', + 'hashed_pass' => 'La tua password corrente non è corretta', 'dumbpwd' => 'Quella password è troppo comune.', - "statuslabel_type" => "È necessario selezionare un tipo di etichetta di stato valido", + 'statuslabel_type' => 'È necessario selezionare un tipo di etichetta di stato valido', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/iu/admin/accessories/general.php b/resources/lang/iu/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/iu/admin/accessories/general.php +++ b/resources/lang/iu/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/iu/admin/accessories/message.php b/resources/lang/iu/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/iu/admin/accessories/message.php +++ b/resources/lang/iu/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/iu/admin/accessories/table.php b/resources/lang/iu/admin/accessories/table.php index e02d9f22e4..69c4d46aab 100644 --- a/resources/lang/iu/admin/accessories/table.php +++ b/resources/lang/iu/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Accessory Name', - -); +]; diff --git a/resources/lang/iu/admin/asset_maintenances/form.php b/resources/lang/iu/admin/asset_maintenances/form.php index 2aa005c45f..1cf3b4ce57 100644 --- a/resources/lang/iu/admin/asset_maintenances/form.php +++ b/resources/lang/iu/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', 'update' => 'Update', - 'create' => 'Create' + 'create' => 'Create', ]; diff --git a/resources/lang/iu/admin/asset_maintenances/message.php b/resources/lang/iu/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/iu/admin/asset_maintenances/message.php +++ b/resources/lang/iu/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/iu/admin/asset_maintenances/table.php b/resources/lang/iu/admin/asset_maintenances/table.php index f3a6be60f9..3ba895038d 100644 --- a/resources/lang/iu/admin/asset_maintenances/table.php +++ b/resources/lang/iu/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/iu/admin/categories/general.php b/resources/lang/iu/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/iu/admin/categories/general.php +++ b/resources/lang/iu/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/iu/admin/categories/message.php b/resources/lang/iu/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/iu/admin/categories/message.php +++ b/resources/lang/iu/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/iu/admin/categories/table.php b/resources/lang/iu/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/iu/admin/categories/table.php +++ b/resources/lang/iu/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/iu/admin/companies/general.php b/resources/lang/iu/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/iu/admin/companies/general.php +++ b/resources/lang/iu/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/iu/admin/companies/message.php b/resources/lang/iu/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/iu/admin/companies/message.php +++ b/resources/lang/iu/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/iu/admin/companies/table.php b/resources/lang/iu/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/iu/admin/companies/table.php +++ b/resources/lang/iu/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/iu/admin/components/general.php b/resources/lang/iu/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/iu/admin/components/general.php +++ b/resources/lang/iu/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/iu/admin/components/message.php b/resources/lang/iu/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/iu/admin/components/message.php +++ b/resources/lang/iu/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/iu/admin/components/table.php b/resources/lang/iu/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/iu/admin/components/table.php +++ b/resources/lang/iu/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/iu/admin/consumables/general.php b/resources/lang/iu/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/iu/admin/consumables/general.php +++ b/resources/lang/iu/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/iu/admin/consumables/message.php b/resources/lang/iu/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/iu/admin/consumables/message.php +++ b/resources/lang/iu/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/iu/admin/consumables/table.php b/resources/lang/iu/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/iu/admin/consumables/table.php +++ b/resources/lang/iu/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/iu/admin/custom_fields/general.php b/resources/lang/iu/admin/custom_fields/general.php index c8d2a70a71..011f983f77 100644 --- a/resources/lang/iu/admin/custom_fields/general.php +++ b/resources/lang/iu/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/iu/admin/custom_fields/message.php b/resources/lang/iu/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/iu/admin/custom_fields/message.php +++ b/resources/lang/iu/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/iu/admin/departments/message.php b/resources/lang/iu/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/iu/admin/departments/message.php +++ b/resources/lang/iu/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/iu/admin/departments/table.php b/resources/lang/iu/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/iu/admin/departments/table.php +++ b/resources/lang/iu/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/iu/admin/depreciations/general.php b/resources/lang/iu/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/iu/admin/depreciations/general.php +++ b/resources/lang/iu/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/iu/admin/depreciations/message.php b/resources/lang/iu/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/iu/admin/depreciations/message.php +++ b/resources/lang/iu/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/iu/admin/depreciations/table.php b/resources/lang/iu/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/iu/admin/depreciations/table.php +++ b/resources/lang/iu/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/iu/admin/groups/message.php b/resources/lang/iu/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/iu/admin/groups/message.php +++ b/resources/lang/iu/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/iu/admin/groups/table.php b/resources/lang/iu/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/iu/admin/groups/table.php +++ b/resources/lang/iu/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/iu/admin/groups/titles.php b/resources/lang/iu/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/iu/admin/groups/titles.php +++ b/resources/lang/iu/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/iu/admin/hardware/form.php b/resources/lang/iu/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/iu/admin/hardware/form.php +++ b/resources/lang/iu/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/iu/admin/hardware/general.php b/resources/lang/iu/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/iu/admin/hardware/general.php +++ b/resources/lang/iu/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/iu/admin/hardware/message.php b/resources/lang/iu/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/iu/admin/hardware/message.php +++ b/resources/lang/iu/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/iu/admin/hardware/table.php b/resources/lang/iu/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/iu/admin/hardware/table.php +++ b/resources/lang/iu/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/iu/admin/kits/general.php b/resources/lang/iu/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/iu/admin/kits/general.php +++ b/resources/lang/iu/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/iu/admin/licenses/form.php b/resources/lang/iu/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/iu/admin/licenses/form.php +++ b/resources/lang/iu/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/iu/admin/licenses/general.php b/resources/lang/iu/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/iu/admin/licenses/general.php +++ b/resources/lang/iu/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/iu/admin/licenses/message.php b/resources/lang/iu/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/iu/admin/licenses/message.php +++ b/resources/lang/iu/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/iu/admin/licenses/table.php b/resources/lang/iu/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/iu/admin/licenses/table.php +++ b/resources/lang/iu/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/iu/admin/locations/message.php b/resources/lang/iu/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/iu/admin/locations/message.php +++ b/resources/lang/iu/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/iu/admin/locations/table.php b/resources/lang/iu/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/iu/admin/locations/table.php +++ b/resources/lang/iu/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/iu/admin/manufacturers/message.php b/resources/lang/iu/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/iu/admin/manufacturers/message.php +++ b/resources/lang/iu/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/iu/admin/manufacturers/table.php b/resources/lang/iu/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/iu/admin/manufacturers/table.php +++ b/resources/lang/iu/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/iu/admin/models/general.php b/resources/lang/iu/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/iu/admin/models/general.php +++ b/resources/lang/iu/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/iu/admin/models/message.php b/resources/lang/iu/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/iu/admin/models/message.php +++ b/resources/lang/iu/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/iu/admin/models/table.php b/resources/lang/iu/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/iu/admin/models/table.php +++ b/resources/lang/iu/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/iu/admin/reports/general.php b/resources/lang/iu/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/iu/admin/reports/general.php +++ b/resources/lang/iu/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/iu/admin/reports/message.php b/resources/lang/iu/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/iu/admin/reports/message.php +++ b/resources/lang/iu/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/iu/admin/settings/general.php b/resources/lang/iu/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/iu/admin/settings/general.php +++ b/resources/lang/iu/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/iu/admin/settings/message.php b/resources/lang/iu/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/iu/admin/settings/message.php +++ b/resources/lang/iu/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/iu/admin/statuslabels/message.php b/resources/lang/iu/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/iu/admin/statuslabels/message.php +++ b/resources/lang/iu/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/iu/admin/statuslabels/table.php b/resources/lang/iu/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/iu/admin/statuslabels/table.php +++ b/resources/lang/iu/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/iu/admin/suppliers/message.php b/resources/lang/iu/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/iu/admin/suppliers/message.php +++ b/resources/lang/iu/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/iu/admin/suppliers/table.php b/resources/lang/iu/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/iu/admin/suppliers/table.php +++ b/resources/lang/iu/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/iu/admin/users/general.php b/resources/lang/iu/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/iu/admin/users/general.php +++ b/resources/lang/iu/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/iu/admin/users/message.php b/resources/lang/iu/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/iu/admin/users/message.php +++ b/resources/lang/iu/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/iu/admin/users/table.php b/resources/lang/iu/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/iu/admin/users/table.php +++ b/resources/lang/iu/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/iu/auth/general.php b/resources/lang/iu/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/iu/auth/general.php +++ b/resources/lang/iu/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/iu/auth/message.php b/resources/lang/iu/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/iu/auth/message.php +++ b/resources/lang/iu/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/iu/button.php b/resources/lang/iu/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/iu/button.php +++ b/resources/lang/iu/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/iu/general.php b/resources/lang/iu/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/iu/general.php +++ b/resources/lang/iu/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/iu/help.php b/resources/lang/iu/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/iu/help.php +++ b/resources/lang/iu/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/iu/mail.php b/resources/lang/iu/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/iu/mail.php +++ b/resources/lang/iu/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/iu/pagination.php b/resources/lang/iu/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/iu/pagination.php +++ b/resources/lang/iu/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/iu/passwords.php b/resources/lang/iu/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/iu/passwords.php +++ b/resources/lang/iu/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/iu/reminders.php b/resources/lang/iu/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/iu/reminders.php +++ b/resources/lang/iu/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/iu/table.php b/resources/lang/iu/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/iu/table.php +++ b/resources/lang/iu/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/iu/validation.php b/resources/lang/iu/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/iu/validation.php +++ b/resources/lang/iu/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ja/admin/accessories/general.php b/resources/lang/ja/admin/accessories/general.php index 5db30c9aee..ff4694921c 100644 --- a/resources/lang/ja/admin/accessories/general.php +++ b/resources/lang/ja/admin/accessories/general.php @@ -1,6 +1,6 @@ '付属品カテゴリー', 'accessory_name' => '付属品名', 'checkout' => '付属品の貸し出し', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => '初期設定EULA を代わりに利用する。', 'use_default_eula_disabled' => '初期設定EULAを代わりに利用する。 初期設定EULAが設定されていません。一つは追加してください。', -); +]; diff --git a/resources/lang/ja/admin/accessories/message.php b/resources/lang/ja/admin/accessories/message.php index c9c5702e30..3cf07282f7 100644 --- a/resources/lang/ja/admin/accessories/message.php +++ b/resources/lang/ja/admin/accessories/message.php @@ -1,37 +1,36 @@ '付属品[:id]は存在しません。', 'assoc_users' => 'この付属品は、ユーザーに :count 個貸し出されています。もう一度、付属品を返却して下さい。 ', - 'create' => array( + 'create' => [ 'error' => '付属品は作成されていません。もう一度やり直してください。', - 'success' => '付属品は正常に作成されました。' - ), + 'success' => '付属品は正常に作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => '付属品は更新されませんでした。もう一度、やり直して下さい。', - 'success' => '付属品は正常に更新されました。' - ), + 'success' => '付属品は正常に更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'この付属品を本当に削除してもよろしいですか？', 'error' => 'この付属品を削除する際に問題が発生しました。もう一度、やり直して下さい。', - 'success' => 'この付属品は正常に削除されました。' - ), + 'success' => 'この付属品は正常に削除されました。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '付属品がチェックされませんでした。もう一度、やり直して下さい。', 'success' => '付属品のチェックが終了しました。', - 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。' - ), + 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '付属品がチェックされませんでした。もう一度、やり直して下さい。', 'success' => '付属品のチェックが終了しました。', - 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。' - ) + 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', + ], - -); +]; diff --git a/resources/lang/ja/admin/accessories/table.php b/resources/lang/ja/admin/accessories/table.php index c1697e899d..2559c5044d 100644 --- a/resources/lang/ja/admin/accessories/table.php +++ b/resources/lang/ja/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSVダウンロード', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'CSVダウンロード', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => '承諾', 'title' => '付属品名', - -); +]; diff --git a/resources/lang/ja/admin/asset_maintenances/form.php b/resources/lang/ja/admin/asset_maintenances/form.php index 0cd9d3fe78..75d81bff92 100644 --- a/resources/lang/ja/admin/asset_maintenances/form.php +++ b/resources/lang/ja/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => '資産管理期間(日数)', 'notes' => '備考', 'update' => '資産管理を更新', - 'create' => '資産管理を作成' + 'create' => '資産管理を作成', ]; diff --git a/resources/lang/ja/admin/asset_maintenances/message.php b/resources/lang/ja/admin/asset_maintenances/message.php index 84496898a2..b3845cd7e0 100644 --- a/resources/lang/ja/admin/asset_maintenances/message.php +++ b/resources/lang/ja/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'この資産管理を本当に削除しますか？', 'error' => '資産管理の削除に失敗しました。もう一度試して下さい。', - 'success' => '資産管理の削除に成功しました。' + 'success' => '資産管理の削除に成功しました。', ], 'create' => [ 'error' => '資産管理を作成できませんでした。もう一度試して下さい。', - 'success' => '資産管理の作成に成功しました。' + 'success' => '資産管理の作成に成功しました。', ], 'edit' => [ 'error' => '資産管理を編集できませんでした。もう一度試して下さい。', - 'success' => '資産管理の編集に成功しました。' + 'success' => '資産管理の編集に成功しました。', ], 'asset_maintenance_incomplete' => '不完全です。', 'warranty' => '保証', 'not_warranty' => '無保証', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ja/admin/asset_maintenances/table.php b/resources/lang/ja/admin/asset_maintenances/table.php index 5dd208f79f..7fabcdecfb 100644 --- a/resources/lang/ja/admin/asset_maintenances/table.php +++ b/resources/lang/ja/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => '資産管理', 'asset_name' => '資産名', 'is_warranty' => '保証書', - 'dl_csv' => 'CSVダウンロード' + 'dl_csv' => 'CSVダウンロード', ]; diff --git a/resources/lang/ja/admin/categories/general.php b/resources/lang/ja/admin/categories/general.php index 4106148343..add9eed380 100644 --- a/resources/lang/ja/admin/categories/general.php +++ b/resources/lang/ja/admin/categories/general.php @@ -1,6 +1,6 @@ '資産カテゴリー', 'category_name' => 'カテゴリー名', 'checkin_email' => 'チェックイン/チェックアウト時、ユーザーに電子メールを送信します。', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => '初期設定EULA を代わりに利用する。', 'use_default_eula_disabled' => '初期設定EULAを代わりに利用する。 初期設定EULAが設定されていません。最低一つは追加してください。', -); +]; diff --git a/resources/lang/ja/admin/categories/message.php b/resources/lang/ja/admin/categories/message.php index 758e9afb36..01bf2bc7ea 100644 --- a/resources/lang/ja/admin/categories/message.php +++ b/resources/lang/ja/admin/categories/message.php @@ -1,25 +1,25 @@ 'カテゴリーが存在しません。', 'assoc_models' => 'このカテゴリーは１つ以上の型番に関連付けられているため削除できません。このカテゴリーを参照しないようにモ型番を更新して再度実行してください。 ', 'assoc_items' => 'このカテゴリーは１つ以上の資産に関連付けられているため削除できません。このカテゴリーを参照しないように資産を更新して、再度実行してください。 ', - 'create' => array( + 'create' => [ 'error' => 'カテゴリーが作成されていません。再度実行してください。', - 'success' => 'カテゴリーの作成に成功しました。' - ), + 'success' => 'カテゴリーの作成に成功しました。', + ], - 'update' => array( + 'update' => [ 'error' => 'カテゴリーは更新されませんでした。再度実行してください。', - 'success' => 'カテゴリーの更新に成功しました。' - ), + 'success' => 'カテゴリーの更新に成功しました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このカテゴリーを本当に削除しますか？', 'error' => 'このカテゴリーを削除する際に問題がおきました。再度実行してください。', - 'success' => 'カテゴリーの削除に成功しました。' - ) + 'success' => 'カテゴリーの削除に成功しました。', + ], -); +]; diff --git a/resources/lang/ja/admin/categories/table.php b/resources/lang/ja/admin/categories/table.php index 5485f57bcb..9d92b9a2df 100644 --- a/resources/lang/ja/admin/categories/table.php +++ b/resources/lang/ja/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => '上位', 'require_acceptance' => '承諾', 'title' => '資産カテゴリー名', -); +]; diff --git a/resources/lang/ja/admin/companies/general.php b/resources/lang/ja/admin/companies/general.php index a011ba0429..f9bbd533f4 100644 --- a/resources/lang/ja/admin/companies/general.php +++ b/resources/lang/ja/admin/companies/general.php @@ -1,4 +1,5 @@ '所属を選択', ]; diff --git a/resources/lang/ja/admin/companies/message.php b/resources/lang/ja/admin/companies/message.php index 6176b70cd1..d2cfaa291a 100644 --- a/resources/lang/ja/admin/companies/message.php +++ b/resources/lang/ja/admin/companies/message.php @@ -1,18 +1,19 @@ '所属は存在しません', 'assoc_users' => 'この所属は現在少なくとも一つの型番に関連付けされているため削除できません。この所属を参照しないように更新した上で、もう一度試して下さい。 ', - 'create' => array( + 'create' => [ 'error' => '所属は作成されませんでした、もう一度やり直してください。', - 'success' => '所属が正常に作成されました。' - ), - 'update' => array( + 'success' => '所属が正常に作成されました。', + ], + 'update' => [ 'error' => '所属部署が更新されませんでした、もう一度やり直してください。', - 'success' => '所属が正常に更新されました。' - ), - 'delete' => array( + 'success' => '所属が正常に更新されました。', + ], + 'delete' => [ 'confirm' => 'この所属を削除してもよろしいですか？', 'error' => '所属を削除する時に問題が発生しました。もう一度試して下さい。', - 'success' => '所属の削除に成功しました。' - ) -); + 'success' => '所属の削除に成功しました。', + ], +]; diff --git a/resources/lang/ja/admin/companies/table.php b/resources/lang/ja/admin/companies/table.php index 1e4181c8bd..4dc865698c 100644 --- a/resources/lang/ja/admin/companies/table.php +++ b/resources/lang/ja/admin/companies/table.php @@ -1,9 +1,10 @@ '所属', 'create' => '所属を作成', 'title' => '所属', 'update' => '所属を更新', 'name' => '所属名', 'id' => 'ID', -); +]; diff --git a/resources/lang/ja/admin/components/general.php b/resources/lang/ja/admin/components/general.php index d8955450de..2b2c8f7886 100644 --- a/resources/lang/ja/admin/components/general.php +++ b/resources/lang/ja/admin/components/general.php @@ -1,6 +1,6 @@ '構成部品名', 'checkin' => '構成品のチェックイン', 'checkout' => '構成部品のチェックアウト', @@ -12,4 +12,4 @@ return array( 'remaining' => '残数', 'total' => '合計', 'update' => '構成部品の更新', -); +]; diff --git a/resources/lang/ja/admin/components/message.php b/resources/lang/ja/admin/components/message.php index 06beea39e3..180c0eba70 100644 --- a/resources/lang/ja/admin/components/message.php +++ b/resources/lang/ja/admin/components/message.php @@ -1,36 +1,35 @@ '構成部品は存在しません', - 'create' => array( + 'create' => [ 'error' => '構成部品が作成できませんでした。もう一度やり直して下さい。', - 'success' => '構成部品が作成されました。' - ), + 'success' => '構成部品が作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => '構成部品がが更新できませんでした。もう一度やり直して下さい。', - 'success' => '構成部品が作成されました。' - ), + 'success' => '構成部品が作成されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'この構成部品を削除してもよろしいですか?', 'error' => '構成部品を削除する際に問題が発生しました。もう一度やり直して下さい。', - 'success' => '構成部品は削除されました。' - ), + 'success' => '構成部品は削除されました。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '構成部品はチェックアウトされませんでした。もう一度、やり直して下さい。', 'success' => '構成部品は正常にチェックアウトされました。', - 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' - ), + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '構成部品はチェックインされませんでした。もう一度、やり直して下さい。', 'success' => '構成部品は正常にチェックインされました。', - 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' - ) + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。', + ], - -); +]; diff --git a/resources/lang/ja/admin/components/table.php b/resources/lang/ja/admin/components/table.php index 08f7648572..ae469e3582 100644 --- a/resources/lang/ja/admin/components/table.php +++ b/resources/lang/ja/admin/components/table.php @@ -1,5 +1,5 @@ '構成部品名', -); +]; diff --git a/resources/lang/ja/admin/consumables/general.php b/resources/lang/ja/admin/consumables/general.php index 58cb5d89c2..67ff8e30a7 100644 --- a/resources/lang/ja/admin/consumables/general.php +++ b/resources/lang/ja/admin/consumables/general.php @@ -1,6 +1,6 @@ 'ユーザーにチェックアウト', 'consumable_name' => '消耗品名', 'create' => '消耗品を作成', @@ -8,4 +8,4 @@ return array( 'remaining' => '残数', 'total' => '合計', 'update' => '消耗品を更新', -); +]; diff --git a/resources/lang/ja/admin/consumables/message.php b/resources/lang/ja/admin/consumables/message.php index 3fe47177b9..7f37ffe58d 100644 --- a/resources/lang/ja/admin/consumables/message.php +++ b/resources/lang/ja/admin/consumables/message.php @@ -1,36 +1,35 @@ '消耗品は存在しません。', - 'create' => array( + 'create' => [ 'error' => '消耗品は作成できませんでした。もう一度試して下さい。', - 'success' => '消耗品の作成に成功しました。' - ), + 'success' => '消耗品の作成に成功しました。', + ], - 'update' => array( + 'update' => [ 'error' => '消耗品の更新に失敗しました。もう一度試して下さい。', - 'success' => '消耗品の更新に成功しました。' - ), + 'success' => '消耗品の更新に成功しました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'この消耗品を削除しますか？', 'error' => '消耗品の削除に失敗しました。もう一度試して下さい。', - 'success' => '消耗品は削除されました。' - ), + 'success' => '消耗品は削除されました。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '消耗品はチェックアウトできませんでした。もう一度試して下さい。', 'success' => '消耗品はチェックアウトに成功しました。', - 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' - ), + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '消耗品はチェックインされませんでした。もう一度試して下さい。', 'success' => '消耗品はチェックインされました。', - 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' - ) + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。', + ], - -); +]; diff --git a/resources/lang/ja/admin/consumables/table.php b/resources/lang/ja/admin/consumables/table.php index a4d3653f09..7993f852f9 100644 --- a/resources/lang/ja/admin/consumables/table.php +++ b/resources/lang/ja/admin/consumables/table.php @@ -1,5 +1,5 @@ '消耗品名', -); +]; diff --git a/resources/lang/ja/admin/custom_fields/general.php b/resources/lang/ja/admin/custom_fields/general.php index bada524802..834c40e2ef 100644 --- a/resources/lang/ja/admin/custom_fields/general.php +++ b/resources/lang/ja/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'カスタムフィールド', 'field' => 'フィールド', 'about_fieldsets_title' => 'フィールドセットについて', @@ -30,4 +30,4 @@ return array( 'create_field' => '新しいユーザー設定フィールド', 'value_encrypted' => 'このフィールドの値は、データベースで暗号化されます。管理者ユーザーのみが復号化された値を表示することができます。', 'show_in_email' => 'このフィールドの値を、ユーザーに送信されるチェックアウト メールに含めますか？（暗号化されたフィールドの値はメールに含めることはできません。）', -); +]; diff --git a/resources/lang/ja/admin/custom_fields/message.php b/resources/lang/ja/admin/custom_fields/message.php index 2a8d01bcd0..0731163212 100644 --- a/resources/lang/ja/admin/custom_fields/message.php +++ b/resources/lang/ja/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'フィールドがありません。', 'already_added' => 'フィールドはすでに追加されています', - 'create' => array( + 'create' => [ 'error' => 'フォルダーは作成されませんでした。もう一度やり直してください。', 'success' => 'フィールドを正常に作成しました。', - 'assoc_success' => 'フィールドはフィールドセットに追加されました' - ), + 'assoc_success' => 'フィールドはフィールドセットに追加されました', + ], - 'update' => array( + 'update' => [ 'error' => 'フィールドは更新されませんでした。もう一度やり直してください。', - 'success' => 'フィールドを正常に更新しました。' - ), + 'success' => 'フィールドを正常に更新しました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このフィールドを削除してもよろしいですか？', 'error' => 'フィールドを削除する際に問題が発生しました。もう一度、やり直して下さい。', 'success' => 'フィールドは削除されました。', 'in_use' => 'フィールドは使用中です。', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'フィールドセットが見つかりません', - 'create' => array( + 'create' => [ 'error' => 'フィールドセットは作成されませんでした。もう一度やり直してください。', - 'success' => 'フィールドセットを正常に作成しました。' - ), + 'success' => 'フィールドセットを正常に作成しました。', + ], - 'update' => array( + 'update' => [ 'error' => 'フィールドセットは更新されませんでした。もう一度やり直してください。', - 'success' => 'フィールドセットを正常に更新しました。' - ), + 'success' => 'フィールドセットを正常に更新しました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このフィールドセットを削除してもよろしいですか？', 'error' => 'フィールドセットを削除する際に問題が発生しました。もう一度、やり直して下さい。', 'success' => 'フィールドセットは削除されました。', 'in_use' => 'フィールドセットは使用中です。', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ja/admin/departments/message.php b/resources/lang/ja/admin/departments/message.php index 5b3d359712..e26060767a 100644 --- a/resources/lang/ja/admin/departments/message.php +++ b/resources/lang/ja/admin/departments/message.php @@ -1,21 +1,21 @@ '部署が見つかりません', 'assoc_users' => 'この部署は1人以上の利用者に関連付けされているため、削除できません。部署の関連付けを削除してから、もう一度試して下さい。 ', - 'create' => array( + 'create' => [ 'error' => '部署が作成できませんでした。もう一度やり直して下さい。', - 'success' => '部署が作成されました。' - ), - 'update' => array( + 'success' => '部署が作成されました。', + ], + 'update' => [ 'error' => '部署が編集できませんでした。もう一度やり直して下さい', - 'success' => '部署が更新されました。' - ), - 'delete' => array( + 'success' => '部署が更新されました。', + ], + 'delete' => [ 'confirm' => '本当にこの部署を削除してもよろしいですか?', 'error' => '部署を削除する際に問題が発生しました。もう一度やり直して下さい。', - 'success' => '部署は削除されました。' - ) + 'success' => '部署は削除されました。', + ], -); +]; diff --git a/resources/lang/ja/admin/departments/table.php b/resources/lang/ja/admin/departments/table.php index 629e97e915..869bc0293b 100644 --- a/resources/lang/ja/admin/departments/table.php +++ b/resources/lang/ja/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => '部署名', @@ -8,4 +8,4 @@ return array( 'location' => '設置場所', 'create' => '部署の作成', 'update' => '部署の更新', - ); + ]; diff --git a/resources/lang/ja/admin/depreciations/general.php b/resources/lang/ja/admin/depreciations/general.php index a0395ecf29..aab918f724 100644 --- a/resources/lang/ja/admin/depreciations/general.php +++ b/resources/lang/ja/admin/depreciations/general.php @@ -1,6 +1,6 @@ '資産の減価償却について', 'about_depreciations' => '定額法に基づいて資産の減価償却を設定することができます。', 'asset_depreciations' => '償却資産', @@ -9,4 +9,4 @@ return array( 'number_of_months' => '月数', 'update' => '減価償却の更新', -); +]; diff --git a/resources/lang/ja/admin/depreciations/message.php b/resources/lang/ja/admin/depreciations/message.php index 22d97e3692..2a9c9e6c7c 100644 --- a/resources/lang/ja/admin/depreciations/message.php +++ b/resources/lang/ja/admin/depreciations/message.php @@ -1,25 +1,24 @@ '減価償却クラスがありません。', 'assoc_users' => 'この減価償却は複数のモデルに関係付けられているため削除することができません。モデルを削除してから再度実行してください。 ', - - 'create' => array( + 'create' => [ 'error' => '減価償却クラスが作成できませんでした。再度実行してください。', - 'success' => '減価償却クラスの作成に成功しました。' - ), + 'success' => '減価償却クラスの作成に成功しました。', + ], - 'update' => array( + 'update' => [ 'error' => '減価償却クラスの更新ができませんでした。再度実行してください。', - 'success' => '減価償却クラスの更新に成功しました。' - ), + 'success' => '減価償却クラスの更新に成功しました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '本当に減価償却クラスを削除しますか？', 'error' => '減価償却クラスを削除する際に問題がおきました。再度実行してください。', - 'success' => '減価償却クラスの削除に成功しました。' - ) + 'success' => '減価償却クラスの削除に成功しました。', + ], -); +]; diff --git a/resources/lang/ja/admin/depreciations/table.php b/resources/lang/ja/admin/depreciations/table.php index bedcaf5cf4..cb44f60786 100644 --- a/resources/lang/ja/admin/depreciations/table.php +++ b/resources/lang/ja/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => '月', 'term' => '期間', 'title' => '名前 ', -); +]; diff --git a/resources/lang/ja/admin/groups/message.php b/resources/lang/ja/admin/groups/message.php index a8e8dd6a98..32314e4832 100644 --- a/resources/lang/ja/admin/groups/message.php +++ b/resources/lang/ja/admin/groups/message.php @@ -1,22 +1,22 @@ 'グループは既に存在しています！', 'group_not_found' => 'グループ [:id] は、存在していません。', 'group_name_required' => '名前フィールドは必須です。', - 'success' => array( + 'success' => [ 'create' => 'グループは正常に作成されました。', 'update' => 'グループは正常に更新されました。', 'delete' => 'グループは正常に削除されました。', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '本当にこのグループを削除してもよいですか？', 'create' => 'グループを作成時に問題が発生しました。もう一度試して下さい。', 'update' => 'グループを更新時に問題が発生しました。もう一度試して下さい。', 'delete' => 'グループを削除時に問題が発生しました。もう一度試して下さい。', - ), + ], -); +]; diff --git a/resources/lang/ja/admin/groups/table.php b/resources/lang/ja/admin/groups/table.php index 362b03cdd0..c586cba019 100644 --- a/resources/lang/ja/admin/groups/table.php +++ b/resources/lang/ja/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => '名前', 'users' => '# の利用者数', -); +]; diff --git a/resources/lang/ja/admin/groups/titles.php b/resources/lang/ja/admin/groups/titles.php index 4873dcf3b0..1316cef597 100644 --- a/resources/lang/ja/admin/groups/titles.php +++ b/resources/lang/ja/admin/groups/titles.php @@ -1,6 +1,6 @@ 'グループについて', 'about_groups' => 'グループを使用して、ユーザーへのアクセス許可を管理します。', 'group_management' => 'グループ管理', @@ -11,4 +11,4 @@ return array( 'allow' => '許可', 'deny' => '拒否', -); +]; diff --git a/resources/lang/ja/admin/hardware/form.php b/resources/lang/ja/admin/hardware/form.php index f5834f5211..78b091c319 100644 --- a/resources/lang/ja/admin/hardware/form.php +++ b/resources/lang/ja/admin/hardware/form.php @@ -1,12 +1,12 @@ '資産の一括削除', +return [ + 'bulk_delete' => '資産の一括削除', 'bulk_delete_help' => '以下の資産が一括削除されます。削除後のデータは戻すことができませ', 'bulk_delete_warn' => ':asset_cont 件の資産を削除しました', - 'bulk_update' => '資産を一括更新', - 'bulk_update_help' => 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ', - 'bulk_update_warn' => '資産群（:asset_count）のプロパティを編集します。', + 'bulk_update' => '資産を一括更新', + 'bulk_update_help' => 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ', + 'bulk_update_warn' => '資産群（:asset_count）のプロパティを編集します。', 'checkedout_to' => 'チェックアウト先', 'checkout_date' => 'チェックアウト日', 'checkin_date' => 'チェックイン日', @@ -38,7 +38,6 @@ return array( 'tag' => '資産タグ', 'update' => '資産アップデート', 'warranty' => '保証', - 'warranty_expires' => '保証期限', + 'warranty_expires' => '保証期限', 'years' => '年', -) -; +]; diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php index 06b3f0fccc..b2c4f5866d 100644 --- a/resources/lang/ja/admin/hardware/general.php +++ b/resources/lang/ja/admin/hardware/general.php @@ -1,9 +1,9 @@ '資産について', 'about_assets_text' => '資産はシリアル番号や資産タグで追跡します。資産は特定することが重要な、高価な物であることが多いです。', - 'archived' => 'アーカイブ', + 'archived' => 'アーカイブ', 'asset' => '資産', 'bulk_checkout' => '一括チェックアウト', 'checkin' => '資産をチェックイン', @@ -19,4 +19,4 @@ return array( 'pending' => 'ペンディング', 'undeployable' => '配備不可', 'view' => '資産を表示', -); +]; diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php index f22f06e9e2..cddae00a7b 100644 --- a/resources/lang/ja/admin/hardware/message.php +++ b/resources/lang/ja/admin/hardware/message.php @@ -1,6 +1,6 @@ '警告:この資産は、現在 未配備としてマークされています。 この状態が変更された場合は、資産のステータスを更新してください。', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => '申し訳ありません。その資産が存在しないまたはリクエスト可能ではありません。', 'assoc_users' => 'この資産は利用者にチェックされているため削除できません。資産をチェック後、もう一度、やり直して下さい。 ', - 'create' => array( + 'create' => [ 'error' => '資産は作成されませんでした。もう一度、やり直して下さい。', - 'success' => '資産は作成されました。' - ), + 'success' => '資産は作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => '資産は更新されませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常に更新されました。', 'nothing_updated' => 'フィールドが選択されていないため、更新されませんでした。', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => '資産は復元されませんでした。もう一度、やり直して下さい。', - 'success' => '資産は正常に復元されました。' - ), + 'success' => '資産は正常に復元されました。', + ], - 'audit' => array( + 'audit' => [ 'error' => '資産の監査に失敗しました。もう一度やり直してください。', - 'success' => '資産の監査ログに記録しました。' - ), + 'success' => '資産の監査ログに記録しました。', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ファイルが削除できませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルは正常に削除されました。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ファイルがアップロードできませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルが正常にアップロードされました。', 'nofiles' => 'アップロードするファイルが選択されていないか、アップロードしようとしているファイルが大き過ぎます。', 'invalidfiles' => 'いずれかのファイルが大き過ぎるか、ファイルタイプが許可されていません。許可されているファイルタイプ（png, gif, jpg, doc, docx, pdf, and txt）', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'いくつかの項目は正しくインポートされませんでした。', 'errorDetail' => '以下のアイテムはエラーのためインポートできませんでした', - 'success' => "ファイルはインポートされました。", - 'file_delete_success' => "ファイルを削除しました。", - 'file_delete_error' => "ファイルが削除出来ませんでした。", - ), + 'success' => 'ファイルはインポートされました。', + 'file_delete_success' => 'ファイルを削除しました。', + 'file_delete_error' => 'ファイルが削除出来ませんでした。', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'この資産を削除してもよろしいですか？', 'error' => '資産を削除する際に問題が発生しました。もう一度やり直して下さい。', 'nothing_updated' => '資産が選択されていないため、削除されませんでした。', - 'success' => '資産は正常に削除されました。' - ), + 'success' => '資産は正常に削除されました。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '資産はチェックアウトされませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常にチェックアウトされました。', 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', 'not_available' => 'この資産はチェックアウトできません!', - 'no_assets_selected' => 'リストから少なくとも1つの資産を選択する必要があります' - ), + 'no_assets_selected' => 'リストから少なくとも1つの資産を選択する必要があります', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '資産はチェックインされませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常にチェックインされました。', 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', 'already_checked_in' => 'その資産はすでにチェックインしています。', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => '資産は要求されませんでした。もう一度、やり直して下さい。', 'success' => '資産の要求処理が成功しました。', - 'canceled' => 'チェックアウトリクエストが正常にキャンセルされました。' - ) + 'canceled' => 'チェックアウトリクエストが正常にキャンセルされました。', + ], -); +]; diff --git a/resources/lang/ja/admin/hardware/table.php b/resources/lang/ja/admin/hardware/table.php index 09f221c65c..c28d3613d6 100644 --- a/resources/lang/ja/admin/hardware/table.php +++ b/resources/lang/ja/admin/hardware/table.php @@ -1,6 +1,6 @@ '資産タグ', 'asset_model' => 'モデル', @@ -20,6 +20,6 @@ return array( 'title' => '資産 ', 'image' => '写真', 'days_without_acceptance' => '未受理期間', - 'monthly_depreciation' => '毎月の減価償却費（減価償却費）' + 'monthly_depreciation' => '毎月の減価償却費（減価償却費）', -); +]; diff --git a/resources/lang/ja/admin/kits/general.php b/resources/lang/ja/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ja/admin/kits/general.php +++ b/resources/lang/ja/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ja/admin/licenses/form.php b/resources/lang/ja/admin/licenses/form.php index 8de9104348..9026532e3d 100644 --- a/resources/lang/ja/admin/licenses/form.php +++ b/resources/lang/ja/admin/licenses/form.php @@ -1,6 +1,6 @@ '資産', 'checkin' => 'チェックイン', @@ -18,5 +18,5 @@ return array( 'to_email' => 'ライセンスされたEmail', 'to_name' => 'ライセンスされた名前', 'update' => 'ライセンスを更新', - 'checkout_help' => 'あなたはハードウェア資産もしくは社員にライセンスを付与しているか確認する必要があります。両方選択することも可能ですが、資産所有者は資産を確認した社員と一致しなければなりません。' -); + 'checkout_help' => 'あなたはハードウェア資産もしくは社員にライセンスを付与しているか確認する必要があります。両方選択することも可能ですが、資産所有者は資産を確認した社員と一致しなければなりません。', +]; diff --git a/resources/lang/ja/admin/licenses/general.php b/resources/lang/ja/admin/licenses/general.php index bfe6aa199f..9b132d265e 100644 --- a/resources/lang/ja/admin/licenses/general.php +++ b/resources/lang/ja/admin/licenses/general.php @@ -1,6 +1,6 @@ 'ライセンスについて', 'about_licenses' => 'ライセンスはソフトウェアの追跡に使用されます。指定した数を個人にチェックアウトすることができます。', 'checkin' => 'ライセンスシートをチェックイン', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'ソフトウェア・ライセンス', 'user' => '利用者', 'view' => 'ライセンスを表示', -); +]; diff --git a/resources/lang/ja/admin/licenses/message.php b/resources/lang/ja/admin/licenses/message.php index a63da157f8..ac535d2234 100644 --- a/resources/lang/ja/admin/licenses/message.php +++ b/resources/lang/ja/admin/licenses/message.php @@ -1,6 +1,6 @@ 'ライセンスが存在しません。', 'user_does_not_exist' => '利用者が存在しません。', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'アセットまたはユーザーを選択する必要がありますが、両方を選択する必要はありません。', 'not_found' => 'ライセンスが見つかりません', - - 'create' => array( + 'create' => [ 'error' => 'ライセンスが作成できませんでした。もう一度、やり直して下さい。', - 'success' => 'ライセンスが作成されました。' - ), + 'success' => 'ライセンスが作成されました。', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ファイルが削除できませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルは削除されました。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ファイルがアップロードできませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルがアップロードされました。', 'nofiles' => 'アップロードするファイルが選択されていないか、アップロードしようとしているファイルが大き過ぎます。', 'invalidfiles' => 'ファイルサイズが大きすぎるか、許可されていない形式です。(png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, lic)', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'ライセンスが更新できませんでした。もう一度、やり直して下さい。', - 'success' => 'ライセンスが更新されました。' - ), + 'success' => 'ライセンスが更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このライセンスを削除してもよろしいですか？', 'error' => 'ライセンスを削除する際に問題が発生しました。もう一度、やり直して下さい。', - 'success' => 'ライセンスが削除されました。' - ), + 'success' => 'ライセンスが削除されました。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'ライセンスのチェックを外す際に問題が発生しました。もう一度、やり直して下さい。', - 'success' => 'ライセンスのチェックを外しました。' - ), + 'success' => 'ライセンスのチェックを外しました。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'ライセンスのチェックを入れる際に問題が発生しました。もう一度、やり直して下さい。', - 'success' => 'ライセンスのチェックを入れました。' - ), + 'success' => 'ライセンスのチェックを入れました。', + ], -); +]; diff --git a/resources/lang/ja/admin/licenses/table.php b/resources/lang/ja/admin/licenses/table.php index 6baba555bc..a079b0f7d2 100644 --- a/resources/lang/ja/admin/licenses/table.php +++ b/resources/lang/ja/admin/licenses/table.php @@ -1,6 +1,6 @@ '割り当て先', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'シリアル', 'title' => 'ライセンス', -); +]; diff --git a/resources/lang/ja/admin/locations/message.php b/resources/lang/ja/admin/locations/message.php index b8c6fb76e2..eef728c812 100644 --- a/resources/lang/ja/admin/locations/message.php +++ b/resources/lang/ja/admin/locations/message.php @@ -1,27 +1,26 @@ 'ロケーションが存在しません。', 'assoc_users' => 'ロケーションは少なくとも一つの利用者に関連付けされているため、削除できません。ローケーションの関連付けを削除し、もう一度試して下さい。 ', 'assoc_assets' => 'この設置場所は少なくとも一つの利用者に関連付けされているため、削除できません。設置場所の関連付けを削除し、もう一度試して下さい。 ', 'assoc_child_loc' => 'この設置場所は、少なくとも一つの配下の設置場所があります。この設置場所を参照しないよう更新して下さい。 ', - - 'create' => array( + 'create' => [ 'error' => 'ロケーションが作成できませんでした。もう一度やり直して下さい。', - 'success' => 'ロケーションが作成されました。' - ), + 'success' => 'ロケーションが作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => 'ロケーションが更新できませんでした。もう一度やり直して下さい。', - 'success' => 'ロケーションが更新されました。' - ), + 'success' => 'ロケーションが更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このロケーションを本当に削除してよいですか？', 'error' => 'ロケーションを削除する際に問題が発生しました。もう一度やり直して下さい。', - 'success' => 'ロケーションが削除されました。' - ) + 'success' => 'ロケーションが削除されました。', + ], -); +]; diff --git a/resources/lang/ja/admin/locations/table.php b/resources/lang/ja/admin/locations/table.php index 912b43aa97..73ef89cb8f 100644 --- a/resources/lang/ja/admin/locations/table.php +++ b/resources/lang/ja/admin/locations/table.php @@ -1,6 +1,6 @@ '設置場所について', 'about_locations' => '設置場所はユーザー、資産、およびその他のアイテムの情報追跡に使用されます。', 'assets_rtd' => '資産', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => '上位', 'currency' => '現地通貨', 'ldap_ou' => 'LDAP OU を検索', - ); + ]; diff --git a/resources/lang/ja/admin/manufacturers/message.php b/resources/lang/ja/admin/manufacturers/message.php index 52a07d4236..5df093dc08 100644 --- a/resources/lang/ja/admin/manufacturers/message.php +++ b/resources/lang/ja/admin/manufacturers/message.php @@ -1,29 +1,29 @@ '製造元が存在しません。', 'assoc_users' => 'この製造元は一つ以上の型番に関連付けられているため、削除できません。この製造元の関連付けを削除後、もう一度試して下さい。 ', - 'create' => array( + 'create' => [ 'error' => '製造元が作成できませんでした。もう一度試して下さい。', - 'success' => '製造元が作成されました。' - ), + 'success' => '製造元が作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => '製造元が更新できませんでした。もう一度試して下さい。', - 'success' => '製造元が更新できませんでした。もう一度試して下さい。' - ), + 'success' => '製造元が更新できませんでした。もう一度試して下さい。', + ], - 'restore' => array( + 'restore' => [ 'error' => '製造元が復元できませんでした。もう一度試して下さい。', - 'success' => '製造元が復元されました。' - ), + 'success' => '製造元が復元されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '本当にこの製造元を削除しますか？', 'error' => '製造元を削除する際に問題が発生しました。もう一度試して下さい。', - 'success' => '製造元が削除されました。' - ) + 'success' => '製造元が削除されました。', + ], -); +]; diff --git a/resources/lang/ja/admin/manufacturers/table.php b/resources/lang/ja/admin/manufacturers/table.php index d2fdf133c7..d2216926e2 100644 --- a/resources/lang/ja/admin/manufacturers/table.php +++ b/resources/lang/ja/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'メーカーについて', 'about_manufacturers_text' => 'メーカーは、あなたの資産を製造する会社です。重要なサポート連絡先は、資産の詳細ページに表示されます。', 'asset_manufacturers' => '資産製造業者', @@ -13,4 +13,4 @@ return array( 'update' => '製造業者を更新', 'url' => 'URL', -); +]; diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php index 5448463167..7b763a40a7 100644 --- a/resources/lang/ja/admin/models/general.php +++ b/resources/lang/ja/admin/models/general.php @@ -1,6 +1,6 @@ '資産モデルについて', 'about_models_text' => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)', 'deleted' => 'この型番は削除されました。元に戻すにはココをクリックして下さい。.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => ':model_count 件の資産モデルを削除しようとしています。', 'restore' => '型番を復元', 'requestable' => 'ユーザーはこのモデルをリクエスト出来ます', - 'show_mac_address' => 'この型番の資産にMACアドレスフィールドを表示', + 'show_mac_address' => 'この型番の資産にMACアドレスフィールドを表示', 'view_deleted' => '削除したものを表示', 'view_models' => '型番を表示', 'fieldset' => 'フィールドセット', 'no_custom_field' => 'カスタム フィールドなし', 'add_default_values' => 'デフォルト値を追加する', -); +]; diff --git a/resources/lang/ja/admin/models/message.php b/resources/lang/ja/admin/models/message.php index 869054dba7..d0a43634dd 100644 --- a/resources/lang/ja/admin/models/message.php +++ b/resources/lang/ja/admin/models/message.php @@ -1,42 +1,41 @@ '型番が存在しません。', 'assoc_users' => 'この型番は他の資産に関連付けられているため、削除できません。資産を削除してから、もう一度試して下さい。 ', - - 'create' => array( + 'create' => [ 'error' => '型番が作成できませんでした。もう一度やり直して下さい。', 'success' => '型番が作成されました。', 'duplicate_set' => '資産型の名前や製造元、型番は、既に存在してます。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '型番が更新できませんでした。もう一度やり直して下さい。', - 'success' => '型番が更新されました。' - ), + 'success' => '型番が更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '本当にこの資産の型番を削除しますか？', 'error' => '型番を削除する際に問題が発生しました。もう一度やり直して下さい。', - 'success' => '型番は削除されました。' - ), + 'success' => '型番は削除されました。', + ], - 'restore' => array( + 'restore' => [ 'error' => '型番が復元されませんでした。もう一度、やり直して下さい。', - 'success' => '型番は復元されました。' - ), + 'success' => '型番は復元されました。', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'フィールドが選択されていないため、更新されませんでした。', - 'success' => '型番を更新しました。' - ), + 'success' => '型番を更新しました。', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'モデルが選択されていないため、何も削除されませんでした。', 'success' => ':success_count モデルが削除されました！', - 'success_partial' => ':success_count モデルが削除されましたが、:fail_count 個はアセットが関連付けられているため、削除できませんでした。' - ), + 'success_partial' => ':success_count モデルが削除されましたが、:fail_count 個はアセットが関連付けられているため、削除できませんでした。', + ], -); +]; diff --git a/resources/lang/ja/admin/models/table.php b/resources/lang/ja/admin/models/table.php index 751442454a..285936c315 100644 --- a/resources/lang/ja/admin/models/table.php +++ b/resources/lang/ja/admin/models/table.php @@ -1,6 +1,6 @@ '資産型番を作成', 'created_at' => '作成済', @@ -14,4 +14,4 @@ return array( 'update' => '資産型番を更新', 'clone' => '資産型番を複製', 'edit' => '資産型番を編集', -); +]; diff --git a/resources/lang/ja/admin/reports/general.php b/resources/lang/ja/admin/reports/general.php index 003c7d26ea..44b2f9205f 100644 --- a/resources/lang/ja/admin/reports/general.php +++ b/resources/lang/ja/admin/reports/general.php @@ -1,5 +1,5 @@ '資産報告書のオプションを選択してください。' -); +return [ + 'info' => '資産報告書のオプションを選択してください。', +]; diff --git a/resources/lang/ja/admin/reports/message.php b/resources/lang/ja/admin/reports/message.php index 41ec1488f4..237b561e4d 100644 --- a/resources/lang/ja/admin/reports/message.php +++ b/resources/lang/ja/admin/reports/message.php @@ -1,5 +1,5 @@ 'あなたは少なくとも一つのオプションを選択しなければなりません。' -); +return [ + 'error' => 'あなたは少なくとも一つのオプションを選択しなければなりません。', +]; diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php index 9075ebc846..8040216578 100644 --- a/resources/lang/ja/admin/settings/general.php +++ b/resources/lang/ja/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory ドメイン', 'ad_domain_help' => '通常はemailのドメイン名と同じです。ただし例外あり', 'ad_append_domain_label' => 'ドメイン名を追加', 'ad_append_domain' => 'ユーザー名フィールドにドメイン名を追加', - 'ad_append_domain_help' => 'ユーザーは "username@domain.local" を記述する必要はなく、"username" と入力するだけです。' , + 'ad_append_domain_help' => 'ユーザーは "username@domain.local" を記述する必要はなく、"username" と入力するだけです。', 'admin_cc_email' => 'CC（カーボンコピー）メール 送信先', 'admin_cc_email_help' => 'ユーザーに送信されたチェックイン/チェックアウト　メールのコピーを追加の電子メールアカウントに送信する場合は、ここにメールアドレスを入力します。必要が無ければ、このフィールドを空白にします', 'is_ad' => 'Active Directory サーバー', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'アラートを無視する期間', 'alert_inv_threshold' => 'インベントリのアラート間隔', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => '資産ID', 'audit_interval' => '監査の間隔', 'audit_interval_help' => '定期的にあなたの資産を監査する必要がある場合は、間隔を月で入力します。', @@ -214,7 +214,7 @@ return array( 'two_factor_enter_code' => '二段階認証コードを入力', 'two_factor_config_complete' => '送信', 'two_factor_enabled_edit_not_allowed' => '管理者はこの設定を編集することを許可していません。', - 'two_factor_enrollment_text' => "二段階認証の登録が必要ですが、あなたのデバイスはまだ登録されていません。Google Authenticatorアプリを開き、下のQRコードをスキャンして端末を登録してください。端末を登録したら以下のコードを入力してください。", + 'two_factor_enrollment_text' => '二段階認証の登録が必要ですが、あなたのデバイスはまだ登録されていません。Google Authenticatorアプリを開き、下のQRコードをスキャンして端末を登録してください。端末を登録したら以下のコードを入力してください。', 'require_accept_signature' => 'シグネチャリクエスト', 'require_accept_signature_help_text' => 'この機能を有効にするには、ユーザーが資産を受け入れる際に物理的にサインオフする必要があります。', 'left' => '左', @@ -227,4 +227,4 @@ return array( 'unique_serial_help_text' => 'このチェックボックスをオンにすると、資産のシリアル番号に一意性制約が適用されます', 'zerofill_count' => '資産タグの長さ (ゼロ埋め含む)', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ja/admin/settings/message.php b/resources/lang/ja/admin/settings/message.php index 825dd9b352..c0b786d290 100644 --- a/resources/lang/ja/admin/settings/message.php +++ b/resources/lang/ja/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '更新時にエラーが発生しました。 ', - 'success' => '更新に成功しました。' - ), - 'backup' => array( + 'success' => '更新に成功しました。', + ], + 'backup' => [ 'delete_confirm' => 'このバックアップファイルを削除してもよろしいですか？この操作は、もとに戻すことは出来ません。 ', 'file_deleted' => 'バックアップファイルの削除に成功しました。 ', 'generated' => '新しいバックアップファイルが作成されました。', 'file_not_found' => 'そのバックアップファイルをサーバー上に見つけることが出来ませんでした。', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'パージ中にエラーが発生しました。 ', 'validation_failed' => 'パージの確定方法が正しくありません。入力してください、単語「削除」確認ボックス。', - 'success' => 'パージによりレコードは削除されました' - ), + 'success' => 'パージによりレコードは削除されました', + ], -); +]; diff --git a/resources/lang/ja/admin/statuslabels/message.php b/resources/lang/ja/admin/statuslabels/message.php index 43526f2125..e659072bd7 100644 --- a/resources/lang/ja/admin/statuslabels/message.php +++ b/resources/lang/ja/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'ステータス ラベルは存在しません。', 'assoc_assets' => 'このステータスラベルは少なくとも一つの資産に関連付けされているため、削除できません。資産の関連付けを削除し、もう一度試して下さい。 ', - - 'create' => array( + 'create' => [ 'error' => 'ステータスラベルが作成できませんでした。もう一度試して下さい。', - 'success' => 'ステータスラベルが作成されました。' - ), + 'success' => 'ステータスラベルが作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => 'ステータスラベルは更新できませんでした。もう一度試して下さい。', - 'success' => 'ステータスラベルが更新されました。' - ), + 'success' => 'ステータスラベルが更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'このステータスラベルを削除しますか？', 'error' => 'ステータスラベルを削除する際に問題が発生しました。もう一度やり直して下さい。', - 'success' => 'ステータスラベルは削除されました。' - ), + 'success' => 'ステータスラベルは削除されました。', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'これらのアセットを誰にも割り当てることはできません。', 'deployable' => 'これらの資産はチェックアウトすることができます。割り当てられたら、 Deployedというメタステータスを想定します。', 'archived' => 'これらのアセットはチェックアウトできず、アーカイブビューにのみ表示されます。これは、予算/歴史的な目的のために資産に関する情報を保持するが、それらを日々の資産リストから外すことに役立つ。', 'pending' => 'これらの資産は、誰にも割り当てられません。修理の対象外ではあるが、流通に戻ることが予想されるアイテムによく使用されます。', - ), + ], -); +]; diff --git a/resources/lang/ja/admin/statuslabels/table.php b/resources/lang/ja/admin/statuslabels/table.php index 0efad234f3..94930e37e6 100644 --- a/resources/lang/ja/admin/statuslabels/table.php +++ b/resources/lang/ja/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'ステータスラベルについて', 'archived' => 'アーカイブ', 'create' => 'ステータスラベルを作成', @@ -16,4 +16,4 @@ return array( 'title' => 'ステータスラベル', 'undeployable' => '配備不可', 'update' => 'ステータスラベルを更新', -); +]; diff --git a/resources/lang/ja/admin/suppliers/message.php b/resources/lang/ja/admin/suppliers/message.php index 09e9ca27b3..5e0540bf4f 100644 --- a/resources/lang/ja/admin/suppliers/message.php +++ b/resources/lang/ja/admin/suppliers/message.php @@ -1,27 +1,26 @@ '仕入先が存在していません。', - - 'create' => array( + 'create' => [ 'error' => '仕入先が作成できませんでした。もう一度試して下さい。', - 'success' => '仕入先が作成されました。' - ), + 'success' => '仕入先が作成されました。', + ], - 'update' => array( + 'update' => [ 'error' => '仕入先は更新できませんでした。もう一度試して下さい。', - 'success' => '仕入先が更新されました。' - ), + 'success' => '仕入先が更新されました。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '本当にこの仕入先を削除してよいですか？', 'error' => '仕入先を削除する際に問題が発生しました。もう一度試して下さい。', 'success' => '仕入先が削除されました。', 'assoc_assets' => 'この仕入先は現在:asset_count個の資産に関連付けされているため削除できません。この仕入先を参照しないように更新した上で、もう一度試して下さい。 ', 'assoc_licenses' => 'この仕入先は現在:licences_count個のライセンスに関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ', 'assoc_maintenances' => 'この仕入先は現在:asset_maintenances_count個の資産管理に関連付けされているため削除できません。この仕入先を参照しないように更新したうえで、もう一度試してください。 ', - ) + ], -); +]; diff --git a/resources/lang/ja/admin/suppliers/table.php b/resources/lang/ja/admin/suppliers/table.php index cd6de4f9d5..6d70962e38 100644 --- a/resources/lang/ja/admin/suppliers/table.php +++ b/resources/lang/ja/admin/suppliers/table.php @@ -1,6 +1,6 @@ '仕入先について', 'about_suppliers_text' => '仕入先は、アイテムの追跡に使用されます。', 'address' => '仕入先住所', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => '資産を表示', 'zip' => '郵便番号', -); +]; diff --git a/resources/lang/ja/admin/users/general.php b/resources/lang/ja/admin/users/general.php index 8a79054f0a..c909a01b0d 100644 --- a/resources/lang/ja/admin/users/general.php +++ b/resources/lang/ja/admin/users/general.php @@ -1,7 +1,6 @@ 'このユーザはログインすることができます。', 'activated_disabled_help_text' => '自分自身のアカウント有効化状態は編集できません。', 'assets_user' => ':name に資産を割り当てる', @@ -13,7 +12,7 @@ return array( 'edit' => '利用者を編集', 'filetype_info' => '許可するファイルタイプ（png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar）', 'history_user' => ':nameの履歴', - 'info' => '情報', + 'info' => '情報', 'restore_user' => '復元するには、ここをクリックします。', 'last_login' => '最終ログイン', 'ldap_config_text' => 'LDAP 構成設定 管理者 > 設定。 選択した場所は、インポートされたすべてのユーザーに対して設定されます。', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => '現在の管理者設定では、2段階認証は任意です。 ', 'two_factor_enrolled' => '二段階認証デバイスの登録 ', 'two_factor_active' => '二段階認証有効 ', - ); + ]; diff --git a/resources/lang/ja/admin/users/message.php b/resources/lang/ja/admin/users/message.php index be19c742f8..1265e21e9b 100644 --- a/resources/lang/ja/admin/users/message.php +++ b/resources/lang/ja/admin/users/message.php @@ -1,6 +1,6 @@ 'この資産を承認しました。', 'declined' => 'この資産を却下しました。', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAPの統合は、インストール時に設定されません。', 'password_resets_sent' => '有効なメールアドレスを持っている選択されたユーザーにパスワードリセットのリンクが送信されました。', - - 'success' => array( + 'success' => [ 'create' => '利用者が正常に作成されました。', 'update' => '利用者が正常に更新されました。', 'update_bulk' => '利用者が正常に更新されました！', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'ユーザーは正常に再開しました。', 'restored' => '利用者が復元されました。', 'import' => '利用者が正常にインポートされました。', - ), + ], - 'error' => array( + 'error' => [ 'create' => '利用者を作成する際に問題が発生しました。もう一度、やり直して下さい。', 'update' => '利用者を更新する際に問題が発生しました。もう一度、やり直して下さい。', 'delete' => '利用者を削除する際に問題が発生しました。もう一度、やり直して下さい。', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAPサーバーを検索できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:', 'ldap_could_not_get_entries' => 'LDAPサーバーからエンティティを取得できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:', 'password_ldap' => 'このアカウントのパスワードは、LDAPかアクティブディレクトリで管理されています。パスワードを変更するには管理者にお問い合わせください。 ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ファイルが削除できませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルは正常に削除されました。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ファイルがアップロードできませんでした。もう一度、やり直して下さい。', 'success' => 'ファイルが正常にアップロードされました。', 'nofiles' => 'アップロードするためのファイルを選択していません。', 'invalidfiles' => 'いずれかのファイルが大き過ぎるか、ファイルタイプが許可されていません。許可されているファイルタイプ（png, gif, jpg, doc, docx, pdf, and txt）', - ), + ], -); +]; diff --git a/resources/lang/ja/admin/users/table.php b/resources/lang/ja/admin/users/table.php index d8419af3bb..7af2262bce 100644 --- a/resources/lang/ja/admin/users/table.php +++ b/resources/lang/ja/admin/users/table.php @@ -1,6 +1,6 @@ '有効', 'allow' => '許可', 'checkedout' => '資産', @@ -28,11 +28,11 @@ return array( 'show_current' => '現在のユーザーを表示', 'show_deleted' => '削除されたユーザーを表示', 'title' => '役職', - 'to_restore_them' => 'それらを復元します。', + 'to_restore_them' => 'それらを復元します。', 'updateuser' => '利用者を更新', 'username' => 'ユーザ名', - 'user_deleted_text' => 'この利用者は、削除済みとしてマークされています。', + 'user_deleted_text' => 'この利用者は、削除済みとしてマークされています。', 'username_note' => '(Windows統合認証のみを利用する。)', 'cloneuser' => '利用者を複製', 'viewusers' => '利用者を表示', -); +]; diff --git a/resources/lang/ja/auth/general.php b/resources/lang/ja/auth/general.php index 07ead90edc..228d57eac9 100644 --- a/resources/lang/ja/auth/general.php +++ b/resources/lang/ja/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ja/auth/message.php b/resources/lang/ja/auth/message.php index c6edd75f14..5346957266 100644 --- a/resources/lang/ja/auth/message.php +++ b/resources/lang/ja/auth/message.php @@ -1,6 +1,6 @@ 'このemailのアカウントが既に存在しています。', 'account_not_found' => 'ユーザー名またはパスワードが不正です。', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'このユーザーアカウントは禁止されています。', 'throttle' => '複数回ログインに失敗しました。 :minutes 分後に再試行してください。', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'お使いのデバイスは既に登録されています。', 'success' => 'ログインに成功しました。', 'code_required' => '二段階認証コードが必要です。', 'invalid_code' => '二段階認証コードが無効です。', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'ログインする際に問題が発生しました。もう一度やり直して下さい。', 'success' => 'ログインに成功しました。', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'ログアウト中に問題が発生しました。もう一度やり直してください。', 'success' => 'ログアウトに成功しました。', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'アカウントを作成する際に問題が発生しました。もう一度やり直して下さい。', 'success' => 'アカウントが作成されました。', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'パスワードリセットの際に問題が発生しました。もう一度やり直して下さい。', 'success' => 'このシステムにそのメールアドレスが存在する場合は、パスワード回復用のメールが送信されました。', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'パスワードをリセットする際に問題が発生しました。もう一度やり直して下さい。', 'success' => 'パスワードがリセットされました。', - ), + ], - -); +]; diff --git a/resources/lang/ja/button.php b/resources/lang/ja/button.php index 6fc82180e8..ae0a2cdeba 100644 --- a/resources/lang/ja/button.php +++ b/resources/lang/ja/button.php @@ -1,6 +1,6 @@ 'アクション', 'add' => '新規追加', 'cancel' => 'キャンセル', @@ -11,7 +11,7 @@ return array( 'request' => 'リクエスト', 'submit' => '送信', 'upload' => 'アップロード', - 'select_file' => 'ファイルを選択...', + 'select_file' => 'ファイルを選択...', 'select_files' => 'ファイルを選択...', 'generate_labels' => '{1} ラベル生成|[2,*] 複数ラベル生成', -); +]; diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php index dde18f963a..2eec5018d6 100644 --- a/resources/lang/ja/general.php +++ b/resources/lang/ja/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'チェックイン数', 'user_requests_count' => 'リクエスト数', 'city' => '市区町村', - 'click_here' => 'ここをクリック', + 'click_here' => 'ここをクリック', 'clear_selection' => '選択をクリア', 'companies' => '所属', 'company' => '所属', 'component' => '構成部品', 'components' => '構成部品', - 'complete' => '成功', + 'complete' => '成功', 'consumable' => '消耗品', 'consumables' => '消耗品数', 'country' => '国', diff --git a/resources/lang/ja/help.php b/resources/lang/ja/help.php index 779b97303d..e3c2b435b9 100644 --- a/resources/lang/ja/help.php +++ b/resources/lang/ja/help.php @@ -1,6 +1,6 @@ "詳細", + 'more_info_title' => '詳細', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => '資産はシリアル番号または資産タグで追跡されるアイテムです。特定のアイテムを識別することが重要なより高い価値のアイテムである傾向があります。', @@ -31,6 +31,4 @@ return array( 'depreciations' => '定額法に基づいて資産の減価償却を設定することができます。', - - -); +]; diff --git a/resources/lang/ja/mail.php b/resources/lang/ja/mail.php index b09c325f26..80861b7f34 100644 --- a/resources/lang/ja/mail.php +++ b/resources/lang/ja/mail.php @@ -1,6 +1,6 @@ 'ユーザーがアイテムリクエストをキャンセルしました。', 'a_user_requested' => 'ユーザーがアイテムをリクエストしています', 'accessory_name' => '付属品名:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ja/pagination.php b/resources/lang/ja/pagination.php index 57e5dea529..ef46643d6c 100644 --- a/resources/lang/ja/pagination.php +++ b/resources/lang/ja/pagination.php @@ -1,6 +1,6 @@ '次へ »', -); +]; diff --git a/resources/lang/ja/passwords.php b/resources/lang/ja/passwords.php index cfcb957b71..71eca805b3 100644 --- a/resources/lang/ja/passwords.php +++ b/resources/lang/ja/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'パスワード リンクが送信されました!', 'user' => 'そのメールアドレスを持つアクティブユーザーは見つかりませんでした', ]; - diff --git a/resources/lang/ja/reminders.php b/resources/lang/ja/reminders.php index 64d31d2790..c975978fd0 100644 --- a/resources/lang/ja/reminders.php +++ b/resources/lang/ja/reminders.php @@ -1,6 +1,6 @@ "パスワードは6文字以上および確認用と一致する必要があります。", + 'password' => 'パスワードは6文字以上および確認用と一致する必要があります。', - "user" => "ユーザー名またはメールアドレスが不正です。", + 'user' => 'ユーザー名またはメールアドレスが不正です。', - "token" => "パスワードリセットのトークンが不正です。", + 'token' => 'パスワードリセットのトークンが不正です。', - "sent" => "メールアドレスが一致した場合、パスワードリマインダーが送信されます！", + 'sent' => 'メールアドレスが一致した場合、パスワードリマインダーが送信されます！', -); +]; diff --git a/resources/lang/ja/table.php b/resources/lang/ja/table.php index 63176ae638..cc8b438f11 100644 --- a/resources/lang/ja/table.php +++ b/resources/lang/ja/table.php @@ -1,10 +1,10 @@ 'アクション', 'action' => 'アクション', 'by' => '実行者', 'item' => '品目', -); +]; diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php index 7e986648fb..cc8d7d4561 100644 --- a/resources/lang/ja/validation.php +++ b/resources/lang/ja/validation.php @@ -1,6 +1,6 @@ ':attribute は、取得済みです。', 'uploaded' => ':attribute のアップロードに失敗しました。', 'url' => ':attribute フォーマットが不正です。', - "unique_undeleted" => ":attribute は 一意の値である必要があります。", + 'unique_undeleted' => ':attribute は 一意の値である必要があります。', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute フィールドに、禁止文字列が含まれています。", - "email_array" => "1 つまたは複数の電子メール アドレスが無効です。", - "hashed_pass" => "現在のパスワードが正しくありません。", + 'alpha_space' => ':attribute フィールドに、禁止文字列が含まれています。', + 'email_array' => '1 つまたは複数の電子メール アドレスが無効です。', + 'hashed_pass' => '現在のパスワードが正しくありません。', 'dumbpwd' => 'そのパスワードはあまりにも脆弱です。', - "statuslabel_type" => "有効なステータスラベルの種類を選択する必要があります。", + 'statuslabel_type' => '有効なステータスラベルの種類を選択する必要があります。', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ko/admin/accessories/general.php b/resources/lang/ko/admin/accessories/general.php index 806be16f01..5f3f2149e7 100644 --- a/resources/lang/ko/admin/accessories/general.php +++ b/resources/lang/ko/admin/accessories/general.php @@ -1,6 +1,6 @@ '부속품 분류', 'accessory_name' => '부속품 명', 'checkout' => '부속품 반출', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => '대체 기본 사용권 계약서를 사용합니다.', 'use_default_eula_disabled' => '대체 기본 사용권 계약서를 사용합니다. 기본 사용권 계약서가 정의되지 않았습니다. 설정에서 하나를 추가해 주세요.', -); +]; diff --git a/resources/lang/ko/admin/accessories/message.php b/resources/lang/ko/admin/accessories/message.php index ea655a0fe5..2c478f2e07 100644 --- a/resources/lang/ko/admin/accessories/message.php +++ b/resources/lang/ko/admin/accessories/message.php @@ -1,37 +1,36 @@ '해당 악세사리 [:id] 가 존재하지 않습니다.', 'assoc_users' => '이 부속품은 현재 사용자에게 :count 개가 반출 되었습니다. 이 부속품을 반입하고 다시 시도해 주세요. ', - 'create' => array( + 'create' => [ 'error' => '부속품을 만들 수 없었습니다. 재시도해 주세요.', - 'success' => '부속품을 만들었습니다.' - ), + 'success' => '부속품을 만들었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '부속품을 갱신하지 못했습니다. 재시도해 주세요.', - 'success' => '부속품을 갱신했습니다.' - ), + 'success' => '부속품을 갱신했습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 부속품을 삭제하시겠습니까?', 'error' => '분류 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '해당 부속품이 삭제 완료 되었습니다.' - ), + 'success' => '해당 부속품이 삭제 완료 되었습니다.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '부속품이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '부속품이 반출 되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ), + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '부속품이 반입되지 않았습니다. 다시 시도해 주세요.', 'success' => '부속품이 반입 되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ) + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - -); +]; diff --git a/resources/lang/ko/admin/accessories/table.php b/resources/lang/ko/admin/accessories/table.php index 1f0f71fb3e..57fcad2976 100644 --- a/resources/lang/ko/admin/accessories/table.php +++ b/resources/lang/ko/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV로 내려받기', - 'eula_text' => '사용권 계약서', +return [ + 'dl_csv' => 'CSV로 내려받기', + 'eula_text' => '사용권 계약서', 'id' => '아이디', 'require_acceptance' => '승인', 'title' => '부속품 명', - -); +]; diff --git a/resources/lang/ko/admin/asset_maintenances/form.php b/resources/lang/ko/admin/asset_maintenances/form.php index 1125bdb66c..4e83936de4 100644 --- a/resources/lang/ko/admin/asset_maintenances/form.php +++ b/resources/lang/ko/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => '자산 관리 기간(일 단위)', 'notes' => '주석', 'update' => '자산 관리 갱신', - 'create' => '자산 관리 생성' + 'create' => '자산 관리 생성', ]; diff --git a/resources/lang/ko/admin/asset_maintenances/message.php b/resources/lang/ko/admin/asset_maintenances/message.php index bee5d0836c..7ed1b4b0e4 100644 --- a/resources/lang/ko/admin/asset_maintenances/message.php +++ b/resources/lang/ko/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '이 자산 관리를 삭제 하시겠습니까?', 'error' => '자산 관리 삭제시에 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '자산 관리가 삭제되었습니다.' + 'success' => '자산 관리가 삭제되었습니다.', ], 'create' => [ 'error' => '자산 관리가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '자산 관리가 생성되었습니다.' + 'success' => '자산 관리가 생성되었습니다.', ], 'edit' => [ 'error' => '자산 관리가 수정되지 않았습니다. 다시 시도해 주세요.', - 'success' => '자산 관리가 수정되었습니다.' + 'success' => '자산 관리가 수정되었습니다.', ], 'asset_maintenance_incomplete' => '아직 완료되지 않았습니다.', 'warranty' => '보증', 'not_warranty' => '보증 안됨', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ko/admin/asset_maintenances/table.php b/resources/lang/ko/admin/asset_maintenances/table.php index a50f0981ec..e36691946c 100644 --- a/resources/lang/ko/admin/asset_maintenances/table.php +++ b/resources/lang/ko/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => '자산 관리', 'asset_name' => '자산명', 'is_warranty' => '보증', - 'dl_csv' => 'CSV로 내려받기' + 'dl_csv' => 'CSV로 내려받기', ]; diff --git a/resources/lang/ko/admin/categories/general.php b/resources/lang/ko/admin/categories/general.php index a4f2c45236..100502b8da 100644 --- a/resources/lang/ko/admin/categories/general.php +++ b/resources/lang/ko/admin/categories/general.php @@ -1,6 +1,6 @@ '자산 분류', 'category_name' => '분류 명', 'checkin_email' => '반입/반출 시 사용자에게 이메일을 보냅니다.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => '대체 기본 사용권 계약서를 사용합니다.', 'use_default_eula_disabled' => '대체 기본 사용권 계약서를 사용합니다. 기본 사용권 계약서가 정의되지 않았습니다. 설정에서 하나를 추가해 주세요.', -); +]; diff --git a/resources/lang/ko/admin/categories/message.php b/resources/lang/ko/admin/categories/message.php index bf542b9832..7a0aeb0826 100644 --- a/resources/lang/ko/admin/categories/message.php +++ b/resources/lang/ko/admin/categories/message.php @@ -1,25 +1,25 @@ '분류가 존재하지 않습니다.', 'assoc_models' => '이 분류는 적어도 한개의 모델과 연결되어 있기에 삭제할 수 없습니다. 이 분류를 참조하지 않게 모델을 수정하고 다시 시도해 주세요. ', 'assoc_items' => '이 분류는 적어도 하나의 :asset_type 과 연결되어 있기에 삭제할 수 없습니다. 이 분류를 참조하지 않게 :asset_type 을 수정하고 다시 시도해 주세요. ', - 'create' => array( + 'create' => [ 'error' => '분류가 생성되지 않았습니다. 다시 시도해 주세요', - 'success' => '분류가 생성되었습니다.' - ), + 'success' => '분류가 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '분류가 갱신되지 않았습니다. 다시 시도해 주세요', - 'success' => '분류가 갱신되었습니다.' - ), + 'success' => '분류가 갱신되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 분류를 삭제하시겠습니까?', 'error' => '분류 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '분류가 삭제되었습니다' - ) + 'success' => '분류가 삭제되었습니다', + ], -); +]; diff --git a/resources/lang/ko/admin/categories/table.php b/resources/lang/ko/admin/categories/table.php index 5988a0f82b..9efe393e79 100644 --- a/resources/lang/ko/admin/categories/table.php +++ b/resources/lang/ko/admin/categories/table.php @@ -1,10 +1,10 @@ '사용권 계약서', +return [ + 'eula_text' => '사용권 계약서', 'id' => '아이디', 'parent' => '상위', 'require_acceptance' => '승인', 'title' => '자산 분류 명', -); +]; diff --git a/resources/lang/ko/admin/companies/general.php b/resources/lang/ko/admin/companies/general.php index d34ca25891..adc686f21f 100644 --- a/resources/lang/ko/admin/companies/general.php +++ b/resources/lang/ko/admin/companies/general.php @@ -1,4 +1,5 @@ '회사 선택', ]; diff --git a/resources/lang/ko/admin/companies/message.php b/resources/lang/ko/admin/companies/message.php index fa229ad0cd..51c1dbc216 100644 --- a/resources/lang/ko/admin/companies/message.php +++ b/resources/lang/ko/admin/companies/message.php @@ -1,18 +1,19 @@ '회사가 없습니다.', 'assoc_users' => '이 회사는 적어도 한개의 모델과 연결되어 있기에 삭제할 수 없습니다. 이 회사를 참조하지 않게 모델을 수정하고 다시 시도해 주세요. ', - 'create' => array( + 'create' => [ 'error' => '회사를 만들지 못했습니다. 재시도해 주십시오.', - 'success' => '회사를 만들었습니다.' - ), - 'update' => array( + 'success' => '회사를 만들었습니다.', + ], + 'update' => [ 'error' => '회사를 갱신하지 못했습니다. 재시도해 주십시오.', - 'success' => '회사를 갱신했습니다.' - ), - 'delete' => array( + 'success' => '회사를 갱신했습니다.', + ], + 'delete' => [ 'confirm' => '이 회사를 삭제하고자 하는게 맞습니까?', 'error' => '회사 삭제 도중 이슈가 발생했습니다. 재시도해 주십시오.', - 'success' => '회사를 삭제했습니다.' - ) -); + 'success' => '회사를 삭제했습니다.', + ], +]; diff --git a/resources/lang/ko/admin/companies/table.php b/resources/lang/ko/admin/companies/table.php index 341871d175..94759eee21 100644 --- a/resources/lang/ko/admin/companies/table.php +++ b/resources/lang/ko/admin/companies/table.php @@ -1,9 +1,10 @@ '회사들', 'create' => '회사 생성', 'title' => '회사', 'update' => '회사 갱신', 'name' => '회사명', 'id' => '아이디', -); +]; diff --git a/resources/lang/ko/admin/components/general.php b/resources/lang/ko/admin/components/general.php index 59acbf311b..a53ed153b4 100644 --- a/resources/lang/ko/admin/components/general.php +++ b/resources/lang/ko/admin/components/general.php @@ -1,6 +1,6 @@ '부품명', 'checkin' => '반입 부품', 'checkout' => '반출 부품', @@ -12,4 +12,4 @@ return array( 'remaining' => '잔여수량', 'total' => '총계', 'update' => '부품 갱신', -); +]; diff --git a/resources/lang/ko/admin/components/message.php b/resources/lang/ko/admin/components/message.php index 88e14ae3bb..77bd4f1681 100644 --- a/resources/lang/ko/admin/components/message.php +++ b/resources/lang/ko/admin/components/message.php @@ -1,36 +1,35 @@ '부품이 존재하지 않습니다.', - 'create' => array( + 'create' => [ 'error' => '부품이 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '부품이 생성되었습니다.' - ), + 'success' => '부품이 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '부품이 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '부품이 갱신 되었습니다.' - ), + 'success' => '부품이 갱신 되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 부품을 삭제하시겠습니까?', 'error' => '부품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '부품이 삭제되었습니다.' - ), + 'success' => '부품이 삭제되었습니다.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '부품이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '부품이 반출 되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ), + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '부품이 반입되지 않았습니다. 다시 시도해 주세요.', 'success' => '부품이 반입되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ) + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - -); +]; diff --git a/resources/lang/ko/admin/components/table.php b/resources/lang/ko/admin/components/table.php index eac46a7c4a..918aadd21b 100644 --- a/resources/lang/ko/admin/components/table.php +++ b/resources/lang/ko/admin/components/table.php @@ -1,5 +1,5 @@ '부품명', -); +]; diff --git a/resources/lang/ko/admin/consumables/general.php b/resources/lang/ko/admin/consumables/general.php index c6e5e93d1b..274b8ae80c 100644 --- a/resources/lang/ko/admin/consumables/general.php +++ b/resources/lang/ko/admin/consumables/general.php @@ -1,6 +1,6 @@ '사용자에게 소모품 반출', 'consumable_name' => '소모품 명', 'create' => '소모품 생성', @@ -8,4 +8,4 @@ return array( 'remaining' => '잔여수량', 'total' => '총계', 'update' => '소모품 갱신', -); +]; diff --git a/resources/lang/ko/admin/consumables/message.php b/resources/lang/ko/admin/consumables/message.php index 2044042eae..53cfd4e428 100644 --- a/resources/lang/ko/admin/consumables/message.php +++ b/resources/lang/ko/admin/consumables/message.php @@ -1,36 +1,35 @@ '소모품이 존재하지 않습니다.', - 'create' => array( + 'create' => [ 'error' => '소모품이 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '소모품이 생성되었습니다.' - ), + 'success' => '소모품이 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '소모품이 수정되지 않았습니다. 다시 시도해 주세요.', - 'success' => '소모품이 수정되었습니다.' - ), + 'success' => '소모품이 수정되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 소모품을 삭제하시겠습니까?', 'error' => '소모품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '소모품이 삭제 되었습니다.' - ), + 'success' => '소모품이 삭제 되었습니다.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '소모품이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '소모품이 반출 되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ), + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '소모품이 반입되지 않았습니다. 다시 시도해 주세요.', 'success' => '소모품이 반입 되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' - ) + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + ], - -); +]; diff --git a/resources/lang/ko/admin/consumables/table.php b/resources/lang/ko/admin/consumables/table.php index fe4f647236..e2e6f7ffb6 100644 --- a/resources/lang/ko/admin/consumables/table.php +++ b/resources/lang/ko/admin/consumables/table.php @@ -1,5 +1,5 @@ '소모품 명', -); +]; diff --git a/resources/lang/ko/admin/custom_fields/general.php b/resources/lang/ko/admin/custom_fields/general.php index 66819b181e..369382eaa2 100644 --- a/resources/lang/ko/admin/custom_fields/general.php +++ b/resources/lang/ko/admin/custom_fields/general.php @@ -1,6 +1,6 @@ '사용자 정의 항목들', 'field' => '항목', 'about_fieldsets_title' => '항목세트란', @@ -29,4 +29,4 @@ return array( 'create_field' => '신규 사용자 항목', 'value_encrypted' => '이 항목의 값은 데이터베이스 내에서 암호화 되었습니다. 관리자만이 해독된 값을 확인 할 수 있습니다.', 'show_in_email' => '사용자에게 전송된 반출 이메일에 이 항목의 값을 포함 시키시겠습니까? 암호화 된 항목들은 이메일에 포함될 수 없습니다.', -); +]; diff --git a/resources/lang/ko/admin/custom_fields/message.php b/resources/lang/ko/admin/custom_fields/message.php index 60683c4f7d..cdc2bf2233 100644 --- a/resources/lang/ko/admin/custom_fields/message.php +++ b/resources/lang/ko/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => '그 항목은 없습니다.', 'already_added' => '이미 추가한 항목입니다.', - 'create' => array( + 'create' => [ 'error' => '항목을 생성하지 못했습니다. 재시도해 주십시오.', 'success' => '항목을 생성했습니다.', - 'assoc_success' => '항목세트에 항목을 추가했습니다.' - ), + 'assoc_success' => '항목세트에 항목을 추가했습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '항목을 생성하지 못했습니다. 재시도해 주십시오.', - 'success' => '항목을 갱신했습니다.' - ), + 'success' => '항목을 갱신했습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 항목을 삭제하는 것이 맞습니까?', 'error' => '항목 삭제 도중에 이슈가 발생했습니다. 재시도해 주십시오.', 'success' => '항목을 삭제했습니다.', 'in_use' => '아직까지 항목을 사용하고 있습니다.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => '항목세트가 존재하지 않습니다', - 'create' => array( + 'create' => [ 'error' => '항목세트를 만들지 못했습니다. 재시도해 주십시오.', - 'success' => '항목세트를 생성했습니다.' - ), + 'success' => '항목세트를 생성했습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '항목세트를 갱신하지 못했습니다. 재시도해 주십시오.', - 'success' => '항목세트를 갱신했습니다.' - ), + 'success' => '항목세트를 갱신했습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 항목세트를 삭제하는 것이 맞습니까?', 'error' => '항목세트 삭제 도중에 이슈가 발생했습니다. 재시도해 주십시오.', 'success' => '항목세트를 삭제했습니다.', 'in_use' => '항목세트를 사용 중입니다.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ko/admin/departments/message.php b/resources/lang/ko/admin/departments/message.php index 61b41e7956..e8775c1324 100644 --- a/resources/lang/ko/admin/departments/message.php +++ b/resources/lang/ko/admin/departments/message.php @@ -1,21 +1,21 @@ '부서가 존재하지 않습니다.', 'assoc_users' => '이 부서는 현재 적어도 한명의 사용자와 연결되어 있어서 삭제할 수 없습니다. 사용자가 더 이상 이 부서를 참조하지 않게 갱신하고 다시 시도해주세요. ', - 'create' => array( + 'create' => [ 'error' => '부서가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '부서가 생성되었습니다.' - ), - 'update' => array( + 'success' => '부서가 생성되었습니다.', + ], + 'update' => [ 'error' => '부서가 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '부서가 갱신되었습니다.' - ), - 'delete' => array( + 'success' => '부서가 갱신되었습니다.', + ], + 'delete' => [ 'confirm' => '이 부서를 삭제하시겠습니까?', 'error' => '부서를 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '부서가 삭제되었습니다.' - ) + 'success' => '부서가 삭제되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/departments/table.php b/resources/lang/ko/admin/departments/table.php index 824cb5f926..8354cc9e0c 100644 --- a/resources/lang/ko/admin/departments/table.php +++ b/resources/lang/ko/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => '부서 명', @@ -8,4 +8,4 @@ return array( 'location' => '위치', 'create' => '부서 생성', 'update' => '부서 갱신', - ); + ]; diff --git a/resources/lang/ko/admin/depreciations/general.php b/resources/lang/ko/admin/depreciations/general.php index 64f019aeab..0bfcb1a5cc 100644 --- a/resources/lang/ko/admin/depreciations/general.php +++ b/resources/lang/ko/admin/depreciations/general.php @@ -1,6 +1,6 @@ '자산 감가 상각이란', 'about_depreciations' => '가치가 하락하는 자산들을 직선법에 의한 감가상각 설정을 할 수 있습니다.', 'asset_depreciations' => '자산 감가 상각', @@ -9,4 +9,4 @@ return array( 'number_of_months' => '개월 수', 'update' => '감가 상각 갱신', -); +]; diff --git a/resources/lang/ko/admin/depreciations/message.php b/resources/lang/ko/admin/depreciations/message.php index 795715d552..814ddd0224 100644 --- a/resources/lang/ko/admin/depreciations/message.php +++ b/resources/lang/ko/admin/depreciations/message.php @@ -1,25 +1,24 @@ '감가 상각 등급이 존재하지 않습니다.', 'assoc_users' => '이 감가 상각은 현재 하나 이상의 모델들에 연결되어 있습니다. 모델들을 삭제하고, 다시 삭제해 주세요. ', - - 'create' => array( + 'create' => [ 'error' => '감가 상각 등급이 생성되지 않았습니다. 다시 시도해 주세요. :(', - 'success' => '감가 상각 등급이 생성되었습니다. :)' - ), + 'success' => '감가 상각 등급이 생성되었습니다. :)', + ], - 'update' => array( + 'update' => [ 'error' => '감가 상각 등급이 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '감가 상각 등급이 갱신 되었습니다.' - ), + 'success' => '감가 상각 등급이 갱신 되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 감가 상각 등급을 삭제 하시겠습니까?', 'error' => '감가 상각 등급 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '감가 상각 등급이 삭제되었습니다.' - ) + 'success' => '감가 상각 등급이 삭제되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/depreciations/table.php b/resources/lang/ko/admin/depreciations/table.php index b5b6da2faf..b2f4b9b14e 100644 --- a/resources/lang/ko/admin/depreciations/table.php +++ b/resources/lang/ko/admin/depreciations/table.php @@ -1,10 +1,10 @@ '아이디', 'months' => '개월', 'term' => '기간', 'title' => '이름 ', -); +]; diff --git a/resources/lang/ko/admin/groups/message.php b/resources/lang/ko/admin/groups/message.php index 3a4221dd15..0386463e26 100644 --- a/resources/lang/ko/admin/groups/message.php +++ b/resources/lang/ko/admin/groups/message.php @@ -1,22 +1,22 @@ '그룹이 이미 존재합니다!', 'group_not_found' => '그룹 [:id]는 존재하지 않습니다.', 'group_name_required' => '이름 항목을 입력해주세요.', - 'success' => array( + 'success' => [ 'create' => '그룹이 생성되었습니다.', 'update' => '그룹이 갱신되었습니다.', 'delete' => '그룹이 삭제되었습니다.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 그룹을 삭제 하시겠습니까?', 'create' => '그룹을 생성하는 중 문제가 발생했습니다. 다시 시도해 주세요.', 'update' => '그룹을 갱신하는 중 오류가 발생했습니다. 다시 시도해 주세요.', 'delete' => '그룹을 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.', - ), + ], -); +]; diff --git a/resources/lang/ko/admin/groups/table.php b/resources/lang/ko/admin/groups/table.php index d58e6b2ae1..a5160b4762 100644 --- a/resources/lang/ko/admin/groups/table.php +++ b/resources/lang/ko/admin/groups/table.php @@ -1,9 +1,9 @@ '아이디', 'name' => '이름', 'users' => '사용자 # 명', -); +]; diff --git a/resources/lang/ko/admin/groups/titles.php b/resources/lang/ko/admin/groups/titles.php index 9c29a555f7..3fc1750afd 100644 --- a/resources/lang/ko/admin/groups/titles.php +++ b/resources/lang/ko/admin/groups/titles.php @@ -1,6 +1,6 @@ '그룹이란', 'about_groups' => '그룹은 일반적인 당신의 권한에 사용된다.', 'group_management' => '그룹 관리', @@ -11,4 +11,4 @@ return array( 'allow' => '허용', 'deny' => '거부', -); +]; diff --git a/resources/lang/ko/admin/hardware/form.php b/resources/lang/ko/admin/hardware/form.php index 8ec0326350..0d6bd46d04 100644 --- a/resources/lang/ko/admin/hardware/form.php +++ b/resources/lang/ko/admin/hardware/form.php @@ -1,12 +1,12 @@ '대량 자산 삭제 승인', +return [ + 'bulk_delete' => '대량 자산 삭제 승인', 'bulk_delete_help' => '아래의 대량 자산 삭제 내용을 검토하십시오. 삭제하시면 복구할 수 없고, 현재 할당되어 있는 사용자와의 연결이 끊어집니다.', 'bulk_delete_warn' => '삭제 대상: asset_count 개', - 'bulk_update' => '대량 자산 갱신', - 'bulk_update_help' => '이 양식은 한번에 여러개의 자산들을 갱신하게 해줍니다. 변경하고 싶은 항목만 채워 넣으세요. 빈란으로 남겨둔 항목들은 변경되지 않을 것입니다. ', - 'bulk_update_warn' => '당신은 asset_count 자산들의 속성들을 편집하려 합니다.', + 'bulk_update' => '대량 자산 갱신', + 'bulk_update_help' => '이 양식은 한번에 여러개의 자산들을 갱신하게 해줍니다. 변경하고 싶은 항목만 채워 넣으세요. 빈란으로 남겨둔 항목들은 변경되지 않을 것입니다. ', + 'bulk_update_warn' => '당신은 asset_count 자산들의 속성들을 편집하려 합니다.', 'checkedout_to' => '반출 대상', 'checkout_date' => '반출 일자', 'checkin_date' => '반입 일자', @@ -38,7 +38,6 @@ return array( 'tag' => '자산 태그', 'update' => '자산 갱신', 'warranty' => '보증', - 'warranty_expires' => '보증 만료일', + 'warranty_expires' => '보증 만료일', 'years' => '년', -) -; +]; diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php index 98197ce015..395bf63845 100644 --- a/resources/lang/ko/admin/hardware/general.php +++ b/resources/lang/ko/admin/hardware/general.php @@ -1,9 +1,9 @@ '자산이란', 'about_assets_text' => '자산은 일련 번호나 자산 꼬리표로 추적되는 품목들입니다. 특정 품목의 상황을 파악하는 것이 더 높은 가치를 갖는 추세입니다.', - 'archived' => '보관됨', + 'archived' => '보관됨', 'asset' => '자산', 'bulk_checkout' => '반출 자산', 'checkin' => '반입 자산', @@ -19,4 +19,4 @@ return array( 'pending' => '대기중', 'undeployable' => '사용불가', 'view' => '자산 보기', -); +]; diff --git a/resources/lang/ko/admin/hardware/message.php b/resources/lang/ko/admin/hardware/message.php index 1584526a8d..1175b2762a 100644 --- a/resources/lang/ko/admin/hardware/message.php +++ b/resources/lang/ko/admin/hardware/message.php @@ -1,6 +1,6 @@ '경고: 이 자산은 현재 사용불가 상태입니다. 이 상태를 변경하시려면, 자산 상태를 갱신하세요.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => '좋은 시도지만, 그 자산은 존재하지 않거나 요청가능하지 않습니다.', 'assoc_users' => '이 자산은 현재 사용자에게 반출 중이어서 삭제 할 수 없습니다. 먼저 자산을 확인해 보고 다시 삭제를 시도해 주세요. ', - 'create' => array( + 'create' => [ 'error' => '자산이 생성되지 않았습니다. 다시 시도해 주세요. :(', - 'success' => '자산이 생성되었습니다. :)' - ), + 'success' => '자산이 생성되었습니다. :)', + ], - 'update' => array( + 'update' => [ 'error' => '자산이 갱신되지 않았습니다. 다시 시도해 주세요.', 'success' => '자산이 갱신되었습니다.', 'nothing_updated' => '선택된 항목이 없어서, 갱신 되지 않습니다.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => '자산이 복원되지 않았습니다. 다시 시도해 주세요.', - 'success' => '자산이 복원되었습니다.' - ), + 'success' => '자산이 복원되었습니다.', + ], - 'audit' => array( + 'audit' => [ 'error' => '자산 감사가 실패했습니다. 다시 시도해 주세요.', - 'success' => '자산 감사가 성공적으로 기록되었습니다.' - ), + 'success' => '자산 감사가 성공적으로 기록되었습니다.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => '파일이 삭제되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일이 삭제되었습니다.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '파일(들)이 업로드 되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일(들)이 업로드 되었습니다.', 'nofiles' => '업로드 하기 위한 파일이 선택되지 않았거나, 업로드 할 파일이 너무 큽니다.', 'invalidfiles' => '하나 이상의 파일이 너무 크거나 허용되지 않는 형식입니다. 허용되는 형식은 png, gif, jpg, doc, docx, pdf, txt 입니다.', - ), + ], - 'import' => array( + 'import' => [ 'error' => '몇몇 품목들을 정확하게 읽어오지 못했습니다.', 'errorDetail' => '다음 품목들은 오류로 읽어오지 못했습니다.', - 'success' => "파일에서 읽어오기가 완료되었습니다", - 'file_delete_success' => "파일 삭제가 완료되었습니다", - 'file_delete_error' => "파일을 삭제할 수 없습니다", - ), + 'success' => '파일에서 읽어오기가 완료되었습니다', + 'file_delete_success' => '파일 삭제가 완료되었습니다', + 'file_delete_error' => '파일을 삭제할 수 없습니다', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => '이 자산을 삭제하시겠습니까?', 'error' => '그룹을 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.', 'nothing_updated' => '선택된 자산이 없기에, 삭제되지 않습니다.', - 'success' => '자산이 삭제되었습니다.' - ), + 'success' => '자산이 삭제되었습니다.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '자산이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '자산이 반출되었습니다.', 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', 'not_available' => '그 자산은 반출 할 수 없습니다!', - 'no_assets_selected' => '목록에서 자산을 하나 이상 선택해야 합니다.' - ), + 'no_assets_selected' => '목록에서 자산을 하나 이상 선택해야 합니다.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '자산이 반입되지 않았습니다. 다시 시도해 주세요.', 'success' => '자산이 반입되었습니다.', 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', 'already_checked_in' => '그 자산은 이미 반입되었습니다.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => '자산을 불러오지 못했습니다. 재시도해 주십시오.', 'success' => '자산을 불러왔습니다.', - 'canceled' => '반출 요청이 취소되었습니다' - ) + 'canceled' => '반출 요청이 취소되었습니다', + ], -); +]; diff --git a/resources/lang/ko/admin/hardware/table.php b/resources/lang/ko/admin/hardware/table.php index 598881f87c..f1b7c832f4 100644 --- a/resources/lang/ko/admin/hardware/table.php +++ b/resources/lang/ko/admin/hardware/table.php @@ -1,6 +1,6 @@ '자산 태그', 'asset_model' => '모델', @@ -20,6 +20,6 @@ return array( 'title' => '자산 ', 'image' => '장비 사진', 'days_without_acceptance' => '미 승인 기간', - 'monthly_depreciation' => '월간 감가상각' + 'monthly_depreciation' => '월간 감가상각', -); +]; diff --git a/resources/lang/ko/admin/kits/general.php b/resources/lang/ko/admin/kits/general.php index 28fa769260..c7f123dd76 100644 --- a/resources/lang/ko/admin/kits/general.php +++ b/resources/lang/ko/admin/kits/general.php @@ -1,6 +1,6 @@ '사전 정의 도구들', 'about_kits_text' => '미리 정의된 키트를 사용하여 사용자에게 아이템(자산, 라이센스 등) 컬렉션을 신속하게 체크아웃할 수 있습니다. 이 기능은 온보드 프로세스가 여러 사용자 간에 일관되고 모든 사용자가 동일한 항목을 수신할 때 유용합니다.', 'checkout' => '체크 아웃 키트', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ko/admin/licenses/form.php b/resources/lang/ko/admin/licenses/form.php index 47584ab185..ca7789fdcb 100644 --- a/resources/lang/ko/admin/licenses/form.php +++ b/resources/lang/ko/admin/licenses/form.php @@ -1,6 +1,6 @@ '자산', 'checkin' => '반입', @@ -18,5 +18,5 @@ return array( 'to_email' => '라이선스 메일 주소', 'to_name' => '라이선스 발급자', 'update' => '라이선스 갱신', - 'checkout_help' => '하드웨어 자산이나 개인에게서 라이선스를 확인을 해야 합니다. 둘 다 선택할 수 있지만, 자산 반출 시마다 자산의 소유자와 개인이 일치하는지 확인을 해야 합니다.' -); + 'checkout_help' => '하드웨어 자산이나 개인에게서 라이선스를 확인을 해야 합니다. 둘 다 선택할 수 있지만, 자산 반출 시마다 자산의 소유자와 개인이 일치하는지 확인을 해야 합니다.', +]; diff --git a/resources/lang/ko/admin/licenses/general.php b/resources/lang/ko/admin/licenses/general.php index b1b7f34cce..e37ce5fdbd 100644 --- a/resources/lang/ko/admin/licenses/general.php +++ b/resources/lang/ko/admin/licenses/general.php @@ -1,6 +1,6 @@ '라이선스 란', 'about_licenses' => '라이선스는 소프트웨어를 추적하는데 사용됩니다. 개인에게 반출 할 수 있는 수량이 정의되어 있습니다', 'checkin' => '라이선스 Seat 확인', @@ -18,4 +18,4 @@ return array( 'software_licenses' => '소프트웨어 라이선스', 'user' => '사용자', 'view' => '라이선스 보기', -); +]; diff --git a/resources/lang/ko/admin/licenses/message.php b/resources/lang/ko/admin/licenses/message.php index 667348f06f..c3ec76b4bd 100644 --- a/resources/lang/ko/admin/licenses/message.php +++ b/resources/lang/ko/admin/licenses/message.php @@ -1,6 +1,6 @@ '라이선스가 존재하지 않습니다.', 'user_does_not_exist' => '사용자가 존재하지 않습니다.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => '애셋이나 사용자 중 하나만 선택해야하며 둘 다 선택할 수는 없습니다.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => '라이선스가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '라이선스가 생성되었습니다.' - ), + 'success' => '라이선스가 생성되었습니다.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '파일이 삭제되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일이 삭제되었습니다.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '파일(들)이 업로드 되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일(들)이 업로드 되었습니다.', 'nofiles' => '업로드 하기 위한 파일이 선택되지 않았거나, 업로드 할 파일이 너무 큽니다.', 'invalidfiles' => '하나 이상의 파일이 너무 크거나 허용되지 않는 형식입니다. 허용되는 형식은 png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, lic 입니다.', - ), + ], - 'update' => array( + 'update' => [ 'error' => '라이선스가 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '라이선스가 갱신되었습니다.' - ), + 'success' => '라이선스가 갱신되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 라이선스를 삭제하시겠습니까?', 'error' => '라이선스 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '라이선스가 삭제되었습니다.' - ), + 'success' => '라이선스가 삭제되었습니다.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '라이선스 반출 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '라이선스가 반출 되었습니다.' - ), + 'success' => '라이선스가 반출 되었습니다.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '라이선스 반입 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '라이선스가 반입 되었습니다.' - ), + 'success' => '라이선스가 반입 되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/licenses/table.php b/resources/lang/ko/admin/licenses/table.php index e2e065b82e..74c32436c6 100644 --- a/resources/lang/ko/admin/licenses/table.php +++ b/resources/lang/ko/admin/licenses/table.php @@ -1,6 +1,6 @@ '사용자', 'checkout' => '입/출', @@ -14,4 +14,4 @@ return array( 'serial' => '일련번호', 'title' => '라이선스', -); +]; diff --git a/resources/lang/ko/admin/locations/message.php b/resources/lang/ko/admin/locations/message.php index f558a9500c..5cb038e77f 100644 --- a/resources/lang/ko/admin/locations/message.php +++ b/resources/lang/ko/admin/locations/message.php @@ -1,27 +1,26 @@ '장소가 존재하지 않습니다.', 'assoc_users' => '이 장소는 현재 적어도 한명의 사용자와 연결되어 있어서 삭제할 수 없습니다. 사용자가 더 이상 이 장소를 참조하지 않게 갱신하고 다시 시도해주세요. ', 'assoc_assets' => '이 장소는 현재 적어도 한명의 사용자와 연결되어 있어서 삭제할 수 없습니다. 사용자가 더 이상 이 장소를 참조하지 않게 갱신하고 다시 시도해주세요. ', 'assoc_child_loc' => '이 장소는 현재 하나 이상의 하위 장소를 가지고 있기에 삭제 할 수 없습니다. 이 장소의 참조를 수정하고 다시 시도해 주세요. ', - - 'create' => array( + 'create' => [ 'error' => '장소가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '장소가 생성되었습니다.' - ), + 'success' => '장소가 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '장소가 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '장소가 갱신되었습니다.' - ), + 'success' => '장소가 갱신되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 장소를 삭제하시겠습니까?', 'error' => '장소 삭제 중에 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '장소가 삭제되었습니다.' - ) + 'success' => '장소가 삭제되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/locations/table.php b/resources/lang/ko/admin/locations/table.php index 49d311b769..994f215d0a 100644 --- a/resources/lang/ko/admin/locations/table.php +++ b/resources/lang/ko/admin/locations/table.php @@ -1,6 +1,6 @@ '장소 란', 'about_locations' => '장소는 사용자, 자산, 그리고 그외의 품목들에 대한 위치 정보 추적에 사용된다', 'assets_rtd' => '자산', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => '상위', 'currency' => '현지 통화', 'ldap_ou' => 'LDAP 검색 OU', - ); + ]; diff --git a/resources/lang/ko/admin/manufacturers/message.php b/resources/lang/ko/admin/manufacturers/message.php index dcfc3918c5..cc2818dbc4 100644 --- a/resources/lang/ko/admin/manufacturers/message.php +++ b/resources/lang/ko/admin/manufacturers/message.php @@ -1,29 +1,29 @@ '제조업체가 존재하지 않습니다.', 'assoc_users' => '이 제조업체는 현재 적어도 하나의 모델에 연결되어 있기에 삭제 할 수 없습니다. 이 제조업체가 모델을 참조 하지 않게 수정하고 다시 시도 해 보세요. ', - 'create' => array( + 'create' => [ 'error' => '제조업체가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '제조업체가 생성되었습니다.' - ), + 'success' => '제조업체가 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '제조업체가 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '제조업체가 갱신되었습니다.' - ), + 'success' => '제조업체가 갱신되었습니다.', + ], - 'restore' => array( + 'restore' => [ 'error' => '제조업체가 복원되지 않았습니다. 다시 시도해 주세요', - 'success' => '제조업체가 복원되었습니다.' - ), + 'success' => '제조업체가 복원되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 제조업체를 삭제하시겠습니까?', 'error' => '제조업체를 삭제하는 중에 문제가 생겼습니다. 다시 시도해 주세요.', - 'success' => '제조업체가 삭제되었습니다.' - ) + 'success' => '제조업체가 삭제되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/manufacturers/table.php b/resources/lang/ko/admin/manufacturers/table.php index 84e08c54e2..3760c12bdd 100644 --- a/resources/lang/ko/admin/manufacturers/table.php +++ b/resources/lang/ko/admin/manufacturers/table.php @@ -1,6 +1,6 @@ '제조업체 란', 'about_manufacturers_text' => '생산자는 당신의 자산들을 생산한 회사들입니다. 여기에 자산 상세 페이지에 나타날, 그들에 대한 중요한 지원 연락처 정보를 저장 할 수 있습니다.', 'asset_manufacturers' => '자산 제조업체', @@ -13,4 +13,4 @@ return array( 'update' => '제조업체 갱신', 'url' => 'URL', -); +]; diff --git a/resources/lang/ko/admin/models/general.php b/resources/lang/ko/admin/models/general.php index b96276ae23..1f33741f9f 100644 --- a/resources/lang/ko/admin/models/general.php +++ b/resources/lang/ko/admin/models/general.php @@ -1,6 +1,6 @@ '자산 모델이란', 'about_models_text' => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.', 'deleted' => '이 모델은 삭제되었습니다. 복원 하려면 여기를 클릭하세요.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => '다음을 삭제하려 합니다:model_count asset models.', 'restore' => '모델 복원', 'requestable' => '사용자가 이 모델을 요청하실 수 있습니다', - 'show_mac_address' => '이 모델의 자산에서 MAC 어드레스 항목 보기', + 'show_mac_address' => '이 모델의 자산에서 MAC 어드레스 항목 보기', 'view_deleted' => '삭제 목록 보기', 'view_models' => '모델 보기', 'fieldset' => '항목세트', 'no_custom_field' => '사용자 정의 항목 없음', 'add_default_values' => '기본값 추가', -); +]; diff --git a/resources/lang/ko/admin/models/message.php b/resources/lang/ko/admin/models/message.php index 3d34950de6..a59491c53b 100644 --- a/resources/lang/ko/admin/models/message.php +++ b/resources/lang/ko/admin/models/message.php @@ -1,42 +1,41 @@ '모델이 존재하지 않습니다.', 'assoc_users' => '이 모델은 현재 하나 이상의 자산들과 연결되어 있기에 삭제 할 수 없습니다. 자산들을 삭제하고 다시 삭제하길 시도하세요. ', - - 'create' => array( + 'create' => [ 'error' => '모델이 생성되지 않았습니다. 다시 시도하세요.', 'success' => '모델이 생성되었습니다.', 'duplicate_set' => '이름, 제조사 그리고 모델 번호가 같은 자산 모델이 존재합니다.', - ), + ], - 'update' => array( + 'update' => [ 'error' => '모델이 갱신되지 않았습니다. 다시 시도하세요.', - 'success' => '모델이 갱신되었습니다.' - ), + 'success' => '모델이 갱신되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 자산 모델을 삭제 하시겠습니까?', 'error' => '모델을 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '모델이 삭제되었습니다.' - ), + 'success' => '모델이 삭제되었습니다.', + ], - 'restore' => array( + 'restore' => [ 'error' => '모델이 복원되지 않았습니다. 다시 시도해 주세요.', - 'success' => '모델이 복원되었습니다.' - ), + 'success' => '모델이 복원되었습니다.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => '변경된 항목이 없어서, 갱신되지 않습니다.', - 'success' => '모델 갱신됨.' - ), + 'success' => '모델 갱신됨.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => '선택된 모델이 없기에, 삭제되지 않습니다.', 'success' => ': success_count 모델이 삭제되었습니다!', - 'success_partial' => ': success_count개의 모델이 삭제되었지만, fail_count 개는 관련된 자산이 있기에 삭제할 수 없습니다.' - ), + 'success_partial' => ': success_count개의 모델이 삭제되었지만, fail_count 개는 관련된 자산이 있기에 삭제할 수 없습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/models/table.php b/resources/lang/ko/admin/models/table.php index 18b09d3573..11445f9e26 100644 --- a/resources/lang/ko/admin/models/table.php +++ b/resources/lang/ko/admin/models/table.php @@ -1,6 +1,6 @@ '자산 모델 생성', 'created_at' => '생성 위치', @@ -14,4 +14,4 @@ return array( 'update' => '자산 모델 갱신', 'clone' => '모델 복제', 'edit' => '모델 편집', -); +]; diff --git a/resources/lang/ko/admin/reports/general.php b/resources/lang/ko/admin/reports/general.php index b74f528eb8..928cb92c49 100644 --- a/resources/lang/ko/admin/reports/general.php +++ b/resources/lang/ko/admin/reports/general.php @@ -1,5 +1,5 @@ '자산 보고서의 옵션을 선택해 주세요.' -); +return [ + 'info' => '자산 보고서의 옵션을 선택해 주세요.', +]; diff --git a/resources/lang/ko/admin/reports/message.php b/resources/lang/ko/admin/reports/message.php index 1f93029d3d..b5666a2b5c 100644 --- a/resources/lang/ko/admin/reports/message.php +++ b/resources/lang/ko/admin/reports/message.php @@ -1,5 +1,5 @@ '적어도 옵션 하나는 선택해 주세요.' -); +return [ + 'error' => '적어도 옵션 하나는 선택해 주세요.', +]; diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php index 56bd26b7c8..83184017bf 100644 --- a/resources/lang/ko/admin/settings/general.php +++ b/resources/lang/ko/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory 도메인', 'ad_domain_help' => '이것은 보통은 당신의 이메일 주소와 같지만, 항상 같지는 않습니다.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => '참조 이메일', 'admin_cc_email_help' => '사용자에게 보낸 반입/반출 이메일 사본을 추가 이메일 계정으로 보내려면, 여기에 입력하세요. 그렇지 않으면 이 필드를 비워 두세요.', 'is_ad' => '이것은 액티브 디렉토리 서버입니다.', @@ -15,7 +15,7 @@ return array( 'alert_interval' => '(일자) 최대값 만료 알림', 'alert_inv_threshold' => '재고 알림 최대값', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => '자산 ID', 'audit_interval' => '감사 간격', 'audit_interval_help' => '자산을 정기적으로 물리적인 감사를 해야하는 경우, 간격을 개월 단위로 입력하십시오.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => '2중 코드 입력', 'two_factor_config_complete' => '코드 제출', 'two_factor_enabled_edit_not_allowed' => '관리자가 이 설정의 수정을 허용하지 않았습니다.', - 'two_factor_enrollment_text' => "2중 인증은 필수입니다만, 당신의 장치는 아직 등록되지 않았습니다. 구글 인증 앱을 실행하고 등록할 장치 아래의 QR 코드를 스캔하세요. 당신의 장치가 등록됐다면, 아래 코드를 입력하세요", + 'two_factor_enrollment_text' => '2중 인증은 필수입니다만, 당신의 장치는 아직 등록되지 않았습니다. 구글 인증 앱을 실행하고 등록할 장치 아래의 QR 코드를 스캔하세요. 당신의 장치가 등록됐다면, 아래 코드를 입력하세요', 'require_accept_signature' => '서명 필수', 'require_accept_signature_help_text' => '이 기능을 활성화하면 자산 수락시에 물리적 서명을 필수로 하게 됩니다.', 'left' => '왼쪽', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => '이 상자를 선택하면 자산 일련 번호를 생성하는 제약 조건이 적용됩니다.', 'zerofill_count' => '0 채움을 포함한, 자산 태그 길이', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ko/admin/settings/message.php b/resources/lang/ko/admin/settings/message.php index 58a8d7bd93..3515c80b73 100644 --- a/resources/lang/ko/admin/settings/message.php +++ b/resources/lang/ko/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '갱신 중 오류가 발생했습니다. ', - 'success' => '설정이 갱신되었습니다.' - ), - 'backup' => array( + 'success' => '설정이 갱신되었습니다.', + ], + 'backup' => [ 'delete_confirm' => '이 백업 파일을 지우시겠습니까? 이 동작은 되돌리기가 되지 않습니다. ', 'file_deleted' => '백업 파일이 삭제 되었습니다. ', 'generated' => '새 백업 파일이 생성되었습니다.', 'file_not_found' => '지정한 백업 파일을 서버에서 찾을 수 없습니다.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => '삭제중 오류가 발생하였습니다. ', 'validation_failed' => '삭제 확인 절차가 잘못되었습니다. 확인 상자에 "DELETE"를 입력해 주세요.', - 'success' => '삭제된 기록들이 삭제되었습니다.' - ), + 'success' => '삭제된 기록들이 삭제되었습니다.', + ], -); +]; diff --git a/resources/lang/ko/admin/statuslabels/message.php b/resources/lang/ko/admin/statuslabels/message.php index c5f30f2fcc..41c2f573be 100644 --- a/resources/lang/ko/admin/statuslabels/message.php +++ b/resources/lang/ko/admin/statuslabels/message.php @@ -1,32 +1,31 @@ '상태 꼬리표가 존재하지 않습니다.', 'assoc_assets' => '이 상태 꼬리표는 하나 이상의 자산과 연결되어 있어서 삭제할 수 없습니다. 이 상태를 참조하지 않게 자산을 수정하고 다시 시도해 주세요. ', - - 'create' => array( + 'create' => [ 'error' => '상태 꼬리표가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '상태 꼬리표가 생성되었습니다.' - ), + 'success' => '상태 꼬리표가 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '상태 꼬리표가 수정되지 않았습니다. 다시 시도해 주세요.', - 'success' => '상태 꼬리표가 수정되었습니다.' - ), + 'success' => '상태 꼬리표가 수정되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 상태 꼬리표를 삭제하시겠습니까?', 'error' => '상태 꼬리표 삭제시 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => '상태 꼬리표가 삭제되었습니다.' - ), + 'success' => '상태 꼬리표가 삭제되었습니다.', + ], - 'help' => array( + 'help' => [ 'undeployable' => '이러한 자산은 누구에게도 할당 할 수 없습니다.', 'deployable' => '이러한 자산은 체크 아웃 할 수 있습니다. 할당되면 Deployed의 메타 상태로 가정합니다.', 'archived' => '이러한 애셋은 체크 아웃 할 수 없으며 보관 된보기에만 표시됩니다. 이는 예산 / 역사적 목적을 위해 자산에 대한 정보를 보유하지만 일상적인 자산 목록에서 유지하는 데 유용합니다.', 'pending' => '이러한 자산은 아직 수리를 위해 나가는 품목에 자주 사용되지만 누구에게나 할당 될 수는 없지만 유통에 회부 될 것으로 예상됩니다.', - ), + ], -); +]; diff --git a/resources/lang/ko/admin/statuslabels/table.php b/resources/lang/ko/admin/statuslabels/table.php index 0c6e0b92fb..124517f8b7 100644 --- a/resources/lang/ko/admin/statuslabels/table.php +++ b/resources/lang/ko/admin/statuslabels/table.php @@ -1,6 +1,6 @@ '상태 꼬리표란', 'archived' => '보관됨', 'create' => '상태 꼬리표 생성', @@ -16,4 +16,4 @@ return array( 'title' => '상태 꼬리표', 'undeployable' => '사용불가', 'update' => '상태 꼬리표 수정', -); +]; diff --git a/resources/lang/ko/admin/suppliers/message.php b/resources/lang/ko/admin/suppliers/message.php index 347d9d7d00..381b92a452 100644 --- a/resources/lang/ko/admin/suppliers/message.php +++ b/resources/lang/ko/admin/suppliers/message.php @@ -1,27 +1,26 @@ '공급자가 존재하지 않습니다.', - - 'create' => array( + 'create' => [ 'error' => '공급자가 생성되지 않았습니다. 다시 시도해 주세요.', - 'success' => '공급자가 생성되었습니다.' - ), + 'success' => '공급자가 생성되었습니다.', + ], - 'update' => array( + 'update' => [ 'error' => '공급자가 갱신되지 않았습니다. 다시 시도해 주세요.', - 'success' => '공급자가 갱신 되었습니다.' - ), + 'success' => '공급자가 갱신 되었습니다.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '이 공급자를 삭제 하시겠습니까?', 'error' => '공급자 삭제 중 문제가 발생했습니다. 다시 시도해 주세요.', 'success' => '공급자가 삭제되었습니다.', 'assoc_assets' => '이 공급자는 현재 다음 :asset_count 자산과 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 자산을 수정하고 다시 시도해 주세요. ', 'assoc_licenses' => '이 공급자는 현재 다음 :licenses_count 라이선스와 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 라이선스을 수정하고 다시 시도해 주세요. ', 'assoc_maintenances' => '이 공급자는 현재 다음 :asset_maintenances_count 자산 관리와 연결되어 있기에 삭제할 수 없습니다. 이 공급자를 더 이상 참조하기 않게 자산 관리을 수정하고 다시 시도해 주세요. ', - ) + ], -); +]; diff --git a/resources/lang/ko/admin/suppliers/table.php b/resources/lang/ko/admin/suppliers/table.php index 2459a51748..f9f9022e07 100644 --- a/resources/lang/ko/admin/suppliers/table.php +++ b/resources/lang/ko/admin/suppliers/table.php @@ -1,6 +1,6 @@ '공급자란', 'about_suppliers_text' => '공급자는 품목의 원천을 추적할 때 사용된다', 'address' => '공급자 주소', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => '자산 보기', 'zip' => '우편번호', -); +]; diff --git a/resources/lang/ko/admin/users/general.php b/resources/lang/ko/admin/users/general.php index ba750230a6..0e5724e72d 100644 --- a/resources/lang/ko/admin/users/general.php +++ b/resources/lang/ko/admin/users/general.php @@ -1,7 +1,6 @@ '이 사용자는 로그인 할 수 있음', 'activated_disabled_help_text' => '자신의 계정에 대한 활성 상태는 편집 할 수 없습니다.', 'assets_user' => '자산 보유자 :name', @@ -13,7 +12,7 @@ return array( 'edit' => '사용자 편집', 'filetype_info' => '허용되는 형식들은 png, gif, jpeg, doc, docx, pdf, txt, zip, rar 입니다.', 'history_user' => '이력 :name', - 'info' => '정보', + 'info' => '정보', 'restore_user' => '그것들을 복원하려면 여기를 클릭하세요.', 'last_login' => '마지막 로그인', 'ldap_config_text' => 'LDAP 구성 설정들은 Admin > Settings 에서 찾을 수 있습니다. (부가적으로) 선택된 장소는 불러온 모든 사용자들에게 설정됩니다.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => '현재 관리 설정이 두가지 인증방법을 선택적으로 실행하게 되어 있습니다. ', 'two_factor_enrolled' => '2FA 장치 등록 ', 'two_factor_active' => '2FA 활성화 ', - ); + ]; diff --git a/resources/lang/ko/admin/users/message.php b/resources/lang/ko/admin/users/message.php index ba5cb50901..234f7a6ce5 100644 --- a/resources/lang/ko/admin/users/message.php +++ b/resources/lang/ko/admin/users/message.php @@ -1,6 +1,6 @@ '이 자산이 승인되었습니다.', 'declined' => '이 자산이 거부되었습니다.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => '이 설치의 LDAP 통합이 구성이 되지 않았습니다.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => '사용자가 생성되었습니다.', 'update' => '사용자가 갱신 되었습니다.', 'update_bulk' => '사용자가 갱신 되었습니다.', @@ -26,9 +25,9 @@ return array( 'unsuspend' => '사용자의 대기를 해제하였습니다.', 'restored' => '사용자를 복원하였습니다.', 'import' => '사용자를 내보냈습니다.', - ), + ], - 'error' => array( + 'error' => [ 'create' => '사용자를 생성하는 중 문제가 발생했습니다. 다시 시도해 주세요.', 'update' => '사용자를 갱신하는 중 오류가 발생했습니다. 다시 시도해 주세요.', 'delete' => '사용자를 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAP 서버를 찾을 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:', 'ldap_could_not_get_entries' => 'LDAP 서버 목록을 가져올 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:', 'password_ldap' => '이 계정의 비밀번호는 LDAP/Active 디렉토리에 의해 관리됩니다. 비밀번호를 변경하려면 IT 부서에 문의하세요. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '파일이 삭제되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일이 삭제되었습니다.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '파일(들) 이 업로드 되지 않았습니다. 다시 시도해 주세요.', 'success' => '파일(들) 이 업로드 되었습니다.', 'nofiles' => '업로드 할 파일을 선택해 주세요', 'invalidfiles' => '하나 이상의 파일이 너무 크거나 허용되지 않는 형식입니다. 허용되는 형식은 png, gif, jpg, doc, docx, pdf, txt 입니다.', - ), + ], -); +]; diff --git a/resources/lang/ko/admin/users/table.php b/resources/lang/ko/admin/users/table.php index 09c4aaf4c3..e8a069bc0e 100644 --- a/resources/lang/ko/admin/users/table.php +++ b/resources/lang/ko/admin/users/table.php @@ -1,6 +1,6 @@ '활성', 'allow' => '허용', 'checkedout' => '자산', @@ -28,11 +28,11 @@ return array( 'show_current' => '현재 사용자들 보기', 'show_deleted' => '삭제된 사용자들 보기', 'title' => '직함', - 'to_restore_them' => '그것들을 복구하기.', + 'to_restore_them' => '그것들을 복구하기.', 'updateuser' => '사용자 갱신', 'username' => '사용자명', - 'user_deleted_text' => '이 사용자는 삭제 된 것으로 표시되어 있습니다.', + 'user_deleted_text' => '이 사용자는 삭제 된 것으로 표시되어 있습니다.', 'username_note' => '(이 것은 로그인이 아닌, 액티브 디렉토리에 연결할 때 사용됩니다.)', 'cloneuser' => '사용자 복제', 'viewusers' => '사용자 보기', -); +]; diff --git a/resources/lang/ko/auth/general.php b/resources/lang/ko/auth/general.php index 201400a61d..39b28238ae 100644 --- a/resources/lang/ko/auth/general.php +++ b/resources/lang/ko/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ko/auth/message.php b/resources/lang/ko/auth/message.php index 6b5d38bbde..af98df0b89 100644 --- a/resources/lang/ko/auth/message.php +++ b/resources/lang/ko/auth/message.php @@ -1,6 +1,6 @@ '이 메일 주소를 사용하는 계정이 존재합니다.', 'account_not_found' => '사용자 명이나 비밀번호가 틀렸습니다.', @@ -9,37 +9,36 @@ return array( 'account_banned' => '이 사용자는 금지 계정입니다.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => '로그인 시에 문제가 발생했습니다. 다시 시도해 주세요.', 'success' => '로그인에 성공했습니다.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => '계정 생성 중에 문제가 발생했습니다. 다시 시도해 주세요.', 'success' => '계정이 생성되었습니다.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => '비밀번호 초기화 코드를 얻는 중에 문제가 발생했습니다. 다시 시도해 주세요.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => '비밀번호 초기화 시 오류가 발생했습니다. 다시 시도해 주세요.', 'success' => '비밀번호가 초기화 되었습니다.', - ), + ], - -); +]; diff --git a/resources/lang/ko/button.php b/resources/lang/ko/button.php index 6cab69abd8..20404bb065 100644 --- a/resources/lang/ko/button.php +++ b/resources/lang/ko/button.php @@ -1,6 +1,6 @@ '기능', 'add' => '추가', 'cancel' => '취소', @@ -11,7 +11,7 @@ return array( 'request' => '요청', 'submit' => '제출', 'upload' => '올리기', - 'select_file' => '파일 선택...', + 'select_file' => '파일 선택...', 'select_files' => '파일 선택...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php index 9ada2bb6e7..9b55a81224 100644 --- a/resources/lang/ko/general.php +++ b/resources/lang/ko/general.php @@ -44,13 +44,13 @@ 'checkins_count' => '반입', 'user_requests_count' => '요청', 'city' => '시', - 'click_here' => '여기를 클릭', + 'click_here' => '여기를 클릭', 'clear_selection' => '선택 해제', 'companies' => '회사들', 'company' => '회사', 'component' => '구성 요소', 'components' => '구성 요소', - 'complete' => '완료', + 'complete' => '완료', 'consumable' => '소모품', 'consumables' => '소모품', 'country' => '국가명', diff --git a/resources/lang/ko/help.php b/resources/lang/ko/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ko/help.php +++ b/resources/lang/ko/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ko/mail.php b/resources/lang/ko/mail.php index fbc5770ec0..035c6efa4e 100644 --- a/resources/lang/ko/mail.php +++ b/resources/lang/ko/mail.php @@ -1,6 +1,6 @@ '사용자가 웹사이트에서 품목 요청을 취소했습니다', 'a_user_requested' => '사용자가 웹사이트에서 품목을 요청했습니다', 'accessory_name' => '액세서리 이름', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => '자산 확인' -); + 'your_assets' => '자산 확인', +]; diff --git a/resources/lang/ko/pagination.php b/resources/lang/ko/pagination.php index 2df2974faa..089fbcc283 100644 --- a/resources/lang/ko/pagination.php +++ b/resources/lang/ko/pagination.php @@ -1,6 +1,6 @@ '다음 »', -); +]; diff --git a/resources/lang/ko/passwords.php b/resources/lang/ko/passwords.php index c5443c6800..40069ac549 100644 --- a/resources/lang/ko/passwords.php +++ b/resources/lang/ko/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => '귀하의 비밀번호 링크가 전송되었습니다!', 'user' => '해당 이메일을 사용하는 활성 사용자를 찾을 수 없습니다.', ]; - diff --git a/resources/lang/ko/reminders.php b/resources/lang/ko/reminders.php index a941f5ac6f..abecae8843 100644 --- a/resources/lang/ko/reminders.php +++ b/resources/lang/ko/reminders.php @@ -1,6 +1,6 @@ "비밀번호는 6글자가 되야 하고 비밀번호 확인과 일치해야 합니다.", + 'password' => '비밀번호는 6글자가 되야 하고 비밀번호 확인과 일치해야 합니다.', - "user" => "사용자명이나 메일 주소가 정확하지 않습니다.", + 'user' => '사용자명이나 메일 주소가 정확하지 않습니다.', - "token" => "이 비밀번호 재설정 힌트가 잘못되었습니다.", + 'token' => '이 비밀번호 재설정 힌트가 잘못되었습니다.', - "sent" => "일치하는 메일 주소가 있다면, 비밀번호 힌트가 전송됩니다!", + 'sent' => '일치하는 메일 주소가 있다면, 비밀번호 힌트가 전송됩니다!', -); +]; diff --git a/resources/lang/ko/table.php b/resources/lang/ko/table.php index 17b9a5ca84..1a4c658290 100644 --- a/resources/lang/ko/table.php +++ b/resources/lang/ko/table.php @@ -1,10 +1,10 @@ '기능', 'action' => '작업', 'by' => '요청자', 'item' => '항목', -); +]; diff --git a/resources/lang/ko/validation.php b/resources/lang/ko/validation.php index 27ad00d13b..4c7706366c 100644 --- a/resources/lang/ko/validation.php +++ b/resources/lang/ko/validation.php @@ -1,6 +1,6 @@ ':attribute 는 이미 획득하였습니다.', 'uploaded' => ':attribute는 업로드 하지 못했습니다.', 'url' => ':attribute 형식이 부정확 합니다.', - "unique_undeleted" => ":attribute 는 고유의 값만 가져야 합니다.", + 'unique_undeleted' => ':attribute 는 고유의 값만 가져야 합니다.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute 항목에는 문자를 입력할 수 없습니다.", - "email_array" => "하나 이상의 이메일 주소가 유효하지 않습니다.", - "hashed_pass" => "현재 비밀번호가 잘못되었습니다.", + 'alpha_space' => ':attribute 항목에는 문자를 입력할 수 없습니다.', + 'email_array' => '하나 이상의 이메일 주소가 유효하지 않습니다.', + 'hashed_pass' => '현재 비밀번호가 잘못되었습니다.', 'dumbpwd' => '그 비밀번호는 너무 일반적입니다.', - "statuslabel_type" => "유효한 상태 라벨 형식을 선택해 주셔야 합니다", + 'statuslabel_type' => '유효한 상태 라벨 형식을 선택해 주셔야 합니다', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/lt/admin/accessories/general.php b/resources/lang/lt/admin/accessories/general.php index 20ebfcadf6..08d9269e3f 100644 --- a/resources/lang/lt/admin/accessories/general.php +++ b/resources/lang/lt/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Įrangos kategorija', 'accessory_name' => 'Įrangos pavadinimas', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Naudoti pirminę EULA vietoje to.', 'use_default_eula_disabled' => 'Naudoti pirminę numatytąją EULA. Nėra nustatytos pirminės numatytosios EULA. Prašome pridėkite ją nustatymuose.', -); +]; diff --git a/resources/lang/lt/admin/accessories/message.php b/resources/lang/lt/admin/accessories/message.php index ae1570c571..165ce433cc 100644 --- a/resources/lang/lt/admin/accessories/message.php +++ b/resources/lang/lt/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Priedas [:id] neegzistuoja.', 'assoc_users' => 'Vartotojams šiuo metu išduotų šio priedo vienetų skaičius - :count. Susigrąžinkite išduotus priedus ir bandykite dar kartą. ', - 'create' => array( + 'create' => [ 'error' => 'Priedas nebuvo sukurtas. Prašome bandykite dar kartą.', - 'success' => 'Priedas sėkmingai sukurtas.' - ), + 'success' => 'Priedas sėkmingai sukurtas.', + ], - 'update' => array( + 'update' => [ 'error' => 'Įranga nebuvo atnaujinta. Prašome bandykite dar kartą', - 'success' => 'Priedas atnaujintas sėkmingai.' - ), + 'success' => 'Priedas atnaujintas sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šį priedą?', 'error' => 'Nepavyko ištrinti šio priedo. Pabandykite dar kartą.', - 'success' => 'Priedas ištrintas sėkmingai.' - ), + 'success' => 'Priedas ištrintas sėkmingai.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Priedo nepavyko išduoti, pabandykite dar kartą', 'success' => 'Įranga sėkmingai išimta.', - 'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.' - ), + 'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Įrangos nepavyko pridėti, prašome bandykite dar kartą', 'success' => 'Įranga sėkmingai pridėta.', - 'user_does_not_exist' => 'Varototojas neteisingas. Prašome bandykite dar kartą.' - ) + 'user_does_not_exist' => 'Varototojas neteisingas. Prašome bandykite dar kartą.', + ], - -); +]; diff --git a/resources/lang/lt/admin/accessories/table.php b/resources/lang/lt/admin/accessories/table.php index 7fcc14ad80..6fbb890b2e 100644 --- a/resources/lang/lt/admin/accessories/table.php +++ b/resources/lang/lt/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Atsisiūsti CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Atsisiūsti CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Priėmimas', 'title' => 'Įrangos pavadinimas', - -); +]; diff --git a/resources/lang/lt/admin/asset_maintenances/form.php b/resources/lang/lt/admin/asset_maintenances/form.php index ae5d2beef6..b2b01c2736 100644 --- a/resources/lang/lt/admin/asset_maintenances/form.php +++ b/resources/lang/lt/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Įrangos naudojimas (dienomis)', 'notes' => 'Pastabos', 'update' => 'Atnaujint įrangos preižiūrą', - 'create' => 'Sukurti įrangos priežiūrą' + 'create' => 'Sukurti įrangos priežiūrą', ]; diff --git a/resources/lang/lt/admin/asset_maintenances/message.php b/resources/lang/lt/admin/asset_maintenances/message.php index dbca60d37d..4dbc737f31 100644 --- a/resources/lang/lt/admin/asset_maintenances/message.php +++ b/resources/lang/lt/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šią įrangos priežiūrą?', 'error' => 'Inepavyko ištrinti įrangos priežiūrą. Prašome bandykite dar kartą.', - 'success' => 'Įrangos preižiūra buvo sėkmingai ištrinta.' + 'success' => 'Įrangos preižiūra buvo sėkmingai ištrinta.', ], 'create' => [ 'error' => 'Įrangos priežiūra nebuvo sukurta, prašome bandykite dar kartą.', - 'success' => 'Įrangos priežiūra sukurta sėkmingai.' + 'success' => 'Įrangos priežiūra sukurta sėkmingai.', ], 'edit' => [ 'error' => 'Turto priežiūra nebuvo redaguota, bandykite dar kartą.', - 'success' => 'Turto priežiūra sėkmingai redaguojama.' + 'success' => 'Turto priežiūra sėkmingai redaguojama.', ], 'asset_maintenance_incomplete' => 'Nebaigta', 'warranty' => 'Garantija', 'not_warranty' => 'Nėra garantijos', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/lt/admin/asset_maintenances/table.php b/resources/lang/lt/admin/asset_maintenances/table.php index 0a3e2b150b..f3b2d7706b 100644 --- a/resources/lang/lt/admin/asset_maintenances/table.php +++ b/resources/lang/lt/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Įrangos priežiūra', 'asset_name' => 'Turto pavadinimas', 'is_warranty' => 'Garantija', - 'dl_csv' => 'Atsisiųti CSV fromatu' + 'dl_csv' => 'Atsisiųti CSV fromatu', ]; diff --git a/resources/lang/lt/admin/categories/general.php b/resources/lang/lt/admin/categories/general.php index ca3d944ef1..dae497f6ff 100644 --- a/resources/lang/lt/admin/categories/general.php +++ b/resources/lang/lt/admin/categories/general.php @@ -1,6 +1,6 @@ 'Įrangos kategorijos', 'category_name' => 'Kategorijos pavadinimas', 'checkin_email' => 'Siųsti el. laišką vartotojui gavus/priskyrus.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Naudoti pirminę numatytąją EULA.', 'use_default_eula_disabled' => 'Naudoti pirminė numatytąją EULA Nėra pirminės numatytosios EULA. Prašome pridėkite ją nustatymuose.', -); +]; diff --git a/resources/lang/lt/admin/categories/message.php b/resources/lang/lt/admin/categories/message.php index f05e4d5e3f..62d0139ffb 100644 --- a/resources/lang/lt/admin/categories/message.php +++ b/resources/lang/lt/admin/categories/message.php @@ -1,25 +1,25 @@ 'Tokios kategorijos nėra.', 'assoc_models' => 'Ši kategorija šiuo metu yra susijusi su bent vienu modeliu ir negali būti ištrinta. Atnaujinkite savo modelius, kad nebebūtų nuorodos į šią kategoriją, ir bandykite dar kartą.', 'assoc_items' => 'Ši kategorija šiuo metu yra susijusi su bent viena: asset_type ir negali būti ištrinta. Prašome atnaujinti savo: asset_type, kad nebebūtų nuorodos į šią kategoriją ir bandykite dar kartą.', - 'create' => array( + 'create' => [ 'error' => 'Kategorijos sukurti nepavyko, prašome badykite dar kartą.', - 'success' => 'Sėkmingai sukurta nauja kategorija.' - ), + 'success' => 'Sėkmingai sukurta nauja kategorija.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorija neatnaujinta, prašome pabandykite dar kartą', - 'success' => 'Kategorijos atnaujinimas sėkmingas.' - ), + 'success' => 'Kategorijos atnaujinimas sėkmingas.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šią kategoriją?', 'error' => 'Nepavyko ištrinti kategorijos. Prašome bandykite dar kartą.', - 'success' => 'Kategorija sėkmingai ištrinta.' - ) + 'success' => 'Kategorija sėkmingai ištrinta.', + ], -); +]; diff --git a/resources/lang/lt/admin/categories/table.php b/resources/lang/lt/admin/categories/table.php index 7f061f0a38..0b98c02bc0 100644 --- a/resources/lang/lt/admin/categories/table.php +++ b/resources/lang/lt/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Pagrindinė', 'require_acceptance' => 'Priėmimas', 'title' => 'Įrangos kategorijos pavadinimas', -); +]; diff --git a/resources/lang/lt/admin/companies/general.php b/resources/lang/lt/admin/companies/general.php index 7f8b2450c3..d7f036248e 100644 --- a/resources/lang/lt/admin/companies/general.php +++ b/resources/lang/lt/admin/companies/general.php @@ -1,4 +1,5 @@ 'Pasirinkite kompaniją', ]; diff --git a/resources/lang/lt/admin/companies/message.php b/resources/lang/lt/admin/companies/message.php index bbce56f73b..bec026ffe5 100644 --- a/resources/lang/lt/admin/companies/message.php +++ b/resources/lang/lt/admin/companies/message.php @@ -1,18 +1,19 @@ 'Kompanija neegzistuoja.', 'assoc_users' => 'Ši kompanija šiuo metu susieta su mažiausiai viena įranga ir negali būti ištrinta. prašome atnaujinkite savo įrangą, kad nebūtų nuorodų į šią kompaniją ir bandykite iš naujo. ', - 'create' => array( + 'create' => [ 'error' => 'Kompanija nebuvo sukurta, prašome bandykite dar kartą.', - 'success' => 'Kompanija sėkmingai įtraukta.' - ), - 'update' => array( + 'success' => 'Kompanija sėkmingai įtraukta.', + ], + 'update' => [ 'error' => 'Kompanija nebuvo atnaujinta, prašome bandykite dar kartą', - 'success' => 'Kompanija sėkmingai atnaujinta.' - ), - 'delete' => array( + 'success' => 'Kompanija sėkmingai atnaujinta.', + ], + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šią kompaniją?', 'error' => 'Įvyko klaida, prašome bandykite dar kartą.', - 'success' => 'Kompanija sėkmingai ištrinta.' - ) -); + 'success' => 'Kompanija sėkmingai ištrinta.', + ], +]; diff --git a/resources/lang/lt/admin/companies/table.php b/resources/lang/lt/admin/companies/table.php index 18ec54425c..15d701c3d3 100644 --- a/resources/lang/lt/admin/companies/table.php +++ b/resources/lang/lt/admin/companies/table.php @@ -1,9 +1,10 @@ 'Kompanijos', 'create' => 'Sukurti kompaniją', 'title' => 'Kompanija', 'update' => 'Atnaujinti kompaniją', 'name' => 'Kompanijos pavadinimas', 'id' => 'ID', -); +]; diff --git a/resources/lang/lt/admin/components/general.php b/resources/lang/lt/admin/components/general.php index 04149fbb2b..4b87917964 100644 --- a/resources/lang/lt/admin/components/general.php +++ b/resources/lang/lt/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponento pavadinimas', 'checkin' => 'Checkin komponentas', 'checkout' => 'Checkout komponentas', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Likutis', 'total' => 'Iš viso', 'update' => 'Atnaujinti komponentą', -); +]; diff --git a/resources/lang/lt/admin/components/message.php b/resources/lang/lt/admin/components/message.php index 513f46be18..c5786a7ab2 100644 --- a/resources/lang/lt/admin/components/message.php +++ b/resources/lang/lt/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponentas \'%s\' neegzistuoja.', - 'create' => array( + 'create' => [ 'error' => 'Komponentas nebuvo sukurtas, prašome bandyti vėl.', - 'success' => 'Komponentas sėkmingai sukurtas.' - ), + 'success' => 'Komponentas sėkmingai sukurtas.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponentas nebuvo atnaujintas, bandykite dar kartą', - 'success' => 'Komponentas sėkmingai atnaujintas.' - ), + 'success' => 'Komponentas sėkmingai atnaujintas.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šį komponentą?', 'error' => 'Problema buvo pašalinta komponentas. Prašau, pabandykite dar kartą.', - 'success' => 'Komponentas ištrintas sėkmingai.' - ), + 'success' => 'Komponentas ištrintas sėkmingai.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponentas nebuvo išregistruotas, bandykite dar kartą', 'success' => 'Komponentas sėkmingai patikrintas.', - 'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.' - ), + 'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponentas nebuvo įregistruotas, bandykite dar kartą', 'success' => 'Komponentas sėkmingai užregistruotas.', - 'user_does_not_exist' => 'Šis naudotojas yra netinkamas. Prašau, pabandykite dar kartą.' - ) + 'user_does_not_exist' => 'Šis naudotojas yra netinkamas. Prašau, pabandykite dar kartą.', + ], - -); +]; diff --git a/resources/lang/lt/admin/components/table.php b/resources/lang/lt/admin/components/table.php index b52616f34f..e7f2542a57 100644 --- a/resources/lang/lt/admin/components/table.php +++ b/resources/lang/lt/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponento pavadinimas', -); +]; diff --git a/resources/lang/lt/admin/consumables/general.php b/resources/lang/lt/admin/consumables/general.php index e169fd9f28..e590f6a372 100644 --- a/resources/lang/lt/admin/consumables/general.php +++ b/resources/lang/lt/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Užsakymas, kurį reikia išnaudoti vartotojui', 'consumable_name' => 'Suvartojamos įrangos pavadinimas', 'create' => 'Sukurti suvartojamą įrangą', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Likutis', 'total' => 'Viso', 'update' => 'Atnaujinti suvartojamą irangą', -); +]; diff --git a/resources/lang/lt/admin/consumables/message.php b/resources/lang/lt/admin/consumables/message.php index 8fc47a10d5..53c2618c64 100644 --- a/resources/lang/lt/admin/consumables/message.php +++ b/resources/lang/lt/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Tokios suvartojamos įrangos nėra.', - 'create' => array( + 'create' => [ 'error' => 'Suvartojama įranga nebuvo sukurta, prašome bandykite dar kartą.', - 'success' => 'Suvartojama įranga sukurta sėkmingai.' - ), + 'success' => 'Suvartojama įranga sukurta sėkmingai.', + ], - 'update' => array( + 'update' => [ 'error' => 'Suvartojama įranga nebuvo atnaujinta, prašome bandykite dar kartą', - 'success' => 'Suvartojama įranga atnaujinta sėkmingai.' - ), + 'success' => 'Suvartojama įranga atnaujinta sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti pasirinktą įrangą?', 'error' => 'Nepavyko ištrinti suvartojamos įrangos. Prašome bandykite dar kartą.', - 'success' => 'Įranga buvo ištrinta sėkmingai.' - ), + 'success' => 'Įranga buvo ištrinta sėkmingai.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ši suvartojama įranga nebuvo išimta, prašome bandykite dar kartą', 'success' => 'Suvartojam įranga sėkminga išimta.', - 'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.' - ), + 'user_does_not_exist' => 'Šis vartotojas neteisingas. Prašome bandykite dar kartą.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ši suvartojama įranga nebuvo pridėta, prašome bandykite dar kartą', 'success' => 'Suvartojama įranga sėkmingai pridėta.', - 'user_does_not_exist' => 'Neteisingas naudotojas. Prašome bandykite dar kartą.' - ) + 'user_does_not_exist' => 'Neteisingas naudotojas. Prašome bandykite dar kartą.', + ], - -); +]; diff --git a/resources/lang/lt/admin/consumables/table.php b/resources/lang/lt/admin/consumables/table.php index 99742a91e0..e2fb45c293 100644 --- a/resources/lang/lt/admin/consumables/table.php +++ b/resources/lang/lt/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Suavrtojamos įrangos pavadinimas', -); +]; diff --git a/resources/lang/lt/admin/custom_fields/general.php b/resources/lang/lt/admin/custom_fields/general.php index 17f20b3a30..902e9c2bd2 100644 --- a/resources/lang/lt/admin/custom_fields/general.php +++ b/resources/lang/lt/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Pritaikyti laukai', 'field' => 'Laukas', 'about_fieldsets_title' => 'Apie laukų grupes', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Naujas pritaikomas laukelis', 'value_encrypted' => 'Šio lauko vertė yra užkoduota duomenų bazėje. Tik admin vartotojai galės peržiūrėti iššifruotą vertę', 'show_in_email' => 'Įterptos šio laukelio išdavimo reikšmės bus siunčiamos vartotojams? Užšifruoti laukai negali būti įterpti į el. laišką.', -); +]; diff --git a/resources/lang/lt/admin/custom_fields/message.php b/resources/lang/lt/admin/custom_fields/message.php index dd4b7439bb..46b8855202 100644 --- a/resources/lang/lt/admin/custom_fields/message.php +++ b/resources/lang/lt/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Laukelis neegzistuoja.', 'already_added' => 'Laukelis jau pridėtas', - 'create' => array( + 'create' => [ 'error' => 'Laukelis nebuvo sukurtas. Prašome bandyti dar kartą.', 'success' => 'Laukelis sukurtas sėkmingai.', - 'assoc_success' => 'Laukelis sėkmingai pridėtas į laukų grupę.' - ), + 'assoc_success' => 'Laukelis sėkmingai pridėtas į laukų grupę.', + ], - 'update' => array( + 'update' => [ 'error' => 'Laukelis nebuvo atnaujintas, prašome bandykite dar kartą', - 'success' => 'Laukelis atnaujintas sėkmingai.' - ), + 'success' => 'Laukelis atnaujintas sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar esate tikri jog norite pašalinti šį laukelį?', 'error' => 'Nepavyko ištrinti laukelio. Prašome bandykite dar kartą.', 'success' => 'Laukelis buvo sėkmingas ištrintas.', 'in_use' => 'Laukelis naudojamas.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset neegzistuoja', - 'create' => array( + 'create' => [ 'error' => 'Laukelis nebuvo sukurtas. Prašome bandyti dar kartą.', - 'success' => 'Laukų grupė sukurta sėkmingai.' - ), + 'success' => 'Laukų grupė sukurta sėkmingai.', + ], - 'update' => array( + 'update' => [ 'error' => 'Laukų grupė nebuvo atnaujinta. Prašome bandyti dar kartą', - 'success' => 'Laukų grupė atnaujinta sėkmingai.' - ), + 'success' => 'Laukų grupė atnaujinta sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar esate tikri jog norite pašalinti šią lankų grupę?', 'error' => 'Klaida bandant ištrinti laukų grupę. Prašome bandykite dar kartą.', 'success' => 'Laukų grupė ištrinta sėkmingai.', 'in_use' => 'Laukų grupė vis dar naudojama.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/lt/admin/departments/message.php b/resources/lang/lt/admin/departments/message.php index bb7ef0d830..bdfc92afce 100644 --- a/resources/lang/lt/admin/departments/message.php +++ b/resources/lang/lt/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departamentas neegzistuoja.', 'assoc_users' => 'Šis skyrius šiuo metu yra susijęs su bent vienu naudotoju ir jo negalima ištrinti. Prašome atnaujinti savo naudotojus, kad jie daugiau nebenumatytų šio skyriaus ir bandytų dar kartą.', - 'create' => array( + 'create' => [ 'error' => 'Departamentas nebuvo sukurtas, prašome pabandyti dar kartą.', - 'success' => 'Departamentas sėkmingai sukūrė.' - ), - 'update' => array( + 'success' => 'Departamentas sėkmingai sukūrė.', + ], + 'update' => [ 'error' => 'Departamentas nebuvo atnaujintas, bandykite dar kartą', - 'success' => 'Departamentas sėkmingai atnaujintas.' - ), - 'delete' => array( + 'success' => 'Departamentas sėkmingai atnaujintas.', + ], + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šį skyrių?', 'error' => 'Buvo pašalinta departamento problema. Prašau, pabandykite dar kartą.', - 'success' => 'Departamentas sėkmingai ištrintas.' - ) + 'success' => 'Departamentas sėkmingai ištrintas.', + ], -); +]; diff --git a/resources/lang/lt/admin/departments/table.php b/resources/lang/lt/admin/departments/table.php index 70d10e1c91..87064199a8 100644 --- a/resources/lang/lt/admin/departments/table.php +++ b/resources/lang/lt/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Departamento pavadinimas', @@ -8,4 +8,4 @@ return array( 'location' => 'Vieta', 'create' => 'Sukurkite skyrių', 'update' => 'Atnaujinti departamentą', - ); + ]; diff --git a/resources/lang/lt/admin/depreciations/general.php b/resources/lang/lt/admin/depreciations/general.php index 9c7bafebf8..97ea5903db 100644 --- a/resources/lang/lt/admin/depreciations/general.php +++ b/resources/lang/lt/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Apie įrangos nusidėvėjimą', 'about_depreciations' => 'Jūs galite nustatyti irangos nusidėvėjimą naudodami proporcinio metodo nusidėvėjimą.', 'asset_depreciations' => 'Irangos nusidėvėjimas', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Mėnesių skaičius', 'update' => 'Atnaujinti nusidėvėjimą', -); +]; diff --git a/resources/lang/lt/admin/depreciations/message.php b/resources/lang/lt/admin/depreciations/message.php index 01e5ee1f8a..122988f582 100644 --- a/resources/lang/lt/admin/depreciations/message.php +++ b/resources/lang/lt/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Nėra tokios nusidėvėjimo klasės.', 'assoc_users' => 'Šis nusidėvėjimas šiuo metu susietas su vienu ar dagiau įrangos vienetų ir negali būti ištrintas. Prašome ištrinkite susietą įrangą, tuomet bandykite iš naujo. ', - - 'create' => array( + 'create' => [ 'error' => 'Nusidėvėjimo grupė nebuvo sukurta, prašome badykite dar kartą. :(', - 'success' => 'Nusidėvėjimo grupė sėkmingai sukurta. :)' - ), + 'success' => 'Nusidėvėjimo grupė sėkmingai sukurta. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Nusidėvėjimo grupė nebuvo atnaujinta, prašome bandykite dar kartą', - 'success' => 'Nusidėvėjimo grupė atnaujinta sėkmingai.' - ), + 'success' => 'Nusidėvėjimo grupė atnaujinta sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šią nusidėvėjimo grupę?', 'error' => 'Nepavyko ištrinti nsuidėvėjimo grupės.', - 'success' => 'Nusidėvėjimo grupė buvo sėkmingai ištrinta.' - ) + 'success' => 'Nusidėvėjimo grupė buvo sėkmingai ištrinta.', + ], -); +]; diff --git a/resources/lang/lt/admin/depreciations/table.php b/resources/lang/lt/admin/depreciations/table.php index 6e18fa7a06..a6eaf2c4da 100644 --- a/resources/lang/lt/admin/depreciations/table.php +++ b/resources/lang/lt/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Mėnesiai', 'term' => 'Laikotarpis', 'title' => 'Pavadinimas ', -); +]; diff --git a/resources/lang/lt/admin/groups/message.php b/resources/lang/lt/admin/groups/message.php index 0655ca13da..17dd0b9f87 100644 --- a/resources/lang/lt/admin/groups/message.php +++ b/resources/lang/lt/admin/groups/message.php @@ -1,22 +1,22 @@ 'Gruoė jau sukurta!', 'group_not_found' => 'Tokios [:id] grupės nėra.', 'group_name_required' => 'Laukelio pavadinimas privalomas', - 'success' => array( + 'success' => [ 'create' => 'Grupė sėkmingai sukurta.', 'update' => 'Grupė sėkmingai atnaujinta.', 'delete' => 'Grupė sėkmingai ištrinta.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šią grupę?', 'create' => 'Nepavyko sukurti grupės. Prašome bandykite dar kartą.', 'update' => 'Nepavyko atnaujinti grupės. Prašome bandykite dar kartą.', 'delete' => 'Nepavyko ištrinti grupės. Prašome bandykite dar kartą.', - ), + ], -); +]; diff --git a/resources/lang/lt/admin/groups/table.php b/resources/lang/lt/admin/groups/table.php index e81468207a..164af15622 100644 --- a/resources/lang/lt/admin/groups/table.php +++ b/resources/lang/lt/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Pavadinimas', 'users' => 'Naudotojų skaičius', -); +]; diff --git a/resources/lang/lt/admin/groups/titles.php b/resources/lang/lt/admin/groups/titles.php index e57927d94a..f55d5448f7 100644 --- a/resources/lang/lt/admin/groups/titles.php +++ b/resources/lang/lt/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Apie grupes', 'about_groups' => 'Grupės naudojamos apibendrinti naudotojo leidimus.', 'group_management' => 'Grupės valdymas', @@ -11,4 +11,4 @@ return array( 'allow' => 'Leisti', 'deny' => 'Neleisti', -); +]; diff --git a/resources/lang/lt/admin/hardware/form.php b/resources/lang/lt/admin/hardware/form.php index 6214e19623..1cc0d96c06 100644 --- a/resources/lang/lt/admin/hardware/form.php +++ b/resources/lang/lt/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Patvirtinkite masinio ištrynimo turinį', +return [ + 'bulk_delete' => 'Patvirtinkite masinio ištrynimo turinį', 'bulk_delete_help' => 'Peržiūrėkite įrangos ištrinimą žemiau. Ištrinus, įranga galima atstatyti, tačiau daugiau nebus priskirta jokiam vartotojam.', 'bulk_delete_warn' => 'Jūs norite ištrinti :asset_count įranga.', - 'bulk_update' => 'Visa atnaujinama įranga', - 'bulk_update_help' => 'Ši forma leidžia jums atnaujinti kelias įrangas vienu metu. Prašome užpildykite laukelius, kuriuos reikia keisti. Visi laukeliai, kuriuos paliksite tuščius liks nepakeisti. ', - 'bulk_update_warn' => 'Jūs ruošiatės keisti sekančius nustatymus :asset_count assets.', + 'bulk_update' => 'Visa atnaujinama įranga', + 'bulk_update_help' => 'Ši forma leidžia jums atnaujinti kelias įrangas vienu metu. Prašome užpildykite laukelius, kuriuos reikia keisti. Visi laukeliai, kuriuos paliksite tuščius liks nepakeisti. ', + 'bulk_update_warn' => 'Jūs ruošiatės keisti sekančius nustatymus :asset_count assets.', 'checkedout_to' => 'Išduota', 'checkout_date' => 'Išdavimo data', 'checkin_date' => 'Priėmimo data', @@ -38,7 +38,6 @@ return array( 'tag' => 'Įrangos pavadinimas', 'update' => 'Įrangos atnaujinimas', 'warranty' => 'Garantija', - 'warranty_expires' => 'Garantija baigiasi', + 'warranty_expires' => 'Garantija baigiasi', 'years' => 'metai', -) -; +]; diff --git a/resources/lang/lt/admin/hardware/general.php b/resources/lang/lt/admin/hardware/general.php index d64fb96669..d66d2cbb18 100644 --- a/resources/lang/lt/admin/hardware/general.php +++ b/resources/lang/lt/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Apie turtą', 'about_assets_text' => 'Turtas - tai daiktai, kurie stebimi serijos numeriu arba turinio žyma. Jie dažniausiai būna vertingesni dalykai, kai svarbu nustatyti konkretų elementą.', - 'archived' => 'Archyvuota', + 'archived' => 'Archyvuota', 'asset' => 'Įranga', 'bulk_checkout' => 'Išduota įranga', 'checkin' => 'Išduota įranga', @@ -19,4 +19,4 @@ return array( 'pending' => 'Vykdoma', 'undeployable' => 'Negalimas naudoti', 'view' => 'Peržiūrėti įrangą', -); +]; diff --git a/resources/lang/lt/admin/hardware/message.php b/resources/lang/lt/admin/hardware/message.php index 45907a92ee..f0d3b94ef8 100644 --- a/resources/lang/lt/admin/hardware/message.php +++ b/resources/lang/lt/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Dėmesio: Ši įranga pažymėta kaip negalima naudoti. Jei būklė pasikeitė, prašome atnaujinti įrangos būklę.', 'does_not_exist' => 'Tokios įrangos nėra.', 'does_not_exist_or_not_requestable' => 'Tokios įrangos nėra arba jos negalima užklausti.', 'assoc_users' => 'Ši įranga šiuo metu yra išduota naudotojui ir negali būti ištrinta. Prašome pirmiausia patikrinkite įrangą, tuomet bandykite ištrinti vėl. ', - 'create' => array( + 'create' => [ 'error' => 'Įrangos sukurti nepavyko, prašome bandykite dar kartą. :(', - 'success' => 'Įranga sėkminga sukurta. :)' - ), + 'success' => 'Įranga sėkminga sukurta. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Įrangos atnaujinti nepavyko, prašome bandykite dar kartą', 'success' => 'Įranga sėkmingai atnaujinta.', 'nothing_updated' => 'Nei vienas laukelis nepasirinktas, tad niekas nebuvo atnaujinta.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Įranga nebuvo atkurta, prašome bandykite dar kartą', - 'success' => 'Įranga atkurta sėkmingai.' - ), + 'success' => 'Įranga atkurta sėkmingai.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Turto auditas buvo nesėkmingas. Prašau, pabandykite dar kartą.', - 'success' => 'Turto auditas sėkmingai registruotas.' - ), + 'success' => 'Turto auditas sėkmingai registruotas.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Failas neištrintas. Prašome bandykite dar kartą.', 'success' => 'Failas sėkmingai ištrintas.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Failas (-ai) neįkelti. Prašome bandykite dar kartą.', 'success' => 'Failas (-ai) sėkmingai įkelti.', 'nofiles' => 'Jūs nepasirinkote nė vieno failo įkėlimui arba failai, kuriuos ketinate įkelti yra per dideli', 'invalidfiles' => 'Vienas ar keli failai yra per didelis arba neleidžiamas šis failų formatas. primename, kad leidžiami sekantys formatai png, gif, jpg, doc, docx, pdf, txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Nepavyko teisingai importuoti kai kurių įrašų.', 'errorDetail' => 'Šie elementai nebuvo importuoti dėl klaidų.', - 'success' => "Jūsų failas importuotas", - 'file_delete_success' => "Jūsų failas buvo sėkmingai ištrintas", - 'file_delete_error' => "Nepavyko ištrinti failo", - ), + 'success' => 'Jūsų failas importuotas', + 'file_delete_success' => 'Jūsų failas buvo sėkmingai ištrintas', + 'file_delete_error' => 'Nepavyko ištrinti failo', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šią įrangą?', 'error' => 'Nepavyko ištrinti įrangos. Prašome bandykite dar kartą.', 'nothing_updated' => 'Nebuvo pasirinkta jokio turto, taigi niekas nebuvo ištrintas.', - 'success' => 'Įranga sėkmingai ištrinta.' - ), + 'success' => 'Įranga sėkmingai ištrinta.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Įranga neišduota, prašome bandyti dar kartą', 'success' => 'Įranga išduota sėkmingai.', 'user_does_not_exist' => 'Netinkamas naudotojas. Prašome bandykite dar kartą.', 'not_available' => 'Šis turtas negali būti išsiunčiamas!', - 'no_assets_selected' => 'Jūs turite pasirinkti bent vieną turtą iš sąrašo' - ), + 'no_assets_selected' => 'Jūs turite pasirinkti bent vieną turtą iš sąrašo', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Įranga neišduota, prašome bandyti dar kartą', 'success' => 'Įranga išduota sėkmingai.', 'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.', 'already_checked_in' => 'Šis turtas jau yra registruotas.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Įranga nebuvo užklausta, prašome bandyti dar kartą', 'success' => 'Įrangos užklausa sėkmingai išsiusta.', - 'canceled' => 'Patikros užklausa sėkmingai atšaukta' - ) + 'canceled' => 'Patikros užklausa sėkmingai atšaukta', + ], -); +]; diff --git a/resources/lang/lt/admin/hardware/table.php b/resources/lang/lt/admin/hardware/table.php index db8ddea292..a602d373b3 100644 --- a/resources/lang/lt/admin/hardware/table.php +++ b/resources/lang/lt/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Įrangos kortelė', 'asset_model' => 'Modelis', @@ -20,6 +20,6 @@ return array( 'title' => 'Įranga ', 'image' => 'Įrenginio nuotrauka', 'days_without_acceptance' => 'Dienų skaičius be priėmimo', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/lt/admin/kits/general.php b/resources/lang/lt/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/lt/admin/kits/general.php +++ b/resources/lang/lt/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/lt/admin/licenses/form.php b/resources/lang/lt/admin/licenses/form.php index a48bc4c451..b54e61957d 100644 --- a/resources/lang/lt/admin/licenses/form.php +++ b/resources/lang/lt/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Įranga', 'checkin' => 'Pridėti', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Gauta licenzija el. paštu', 'to_name' => 'Licenzija išduota šiuo vardu', 'update' => 'Atnaujinta licenzija', - 'checkout_help' => 'Jūs turite išduoti licenziją įrangai arba asmeniui. Jūs galite pasirinkti abu, bet savininkas naudojantis įrangą turi sutapti su asmeniu, kuriam ši įranga perduodama.' -); + 'checkout_help' => 'Jūs turite išduoti licenziją įrangai arba asmeniui. Jūs galite pasirinkti abu, bet savininkas naudojantis įrangą turi sutapti su asmeniu, kuriam ši įranga perduodama.', +]; diff --git a/resources/lang/lt/admin/licenses/general.php b/resources/lang/lt/admin/licenses/general.php index 05375b7352..d1d2a482f2 100644 --- a/resources/lang/lt/admin/licenses/general.php +++ b/resources/lang/lt/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Apie licencijas', 'about_licenses' => 'Licencijos naudojamos programinei įrangai stebėti. Jie turi tam tikrą skaičių vietų, kurias galima patikrinti asmenims', 'checkin' => 'Išduoti licenzijos prieigą', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Programinės įrangos licenzijos', 'user' => 'Naudotojas', 'view' => 'Peržiūrėti licenziją', -); +]; diff --git a/resources/lang/lt/admin/licenses/message.php b/resources/lang/lt/admin/licenses/message.php index 2a63a77cb7..6b0f5251a2 100644 --- a/resources/lang/lt/admin/licenses/message.php +++ b/resources/lang/lt/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licenzijos nėra.', 'user_does_not_exist' => 'Naudotojo nėra.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Turite pasirinkti turtą arba naudotoją, bet ne abu.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licenzija nesukurta, prašome bandykite dar kartą.', - 'success' => 'Licenzija sukurta.' - ), + 'success' => 'Licenzija sukurta.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Failas neištrintas. Prašome bandykite dar kartą.', 'success' => 'Failas sėkmingai ištrintas.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Failas (-ai) neįkelti. Prašome bandykite dar kartą.', 'success' => 'Failas (-ai) sėkmingai įkelti.', 'nofiles' => 'Jūs nepasirinkote įkelti jokių failų arba failas, kurį ketinate įkelti yra per didelis', 'invalidfiles' => 'Vienas ar keli jūsų failai yra per dideli arba yra neleidžiamas failų tipas. Leidžiami failų tipai yra png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml ir lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licenzija nesukurta, prašome bandykite dar kartą', - 'success' => 'Licenzija atnaujinta sėkmingai.' - ), + 'success' => 'Licenzija atnaujinta sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šią licenziją?', 'error' => 'Licenzijos nepavyko ištrinti. Prašome bandykite dar kartą.', - 'success' => 'Licenzija sėkmingai ištrinta.' - ), + 'success' => 'Licenzija sėkmingai ištrinta.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Nepavyko išduoti licenzijos. Prašome bandykite dar kartą.', - 'success' => 'Licenzija sėkmingai išduota' - ), + 'success' => 'Licenzija sėkmingai išduota', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nepavyko priimti licenzijos. Prašome bandykite dar kartą.', - 'success' => 'Licenzija sėkmingai priimta' - ), + 'success' => 'Licenzija sėkmingai priimta', + ], -); +]; diff --git a/resources/lang/lt/admin/licenses/table.php b/resources/lang/lt/admin/licenses/table.php index 0ddb7d856e..ecaa668df8 100644 --- a/resources/lang/lt/admin/licenses/table.php +++ b/resources/lang/lt/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Susieta su', 'checkout' => 'Priimta/išduota', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serijinis numeris', 'title' => 'Licenzija', -); +]; diff --git a/resources/lang/lt/admin/locations/message.php b/resources/lang/lt/admin/locations/message.php index 4a7ecc6108..20abfa0a39 100644 --- a/resources/lang/lt/admin/locations/message.php +++ b/resources/lang/lt/admin/locations/message.php @@ -1,27 +1,26 @@ 'Tokios vietovės nėra.', 'assoc_users' => 'Ši vietovė šiuo metu yra susieta bent su vienu vartotoju ir negali būti ištrinta. Prašome atnaujinkite naudotojus, kad atsieti šią vietovę ir tuomet bandykite iš naujo ištrinti. ', 'assoc_assets' => 'Ši vietovė šiuo metu yra susieta bent su vienu įrangos vienetu ir negali būti ištrinta. Prašome atnaujinkite įrangą, kad atsieti šią vietovę ir tuomet bandykite iš naujo ištrinti. ', 'assoc_child_loc' => 'Ši vietovė šiuo metu yra skaip pagrindinė bent kelioms kitoms žemesnio lygio vietovėms ir negali būti ištrinta. Prašome atnaujinkite vietoves, kad atsieti šią vietovę ir tuomet bandykite iš naujo ištrinti. ', - - 'create' => array( + 'create' => [ 'error' => 'Vietovė nesukurta. Prašome bandykite dar kartą.', - 'success' => 'Vietovė sukurta.' - ), + 'success' => 'Vietovė sukurta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Vietovė neatnaujinta. Prašome bandykite dar kartą', - 'success' => 'Vietovė sėkmingai atnaujinta.' - ), + 'success' => 'Vietovė sėkmingai atnaujinta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šią vietovę?', 'error' => 'Nepavyko ištrinti vietovės. Prašome bandykite dar kartą.', - 'success' => 'Vietovė sėkmingai ištrinta.' - ) + 'success' => 'Vietovė sėkmingai ištrinta.', + ], -); +]; diff --git a/resources/lang/lt/admin/locations/table.php b/resources/lang/lt/admin/locations/table.php index ead7bc6f71..74528b7019 100644 --- a/resources/lang/lt/admin/locations/table.php +++ b/resources/lang/lt/admin/locations/table.php @@ -1,6 +1,6 @@ 'Apie vietas', 'about_locations' => 'Vietos naudojamos stebėti naudotojų, turto ir kitų objektų vietovės informaciją', 'assets_rtd' => 'Įranga', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Pagrindinė', 'currency' => 'Vietos valiuta', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/lt/admin/manufacturers/message.php b/resources/lang/lt/admin/manufacturers/message.php index f3d4432c84..16e51319a1 100644 --- a/resources/lang/lt/admin/manufacturers/message.php +++ b/resources/lang/lt/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Tokio gamintojo nėra.', 'assoc_users' => 'Šis gamintojas šiuo metu susietas su daugaiau nei vienu modeliu ir negali būti ištrintas. Prašome atnaujinkite savo modelius, kad nesisietų su šiuo gamintoju ir bandykite iš naujo. ', - 'create' => array( + 'create' => [ 'error' => 'Gamintojas nesukurtas, prašome bandykite dar kartą.', - 'success' => 'Gamintojas sėkmingai sukurtas.' - ), + 'success' => 'Gamintojas sėkmingai sukurtas.', + ], - 'update' => array( + 'update' => [ 'error' => 'Gamintojas neatnaujintas, prašome bandykite dar kartą', - 'success' => 'Gamintojas sėkmingai atnaujintas.' - ), + 'success' => 'Gamintojas sėkmingai atnaujintas.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Gamintojas nebuvo atkurtas, prašome bandyti dar kartą', - 'success' => 'Gamintojas buvo atkurtas sėkmingai.' - ), + 'success' => 'Gamintojas buvo atkurtas sėkmingai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šį gamintoją?', 'error' => 'Nepavyko ištrinti gamintojo. Prašome bandykite dar kartą.', - 'success' => 'Gamintojas sėkmingai ištrintas.' - ) + 'success' => 'Gamintojas sėkmingai ištrintas.', + ], -); +]; diff --git a/resources/lang/lt/admin/manufacturers/table.php b/resources/lang/lt/admin/manufacturers/table.php index 842badf06d..e2895de074 100644 --- a/resources/lang/lt/admin/manufacturers/table.php +++ b/resources/lang/lt/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Apie gamintojus', 'about_manufacturers_text' => 'Gamintojai yra įmonės, kurios kuria jūsų turtą. Čia galite išsaugoti svarbią palaikymo kontaktinę informaciją apie juos, kuri bus rodoma išsamiuose savo turinio puslapiuose.', 'asset_manufacturers' => 'Įrangos gamintojai', @@ -13,4 +13,4 @@ return array( 'update' => 'Atnaujinti gamintoją', 'url' => 'URL', -); +]; diff --git a/resources/lang/lt/admin/models/general.php b/resources/lang/lt/admin/models/general.php index a83a69214a..63b4fbff3c 100644 --- a/resources/lang/lt/admin/models/general.php +++ b/resources/lang/lt/admin/models/general.php @@ -1,6 +1,6 @@ 'Apie turto modelius', 'about_models_text' => 'Turto modeliai yra būdas grupuoti identišką turtą. "MBP 2013", "IPhone 6s" ir kt.', 'deleted' => 'Šis modelis ištrintas. Spauskite atkurti modelį čia.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Ketinate ištrinti :model_count turto modelius.', 'restore' => 'Atkurti modelį', 'requestable' => 'Naudotojai gali užklausi šį modelį', - 'show_mac_address' => 'Rodykite MAC adreso laukelį įrangoje šiam modeliui', + 'show_mac_address' => 'Rodykite MAC adreso laukelį įrangoje šiam modeliui', 'view_deleted' => 'Peržiūrėti ištrintus', 'view_models' => 'Peržiūrėti modelius', 'fieldset' => 'Laukų grupė', 'no_custom_field' => 'Nėra pritaikytų laukų', 'add_default_values' => 'Pridėti numatytąją reikšmę', -); +]; diff --git a/resources/lang/lt/admin/models/message.php b/resources/lang/lt/admin/models/message.php index ff7495b781..83d0acef73 100644 --- a/resources/lang/lt/admin/models/message.php +++ b/resources/lang/lt/admin/models/message.php @@ -1,42 +1,41 @@ 'Tokio modelio nėra.', 'assoc_users' => 'Šis modelis šiuo metu susietas su daugiau nei vienu įrangos vientu ir negali būti ištrintas. Prašome ištrinkite įrangą ir tuomet bandykite trinti iš naujo. ', - - 'create' => array( + 'create' => [ 'error' => 'Modelis nebuvo ištrintas, prašome bandykite iš naujo.', 'success' => 'Modelis sėkmingai sukurtas.', 'duplicate_set' => 'Įrangos modelis su šiuo pavadinimu, gamintoju ir modeliu numeriu jau yra.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modelis nebuvo atnaujintas, prašome bandykite iš naujo', - 'success' => 'Modelis sėkmingai atnaujintas.' - ), + 'success' => 'Modelis sėkmingai atnaujintas.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šios įrangos modelį?', 'error' => 'Nepavyko ištrinti modelio. Prašome bandykite dar kartą.', - 'success' => 'Modelis sėkmingai ištrintas.' - ), + 'success' => 'Modelis sėkmingai ištrintas.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modelis nebuvo atkurtas, prašome bandykite dar kartą', - 'success' => 'Modelis sėkmingai atkurtas.' - ), + 'success' => 'Modelis sėkmingai atkurtas.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nebuvo pakeista jokių laukų, todėl niekas nebuvo atnaujintas.', - 'success' => 'Modeliai atnaujinti.' - ), + 'success' => 'Modeliai atnaujinti.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nepasirinktas modelis, nėra ką ištrinti.', 'success' => ':success_count model(s) ištrinti!', - 'success_partial' => ':success_count model(s) buvo ištrinti, bet :fail_count negalima ištrinti todėl, kad turtas vis dar susietas.' - ), + 'success_partial' => ':success_count model(s) buvo ištrinti, bet :fail_count negalima ištrinti todėl, kad turtas vis dar susietas.', + ], -); +]; diff --git a/resources/lang/lt/admin/models/table.php b/resources/lang/lt/admin/models/table.php index d763d65423..d217cf94a3 100644 --- a/resources/lang/lt/admin/models/table.php +++ b/resources/lang/lt/admin/models/table.php @@ -1,6 +1,6 @@ 'Sukurti įrangos modelį', 'created_at' => 'Sukurta', @@ -14,4 +14,4 @@ return array( 'update' => 'Atnaujinti įrangos modelį', 'clone' => 'Kopijuoti modelį', 'edit' => 'Taisyti modelį', -); +]; diff --git a/resources/lang/lt/admin/reports/general.php b/resources/lang/lt/admin/reports/general.php index f955ad195d..21443f1753 100644 --- a/resources/lang/lt/admin/reports/general.php +++ b/resources/lang/lt/admin/reports/general.php @@ -1,5 +1,5 @@ 'Pasirinkite dalis, kurias norite matyti savo įrangos ataskaitoje.' -); +return [ + 'info' => 'Pasirinkite dalis, kurias norite matyti savo įrangos ataskaitoje.', +]; diff --git a/resources/lang/lt/admin/reports/message.php b/resources/lang/lt/admin/reports/message.php index bebb0e973d..717a3d3646 100644 --- a/resources/lang/lt/admin/reports/message.php +++ b/resources/lang/lt/admin/reports/message.php @@ -1,5 +1,5 @@ 'Jūs turite pasirinkti bent vieną parametrą.' -); +return [ + 'error' => 'Jūs turite pasirinkti bent vieną parametrą.', +]; diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php index 7eb9c1ac72..1bc39343b0 100644 --- a/resources/lang/lt/admin/settings/general.php +++ b/resources/lang/lt/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => '"Active Directory" domenas', 'ad_domain_help' => 'Tai kartais sutampa su jūsų el. Pašto domenu, bet ne visada.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC El. paštas', 'admin_cc_email_help' => 'Jeigu Jūs norite siųsti išduoto/neišduoto turto sąrašo kopiją, įveskite čia el. pašto adresą. Kitu atveju palikite laukelį tuščią.', 'is_ad' => 'Tai yra "Active Directory" serveris', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Galiojanti įspėjimų slenkstis (dienomis)', 'alert_inv_threshold' => 'Inventoriaus įspėjimo slenkstis', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Įrangos ID', 'audit_interval' => 'Audito intervalas', 'audit_interval_help' => 'Jei turite reguliariai fiziškai tikrinti savo turtą, įveskite intervalą per mėnesius.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Įveskite dviejų veiksnių kodą', 'two_factor_config_complete' => 'Pateikti kodeksą', 'two_factor_enabled_edit_not_allowed' => 'Jūsų administratorius neleidžia jums redaguoti šio nustatymo.', - 'two_factor_enrollment_text' => "Būtina atlikti du autentiškumo patvirtinimo veiksnius, tačiau jūsų įrenginys dar nebuvo užregistruotas. Atidarykite \"Google\" autentifikavimo priemonės programą ir nuskaitykite žemiau esantį QR kodą, kad užsiregistruotumėte savo įrenginį. Įrašę savo įrenginį įveskite žemiau esantį kodą", + 'two_factor_enrollment_text' => 'Būtina atlikti du autentiškumo patvirtinimo veiksnius, tačiau jūsų įrenginys dar nebuvo užregistruotas. Atidarykite "Google" autentifikavimo priemonės programą ir nuskaitykite žemiau esantį QR kodą, kad užsiregistruotumėte savo įrenginį. Įrašę savo įrenginį įveskite žemiau esantį kodą', 'require_accept_signature' => 'Reikalauti parašo', 'require_accept_signature_help_text' => 'Įjungus šią funkciją, naudotojams reikės fiziškai atsisakyti priimti turtą.', 'left' => 'kairėje', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Pažymėtas šis langelis reiškia unikalius serijinius kiekvienam turtui', 'zerofill_count' => 'Turto žymų ilgis, įskaitant "zerofill"', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/lt/admin/settings/message.php b/resources/lang/lt/admin/settings/message.php index 199af27f96..0b24df980e 100644 --- a/resources/lang/lt/admin/settings/message.php +++ b/resources/lang/lt/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Atnaujinant iškilo nenumatyta problema. ', - 'success' => 'Nustatymai sėkmingai atnaujinti.' - ), - 'backup' => array( + 'success' => 'Nustatymai sėkmingai atnaujinti.', + ], + 'backup' => [ 'delete_confirm' => 'Ar tikrai norite ištrinti atsarginę kopiją? Šis veiksmas negalimas. ', 'file_deleted' => 'Atsarginė kopija sėkmingai ištrinta. ', 'generated' => 'Atsarginė kopija sėkmingai sukurta.', 'file_not_found' => 'Atsarginė kopija nerasta.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Išvalant įvyko klaida.', 'validation_failed' => 'Jūsų valymo patvirtinimas yra neteisingas. Patvirtinimo laukelyje įrašykite žodį "DELETE".', - 'success' => 'Ištrinti įrašai sėkmingai išvalomi.' - ), + 'success' => 'Ištrinti įrašai sėkmingai išvalomi.', + ], -); +]; diff --git a/resources/lang/lt/admin/statuslabels/message.php b/resources/lang/lt/admin/statuslabels/message.php index 4dcf591ec5..2ba042f1a7 100644 --- a/resources/lang/lt/admin/statuslabels/message.php +++ b/resources/lang/lt/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Statuso žymė neegzistuoja.', 'assoc_assets' => 'Ši būsenos etiketė šiuo metu yra susijusi su bent vienu turtu ir negali būti ištrinta. Prašome atnaujinti savo turtą, kad nebebūtų nuorodos į šį statusą ir bandykite dar kartą.', - - 'create' => array( + 'create' => [ 'error' => 'Būsenos etiketė nebuvo sukurta, bandykite dar kartą.', - 'success' => 'Būsenos etiketė sėkmingai sukurta.' - ), + 'success' => 'Būsenos etiketė sėkmingai sukurta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Būsenos etiketė nebuvo atnaujinta, bandykite dar kartą', - 'success' => 'Būsenos etiketė sėkmingai atnaujinta.' - ), + 'success' => 'Būsenos etiketė sėkmingai atnaujinta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar tikrai norite ištrinti šią būsenos etiketę?', 'error' => 'Buvo ištaisyta būklės etiketė. Prašau, pabandykite dar kartą.', - 'success' => 'Statuso etiketė sėkmingai ištrinta.' - ), + 'success' => 'Statuso etiketė sėkmingai ištrinta.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Šis turtas niekam negali būti priskirtas.', 'deployable' => 'Šį turtą galima patikrinti. Kai jie bus priskirti, jie prisiims Darbuoto meta statusą.', 'archived' => 'Šio turto negalima patikrinti ir jis bus rodomas tik archyvuotame rodinyje. Tai naudinga, jei norite išsaugoti informaciją apie turtą, skirtą biudžetui / istoriniams tikslams, bet išlaikyti juos kasdieniame turto sąraše.', 'pending' => 'Šis turtas dar negali būti priskirtas visiems, dažnai naudojamas daiktams, kurie yra remontuojami, tačiau tikimasi, kad jie grįš į apyvartą.', - ), + ], -); +]; diff --git a/resources/lang/lt/admin/statuslabels/table.php b/resources/lang/lt/admin/statuslabels/table.php index bf0319c249..3c741fc90d 100644 --- a/resources/lang/lt/admin/statuslabels/table.php +++ b/resources/lang/lt/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Apie būklės korteles', 'archived' => 'Archyvuota', 'create' => 'Sukurti būlės kortelę', @@ -16,4 +16,4 @@ return array( 'title' => 'Būklės kortelės', 'undeployable' => 'Negalimas naudoti', 'update' => 'Atnaujinti būklės kortelę', -); +]; diff --git a/resources/lang/lt/admin/suppliers/message.php b/resources/lang/lt/admin/suppliers/message.php index 17db633f9e..4a66816460 100644 --- a/resources/lang/lt/admin/suppliers/message.php +++ b/resources/lang/lt/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Tokio tiekėjo nėra.', - - 'create' => array( + 'create' => [ 'error' => 'Tiekėjas nesukurtas. Prašome bandykite dar kartą.', - 'success' => 'Tiekėjas sėkmingai sukurtas.' - ), + 'success' => 'Tiekėjas sėkmingai sukurtas.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tiekėjas neatnaujintas. Prašome bandykite dar kartą', - 'success' => 'Tiekėjas sėkmingai atnaujintas.' - ), + 'success' => 'Tiekėjas sėkmingai atnaujintas.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ar jūs tikrai norite ištrinti šį tiekėją?', 'error' => 'Nepavyko ištrinti tiekėjo. Prašome bandykite dar kartą.', 'success' => 'Tiekėjas ištrintas sėkmingai.', 'assoc_assets' => 'Šis tiekėjas šiuo metu susietas su bent vienu modeliu ir negali būti ištrintas. Prašome atnaujinkite savo modelius, kad šie nebūtu susieti su šiuo tiekėju ir bandykite dar kartą. ', 'assoc_licenses' => 'Šis tiekėjas šiuo metu susietas su licenzija ir negali būti ištrinti. Prašome atnaujinkite savo modelius, kad šie nebūtų susieti su šiuo tiekėjų ir bandykite dar kartą. ', 'assoc_maintenances' => 'Šis tiekėjas šiuo metu susietas su bent vienu modeliu ir negali būti ištrintas. Prašome atnaujinkite savo modelius, kad šie nebūtu susieti su šiuo tiekėju ir bandykite dar kartą. ', - ) + ], -); +]; diff --git a/resources/lang/lt/admin/suppliers/table.php b/resources/lang/lt/admin/suppliers/table.php index 863a3958b8..c6bb39b080 100644 --- a/resources/lang/lt/admin/suppliers/table.php +++ b/resources/lang/lt/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Apie tiekėjus', 'about_suppliers_text' => 'Tiekėjai naudojami daiktų šaltiniui stebėti', 'address' => 'Tiekėjo adresas', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Peržiūrėti įrangą šiam', 'zip' => 'Pašto kodas', -); +]; diff --git a/resources/lang/lt/admin/users/general.php b/resources/lang/lt/admin/users/general.php index e4bdb2f33b..1f37a28422 100644 --- a/resources/lang/lt/admin/users/general.php +++ b/resources/lang/lt/admin/users/general.php @@ -1,7 +1,6 @@ 'Šis vartotojas gali prisijungti', 'activated_disabled_help_text' => 'Jūs negalite keisti savosios pąskyros aktyvacijos statuso.', 'assets_user' => 'Priskirta įranga :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Redaguoti naudotoją', 'filetype_info' => 'Leidžiami dokumentų formatai png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', 'history_user' => ':name naudotojo istorija', - 'info' => 'Informacija', + 'info' => 'Informacija', 'restore_user' => 'Spauskite čia norėdami juos atkurti.', 'last_login' => 'Paskutinis prisijungimas', 'ldap_config_text' => 'LDAP konfigūracijos parametrus galite rasti Administratorius> Nustatymai. Pasirinkta vieta (pasirinktinai) bus nustatyta visiems importuojamiems vartotojams.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Dabartiniai jūsų nustatymai leidžia pasirinkti dviejų veiksnių autentifikavimą.', 'two_factor_enrolled' => 'Įrašytas 2FA įrenginys', 'two_factor_active' => '2FA aktyvus', - ); + ]; diff --git a/resources/lang/lt/admin/users/message.php b/resources/lang/lt/admin/users/message.php index 82a7e5b415..4d51e4d923 100644 --- a/resources/lang/lt/admin/users/message.php +++ b/resources/lang/lt/admin/users/message.php @@ -1,6 +1,6 @@ 'Jūs sėkmingai priėmėte šią įrangą.', 'declined' => 'Jūs sėkmingai atšaukėte šią įrangą.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integracija nebuvo sukonfikuruota šiam diegimui.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Naudotojas sėkmingai sukurtas.', 'update' => 'Naudotojas sėkmingai atnaujintas.', 'update_bulk' => 'Vartotojai buvo sėkmingai atnaujinti!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Naudotojas sėkmingai atšaldytas.', 'restored' => 'Naudotojas sėkmingai atkurtas.', 'import' => 'Naudotojai sėkmingai įkelti.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Nepavyko sukurti naudotojo. Prašome bandykite dar kartą.', 'update' => 'Nepavyko atnaujinti naudotojo. Prašome bandykite dar kartą.', 'delete' => 'Nepavyko ištrinti naudotojo. Prašome bandykite dar kartą.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Negali rasti LDAP serverio. Prašome patikrinkite savo LDAP serverio konfigūraciją LDAP konfigūracijos faile.
Klaida iš LDAP Serverio:', 'ldap_could_not_get_entries' => 'Negali gauti prieigos prie LDAP serverio. Prašome patikrinkite savo LDAP serverio konfigūraciją LDAP konfigūracijos faile.
Klaida iš LDAP Serverio:', 'password_ldap' => 'Šios paskyros slaptažodį tvarko LDAP / Active Directory. Prašome susisiekti su savo IT departamentu, kad pakeistumėte slaptažodį.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Failas neištrintas. Prašome bandykite dar kartą.', 'success' => 'Failas sėkmingai ištrintas.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Failas (-ai) neįkelti. Prašome bandykite dar kartą.', 'success' => 'Failas (-ai) sėkmingai įkelti.', 'nofiles' => 'Įkėlimui jūs nepasirinkote jokių failų', 'invalidfiles' => 'Vienas ar keli failai yra per dideli arba neleidžiamas šis failų formatas. Primename, kad leidžiami sekantys formatai png, gif, jpg, doc, docx, pdf, txt.', - ), + ], -); +]; diff --git a/resources/lang/lt/admin/users/table.php b/resources/lang/lt/admin/users/table.php index 7e2688e087..1b8ef50bc9 100644 --- a/resources/lang/lt/admin/users/table.php +++ b/resources/lang/lt/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktyvus', 'allow' => 'Leisti', 'checkedout' => 'Įranga', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Rodyti esamus naudotojus', 'show_deleted' => 'Rodyti ištrintus naudotojus', 'title' => 'Antraštė', - 'to_restore_them' => 'juos atkurti.', + 'to_restore_them' => 'juos atkurti.', 'updateuser' => 'Atnaujinti naudotoją', 'username' => 'Vartotojo vardas', - 'user_deleted_text' => 'Šis naudotojas pažymėtas kaip ištrintas.', + 'user_deleted_text' => 'Šis naudotojas pažymėtas kaip ištrintas.', 'username_note' => '(Tai naudojamą tik aktyviam direktorijos binding ne prisijungimui.)', 'cloneuser' => 'Kopijuoti naudotoją', 'viewusers' => 'Peržiūrėti naudotojus', -); +]; diff --git a/resources/lang/lt/auth/general.php b/resources/lang/lt/auth/general.php index defd358212..9f09adee6d 100644 --- a/resources/lang/lt/auth/general.php +++ b/resources/lang/lt/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/lt/auth/message.php b/resources/lang/lt/auth/message.php index 3550b812fc..93f6a459e1 100644 --- a/resources/lang/lt/auth/message.php +++ b/resources/lang/lt/auth/message.php @@ -1,6 +1,6 @@ 'Paskyra su šiuo el. paštu jau yra sukurta.', 'account_not_found' => 'Naudotojo vardas arba slaptažodis neteisingas.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Šio vartojo paskyra užblokuota.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Iškilo problema bandant prisijungti, prašome bandykite dar kartą.', 'success' => 'Jūs sėkmingai prisijungėte.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Siekiant suskurti jūsų paskyrą iškilo problema. Prašome bandykite dar kartą.', 'success' => 'Paskyra sėkmingai sukurta.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Iškilo sunkumų siekiant gauti slaptažodžio atnaujinimo kodą. Prašome bandykite dar kartą.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Iškilo sunkumų siekiant pakeisti jūsų slaptažodį. Prašome bandykite dar kartą.', 'success' => 'Jūsų slaptaždis sėkmingai atnaujintas.', - ), + ], - -); +]; diff --git a/resources/lang/lt/button.php b/resources/lang/lt/button.php index 9da53b5f8c..cd660b6ffc 100644 --- a/resources/lang/lt/button.php +++ b/resources/lang/lt/button.php @@ -1,6 +1,6 @@ 'Veiksmai', 'add' => 'Pridėti naują', 'cancel' => 'Atšaukti', @@ -11,7 +11,7 @@ return array( 'request' => 'Užklausti', 'submit' => 'Išsaugoti', 'upload' => 'Įkelti', - 'select_file' => 'Pasirinkite failą ...', + 'select_file' => 'Pasirinkite failą ...', 'select_files' => 'Pasirinkite failą...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php index 8f988938f7..723936c684 100644 --- a/resources/lang/lt/general.php +++ b/resources/lang/lt/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Pridėti', 'user_requests_count' => 'Užklausos', 'city' => 'Miestas', - 'click_here' => 'Paspauskite čia', + 'click_here' => 'Paspauskite čia', 'clear_selection' => 'Išvalyti pasirinkimą', 'companies' => 'Kompanijos', 'company' => 'Kompanija', 'component' => 'Komponentas', 'components' => 'Komponentai', - 'complete' => 'Baigti', + 'complete' => 'Baigti', 'consumable' => 'Suvartojama įranga', 'consumables' => 'Suvartojama įranga', 'country' => 'Šalis', diff --git a/resources/lang/lt/help.php b/resources/lang/lt/help.php index 690130921a..46bb92d68f 100644 --- a/resources/lang/lt/help.php +++ b/resources/lang/lt/help.php @@ -1,6 +1,6 @@ "Detaliau", + 'more_info_title' => 'Detaliau', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/lt/mail.php b/resources/lang/lt/mail.php index 6d6d21dcde..cca2ea5778 100644 --- a/resources/lang/lt/mail.php +++ b/resources/lang/lt/mail.php @@ -1,6 +1,6 @@ 'Vartotojas svetainėje atšaukė elemento užklausą', 'a_user_requested' => 'Vartotojas paprašė elemento svetainėje', 'accessory_name' => 'Aksesuaro pavadinimas:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/lt/pagination.php b/resources/lang/lt/pagination.php index 69ee7c38fb..3da6d9424e 100644 --- a/resources/lang/lt/pagination.php +++ b/resources/lang/lt/pagination.php @@ -1,6 +1,6 @@ 'Kitas »', -); +]; diff --git a/resources/lang/lt/passwords.php b/resources/lang/lt/passwords.php index 5e5ad6e5b2..a9f37c8331 100644 --- a/resources/lang/lt/passwords.php +++ b/resources/lang/lt/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Nuoroda atkurti slaptažodį išsiųsta!', 'user' => 'Neaptikta vartotojo su šiuo elektroninio pašto adresu.', ]; - diff --git a/resources/lang/lt/reminders.php b/resources/lang/lt/reminders.php index cb7acd48e4..11652326e2 100644 --- a/resources/lang/lt/reminders.php +++ b/resources/lang/lt/reminders.php @@ -1,6 +1,6 @@ "Slaptažodžiai turi sutapti ir būti iš 6 simbolių.", + 'password' => 'Slaptažodžiai turi sutapti ir būti iš 6 simbolių.', - "user" => "Neteisingas naudotojas arba el. paštas", + 'user' => 'Neteisingas naudotojas arba el. paštas', - "token" => "Šis slaptažodžio atnaujinimas negaliojantis.", + 'token' => 'Šis slaptažodžio atnaujinimas negaliojantis.', - "sent" => "Jūsų slaptažodžio priminimas bus išsiųstas jei nurodytas el. pašto adresas yra sistemoje!", + 'sent' => 'Jūsų slaptažodžio priminimas bus išsiųstas jei nurodytas el. pašto adresas yra sistemoje!', -); +]; diff --git a/resources/lang/lt/table.php b/resources/lang/lt/table.php index dccf8ca6f7..e55753050e 100644 --- a/resources/lang/lt/table.php +++ b/resources/lang/lt/table.php @@ -1,10 +1,10 @@ 'Veiksmai', 'action' => 'Veiksmas', 'by' => 'Atlikti', 'item' => 'Įranga', -); +]; diff --git a/resources/lang/lt/validation.php b/resources/lang/lt/validation.php index f06df80533..1403408cd9 100644 --- a/resources/lang/lt/validation.php +++ b/resources/lang/lt/validation.php @@ -1,6 +1,6 @@ ':attribute jau užimtas.', 'uploaded' => 'Nepavyko įkelti atributo.', 'url' => ':attribute formatas neteisingas.', - "unique_undeleted" => ":attribute turi būti unikalus.", + 'unique_undeleted' => ':attribute turi būti unikalus.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Lauke: atributo lauke yra simbolis, kuris nėra leidžiamas.", - "email_array" => "Vienas ar keli el. Pašto adresai yra netinkami.", - "hashed_pass" => "Jūsų dabartinis slaptažodis yra neteisingas", + 'alpha_space' => 'Lauke: atributo lauke yra simbolis, kuris nėra leidžiamas.', + 'email_array' => 'Vienas ar keli el. Pašto adresai yra netinkami.', + 'hashed_pass' => 'Jūsų dabartinis slaptažodis yra neteisingas', 'dumbpwd' => 'Šis slaptažodis yra per dažnas.', - "statuslabel_type" => "Turite pasirinkti tinkamą statuso etiketės tipą", + 'statuslabel_type' => 'Turite pasirinkti tinkamą statuso etiketės tipą', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/lv/admin/accessories/general.php b/resources/lang/lv/admin/accessories/general.php index 3e31a24455..6ef2cd3c13 100644 --- a/resources/lang/lv/admin/accessories/general.php +++ b/resources/lang/lv/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Piederumu kategorija', 'accessory_name' => 'Piederuma nosaukums', 'checkout' => 'Izrakstīšanās Piederums', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Tā vietā izmantojiet pirmo noklusējuma EULA.', 'use_default_eula_disabled' => 'Izmantojiet galveno noklusējuma EULA. Netiek iestatīta galvenā noklusējuma EULA. Lūdzu, pievienojiet vienu pakalpojumā Iestatījumi.', -); +]; diff --git a/resources/lang/lv/admin/accessories/message.php b/resources/lang/lv/admin/accessories/message.php index 6d6995f3e0..73ebbf8ff2 100644 --- a/resources/lang/lv/admin/accessories/message.php +++ b/resources/lang/lv/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Pašlaik šim piederumam ir: lietotāju skaits tiek pārbaudīts. Lūdzu, pārbaudiet piederumus un mēģiniet vēlreiz.', - 'create' => array( + 'create' => [ 'error' => 'Piederums netika izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Piederums tika veiksmīgi izveidots.' - ), + 'success' => 'Piederums tika veiksmīgi izveidots.', + ], - 'update' => array( + 'update' => [ 'error' => 'Piederums netika atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Piederums tika veiksmīgi atjaunināts.' - ), + 'success' => 'Piederums tika veiksmīgi atjaunināts.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo piederumu?', 'error' => 'Radās problēma, noņemot piederumu. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Piederums tika veiksmīgi izdzēsts.' - ), + 'success' => 'Piederums tika veiksmīgi izdzēsts.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Piederums netika pārbaudīts, lūdzu, mēģiniet vēlreiz', 'success' => 'Piederums ir veiksmīgi izrakstīts.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ), + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Piederums netika atzīmēts, lūdzu, mēģiniet vēlreiz', 'success' => 'Piederumi ir pārbaudīti veiksmīgi.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ) + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - -); +]; diff --git a/resources/lang/lv/admin/accessories/table.php b/resources/lang/lv/admin/accessories/table.php index 2291b1c4cf..e9b9b684a7 100644 --- a/resources/lang/lv/admin/accessories/table.php +++ b/resources/lang/lv/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Lejupielādējiet CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Lejupielādējiet CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Pieņemšana', 'title' => 'Piederumu nosaukums', - -); +]; diff --git a/resources/lang/lv/admin/asset_maintenances/form.php b/resources/lang/lv/admin/asset_maintenances/form.php index dcfae943e8..7bb26ab272 100644 --- a/resources/lang/lv/admin/asset_maintenances/form.php +++ b/resources/lang/lv/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dienas', 'notes' => 'Piezīmes', 'update' => 'Atjaunināt', - 'create' => 'Izveidot' + 'create' => 'Izveidot', ]; diff --git a/resources/lang/lv/admin/asset_maintenances/message.php b/resources/lang/lv/admin/asset_maintenances/message.php index e5a46852c1..467ebb8ef9 100644 --- a/resources/lang/lv/admin/asset_maintenances/message.php +++ b/resources/lang/lv/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo līdzekļu uzturēšanu?', 'error' => 'Problēmu novēršanas jautājums tika dzēsts. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Aktīvu uzturēšana tika veiksmīgi dzēsta.' + 'success' => 'Aktīvu uzturēšana tika veiksmīgi dzēsta.', ], 'create' => [ 'error' => 'Aktīvu uzturēšana nav izveidota, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Aktīvu uzturēšana tika veiksmīgi izveidota.' + 'success' => 'Aktīvu uzturēšana tika veiksmīgi izveidota.', ], 'edit' => [ 'error' => 'Aktīvu uzturēšana nav rediģēta, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Aktīvu uzturēšana veiksmīgi mainīta.' + 'success' => 'Aktīvu uzturēšana veiksmīgi mainīta.', ], 'asset_maintenance_incomplete' => 'Vēl nav pabeigts', 'warranty' => 'Garantija', 'not_warranty' => 'Nav garantija', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/lv/admin/asset_maintenances/table.php b/resources/lang/lv/admin/asset_maintenances/table.php index 46bdcb9332..b4ff297ab0 100644 --- a/resources/lang/lv/admin/asset_maintenances/table.php +++ b/resources/lang/lv/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Aktīvu uzturēšana', 'asset_name' => 'Aktīva nosaukums', 'is_warranty' => 'Garantija', - 'dl_csv' => 'Lejupielādējiet CSV' + 'dl_csv' => 'Lejupielādējiet CSV', ]; diff --git a/resources/lang/lv/admin/categories/general.php b/resources/lang/lv/admin/categories/general.php index f923bec2e6..6ab5f0f6c3 100644 --- a/resources/lang/lv/admin/categories/general.php +++ b/resources/lang/lv/admin/categories/general.php @@ -1,6 +1,6 @@ 'Aktīvu kategorijas', 'category_name' => 'Kategorijas nosaukums', 'checkin_email' => 'Sūtiet e-pastu lietotājam kad tiek piešķirts / atgriezts aktīvs(i).', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Tā vietā izmantojiet pirmo noklusējuma EULA.', 'use_default_eula_disabled' => 'Izmantojiet galveno noklusējuma EULA. Netiek iestatīta galvenā noklusējuma EULA. Lūdzu, pievienojiet vienu pakalpojumā Iestatījumi.', -); +]; diff --git a/resources/lang/lv/admin/categories/message.php b/resources/lang/lv/admin/categories/message.php index 7493e5f5c4..a9350400cd 100644 --- a/resources/lang/lv/admin/categories/message.php +++ b/resources/lang/lv/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorija nav.', 'assoc_models' => 'Šobrīd šī kategorija ir saistīta ar vismaz vienu modeli, un to nevar izdzēst. Lūdzu, atjauniniet savus modeļus, lai vairs nerindrinātu šo kategoriju, un mēģiniet vēlreiz.', 'assoc_items' => 'Šobrīd šī kategorija ir saistīta ar vismaz vienu: asset_type un to nevar izdzēst. Lūdzu, atjauniniet savu: asset_type, lai vairs nenorādītu šo kategoriju, un mēģiniet vēlreiz.', - 'create' => array( + 'create' => [ 'error' => 'Kategorija nav izveidota, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Kategorija veiksmīgi izveidota.' - ), + 'success' => 'Kategorija veiksmīgi izveidota.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorija nav atjaunināta, lūdzu, mēģiniet vēlreiz', - 'success' => 'Kategorija ir veiksmīgi atjaunināta.' - ), + 'success' => 'Kategorija ir veiksmīgi atjaunināta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo kategoriju?', 'error' => 'Radās problēma, dzēšot kategoriju. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Kategorija tika veiksmīgi dzēsta.' - ) + 'success' => 'Kategorija tika veiksmīgi dzēsta.', + ], -); +]; diff --git a/resources/lang/lv/admin/categories/table.php b/resources/lang/lv/admin/categories/table.php index 6c521fd955..f057edb582 100644 --- a/resources/lang/lv/admin/categories/table.php +++ b/resources/lang/lv/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Vecāks', 'require_acceptance' => 'Pieņemšana', 'title' => 'Pamatlīdzekļu kategorijas nosaukums', -); +]; diff --git a/resources/lang/lv/admin/companies/general.php b/resources/lang/lv/admin/companies/general.php index d20b049859..a22d65872a 100644 --- a/resources/lang/lv/admin/companies/general.php +++ b/resources/lang/lv/admin/companies/general.php @@ -1,4 +1,5 @@ 'Izvēlieties uzņēmumu', ]; diff --git a/resources/lang/lv/admin/companies/message.php b/resources/lang/lv/admin/companies/message.php index b6950d7cf9..78707d5473 100644 --- a/resources/lang/lv/admin/companies/message.php +++ b/resources/lang/lv/admin/companies/message.php @@ -1,18 +1,19 @@ 'Kompānija neeksistē.', 'assoc_users' => 'Šobrīd šis uzņēmums ir saistīts ar vismaz vienu modeli, un to nevar izdzēst. Lūdzu, atjauniniet savus modeļus, lai vairs neuzrādītu šo uzņēmumu, un mēģiniet vēlreiz.', - 'create' => array( + 'create' => [ 'error' => 'Uzņēmums netika izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Uzņēmums veiksmīgi izveidots.' - ), - 'update' => array( + 'success' => 'Uzņēmums veiksmīgi izveidots.', + ], + 'update' => [ 'error' => 'Uzņēmums netika atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Uzņēmums ir veiksmīgi atjaunināts.' - ), - 'delete' => array( + 'success' => 'Uzņēmums ir veiksmīgi atjaunināts.', + ], + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties izdzēst šo uzņēmumu?', 'error' => 'Radās problēma, izlaižot uzņēmumu. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Uzņēmums tika veiksmīgi dzēsts.' - ) -); + 'success' => 'Uzņēmums tika veiksmīgi dzēsts.', + ], +]; diff --git a/resources/lang/lv/admin/companies/table.php b/resources/lang/lv/admin/companies/table.php index c5d586f3cb..a311cf1741 100644 --- a/resources/lang/lv/admin/companies/table.php +++ b/resources/lang/lv/admin/companies/table.php @@ -1,9 +1,10 @@ 'Kompānijas', 'create' => 'Izveidojiet uzņēmumu', 'title' => 'Uzņēmums', 'update' => 'Atjaunināt uzņēmumu', 'name' => 'Kompānijas nosaukums', 'id' => 'ID', -); +]; diff --git a/resources/lang/lv/admin/components/general.php b/resources/lang/lv/admin/components/general.php index ccc013d148..b72ac3134a 100644 --- a/resources/lang/lv/admin/components/general.php +++ b/resources/lang/lv/admin/components/general.php @@ -1,6 +1,6 @@ 'Sastāvdaļas nosaukums', 'checkin' => 'Reģistrēšanās sastāvdaļa', 'checkout' => 'Checkout komponentu', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Atlikušais', 'total' => 'Kopā', 'update' => 'Atjaunināt komponents', -); +]; diff --git a/resources/lang/lv/admin/components/message.php b/resources/lang/lv/admin/components/message.php index 89c12a2f55..abf5322a6f 100644 --- a/resources/lang/lv/admin/components/message.php +++ b/resources/lang/lv/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponents neeksistē.', - 'create' => array( + 'create' => [ 'error' => 'Komponents nav izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Komponents tika veiksmīgi izveidots.' - ), + 'success' => 'Komponents tika veiksmīgi izveidots.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponents nav atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Komponents ir veiksmīgi atjaunināts.' - ), + 'success' => 'Komponents ir veiksmīgi atjaunināts.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo komponentu?', 'error' => 'Radās problēma, izdzēšot komponentu. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Komponents tika veiksmīgi dzēsts.' - ), + 'success' => 'Komponents tika veiksmīgi dzēsts.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponents netika pārbaudīts, lūdzu, mēģiniet vēlreiz', 'success' => 'Komponents veiksmīgi pārbaudīts.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ), + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponents nav reģistrēts, lūdzu, mēģiniet vēlreiz', 'success' => 'Komponents ir veiksmīgi reģistrēts.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ) + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - -); +]; diff --git a/resources/lang/lv/admin/components/table.php b/resources/lang/lv/admin/components/table.php index c33c8e0498..fc342bd158 100644 --- a/resources/lang/lv/admin/components/table.php +++ b/resources/lang/lv/admin/components/table.php @@ -1,5 +1,5 @@ 'Sastāvdaļas nosaukums', -); +]; diff --git a/resources/lang/lv/admin/consumables/general.php b/resources/lang/lv/admin/consumables/general.php index 138e40cdf1..5a839b643d 100644 --- a/resources/lang/lv/admin/consumables/general.php +++ b/resources/lang/lv/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Izrakstīšanās, ko patērē lietotājs', 'consumable_name' => 'Paturējamais nosaukums', 'create' => 'Izveidot patērējamu', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Atlikušais', 'total' => 'Kopā', 'update' => 'Atjaunināt patērējamu', -); +]; diff --git a/resources/lang/lv/admin/consumables/message.php b/resources/lang/lv/admin/consumables/message.php index 9e0202739b..56413f85f1 100644 --- a/resources/lang/lv/admin/consumables/message.php +++ b/resources/lang/lv/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Patērējamais nav.', - 'create' => array( + 'create' => [ 'error' => 'Patērējamais nav izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Izlietojamie tika veiksmīgi izveidoti.' - ), + 'success' => 'Izlietojamie tika veiksmīgi izveidoti.', + ], - 'update' => array( + 'update' => [ 'error' => 'Patērējamais nav atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Izlietojamie tiek veiksmīgi atjaunināti.' - ), + 'success' => 'Izlietojamie tiek veiksmīgi atjaunināti.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties izdzēst šo patērējamo?', 'error' => 'Radās problēma, izdzēšot patērējamo. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Palīgmateriāls tika veiksmīgi dzēsts.' - ), + 'success' => 'Palīgmateriāls tika veiksmīgi dzēsts.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Neizdevās izņemt patēriņu, lūdzu, mēģiniet vēlreiz', 'success' => 'Izlietojamie izrakstīti veiksmīgi.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ), + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Paredzētais patēriņš netika reģistrēts, lūdzu, mēģiniet vēlreiz', 'success' => 'Izlietojamie tiek veiksmīgi reģistrēti.', - 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.' - ) + 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', + ], - -); +]; diff --git a/resources/lang/lv/admin/consumables/table.php b/resources/lang/lv/admin/consumables/table.php index 1f64bc2a15..e26d8c3a68 100644 --- a/resources/lang/lv/admin/consumables/table.php +++ b/resources/lang/lv/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Paturējamais nosaukums', -); +]; diff --git a/resources/lang/lv/admin/custom_fields/general.php b/resources/lang/lv/admin/custom_fields/general.php index b2d71c72c6..5c4f36a311 100644 --- a/resources/lang/lv/admin/custom_fields/general.php +++ b/resources/lang/lv/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Pielāgotie lauki', 'field' => 'Lauks', 'about_fieldsets_title' => 'Par lauka laukiem', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Jauna pielāgota lauks', 'value_encrypted' => 'Šī lauka vērtība ir šifrēta datu bāzē. Tikai admin lietotāji varēs apskatīt atšifrēto vērtību', 'show_in_email' => 'Vai iekļaut šī lauka vērtību lietotājiem nosūtītajos e-pasta paziņojumos? Šifrētie lauki nevar būt iekļauti e-pasta ziņojumos.', -); +]; diff --git a/resources/lang/lv/admin/custom_fields/message.php b/resources/lang/lv/admin/custom_fields/message.php index a1df5007f2..ee1411603c 100644 --- a/resources/lang/lv/admin/custom_fields/message.php +++ b/resources/lang/lv/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Šis lauks neeksistē.', 'already_added' => 'Lauks jau ir pievienots', - 'create' => array( + 'create' => [ 'error' => 'Lauks nav izveidots, lūdzu, mēģiniet vēlreiz.', 'success' => 'Lauks veiksmīgi izveidots.', - 'assoc_success' => 'Lauks veiksmīgi pievienots lauka laukam.' - ), + 'assoc_success' => 'Lauks veiksmīgi pievienots lauka laukam.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lauks nav atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Lauks ir veiksmīgi atjaunināts.' - ), + 'success' => 'Lauks ir veiksmīgi atjaunināts.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo lauku?', 'error' => 'Radās problēma, dzēšot lauku. Lūdzu mēģiniet vēlreiz.', 'success' => 'Lauks bija veiksmīgi dzēsts.', 'in_use' => 'Lauks joprojām tiek izmantots.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset nepastāv', - 'create' => array( + 'create' => [ 'error' => 'Fieldset nav izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Fieldset izveidota veiksmīgi.' - ), + 'success' => 'Fieldset izveidota veiksmīgi.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset nebija atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Fieldset tika veiksmīgi atjaunināta.' - ), + 'success' => 'Fieldset tika veiksmīgi atjaunināta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo lauka iestatījumu?', 'error' => 'Radās problēma, novēršot lauka iestatījumu. Lūdzu mēģiniet vēlreiz.', 'success' => 'Fieldset tika veiksmīgi dzēsts.', 'in_use' => 'Fieldset joprojām tiek izmantots.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/lv/admin/departments/message.php b/resources/lang/lv/admin/departments/message.php index 34525b7795..677eb65952 100644 --- a/resources/lang/lv/admin/departments/message.php +++ b/resources/lang/lv/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departaments nepastāv.', 'assoc_users' => 'Pašlaik šis departaments ir saistīts ar vismaz vienu lietotāju un to nevar izdzēst. Lūdzu, atjauniniet savus lietotājus, lai tie vairs netiktu izmantoti šajā nodaļā, un mēģiniet vēlreiz.', - 'create' => array( + 'create' => [ 'error' => 'Departaments nav izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Nodaļa veiksmīgi izveidota.' - ), - 'update' => array( + 'success' => 'Nodaļa veiksmīgi izveidota.', + ], + 'update' => [ 'error' => 'Departaments netika atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Nodaļa veiksmīgi atjaunota.' - ), - 'delete' => array( + 'success' => 'Nodaļa veiksmīgi atjaunota.', + ], + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo nodaļu?', 'error' => 'Radās problēma, izdzēšot nodaļu. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Departaments tika veiksmīgi dzēsts.' - ) + 'success' => 'Departaments tika veiksmīgi dzēsts.', + ], -); +]; diff --git a/resources/lang/lv/admin/departments/table.php b/resources/lang/lv/admin/departments/table.php index 39dde0adde..2086d1bbca 100644 --- a/resources/lang/lv/admin/departments/table.php +++ b/resources/lang/lv/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nodaļas nosaukums', @@ -8,4 +8,4 @@ return array( 'location' => 'Atrašanās vieta', 'create' => 'Izveidot departamentu', 'update' => 'Atjaunināt departamentu', - ); + ]; diff --git a/resources/lang/lv/admin/depreciations/general.php b/resources/lang/lv/admin/depreciations/general.php index 5a7672341c..81be6da6f6 100644 --- a/resources/lang/lv/admin/depreciations/general.php +++ b/resources/lang/lv/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Par Asset Depreciations', 'about_depreciations' => 'Jūs varat izveidot aktīvu nolietojumu, lai nolietotu aktīvus, pamatojoties uz lineāro nolietojumu.', 'asset_depreciations' => 'Aktīvu vērtības samazināšanās', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Mēnešu skaits', 'update' => 'Atjaunināt nolietojumu', -); +]; diff --git a/resources/lang/lv/admin/depreciations/message.php b/resources/lang/lv/admin/depreciations/message.php index 065631c1ed..be4f694993 100644 --- a/resources/lang/lv/admin/depreciations/message.php +++ b/resources/lang/lv/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Nolietojuma kategorija nepastāv.', 'assoc_users' => 'Šis nolietojums pašlaik ir saistīts ar vienu vai vairākiem modeļiem, un tos nevar izdzēst. Lūdzu, izdzēsiet modeļus un pēc tam mēģiniet dzēst vēlreiz.', - - 'create' => array( + 'create' => [ 'error' => 'Nolietojuma kategorija netika izveidota, lūdzu, mēģiniet vēlreiz. :(', - 'success' => 'Nolietojuma pakāpe ir veiksmīgi izveidota. :)' - ), + 'success' => 'Nolietojuma pakāpe ir veiksmīgi izveidota. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Nolietojuma kategorija netika atjaunināta, lūdzu, mēģiniet vēlreiz', - 'success' => 'Amortizācijas klase ir veiksmīgi atjaunināta.' - ), + 'success' => 'Amortizācijas klase ir veiksmīgi atjaunināta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo nolietojuma klasi?', 'error' => 'Izdevuma nolietojuma klases dzēšana. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Amortizācijas klase tika veiksmīgi dzēsta.' - ) + 'success' => 'Amortizācijas klase tika veiksmīgi dzēsta.', + ], -); +]; diff --git a/resources/lang/lv/admin/depreciations/table.php b/resources/lang/lv/admin/depreciations/table.php index 14b2fc81bb..81a4b39d39 100644 --- a/resources/lang/lv/admin/depreciations/table.php +++ b/resources/lang/lv/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Mēneši', 'term' => 'Termiņš', 'title' => 'Nosaukums', -); +]; diff --git a/resources/lang/lv/admin/groups/message.php b/resources/lang/lv/admin/groups/message.php index c49d274624..46282fa0a0 100644 --- a/resources/lang/lv/admin/groups/message.php +++ b/resources/lang/lv/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grupa jau pastāv!', 'group_not_found' => 'Grupa [: id] nepastāv.', 'group_name_required' => 'Nosaukuma lauks ir nepieciešams', - 'success' => array( + 'success' => [ 'create' => 'Grupa tika veiksmīgi izveidota.', 'update' => 'Grupa tika veiksmīgi atjaunināta.', 'delete' => 'Grupa tika veiksmīgi izdzēsta.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo grupu?', 'create' => 'Radās problēma, veidojot grupu. Lūdzu mēģiniet vēlreiz.', 'update' => 'Radās problēma, atjauninot grupu. Lūdzu mēģiniet vēlreiz.', 'delete' => 'Radās problēma, izdzēšot grupu. Lūdzu mēģiniet vēlreiz.', - ), + ], -); +]; diff --git a/resources/lang/lv/admin/groups/table.php b/resources/lang/lv/admin/groups/table.php index 7003479a4f..42456736d9 100644 --- a/resources/lang/lv/admin/groups/table.php +++ b/resources/lang/lv/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nosaukums', 'users' => 'Lietotāju skaits', -); +]; diff --git a/resources/lang/lv/admin/groups/titles.php b/resources/lang/lv/admin/groups/titles.php index 16594ee46f..f66d3e54b9 100644 --- a/resources/lang/lv/admin/groups/titles.php +++ b/resources/lang/lv/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Par grupām', 'about_groups' => 'Grupas tiek izmantotas, lai vispārinātu lietotāju atļaujas.', 'group_management' => 'Grupas vadība', @@ -11,4 +11,4 @@ return array( 'allow' => 'Atļaut', 'deny' => 'Liegties', -); +]; diff --git a/resources/lang/lv/admin/hardware/form.php b/resources/lang/lv/admin/hardware/form.php index 88e5661f92..2366015b9c 100644 --- a/resources/lang/lv/admin/hardware/form.php +++ b/resources/lang/lv/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Apstiprināt lielapjoma aktīvu dzēšanu', +return [ + 'bulk_delete' => 'Apstiprināt lielapjoma aktīvu dzēšanu', 'bulk_delete_help' => 'Pārskatīt aktīvu lielapjoma dzēšanu zemāk. Dzēstos aktīvus var atjaunot, bet tie vairs nebūs saistīti ar šībrīža lietotāju.', 'bulk_delete_warn' => 'Jūs gatavojaties dzēst: asset_count aktīvi.', - 'bulk_update' => 'Lielapjoma atjaunināšanas līdzekļi', - 'bulk_update_help' => 'Šī veidlapa ļauj vienlaikus atjaunināt vairākus aktīvus. Aizpildiet tikai nepieciešamos laukus. Jebkurš tukšs laukums paliek nemainīgs.', - 'bulk_update_warn' => 'Jūs gatavojaties rediģēt: asset_count īpašumus.', + 'bulk_update' => 'Lielapjoma atjaunināšanas līdzekļi', + 'bulk_update_help' => 'Šī veidlapa ļauj vienlaikus atjaunināt vairākus aktīvus. Aizpildiet tikai nepieciešamos laukus. Jebkurš tukšs laukums paliek nemainīgs.', + 'bulk_update_warn' => 'Jūs gatavojaties rediģēt: asset_count īpašumus.', 'checkedout_to' => 'Izrakstīts uz', 'checkout_date' => 'Izrakstīšanās datums', 'checkin_date' => 'Reģistrēšanās datums', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Aktīvu atjaunošana', 'warranty' => 'Garantija', - 'warranty_expires' => 'Garantija beidzās', + 'warranty_expires' => 'Garantija beidzās', 'years' => 'gadiem', -) -; +]; diff --git a/resources/lang/lv/admin/hardware/general.php b/resources/lang/lv/admin/hardware/general.php index 2688ccf0c2..460184019d 100644 --- a/resources/lang/lv/admin/hardware/general.php +++ b/resources/lang/lv/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Par aktīviem', 'about_assets_text' => 'Aktīvi ir posteņi, ko izseko pēc sērijas numura vai aktīvu taga. Viņi mēdz būt augstākas vērtības priekšmeti, kad ir svarīgi noteikt konkrētu objektu.', - 'archived' => 'Arhivēts', + 'archived' => 'Arhivēts', 'asset' => 'Aktīvs', 'bulk_checkout' => 'Lielapjoma izsniegšana', 'checkin' => 'Reģistrēšanās aktīvs', @@ -19,4 +19,4 @@ return array( 'pending' => 'Gaida', 'undeployable' => 'Nodarbināms', 'view' => 'Skatīt aktīvu', -); +]; diff --git a/resources/lang/lv/admin/hardware/message.php b/resources/lang/lv/admin/hardware/message.php index bbad7afae2..311693bc96 100644 --- a/resources/lang/lv/admin/hardware/message.php +++ b/resources/lang/lv/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Ievadīšana: Šis īpašums ir atzīmēts kā pašlaik nederīgs. Ja šis statuss ir mainījies, lūdzu, atjauniniet aktīvu statusu.', 'does_not_exist' => 'Aktīvs neeksistē.', 'does_not_exist_or_not_requestable' => 'Labs mēģinājums. Šis īpašums nepastāv vai nav pieprasāms.', 'assoc_users' => 'Šobrīd šis īpašums tiek pārbaudīts lietotājam un to nevar izdzēst. Vispirms pārbaudiet aktīvu, un pēc tam mēģiniet vēlreiz izdzēst.', - 'create' => array( + 'create' => [ 'error' => 'Īpašums netika izveidots, lūdzu, mēģiniet vēlreiz. :(', - 'success' => 'Īpašums veiksmīgi izveidots. :)' - ), + 'success' => 'Īpašums veiksmīgi izveidots. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Īpašums netika atjaunināts, lūdzu, mēģiniet vēlreiz', 'success' => 'Īpašums ir veiksmīgi atjaunināts.', 'nothing_updated' => 'Lauki nav atlasīti, tāpēc nekas netika atjaunināts.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Īpašums netika atjaunots, lūdzu, mēģiniet vēlreiz', - 'success' => 'Aktīvs veiksmīgi atjaunots.' - ), + 'success' => 'Aktīvs veiksmīgi atjaunots.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Aktīvu revīzija bija neveiksmīga. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Aktīvu audits ir veiksmīgi reģistrēts.' - ), + 'success' => 'Aktīvu audits ir veiksmīgi reģistrēts.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fails nav izdzēsts. Lūdzu mēģiniet vēlreiz.', 'success' => 'Fails veiksmīgi izdzēsts.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Faili nav augšupielādēti. Lūdzu mēģiniet vēlreiz.', 'success' => 'Faili (-i) ir veiksmīgi augšupielādēti.', 'nofiles' => 'Jūs neesat atlasījis augšupielādējamos failus, vai arī fails, kuru mēģināt augšupielādēt, ir pārāk liels', 'invalidfiles' => 'Viens vai vairāki jūsu faili ir pārāk lieli vai nav atļauto faila tipu. Atļautie failu tipi ir png, gif, jpg, doc, docx, pdf un txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Daži vienumi netika pareizi importēti.', 'errorDetail' => 'Tālāk minētie vienumi netika importēti kļūdu dēļ.', - 'success' => "Jūsu fails ir importēts", - 'file_delete_success' => "Jūsu fails ir veiksmīgi izdzēsts", - 'file_delete_error' => "Failu nevarēja dzēst", - ), + 'success' => 'Jūsu fails ir importēts', + 'file_delete_success' => 'Jūsu fails ir veiksmīgi izdzēsts', + 'file_delete_error' => 'Failu nevarēja dzēst', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo īpašumu?', 'error' => 'Radās problēma, noņemot aktīvu. Lūdzu mēģiniet vēlreiz.', 'nothing_updated' => 'Netika atlasīti neviens aktīvs, tāpēc nekas netika izdzēsts.', - 'success' => 'Aktīvs tika veiksmīgi dzēsts.' - ), + 'success' => 'Aktīvs tika veiksmīgi dzēsts.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Īpašums netika pārbaudīts, lūdzu, mēģiniet vēlreiz', 'success' => 'Aktīvs pārbaudīts veiksmīgi.', 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', 'not_available' => 'Šis īpašums nav pieejams izrakstīšanai!', - 'no_assets_selected' => 'Jums jāizvēlas vismaz vienu aparatūru' - ), + 'no_assets_selected' => 'Jums jāizvēlas vismaz vienu aparatūru', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Īpašums netika reģistrēts, lūdzu, mēģiniet vēlreiz', 'success' => 'Aktīvs ir pārbaudīts veiksmīgi.', 'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.', 'already_checked_in' => 'Šis aktīvs jau ir reģistrēts.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Īpašums netika pieprasīts, lūdzu, mēģiniet vēlreiz', 'success' => 'Īpašums pieprasīts veiksmīgi.', - 'canceled' => 'Norēķinu pieprasījums ir sekmīgi atcelts' - ) + 'canceled' => 'Norēķinu pieprasījums ir sekmīgi atcelts', + ], -); +]; diff --git a/resources/lang/lv/admin/hardware/table.php b/resources/lang/lv/admin/hardware/table.php index cec3339a30..f3968130fc 100644 --- a/resources/lang/lv/admin/hardware/table.php +++ b/resources/lang/lv/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Modelis', @@ -20,6 +20,6 @@ return array( 'title' => 'Aktīvs', 'image' => 'Ierīces attēls', 'days_without_acceptance' => 'Dienas bez pieņemšanas', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/lv/admin/kits/general.php b/resources/lang/lv/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/lv/admin/kits/general.php +++ b/resources/lang/lv/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/lv/admin/licenses/form.php b/resources/lang/lv/admin/licenses/form.php index 6964c78d9d..e1db73ce31 100644 --- a/resources/lang/lv/admin/licenses/form.php +++ b/resources/lang/lv/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Aktīvs', 'checkin' => 'Reģistrēties', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licencēta uz e-pastu', 'to_name' => 'Licencēta uz vārdu', 'update' => 'Atjaunināt licenci', - 'checkout_help' => 'Jums jāpārbauda licence aparatūras aktīvam vai personai. Jūs varat izvēlēties abus, bet īpašnieka īpašumam ir jāatbilst personai, kurai veicat īpašuma pārbaudi.' -); + 'checkout_help' => 'Jums jāpārbauda licence aparatūras aktīvam vai personai. Jūs varat izvēlēties abus, bet īpašnieka īpašumam ir jāatbilst personai, kurai veicat īpašuma pārbaudi.', +]; diff --git a/resources/lang/lv/admin/licenses/general.php b/resources/lang/lv/admin/licenses/general.php index d09ff39167..cd93fe08b0 100644 --- a/resources/lang/lv/admin/licenses/general.php +++ b/resources/lang/lv/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Par licencēm', 'about_licenses' => 'Licences izmanto, lai izsekotu programmatūru. Viņiem ir noteikts skaits sēdvietu, kurus var pārbaudīt personām', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Programmatūras licences', 'user' => 'Lietotājs', 'view' => 'Skatīt licenci', -); +]; diff --git a/resources/lang/lv/admin/licenses/message.php b/resources/lang/lv/admin/licenses/message.php index 20b0e8a3f2..81191545a1 100644 --- a/resources/lang/lv/admin/licenses/message.php +++ b/resources/lang/lv/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licence neeksistē.', 'user_does_not_exist' => 'Lietotājs neeksistē.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Jums jāizvēlas aktīvs vai lietotājs, bet ne abi.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licence netika izveidota, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Licence tika veiksmīgi izveidota.' - ), + 'success' => 'Licence tika veiksmīgi izveidota.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fails nav izdzēsts. Lūdzu mēģiniet vēlreiz.', 'success' => 'Fails veiksmīgi izdzēsts.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Faili nav augšupielādēti. Lūdzu mēģiniet vēlreiz.', 'success' => 'Faili (-i) ir veiksmīgi augšupielādēti.', 'nofiles' => 'Jūs neesat atlasījis augšupielādējamos failus, vai arī fails, kuru mēģināt augšupielādēt, ir pārāk liels', 'invalidfiles' => 'Viens vai vairāki jūsu faili ir pārāk lieli vai nav atļauto faila tipu. Atļautie failu tipi ir png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml un lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licence netika atjaunināta, lūdzu, mēģiniet vēlreiz', - 'success' => 'Licence tika veiksmīgi atjaunināta.' - ), + 'success' => 'Licence tika veiksmīgi atjaunināta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo licenci?', 'error' => 'Radās problēma, dzēšot licenci. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Licence tika veiksmīgi dzēsta.' - ), + 'success' => 'Licence tika veiksmīgi dzēsta.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Pārbaudot licenci, radās problēma. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Licence tika veiksmīgi pārbaudīta' - ), + 'success' => 'Licence tika veiksmīgi pārbaudīta', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Licencē tika pārbaudīta problēma. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Licence tika veiksmīgi reģistrēta' - ), + 'success' => 'Licence tika veiksmīgi reģistrēta', + ], -); +]; diff --git a/resources/lang/lv/admin/licenses/table.php b/resources/lang/lv/admin/licenses/table.php index ede0459079..8955af942a 100644 --- a/resources/lang/lv/admin/licenses/table.php +++ b/resources/lang/lv/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Piešķirts', 'checkout' => 'Iekšā ārā', @@ -14,4 +14,4 @@ return array( 'serial' => 'Sērijas numurs', 'title' => 'Licence', -); +]; diff --git a/resources/lang/lv/admin/locations/message.php b/resources/lang/lv/admin/locations/message.php index 50c3ebd526..60cf20a7ff 100644 --- a/resources/lang/lv/admin/locations/message.php +++ b/resources/lang/lv/admin/locations/message.php @@ -1,27 +1,26 @@ 'Atrašanās vietas neeksistē.', 'assoc_users' => 'Pašlaik šī atrašanās vieta ir saistīta ar vismaz vienu lietotāju un to nevar izdzēst. Lūdzu, atjauniniet savus lietotājus, lai vairs nerindrinātu šo atrašanās vietu, un mēģiniet vēlreiz.', 'assoc_assets' => 'Pašlaik šī atrašanās vieta ir saistīta ar vismaz vienu īpašumu un to nevar izdzēst. Lūdzu, atjauniniet savus aktīvus, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.', 'assoc_child_loc' => 'Pašlaik šī vieta ir vismaz viena bērna atrašanās vieta un to nevar izdzēst. Lūdzu, atjauniniet savas atrašanās vietas, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.', - - 'create' => array( + 'create' => [ 'error' => 'Atrašanās vieta nav izveidota, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Atrašanās vieta ir veiksmīgi izveidota.' - ), + 'success' => 'Atrašanās vieta ir veiksmīgi izveidota.', + ], - 'update' => array( + 'update' => [ 'error' => 'Atrašanās vieta nav atjaunināta, lūdzu, mēģiniet vēlreiz', - 'success' => 'Atrašanās vieta ir veiksmīgi atjaunināta.' - ), + 'success' => 'Atrašanās vieta ir veiksmīgi atjaunināta.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo atrašanās vietu?', 'error' => 'Radās problēma, dzēšot atrašanās vietu. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Atrašanās vieta tika veiksmīgi dzēsta.' - ) + 'success' => 'Atrašanās vieta tika veiksmīgi dzēsta.', + ], -); +]; diff --git a/resources/lang/lv/admin/locations/table.php b/resources/lang/lv/admin/locations/table.php index 99dfb89464..2f85723c8e 100644 --- a/resources/lang/lv/admin/locations/table.php +++ b/resources/lang/lv/admin/locations/table.php @@ -1,6 +1,6 @@ 'Par atrašanās vietu', 'about_locations' => 'Vietas tiek izmantotas, lai izsekotu atrašanās vietas informāciju lietotājiem, īpašumiem un citiem vienumiem', 'assets_rtd' => 'Aktīvi', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Vecāks', 'currency' => 'Atrašanās vietas valūta', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/lv/admin/manufacturers/message.php b/resources/lang/lv/admin/manufacturers/message.php index 33477efd09..08ba7d4845 100644 --- a/resources/lang/lv/admin/manufacturers/message.php +++ b/resources/lang/lv/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Ražotājs neeksistē.', 'assoc_users' => 'Šis ražotājs pašlaik ir saistīts ar vismaz vienu modeli, un to nevar izdzēst. Lūdzu, atjauniniet savus modeļus, lai vairs nerādītu šo ražotāju, un mēģiniet vēlreiz.', - 'create' => array( + 'create' => [ 'error' => 'Ražotājs netika izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Ražotājs veiksmīgi izveidots.' - ), + 'success' => 'Ražotājs veiksmīgi izveidots.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ražotājs netika atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Ražotājs tika veiksmīgi atjaunināts.' - ), + 'success' => 'Ražotājs tika veiksmīgi atjaunināts.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ražotāja dati nav atjaunoti, lūdzu mēģiniet vēlreiz', - 'success' => 'Ražotāja dati atjaunoti veiksmīgi.' - ), + 'success' => 'Ražotāja dati atjaunoti veiksmīgi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo ražotāju?', 'error' => 'Radās problēma, izdzēšot ražotāju. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Ražotājs tika veiksmīgi dzēsts.' - ) + 'success' => 'Ražotājs tika veiksmīgi dzēsts.', + ], -); +]; diff --git a/resources/lang/lv/admin/manufacturers/table.php b/resources/lang/lv/admin/manufacturers/table.php index 2c5d637a1b..bc6b83eac8 100644 --- a/resources/lang/lv/admin/manufacturers/table.php +++ b/resources/lang/lv/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Par ražotājiem', 'about_manufacturers_text' => 'Ražotāji ir uzņēmumi, kas veido jūsu aktīvus. Šeit varat saglabāt svarīgu atbalsta kontaktinformāciju par tiem, kas tiks parādīti jūsu detalizētās informācijas lapās.', 'asset_manufacturers' => 'Aktīvu ražotāji', @@ -13,4 +13,4 @@ return array( 'update' => 'Atjaunināt ražotāju', 'url' => 'URL', -); +]; diff --git a/resources/lang/lv/admin/models/general.php b/resources/lang/lv/admin/models/general.php index e43a9039bf..ced11fcd1a 100644 --- a/resources/lang/lv/admin/models/general.php +++ b/resources/lang/lv/admin/models/general.php @@ -1,6 +1,6 @@ 'Par īpašuma modeļiem', 'about_models_text' => 'Aktīvu modeļi ir veids, kā grupēt identiskus aktīvus. "MBP 2013", "IPhone 6s" uc', 'deleted' => 'Šis modelis ir dzēsts. Noklikšķiniet šeit, lai to atjaunotu.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Tiks dzēsti :model_count līdzekļu modeļi.', 'restore' => 'Atjaunot modeli', 'requestable' => 'Lietotāji var pieprasīt šo modeli', - 'show_mac_address' => 'Parādiet MAC adreses lauku šī modeļa aktīvos', + 'show_mac_address' => 'Parādiet MAC adreses lauku šī modeļa aktīvos', 'view_deleted' => 'Skatīt dzēsto', 'view_models' => 'Skatīt modeļus', 'fieldset' => 'Lauka laukums', 'no_custom_field' => 'Nav pielāgotu lauku', 'add_default_values' => 'Pievienot noklusējuma vērtības', -); +]; diff --git a/resources/lang/lv/admin/models/message.php b/resources/lang/lv/admin/models/message.php index 0b8092057e..f82ed9e15f 100644 --- a/resources/lang/lv/admin/models/message.php +++ b/resources/lang/lv/admin/models/message.php @@ -1,42 +1,41 @@ 'Modelis nepastāv.', 'assoc_users' => 'Šobrīd šis modelis ir saistīts ar vienu vai vairākiem aktīviem, un tos nevar izdzēst. Lūdzu, izdzēsiet aktīvus un pēc tam mēģiniet vēlreiz dzēst.', - - 'create' => array( + 'create' => [ 'error' => 'Modelis netika izveidots, lūdzu, mēģiniet vēlreiz.', 'success' => 'Modelis veiksmīgi izveidots.', 'duplicate_set' => 'Aktīvu modelis ar šo nosaukumu, ražotāju un modeļa numuru jau pastāv.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modelis nav atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Modelis tika veiksmīgi atjaunināts.' - ), + 'success' => 'Modelis tika veiksmīgi atjaunināts.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo aktīvu modeli?', 'error' => 'Radās problēma, izdzēšot modeli. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Modelis tika veiksmīgi dzēsts.' - ), + 'success' => 'Modelis tika veiksmīgi dzēsts.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modelis netika atjaunots, lūdzu, mēģiniet vēlreiz', - 'success' => 'Veiksmīgi atjaunots modelis.' - ), + 'success' => 'Veiksmīgi atjaunots modelis.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Neviens laukums netika mainīts, tāpēc nekas netika atjaunināts.', - 'success' => 'Modeļi ir atjaunināti.' - ), + 'success' => 'Modeļi ir atjaunināti.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nav atlasītu modeļu, tāpēc nekas netika izdzēsts.', 'success' => '{1} :success_count modelis dzēsts!|[2,*] :success_count modeļi dzēsti!', - 'success_partial' => ':success_count modeļi dzēsti, tomēr :fail_count nevarēja tik dzēsti, jo tiem ir piesaistītas aparatūras.' - ), + 'success_partial' => ':success_count modeļi dzēsti, tomēr :fail_count nevarēja tik dzēsti, jo tiem ir piesaistītas aparatūras.', + ], -); +]; diff --git a/resources/lang/lv/admin/models/table.php b/resources/lang/lv/admin/models/table.php index 84c9146a23..f0843c03fa 100644 --- a/resources/lang/lv/admin/models/table.php +++ b/resources/lang/lv/admin/models/table.php @@ -1,6 +1,6 @@ 'Izveidot aktīvu modeli', 'created_at' => 'Izveidots pie', @@ -14,4 +14,4 @@ return array( 'update' => 'Atjaunināt aktīvu modeli', 'clone' => 'Klona modelis', 'edit' => 'Rediģēt modeli', -); +]; diff --git a/resources/lang/lv/admin/reports/general.php b/resources/lang/lv/admin/reports/general.php index 03787fc0dd..78de9d5678 100644 --- a/resources/lang/lv/admin/reports/general.php +++ b/resources/lang/lv/admin/reports/general.php @@ -1,5 +1,5 @@ 'Atlasiet opcijas, kuras vēlaties izmantot savam aktīvu pārskatam.' -); +return [ + 'info' => 'Atlasiet opcijas, kuras vēlaties izmantot savam aktīvu pārskatam.', +]; diff --git a/resources/lang/lv/admin/reports/message.php b/resources/lang/lv/admin/reports/message.php index 49dfcc4244..287e78ffc3 100644 --- a/resources/lang/lv/admin/reports/message.php +++ b/resources/lang/lv/admin/reports/message.php @@ -1,5 +1,5 @@ 'Jums jāizvēlas vismaz ONE iespēja.' -); +return [ + 'error' => 'Jums jāizvēlas vismaz ONE iespēja.', +]; diff --git a/resources/lang/lv/admin/settings/general.php b/resources/lang/lv/admin/settings/general.php index 6fc62013c3..5e8c38e2fb 100644 --- a/resources/lang/lv/admin/settings/general.php +++ b/resources/lang/lv/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domēns', 'ad_domain_help' => 'Tas dažreiz ir tāds pats kā jūsu e-pasta domēnam, bet ne vienmēr.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'E-pasta kopija', 'admin_cc_email_help' => 'Šeit ievadiet epasta adresi, ja vēlaties saņemt kopiju epastiem par izsniegšanu / saņemšanu, kuras sūta lietotājiem. Atstājiet tukšu, ja nevēlaties kopijas.', 'is_ad' => 'Tas ir Active Directory serveris', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Pabeidzamo brīdinājumu slieksnis (dienās)', 'alert_inv_threshold' => 'Inventāra trauksmes slieksnis', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Aktīvu ID', 'audit_interval' => 'Audita intervāls', 'audit_interval_help' => 'Ja jums ir pienākums regulāri fiziski pārbaudīt savus aktīvus, ievadiet intervālu mēnešos.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ievadiet divu faktoru kodu', 'two_factor_config_complete' => 'Iesniegt kodu', 'two_factor_enabled_edit_not_allowed' => 'Jūsu administrators neatļauj mainīt šo iestatījumu.', - 'two_factor_enrollment_text' => "Nepieciešama divu faktoru autentifikācija, tomēr jūsu ierīce vēl nav reģistrēta. Atveriet savu lietotni Google autentifikators un skenējiet zemāk redzamo QR kodu, lai reģistrētu savu ierīci. Kad esat reģistrējies savā ierīcē, ievadiet zemāk redzamo kodu", + 'two_factor_enrollment_text' => 'Nepieciešama divu faktoru autentifikācija, tomēr jūsu ierīce vēl nav reģistrēta. Atveriet savu lietotni Google autentifikators un skenējiet zemāk redzamo QR kodu, lai reģistrētu savu ierīci. Kad esat reģistrējies savā ierīcē, ievadiet zemāk redzamo kodu', 'require_accept_signature' => 'Pieprasīt parakstu', 'require_accept_signature_help_text' => 'Iespējojot šo funkciju, lietotājiem būs jāpiesaista aktīva pieņemšana.', 'left' => 'pa kreisi', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Atzīmējot šo lodziņu, tas padarīs Aktīvu/inventāra sērijas nummurus unikālus', 'zerofill_count' => 'Aktīvu biržas garums, ieskaitot zerofill', 'username_format_help' => 'Importa process izmantos šo iestatījumu tikai ja lietotājvārds nebūs norādīts un mums to vajadzēs uzģenerēt priekš Tevis.', -); +]; diff --git a/resources/lang/lv/admin/settings/message.php b/resources/lang/lv/admin/settings/message.php index 9f831e75a0..3cbc8dfcb2 100644 --- a/resources/lang/lv/admin/settings/message.php +++ b/resources/lang/lv/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Atjaunināšanas laikā radās kļūda.', - 'success' => 'Iestatījumi tika veiksmīgi atjaunināti.' - ), - 'backup' => array( + 'success' => 'Iestatījumi tika veiksmīgi atjaunināti.', + ], + 'backup' => [ 'delete_confirm' => 'Vai tiešām vēlaties izdzēst šo dublējuma failu? Šo darbību nevar atsaukt.', 'file_deleted' => 'Dublējuma fails tika veiksmīgi izdzēsts.', 'generated' => 'Veiksmīgi izveidots jauns dublējuma fails.', 'file_not_found' => 'Šo dublējuma failu nevarēja atrast serverī.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Iztīrīšanas laikā radās kļūda.', 'validation_failed' => 'Jūsu tīrīšanas apstiprinājums nav pareizs. Lūdzu, ierakstiet apstiprinājuma lodziņā vārdu "DELETE".', - 'success' => 'Izdzēstie ieraksti veiksmīgi iztīrīti.' - ), + 'success' => 'Izdzēstie ieraksti veiksmīgi iztīrīti.', + ], -); +]; diff --git a/resources/lang/lv/admin/statuslabels/message.php b/resources/lang/lv/admin/statuslabels/message.php index 40c199d9c1..a64e6eb88c 100644 --- a/resources/lang/lv/admin/statuslabels/message.php +++ b/resources/lang/lv/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Statusa marķējums nepastāv.', 'assoc_assets' => 'Šī statusa marķējums pašlaik ir saistīts ar vismaz vienu īpašumu un to nevar izdzēst. Lūdzu, atjauniniet savus aktīvus, lai vairs nenozīmē šo statusu, un mēģiniet vēlreiz.', - - 'create' => array( + 'create' => [ 'error' => 'Statusa marķējums netika izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Statusa marķējums tika veiksmīgi izveidots.' - ), + 'success' => 'Statusa marķējums tika veiksmīgi izveidots.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statusa marķējums nav atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Statusa marķējums ir veiksmīgi atjaunināts.' - ), + 'success' => 'Statusa marķējums ir veiksmīgi atjaunināts.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo statusa etiķeti?', 'error' => 'Dzēšot statusa marķējumu, radās problēma. Lūdzu mēģiniet vēlreiz.', - 'success' => 'Statusa marķējums tika veiksmīgi dzēsts.' - ), + 'success' => 'Statusa marķējums tika veiksmīgi dzēsts.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Šos līdzekļus nevar nodot nevienam.', 'deployable' => 'Šos aktīvus var pārbaudīt. Kad tie ir piešķirti, viņi uzņemsies meta statusu detalizēti.', 'archived' => 'Šos līdzekļus nevar pārbaudīt, un tie tiks parādīti tikai arhivētajā skatā. Tas ir noderīgi, lai saglabātu informāciju par aktīviem budžetam / vēsturiskiem mērķiem, bet tos saglabātu ikdienas aktīvu sarakstā.', 'pending' => 'Šos aktīvus vēl nevar piešķirt ikvienam, bieži tos izmanto priekšmetos, kas paredzēti remontam, bet tiek sagaidīts, ka tie atgriezīsies apgrozībā.', - ), + ], -); +]; diff --git a/resources/lang/lv/admin/statuslabels/table.php b/resources/lang/lv/admin/statuslabels/table.php index 2b41c33f55..ef1eadff12 100644 --- a/resources/lang/lv/admin/statuslabels/table.php +++ b/resources/lang/lv/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Par statusa etiķetēm', 'archived' => 'Arhivēts', 'create' => 'Izveidot statusa marķējumu', @@ -16,4 +16,4 @@ return array( 'title' => 'Statusa etiķetes', 'undeployable' => 'Nodarbināms', 'update' => 'Atjaunināt statusa marķējumu', -); +]; diff --git a/resources/lang/lv/admin/suppliers/message.php b/resources/lang/lv/admin/suppliers/message.php index 90cb73f57d..d78a94ac67 100644 --- a/resources/lang/lv/admin/suppliers/message.php +++ b/resources/lang/lv/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Piegādātājs neeksistē.', - - 'create' => array( + 'create' => [ 'error' => 'Piegādātājs netika izveidots, lūdzu, mēģiniet vēlreiz.', - 'success' => 'Piegādātājs veiksmīgi izveidots.' - ), + 'success' => 'Piegādātājs veiksmīgi izveidots.', + ], - 'update' => array( + 'update' => [ 'error' => 'Piegādātājs netika atjaunināts, lūdzu, mēģiniet vēlreiz', - 'success' => 'Piegādātājs ir veiksmīgi atjaunināts' - ), + 'success' => 'Piegādātājs ir veiksmīgi atjaunināts', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Vai tiešām vēlaties dzēst šo piegādātāju?', 'error' => 'Radās problēma, izlaižot piegādātāju. Lūdzu mēģiniet vēlreiz.', 'success' => 'Piegādātājs tika veiksmīgi dzēsts.', 'assoc_assets' => 'Šis piegādātājs pašlaik ir saistīts ar :asset_count aktīvu(-iem), un to nevar dzēst. Lūdzu, atjauniniet savus aktīvus, lai tie vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', 'assoc_licenses' => 'Šis piegādātājs pašlaik ir saistīts ar :licenses_count licenci(-ēm), un to nevar dzēst. Lūdzu, atjauniniet savas licences, lai tās vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', 'assoc_maintenances' => 'Šis piegādātājs pašlaik ir saistīts ar :asset_maintenances_count aktīvu uzturēšanu(-ām), un to nevar dzēst. Lūdzu, atjauniniet savus aktīvu uzturēšanas datus, lai tie vairs neatsauktos uz šo piegādātāju, tad mēģiniet vēlreiz. ', - ) + ], -); +]; diff --git a/resources/lang/lv/admin/suppliers/table.php b/resources/lang/lv/admin/suppliers/table.php index f90bbac442..7f4212268e 100644 --- a/resources/lang/lv/admin/suppliers/table.php +++ b/resources/lang/lv/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Par Piegādātājiem', 'about_suppliers_text' => 'Piegādātāji tiek izmantoti preču avota izsekošanai', 'address' => 'Piegādātāja adrese', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Skatīt aktīvu par', 'zip' => 'Pasta indekss', -); +]; diff --git a/resources/lang/lv/admin/users/general.php b/resources/lang/lv/admin/users/general.php index 6fae5dc929..fd09103623 100644 --- a/resources/lang/lv/admin/users/general.php +++ b/resources/lang/lv/admin/users/general.php @@ -1,7 +1,6 @@ 'Lietotājs var pieslēgties sistēmai', 'activated_disabled_help_text' => 'Jūs nevarat rediģēt sava konta aktivizācijas statusu.', 'assets_user' => 'Aktīvi, kas piešķirti: nosaukums', @@ -13,7 +12,7 @@ return array( 'edit' => 'Rediģēt lietotāju', 'filetype_info' => 'Atļautie failu tipi ir png, gif, jpg, jpeg, doc, docx, pdf, txt, zip un rar.', 'history_user' => 'Vēsture: vārds', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Noklikšķiniet šeit, lai tos atjaunotu.', 'last_login' => 'Pēdējais pieteikšanās', 'ldap_config_text' => 'LDAP konfigurācijas iestatījumus var atrast Admin> Settings. Atlasītā atrašanās vieta (izvēles) tiks iestatīta visiem importētajiem lietotājiem.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Jūsu pašreizējie administrēšanas iestatījumi ļauj atlasīt divu faktoru autentifikāciju.', 'two_factor_enrolled' => 'Reģistrēta 2F ierīce', 'two_factor_active' => '2FA aktīvs', - ); + ]; diff --git a/resources/lang/lv/admin/users/message.php b/resources/lang/lv/admin/users/message.php index 2e77c4caf3..17183b7d2a 100644 --- a/resources/lang/lv/admin/users/message.php +++ b/resources/lang/lv/admin/users/message.php @@ -1,6 +1,6 @@ 'Jūs esat veiksmīgi pieņēmuši šo aktīvu.', 'declined' => 'Jūs esat veiksmīgi atteicies no šī īpašuma.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integrācija nav konfigurēta šai instalācijai.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Lietotājs tika veiksmīgi izveidots.', 'update' => 'Lietotājs tika veiksmīgi atjaunināts.', 'update_bulk' => 'Lietotāji tika veiksmīgi atjaunināti!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Lietotājs tika veiksmīgi atcelts.', 'restored' => 'Lietotājs tika veiksmīgi atjaunots.', 'import' => 'Lietotāji veiksmīgi importēti.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Radās problēma, izveidojot lietotāju. Lūdzu mēģiniet vēlreiz.', 'update' => 'Radās problēma, atjauninot lietotāju. Lūdzu mēģiniet vēlreiz.', 'delete' => 'Radās problēma, izdzēšot lietotāju. Lūdzu mēģiniet vēlreiz.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nevarēja meklēt LDAP serverī. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā.
Par LDAP servera kļūda:', 'ldap_could_not_get_entries' => 'Nevarēja iegūt ierakstus no LDAP servera. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā.
Par LDAP servera kļūda:', 'password_ldap' => 'Šī konta paroli pārvalda LDAP / Active Directory. Lai mainītu savu paroli, lūdzu, sazinieties ar IT nodaļu.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fails nav izdzēsts. Lūdzu mēģiniet vēlreiz.', 'success' => 'Fails veiksmīgi izdzēsts.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Faili nav augšupielādēti. Lūdzu mēģiniet vēlreiz.', 'success' => 'Faili (-i) ir veiksmīgi augšupielādēti.', 'nofiles' => 'Jūs neesat atlasījis augšupielādes failus', 'invalidfiles' => 'Viens vai vairāki jūsu faili ir pārāk lieli vai nav atļauto faila tipu. Atļautie failu tipi ir png, gif, jpg, doc, docx, pdf un txt.', - ), + ], -); +]; diff --git a/resources/lang/lv/admin/users/table.php b/resources/lang/lv/admin/users/table.php index 7fd6592f0d..b167fdc124 100644 --- a/resources/lang/lv/admin/users/table.php +++ b/resources/lang/lv/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktīvs', 'allow' => 'Atļaut', 'checkedout' => 'Aktīvi', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Rādīt pašreizējos lietotājus', 'show_deleted' => 'Rādīt izdzēstos lietotājus', 'title' => 'Nosaukums', - 'to_restore_them' => 'lai tos atjaunotu.', + 'to_restore_them' => 'lai tos atjaunotu.', 'updateuser' => 'Atjaunināt lietotāju', 'username' => 'Lietotājvārds', - 'user_deleted_text' => 'Šis lietotājs ir atzīmēts kā izdzēsts.', + 'user_deleted_text' => 'Šis lietotājs ir atzīmēts kā izdzēsts.', 'username_note' => '(To izmanto tikai Active Directory saistošai, nevis pieteikšanās.)', 'cloneuser' => 'Klons lietotājs', 'viewusers' => 'Skatīt lietotājus', -); +]; diff --git a/resources/lang/lv/auth/general.php b/resources/lang/lv/auth/general.php index f80e1043e9..796b0a6a71 100644 --- a/resources/lang/lv/auth/general.php +++ b/resources/lang/lv/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/lv/auth/message.php b/resources/lang/lv/auth/message.php index 6ed43f2cf3..37bf7f3f1d 100644 --- a/resources/lang/lv/auth/message.php +++ b/resources/lang/lv/auth/message.php @@ -1,6 +1,6 @@ 'Konts ar šo e-pasta adresi jau pastāv.', 'account_not_found' => 'Lietotājvārds vai parole nav pareiza.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Šis lietotāja konts ir aizliegts.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Mēģinot pieslēgties, radās problēma. Lūdzu, mēģiniet vēlreiz.', 'success' => 'Jūs esat veiksmīgi pieteicies', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Mēģinot izveidot kontu, radās problēma. Lūdzu, mēģiniet vēlreiz.', 'success' => 'Konts veiksmīgi izveidots.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Mēģinot atkopt paroles kodu, radās problēma. Lūdzu, mēģiniet vēlreiz.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Mēģinot atiestatīt paroli, radās problēma. Lūdzu, mēģiniet vēlreiz.', 'success' => 'Jūsu parole ir veiksmīgi atiestatīta.', - ), + ], - -); +]; diff --git a/resources/lang/lv/button.php b/resources/lang/lv/button.php index 25366eb0dc..9a52b91cf5 100644 --- a/resources/lang/lv/button.php +++ b/resources/lang/lv/button.php @@ -1,6 +1,6 @@ 'Darbības', 'add' => 'Pievieno jaunu', 'cancel' => 'Atcelt', @@ -11,7 +11,7 @@ return array( 'request' => 'Pieprasījums', 'submit' => 'Iesniegt', 'upload' => 'Augšupielādēt', - 'select_file' => 'Atlasiet failu ...', + 'select_file' => 'Atlasiet failu ...', 'select_files' => 'Atlasiet datnes...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php index 6eea2d013f..41c4e640d3 100644 --- a/resources/lang/lv/general.php +++ b/resources/lang/lv/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Atgrieztie aktīvi', 'user_requests_count' => 'Pieprasījumi', 'city' => 'Pilsēta', - 'click_here' => 'Noklikšķiniet šeit', + 'click_here' => 'Noklikšķiniet šeit', 'clear_selection' => 'Notīrīt izvēli', 'companies' => 'Kompānijas', 'company' => 'Uzņēmums', 'component' => 'Komponents', 'components' => 'Komponenti', - 'complete' => 'Pabeigt', + 'complete' => 'Pabeigt', 'consumable' => 'Izlietojams', 'consumables' => 'Izejmateriāli', 'country' => 'Valsts', diff --git a/resources/lang/lv/help.php b/resources/lang/lv/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/lv/help.php +++ b/resources/lang/lv/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/lv/mail.php b/resources/lang/lv/mail.php index 752ad43d41..52004a4165 100644 --- a/resources/lang/lv/mail.php +++ b/resources/lang/lv/mail.php @@ -1,6 +1,6 @@ 'Lietotājs vietnē ir atcēlis objekta pieprasījumu', 'a_user_requested' => 'Lietotājs ir pieprasījis vienumu vietnē', 'accessory_name' => 'Piederumu nosaukums:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/lv/pagination.php b/resources/lang/lv/pagination.php index 4b74707e33..754fa073dc 100644 --- a/resources/lang/lv/pagination.php +++ b/resources/lang/lv/pagination.php @@ -1,6 +1,6 @@ 'Nākamais »', -); +]; diff --git a/resources/lang/lv/passwords.php b/resources/lang/lv/passwords.php index 96eab9f593..6ecdf7c736 100644 --- a/resources/lang/lv/passwords.php +++ b/resources/lang/lv/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Jūsu paroles saite ir nosūtīta!', 'user' => 'Lietotājs ar tādu e-pasta adresi netika atrasts.', ]; - diff --git a/resources/lang/lv/reminders.php b/resources/lang/lv/reminders.php index 7141770dfc..51f1de5223 100644 --- a/resources/lang/lv/reminders.php +++ b/resources/lang/lv/reminders.php @@ -1,6 +1,6 @@ "Parolēm jābūt sešām rakstzīmēm un jāatbilst apstiprinājumam.", + 'password' => 'Parolēm jābūt sešām rakstzīmēm un jāatbilst apstiprinājumam.', - "user" => "Lietotājvārds vai e-pasta adrese ir nepareiza", + 'user' => 'Lietotājvārds vai e-pasta adrese ir nepareiza', - "token" => "Šis paroles atiestatīšanas marķieris nav derīgs.", + 'token' => 'Šis paroles atiestatīšanas marķieris nav derīgs.', - "sent" => "Ja tika atrasta atbilstoša e-pasta adrese, tika nosūtīts paroles atgādinājums!", + 'sent' => 'Ja tika atrasta atbilstoša e-pasta adrese, tika nosūtīts paroles atgādinājums!', -); +]; diff --git a/resources/lang/lv/table.php b/resources/lang/lv/table.php index 1e36198579..198c6c873f 100644 --- a/resources/lang/lv/table.php +++ b/resources/lang/lv/table.php @@ -1,10 +1,10 @@ 'Darbības', 'action' => 'Darbība', 'by' => 'Līdz', 'item' => 'Vienums', -); +]; diff --git a/resources/lang/lv/validation.php b/resources/lang/lv/validation.php index 7370737a3b..298aeb48bd 100644 --- a/resources/lang/lv/validation.php +++ b/resources/lang/lv/validation.php @@ -1,6 +1,6 @@ 'Atribūts jau ir pieņemts.', 'uploaded' => 'Atribūts neizdevās augšupielādēt.', 'url' => 'Atribūta formāts nav derīgs.', - "unique_undeleted" => ":attribute jābūt unikālam.", + 'unique_undeleted' => ':attribute jābūt unikālam.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Laukā: atribūta lauks ir rakstzīme, kas nav atļauta.", - "email_array" => "Viena vai vairākas e-pasta adreses nav derīgas.", - "hashed_pass" => "Jūsu pašreizējā parole nav pareiza", + 'alpha_space' => 'Laukā: atribūta lauks ir rakstzīme, kas nav atļauta.', + 'email_array' => 'Viena vai vairākas e-pasta adreses nav derīgas.', + 'hashed_pass' => 'Jūsu pašreizējā parole nav pareiza', 'dumbpwd' => 'Šī parole ir pārāk izplatīta.', - "statuslabel_type" => "Jums ir jāizvēlas derīgs statusa etiķetes veids", + 'statuslabel_type' => 'Jums ir jāizvēlas derīgs statusa etiķetes veids', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/mi/admin/accessories/general.php b/resources/lang/mi/admin/accessories/general.php index 523ea15e8e..99f3ee3353 100644 --- a/resources/lang/mi/admin/accessories/general.php +++ b/resources/lang/mi/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kāwai Accessory', 'accessory_name' => 'Ingoa Whakauru', 'checkout' => 'Whakaritea Whakairinga', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Whakamahia te taunoa 123_57__321primary taunoa EULA hei utu mo tenei.', 'use_default_eula_disabled' => 'Me te taunoa tuatahi o te EULA instead. Karekau he tautuhinga taunoa EULA. Tēnā tāpirihia tētahi i Ngā Tautuhinga.', -); +]; diff --git a/resources/lang/mi/admin/accessories/message.php b/resources/lang/mi/admin/accessories/message.php index 9ecd7416da..244df9ebd7 100644 --- a/resources/lang/mi/admin/accessories/message.php +++ b/resources/lang/mi/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Ko tenei taputapu i tenei wa: ko nga nama kua taatatia ki nga kaiwhakamahi. Titiro koa ki nga taputapu me te ngana ano.', - 'create' => array( + 'create' => [ 'error' => 'Kaore i hangaia te taputapu, ngana ano ngana.', - 'success' => 'I angitu te waihanga i te taputapu.' - ), + 'success' => 'I angitu te waihanga i te taputapu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahouhia te taputapu, tēnā whakamātau anō', - 'success' => 'Kua pai te whakahoutanga o te taputapu.' - ), + 'success' => 'Kua pai te whakahoutanga o te taputapu.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei taputapu?', 'error' => 'He raruraru kei te whakakore i te taputapu. Tena ngana ano.', - 'success' => 'Kua whakakorehia te taputapu.' - ), + 'success' => 'Kua whakakorehia te taputapu.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kaore ano kia uruhia te uru, ka ngana ano', 'success' => 'He pai te tirotiro i te Accessory.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ), + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kaore i te takiuruhia te Accessory, tēnā whakamātau anō', 'success' => 'Whakaratohia te Accessory i te angitu.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ) + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - -); +]; diff --git a/resources/lang/mi/admin/accessories/table.php b/resources/lang/mi/admin/accessories/table.php index 8962f9350d..595b418190 100644 --- a/resources/lang/mi/admin/accessories/table.php +++ b/resources/lang/mi/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Tikiake CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Tikiake CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Te whakaae', 'title' => 'Ingoa Whakauru', - -); +]; diff --git a/resources/lang/mi/admin/asset_maintenances/form.php b/resources/lang/mi/admin/asset_maintenances/form.php index 3ebd1d2e8f..2d95eb5096 100644 --- a/resources/lang/mi/admin/asset_maintenances/form.php +++ b/resources/lang/mi/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Nga ra', 'notes' => 'Tuhipoka', 'update' => 'Whakahou', - 'create' => 'Waihanga' + 'create' => 'Waihanga', ]; diff --git a/resources/lang/mi/admin/asset_maintenances/message.php b/resources/lang/mi/admin/asset_maintenances/message.php index 0f432deb5f..06a25f8254 100644 --- a/resources/lang/mi/admin/asset_maintenances/message.php +++ b/resources/lang/mi/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei mahinga taonga?', 'error' => 'He raru kei te whakakore i te tiaki o te rawa. Tena ngana ano.', - 'success' => 'Kua mukua te mahinga taonga.' + 'success' => 'Kua mukua te mahinga taonga.', ], 'create' => [ 'error' => 'Kaore i hangahia te Whakaaetanga Tahua, me ngana ano.', - 'success' => 'He pai te whakahaere i te tahua.' + 'success' => 'He pai te whakahaere i te tahua.', ], 'edit' => [ 'error' => 'Kaore i whakatikahia te Whakaaetanga Tahua, tēnā whakamātau anō.', - 'success' => 'He pai te whakatikatika i te Whakaaetanga Tahua.' + 'success' => 'He pai te whakatikatika i te Whakaaetanga Tahua.', ], 'asset_maintenance_incomplete' => 'Kāore i Whakaotihia', 'warranty' => 'Te tiwhikete', 'not_warranty' => 'Ehara i te Tiwhikete', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/mi/admin/asset_maintenances/table.php b/resources/lang/mi/admin/asset_maintenances/table.php index 1ae0248c12..3d756a00f2 100644 --- a/resources/lang/mi/admin/asset_maintenances/table.php +++ b/resources/lang/mi/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Te Whakahaere Ahua', 'asset_name' => 'Ingoa Ahua', 'is_warranty' => 'Te tiwhikete', - 'dl_csv' => 'Tikiake CSV' + 'dl_csv' => 'Tikiake CSV', ]; diff --git a/resources/lang/mi/admin/categories/general.php b/resources/lang/mi/admin/categories/general.php index 6781dfe308..ec9c9374c8 100644 --- a/resources/lang/mi/admin/categories/general.php +++ b/resources/lang/mi/admin/categories/general.php @@ -1,6 +1,6 @@ 'Ngā Kāwai Āhuatanga', 'category_name' => 'Ingoa Kāwai', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Whakamahia te taunoa 123_57__321primary taunoa EULA hei utu mo tenei.', 'use_default_eula_disabled' => 'Me te taunoa tuatahi o te EULA instead. Karekau he tautuhinga taunoa EULA. Tēnā tāpirihia tētahi i Ngā Tautuhinga.', -); +]; diff --git a/resources/lang/mi/admin/categories/message.php b/resources/lang/mi/admin/categories/message.php index c0f90c92df..a7efdc7f16 100644 --- a/resources/lang/mi/admin/categories/message.php +++ b/resources/lang/mi/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kāhore he kāwai.', 'assoc_models' => 'Kei te honohia tenei waahanga ki te tauira kotahi, kaore e taea te muku. Tena koa whakahou i o tauira kia kaua e tautuhi i tenei waahanga ka ngana ano.', 'assoc_items' => 'Ko tenei waahanga kei te hono tahi me te iti rawa: asset_type kaore e taea te muku. Tena koa whakahou i to: asset_type kia kaua e tohutohutia tenei waahanga ka ngana ano.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hangaia te kāwai, tēnā whakamātau anō.', - 'success' => 'Kua angitu te hanga o te hanga.' - ), + 'success' => 'Kua angitu te hanga o te hanga.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāhore i whakahoutia te kāwai, tēnā whakamātau anō', - 'success' => 'Kua pai te whakahoutanga o te momo.' - ), + 'success' => 'Kua pai te whakahoutanga o te momo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei kāwai?', 'error' => 'He raruraru kei te whakakore i te kāwai. Tena ngana ano.', - 'success' => 'Kua mukua te kāwai.' - ) + 'success' => 'Kua mukua te kāwai.', + ], -); +]; diff --git a/resources/lang/mi/admin/categories/table.php b/resources/lang/mi/admin/categories/table.php index e384e3a50f..d34f17f741 100644 --- a/resources/lang/mi/admin/categories/table.php +++ b/resources/lang/mi/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Matua', 'require_acceptance' => 'Te whakaae', 'title' => 'Ingoa Kāhua Āhuatanga', -); +]; diff --git a/resources/lang/mi/admin/companies/general.php b/resources/lang/mi/admin/companies/general.php index cfaaddd7c7..66db2c72a0 100644 --- a/resources/lang/mi/admin/companies/general.php +++ b/resources/lang/mi/admin/companies/general.php @@ -1,4 +1,5 @@ 'Tīpako Kamupene', ]; diff --git a/resources/lang/mi/admin/companies/message.php b/resources/lang/mi/admin/companies/message.php index a91d030dfb..47ef394f45 100644 --- a/resources/lang/mi/admin/companies/message.php +++ b/resources/lang/mi/admin/companies/message.php @@ -1,18 +1,19 @@ 'Kāore te Kamupene i te tīariari.', 'assoc_users' => 'Kei te hono tenei kamupene ki te tauira kotahi, kaore e taea te muku. Tena koa whakahou i o tauira kia kaua e tohutohutia tenei kamupene ka ngana ano.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hangaia te Kamupene, tēnā whakamātau anō.', - 'success' => 'I angitu te Kamupene.' - ), - 'update' => array( + 'success' => 'I angitu te Kamupene.', + ], + 'update' => [ 'error' => 'Kāore te Kamupene i whakahoutia, tēnā whakamātau anō', - 'success' => 'Kua angitu te Kamupene.' - ), - 'delete' => array( + 'success' => 'Kua angitu te Kamupene.', + ], + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei kamupene?', 'error' => 'He raru kei te whakakore i te kamupene. Tena ngana ano.', - 'success' => 'I mukua te Kamupene.' - ) -); + 'success' => 'I mukua te Kamupene.', + ], +]; diff --git a/resources/lang/mi/admin/companies/table.php b/resources/lang/mi/admin/companies/table.php index 495f84fde0..97730a38bb 100644 --- a/resources/lang/mi/admin/companies/table.php +++ b/resources/lang/mi/admin/companies/table.php @@ -1,9 +1,10 @@ 'Kamupene', 'create' => 'Waihanga Kamupene', 'title' => 'Kamupene', 'update' => 'Whakahou Kamupene', 'name' => 'Ingoa Kamupene', 'id' => 'ID', -); +]; diff --git a/resources/lang/mi/admin/components/general.php b/resources/lang/mi/admin/components/general.php index 7eb5aecf6c..29bb137d19 100644 --- a/resources/lang/mi/admin/components/general.php +++ b/resources/lang/mi/admin/components/general.php @@ -1,6 +1,6 @@ 'Ingoa Ingoa', 'checkin' => 'Tirohia te Mea', 'checkout' => 'Waehia te Waehere', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Te noho', 'total' => 'Te tapeke', 'update' => 'Whakahōuhia te Wae', -); +]; diff --git a/resources/lang/mi/admin/components/message.php b/resources/lang/mi/admin/components/message.php index f23dfab83d..ad246c7448 100644 --- a/resources/lang/mi/admin/components/message.php +++ b/resources/lang/mi/admin/components/message.php @@ -1,36 +1,35 @@ 'Kāore i te tīariari te wae.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hangahia te waehanga, tēnā whakamātau anō.', - 'success' => 'Kua pai te hanga o te wae.' - ), + 'success' => 'Kua pai te hanga o te wae.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i whakahoutia te wāhanga, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te mea.' - ), + 'success' => 'Kua whakahoutia te mea.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei waahanga?', 'error' => 'He raruraru kei te whakakore i te waahanga. Tena ngana ano.', - 'success' => 'I mukua te wāhanga.' - ), + 'success' => 'I mukua te wāhanga.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kāore i tutakina te wāhanga, tēnā whakamātau anō', 'success' => 'Kua tohua te Waeine.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ), + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kāore i whakauruhia te wāhanga, tēnā whakamātau anō', 'success' => 'Kua takitakihia te Waeine.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ) + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - -); +]; diff --git a/resources/lang/mi/admin/components/table.php b/resources/lang/mi/admin/components/table.php index 72f150476b..030d6fa402 100644 --- a/resources/lang/mi/admin/components/table.php +++ b/resources/lang/mi/admin/components/table.php @@ -1,5 +1,5 @@ 'Ingoa Ingoa', -); +]; diff --git a/resources/lang/mi/admin/consumables/general.php b/resources/lang/mi/admin/consumables/general.php index c1567d7b5d..5d13931205 100644 --- a/resources/lang/mi/admin/consumables/general.php +++ b/resources/lang/mi/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Waea Whakamahia ki te Kaiwhakamahi', 'consumable_name' => 'Ingoa Whakamahia', 'create' => 'Waihanga Whakamahia', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Te noho', 'total' => 'Te tapeke', 'update' => 'Whakahou Whakamahia', -); +]; diff --git a/resources/lang/mi/admin/consumables/message.php b/resources/lang/mi/admin/consumables/message.php index 621c0b12af..b146db6f48 100644 --- a/resources/lang/mi/admin/consumables/message.php +++ b/resources/lang/mi/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Kaore e taea te whakamahi.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i whakamahia te whakamahinga, tēnā whakamātau anō.', - 'success' => 'Ko te whakamahinga i hanga angitu.' - ), + 'success' => 'Ko te whakamahinga i hanga angitu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i whakamahia te whakamahinga, tēnā whakamātau anō', - 'success' => 'Ko te whakamahinga kua whakahoutia pai.' - ), + 'success' => 'Ko te whakamahinga kua whakahoutia pai.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei whakamahinga?', 'error' => 'He raru kei te whakakore i te kai. Tena ngana ano.', - 'success' => 'Kua mukua te kaihoko.' - ), + 'success' => 'Kua mukua te kaihoko.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kāore i whakamahia te whakamahinga, tēnā whakamātau anō', 'success' => 'He pai te tirotiro i te whakamahinga.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ), + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kāore i whakamahia te whakamahinga, tēnā whakamātau anō', 'success' => 'Kua tohua te whakamahinga i te pai.', - 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.' - ) + 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', + ], - -); +]; diff --git a/resources/lang/mi/admin/consumables/table.php b/resources/lang/mi/admin/consumables/table.php index 76f146d701..433a3bf722 100644 --- a/resources/lang/mi/admin/consumables/table.php +++ b/resources/lang/mi/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Ingoa Whakamahia', -); +]; diff --git a/resources/lang/mi/admin/custom_fields/general.php b/resources/lang/mi/admin/custom_fields/general.php index a83d3a5485..82fb19fe29 100644 --- a/resources/lang/mi/admin/custom_fields/general.php +++ b/resources/lang/mi/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Rawa Ritenga', 'field' => 'Āpure', 'about_fieldsets_title' => 'Mō Ngā Āpure', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Rawa Ritenga Hou', 'value_encrypted' => 'Ko te uara o tenei mara kei te whakamunatia i roto i te pātengi raraunga. Ka taea anake e nga kaiwhakahaere ka kite i te uara kua tohua', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/mi/admin/custom_fields/message.php b/resources/lang/mi/admin/custom_fields/message.php index f5039637da..2a2eb94654 100644 --- a/resources/lang/mi/admin/custom_fields/message.php +++ b/resources/lang/mi/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Kāore te mara i te tīariari.', 'already_added' => 'Kua tapirihia te mara', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hanga te mara, tēnā whakamātau anō.', 'success' => 'Kua angitu te hanganga o te mara.', - 'assoc_success' => 'Kua angitu te uru o te mara ki te raruraru.' - ), + 'assoc_success' => 'Kua angitu te uru o te mara ki te raruraru.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahou te mara, tēnā whakamātau anō', - 'success' => 'Kua oti te whakahoutanga o te mara.' - ), + 'success' => 'Kua oti te whakahoutanga o te mara.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei mara?', 'error' => 'He raru kei te whakakore i te mara. Tena ngana ano.', 'success' => 'Kua mukua te mara.', 'in_use' => 'Kei te whakamahia tonu te mara.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Kāore i te tīariari te āpure', - 'create' => array( + 'create' => [ 'error' => 'Kaore i hangahia te papawai, me ngana ano.', - 'success' => 'I hanga angitu a Fieldset.' - ), + 'success' => 'I hanga angitu a Fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahoutia a Fieldset, tēnā whakamātau anō', - 'success' => 'Kua pai te whakahōu o Fieldfield.' - ), + 'success' => 'Kua pai te whakahōu o Fieldfield.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe kia mukua tenei raruraru?', 'error' => 'He raru kei te whakakore i te raruraru. Tena ngana ano.', 'success' => 'Kua mukua te raruraru.', 'in_use' => 'Kei te whakamahia tonu a Fieldset.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/mi/admin/departments/message.php b/resources/lang/mi/admin/departments/message.php index 8047c18a21..6c34c73a88 100644 --- a/resources/lang/mi/admin/departments/message.php +++ b/resources/lang/mi/admin/departments/message.php @@ -1,21 +1,21 @@ 'Kāore te Tari i te tīariari.', 'assoc_users' => 'Kei te hono tonu tenei tari ki tetahi kaiwhakamahi kotahi, kaore e taea te muku. Whakaorangia nga kaiwhakamahi ki te kore e tuhi atu ki tenei tari ka ngana ano.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hanga te Tari, tēnā whakamātau anō.', - 'success' => 'He pai te mahi a te Tari.' - ), - 'update' => array( + 'success' => 'He pai te mahi a te Tari.', + ], + 'update' => [ 'error' => 'Kāore i te whakahouhia te Tari, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te Tari.' - ), - 'delete' => array( + 'success' => 'Kua whakahoutia te Tari.', + ], + 'delete' => [ 'confirm' => 'Kei te hiahia koe kia mukua tenei tari?', 'error' => 'He raru kei te whakakore i te tari. Tena ngana ano.', - 'success' => 'I mukua te tari.' - ) + 'success' => 'I mukua te tari.', + ], -); +]; diff --git a/resources/lang/mi/admin/departments/table.php b/resources/lang/mi/admin/departments/table.php index 41feba0928..469ecb2985 100644 --- a/resources/lang/mi/admin/departments/table.php +++ b/resources/lang/mi/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Ingoa Tari', @@ -8,4 +8,4 @@ return array( 'location' => 'Wāhi', 'create' => 'Waihanga Te Tari', 'update' => 'Whakahou i te Tari', - ); + ]; diff --git a/resources/lang/mi/admin/depreciations/general.php b/resources/lang/mi/admin/depreciations/general.php index cafc0521df..33cb4fa38a 100644 --- a/resources/lang/mi/admin/depreciations/general.php +++ b/resources/lang/mi/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Mō nga Tahaepaha Tahua', 'about_depreciations' => 'Ka taea e koe te whakarite i nga whakahekenga o te rawa ki te whakaiti i nga rawa i runga i te toenga o te raina tika.', 'asset_depreciations' => 'Tapahatanga Tahua', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Tau o Marama', 'update' => 'Whakahouhia te whakahekenga', -); +]; diff --git a/resources/lang/mi/admin/depreciations/message.php b/resources/lang/mi/admin/depreciations/message.php index 37d6932eb8..441c550dcd 100644 --- a/resources/lang/mi/admin/depreciations/message.php +++ b/resources/lang/mi/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Kaore e noho ana te akomanga o te kounga.', 'assoc_users' => 'Kei te honohia tenei toenga i tetahi tauira neke atu ranei kaore e taea te muku. Me mukua nga tauira, ka ngana ano kia mukua ano.', - - 'create' => array( + 'create' => [ 'error' => 'Kaore ano i tohua te akomanga o te utu, me ngana ano. :(', - 'success' => 'Kua angitu te waahanga o te tahua. :)' - ), + 'success' => 'Kua angitu te waahanga o te tahua. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Kaore i te whakahoutia te akomanga o te whakahekenga, me ngana ano', - 'success' => 'Kua angitu te whakahoutanga o te akomanga.' - ), + 'success' => 'Kua angitu te whakahoutanga o te akomanga.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei akomanga uara?', 'error' => 'I puta he take e whakakore ana i te akomanga whakahekenga. Tena ngana ano.', - 'success' => 'Kua mukua te akomanga ohaoha.' - ) + 'success' => 'Kua mukua te akomanga ohaoha.', + ], -); +]; diff --git a/resources/lang/mi/admin/depreciations/table.php b/resources/lang/mi/admin/depreciations/table.php index e781b661a0..d43766d76c 100644 --- a/resources/lang/mi/admin/depreciations/table.php +++ b/resources/lang/mi/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Marama', 'term' => 'Waea', 'title' => 'Ingoa', -); +]; diff --git a/resources/lang/mi/admin/groups/message.php b/resources/lang/mi/admin/groups/message.php index c2b4b288b5..09feaa1928 100644 --- a/resources/lang/mi/admin/groups/message.php +++ b/resources/lang/mi/admin/groups/message.php @@ -1,22 +1,22 @@ 'Kua oti te roopu!', 'group_not_found' => 'Kāore te rōpū [: id] i te tīariari.', 'group_name_required' => 'Kei te hiahiatia te mara ingoa', - 'success' => array( + 'success' => [ 'create' => 'He pai te waihanga o te roopu.', 'update' => 'Kua pai te whakahoutanga o te roopu.', 'delete' => 'Kua mukua te roopu.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei roopu?', 'create' => 'He raruraru kei te hanga i te rōpū. Tena ngana ano.', 'update' => 'He raruraru kei te whakahou i te rōpū. Tena ngana ano.', 'delete' => 'He raru kei te whakakore i te rōpū. Tena ngana ano.', - ), + ], -); +]; diff --git a/resources/lang/mi/admin/groups/table.php b/resources/lang/mi/admin/groups/table.php index f04bd1a362..b89249d64a 100644 --- a/resources/lang/mi/admin/groups/table.php +++ b/resources/lang/mi/admin/groups/table.php @@ -1,9 +1,9 @@ 'Tuhinga', 'name' => 'Ingoa', 'users' => '# o Kaiwhakamahi', -); +]; diff --git a/resources/lang/mi/admin/groups/titles.php b/resources/lang/mi/admin/groups/titles.php index 6d9ea6b8d2..6abfd3a8de 100644 --- a/resources/lang/mi/admin/groups/titles.php +++ b/resources/lang/mi/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Mō Ngā Rōpū', 'about_groups' => 'Ka whakamahia nga röpü ki te whakawhäiti i nga whakaaetanga kaiwhakamahi.', 'group_management' => 'Whakahaere Rōpū', @@ -11,4 +11,4 @@ return array( 'allow' => 'Tukua', 'deny' => 'Whakaae', -); +]; diff --git a/resources/lang/mi/admin/hardware/form.php b/resources/lang/mi/admin/hardware/form.php index fa580c3273..4b96c6ee0f 100644 --- a/resources/lang/mi/admin/hardware/form.php +++ b/resources/lang/mi/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Whakaaetia te Puku Whakamuri Taonga', +return [ + 'bulk_delete' => 'Whakaaetia te Puku Whakamuri Taonga', 'bulk_delete_help' => 'Arotakehia nga rawa mo te whakakore nui i raro. Kia mukua, ka taea te whakahoki mai i enei taonga, engari kaore i te hono atu ki nga kaiwhakamahi e tukuna ana ki a raatau.', 'bulk_delete_warn' => 'Kei te tata koe ki te muku: te hua moni rawa.', - 'bulk_update' => 'Kaupapa Whakatairanga Nui', - 'bulk_update_help' => 'Ko tenei puka ka taea e koe te whakahou i nga hua maha i te wa kotahi. Whakakiia nga mara e hiahia ana koe ki te huri. Ko nga mara katoa e mahue ana ka noho tonu.', - 'bulk_update_warn' => 'Kei te tata koe ki te whakatika i nga taonga o: rawa hua.', + 'bulk_update' => 'Kaupapa Whakatairanga Nui', + 'bulk_update_help' => 'Ko tenei puka ka taea e koe te whakahou i nga hua maha i te wa kotahi. Whakakiia nga mara e hiahia ana koe ki te huri. Ko nga mara katoa e mahue ana ka noho tonu.', + 'bulk_update_warn' => 'Kei te tata koe ki te whakatika i nga taonga o: rawa hua.', 'checkedout_to' => 'Kua aroahia ki te', 'checkout_date' => 'Rā Rārangi', 'checkin_date' => 'Rangi Titiro', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tae Taonga', 'update' => 'Te Whakahou Ahua', 'warranty' => 'Te tiwhikete', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'tau', -) -; +]; diff --git a/resources/lang/mi/admin/hardware/general.php b/resources/lang/mi/admin/hardware/general.php index 19fb0b8cdf..19ec3961da 100644 --- a/resources/lang/mi/admin/hardware/general.php +++ b/resources/lang/mi/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Mō Ngā Taonga', 'about_assets_text' => 'Ko nga taonga he taonga kua rapua e te tau rangatū, te tohu taonga ranei. He ahua nui ake o nga taonga kei te tautuhi i nga take e tika ana.', - 'archived' => 'Whakamahia', + 'archived' => 'Whakamahia', 'asset' => 'Tahua', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Tirohia te Ahua', @@ -19,4 +19,4 @@ return array( 'pending' => 'Kei te tatari', 'undeployable' => 'Kaore e taea', 'view' => 'Tirohia te Ahua', -); +]; diff --git a/resources/lang/mi/admin/hardware/message.php b/resources/lang/mi/admin/hardware/message.php index dad96cf98f..c446c59bcb 100644 --- a/resources/lang/mi/admin/hardware/message.php +++ b/resources/lang/mi/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Warning: Kua tohua tenei taonga i te mea kaore i te rongonui. Mena kua hurihia tenei mana, whakahouhia te mana o te taonga.', 'does_not_exist' => 'Kaore he tahua.', 'does_not_exist_or_not_requestable' => 'He tamata pai. Kaore e noho ana taua taonga, kaore hoki e taea te tuku.', 'assoc_users' => 'Kei te tirohia tenei taonga i tetahi kaiwhakamahi me te kore e taea te muku. Tirohia koa te taonga i te tuatahi, a ka ngana ki te muku ano.', - 'create' => array( + 'create' => [ 'error' => 'Kaore i hangaia te tahua, tēnā whakamātau anō. :(', - 'success' => 'Kua waihangatia te tahua. :)' - ), + 'success' => 'Kua waihangatia te tahua. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahouhia te tahua, tēnā whakamātau anō', 'success' => 'Kua whakahoutia te tahua.', 'nothing_updated' => 'Kaore i whiriwhiria he mahinga, na reira kaore i whakahoutia.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Kaore i whakahokia mai te tahua, tena koa ngana ano', - 'success' => 'Kua hokihia te tahua.' - ), + 'success' => 'Kua hokihia te tahua.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Kaore i te angitu te arotake o te tahua. Tena ngana ano.', - 'success' => 'Kua pai te takiuru o te kaute.' - ), + 'success' => 'Kua pai te takiuru o te kaute.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Kāore te kōnae i mukua. Tena ngana ano.', 'success' => 'Kua mukua te kōnae.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ko nga kōnae kāore i tukuna. Tena ngana ano.', 'success' => 'Ko te (ngā) kōnae i tukuna paihia.', 'nofiles' => 'Kaore i whiriwhiria e koe tetahi kōnae mo te tukuna, ko te kōnae e ngana ana koe ki te tuku he nui rawa', 'invalidfiles' => 'Kotahi, nui atu ranei o ou kōnae he nui rawa atu, he waaahi ranei e kore e whakaaetia. Ko nga kōnae e whakaaetia ana he png, gif, jpg, doc, docx, pdf, me te txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Kāore i tika te kawemai o etahi o nga mea.', 'errorDetail' => 'Ko nga mea e whai ake nei kihai i kawemai no te mea he hapa.', - 'success' => "I kawemai to kōnae", - 'file_delete_success' => "Kua mukua pai to kōnae", - 'file_delete_error' => "Kāore i taea te mukua te kōnae", - ), + 'success' => 'I kawemai to kōnae', + 'file_delete_success' => 'Kua mukua pai to kōnae', + 'file_delete_error' => 'Kāore i taea te mukua te kōnae', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei taonga?', 'error' => 'He raru kei te whakakore i te taonga. Tena ngana ano.', 'nothing_updated' => 'Kaore he rawa i tohua, na reira kaore i whakakorehia.', - 'success' => 'Kua mukua te taonga.' - ), + 'success' => 'Kua mukua te taonga.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kaore i teahia te taketake, me ngana ano', 'success' => 'Kua tohua te tahua.', 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', 'not_available' => 'Kaore i te wātea te taonga mo te takitaki!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kaore i whakauruhia te taketake, me ngana ano', 'success' => 'Kua tohua te tahua.', 'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.', 'already_checked_in' => 'Kua tohua taua taonga i roto i.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Kāore i te tono te tahua, tēnā whakamātau anō', 'success' => 'I tono angitu te tahua.', - 'canceled' => 'Kua whakakorea te manaakitia o te tono riihi' - ) + 'canceled' => 'Kua whakakorea te manaakitia o te tono riihi', + ], -); +]; diff --git a/resources/lang/mi/admin/hardware/table.php b/resources/lang/mi/admin/hardware/table.php index 52ca9967f1..c8586abb9a 100644 --- a/resources/lang/mi/admin/hardware/table.php +++ b/resources/lang/mi/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Tae Taonga', 'asset_model' => 'Tauira', @@ -20,6 +20,6 @@ return array( 'title' => 'Tahua', 'image' => 'Atahanga Pūrere', 'days_without_acceptance' => 'Nga Rahui Te Whakaae', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/mi/admin/kits/general.php b/resources/lang/mi/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/mi/admin/kits/general.php +++ b/resources/lang/mi/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/mi/admin/licenses/form.php b/resources/lang/mi/admin/licenses/form.php index ce326c2144..d5c6bea584 100644 --- a/resources/lang/mi/admin/licenses/form.php +++ b/resources/lang/mi/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Tahua', 'checkin' => 'Tirohia', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Kua raihanahia ki te Īmēra', 'to_name' => 'Kua whakaaetia kia Ingoa', 'update' => 'Whakahou Raihana', - 'checkout_help' => 'Me tirohia e koe he raihana ki tetahi taonga taputapu, ki tetahi tangata ranei. Ka taea e koe te whiriwhiri i nga mea e rua, engari ko te kaipupuri o te rawa ka rite ki te tangata e tirotirohia ana e koe te taonga.' -); + 'checkout_help' => 'Me tirohia e koe he raihana ki tetahi taonga taputapu, ki tetahi tangata ranei. Ka taea e koe te whiriwhiri i nga mea e rua, engari ko te kaipupuri o te rawa ka rite ki te tangata e tirotirohia ana e koe te taonga.', +]; diff --git a/resources/lang/mi/admin/licenses/general.php b/resources/lang/mi/admin/licenses/general.php index 92d4f3c2d8..d5989726f0 100644 --- a/resources/lang/mi/admin/licenses/general.php +++ b/resources/lang/mi/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Mō Ngā Raihana', 'about_licenses' => 'Ka whakamahia nga raihana ki te aroturuki i te rorohiko. Kei a raua he maha o nga nohoanga e taea ana te tirotiro ki nga takitahi', 'checkin' => 'Waitohu Tika Tono', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Raihana Pūmanawa', 'user' => 'Kaiwhakamahi', 'view' => 'Tirohia Raihana', -); +]; diff --git a/resources/lang/mi/admin/licenses/message.php b/resources/lang/mi/admin/licenses/message.php index 9812cfc222..108d7d835d 100644 --- a/resources/lang/mi/admin/licenses/message.php +++ b/resources/lang/mi/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Kaore he raihana.', 'user_does_not_exist' => 'Kāore te Kaiwhakamahi i te tīariari.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Me whiriwhiri koe i tetahi rawa, i tetahi kaiwhakamahi ranei, engari ehara i te mea e rua.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Kāore i raihana te waihanga, tēnā whakamātau anō.', - 'success' => 'I waihangahia te raihana.' - ), + 'success' => 'I waihangahia te raihana.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Kāore te kōnae i mukua. Tena ngana ano.', 'success' => 'Kua mukua te kōnae.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ko nga kōnae kāore i tukuna. Tena ngana ano.', 'success' => 'Ko te (ngā) kōnae i tukuna paihia.', 'nofiles' => 'Kaore i whiriwhiria e koe tetahi kōnae mo te tukuna, ko te kōnae e ngana ana koe ki te tuku he nui rawa', 'invalidfiles' => 'Kotahi, nui atu ranei o ou kōnae he nui rawa atu, he waaahi ranei e kore e whakaaetia. Ko nga kōnae e whakaaetia ana he png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, me te raihana.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahouhia te raihana, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te raihana.' - ), + 'success' => 'Kua whakahoutia te raihana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei raihana?', 'error' => 'He raruraru kei te whakakore i te raihana. Tena ngana ano.', - 'success' => 'Kua mukua te raihana.' - ), + 'success' => 'Kua mukua te raihana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'I puta he take hei tirotiro i te raihana. Tena ngana ano.', - 'success' => 'I tohua te raihana' - ), + 'success' => 'I tohua te raihana', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'I kitea he take e tirotirohia ana i roto i te raihana. Tena ngana ano.', - 'success' => 'I tohua te raihana i te angitu' - ), + 'success' => 'I tohua te raihana i te angitu', + ], -); +]; diff --git a/resources/lang/mi/admin/licenses/table.php b/resources/lang/mi/admin/licenses/table.php index 35171f7a93..e0690fa4d7 100644 --- a/resources/lang/mi/admin/licenses/table.php +++ b/resources/lang/mi/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Tohua Ki To', 'checkout' => 'In / Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Waea', 'title' => 'Raihana', -); +]; diff --git a/resources/lang/mi/admin/locations/message.php b/resources/lang/mi/admin/locations/message.php index f04c7db9b2..57baf20a3c 100644 --- a/resources/lang/mi/admin/locations/message.php +++ b/resources/lang/mi/admin/locations/message.php @@ -1,27 +1,26 @@ 'Kāore i te tīariari te wāhi.', 'assoc_users' => 'Kei te hono tenei taangata ki tetahi kaiwhakamahi kotahi, kaore e taea te muku. Whakaorangia nga kaiwhakamahi kia kaua e tautuhi i tenei tauranga ka ngana ano.', 'assoc_assets' => 'Kei te honohia tenei taapiri ki te iti rawa o te rawa me te kore e taea te muku. Whakaorangia nga taonga ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.', 'assoc_child_loc' => 'Kei tenei waahi te matua o te iti rawa o te mokopuna me te kore e taea te muku. Whakaorangia nga taangata ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.', - - 'create' => array( + 'create' => [ 'error' => 'Kāore i tuhia te wāhi, tēnā whakamātau anō.', - 'success' => 'He pai te hanganga o te wahi.' - ), + 'success' => 'He pai te hanganga o te wahi.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i whakahoutia te wāhi, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te tau.' - ), + 'success' => 'Kua whakahoutia te tau.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei tauwāhi?', 'error' => 'He raru kei te whakakore i te tauwāhi. Tena ngana ano.', - 'success' => 'I mukua te tauwāhi.' - ) + 'success' => 'I mukua te tauwāhi.', + ], -); +]; diff --git a/resources/lang/mi/admin/locations/table.php b/resources/lang/mi/admin/locations/table.php index f4192fdd22..936f538e9e 100644 --- a/resources/lang/mi/admin/locations/table.php +++ b/resources/lang/mi/admin/locations/table.php @@ -1,6 +1,6 @@ 'Mō Ngā Tauwāhi', 'about_locations' => 'Whakamahia ai nga waahi ki te aroturuki i nga korero tauwāhi mo nga kaiwhakamahi, nga rawa, me etahi atu mea', 'assets_rtd' => 'Ngā taonga', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Matua', 'currency' => 'Wāhi Moni', 'ldap_ou' => 'Rapua Rapu LDAP', - ); + ]; diff --git a/resources/lang/mi/admin/manufacturers/message.php b/resources/lang/mi/admin/manufacturers/message.php index cb6e56c109..ff31d14aed 100644 --- a/resources/lang/mi/admin/manufacturers/message.php +++ b/resources/lang/mi/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Kaore te kaihoko i te tīariari.', 'assoc_users' => 'Ko tenei kaiwhakanao e whai ana ki tetahi tauira kotahi, kaore e taea te muku. Whakaorangia nga tauira kia kore koe e tohu i tenei kaihanga me te ngana ano.', - 'create' => array( + 'create' => [ 'error' => 'Kāore i hangaia te kaihanga, tēnā whakamātau anō.', - 'success' => 'He pai te hanga a te kaihanga.' - ), + 'success' => 'He pai te hanga a te kaihanga.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kaore i te whakahoutia te kaihanga, na me ngana ano', - 'success' => 'Kua angitu te kaihanga.' - ), + 'success' => 'Kua angitu te kaihanga.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei kaiwhakanao?', 'error' => 'He raru kei te whakakore i te kaihanga. Tena ngana ano.', - 'success' => 'I mukua te Kaihanga.' - ) + 'success' => 'I mukua te Kaihanga.', + ], -); +]; diff --git a/resources/lang/mi/admin/manufacturers/table.php b/resources/lang/mi/admin/manufacturers/table.php index 9c47aa3288..1fa7adbee8 100644 --- a/resources/lang/mi/admin/manufacturers/table.php +++ b/resources/lang/mi/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Mo nga kaihanga', 'about_manufacturers_text' => 'Ko nga kaihanga ko nga kamupene kei te waihanga i o taonga. Ka taea e koe te rokiroki i nga korero whakapiri tautoko nui e pa ana ki a ratou i konei, e whakaatuhia ana ki o raatau tuhinga taipitopito.', 'asset_manufacturers' => 'Kaihanga Ahua', @@ -13,4 +13,4 @@ return array( 'update' => 'Whakahōu Kaihanga', 'url' => 'URL', -); +]; diff --git a/resources/lang/mi/admin/models/general.php b/resources/lang/mi/admin/models/general.php index ecb0255dba..2f8d673db1 100644 --- a/resources/lang/mi/admin/models/general.php +++ b/resources/lang/mi/admin/models/general.php @@ -1,6 +1,6 @@ 'Mō nga tauira Ahua', 'about_models_text' => 'Ko nga Momo Ahuatanga he huarahi ki te whakariterite i nga rawa taatai. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'Kua mukua tenei tauira. Kua tuhia ki konei hei whakaora i te reira.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Whakahoki Tauira', 'requestable' => 'Ka taea e nga kaiwhakamahi te tono i tenei tauira', - 'show_mac_address' => 'Whakaatuhia te maraataka MAC mo nga taonga i tenei tauira', + 'show_mac_address' => 'Whakaatuhia te maraataka MAC mo nga taonga i tenei tauira', 'view_deleted' => 'Tiro Kua Mukua', 'view_models' => 'Tirohia nga tauira', 'fieldset' => 'Whakaputu', 'no_custom_field' => 'Karekau he mara ritenga', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/mi/admin/models/message.php b/resources/lang/mi/admin/models/message.php index 1e372cf64b..6a5151019f 100644 --- a/resources/lang/mi/admin/models/message.php +++ b/resources/lang/mi/admin/models/message.php @@ -1,42 +1,41 @@ 'Kāore te tauira i te tīariari.', 'assoc_users' => 'Kei te hono tenei tauira ki te kotahi, neke atu ranei nga rawa, kaore e taea te muku. Nganahia nga rawa, ka ngana ki te muku ano.', - - 'create' => array( + 'create' => [ 'error' => 'Kāore i hangaia te tauira, tēnā whakamātau anō.', 'success' => 'I waihangahia te tauira i pai.', 'duplicate_set' => 'Ko te tauira o te taonga me te ingoa, te kaiwhakanao me te tau tauira kei te noho tonu.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahouhia te tauira, na me ngana ano', - 'success' => 'He pai te whakahoutanga o te tauira.' - ), + 'success' => 'He pai te whakahoutanga o te tauira.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei tauira taonga?', 'error' => 'I puta he take e whakakore ana i te tauira. Tena ngana ano.', - 'success' => 'Kua mukua te tauira.' - ), + 'success' => 'Kua mukua te tauira.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Kaore ano kia whakahokia mai te tauira, na me ngana ano', - 'success' => 'He tauira kua whakahokia mai.' - ), + 'success' => 'He tauira kua whakahokia mai.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Kaore i whakarereke nga mara, naore i whakahoutia.', - 'success' => 'Kua whakahoutia nga tauira.' - ), + 'success' => 'Kua whakahoutia nga tauira.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/mi/admin/models/table.php b/resources/lang/mi/admin/models/table.php index 65b0327ac4..80b3fb2f0e 100644 --- a/resources/lang/mi/admin/models/table.php +++ b/resources/lang/mi/admin/models/table.php @@ -1,6 +1,6 @@ 'Waihanga Tae Ahua', 'created_at' => 'I hangaia i', @@ -14,4 +14,4 @@ return array( 'update' => 'Whakahouhia te tauira Ahua', 'clone' => 'He tauira tauira', 'edit' => 'Whakatikahia te tauira', -); +]; diff --git a/resources/lang/mi/admin/reports/general.php b/resources/lang/mi/admin/reports/general.php index 1cd625ee36..a242c51478 100644 --- a/resources/lang/mi/admin/reports/general.php +++ b/resources/lang/mi/admin/reports/general.php @@ -1,5 +1,5 @@ 'Tīpakohia nga kōwhiringa e hiahia ana koe mo tō pūrongo hua.' -); +return [ + 'info' => 'Tīpakohia nga kōwhiringa e hiahia ana koe mo tō pūrongo hua.', +]; diff --git a/resources/lang/mi/admin/reports/message.php b/resources/lang/mi/admin/reports/message.php index e60d2fce82..e1b30963fd 100644 --- a/resources/lang/mi/admin/reports/message.php +++ b/resources/lang/mi/admin/reports/message.php @@ -1,5 +1,5 @@ 'Me whiriwhiri e koe i te iti rawa kia KOTAHI awhina.' -); +return [ + 'error' => 'Me whiriwhiri e koe i te iti rawa kia KOTAHI awhina.', +]; diff --git a/resources/lang/mi/admin/settings/general.php b/resources/lang/mi/admin/settings/general.php index 785f841f04..b3094a4f29 100644 --- a/resources/lang/mi/admin/settings/general.php +++ b/resources/lang/mi/admin/settings/general.php @@ -1,12 +1,12 @@ 'Whaiaronga Active', 'ad_domain' => 'Rohe Whaiaronga Active', 'ad_domain_help' => 'He waahi tenei i te wa i to rohe rohe īmēra, engari ehara i nga wa katoa.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'He raupapa Active Directory tēnei', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Nga Mahinga Whakamutunga Nga Tae (i nga ra)', 'alert_inv_threshold' => 'Waehere Awhearanga Inventory', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Ngā ID tahua', 'audit_interval' => 'Whirihoranga Arotake', 'audit_interval_help' => 'Mena ka hiahia koe ki te tirotiro i nga rawa o taau, ka uru ki roto i nga marama.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Tāuruhia te Waehere Tuarua-Wae', 'two_factor_config_complete' => 'Tukuna Waehere', 'two_factor_enabled_edit_not_allowed' => 'Kaore to kaiwhakahaere e tuku ki a koe kia whakatika i tenei tautuhinga.', - 'two_factor_enrollment_text' => "E rua nga tohu motuhake e hiahiatia ana, ahakoa kuaore i whakauruhia to whakaaro. Whakatūwherahia tō taupānga Authenticator Google me te matawai i te waehere QR i raro nei hei whakauru i tō pūrere. I te wa i whakauruhia e koe to whakaaro, uruhia te waehere i raro nei", + 'two_factor_enrollment_text' => 'E rua nga tohu motuhake e hiahiatia ana, ahakoa kuaore i whakauruhia to whakaaro. Whakatūwherahia tō taupānga Authenticator Google me te matawai i te waehere QR i raro nei hei whakauru i tō pūrere. I te wa i whakauruhia e koe to whakaaro, uruhia te waehere i raro nei', 'require_accept_signature' => 'Me tono Waitohu', 'require_accept_signature_help_text' => 'Ma te whakahoahoa i tenei ahua ka hiahia nga kaiwhakamahi ki te waitohu i te waahi ki te whakaae i tetahi taonga.', 'left' => 'maui', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Te roa o nga taputapu hua, tae atu ki te korerehu', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/mi/admin/settings/message.php b/resources/lang/mi/admin/settings/message.php index 95bb1cc8ba..066a33bdbd 100644 --- a/resources/lang/mi/admin/settings/message.php +++ b/resources/lang/mi/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'I puta he hapa i te whakahou.', - 'success' => 'Kua whakahoutia nga tautuhinga.' - ), - 'backup' => array( + 'success' => 'Kua whakahoutia nga tautuhinga.', + ], + 'backup' => [ 'delete_confirm' => 'Kei te hiahia koe ki te muku i tenei kōnae taapiri? Kaore e taea te whakakore tenei mahi.', 'file_deleted' => 'Kua mukua te kōnae taapiri.', 'generated' => 'He pai te waihanga i tetahi kōnae taapiri hou.', 'file_not_found' => 'Kāore i kitea te kōnae taapiri i runga i te tūmau.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Kua puta he hapa i te wa e purea ana.', 'validation_failed' => 'He hē te whakauru o te purge. Tena koa tuhia te kupu "MOTORI" i roto i te pouaka whakauru.', - 'success' => 'I horoia nga tuhinga kua mukua.' - ), + 'success' => 'I horoia nga tuhinga kua mukua.', + ], -); +]; diff --git a/resources/lang/mi/admin/statuslabels/message.php b/resources/lang/mi/admin/statuslabels/message.php index fb2bae0e72..5895a3859b 100644 --- a/resources/lang/mi/admin/statuslabels/message.php +++ b/resources/lang/mi/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Kaore te Ingoa Tūnga i te tīariari.', 'assoc_assets' => 'Ko tenei Tapanga Whakaaetanga kei te hono atu ki tetahi rawa rawa, kaore e taea te muku. Whakaorangia nga taonga ki a koe kia kaua e tuhi i tenei tikanga ka ngana ano.', - - 'create' => array( + 'create' => [ 'error' => 'Kaore i tuhia te Tapanga Whakaaetanga, me ngana ano.', - 'success' => 'I hanga angitu te Tapanga Whakaaetanga.' - ), + 'success' => 'I hanga angitu te Tapanga Whakaaetanga.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kāore i te whakahou te Tapanga Tūnga, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te Tapanga Whakaaetanga.' - ), + 'success' => 'Kua whakahoutia te Tapanga Whakaaetanga.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei Tapanga Tūnga?', 'error' => 'He raru kei te whakakore i te Tapanga Tūnga. Tena ngana ano.', - 'success' => 'I mukua te Tapanga Whakaaetanga.' - ), + 'success' => 'I mukua te Tapanga Whakaaetanga.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Kaore e taea te tuku atu i enei taonga ki tetahi.', 'deployable' => 'Ka taea te tirotiro i enei taonga. Kia tohaina ratou, ka whakatauhia he tohu meta o Deployed.', 'archived' => 'Kaore e taea te tirotiro i enei taonga, ka whakaaturia anake i roto i te tirohanga Whakamahia. He whai hua tenei mo te pupuri i nga korero e pa ana ki nga moni mo te tahua moni / kaupapa whakamaharatanga, engari ko te tiaki ia ratou i te rarangi o nga raanei raanei.', 'pending' => 'Kaore e taea te tuku atu i enei taonga ki tetahi, e whakamahia ana mo nga mea e tika ana mo te whakapai, engari e tika ana kia hoki mai ki te rere.', - ), + ], -); +]; diff --git a/resources/lang/mi/admin/statuslabels/table.php b/resources/lang/mi/admin/statuslabels/table.php index 3bdc6ff621..07365bcf62 100644 --- a/resources/lang/mi/admin/statuslabels/table.php +++ b/resources/lang/mi/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Mō nga Tapanga Tūnga', 'archived' => 'Whakamahia', 'create' => 'Waihanga Tapanga Whakaaetanga', @@ -16,4 +16,4 @@ return array( 'title' => 'Ngā Tapanga Tūnga', 'undeployable' => 'Kaore e taea', 'update' => 'Whakahoutia te Tapanga Tūnga', -); +]; diff --git a/resources/lang/mi/admin/suppliers/message.php b/resources/lang/mi/admin/suppliers/message.php index 353f8bfde1..bbfbf96e60 100644 --- a/resources/lang/mi/admin/suppliers/message.php +++ b/resources/lang/mi/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Kaore he kaiwhakarato.', - - 'create' => array( + 'create' => [ 'error' => 'Kaore i hangaia te kaiwhakarato, tēnā whakamātau anō.', - 'success' => 'He pai te kaihoko.' - ), + 'success' => 'He pai te kaihoko.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kaore i whakahoutia te kaiwhakarato, tēnā whakamātau anō', - 'success' => 'Kua whakahoutia te kaiwhakarato.' - ), + 'success' => 'Kua whakahoutia te kaiwhakarato.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Kei te hiahia koe ki te muku i tenei kaiwhakarato?', 'error' => 'He raru kei te whakakore i te kaituku. Tena ngana ano.', 'success' => 'Kua mukua te kaihoko.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/mi/admin/suppliers/table.php b/resources/lang/mi/admin/suppliers/table.php index ff5b4bd3af..192f1cdbf9 100644 --- a/resources/lang/mi/admin/suppliers/table.php +++ b/resources/lang/mi/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Mō Ngā Kaihoko', 'about_suppliers_text' => 'Ka whakamahia nga kaiwhakarato ki te whai i te puna o nga taonga', 'address' => 'Kaihoko Kaiwhakahaere', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Tirohia nga Taonga mo', 'zip' => 'Waehere Pouaka', -); +]; diff --git a/resources/lang/mi/admin/users/general.php b/resources/lang/mi/admin/users/general.php index 3596133aaa..e6a2a169c6 100644 --- a/resources/lang/mi/admin/users/general.php +++ b/resources/lang/mi/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Nga taonga kua tohaina ki: ingoa', @@ -13,7 +12,7 @@ return array( 'edit' => 'Whakatika Kaiwhakamahi', 'filetype_info' => 'Ko nga piriti kua whakaaetia he png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, me te rar.', 'history_user' => 'Hītori mō: ingoa', - 'info' => 'Mōhiohio', + 'info' => 'Mōhiohio', 'restore_user' => 'Pāwhiri ki konei kia whakahokia mai.', 'last_login' => 'Whakauru Whakamutunga', 'ldap_config_text' => 'Ka taea te kitea nga tautuhinga whirihora LDAP Kaiwhakahaere> Tautuhinga. Ko te (tahua) kua tohua te tauwāhi kua tohua mo nga kaiwhakamahi katoa kua kawemai.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Ko to tautuhinga kaiwhakahaere o toianei kei te whakarite i te whakatinanatanga o te whakamotuhēhēnga-rua.', 'two_factor_enrolled' => 'Kua whakauruhia te Pūrere 2FA', 'two_factor_active' => '2FA Mahi', - ); + ]; diff --git a/resources/lang/mi/admin/users/message.php b/resources/lang/mi/admin/users/message.php index ef939b84ab..54258de4b3 100644 --- a/resources/lang/mi/admin/users/message.php +++ b/resources/lang/mi/admin/users/message.php @@ -1,6 +1,6 @@ 'Kua whakaaetia e koe tenei taonga.', 'declined' => 'Kua paopao angitu koe ki tenei taonga.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Ko te whakaurutanga LDAP kua kore i whirihorahia mo tenei whakauru.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'I hanga angitu te Kaiwhakamahi.', 'update' => 'I whakahoutia te kaiwhakamahi.', 'update_bulk' => 'Kua pai te whakahou o nga kaiwhakamahi!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'I tino angitu te Kaiwhakamahi.', 'restored' => 'I angitu te ora o te Kaiwhakamahi.', 'import' => 'He pai te kawemai o nga kaiwhakamahi.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'He raruraru kei te hanga i te kaiwhakamahi. Tena ngana ano.', 'update' => 'He raru kei te whakahou i te kaiwhakamahi. Tena ngana ano.', 'delete' => 'He raru kei te whakakore i te kaiwhakamahi. Tena ngana ano.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Kāore i taea te rapu i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP.
Error mai i te Tūmau LDAP:', 'ldap_could_not_get_entries' => 'Kāore i taea te tiki tuhinga mai i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP.
Error mai i te Tūmau LDAP:', 'password_ldap' => 'Ko te kupuhipa mo tenei kaute kei te whakahaeretia e LDAP / Active Directory. Tēnā whakapā atu ki tō tari IT hei huri i tō kupuhipa.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Kāore te kōnae i mukua. Tena ngana ano.', 'success' => 'Kua mukua te kōnae.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ko nga kōnae kāore i tukuna. Tena ngana ano.', 'success' => 'Ko te (ngā) kōnae i tukuna paihia.', 'nofiles' => 'Kāore i tīpakohia e koe tetahi kōnae hei tuku ake', 'invalidfiles' => 'Kotahi, nui atu ranei o ou kōnae he nui rawa atu, he waaahi ranei e kore e whakaaetia. Ko nga kōnae e whakaaetia ana he png, gif, jpg, doc, docx, pdf, me te txt.', - ), + ], -); +]; diff --git a/resources/lang/mi/admin/users/table.php b/resources/lang/mi/admin/users/table.php index 54e5b3acf8..7c97570134 100644 --- a/resources/lang/mi/admin/users/table.php +++ b/resources/lang/mi/admin/users/table.php @@ -1,6 +1,6 @@ 'He kaha', 'allow' => 'Tukua', 'checkedout' => 'Ngā taonga', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Whakaatuhia nga Kaiwhakamahi o Naianei', 'show_deleted' => 'Whakaatu Kaiwhakamahi Kua Mukua', 'title' => 'Taitara', - 'to_restore_them' => 'ki te whakaora ia ratou.', + 'to_restore_them' => 'ki te whakaora ia ratou.', 'updateuser' => 'Whakahōu Kaiwhakamahi', 'username' => 'Ingoa Kaiwhakamahi', - 'user_deleted_text' => 'Kua tohua tenei kaiwhakamahi kia mukua.', + 'user_deleted_text' => 'Kua tohua tenei kaiwhakamahi kia mukua.', 'username_note' => '(Ka whakamahia tenei mo te Active Directory anake, kaore i te takiuru.)', 'cloneuser' => 'Kaiwhakamahi Tino', 'viewusers' => 'Kaiwhakamahi Tiro', -); +]; diff --git a/resources/lang/mi/auth/general.php b/resources/lang/mi/auth/general.php index e8e0751fee..35a89a1aa0 100644 --- a/resources/lang/mi/auth/general.php +++ b/resources/lang/mi/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/mi/auth/message.php b/resources/lang/mi/auth/message.php index 7ccd87564c..feee4bea0a 100644 --- a/resources/lang/mi/auth/message.php +++ b/resources/lang/mi/auth/message.php @@ -1,6 +1,6 @@ 'Kei te tīariari tetahi pūkete ki tenei īmēra.', 'account_not_found' => 'He hē te ingoa kaiwhakamahi, kupuhipa rānei.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ka whakatakahia tenei pūkete kaiwhakamahi.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'I te raruraru i te wa e ngana ana ki te takiuru ki a koe, tena koa ngana ano.', 'success' => 'Kua uru koe ki roto.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'I te raruraru i te wa e ngana ana ki te hanga i to taakete, me ngana ano.', 'success' => 'Ko te kaute i hanga.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'He raru i te wa e ngana ana ki te tautuhi i te waehere kupuhipa, me ngana ano.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'He raruraru i te wa e ngana ana ki te tautuhi i to kupuhipa, ngana ano.', 'success' => 'Kua oti te tautuhi i to kupuhipa.', - ), + ], - -); +]; diff --git a/resources/lang/mi/button.php b/resources/lang/mi/button.php index e7acd34c8b..6c51d09d79 100644 --- a/resources/lang/mi/button.php +++ b/resources/lang/mi/button.php @@ -1,6 +1,6 @@ 'Nga mahi', 'add' => 'Tāpiri Hou', 'cancel' => 'Whakakore', @@ -11,7 +11,7 @@ return array( 'request' => 'Tono', 'submit' => 'Tukuna', 'upload' => 'Tukuake', - 'select_file' => 'Tīpako Kōnae ...', + 'select_file' => 'Tīpako Kōnae ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php index ecf86a4ab4..9159572622 100644 --- a/resources/lang/mi/general.php +++ b/resources/lang/mi/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Pāwhiri ki konei', + 'click_here' => 'Pāwhiri ki konei', 'clear_selection' => 'Clear Selection', 'companies' => 'Kamupene', 'company' => 'Kamupene', 'component' => 'Tuhinga', 'components' => 'Tuhinga', - 'complete' => 'Kua oti', + 'complete' => 'Kua oti', 'consumable' => 'Whakamahia', 'consumables' => 'Ngā whakamahinga', 'country' => 'Whenua', diff --git a/resources/lang/mi/help.php b/resources/lang/mi/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/mi/help.php +++ b/resources/lang/mi/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/mi/mail.php b/resources/lang/mi/mail.php index 9a04a0e635..743729e954 100644 --- a/resources/lang/mi/mail.php +++ b/resources/lang/mi/mail.php @@ -1,6 +1,6 @@ 'Kua whakakorea e tetahi kaiwhakamahi tetahi tonoemi i runga i te paetukutuku', 'a_user_requested' => 'Kua tono tetahi kaiwhakamahi i tetahi mea i runga i te paetukutuku', 'accessory_name' => 'Ingoa Whakauru:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/mi/pagination.php b/resources/lang/mi/pagination.php index 7ab6f70394..628d94f550 100644 --- a/resources/lang/mi/pagination.php +++ b/resources/lang/mi/pagination.php @@ -1,6 +1,6 @@ 'Tuhinga o mua »', -); +]; diff --git a/resources/lang/mi/passwords.php b/resources/lang/mi/passwords.php index b476f8d521..cfae788f8d 100644 --- a/resources/lang/mi/passwords.php +++ b/resources/lang/mi/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Kua tukuna to hononga kupuhipa!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/mi/reminders.php b/resources/lang/mi/reminders.php index 5163d59947..62851f7590 100644 --- a/resources/lang/mi/reminders.php +++ b/resources/lang/mi/reminders.php @@ -1,6 +1,6 @@ "Ko nga kupuhipa he ono nga kupuhipa me te whakarite i te haamau.", + 'password' => 'Ko nga kupuhipa he ono nga kupuhipa me te whakarite i te haamau.', - "user" => "He hē te ingoa kaiwhakamahi me te wāhitau īmēra", + 'user' => 'He hē te ingoa kaiwhakamahi me te wāhitau īmēra', - "token" => "He muhu tenei kupuhipa tautuhinga tautuhi.", + 'token' => 'He muhu tenei kupuhipa tautuhinga tautuhi.', - "sent" => "Mena kua kitea he wahitau īmēra rite, kua tukuna he whakamahara kupuhipa!", + 'sent' => 'Mena kua kitea he wahitau īmēra rite, kua tukuna he whakamahara kupuhipa!', -); +]; diff --git a/resources/lang/mi/table.php b/resources/lang/mi/table.php index 105af16182..e2209efe34 100644 --- a/resources/lang/mi/table.php +++ b/resources/lang/mi/table.php @@ -1,10 +1,10 @@ 'Nga mahi', 'action' => 'Mahi', 'by' => 'Na', 'item' => 'Tuhinga', -); +]; diff --git a/resources/lang/mi/validation.php b/resources/lang/mi/validation.php index d303b59f87..b5490bc979 100644 --- a/resources/lang/mi/validation.php +++ b/resources/lang/mi/validation.php @@ -1,6 +1,6 @@ 'Ko te: kua tangohia te huanga.', 'uploaded' => 'Ko te: ko te huanga i rahua te tuku.', 'url' => 'Ko te: ko te hōputu huanga he muhu.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Ko te: kei roto i te waahi tohu he momo e kore e whakaaetia.", - "email_array" => "Kotahi, neke atu ranei nga wahitau īmēra he muhu.", - "hashed_pass" => "He hē tō kupuhipa o nāianei", + 'alpha_space' => 'Ko te: kei roto i te waahi tohu he momo e kore e whakaaetia.', + 'email_array' => 'Kotahi, neke atu ranei nga wahitau īmēra he muhu.', + 'hashed_pass' => 'He hē tō kupuhipa o nāianei', 'dumbpwd' => 'He noa rawa te kupuhipa.', - "statuslabel_type" => "Me tīpako i te momo tahua tohu whaimana", + 'statuslabel_type' => 'Me tīpako i te momo tahua tohu whaimana', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/mk/admin/accessories/general.php b/resources/lang/mk/admin/accessories/general.php index 0d97956c28..f7f551d46b 100644 --- a/resources/lang/mk/admin/accessories/general.php +++ b/resources/lang/mk/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Категорија на додаток', 'accessory_name' => 'Име на додаток', 'checkout' => 'Задолжи додаток', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Наместо ова, користете стандардни Услови за користење.', 'use_default_eula_disabled' => 'Наместо тоа користете стандардни Услови за користење. Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.', -); +]; diff --git a/resources/lang/mk/admin/accessories/message.php b/resources/lang/mk/admin/accessories/message.php index be80ec9e8d..1296f675e2 100644 --- a/resources/lang/mk/admin/accessories/message.php +++ b/resources/lang/mk/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Овој додаток во моментов има :count ставки задолжени на корисници. Ве молиме проверете во додатоците и обидете се повторно. ', - 'create' => array( + 'create' => [ 'error' => 'Додатокот не е креиран, обидете се повторно.', - 'success' => 'Додатокот беше успешно креиран.' - ), + 'success' => 'Додатокот беше успешно креиран.', + ], - 'update' => array( + 'update' => [ 'error' => 'Додатокот не беше ажуриран, обидете се повторно', - 'success' => 'Додатокот беше успешно ажуриран.' - ), + 'success' => 'Додатокот беше успешно ажуриран.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој додаток?', 'error' => 'Имаше проблем со бришење на додатокот. Обидете се повторно.', - 'success' => 'Додатокот беше успешно избришан.' - ), + 'success' => 'Додатокот беше успешно избришан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Додатокот не беше задолжен, обидете се повторно', 'success' => 'Додатокот е задолжен.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ), + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Додатокот не беше раздолжен, обидете се повторно', 'success' => 'Додатокот е раздолжен.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ) + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - -); +]; diff --git a/resources/lang/mk/admin/accessories/table.php b/resources/lang/mk/admin/accessories/table.php index 46c1de7d28..4a5a9427e3 100644 --- a/resources/lang/mk/admin/accessories/table.php +++ b/resources/lang/mk/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Преземи CSV', - 'eula_text' => 'Услови за користење', +return [ + 'dl_csv' => 'Преземи CSV', + 'eula_text' => 'Услови за користење', 'id' => 'ID', 'require_acceptance' => 'Прифаќање', 'title' => 'Име на додаток', - -); +]; diff --git a/resources/lang/mk/admin/asset_maintenances/form.php b/resources/lang/mk/admin/asset_maintenances/form.php index ec848c9b8b..b8f6c89908 100644 --- a/resources/lang/mk/admin/asset_maintenances/form.php +++ b/resources/lang/mk/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Денови', 'notes' => 'Забелешки', 'update' => 'Ажурирање', - 'create' => 'Креирај' + 'create' => 'Креирај', ]; diff --git a/resources/lang/mk/admin/asset_maintenances/message.php b/resources/lang/mk/admin/asset_maintenances/message.php index d03ad216b5..78ab8b8f9a 100644 --- a/resources/lang/mk/admin/asset_maintenances/message.php +++ b/resources/lang/mk/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете ова одржување на основни средства?', 'error' => 'Имаше проблем со бришење на одржувањето на основни средства. Обидете се повторно.', - 'success' => 'Одржувањето на основни средства беше успешно избришано.' + 'success' => 'Одржувањето на основни средства беше успешно избришано.', ], 'create' => [ 'error' => 'Одржувањето на основни средства не е креирано, обидете се повторно.', - 'success' => 'Одржувањето на основни средства беше успешно креирано.' + 'success' => 'Одржувањето на основни средства беше успешно креирано.', ], 'edit' => [ 'error' => 'Одржувањето на основни средства не е ажурирано, обидете се повторно.', - 'success' => 'Одржувањето на основни средства беше успешно ажурирано.' + 'success' => 'Одржувањето на основни средства беше успешно ажурирано.', ], 'asset_maintenance_incomplete' => 'Се уште не е завршено', 'warranty' => 'Гаранција', 'not_warranty' => 'Без гаранција', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/mk/admin/asset_maintenances/table.php b/resources/lang/mk/admin/asset_maintenances/table.php index 4278d6bff2..f85683c9d4 100644 --- a/resources/lang/mk/admin/asset_maintenances/table.php +++ b/resources/lang/mk/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Одржување на основни средства', 'asset_name' => 'Име на основното средство', 'is_warranty' => 'Гаранција', - 'dl_csv' => 'Преземи CSV' + 'dl_csv' => 'Преземи CSV', ]; diff --git a/resources/lang/mk/admin/categories/general.php b/resources/lang/mk/admin/categories/general.php index 9054957ecd..49befac972 100644 --- a/resources/lang/mk/admin/categories/general.php +++ b/resources/lang/mk/admin/categories/general.php @@ -1,6 +1,6 @@ 'Категории на основни средства', 'category_name' => 'Име на категорија', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Наместо ова, користете стандардни Услови за користење.', 'use_default_eula_disabled' => 'Наместо ова, користете стандардни Услови за користење. Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.', -); +]; diff --git a/resources/lang/mk/admin/categories/message.php b/resources/lang/mk/admin/categories/message.php index fc33d12c77..e549ea6fcf 100644 --- a/resources/lang/mk/admin/categories/message.php +++ b/resources/lang/mk/admin/categories/message.php @@ -1,25 +1,25 @@ 'Категоријата не постои.', 'assoc_models' => 'Оваа категорија моментално е поврзана со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате вашите модели за да не ја користите оваа категорија и обидете се повторно. ', 'assoc_items' => 'Оваа категорија е моментално поврзана со најмалку еден :asset_type и не може да се избрише. Ажурирајте го вашиот :asset_type да не ја користи оваа категорија и обидете се повторно. ', - 'create' => array( + 'create' => [ 'error' => 'Категоријата не е креирана, обидете се повторно.', - 'success' => 'Категоријата е успешно креирана.' - ), + 'success' => 'Категоријата е успешно креирана.', + ], - 'update' => array( + 'update' => [ 'error' => 'Категоријата не беше ажурирана, обидете се повторно', - 'success' => 'Категоријата е успешно ажурирана.' - ), + 'success' => 'Категоријата е успешно ажурирана.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа категорија?', 'error' => 'Имаше проблем со бришење на категоријата. Обидете се повторно.', - 'success' => 'Категоријата беше успешно избришана.' - ) + 'success' => 'Категоријата беше успешно избришана.', + ], -); +]; diff --git a/resources/lang/mk/admin/categories/table.php b/resources/lang/mk/admin/categories/table.php index 6629145128..325c8a1965 100644 --- a/resources/lang/mk/admin/categories/table.php +++ b/resources/lang/mk/admin/categories/table.php @@ -1,10 +1,10 @@ 'Услови за користење', +return [ + 'eula_text' => 'Услови за користење', 'id' => 'ID', 'parent' => 'Родител', 'require_acceptance' => 'Прифаќање', 'title' => 'Име на Категорија на основни средства', -); +]; diff --git a/resources/lang/mk/admin/companies/general.php b/resources/lang/mk/admin/companies/general.php index e420c203c8..a074ec15a5 100644 --- a/resources/lang/mk/admin/companies/general.php +++ b/resources/lang/mk/admin/companies/general.php @@ -1,4 +1,5 @@ 'Изберете компанија', ]; diff --git a/resources/lang/mk/admin/companies/message.php b/resources/lang/mk/admin/companies/message.php index ea6fb96cf5..6b7f77e9ba 100644 --- a/resources/lang/mk/admin/companies/message.php +++ b/resources/lang/mk/admin/companies/message.php @@ -1,18 +1,19 @@ 'Компанијата не постои.', 'assoc_users' => 'Оваа компанија моментално е поврзана со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате вашите модели за да не ја користите оваа компанија и обидете се повторно. ', - 'create' => array( + 'create' => [ 'error' => 'Компанијата не е креирана, обидете се повторно.', - 'success' => 'Компанијата е успешно креирана.' - ), - 'update' => array( + 'success' => 'Компанијата е успешно креирана.', + ], + 'update' => [ 'error' => 'Компанијата не е креирана, обидете се повторно', - 'success' => 'Компанијата е ажурирана.' - ), - 'delete' => array( + 'success' => 'Компанијата е ажурирана.', + ], + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа компанија?', 'error' => 'Имаше проблем со бришење на компанијата. Обидете се повторно.', - 'success' => 'Компанијата беше успешно избришана.' - ) -); + 'success' => 'Компанијата беше успешно избришана.', + ], +]; diff --git a/resources/lang/mk/admin/companies/table.php b/resources/lang/mk/admin/companies/table.php index 7dbba66db9..895bc3a757 100644 --- a/resources/lang/mk/admin/companies/table.php +++ b/resources/lang/mk/admin/companies/table.php @@ -1,9 +1,10 @@ 'Компании', 'create' => 'Креирај компанија', 'title' => 'Компанија', 'update' => 'Ажурирај компанија', 'name' => 'Име на компанија', 'id' => 'ID', -); +]; diff --git a/resources/lang/mk/admin/components/general.php b/resources/lang/mk/admin/components/general.php index cdb005bd6e..430f0be0de 100644 --- a/resources/lang/mk/admin/components/general.php +++ b/resources/lang/mk/admin/components/general.php @@ -1,6 +1,6 @@ 'Име на компонента', 'checkin' => 'Раздолжи компонента', 'checkout' => 'Задолжи компонента', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Останува', 'total' => 'Вкупно', 'update' => 'Уреди компонента', -); +]; diff --git a/resources/lang/mk/admin/components/message.php b/resources/lang/mk/admin/components/message.php index a204fa9a4b..9397697e2e 100644 --- a/resources/lang/mk/admin/components/message.php +++ b/resources/lang/mk/admin/components/message.php @@ -1,36 +1,35 @@ 'Компонентата не постои.', - 'create' => array( + 'create' => [ 'error' => 'Компонентата не е креирана, обидете се повторно.', - 'success' => 'Компонентата е успешно креирана.' - ), + 'success' => 'Компонентата е успешно креирана.', + ], - 'update' => array( + 'update' => [ 'error' => 'Компонентата не беше ажурирана, обидете се повторно', - 'success' => 'Компонентата е успешно ажурирана.' - ), + 'success' => 'Компонентата е успешно ажурирана.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа компонента?', 'error' => 'Имаше проблем со бришење на компонентата. Обидете се повторно.', - 'success' => 'Компонентата беше успешно избришана.' - ), + 'success' => 'Компонентата беше успешно избришана.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Компонентата не беше задолжена, обидете се повторно', 'success' => 'Компонентата е задолжена.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ), + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Компонентата не беше раздолжена, обидете се повторно', 'success' => 'Компонентата е раздолжена.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ) + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - -); +]; diff --git a/resources/lang/mk/admin/components/table.php b/resources/lang/mk/admin/components/table.php index 65886596b1..038cc33c1d 100644 --- a/resources/lang/mk/admin/components/table.php +++ b/resources/lang/mk/admin/components/table.php @@ -1,5 +1,5 @@ 'Име на компонента', -); +]; diff --git a/resources/lang/mk/admin/consumables/general.php b/resources/lang/mk/admin/consumables/general.php index 3a92336c0e..78fd3c5bc3 100644 --- a/resources/lang/mk/admin/consumables/general.php +++ b/resources/lang/mk/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Задолжи потрошен материјал на корисник', 'consumable_name' => 'Име на потрошен материјал', 'create' => 'Креирај потрошен материјал', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Останува', 'total' => 'Вкупно', 'update' => 'Ажурирај потрошен материјал', -); +]; diff --git a/resources/lang/mk/admin/consumables/message.php b/resources/lang/mk/admin/consumables/message.php index 59222f117f..dd40406fad 100644 --- a/resources/lang/mk/admin/consumables/message.php +++ b/resources/lang/mk/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Потрошниот материјал не постои.', - 'create' => array( + 'create' => [ 'error' => 'Потрошниот материјал не е креиран, обидете се повторно.', - 'success' => 'Потрошниот материјал е успешно креиран.' - ), + 'success' => 'Потрошниот материјал е успешно креиран.', + ], - 'update' => array( + 'update' => [ 'error' => 'Потрошниот материјал не е ажуриран, обидете се повторно', - 'success' => 'Потрошниот материјал е успешно ажуриран.' - ), + 'success' => 'Потрошниот материјал е успешно ажуриран.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој потрошен материјал?', 'error' => 'Имаше проблем со бришење на потрошниот материјал. Обидете се повторно.', - 'success' => 'Потрошниот материјал беше успешно избришан.' - ), + 'success' => 'Потрошниот материјал беше успешно избришан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Потрошниот материјал не е задолжен, обидете се повторно', 'success' => 'Потрошниот материјал е успешно задолжен.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ), + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Потрошниот материјал не е раздолжен, обидете се повторно', 'success' => 'Потрошниот материјал е успешно раздолжен.', - 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.' - ) + 'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.', + ], - -); +]; diff --git a/resources/lang/mk/admin/consumables/table.php b/resources/lang/mk/admin/consumables/table.php index 21df79fd0f..b5f4dc9192 100644 --- a/resources/lang/mk/admin/consumables/table.php +++ b/resources/lang/mk/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Име на потрошен материјал', -); +]; diff --git a/resources/lang/mk/admin/custom_fields/general.php b/resources/lang/mk/admin/custom_fields/general.php index cb0b12572b..2372deca28 100644 --- a/resources/lang/mk/admin/custom_fields/general.php +++ b/resources/lang/mk/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Полиња по желба', 'field' => 'Поле', 'about_fieldsets_title' => 'За Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Ново прилагодено поле', 'value_encrypted' => 'Вредноста на ова поле е емкриптирана во базата на податоци. Само административните корисници ќе можат да ја видат декриптираната вредност', 'show_in_email' => 'Вклучете ја вредноста на ова поле во е-поштата испратена до корисникот? Шифрираните полиња не можат да бидат вклучени во е-пошта.', -); +]; diff --git a/resources/lang/mk/admin/custom_fields/message.php b/resources/lang/mk/admin/custom_fields/message.php index 040152b955..36108c4823 100644 --- a/resources/lang/mk/admin/custom_fields/message.php +++ b/resources/lang/mk/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Poleto не постои.', 'already_added' => 'Полето веќе е додадено', - 'create' => array( + 'create' => [ 'error' => 'Полето не е креирано, обидете се повторно.', 'success' => 'Полето е успешно создадено.', - 'assoc_success' => 'Полето е успешно додадено во групата со полиња.' - ), + 'assoc_success' => 'Полето е успешно додадено во групата со полиња.', + ], - 'update' => array( + 'update' => [ 'error' => 'Полето не е ажурирано, обидете се повторно', - 'success' => 'Полето е успешно ажурирано.' - ), + 'success' => 'Полето е успешно ажурирано.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете ова поле?', 'error' => 'Имаше проблем со бришење на полето. Обидете се повторно.', 'success' => 'Полето беше успешно избришано.', 'in_use' => 'Полето е сеуште во употреба.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset не постои', - 'create' => array( + 'create' => [ 'error' => 'Fieldset не е креиран, обидете се повторно.', - 'success' => 'Fieldset создаден успешно.' - ), + 'success' => 'Fieldset создаден успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset не е ажуриран, обидете се повторно', - 'success' => 'Fieldset ажуриран успешно.' - ), + 'success' => 'Fieldset ажуриран успешно.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој Fieldset?', 'error' => 'Се појави проблем при бришењето на овој Fieldset. Обидете се повторно.', 'success' => 'Fieldset успешно избришан.', 'in_use' => 'Fieldset е сеуште во употреба.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/mk/admin/departments/message.php b/resources/lang/mk/admin/departments/message.php index 6f81bec962..64419bcc2f 100644 --- a/resources/lang/mk/admin/departments/message.php +++ b/resources/lang/mk/admin/departments/message.php @@ -1,21 +1,21 @@ 'Одделот не постои.', 'assoc_users' => 'Овој оддел моментално е поврзана со барем еден корисник и не може да се избрише. Ве молиме да ги ажурирате вашите корисници за да не го користите овој оддел и обидете се повторно. ', - 'create' => array( + 'create' => [ 'error' => 'Одделот не е креиран, обидете се повторно.', - 'success' => 'Одделот е успешно креиран.' - ), - 'update' => array( + 'success' => 'Одделот е успешно креиран.', + ], + 'update' => [ 'error' => 'Одделот не е ажуриран, обидете се повторно', - 'success' => 'Одделот е успешно ажуриран.' - ), - 'delete' => array( + 'success' => 'Одделот е успешно ажуриран.', + ], + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој оддел?', 'error' => 'Имаше проблем при бришење на одделот. Обидете се повторно.', - 'success' => 'Одделот беше успешно избришан.' - ) + 'success' => 'Одделот беше успешно избришан.', + ], -); +]; diff --git a/resources/lang/mk/admin/departments/table.php b/resources/lang/mk/admin/departments/table.php index 7a770cd610..dfa93fec1c 100644 --- a/resources/lang/mk/admin/departments/table.php +++ b/resources/lang/mk/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Име на оддел', @@ -8,4 +8,4 @@ return array( 'location' => 'Локација', 'create' => 'Креирај оддел', 'update' => 'Ажурирај оддел', - ); + ]; diff --git a/resources/lang/mk/admin/depreciations/general.php b/resources/lang/mk/admin/depreciations/general.php index 14a2f55cdc..753192d1bd 100644 --- a/resources/lang/mk/admin/depreciations/general.php +++ b/resources/lang/mk/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'За амортизационите планови', 'about_depreciations' => 'Можете да поставите амортизационен план за основните средства за да ја намалувате нивната вредност праволиниски.', 'asset_depreciations' => 'Амортизациони планови', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Број на месеци', 'update' => 'Ажурирај амортизационен план', -); +]; diff --git a/resources/lang/mk/admin/depreciations/message.php b/resources/lang/mk/admin/depreciations/message.php index bc9a115c43..682bdd3b99 100644 --- a/resources/lang/mk/admin/depreciations/message.php +++ b/resources/lang/mk/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Aмортизациониот план не постои.', 'assoc_users' => 'Амортизациониот план моментално е поврзан со еден или повеќе модели и не може да се избрише. Ве молиме избришете ги моделите, а потоа пробајте повторно да го избришете. ', - - 'create' => array( + 'create' => [ 'error' => 'Амортизациониот план не е креиран, обидете се повторно. :(', - 'success' => 'Амортизациониот план е успешно креиран. :)' - ), + 'success' => 'Амортизациониот план е успешно креиран. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Амортизациониот план не е ажуриран, обидете се повторно', - 'success' => 'Амортизациониот план е успешно ажуриран.' - ), + 'success' => 'Амортизациониот план е успешно ажуриран.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој амортизационен план?', 'error' => 'Имаше проблем при бришење на амортизациониот план. Обидете се повторно.', - 'success' => 'Амортизациониот план е успешно избришан.' - ) + 'success' => 'Амортизациониот план е успешно избришан.', + ], -); +]; diff --git a/resources/lang/mk/admin/depreciations/table.php b/resources/lang/mk/admin/depreciations/table.php index 6a790f7233..82b4b4b83d 100644 --- a/resources/lang/mk/admin/depreciations/table.php +++ b/resources/lang/mk/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Месеци', 'term' => 'Времетраење', 'title' => 'Име ', -); +]; diff --git a/resources/lang/mk/admin/groups/message.php b/resources/lang/mk/admin/groups/message.php index 3df582a471..84c1655287 100644 --- a/resources/lang/mk/admin/groups/message.php +++ b/resources/lang/mk/admin/groups/message.php @@ -1,22 +1,22 @@ 'Групата веќе постои!', 'group_not_found' => 'Групата [:id] не постои.', 'group_name_required' => 'Полето за име е задолжително', - 'success' => array( + 'success' => [ 'create' => 'Групата е успешно креирана.', 'update' => 'Групата е успешно ажурирана.', 'delete' => 'Групата е успешно избришана.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа група?', 'create' => 'Имаше проблем со креирање на групата. Обидете се повторно.', 'update' => 'Имаше проблем со ажурирање на групата. Обидете се повторно.', 'delete' => 'Имаше проблем со бришење на групата. Обидете се повторно.', - ), + ], -); +]; diff --git a/resources/lang/mk/admin/groups/table.php b/resources/lang/mk/admin/groups/table.php index 58e15ed505..491e707fc9 100644 --- a/resources/lang/mk/admin/groups/table.php +++ b/resources/lang/mk/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Име', 'users' => 'Број на корисници', -); +]; diff --git a/resources/lang/mk/admin/groups/titles.php b/resources/lang/mk/admin/groups/titles.php index aaa9f0d998..c915a31a5e 100644 --- a/resources/lang/mk/admin/groups/titles.php +++ b/resources/lang/mk/admin/groups/titles.php @@ -1,6 +1,6 @@ 'За групите', 'about_groups' => 'Групите се користат за генерализирање на кориснички дозволи.', 'group_management' => 'Управување со група', @@ -11,4 +11,4 @@ return array( 'allow' => 'Дозволи', 'deny' => 'Одбиј', -); +]; diff --git a/resources/lang/mk/admin/hardware/form.php b/resources/lang/mk/admin/hardware/form.php index 53532f1a38..3f703ec3d8 100644 --- a/resources/lang/mk/admin/hardware/form.php +++ b/resources/lang/mk/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Потврди масовно бришење на основни средства', +return [ + 'bulk_delete' => 'Потврди масовно бришење на основни средства', 'bulk_delete_help' => 'Прегледајте ги основните средства за масовно бришење подолу. Откако ќе се избришат, овие основни средства можат да бидат обновени, но повеќе нема да бидат задолжени на корисник.', 'bulk_delete_warn' => 'Ќе избришете :assets_count основни средства.', - 'bulk_update' => 'Масовно ажурирање на основни средства', - 'bulk_update_help' => 'Оваа форма ви овозможува да ажурирате повеќе основни средства одеднаш. Пополнете ги полињата што треба да ги промените. Сите полиња што остануваат празни ќе останат непроменети. ', - 'bulk_update_warn' => 'Ќе ажурирате :assets_count основни средства.', + 'bulk_update' => 'Масовно ажурирање на основни средства', + 'bulk_update_help' => 'Оваа форма ви овозможува да ажурирате повеќе основни средства одеднаш. Пополнете ги полињата што треба да ги промените. Сите полиња што остануваат празни ќе останат непроменети. ', + 'bulk_update_warn' => 'Ќе ажурирате :assets_count основни средства.', 'checkedout_to' => 'Задолжен на', 'checkout_date' => 'Датум на задолжување', 'checkin_date' => 'Датум на раздолжување', @@ -38,7 +38,6 @@ return array( 'tag' => 'Код на основното средство', 'update' => 'Ажурирање на основни средства', 'warranty' => 'Гаранција', - 'warranty_expires' => 'Гаранцијата истекува', + 'warranty_expires' => 'Гаранцијата истекува', 'years' => 'години', -) -; +]; diff --git a/resources/lang/mk/admin/hardware/general.php b/resources/lang/mk/admin/hardware/general.php index 61296cc2e3..6a30fcf735 100644 --- a/resources/lang/mk/admin/hardware/general.php +++ b/resources/lang/mk/admin/hardware/general.php @@ -1,9 +1,9 @@ 'За основните средства', 'about_assets_text' => 'Основни средства се ставки следени по сериски број или код на средства. Тие обично имаат повисока набавна вредност и е важно нивно поединечно евидентирање.', - 'archived' => 'Архивирано', + 'archived' => 'Архивирано', 'asset' => 'Основно средство', 'bulk_checkout' => 'Раздолжи основно средство', 'checkin' => 'Раздолжи основно средство', @@ -19,4 +19,4 @@ return array( 'pending' => 'Во чекање', 'undeployable' => 'Нераспоредливи', 'view' => 'Преглед на основно средство', -); +]; diff --git a/resources/lang/mk/admin/hardware/message.php b/resources/lang/mk/admin/hardware/message.php index 0c99b64e70..379ba95404 100644 --- a/resources/lang/mk/admin/hardware/message.php +++ b/resources/lang/mk/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Предупредување: Ова основно средство е означено како нераспоредливо. Ако овој статус е променет, ве молиме да го ажурирате статусот на средството.', 'does_not_exist' => 'Основното средство не постои.', 'does_not_exist_or_not_requestable' => 'Добар обид. Тоа основно средство не постои или не може да биде побарано.', 'assoc_users' => 'Ова средство е задолжено на корисник и не може да се избрише. Проверете го, а потоа пробајте повторно да го избришете. ', - 'create' => array( + 'create' => [ 'error' => 'Основното средство не е креирано, обидете се повторно. :(', - 'success' => 'Основното средство е успешно креирано. :)' - ), + 'success' => 'Основното средство е успешно креирано. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Основното средство не е ажурирано, обидете се повторно', 'success' => 'Основното средство е успешно ажурирано.', 'nothing_updated' => 'Не беа избрани полиња, затоа ништо не беше ажурирано.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Основното средство не е вратено, обидете се повторно', - 'success' => 'Основното средство е успешно вратено.' - ), + 'success' => 'Основното средство е успешно вратено.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Ревизијата на основни средства беше неуспешна. Обидете се повторно.', - 'success' => 'Ревизијата на основни средства е логирана.' - ), + 'success' => 'Ревизијата на основни средства е логирана.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Датотеката не се избриша. Обидете се повторно.', 'success' => 'Датотеката е успешно избришана.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Датотеките не се прикачени. Обидете се повторно.', 'success' => 'Успешно се преземени датотеките.', 'nofiles' => 'Не одбравте датотеки за прикачување, или датотеката што сакате да ја поставите е премногу голема', 'invalidfiles' => 'Една или повеќе од вашите датотеки е преголема или е тип на датотека што не е дозволен. Дозволени типови на датотеки се png, gif, jpg, doc, docx, pdf и txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Некои ставки не се увезоа правилно.', 'errorDetail' => 'Следниве елементи не се увезени поради грешки.', - 'success' => "Вашата датотека е увезена", - 'file_delete_success' => "Вашата датотека е избришана", - 'file_delete_error' => "Датотеката не можеше да се избрише", - ), + 'success' => 'Вашата датотека е увезена', + 'file_delete_success' => 'Вашата датотека е избришана', + 'file_delete_error' => 'Датотеката не можеше да се избрише', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете ова основно средство?', 'error' => 'Имаше проблем со бришење на основното средство. Обидете се повторно.', 'nothing_updated' => 'Не беа избрани основни средства, затоа ништо не беше избришано.', - 'success' => 'Основното средство беше избришано.' - ), + 'success' => 'Основното средство беше избришано.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Основното средство не беше задолжено, обидете се повторно', 'success' => 'Основното средство е задолжено.', 'user_does_not_exist' => 'Корисникот е неважечки. Обидете се повторно.', 'not_available' => 'Основното средство не е достапно за задолжување!', - 'no_assets_selected' => 'Мора да одберете најмалку едно основно средство' - ), + 'no_assets_selected' => 'Мора да одберете најмалку едно основно средство', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Основното средство не беше раздолжено, обидете се повторно', 'success' => 'Основното средство е раздолжено.', 'user_does_not_exist' => 'Корисникот е неважечки. Обидете се повторно.', 'already_checked_in' => 'Основното средство е веќе задолжено.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Основното средство не е побарано, обидете се повторно', 'success' => 'Основното средство е побарано.', - 'canceled' => 'Барањето за задолжување е откажано' - ) + 'canceled' => 'Барањето за задолжување е откажано', + ], -); +]; diff --git a/resources/lang/mk/admin/hardware/table.php b/resources/lang/mk/admin/hardware/table.php index 16c068c8e3..96daec93e7 100644 --- a/resources/lang/mk/admin/hardware/table.php +++ b/resources/lang/mk/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Код на основното средство', 'asset_model' => 'Модел', @@ -20,6 +20,6 @@ return array( 'title' => 'Основно средство ', 'image' => 'Слика', 'days_without_acceptance' => 'Денови без прифаќање', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/mk/admin/kits/general.php b/resources/lang/mk/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/mk/admin/kits/general.php +++ b/resources/lang/mk/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/mk/admin/licenses/form.php b/resources/lang/mk/admin/licenses/form.php index 8ac8c879d8..8a22621856 100644 --- a/resources/lang/mk/admin/licenses/form.php +++ b/resources/lang/mk/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Основно средство', 'checkin' => 'Раздолжи', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Лиценцирано на е-пошта', 'to_name' => 'Лиценцирано на име', 'update' => 'Ажурирај лиценца', - 'checkout_help' => 'Мора да задолжите лиценца на основно средство или на лице. Можете да ги изберете и двете, но сопственикот на основното средство мора да одговара на лицето на кое ја задолжувате лиценцата.' -); + 'checkout_help' => 'Мора да задолжите лиценца на основно средство или на лице. Можете да ги изберете и двете, но сопственикот на основното средство мора да одговара на лицето на кое ја задолжувате лиценцата.', +]; diff --git a/resources/lang/mk/admin/licenses/general.php b/resources/lang/mk/admin/licenses/general.php index 3628ebda93..a307ecd960 100644 --- a/resources/lang/mk/admin/licenses/general.php +++ b/resources/lang/mk/admin/licenses/general.php @@ -1,6 +1,6 @@ 'За лиценците', 'about_licenses' => 'Лиценците се користат за следење на софтверот. Тие имаат одреден број места кои можат да се задолжат на поединци', 'checkin' => 'Раздолжи лиценца за место', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Лиценци за софтвер', 'user' => 'Корисник', 'view' => 'Погледнете лиценца', -); +]; diff --git a/resources/lang/mk/admin/licenses/message.php b/resources/lang/mk/admin/licenses/message.php index ad5da4fc68..2a96aa5693 100644 --- a/resources/lang/mk/admin/licenses/message.php +++ b/resources/lang/mk/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Лиценцата не постои.', 'user_does_not_exist' => 'Корисникот не постои.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Мора да изберете основно средство или корисник, но не и двете.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Лиценцата не е креирана, обидете се повторно.', - 'success' => 'Лиценцата е успешно креирана.' - ), + 'success' => 'Лиценцата е успешно креирана.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Датотеката не се избриша. Обидете се повторно.', 'success' => 'Датотеката е успешно избришана.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Датотеките не се прикачени. Обидете се повторно.', 'success' => 'Успешно се прикачени датотеките.', 'nofiles' => 'Не одбравте датотеки за прикачување, или датотеката што сакате да ја поставите е премногу голема', 'invalidfiles' => 'Една или повеќе од вашите датотеки е преголема или е тип на датотека што не е дозволен. Дозволени типови на датотеки се png, gif, jpg, doc, docx, pdf и txt.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Лиценцата не е ажурирана, обидете се повторно', - 'success' => 'Лиценцата е успешно ажурирана.' - ), + 'success' => 'Лиценцата е успешно ажурирана.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа лиценца?', 'error' => 'Имаше проблем со бришење на лиценцата. Обидете се повторно.', - 'success' => 'Лиценцата беше успешно избришана.' - ), + 'success' => 'Лиценцата беше успешно избришана.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Имаше проблем со задолжување на лиценцата. Обидете се повторно.', - 'success' => 'Лиценцата беше успешно задолжена' - ), + 'success' => 'Лиценцата беше успешно задолжена', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Имаше проблем со раздолжување на лиценцата. Обидете се повторно.', - 'success' => 'Лиценцата беше успешно раздолжена' - ), + 'success' => 'Лиценцата беше успешно раздолжена', + ], -); +]; diff --git a/resources/lang/mk/admin/licenses/table.php b/resources/lang/mk/admin/licenses/table.php index 31d9da20fd..421cc77cfc 100644 --- a/resources/lang/mk/admin/licenses/table.php +++ b/resources/lang/mk/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Задолжен на', 'checkout' => 'Раздолжи/Задолжи', @@ -14,4 +14,4 @@ return array( 'serial' => 'Сериски број', 'title' => 'Лиценца', -); +]; diff --git a/resources/lang/mk/admin/locations/message.php b/resources/lang/mk/admin/locations/message.php index a6b9418664..768967b1ac 100644 --- a/resources/lang/mk/admin/locations/message.php +++ b/resources/lang/mk/admin/locations/message.php @@ -1,27 +1,26 @@ 'Локацијата не постои.', 'assoc_users' => 'Оваа локација моментално е поврзана со барем еден корисник и не може да се избрише. Ве молиме да ги ажурирате вашите корисници за да не ја користете оваа локација и обидете се повторно. ', 'assoc_assets' => 'Оваа локација моментално е поврзана со барем едно основно средство и не може да се избрише. Ве молиме да ги ажурирате вашите основни средства за да не ја користите оваа локација и обидете се повторно. ', 'assoc_child_loc' => 'Оваа локација моментално е родител на најмалку една локација и не може да се избрише. Ве молиме да ги ажурирате вашите локации повеќе да не ја користат оваа локација како родител и обидете се повторно. ', - - 'create' => array( + 'create' => [ 'error' => 'Локацијата не е креирана, обидете се повторно.', - 'success' => 'Локацијата е успешно креирана.' - ), + 'success' => 'Локацијата е успешно креирана.', + ], - 'update' => array( + 'update' => [ 'error' => 'Локацијата не беше ажурирана, обидете се повторно', - 'success' => 'Локацијата е успешно ажурирана.' - ), + 'success' => 'Локацијата е успешно ажурирана.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете оваа локација?', 'error' => 'Имаше проблем со бришење на локацијата. Обидете се повторно.', - 'success' => 'Локацијата беше успешно избришана.' - ) + 'success' => 'Локацијата беше успешно избришана.', + ], -); +]; diff --git a/resources/lang/mk/admin/locations/table.php b/resources/lang/mk/admin/locations/table.php index 45a079d6bf..4909e9c759 100644 --- a/resources/lang/mk/admin/locations/table.php +++ b/resources/lang/mk/admin/locations/table.php @@ -1,6 +1,6 @@ 'За локациите', 'about_locations' => 'Локациите се користат за следење на информации за тоа каде се наоѓаат корисниците, основните средства и други средства', 'assets_rtd' => 'Основни средства', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Родител', 'currency' => 'Валута на локација', 'ldap_ou' => 'LDAP OU за пребарување', - ); + ]; diff --git a/resources/lang/mk/admin/manufacturers/message.php b/resources/lang/mk/admin/manufacturers/message.php index 20ab33ae2a..f8d7fbbd99 100644 --- a/resources/lang/mk/admin/manufacturers/message.php +++ b/resources/lang/mk/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Производителот не постои.', 'assoc_users' => 'Овој производител моментално е поврзан со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате моделите за да не го користат овој производител и обидете се повторно. ', - 'create' => array( + 'create' => [ 'error' => 'Производителот не е креиран, обидете се повторно.', - 'success' => 'Производителот е креиран.' - ), + 'success' => 'Производителот е креиран.', + ], - 'update' => array( + 'update' => [ 'error' => 'Производителот не е ажуриран, обидете се повторно', - 'success' => 'Производителот е ажуриран.' - ), + 'success' => 'Производителот е ажуриран.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Производителот не е вреатен, обидете се повторно', - 'success' => 'Производителот е вратен.' - ), + 'success' => 'Производителот е вратен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете овој производител?', 'error' => 'Имаше проблем со бришење на производителот. Обидете се повторно.', - 'success' => 'Производителот е избришан.' - ) + 'success' => 'Производителот е избришан.', + ], -); +]; diff --git a/resources/lang/mk/admin/manufacturers/table.php b/resources/lang/mk/admin/manufacturers/table.php index 1546f66f1e..ce0ada839b 100644 --- a/resources/lang/mk/admin/manufacturers/table.php +++ b/resources/lang/mk/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'За производителите', 'about_manufacturers_text' => 'Производителите се компаниите кои ги произведуваат основните средства. Овде можете да зачувате информации за контакт за поддршка и сл., кои ќе бидат прикажани на страниците со детали за вашите средства.', 'asset_manufacturers' => 'Производители', @@ -13,4 +13,4 @@ return array( 'update' => 'Ажурирај го производителот', 'url' => 'URL', -); +]; diff --git a/resources/lang/mk/admin/models/general.php b/resources/lang/mk/admin/models/general.php index 551570fe6e..545f6f983b 100644 --- a/resources/lang/mk/admin/models/general.php +++ b/resources/lang/mk/admin/models/general.php @@ -1,6 +1,6 @@ 'За моделите на основни средства', 'about_models_text' => 'Моделите на основни средства служат да се групираат идентични средства. Пр. "IPhone 6s", "ThinkPad T470" итн.', 'deleted' => 'Овој модел е избришан. Кликнете овде за да го вратите.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Ќе избришете :model_count модели.', 'restore' => 'Врати модел', 'requestable' => 'Корисниците може да го побараат овој модел', - 'show_mac_address' => 'Покажи поле за MAC адреса во основните средства од овој модел', + 'show_mac_address' => 'Покажи поле за MAC адреса во основните средства од овој модел', 'view_deleted' => 'Преглед на избришани', 'view_models' => 'Преглед на модели', 'fieldset' => 'Група на полиња', 'no_custom_field' => 'Без полиња по желба', 'add_default_values' => 'Додајте default вредности', -); +]; diff --git a/resources/lang/mk/admin/models/message.php b/resources/lang/mk/admin/models/message.php index 2c421ba394..01a1277db8 100644 --- a/resources/lang/mk/admin/models/message.php +++ b/resources/lang/mk/admin/models/message.php @@ -1,42 +1,41 @@ 'Моделот не постои.', 'assoc_users' => 'Моделот во моментов е поврзан со едно или повеќе основни средства и не може да се избрише. Ве молиме избришете ги основните средствата, а потоа пробајте повторно да го избришете. ', - - 'create' => array( + 'create' => [ 'error' => 'Моделот не е креиран, обидете се повторно.', 'success' => 'Моделот е успешно креиран.', 'duplicate_set' => 'Модел на основно средство со тоа име, производител и број на модел веќе постои.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Моделот не е ажуриран, обидете се повторно', - 'success' => 'Моделот е ажуриран.' - ), + 'success' => 'Моделот е ажуриран.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете моделот?', 'error' => 'Имаше проблем со бришење на моделот. Обидете се повторно.', - 'success' => 'Моделот е избришан.' - ), + 'success' => 'Моделот е избришан.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Моделот не е вратен, обидете се повторно', - 'success' => 'Моделот е вратен.' - ), + 'success' => 'Моделот е вратен.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Не беа сменети полиња, затоа ништо не беше ажурирано.', - 'success' => 'Моделите се ажурирани.' - ), + 'success' => 'Моделите се ажурирани.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Не беа избрани модели, затоа ништо не беше избришано.', 'success' => ':success_count модел(и) се избришани!', - 'success_partial' => ':success_count модел (и) се избришани, меѓутоа :fail_count не може да се избришат, бидејќи тие сè уште имаат средства поврзани со нив.' - ), + 'success_partial' => ':success_count модел (и) се избришани, меѓутоа :fail_count не може да се избришат, бидејќи тие сè уште имаат средства поврзани со нив.', + ], -); +]; diff --git a/resources/lang/mk/admin/models/table.php b/resources/lang/mk/admin/models/table.php index f508c5fde4..dabbc069e3 100644 --- a/resources/lang/mk/admin/models/table.php +++ b/resources/lang/mk/admin/models/table.php @@ -1,6 +1,6 @@ 'Креирај модел на основно средство', 'created_at' => 'Креиран во', @@ -14,4 +14,4 @@ return array( 'update' => 'Ажурирај модел на основни средства', 'clone' => 'Клонирај модел', 'edit' => 'Ажурирај модел', -); +]; diff --git a/resources/lang/mk/admin/reports/general.php b/resources/lang/mk/admin/reports/general.php index 4c0c102ea6..7c28ecd711 100644 --- a/resources/lang/mk/admin/reports/general.php +++ b/resources/lang/mk/admin/reports/general.php @@ -1,5 +1,5 @@ 'Изберете ги опциите за извештајот за основни средства.' -); +return [ + 'info' => 'Изберете ги опциите за извештајот за основни средства.', +]; diff --git a/resources/lang/mk/admin/reports/message.php b/resources/lang/mk/admin/reports/message.php index 9416accc75..ccfb96b1ed 100644 --- a/resources/lang/mk/admin/reports/message.php +++ b/resources/lang/mk/admin/reports/message.php @@ -1,5 +1,5 @@ 'Мора да изберете барем една опција.' -); +return [ + 'error' => 'Мора да изберете барем една опција.', +]; diff --git a/resources/lang/mk/admin/settings/general.php b/resources/lang/mk/admin/settings/general.php index 064a2d7aaf..63173ce68c 100644 --- a/resources/lang/mk/admin/settings/general.php +++ b/resources/lang/mk/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Домен на Active Directory', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Ова е сервер на Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Праг на застарување на аларм (денови)', 'alert_inv_threshold' => 'Праг на аларм за инвентар', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID на основни средства', 'audit_interval' => 'Интервал на ревизија', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/mk/admin/settings/message.php b/resources/lang/mk/admin/settings/message.php index 8e49a91c1f..2a5641e24b 100644 --- a/resources/lang/mk/admin/settings/message.php +++ b/resources/lang/mk/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Се случи грешка при ажурирањето. ', - 'success' => 'Поставките се ажурирани.' - ), - 'backup' => array( + 'success' => 'Поставките се ажурирани.', + ], + 'backup' => [ 'delete_confirm' => 'Дали си сигурен дека сакаш да ја избришеш резервната копија? Ова не може да биде вратено. ', 'file_deleted' => 'Резервната копија е избришана. ', 'generated' => 'Направена е нова резервна копија.', 'file_not_found' => 'Таа резервна копија не може да се најде на серверот.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Се случи грешка при трајното бришење. ', 'validation_failed' => 'Потврдата за трајно бришење е неточна. Внесете го зборот "DELETE" во полето за потврда.', - 'success' => 'Записите се трајно избришани.' - ), + 'success' => 'Записите се трајно избришани.', + ], -); +]; diff --git a/resources/lang/mk/admin/statuslabels/message.php b/resources/lang/mk/admin/statuslabels/message.php index e937c2c84c..7ecd4183b2 100644 --- a/resources/lang/mk/admin/statuslabels/message.php +++ b/resources/lang/mk/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Етикетата за статус не постои.', 'assoc_assets' => 'Оваа етикета за статус моментално е поврзана со барем едно основно средство и не може да се избрише. Ве молиме да ги ажурирате вашите основни средства за да не ја користите оваа етикета за статус и обидете се повторно. ', - - 'create' => array( + 'create' => [ 'error' => 'Етикетата за статус не е креирана, обидете се повторно.', - 'success' => 'Етикетата за статус е креирана.' - ), + 'success' => 'Етикетата за статус е креирана.', + ], - 'update' => array( + 'update' => [ 'error' => 'Етикетата за статус не е ажурирана, обидете се повторно', - 'success' => 'Етикетата за статус е ажурирана.' - ), + 'success' => 'Етикетата за статус е ажурирана.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да ја избришете етикетата за статус?', 'error' => 'Имаше проблем со бришење на етикетата за статус. Обидете се повторно.', - 'success' => 'Етикетата за статус е избришана.' - ), + 'success' => 'Етикетата за статус е избришана.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Овие основни средства не може да се задолжат на никого.', 'deployable' => 'Овие основни средства може да се задолжат. Откако ќе бидат задолжени, ќе имаат мета-статус на Распоредени.', 'archived' => 'Овие средства не може да се задолжат, и ќе се појавуваат во архивираните средства. Ова е корисно за зачувување на информации за основните средства за сметководствени/историски потреби.', 'pending' => 'Овие средства сè уште не можат да се задолжат. Најчесто се користи за средства кои се надвор за сервисирање, но се очекува да се вратат.', - ), + ], -); +]; diff --git a/resources/lang/mk/admin/statuslabels/table.php b/resources/lang/mk/admin/statuslabels/table.php index b9dc038d4a..050545a70a 100644 --- a/resources/lang/mk/admin/statuslabels/table.php +++ b/resources/lang/mk/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'За статусните етикети', 'archived' => 'Архивирано', 'create' => 'Направете етикета за статус', @@ -16,4 +16,4 @@ return array( 'title' => 'Етикети со статус', 'undeployable' => 'Нераспоредливи', 'update' => 'Ажурирај етикета за статус', -); +]; diff --git a/resources/lang/mk/admin/suppliers/message.php b/resources/lang/mk/admin/suppliers/message.php index be288fbfaa..8d58da4ff2 100644 --- a/resources/lang/mk/admin/suppliers/message.php +++ b/resources/lang/mk/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Добавувачот не постои.', - - 'create' => array( + 'create' => [ 'error' => 'Добавувачот не е креиран, обидете се повторно.', - 'success' => 'Добавувачот е креиран.' - ), + 'success' => 'Добавувачот е креиран.', + ], - 'update' => array( + 'update' => [ 'error' => 'Добавувачот не е ажуриран, обидете се повторно', - 'success' => 'Добавувачот е ажуриран.' - ), + 'success' => 'Добавувачот е ажуриран.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Дали сте сигурни дека сакате да го избришете добавувачот?', 'error' => 'Имаше проблем со бришење на добавувачот. Обидете се повторно.', 'success' => 'Добавувачот е избришан.', 'assoc_assets' => 'Добавувачот моментално е поврзан со :asset_count основни средства и не може да се избрише. Ве молиме да ги ажурирате основните средства за да не го користат овој добавувач и обидете се повторно. ', 'assoc_licenses' => 'Добавувачот моментално е поврзан со :licenses_count лиценци и не може да се избрише. Ве молиме да ги ажурирате лиценците за да не го користат овој добавувач и обидете се повторно. ', 'assoc_maintenances' => 'Добавувачот моментално е поврзан со :asset_maintenances_count сервисирања и не може да се избрише. Ве молиме да ги ажурирате сервисирањата за да не го користат овој добавувач и обидете се повторно. ', - ) + ], -); +]; diff --git a/resources/lang/mk/admin/suppliers/table.php b/resources/lang/mk/admin/suppliers/table.php index 5a1e0fbbf7..e3563712c8 100644 --- a/resources/lang/mk/admin/suppliers/table.php +++ b/resources/lang/mk/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'За добавувачите', 'about_suppliers_text' => 'Добавувачите се компаниите од кои е набавена опремата и кои се одговорни за гаранцијата на основните средства', 'address' => 'Адреса на добавувачот', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Преглед на средства за', 'zip' => 'Поштенски код', -); +]; diff --git a/resources/lang/mk/admin/users/general.php b/resources/lang/mk/admin/users/general.php index 0abcc16222..2181c3beb2 100644 --- a/resources/lang/mk/admin/users/general.php +++ b/resources/lang/mk/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Средства задолжени на :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Ажурирај корисник', 'filetype_info' => 'Дозволени типови на датотеки се png, gif, jpg, jpeg, doc, docx, pdf, txt, zip и rar.', 'history_user' => 'Историја за :name', - 'info' => 'Информации', + 'info' => 'Информации', 'restore_user' => 'Кликни тука за да ги вратите.', 'last_login' => 'Последна најава', 'ldap_config_text' => 'LDAP конфигурациските поставки може да се најдат во Admin > Settings. Избраната локација (опционално) ќе биде поставена за сите увезени корисници.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Вашите тековни администраторски поставки овозможуваат селективно спроведување на автентикација со два фактори. ', 'two_factor_enrolled' => 'Поврзан уред за 2FA ', 'two_factor_active' => '2FA активна', - ); + ]; diff --git a/resources/lang/mk/admin/users/message.php b/resources/lang/mk/admin/users/message.php index 0c63b5b252..7694812bd3 100644 --- a/resources/lang/mk/admin/users/message.php +++ b/resources/lang/mk/admin/users/message.php @@ -1,6 +1,6 @@ 'Го прифативте основното средство.', 'declined' => 'Го одбивте основното средство.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Интеграција со LDAP не е конфигурирана.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Корисникот е креиран.', 'update' => 'Корисникот е ажуриран.', 'update_bulk' => 'Корисниците се ажурирани!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Привременото блокирање е отстрането.', 'restored' => 'Корисникот е вратен.', 'import' => 'Корисниците се увезени.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Имаше проблем со креирање на корисникот. Обидете се повторно.', 'update' => 'Имаше проблем со ажурирање на корисникот. Обидете се повторно.', 'delete' => 'Имаше проблем со бришење на корисникот. Обидете се повторно.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Не можам да го пребарам LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека.
Грешка од LDAP-серверот:', 'ldap_could_not_get_entries' => 'Не можам да добијам записи од LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека.
Грешка од LDAP-серверот:', 'password_ldap' => 'Лозинката за корисникот е управувана од LDAP/Active Directory. Ве молиме контактирајте го одделот за ИТ за да ја смените вашата лозинка. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Датотеката не се избриша. Обидете се повторно.', 'success' => 'Датотеката е избришана.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Датотеките не се прикачени. Обидете се повторно.', 'success' => 'Датотеките се прикачени.', 'nofiles' => 'Не одбравте датотеки за прикачување', 'invalidfiles' => 'Една или повеќе од вашите датотеки е преголема или е тип на датотека што не е дозволен. Дозволени типови на датотеки се png, gif, jpg, doc, docx, pdf и txt.', - ), + ], -); +]; diff --git a/resources/lang/mk/admin/users/table.php b/resources/lang/mk/admin/users/table.php index 8e718e126a..fa94d4a8f2 100644 --- a/resources/lang/mk/admin/users/table.php +++ b/resources/lang/mk/admin/users/table.php @@ -1,6 +1,6 @@ 'Активна', 'allow' => 'Дозволи', 'checkedout' => 'Основни средства', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Прикажи тековни корисници', 'show_deleted' => 'Прикажи ги избришаните корисници', 'title' => 'Наслов', - 'to_restore_them' => 'да се вратат.', + 'to_restore_them' => 'да се вратат.', 'updateuser' => 'Ажурирај го корисникот', 'username' => 'Корисничко име', - 'user_deleted_text' => 'Овој корисник е обележан како избришан.', + 'user_deleted_text' => 'Овој корисник е обележан како избришан.', 'username_note' => '(Ова се користи само за поврзување со Active Directory, а не за најава.)', 'cloneuser' => 'Клонирај корисник', 'viewusers' => 'Преглед на корисници', -); +]; diff --git a/resources/lang/mk/auth/general.php b/resources/lang/mk/auth/general.php index 78d4e3ed4e..a5f8974fb4 100644 --- a/resources/lang/mk/auth/general.php +++ b/resources/lang/mk/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/mk/auth/message.php b/resources/lang/mk/auth/message.php index 7763c2a99f..07339e6858 100644 --- a/resources/lang/mk/auth/message.php +++ b/resources/lang/mk/auth/message.php @@ -1,6 +1,6 @@ 'Постои корисник со оваа е-пошта.', 'account_not_found' => 'Корисничкото име или лозинката се неточни.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Оваа корисничка сметка е блокирана.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Имаше проблем при обидот да се најавите, обидете се повторно.', 'success' => 'Успешно сте најавени.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Имаше проблем при креирање на корисничката сметка, обидете се повторно.', 'success' => 'Корисничката сметка е креирана.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Имаше проблем при обидот да се добие кодот за ресетирање не лозинка, обидете се повторно.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Имаше проблем при ресетирање на лозинката, обидете се повторно.', 'success' => 'Вашата лозинка е ресетирана.', - ), + ], - -); +]; diff --git a/resources/lang/mk/button.php b/resources/lang/mk/button.php index 2cf17817c3..7eeb813813 100644 --- a/resources/lang/mk/button.php +++ b/resources/lang/mk/button.php @@ -1,6 +1,6 @@ 'Акции', 'add' => 'Додади ново', 'cancel' => 'Откажи', @@ -11,7 +11,7 @@ return array( 'request' => 'Побарај', 'submit' => 'Поднеси', 'upload' => 'Прикачи', - 'select_file' => 'Избери датотека...', + 'select_file' => 'Избери датотека...', 'select_files' => 'Избери датотека...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/mk/general.php b/resources/lang/mk/general.php index 690aa5e164..60a775344a 100644 --- a/resources/lang/mk/general.php +++ b/resources/lang/mk/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Пријавувања', 'user_requests_count' => 'Барања', 'city' => 'Град', - 'click_here' => 'Кликни тука', + 'click_here' => 'Кликни тука', 'clear_selection' => 'Отселектирај ги сите', 'companies' => 'Компании', 'company' => 'Компанија', 'component' => 'Компонента', 'components' => 'Компоненти', - 'complete' => 'Завршено', + 'complete' => 'Завршено', 'consumable' => 'Потрошен материјал', 'consumables' => 'Потрошен материјал', 'country' => 'Држава', diff --git a/resources/lang/mk/help.php b/resources/lang/mk/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/mk/help.php +++ b/resources/lang/mk/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/mk/mail.php b/resources/lang/mk/mail.php index b9b195b96e..28a396f971 100644 --- a/resources/lang/mk/mail.php +++ b/resources/lang/mk/mail.php @@ -1,6 +1,6 @@ 'Корисникот го откажал барањето за средство на веб-страницата', 'a_user_requested' => 'Корисникот побарал средство на веб-страницата', 'accessory_name' => 'Име на додаток:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/mk/pagination.php b/resources/lang/mk/pagination.php index adbd7187f6..6ebb48b911 100644 --- a/resources/lang/mk/pagination.php +++ b/resources/lang/mk/pagination.php @@ -1,6 +1,6 @@ 'Следна »', -); +]; diff --git a/resources/lang/mk/passwords.php b/resources/lang/mk/passwords.php index 99d27f6bd2..6f100fe74e 100644 --- a/resources/lang/mk/passwords.php +++ b/resources/lang/mk/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Линкот за вашата лозинка е испратен!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/mk/reminders.php b/resources/lang/mk/reminders.php index 0f15730e82..974f6f884d 100644 --- a/resources/lang/mk/reminders.php +++ b/resources/lang/mk/reminders.php @@ -1,6 +1,6 @@ "Лозинките мора да содржат најмалку шест знаци и да одговараат на потврдата.", + 'password' => 'Лозинките мора да содржат најмалку шест знаци и да одговараат на потврдата.', - "user" => "Корисничкото име или адресата за е-пошта е неточна", + 'user' => 'Корисничкото име или адресата за е-пошта е неточна', - "token" => "Токенот за ресетирање на лозинката е невалиден.", + 'token' => 'Токенот за ресетирање на лозинката е невалиден.', - "sent" => "Ако е пронајдена соодветна адреса за е-пошта, потсетникот за лозинка е испратен!", + 'sent' => 'Ако е пронајдена соодветна адреса за е-пошта, потсетникот за лозинка е испратен!', -); +]; diff --git a/resources/lang/mk/table.php b/resources/lang/mk/table.php index f0cfcc0288..16cd1aa5cd 100644 --- a/resources/lang/mk/table.php +++ b/resources/lang/mk/table.php @@ -1,10 +1,10 @@ 'Акции', 'action' => 'Акција', 'by' => 'Од', 'item' => 'Ставка', -); +]; diff --git a/resources/lang/mk/validation.php b/resources/lang/mk/validation.php index 1db44371b6..ca4c2157bd 100644 --- a/resources/lang/mk/validation.php +++ b/resources/lang/mk/validation.php @@ -1,6 +1,6 @@ ':attribute е веќе зафатен.', 'uploaded' => ':attribute не е прикачен.', 'url' => 'Форматот на :attribute не е валиден.', - "unique_undeleted" => ":attribute мора да биде уникатен.", + 'unique_undeleted' => ':attribute мора да биде уникатен.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Полето :attribute содржи знак што не е дозволен.", - "email_array" => "Една или повеќе е-пошти не се валидни.", - "hashed_pass" => "Вашата тековна лозинка е неточна", + 'alpha_space' => 'Полето :attribute содржи знак што не е дозволен.', + 'email_array' => 'Една или повеќе е-пошти не се валидни.', + 'hashed_pass' => 'Вашата тековна лозинка е неточна', 'dumbpwd' => 'Таа лозинка е премногу честа.', - "statuslabel_type" => "Мора да изберете валидна етикета за статус", + 'statuslabel_type' => 'Мора да изберете валидна етикета за статус', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ml-IN/admin/accessories/general.php b/resources/lang/ml-IN/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/ml-IN/admin/accessories/general.php +++ b/resources/lang/ml-IN/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/ml-IN/admin/accessories/message.php b/resources/lang/ml-IN/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/ml-IN/admin/accessories/message.php +++ b/resources/lang/ml-IN/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ml-IN/admin/accessories/table.php b/resources/lang/ml-IN/admin/accessories/table.php index e02d9f22e4..69c4d46aab 100644 --- a/resources/lang/ml-IN/admin/accessories/table.php +++ b/resources/lang/ml-IN/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Accessory Name', - -); +]; diff --git a/resources/lang/ml-IN/admin/asset_maintenances/form.php b/resources/lang/ml-IN/admin/asset_maintenances/form.php index 2aa005c45f..1cf3b4ce57 100644 --- a/resources/lang/ml-IN/admin/asset_maintenances/form.php +++ b/resources/lang/ml-IN/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', 'update' => 'Update', - 'create' => 'Create' + 'create' => 'Create', ]; diff --git a/resources/lang/ml-IN/admin/asset_maintenances/message.php b/resources/lang/ml-IN/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/ml-IN/admin/asset_maintenances/message.php +++ b/resources/lang/ml-IN/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ml-IN/admin/asset_maintenances/table.php b/resources/lang/ml-IN/admin/asset_maintenances/table.php index f3a6be60f9..3ba895038d 100644 --- a/resources/lang/ml-IN/admin/asset_maintenances/table.php +++ b/resources/lang/ml-IN/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/ml-IN/admin/categories/general.php b/resources/lang/ml-IN/admin/categories/general.php index f681aaf85c..6b8f9fa1af 100644 --- a/resources/lang/ml-IN/admin/categories/general.php +++ b/resources/lang/ml-IN/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'വിഭാഗത്തിന്റെ പേര്', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/ml-IN/admin/categories/message.php b/resources/lang/ml-IN/admin/categories/message.php index b5d21a7691..03a462258e 100644 --- a/resources/lang/ml-IN/admin/categories/message.php +++ b/resources/lang/ml-IN/admin/categories/message.php @@ -1,25 +1,25 @@ 'ഇ വിഭാഗം നിലവിലില്ല.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/categories/table.php b/resources/lang/ml-IN/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/ml-IN/admin/categories/table.php +++ b/resources/lang/ml-IN/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/ml-IN/admin/companies/general.php b/resources/lang/ml-IN/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/ml-IN/admin/companies/general.php +++ b/resources/lang/ml-IN/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/ml-IN/admin/companies/message.php b/resources/lang/ml-IN/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/ml-IN/admin/companies/message.php +++ b/resources/lang/ml-IN/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/ml-IN/admin/companies/table.php b/resources/lang/ml-IN/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/ml-IN/admin/companies/table.php +++ b/resources/lang/ml-IN/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/ml-IN/admin/components/general.php b/resources/lang/ml-IN/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/ml-IN/admin/components/general.php +++ b/resources/lang/ml-IN/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/ml-IN/admin/components/message.php b/resources/lang/ml-IN/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/ml-IN/admin/components/message.php +++ b/resources/lang/ml-IN/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ml-IN/admin/components/table.php b/resources/lang/ml-IN/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/ml-IN/admin/components/table.php +++ b/resources/lang/ml-IN/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/ml-IN/admin/consumables/general.php b/resources/lang/ml-IN/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/ml-IN/admin/consumables/general.php +++ b/resources/lang/ml-IN/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/ml-IN/admin/consumables/message.php b/resources/lang/ml-IN/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/ml-IN/admin/consumables/message.php +++ b/resources/lang/ml-IN/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ml-IN/admin/consumables/table.php b/resources/lang/ml-IN/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/ml-IN/admin/consumables/table.php +++ b/resources/lang/ml-IN/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/ml-IN/admin/custom_fields/general.php b/resources/lang/ml-IN/admin/custom_fields/general.php index c8d2a70a71..011f983f77 100644 --- a/resources/lang/ml-IN/admin/custom_fields/general.php +++ b/resources/lang/ml-IN/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/ml-IN/admin/custom_fields/message.php b/resources/lang/ml-IN/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/ml-IN/admin/custom_fields/message.php +++ b/resources/lang/ml-IN/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ml-IN/admin/departments/message.php b/resources/lang/ml-IN/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/ml-IN/admin/departments/message.php +++ b/resources/lang/ml-IN/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/departments/table.php b/resources/lang/ml-IN/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/ml-IN/admin/departments/table.php +++ b/resources/lang/ml-IN/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/ml-IN/admin/depreciations/general.php b/resources/lang/ml-IN/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/ml-IN/admin/depreciations/general.php +++ b/resources/lang/ml-IN/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/ml-IN/admin/depreciations/message.php b/resources/lang/ml-IN/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/ml-IN/admin/depreciations/message.php +++ b/resources/lang/ml-IN/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/depreciations/table.php b/resources/lang/ml-IN/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/ml-IN/admin/depreciations/table.php +++ b/resources/lang/ml-IN/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/ml-IN/admin/groups/message.php b/resources/lang/ml-IN/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/ml-IN/admin/groups/message.php +++ b/resources/lang/ml-IN/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/ml-IN/admin/groups/table.php b/resources/lang/ml-IN/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/ml-IN/admin/groups/table.php +++ b/resources/lang/ml-IN/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/ml-IN/admin/groups/titles.php b/resources/lang/ml-IN/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/ml-IN/admin/groups/titles.php +++ b/resources/lang/ml-IN/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/ml-IN/admin/hardware/form.php b/resources/lang/ml-IN/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/ml-IN/admin/hardware/form.php +++ b/resources/lang/ml-IN/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/ml-IN/admin/hardware/general.php b/resources/lang/ml-IN/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/ml-IN/admin/hardware/general.php +++ b/resources/lang/ml-IN/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/ml-IN/admin/hardware/message.php b/resources/lang/ml-IN/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/ml-IN/admin/hardware/message.php +++ b/resources/lang/ml-IN/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/hardware/table.php b/resources/lang/ml-IN/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/ml-IN/admin/hardware/table.php +++ b/resources/lang/ml-IN/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/ml-IN/admin/kits/general.php b/resources/lang/ml-IN/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ml-IN/admin/kits/general.php +++ b/resources/lang/ml-IN/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ml-IN/admin/licenses/form.php b/resources/lang/ml-IN/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/ml-IN/admin/licenses/form.php +++ b/resources/lang/ml-IN/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/ml-IN/admin/licenses/general.php b/resources/lang/ml-IN/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/ml-IN/admin/licenses/general.php +++ b/resources/lang/ml-IN/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/ml-IN/admin/licenses/message.php b/resources/lang/ml-IN/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/ml-IN/admin/licenses/message.php +++ b/resources/lang/ml-IN/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/licenses/table.php b/resources/lang/ml-IN/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/ml-IN/admin/licenses/table.php +++ b/resources/lang/ml-IN/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/ml-IN/admin/locations/message.php b/resources/lang/ml-IN/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/ml-IN/admin/locations/message.php +++ b/resources/lang/ml-IN/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/locations/table.php b/resources/lang/ml-IN/admin/locations/table.php index 5319640b24..17e22f8a0b 100644 --- a/resources/lang/ml-IN/admin/locations/table.php +++ b/resources/lang/ml-IN/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/ml-IN/admin/manufacturers/message.php b/resources/lang/ml-IN/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/ml-IN/admin/manufacturers/message.php +++ b/resources/lang/ml-IN/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/manufacturers/table.php b/resources/lang/ml-IN/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/ml-IN/admin/manufacturers/table.php +++ b/resources/lang/ml-IN/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/ml-IN/admin/models/general.php b/resources/lang/ml-IN/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/ml-IN/admin/models/general.php +++ b/resources/lang/ml-IN/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/ml-IN/admin/models/message.php b/resources/lang/ml-IN/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/ml-IN/admin/models/message.php +++ b/resources/lang/ml-IN/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/models/table.php b/resources/lang/ml-IN/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/ml-IN/admin/models/table.php +++ b/resources/lang/ml-IN/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/ml-IN/admin/reports/general.php b/resources/lang/ml-IN/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/ml-IN/admin/reports/general.php +++ b/resources/lang/ml-IN/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/ml-IN/admin/reports/message.php b/resources/lang/ml-IN/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/ml-IN/admin/reports/message.php +++ b/resources/lang/ml-IN/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/ml-IN/admin/settings/general.php +++ b/resources/lang/ml-IN/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ml-IN/admin/settings/message.php b/resources/lang/ml-IN/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/ml-IN/admin/settings/message.php +++ b/resources/lang/ml-IN/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/ml-IN/admin/statuslabels/message.php b/resources/lang/ml-IN/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/ml-IN/admin/statuslabels/message.php +++ b/resources/lang/ml-IN/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/ml-IN/admin/statuslabels/table.php b/resources/lang/ml-IN/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/ml-IN/admin/statuslabels/table.php +++ b/resources/lang/ml-IN/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/ml-IN/admin/suppliers/message.php b/resources/lang/ml-IN/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/ml-IN/admin/suppliers/message.php +++ b/resources/lang/ml-IN/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ml-IN/admin/suppliers/table.php b/resources/lang/ml-IN/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/ml-IN/admin/suppliers/table.php +++ b/resources/lang/ml-IN/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/ml-IN/admin/users/general.php b/resources/lang/ml-IN/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/ml-IN/admin/users/general.php +++ b/resources/lang/ml-IN/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/ml-IN/admin/users/message.php b/resources/lang/ml-IN/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/ml-IN/admin/users/message.php +++ b/resources/lang/ml-IN/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/ml-IN/admin/users/table.php b/resources/lang/ml-IN/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/ml-IN/admin/users/table.php +++ b/resources/lang/ml-IN/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/ml-IN/auth/general.php b/resources/lang/ml-IN/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/ml-IN/auth/general.php +++ b/resources/lang/ml-IN/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ml-IN/auth/message.php b/resources/lang/ml-IN/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/ml-IN/auth/message.php +++ b/resources/lang/ml-IN/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/ml-IN/button.php b/resources/lang/ml-IN/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/ml-IN/button.php +++ b/resources/lang/ml-IN/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/ml-IN/general.php +++ b/resources/lang/ml-IN/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/ml-IN/help.php b/resources/lang/ml-IN/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ml-IN/help.php +++ b/resources/lang/ml-IN/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ml-IN/mail.php b/resources/lang/ml-IN/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/ml-IN/mail.php +++ b/resources/lang/ml-IN/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ml-IN/pagination.php b/resources/lang/ml-IN/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/ml-IN/pagination.php +++ b/resources/lang/ml-IN/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/ml-IN/passwords.php b/resources/lang/ml-IN/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/ml-IN/passwords.php +++ b/resources/lang/ml-IN/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/ml-IN/reminders.php b/resources/lang/ml-IN/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/ml-IN/reminders.php +++ b/resources/lang/ml-IN/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/ml-IN/table.php b/resources/lang/ml-IN/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/ml-IN/table.php +++ b/resources/lang/ml-IN/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/ml-IN/validation.php b/resources/lang/ml-IN/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/ml-IN/validation.php +++ b/resources/lang/ml-IN/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/mn/admin/accessories/general.php b/resources/lang/mn/admin/accessories/general.php index 507ae7daed..189bb2efd5 100644 --- a/resources/lang/mn/admin/accessories/general.php +++ b/resources/lang/mn/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Дагалдах хэрэгслийн ангилал', 'accessory_name' => 'Дагалдах хэрэгслийн нэр', 'checkout' => 'Төлбөрийн дагалдах хэрэгсэл', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Оронд нь програмын үндсэн EULA-г ашиглаарай.', 'use_default_eula_disabled' => ' оронд үндсэн анхдагч EULA ашигла. Үндсэн анхдагч EULA тохируулагдаагүй байна. Тохиргоо дотроос нэгийг нэмж оруулна уу.', -); +]; diff --git a/resources/lang/mn/admin/accessories/message.php b/resources/lang/mn/admin/accessories/message.php index 073437e0cb..545f4face2 100644 --- a/resources/lang/mn/admin/accessories/message.php +++ b/resources/lang/mn/admin/accessories/message.php @@ -1,37 +1,36 @@ '[:id] дагалдах хэрэгсэл байхгүй байна.', 'assoc_users' => 'Одоогоор энэ дагалдах хэрэгсэлд: хэрэглэгчдийг шалгасан зүйлсийг тоолж байна. Дагалдах хэрэгслийг шалгаад, дахин оролдоно уу.', - 'create' => array( + 'create' => [ 'error' => 'Дагалдах хэрэгсэл үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Дагалдах хэрэгсэл амжилттай хийгдсэн.' - ), + 'success' => 'Дагалдах хэрэгсэл амжилттай хийгдсэн.', + ], - 'update' => array( + 'update' => [ 'error' => 'Дагалдах хэрэгсэл шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Дагалдах хэрэгсэл амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Дагалдах хэрэгсэл амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ нэмэлт хэрэгслийг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Дагалдах хэрэгсэл устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Дагалдах хэрэгсэл амжилттай устгагдсан.' - ), + 'success' => 'Дагалдах хэрэгсэл амжилттай устгагдсан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Дагалдах хэрэгсэл шалгагдаагүй байна, дахин оролдоно уу', 'success' => 'Дагалдах хэрэгсэл амжилттай шалгасан.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ), + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Дагалдах хэрэгсэл нэвтэрсэнгүй, дахин оролдоно уу', 'success' => 'Дагалдах хэрэгсэл амжилттай шалгасан байна.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ) + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - -); +]; diff --git a/resources/lang/mn/admin/accessories/table.php b/resources/lang/mn/admin/accessories/table.php index 9e7c62f2c7..9eee01597e 100644 --- a/resources/lang/mn/admin/accessories/table.php +++ b/resources/lang/mn/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV файл татах', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'CSV файл татах', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Зөвшөөрөл', 'title' => 'Аксессуарын нэр', - -); +]; diff --git a/resources/lang/mn/admin/asset_maintenances/form.php b/resources/lang/mn/admin/asset_maintenances/form.php index 749714cde3..f301ac2f7b 100644 --- a/resources/lang/mn/admin/asset_maintenances/form.php +++ b/resources/lang/mn/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Хоног', 'notes' => 'Тэмдэглэл', 'update' => 'Шинэчлэх', - 'create' => 'Үүсгэх' + 'create' => 'Үүсгэх', ]; diff --git a/resources/lang/mn/admin/asset_maintenances/message.php b/resources/lang/mn/admin/asset_maintenances/message.php index b13eea9512..dbaf06e92c 100644 --- a/resources/lang/mn/admin/asset_maintenances/message.php +++ b/resources/lang/mn/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Та устгахдаа итгэлтэй байна уу?', 'error' => 'Устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Амжилттай устгалаа.' + 'success' => 'Амжилттай устгалаа.', ], 'create' => [ 'error' => 'Үүсгэж чадсангүй, дахин оролдоно уу.', - 'success' => 'Амжилттай үүсгэлээ.' + 'success' => 'Амжилттай үүсгэлээ.', ], 'edit' => [ 'error' => 'Хөрөнгийн засварыг засаагүй байна, дахин оролдоно уу.', - 'success' => 'Хөрөнгийн засварыг амжилттай засварлав.' + 'success' => 'Хөрөнгийн засварыг амжилттай засварлав.', ], 'asset_maintenance_incomplete' => 'Дуусаагүй', 'warranty' => 'Баталгаа', 'not_warranty' => 'Баталгаагүй', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/mn/admin/asset_maintenances/table.php b/resources/lang/mn/admin/asset_maintenances/table.php index 70e892afd4..60e22788d7 100644 --- a/resources/lang/mn/admin/asset_maintenances/table.php +++ b/resources/lang/mn/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Засвар үйлчилгээ', 'asset_name' => 'Хөрөнгийн нэр', 'is_warranty' => 'Баталгаа', - 'dl_csv' => 'CSV файл татах' + 'dl_csv' => 'CSV файл татах', ]; diff --git a/resources/lang/mn/admin/categories/general.php b/resources/lang/mn/admin/categories/general.php index 224ac23589..baf04df0fc 100644 --- a/resources/lang/mn/admin/categories/general.php +++ b/resources/lang/mn/admin/categories/general.php @@ -1,6 +1,6 @@ 'Хөрөнгийн ангиллууд', 'category_name' => 'Ангиллын нэр', 'checkin_email' => 'Авах/олгох үед хэрэглэгч үрүү имэйл илгээх.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Үүний оронд үндсэн стандарт EULA -г ашиглана уу.', 'use_default_eula_disabled' => 'Үүний оронд үндсэн хэрэглэгчийн гэрээг ашиглана уу. Үндсэн хэрэглэгчийн гэрээг зааж өгөөгүй байна. Тохируулга хэсэгт нэмж оруулна уу.', -); +]; diff --git a/resources/lang/mn/admin/categories/message.php b/resources/lang/mn/admin/categories/message.php index d03ecaecf0..a75dcb9321 100644 --- a/resources/lang/mn/admin/categories/message.php +++ b/resources/lang/mn/admin/categories/message.php @@ -1,25 +1,25 @@ 'Ангилал байхгүй байна.', 'assoc_models' => 'Энэ ангилалд дор хаяж нэг загвартай холбоотой бөгөөд устгагдах боломжгүй байна. Энэ загварыг цаашид ашиглахгүй байхаар загвараа шинэчлээд дахин оролдоно уу.', 'assoc_items' => 'Энэ категор нь дор хаяж нэг: asset_typeтэй холбоотой бөгөөд устгах боломжгүй. Та: asset_type-ыг энэ ангилалд хамааруулахгүй болгож дахин оролдоно уу.', - 'create' => array( + 'create' => [ 'error' => 'Ангилал үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Ангилал амжилттай болсон.' - ), + 'success' => 'Ангилал амжилттай болсон.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ангилал шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Ангилал амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Ангилал амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ категорийг устгахдаа итгэлтэй байна уу?', 'error' => 'Категорийг устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Ангилал амжилттай устгагдсан байна.' - ) + 'success' => 'Ангилал амжилттай устгагдсан байна.', + ], -); +]; diff --git a/resources/lang/mn/admin/categories/table.php b/resources/lang/mn/admin/categories/table.php index 2287db2c8d..a061639b34 100644 --- a/resources/lang/mn/admin/categories/table.php +++ b/resources/lang/mn/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Эцэг эх', 'require_acceptance' => 'Хүлээн зөвшөөрөх', 'title' => 'Активын нэр', -); +]; diff --git a/resources/lang/mn/admin/companies/general.php b/resources/lang/mn/admin/companies/general.php index d1c56790e5..ecb7295359 100644 --- a/resources/lang/mn/admin/companies/general.php +++ b/resources/lang/mn/admin/companies/general.php @@ -1,4 +1,5 @@ 'Компани сонгох', ]; diff --git a/resources/lang/mn/admin/companies/message.php b/resources/lang/mn/admin/companies/message.php index 1450666808..15e0b3bf5c 100644 --- a/resources/lang/mn/admin/companies/message.php +++ b/resources/lang/mn/admin/companies/message.php @@ -1,18 +1,19 @@ 'Компани байхгүй байна.', 'assoc_users' => 'Энэ компани одоогоор хамгийн багадаа нэг загвартай холбоотой бөгөөд устгах боломжгүй байна. Энэ компанийг цаашид лавлахын тулд загвараа шинэчлээд дахин оролдоно уу.', - 'create' => array( + 'create' => [ 'error' => 'Компани бүтээгдээгүй, дахин оролдоно уу.', - 'success' => 'Компани амжилттай байгуулагдсан.' - ), - 'update' => array( + 'success' => 'Компани амжилттай байгуулагдсан.', + ], + 'update' => [ 'error' => 'Компани шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Компани амжилттай шинэчлэгдсэн.' - ), - 'delete' => array( + 'success' => 'Компани амжилттай шинэчлэгдсэн.', + ], + 'delete' => [ 'confirm' => 'Та энэ компанийг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Компаниыг устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Компани амжилттай устгасан.' - ) -); + 'success' => 'Компани амжилттай устгасан.', + ], +]; diff --git a/resources/lang/mn/admin/companies/table.php b/resources/lang/mn/admin/companies/table.php index 3446134d30..45fe32391e 100644 --- a/resources/lang/mn/admin/companies/table.php +++ b/resources/lang/mn/admin/companies/table.php @@ -1,9 +1,10 @@ 'Компаниуд', 'create' => 'Компани үүсгэх', 'title' => 'Компани', 'update' => 'Компанийг шинэчлэх', 'name' => 'Компанийн нэр', 'id' => 'ID', -); +]; diff --git a/resources/lang/mn/admin/components/general.php b/resources/lang/mn/admin/components/general.php index 1c90756a82..0bba736572 100644 --- a/resources/lang/mn/admin/components/general.php +++ b/resources/lang/mn/admin/components/general.php @@ -1,6 +1,6 @@ 'Бүрэлдэхүүн хэсэг Нэр', 'checkin' => 'Checkin Component', 'checkout' => 'Тооцоо хийх хэсэг', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Үлдсэн', 'total' => 'Нийт', 'update' => 'Бүрэлдэхүүн хэсэг шинэчлэх', -); +]; diff --git a/resources/lang/mn/admin/components/message.php b/resources/lang/mn/admin/components/message.php index 1adaea3e11..2725baf10c 100644 --- a/resources/lang/mn/admin/components/message.php +++ b/resources/lang/mn/admin/components/message.php @@ -1,36 +1,35 @@ 'Бүрэлдэхүүн хэсэг байхгүй байна.', - 'create' => array( + 'create' => [ 'error' => 'Бүрэлдэхүүн бүтээсэнгүй, дахин оролдоно уу.', - 'success' => 'Бүрэлдэхүүн хэсэг амжилттай бүтээгдсэн.' - ), + 'success' => 'Бүрэлдэхүүн хэсэг амжилттай бүтээгдсэн.', + ], - 'update' => array( + 'update' => [ 'error' => 'Бүрэлдэхүүн шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Бүрэлдэхүүн хэсэг амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Бүрэлдэхүүн хэсэг амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ бүрэлдэхүүн хэсгийг устгахдаа итгэлтэй байна уу?', 'error' => 'Энэ бүрэлдэхүүнийг устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Бүрэлдэхүүн хэсэг амжилттай устгагдсан.' - ), + 'success' => 'Бүрэлдэхүүн хэсэг амжилттай устгагдсан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Бүрэлдэхүүнийг шалгаагүй байна, дахин оролдоно уу', 'success' => 'Бүрэлдэхүүн хэсэг амжилттай шалгагдсан.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ), + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Бүрэлдэхүүнийг шалгаагүй байна, дахин оролдоно уу', 'success' => 'Бүрэлдэхүүн хэсэг амжилттай шалгагдсан.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ) + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - -); +]; diff --git a/resources/lang/mn/admin/components/table.php b/resources/lang/mn/admin/components/table.php index 017c29fbf3..b4e99b74ea 100644 --- a/resources/lang/mn/admin/components/table.php +++ b/resources/lang/mn/admin/components/table.php @@ -1,5 +1,5 @@ 'Бүрэлдэхүүн хэсэг Нэр', -); +]; diff --git a/resources/lang/mn/admin/consumables/general.php b/resources/lang/mn/admin/consumables/general.php index c3c78d0399..cc38b7216b 100644 --- a/resources/lang/mn/admin/consumables/general.php +++ b/resources/lang/mn/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Хэрэглэгчдэд хэрэглэх боломжтой', 'consumable_name' => 'Боломжийн нэр', 'create' => 'Болгоомжтой болгох', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Үлдсэн', 'total' => 'Нийт', 'update' => 'Боломжийн талаар шинэчиллээ', -); +]; diff --git a/resources/lang/mn/admin/consumables/message.php b/resources/lang/mn/admin/consumables/message.php index 1bc8297097..4fdfa335c3 100644 --- a/resources/lang/mn/admin/consumables/message.php +++ b/resources/lang/mn/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Хадгалах боломжгүй.', - 'create' => array( + 'create' => [ 'error' => 'Боломжит бүтээгдээгүй байна, дахин оролдоно уу.', - 'success' => 'Боломжит бүтээмж амжилттай болсон.' - ), + 'success' => 'Боломжит бүтээмж амжилттай болсон.', + ], - 'update' => array( + 'update' => [ 'error' => 'Боломжийн талаар шинэчилсэн, дахин оролдоно уу', - 'success' => 'Хэрэглээ шинэчлэгдсэн.' - ), + 'success' => 'Хэрэглээ шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та үүнийг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Хэрэглэгдэхүүн устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Хэрэглүүр амжилттай устгагдсан.' - ), + 'success' => 'Хэрэглүүр амжилттай устгагдсан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Боломжийн талаар шалгаагүй байна, дахин оролдоно уу', 'success' => 'Боломжийн талаар амжилттай шалгасан.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ), + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Боломжийн талаар шалгаагүй байна, дахин оролдоно уу', 'success' => 'Боломжийн шалгуурт амжилттай шалгагдсан.', - 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.' - ) + 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', + ], - -); +]; diff --git a/resources/lang/mn/admin/consumables/table.php b/resources/lang/mn/admin/consumables/table.php index 3715b6935e..419735dfdd 100644 --- a/resources/lang/mn/admin/consumables/table.php +++ b/resources/lang/mn/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Боломжийн нэр', -); +]; diff --git a/resources/lang/mn/admin/custom_fields/general.php b/resources/lang/mn/admin/custom_fields/general.php index 8cf5f78af4..f3d19d3665 100644 --- a/resources/lang/mn/admin/custom_fields/general.php +++ b/resources/lang/mn/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Гаалийн талбарууд', 'field' => 'Талбар', 'about_fieldsets_title' => 'Fieldsets-ийн тухай', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Шинэ Гаалийн талбар', 'value_encrypted' => 'Энэ талбарын үнэ цэнийг мэдээллийн санд шифрлэдэг. Зөвхөн админ хэрэглэгч нар нь буцаагдсан утгыг харах боломжтой байна', 'show_in_email' => 'Хэрэглэгчид илгээсэн олголтын имэйлд энэ талбарын утгыг оруулах уу? Шифрлэгдсэн талбаруудыг имэйлд оруулах боломжгүй.', -); +]; diff --git a/resources/lang/mn/admin/custom_fields/message.php b/resources/lang/mn/admin/custom_fields/message.php index 41df018663..8a063addc1 100644 --- a/resources/lang/mn/admin/custom_fields/message.php +++ b/resources/lang/mn/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Энэ талбар байхгүй байна.', 'already_added' => 'Талбай нэмэгдсэн байна', - 'create' => array( + 'create' => [ 'error' => 'Талбар үүсгэгдсэнгүй, дахин оролдоно уу.', 'success' => 'Талбай амжилттай болсон.', - 'assoc_success' => 'Field талбарт амжилттай нэмсэн.' - ), + 'assoc_success' => 'Field талбарт амжилттай нэмсэн.', + ], - 'update' => array( + 'update' => [ 'error' => 'Талбар шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Field амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Field амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ талбарыг устгахыг хүсч байна уу?', 'error' => 'Энэ талбарыг устгах асуудал гарлаа. Дахин оролдоно уу.', 'success' => 'Талбар амжилттай устгагдсан байна.', 'in_use' => 'Талбар ашиглагдаж байна.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset байхгүй байна', - 'create' => array( + 'create' => [ 'error' => 'Fieldset үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Fieldset амжилттай болсон.' - ), + 'success' => 'Fieldset амжилттай болсон.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Fieldset амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Fieldset амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ талбарыг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Энэ талбарыг устгах асуудал гарлаа. Дахин оролдоно уу.', 'success' => 'Fields амжилттай устгагдсан байна.', 'in_use' => 'Fieldset ашиглагдаж байна.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/mn/admin/departments/message.php b/resources/lang/mn/admin/departments/message.php index 60176b297a..2fb23513fb 100644 --- a/resources/lang/mn/admin/departments/message.php +++ b/resources/lang/mn/admin/departments/message.php @@ -1,21 +1,21 @@ 'Хэлтэс байхгүй байна.', 'assoc_users' => 'Энэ хэлтэс нь одоогоор хамгийн багадаа нэг хэрэглэгчтэй холбоотой бөгөөд устгах боломжгүй байна. Энэ хэрэглэгчийн лавлагааг цаашид хэрэггүй болгохын тулд хэрэглэгчиддээ шинэчилнэ үү.', - 'create' => array( + 'create' => [ 'error' => 'Газар үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Газар амжилттай бий болсон.' - ), - 'update' => array( + 'success' => 'Газар амжилттай бий болсон.', + ], + 'update' => [ 'error' => 'Хэлтэс шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Газар амжилттай шинэчлэгдсэн.' - ), - 'delete' => array( + 'success' => 'Газар амжилттай шинэчлэгдсэн.', + ], + 'delete' => [ 'confirm' => 'Та энэ хэлтэст устгахыг хүсч байна уу?', 'error' => 'Департаментыг устгах асуудал гарсан. Дахин оролдоно уу.', - 'success' => 'Энэ хэлтэс амжилттай устгагдсан.' - ) + 'success' => 'Энэ хэлтэс амжилттай устгагдсан.', + ], -); +]; diff --git a/resources/lang/mn/admin/departments/table.php b/resources/lang/mn/admin/departments/table.php index 541b45f6f7..e785d89f03 100644 --- a/resources/lang/mn/admin/departments/table.php +++ b/resources/lang/mn/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Газрын нэр', @@ -8,4 +8,4 @@ return array( 'location' => 'Байршил', 'create' => 'Газар үүсгэх', 'update' => 'Шинэчилсэн газар', - ); + ]; diff --git a/resources/lang/mn/admin/depreciations/general.php b/resources/lang/mn/admin/depreciations/general.php index 05cb05f281..e023a663df 100644 --- a/resources/lang/mn/admin/depreciations/general.php +++ b/resources/lang/mn/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Хөрөнгийн элэгдлийн тухай', 'about_depreciations' => 'Та шулуун шугамын элэгдэл дээр үндэслэн хөрөнгийг элэгдүүлэхийн тулд хөрөнгийн элэгдлийг үүсгэж болно.', 'asset_depreciations' => 'Хөрөнгийн элэгдэл', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Сарын тоо', 'update' => 'Элэгдэл шинэчлэх', -); +]; diff --git a/resources/lang/mn/admin/depreciations/message.php b/resources/lang/mn/admin/depreciations/message.php index 5d1dde23de..79d65c174b 100644 --- a/resources/lang/mn/admin/depreciations/message.php +++ b/resources/lang/mn/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Элэгдлийн анги байхгүй байна.', 'assoc_users' => 'Энэ элэгдэл нэг буюу хэд хэдэн загвартай холбоотой бөгөөд устгах боломжгүй. Загваруудыг устгаж, дараа нь устгахыг оролдоно уу.', - - 'create' => array( + 'create' => [ 'error' => 'Элэгдэлийн анги үүссэнгүй, дахин оролдоно уу. :(', - 'success' => 'Элэгдэлийн элэгдэл бий болсон. :)' - ), + 'success' => 'Элэгдэлийн элэгдэл бий болсон. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Элэгдэлийн анги шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Элэгдэлийн ангилал амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Элэгдэлийн ангилал амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ элэгдлийн ангилалыг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Элэгдлийн анги устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Элэгдэлийн анги амжилттай устгасан.' - ) + 'success' => 'Элэгдэлийн анги амжилттай устгасан.', + ], -); +]; diff --git a/resources/lang/mn/admin/depreciations/table.php b/resources/lang/mn/admin/depreciations/table.php index bbbc6424d2..e2b962fafc 100644 --- a/resources/lang/mn/admin/depreciations/table.php +++ b/resources/lang/mn/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Сар', 'term' => 'Хугацаа', 'title' => 'Нэр', -); +]; diff --git a/resources/lang/mn/admin/groups/message.php b/resources/lang/mn/admin/groups/message.php index 6ee7aef5c6..41d927a1c8 100644 --- a/resources/lang/mn/admin/groups/message.php +++ b/resources/lang/mn/admin/groups/message.php @@ -1,22 +1,22 @@ 'Групп аль хэдийн байна!', 'group_not_found' => 'Групп [: id] байхгүй байна.', 'group_name_required' => 'Нэрийн талбар шаардлагатай', - 'success' => array( + 'success' => [ 'create' => 'Групп амжилттай болсон.', 'update' => 'Групп амжилттай шинэчлэгдсэн.', 'delete' => 'Групп амжилттай устгагдсан байна.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ бүлгийг устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'create' => 'Бүлэг үүсгэх асуудал үүссэн. Дахин оролдоно уу.', 'update' => 'Бүлгийг шинэчлэх асуудал гарлаа. Дахин оролдоно уу.', 'delete' => 'Бүлгийг устгах асуудал гарлаа. Дахин оролдоно уу.', - ), + ], -); +]; diff --git a/resources/lang/mn/admin/groups/table.php b/resources/lang/mn/admin/groups/table.php index 893cc7ccbb..36cf445f66 100644 --- a/resources/lang/mn/admin/groups/table.php +++ b/resources/lang/mn/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Нэр', 'users' => 'Хэрэглэгчдийн тоо #', -); +]; diff --git a/resources/lang/mn/admin/groups/titles.php b/resources/lang/mn/admin/groups/titles.php index 75be315a24..02bab0008b 100644 --- a/resources/lang/mn/admin/groups/titles.php +++ b/resources/lang/mn/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Бүлгүүдийн тухай', 'about_groups' => 'Бүлгүүд нь хэрэглэгчийн зөвшөөрлүүдийг ерөнхийд нь тодорхойлоход ашиглагддаг.', 'group_management' => 'Группын удирдлага', @@ -11,4 +11,4 @@ return array( 'allow' => 'Зөвшөөрнө үү', 'deny' => 'Дене', -); +]; diff --git a/resources/lang/mn/admin/hardware/form.php b/resources/lang/mn/admin/hardware/form.php index 440e3483e4..6de730313b 100644 --- a/resources/lang/mn/admin/hardware/form.php +++ b/resources/lang/mn/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Бөөнөөр устгах активыг баталгаажуулна уу', +return [ + 'bulk_delete' => 'Бөөнөөр устгах активыг баталгаажуулна уу', 'bulk_delete_help' => 'Доорхи их хэмжээний устгалт хийх хөрөнгийг хянаж үзэх. Устгагдсан тохиолдолд эдгээр хөрөнгийг сэргээж болно. Гэхдээ тэдгээр нь одоогоор тэдгээрт хуваарилагдсан хэрэглэгчдэд хамааралгүй болно.', 'bulk_delete_warn' => 'Та устгах гэж байна: asset_count хөрөнгө.', - 'bulk_update' => 'Бөөнөөр шинэчлэх актив', - 'bulk_update_help' => 'Энэ маягтыг олон дахин нэг зэрэг олон актив шинэчлэх боломжтой. Зөвхөн өөрчлөх шаардлагатай талбаруудыг бөглөөрэй. Хоосон үлдсэн талбарууд өөрчлөгдөхгүй хэвээр үлдэнэ.', - 'bulk_update_warn' => 'Та asset_count активын шинж чанарыг засах гэж байна.', + 'bulk_update' => 'Бөөнөөр шинэчлэх актив', + 'bulk_update_help' => 'Энэ маягтыг олон дахин нэг зэрэг олон актив шинэчлэх боломжтой. Зөвхөн өөрчлөх шаардлагатай талбаруудыг бөглөөрэй. Хоосон үлдсэн талбарууд өөрчлөгдөхгүй хэвээр үлдэнэ.', + 'bulk_update_warn' => 'Та asset_count активын шинж чанарыг засах гэж байна.', 'checkedout_to' => 'Үүнийг шалгах', 'checkout_date' => 'Тооцоо хийх өдөр', 'checkin_date' => 'Checkin Огноо', @@ -38,7 +38,6 @@ return array( 'tag' => 'Хөрөнгийн шошго', 'update' => 'Хөрөнгийн шинэчлэлт', 'warranty' => 'Баталгаат', - 'warranty_expires' => 'Баталгаат хугацаа дуусах', + 'warranty_expires' => 'Баталгаат хугацаа дуусах', 'years' => 'жил', -) -; +]; diff --git a/resources/lang/mn/admin/hardware/general.php b/resources/lang/mn/admin/hardware/general.php index 835236c5b7..b5437436ab 100644 --- a/resources/lang/mn/admin/hardware/general.php +++ b/resources/lang/mn/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Хөрөнгийн тухай', 'about_assets_text' => 'Актив нь сериал дугаар буюу хөрөнгийн тэмдэгтээр хянагдсан зүйлс юм. Эдгээр нь тодорхой зүйлүүдийг тодорхойлоход илүү үнэ цэнэтэй зүйлс байх хандлагатай байдаг.', - 'archived' => 'Архивлагдсан', + 'archived' => 'Архивлагдсан', 'asset' => 'Актив', 'bulk_checkout' => 'Хөрөнгийг олгох', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Хүлээгдэж байна', 'undeployable' => 'Undeployable', 'view' => 'Хөрөнгийг харах', -); +]; diff --git a/resources/lang/mn/admin/hardware/message.php b/resources/lang/mn/admin/hardware/message.php index bcf7395446..2702ec5288 100644 --- a/resources/lang/mn/admin/hardware/message.php +++ b/resources/lang/mn/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Анхааруулга: Энэ хөрөнгө нь одоогоор хүчингүй болсон гэж тэмдэглэгдсэн байна. Хэрэв энэ байдал өөрчлөгдсөн бол хөрөнгийн статусыг шинэчлэнэ үү.', 'does_not_exist' => 'Хөрөнгө байхгүй байна.', 'does_not_exist_or_not_requestable' => 'Сайхан оролдлого. Энэ хөрөнгө байхгүй эсвэл хүсэлт гаргаагүй.', 'assoc_users' => 'Энэ хөрөнгийг одоогоор хэрэглэгчид шалгаж, устгах боломжгүй байна. Эхлээд хөрөнгийг шалгаж үзээд дараа нь устга.', - 'create' => array( + 'create' => [ 'error' => 'Акт үүсгээгүй байна, дахин оролдоно уу. :(', - 'success' => 'Хөрөнгө амжилттай болсон. :)' - ), + 'success' => 'Хөрөнгө амжилттай болсон. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Хөрөнгийн шинэчлэлт хийгдээгүй тул дахин оролдоно уу', 'success' => 'Акт амжилттай шинэчлэгдсэн.', 'nothing_updated' => 'Ямар ч талбар сонгогдоогүй тул шинэчлэгдээгүй байна.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Хөрөнгө сэргээгээгүй байна, дахин оролдоно уу', - 'success' => 'Хөрөнгийн амжилттай сэргээгдэв.' - ), + 'success' => 'Хөрөнгийн амжилттай сэргээгдэв.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Хөрөнгийн аудит амжилтгүй болсон. Дахин оролдоно уу.', - 'success' => 'Хөрөнгийн аудит амжилттай нэвтэрсэн байна.' - ), + 'success' => 'Хөрөнгийн аудит амжилттай нэвтэрсэн байна.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлыг устгаагүй байна. Дахин оролдоно уу.', 'success' => 'Файл амжилттай устгагдсан.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Файлд байршуулаагүй файл. Дахин оролдоно уу.', 'success' => 'Файлууд амжилттай байршуулсан.', 'nofiles' => 'Та байршуулах ямар ч файл сонгоогүй, эсвэл байршуулах гэж буй файл хэт том байна', 'invalidfiles' => 'Таны файлуудын нэг юмуу хэд нь хэтэрхий том юмуу эсвэл файлын төрлийг зөвшөөрдөггүй. Зөвшөөрөгдсөн filetypes нь png, gif, jpg, doc, docx, pdf, болон txt байна.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Зарим зүйлс зөв импорт хийгдээгүй байна.', 'errorDetail' => 'Дараах зүйлсийг алдааны улмаас импортолсонгүй.', - 'success' => "Таны файл импортлогдсон байна", - 'file_delete_success' => "Таны файл амжилттай болсон байна", - 'file_delete_error' => "Файл устгагдах боломжгүй байна", - ), + 'success' => 'Таны файл импортлогдсон байна', + 'file_delete_success' => 'Таны файл амжилттай болсон байна', + 'file_delete_error' => 'Файл устгагдах боломжгүй байна', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ хөрөнгийг устгахыг хүсч байна уу?', 'error' => 'Хөрөнгийг устгах асуудал гарлаа. Дахин оролдоно уу.', 'nothing_updated' => 'Ямар ч хөрөнгө сонгогдоогүй тул юу ч устгаагүй.', - 'success' => 'Хөрөнгийг амжилттай устгасан байна.' - ), + 'success' => 'Хөрөнгийг амжилттай устгасан байна.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Хөрөнгийг шалгаагүй байна, дахин оролдоно уу', 'success' => 'Акт амжилттай шалгасан.', 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', 'not_available' => 'Энэ хөрөнгийг татаж авахад бэлэн биш байна!', - 'no_assets_selected' => 'Жагсаалтаас доод тал нь нэг хөрөнгийг сонгоно уу' - ), + 'no_assets_selected' => 'Жагсаалтаас доод тал нь нэг хөрөнгийг сонгоно уу', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Хөрөнгө оруулаагүй байна, дахин оролдоно уу', 'success' => 'Хөрөнгө амжилттай шалгагдсан.', 'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.', 'already_checked_in' => 'Энэ аккаунтыг аль хэдийн шалгасан байна.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Акт хүсээгүй тул дахин оролдоно уу', 'success' => 'Хөрөнгө амжилттай ирэв.', - 'canceled' => 'Тооцоо хийх хүсэлт амжилттай цуцлагдсан' - ) + 'canceled' => 'Тооцоо хийх хүсэлт амжилттай цуцлагдсан', + ], -); +]; diff --git a/resources/lang/mn/admin/hardware/table.php b/resources/lang/mn/admin/hardware/table.php index 086dd37267..828cc251ee 100644 --- a/resources/lang/mn/admin/hardware/table.php +++ b/resources/lang/mn/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Хөрөнгийн шошго', 'asset_model' => 'Загвар', @@ -20,6 +20,6 @@ return array( 'title' => 'Актив', 'image' => 'Төхөөрөмжийн дүрс', 'days_without_acceptance' => 'Хүлээн зөвшөөрөхгүй өдрүүд', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/mn/admin/kits/general.php b/resources/lang/mn/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/mn/admin/kits/general.php +++ b/resources/lang/mn/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/mn/admin/licenses/form.php b/resources/lang/mn/admin/licenses/form.php index ab15e3dd19..67fca9c5d2 100644 --- a/resources/lang/mn/admin/licenses/form.php +++ b/resources/lang/mn/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Актив', 'checkin' => 'Шалгах', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Имэйлд тусгайлсан', 'to_name' => 'Нэрээр нь тусгайлсан', 'update' => 'Лицензийг шинэчлэх', - 'checkout_help' => 'Та лицензийг тоног төхөөрөмжийн хөрөнгө эсвэл хүн болгонд шалгаж үзэх ёстой. Та хоёуланг нь сонгож болно, гэхдээ хөрөнгийн эзэмшигч нь уг хөрөнгөө шалгаж байгаа хүнтэй таарах ёстой.' -); + 'checkout_help' => 'Та лицензийг тоног төхөөрөмжийн хөрөнгө эсвэл хүн болгонд шалгаж үзэх ёстой. Та хоёуланг нь сонгож болно, гэхдээ хөрөнгийн эзэмшигч нь уг хөрөнгөө шалгаж байгаа хүнтэй таарах ёстой.', +]; diff --git a/resources/lang/mn/admin/licenses/general.php b/resources/lang/mn/admin/licenses/general.php index 27cb9e1af2..4a9ba8ac4f 100644 --- a/resources/lang/mn/admin/licenses/general.php +++ b/resources/lang/mn/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Лицензийн тухай', 'about_licenses' => 'Програмыг хянах лицензийг ашигладаг. Тэдгээр нь тодорхой тооны суудалтай байдаг', 'checkin' => 'Checkin лицензийн суудал', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Програм хангамжийн лиценз', 'user' => 'Хэрэглэгч', 'view' => 'Лицензийг харах', -); +]; diff --git a/resources/lang/mn/admin/licenses/message.php b/resources/lang/mn/admin/licenses/message.php index 213ef46c59..f92f776c1a 100644 --- a/resources/lang/mn/admin/licenses/message.php +++ b/resources/lang/mn/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Лиценз байхгүй байна.', 'user_does_not_exist' => 'Хэрэглэгч байхгүй байна.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Та хөрөнгө эсвэл хэрэглэгчийг сонгох ёстой, гэхдээ хоёулаа биш.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Лиценз үүсгэгдсэнгүй, дахин оролдоно уу.', - 'success' => 'Лиценз амжилттай болсон.' - ), + 'success' => 'Лиценз амжилттай болсон.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлыг устгаагүй байна. Дахин оролдоно уу.', 'success' => 'Файл амжилттай устгагдсан.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Файлд байршуулаагүй файл. Дахин оролдоно уу.', 'success' => 'Файлууд амжилттай байршуулсан.', 'nofiles' => 'Та байршуулах ямар ч файл сонгоогүй, эсвэл байршуулах гэж буй файл хэт том байна', 'invalidfiles' => 'Таны файлуудын нэг юмуу хэд нь хэтэрхий том юмуу эсвэл файлын төрлийг зөвшөөрдөггүй. Зөвшөөрөгдсөн filetypes нь png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, lic юм.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Лиценз шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Лиценз шинэчлэгдсэн.' - ), + 'success' => 'Лиценз шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ лицензийг устгахыг хүсч байна уу?', 'error' => 'Лицензийг устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Лиценз амжилттай устгагдсан.' - ), + 'success' => 'Лиценз амжилттай устгагдсан.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Лицензийг шалгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Лицензийг амжилттай шалгасан' - ), + 'success' => 'Лицензийг амжилттай шалгасан', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Лиценз дээр асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Лицензийг амжилттай шалгасан байна' - ), + 'success' => 'Лицензийг амжилттай шалгасан байна', + ], -); +]; diff --git a/resources/lang/mn/admin/licenses/table.php b/resources/lang/mn/admin/licenses/table.php index cbbb4b61f4..7fac798cd6 100644 --- a/resources/lang/mn/admin/licenses/table.php +++ b/resources/lang/mn/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Томилогдсон', 'checkout' => 'Гадуур нь', @@ -14,4 +14,4 @@ return array( 'serial' => 'Цуваа', 'title' => 'Лиценз', -); +]; diff --git a/resources/lang/mn/admin/locations/message.php b/resources/lang/mn/admin/locations/message.php index 5e087d6c8a..56a29f3143 100644 --- a/resources/lang/mn/admin/locations/message.php +++ b/resources/lang/mn/admin/locations/message.php @@ -1,27 +1,26 @@ 'Байршил байхгүй байна.', 'assoc_users' => 'Энэ байршил нь одоогоор хамгийн багадаа нэг хэрэглэгчтэй холбоотой бөгөөд устгах боломжгүй байна. Энэ байршлыг лавшруулахгүй болгохын тулд хэрэглэгчдийг шинэчилнэ үү, дахин оролдоно уу.', 'assoc_assets' => 'Энэ байршил нь одоогоор нэгээс доошгүй активтай холбоотой бөгөөд устгах боломжгүй байна. Энэ байршлыг лавлагаа болгохоо болихын тулд өөрийн хөрөнгийг шинэчлээд дахин оролдоно уу.', 'assoc_child_loc' => 'Энэ байршил нь одоогоор хамгийн багадаа нэг хүүхдийн байрлалын эцэг эх бөгөөд устгах боломжгүй байна. Энэ байршлыг лавшруулахгүй болгохын тулд байршлаа шинэчлээд дахин оролдоно уу.', - - 'create' => array( + 'create' => [ 'error' => 'Байршалт үүсээгүй байна, дахин оролдоно уу.', - 'success' => 'Байршил амжилттай болсон.' - ), + 'success' => 'Байршил амжилттай болсон.', + ], - 'update' => array( + 'update' => [ 'error' => 'Байршил шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Байршил амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Байршил амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ байршлыг устгахыг хүсч байна уу?', 'error' => 'Байршил устгах асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Байршил амжилттай устгагдсан байна.' - ) + 'success' => 'Байршил амжилттай устгагдсан байна.', + ], -); +]; diff --git a/resources/lang/mn/admin/locations/table.php b/resources/lang/mn/admin/locations/table.php index 29735db626..a7b8bed794 100644 --- a/resources/lang/mn/admin/locations/table.php +++ b/resources/lang/mn/admin/locations/table.php @@ -1,6 +1,6 @@ 'Байршлын тухай', 'about_locations' => 'Байршил нь хэрэглэгчид, эд хөрөнгө, бусад зүйлсийн байршлын мэдээллийг хянахад ашиглагддаг', 'assets_rtd' => 'Актив', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Эцэг эх', 'currency' => 'Байршил валют', 'ldap_ou' => 'LDAP хайлт ОУ', - ); + ]; diff --git a/resources/lang/mn/admin/manufacturers/message.php b/resources/lang/mn/admin/manufacturers/message.php index e16ce77102..ce4359bc54 100644 --- a/resources/lang/mn/admin/manufacturers/message.php +++ b/resources/lang/mn/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Үйлдвэрлэгч байхгүй байна.', 'assoc_users' => 'Энэ үйлдвэр нь одоогоор хамгийн багадаа нэг загвартай холбоотой бөгөөд устгах боломжгүй. Энэ загварыг дахин үйлдвэрлэхээ больсон загвараа шинэчлээд дахин оролдоно уу.', - 'create' => array( + 'create' => [ 'error' => 'Үйлдвэрлэгч үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Үйлдвэрлэгч амжилттай ажиллаж байна.' - ), + 'success' => 'Үйлдвэрлэгч амжилттай ажиллаж байна.', + ], - 'update' => array( + 'update' => [ 'error' => 'Үйлдвэрлэгч шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Үйлдвэрлэгч амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Үйлдвэрлэгч амжилттай шинэчлэгдсэн.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Үйлдвэрлэгч сэргэгдээгүй тул дахин оролдоно уу', - 'success' => 'Үйлдвэрлэгч амжилттай сэргээгдсэн.' - ), + 'success' => 'Үйлдвэрлэгч амжилттай сэргээгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ үйлдвэрлэгчийн устгахыг хүсч байгаадаа итгэлтэй байна уу?', 'error' => 'Үйлдвэрлэгчийг устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Үйлдвэрлэгч амжилттай устгагдсан байна.' - ) + 'success' => 'Үйлдвэрлэгч амжилттай устгагдсан байна.', + ], -); +]; diff --git a/resources/lang/mn/admin/manufacturers/table.php b/resources/lang/mn/admin/manufacturers/table.php index 6f000c3fd5..f965bd9347 100644 --- a/resources/lang/mn/admin/manufacturers/table.php +++ b/resources/lang/mn/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Үйлдвэрлэгчийн талаар', 'about_manufacturers_text' => 'Үйлдвэрлэгчид нь таны хөрөнгийг үүсгэдэг компаниуд юм. Та эдгээрийн талаар чухал мэдээллийг холбоо барих мэдээллийг хадгалах боломжтой бөгөөд энэ нь таны хөрөнгийн дэлгэрэнгүй хуудаснууд дээр харагдах болно.', 'asset_manufacturers' => 'Актив үйлдвэрлэгчид', @@ -13,4 +13,4 @@ return array( 'update' => 'Үйлдвэрлэгчийг шинэчлэх', 'url' => 'URL', -); +]; diff --git a/resources/lang/mn/admin/models/general.php b/resources/lang/mn/admin/models/general.php index 495984c262..37c5819c3d 100644 --- a/resources/lang/mn/admin/models/general.php +++ b/resources/lang/mn/admin/models/general.php @@ -1,6 +1,6 @@ 'Активын загварууд', 'about_models_text' => 'Хөрөнгийн загвар нь ижил төрлийн хөрөнгийг бүлэглэх арга юм. "MBP 2013", "IPhone 6s", гэх мэт.', 'deleted' => 'Энэ загварыг устгасан. Дахин оруулна уу.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Та :asset_count ширхэг хөрөнгийн загвар устгах гэж байна.', 'restore' => 'Загварыг сэргээх', 'requestable' => 'Хэрэглэгчид энэ загварыг хүсч болно', - 'show_mac_address' => 'Энэ загварт буй MAC хаягийн талбарыг харуулах', + 'show_mac_address' => 'Энэ загварт буй MAC хаягийн талбарыг харуулах', 'view_deleted' => 'Устгагдсан харах', 'view_models' => 'Загварыг үзэх', 'fieldset' => 'Талбар', 'no_custom_field' => 'Өөрчлөгдсөн талбар байхгүй байна', 'add_default_values' => 'Анхдагч утга нэмэх', -); +]; diff --git a/resources/lang/mn/admin/models/message.php b/resources/lang/mn/admin/models/message.php index c028a34760..3c61a8e745 100644 --- a/resources/lang/mn/admin/models/message.php +++ b/resources/lang/mn/admin/models/message.php @@ -1,42 +1,41 @@ 'Загвар байхгүй байна.', 'assoc_users' => 'Энэ загвар одоогоор нэг буюу хэд хэдэн хөрөнгөтэй холбоотой бөгөөд устгаж болохгүй. Хөрөнгө устгаж, дараа нь устгахыг оролдоно уу.', - - 'create' => array( + 'create' => [ 'error' => 'Загвар үүсгэгдсэнгүй, дахин оролдоно уу.', 'success' => 'Загвар амжилттай болсон.', 'duplicate_set' => 'Тухайн нэр, үйлдвэрлэгч болон загварын дугаар бүхий хөрөнгийн загвар аль хэдийн гарсан байна.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Загвар шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Загвар амжилттай болсон.' - ), + 'success' => 'Загвар амжилттай болсон.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ хөрөнгийн загварыг устгахыг хүсэж байна уу?', 'error' => 'Загварыг устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Загвар амжилттай устгагдсан байна.' - ), + 'success' => 'Загвар амжилттай устгагдсан байна.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Загвар сэргээгээгүй, дахин оролдоно уу', - 'success' => 'Загвар амжилттай болсон.' - ), + 'success' => 'Загвар амжилттай болсон.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ямар ч талбар өөрчлөгдсөнгүй тул шинэчлэгдээгүй байна.', - 'success' => 'Загвар шинэчилсэн.' - ), + 'success' => 'Загвар шинэчилсэн.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ямар ч загвар сонгогдоогүй тул юу ч устаагүй.', 'success' => ':success_count ширхэг загвар устсан!', - 'success_partial' => ':success_count ширхэг загвар устсан ба :fail_count ширхэг загвар одоо хүртэл хөрөнгөтэй холбоотой байгаа тул устаагүй.' - ), + 'success_partial' => ':success_count ширхэг загвар устсан ба :fail_count ширхэг загвар одоо хүртэл хөрөнгөтэй холбоотой байгаа тул устаагүй.', + ], -); +]; diff --git a/resources/lang/mn/admin/models/table.php b/resources/lang/mn/admin/models/table.php index ba98bda324..060261af68 100644 --- a/resources/lang/mn/admin/models/table.php +++ b/resources/lang/mn/admin/models/table.php @@ -1,6 +1,6 @@ 'Хөрөнгийн загвар үүсгэх', 'created_at' => 'Үүсгэгдсэн', @@ -14,4 +14,4 @@ return array( 'update' => 'Активын загварыг шинэчлэх', 'clone' => 'Клоны загвар', 'edit' => 'Загварыг засах', -); +]; diff --git a/resources/lang/mn/admin/reports/general.php b/resources/lang/mn/admin/reports/general.php index 1f097a26a9..6367819e59 100644 --- a/resources/lang/mn/admin/reports/general.php +++ b/resources/lang/mn/admin/reports/general.php @@ -1,5 +1,5 @@ 'Хөрөнгийн тайлангаа хүссэн сонголтоо сонгоно уу.' -); +return [ + 'info' => 'Хөрөнгийн тайлангаа хүссэн сонголтоо сонгоно уу.', +]; diff --git a/resources/lang/mn/admin/reports/message.php b/resources/lang/mn/admin/reports/message.php index 452da9600f..a23176eeb4 100644 --- a/resources/lang/mn/admin/reports/message.php +++ b/resources/lang/mn/admin/reports/message.php @@ -1,5 +1,5 @@ 'Та хамгийн багадаа ONE сонголтыг сонгох ёстой.' -); +return [ + 'error' => 'Та хамгийн багадаа ONE сонголтыг сонгох ёстой.', +]; diff --git a/resources/lang/mn/admin/settings/general.php b/resources/lang/mn/admin/settings/general.php index 6b3b9a9f02..1313134ab0 100644 --- a/resources/lang/mn/admin/settings/general.php +++ b/resources/lang/mn/admin/settings/general.php @@ -1,12 +1,12 @@ 'Идэвхтэй лавлах', 'ad_domain' => 'Active Directory домэйн', 'ad_domain_help' => 'Энэ нь заримдаа таны имэйл домэйнтой адил боловч үргэлж биш юм.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Имэйл', 'admin_cc_email_help' => 'Хэрэв та хэрэглэгчдэд илгээсэн хүлээн авах/олгох имэйлийн хуулбарыг нэмэлт имэйл үрүү илгээхийг хүсвэл энд оруулна уу. Үгүй бол энэ талбарыг хоосон орхино уу.', 'is_ad' => 'Энэ бол Active Directory Server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Exped Alerts (босоо хоногоор)', 'alert_inv_threshold' => 'Бараа материалын Alert босго', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Хөрөнгийн дугаар', 'audit_interval' => 'Аудитын интервал', 'audit_interval_help' => 'Хэрэв та хөрөнгөө тогтмол шалгаж байх шаардлагатай бол сар бүрийн интервалыг оруул.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Хоёр хүчин зүйлийн кодыг оруулна уу', 'two_factor_config_complete' => 'Код илгээх', 'two_factor_enabled_edit_not_allowed' => 'Таны админ энэ тохиргоог засахыг зөвшөөрөхгүй.', - 'two_factor_enrollment_text' => "Хоёр хүчин зүйлийг баталгаажуулах шаардлагатай боловч таны төхөөрөмж одоогоор бүртгэгдээгүй байна. Google Authenticator аппликейшнийг нээж, төхөөрөмжөө бүртгүүлэхийн тулд доорх QR кодыг хайна уу. Та төхөөрөмжөө бүртгүүлснийхээ дараа доорх кодыг оруулна уу", + 'two_factor_enrollment_text' => 'Хоёр хүчин зүйлийг баталгаажуулах шаардлагатай боловч таны төхөөрөмж одоогоор бүртгэгдээгүй байна. Google Authenticator аппликейшнийг нээж, төхөөрөмжөө бүртгүүлэхийн тулд доорх QR кодыг хайна уу. Та төхөөрөмжөө бүртгүүлснийхээ дараа доорх кодыг оруулна уу', 'require_accept_signature' => 'Гарын үсэг зурах шаардлагатай', 'require_accept_signature_help_text' => 'Энэ функцийг идэвхжүүлэх нь хэрэглэгчид активыг хүлээн авахдаа биечлэн гарын үсэг зурах шаардлагатай болно.', 'left' => 'үлдсэн', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Энэ хайрцгийг шалгаснаар хөрөнгийн сериал дахь дахин давтагдашгүй дугаарлалтын хязгаарлалтыг хэрэгжүүлэх болно', 'zerofill_count' => 'Үүнд үл хөдлөх хөрөнгийн хаягуудын урт', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/mn/admin/settings/message.php b/resources/lang/mn/admin/settings/message.php index 6c16ed7544..00278cea53 100644 --- a/resources/lang/mn/admin/settings/message.php +++ b/resources/lang/mn/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Шинэчлэлт хийх үед алдаа гарлаа.', - 'success' => 'Тохиргоо амжилттай болсон.' - ), - 'backup' => array( + 'success' => 'Тохиргоо амжилттай болсон.', + ], + 'backup' => [ 'delete_confirm' => 'Та энэ нөөц файлыг устгахыг хүсч байна уу? Энэ үйлдлийг буцаах боломжгүй.', 'file_deleted' => 'Нөөц файл амжилттай устгагдсан байна.', 'generated' => 'Шинэ нөөц файл амжилттай болсон.', 'file_not_found' => 'Энэ нөөц файлыг сервер дээрээс олж чадсангүй.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Цэвэрлэх явцад алдаа гарлаа.', 'validation_failed' => 'Таны таслалтын баталгаа буруу байна. Баталгаажуулалтын хайрцагт "DELETE" үгийг оруулна уу.', - 'success' => 'Устсан бүртгэлийг амжилттай цэвэрлэж байна.' - ), + 'success' => 'Устсан бүртгэлийг амжилттай цэвэрлэж байна.', + ], -); +]; diff --git a/resources/lang/mn/admin/statuslabels/message.php b/resources/lang/mn/admin/statuslabels/message.php index bd0eea63a0..80edc68394 100644 --- a/resources/lang/mn/admin/statuslabels/message.php +++ b/resources/lang/mn/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Статусын шошго байхгүй байна.', 'assoc_assets' => 'Энэ Статистик хаяг нь одоогоор хамгийн багадаа нэг акттай холбоотой бөгөөд устгагдах боломжгүй байна. Энэ хөрөнгийг дахин ашиглахын тулд өөрийн хөрөнгийг шинэчилнэ үү.', - - 'create' => array( + 'create' => [ 'error' => 'Статусын шошгыг үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Статусын шошго амжилттай болсон.' - ), + 'success' => 'Статусын шошго амжилттай болсон.', + ], - 'update' => array( + 'update' => [ 'error' => 'Статусын шошго шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Статусын шошго амжилттай болсон.' - ), + 'success' => 'Статусын шошго амжилттай болсон.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ Статус шошгыг устгахыг хүсч байна уу?', 'error' => 'Статусын шошгыг устгахад асуудал гарлаа. Дахин оролдоно уу.', - 'success' => 'Статусын шошго амжилттай устгагдсан байна.' - ), + 'success' => 'Статусын шошго амжилттай устгагдсан байна.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Эдгээр хөрөнгийг хэн ч өгч чадахгүй.', 'deployable' => 'Эдгээр хөрөнгийг шалгах боломжтой. Тэдгээрийг оноож дууссаны дараа тэд Deployed гэсэн мета төлөв гэж тооцдог.', 'archived' => 'Эдгээр хөрөнгө нь шалгагдаагүй, зөвхөн Архивлагдсан үзэгдэлд харагдана. Энэ нь төсөвт / түүхэн зориулалтаар ашиглах хөрөнгийн тухай мэдээллийг хадгалж үлдэхийн зэрэгцээ тэдгээрийг өдөр тутмын хөрөнгийн жагсаалтаас гаргахад тустай байдаг.', 'pending' => 'Эд хөрөнгийг засварлахын тулд ихэвчлэн ашигладаг боловч эргэлтэнд орохоор хүлээгдэж буй эд зүйлсэд ашиглагддаггүй.', - ), + ], -); +]; diff --git a/resources/lang/mn/admin/statuslabels/table.php b/resources/lang/mn/admin/statuslabels/table.php index 89142f9866..b7b412f9a8 100644 --- a/resources/lang/mn/admin/statuslabels/table.php +++ b/resources/lang/mn/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Статусын гарчгийн талаар', 'archived' => 'Архивлагдсан', 'create' => 'Статусын шошго үүсгэнэ үү', @@ -16,4 +16,4 @@ return array( 'title' => 'Статусын шошго', 'undeployable' => 'Undeployable', 'update' => 'Статус шошго шинэчлэх', -); +]; diff --git a/resources/lang/mn/admin/suppliers/message.php b/resources/lang/mn/admin/suppliers/message.php index ab5b667f78..e8be1b33c8 100644 --- a/resources/lang/mn/admin/suppliers/message.php +++ b/resources/lang/mn/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Нийлүүлэгч байхгүй байна.', - - 'create' => array( + 'create' => [ 'error' => 'Нийлүүлэгч үүсгээгүй байна, дахин оролдоно уу.', - 'success' => 'Ханган нийлүүлэгч амжилтанд хүрсэн.' - ), + 'success' => 'Ханган нийлүүлэгч амжилтанд хүрсэн.', + ], - 'update' => array( + 'update' => [ 'error' => 'Нийлүүлэгч шинэчлэгдсэнгүй, дахин оролдоно уу', - 'success' => 'Ханган нийлүүлэгч амжилттай шинэчлэгдсэн.' - ), + 'success' => 'Ханган нийлүүлэгч амжилттай шинэчлэгдсэн.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Та энэ нийлүүлэгчийг устгахыг хүсэж байна уу?', 'error' => 'Ханган нийлүүлэгчийг устгах асуудал гарч байсан. Дахин оролдоно уу.', 'success' => 'Ханган нийлүүлэгч амжилттай устгагдсан.', 'assoc_assets' => 'Энэ нийлүүлэгч одоогоор :asset_count хөрөнгөтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ үйлдвэрлэгчтэй холбоогүй болгож хөрөнгөө шинэчлээд дахин оролдоно уу. ', 'assoc_licenses' => 'Энэ нийлүүлэгч одоогоор :licenses_count лицензтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ нийлүүлэгчтэй холбоогүй болгож лицензээ шинэчлээд дахин оролдоно уу. ', 'assoc_maintenances' => 'Энэ нийлүүлэгч одоогоор :asset_maintenances_count засвар үйлчилгээтэй холбоотой байгаа тул устгах боломжгүй байна. Энэ нийлүүлэгчтэй холбоогүй болгож засвар үйлчилгээгээ шинэчлээд дахин оролдоно уу. ', - ) + ], -); +]; diff --git a/resources/lang/mn/admin/suppliers/table.php b/resources/lang/mn/admin/suppliers/table.php index de48ae0321..2564d277e6 100644 --- a/resources/lang/mn/admin/suppliers/table.php +++ b/resources/lang/mn/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Нийлүүлэгчийн талаар', 'about_suppliers_text' => 'Нийлүүлэгч нь эд зүйлийн эх сурвалжийг хянахад ашиглагддаг', 'address' => 'Нийлүүлэгчийн хаяг', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Активыг харах', 'zip' => 'Шуудангийн код', -); +]; diff --git a/resources/lang/mn/admin/users/general.php b/resources/lang/mn/admin/users/general.php index f6853d7054..3971f8e663 100644 --- a/resources/lang/mn/admin/users/general.php +++ b/resources/lang/mn/admin/users/general.php @@ -1,7 +1,6 @@ 'Энэ хэрэглэгч нэвтрэх эрхтэй', 'activated_disabled_help_text' => 'Та өөрийн дансны идэвхжүүлэх статусыг засах боломжгүй.', 'assets_user' => 'Нэр:', @@ -13,7 +12,7 @@ return array( 'edit' => 'Хэрэглэгчийг засварлах', 'filetype_info' => 'Зөвшөөрөгдсөн filetypes нь png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Түүх: нэр', - 'info' => 'Мэдээлэл', + 'info' => 'Мэдээлэл', 'restore_user' => 'Тэднийг сэргээхийн тулд энд дарна уу.', 'last_login' => 'Сүүлчийн Нэвтрэх', 'ldap_config_text' => 'LDAP тохиргооны тохиргоог Админ> Тохиргоо гэж олж болно. (Заавал биш) сонгосон байршлыг бүх импортлогчдын хувьд тохируулах болно.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Таны одоогийн админ тохиргоо нь хоёр хүчин зүйлийн баталгаажуулалтыг сонгохыг зөвшөөрдөг.', 'two_factor_enrolled' => '2FA төхөөрөмжийг бүртгүүлсэн', 'two_factor_active' => '2FA идэвхтэй', - ); + ]; diff --git a/resources/lang/mn/admin/users/message.php b/resources/lang/mn/admin/users/message.php index d429876291..abef783fc4 100644 --- a/resources/lang/mn/admin/users/message.php +++ b/resources/lang/mn/admin/users/message.php @@ -1,6 +1,6 @@ 'Та энэ хөрөнгийг амжилттай хүлээн авлаа.', 'declined' => 'Та энэ хөрөнгийг амжилттай татгалзсан.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP интеграци нь энэ суулгацыг тохируулаагүй байна.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Хэрэглэгч амжилттай хийгдсэн.', 'update' => 'Хэрэглэгч амжилттай шинэчлэгдсэн.', 'update_bulk' => 'Хэрэглэгчид амжилттай шинэчлэгдсэн!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Хэрэглэгч амжилтанд хүрсэнгүй.', 'restored' => 'Хэрэглэгч амжилттай сэргээгдсэн байна.', 'import' => 'Хэрэглэгчид амжилттай импортолсон.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Хэрэглэгч үүсгэх асуудал гарсан. Дахин оролдоно уу.', 'update' => 'Хэрэглэгчийг шинэчлэхэд асуудал гарлаа. Дахин оролдоно уу.', 'delete' => 'Хэрэглэгчийг устгахад асуудал гарлаа. Дахин оролдоно уу.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAP серверийг хайж чадахгүй байна. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу.
LDAP серверийн алдаа:', 'ldap_could_not_get_entries' => 'LDAP серверээс бичилтийг авч чадсангүй. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу.
LDAP серверийн алдаа:', 'password_ldap' => 'Энэ акаунтын нууц үгийг LDAP / Active Directory удирддаг. Нууц үгээ солихын тулд өөрийн IT хэлтэст хандана уу.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Файлыг устгаагүй байна. Дахин оролдоно уу.', 'success' => 'Файл амжилттай устгагдсан.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Файлд байршуулаагүй файл. Дахин оролдоно уу.', 'success' => 'Файлууд амжилттай байршуулсан.', 'nofiles' => 'Та байршуулах ямар ч файл сонгоогүй байна', 'invalidfiles' => 'Таны файлуудын нэг юмуу хэд нь хэтэрхий том юмуу эсвэл файлын төрлийг зөвшөөрдөггүй. Зөвшөөрөгдсөн filetypes нь png, gif, jpg, doc, docx, pdf, болон txt байна.', - ), + ], -); +]; diff --git a/resources/lang/mn/admin/users/table.php b/resources/lang/mn/admin/users/table.php index d456ec47e8..f1c48b3f06 100644 --- a/resources/lang/mn/admin/users/table.php +++ b/resources/lang/mn/admin/users/table.php @@ -1,6 +1,6 @@ 'Идэвхтэй байна', 'allow' => 'Зөвшөөрнө үү', 'checkedout' => 'Актив', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Одоогийн хэрэглэгчдийг харуулах', 'show_deleted' => 'Хасагдсан хэрэглэгчдийг харуулах', 'title' => 'Гарчиг', - 'to_restore_them' => 'тэднийг сэргээх.', + 'to_restore_them' => 'тэднийг сэргээх.', 'updateuser' => 'Хэрэглэгчийг шинэчлэх', 'username' => 'Хэрэглэгчийн нэр', - 'user_deleted_text' => 'Энэ хэрэглэгчийг устгасан гэж тэмдэглэсэн.', + 'user_deleted_text' => 'Энэ хэрэглэгчийг устгасан гэж тэмдэглэсэн.', 'username_note' => '(Энэ нь нэвтрэхэд биш зөвхөн Active Directory-д зориулж ашиглагддаг.)', 'cloneuser' => 'Clone Хэрэглэгч', 'viewusers' => 'Хэрэглэгчдийг харах', -); +]; diff --git a/resources/lang/mn/auth/general.php b/resources/lang/mn/auth/general.php index 302c9e309d..c4aaed44f9 100644 --- a/resources/lang/mn/auth/general.php +++ b/resources/lang/mn/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/mn/auth/message.php b/resources/lang/mn/auth/message.php index f0898d2644..01ef2947a5 100644 --- a/resources/lang/mn/auth/message.php +++ b/resources/lang/mn/auth/message.php @@ -1,6 +1,6 @@ 'Энэ имэйл хаягтай байна.', 'account_not_found' => 'Хэрэглэгчийн нэр эсвэл нууц үг буруу байна.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Энэ хэрэглэгчийн бүртгэлийг хориглосон байна.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Нэвтрэхийг оролдож байх явцад асуудал гарсан, дахин оролдоно уу.', 'success' => 'Та амжилттай нэвтэрсэн байна.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Таны акаунтыг үүсгэх үед алдаа гарлаа, дахин оролдоно уу.', 'success' => 'Акаунт амжилттай хийгдсэн.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Нууц үгийг дахин тохируулахыг оролдож байх явцад асуудал гарлаа, дахин оролдоно уу.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Нууц үгээ шинэчлэхдээ алдаа гарлаа, дахин оролдоно уу.', 'success' => 'Таны нууц үг амжилттай хийгдсэн.', - ), + ], - -); +]; diff --git a/resources/lang/mn/button.php b/resources/lang/mn/button.php index 2486db2cc1..f753656b06 100644 --- a/resources/lang/mn/button.php +++ b/resources/lang/mn/button.php @@ -1,6 +1,6 @@ 'Үйлдлүүд', 'add' => 'Шинийг нэмэх', 'cancel' => 'Болих', @@ -11,7 +11,7 @@ return array( 'request' => 'Хүсэлт', 'submit' => 'Оруулах', 'upload' => 'Оруулах', - 'select_file' => 'Файл сонгох...', + 'select_file' => 'Файл сонгох...', 'select_files' => 'Файл сонгох...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php index 796a633555..a9f21bb5a2 100644 --- a/resources/lang/mn/general.php +++ b/resources/lang/mn/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Буцаан авсан', 'user_requests_count' => 'Хүсэлт', 'city' => 'Хот', - 'click_here' => 'Энд дар', + 'click_here' => 'Энд дар', 'clear_selection' => 'Сонголтыг арилгах', 'companies' => 'Компаниуд', 'company' => 'Компани', 'component' => 'Бүрэлдэхүүн хэсэг', 'components' => 'Бүрэлдэхүүн хэсгүүд', - 'complete' => 'Бүрэн дуусгах', + 'complete' => 'Бүрэн дуусгах', 'consumable' => 'Боломжтой', 'consumables' => 'Хэрэглээ', 'country' => 'Улс', diff --git a/resources/lang/mn/help.php b/resources/lang/mn/help.php index 18121d08df..c07ddcb7de 100644 --- a/resources/lang/mn/help.php +++ b/resources/lang/mn/help.php @@ -1,6 +1,6 @@ "Дэлгэрэнгүй мэдээлэл", + 'more_info_title' => 'Дэлгэрэнгүй мэдээлэл', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/mn/mail.php b/resources/lang/mn/mail.php index ca4e8eff96..4ddbf8c57b 100644 --- a/resources/lang/mn/mail.php +++ b/resources/lang/mn/mail.php @@ -1,6 +1,6 @@ 'Хэрэглэгч вэбсайт дээрх зүйл хүсэлтийг цуцалсан байна', 'a_user_requested' => 'Хэрэглэгч вэбсайт дээрх зүйлийг хүссэн байна', 'accessory_name' => 'Дагалдах хэрэгслийн нэр:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/mn/pagination.php b/resources/lang/mn/pagination.php index 247a7fa84a..c11a94f0c3 100644 --- a/resources/lang/mn/pagination.php +++ b/resources/lang/mn/pagination.php @@ -1,6 +1,6 @@ 'Дараах »', -); +]; diff --git a/resources/lang/mn/passwords.php b/resources/lang/mn/passwords.php index f55d91e646..fb93577937 100644 --- a/resources/lang/mn/passwords.php +++ b/resources/lang/mn/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Тан уруу нууц үгийн холбоосыг явууллаа!', 'user' => 'Уг имэйл дээр бүртгэлтэй хэрэглэгч байхгүй байна.', ]; - diff --git a/resources/lang/mn/reminders.php b/resources/lang/mn/reminders.php index a389afe393..2f781f0190 100644 --- a/resources/lang/mn/reminders.php +++ b/resources/lang/mn/reminders.php @@ -1,6 +1,6 @@ "Нууц үг дор хаяж 6 тэмдэгт урттай бөгөөд давхар баталгаажуулж оруулсантайгаа таарч байх ёстой.", + 'password' => 'Нууц үг дор хаяж 6 тэмдэгт урттай бөгөөд давхар баталгаажуулж оруулсантайгаа таарч байх ёстой.', - "user" => "Хэрэглэгчийн нэр эсвэл имэйл хаяг буруу байна", + 'user' => 'Хэрэглэгчийн нэр эсвэл имэйл хаяг буруу байна', - "token" => "Нууц үг сэргээх токен буруу байна.", + 'token' => 'Нууц үг сэргээх токен буруу байна.', - "sent" => "Хэрэв имэйл хаяг бүртгэгдсэн байвал нууц үг сануулах имэйлийг илгээх болно!", + 'sent' => 'Хэрэв имэйл хаяг бүртгэгдсэн байвал нууц үг сануулах имэйлийг илгээх болно!', -); +]; diff --git a/resources/lang/mn/table.php b/resources/lang/mn/table.php index 2582fbd470..f69a23dda7 100644 --- a/resources/lang/mn/table.php +++ b/resources/lang/mn/table.php @@ -1,10 +1,10 @@ 'Үйлдлүүд', 'action' => 'Үйлдэл', 'by' => 'Хэрэглэгч', 'item' => 'Зүйл', -); +]; diff --git a/resources/lang/mn/validation.php b/resources/lang/mn/validation.php index 6bd7c1e690..2d9080517e 100644 --- a/resources/lang/mn/validation.php +++ b/resources/lang/mn/validation.php @@ -1,6 +1,6 @@ 'Үүнд: атрибут аль хэдийн авсан байна.', 'uploaded' => 'Үүнд: атрибут байршуулах боломжгүй байна.', 'url' => 'Агуулга формат буруу байна.', - "unique_undeleted" => ":attribute дахин давтагдашгүй байх ёстой.", + 'unique_undeleted' => ':attribute дахин давтагдашгүй байх ёстой.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Үүнд: аттрибут талбар нь зөвшөөрөгдөөгүй тэмдэгт агуулна.", - "email_array" => "Нэг буюу хэд хэдэн имэйл хаяг буруу байна.", - "hashed_pass" => "Таны одоогийн нууц үг буруу байна", + 'alpha_space' => 'Үүнд: аттрибут талбар нь зөвшөөрөгдөөгүй тэмдэгт агуулна.', + 'email_array' => 'Нэг буюу хэд хэдэн имэйл хаяг буруу байна.', + 'hashed_pass' => 'Таны одоогийн нууц үг буруу байна', 'dumbpwd' => 'Энэ нууц үг хэтэрхий нийтлэг байна.', - "statuslabel_type" => "Та зөв статустай шошгын төрлийг сонгох ёстой", + 'statuslabel_type' => 'Та зөв статустай шошгын төрлийг сонгох ёстой', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ms/admin/accessories/general.php b/resources/lang/ms/admin/accessories/general.php index 376ff26261..26c97bdcfe 100644 --- a/resources/lang/ms/admin/accessories/general.php +++ b/resources/lang/ms/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategori Aksesori', 'accessory_name' => 'Nama Aksesori', 'checkout' => 'Semak keluar aksesori', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Gunakan pilihan utama lalai EULA sebaliknya.', 'use_default_eula_disabled' => 'Gunakan EULA lalai utama bukannya. Tiada seting utama EULA ditetapkan. Sila tambah satu dalam Tetapan.', -); +]; diff --git a/resources/lang/ms/admin/accessories/message.php b/resources/lang/ms/admin/accessories/message.php index e06e835a08..fd1d72fcbf 100644 --- a/resources/lang/ms/admin/accessories/message.php +++ b/resources/lang/ms/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Aksesori ini pada masa ini mempunyai: mengira item yang diperiksa kepada pengguna. Sila semak aksesori dan cuba lagi.', - 'create' => array( + 'create' => [ 'error' => 'Aksesori tidak dicipta, sila cuba lagi.', - 'success' => 'Aksesori telah berjaya dicipta.' - ), + 'success' => 'Aksesori telah berjaya dicipta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Aksesori gagal dikemaskini, sila cuba lagi', - 'success' => 'Aksesori berjaya dikemaskini.' - ), + 'success' => 'Aksesori berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti anda mahu membuang aksesori ini?', 'error' => 'Ralat berlaku semasa membuang aksesori. Sila cuba lagi.', - 'success' => 'Aksesori berjaya dibuang.' - ), + 'success' => 'Aksesori berjaya dibuang.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aksesori tidak diperiksa, sila cuba lagi', 'success' => 'Aksesori diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ), + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aksesori tidak diperiksa, sila cuba lagi', 'success' => 'Aksesori diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ) + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - -); +]; diff --git a/resources/lang/ms/admin/accessories/table.php b/resources/lang/ms/admin/accessories/table.php index 3be44aa7c6..e39e8e034a 100644 --- a/resources/lang/ms/admin/accessories/table.php +++ b/resources/lang/ms/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Muat turun CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Muat turun CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Penerimaan', 'title' => 'Nama Aksesori', - -); +]; diff --git a/resources/lang/ms/admin/asset_maintenances/form.php b/resources/lang/ms/admin/asset_maintenances/form.php index 750fbbb532..15a841c5fe 100644 --- a/resources/lang/ms/admin/asset_maintenances/form.php +++ b/resources/lang/ms/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Hari', 'notes' => 'Nota', 'update' => 'Kemaskini', - 'create' => 'Cipta' + 'create' => 'Cipta', ]; diff --git a/resources/lang/ms/admin/asset_maintenances/message.php b/resources/lang/ms/admin/asset_maintenances/message.php index 9b246b3df7..1a39a8e589 100644 --- a/resources/lang/ms/admin/asset_maintenances/message.php +++ b/resources/lang/ms/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Adakah anda pasti untuk menghapuskan penyelenggaraan aset ini?', 'error' => 'Tidak dapat menghapuskan penyelenggaraan aset. Sila cuba lagi.', - 'success' => 'Penyelenggaraan aset telah berjaya dihapuskan.' + 'success' => 'Penyelenggaraan aset telah berjaya dihapuskan.', ], 'create' => [ 'error' => 'Penyelenggaraan aset belum dicipta, sila cuba lagi.', - 'success' => 'Penyelenggaraan aset berjaya dicipta.' + 'success' => 'Penyelenggaraan aset berjaya dicipta.', ], 'edit' => [ 'error' => 'Penyelenggaraan Aset tidak diedit, sila cuba lagi.', - 'success' => 'Penyenggaraan Aset berjaya disunting.' + 'success' => 'Penyenggaraan Aset berjaya disunting.', ], 'asset_maintenance_incomplete' => 'Tidak dilengkapkan lagi', 'warranty' => 'Waranti', 'not_warranty' => 'Bukan Jaminan', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ms/admin/asset_maintenances/table.php b/resources/lang/ms/admin/asset_maintenances/table.php index 30f04a2bee..5de5f1d0e9 100644 --- a/resources/lang/ms/admin/asset_maintenances/table.php +++ b/resources/lang/ms/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Penyelenggaraan Aset', 'asset_name' => 'Nama Aset', 'is_warranty' => 'Waranti', - 'dl_csv' => 'Muat turun CSV' + 'dl_csv' => 'Muat turun CSV', ]; diff --git a/resources/lang/ms/admin/categories/general.php b/resources/lang/ms/admin/categories/general.php index 6c230e3daa..19dcae49ba 100644 --- a/resources/lang/ms/admin/categories/general.php +++ b/resources/lang/ms/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategori aset', 'category_name' => 'Nama Kategori', 'checkin_email' => 'Hantar e-mel kepada pengguna selepas semak masuk / semak keluar.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Gunakan pilihan utama lalai EULA sebaliknya.', 'use_default_eula_disabled' => 'Gunakan EULA lalai utama bukannya. Tiada seting utama EULA ditetapkan. Sila tambah satu dalam Tetapan.', -); +]; diff --git a/resources/lang/ms/admin/categories/message.php b/resources/lang/ms/admin/categories/message.php index 4024fc75a3..3dafce9fdc 100644 --- a/resources/lang/ms/admin/categories/message.php +++ b/resources/lang/ms/admin/categories/message.php @@ -1,25 +1,25 @@ 'Tidak wujud.', 'assoc_models' => 'Kategori ini kini dikaitkan dengan sekurang-kurangnya satu model dan tidak boleh dihapuskan. Sila kemas kini model anda untuk tidak lagi merujuk kategori ini dan cuba lagi.', 'assoc_items' => 'Kategori ini kini dikaitkan dengan sekurang-kurangnya satu: asset_type dan tidak boleh dipadamkan. Sila kemas kini anda: asset_type untuk tidak merujuk kategori ini lagi dan cuba lagi.', - 'create' => array( + 'create' => [ 'error' => 'Kategori tidak dapat dicipta, Sila cuba lagi.', - 'success' => 'kategori berjaya dicipta.' - ), + 'success' => 'kategori berjaya dicipta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategori tidak dapat dikemaskini, sila cuba lagi.', - 'success' => 'Kategori berjaya dikemaskini.' - ), + 'success' => 'Kategori berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti untuk memadam kategori ini?', 'error' => 'Terdapat ralat untuk menghapuskan kategori ini. Sila cuba lagi.', - 'success' => 'Katergori berjaya dihapuskan.' - ) + 'success' => 'Katergori berjaya dihapuskan.', + ], -); +]; diff --git a/resources/lang/ms/admin/categories/table.php b/resources/lang/ms/admin/categories/table.php index 5844609d03..7873518168 100644 --- a/resources/lang/ms/admin/categories/table.php +++ b/resources/lang/ms/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Diterima', 'title' => 'Nama Kategori Harta', -); +]; diff --git a/resources/lang/ms/admin/companies/general.php b/resources/lang/ms/admin/companies/general.php index 72164a4c09..9b9fef2689 100644 --- a/resources/lang/ms/admin/companies/general.php +++ b/resources/lang/ms/admin/companies/general.php @@ -1,4 +1,5 @@ 'Pilih Syarikat', ]; diff --git a/resources/lang/ms/admin/companies/message.php b/resources/lang/ms/admin/companies/message.php index de48e100dc..72d2f1e45d 100644 --- a/resources/lang/ms/admin/companies/message.php +++ b/resources/lang/ms/admin/companies/message.php @@ -1,18 +1,19 @@ 'Syarikat tidak wujud.', 'assoc_users' => 'Syarikat ini kini dikaitkan dengan sekurang-kurangnya satu model dan tidak boleh dipadamkan. Sila kemas kini model anda untuk tidak lagi merujuk syarikat ini dan cuba lagi.', - 'create' => array( + 'create' => [ 'error' => 'Syarikat tidak dicipta, sila cuba lagi.', - 'success' => 'Syarikat berjaya berjaya.' - ), - 'update' => array( + 'success' => 'Syarikat berjaya berjaya.', + ], + 'update' => [ 'error' => 'Syarikat tidak dikemas kini, sila cuba lagi', - 'success' => 'Syarikat dikemas kini dengan jayanya.' - ), - 'delete' => array( + 'success' => 'Syarikat dikemas kini dengan jayanya.', + ], + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan syarikat ini?', 'error' => 'Ada masalah memusnahkan syarikat. Sila cuba lagi.', - 'success' => 'Syarikat telah berjaya dipadam.' - ) -); + 'success' => 'Syarikat telah berjaya dipadam.', + ], +]; diff --git a/resources/lang/ms/admin/companies/table.php b/resources/lang/ms/admin/companies/table.php index 0585cdfe18..b3245cbf7f 100644 --- a/resources/lang/ms/admin/companies/table.php +++ b/resources/lang/ms/admin/companies/table.php @@ -1,9 +1,10 @@ 'Syarikat-syarikat', 'create' => 'Buat Syarikat', 'title' => 'Syarikat', 'update' => 'Kemas kini Syarikat', 'name' => 'nama syarikat', 'id' => 'ID', -); +]; diff --git a/resources/lang/ms/admin/components/general.php b/resources/lang/ms/admin/components/general.php index b3be56b83c..0a23cc8a3a 100644 --- a/resources/lang/ms/admin/components/general.php +++ b/resources/lang/ms/admin/components/general.php @@ -1,6 +1,6 @@ 'Nama Komponen', 'checkin' => 'Komponen Pemeriksa', 'checkout' => 'Komponen Keluar', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Baki', 'total' => 'Jumlah', 'update' => 'Komponen Kemas Kini', -); +]; diff --git a/resources/lang/ms/admin/components/message.php b/resources/lang/ms/admin/components/message.php index a2fd31d7a5..ac4c2740a4 100644 --- a/resources/lang/ms/admin/components/message.php +++ b/resources/lang/ms/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponen tidak wujud.', - 'create' => array( + 'create' => [ 'error' => 'Komponen tidak dibuat, sila cuba lagi.', - 'success' => 'Komponen berjaya dihasilkan.' - ), + 'success' => 'Komponen berjaya dihasilkan.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponen tidak dikemas kini, sila cuba lagi', - 'success' => 'Komponen berjaya dikemas kini.' - ), + 'success' => 'Komponen berjaya dikemas kini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan komponen ini?', 'error' => 'Terdapat isu memadamkan komponen. Sila cuba lagi.', - 'success' => 'Komponen telah berjaya dipadam.' - ), + 'success' => 'Komponen telah berjaya dipadam.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponen tidak diperiksa, sila cuba lagi', 'success' => 'Komponen diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ), + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponen tidak diperiksa, sila cuba lagi', 'success' => 'Komponen diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ) + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - -); +]; diff --git a/resources/lang/ms/admin/components/table.php b/resources/lang/ms/admin/components/table.php index a370845bf3..ec49357d02 100644 --- a/resources/lang/ms/admin/components/table.php +++ b/resources/lang/ms/admin/components/table.php @@ -1,5 +1,5 @@ 'Nama Komponen', -); +]; diff --git a/resources/lang/ms/admin/consumables/general.php b/resources/lang/ms/admin/consumables/general.php index 103eafe4c7..5f59181d85 100644 --- a/resources/lang/ms/admin/consumables/general.php +++ b/resources/lang/ms/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Disebabkan Pengguna', 'consumable_name' => 'Nama yang boleh digunakan', 'create' => 'Buat Makan', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Baki', 'total' => 'Jumlah', 'update' => 'Kemas kini boleh digunakan', -); +]; diff --git a/resources/lang/ms/admin/consumables/message.php b/resources/lang/ms/admin/consumables/message.php index 6fd51bcc2c..5b3eaadb19 100644 --- a/resources/lang/ms/admin/consumables/message.php +++ b/resources/lang/ms/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Tidak boleh digunakan.', - 'create' => array( + 'create' => [ 'error' => 'Tidak boleh dicipta, sila cuba lagi.', - 'success' => 'Berguna dicipta dengan jayanya.' - ), + 'success' => 'Berguna dicipta dengan jayanya.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dikenakan tidak dikemas kini, sila cuba lagi', - 'success' => 'Berguna dikemas kini berjaya.' - ), + 'success' => 'Berguna dikemas kini berjaya.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin menghapuskan penggunaan ini?', 'error' => 'Terdapat isu memadamkan pemakaian. Sila cuba lagi.', - 'success' => 'Pemakaian telah berjaya dipadam.' - ), + 'success' => 'Pemakaian telah berjaya dipadam.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Makanan tidak diperiksa, sila cuba lagi', 'success' => 'Berguna diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ), + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Dikenakan tidak diperiksa, sila cuba lagi', 'success' => 'Berguna diperiksa dengan jayanya.', - 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.' - ) + 'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.', + ], - -); +]; diff --git a/resources/lang/ms/admin/consumables/table.php b/resources/lang/ms/admin/consumables/table.php index b0312f7733..f486118f91 100644 --- a/resources/lang/ms/admin/consumables/table.php +++ b/resources/lang/ms/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nama yang boleh digunakan', -); +]; diff --git a/resources/lang/ms/admin/custom_fields/general.php b/resources/lang/ms/admin/custom_fields/general.php index 7f6be50f09..e7d7b76766 100644 --- a/resources/lang/ms/admin/custom_fields/general.php +++ b/resources/lang/ms/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Bidang Tersuai', 'field' => 'Padang', 'about_fieldsets_title' => 'Mengenai Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Padang Tersuai Baru', 'value_encrypted' => 'Nilai medan ini disulitkan dalam pangkalan data. Hanya pengguna admin sahaja yang dapat melihat nilai yang disahkrit', 'show_in_email' => 'Sertakan nilai medan ini dalam e-mel semak keluar yang dihantar kepada pengguna? Medan yang disulitkan tidak boleh dimasukkan ke dalam e-mel.', -); +]; diff --git a/resources/lang/ms/admin/custom_fields/message.php b/resources/lang/ms/admin/custom_fields/message.php index ad0be7bf1a..305ca39bc1 100644 --- a/resources/lang/ms/admin/custom_fields/message.php +++ b/resources/lang/ms/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Bidang itu tidak wujud.', 'already_added' => 'Bidang sudah ditambahkan', - 'create' => array( + 'create' => [ 'error' => 'Bidang tidak dibuat, sila cuba lagi.', 'success' => 'Bidang berjaya dibuat.', - 'assoc_success' => 'Bidang berjaya ditambah ke fieldset.' - ), + 'assoc_success' => 'Bidang berjaya ditambah ke fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Bidang tidak dikemas kini, sila cuba lagi', - 'success' => 'Bidang dikemas kini berjaya.' - ), + 'success' => 'Bidang dikemas kini berjaya.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan medan ini?', 'error' => 'Terdapat masalah memadamkan medan. Sila cuba lagi.', 'success' => 'Medan telah berjaya dipadam.', 'in_use' => 'Medan masih digunakan.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset tidak wujud', - 'create' => array( + 'create' => [ 'error' => 'Fieldset tidak dibuat, sila cuba lagi.', - 'success' => 'Fieldset berjaya berjaya.' - ), + 'success' => 'Fieldset berjaya berjaya.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset tidak dikemas kini, sila cuba lagi', - 'success' => 'Fieldset dikemas kini dengan jayanya.' - ), + 'success' => 'Fieldset dikemas kini dengan jayanya.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan medan ini?', 'error' => 'Terdapat isu memadamkan medan. Sila cuba lagi.', 'success' => 'Bidang field telah berjaya dipadam.', 'in_use' => 'Fieldset masih digunakan.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ms/admin/departments/message.php b/resources/lang/ms/admin/departments/message.php index 0ba7f41676..0f8a60e95c 100644 --- a/resources/lang/ms/admin/departments/message.php +++ b/resources/lang/ms/admin/departments/message.php @@ -1,21 +1,21 @@ 'Jabatan tidak wujud.', 'assoc_users' => 'Jabatan ini kini dikaitkan dengan sekurang-kurangnya seorang pengguna dan tidak boleh dipadamkan. Sila kemas kini pengguna anda untuk tidak lagi merujuk jabatan ini dan cuba lagi.', - 'create' => array( + 'create' => [ 'error' => 'Jabatan tidak dibuat, sila cuba lagi.', - 'success' => 'Jabatan berjaya berjaya.' - ), - 'update' => array( + 'success' => 'Jabatan berjaya berjaya.', + ], + 'update' => [ 'error' => 'Jabatan tidak dikemas kini, sila cuba lagi', - 'success' => 'Jabatan dikemas kini berjaya.' - ), - 'delete' => array( + 'success' => 'Jabatan dikemas kini berjaya.', + ], + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan jabatan ini?', 'error' => 'Terdapat isu memadamkan jabatan. Sila cuba lagi.', - 'success' => 'Jabatan telah berjaya dipadam.' - ) + 'success' => 'Jabatan telah berjaya dipadam.', + ], -); +]; diff --git a/resources/lang/ms/admin/departments/table.php b/resources/lang/ms/admin/departments/table.php index ffe953c5f1..8961357a79 100644 --- a/resources/lang/ms/admin/departments/table.php +++ b/resources/lang/ms/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'nama jabatan', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokasi', 'create' => 'Buat Jabatan', 'update' => 'Jabatan Kemas Kini', - ); + ]; diff --git a/resources/lang/ms/admin/depreciations/general.php b/resources/lang/ms/admin/depreciations/general.php index fdfd7d0186..bc75e66983 100644 --- a/resources/lang/ms/admin/depreciations/general.php +++ b/resources/lang/ms/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Mengenai Susut Nilai Harta', 'about_depreciations' => 'Anda boleh tetapkan susut nilai harta berdasarkan kepada penyusutan berasaskan susut nilai garisan lurus.', 'asset_depreciations' => 'Susut Nilai Harta', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Bilangan Bulan', 'update' => 'Kemas kini Susutnilai', -); +]; diff --git a/resources/lang/ms/admin/depreciations/message.php b/resources/lang/ms/admin/depreciations/message.php index 5166c1f2b0..d12afca20d 100644 --- a/resources/lang/ms/admin/depreciations/message.php +++ b/resources/lang/ms/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Kelas susut nilai tidak wujud.', 'assoc_users' => 'Susut nilai ini telah dikaitkan dengan salah satu model dan tidak boleh dihapuskan. Sila hapuskan model tersebut dan cuba semula. ', - - 'create' => array( + 'create' => [ 'error' => 'Kelas susut nilai gagal di cipta, sila cuba semula. :(', - 'success' => 'Kelas susut nilai berjaya dicipta. :)' - ), + 'success' => 'Kelas susut nilai berjaya dicipta. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Kelas susut nilai gagal dikemaskini, sila cuba semua', - 'success' => 'Kelas susut nilai berjaya dikemaskini.' - ), + 'success' => 'Kelas susut nilai berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti untuk hapuskan kelas susut nilai ini?', 'error' => 'Ada isu untuk hapuskan kelas susut nilai. Sila cuba semula.', - 'success' => 'Kelas susut nilai berjaya dihapuskan.' - ) + 'success' => 'Kelas susut nilai berjaya dihapuskan.', + ], -); +]; diff --git a/resources/lang/ms/admin/depreciations/table.php b/resources/lang/ms/admin/depreciations/table.php index 0090a589ca..cb7ee742a3 100644 --- a/resources/lang/ms/admin/depreciations/table.php +++ b/resources/lang/ms/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Bulan', 'term' => 'Terma', 'title' => 'Nama ', -); +]; diff --git a/resources/lang/ms/admin/groups/message.php b/resources/lang/ms/admin/groups/message.php index a86a0f46fe..fed97c4ea9 100644 --- a/resources/lang/ms/admin/groups/message.php +++ b/resources/lang/ms/admin/groups/message.php @@ -1,22 +1,22 @@ 'Kumpulan sudah wujud!', 'group_not_found' => 'Kumpulan [:id] tidah wujud.', 'group_name_required' => 'Ruangan nama adalah perlu', - 'success' => array( + 'success' => [ 'create' => 'Kumpulan berjaya dicipta.', 'update' => 'Kumpulan berjaya dikemaskini.', 'delete' => 'Kumpulan berjaya dihapuskan.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti untuk haspuskan kumpulan ini?', 'create' => 'Ada isu semasa mencipta kumpulan. Sila cuba semula.', 'update' => 'Ada isu semasa mengemaskini kumpulan, Sila cuba semula.', 'delete' => 'Ada isu semasa menghapuskan kumpulan ini, Sila cuba semula.', - ), + ], -); +]; diff --git a/resources/lang/ms/admin/groups/table.php b/resources/lang/ms/admin/groups/table.php index de40a150d2..40e7d479e1 100644 --- a/resources/lang/ms/admin/groups/table.php +++ b/resources/lang/ms/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nama', 'users' => '# bil Pengguna', -); +]; diff --git a/resources/lang/ms/admin/groups/titles.php b/resources/lang/ms/admin/groups/titles.php index 7d2612f8b4..7da85d7a90 100644 --- a/resources/lang/ms/admin/groups/titles.php +++ b/resources/lang/ms/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Mengenai Kumpulan', 'about_groups' => 'Kumpulan digunakan untuk memperibadikan kebenaran pengguna.', 'group_management' => 'Pengurusan Kumpulan', @@ -11,4 +11,4 @@ return array( 'allow' => 'Benarkan', 'deny' => 'Nafikan', -); +]; diff --git a/resources/lang/ms/admin/hardware/form.php b/resources/lang/ms/admin/hardware/form.php index ed4bc35c66..091ba1408b 100644 --- a/resources/lang/ms/admin/hardware/form.php +++ b/resources/lang/ms/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Sahkan Pemutihan Aset Pukal', +return [ + 'bulk_delete' => 'Sahkan Pemutihan Aset Pukal', 'bulk_delete_help' => 'Semak aset untuk penghapusan pukal di bawah. Sebaik sahaja dipadam, aset ini dapat dipulihkan, tetapi mereka tidak lagi akan dikaitkan dengan mana-mana pengguna yang mereka buat sekarang.', 'bulk_delete_warn' => 'Anda akan hapus: asset_count aset.', - 'bulk_update' => 'Aset Kemas Kini Pukal', - 'bulk_update_help' => 'Borang ini membolehkan anda mengemas kini berbilang aset sekaligus. Hanya isikan medan yang perlu anda ubah. Mana-mana medan yang dibiarkan kosong akan kekal tidak berubah.', - 'bulk_update_warn' => 'Anda akan menyunting sifat aset aset_count.', + 'bulk_update' => 'Aset Kemas Kini Pukal', + 'bulk_update_help' => 'Borang ini membolehkan anda mengemas kini berbilang aset sekaligus. Hanya isikan medan yang perlu anda ubah. Mana-mana medan yang dibiarkan kosong akan kekal tidak berubah.', + 'bulk_update_warn' => 'Anda akan menyunting sifat aset aset_count.', 'checkedout_to' => 'Agihkan Kepada', 'checkout_date' => 'Tarikh Checkout', 'checkin_date' => 'Tarikh daftar masuk', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tag Harta', 'update' => 'Kemaskini Harta', 'warranty' => 'Waranti', - 'warranty_expires' => 'Tamat Tempoh Waranti', + 'warranty_expires' => 'Tamat Tempoh Waranti', 'years' => 'tahun', -) -; +]; diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php index 4929735b4c..6bb40ab7d7 100644 --- a/resources/lang/ms/admin/hardware/general.php +++ b/resources/lang/ms/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Mengenai Aset', 'about_assets_text' => 'Aset adalah item yang dikesan oleh nombor siri atau tag aset. Mereka cenderung menjadi item nilai yang lebih tinggi di mana mengenal pasti perkara-perkara tertentu.', - 'archived' => 'Diarkibkan', + 'archived' => 'Diarkibkan', 'asset' => 'Harta', 'bulk_checkout' => 'Daftar Keluar Aset', 'checkin' => 'Terima Harta', @@ -19,4 +19,4 @@ return array( 'pending' => 'Menunggu', 'undeployable' => 'Tidak dapat dipisahkan', 'view' => 'Papar Harta', -); +]; diff --git a/resources/lang/ms/admin/hardware/message.php b/resources/lang/ms/admin/hardware/message.php index e8ec0e560c..ffebaeddc0 100644 --- a/resources/lang/ms/admin/hardware/message.php +++ b/resources/lang/ms/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Amaran: Aset ini telah ditandakan sebagai tidak boleh dikehendaki. Jika status ini telah berubah, sila kemas kini status aset.', 'does_not_exist' => 'Harta tidak wujud.', 'does_not_exist_or_not_requestable' => 'Cubaan yang baik. Aset itu tidak wujud atau tidak boleh diminta.', 'assoc_users' => 'Harta ini sekarang telah diagihkan kepada pengguna dan tidak boleh dihapuskan. Sila semak status harta ini dahulu, dan kemudian cuba semula. ', - 'create' => array( + 'create' => [ 'error' => 'Harta gagal dicipta, sila cuba semula. :(', - 'success' => 'Harta berjaya dicipta. :)' - ), + 'success' => 'Harta berjaya dicipta. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Harta gagal dikemaskini, sila cuba semula', 'success' => 'Harta berjaya dikemaskini.', 'nothing_updated' => 'Tiada medan dipilih, jadi tiada apa yang dikemas kini.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Aset tidak dipulihkan, sila cuba lagi', - 'success' => 'Aset dipulihkan dengan jayanya.' - ), + 'success' => 'Aset dipulihkan dengan jayanya.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audit aset tidak berjaya. Sila cuba lagi.', - 'success' => 'Audit aset berjaya log.' - ), + 'success' => 'Audit aset berjaya log.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fail tidak dipadam. Sila cuba lagi.', 'success' => 'Fail berjaya dipadam.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fail tidak dimuat naik. Sila cuba lagi.', 'success' => 'Fail berjaya dimuat naik.', 'nofiles' => 'Anda tidak memilih sebarang fail untuk dimuat naik, atau fail yang anda cuba muat naik terlalu besar', 'invalidfiles' => 'Satu atau lebih daripada fail anda terlalu besar atau merupakan filetype yang tidak dibenarkan. Filetype yang dibenarkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Sesetengah item tidak diimport dengan betul.', 'errorDetail' => 'Item berikut tidak diimport kerana kesilapan.', - 'success' => "Fail anda telah diimport", - 'file_delete_success' => "Fail anda telah berjaya dihapuskan", - 'file_delete_error' => "Fail tidak dapat dipadamkan", - ), + 'success' => 'Fail anda telah diimport', + 'file_delete_success' => 'Fail anda telah berjaya dihapuskan', + 'file_delete_error' => 'Fail tidak dapat dipadamkan', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti anda ingin hapuskan harta ini?', 'error' => 'Ada isu semasa menghapuskan harta. Sila cuba lagi.', 'nothing_updated' => 'Tiada aset dipilih, jadi tiada apa yang dipadamkan.', - 'success' => 'Harta berjaya dihapuskan.' - ), + 'success' => 'Harta berjaya dihapuskan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Harta gagal diagihkan, sila cuba semula', 'success' => 'Harta berjaya diagihkan.', 'user_does_not_exist' => 'Pengguna tak sah. Sila cuba lagi.', 'not_available' => 'Aset itu tidak tersedia untuk checkout!', - 'no_assets_selected' => 'Anda mesti memilih sekurang-kurangnya satu aset dari senarai' - ), + 'no_assets_selected' => 'Anda mesti memilih sekurang-kurangnya satu aset dari senarai', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Harta tidak diterima, sila cuba lagi', 'success' => 'Harta berjaya diterima.', 'user_does_not_exist' => 'Pengguna tidah sah. Sila cuba lagi.', 'already_checked_in' => 'Aset itu sudah diperiksa.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Aset tidak diminta, sila cuba lagi', 'success' => 'Aset diminta berjaya.', - 'canceled' => 'Permintaan keluar telah dibatalkan' - ) + 'canceled' => 'Permintaan keluar telah dibatalkan', + ], -); +]; diff --git a/resources/lang/ms/admin/hardware/table.php b/resources/lang/ms/admin/hardware/table.php index 1fa744ae50..29f2836861 100644 --- a/resources/lang/ms/admin/hardware/table.php +++ b/resources/lang/ms/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Tag Harta', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Harta ', 'image' => 'Imej Peranti', 'days_without_acceptance' => 'Hari Tanpa Penerimaan', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/ms/admin/kits/general.php b/resources/lang/ms/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ms/admin/kits/general.php +++ b/resources/lang/ms/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ms/admin/licenses/form.php b/resources/lang/ms/admin/licenses/form.php index b46bdba9e6..d438b4c914 100644 --- a/resources/lang/ms/admin/licenses/form.php +++ b/resources/lang/ms/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Harta', 'checkin' => 'Terima', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Lesen Untuk Di \'email\'', 'to_name' => 'Lesen Untuk Dinamakan', 'update' => 'Kemaskini Lesen', - 'checkout_help' => 'Anda mesti menyemak lesen keluar kepada perkakasan atau persorangan. Anda boleh memilih keduanya, tetapi pemilik harta mesti sama dengan orang yang anda semak dimana harta diagihkan.' -); + 'checkout_help' => 'Anda mesti menyemak lesen keluar kepada perkakasan atau persorangan. Anda boleh memilih keduanya, tetapi pemilik harta mesti sama dengan orang yang anda semak dimana harta diagihkan.', +]; diff --git a/resources/lang/ms/admin/licenses/general.php b/resources/lang/ms/admin/licenses/general.php index 65ca4c94c1..982041467f 100644 --- a/resources/lang/ms/admin/licenses/general.php +++ b/resources/lang/ms/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Mengenai Lesen', 'about_licenses' => 'Lesen digunakan untuk mengesan perisian. Mereka mempunyai bilangan tempat duduk tertentu yang boleh diperiksa kepada individu', 'checkin' => 'Terima Kekosongan Lesen', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Lesen Perisian', 'user' => 'Pengguna', 'view' => 'Papar Lesen', -); +]; diff --git a/resources/lang/ms/admin/licenses/message.php b/resources/lang/ms/admin/licenses/message.php index 25c59864ff..13d937c520 100644 --- a/resources/lang/ms/admin/licenses/message.php +++ b/resources/lang/ms/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lesen tidak wujud.', 'user_does_not_exist' => 'Pengguna tidak wujud.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Anda mesti memilih aset atau pengguna, tetapi tidak kedua-duanya.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Lesen gagal dicipta, sila cuba lagi.', - 'success' => 'Lesen berjaya dicipta.' - ), + 'success' => 'Lesen berjaya dicipta.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fail tidak dipadam. Sila cuba lagi.', 'success' => 'Fail berjaya dipadam.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fail tidak dimuat naik. Sila cuba lagi.', 'success' => 'Fail berjaya dimuat naik.', 'nofiles' => 'Anda tidak memilih sebarang fail untuk dimuat naik, atau fail yang anda cuba muat naik terlalu besar', 'invalidfiles' => 'Satu atau lebih daripada fail anda terlalu besar atau merupakan filetype yang tidak dibenarkan. Filetype yang dibenarkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, dan lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lesen gagal dikemaskini, sila cuba lagi', - 'success' => 'Lesen berjaya dikemaskini.' - ), + 'success' => 'Lesen berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti and ingin menghapuskan lesen ini?', 'error' => 'Ada isu semada menghapuskan lesen, sila cuba lagi.', - 'success' => 'Lesen berjaya dihapuskan.' - ), + 'success' => 'Lesen berjaya dihapuskan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ada isu semasa agihan lesen. Sila cuba lagi.', - 'success' => 'Lesen berjaya diagihkan' - ), + 'success' => 'Lesen berjaya diagihkan', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ada isu semasa terima lesen. Sila cuba lagi.', - 'success' => 'Lesen berjaya diterima' - ), + 'success' => 'Lesen berjaya diterima', + ], -); +]; diff --git a/resources/lang/ms/admin/licenses/table.php b/resources/lang/ms/admin/licenses/table.php index f1051709fd..4961d97da8 100644 --- a/resources/lang/ms/admin/licenses/table.php +++ b/resources/lang/ms/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Serah Kepada', 'checkout' => 'Masuk/Keluar', @@ -14,4 +14,4 @@ return array( 'serial' => 'Siri', 'title' => 'Lesen', -); +]; diff --git a/resources/lang/ms/admin/locations/message.php b/resources/lang/ms/admin/locations/message.php index 3622ea96e9..89c7651f48 100644 --- a/resources/lang/ms/admin/locations/message.php +++ b/resources/lang/ms/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokasi tidak wujud.', 'assoc_users' => 'Lokasi ini sekaran telah disekutukan dengan sekurang2nya satu pengguna dan tidak boleh dihapuskan. Sila kemaskini pengguna anda supaya tidak lagi merujuk kepada lokasi ini dan cuba lagi. ', 'assoc_assets' => 'Lokasi ini kini dikaitkan dengan sekurang-kurangnya satu aset dan tidak boleh dihapuskan. Sila kemas kini aset anda untuk tidak merujuk lagi lokasi ini dan cuba lagi.', 'assoc_child_loc' => 'Lokasi ini adalah ibu bapa sekurang-kurangnya satu lokasi kanak-kanak dan tidak boleh dipadamkan. Sila kemas kini lokasi anda untuk tidak merujuk lokasi ini lagi dan cuba lagi.', - - 'create' => array( + 'create' => [ 'error' => 'Lokasi gagal dicipta, sila cuba lagi.', - 'success' => 'Lokasi berjaya dicipta.' - ), + 'success' => 'Lokasi berjaya dicipta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokasi gagal dikemaskini, sila cuba lagi', - 'success' => 'Lokasi berjaya dikemaskini.' - ), + 'success' => 'Lokasi berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti and ingin menghapuskan lokasi ini?', 'error' => 'Ada isu semasa menghapuskan lokasi. Sila cuba lagi.', - 'success' => 'Lokasi berjaya dihapuskan.' - ) + 'success' => 'Lokasi berjaya dihapuskan.', + ], -); +]; diff --git a/resources/lang/ms/admin/locations/table.php b/resources/lang/ms/admin/locations/table.php index b65bb1e997..194506f2e3 100644 --- a/resources/lang/ms/admin/locations/table.php +++ b/resources/lang/ms/admin/locations/table.php @@ -1,6 +1,6 @@ 'Mengenai Lokasi', 'about_locations' => 'Lokasi digunakan untuk mengesan maklumat lokasi untuk pengguna, aset dan barangan lain', 'assets_rtd' => 'Aset', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Ibu bapa', 'currency' => 'Mata Wang Lokasi', 'ldap_ou' => 'Carian LDAP OU', - ); + ]; diff --git a/resources/lang/ms/admin/manufacturers/message.php b/resources/lang/ms/admin/manufacturers/message.php index ee468483ba..5f2de12d3a 100644 --- a/resources/lang/ms/admin/manufacturers/message.php +++ b/resources/lang/ms/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Pengeluar tidak wujud.', 'assoc_users' => 'Pengeluar ini sekarang disekutukan dengan sekurang2nya satu model dan tidak boleh dihapuskan. Sila kemaskini model supaya tidak lagi merujuk kepada pengeluar ini dan cuba lagi. ', - 'create' => array( + 'create' => [ 'error' => 'Pengeluar gagal dicipta, sila cuba lagi.', - 'success' => 'Pengeluar berjaya dicipta.' - ), + 'success' => 'Pengeluar berjaya dicipta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pengeluar gagal dikemaskini, sila cuba lagi', - 'success' => 'Pengeluar berjaya dikemaskini.' - ), + 'success' => 'Pengeluar berjaya dikemaskini.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Pengilang tidak dipulihkan, sila cuba semula', - 'success' => 'Pengilang berjaya dipulihkan.' - ), + 'success' => 'Pengilang berjaya dipulihkan.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti anda ingin hapuskan pengeluar ini?', 'error' => 'Ada isu semasa menghapuskan pengeluar. Sila cuba lagi.', - 'success' => 'Pengeluar gagal dihapuskan.' - ) + 'success' => 'Pengeluar gagal dihapuskan.', + ], -); +]; diff --git a/resources/lang/ms/admin/manufacturers/table.php b/resources/lang/ms/admin/manufacturers/table.php index 22b77407bc..6768c6efa1 100644 --- a/resources/lang/ms/admin/manufacturers/table.php +++ b/resources/lang/ms/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Mengenai pengeluar', 'about_manufacturers_text' => 'Pengilang adalah syarikat yang membuat aset anda. Anda boleh menyimpan maklumat hubungan sokongan penting tentang mereka di sini, yang akan dipaparkan pada halaman butiran aset anda.', 'asset_manufacturers' => 'Pengeluar Harta', @@ -13,4 +13,4 @@ return array( 'update' => 'Kemaskini Pengeluar', 'url' => 'URL', -); +]; diff --git a/resources/lang/ms/admin/models/general.php b/resources/lang/ms/admin/models/general.php index 06d1d69d72..15aff4021c 100644 --- a/resources/lang/ms/admin/models/general.php +++ b/resources/lang/ms/admin/models/general.php @@ -1,6 +1,6 @@ 'Mengenai Model Asset', 'about_models_text' => 'Model Aset adalah cara untuk mengumpulkan aset yang sama. "MBP 2013", "IPhone 6s", dan sebagainya.', 'deleted' => 'Model ini telah dipadamkan. Klik di sini untuk memulihkannya.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Anda akan hapus :model_count model aset.', 'restore' => 'Pulihkan Model', 'requestable' => 'Pengguna boleh meminta model ini', - 'show_mac_address' => 'Tunjukkan medan alamat MAC dalam aset dalam model ini', + 'show_mac_address' => 'Tunjukkan medan alamat MAC dalam aset dalam model ini', 'view_deleted' => 'Paparan Dihapus', 'view_models' => 'Lihat Model', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Tiada bidang tersuai', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/ms/admin/models/message.php b/resources/lang/ms/admin/models/message.php index 05662d224e..fbb6c4f4d6 100644 --- a/resources/lang/ms/admin/models/message.php +++ b/resources/lang/ms/admin/models/message.php @@ -1,42 +1,41 @@ 'Model tidak wujud.', 'assoc_users' => 'Model ini sekarang disekutukan dengan sekurang2nya satu atau lebih harta dan tidak boleh dihapuskan. Sila kemaskini harta, dan kemudian cuba lagi. ', - - 'create' => array( + 'create' => [ 'error' => 'Model gagal dicipta, sila cuba lagi.', 'success' => 'Model berjaya dicipta.', 'duplicate_set' => 'Model aset dengan nama itu, pengeluar dan nombor model sudah ada.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model gagal dikemaskin, sila cuba lagi', - 'success' => 'Model berjaya dikemaskini.' - ), + 'success' => 'Model berjaya dikemaskini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti anda ingin hapuskan model harta ini?', 'error' => 'Ada isu semasa menghapuskan model. Sila cuba lagi.', - 'success' => 'Model berjaya dihapuskan.' - ), + 'success' => 'Model berjaya dihapuskan.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model tidak dipulihkan, sila cuba lagi', - 'success' => 'Model berjaya dipulihkan.' - ), + 'success' => 'Model berjaya dipulihkan.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Tiada medan berubah, jadi tiada apa yang dikemas kini.', - 'success' => 'Model dikemas kini.' - ), + 'success' => 'Model dikemas kini.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/ms/admin/models/table.php b/resources/lang/ms/admin/models/table.php index 4788bdaf11..f4ac9c7874 100644 --- a/resources/lang/ms/admin/models/table.php +++ b/resources/lang/ms/admin/models/table.php @@ -1,6 +1,6 @@ 'Cipta Model Harta', 'created_at' => 'Cipta Pada', @@ -14,4 +14,4 @@ return array( 'update' => 'Kemaskini Model Harta', 'clone' => 'Pendua Model', 'edit' => 'Kemaskini Model', -); +]; diff --git a/resources/lang/ms/admin/reports/general.php b/resources/lang/ms/admin/reports/general.php index 1eefd4c058..e48707e1b4 100644 --- a/resources/lang/ms/admin/reports/general.php +++ b/resources/lang/ms/admin/reports/general.php @@ -1,5 +1,5 @@ 'Pilih opsyen yang anda mahu untuk laporan harta anda.' -); +return [ + 'info' => 'Pilih opsyen yang anda mahu untuk laporan harta anda.', +]; diff --git a/resources/lang/ms/admin/reports/message.php b/resources/lang/ms/admin/reports/message.php index 799596a821..a6b52bfd87 100644 --- a/resources/lang/ms/admin/reports/message.php +++ b/resources/lang/ms/admin/reports/message.php @@ -1,5 +1,5 @@ 'Anda mesti pilih sekurang-kurangnya SATU opsyen.' -); +return [ + 'error' => 'Anda mesti pilih sekurang-kurangnya SATU opsyen.', +]; diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php index dfd13f6449..ab1827a86b 100644 --- a/resources/lang/ms/admin/settings/general.php +++ b/resources/lang/ms/admin/settings/general.php @@ -1,12 +1,12 @@ 'Direktori Aktif', 'ad_domain' => 'Domain direktori aktif', 'ad_domain_help' => 'Ini kadangkala sama dengan domain e-mel anda, tetapi tidak semestinya.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Ini adalah pelayan Direktori Aktif', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Amaran Pemberitahuan Amaran (dalam hari)', 'alert_inv_threshold' => 'Ambang Amaran Inventori', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID Aset', 'audit_interval' => 'Selang Audit', 'audit_interval_help' => 'Sekiranya anda dikehendaki untuk secara tetap mengaudit aset anda, masukkan selang waktu dalam bulan.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Masukkan Kod Dua Faktor', 'two_factor_config_complete' => 'Hantar Kod', 'two_factor_enabled_edit_not_allowed' => 'Pentadbir anda tidak membenarkan anda mengedit tetapan ini.', - 'two_factor_enrollment_text' => "Dua faktor pengesahan diperlukan, namun peranti anda belum lagi mendaftar. Buka apl Google Authenticator anda dan imbas kod QR di bawah untuk mendaftarkan peranti anda. Sebaik sahaja anda telah mendaftarkan peranti anda, masukkan kod di bawah", + 'two_factor_enrollment_text' => 'Dua faktor pengesahan diperlukan, namun peranti anda belum lagi mendaftar. Buka apl Google Authenticator anda dan imbas kod QR di bawah untuk mendaftarkan peranti anda. Sebaik sahaja anda telah mendaftarkan peranti anda, masukkan kod di bawah', 'require_accept_signature' => 'Memerlukan Tandatangan', 'require_accept_signature_help_text' => 'Mengaktifkan ciri ini akan menghendaki pengguna menandatangani secara fizikal apabila menerima aset.', 'left' => 'dibiarkan', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Panjang tag aset, termasuk zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ms/admin/settings/message.php b/resources/lang/ms/admin/settings/message.php index 53b01e3330..15592328f9 100644 --- a/resources/lang/ms/admin/settings/message.php +++ b/resources/lang/ms/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ralat berlaku semasa kemaskini. ', - 'success' => 'Tetapan berjaya dikemaskini.' - ), - 'backup' => array( + 'success' => 'Tetapan berjaya dikemaskini.', + ], + 'backup' => [ 'delete_confirm' => 'Adakah anda pasti mahu memadam fail sandaran ini? Tindakan ini tidak dapat dibatalkan.', 'file_deleted' => 'Fail sandaran telah berjaya dihapuskan.', 'generated' => 'Fail sandaran baharu berjaya dibuat.', 'file_not_found' => 'Fail sandaran itu tidak dapat dijumpai di pelayan.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ralat telah berlaku semasa pembersihan.', 'validation_failed' => 'Pengesahan pembersihan anda tidak betul. Sila taip perkataan "DELETE" dalam kotak pengesahan.', - 'success' => 'Rekod dipadamkan berjaya dibersihkan.' - ), + 'success' => 'Rekod dipadamkan berjaya dibersihkan.', + ], -); +]; diff --git a/resources/lang/ms/admin/statuslabels/message.php b/resources/lang/ms/admin/statuslabels/message.php index 10cc148e1f..c934f9a125 100644 --- a/resources/lang/ms/admin/statuslabels/message.php +++ b/resources/lang/ms/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Label Status tidak wujud.', 'assoc_assets' => 'Label Status ini kini dikaitkan dengan sekurang-kurangnya satu Aset dan tidak boleh dipadamkan. Sila kemas kini aset anda untuk tidak merujuk lagi status ini dan cuba lagi.', - - 'create' => array( + 'create' => [ 'error' => 'Label Status tidak dibuat, sila cuba lagi.', - 'success' => 'Label Status berjaya dibuat.' - ), + 'success' => 'Label Status berjaya dibuat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Label Status tidak dikemas kini, sila cuba lagi', - 'success' => 'Label Status berjaya dikemas kini.' - ), + 'success' => 'Label Status berjaya dikemas kini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Adakah anda pasti ingin memadamkan Label Status ini?', 'error' => 'Terdapat masalah memadamkan Label Status. Sila cuba lagi.', - 'success' => 'Label Status berjaya dipadam.' - ), + 'success' => 'Label Status berjaya dipadam.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Aset ini tidak boleh diberikan kepada sesiapa sahaja.', 'deployable' => 'Aset ini boleh diperiksa. Sebaik sahaja mereka ditugaskan, mereka akan menerima status meta Deployed.', 'archived' => 'Aset-aset ini tidak boleh diperiksa, dan hanya akan dipaparkan dalam pandangan Arkib. Ini berguna untuk mengekalkan maklumat mengenai aset untuk tujuan belanjawan / bersejarah tetapi menyimpannya daripada senarai aset harian.', 'pending' => 'Aset-aset ini belum dapat ditugaskan kepada sesiapa sahaja, sering kali digunakan untuk barang-barang yang hendak dibaiki, tetapi diharapkan dapat kembali ke peredaran.', - ), + ], -); +]; diff --git a/resources/lang/ms/admin/statuslabels/table.php b/resources/lang/ms/admin/statuslabels/table.php index e9fb99b2bd..d5bdcb1553 100644 --- a/resources/lang/ms/admin/statuslabels/table.php +++ b/resources/lang/ms/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Mengenai Label Status', 'archived' => 'Diarkibkan', 'create' => 'Cipata Label Status', @@ -16,4 +16,4 @@ return array( 'title' => 'Label Status', 'undeployable' => 'Tidak dapat dipisahkan', 'update' => 'Kemaskini Label Status', -); +]; diff --git a/resources/lang/ms/admin/suppliers/message.php b/resources/lang/ms/admin/suppliers/message.php index e9f53147ba..8604aefd55 100644 --- a/resources/lang/ms/admin/suppliers/message.php +++ b/resources/lang/ms/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Pembekal tidak wujud.', - - 'create' => array( + 'create' => [ 'error' => 'Pembekal gagal dicipta, sila cuba lagi.', - 'success' => 'Pembekal berjaya dicipta.' - ), + 'success' => 'Pembekal berjaya dicipta.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pembekal gagal dikemaskini, sila cuba lagi', - 'success' => 'Pembekal berjaya dikemakini.' - ), + 'success' => 'Pembekal berjaya dikemakini.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Anda pasti anda ingin hapuskan pembekal ini? ', 'error' => 'Ada isu semasa menghapuskan pembekal, sila cuba lagi.', 'success' => 'Pembekal berjaya dihapuskan.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ms/admin/suppliers/table.php b/resources/lang/ms/admin/suppliers/table.php index 18290ef38a..591e912611 100644 --- a/resources/lang/ms/admin/suppliers/table.php +++ b/resources/lang/ms/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Mengenai Pembekal', 'about_suppliers_text' => 'Pembekal digunakan untuk mengesan sumber barangan', 'address' => 'Alamat Pembekal', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Papar Harta Untuk', 'zip' => 'Poskod', -); +]; diff --git a/resources/lang/ms/admin/users/general.php b/resources/lang/ms/admin/users/general.php index f7aec797b9..f03e0a7c79 100644 --- a/resources/lang/ms/admin/users/general.php +++ b/resources/lang/ms/admin/users/general.php @@ -1,7 +1,6 @@ 'Pengguna ini boleh log masuk', 'activated_disabled_help_text' => 'Anda tidak boleh kemaskini status pengaktifan akaun anda sendiri.', 'assets_user' => 'Serahkan harta kepada :nama', @@ -13,7 +12,7 @@ return array( 'edit' => 'Kemaskini Pengguna', 'filetype_info' => 'Filetype yang dibenarkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.', 'history_user' => 'Sejarah untuk :nama', - 'info' => 'Maklumat', + 'info' => 'Maklumat', 'restore_user' => 'Klik di sini untuk memulihkannya.', 'last_login' => 'Log masuk terakhir', 'ldap_config_text' => 'Tetapan konfigurasi LDAP boleh didapati Admin> Tetapan. Lokasi (pilihan) yang dipilih akan ditetapkan untuk semua pengguna yang diimport.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Tetapan admin semasa anda membenarkan penguatkuasaan selektif pengesahan dua faktor.', 'two_factor_enrolled' => '2FA Device Enrolled', 'two_factor_active' => '2FA Aktif', - ); + ]; diff --git a/resources/lang/ms/admin/users/message.php b/resources/lang/ms/admin/users/message.php index 7903cad454..367fbd23a5 100644 --- a/resources/lang/ms/admin/users/message.php +++ b/resources/lang/ms/admin/users/message.php @@ -1,6 +1,6 @@ 'Anda telah berjaya menerima aset ini.', 'declined' => 'Anda telah berjaya menolak aset ini.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integrasi LDAP belum dikonfigurasi untuk pemasangan ini.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Pengguna berjaya dicipta.', 'update' => 'Pengguna berjaya dikemaskini.', 'update_bulk' => 'Pengguna berjaya dikemas kini!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Pengguna berjaya dilepaskan.', 'restored' => 'Pengguna berjaya dimasukkan semula.', 'import' => 'Pengguna diimport dengan jayanya.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Ada isu semasa mencipta pengguna. Sila cuba lagi.', 'update' => 'Ada isu semasa mencipta pengguna. Sila cuba lagi.', 'delete' => 'Ada isu semasa menghapuskan pengguna. Sila cuba lagi.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Tidak dapat mencari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP.
Error dari LDAP Server:', 'ldap_could_not_get_entries' => 'Tidak dapat masuk dari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP.
Error dari LDAP Server:', 'password_ldap' => 'Kata laluan untuk akaun ini diuruskan oleh LDAP / Active Directory. Sila hubungi jabatan IT anda untuk menukar kata laluan anda.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fail tidak dipadam. Sila cuba lagi.', 'success' => 'Fail berjaya dipadam.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fail tidak dimuat naik. Sila cuba lagi.', 'success' => 'Fail berjaya dimuat naik.', 'nofiles' => 'Anda tidak memilih sebarang fail untuk dimuat naik', 'invalidfiles' => 'Satu atau lebih daripada fail anda terlalu besar atau merupakan filetype yang tidak dibenarkan. Filetype yang dibenarkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', - ), + ], -); +]; diff --git a/resources/lang/ms/admin/users/table.php b/resources/lang/ms/admin/users/table.php index 3b8588741a..676bb0d904 100644 --- a/resources/lang/ms/admin/users/table.php +++ b/resources/lang/ms/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktif', 'allow' => 'Benarkan', 'checkedout' => 'Harta', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Tunjukkan Pengguna Semasa', 'show_deleted' => 'Tunjukkan Pengguna Dipadamkan', 'title' => 'Tajuk', - 'to_restore_them' => 'untuk memulihkannya.', + 'to_restore_them' => 'untuk memulihkannya.', 'updateuser' => 'Kemaskini Pengguna', 'username' => 'Nama pengguna', - 'user_deleted_text' => 'Pengguna ini telah ditandakan sebagai dipadamkan.', + 'user_deleted_text' => 'Pengguna ini telah ditandakan sebagai dipadamkan.', 'username_note' => '(Ini digunakan untuk \'Active Directory\' sahaja, bukan untuk log masuk.)', 'cloneuser' => 'Pendua Pengguna', 'viewusers' => 'Papar Pengguna', -); +]; diff --git a/resources/lang/ms/auth/general.php b/resources/lang/ms/auth/general.php index 1a6a77f89c..b7615e42f4 100644 --- a/resources/lang/ms/auth/general.php +++ b/resources/lang/ms/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ms/auth/message.php b/resources/lang/ms/auth/message.php index 95b99c1c73..fc4ac43a5a 100644 --- a/resources/lang/ms/auth/message.php +++ b/resources/lang/ms/auth/message.php @@ -1,6 +1,6 @@ 'Akaun menggunakan e-mel ini telah wujud.', 'account_not_found' => 'Nama pengguna atau kata laluan tidak betul.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Akaun pengguna ini di sekat.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Ada masalah semasa log masuk, sila cuba lagi.', 'success' => 'Anda berjaya log masuk.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Ada masalah semasa mencipta akaun anda, sila cuba lagi.', 'success' => 'Akaun berjaya dicipta.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Ada masalah semasa memohon kata kunci baru, sila cuba lagi.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ada masalah semasa kaka kunci di tetapkan, sila cuba lagi.', 'success' => 'Kata kunci berjaya di tukar.', - ), + ], - -); +]; diff --git a/resources/lang/ms/button.php b/resources/lang/ms/button.php index 28a2961c6f..054e07f1ef 100644 --- a/resources/lang/ms/button.php +++ b/resources/lang/ms/button.php @@ -1,6 +1,6 @@ 'Tindakan', 'add' => 'Tambah baru', 'cancel' => 'Batalkan', @@ -11,7 +11,7 @@ return array( 'request' => 'Permintaan', 'submit' => 'Hantar', 'upload' => 'Muat naik', - 'select_file' => 'Pilih Fail ...', + 'select_file' => 'Pilih Fail ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php index f502a05ee7..d80b154c36 100644 --- a/resources/lang/ms/general.php +++ b/resources/lang/ms/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Semak masuk', 'user_requests_count' => 'Permintaan', 'city' => 'Bandar', - 'click_here' => 'Tekan di sini', + 'click_here' => 'Tekan di sini', 'clear_selection' => 'Buang pilihan', 'companies' => 'Syarikat-syarikat', 'company' => 'Syarikat', 'component' => 'Komponen', 'components' => 'Komponen', - 'complete' => 'Lengkap', + 'complete' => 'Lengkap', 'consumable' => 'Boleh makan', 'consumables' => 'Makanan yang boleh dimakan', 'country' => 'Negara', diff --git a/resources/lang/ms/help.php b/resources/lang/ms/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ms/help.php +++ b/resources/lang/ms/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ms/mail.php b/resources/lang/ms/mail.php index 29c3bf7365..f1cd6d4e0e 100644 --- a/resources/lang/ms/mail.php +++ b/resources/lang/ms/mail.php @@ -1,6 +1,6 @@ 'Pengguna telah membatalkan permintaan item di laman web', 'a_user_requested' => 'Seorang pengguna telah meminta item di laman web', 'accessory_name' => 'Nama Aksesori:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ms/pagination.php b/resources/lang/ms/pagination.php index 3d6fed98b6..95cc8b9a5c 100644 --- a/resources/lang/ms/pagination.php +++ b/resources/lang/ms/pagination.php @@ -1,6 +1,6 @@ 'Seterusnya »', -); +]; diff --git a/resources/lang/ms/passwords.php b/resources/lang/ms/passwords.php index e65f2c796c..9b03172bc0 100644 --- a/resources/lang/ms/passwords.php +++ b/resources/lang/ms/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Pautan kata laluan anda telah dihantar!', 'user' => 'Tiada pengguna aktif yang menggunakan email ini.', ]; - diff --git a/resources/lang/ms/reminders.php b/resources/lang/ms/reminders.php index b1dd77aeb4..f770118e19 100644 --- a/resources/lang/ms/reminders.php +++ b/resources/lang/ms/reminders.php @@ -1,6 +1,6 @@ "Kata Kunci mesti terdiri dari 6 huruf dan sama dengan pengesahan.", + 'password' => 'Kata Kunci mesti terdiri dari 6 huruf dan sama dengan pengesahan.', - "user" => "Kata Laluan atau alamat e-mel tidak betul. ", + 'user' => 'Kata Laluan atau alamat e-mel tidak betul. ', - "token" => "Token Kata kunci tidak sah.", + 'token' => 'Token Kata kunci tidak sah.', - "sent" => "Jika alamat email yang sesuai ditemui, peringatan kata kunci telha dihantar!", + 'sent' => 'Jika alamat email yang sesuai ditemui, peringatan kata kunci telha dihantar!', -); +]; diff --git a/resources/lang/ms/table.php b/resources/lang/ms/table.php index 5c3e925fe1..a3e7ee0291 100644 --- a/resources/lang/ms/table.php +++ b/resources/lang/ms/table.php @@ -1,10 +1,10 @@ 'Tindakan', 'action' => 'Tindakan', 'by' => 'Oleh', 'item' => 'Perkara', -); +]; diff --git a/resources/lang/ms/validation.php b/resources/lang/ms/validation.php index 9f4f294f77..10f8ab37cf 100644 --- a/resources/lang/ms/validation.php +++ b/resources/lang/ms/validation.php @@ -1,6 +1,6 @@ ':attribute telah diambil.', 'uploaded' => 'The: attribute gagal untuk dimuat naik.', 'url' => ':attribute format tidak sah.', - "unique_undeleted" => ":attribute mesti unik.", + 'unique_undeleted' => ':attribute mesti unik.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Bidang: atribut mengandungi aksara yang tidak dibenarkan.", - "email_array" => "Satu atau lebih alamat e-mel tidak sah.", - "hashed_pass" => "Kata laluan semasa anda tidak betul", + 'alpha_space' => 'Bidang: atribut mengandungi aksara yang tidak dibenarkan.', + 'email_array' => 'Satu atau lebih alamat e-mel tidak sah.', + 'hashed_pass' => 'Kata laluan semasa anda tidak betul', 'dumbpwd' => 'Kata laluan itu terlalu umum.', - "statuslabel_type" => "Anda mesti memilih jenis label status yang sah", + 'statuslabel_type' => 'Anda mesti memilih jenis label status yang sah', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/nl/admin/accessories/general.php b/resources/lang/nl/admin/accessories/general.php index 5505c70327..45876c33c6 100644 --- a/resources/lang/nl/admin/accessories/general.php +++ b/resources/lang/nl/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessoire Categorie', 'accessory_name' => 'Accessoire Naam', 'checkout' => 'Check uit accessoire', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Gebruik de standaard gebruikersovereenkomst anders.', 'use_default_eula_disabled' => 'Gebruik de standaard gebruikersovereenkomst anders. Geen standaard gebruikersovereenkomst ingesteld. Voeg er alsjeblieft één toe in Instellingen.', -); +]; diff --git a/resources/lang/nl/admin/accessories/message.php b/resources/lang/nl/admin/accessories/message.php index 21c9e95430..ab1e03d8de 100644 --- a/resources/lang/nl/admin/accessories/message.php +++ b/resources/lang/nl/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Accessoire [:id] bestaat niet.', 'assoc_users' => 'Deze accessoire heeft op dit moment :count items uitgecheckt aan gebruikers. Check alsjeblieft de accessoire in en probeer opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Accessoire is niet gecreëerd, Probeer alsjeblieft opnieuw.', - 'success' => 'Accessoire succesvol aangemaakt.' - ), + 'success' => 'Accessoire succesvol aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Accessoire is niet geüpdatet, Probeer alsjeblieft opnieuw', - 'success' => 'Accessoire succesvol geupdate.' - ), + 'success' => 'Accessoire succesvol geupdate.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet u zeker dat u dit accessoire wilt verwijderen?', 'error' => 'Er was een probleem met verwijderen van het accessoire. Probeer het opnieuw.', - 'success' => 'Het accessoire is succesvol verwijderd.' - ), + 'success' => 'Het accessoire is succesvol verwijderd.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessoire is niet uitgecheckt, probeer alsjeblieft opnieuw', 'success' => 'Accessoire is succesvol uitgecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ), + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessoire is niet ingecheckt. Probeer alsjeblieft opnieuw', 'success' => 'Accessoire succesvol ingecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ) + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - -); +]; diff --git a/resources/lang/nl/admin/accessories/table.php b/resources/lang/nl/admin/accessories/table.php index 76f6c98773..12adcd6726 100644 --- a/resources/lang/nl/admin/accessories/table.php +++ b/resources/lang/nl/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV downloaden', - 'eula_text' => 'Gebruikersovereenkomst', +return [ + 'dl_csv' => 'CSV downloaden', + 'eula_text' => 'Gebruikersovereenkomst', 'id' => 'ID', 'require_acceptance' => 'Acceptatie', 'title' => 'Accessoire Naam', - -); +]; diff --git a/resources/lang/nl/admin/asset_maintenances/form.php b/resources/lang/nl/admin/asset_maintenances/form.php index aa8eb87f29..4287b0e2f5 100644 --- a/resources/lang/nl/admin/asset_maintenances/form.php +++ b/resources/lang/nl/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dagen', 'notes' => 'Notities', 'update' => 'Bijwerken', - 'create' => 'Creeër' + 'create' => 'Creeër', ]; diff --git a/resources/lang/nl/admin/asset_maintenances/message.php b/resources/lang/nl/admin/asset_maintenances/message.php index f06c45209c..694da8399a 100644 --- a/resources/lang/nl/admin/asset_maintenances/message.php +++ b/resources/lang/nl/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Weet je zeker dat je dit asset onderhoud wilt verwijderen?', 'error' => 'Er was een probleem tijdens het verwijderen van de asset onderhoud. Probeer het opnieuw.', - 'success' => 'De asset onderhoud is succesvol verwijderd.' + 'success' => 'De asset onderhoud is succesvol verwijderd.', ], 'create' => [ 'error' => 'Asset onderhoud is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Asset onderhoud is met succes aangemaakt.' + 'success' => 'Asset onderhoud is met succes aangemaakt.', ], 'edit' => [ 'error' => 'Asset onderhoud is niet aangepast, probeer het opnieuw.', - 'success' => 'Asset onderhoud is met succes aangepast.' + 'success' => 'Asset onderhoud is met succes aangepast.', ], 'asset_maintenance_incomplete' => 'Nog niet voltooid', 'warranty' => 'Garantie', 'not_warranty' => 'Geen garantie', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/nl/admin/asset_maintenances/table.php b/resources/lang/nl/admin/asset_maintenances/table.php index e1a1711432..1a9df4f612 100644 --- a/resources/lang/nl/admin/asset_maintenances/table.php +++ b/resources/lang/nl/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset onderhoud', 'asset_name' => 'Asset naam', 'is_warranty' => 'Garantie', - 'dl_csv' => 'CSV downloaden' + 'dl_csv' => 'CSV downloaden', ]; diff --git a/resources/lang/nl/admin/categories/general.php b/resources/lang/nl/admin/categories/general.php index f0d0c3b373..230fe857e2 100644 --- a/resources/lang/nl/admin/categories/general.php +++ b/resources/lang/nl/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categorieën', 'category_name' => 'Categorie Naam', 'checkin_email' => 'Stuur een E-mail naar de gebruiker bij in- of uitchecken.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Gebruik de standaard gebruikersovereenkomst anders.', 'use_default_eula_disabled' => 'Gebruik de standaard gebruikersovereenkomst anders. Geen standaard gebruikersovereenkomst ingesteld. Voeg er één toe in Instellingen.', -); +]; diff --git a/resources/lang/nl/admin/categories/message.php b/resources/lang/nl/admin/categories/message.php index c530b4f8f4..7d9c146364 100644 --- a/resources/lang/nl/admin/categories/message.php +++ b/resources/lang/nl/admin/categories/message.php @@ -1,25 +1,25 @@ 'Categorie bestaat niet.', 'assoc_models' => 'Deze categorie is momenteel gekoppeld met ten minste 1 model en kan niet verwijderd worden. Pas uw modellen aan zodat deze categorie niet langer gebruikt wordt en probeer opnieuw. ', 'assoc_items' => 'Deze categorie is momenteel gekoppeld aan ten minste één: asset_type en kan niet worden verwijderd. Zorg dat uw: asset_type niet langer verwijst naar deze categorie en probeer het opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Categorie werd niet aangemaakt. Probeer opnieuw, aub.', - 'success' => 'Categorie correct aangemaakt.' - ), + 'success' => 'Categorie correct aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Categorie werd niet aangepast. Probeer opnieuw, aub.', - 'success' => 'Categorie correct aangepast.' - ), + 'success' => 'Categorie correct aangepast.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bent u zeker dat u deze categorie wilt wissen?', 'error' => 'Er is een probleem opgetreden bij het verwijderen van deze categorie. Probeer opnieuw, aub.', - 'success' => 'De categorie werd succesvol verwijderd.' - ) + 'success' => 'De categorie werd succesvol verwijderd.', + ], -); +]; diff --git a/resources/lang/nl/admin/categories/table.php b/resources/lang/nl/admin/categories/table.php index df96d606a1..f2096e859b 100644 --- a/resources/lang/nl/admin/categories/table.php +++ b/resources/lang/nl/admin/categories/table.php @@ -1,10 +1,10 @@ 'GEBRUIKSRECHTOVEREENKOMST', +return [ + 'eula_text' => 'GEBRUIKSRECHTOVEREENKOMST', 'id' => 'ID', 'parent' => 'Bovenliggend', 'require_acceptance' => 'Acceptatie', 'title' => 'Asset categorie naam', -); +]; diff --git a/resources/lang/nl/admin/companies/general.php b/resources/lang/nl/admin/companies/general.php index 85852c0518..b12e16bb62 100644 --- a/resources/lang/nl/admin/companies/general.php +++ b/resources/lang/nl/admin/companies/general.php @@ -1,4 +1,5 @@ 'Selecteer een bedrijf', ]; diff --git a/resources/lang/nl/admin/companies/message.php b/resources/lang/nl/admin/companies/message.php index b80815d890..113db6992a 100644 --- a/resources/lang/nl/admin/companies/message.php +++ b/resources/lang/nl/admin/companies/message.php @@ -1,18 +1,19 @@ 'Bedrijf bestaat niet.', 'assoc_users' => 'Deze categorie is momenteel gekoppeld met ten minste 1 model en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze categorie niet langer gebruikt wordt en probeer het opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Bedrijf is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Bedrijf met succes aangemaakt.' - ), - 'update' => array( + 'success' => 'Bedrijf met succes aangemaakt.', + ], + 'update' => [ 'error' => 'Bedrijf is niet gewijzigd, probeer het opnieuw', - 'success' => 'Bedrijf met succes gewijzigd.' - ), - 'delete' => array( + 'success' => 'Bedrijf met succes gewijzigd.', + ], + 'delete' => [ 'confirm' => 'Weet je het zeker dat je dit bedrijf wilt verwijderen?', 'error' => 'Er was een probleem met het verwijderen van het bedrijf, Probeer het opnieuw.', - 'success' => 'Het bedrijf is met succes verwijderd.' - ) -); + 'success' => 'Het bedrijf is met succes verwijderd.', + ], +]; diff --git a/resources/lang/nl/admin/companies/table.php b/resources/lang/nl/admin/companies/table.php index 9e7cb8ccd7..345f95e3cb 100644 --- a/resources/lang/nl/admin/companies/table.php +++ b/resources/lang/nl/admin/companies/table.php @@ -1,9 +1,10 @@ 'Bedrijven', 'create' => 'Maak bedrijf aan', 'title' => 'Bedrijf', 'update' => 'Wijzig bedrijf', 'name' => 'Bedrijfsnaam', 'id' => 'ID', -); +]; diff --git a/resources/lang/nl/admin/components/general.php b/resources/lang/nl/admin/components/general.php index c804baf9c7..c63bd43e23 100644 --- a/resources/lang/nl/admin/components/general.php +++ b/resources/lang/nl/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Naam', 'checkin' => 'Component inchecken', 'checkout' => 'Component uitchecken', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Resterend', 'total' => 'Totaal', 'update' => 'Component bijwerken', -); +]; diff --git a/resources/lang/nl/admin/components/message.php b/resources/lang/nl/admin/components/message.php index 5e4a3fe566..e5b4d91097 100644 --- a/resources/lang/nl/admin/components/message.php +++ b/resources/lang/nl/admin/components/message.php @@ -1,36 +1,35 @@ 'Component bestaat niet.', - 'create' => array( + 'create' => [ 'error' => 'Component is niet aangemaakt, probeer het nogmaals.', - 'success' => 'Component succesvol aangemaakt.' - ), + 'success' => 'Component succesvol aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component is niet bijgewerkt, probeer het nogmaals.', - 'success' => 'Component succesvol bijgewerkt.' - ), + 'success' => 'Component succesvol bijgewerkt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je zeker dat je dit component wil verwijderen?', 'error' => 'Er ging iets mis bij het verwijderen van het component. Probeer het nogmaals.', - 'success' => 'Component succesvol verwijderd.' - ), + 'success' => 'Component succesvol verwijderd.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component is niet uitgecheckt, probeer het nogmaals', 'success' => 'Component succesvol uitgecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ), + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component is niet ingecheckt, probeer het nogmaals', 'success' => 'Component succesvol ingecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ) + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - -); +]; diff --git a/resources/lang/nl/admin/components/table.php b/resources/lang/nl/admin/components/table.php index fc408c7c72..1868a531c6 100644 --- a/resources/lang/nl/admin/components/table.php +++ b/resources/lang/nl/admin/components/table.php @@ -1,5 +1,5 @@ 'Componentnaam', -); +]; diff --git a/resources/lang/nl/admin/consumables/general.php b/resources/lang/nl/admin/consumables/general.php index 08610134ff..5fa20dfdee 100644 --- a/resources/lang/nl/admin/consumables/general.php +++ b/resources/lang/nl/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Verbruiksartikel uitchecken aan gebruiker', 'consumable_name' => 'Verbruiksartikel naam', 'create' => 'Maak verbruiksartikel aan', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Resterende', 'total' => 'Totaal', 'update' => 'Wijzig verbruiksartikel', -); +]; diff --git a/resources/lang/nl/admin/consumables/message.php b/resources/lang/nl/admin/consumables/message.php index cffe71acbf..b89330aff0 100644 --- a/resources/lang/nl/admin/consumables/message.php +++ b/resources/lang/nl/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Verbruiksartikel bestaat niet.', - 'create' => array( + 'create' => [ 'error' => 'Verbruiksartikel is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Verbruiksartikel is met succes aangemaakt.' - ), + 'success' => 'Verbruiksartikel is met succes aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Verbruiksartikel is niet gewijzigd, probeer het opnieuw', - 'success' => 'Verbruiksartikel is met succes gewijzigd.' - ), + 'success' => 'Verbruiksartikel is met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je het zeker dat je deze verbruiksartikel wilt verwijderen?', 'error' => 'Er was een probleem met het verwijderen van dit verbruiksartikel. Probeer het opnieuw.', - 'success' => 'Het verbruiksartikel is met succes verwijderd.' - ), + 'success' => 'Het verbruiksartikel is met succes verwijderd.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Verbruiksartikel is niet uitgecheckt, probeer het opnieuw', 'success' => 'Verbruiksartikel is met succes uitgecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ), + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Verbruiksartikel is niet ingecheckt, probeer het opnieuw', 'success' => 'Verbruiksartikel is met succes ingecheckt.', - 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.' - ) + 'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.', + ], - -); +]; diff --git a/resources/lang/nl/admin/consumables/table.php b/resources/lang/nl/admin/consumables/table.php index 36af35def2..187fa8ef6c 100644 --- a/resources/lang/nl/admin/consumables/table.php +++ b/resources/lang/nl/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Verbruiksartikel naam', -); +]; diff --git a/resources/lang/nl/admin/custom_fields/general.php b/resources/lang/nl/admin/custom_fields/general.php index 6df8aaa967..4d03028aa2 100644 --- a/resources/lang/nl/admin/custom_fields/general.php +++ b/resources/lang/nl/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Speciale velden', 'field' => 'Veld', 'about_fieldsets_title' => 'Over veldverzamelingen', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nieuw aangepast veld', 'value_encrypted' => 'De waarde van dit veld is versleuteld in de database. Alleen beheerders zullen de onversleutelde waarde kunnen weergeven.', 'show_in_email' => 'De waarde van dit veld opnemen in de checkout-e-mails die naar de gebruiker zijn verzonden? Versleutelde velden kunnen niet worden opgenomen in e-mails.', -); +]; diff --git a/resources/lang/nl/admin/custom_fields/message.php b/resources/lang/nl/admin/custom_fields/message.php index a645712726..47d6c284a3 100644 --- a/resources/lang/nl/admin/custom_fields/message.php +++ b/resources/lang/nl/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Dat veld bestaat niet.', 'already_added' => 'Veld is al toegevoegd', - 'create' => array( + 'create' => [ 'error' => 'Veld is niet aangemaakt, probeer het opnieuw.', 'success' => 'Veld is met succes aangemaakt.', - 'assoc_success' => 'Veld is met succes aan veldverzameling toegevoegd.' - ), + 'assoc_success' => 'Veld is met succes aan veldverzameling toegevoegd.', + ], - 'update' => array( + 'update' => [ 'error' => 'Veld was niet gewijzigd, probeer het opnieuw', - 'success' => 'Veld is met succes gewijzigd.' - ), + 'success' => 'Veld is met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je zeker dat je dit veld wilt verwijderen?', 'error' => 'Er was een probleem tijden het verwijderen van dit veld. Probeer het opnieuw.', 'success' => 'Het veld is met succes verwijderd.', 'in_use' => 'Veld is nog in gebruik.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Veldverzameling bestaat niet', - 'create' => array( + 'create' => [ 'error' => 'Veldverzameling is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Veldverzameling is met succes aangemaakt.' - ), + 'success' => 'Veldverzameling is met succes aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Veldverzameling is niet gewijzigd, probeer het opnieuw', - 'success' => 'Veldverzameling is met succes gewijzigd.' - ), + 'success' => 'Veldverzameling is met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je zeker dat je deze veldverzameling wilt verwijderen?', 'error' => 'Er was een probleem tijdens het verwijderen van deze veldverzameling, probeer het opnieuw.', 'success' => 'De veldverzameling is met succes verwijderd.', 'in_use' => 'Veldverzamelingen is nog in gebruikt.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/nl/admin/departments/message.php b/resources/lang/nl/admin/departments/message.php index 0e7d7fa963..ea9c3c594d 100644 --- a/resources/lang/nl/admin/departments/message.php +++ b/resources/lang/nl/admin/departments/message.php @@ -1,21 +1,21 @@ 'Afdeling bestaat niet.', 'assoc_users' => 'Deze afdeling is op dit moment gekoppeld aan minstens één gebruiker en kan daardoor niet verwijderd worden. Zorg ervoor dat er geen gebruikers meer aan deze afdeling gekoppeld zijn en probeer het opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Afdeling is niet aangemaakt, probeer het nogmaals.', - 'success' => 'Afdeling succesvol aangemaakt.' - ), - 'update' => array( + 'success' => 'Afdeling succesvol aangemaakt.', + ], + 'update' => [ 'error' => 'Afdeling is niet bijgewerkt, probeer het nogmaals', - 'success' => 'Afdeling succesvol bijgewerkt.' - ), - 'delete' => array( + 'success' => 'Afdeling succesvol bijgewerkt.', + ], + 'delete' => [ 'confirm' => 'Weet je zeker dat je deze afdeling wil verwijderen?', 'error' => 'Er was een probleem tijdens het verwijderen van de afdeling, probeer het nogmaals.', - 'success' => 'De afdeling is succesvol verwijderd.' - ) + 'success' => 'De afdeling is succesvol verwijderd.', + ], -); +]; diff --git a/resources/lang/nl/admin/departments/table.php b/resources/lang/nl/admin/departments/table.php index 0ee45cb719..0c8222fd38 100644 --- a/resources/lang/nl/admin/departments/table.php +++ b/resources/lang/nl/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Afdelingsnaam', @@ -8,4 +8,4 @@ return array( 'location' => 'Locatie', 'create' => 'Afdeling aanmaken', 'update' => 'Afdeling bijwerken', - ); + ]; diff --git a/resources/lang/nl/admin/depreciations/general.php b/resources/lang/nl/admin/depreciations/general.php index e359da4f65..72ee8bccbd 100644 --- a/resources/lang/nl/admin/depreciations/general.php +++ b/resources/lang/nl/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Over afschrijvingen van Asset', 'about_depreciations' => 'U kan de asset-afschrijving instellen om assets af te schrijven op basis van lineaire afschrijving.', 'asset_depreciations' => 'Asset afschrijvingen', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Aantal maanden', 'update' => 'Afschrijving bijwerken', -); +]; diff --git a/resources/lang/nl/admin/depreciations/message.php b/resources/lang/nl/admin/depreciations/message.php index 634a4378d4..27b8f94ab2 100644 --- a/resources/lang/nl/admin/depreciations/message.php +++ b/resources/lang/nl/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Afschrijvingsklasse bestaat niet.', 'assoc_users' => 'Deze afschrijving is momenteel gekoppeld aan één of meer modellen en kan niet verwijderd worden. Gelieve de modellen te verwijderen, en probeer het verwijderen opnieuw. ', - - 'create' => array( + 'create' => [ 'error' => 'Afschrijvingsklasse werd niet aangemaakt, probeer opnieuw aub. :(', - 'success' => 'Afschrijvingsklasse succesvol aangemaakt. :)' - ), + 'success' => 'Afschrijvingsklasse succesvol aangemaakt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Afschrijvingsklasse werd niet bijgewerkt. Probeer opnieuw, aub.', - 'success' => 'Afschrijvingsklasse succesvol bijgewerkt.' - ), + 'success' => 'Afschrijvingsklasse succesvol bijgewerkt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bent u zeker dat u deze afschrijvingsklasse wil verwijderen?', 'error' => 'Er was een probleem bij het verwijderen van de afschrijvingsklasse. Probeer opnieuw, aub.', - 'success' => 'De afschrijvingsklasse werd succesvol verwijderd.' - ) + 'success' => 'De afschrijvingsklasse werd succesvol verwijderd.', + ], -); +]; diff --git a/resources/lang/nl/admin/depreciations/table.php b/resources/lang/nl/admin/depreciations/table.php index 03f9f71a8a..8fd8016c82 100644 --- a/resources/lang/nl/admin/depreciations/table.php +++ b/resources/lang/nl/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Maanden', 'term' => 'Termijn', 'title' => 'Naam ', -); +]; diff --git a/resources/lang/nl/admin/groups/message.php b/resources/lang/nl/admin/groups/message.php index d5e1ff813d..e102d447ad 100644 --- a/resources/lang/nl/admin/groups/message.php +++ b/resources/lang/nl/admin/groups/message.php @@ -1,22 +1,22 @@ 'Groep bestaat al!', 'group_not_found' => 'Groep [:id] bestaat niet.', 'group_name_required' => 'Het veld \'naam\' is verplicht.', - 'success' => array( + 'success' => [ 'create' => 'Groep succesvol aangemaakt.', 'update' => 'Groep succesvol bijgewerkt.', 'delete' => 'Groep succesvol verwijderd.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bent u zeker dat u deze groep wilt verwijderen?', 'create' => 'Er was een probleem tijdens het aanmaken van deze groep. Probeer opnieuw, aub.', 'update' => 'Er was een probleem tijdens het bijwerken van deze groep. Probeer opnieuw, aub.', 'delete' => 'Er was een probleem tijdens het verwijderen van deze groep. Probeer opnieuw, aub.', - ), + ], -); +]; diff --git a/resources/lang/nl/admin/groups/table.php b/resources/lang/nl/admin/groups/table.php index eff8ccbbb5..025dc2a6f5 100644 --- a/resources/lang/nl/admin/groups/table.php +++ b/resources/lang/nl/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Naam', 'users' => 'Aantal gebruikers', -); +]; diff --git a/resources/lang/nl/admin/groups/titles.php b/resources/lang/nl/admin/groups/titles.php index 37e5ea03e4..690a0a4aaf 100644 --- a/resources/lang/nl/admin/groups/titles.php +++ b/resources/lang/nl/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Over groepen', 'about_groups' => 'Groepen die gebruikt worden om gebruikerspermissies te generaliseren.', 'group_management' => 'Groepsmanagement', @@ -11,4 +11,4 @@ return array( 'allow' => 'Toestaan', 'deny' => 'Weigeren', -); +]; diff --git a/resources/lang/nl/admin/hardware/form.php b/resources/lang/nl/admin/hardware/form.php index cdf6ecbcf8..deb4423933 100644 --- a/resources/lang/nl/admin/hardware/form.php +++ b/resources/lang/nl/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Bevestig bulk verwijdering van assets', +return [ + 'bulk_delete' => 'Bevestig bulk verwijdering van assets', 'bulk_delete_help' => 'Bekijk de assets voor bulkverwijdering hieronder. Eenmaal verwijderd, kunnen deze assets worden hersteld, maar ze zullen niet langer geassocieerd worden met gebruikers waaraan ze momenteel zijn toegewezen.', 'bulk_delete_warn' => 'Je staat op het punt om :asset_count assets te verwijderen.', - 'bulk_update' => 'Assets in bulk bijwerken', - 'bulk_update_help' => 'Met dit formulier kun je meerdere assets tegelijk bijwerken. Vul alleen de velden in die je moet wijzigen. Alle lege velden blijven ongewijzigd. ', - 'bulk_update_warn' => 'Je staat op het punt de eigenschappen van :asset_count assets te wijzigen.', + 'bulk_update' => 'Assets in bulk bijwerken', + 'bulk_update_help' => 'Met dit formulier kun je meerdere assets tegelijk bijwerken. Vul alleen de velden in die je moet wijzigen. Alle lege velden blijven ongewijzigd. ', + 'bulk_update_warn' => 'Je staat op het punt de eigenschappen van :asset_count assets te wijzigen.', 'checkedout_to' => 'Uitgecheckt aan', 'checkout_date' => 'Uitgecheckt datum', 'checkin_date' => 'Ingecheckt datum', @@ -38,7 +38,6 @@ return array( 'tag' => 'Assettag', 'update' => 'Asset update', 'warranty' => 'Garantie', - 'warranty_expires' => 'Garantie vervalt', + 'warranty_expires' => 'Garantie vervalt', 'years' => 'jaar', -) -; +]; diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php index 2b3456fcd0..1f3d46a949 100644 --- a/resources/lang/nl/admin/hardware/general.php +++ b/resources/lang/nl/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Over assets', 'about_assets_text' => 'Assets zijn items die worden bijgehouden op serienummer of een tag van het product. Het zijn meestal items met een hogere waarde waarbij het identificeren van een specifiek item belangrijk is.', - 'archived' => 'Gearchiveerd', + 'archived' => 'Gearchiveerd', 'asset' => 'Asset', 'bulk_checkout' => 'Asset uitchecken', 'checkin' => 'Asset inchecken', @@ -19,4 +19,4 @@ return array( 'pending' => 'In behandeling', 'undeployable' => 'Niet uitgeefbaar', 'view' => 'Bekijk Asset', -); +]; diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php index 811d1257d2..ae82a9037b 100644 --- a/resources/lang/nl/admin/hardware/message.php +++ b/resources/lang/nl/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Waarschuwing: Dit bestand is gemarkeerd als niet-uitgeefbaar. Als deze status is veranderd, update dan de asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Leuk geprobeerd. Het asset bestaat niet of is niet aanvraagbaar.', 'assoc_users' => 'Dit asset is momenteel toegewezen aan een gebruiker en kan niet worden verwijderd. Controleer het asset eerst en probeer het opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Asset is niet aangemaakt, probeer het opnieuw :(', - 'success' => 'Asset is succesvol aangemaakt. :)' - ), + 'success' => 'Asset is succesvol aangemaakt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset is niet gewijzigd, probeer het opnieuw', 'success' => 'Asset is succesvol bijgewerkt.', 'nothing_updated' => 'Geen veld is geselecteerd, er is dus niks gewijzigd.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset is niet hersteld, probeer het opnieuw', - 'success' => 'Asset is succesvol hersteld.' - ), + 'success' => 'Asset is succesvol hersteld.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit is mislukt. Probeer het opnieuw.', - 'success' => 'Asset audit succesvol geregistreerd.' - ), + 'success' => 'Asset audit succesvol geregistreerd.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Bestand is niet verwijderd. Probeer het opnieuw.', 'success' => 'Bestand is met succes verwijderd.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Bestand(en) zijn niet geüpload. Probeer het opnieuw.', 'success' => 'Bestand(en) zijn met succes geüpload.', 'nofiles' => 'Je hebt geen bestanden geselecteerd om te uploaden, of het bestand wat je probeert te uploaden is te groot', 'invalidfiles' => 'Een of meer van uw bestanden is te groot of is een bestandstype dat niet is toegestaan. Toegestaande bestandstypen png, gif, jpg, doc, docx, pdf en txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Sommige items zijn niet goed geïmporteerd.', 'errorDetail' => 'De volgende items zijn niet geïmporteerd vanwege fouten.', - 'success' => "Je bestand is geïmporteerd", - 'file_delete_success' => "Je bestand is succesvol verwijderd", - 'file_delete_error' => "Het bestand kon niet worden verwijderd", - ), + 'success' => 'Je bestand is geïmporteerd', + 'file_delete_success' => 'Je bestand is succesvol verwijderd', + 'file_delete_error' => 'Het bestand kon niet worden verwijderd', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je zeker dat je dit asset wilt verwijderen?', 'error' => 'Er was een probleem tijdens het verwijderen van het asset. Probeer het opnieuw.', 'nothing_updated' => 'Er zijn geen assets geselecteerd, er is dus niets verwijderd.', - 'success' => 'Het asset is succesvol verwijderd.' - ), + 'success' => 'Het asset is succesvol verwijderd.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset is niet uitgecheckt, probeer het opnieuw', 'success' => 'Asset is met succes uitgecheckt.', 'user_does_not_exist' => 'De gebruiker is ongeldig. Probeer het opnieuw.', 'not_available' => 'Dat asset is niet beschikbaar voor check-out!', - 'no_assets_selected' => 'U moet minstens één asset selecteren uit de lijst' - ), + 'no_assets_selected' => 'U moet minstens één asset selecteren uit de lijst', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset is niet ingecheckt, probeer het opnieuw', 'success' => 'Asset is met succes ingecheckt.', 'user_does_not_exist' => 'De gebruiker is ongeldig. Probeer het opnieuw.', 'already_checked_in' => 'Dat asset is al ingecheckt.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset is niet aangevraagd. Probeer het opnieuw', 'success' => 'Asset is succesvol aangevraagd.', - 'canceled' => 'Checkout aanvraag succesvol geannuleerd' - ) + 'canceled' => 'Checkout aanvraag succesvol geannuleerd', + ], -); +]; diff --git a/resources/lang/nl/admin/hardware/table.php b/resources/lang/nl/admin/hardware/table.php index 3a6c91ce15..d20cc99178 100644 --- a/resources/lang/nl/admin/hardware/table.php +++ b/resources/lang/nl/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Asset afbeelding', 'days_without_acceptance' => 'Dagen zonder acceptatie', - 'monthly_depreciation' => 'Maandelijkse afschrijving' + 'monthly_depreciation' => 'Maandelijkse afschrijving', -); +]; diff --git a/resources/lang/nl/admin/kits/general.php b/resources/lang/nl/admin/kits/general.php index eab985c4cc..956bc4a5a7 100644 --- a/resources/lang/nl/admin/kits/general.php +++ b/resources/lang/nl/admin/kits/general.php @@ -1,6 +1,6 @@ 'Over vooraf gedefinieerde Kits', 'about_kits_text' => 'Vooraf gedefinieerde Kits laat je snel een verzameling items bekijken (assets, licenties, enz.) voor een gebruiker. Dit kan handig zijn wanneer uw onboarding proces consistent is voor veel gebruikers en alle gebruikers dezelfde items ontvangen.', 'checkout' => 'Check uit Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Er zijn niet genoeg beschikbare eenheden van :consumable om uit te checken. :qty zijn verplicht. ', 'none_accessory' => 'Er zijn niet genoeg beschikbare eenheden van :accessory om uit te checken. :qty zijn verplicht. ', -); +]; diff --git a/resources/lang/nl/admin/licenses/form.php b/resources/lang/nl/admin/licenses/form.php index a60af5a0c0..d68d7b4aeb 100644 --- a/resources/lang/nl/admin/licenses/form.php +++ b/resources/lang/nl/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licentie uitgegeven aan E-mail', 'to_name' => 'Licentie uitgegeven aan Naam', 'update' => 'Wijzig licentie', - 'checkout_help' => 'Je moet een licentie uitchecken naar een hardware product of een persoon. Je kunt beide selecteren, maar de eigenaar van het product moet overeenkomen met de persoon waar je het asset aan selecteert.' -); + 'checkout_help' => 'Je moet een licentie uitchecken naar een hardware product of een persoon. Je kunt beide selecteren, maar de eigenaar van het product moet overeenkomen met de persoon waar je het asset aan selecteert.', +]; diff --git a/resources/lang/nl/admin/licenses/general.php b/resources/lang/nl/admin/licenses/general.php index a9fb0ef8cc..36239b0751 100644 --- a/resources/lang/nl/admin/licenses/general.php +++ b/resources/lang/nl/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Over licenties', 'about_licenses' => 'Licenties worden gebruikt om software te beheren. Deze hebben een maximum aantal wat aan gebruikers uitgeleverd kan worden', 'checkin' => 'Check werkplek licentie in', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Applicatie Licenties', 'user' => 'Gebruiker', 'view' => 'Bekijk licentie', -); +]; diff --git a/resources/lang/nl/admin/licenses/message.php b/resources/lang/nl/admin/licenses/message.php index 9a0e74e614..2c3c64baf4 100644 --- a/resources/lang/nl/admin/licenses/message.php +++ b/resources/lang/nl/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licentie bestaat niet.', 'user_does_not_exist' => 'Gebruiker bestaat niet.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'U moet een asset of een gebruiker selecteren, maar niet beide.', 'not_found' => 'Licentie niet gevonden', - - 'create' => array( + 'create' => [ 'error' => 'Licentie is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Licentie is met succes aangemaakt.' - ), + 'success' => 'Licentie is met succes aangemaakt.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Bestand is niet verwijderd. Probeer het opnieuw.', 'success' => 'Bestand is met succes verwijderd.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Bestand(en) zijn niet geüpload. Probeer het opnieuw.', 'success' => 'Bestand(en) zijn met succes geüpload.', 'nofiles' => 'Je hebt geen bestanden geselecteerd om te uploaden, of het bestand wat je probeert te uploaden is te groot', 'invalidfiles' => 'Een of meer van de bestanden is te groot of het bestandstype is niet toegestaan. Toegestane bestandstypes zijn png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml en lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licentie is niet gewijzigd, probeer het opnieuw', - 'success' => 'Licentie is met succes gewijzigd.' - ), + 'success' => 'Licentie is met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je het zeker dat je deze licentie wilt verwijderen?', 'error' => 'Er was een probleem tijdens het verwijderen van deze licentie, probeer het opnieuw.', - 'success' => 'De licentie is met succes verwijderd.' - ), + 'success' => 'De licentie is met succes verwijderd.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Er was een probleem met het uitchecken van deze licentie. Probeer het opnieuw.', - 'success' => 'De licentie is met succes uitgecheckt' - ), + 'success' => 'De licentie is met succes uitgecheckt', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Er was een probleem met het inchecken van deze licentie. Probeer het opnieuw.', - 'success' => 'De licentie is met succes ingecheckt' - ), + 'success' => 'De licentie is met succes ingecheckt', + ], -); +]; diff --git a/resources/lang/nl/admin/licenses/table.php b/resources/lang/nl/admin/licenses/table.php index 092364be11..e38def758d 100644 --- a/resources/lang/nl/admin/licenses/table.php +++ b/resources/lang/nl/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Toegewezen aan', 'checkout' => 'In/Uit', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serienummer', 'title' => 'Licentie', -); +]; diff --git a/resources/lang/nl/admin/locations/message.php b/resources/lang/nl/admin/locations/message.php index ad46aae440..8f5963b99c 100644 --- a/resources/lang/nl/admin/locations/message.php +++ b/resources/lang/nl/admin/locations/message.php @@ -1,27 +1,26 @@ 'Locatie bestaat niet.', 'assoc_users' => 'Deze locatie is momenteel gekoppeld met tenminste één persoon en kan hierdoor niet worden verwijderd. Update je gebruikers die niet meer bij deze locatie horen en probeer het opnieuw. ', 'assoc_assets' => 'Deze locatie is momenteel gekoppeld met tenminste één asset en kan hierdoor niet worden verwijderd. Update je assets die niet meer bij deze locatie en probeer het opnieuw. ', 'assoc_child_loc' => 'Deze locatie is momenteen de ouder van ten minste één kind locatie en kan hierdoor niet worden verwijderd. Update je locaties bij die niet meer naar deze locatie verwijzen en probeer het opnieuw. ', - - 'create' => array( + 'create' => [ 'error' => 'Locatie is niet aangemaakt, probeer het opnieuw.', - 'success' => 'Locatie is met succes aangemaakt.' - ), + 'success' => 'Locatie is met succes aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Locatie is niet gewijzigd, probeer het opnieuw', - 'success' => 'Locatie is met succes gewijzigd.' - ), + 'success' => 'Locatie is met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je het zeker dat je deze locatie wilt verwijderen?', 'error' => 'Er was een probleem met het verwijderen van deze locatie. Probeer het opnieuw.', - 'success' => 'De locatie is met succes verwijderd.' - ) + 'success' => 'De locatie is met succes verwijderd.', + ], -); +]; diff --git a/resources/lang/nl/admin/locations/table.php b/resources/lang/nl/admin/locations/table.php index b9d64f92f6..b2b8996974 100644 --- a/resources/lang/nl/admin/locations/table.php +++ b/resources/lang/nl/admin/locations/table.php @@ -1,6 +1,6 @@ 'Over locaties', 'about_locations' => 'Locaties worden gebruikt om de locatie van gebruikers, materiaal en overige items bij te houden', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Bovenliggend', 'currency' => 'Locatie valuta', 'ldap_ou' => 'LDAP zoek OU', - ); + ]; diff --git a/resources/lang/nl/admin/manufacturers/message.php b/resources/lang/nl/admin/manufacturers/message.php index 0db1822e91..55699160fd 100644 --- a/resources/lang/nl/admin/manufacturers/message.php +++ b/resources/lang/nl/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Fabrikant bestaat niet.', 'assoc_users' => 'Deze fabrikant is verbonden met 1 of meerdere modellen en kan hierdoor niet verwijderd worden. Controleer de modellen zodat er geen verbinding meer is met deze fabrikant en probeer opnieuw. ', - 'create' => array( + 'create' => [ 'error' => 'Fabrikant was niet aangemaakt, Probeer opnieuw.', - 'success' => 'Fabrikant aangemaakt.' - ), + 'success' => 'Fabrikant aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fabrikant niet bijgewerkt, probeer opnieuw', - 'success' => 'Fabrikant succesvol bijgewerkt.' - ), + 'success' => 'Fabrikant succesvol bijgewerkt.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Fabrikant is niet hersteld, probeer het opnieuw', - 'success' => 'Fabrikant succesvol hersteld.' - ), + 'success' => 'Fabrikant succesvol hersteld.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet u zeker dat deze fabrikant verwijderd kan worden?', 'error' => 'Er was een probleem bij het verwijderen. Probeer opnieuw.', - 'success' => 'Fabrikant succesvol verwijderd.' - ) + 'success' => 'Fabrikant succesvol verwijderd.', + ], -); +]; diff --git a/resources/lang/nl/admin/manufacturers/table.php b/resources/lang/nl/admin/manufacturers/table.php index 02b3bb9cdb..9a15cf6b88 100644 --- a/resources/lang/nl/admin/manufacturers/table.php +++ b/resources/lang/nl/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Over fabrikanten', 'about_manufacturers_text' => 'Fabrikanten zijn de bedrijven die uw assets maken. U kunt hier belangrijke contactinformatie over hen opslaan, die wordt weergegeven op de detailpagina van uw asset.', 'asset_manufacturers' => 'Asset fabrikanten', @@ -13,4 +13,4 @@ return array( 'update' => 'Wijzig Fabrikant', 'url' => 'URL', -); +]; diff --git a/resources/lang/nl/admin/models/general.php b/resources/lang/nl/admin/models/general.php index 43c1a4434f..90b2dfbae6 100644 --- a/resources/lang/nl/admin/models/general.php +++ b/resources/lang/nl/admin/models/general.php @@ -1,6 +1,6 @@ 'Over Asset Modellen', 'about_models_text' => 'Assetmodellen zijn een manier om identieke assets te groeperen. "MBP 2013", "iPhone 6s", enz.', 'deleted' => 'Dit asset is verwijderd. Klik hier om het te herstellen.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Je staat op het punt om :model_count assetmodellen te verwijderen.', 'restore' => 'Herstel model', 'requestable' => 'Gebruikers mogen dit model aanvragen', - 'show_mac_address' => 'Toon MAC-adresveld in de assets van dit model', + 'show_mac_address' => 'Toon MAC-adresveld in de assets van dit model', 'view_deleted' => 'Bekijk verwijderde', 'view_models' => 'Bekijk modelen', 'fieldset' => 'Veldverzameling', 'no_custom_field' => 'Geen aangepaste velden', 'add_default_values' => 'Voeg standaardwaarden toe', -); +]; diff --git a/resources/lang/nl/admin/models/message.php b/resources/lang/nl/admin/models/message.php index 89df316480..575ca2994d 100644 --- a/resources/lang/nl/admin/models/message.php +++ b/resources/lang/nl/admin/models/message.php @@ -1,42 +1,41 @@ 'Model bestaat niet.', 'assoc_users' => 'Dit model is momenteel gekoppeld met één of meer assets en kan niet worden verwijderd. Verwijder de assets en probeer het opnieuw. ', - - 'create' => array( + 'create' => [ 'error' => 'Model is niet aangemaakt, probeer het opnieuw.', 'success' => 'Model is met succes aangemaakt.', 'duplicate_set' => 'Een asset model met die naam, fabrikant en model nummer bestaat al.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model is niet gewijzigd, probeer het opnieuw', - 'success' => 'Model met succes gewijzigd.' - ), + 'success' => 'Model met succes gewijzigd.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je het zeker dat je deze asset model wilt verwijderen?', 'error' => 'Er was een probleem tijden het verwijderen van dit model. Probeer het opnieuw.', - 'success' => 'Het model is met succes verwijderd.' - ), + 'success' => 'Het model is met succes verwijderd.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model is niet hersteld. Probeer opnieuw', - 'success' => 'Model is met succes hersteld.' - ), + 'success' => 'Model is met succes hersteld.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Er was geen veld geselecteerd dus is er niks gewijzigd.', - 'success' => 'Modellen bijgewerkt.' - ), + 'success' => 'Modellen bijgewerkt.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Er waren geen modellen geselecteerd, er is dus niets verwijderd.', 'success' => ':success_count model(s) verwijderd!', - 'success_partial' => ':success_count model(len) werden verwijderd, maar : fail_count konden niet worden verwijderd omdat er nog steeds assets aan gekoppeld zijn.' - ), + 'success_partial' => ':success_count model(len) werden verwijderd, maar : fail_count konden niet worden verwijderd omdat er nog steeds assets aan gekoppeld zijn.', + ], -); +]; diff --git a/resources/lang/nl/admin/models/table.php b/resources/lang/nl/admin/models/table.php index bbb11f1325..366eac04a3 100644 --- a/resources/lang/nl/admin/models/table.php +++ b/resources/lang/nl/admin/models/table.php @@ -1,6 +1,6 @@ 'Maak asset model aan', 'created_at' => 'Aangemaakt op', @@ -14,4 +14,4 @@ return array( 'update' => 'Wijzig asset model', 'clone' => 'Kopieer model', 'edit' => 'Bewerk model', -); +]; diff --git a/resources/lang/nl/admin/reports/general.php b/resources/lang/nl/admin/reports/general.php index e18d930588..af022e566c 100644 --- a/resources/lang/nl/admin/reports/general.php +++ b/resources/lang/nl/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecteer de opties die je wilt voor je assetrapport.' -); +return [ + 'info' => 'Selecteer de opties die je wilt voor je assetrapport.', +]; diff --git a/resources/lang/nl/admin/reports/message.php b/resources/lang/nl/admin/reports/message.php index 0f8c2a1642..9cfbee40b2 100644 --- a/resources/lang/nl/admin/reports/message.php +++ b/resources/lang/nl/admin/reports/message.php @@ -1,5 +1,5 @@ 'Je moet ten minste één optie kiezen.' -); +return [ + 'error' => 'Je moet ten minste één optie kiezen.', +]; diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php index 134cb0064d..f3cd6c7329 100644 --- a/resources/lang/nl/admin/settings/general.php +++ b/resources/lang/nl/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domein', 'ad_domain_help' => 'Dit is soms hetzelfde als je e-mail domein.', 'ad_append_domain_label' => 'Domeinnaam toevoegen', 'ad_append_domain' => 'Domeinnaam toevoegen aan veld gebruikersnaam', - 'ad_append_domain_help' => 'Gebruiker is niet verplicht om "username@domain.local" te schrijven, deze kan alleen "username" typen.' , + 'ad_append_domain_help' => 'Gebruiker is niet verplicht om "username@domain.local" te schrijven, deze kan alleen "username" typen.', 'admin_cc_email' => 'CC e-mail', 'admin_cc_email_help' => 'Als u een kopie van de checkout/checkin e-mail die aan de gebruikers worden verzonden wilt verzenden naar een extra e-mailaccount, vul dan hier het e-mailadres in. Laat anders dit veld leeg.', 'is_ad' => 'Dit is een Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Drempel verlopende meldingen (in dagen)', 'alert_inv_threshold' => 'Inventaris melding drempel', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Interval audit', 'audit_interval_help' => 'Als je verplicht bent om regelmatig je assets te controleren, voer dan de interval in maanden in.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Voer twee factor code in', 'two_factor_config_complete' => 'Code verzenden', 'two_factor_enabled_edit_not_allowed' => 'De beheerder staat niet toe dat deze instelling aangepast wordt.', - 'two_factor_enrollment_text' => "Twee factor authenticatie is vereist, echter is je apparaat nog niet geactiveerd. Open je Google Authenticator app en scan de onderstaande QR code om je apparaat te activeren. Vul wanneer je het apparaat succesvol hebt geactiveerd hieronder de code in", + 'two_factor_enrollment_text' => 'Twee factor authenticatie is vereist, echter is je apparaat nog niet geactiveerd. Open je Google Authenticator app en scan de onderstaande QR code om je apparaat te activeren. Vul wanneer je het apparaat succesvol hebt geactiveerd hieronder de code in', 'require_accept_signature' => 'Handtekening vereisen', 'require_accept_signature_help_text' => 'Het inschakelen van deze functie vereist dat gebruikers fysiek ondertekenen bij het accepteren van een asset.', 'left' => 'links', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Als u dit selectievakje inschakelt, worden unieke serienummers van assets ingeschakeld', 'zerofill_count' => 'Lengte van asset labels, inclusief opvulling', 'username_format_help' => 'Deze instelling wordt alleen gebruikt door het importproces als er geen gebruikersnaam is opgegeven en we een gebruikersnaam moeten genereren.', -); +]; diff --git a/resources/lang/nl/admin/settings/message.php b/resources/lang/nl/admin/settings/message.php index a40ef95f3f..03294a3e80 100644 --- a/resources/lang/nl/admin/settings/message.php +++ b/resources/lang/nl/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Er is een fout opgetreden tijdens het updaten. ', - 'success' => 'Instellingen zijn met succes gewijzigd.' - ), - 'backup' => array( + 'success' => 'Instellingen zijn met succes gewijzigd.', + ], + 'backup' => [ 'delete_confirm' => 'Weet je het zeker dat je deze Back-up bestand wilt verwijderen? Dit kan niet meer terug gedraaid worden. ', 'file_deleted' => 'De Back-up bestand is met succes verwijderd. ', 'generated' => 'Een nieuw Back-up bestand is met succes aangemaakt.', 'file_not_found' => 'Die Back-up bestand kon niet gevonden worden op de server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Er is iets fout gegaan tijdens het opschonen.', 'validation_failed' => 'De opschoon bevestiging is niet correct. Typ het woord "DELETE" in het bevestigingsveld.', - 'success' => 'Verwijderde items succesvol opgeschoond' - ), + 'success' => 'Verwijderde items succesvol opgeschoond', + ], -); +]; diff --git a/resources/lang/nl/admin/statuslabels/message.php b/resources/lang/nl/admin/statuslabels/message.php index 31530be2e7..e0be7aaf9d 100644 --- a/resources/lang/nl/admin/statuslabels/message.php +++ b/resources/lang/nl/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status label bestaat niet.', 'assoc_assets' => 'Dit status label is tenminste met één asset gekoppeld en kan niet verwijderd worden. Zorg ervoor dat assets geen gebruik maken van dit statuslabel en probeer het nogmaals. ', - - 'create' => array( + 'create' => [ 'error' => 'Status label is niet aangemaakt, probeer het nogmaals.', - 'success' => 'Status label succesvol aangemaakt.' - ), + 'success' => 'Status label succesvol aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status label is niet bijgewerkt, probeer het nogmaals', - 'success' => 'Status label succesvol bijgewerkt.' - ), + 'success' => 'Status label succesvol bijgewerkt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Weet je zeker dat je dit status label wil verwijderen?', 'error' => 'Er is iets mis gegaan tijdens het verwijderen van het status label, probeer het nogmaals.', - 'success' => 'Het status label is succesvol verwijderd.' - ), + 'success' => 'Het status label is succesvol verwijderd.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Deze assets kunnen niet aan iemand worden toegewezen.', 'deployable' => 'Deze assets kunnen worden uitgecheckt. Zodra ze zijn toegewezen, nemen ze een meta-status van Ingezet.', 'archived' => 'Deze assets kunnen niet uitgecheckt worden en worden alleen weergegeven in de gearchiveerde weergave. Dit is nuttig om informatie te bewaren over assets voor budgetteren/historische doeleinden, maar om deze buiten de dagelijkse asset-lijst te houden.', 'pending' => 'Deze assets kunnen nog niet aan iemand worden toegewezen, vaak gebruikt voor items die in reparatie zijn, maar naar verwachting zullen ze weer in omloop komen.', - ), + ], -); +]; diff --git a/resources/lang/nl/admin/statuslabels/table.php b/resources/lang/nl/admin/statuslabels/table.php index 770f969f1e..00051b94b9 100644 --- a/resources/lang/nl/admin/statuslabels/table.php +++ b/resources/lang/nl/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Over status labels', 'archived' => 'Gearchiveerd', 'create' => 'Maak een Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Statuslabels', 'undeployable' => 'Niet inzetbaar', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/nl/admin/suppliers/message.php b/resources/lang/nl/admin/suppliers/message.php index d2b71b842e..b02d3b8126 100644 --- a/resources/lang/nl/admin/suppliers/message.php +++ b/resources/lang/nl/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'De leverancier bestaat niet.', - - 'create' => array( + 'create' => [ 'error' => 'De leverancier is niet aangemaakt, probeer het opnieuw.', - 'success' => 'De leverancier is succesvol aangemaakt.' - ), + 'success' => 'De leverancier is succesvol aangemaakt.', + ], - 'update' => array( + 'update' => [ 'error' => 'De leverancier is niet gewijzigd, probeer het opnieuw', - 'success' => 'De leverancier is succesvol aangemaakt.' - ), + 'success' => 'De leverancier is succesvol aangemaakt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ben je zeker dat je de leverancier wil verwijderen?', 'error' => 'Er ging iets mis tijdens het verwijderen van de leverancier. Probeer het nog een keer.', 'success' => 'De leverancier is succesvol verwijderd.', 'assoc_assets' => 'Deze leverancier is momenteel gekoppeld met :asset_count asset(s) en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', 'assoc_licenses' => 'Deze leverancier is momenteel gekoppeld met :licenses_count licences(s) en kan hierdoor niet verwijderd worden. Pas je modellen aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', 'assoc_maintenances' => 'Deze leverancier is momenteel gekoppeld met :asset_maintenances_count asset onderhoud(en) en kan niet verwijderd worden. Pas je materiaal aan zodat deze leverancier niet langer gebruikt wordt en probeer het opnieuw. ', - ) + ], -); +]; diff --git a/resources/lang/nl/admin/suppliers/table.php b/resources/lang/nl/admin/suppliers/table.php index f26481e53d..a4955ef07c 100644 --- a/resources/lang/nl/admin/suppliers/table.php +++ b/resources/lang/nl/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Over leveranciers', 'about_suppliers_text' => 'Leveranciers worden gebruikt om de afkomst van items bij te houden', 'address' => 'Leverancier adres', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Bekijk assets voor', 'zip' => 'Postcode', -); +]; diff --git a/resources/lang/nl/admin/users/general.php b/resources/lang/nl/admin/users/general.php index b62f3d09e3..141a2677ca 100644 --- a/resources/lang/nl/admin/users/general.php +++ b/resources/lang/nl/admin/users/general.php @@ -1,7 +1,6 @@ 'Deze gebruiker kan inloggen', 'activated_disabled_help_text' => 'U kunt de activeringsstatus niet bewerken voor uw eigen account.', 'assets_user' => 'Assets toegewezen aan :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Gebruiker aanpassen', 'filetype_info' => 'Toegestane bestandstypes zijn png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Geschiedenis voor :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klik hier om ze te herstellen.', 'last_login' => 'Laatst aangemeld', 'ldap_config_text' => 'LDAP configuratie kan worden gevonden in Admin > Instellingen. De (optioneel) geselecteerde locatie zal voor alle geimporteerde gebruikers ingesteld worden.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'De huidige beheer instellingen staan selectief gebruik van twee factor authenticatie toe. ', 'two_factor_enrolled' => 'Twee factor authenticatie apparaat ingesteld ', 'two_factor_active' => 'Twee factor authenticatie actief ', - ); + ]; diff --git a/resources/lang/nl/admin/users/message.php b/resources/lang/nl/admin/users/message.php index 70ad72b991..80ebc9a483 100644 --- a/resources/lang/nl/admin/users/message.php +++ b/resources/lang/nl/admin/users/message.php @@ -1,6 +1,6 @@ 'Je hebt dit asset succesvol geaccepteerd.', 'declined' => 'Je hebt dit asset met succes geweigerd.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integratie is niet geconfigureerd voor deze installatie.', 'password_resets_sent' => 'De geselecteerde gebruikers die zijn geactiveerd en die een geldig e-mailadres hebben, hebben een wachtwoord reset link ontvangen.', - - 'success' => array( + 'success' => [ 'create' => 'Gebruiker succesvol aangemaakt.', 'update' => 'Gebruiker succesvol bijgewerkt.', 'update_bulk' => 'Gebruikers zijn succesvol bijgewerkt!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Gebruiker werd succesvol ingeschakeld.', 'restored' => 'Gebruiker werd succesvol opnieuw geactiveerd.', 'import' => 'Gebruikers met succes geïmporteerd.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Er was een probleem tijdens het aanmaken van de gebruiker. Probeer opnieuw, aub.', 'update' => 'Er was een probleem tijdens het bijwerken van de gebruiker. Probeer opnieuw, aub.', 'delete' => 'Er was een probleem tijdens het verwijderen van de gebruiker. Probeer opnieuw, aub.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Kan niet zoeken in de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server:', 'ldap_could_not_get_entries' => 'Kan geen gegeven van de LDAP server krijgen. Controleer je LDAP server configuratie in de LDAP configuratie bestand.
Fout van LDAP server:', 'password_ldap' => 'Het wachtwoord voor deze account wordt beheerd door LDAP/Active Directory. Neem contact op met uw IT-afdeling om uw wachtwoord te wijzigen. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Bestand is niet verwijderd. Probeer het opnieuw.', 'success' => 'Bestand met succes verwijderd.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Bestand(en) zijn niet geüpload. Probeer het opnieuw.', 'success' => 'Bestand(en) zijn met succes geüpload.', 'nofiles' => 'Je hebt geen bestanden geselecteerd voor de upload', 'invalidfiles' => 'Een of meer van uw bestanden is te groot of is een bestandstype dat niet is toegestaan. Toegestaande bestandstypen png, gif, jpg, doc, docx, pdf en txt.', - ), + ], -); +]; diff --git a/resources/lang/nl/admin/users/table.php b/resources/lang/nl/admin/users/table.php index 7d1243bafe..411f4a6503 100644 --- a/resources/lang/nl/admin/users/table.php +++ b/resources/lang/nl/admin/users/table.php @@ -1,6 +1,6 @@ 'Actief', 'allow' => 'Toestaan', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Toon de huidige gebruikers', 'show_deleted' => 'Toon de verwijderde gebruikers', 'title' => 'Titel', - 'to_restore_them' => 'om ze te herstellen.', + 'to_restore_them' => 'om ze te herstellen.', 'updateuser' => 'Gebruiker bijwerken', 'username' => 'Gebruikersnaam', - 'user_deleted_text' => 'Deze gebruiker is gemarkeerd als verwijderd.', + 'user_deleted_text' => 'Deze gebruiker is gemarkeerd als verwijderd.', 'username_note' => '(Dit wordt enkel gebruikt om te koppelen met de Active Directory, niet om aan te melden.)', 'cloneuser' => 'Gebruiker dupliceren', 'viewusers' => 'Bekijk gebruikers', -); +]; diff --git a/resources/lang/nl/auth/general.php b/resources/lang/nl/auth/general.php index 6cf9a7f038..8c81faefc4 100644 --- a/resources/lang/nl/auth/general.php +++ b/resources/lang/nl/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Voer je gebruikersnaam in om een wachtwoord reset link te mailen.', 'username_help_bottom' => 'Je gebruikersnaam en e-mailadres kunnen hetzelfde zijn, maar kan ook niet zo zijn, afhankelijk van je configuratie. Als je je gebruikersnaam niet meer weet, neem dan contact op met je beheerder.

Gebruikersnamen zonder een bijbehorende e-mailadres zullen geen wachtwoord reset link toegestuurd krijgen. ', ]; - diff --git a/resources/lang/nl/auth/message.php b/resources/lang/nl/auth/message.php index d1a15ebb21..0381500ef7 100644 --- a/resources/lang/nl/auth/message.php +++ b/resources/lang/nl/auth/message.php @@ -1,6 +1,6 @@ 'Een account met dit e-mailadres bestaat reeds.', 'account_not_found' => 'De gebruikersnaam of het wachtwoord is niet juist.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Deze gebruikersaccount is geband.', 'throttle' => 'Te veel mislukte inlog pogingen. Probeer het over :minuten opnieuw.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Je apparaat is al uitgeleverd.', 'success' => 'U bent succesvol ingelogd.', 'code_required' => 'Tweestapsverificatie code is vereist.', 'invalid_code' => 'Tweestapsverificatie code is ongeldig.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Er was een probleem bij inloggen, probeer opnieuw aub.', 'success' => 'U bent succesvol aangemeld.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Er is een probleem opgetreden bij het uitloggen, probeer het nogmaals.', 'success' => 'U bent succesvol uitgelogd.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Er was een probleem bij het aanmaken van uw account, probeer opnieuw aub.', 'success' => 'Gebruikersaccount succesvol aangemaakt.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Er was een probleem bij het ophalen van de paswoord herstelcode, probeer opnieuw aub.', 'success' => 'Als dat e-mailadres in ons systeem bestaat, is er een e-mail gestuurd om het wachtwoord te herstellen.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Er was een probleem bij het opnieuw instellen van uw wachtwoord, probeer opnieuw aub.', 'success' => 'Uw wachtwoord werd hersteld.', - ), + ], - -); +]; diff --git a/resources/lang/nl/button.php b/resources/lang/nl/button.php index b1a41f7d0d..4c60908f71 100644 --- a/resources/lang/nl/button.php +++ b/resources/lang/nl/button.php @@ -1,6 +1,6 @@ 'Acties', 'add' => 'Toevoegen', 'cancel' => 'Annuleren', @@ -11,7 +11,7 @@ return array( 'request' => 'Aanvraag', 'submit' => 'Verzenden', 'upload' => 'Verstuur', - 'select_file' => 'Bestand selecteren...', + 'select_file' => 'Bestand selecteren...', 'select_files' => 'Bestanden selecteren...', 'generate_labels' => '{1} Genereer label|[2,*] Genereer labels', -); +]; diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php index 052b2c344b..4a8240a1af 100644 --- a/resources/lang/nl/general.php +++ b/resources/lang/nl/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Check in\'s', 'user_requests_count' => 'Aanvragen', 'city' => 'Plaats', - 'click_here' => 'Klik hier', + 'click_here' => 'Klik hier', 'clear_selection' => 'Selectie wissen', 'companies' => 'Bedrijven', 'company' => 'Bedrijf', 'component' => 'Component', 'components' => 'Componenten', - 'complete' => 'Voltooid', + 'complete' => 'Voltooid', 'consumable' => 'Verbruiksartikelen', 'consumables' => 'Verbruiksartikelen', 'country' => 'Land', diff --git a/resources/lang/nl/help.php b/resources/lang/nl/help.php index d54cd41931..5cca451e48 100644 --- a/resources/lang/nl/help.php +++ b/resources/lang/nl/help.php @@ -1,6 +1,6 @@ "Meer Info", + 'more_info_title' => 'Meer Info', - "audit_help" => "Als u dit selectievakje aanvinkt, wordt het asset record bewerkt om deze nieuwe locatie te weerspiegelen. Als u het uitgevinkt laat staan ziet u de locatie in het audit logboek.

Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.", + 'audit_help' => 'Als u dit selectievakje aanvinkt, wordt het asset record bewerkt om deze nieuwe locatie te weerspiegelen. Als u het uitgevinkt laat staan ziet u de locatie in het audit logboek.

Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.', 'assets' => 'Assets bestaan uit items die met een serienummer of identificatiesticker geregistreerd zijn. Dit zijn over het algemeen de objecten met een hogere waarde waarbij identificatie belangrijk is.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Je kunt de asset-afschrijving instellen om assets af te schrijven op basis van lineaire afschrijving.', - - -); +]; diff --git a/resources/lang/nl/mail.php b/resources/lang/nl/mail.php index faffe0be3a..89ff6d7258 100644 --- a/resources/lang/nl/mail.php +++ b/resources/lang/nl/mail.php @@ -1,6 +1,6 @@ 'Een gebruiker heeft een verzoek om een item op de website geannuleerd', 'a_user_requested' => 'Een gebruiker heeft een item op de website aangevraagd', 'accessory_name' => 'Accessoire Naam:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Verwachte asset check in rapport', 'Expected_Checkin_Notification' => 'Herinnering: :name check in deadline nadert', 'Expected_Checkin_Date' => 'Een asset uitgecheckt aan jou moet worden ingecheckt op :date', - 'your_assets' => 'Bekijk je assets' -); + 'your_assets' => 'Bekijk je assets', +]; diff --git a/resources/lang/nl/pagination.php b/resources/lang/nl/pagination.php index 6f99c193af..d3fef03af5 100644 --- a/resources/lang/nl/pagination.php +++ b/resources/lang/nl/pagination.php @@ -1,6 +1,6 @@ 'Volgende »', -); +]; diff --git a/resources/lang/nl/passwords.php b/resources/lang/nl/passwords.php index 2377126617..64a56f6d2a 100644 --- a/resources/lang/nl/passwords.php +++ b/resources/lang/nl/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Er is een wachtwoord link naar je verstuurd!', 'user' => 'Geen overeenkomende actieve gebruiker gevonden met dit e-mailadres.', ]; - diff --git a/resources/lang/nl/reminders.php b/resources/lang/nl/reminders.php index ba4c294dfe..fd34926466 100644 --- a/resources/lang/nl/reminders.php +++ b/resources/lang/nl/reminders.php @@ -1,6 +1,6 @@ "Paswoorden moeten 6 karakters lang zijn en gelijk zijn in beide paswoordvelden.", + 'password' => 'Paswoorden moeten 6 karakters lang zijn en gelijk zijn in beide paswoordvelden.', - "user" => "Gebruikersnaam of e-mailadres is niet correct", + 'user' => 'Gebruikersnaam of e-mailadres is niet correct', - "token" => "De token voor paswoordherstel is niet correct.", + 'token' => 'De token voor paswoordherstel is niet correct.', - "sent" => "Indien het e-mailadres bestaat, werd een paswoordhint verstuurd", + 'sent' => 'Indien het e-mailadres bestaat, werd een paswoordhint verstuurd', -); +]; diff --git a/resources/lang/nl/table.php b/resources/lang/nl/table.php index 1125daf164..7ba6537f8a 100644 --- a/resources/lang/nl/table.php +++ b/resources/lang/nl/table.php @@ -1,10 +1,10 @@ 'Acties', 'action' => 'Actie', 'by' => 'Door', 'item' => 'Item', -); +]; diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php index 21c19e4629..b444e8a0e1 100644 --- a/resources/lang/nl/validation.php +++ b/resources/lang/nl/validation.php @@ -1,6 +1,6 @@ 'Het veld :attribute is reeds in gebruik.', 'uploaded' => 'Uploaden van :attribute is mislukt.', 'url' => 'Het formaat van :attribute is ongeldig.', - "unique_undeleted" => "De :attribute moet uniek zijn. ", + 'unique_undeleted' => 'De :attribute moet uniek zijn. ', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute veld bevat een karakter wat niet is toegestaan.", - "email_array" => "één of meer e-mail adressen kloppen niet.", - "hashed_pass" => "Je huidige wachtwoord is incorrect", + 'alpha_space' => ':attribute veld bevat een karakter wat niet is toegestaan.', + 'email_array' => 'één of meer e-mail adressen kloppen niet.', + 'hashed_pass' => 'Je huidige wachtwoord is incorrect', 'dumbpwd' => 'Dat wachtwoord is te veelvoorkomend.', - "statuslabel_type" => "Selecteer een valide status label", + 'statuslabel_type' => 'Selecteer een valide status label', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/no/admin/accessories/general.php b/resources/lang/no/admin/accessories/general.php index bc05b71977..4f3e83d237 100644 --- a/resources/lang/no/admin/accessories/general.php +++ b/resources/lang/no/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Tilbehørskategori', 'accessory_name' => 'Navn tilbehør', 'checkout' => 'Sjekk ut tilbehør', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Bruk standard EULA i stedet.', 'use_default_eula_disabled' => 'Bruk standard EULA i stedet. Ingen standard EULA er satt. Legg til en i Innstillinger.', -); +]; diff --git a/resources/lang/no/admin/accessories/message.php b/resources/lang/no/admin/accessories/message.php index ea2bfbcac1..969f7d9c50 100644 --- a/resources/lang/no/admin/accessories/message.php +++ b/resources/lang/no/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Tilbehøret [:id] finnes ikke.', 'assoc_users' => 'Dette tilbehøret har for øyeblikket :count enheter utsjekket til brukere. Sjekk inn tilbehøret og prøv igjen. ', - 'create' => array( + 'create' => [ 'error' => 'Tilbehør ble ikke opprettet, vennligst prøv igjen.', - 'success' => 'Tilbehør optrettet.' - ), + 'success' => 'Tilbehør optrettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tilbehør ble ikke oppdatert, vennligst prøv igjen', - 'success' => 'Tilbehør oppdatert.' - ), + 'success' => 'Tilbehør oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette dette tilbehøret?', 'error' => 'Det oppstod et problem under sletting av tilbehøret. Prøv igjen.', - 'success' => 'Tilbehøret ble slettet.' - ), + 'success' => 'Tilbehøret ble slettet.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tilbehør ble ikke sjekket ut. Prøv igjen', 'success' => 'Vellykket utsjekking av tilbehør.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' - ), + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tilbehør ble ikke sjekket inn. Prøv igjen', 'success' => 'Vellykket innsjekk av tilbehør.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' - ) + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.', + ], - -); +]; diff --git a/resources/lang/no/admin/accessories/table.php b/resources/lang/no/admin/accessories/table.php index f154d8fe91..fdd6ca113b 100644 --- a/resources/lang/no/admin/accessories/table.php +++ b/resources/lang/no/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Last ned CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Last ned CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Godtatt', 'title' => 'Navn tilbehør', - -); +]; diff --git a/resources/lang/no/admin/asset_maintenances/form.php b/resources/lang/no/admin/asset_maintenances/form.php index a83b80eb77..deff6c3e14 100644 --- a/resources/lang/no/admin/asset_maintenances/form.php +++ b/resources/lang/no/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tid brukt på vedlikehold (i dager)', 'notes' => 'Notater', 'update' => 'Oppdater Vedlikehold', - 'create' => 'Legg til Vedlikehold' + 'create' => 'Legg til Vedlikehold', ]; diff --git a/resources/lang/no/admin/asset_maintenances/message.php b/resources/lang/no/admin/asset_maintenances/message.php index b37034435f..7b387a2973 100644 --- a/resources/lang/no/admin/asset_maintenances/message.php +++ b/resources/lang/no/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette dette vedlikeholdet?', 'error' => 'Kunne ikke slette vedlikholdet. Prøv igjen.', - 'success' => 'Vedlikeholdet ble slettet.' + 'success' => 'Vedlikeholdet ble slettet.', ], 'create' => [ 'error' => 'Vedlikeholdet ble ikke opprettet, prøv igjen.', - 'success' => 'Vedlikeholdet ble opprettet.' + 'success' => 'Vedlikeholdet ble opprettet.', ], 'edit' => [ 'error' => 'Vedlikeholdet ble ikke opprettet, prøv igjen.', - 'success' => 'Vedlikehold endret vellykket.' + 'success' => 'Vedlikehold endret vellykket.', ], 'asset_maintenance_incomplete' => 'Enda Ikke fullført', 'warranty' => 'Garanti', 'not_warranty' => 'Ikke garanti', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/no/admin/asset_maintenances/table.php b/resources/lang/no/admin/asset_maintenances/table.php index cc6092f45d..9a584665a5 100644 --- a/resources/lang/no/admin/asset_maintenances/table.php +++ b/resources/lang/no/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Vedlikehold av eiendel', 'asset_name' => 'Navn', 'is_warranty' => 'Garanti', - 'dl_csv' => 'Last ned CSV' + 'dl_csv' => 'Last ned CSV', ]; diff --git a/resources/lang/no/admin/categories/general.php b/resources/lang/no/admin/categories/general.php index 7f184a477e..cff43a9888 100644 --- a/resources/lang/no/admin/categories/general.php +++ b/resources/lang/no/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorier', 'category_name' => 'Navn', 'checkin_email' => 'Send epost til bruker ved innsjekking/utsjekking.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Bruk standard EULA i stedet.', 'use_default_eula_disabled' => 'Bruk standard EULA i stedet. Ingen standard EULA er satt. Legg til en i Innstillinger.', -); +]; diff --git a/resources/lang/no/admin/categories/message.php b/resources/lang/no/admin/categories/message.php index 06e38e5304..318951a1e5 100644 --- a/resources/lang/no/admin/categories/message.php +++ b/resources/lang/no/admin/categories/message.php @@ -1,26 +1,26 @@ 'Kategorien eksisterer ikke.', 'assoc_models' => 'Denne kategorien er koblet til minst èn modell og kan ikke slettes. Vennligst oppdater dine modeller til å ikke referere til denne kategorien og prøv igjen. ', 'assoc_items' => 'Denne kategorien er knyttet til minst én :asset_type og kan ikke slettes. Oppdater din :asset_type til å ikke lenger refererer til denne kategorien, og prøv på nytt. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorien ble ikke opprettet, vennligst prøv igjen.', - 'success' => 'Kategorien ble opprettet.' - ), + 'success' => 'Kategorien ble opprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorien ble ikke opprettet, vennligst prøv igjen', - 'success' => 'Kategorien ble oppdatert.' - ), + 'success' => 'Kategorien ble oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på du vil slette denne kategorien?', 'error' => 'Det oppsto et problem ved sletting av kategorien. Vennligst prøv igjen. ', - 'success' => 'Kategorien ble slettet.' - ) + 'success' => 'Kategorien ble slettet.', + ], -); +]; diff --git a/resources/lang/no/admin/categories/table.php b/resources/lang/no/admin/categories/table.php index 6f07705218..04afb01f8b 100644 --- a/resources/lang/no/admin/categories/table.php +++ b/resources/lang/no/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Overordnet kategori', 'require_acceptance' => 'Godtatt', 'title' => 'Kategorinavn', -); +]; diff --git a/resources/lang/no/admin/companies/general.php b/resources/lang/no/admin/companies/general.php index 9fdd9e0436..be193aef9a 100644 --- a/resources/lang/no/admin/companies/general.php +++ b/resources/lang/no/admin/companies/general.php @@ -1,4 +1,5 @@ 'Velg bedrift', ]; diff --git a/resources/lang/no/admin/companies/message.php b/resources/lang/no/admin/companies/message.php index 455c598272..cc8bf9942d 100644 --- a/resources/lang/no/admin/companies/message.php +++ b/resources/lang/no/admin/companies/message.php @@ -1,18 +1,19 @@ 'Bedriften eksisterer ikke.', 'assoc_users' => 'Denne bedriften er tilknyttet minst en modell og kan ikke slettes. Oppdater modellene dine til å ikke refere til denne bedriften og prøv igjen. ', - 'create' => array( + 'create' => [ 'error' => 'Bedriften ble ikke opprette. Prøv igjen.', - 'success' => 'Bedriften ble opprettet.' - ), - 'update' => array( + 'success' => 'Bedriften ble opprettet.', + ], + 'update' => [ 'error' => 'Bedriften ble ikke oppdatert. Prøv igjen', - 'success' => 'Bedriften ble oppdatert.' - ), - 'delete' => array( + 'success' => 'Bedriften ble oppdatert.', + ], + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne bedriften?', 'error' => 'Feil ved sletting av bedrift. Prøv igjen.', - 'success' => 'Bedriften ble slettet.' - ) -); + 'success' => 'Bedriften ble slettet.', + ], +]; diff --git a/resources/lang/no/admin/companies/table.php b/resources/lang/no/admin/companies/table.php index a028bfdde1..3a6348dbdd 100644 --- a/resources/lang/no/admin/companies/table.php +++ b/resources/lang/no/admin/companies/table.php @@ -1,9 +1,10 @@ 'Bedrifter', 'create' => 'Opprett bedrift', 'title' => 'Bedrift', 'update' => 'Oppdater bedrift', 'name' => 'Navn på bedrift', 'id' => 'ID', -); +]; diff --git a/resources/lang/no/admin/components/general.php b/resources/lang/no/admin/components/general.php index d49358e401..c6a4e65d2d 100644 --- a/resources/lang/no/admin/components/general.php +++ b/resources/lang/no/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponent navn', 'checkin' => 'Sjekk inn komponent', 'checkout' => 'Sjekk ut komponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Gjenstår', 'total' => 'Total', 'update' => 'Oppdater komponent', -); +]; diff --git a/resources/lang/no/admin/components/message.php b/resources/lang/no/admin/components/message.php index be71a737ee..f74ebfaa51 100644 --- a/resources/lang/no/admin/components/message.php +++ b/resources/lang/no/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenten finnes ikke.', - 'create' => array( + 'create' => [ 'error' => 'Komponenten ble ikke opprettet, vennligst prøv igjen.', - 'success' => 'Komponent ble opprettet.' - ), + 'success' => 'Komponent ble opprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenten ble ikke oppdatert. Vennligst prøv igjen', - 'success' => 'Komponent ble oppdatert.' - ), + 'success' => 'Komponent ble oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne komponenten?', 'error' => 'Det oppstod et problem under sletting av komponenten. Vennligst prøv igjen.', - 'success' => 'Sletting av komponent vellykket.' - ), + 'success' => 'Sletting av komponent vellykket.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponent ble ikke sjekket ut. Prøv igjen', 'success' => 'Vellykket utsjekk av komponent.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.' - ), + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenten ble ikke sjekket inn, vennligst prøv igjen', 'success' => 'Vellykket innsjekk av komponent.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' - ) + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.', + ], - -); +]; diff --git a/resources/lang/no/admin/components/table.php b/resources/lang/no/admin/components/table.php index f2692003d6..bad963d325 100644 --- a/resources/lang/no/admin/components/table.php +++ b/resources/lang/no/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentnavn', -); +]; diff --git a/resources/lang/no/admin/consumables/general.php b/resources/lang/no/admin/consumables/general.php index bb602196b3..7b4b7e6e88 100644 --- a/resources/lang/no/admin/consumables/general.php +++ b/resources/lang/no/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Sjekk ut Forbruksvare til Bruker', 'consumable_name' => 'Navn på forbruksvare', 'create' => 'Legg til forbruksvare', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Gjenstår', 'total' => 'Total', 'update' => 'Oppdater forbruksvare', -); +]; diff --git a/resources/lang/no/admin/consumables/message.php b/resources/lang/no/admin/consumables/message.php index 32570c169e..de57c8c0fe 100644 --- a/resources/lang/no/admin/consumables/message.php +++ b/resources/lang/no/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Forbruksvaren finnes ikke.', - 'create' => array( + 'create' => [ 'error' => 'Forbruksvaren bli ikke opprettet, prøv igjen.', - 'success' => 'Forbruksvaren opprettet.' - ), + 'success' => 'Forbruksvaren opprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Forbruksvaren ble ikke opprettet, prøv igjen', - 'success' => 'Forbruksvare oppdatert.' - ), + 'success' => 'Forbruksvare oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at forbruksmateriellet skal slettes?', 'error' => 'Noe gikk feil under sletting av forbruksvaren. Prøv igjen.', - 'success' => 'Forbruksmateriell ble slettet.' - ), + 'success' => 'Forbruksmateriell ble slettet.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Forbruksvaren ble ikke tatt ut, prøv igjen', 'success' => 'Forbruksvaren ble tatt ut.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' - ), + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Forbruksvaren ble ikke lagt inn, prøv igjen', 'success' => 'Forbruksvaren ble tatt ut.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' - ) + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.', + ], - -); +]; diff --git a/resources/lang/no/admin/consumables/table.php b/resources/lang/no/admin/consumables/table.php index 329fb1e136..4e344681a6 100644 --- a/resources/lang/no/admin/consumables/table.php +++ b/resources/lang/no/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Navn på forbruksvare', -); +]; diff --git a/resources/lang/no/admin/custom_fields/general.php b/resources/lang/no/admin/custom_fields/general.php index 2bd097bb21..66fb49b2c1 100644 --- a/resources/lang/no/admin/custom_fields/general.php +++ b/resources/lang/no/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Egendefinerte Felt', 'field' => 'Felt', 'about_fieldsets_title' => 'Om Feltsett', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nytt Egendefinert Felt', 'value_encrypted' => 'Verdien i dette feltet er kryptert i databasen. Bare administratorer kan se hva som står i dette feltet', 'show_in_email' => 'Inkluder verdien i dette feltet i utsjekkseposter sendt til brukeren? Krypterte felter kan ikke inkluderes i eposter.', -); +]; diff --git a/resources/lang/no/admin/custom_fields/message.php b/resources/lang/no/admin/custom_fields/message.php index 61b19d9b4f..2beb1eccaa 100644 --- a/resources/lang/no/admin/custom_fields/message.php +++ b/resources/lang/no/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Feltet finnes ikke.', 'already_added' => 'Feltet er allerede lagt til', - 'create' => array( + 'create' => [ 'error' => 'Feltet ble ikke opprettet, vennligst prøv igjen.', 'success' => 'Felt opprettet.', - 'assoc_success' => 'Feltet ble lagt til.' - ), + 'assoc_success' => 'Feltet ble lagt til.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feltet ble ikke oppdatert, vennligst prøv igjen', - 'success' => 'Felt oppdatert.' - ), + 'success' => 'Felt oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette dette feltet?', 'error' => 'Det oppstod et problem ved sletting av feltet. Vennligst prøv igjen senere.', 'success' => 'Feltet ble slettet.', 'in_use' => 'Feltet er fremdeles i bruk.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset eksisterer ikke', - 'create' => array( + 'create' => [ 'error' => 'Feltsettet ble ikke opprettet, vennligst prøv igjen.', - 'success' => 'Feltsettet ble opprettet.' - ), + 'success' => 'Feltsettet ble opprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Feltsettet ble ikke oppdatert, vennligst prøv igjen', - 'success' => 'Feltsettet ble oppdatert.' - ), + 'success' => 'Feltsettet ble oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette feltsettet?', 'error' => 'Det oppstod et problem ved sletting av feltsettet. Vennligst prøv igjen.', 'success' => 'Feltsettet ble slettet.', 'in_use' => 'Feltsettet er fortsatt i bruk.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/no/admin/departments/message.php b/resources/lang/no/admin/departments/message.php index f60905b5aa..c32e8eb14d 100644 --- a/resources/lang/no/admin/departments/message.php +++ b/resources/lang/no/admin/departments/message.php @@ -1,21 +1,21 @@ 'Avdeling finnes ikke.', 'assoc_users' => 'Denne avdelingen er knyttet til minst én bruker og kan ikke slettes. Oppdater brukerne ikke lenger refererer til denne avdelingen og prøv igjen. ', - 'create' => array( + 'create' => [ 'error' => 'Avdelingen ble ikke opprettet, prøv igjen.', - 'success' => 'Avdeling opprettet.' - ), - 'update' => array( + 'success' => 'Avdeling opprettet.', + ], + 'update' => [ 'error' => 'Avdelingen ble ikke oppdatert, prøv igjen', - 'success' => 'Avdeling oppdatert.' - ), - 'delete' => array( + 'success' => 'Avdeling oppdatert.', + ], + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne avdelingen?', 'error' => 'Det var et problem med å slette avdelingen. Prøv på nytt.', - 'success' => 'Avdelingen ble slettet.' - ) + 'success' => 'Avdelingen ble slettet.', + ], -); +]; diff --git a/resources/lang/no/admin/departments/table.php b/resources/lang/no/admin/departments/table.php index 3373541407..167f835589 100644 --- a/resources/lang/no/admin/departments/table.php +++ b/resources/lang/no/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Avdelingsnavn', @@ -8,4 +8,4 @@ return array( 'location' => 'Plassering', 'create' => 'Opprett avdeling', 'update' => 'Oppdater avdeling', - ); + ]; diff --git a/resources/lang/no/admin/depreciations/general.php b/resources/lang/no/admin/depreciations/general.php index 1c61d7f090..0aef1ff615 100644 --- a/resources/lang/no/admin/depreciations/general.php +++ b/resources/lang/no/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Om avskrivninger', 'about_depreciations' => 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.', 'asset_depreciations' => 'Avskrivninger', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Antall måneder', 'update' => 'Oppdater avskrivninger', -); +]; diff --git a/resources/lang/no/admin/depreciations/message.php b/resources/lang/no/admin/depreciations/message.php index 4c56baa473..adc401adae 100644 --- a/resources/lang/no/admin/depreciations/message.php +++ b/resources/lang/no/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Avskrivningen eksisterer ikke.', 'assoc_users' => 'Denne avskrivningen er tilknyttet én eller flere modeller og kan ikke slettes. Vennligst slett modellene og prøv å slette på nytt. ', - - 'create' => array( + 'create' => [ 'error' => 'Avskrivningen ble ikke opprettet, vennligst prøv igjen. :(', - 'success' => 'Avskrivningen ble opprettet. :)' - ), + 'success' => 'Avskrivningen ble opprettet. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Avskrivningen ble ikke oppdatert, vennligst prøv igjen', - 'success' => 'Avskrivningen ble oppdatert.' - ), + 'success' => 'Avskrivningen ble oppdatert.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne avskrivningen ?', 'error' => 'Det oppsto et problem med sletting av avskrivningen. Vennligst prøv igjen.', - 'success' => 'Avskrivningen ble slettet.' - ) + 'success' => 'Avskrivningen ble slettet.', + ], -); +]; diff --git a/resources/lang/no/admin/depreciations/table.php b/resources/lang/no/admin/depreciations/table.php index 71aac27ec4..83598cf7cf 100644 --- a/resources/lang/no/admin/depreciations/table.php +++ b/resources/lang/no/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Måneder', 'term' => 'Avskrivningsperiode', 'title' => 'Navn ', -); +]; diff --git a/resources/lang/no/admin/groups/message.php b/resources/lang/no/admin/groups/message.php index 0c59b78aa3..1d1dea0aaa 100644 --- a/resources/lang/no/admin/groups/message.php +++ b/resources/lang/no/admin/groups/message.php @@ -1,22 +1,22 @@ 'Gruppen eksisterer allerede!', 'group_not_found' => 'Gruppen [:id] eksisterer ikke.', 'group_name_required' => 'Navnefeltet er påkrevd', - 'success' => array( + 'success' => [ 'create' => 'Gruppen ble opprettet.', 'update' => 'Gruppen ble oppdatert.', 'delete' => 'Gruppen ble slettet.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne gruppen?', 'create' => 'Det oppsto et problem med oppretting av gruppen. Vennligst prøv igjen.', 'update' => 'Det oppsto et problem med oppdatering av gruppen. Vennligst prøv igjen.', 'delete' => 'Det oppsto et problem med sletting av gruppen. Vennligst prøv igjen.', - ), + ], -); +]; diff --git a/resources/lang/no/admin/groups/table.php b/resources/lang/no/admin/groups/table.php index e8f777138c..7fb08a302f 100644 --- a/resources/lang/no/admin/groups/table.php +++ b/resources/lang/no/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Navn', 'users' => 'Antall brukere', -); +]; diff --git a/resources/lang/no/admin/groups/titles.php b/resources/lang/no/admin/groups/titles.php index a6596adfd8..ed4031564e 100644 --- a/resources/lang/no/admin/groups/titles.php +++ b/resources/lang/no/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Om grupper', 'about_groups' => 'Grupper brukes til å generalisere brukertillatelser.', 'group_management' => 'Gruppeadministrasjon', @@ -11,4 +11,4 @@ return array( 'allow' => 'Tillat', 'deny' => 'Avslå', -); +]; diff --git a/resources/lang/no/admin/hardware/form.php b/resources/lang/no/admin/hardware/form.php index 550a1d436a..2049a83f03 100644 --- a/resources/lang/no/admin/hardware/form.php +++ b/resources/lang/no/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Bekreft sletting av flere enheter', +return [ + 'bulk_delete' => 'Bekreft sletting av flere enheter', 'bulk_delete_help' => 'Se gjennom listen over enheter som er valgt for sletting. Etter sletting er det mulig å gjenopprette enheter, men nåværende koblinger til brukere vil ikke lenger finnes.', 'bulk_delete_warn' => 'Du er i ferd med å slette :asset_count enheter.', - 'bulk_update' => 'Masseoppdater eiendeler', - 'bulk_update_help' => 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ', - 'bulk_update_warn' => 'Du er på vei til å endre egenskapene til :asset_count eiendeler.', + 'bulk_update' => 'Masseoppdater eiendeler', + 'bulk_update_help' => 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ', + 'bulk_update_warn' => 'Du er på vei til å endre egenskapene til :asset_count eiendeler.', 'checkedout_to' => 'Utsjekket til', 'checkout_date' => 'Utsjekkdato', 'checkin_date' => 'Innsjekkdato', @@ -38,7 +38,6 @@ return array( 'tag' => 'Eiendelsmerke', 'update' => 'Oppdater eiendel', 'warranty' => 'Garanti', - 'warranty_expires' => 'Garantien utløper', + 'warranty_expires' => 'Garantien utløper', 'years' => 'år', -) -; +]; diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php index ef10ae9ce8..2360993d3f 100644 --- a/resources/lang/no/admin/hardware/general.php +++ b/resources/lang/no/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Om assets', 'about_assets_text' => 'Eiendeler er sporet av serienummer eller assetsmerke. De pleier å være høyere verdi f. eks for å identifisere spesielle ting.', - 'archived' => 'Arkivert', + 'archived' => 'Arkivert', 'asset' => 'Eiendel', 'bulk_checkout' => 'Sjekk ut Eiendeler', 'checkin' => 'Sjekk inn eiendel', @@ -19,4 +19,4 @@ return array( 'pending' => 'Under arbeid', 'undeployable' => 'Ikke utleverbar', 'view' => 'Vis eiendel', -); +]; diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php index d27a5175be..1a68610c1f 100644 --- a/resources/lang/no/admin/hardware/message.php +++ b/resources/lang/no/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Advarsel: Denne eiendelen er merket som ikke utleverbar. Oppdater eiendelsstatus hvis situasjonen har endret seg.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Eiendelen eksisterer ikke eller kan ikke forespørres.', 'assoc_users' => 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ', - 'create' => array( + 'create' => [ 'error' => 'Eiendelen ble ikke opprettet, prøv igjen :(', - 'success' => 'Eiendelen ble opprettet :)' - ), + 'success' => 'Eiendelen ble opprettet :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Eiendelen ble ikke oppdatert, prøv igjen', 'success' => 'Oppdatering av eiendel vellykket.', 'nothing_updated' => 'Ingen felter er valgt, så ingenting ble endret.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Eiendel ble ikke gjenopprettet. Prøv igjen', - 'success' => 'Vellykket gjenoppretting av eiendel.' - ), + 'success' => 'Vellykket gjenoppretting av eiendel.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit var mislykket. Prøv på nytt.', - 'success' => 'Asset audit ble logget.' - ), + 'success' => 'Asset audit ble logget.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fil ble ikke slettet. Prøv igjen.', 'success' => 'Vellykket sletting av fil.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil(er) ble ikke lastet opp. Prøv igjen.', 'success' => 'Vellykket opplasting av fil(er).', 'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor', 'invalidfiles' => 'En eller flere av filene dine er for store eller av en ikke tillatt filtype. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Noen elementer ble ikke importert riktig.', 'errorDetail' => 'Følgende elementer ble ikke importert på grunn av feil.', - 'success' => "Filen har blitt importert", - 'file_delete_success' => "Filen har blitt slettet", - 'file_delete_error' => "Filen kunne ikke bli slettet", - ), + 'success' => 'Filen har blitt importert', + 'file_delete_success' => 'Filen har blitt slettet', + 'file_delete_error' => 'Filen kunne ikke bli slettet', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette eiendelen?', 'error' => 'Det oppstod et problem under sletting av eiendel. Vennligst prøv igjen.', 'nothing_updated' => 'Ingen assets ble valgt, så ingenting ble slettet.', - 'success' => 'Vellykket sletting av eiendel.' - ), + 'success' => 'Vellykket sletting av eiendel.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Eiendel ble ikke sjekket ut. Prøv igjen', 'success' => 'Vellykket utsjekk av eiendel.', 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.', 'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!', - 'no_assets_selected' => 'Du må velge minst én enhet fra listen' - ), + 'no_assets_selected' => 'Du må velge minst én enhet fra listen', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Eiendel ble ikke sjekket inn. Prøv igjen', 'success' => 'Vellykket innsjekk av eiendel.', 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.', 'already_checked_in' => 'Den eiendelen er allerede sjekket inn.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Eiendelen ble ikke forespurt, prøv igjen', 'success' => 'Eiendel ble forespurt.', - 'canceled' => 'Utsjekkingsforespørselen ble kansellert' - ) + 'canceled' => 'Utsjekkingsforespørselen ble kansellert', + ], -); +]; diff --git a/resources/lang/no/admin/hardware/table.php b/resources/lang/no/admin/hardware/table.php index 07a384f855..d20a51626f 100644 --- a/resources/lang/no/admin/hardware/table.php +++ b/resources/lang/no/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Eiendelsmerke', 'asset_model' => 'Modell', @@ -20,6 +20,6 @@ return array( 'title' => 'Eiendel ', 'image' => 'Enhet bilde', 'days_without_acceptance' => 'Dager uten aksept', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/no/admin/kits/general.php b/resources/lang/no/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/no/admin/kits/general.php +++ b/resources/lang/no/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/no/admin/licenses/form.php b/resources/lang/no/admin/licenses/form.php index 47a1ffcc07..3052b88990 100644 --- a/resources/lang/no/admin/licenses/form.php +++ b/resources/lang/no/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Eiendel', 'checkin' => 'Sjekk inn', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Lisensiert til e-post', 'to_name' => 'Lisensiert til navn', 'update' => 'Oppdater lisens', - 'checkout_help' => 'Du må sjekke ut en lisens til en maskinvare- eller person-eiendel. Du kan velge begge, men eier av eiendel må være lik den du sjekker eiendel ut til.' -); + 'checkout_help' => 'Du må sjekke ut en lisens til en maskinvare- eller person-eiendel. Du kan velge begge, men eier av eiendel må være lik den du sjekker eiendel ut til.', +]; diff --git a/resources/lang/no/admin/licenses/general.php b/resources/lang/no/admin/licenses/general.php index e220af4c5f..7d08e377d4 100644 --- a/resources/lang/no/admin/licenses/general.php +++ b/resources/lang/no/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Om lisenser', 'about_licenses' => 'Lisenser er brukt til å spore bruk av programvare. De har et angitt antall seter som kan sjekkes ut til enkeltpersoner', 'checkin' => 'Sjekk inn setelisens', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Programvarelisenser', 'user' => 'Bruker', 'view' => 'Vis lisens', -); +]; diff --git a/resources/lang/no/admin/licenses/message.php b/resources/lang/no/admin/licenses/message.php index 957935f6aa..66ff0ccdfd 100644 --- a/resources/lang/no/admin/licenses/message.php +++ b/resources/lang/no/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisens eksisterer ikke.', 'user_does_not_exist' => 'Bruker eksisterer ikke.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Du må velge en ressurs eller en bruker, men ikke begge.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Lisens ble ikke opprettet, prøv igjen.', - 'success' => 'Vellykket opprettelse av lisens.' - ), + 'success' => 'Vellykket opprettelse av lisens.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fil ble ikke slettet. Prøv igjen.', 'success' => 'Fil ble slettet.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil(er) ble ikke lastet opp. Prøv igjen.', 'success' => 'Fil(er) ble slettet.', 'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor', 'invalidfiles' => 'En eller flere av filene er for stor, eller er en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, og lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lisens ble ikke oppdatert, prøv igjen', - 'success' => 'Vellykket oppdatering av lisens.' - ), + 'success' => 'Vellykket oppdatering av lisens.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne lisensen?', 'error' => 'Det oppstod et problem under sletting av lisens. Vennligst prøv igjen.', - 'success' => 'Vellykket sletting av lisens.' - ), + 'success' => 'Vellykket sletting av lisens.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.', - 'success' => 'Vellykket utsjekk av lisens' - ), + 'success' => 'Vellykket utsjekk av lisens', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.', - 'success' => 'Vellykket innsjekk av lisens' - ), + 'success' => 'Vellykket innsjekk av lisens', + ], -); +]; diff --git a/resources/lang/no/admin/licenses/table.php b/resources/lang/no/admin/licenses/table.php index a200c9a09d..18fe55cbfb 100644 --- a/resources/lang/no/admin/licenses/table.php +++ b/resources/lang/no/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Tildelt til', 'checkout' => 'Inne/ute', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serienummer', 'title' => 'Lisens', -); +]; diff --git a/resources/lang/no/admin/locations/message.php b/resources/lang/no/admin/locations/message.php index cb0a51b7b5..f0ca02ce4e 100644 --- a/resources/lang/no/admin/locations/message.php +++ b/resources/lang/no/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokasjon eksisterer ikke.', 'assoc_users' => 'Denne lokasjonen er i bruk av minst en bruker, og kan ikke slettes. Fjern brukernes kobling mot lokasjonen og prøv igjen. ', 'assoc_assets' => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ', 'assoc_child_loc' => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokasjon ble ikke opprettet, prøv igjen.', - 'success' => 'Vellykket opprettelse av lokasjon.' - ), + 'success' => 'Vellykket opprettelse av lokasjon.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokasjon ble ikke oppdatert, prøv igjen', - 'success' => 'Vellykket oppdatering av plassering.' - ), + 'success' => 'Vellykket oppdatering av plassering.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne plasseringen?', 'error' => 'Det oppstod et problem under sletting av plassering. Vennligst prøv igjen.', - 'success' => 'Vellykket sletting av plassering.' - ) + 'success' => 'Vellykket sletting av plassering.', + ], -); +]; diff --git a/resources/lang/no/admin/locations/table.php b/resources/lang/no/admin/locations/table.php index 4a45125c51..dce76c4fb4 100644 --- a/resources/lang/no/admin/locations/table.php +++ b/resources/lang/no/admin/locations/table.php @@ -1,6 +1,6 @@ 'Om Lokasjoner', 'about_locations' => 'Plassering brukes til å spore stedsinformasjon for brukere, eiendeler og andre elementer', 'assets_rtd' => 'Eiendeler', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Overordnet', 'currency' => 'Valuta i lokasjon', 'ldap_ou' => 'LDAP-søk OU', - ); + ]; diff --git a/resources/lang/no/admin/manufacturers/message.php b/resources/lang/no/admin/manufacturers/message.php index 936c63e353..04137afa32 100644 --- a/resources/lang/no/admin/manufacturers/message.php +++ b/resources/lang/no/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Produsent eksisterer ikke.', 'assoc_users' => 'Denne produsenten er tilknyttet minst en modell og kan ikke slettes. Oppdatèr modellen(e) til ikke å bruke denne produsenten, og prøv igjen. ', - 'create' => array( + 'create' => [ 'error' => 'Produsent ble ikke opprettet. Prøv igjen.', - 'success' => 'Opprettelse av produsent vellykket.' - ), + 'success' => 'Opprettelse av produsent vellykket.', + ], - 'update' => array( + 'update' => [ 'error' => 'Produsent ble ikke oppdatert. Prøv igjen', - 'success' => 'Oppdatering av produsent vellykket.' - ), + 'success' => 'Oppdatering av produsent vellykket.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Produsent ble ikke gjenopprettet. Prøv igjen', - 'success' => 'Gjenopprettelse av produsent vellykket.' - ), + 'success' => 'Gjenopprettelse av produsent vellykket.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne produsenten?', 'error' => 'Det oppstod et problem under sletting av produsenten. Prøv igjen.', - 'success' => 'Sletting av produsenten var vellykket.' - ) + 'success' => 'Sletting av produsenten var vellykket.', + ], -); +]; diff --git a/resources/lang/no/admin/manufacturers/table.php b/resources/lang/no/admin/manufacturers/table.php index 0b4e7b91cf..71ac781f95 100644 --- a/resources/lang/no/admin/manufacturers/table.php +++ b/resources/lang/no/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Om produsenter', 'about_manufacturers_text' => 'Produsenter er firmaer som lager dine eiendeler. Du kan lagre viktig kundestøtte kontaktinformasjon om dem her, som vises på sidene om asset-detaljer.', 'asset_manufacturers' => 'Eiendelsprodusenter', @@ -13,4 +13,4 @@ return array( 'update' => 'Endre produsent', 'url' => 'URL', -); +]; diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php index 56005b47ca..ea633beeee 100644 --- a/resources/lang/no/admin/models/general.php +++ b/resources/lang/no/admin/models/general.php @@ -1,6 +1,6 @@ 'Om asset modeller', 'about_models_text' => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Du er i ferd med å slette :model_count modeller.', 'restore' => 'Gjenopprett modell', 'requestable' => 'Brukere kan be om denne modellen', - 'show_mac_address' => 'Vis felt for MAC-adresse for denne modellen', + 'show_mac_address' => 'Vis felt for MAC-adresse for denne modellen', 'view_deleted' => 'Vis slettede', 'view_models' => 'Vis modeller', 'fieldset' => 'Felt', 'no_custom_field' => 'Ingen egendefinerte felt', 'add_default_values' => 'Legg til standardverdier', -); +]; diff --git a/resources/lang/no/admin/models/message.php b/resources/lang/no/admin/models/message.php index e4dcacfb4a..a0ecf1d1e2 100644 --- a/resources/lang/no/admin/models/message.php +++ b/resources/lang/no/admin/models/message.php @@ -1,42 +1,41 @@ 'Modell eksisterer ikke.', 'assoc_users' => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ', - - 'create' => array( + 'create' => [ 'error' => 'Modellen ble ikke opprettet. Prøv igjen.', 'success' => 'Opprettelse av modell var vellykket.', 'duplicate_set' => 'En eiendel med dette navnet, produsenten og modelnummeret eksisterer allerede.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modell ble ikke oppdatert. Prøv igjen', - 'success' => 'Oppdatering av modell vellykket.' - ), + 'success' => 'Oppdatering av modell vellykket.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne modellen?', 'error' => 'Det oppstod et problem under sletting av modellen. Prøv igjen.', - 'success' => 'Sletting av modell vellykket.' - ), + 'success' => 'Sletting av modell vellykket.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modell ble ikke gjenopprettet. Prøv igjen', - 'success' => 'Vellykket gjenoppretting av modell.' - ), + 'success' => 'Vellykket gjenoppretting av modell.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Ingen felt ble endret, så ingenting ble oppdatert.', - 'success' => 'Modeller oppdatert.' - ), + 'success' => 'Modeller oppdatert.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ingen modeller ble valgt, så ingenting ble slettet.', 'success' => ': success_count modell(er) slettet!', - 'success_partial' => ':Success_count-modell(ene) ble slettet, men fail_count kunne ikke slettes fordi de fortsatt har eiendeler knyttet til dem.' - ), + 'success_partial' => ':Success_count-modell(ene) ble slettet, men fail_count kunne ikke slettes fordi de fortsatt har eiendeler knyttet til dem.', + ], -); +]; diff --git a/resources/lang/no/admin/models/table.php b/resources/lang/no/admin/models/table.php index b8c7daa389..1fa96b7ef2 100644 --- a/resources/lang/no/admin/models/table.php +++ b/resources/lang/no/admin/models/table.php @@ -1,6 +1,6 @@ 'Opprett modell', 'created_at' => 'Opprettet', @@ -14,4 +14,4 @@ return array( 'update' => 'Endre modell', 'clone' => 'Klon modell', 'edit' => 'Endre modell', -); +]; diff --git a/resources/lang/no/admin/reports/general.php b/resources/lang/no/admin/reports/general.php index 513500aaba..8752036213 100644 --- a/resources/lang/no/admin/reports/general.php +++ b/resources/lang/no/admin/reports/general.php @@ -1,5 +1,5 @@ 'Velg de alternativene du ønsker skal inngå i rapporten.' -); +return [ + 'info' => 'Velg de alternativene du ønsker skal inngå i rapporten.', +]; diff --git a/resources/lang/no/admin/reports/message.php b/resources/lang/no/admin/reports/message.php index be9181f1ef..3f9c32ba32 100644 --- a/resources/lang/no/admin/reports/message.php +++ b/resources/lang/no/admin/reports/message.php @@ -1,5 +1,5 @@ 'Du må velge minst ETT alternativ.' -); +return [ + 'error' => 'Du må velge minst ETT alternativ.', +]; diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php index 59a304e552..d9382c73c8 100644 --- a/resources/lang/no/admin/settings/general.php +++ b/resources/lang/no/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domene', 'ad_domain_help' => 'Dette er noen ganger det samme som e-post domene, men ikke alltid.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC e-post', 'admin_cc_email_help' => 'Hvis du vil sende en kopi av innsjekk-/utsjekkeposter som sendes til brukere til en ekstra epostadresse, skriv den inn her. La ellers feltet stå tomt.', 'is_ad' => 'Dette er en Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Terskel for utløpende varslinger (dager)', 'alert_inv_threshold' => 'Terskel for eiendelsvarslinger', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Eiendels-IDer', 'audit_interval' => 'Audit intervall', 'audit_interval_help' => 'Hvis du regelmessig må fysisk overvåke dine eiendeler, angi intervallet i måneder.', @@ -214,7 +214,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.', 'two_factor_enter_code' => 'Skriv inn to-faktor kode', 'two_factor_config_complete' => 'Send kode', 'two_factor_enabled_edit_not_allowed' => 'Systemansvarlig tillater ikke at du redigerer denne innstillingen.', - 'two_factor_enrollment_text' => "To-faktor autentisering er påkrevd, men enheten din har ikke blitt aktivert for dette enda. Åpne Google Authenticator-appen og scan inn QR-koden nedenfor for å aktivere. Når du har aktivert enheten din, skriv inn koden nedenfor", + 'two_factor_enrollment_text' => 'To-faktor autentisering er påkrevd, men enheten din har ikke blitt aktivert for dette enda. Åpne Google Authenticator-appen og scan inn QR-koden nedenfor for å aktivere. Når du har aktivert enheten din, skriv inn koden nedenfor', 'require_accept_signature' => 'Kreve signatur', 'require_accept_signature_help_text' => 'Aktivering av denne funksjonen ville forlange brukernes å fysisk logge ut for å akseptere en eiendel.', 'left' => 'venstre', @@ -227,4 +227,4 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.', 'unique_serial_help_text' => 'Håndhever at eiendelsserienumre er unike', 'zerofill_count' => 'Lengden på ID-merker, inkludert zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/no/admin/settings/message.php b/resources/lang/no/admin/settings/message.php index 4e50bf5bd0..5ce9c7619f 100644 --- a/resources/lang/no/admin/settings/message.php +++ b/resources/lang/no/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'En feil oppstod under oppdatering. ', - 'success' => 'Oppdatering av innstillinger vellykket.' - ), - 'backup' => array( + 'success' => 'Oppdatering av innstillinger vellykket.', + ], + 'backup' => [ 'delete_confirm' => 'Er du sikker på at du vil slette denne sikkerhetskopien? Denne handlingen kan ikke angres. ', 'file_deleted' => 'Den Sikkerhetskopierte filen ble slettet. ', 'generated' => 'En ny sikkerhetskopi fil ble opprettet.', 'file_not_found' => 'Den backup-filen ble ikke funnet på serveren.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Det oppstod en feil under fjerning. ', 'validation_failed' => 'Din fjerningsbekreftelse er feil. Vennligst skriv inn ordet "DELETE" i bekreftelsesboksen.', - 'success' => 'Slettede rader ble fjernet.' - ), + 'success' => 'Slettede rader ble fjernet.', + ], -); +]; diff --git a/resources/lang/no/admin/statuslabels/message.php b/resources/lang/no/admin/statuslabels/message.php index 81dc8c7135..84788d15d9 100644 --- a/resources/lang/no/admin/statuslabels/message.php +++ b/resources/lang/no/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status-etiketten finnes ikke.', 'assoc_assets' => 'Denne status-etiketten er for øyeblikket i bruk på minst en eiendel, og kan ikke slettes. Vennligst endre dine eiendeler til å ikke bruke denne statusen, og prøv igjen. ', - - 'create' => array( + 'create' => [ 'error' => 'Statusmerket ble ikke opprettet. Prøv igjen.', - 'success' => 'Statusmerket ble opprettet.' - ), + 'success' => 'Statusmerket ble opprettet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statusmerket ble ikke oppdatert. Prøv igjen', - 'success' => 'Vellykket oppdatering av statusmerke.' - ), + 'success' => 'Vellykket oppdatering av statusmerke.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette dette statusmerket?', 'error' => 'Det oppstod et problem under sletting av statusmerket. Prøv igjen.', - 'success' => 'Vellykket sletting av statusmerke.' - ), + 'success' => 'Vellykket sletting av statusmerke.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Disse eiendelene kan ikke tilordnes noen.', 'deployable' => 'Disse eiendelene kan sjekkes ut. Når de er tildelt, antar de en metastatus på Deployed.', 'archived' => 'Disse eiendelene kan ikke sjekkes ut, og vises bare i arkivert visning. Dette er nyttig for å beholde informasjon om eiendeler for budsjettering / historiske formål, men å holde dem ut av den daglige aktivitetslisten.', 'pending' => 'Disse eiendelene kan ikke tildeles til noen, ofte brukt til gjenstander som er ute for reparasjon, men forventes å komme tilbake til omløp.', - ), + ], -); +]; diff --git a/resources/lang/no/admin/statuslabels/table.php b/resources/lang/no/admin/statuslabels/table.php index d84409f884..09c902953b 100644 --- a/resources/lang/no/admin/statuslabels/table.php +++ b/resources/lang/no/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Om statusmerker', 'archived' => 'Arkivert', 'create' => 'Opprett statusmerke', @@ -16,4 +16,4 @@ return array( 'title' => 'Statusmerke', 'undeployable' => 'Ikke utleverbar', 'update' => 'Oppdater statusmerke', -); +]; diff --git a/resources/lang/no/admin/suppliers/message.php b/resources/lang/no/admin/suppliers/message.php index 3b23320d23..df61bde84e 100644 --- a/resources/lang/no/admin/suppliers/message.php +++ b/resources/lang/no/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Leverandør finnes ikke.', - - 'create' => array( + 'create' => [ 'error' => 'Leverandør ble ikke opprettet. Prøv igjen.', - 'success' => 'Opprettelse av leverandør vellykket.' - ), + 'success' => 'Opprettelse av leverandør vellykket.', + ], - 'update' => array( + 'update' => [ 'error' => 'Leverandør ble ikke oppdatert. Prøv igjen', - 'success' => 'Oppdatering av leverandør vellykket.' - ), + 'success' => 'Oppdatering av leverandør vellykket.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Er du sikker på at du vil slette denne leverandøren?', 'error' => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.', 'success' => 'Sletting av leverandør vellykket.', 'assoc_assets' => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ', 'assoc_licenses' => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ', 'assoc_maintenances' => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ', - ) + ], -); +]; diff --git a/resources/lang/no/admin/suppliers/table.php b/resources/lang/no/admin/suppliers/table.php index 1bbd773b98..9cde44d423 100644 --- a/resources/lang/no/admin/suppliers/table.php +++ b/resources/lang/no/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Om leverandører', 'about_suppliers_text' => 'Leverandører brukes til å spore kilden til varer', 'address' => 'Leverandøradresse', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Vis eiendeler for', 'zip' => 'Postnummer', -); +]; diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php index 7c08d0d88d..0efefa05dd 100644 --- a/resources/lang/no/admin/users/general.php +++ b/resources/lang/no/admin/users/general.php @@ -1,7 +1,6 @@ 'Denne brukeren kan logge inn', 'activated_disabled_help_text' => 'Du kan ikke redigere aktiveringsstatus for din egen konto.', 'assets_user' => 'Eiendeler tildelt :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Rediger bruker', 'filetype_info' => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.', 'history_user' => 'Historikk for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klikk her for å gjenopprette dem.', 'last_login' => 'Siste innlogging', 'ldap_config_text' => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Gjeldende administrasjonsinnstillinger tillater selektiv håndhevelse av to-faktor autentisering. ', 'two_factor_enrolled' => '2FA enhet registrert ', 'two_factor_active' => '2FA Aktiv ', - ); + ]; diff --git a/resources/lang/no/admin/users/message.php b/resources/lang/no/admin/users/message.php index c4bb5a2182..37557c7e5d 100644 --- a/resources/lang/no/admin/users/message.php +++ b/resources/lang/no/admin/users/message.php @@ -1,6 +1,6 @@ 'Du har akseptert eiendelen.', 'declined' => 'Du har avvist eiendelen.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integrasjonen er ikke konfigurert i denne installasjonen.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Opprettelse av bruker vellykket.', 'update' => 'Oppdatering av bruker vellykket.', 'update_bulk' => 'Oppdatering av brukere vellykket!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Vellykket aktivering av bruker.', 'restored' => 'Vellykket gjenopprettelse av bruker.', 'import' => 'Vellykket import av brukere.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Det oppstod et problem under opprettelse av bruker. Prøv igjen.', 'update' => 'Det oppstod et problem under oppdatering av bruker. Prøv igjen.', 'delete' => 'Det oppstod et problem under sletting av bruker. Prøv igjen.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:', 'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:', 'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fil ble ikke slettet. Prøv igjen.', 'success' => 'Fil ble slettet.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil(er) ble ikke lastet opp. Prøv igjen.', 'success' => 'Vellykket opplasting av fil(er).', 'nofiles' => 'Du valgte ingen filer for opplasting', 'invalidfiles' => 'En eller flere av filene dine er for store eller av en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.', - ), + ], -); +]; diff --git a/resources/lang/no/admin/users/table.php b/resources/lang/no/admin/users/table.php index 6d7cee7d8a..4a5e591cde 100644 --- a/resources/lang/no/admin/users/table.php +++ b/resources/lang/no/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktiv', 'allow' => 'Tillatt', 'checkedout' => 'Eiendeler', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Vis nåværende brukere', 'show_deleted' => 'Vis slettede brukere', 'title' => 'Tittel', - 'to_restore_them' => 'for å gjenopprette de.', + 'to_restore_them' => 'for å gjenopprette de.', 'updateuser' => 'Oppdater bruker', 'username' => 'Brukernavn', - 'user_deleted_text' => 'Denne brukeren er merket som slettet.', + 'user_deleted_text' => 'Denne brukeren er merket som slettet.', 'username_note' => '(Dette brukes til binding i Active Directory, ikke for innlogging)', 'cloneuser' => 'Klon bruker', 'viewusers' => 'Vis brukere', -); +]; diff --git a/resources/lang/no/auth/general.php b/resources/lang/no/auth/general.php index 3fa957cb5a..41dddd8954 100644 --- a/resources/lang/no/auth/general.php +++ b/resources/lang/no/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/no/auth/message.php b/resources/lang/no/auth/message.php index 98decedb69..09029fd244 100644 --- a/resources/lang/no/auth/message.php +++ b/resources/lang/no/auth/message.php @@ -1,6 +1,6 @@ 'En konto med denne e-postadressen finnes allerede.', 'account_not_found' => 'Brukernavnet eller passordet er feil.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Denne brukerkontoen er forbudt.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Det oppstod et problem under innlogging. Prøv igjen.', 'success' => 'Vellykket innlogging.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Det oppstod et problem under opprettelse av konto. Prøv igjen.', 'success' => 'Opprettelse av konto vellykket.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Det oppstod et problem under henting av kode for resetting av passord. Prøv igjen.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Det oppstod et problem under gjenopprettelse av passordet ditt. Prøv igjen.', 'success' => 'Ditt passord er resatt.', - ), + ], - -); +]; diff --git a/resources/lang/no/button.php b/resources/lang/no/button.php index 4326e5c7bb..4e3a73797f 100644 --- a/resources/lang/no/button.php +++ b/resources/lang/no/button.php @@ -1,6 +1,6 @@ 'Handlinger', 'add' => 'Opprett ny', 'cancel' => 'Avbryt', @@ -11,7 +11,7 @@ return array( 'request' => 'Forespørsel', 'submit' => 'Send', 'upload' => 'Last opp', - 'select_file' => 'Velg fil...', + 'select_file' => 'Velg fil...', 'select_files' => 'Velg filer...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php index 154979532f..8a6fb4a8bd 100644 --- a/resources/lang/no/general.php +++ b/resources/lang/no/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Sjekk inn', 'user_requests_count' => 'Forespørsler', 'city' => 'By', - 'click_here' => 'Klikk her', + 'click_here' => 'Klikk her', 'clear_selection' => 'Tøm valg', 'companies' => 'Selskaper', 'company' => 'Firmanavn', 'component' => 'Komponent', 'components' => 'Komponenter', - 'complete' => 'Fullført', + 'complete' => 'Fullført', 'consumable' => 'Forbruksvare', 'consumables' => 'Forbruksvarer', 'country' => 'Land', diff --git a/resources/lang/no/help.php b/resources/lang/no/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/no/help.php +++ b/resources/lang/no/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/no/mail.php b/resources/lang/no/mail.php index 75c8d6c79f..fa95bbfd27 100644 --- a/resources/lang/no/mail.php +++ b/resources/lang/no/mail.php @@ -1,6 +1,6 @@ 'Brukeren har avbrutt en element-forespørsel på webområdet', 'a_user_requested' => 'En bruker har bedt om et element på webområdet', 'accessory_name' => 'Navn tilbehør:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/no/pagination.php b/resources/lang/no/pagination.php index 26ea2fb2ad..1e26ddff7f 100644 --- a/resources/lang/no/pagination.php +++ b/resources/lang/no/pagination.php @@ -1,6 +1,6 @@ 'Neste »', -); +]; diff --git a/resources/lang/no/passwords.php b/resources/lang/no/passwords.php index 49bb02e9fb..1c0588f3b8 100644 --- a/resources/lang/no/passwords.php +++ b/resources/lang/no/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Din passord link har blitt sendt!', 'user' => 'Ingen aktiv bruker med den epostadressen funnet.', ]; - diff --git a/resources/lang/no/reminders.php b/resources/lang/no/reminders.php index 63956d429f..a51db23e24 100644 --- a/resources/lang/no/reminders.php +++ b/resources/lang/no/reminders.php @@ -1,6 +1,6 @@ "Passord må bestå av minst 6 tegn og stemme med bekreftelse.", + 'password' => 'Passord må bestå av minst 6 tegn og stemme med bekreftelse.', - "user" => "Brukernavn eller epostadresse er ugyldig", + 'user' => 'Brukernavn eller epostadresse er ugyldig', - "token" => "Denne passordresetten er ugyldig.", + 'token' => 'Denne passordresetten er ugyldig.', - "sent" => "En passordpåminnelse er sendt hvis en gyldig e-postadresse ble funnet.", + 'sent' => 'En passordpåminnelse er sendt hvis en gyldig e-postadresse ble funnet.', -); +]; diff --git a/resources/lang/no/table.php b/resources/lang/no/table.php index 25b8be6b6a..450267cb0a 100644 --- a/resources/lang/no/table.php +++ b/resources/lang/no/table.php @@ -1,10 +1,10 @@ 'Handlinger', 'action' => 'Handling', 'by' => 'Av', 'item' => 'Enhet', -); +]; diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php index 68a26eb214..d8d91e598e 100644 --- a/resources/lang/no/validation.php +++ b/resources/lang/no/validation.php @@ -1,6 +1,6 @@ 'Attributtet :attribute er allerede tatt.', 'uploaded' => 'Atribbutet :attribute kunne ikke lastes opp.', 'url' => 'Attributt-formatet :attribute er ugyldig.', - "unique_undeleted" => ":attribute må være unikt.", + 'unique_undeleted' => ':attribute må være unikt.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Attributtfeltet inneholder et tegn som ikke er tillatt.", - "email_array" => "En eller flere e-postadresser er ugyldige.", - "hashed_pass" => "Gjeldende passord er feil", + 'alpha_space' => 'Attributtfeltet inneholder et tegn som ikke er tillatt.', + 'email_array' => 'En eller flere e-postadresser er ugyldige.', + 'hashed_pass' => 'Gjeldende passord er feil', 'dumbpwd' => 'Passordet er for vanlig.', - "statuslabel_type" => "Du må velge en gyldig statusetikett-type", + 'statuslabel_type' => 'Du må velge en gyldig statusetikett-type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/pl/admin/accessories/general.php b/resources/lang/pl/admin/accessories/general.php index e3f516d50c..a9ef6413ce 100644 --- a/resources/lang/pl/admin/accessories/general.php +++ b/resources/lang/pl/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorie Akcesoriów', 'accessory_name' => 'Nazwa akcesoriów', 'checkout' => 'Wydanie akcesoriów', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Użyj domyślnej EULA zamiast tego.', 'use_default_eula_disabled' => 'Użyj zamiast domyślnego EULA. Brak domyślnego EULA. Proszę dodaj jakieś w opcjach.', -); +]; diff --git a/resources/lang/pl/admin/accessories/message.php b/resources/lang/pl/admin/accessories/message.php index 34cc7f658b..b66b3583d4 100644 --- a/resources/lang/pl/admin/accessories/message.php +++ b/resources/lang/pl/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Akcesorium [:id] nie istnieje.', 'assoc_users' => 'Akcesoria z tej kategorii zostały wydane do :count użytkowników. Zbierz akcesoria i spróbuj ponownie. ', - 'create' => array( + 'create' => [ 'error' => 'Akcesorium nie utworzono, spróbuj ponownie.', - 'success' => 'Akcesorium utworzono pomyślnie.' - ), + 'success' => 'Akcesorium utworzono pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Nie zaktualizowano Akcesorium, spróbuj ponownie', - 'success' => 'Akcesorium utworzono pomyślnie.' - ), + 'success' => 'Akcesorium utworzono pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć to Akcesorium?', 'error' => 'Wystąpił błąd podczas usuwania akcesorium. Proszę spróbować ponownie.', - 'success' => 'Akcesorium zostało usunięte pomyślnie.' - ), + 'success' => 'Akcesorium zostało usunięte pomyślnie.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Akcesoria nie zostały przypisane, spróbuj ponownie', 'success' => 'Akcesoria przypisany pomyślnie.', - 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' - ), + 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Akcesoria nie zostały przypisane, spróbuj ponownie', 'success' => 'Akcesoria przypisane pomyślnie.', - 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' - ) + 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.', + ], - -); +]; diff --git a/resources/lang/pl/admin/accessories/table.php b/resources/lang/pl/admin/accessories/table.php index ec387f110d..788ae2a14b 100644 --- a/resources/lang/pl/admin/accessories/table.php +++ b/resources/lang/pl/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Pobierz CSV', - 'eula_text' => 'Licencja', +return [ + 'dl_csv' => 'Pobierz CSV', + 'eula_text' => 'Licencja', 'id' => 'ID', 'require_acceptance' => 'Akceptacja', 'title' => 'Nazwa akcesoriów', - -); +]; diff --git a/resources/lang/pl/admin/asset_maintenances/form.php b/resources/lang/pl/admin/asset_maintenances/form.php index 7b8bd52613..74abb32233 100644 --- a/resources/lang/pl/admin/asset_maintenances/form.php +++ b/resources/lang/pl/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dni', 'notes' => 'Notatki', 'update' => 'Uaktualnij', - 'create' => 'Utwórz' + 'create' => 'Utwórz', ]; diff --git a/resources/lang/pl/admin/asset_maintenances/message.php b/resources/lang/pl/admin/asset_maintenances/message.php index fc34f9b587..f54fc5e531 100644 --- a/resources/lang/pl/admin/asset_maintenances/message.php +++ b/resources/lang/pl/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Czy chcesz usunąć konserwację tego aktywa?', 'error' => 'Wystąpił błąd przy usuwaniu konserwacji aktywa. Spróbuj ponownie.', - 'success' => 'Konserwacja aktywa usunięta pomyślnie.' + 'success' => 'Konserwacja aktywa usunięta pomyślnie.', ], 'create' => [ 'error' => 'Konserwacja aktywa nie została utworzona, spróbuj ponownie.', - 'success' => 'Konserwacja aktywa utworzona pomyślnie.' + 'success' => 'Konserwacja aktywa utworzona pomyślnie.', ], 'edit' => [ 'error' => 'Konserwacja aktywa nie została edytowana, spróbuj ponownie.', - 'success' => 'Edycja konserwacji aktywa zakończona pomyślnie.' + 'success' => 'Edycja konserwacji aktywa zakończona pomyślnie.', ], 'asset_maintenance_incomplete' => 'Nieukończone', 'warranty' => 'Gwarancja', 'not_warranty' => 'Brak Gwarancji', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/pl/admin/asset_maintenances/table.php b/resources/lang/pl/admin/asset_maintenances/table.php index b4d524fab4..45535d25de 100644 --- a/resources/lang/pl/admin/asset_maintenances/table.php +++ b/resources/lang/pl/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Utrzymywanie aktywów', 'asset_name' => 'Nazwa Aktywu', 'is_warranty' => 'Gwarancja', - 'dl_csv' => 'Pobierz CSV' + 'dl_csv' => 'Pobierz CSV', ]; diff --git a/resources/lang/pl/admin/categories/general.php b/resources/lang/pl/admin/categories/general.php index 82aeae0520..0a5fe6ce6e 100644 --- a/resources/lang/pl/admin/categories/general.php +++ b/resources/lang/pl/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorie aktywów', 'category_name' => 'Nazwa kategorii', 'checkin_email' => 'Wyślij e-mail do użytkownika przy odbiorze / przypisaniu.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Użyj domyślnej EULA zamiast tego.', 'use_default_eula_disabled' => 'Użyj domyślnej EULA. Brak domyślnej EULA. Proszę dodaj jedną w Ustawieniach.', -); +]; diff --git a/resources/lang/pl/admin/categories/message.php b/resources/lang/pl/admin/categories/message.php index dcfc786526..3ad47befcb 100644 --- a/resources/lang/pl/admin/categories/message.php +++ b/resources/lang/pl/admin/categories/message.php @@ -1,25 +1,25 @@ 'Nie ma takiej kategorii.', 'assoc_models' => 'Wybrana kategoria jest obecnie powiązana z co najmniej jednym typem urządzenia i nie może zostać usunięta. Uaktualnij swoją listę modeli urządzeń by nie zwierała tej kategorii, a następnie spróbuj ponownie. ', 'assoc_items' => 'Ta kategoria jest obecnie powiązana z co najmniej jednym :asset_type i nie można jej usunąć. Uaktualnij swój :asset_type tak, aby nie odnosiła się do tej kategorii, a następnie spróbuj ponownie. ', - 'create' => array( + 'create' => [ 'error' => 'Kategoria nie została utworzona, spróbuj ponownie.', - 'success' => 'Kategoria utworzona.' - ), + 'success' => 'Kategoria utworzona.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategoria nie została zaktualizowana, spróbuj ponownie', - 'success' => 'Kategoria zaktualizowana.' - ), + 'success' => 'Kategoria zaktualizowana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy jesteś pewien że chcesz usunąć tą kategorię ?', 'error' => 'Wystąpił błąd podczas usuwania kategorii. Spróbuj ponownie.', - 'success' => 'Kategoria usunięta.' - ) + 'success' => 'Kategoria usunięta.', + ], -); +]; diff --git a/resources/lang/pl/admin/categories/table.php b/resources/lang/pl/admin/categories/table.php index 8a287d5823..e3ae521b38 100644 --- a/resources/lang/pl/admin/categories/table.php +++ b/resources/lang/pl/admin/categories/table.php @@ -1,10 +1,10 @@ 'Licencja dla użytkownika końcowego', +return [ + 'eula_text' => 'Licencja dla użytkownika końcowego', 'id' => 'ID', 'parent' => 'Kategoria nadrzędna', 'require_acceptance' => 'Akceptacja', 'title' => 'Nazwa kategorii', -); +]; diff --git a/resources/lang/pl/admin/companies/general.php b/resources/lang/pl/admin/companies/general.php index bd2b44e674..05d953c04d 100644 --- a/resources/lang/pl/admin/companies/general.php +++ b/resources/lang/pl/admin/companies/general.php @@ -1,4 +1,5 @@ 'Wybierz firmę', ]; diff --git a/resources/lang/pl/admin/companies/message.php b/resources/lang/pl/admin/companies/message.php index ad75832ad9..0e80434f11 100644 --- a/resources/lang/pl/admin/companies/message.php +++ b/resources/lang/pl/admin/companies/message.php @@ -1,18 +1,19 @@ 'Wskazana firma nie istnieje.', 'assoc_users' => 'Wybrana kategoria jest obecnie powiązana z co najmniej jednym typem urządzenia i nie może zostać usunięta. Uaktualnij swoją listę modeli urządzeń by nie zwierała tej kategorii, a następnie spróbuj ponownie. ', - 'create' => array( + 'create' => [ 'error' => 'Firma nie została utworzona, spróbuj ponownie.', - 'success' => 'Firma utworzona pomyślnie.' - ), - 'update' => array( + 'success' => 'Firma utworzona pomyślnie.', + ], + 'update' => [ 'error' => 'Firma nie została uaktualniona, spróbuj ponownie', - 'success' => 'Firma została uaktualniona pomyślnie.' - ), - 'delete' => array( + 'success' => 'Firma została uaktualniona pomyślnie.', + ], + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć tę firmę?', 'error' => 'Wystąpił problem podczas usuwania firmy. Spróbuj ponownie.', - 'success' => 'Firma została usunięta pomyślnie.' - ) -); + 'success' => 'Firma została usunięta pomyślnie.', + ], +]; diff --git a/resources/lang/pl/admin/companies/table.php b/resources/lang/pl/admin/companies/table.php index 8db983722d..6bf382970e 100644 --- a/resources/lang/pl/admin/companies/table.php +++ b/resources/lang/pl/admin/companies/table.php @@ -1,9 +1,10 @@ 'Firmy', 'create' => 'Utwórz firmę', 'title' => 'Firma', 'update' => 'Aktualizacja firmy', 'name' => 'Nazwa Firmy', 'id' => 'Id', -); +]; diff --git a/resources/lang/pl/admin/components/general.php b/resources/lang/pl/admin/components/general.php index fc0878cb4f..276b139fac 100644 --- a/resources/lang/pl/admin/components/general.php +++ b/resources/lang/pl/admin/components/general.php @@ -1,6 +1,6 @@ 'Nazwa składnika', 'checkin' => 'Odbiór składnika', 'checkout' => 'Wydanie składnika', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Pozostało', 'total' => 'Suma', 'update' => 'Aktualizacja składnika', -); +]; diff --git a/resources/lang/pl/admin/components/message.php b/resources/lang/pl/admin/components/message.php index afc4868e71..e3e96e9c57 100644 --- a/resources/lang/pl/admin/components/message.php +++ b/resources/lang/pl/admin/components/message.php @@ -1,36 +1,35 @@ 'Składnik nie istnieje.', - 'create' => array( + 'create' => [ 'error' => 'Składnik nie został utworzony, spróbuj ponownie.', - 'success' => 'Składnik został utworzony pomyślnie.' - ), + 'success' => 'Składnik został utworzony pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Składnik nie został uaktualniony, spróbuj ponownie', - 'success' => 'Składnik został zaktualizowany pomyślnie.' - ), + 'success' => 'Składnik został zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć ten składnik?', 'error' => 'Wystąpił problem podczas usuwania składnika. Spróbuj ponownie.', - 'success' => 'Składnik został usunięty pomyślnie.' - ), + 'success' => 'Składnik został usunięty pomyślnie.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Składnik nie został wydany, spróbuj ponownie', 'success' => 'Składnik został wydany pomyślnie.', - 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.' - ), + 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Składnik nie został odebrany, spróbuj ponownie', 'success' => 'Składnik został odebrany pomyślnie.', - 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.' - ) + 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.', + ], - -); +]; diff --git a/resources/lang/pl/admin/components/table.php b/resources/lang/pl/admin/components/table.php index c7a12c46b8..820da6f400 100644 --- a/resources/lang/pl/admin/components/table.php +++ b/resources/lang/pl/admin/components/table.php @@ -1,5 +1,5 @@ 'Nazwa składnika', -); +]; diff --git a/resources/lang/pl/admin/consumables/general.php b/resources/lang/pl/admin/consumables/general.php index 068ae529a5..3cae58c9ce 100644 --- a/resources/lang/pl/admin/consumables/general.php +++ b/resources/lang/pl/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Rozliczenie dla użytkownika', 'consumable_name' => 'Nazwa materiału eksploatacyjnego', 'create' => 'Utwórz materiał eksploatacyjny', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Pozostało', 'total' => 'Łącznie', 'update' => 'Aktualizuj materiał eksploatacyjny', -); +]; diff --git a/resources/lang/pl/admin/consumables/message.php b/resources/lang/pl/admin/consumables/message.php index b1209eabed..2afb1e106f 100644 --- a/resources/lang/pl/admin/consumables/message.php +++ b/resources/lang/pl/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Materiał eksploatacyjny nie istnieje.', - 'create' => array( + 'create' => [ 'error' => 'Materiał eksploatacyjny nie został utworzony, spróbuj ponownie.', - 'success' => 'Materiał eksploatacyjny utworzony pomyślnie.' - ), + 'success' => 'Materiał eksploatacyjny utworzony pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Materiał eksploatacyjny nie został uaktualniony, spróbuj ponownie', - 'success' => 'Materiał eksploatacyjny został zaktualizowany pomyślnie.' - ), + 'success' => 'Materiał eksploatacyjny został zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć materiał eksploatacyjny?', 'error' => 'Wystąpił problem podczas usuwania materiału eksploatacyjnego. Spróbuj ponownie.', - 'success' => 'Materiał eksploatacyjny został usunięty pomyślnie.' - ), + 'success' => 'Materiał eksploatacyjny został usunięty pomyślnie.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Materiał eksploatacyjny nie został wydany, spróbuj ponownie', 'success' => 'Materiał eksploatacyjny został wydany pomyślnie.', - 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' - ), + 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Materiał eksploatacyjny nie został odebrany, spróbuj ponownie', 'success' => 'Materiał eksploatacyjny odebrany pomyślnie.', - 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' - ) + 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.', + ], - -); +]; diff --git a/resources/lang/pl/admin/consumables/table.php b/resources/lang/pl/admin/consumables/table.php index 3212a27d47..cc9ecfcbf3 100644 --- a/resources/lang/pl/admin/consumables/table.php +++ b/resources/lang/pl/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nazwa materiału eksploatacyjnego', -); +]; diff --git a/resources/lang/pl/admin/custom_fields/general.php b/resources/lang/pl/admin/custom_fields/general.php index 3451dd60bf..8c4afb0e42 100644 --- a/resources/lang/pl/admin/custom_fields/general.php +++ b/resources/lang/pl/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Pola niestandardowe', 'field' => 'Pole', 'about_fieldsets_title' => 'O zestawie pól', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nowe pole niestandardowe', 'value_encrypted' => 'Wartość tego pola jest zaszyfrowana w bazie danych. Tylko admini będą mogli wyświetlić rozszyfrowaną wartość', 'show_in_email' => 'Czy podać wartość tego pola w e-mailach z przypisaniem, wysłanych do użytkownika? Zaszyfrowane pola nie mogą być zawarte w wiadomościach e-mail.', -); +]; diff --git a/resources/lang/pl/admin/custom_fields/message.php b/resources/lang/pl/admin/custom_fields/message.php index 9fc2f5b0b4..a62f7f7a8c 100644 --- a/resources/lang/pl/admin/custom_fields/message.php +++ b/resources/lang/pl/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Pole nie istnieje.', 'already_added' => 'Pole już istnieje', - 'create' => array( + 'create' => [ 'error' => 'Pole nie zostało utworzone. Spróbuj ponownie.', 'success' => 'Pole utworzone pomyślnie.', - 'assoc_success' => 'Pole pomyślnie dadane do zestawu pól.' - ), + 'assoc_success' => 'Pole pomyślnie dadane do zestawu pól.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pole nie zostało zaktualizowane, spróbuj ponownie', - 'success' => 'Pole zaktualizowane pomyślnie.' - ), + 'success' => 'Pole zaktualizowane pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć to pole?', 'error' => 'Wystąpił błąd podczas usuwania pola. Spróbuj ponownie.', 'success' => 'Pole zostało usunięte pomyślnie.', 'in_use' => 'Pole jest wciąż w użytku.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Zestaw pól nie istnieje', - 'create' => array( + 'create' => [ 'error' => 'Zestaw pól nie został utworzony, spróbuj ponownie.', - 'success' => 'Zestaw pól utworzono pomyślnie.' - ), + 'success' => 'Zestaw pól utworzono pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Zestaw pól nie został zaktualizowany, spróbuj ponownie', - 'success' => 'Zestaw pól zaktualizowany pomyślnie.' - ), + 'success' => 'Zestaw pól zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć ten zestaw pól?', 'error' => 'Wystąpił błąd podczas usuwania zestawu pól. Spróbuj ponownie.', 'success' => 'Zestaw pól usunięto pomyślnie.', 'in_use' => 'Zestaw pól jest nadal w użyciu.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/pl/admin/departments/message.php b/resources/lang/pl/admin/departments/message.php index 5bdef97b99..f0411aa1e8 100644 --- a/resources/lang/pl/admin/departments/message.php +++ b/resources/lang/pl/admin/departments/message.php @@ -1,21 +1,21 @@ 'Wydział nie istnieje.', 'assoc_users' => 'Ten wydział obecnie jest skojarzony z co najmniej jednym użytkownikiem i nie może zostać usunięty. Uaktualnij użytkowników tak, aby nie było relacji z tym wydziałem i spróbuj ponownie. ', - 'create' => array( + 'create' => [ 'error' => 'Wydział nie został utworzony. Spróbuj ponownie.', - 'success' => 'Wydział utworzony pomyślnie.' - ), - 'update' => array( + 'success' => 'Wydział utworzony pomyślnie.', + ], + 'update' => [ 'error' => 'Wydział nie został utworzony. Spróbuj ponownie', - 'success' => 'Wydział utworzony pomyślnie.' - ), - 'delete' => array( + 'success' => 'Wydział utworzony pomyślnie.', + ], + 'delete' => [ 'confirm' => 'Czy na pewno usunąć wybrany wydział?', 'error' => 'Podczas usuwania wydziału napotkano problem. Spróbuj ponownie.', - 'success' => 'Wydział usunięty pomyślnie.' - ) + 'success' => 'Wydział usunięty pomyślnie.', + ], -); +]; diff --git a/resources/lang/pl/admin/departments/table.php b/resources/lang/pl/admin/departments/table.php index c2147248d7..41dfe0600c 100644 --- a/resources/lang/pl/admin/departments/table.php +++ b/resources/lang/pl/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nazwa wydziału', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokalizacja', 'create' => 'Utwórz wydział', 'update' => 'Aktualizuj wydział', - ); + ]; diff --git a/resources/lang/pl/admin/depreciations/general.php b/resources/lang/pl/admin/depreciations/general.php index 8fd2e4bffd..00d5c5983c 100644 --- a/resources/lang/pl/admin/depreciations/general.php +++ b/resources/lang/pl/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Informacja na temat amortyzacji nabytku', 'about_depreciations' => 'Możesz ustawić amortyzację środków trwałych na podstawie amortyzacji aktywów w oparciu o metodę liniową.', 'asset_depreciations' => 'Amortyzacja nabytków', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Numer miesiąca', 'update' => 'Aktualizuj amortyzację', -); +]; diff --git a/resources/lang/pl/admin/depreciations/message.php b/resources/lang/pl/admin/depreciations/message.php index 5088977a86..bcc9b59f5d 100644 --- a/resources/lang/pl/admin/depreciations/message.php +++ b/resources/lang/pl/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Klasa amortyzacji nie istnieje.', 'assoc_users' => 'Amortyzacja ta jest aktualnie skojarzona z jednym lub większą ilością modeli amortyzacji i nie można usunąć. Proszę usunąć modele, a następnie spróbować ją ponownie usunąć. ', - - 'create' => array( + 'create' => [ 'error' => 'Klasa amortyzacji nie został utworzony, spróbuj ponownie. :(', - 'success' => 'Klasa amortyzacji została utworzona pomyślnie. :)' - ), + 'success' => 'Klasa amortyzacji została utworzona pomyślnie. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Klasa amortyzacji nie został uaktualniona, spróbuj ponownie', - 'success' => 'Klasa amortyzacji została uaktualniona pomyślnie.' - ), + 'success' => 'Klasa amortyzacji została uaktualniona pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć tę klasę amortyzacji?', 'error' => 'Wystąpił problem podczas usuwania klasy amortyzacji. Spróbuj ponownie.', - 'success' => 'Klasa amortyzacji została usunięta pomyślnie.' - ) + 'success' => 'Klasa amortyzacji została usunięta pomyślnie.', + ], -); +]; diff --git a/resources/lang/pl/admin/depreciations/table.php b/resources/lang/pl/admin/depreciations/table.php index eaf87978c3..7ec3ca8be9 100644 --- a/resources/lang/pl/admin/depreciations/table.php +++ b/resources/lang/pl/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'Id', 'months' => 'Miesiące', 'term' => 'Termin', 'title' => 'Nazwa ', -); +]; diff --git a/resources/lang/pl/admin/groups/message.php b/resources/lang/pl/admin/groups/message.php index 4cee54d4d8..550d59ef25 100644 --- a/resources/lang/pl/admin/groups/message.php +++ b/resources/lang/pl/admin/groups/message.php @@ -1,22 +1,22 @@ 'Taka grupa już istnieje!', 'group_not_found' => 'Grupa [:id] nie istnieje.', 'group_name_required' => 'Nazwa jest polem obowiązkowym', - 'success' => array( + 'success' => [ 'create' => 'Grupa została poprawnie utworzona.', 'update' => 'Grupa została poprawnie zaktualizowana.', 'delete' => 'Grupa została usunięta.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć tą grupę ?', 'create' => 'Wystąpił problem podczas tworzenia grupy. Proszę spróbować ponownie.', 'update' => 'Wystąpił problem podczas aktualizacji grupy. Proszę spróbować ponownie.', 'delete' => 'Wystąpił problem podczas usuwania grupy. Proszę spróbować ponownie.', - ), + ], -); +]; diff --git a/resources/lang/pl/admin/groups/table.php b/resources/lang/pl/admin/groups/table.php index 1bff99347d..f65f53c777 100644 --- a/resources/lang/pl/admin/groups/table.php +++ b/resources/lang/pl/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nazwa', 'users' => '# z użytkowników', -); +]; diff --git a/resources/lang/pl/admin/groups/titles.php b/resources/lang/pl/admin/groups/titles.php index f853d9241c..1d12aa8816 100644 --- a/resources/lang/pl/admin/groups/titles.php +++ b/resources/lang/pl/admin/groups/titles.php @@ -1,6 +1,6 @@ 'O Grupach użytkowników', 'about_groups' => 'Grupy są używane do generalizowania uprawnień użytkowników.', 'group_management' => 'Zarządzanie grupą', @@ -11,4 +11,4 @@ return array( 'allow' => 'Zezwól', 'deny' => 'Odmów', -); +]; diff --git a/resources/lang/pl/admin/hardware/form.php b/resources/lang/pl/admin/hardware/form.php index 9bb274ee0e..250430c004 100644 --- a/resources/lang/pl/admin/hardware/form.php +++ b/resources/lang/pl/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Potwierdź zbiorcze usuwanie aktywów', +return [ + 'bulk_delete' => 'Potwierdź zbiorcze usuwanie aktywów', 'bulk_delete_help' => 'Przejrzyj usuwanie zbiorcze aktywów poniżej. Po usunięciu tych aktywów będą one mogły zostać przywrócone, ale nie będą one skojarzone z żadnym z użytkowników, do których są aktualnie przypisane.', 'bulk_delete_warn' => 'Zamierzasz usunąć :asset_count aktywów.', - 'bulk_update' => 'Zbiorcza aktualizacja aktywów', - 'bulk_update_help' => 'Ten formularz umożliwia zbiorczą aktualizację wielu aktywów na raz. Wypełnij tylko te pola, które chcesz zmienić. Puste pola pozostaną niezmienione. ', - 'bulk_update_warn' => 'Zamierzasz edytować właściwości :asset_count zestawów.', + 'bulk_update' => 'Zbiorcza aktualizacja aktywów', + 'bulk_update_help' => 'Ten formularz umożliwia zbiorczą aktualizację wielu aktywów na raz. Wypełnij tylko te pola, które chcesz zmienić. Puste pola pozostaną niezmienione. ', + 'bulk_update_warn' => 'Zamierzasz edytować właściwości :asset_count zestawów.', 'checkedout_to' => 'Wypożyczony do', 'checkout_date' => 'Data przypisania', 'checkin_date' => 'Data przypisania', @@ -38,7 +38,6 @@ return array( 'tag' => 'Tag-i zasobu/nabytku', 'update' => 'Aktualizacja zasobu/nabytku', 'warranty' => 'Gwarancja', - 'warranty_expires' => 'Gwarancja wygasa', + 'warranty_expires' => 'Gwarancja wygasa', 'years' => 'rok', -) -; +]; diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php index 27a19b3a9e..1b63c2bd2e 100644 --- a/resources/lang/pl/admin/hardware/general.php +++ b/resources/lang/pl/admin/hardware/general.php @@ -1,9 +1,9 @@ 'O Aktywach', 'about_assets_text' => 'Aktywa są to elementy identyfikowane przez numer seryjny lub etykietę. Są to przedmioty o większej wartości, gdzie liczy się identyfikacji określonego elementu.', - 'archived' => 'Zarchiwizowane', + 'archived' => 'Zarchiwizowane', 'asset' => 'Nabytek', 'bulk_checkout' => 'Przypisz aktywa', 'checkin' => 'Potwierdzanie zasobu/aktywa', @@ -19,4 +19,4 @@ return array( 'pending' => 'Oczekuje', 'undeployable' => 'Niemożliwe do wdrożenia', 'view' => 'Wyświetl nabytki', -); +]; diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php index 2c334efa72..172286a613 100644 --- a/resources/lang/pl/admin/hardware/message.php +++ b/resources/lang/pl/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Uwaga: To aktywo zostało oznaczone jako tymczasowo niemożliwe do wdrożenia. Jeśli jego stan się zmienił, zaktualizuj status aktywa.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Niezła próba. Ten nabytek/zasób nie istnieje lub nie można go zażądać.', 'assoc_users' => 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie.', - 'create' => array( + 'create' => [ 'error' => 'Nabytek nie został utworzony, proszę spróbować ponownie. :(', - 'success' => 'Nowy nabytek został utworzony. :)' - ), + 'success' => 'Nowy nabytek został utworzony. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Nie zaktualizowano nabytku/zasobu, proszę spróbować ponownie', 'success' => 'Aktualizacja poprawna.', 'nothing_updated' => 'Żadne pole nie zostało wybrane, więc nic nie zostało zmienione.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Aktywo nie został przywrócony, spróbuj ponownie.', - 'success' => 'Aktywo zostało przywrócone.' - ), + 'success' => 'Aktywo zostało przywrócone.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Audyt aktywów nie powiódł się. Proszę spróbować ponownie.', - 'success' => 'Audyt aktywów pomyślnie zarejestrowany.' - ), + 'success' => 'Audyt aktywów pomyślnie zarejestrowany.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Plik nie zostały usunięte. Spróbuj ponownie.', 'success' => 'Plik zostały usunięty.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', 'success' => 'Plik(i) zostały wysłane.', 'nofiles' => 'Nie wybrałeś żadnych plików do przesłania, albo plik, który próbujesz przekazać jest zbyt duży', 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest jest za duży lub jego typ jest niewłaściwy. Dopuszczalne typy plików: png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Niektóre elementy nie zostały poprawnie zaimportowane.', 'errorDetail' => 'Następujące elementy nie zostały zaimportowane z powodu błędów.', - 'success' => "Twój plik został zaimportowany", - 'file_delete_success' => "Twój plik został poprawnie usunięty", - 'file_delete_error' => "Plik nie może zostać usunięty", - ), + 'success' => 'Twój plik został zaimportowany', + 'file_delete_success' => 'Twój plik został poprawnie usunięty', + 'file_delete_error' => 'Plik nie może zostać usunięty', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć?', 'error' => 'Nie można usunąć. Proszę spróbować ponownie.', 'nothing_updated' => 'Aktywa nie zostały wybrane, więc nic nie zostało usunięte.', - 'success' => 'Nabytek został usunięty.' - ), + 'success' => 'Nabytek został usunięty.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Nie mogę wypisać nabytku/zasobu, proszę spróbować ponownie.', 'success' => 'Przypisano nabytek/zasób.', 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.', 'not_available' => 'Ten składnik aktywów nie jest dostępny do zamówienia!', - 'no_assets_selected' => 'Musisz wybrać co najmniej jeden zasób z listy' - ), + 'no_assets_selected' => 'Musisz wybrać co najmniej jeden zasób z listy', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nie można przypisać nabytku/zasobu, proszę spróbować ponownie', 'success' => 'Nabytek/zasób przypisany.', 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.', 'already_checked_in' => 'Aktywo jest już zaewidencjonowane.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Aktywo nie zostało zawnioskowane, spróbuj ponownie', 'success' => 'Aktywo zawnioskowe pomyślnie.', - 'canceled' => 'Żądanie przypisania zostało anulowane' - ) + 'canceled' => 'Żądanie przypisania zostało anulowane', + ], -); +]; diff --git a/resources/lang/pl/admin/hardware/table.php b/resources/lang/pl/admin/hardware/table.php index 968f0fd60c..4b6400b4d1 100644 --- a/resources/lang/pl/admin/hardware/table.php +++ b/resources/lang/pl/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Kod', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Nabytek', 'image' => 'Zdjęcie urządzenia', 'days_without_acceptance' => 'Dni bez akceptacji', - 'monthly_depreciation' => 'Amortyzacja miesięczna' + 'monthly_depreciation' => 'Amortyzacja miesięczna', -); +]; diff --git a/resources/lang/pl/admin/kits/general.php b/resources/lang/pl/admin/kits/general.php index b9f83eb820..b7608afefe 100644 --- a/resources/lang/pl/admin/kits/general.php +++ b/resources/lang/pl/admin/kits/general.php @@ -1,6 +1,6 @@ 'O zestawach', 'about_kits_text' => 'Zestawy predefiniowane pozwalają na szybkie przydzielenie zbioru pozycji (urządzeń, licencji itd.) użytkownikowi. Może to być pomocne, kiedy twój proces wdrażania jest spójny dla wielu użytkowników i wszyscy użytkownicy otrzymują takie same pozycje.', 'checkout' => 'Wydaj zestaw ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Nie ma wystarczającej ilości dostępnych jednostek :consumable do zakupu. :qty są wymagane. ', 'none_accessory' => 'Brak wystarczającej liczby dostępnych jednostek z :accessory do zamówienia. :qty są wymagane. ', -); +]; diff --git a/resources/lang/pl/admin/licenses/form.php b/resources/lang/pl/admin/licenses/form.php index d7e2735237..efc309c63d 100644 --- a/resources/lang/pl/admin/licenses/form.php +++ b/resources/lang/pl/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Aktywa', 'checkin' => 'Przyjęcie', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Przypisany do adresu email', 'to_name' => 'Przypisany do Nazwiska', 'update' => 'Edytuj Lincencję', - 'checkout_help' => 'Licencję należy przypisać, do środka trwałego lub osoby. Możesz wybrać oba, ale właściciel środka trwałego musi odpowiadać osobie, której przypisujesz składnik aktywów.' -); + 'checkout_help' => 'Licencję należy przypisać, do środka trwałego lub osoby. Możesz wybrać oba, ale właściciel środka trwałego musi odpowiadać osobie, której przypisujesz składnik aktywów.', +]; diff --git a/resources/lang/pl/admin/licenses/general.php b/resources/lang/pl/admin/licenses/general.php index 9f408adb32..e519ed2d37 100644 --- a/resources/lang/pl/admin/licenses/general.php +++ b/resources/lang/pl/admin/licenses/general.php @@ -1,6 +1,6 @@ 'O Licencjach', 'about_licenses' => 'Licencje są używane do śledzenia oprogramowania. Posiadają określoną liczbę stanowisk, które mogą być przypisane do osób fizycznych.', 'checkin' => 'Sprawdź płatność', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licencje oprogramowania', 'user' => 'Użytkownik', 'view' => 'Podgląd licencji', -); +]; diff --git a/resources/lang/pl/admin/licenses/message.php b/resources/lang/pl/admin/licenses/message.php index 6bfbbbaf14..99ba28eae1 100644 --- a/resources/lang/pl/admin/licenses/message.php +++ b/resources/lang/pl/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licencja nie istnieje.', 'user_does_not_exist' => 'Użytkownik nie istnieje.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Musisz wybrać składnik aktywów lub użytkownika, ale nie oba.', 'not_found' => 'Licencja nie została znaleziona', - - 'create' => array( + 'create' => [ 'error' => 'Licencja nie została utworzona, spróbuj ponownie.', - 'success' => 'Licencja została utworzona pomyślnie.' - ), + 'success' => 'Licencja została utworzona pomyślnie.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Plik nie został usunięty. Spróbuj ponownie.', 'success' => 'Plik został usunięty pomyślnie.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', 'success' => 'Plik(i) zostały wysłane poprawnie.', 'nofiles' => 'Nie wybrałeś żadnych plików do przesłania, albo plik, który próbujesz przekazać jest zbyt duży', 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest za duży lub jego typ nie jest dopuszczony. Dopuszczalne typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licencja nie została uaktualniona, spróbuj ponownie', - 'success' => 'Licencja została zaktualizowana pomyślnie.' - ), + 'success' => 'Licencja została zaktualizowana pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy jesteś pewny, że chcesz usunąć tą licencję?', 'error' => 'Wystąpił problem podczas usuwania licencji. Spróbuj ponownie.', - 'success' => 'Licencja została usunięta pomyślnie.' - ), + 'success' => 'Licencja została usunięta pomyślnie.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Nastąpił problem podczas weryfikacji licencji. Spróbuj ponownie', - 'success' => 'Licencja poprawna' - ), + 'success' => 'Licencja poprawna', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Nastąpił problem podczas weryfikacji licencji. Spróbuj ponownie', - 'success' => 'Licencja poprawna' - ), + 'success' => 'Licencja poprawna', + ], -); +]; diff --git a/resources/lang/pl/admin/licenses/table.php b/resources/lang/pl/admin/licenses/table.php index 7560ce60e4..016e992b54 100644 --- a/resources/lang/pl/admin/licenses/table.php +++ b/resources/lang/pl/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Przypisane do', 'checkout' => 'Wejście/Wyjście', @@ -14,4 +14,4 @@ return array( 'serial' => 'Nr. seryjny', 'title' => 'Licencja', -); +]; diff --git a/resources/lang/pl/admin/locations/message.php b/resources/lang/pl/admin/locations/message.php index 96280d5f1f..c37250c0c2 100644 --- a/resources/lang/pl/admin/locations/message.php +++ b/resources/lang/pl/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokalizacja nie istnieje.', 'assoc_users' => 'Lokalizacja obecnie jest skojarzona z minimum jednym użytkownikiem i nie może zostać usunięta. Uaktualnij właściwości użytkownika tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', 'assoc_assets' => 'Lokalizacja obecnie jest skojarzona z minimum jednym aktywem i nie może zostać usunięta. Uaktualnij właściwości aktywów tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', 'assoc_child_loc' => 'Lokalizacja obecnie jest rodzicem minimum jeden innej lokalizacji i nie może zostać usunięta. Uaktualnij właściwości lokalizacji tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokalizacja nie została stworzona. Spróbuj ponownie.', - 'success' => 'Lokalizacja stworzona pomyślnie.' - ), + 'success' => 'Lokalizacja stworzona pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokalizacja nie została zaktualizowana, spróbuj ponownie', - 'success' => 'Lokalizacja zaktualizowana pomyślnie.' - ), + 'success' => 'Lokalizacja zaktualizowana pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno usunąć wybraną lokalizację?', 'error' => 'Podczas usuwania lokalizacji napotkano problem. Spróbuj ponownie.', - 'success' => 'Lokalizacja usunięta pomyślnie.' - ) + 'success' => 'Lokalizacja usunięta pomyślnie.', + ], -); +]; diff --git a/resources/lang/pl/admin/locations/table.php b/resources/lang/pl/admin/locations/table.php index 0eb8ed106f..6a0f84c399 100644 --- a/resources/lang/pl/admin/locations/table.php +++ b/resources/lang/pl/admin/locations/table.php @@ -1,6 +1,6 @@ 'O Lokalizacjach', 'about_locations' => 'Lokalizacje są używane do śledzenia informacji o lokalizacji użytkowników, aktywów i innych elementów', 'assets_rtd' => 'Aktywa', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Rodzic', 'currency' => 'Waluta lokalna', 'ldap_ou' => 'OU wyszukiwania LDAP', - ); + ]; diff --git a/resources/lang/pl/admin/manufacturers/message.php b/resources/lang/pl/admin/manufacturers/message.php index 7d703fd2e0..ba799ed512 100644 --- a/resources/lang/pl/admin/manufacturers/message.php +++ b/resources/lang/pl/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Producent nie istnieje.', 'assoc_users' => 'Wybrany producent jest obecnie skojarzony z minimum jednym modelem i nie może zostać usunięty. Uaktualnij swoją listę modeli urządzeń by nie zawierała tego producenta, a następnie spróbuj ponownie. ', - 'create' => array( + 'create' => [ 'error' => 'Producent nie został stworzony, spróbuj ponownie.', - 'success' => 'Producent stworzony pomyślnie.' - ), + 'success' => 'Producent stworzony pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Producent nie został zaktualizowany, spróbuj ponownie', - 'success' => 'Producent zaktualizowany pomyślnie.' - ), + 'success' => 'Producent zaktualizowany pomyślnie.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Producent nie został przywrócony, spróbuj ponownie.', - 'success' => 'Producent przywrócony pomyślnie.' - ), + 'success' => 'Producent przywrócony pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno usunąć danego producenta?', 'error' => 'Podczas usuwania producenta wystąpił błąd. Spróbuj ponownie.', - 'success' => 'Producent usunięty pomyślnie.' - ) + 'success' => 'Producent usunięty pomyślnie.', + ], -); +]; diff --git a/resources/lang/pl/admin/manufacturers/table.php b/resources/lang/pl/admin/manufacturers/table.php index 103add8620..03bdefd3fd 100644 --- a/resources/lang/pl/admin/manufacturers/table.php +++ b/resources/lang/pl/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'O Producentach', 'about_manufacturers_text' => 'Producentami są firmy, które wytwarzają Twoje aktywa. Możesz przechowywać informacje o tych firmach, które będą wyświetlane na stronach szczegółów aktywów.', 'asset_manufacturers' => 'Producenci aktywów', @@ -13,4 +13,4 @@ return array( 'update' => 'Zaktualizuj Producenta', 'url' => 'Adres WWW', -); +]; diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php index 74188691d0..5aaf261134 100644 --- a/resources/lang/pl/admin/models/general.php +++ b/resources/lang/pl/admin/models/general.php @@ -1,6 +1,6 @@ 'O Modelach aktywów', 'about_models_text' => 'Modele aktywów są sposobem grupowania identycznych aktywów. "MBP 2013", "IPhone 6s", itp.', 'deleted' => 'Model został usunięty. Kliknij aby przywrócić.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Zamierzasz usunąć :model_count modeli aktywów.', 'restore' => 'Przywróć Model', 'requestable' => 'Użytkownicy mogą zażądać tego modelu', - 'show_mac_address' => 'Pokaż pole MAC adresu tego modelu w aktywach', + 'show_mac_address' => 'Pokaż pole MAC adresu tego modelu w aktywach', 'view_deleted' => 'Pokaż usunięte', 'view_models' => 'Pokaż Modele', 'fieldset' => 'Zestaw pól', 'no_custom_field' => 'Brak niestandardowych pól', 'add_default_values' => 'Dodaj wartości domyślne', -); +]; diff --git a/resources/lang/pl/admin/models/message.php b/resources/lang/pl/admin/models/message.php index 368fc49153..140d4d2dc4 100644 --- a/resources/lang/pl/admin/models/message.php +++ b/resources/lang/pl/admin/models/message.php @@ -1,42 +1,41 @@ 'Model nie istnieje.', 'assoc_users' => 'Ten model jest przypisany do minim jednego aktywa i nie może być usunięty. Proszę usunąć aktywa, a następnie spróbować ponownie. ', - - 'create' => array( + 'create' => [ 'error' => 'Model nie został stworzony. Spróbuj ponownie.', 'success' => 'Model utworzony pomyślnie.', 'duplicate_set' => 'Istnieje już model aktywu o tej nazwie, producencie i numerze.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model nie został zaktualizowany, spróbuj ponownie', - 'success' => 'Model zaktualizowany pomyślnie.' - ), + 'success' => 'Model zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć ten model aktywów?', 'error' => 'Wystąpił błąd podczas usuwania modelu. Spróbuj ponownie.', - 'success' => 'Model usunięty poprawnie.' - ), + 'success' => 'Model usunięty poprawnie.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model nie został przywrócony, spróbuj ponownie', - 'success' => 'Model został przywrócony pomyślnie.' - ), + 'success' => 'Model został przywrócony pomyślnie.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Żadne pole nie zostało zmodyfikowane, więc nic nie zostało zaktualizowane.', - 'success' => 'Modele zostały uaktualnione.' - ), + 'success' => 'Modele zostały uaktualnione.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nie wybrano modeli, więc nic nie zostało usunięte.', 'success' => 'Zostało usunięte :success_count model(i)!', - 'success_partial' => ':success_count model(i) zostało usuniętych, jednakże :fail_count nie udało się usunąć, ponieważ wciąż są powiązane z nimi zasoby.' - ), + 'success_partial' => ':success_count model(i) zostało usuniętych, jednakże :fail_count nie udało się usunąć, ponieważ wciąż są powiązane z nimi zasoby.', + ], -); +]; diff --git a/resources/lang/pl/admin/models/table.php b/resources/lang/pl/admin/models/table.php index 664f44d962..466de4abbe 100644 --- a/resources/lang/pl/admin/models/table.php +++ b/resources/lang/pl/admin/models/table.php @@ -1,6 +1,6 @@ 'Utwórz model aktytwa', 'created_at' => 'Utworzone', @@ -14,4 +14,4 @@ return array( 'update' => 'Uaktualnij model aktywa', 'clone' => 'Kopiuj Model', 'edit' => 'Edytuj Model', -); +]; diff --git a/resources/lang/pl/admin/reports/general.php b/resources/lang/pl/admin/reports/general.php index 74a79b48f7..5f81014290 100644 --- a/resources/lang/pl/admin/reports/general.php +++ b/resources/lang/pl/admin/reports/general.php @@ -1,5 +1,5 @@ 'Wybierz opcje, które chcesz by znalazły się w raporcie aktywów.' -); +return [ + 'info' => 'Wybierz opcje, które chcesz by znalazły się w raporcie aktywów.', +]; diff --git a/resources/lang/pl/admin/reports/message.php b/resources/lang/pl/admin/reports/message.php index d9b7c1d740..91d6b2c308 100644 --- a/resources/lang/pl/admin/reports/message.php +++ b/resources/lang/pl/admin/reports/message.php @@ -1,5 +1,5 @@ 'Musisz wybrać przynajmniej jedną opcje.' -); +return [ + 'error' => 'Musisz wybrać przynajmniej jedną opcje.', +]; diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php index db1c749429..fe626b48c2 100644 --- a/resources/lang/pl/admin/settings/general.php +++ b/resources/lang/pl/admin/settings/general.php @@ -1,12 +1,12 @@ 'Usługa katalogowa Active Directory', 'ad_domain' => 'Domena Active Directory', 'ad_domain_help' => 'Czasami jest taka sama jak domena poczty e-mail, ale nie zawsze.', 'ad_append_domain_label' => 'Dołącz nazwę domeny', 'ad_append_domain' => 'Dołącz nazwę domeny do pola nazwy użytkownika', - 'ad_append_domain_help' => 'Użytkownik nie jest wymagany do wpisywania "username@domain.local", może po prostu wpisać "username".' , + 'ad_append_domain_help' => 'Użytkownik nie jest wymagany do wpisywania "username@domain.local", może po prostu wpisać "username".', 'admin_cc_email' => 'Kopia', 'admin_cc_email_help' => 'Jeśli chcesz otrzymywać kopię e-maili przypisań wysyłanych do użytkowników na dodatkowy adres e-mail, wpisz go tutaj. W przeciwnym razie zostaw to pole puste.', 'is_ad' => 'To jest serwer Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Próg wygasających alarmów (w dniach)', 'alert_inv_threshold' => 'Inwentarz progu alarmów', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID Aktywa', 'audit_interval' => 'Interwał audytu', 'audit_interval_help' => 'Jeśli wymagane są regularne kontrole fizycznie aktyw, wprowadź interwał w miesiącach.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Wprowadź kod jednorazowy', 'two_factor_config_complete' => 'Zatwierdź kod', 'two_factor_enabled_edit_not_allowed' => 'Administrator nie zezwala na edycję tego ustawienia.', - 'two_factor_enrollment_text' => "Wymagane jest uwierzytelnianie dwóch elementów, ale urządzenie nie zostało jeszcze zapisane. Otwórz aplikację Google Authenticator i zeskanuj kod QR poniżej, aby zarejestrować urządzenie. Po zarejestrowaniu urządzenia wprowadź poniższy kod", + 'two_factor_enrollment_text' => 'Wymagane jest uwierzytelnianie dwóch elementów, ale urządzenie nie zostało jeszcze zapisane. Otwórz aplikację Google Authenticator i zeskanuj kod QR poniżej, aby zarejestrować urządzenie. Po zarejestrowaniu urządzenia wprowadź poniższy kod', 'require_accept_signature' => 'Wymagany podpis', 'require_accept_signature_help_text' => 'Włączając tę funkcjonalność wymusza się na użytkownikach fizycznego podpisania przyjęcia aktywa.', 'left' => 'lewo', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Zaznaczenie tego pola wymusi sprawdzanie czy numer seryjny nie został już przypisany w zasobach', 'zerofill_count' => 'Długość znaczników zasobów, w tym zerofill', 'username_format_help' => 'To ustawienie będzie używane przez proces importu tylko wtedy, gdy nazwa użytkownika nie jest podana i musimy wygenerować nazwę użytkownika dla Ciebie.', -); +]; diff --git a/resources/lang/pl/admin/settings/message.php b/resources/lang/pl/admin/settings/message.php index 44fa2f2378..8be4b1dc43 100644 --- a/resources/lang/pl/admin/settings/message.php +++ b/resources/lang/pl/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Wystąpił błąd podczas aktualizacji. ', - 'success' => 'Ustawienia zaktualizowane pomyślnie.' - ), - 'backup' => array( + 'success' => 'Ustawienia zaktualizowane pomyślnie.', + ], + 'backup' => [ 'delete_confirm' => 'Czy na pewno chcesz usunąć kopie zapasową? Nie można cofnąć tej akcji. ', 'file_deleted' => 'Kopia zapasowa usunięta pomyślnie. ', 'generated' => 'Nowa kopia zapasowa utworzona pomyślnie.', 'file_not_found' => 'Nie odnaleziono kopii zapasowej na serwerze.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Wystąpił błąd podczas czyszczenia. ', 'validation_failed' => 'Potwierdzenie czyszczenia jest niepoprawne. Wpisz słowo "DELETE" w polu potwierdzenia.', - 'success' => 'Pomyślnie wyczyszczono rekordy usunięte.' - ), + 'success' => 'Pomyślnie wyczyszczono rekordy usunięte.', + ], -); +]; diff --git a/resources/lang/pl/admin/statuslabels/message.php b/resources/lang/pl/admin/statuslabels/message.php index 04635505cf..c8ff8b8170 100644 --- a/resources/lang/pl/admin/statuslabels/message.php +++ b/resources/lang/pl/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status etykiety nie istnieje.', 'assoc_assets' => 'Status etykiety jest skojarzony z minimum jednym aktywem i nie może być usunięty. Uaktualnij aktywa tak aby nie było relacji z tym statusem i spróbuj ponownie. ', - - 'create' => array( + 'create' => [ 'error' => 'Status etykiety nie został utworzony, spróbuj ponownie.', - 'success' => 'Status etykiety utworzony pomyślnie.' - ), + 'success' => 'Status etykiety utworzony pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status etykiety nie został zaktualizowany, spróbuj ponownie', - 'success' => 'Status etykiety został zaktualizowany pomyślnie.' - ), + 'success' => 'Status etykiety został zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno chcesz usunąć ten status etykiety?', 'error' => 'Wystąpił błąd podczas usuwania statusu etykiety. Spróbuj ponownie.', - 'success' => 'Status etykiety został usunięty pomyślnie.' - ), + 'success' => 'Status etykiety został usunięty pomyślnie.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Te aktywa nie mogą być przypisane do nikogo.', 'deployable' => 'Te aktywa można sprawdzić. Gdy zostaną przypisane, przyjmą stan meta w postaci Deployed.', 'archived' => 'Te zasoby nie mogą zostać sprawdzone i będą wyświetlane tylko w Archiwizowanym widoku. Jest to użyteczne przy przechowywaniu informacji o zasobach w celach budżetowych / historycznych, ale nie na bieżąco z listy aktywów.', 'pending' => 'Te aktywa nie mogą być jeszcze przydzielone nikomu, często używane do przedmiotów przeznaczonych do naprawy, ale oczekują, że powrócą do obiegu.', - ), + ], -); +]; diff --git a/resources/lang/pl/admin/statuslabels/table.php b/resources/lang/pl/admin/statuslabels/table.php index fde97206de..26741925f9 100644 --- a/resources/lang/pl/admin/statuslabels/table.php +++ b/resources/lang/pl/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'O statusie', 'archived' => 'Zarchiwizowane', 'create' => 'Stwórz Status', @@ -16,4 +16,4 @@ return array( 'title' => 'Status', 'undeployable' => 'Niemożliwe do wdrożenia', 'update' => 'Zaktualizuj Status', -); +]; diff --git a/resources/lang/pl/admin/suppliers/message.php b/resources/lang/pl/admin/suppliers/message.php index ee3993a24c..4fc402eb59 100644 --- a/resources/lang/pl/admin/suppliers/message.php +++ b/resources/lang/pl/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Dostawca nie istnieje.', - - 'create' => array( + 'create' => [ 'error' => 'Dostawca nie został utworzony, spróbuj ponownie.', - 'success' => 'Dostawca utworzony pomyślnie.' - ), + 'success' => 'Dostawca utworzony pomyślnie.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dostawca nie został zaktualizowany, spróbuj ponownie', - 'success' => 'Dostawca zaktualizowany pomyślnie.' - ), + 'success' => 'Dostawca zaktualizowany pomyślnie.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Czy na pewno usunąć tego dostawcę?', 'error' => 'Podczas usuwania dostawcy napotkano błąd. Spróbuj ponownie.', 'success' => 'Dostawca usunięty pomyślnie.', 'assoc_assets' => 'Ten dostawca jest obecnie powiązany z :asset_count aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ', 'assoc_licenses' => 'Ten dostawca jest obecnie powiązany z :licenses_count licencjami i nie może zostać usunięty. Zaktualizuj licencje tak aby do niego nie nawiązywały i spróbuj ponownie. ', 'assoc_maintenances' => 'Ten dostawca jest obecnie powiązany z :asset_maintenances_count konserwowanymi aktywami i nie może zostać usunięty. Zaktualizuj aktywa aby nie były z nim powiązane i spróbuj ponownie. ', - ) + ], -); +]; diff --git a/resources/lang/pl/admin/suppliers/table.php b/resources/lang/pl/admin/suppliers/table.php index eb08467db1..2e00d42d46 100644 --- a/resources/lang/pl/admin/suppliers/table.php +++ b/resources/lang/pl/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'O Dostawcach', 'about_suppliers_text' => 'Dostawcy są wykorzystywani do śledzenia źródeł elementów', 'address' => 'Adres Dostawcy', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Podgląd aktywa dla', 'zip' => 'Kod Pocztowy', -); +]; diff --git a/resources/lang/pl/admin/users/general.php b/resources/lang/pl/admin/users/general.php index 9f223ed7c4..7efc3fe9f3 100644 --- a/resources/lang/pl/admin/users/general.php +++ b/resources/lang/pl/admin/users/general.php @@ -1,7 +1,6 @@ 'Ten użytkownik może się zalogować', 'activated_disabled_help_text' => 'Nie możesz edytować statusu aktywacji dla własnego konta.', 'assets_user' => 'Aktywa przypisane do :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edycja Użytkownika', 'filetype_info' => 'Dozwolone typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', 'history_user' => 'Historia', - 'info' => 'Informacje', + 'info' => 'Informacje', 'restore_user' => 'Kliknij tutaj, aby je przywrócić.', 'last_login' => 'Ostatnie logowanie', 'ldap_config_text' => 'Ustawienia konfiguracji LDAP mogą być znalezione w Administracja -> Ustawienia. Opcjonalnie wybierz lokalizacje, która będzie ustawiona dla zaimportowanych użytkowników.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Bieżące ustawienia administracyjne pozwalają na wybiórcze rejestrowanie uwierzytelniania dwuskładnikowego. ', 'two_factor_enrolled' => 'Zarejestrowane urządzenie 2FA ', 'two_factor_active' => 'Aktywuj 2FA ', - ); + ]; diff --git a/resources/lang/pl/admin/users/message.php b/resources/lang/pl/admin/users/message.php index 9a32ad5822..0b717d26ca 100644 --- a/resources/lang/pl/admin/users/message.php +++ b/resources/lang/pl/admin/users/message.php @@ -1,6 +1,6 @@ 'Pomyślnie zaakceptowałeś ten składnik aktywów.', 'declined' => 'Pomyślnie odrzuciłeś ten składnik aktywów.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integracja z LDAP nie została skonfigurowana dla tej instalacji.', 'password_resets_sent' => 'Wybrani użytkownicy, którzy są aktywni i mają prawidłowe adresy e-mail, otrzymali link do resetowania hasła.', - - 'success' => array( + 'success' => [ 'create' => 'Użytkownik utworzony pomyślnie.', 'update' => 'Użytkownik zaktualizowany pomyślnie.', 'update_bulk' => 'Użytkownik zaktualizowany pomyślnie!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Konto użytkownika zostało włączone.', 'restored' => 'Użytkownik został przywrócony pomyślnie.', 'import' => 'Import użytkowników zakończony sukcesem.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Podczas tworzenia użytkownika wystąpił problem. Spróbuj ponownie.', 'update' => 'Podczas aktualizacji użytkownika wystąpił problem. Spróbuj ponownie.', 'delete' => 'Wystąpił błąd podczas usuwania użytkownika. Spróbuj ponownie.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nie udało się przeszukać serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:', 'ldap_could_not_get_entries' => 'Nie udało się pobrać pozycji z serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:', 'password_ldap' => 'Hasło dla tego konta jest zarządzane przez usługę LDAP, Active Directory. Skontaktuj się z działem IT, aby zmienić swoje hasło. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Pliki nie zostały usunięte. Spróbuj ponownie.', 'success' => 'Pliki zostały usunięte.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', 'success' => 'Plik(i) zostały wysłane poprawnie.', 'nofiles' => 'Nie wybrałeś żadnych plików do wysłania', 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest za duży lub jego typ nie jest dopuszczony. Dopuszczalne typy plików: png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/pl/admin/users/table.php b/resources/lang/pl/admin/users/table.php index cbbd1b3229..6c8d7ad966 100644 --- a/resources/lang/pl/admin/users/table.php +++ b/resources/lang/pl/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktywny', 'allow' => 'Pozwól', 'checkedout' => 'Aktywa', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Pokaż bieżących użytkowników', 'show_deleted' => 'Pokaż usuniętych użytkowników', 'title' => 'Tytuł', - 'to_restore_them' => 'aby je przywrócić.', + 'to_restore_them' => 'aby je przywrócić.', 'updateuser' => 'Zaktualizuj użytkownika', 'username' => 'Nazwa użytkownika', - 'user_deleted_text' => 'Ten użytkownik został oznaczony jako usunięty.', + 'user_deleted_text' => 'Ten użytkownik został oznaczony jako usunięty.', 'username_note' => '(to jest używane do połączenia do Active Directory, nie do logowania)', 'cloneuser' => 'Kopiuj Użytkownika', 'viewusers' => 'Przeglądaj użytkowników', -); +]; diff --git a/resources/lang/pl/auth/general.php b/resources/lang/pl/auth/general.php index 1e8a2f87ce..c243308dab 100644 --- a/resources/lang/pl/auth/general.php +++ b/resources/lang/pl/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Wprowadź swoją nazwę użytkownika , aby otrzymać wiadomość e-mail z linkiem do resetowania hasła.', 'username_help_bottom' => 'Twoja nazwa użytkownika i adres e-mail mogą być takie same, ale mogą nie być zależne od konfiguracji. Jeśli nie pamiętasz nazwy użytkownika, skontaktuj się z administratorem.

Nazwy użytkowników bez powiązanego adresu e-mail nie będą otrzymywać powiadomień na adres e-mail z linkiem do resetowania hasła. ', ]; - diff --git a/resources/lang/pl/auth/message.php b/resources/lang/pl/auth/message.php index 9b01d2e5ac..39378778ab 100644 --- a/resources/lang/pl/auth/message.php +++ b/resources/lang/pl/auth/message.php @@ -1,6 +1,6 @@ 'Konto z takim adresem e-mail już istnieje.', 'account_not_found' => 'Nazwa użytkownika lub hasło jest niepoprawne.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Twoje konto zostało zablokowane.', 'throttle' => 'Zbyt wiele nieudanych prób logowania. Spróbuj ponownie za :minutes minut(y).', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Twoje urządzenie jest już zapisane.', 'success' => 'Zalogowano pomyślnie.', 'code_required' => 'Kod weryfikacji dwuskładnikowej jest wymagany.', 'invalid_code' => 'Kod weryfikacji dwuskładnikowej jest nieprawidłowy.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Wystąpił problem z logowanie, proszę spróbować ponownie.', 'success' => 'Logowanie poprawne.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Wystąpił problem podczas wylogowywania, proszę spróbować ponownie.', 'success' => 'Wylogowano pomyślnie.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Wystąpił błąd podczas próby utworzenia konta, proszę spróbować ponownie.', 'success' => 'Konto zostało utworzone.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Wystąpił błąd podczas próby zresetowania hasła, proszę spróbować ponownie.', 'success' => 'Jeśli ten adres e-mail istnieje w naszym systemie, e-mail odzyskiwania hasła został wysłany.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Wystąpił błąd podczas próby resetowania hasła, proszę próbować ponownie.', 'success' => 'Twoje hasło zostało poprawnie zresetowane.', - ), + ], - -); +]; diff --git a/resources/lang/pl/button.php b/resources/lang/pl/button.php index 129cbf24ec..072d049706 100644 --- a/resources/lang/pl/button.php +++ b/resources/lang/pl/button.php @@ -1,6 +1,6 @@ 'Akcje', 'add' => 'Dodaj nowy', 'cancel' => 'Anuluj', @@ -11,7 +11,7 @@ return array( 'request' => 'Zamówienie', 'submit' => 'Zatwierdź', 'upload' => 'Wgraj', - 'select_file' => 'Wybierz plik...', + 'select_file' => 'Wybierz plik...', 'select_files' => 'Wybierz pliki...', 'generate_labels' => '{1} Generuj etykietę|[2,*] Generuj etykiety', -); +]; diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php index 280a226ef3..3950bd7a32 100644 --- a/resources/lang/pl/general.php +++ b/resources/lang/pl/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Odbiory', 'user_requests_count' => 'Żądania', 'city' => 'Miasto', - 'click_here' => 'Kliknij tutaj', + 'click_here' => 'Kliknij tutaj', 'clear_selection' => 'Wyczyść zaznaczone', 'companies' => 'Firmy', 'company' => 'Firma', 'component' => 'Składnik', 'components' => 'Składniki', - 'complete' => 'Ukończone', + 'complete' => 'Ukończone', 'consumable' => 'Materiał eksploatacyjny', 'consumables' => 'Materiały eksploatacyjne', 'country' => 'Kraj', diff --git a/resources/lang/pl/help.php b/resources/lang/pl/help.php index 55e6b884fd..e0699e01dd 100644 --- a/resources/lang/pl/help.php +++ b/resources/lang/pl/help.php @@ -1,6 +1,6 @@ "Więcej informacji", + 'more_info_title' => 'Więcej informacji', - "audit_help" => "Zaznaczenie tego pola spowoduje edycję rekordu aktywów, aby odzwierciedlić tę nową lokalizację. Pozostawienie go niezaznaczone spowoduje po prostu odnotowanie lokalizacji w dzienniku audytu.

Zauważ, że ten zasób jest zablokowany, nie zmieni lokalizacji osoby, składnika aktywów lub miejsca, w którym jest ona kontrolowana.", + 'audit_help' => 'Zaznaczenie tego pola spowoduje edycję rekordu aktywów, aby odzwierciedlić tę nową lokalizację. Pozostawienie go niezaznaczone spowoduje po prostu odnotowanie lokalizacji w dzienniku audytu.

Zauważ, że ten zasób jest zablokowany, nie zmieni lokalizacji osoby, składnika aktywów lub miejsca, w którym jest ona kontrolowana.', 'assets' => 'Aktywa są to elementy identyfikowane przez numer seryjny lub etykietę. Są to przedmioty o większej wartości, gdzie liczy się identyfikacja określonego elementu.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Możesz ustawić amortyzację środków trwałych na podstawie amortyzacji aktywów w oparciu o metodę liniową.', - - -); +]; diff --git a/resources/lang/pl/mail.php b/resources/lang/pl/mail.php index e9250b2d4b..f3c08741dc 100644 --- a/resources/lang/pl/mail.php +++ b/resources/lang/pl/mail.php @@ -1,6 +1,6 @@ 'Użytkownik anulował zapotrzebowanie na sprzęt na stronie www', 'a_user_requested' => 'Użytkownik zamówił pozycję na stronie internetowej', 'accessory_name' => 'Nazwa sprzętu:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Oczekiwano raportu kontroli aktywów', 'Expected_Checkin_Notification' => 'Przypomnienie: :name sprawdza termin zbliżający się', 'Expected_Checkin_Date' => 'Zasób przypisany Tobie ma być zwrócony w dniu :date', - 'your_assets' => 'Zobacz swój sprzęt' -); + 'your_assets' => 'Zobacz swój sprzęt', +]; diff --git a/resources/lang/pl/pagination.php b/resources/lang/pl/pagination.php index f6c5e5af55..b5bf42ac42 100644 --- a/resources/lang/pl/pagination.php +++ b/resources/lang/pl/pagination.php @@ -1,6 +1,6 @@ 'Następna »', -); +]; diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php index 4a1a05eece..b3ef270139 100644 --- a/resources/lang/pl/passwords.php +++ b/resources/lang/pl/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Twój link do hasła został wysłany!', 'user' => 'E-mail nie jest przypisany do żadnego aktywnego konta.', ]; - diff --git a/resources/lang/pl/reminders.php b/resources/lang/pl/reminders.php index 95b6344fe8..c480fc36fa 100644 --- a/resources/lang/pl/reminders.php +++ b/resources/lang/pl/reminders.php @@ -1,6 +1,6 @@ "Hasło musi mieć minimum 6 znaków i musi być potwierdzone.", + 'password' => 'Hasło musi mieć minimum 6 znaków i musi być potwierdzone.', - "user" => "Login lub e-mail jest niepoprawny", + 'user' => 'Login lub e-mail jest niepoprawny', - "token" => "Token resetu hasła jest niepoprawny.", + 'token' => 'Token resetu hasła jest niepoprawny.', - "sent" => "Jeśli adres e-mail jest poprawny , przypomnienie hasła zostanie wysłane!", + 'sent' => 'Jeśli adres e-mail jest poprawny , przypomnienie hasła zostanie wysłane!', -); +]; diff --git a/resources/lang/pl/table.php b/resources/lang/pl/table.php index 5e73b97e54..b8e84b9f28 100644 --- a/resources/lang/pl/table.php +++ b/resources/lang/pl/table.php @@ -1,10 +1,10 @@ 'Akcje', 'action' => 'Akcja', 'by' => 'Przez', 'item' => 'Przedmiot', -); +]; diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php index 2dce7cc3a1..d44e12949d 100644 --- a/resources/lang/pl/validation.php +++ b/resources/lang/pl/validation.php @@ -1,6 +1,6 @@ ':attribute został już wzięty.', 'uploaded' => 'Nie udało się przesłać atrybutu:.', 'url' => 'Format pola :attribute jest niewłaściwy.', - "unique_undeleted" => "Wartość :attribute musi być unikalna.", + 'unique_undeleted' => 'Wartość :attribute musi być unikalna.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Pole: attribute zawiera znak, który nie jest dozwolony.", - "email_array" => "Jeden lub więcej adresów e-mail jest nieprawidłowy.", - "hashed_pass" => "Twoje bieżące hasło jest niepoprawne", + 'alpha_space' => 'Pole: attribute zawiera znak, który nie jest dozwolony.', + 'email_array' => 'Jeden lub więcej adresów e-mail jest nieprawidłowy.', + 'hashed_pass' => 'Twoje bieżące hasło jest niepoprawne', 'dumbpwd' => 'To hasło jest zbyt powszechne.', - "statuslabel_type" => "Musisz wybrać odpowiedni typ etykiety statusu", + 'statuslabel_type' => 'Musisz wybrać odpowiedni typ etykiety statusu', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/pt-BR/admin/accessories/general.php b/resources/lang/pt-BR/admin/accessories/general.php index 7dbf44f959..1caa034b61 100644 --- a/resources/lang/pt-BR/admin/accessories/general.php +++ b/resources/lang/pt-BR/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', 'checkout' => 'Alocar acessório', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Em vez disso, use o EULA padrão primário.', 'use_default_eula_disabled' => 'Em vez disso, use o EULA padrão primário. Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.', -); +]; diff --git a/resources/lang/pt-BR/admin/accessories/message.php b/resources/lang/pt-BR/admin/accessories/message.php index d1aac7ba2a..06f7a4a907 100644 --- a/resources/lang/pt-BR/admin/accessories/message.php +++ b/resources/lang/pt-BR/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Este acessório [:id] não existe.', 'assoc_users' => 'Este acessório tem atualmente :count itens alocado para os usuários. Por favor, verifique em acessórios e e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Acessório não criado, Por favor tente novamente.', - 'success' => 'Acessório criado com sucesso.' - ), + 'success' => 'Acessório criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Acessório não atualizado, Por favor tente novamente', - 'success' => 'Acessório atualizado com sucesso.' - ), + 'success' => 'Acessório atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este acessório?', 'error' => 'Ocorreu um problema ao remover o acessório. Por favor, tente novamente.', - 'success' => 'O acessório foi excluído com sucesso.' - ), + 'success' => 'O acessório foi excluído com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'O acessório não foi alocado, por favor tente novamente', 'success' => 'Acessório alocado com sucesso.', - 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.' - ), + 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'O acessório não foi devolvido, por favor, tente novamente', 'success' => 'Acessório devolvido com sucesso.', - 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.' - ) + 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', + ], - -); +]; diff --git a/resources/lang/pt-BR/admin/accessories/table.php b/resources/lang/pt-BR/admin/accessories/table.php index 0a6a830444..948870ef16 100644 --- a/resources/lang/pt-BR/admin/accessories/table.php +++ b/resources/lang/pt-BR/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Baixar CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Baixar CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Aceitação', 'title' => 'Nome do Acessório', - -); +]; diff --git a/resources/lang/pt-BR/admin/asset_maintenances/form.php b/resources/lang/pt-BR/admin/asset_maintenances/form.php index 428f97542d..940e21d6d9 100644 --- a/resources/lang/pt-BR/admin/asset_maintenances/form.php +++ b/resources/lang/pt-BR/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tempo da Manutenção do Ativo(em dias)', 'notes' => 'Notas', 'update' => 'Atualizar Manutenção do Ativo', - 'create' => 'Criar Manutenção do Ativo' + 'create' => 'Criar Manutenção do Ativo', ]; diff --git a/resources/lang/pt-BR/admin/asset_maintenances/message.php b/resources/lang/pt-BR/admin/asset_maintenances/message.php index e52948b9a7..25b961c7a2 100644 --- a/resources/lang/pt-BR/admin/asset_maintenances/message.php +++ b/resources/lang/pt-BR/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Você deseja apagar esta manutenção do ativo?', 'error' => 'Existe um problema para apagar essa manutenção deste ativo. Por favor tente novamente.', - 'success' => 'A manutenção do ativo foi apagada com sucesso.' + 'success' => 'A manutenção do ativo foi apagada com sucesso.', ], 'create' => [ 'error' => 'Não foi criada a Manutenção do Ativo, por favor tente novamente.', - 'success' => 'Manutenção do ativo criada com sucesso.' + 'success' => 'Manutenção do ativo criada com sucesso.', ], 'edit' => [ 'error' => 'Manutenção de ativos não foi alterada, por favor tente novamente.', - 'success' => 'Manutenção de ativo alterada com sucesso.' + 'success' => 'Manutenção de ativo alterada com sucesso.', ], 'asset_maintenance_incomplete' => 'Não foi Completada Ainda', 'warranty' => 'Garantia', 'not_warranty' => 'Sem Garantia', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/pt-BR/admin/asset_maintenances/table.php b/resources/lang/pt-BR/admin/asset_maintenances/table.php index f1d55f3e81..d5bcaf65b8 100644 --- a/resources/lang/pt-BR/admin/asset_maintenances/table.php +++ b/resources/lang/pt-BR/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Manutenção de Ativo', 'asset_name' => 'Nome do Ativo', 'is_warranty' => 'Garantia', - 'dl_csv' => 'Baixar CSV' + 'dl_csv' => 'Baixar CSV', ]; diff --git a/resources/lang/pt-BR/admin/categories/general.php b/resources/lang/pt-BR/admin/categories/general.php index 85e08f8cef..9f438e4a1d 100644 --- a/resources/lang/pt-BR/admin/categories/general.php +++ b/resources/lang/pt-BR/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorias de Ativos', 'category_name' => 'Nome da Categoria', 'checkin_email' => 'Enviar email para o usuário no check-in / check-out.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Em vez disso, use o EULA padrão primário.', 'use_default_eula_disabled' => 'Em vez disso, use o EULA padrão primário. Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.', -); +]; diff --git a/resources/lang/pt-BR/admin/categories/message.php b/resources/lang/pt-BR/admin/categories/message.php index 88740d4e35..a364d6a7e0 100644 --- a/resources/lang/pt-BR/admin/categories/message.php +++ b/resources/lang/pt-BR/admin/categories/message.php @@ -1,25 +1,25 @@ 'A categoria não existe.', 'assoc_models' => 'Esta categoria está no momento associada a pelo menos um modelo e não pode ser excluída. Atualize seus modelos para não referenciarem mais esta categoria e tente novamente. ', 'assoc_items' => 'Esta categoria está no momento associada a pelo menos um modelo e não pode ser excluída. Atualize seus :asset_type para não referenciarem mais esta categoria e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'A categoria não foi criada. Tente novamente.', - 'success' => 'Categoria criada com sucesso.' - ), + 'success' => 'Categoria criada com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'A categoria não foi atualizada, tente novamente', - 'success' => 'Categoria atualizada com sucesso.' - ), + 'success' => 'Categoria atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir esta categoria?', 'error' => 'Houve um problema ao excluir a categoria. Tente novamente.', - 'success' => 'A categoria foi excluída com sucesso.' - ) + 'success' => 'A categoria foi excluída com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/categories/table.php b/resources/lang/pt-BR/admin/categories/table.php index fcafba2499..99f39aae0b 100644 --- a/resources/lang/pt-BR/admin/categories/table.php +++ b/resources/lang/pt-BR/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Pai', 'require_acceptance' => 'Aceitação', 'title' => 'Nome da Categoria de Bens', -); +]; diff --git a/resources/lang/pt-BR/admin/companies/general.php b/resources/lang/pt-BR/admin/companies/general.php index ef0c0723c7..d3538aae18 100644 --- a/resources/lang/pt-BR/admin/companies/general.php +++ b/resources/lang/pt-BR/admin/companies/general.php @@ -1,4 +1,5 @@ 'Selecione a empresa', ]; diff --git a/resources/lang/pt-BR/admin/companies/message.php b/resources/lang/pt-BR/admin/companies/message.php index 923a47fe83..a59ad6ce01 100644 --- a/resources/lang/pt-BR/admin/companies/message.php +++ b/resources/lang/pt-BR/admin/companies/message.php @@ -1,18 +1,19 @@ 'Empresa não existe.', 'assoc_users' => 'Esta empresa está associada a pelo menos um modelo e não pode ser deletada. Atualize os modelos para que não referenciem esta empresa e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Empresa não criada, por favor tente de novo.', - 'success' => 'Empresa criada com sucesso.' - ), - 'update' => array( + 'success' => 'Empresa criada com sucesso.', + ], + 'update' => [ 'error' => 'Empresa não foi atualizada, tente novamente', - 'success' => 'Empresa atualizada com sucesso.' - ), - 'delete' => array( + 'success' => 'Empresa atualizada com sucesso.', + ], + 'delete' => [ 'confirm' => 'Tem certeza que deseja eliminar esta empresa?', 'error' => 'Existe um problema ao eliminar a empresa. Por favor tente novamente.', - 'success' => 'A empresa foi eliminada com sucesso.' - ) -); + 'success' => 'A empresa foi eliminada com sucesso.', + ], +]; diff --git a/resources/lang/pt-BR/admin/companies/table.php b/resources/lang/pt-BR/admin/companies/table.php index 90868a65cd..ac1dd752d8 100644 --- a/resources/lang/pt-BR/admin/companies/table.php +++ b/resources/lang/pt-BR/admin/companies/table.php @@ -1,9 +1,10 @@ 'Empresas', 'create' => 'Criar Empresa', 'title' => 'Empresa', 'update' => 'Atualizar Empresa', 'name' => 'Nome da Empresa', 'id' => 'ID', -); +]; diff --git a/resources/lang/pt-BR/admin/components/general.php b/resources/lang/pt-BR/admin/components/general.php index 09d1cc4751..205dbcabd7 100644 --- a/resources/lang/pt-BR/admin/components/general.php +++ b/resources/lang/pt-BR/admin/components/general.php @@ -1,6 +1,6 @@ 'Nome do componente', 'checkin' => 'Devolução do componente', 'checkout' => 'Atribuição de componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Atualizar componente', -); +]; diff --git a/resources/lang/pt-BR/admin/components/message.php b/resources/lang/pt-BR/admin/components/message.php index d5d781be7e..9ab4522ff3 100644 --- a/resources/lang/pt-BR/admin/components/message.php +++ b/resources/lang/pt-BR/admin/components/message.php @@ -1,36 +1,35 @@ 'Componente não existe.', - 'create' => array( + 'create' => [ 'error' => 'Componente não foi criada, por favor tente de novo.', - 'success' => 'Componente criado com sucesso.' - ), + 'success' => 'Componente criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Componente não foi atualizado, por favor tente de novo', - 'success' => 'Componente atualizado com sucesso.' - ), + 'success' => 'Componente atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja excluir este componente?', 'error' => 'Existe um problema ao excluir o componente. Por favor tente de novo.', - 'success' => 'O componente foi excluído com sucesso.' - ), + 'success' => 'O componente foi excluído com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'O componente não foi atribuido, por favor tente de novo', 'success' => 'Componente atribuido com sucesso.', - 'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.' - ), + 'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'O componente não foi devolvido, por favor tente de novo', 'success' => 'O componente foi devolvido com sucesso.', - 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.' - ) + 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', + ], - -); +]; diff --git a/resources/lang/pt-BR/admin/components/table.php b/resources/lang/pt-BR/admin/components/table.php index 9601170939..608371bec7 100644 --- a/resources/lang/pt-BR/admin/components/table.php +++ b/resources/lang/pt-BR/admin/components/table.php @@ -1,5 +1,5 @@ 'Nome do componente', -); +]; diff --git a/resources/lang/pt-BR/admin/consumables/general.php b/resources/lang/pt-BR/admin/consumables/general.php index 754c07d5f0..5ea0734f7e 100644 --- a/resources/lang/pt-BR/admin/consumables/general.php +++ b/resources/lang/pt-BR/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Devolução de suprimento ao usuário', 'consumable_name' => 'Nome do Suprimento', 'create' => 'Criar um suprimento', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Atualizar um suprimento', -); +]; diff --git a/resources/lang/pt-BR/admin/consumables/message.php b/resources/lang/pt-BR/admin/consumables/message.php index 015b9bb02f..1ab9a3309f 100644 --- a/resources/lang/pt-BR/admin/consumables/message.php +++ b/resources/lang/pt-BR/admin/consumables/message.php @@ -1,36 +1,35 @@ 'O consumível não existe.', - 'create' => array( + 'create' => [ 'error' => 'O Consumível não foi criado, por favor, tente novamente.', - 'success' => 'Consumível criado com sucesso.' - ), + 'success' => 'Consumível criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumível não foi atualizado, por favor tente novamente', - 'success' => 'Consumível atualizado com sucesso.' - ), + 'success' => 'Consumível atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Você realmente quer apagar este suprimento?', 'error' => 'Houve um problema ao excluir o consumível. Por favor, tente novamente.', - 'success' => 'O suprimento foi deletado com sucesso.' - ), + 'success' => 'O suprimento foi deletado com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumível não foi verificado, por favor tente novamente', 'success' => 'Realizada a verificação do consumível com êxito.', - 'user_does_not_exist' => 'Esse usuário é inválido. Por favor, tente novamente.' - ), + 'user_does_not_exist' => 'Esse usuário é inválido. Por favor, tente novamente.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumível não foi verificado, por favor tente novamente', 'success' => 'Realizado o check-in do consumível com sucesso.', - 'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.' - ) + 'user_does_not_exist' => 'Esse Usuário é inválido. Por favor, tente novamente.', + ], - -); +]; diff --git a/resources/lang/pt-BR/admin/consumables/table.php b/resources/lang/pt-BR/admin/consumables/table.php index 68f97f7215..f1fb11ecf7 100644 --- a/resources/lang/pt-BR/admin/consumables/table.php +++ b/resources/lang/pt-BR/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nome do consumível', -); +]; diff --git a/resources/lang/pt-BR/admin/custom_fields/general.php b/resources/lang/pt-BR/admin/custom_fields/general.php index 24ce7d4dac..95dc70a833 100644 --- a/resources/lang/pt-BR/admin/custom_fields/general.php +++ b/resources/lang/pt-BR/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos Personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Sobre conjuntos de campos', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Novo conjunto de campos personalizado', 'value_encrypted' => 'O valor deste campo é encriptado no banco de dados. Somente usuários administradores podem ver o valor descriptografado', 'show_in_email' => 'Incluir o valor desse campo nos e-mails enviados para o usuário? Campos criptografados não podem ser incluídos em emails.', -); +]; diff --git a/resources/lang/pt-BR/admin/custom_fields/message.php b/resources/lang/pt-BR/admin/custom_fields/message.php index 6eb3f3fcb4..44ef738936 100644 --- a/resources/lang/pt-BR/admin/custom_fields/message.php +++ b/resources/lang/pt-BR/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Esse campo não existe.', 'already_added' => 'Campo já adicionado', - 'create' => array( + 'create' => [ 'error' => 'Campo não criado. Por favor tente novamente.', 'success' => 'Campo criado com sucesso.', - 'assoc_success' => 'Campo adicionado ao conjunto de campos com sucesso.' - ), + 'assoc_success' => 'Campo adicionado ao conjunto de campos com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Campo não foi atualizado, por favor tente de novamente', - 'success' => 'Campo atualizado com sucesso.' - ), + 'success' => 'Campo atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza que deseja excluir este campo?', 'error' => 'Ocorreu um erro ao remover o campo. Por favor tente novamente.', 'success' => 'O campo foi apagado com sucesso.', 'in_use' => 'Campo continua em uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset não existe', - 'create' => array( + 'create' => [ 'error' => 'O Conjunto de campos não foi criado, por favor tente novamente.', - 'success' => 'Conjunto de campos criado com sucesso.' - ), + 'success' => 'Conjunto de campos criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Conjunto de campos não foi atualizado, por favor tente novamente', - 'success' => 'Conjunto de campos atualizado com sucesso.' - ), + 'success' => 'Conjunto de campos atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja eliminar este conjunto de campos?', 'error' => 'Ocorreu um erro ao apagar o conjunto de campos. Por favor tente novamente.', 'success' => 'O campo foi apagado com sucesso.', 'in_use' => 'Conjunto de campos continua em uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/pt-BR/admin/departments/message.php b/resources/lang/pt-BR/admin/departments/message.php index d2de2830b0..2d2315788d 100644 --- a/resources/lang/pt-BR/admin/departments/message.php +++ b/resources/lang/pt-BR/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departamento não existe.', 'assoc_users' => 'Este departamento esta atualmente associado a pelo menos um usuário e não pode ser deletado. Por favor atualize seus usuários para não fazer mais referência a este departamento e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'O departamento não foi criado, por favor tente novamente.', - 'success' => 'Departamento criado com sucesso.' - ), - 'update' => array( + 'success' => 'Departamento criado com sucesso.', + ], + 'update' => [ 'error' => 'Departamento não foi atualizado, por favor, tente novamente', - 'success' => 'Departamento atualizado com sucesso.' - ), - 'delete' => array( + 'success' => 'Departamento atualizado com sucesso.', + ], + 'delete' => [ 'confirm' => 'Tem certeza que deseja excluir este departamento?', 'error' => 'Houve um problema de exclusão no departamento. Por favor, tente novamente.', - 'success' => 'O departamento foi excluído com sucesso.' - ) + 'success' => 'O departamento foi excluído com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/departments/table.php b/resources/lang/pt-BR/admin/departments/table.php index 7343657993..f51d741c41 100644 --- a/resources/lang/pt-BR/admin/departments/table.php +++ b/resources/lang/pt-BR/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Nome do departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Localização', 'create' => 'Criar departamento', 'update' => 'Atualizar Departamento', - ); + ]; diff --git a/resources/lang/pt-BR/admin/depreciations/general.php b/resources/lang/pt-BR/admin/depreciations/general.php index 13a7dfe8be..fdc1c0b9c8 100644 --- a/resources/lang/pt-BR/admin/depreciations/general.php +++ b/resources/lang/pt-BR/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Sobre as Depreciações de Ativos', 'about_depreciations' => 'Você pode configurar depreciações para depreciar ativos baseados na depreciação linear.', 'asset_depreciations' => 'Depreciações de Ativos', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Número de Meses', 'update' => 'Atualizar Depreciação', -); +]; diff --git a/resources/lang/pt-BR/admin/depreciations/message.php b/resources/lang/pt-BR/admin/depreciations/message.php index 8432458486..47f4b07af6 100644 --- a/resources/lang/pt-BR/admin/depreciations/message.php +++ b/resources/lang/pt-BR/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'A classe de depreciação não existe.', 'assoc_users' => 'A depreciação está no momento associada com um ou mais modelos e não pode ser excluída. Exclua os modelos e então tente excluir novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'A classe de depreciação não foi criada. Tente novamente. :(', - 'success' => 'Classe de depreciação criada com sucesso. :)' - ), + 'success' => 'Classe de depreciação criada com sucesso. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'A classe de depreciação não foi atualizada, tente novamente', - 'success' => 'Classe de depreciação atualizada com sucesso.' - ), + 'success' => 'Classe de depreciação atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir esta classe de depreciação?', 'error' => 'Houve um problema ao excluir a classe de depreciação. Tente novamente.', - 'success' => 'A classe de depreciação foi excluída com sucesso.' - ) + 'success' => 'A classe de depreciação foi excluída com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/depreciations/table.php b/resources/lang/pt-BR/admin/depreciations/table.php index 802f033f32..05da174dea 100644 --- a/resources/lang/pt-BR/admin/depreciations/table.php +++ b/resources/lang/pt-BR/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meses', 'term' => 'Termo', 'title' => 'Nome ', -); +]; diff --git a/resources/lang/pt-BR/admin/groups/message.php b/resources/lang/pt-BR/admin/groups/message.php index 6869ea2d1f..80f49e21a8 100644 --- a/resources/lang/pt-BR/admin/groups/message.php +++ b/resources/lang/pt-BR/admin/groups/message.php @@ -1,22 +1,22 @@ 'O grupo já existe!', 'group_not_found' => 'O grupo [:id] não existe.', 'group_name_required' => 'O campo nome é requerido', - 'success' => array( + 'success' => [ 'create' => 'O grupo foi criado com sucesso.', 'update' => 'O grupo foi atualizado com sucesso.', 'delete' => 'O grupo foi excluído com sucesso.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este grupo?', 'create' => 'Houve um problema ao criar o grupo. Tente novamente.', 'update' => 'Houve um problema ao atualizar o grupo. Tente novamente.', 'delete' => 'Houve um problema ao excluir o grupo. Tente novamente.', - ), + ], -); +]; diff --git a/resources/lang/pt-BR/admin/groups/table.php b/resources/lang/pt-BR/admin/groups/table.php index 681add832d..194d33e7b9 100644 --- a/resources/lang/pt-BR/admin/groups/table.php +++ b/resources/lang/pt-BR/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nome', 'users' => '# de Usuários', -); +]; diff --git a/resources/lang/pt-BR/admin/groups/titles.php b/resources/lang/pt-BR/admin/groups/titles.php index 704fbb1449..9b19c96ac5 100644 --- a/resources/lang/pt-BR/admin/groups/titles.php +++ b/resources/lang/pt-BR/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Sobre Grupos', 'about_groups' => 'Os Grupos são utilizados para generalizar as permissões do usuário.', 'group_management' => 'Gerenciamento do Grupo', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Negar', -); +]; diff --git a/resources/lang/pt-BR/admin/hardware/form.php b/resources/lang/pt-BR/admin/hardware/form.php index 8c7a0c8397..385c8be022 100644 --- a/resources/lang/pt-BR/admin/hardware/form.php +++ b/resources/lang/pt-BR/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirma a exclusão de Ativos em Massa', +return [ + 'bulk_delete' => 'Confirma a exclusão de Ativos em Massa', 'bulk_delete_help' => 'Reveja os ativos selecionados para deletar. Depois de deletados, estes ativos podem ser restaurados, mas não estarão associados aos usuários.', 'bulk_delete_warn' => 'Você está prestes a excluir.', - 'bulk_update' => 'Ativos da Atualização em Massa', - 'bulk_update_help' => 'Este formulário lhe permite atualizar múltiplos ativos de uma vez só. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado. ', - 'bulk_update_warn' => 'Você está prestes a editar as propriedades de :asset_count ativos.', + 'bulk_update' => 'Ativos da Atualização em Massa', + 'bulk_update_help' => 'Este formulário lhe permite atualizar múltiplos ativos de uma vez só. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado. ', + 'bulk_update_warn' => 'Você está prestes a editar as propriedades de :asset_count ativos.', 'checkedout_to' => 'Alocado para', 'checkout_date' => 'Data de alocação', 'checkin_date' => 'Data de devolução', @@ -38,7 +38,6 @@ return array( 'tag' => 'Marcação do Ativo', 'update' => 'Atualização do Ativo', 'warranty' => 'Garantia', - 'warranty_expires' => 'A garantia expira', + 'warranty_expires' => 'A garantia expira', 'years' => 'anos', -) -; +]; diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php index cef61a6107..e17dcf1539 100644 --- a/resources/lang/pt-BR/admin/hardware/general.php +++ b/resources/lang/pt-BR/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Sobre os Ativos', 'about_assets_text' => 'Ativos são itens que são controlados e rastreáveis pelo número de série ou por uma etiqueta de ativo (patrimônio). Eles tendem a ser de valor elevado onde a identificação de itens específicos é relevante.', - 'archived' => 'Arquivado', + 'archived' => 'Arquivado', 'asset' => 'Ativo', 'bulk_checkout' => 'Alocação de Ativos', 'checkin' => 'Retornar Ativo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pendente', 'undeployable' => 'Não implementável', 'view' => 'Ver Ativo', -); +]; diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php index 600f0ba9cb..45dd4f8e98 100644 --- a/resources/lang/pt-BR/admin/hardware/message.php +++ b/resources/lang/pt-BR/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Aviso: Este ativo foi marcado como atualmente não implementável. Se este status mudou, atualize o status do ativo.', 'does_not_exist' => 'O ativo não existe.', 'does_not_exist_or_not_requestable' => 'Boa tentativa. Este ativo não existe ou não pode ser requisitado.', 'assoc_users' => 'Este bem está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu bem para que não referencie mais este usuário e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'O ativo não foi criado, tente novamente. :(', - 'success' => 'Ativo criado com sucesso. :)' - ), + 'success' => 'Ativo criado com sucesso. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'O ativo não foi atualizado, tente novamente', 'success' => 'Ativo atualizado com sucesso.', 'nothing_updated' => 'Nenhum campo foi selecionado, então nada foi atualizado.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'O ativo não foi restaurado, tente novamente', - 'success' => 'Ativo restaurado com sucesso.' - ), + 'success' => 'Ativo restaurado com sucesso.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'A auditoria de equipamentos não teve êxito. Por favor, tente novamente.', - 'success' => 'Auditoria de equipamentos logada com sucesso.' - ), + 'success' => 'Auditoria de equipamentos logada com sucesso.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'O arquivo não foi excluído. Tente novamente.', 'success' => 'Arquivo excluído com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'O(s) arquivo(s) não foi/foram carregado(s). Tente novamente.', 'success' => 'Arquivo(s) carregado(s) com sucesso.', 'nofiles' => 'Você não selecionou arquivos para carregar, ou o arquivo que você esta tentando carrega é muito grande', 'invalidfiles' => 'Um ou mais de seus arquivos é muito grande ou está em um tipo de arquivo não permitido. Os tipos permitidos são png, gif, jpg, doc, docx, pdf, e txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Alguns itens não foram importados corretamente.', 'errorDetail' => 'Os seguintes itens não foram importados devido a erros.', - 'success' => "O seu arquivo foi importado", - 'file_delete_success' => "O arquivo foi excluído com sucesso", - 'file_delete_error' => "Não foi possível excluir o arquivo", - ), + 'success' => 'O seu arquivo foi importado', + 'file_delete_success' => 'O arquivo foi excluído com sucesso', + 'file_delete_error' => 'Não foi possível excluir o arquivo', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este ativo?', 'error' => 'Houve um problema ao excluir o ativo. Tente novamente.', 'nothing_updated' => 'Nenhum ativo foi selecionado, então nada foi deletado.', - 'success' => 'O ativo foi excluído com sucesso.' - ), + 'success' => 'O ativo foi excluído com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ativo não foi registrado, favor tentar novamente', 'success' => 'Ativo registrado com sucesso.', 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', 'not_available' => 'Esse recurso não está disponível para checkout!', - 'no_assets_selected' => 'Você deve selecionar pelo menos um recurso da lista' - ), + 'no_assets_selected' => 'Você deve selecionar pelo menos um recurso da lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ativo não foi retornado, favor tentar novamente', 'success' => 'Ativo retornado com sucesso.', 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', 'already_checked_in' => 'Este ativo já foi devolvido.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Ativo não foi solicitado, por favor tente novamente', 'success' => 'Ativo solicitado com sucesso.', - 'canceled' => 'Requisição cancelada com sucesso' - ) + 'canceled' => 'Requisição cancelada com sucesso', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/hardware/table.php b/resources/lang/pt-BR/admin/hardware/table.php index 304c019483..44983bf6a8 100644 --- a/resources/lang/pt-BR/admin/hardware/table.php +++ b/resources/lang/pt-BR/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Marcação do Ativo', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Ativo ', 'image' => 'Imagem do equipamento', 'days_without_acceptance' => 'Dias sem que fosse aceito', - 'monthly_depreciation' => 'Depreciação Mensal' + 'monthly_depreciation' => 'Depreciação Mensal', -); +]; diff --git a/resources/lang/pt-BR/admin/kits/general.php b/resources/lang/pt-BR/admin/kits/general.php index c38a37240c..6b9b5e6367 100644 --- a/resources/lang/pt-BR/admin/kits/general.php +++ b/resources/lang/pt-BR/admin/kits/general.php @@ -1,6 +1,6 @@ 'Sobre Kits predefinidos', 'about_kits_text' => 'Kits predefinidos permitem que você verifique rapidamente uma coleção de itens (ativos, licenças, etc.) para um usuário. Isso pode ser útil quando o processo de integração é consistente em muitos usuários e todos os usuários recebem os mesmos itens.', 'checkout' => 'Kit alocado para ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Não há quantidade de consumíveis suficientes para :model fazer atribuição. :qty são necessários. ', 'none_accessory' => 'Não há unidades disponíveis de :accessory para check-out. :qty são necessários. ', -); +]; diff --git a/resources/lang/pt-BR/admin/licenses/form.php b/resources/lang/pt-BR/admin/licenses/form.php index 84b4d3835f..21e370cf7c 100644 --- a/resources/lang/pt-BR/admin/licenses/form.php +++ b/resources/lang/pt-BR/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Ativo', 'checkin' => 'Registrar', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenciado ao E-mail', 'to_name' => 'Licenciado ao Nome', 'update' => 'Atualizar Licença', - 'checkout_help' => 'Você precisa registrar uma licença para uma pessoa ou hardware. Você pode selecionar ambos, mas o proprietário do ativo deve coincidir com a pessoa para quem você está tentando registrá-lo.' -); + 'checkout_help' => 'Você precisa registrar uma licença para uma pessoa ou hardware. Você pode selecionar ambos, mas o proprietário do ativo deve coincidir com a pessoa para quem você está tentando registrá-lo.', +]; diff --git a/resources/lang/pt-BR/admin/licenses/general.php b/resources/lang/pt-BR/admin/licenses/general.php index 7487526930..cbbd983229 100644 --- a/resources/lang/pt-BR/admin/licenses/general.php +++ b/resources/lang/pt-BR/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Sobre Licenças', 'about_licenses' => 'Licenças são utilizadas para controlar o uso dos softwares. Ela possuem uma quantidade específica que podem ser alocadas para os usuários', 'checkin' => 'Retorna Licença Compartilhada', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licenças de Software', 'user' => 'Usuário', 'view' => 'Ver Licença', -); +]; diff --git a/resources/lang/pt-BR/admin/licenses/message.php b/resources/lang/pt-BR/admin/licenses/message.php index dc3329441a..3c952aad95 100644 --- a/resources/lang/pt-BR/admin/licenses/message.php +++ b/resources/lang/pt-BR/admin/licenses/message.php @@ -1,6 +1,6 @@ 'A licença não existe.', 'user_does_not_exist' => 'O usuário não existe.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Você deve selecionar um ativo ou um usuário, mas não ambos.', 'not_found' => 'Licença não encontrada', - - 'create' => array( + 'create' => [ 'error' => 'A licença não foi criada, tente novamente.', - 'success' => 'Licença criada com sucesso.' - ), + 'success' => 'Licença criada com sucesso.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'O arquivo não foi excluído. Tente novamente.', 'success' => 'Arquivo excluído com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'O(s) arquivo(s) não foi/foram carregado(s). Tente novamente.', 'success' => 'Arquivo(s) carregado(s) com sucesso.', 'nofiles' => 'Você não selecionou arquivos para carregar, ou o arquivo que você esta tentando carregar é muito grande', 'invalidfiles' => 'Um ou mais arquivos excedem o tamanho ou são do tipo de arquivo não permitido. Os tipos permitidos são png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'A licença não foi atualizada, tente novamente', - 'success' => 'Licença atualizada com sucesso.' - ), + 'success' => 'Licença atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir esta licença?', 'error' => 'Houve um problema ao excluir esta licença. Tente novamente.', - 'success' => 'A licença foi excluída com sucesso.' - ), + 'success' => 'A licença foi excluída com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Houve um problema de registro na licença. Favor tentar novamente.', - 'success' => 'A licença foi registrada com sucesso' - ), + 'success' => 'A licença foi registrada com sucesso', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Houve um problema de registro na licença. Favor tentar novamente.', - 'success' => 'A licença foi registrada com sucesso.' - ), + 'success' => 'A licença foi registrada com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/licenses/table.php b/resources/lang/pt-BR/admin/licenses/table.php index 12dda3189c..4229b28aa6 100644 --- a/resources/lang/pt-BR/admin/licenses/table.php +++ b/resources/lang/pt-BR/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Atribuído A', 'checkout' => 'Entrada/Saída', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Licença', -); +]; diff --git a/resources/lang/pt-BR/admin/locations/message.php b/resources/lang/pt-BR/admin/locations/message.php index d0343c62d7..2cf1bfe328 100644 --- a/resources/lang/pt-BR/admin/locations/message.php +++ b/resources/lang/pt-BR/admin/locations/message.php @@ -1,27 +1,26 @@ 'O local não existe.', 'assoc_users' => 'Este local está no momento associado com pelo menos um usuário e não pode ser excluído. Atualize seus usuários para não referenciarem mais este local e tente novamente. ', 'assoc_assets' => 'Este local esta atualmente associado a pelo menos um ativo e não pode ser deletado. Por favor atualize seu ativo para não fazer mais referência a este local e tente novamente. ', 'assoc_child_loc' => 'Este local é atualmente o principal de pelo menos local secundário e não pode ser deletado. Por favor atualize seus locais para não fazer mais referência a este local e tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'O local não foi criado, tente novamente.', - 'success' => 'Local criado com sucesso.' - ), + 'success' => 'Local criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'O local não foi atualizado, tente novamente', - 'success' => 'Local atualizado com sucesso.' - ), + 'success' => 'Local atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que quer excluir este local?', 'error' => 'Houve um problema ao excluir o local. Tente novamente.', - 'success' => 'O local foi excluído com sucesso.' - ) + 'success' => 'O local foi excluído com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/locations/table.php b/resources/lang/pt-BR/admin/locations/table.php index 8780c016cf..92505727ad 100644 --- a/resources/lang/pt-BR/admin/locations/table.php +++ b/resources/lang/pt-BR/admin/locations/table.php @@ -1,6 +1,6 @@ 'Sobre as Localizações', 'about_locations' => 'As localizações são usadas para seguir informações de utilizadores, assets, e outros itens', 'assets_rtd' => 'Ativos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Principal', 'currency' => 'Moeda local', 'ldap_ou' => 'Pesquisa LDAP UO', - ); + ]; diff --git a/resources/lang/pt-BR/admin/manufacturers/message.php b/resources/lang/pt-BR/admin/manufacturers/message.php index 0985f4be4c..0399ac85d6 100644 --- a/resources/lang/pt-BR/admin/manufacturers/message.php +++ b/resources/lang/pt-BR/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'O fabricante não existe.', 'assoc_users' => 'Este fabricante está no momento associado com pelo menos um modelo e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fabricante e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'O fabricante não foi criado, tente novamente.', - 'success' => 'Fabricante criado com sucesso.' - ), + 'success' => 'Fabricante criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'O fabricante não foi atualizado, tente novamente', - 'success' => 'Fabricante atualizado com sucesso.' - ), + 'success' => 'Fabricante atualizado com sucesso.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'O fabricante não foi atualizado, tente novamente', - 'success' => 'Fabricante atualizado com sucesso.' - ), + 'success' => 'Fabricante atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este fabricante?', 'error' => 'Ocorreu um erro ao tentar deletar o fabricante. Por favor, tente novamente.', - 'success' => 'O Fabricante foi excluído com sucesso.' - ) + 'success' => 'O Fabricante foi excluído com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/manufacturers/table.php b/resources/lang/pt-BR/admin/manufacturers/table.php index 6e357a5719..dfa31fae1c 100644 --- a/resources/lang/pt-BR/admin/manufacturers/table.php +++ b/resources/lang/pt-BR/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre os fabricantes', 'about_manufacturers_text' => 'Fabricantes são as empresas que criam seus ativos. Você pode armazenar informação de contato de suporte sobre eles aqui, que será exibida em suas páginas de detalhe de ativos.', 'asset_manufacturers' => 'Fabricantes de Ativos', @@ -13,4 +13,4 @@ return array( 'update' => 'Atualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php index aa8e588f79..4e52e9ed83 100644 --- a/resources/lang/pt-BR/admin/models/general.php +++ b/resources/lang/pt-BR/admin/models/general.php @@ -1,6 +1,6 @@ 'Sobre os Modelos de Ativos', 'about_models_text' => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.', 'deleted' => 'Este modelo foi excluído. Clique aqui para o restaurar.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Você está prestes a exluir :model_count asset models.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Usuários podem solicitar este modelo', - 'show_mac_address' => 'Exibir o campo de endereço MAC nos ativos neste modelo', + 'show_mac_address' => 'Exibir o campo de endereço MAC nos ativos neste modelo', 'view_deleted' => 'Ver Excluídos', 'view_models' => 'Ver Modelos', 'fieldset' => 'Conjunto de campos', 'no_custom_field' => 'Sem campos customizados', 'add_default_values' => 'Adicionar valores padrão', -); +]; diff --git a/resources/lang/pt-BR/admin/models/message.php b/resources/lang/pt-BR/admin/models/message.php index 42daec19b1..72e46ee1ed 100644 --- a/resources/lang/pt-BR/admin/models/message.php +++ b/resources/lang/pt-BR/admin/models/message.php @@ -1,42 +1,41 @@ 'O modelo não existe.', 'assoc_users' => 'Este modelo está no momento associado com um ou mais ativos e não pode ser excluído. Exclua os ativos e então tente excluir novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'O modelo não foi criado, tente novamente.', 'success' => 'Modelo criado com sucesso.', 'duplicate_set' => 'Um modelo de ativo com este nome, desse fabricante e desse modelo já existe.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'O modelo não foi atualizado, tente novamente', - 'success' => 'Modelo atualizado com sucesso.' - ), + 'success' => 'Modelo atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que quer excluir este modelo de ativo?', 'error' => 'Houve um problema ao deletar o modelo. Por favor, tente novamente.', - 'success' => 'O modelo foi excluído com sucesso.' - ), + 'success' => 'O modelo foi excluído com sucesso.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'O modelo não foi restaurado, tente novamente', - 'success' => 'Modelo restaurado com sucesso.' - ), + 'success' => 'Modelo restaurado com sucesso.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nenhum campo foi alterado, então nada foi atualizado.', - 'success' => 'Modelos atualizados.' - ), + 'success' => 'Modelos atualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nenhum modelo foi selecionado, então nada foi deletado.', 'success' => '::succes_count model (s) deletados!', - 'success_partial' => ':success_count model(s) foram deletados,no entando :fail_count não pode ser excluído porque eles ainda possuem ativos associados a eles.' - ), + 'success_partial' => ':success_count model(s) foram deletados,no entando :fail_count não pode ser excluído porque eles ainda possuem ativos associados a eles.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/models/table.php b/resources/lang/pt-BR/admin/models/table.php index d3f6c3c811..eb7332ac26 100644 --- a/resources/lang/pt-BR/admin/models/table.php +++ b/resources/lang/pt-BR/admin/models/table.php @@ -1,6 +1,6 @@ 'Criar Modelo de Ativos', 'created_at' => 'Criado em', @@ -14,4 +14,4 @@ return array( 'update' => 'Atualizar Modelo de Ativos', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/pt-BR/admin/reports/general.php b/resources/lang/pt-BR/admin/reports/general.php index ea56fb3353..2f44cafeb7 100644 --- a/resources/lang/pt-BR/admin/reports/general.php +++ b/resources/lang/pt-BR/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecione as opções que você quer para o seu relatório de ativos.' -); +return [ + 'info' => 'Selecione as opções que você quer para o seu relatório de ativos.', +]; diff --git a/resources/lang/pt-BR/admin/reports/message.php b/resources/lang/pt-BR/admin/reports/message.php index c5bb86efa8..bc07e51f8a 100644 --- a/resources/lang/pt-BR/admin/reports/message.php +++ b/resources/lang/pt-BR/admin/reports/message.php @@ -1,5 +1,5 @@ 'Você deve selecionar pelo menos UMA opção.' -); +return [ + 'error' => 'Você deve selecionar pelo menos UMA opção.', +]; diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php index 59ee0794ca..392e54e45f 100644 --- a/resources/lang/pt-BR/admin/settings/general.php +++ b/resources/lang/pt-BR/admin/settings/general.php @@ -1,12 +1,12 @@ 'Diretório Ativo', 'ad_domain' => 'Domínio de Diretório Ativo', 'ad_domain_help' => 'Geralmente isso é igual ao seu domínio de email, mas nem sempre.', 'ad_append_domain_label' => 'Acrescentar nome de domínio', 'ad_append_domain' => 'Acrescentar nome de domínio ao campo de usuário', - 'ad_append_domain_help' => 'Usuário não é necessário para escrever "username@domain.local", ele pode apenas digitar "username".' , + 'ad_append_domain_help' => 'Usuário não é necessário para escrever "username@domain.local", ele pode apenas digitar "username".', 'admin_cc_email' => 'E-mail em CC', 'admin_cc_email_help' => 'Se você quiser enviar uma cópia dos e-mails de check-in / check-out que são enviados aos usuários para uma conta de e-mail adicional, insira-a aqui. Caso contrário, deixe este campo em branco.', 'is_ad' => 'Este é um servidor de Diretório Ativo', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Limite de Expiração dos Alertas (em dias)', 'alert_inv_threshold' => 'Limite de Alerta de Inventário', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID do ativo', 'audit_interval' => 'Intervalo de auditoria', 'audit_interval_help' => 'Se você precisa verificar fisicamente seus ativos com frequência, insira um intervalo em meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Digite o código de autenticação de pois passos', 'two_factor_config_complete' => 'Enviar código', 'two_factor_enabled_edit_not_allowed' => 'O Administrador não permite editar esta opção.', - 'two_factor_enrollment_text' => "A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registrado, abra o Google Authenticator e escaneie o QR Code para registrar o teu dispositivo. Uma vez registrado, digite o código abaixo", + 'two_factor_enrollment_text' => 'A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registrado, abra o Google Authenticator e escaneie o QR Code para registrar o teu dispositivo. Uma vez registrado, digite o código abaixo', 'require_accept_signature' => 'Requer assinatura', 'require_accept_signature_help_text' => 'Habilitar este recurso vai exigir que os usuários assinem pessoalmente o aceite do ativo.', 'left' => 'esquerda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Marcar esta opção impõe identificadores únicos nos números de séries dos ativos', 'zerofill_count' => 'Comprimento de etiquetas de ativos, incluindo zerofill', 'username_format_help' => 'Esta configuração será usada somente pelo processo de importação, se um nome de usuário não for fornecido nós iremos gerar um nome de usuário para você.', -); +]; diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php index 504e98b149..c9ecc72288 100644 --- a/resources/lang/pt-BR/admin/settings/message.php +++ b/resources/lang/pt-BR/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ocorreu um erro ao atualizar. ', - 'success' => 'Configurações atualizadas com sucesso.' - ), - 'backup' => array( + 'success' => 'Configurações atualizadas com sucesso.', + ], + 'backup' => [ 'delete_confirm' => 'Você tem certeza que quer apagar este arquivo de backup? Esta ação não pode ser desfeita. ', 'file_deleted' => 'O arquivo de backup foi apagado com sucesso. ', 'generated' => 'Um novo arquivo de backup foi criado com sucesso.', 'file_not_found' => 'Arquivo de backup não foi encontrado no servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ocorreu um erro ao excluir os registros. ', 'validation_failed' => 'Sua confirmação de exclusão está incorreta. Por favor, digite a palavra "DELETE" na caixa de confirmação.', - 'success' => 'Registros excluídos com sucesso.' - ), + 'success' => 'Registros excluídos com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-BR/admin/statuslabels/message.php b/resources/lang/pt-BR/admin/statuslabels/message.php index ac515903f1..621afced5d 100644 --- a/resources/lang/pt-BR/admin/statuslabels/message.php +++ b/resources/lang/pt-BR/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Rótulo de estado não existe.', 'assoc_assets' => 'Este rótulo de estado está associado com pelo menos um Asset e não pode ser removido. Por favor atualize seus assets para não referenciarem este rótulo e tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'Rótulo de estado não foi criado, por favor tente novamente.', - 'success' => 'Rótulo de estado criado com sucesso.' - ), + 'success' => 'Rótulo de estado criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Rótulo de estado não foi atualizado, por favor tente novamente', - 'success' => 'Rótulo de estado atualizado com sucesso.' - ), + 'success' => 'Rótulo de estado atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza que deseja deletar este Rótulo de estado?', 'error' => 'Ocorreu um problema ao deletar o Rótulo de estado. Por favor tente novamente.', - 'success' => 'O Rótulo de estado foi deletado com sucesso.' - ), + 'success' => 'O Rótulo de estado foi deletado com sucesso.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Esses ativos não podem ser atribuídos a ninguém.', 'deployable' => 'Esses ativos podem ser retirados. Uma vez que são retirados, eles assumirão um status meta de Deployed.', 'archived' => 'Esses ativos não podem ser verificados, e só aparecerão na visão arquivada. Isso é útil para manter informações sobre recursos para fins orçamentários / históricos, mas mantendo-os fora da lista de ativos do dia-a-dia.', 'pending' => 'Esses ativos ainda não podem ser atribuídos a ninguém, muitas vezes usado para itens que estão fora para reparo, mas é esperado que retornem à circulação.', - ), + ], -); +]; diff --git a/resources/lang/pt-BR/admin/statuslabels/table.php b/resources/lang/pt-BR/admin/statuslabels/table.php index c76342afcd..4faa78fd47 100644 --- a/resources/lang/pt-BR/admin/statuslabels/table.php +++ b/resources/lang/pt-BR/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Sobre os Rótulos de Status', 'archived' => 'Arquivado', 'create' => 'Criar Rótulo de Status', @@ -16,4 +16,4 @@ return array( 'title' => 'Rótulos de Status', 'undeployable' => 'Não implementável', 'update' => 'Atualizar Rótulo de Status', -); +]; diff --git a/resources/lang/pt-BR/admin/suppliers/message.php b/resources/lang/pt-BR/admin/suppliers/message.php index 8f9d4d377a..06a232c805 100644 --- a/resources/lang/pt-BR/admin/suppliers/message.php +++ b/resources/lang/pt-BR/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'O fornecedor não existe.', - - 'create' => array( + 'create' => [ 'error' => 'O fornecedor não foi criado, tente novamente.', - 'success' => 'Fornecedor criado com sucesso.' - ), + 'success' => 'Fornecedor criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'O fornecedor não foi atualizado, tente novamente', - 'success' => 'Fornecedor atualizado com sucesso.' - ), + 'success' => 'Fornecedor atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este fornecedor?', 'error' => 'Houve um problema ao excluir o fornecedor. Tente novamente.', 'success' => 'O fornecedor foi excluído com sucesso.', 'assoc_assets' => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', 'assoc_licenses' => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', 'assoc_maintenances' => 'Este fornecedor está no momento associado com :asset_maintenances_count asset maintenance(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ', - ) + ], -); +]; diff --git a/resources/lang/pt-BR/admin/suppliers/table.php b/resources/lang/pt-BR/admin/suppliers/table.php index 91c013e8bb..e123f08094 100644 --- a/resources/lang/pt-BR/admin/suppliers/table.php +++ b/resources/lang/pt-BR/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Sobre os fornecedores', 'about_suppliers_text' => 'Fornecedores são usados para seguir a origem de itens', 'address' => 'Endereço do Fornecedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Bens para', 'zip' => 'Código Postal', -); +]; diff --git a/resources/lang/pt-BR/admin/users/general.php b/resources/lang/pt-BR/admin/users/general.php index 12c49d1dd8..0f64b5150f 100644 --- a/resources/lang/pt-BR/admin/users/general.php +++ b/resources/lang/pt-BR/admin/users/general.php @@ -1,7 +1,6 @@ 'Este usuário pode efetuar login', 'activated_disabled_help_text' => 'Você não pode alterar o status de ativação da sua própria conta.', 'assets_user' => 'Bens atribuidos a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Usuário', 'filetype_info' => 'Tipo de arquivos permitidos são png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.', 'history_user' => 'Histórico para :name', - 'info' => 'Informações', + 'info' => 'Informações', 'restore_user' => 'Clique aqui para restaurá-los.', 'last_login' => 'Último Login', 'ldap_config_text' => 'As configurações do LDAP podem ser encontradas em \'Administrador > Definições\'. A localização (opcional) selecionada será definida para todos os usuários importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'As configurações de admin atuais permitem a aplicação seletiva de autenticação de dois passos. ', 'two_factor_enrolled' => 'Dispositivo 2FA Registrado ', 'two_factor_active' => 'A2P Ativo ', - ); + ]; diff --git a/resources/lang/pt-BR/admin/users/message.php b/resources/lang/pt-BR/admin/users/message.php index 2fe547d5d5..d1a7c5edfb 100644 --- a/resources/lang/pt-BR/admin/users/message.php +++ b/resources/lang/pt-BR/admin/users/message.php @@ -1,6 +1,6 @@ 'Este aceitou este ativo com sucesso.', 'declined' => 'Você recusou com sucesso esse ativo.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integração LDAP não foi configurada para esta instalação.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'O usuário foi criado com sucesso.', 'update' => 'O usuário foi atualizado com sucesso.', 'update_bulk' => 'Usuários atualizados com sucesso!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'O usuário foi removido da suspensão com sucesso.', 'restored' => 'O usuário foi restaurado com sucesso.', 'import' => 'Usuários importados com sucesso.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Houve um problema ao criar o usuário. Tente novamente.', 'update' => 'Houve um problema ao atualizar o usuário. Tente novamente.', 'delete' => 'Houve um problema ao excluir o usuário. Tente novamente.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Não foi possível procurar o servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:', 'ldap_could_not_get_entries' => 'Não foi possível obter informações do servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:', 'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Arquivo não deletado. Por favor tente novamente.', 'success' => 'Arquivo foi deletado com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Arquivo(s) não carregados. Por favor tente novamente.', 'success' => 'Arquivo(s) carregados com sucesso.', 'nofiles' => 'Você não selecionou nenhum arquivo para carregar', 'invalidfiles' => 'Um ou mais de seus arquivos são muito grande ou o tipo de arquivo não é permitido. Tipos permitidos são png, gif, jpg, doc, docx, pdf e txt.', - ), + ], -); +]; diff --git a/resources/lang/pt-BR/admin/users/table.php b/resources/lang/pt-BR/admin/users/table.php index 484e7db6b9..8d49cda20d 100644 --- a/resources/lang/pt-BR/admin/users/table.php +++ b/resources/lang/pt-BR/admin/users/table.php @@ -1,6 +1,6 @@ 'Ativo', 'allow' => 'Permitir', 'checkedout' => 'Ativos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar Usuários Atuais', 'show_deleted' => 'Mostrar Usuários Excluídos', 'title' => 'Título', - 'to_restore_them' => 'para restaurar ele(a).', + 'to_restore_them' => 'para restaurar ele(a).', 'updateuser' => 'Atualizar Usuário', 'username' => 'Usuário', - 'user_deleted_text' => 'Este usuário foi marcado como deletado.', + 'user_deleted_text' => 'Este usuário foi marcado como deletado.', 'username_note' => '(Istó é usado somente para conexão do Active Directory, não para login.)', 'cloneuser' => 'Clonar Usuário', 'viewusers' => 'Ver Usuários', -); +]; diff --git a/resources/lang/pt-BR/auth/general.php b/resources/lang/pt-BR/auth/general.php index f39463deff..310bef08ef 100644 --- a/resources/lang/pt-BR/auth/general.php +++ b/resources/lang/pt-BR/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Digite seu nome de usuário para receber um email com um link de redefinição de senha.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/pt-BR/auth/message.php b/resources/lang/pt-BR/auth/message.php index 95ba8415a9..a618ead779 100644 --- a/resources/lang/pt-BR/auth/message.php +++ b/resources/lang/pt-BR/auth/message.php @@ -1,6 +1,6 @@ 'Uma conta com este e-mail já existe.', 'account_not_found' => 'O nome do usuário ou a senha estão incorretos.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Esta conta de usuário está banida.', 'throttle' => 'Muitas tentativas com falha de login. Por favor, tente novamente em :minutes minutos.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Seu dispositivo já está inscrito.', 'success' => 'Você logou na sua conta com sucesso.', 'code_required' => 'O código de dois fatores é obrigatório.', 'invalid_code' => 'O código de dois fatores é inválido.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Houve um problema ao tentar-lhe entrar, tente novamente.', 'success' => 'Você entrou com sucesso.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Houve um problema ao tentar desconectar, por favor, tente novamente.', 'success' => 'Você se desconectou com sucesso.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Houve um problema ao tentar criar sua conta, tente novamente.', 'success' => 'Conta criada com sucesso.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Houve um problema ao tentar obter um código de redefinição da senha, tente novamente.', 'success' => 'Se esse endereço de e-mail existir em nosso sistema, um e-mail de recuperação de senha foi enviado.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Houve um problema ao tentar redefinir sua senha, tente novamente.', 'success' => 'Sua senha foi redefinida com sucesso.', - ), + ], - -); +]; diff --git a/resources/lang/pt-BR/button.php b/resources/lang/pt-BR/button.php index 9e52ed2557..53ca4276e8 100644 --- a/resources/lang/pt-BR/button.php +++ b/resources/lang/pt-BR/button.php @@ -1,6 +1,6 @@ 'Ações', 'add' => 'Adicionar Novo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitação', 'submit' => 'Enviar', 'upload' => 'Carregar', - 'select_file' => 'Selecionar arquivo...', + 'select_file' => 'Selecionar arquivo...', 'select_files' => 'Selecionar arquivos...', 'generate_labels' => '{1} Gerar Etiqueta|[2,*] Gerar Etiquetas', -); +]; diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php index 29880b7d6a..a89a05e28d 100644 --- a/resources/lang/pt-BR/general.php +++ b/resources/lang/pt-BR/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Solicitações', 'city' => 'Cidade', - 'click_here' => 'Clique aqui', + 'click_here' => 'Clique aqui', 'clear_selection' => 'Limpar Seleção', 'companies' => 'Empresas', 'company' => 'Empresas', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumíveis', 'consumables' => 'Consumíveis', 'country' => 'País', diff --git a/resources/lang/pt-BR/help.php b/resources/lang/pt-BR/help.php index d50fcb94fd..e9b400fb63 100644 --- a/resources/lang/pt-BR/help.php +++ b/resources/lang/pt-BR/help.php @@ -1,6 +1,6 @@ "Mais Informações", + 'more_info_title' => 'Mais Informações', - "audit_help" => "Marcar esta caixa irá editar o registro de ativos para refletir esse novo local. Deixando-o desmarcado irá simplesmente anotar o local no log de auditoria.

Note que este ativo é verificado, não irá alterar a localização da pessoa, ativo ou local para onde for reservado.", + 'audit_help' => 'Marcar esta caixa irá editar o registro de ativos para refletir esse novo local. Deixando-o desmarcado irá simplesmente anotar o local no log de auditoria.

Note que este ativo é verificado, não irá alterar a localização da pessoa, ativo ou local para onde for reservado.', 'assets' => 'Ativos são itens que são controlados e rastreáveis pelo número de série ou por uma etiqueta de ativo (patrimônio). Eles tendem a ser de valor elevado onde a identificação de itens específicos é relevante.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Você pode configurar depreciações para depreciar ativos baseados na depreciação linear.', - - -); +]; diff --git a/resources/lang/pt-BR/mail.php b/resources/lang/pt-BR/mail.php index 26a9e64580..112a0173ce 100644 --- a/resources/lang/pt-BR/mail.php +++ b/resources/lang/pt-BR/mail.php @@ -1,6 +1,6 @@ 'Um usuário cancelou uma requisição no website', 'a_user_requested' => 'Um usuário requisitou um item no website', 'accessory_name' => 'Nome do Acessório:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Relatório de check-in de ativos esperado', 'Expected_Checkin_Notification' => 'Lembrete: :name prazo de devolução aproximando', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'Ver seus ativos' -); + 'your_assets' => 'Ver seus ativos', +]; diff --git a/resources/lang/pt-BR/pagination.php b/resources/lang/pt-BR/pagination.php index 1ac132ef1b..469deb6bc7 100644 --- a/resources/lang/pt-BR/pagination.php +++ b/resources/lang/pt-BR/pagination.php @@ -1,6 +1,6 @@ 'Próxima »', -); +]; diff --git a/resources/lang/pt-BR/passwords.php b/resources/lang/pt-BR/passwords.php index 29a89656ba..7bd0fb3109 100644 --- a/resources/lang/pt-BR/passwords.php +++ b/resources/lang/pt-BR/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'O link com a senha de acesso foi enviado com sucesso!', 'user' => 'Nenhum usuário ativo encontrado com este e-mail.', ]; - diff --git a/resources/lang/pt-BR/reminders.php b/resources/lang/pt-BR/reminders.php index 583a3996e9..fead60e5af 100644 --- a/resources/lang/pt-BR/reminders.php +++ b/resources/lang/pt-BR/reminders.php @@ -1,6 +1,6 @@ "As senhas devem ter seis caracteres e corresponderem à confirmação.", + 'password' => 'As senhas devem ter seis caracteres e corresponderem à confirmação.', - "user" => "O nome de usuário ou endereço de e-mail está incorreto", + 'user' => 'O nome de usuário ou endereço de e-mail está incorreto', - "token" => "Este token de redefinição da senha é inválido.", + 'token' => 'Este token de redefinição da senha é inválido.', - "sent" => "Se um endereço de e-mail correspondente foi encontrado, um lembrete de senha foi enviado!", + 'sent' => 'Se um endereço de e-mail correspondente foi encontrado, um lembrete de senha foi enviado!', -); +]; diff --git a/resources/lang/pt-BR/table.php b/resources/lang/pt-BR/table.php index e6c7b0ef36..6fe2e313e3 100644 --- a/resources/lang/pt-BR/table.php +++ b/resources/lang/pt-BR/table.php @@ -1,10 +1,10 @@ 'Ações', 'action' => 'Ação', 'by' => 'Por', 'item' => 'Item', -); +]; diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php index a9c0a62e52..30de574b61 100644 --- a/resources/lang/pt-BR/validation.php +++ b/resources/lang/pt-BR/validation.php @@ -1,6 +1,6 @@ 'O :attribute já foi tomado.', 'uploaded' => 'O :attribute falhou no upload.', 'url' => 'O formato de :attribute é inválido.', - "unique_undeleted" => "O :attribute deve ser único.", + 'unique_undeleted' => 'O :attribute deve ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "O campo :attribute contém um caractere que não é permitido.", - "email_array" => "Um ou mais e-mails sõ invalidos.", - "hashed_pass" => "Sua senha atual está incorreta", + 'alpha_space' => 'O campo :attribute contém um caractere que não é permitido.', + 'email_array' => 'Um ou mais e-mails sõ invalidos.', + 'hashed_pass' => 'Sua senha atual está incorreta', 'dumbpwd' => 'Essa senha é muito comum.', - "statuslabel_type" => "Você deve selecionar um tipo de etiqueta de status válido", + 'statuslabel_type' => 'Você deve selecionar um tipo de etiqueta de status válido', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/pt-PT/admin/accessories/general.php b/resources/lang/pt-PT/admin/accessories/general.php index 1c0c4a828f..8d48787f08 100644 --- a/resources/lang/pt-PT/admin/accessories/general.php +++ b/resources/lang/pt-PT/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', 'checkout' => 'Alocar acessório', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Em vez disso, utilize o EULA padrão.', 'use_default_eula_disabled' => 'Em vez disso, utilize o EULA padrão Nenhum foi definido. Adicione um nas Configurações.', -); +]; diff --git a/resources/lang/pt-PT/admin/accessories/message.php b/resources/lang/pt-PT/admin/accessories/message.php index 200beee1d8..47fbf603b7 100644 --- a/resources/lang/pt-PT/admin/accessories/message.php +++ b/resources/lang/pt-PT/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Esta acessório tem atualmente :count items alocados a utilizadores. Por favor, devolva-os e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Acessório não foi criado, por favor tente novamente.', - 'success' => 'Acessório criado com sucesso.' - ), + 'success' => 'Acessório criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Acessório não foi actualizado, por favor tente novamente', - 'success' => 'Acessório actualizado com sucesso.' - ), + 'success' => 'Acessório actualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover este acessório?', 'error' => 'Ocorreu um problema ao remover o acessório. Por favor, tente novamente.', - 'success' => 'O acessório foi removido com sucesso.' - ), + 'success' => 'O acessório foi removido com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'O acessório não foi alocado. Por favor, tente novamente', 'success' => 'Acessório alocado com sucesso.', - 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' - ), + 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'O acessório não foi devolvido. Por favor, tente novamente', 'success' => 'Acessório devolvido com sucesso.', - 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' - ) + 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', + ], - -); +]; diff --git a/resources/lang/pt-PT/admin/accessories/table.php b/resources/lang/pt-PT/admin/accessories/table.php index 21c79f2369..e926dfe5d3 100644 --- a/resources/lang/pt-PT/admin/accessories/table.php +++ b/resources/lang/pt-PT/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Transferir CSV', - 'eula_text' => 'EULA (Contrato de Licença de Utilizador Final)', +return [ + 'dl_csv' => 'Transferir CSV', + 'eula_text' => 'EULA (Contrato de Licença de Utilizador Final)', 'id' => 'ID', 'require_acceptance' => 'Aceitação', 'title' => 'Nome do Acessório', - -); +]; diff --git a/resources/lang/pt-PT/admin/asset_maintenances/form.php b/resources/lang/pt-PT/admin/asset_maintenances/form.php index 19e691dbbf..d4f50566f5 100644 --- a/resources/lang/pt-PT/admin/asset_maintenances/form.php +++ b/resources/lang/pt-PT/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Tempo da Manutenção do Artigo (em dias)', 'notes' => 'Notas', 'update' => 'Atualizar Manutenção do Artigo', - 'create' => 'Criar Manutenção do Artigo' + 'create' => 'Criar Manutenção do Artigo', ]; diff --git a/resources/lang/pt-PT/admin/asset_maintenances/message.php b/resources/lang/pt-PT/admin/asset_maintenances/message.php index 33b9a9ffc3..ca86bcd3dc 100644 --- a/resources/lang/pt-PT/admin/asset_maintenances/message.php +++ b/resources/lang/pt-PT/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Tem a certeza que quer remover esta manutenção do artigo?', 'error' => 'Ocorreu um problema na remoção desta manutenção do artigo. Por favor, tente novamente.', - 'success' => 'A manutenção do artigo foi removida com sucesso.' + 'success' => 'A manutenção do artigo foi removida com sucesso.', ], 'create' => [ 'error' => 'Não foi possível criar a manutenção do artigo. Por favor, tente novamente.', - 'success' => 'Manutenção do artigo criada com sucesso.' + 'success' => 'Manutenção do artigo criada com sucesso.', ], 'edit' => [ 'error' => 'Manutenção de ativos não foi editada, tente novamente.', - 'success' => 'Manutenção de ativos editada com sucesso.' + 'success' => 'Manutenção de ativos editada com sucesso.', ], 'asset_maintenance_incomplete' => 'Incompleto', 'warranty' => 'Garantia', 'not_warranty' => 'Sem Garantia', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/pt-PT/admin/asset_maintenances/table.php b/resources/lang/pt-PT/admin/asset_maintenances/table.php index 2bae10b5a2..0ad106fbf9 100644 --- a/resources/lang/pt-PT/admin/asset_maintenances/table.php +++ b/resources/lang/pt-PT/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Manutenção de Artigo', 'asset_name' => 'Nome do Artigo', 'is_warranty' => 'Garantia', - 'dl_csv' => 'Descarregar CSV' + 'dl_csv' => 'Descarregar CSV', ]; diff --git a/resources/lang/pt-PT/admin/categories/general.php b/resources/lang/pt-PT/admin/categories/general.php index b4facf4a32..469bef24cc 100644 --- a/resources/lang/pt-PT/admin/categories/general.php +++ b/resources/lang/pt-PT/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categorias de Equipamentos', 'category_name' => 'Nome da Categoria', 'checkin_email' => 'Enviar e-mail para o utilizador em caso de checkin/checktout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Em vez disso, utilize o EULA padrão.', 'use_default_eula_disabled' => 'Em vez disso, utilize o EULA padrão Nenhum foi definido. Adicione um nas Configurações.', -); +]; diff --git a/resources/lang/pt-PT/admin/categories/message.php b/resources/lang/pt-PT/admin/categories/message.php index 5614d2df3b..96b4bb70ba 100644 --- a/resources/lang/pt-PT/admin/categories/message.php +++ b/resources/lang/pt-PT/admin/categories/message.php @@ -1,25 +1,25 @@ 'A categoria não existe.', 'assoc_models' => 'Esta categoria está associada a pelo menos um modelo e não pode ser apagada. Por favor atualize o modelo para não estar referenciado a esta categoria e tente de novo. ', 'assoc_items' => 'Esta categoria está no momento associada a pelo menos um modelo e não pode ser excluída. Atualize os seus :asset_type para não referenciarem mais esta categoria e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'A categoria não foi criada, por favor tenta novamente.', - 'success' => 'A categoria foi criada com sucesso.' - ), + 'success' => 'A categoria foi criada com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'A categoria não foi actualizada, por favor tenta novamente', - 'success' => 'A categoria foi actualizada com sucesso.' - ), + 'success' => 'A categoria foi actualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tens a certeza que queres eliminar esta categoria?', 'error' => 'Houve um problema a eliminar a categoria. Por favor tenta novamente.', - 'success' => 'A categoria foi eliminada com sucesso.' - ) + 'success' => 'A categoria foi eliminada com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/categories/table.php b/resources/lang/pt-PT/admin/categories/table.php index ccf50b56ba..db5222f163 100644 --- a/resources/lang/pt-PT/admin/categories/table.php +++ b/resources/lang/pt-PT/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA (Contrato de Licença de Utilizador Final)', +return [ + 'eula_text' => 'EULA (Contrato de Licença de Utilizador Final)', 'id' => 'ID', 'parent' => 'Pertence a', 'require_acceptance' => 'Aceitação', 'title' => 'Nome da categoria de equipamento', -); +]; diff --git a/resources/lang/pt-PT/admin/companies/general.php b/resources/lang/pt-PT/admin/companies/general.php index ef0c0723c7..d3538aae18 100644 --- a/resources/lang/pt-PT/admin/companies/general.php +++ b/resources/lang/pt-PT/admin/companies/general.php @@ -1,4 +1,5 @@ 'Selecione a empresa', ]; diff --git a/resources/lang/pt-PT/admin/companies/message.php b/resources/lang/pt-PT/admin/companies/message.php index 53aa2347fc..b9bf97044e 100644 --- a/resources/lang/pt-PT/admin/companies/message.php +++ b/resources/lang/pt-PT/admin/companies/message.php @@ -1,18 +1,19 @@ 'Empresa não existe.', 'assoc_users' => 'Esta empresa está associada a pelo menos um modelo e não pode ser eliminada. Actualize os seus modelos para que não referenciem esta empresa e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Empresa não criada, por favor tente de novo.', - 'success' => 'Empresa criada com sucesso.' - ), - 'update' => array( + 'success' => 'Empresa criada com sucesso.', + ], + 'update' => [ 'error' => 'Empresa não foi atualizada, tente novamente', - 'success' => 'Empresa atualizada com sucesso.' - ), - 'delete' => array( + 'success' => 'Empresa atualizada com sucesso.', + ], + 'delete' => [ 'confirm' => 'Tem a certeza que deseja eliminar está empresa?', 'error' => 'Existe um problema ao eliminar a empresa. Por favor tente de novo.', - 'success' => 'A empresa foi eliminada com sucesso.' - ) -); + 'success' => 'A empresa foi eliminada com sucesso.', + ], +]; diff --git a/resources/lang/pt-PT/admin/companies/table.php b/resources/lang/pt-PT/admin/companies/table.php index 90868a65cd..ac1dd752d8 100644 --- a/resources/lang/pt-PT/admin/companies/table.php +++ b/resources/lang/pt-PT/admin/companies/table.php @@ -1,9 +1,10 @@ 'Empresas', 'create' => 'Criar Empresa', 'title' => 'Empresa', 'update' => 'Atualizar Empresa', 'name' => 'Nome da Empresa', 'id' => 'ID', -); +]; diff --git a/resources/lang/pt-PT/admin/components/general.php b/resources/lang/pt-PT/admin/components/general.php index 36bfa98ada..a4a99aaf54 100644 --- a/resources/lang/pt-PT/admin/components/general.php +++ b/resources/lang/pt-PT/admin/components/general.php @@ -1,6 +1,6 @@ 'Nome do Componente', 'checkin' => 'Devolução do componente', 'checkout' => 'Atribuição de componente', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Restantes', 'total' => 'Total', 'update' => 'Atualizar componente', -); +]; diff --git a/resources/lang/pt-PT/admin/components/message.php b/resources/lang/pt-PT/admin/components/message.php index 78234eda7b..cf72675622 100644 --- a/resources/lang/pt-PT/admin/components/message.php +++ b/resources/lang/pt-PT/admin/components/message.php @@ -1,36 +1,35 @@ 'Componente não existe.', - 'create' => array( + 'create' => [ 'error' => 'Componente não foi criada, por favor tente de novo.', - 'success' => 'Componente criado com sucesso.' - ), + 'success' => 'Componente criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Componente não foi atualizado, por favor tente de novo', - 'success' => 'Componente atualizado com sucesso.' - ), + 'success' => 'Componente atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja eliminar este componente?', 'error' => 'Existe um problema ao eliminar o componente. Por favor tente de novo.', - 'success' => 'O componente foi eliminado com sucesso.' - ), + 'success' => 'O componente foi eliminado com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'O componente não foi atribuido, por favor tente de novo', 'success' => 'Componente atribuido com sucesso.', - 'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.' - ), + 'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'O componente não foi devolvido, por favor tente de novo', 'success' => 'O componente foi devolvido com sucesso.', - 'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.' - ) + 'user_does_not_exist' => 'O utilizador é invalido. Por favor tente de novo.', + ], - -); +]; diff --git a/resources/lang/pt-PT/admin/components/table.php b/resources/lang/pt-PT/admin/components/table.php index 9601170939..608371bec7 100644 --- a/resources/lang/pt-PT/admin/components/table.php +++ b/resources/lang/pt-PT/admin/components/table.php @@ -1,5 +1,5 @@ 'Nome do componente', -); +]; diff --git a/resources/lang/pt-PT/admin/consumables/general.php b/resources/lang/pt-PT/admin/consumables/general.php index 5964fd5440..cb94f48737 100644 --- a/resources/lang/pt-PT/admin/consumables/general.php +++ b/resources/lang/pt-PT/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Requisitar consumível', 'consumable_name' => 'Nome do consumível', 'create' => 'Criar consumível', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Restantes', 'total' => 'Total', 'update' => 'Atualizar consumível', -); +]; diff --git a/resources/lang/pt-PT/admin/consumables/message.php b/resources/lang/pt-PT/admin/consumables/message.php index a3d14b4e3b..6ff1a66d3e 100644 --- a/resources/lang/pt-PT/admin/consumables/message.php +++ b/resources/lang/pt-PT/admin/consumables/message.php @@ -1,36 +1,35 @@ 'O consumível não existe.', - 'create' => array( + 'create' => [ 'error' => 'Não foi possível criar o consumível. Por favor, tente novamente.', - 'success' => 'Consumível criado com sucesso.' - ), + 'success' => 'Consumível criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumível não atualizado. Por favor, tente novamente', - 'success' => 'Consumível atualizado com sucesso.' - ), + 'success' => 'Consumível atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja remover este consumível?', 'error' => 'Ocorreu um problema ao remover o consumível. Por favor, tente novamente.', - 'success' => 'Consumível removido com sucesso.' - ), + 'success' => 'Consumível removido com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'O consumível não foi alocado. Por favor, tente novamente', 'success' => 'Consumível alocado com sucesso.', - 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' - ), + 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'O consumível não foi devolvido. Por favor, tente novamente', 'success' => 'Consumível devolvido com sucesso.', - 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' - ) + 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', + ], - -); +]; diff --git a/resources/lang/pt-PT/admin/consumables/table.php b/resources/lang/pt-PT/admin/consumables/table.php index 68f97f7215..f1fb11ecf7 100644 --- a/resources/lang/pt-PT/admin/consumables/table.php +++ b/resources/lang/pt-PT/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nome do consumível', -); +]; diff --git a/resources/lang/pt-PT/admin/custom_fields/general.php b/resources/lang/pt-PT/admin/custom_fields/general.php index 9957360f8d..3fa14ae727 100644 --- a/resources/lang/pt-PT/admin/custom_fields/general.php +++ b/resources/lang/pt-PT/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Campos Personalizados', 'field' => 'Campo', 'about_fieldsets_title' => 'Sobre conjuntos de campos', @@ -30,4 +30,4 @@ return array( 'create_field' => 'Novo conjunto de campos personalizado', 'value_encrypted' => 'O valor deste campo está encriptado na base de dados. apenas administradores poderão ver o valor desencriptado', 'show_in_email' => 'Incluir o valor deste campo nos e-mails de checktout enviados ao utilizador? Os campos encriptados não serão incluídos.', -); +]; diff --git a/resources/lang/pt-PT/admin/custom_fields/message.php b/resources/lang/pt-PT/admin/custom_fields/message.php index b908c3e9da..094defe995 100644 --- a/resources/lang/pt-PT/admin/custom_fields/message.php +++ b/resources/lang/pt-PT/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Esse campo não existe.', 'already_added' => 'Campo já adicionado', - 'create' => array( + 'create' => [ 'error' => 'Campo não criado. Por favor tente novamente.', 'success' => 'Campo criado com sucesso.', - 'assoc_success' => 'Campo adicionado ao conjunto de campos com sucesso.' - ), + 'assoc_success' => 'Campo adicionado ao conjunto de campos com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Campo não foi atualizado, por favor tente de novamente', - 'success' => 'Campo atualizado com sucesso.' - ), + 'success' => 'Campo atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja eliminar este campo?', 'error' => 'Ocorreu um problema ao remover o campo. Por favor tente novamente.', 'success' => 'O campo foi apagado com sucesso.', 'in_use' => 'Campo continua em uso.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset não existe', - 'create' => array( + 'create' => [ 'error' => 'O Conjunto de campos não foi criado, por favor tente novamente.', - 'success' => 'Conjunto de campos criado com sucesso.' - ), + 'success' => 'Conjunto de campos criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Conjunto de campos não foi atualizado, por favor tente novamente', - 'success' => 'Conjunto de campos atualizado com sucesso.' - ), + 'success' => 'Conjunto de campos atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que deseja eliminar este conjunto de campos?', 'error' => 'Ocorreu um problema ao apagar o conjunto de campos. Por favor tente novamente.', 'success' => 'O conjunto de campos foi eliminado com sucesso.', 'in_use' => 'Conjunto de campos continua em uso.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/pt-PT/admin/departments/message.php b/resources/lang/pt-PT/admin/departments/message.php index 0690b6c866..5c00b3eb9d 100644 --- a/resources/lang/pt-PT/admin/departments/message.php +++ b/resources/lang/pt-PT/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departamento não existe.', 'assoc_users' => 'Este departamento está atualmente associado a pelo menos um usuário e não pode ser excluído. Atualize seus usuários para não mais fazer referência a este departamento e tente novamente.', - 'create' => array( + 'create' => [ 'error' => 'O departamento não foi criado, tente novamente.', - 'success' => 'Departamento criado com sucesso.' - ), - 'update' => array( + 'success' => 'Departamento criado com sucesso.', + ], + 'update' => [ 'error' => 'O departamento não foi atualizado, tente novamente', - 'success' => 'Departamento atualizado com sucesso.' - ), - 'delete' => array( + 'success' => 'Departamento atualizado com sucesso.', + ], + 'delete' => [ 'confirm' => 'Tem certeza de que deseja excluir este departamento?', 'error' => 'Houve uma questão de eliminar o departamento. Por favor, tente novamente.', - 'success' => 'O departamento foi excluído com sucesso.' - ) + 'success' => 'O departamento foi excluído com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/departments/table.php b/resources/lang/pt-PT/admin/departments/table.php index ebbe31d57b..36b6361d42 100644 --- a/resources/lang/pt-PT/admin/departments/table.php +++ b/resources/lang/pt-PT/admin/departments/table.php @@ -1,6 +1,6 @@ 'identidade', 'name' => 'Nome do departamento', @@ -8,4 +8,4 @@ return array( 'location' => 'Localização', 'create' => 'Criar Departamento', 'update' => 'Departamento de atualização', - ); + ]; diff --git a/resources/lang/pt-PT/admin/depreciations/general.php b/resources/lang/pt-PT/admin/depreciations/general.php index 183c81c492..3e7f143807 100644 --- a/resources/lang/pt-PT/admin/depreciations/general.php +++ b/resources/lang/pt-PT/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Acerca de Depreciações de Equipamentos', 'about_depreciations' => 'Podes configurar as depreciações dos equipamentos baseadas numa depreciação constante ao longo do tempo.', 'asset_depreciations' => 'Depreciações dos Equipamentos', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Número de mêses', 'update' => 'Actualizar depreciação', -); +]; diff --git a/resources/lang/pt-PT/admin/depreciations/message.php b/resources/lang/pt-PT/admin/depreciations/message.php index 2b9d43bc4e..e55b9ee486 100644 --- a/resources/lang/pt-PT/admin/depreciations/message.php +++ b/resources/lang/pt-PT/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'A classe de imobilizado não existe.', 'assoc_users' => 'Esta depreciação está atualmente associada com um ou mais modelos e não pode ser removida. Por favor, remova os modelos, e depois tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'A não foi possível criar a classe de imobilizado. Por favor, tente novamente.', - 'success' => 'Classe de imobilizado criada com sucesso.' - ), + 'success' => 'Classe de imobilizado criada com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Classe de imobilizado não foi atualizada. Por favor, tente novamente', - 'success' => 'Classe de imobilizado atualizada com sucesso.' - ), + 'success' => 'Classe de imobilizado atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover esta classe de imobilizado?', 'error' => 'Ocorreu um problema ao remover esta classe de imobilizado. Por favor, tente novamente.', - 'success' => 'A classe de imobilizado foi criada com sucesso.' - ) + 'success' => 'A classe de imobilizado foi criada com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/depreciations/table.php b/resources/lang/pt-PT/admin/depreciations/table.php index 802f033f32..05da174dea 100644 --- a/resources/lang/pt-PT/admin/depreciations/table.php +++ b/resources/lang/pt-PT/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meses', 'term' => 'Termo', 'title' => 'Nome ', -); +]; diff --git a/resources/lang/pt-PT/admin/groups/message.php b/resources/lang/pt-PT/admin/groups/message.php index 06544fe87e..897d3b142d 100644 --- a/resources/lang/pt-PT/admin/groups/message.php +++ b/resources/lang/pt-PT/admin/groups/message.php @@ -1,22 +1,22 @@ 'O grupo já existe!', 'group_not_found' => 'O Grupo [:id] não existe.', 'group_name_required' => 'O atributo nome é obrigatório', - 'success' => array( + 'success' => [ 'create' => 'O Grupo foi criado com sucesso.', 'update' => 'O Grupo foi atualizado com sucesso.', 'delete' => 'O Grupo foi removido com sucesso.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover este grupo?', 'create' => 'Ocorreu um problema ao criar o grupo. Por favor, tente novamente.', 'update' => 'Ocorreu um problema ao atualizar o grupo. Por favor, tente novamente.', 'delete' => 'Ocorreu um problema ao remover o grupo. Por favor, tente novamente.', - ), + ], -); +]; diff --git a/resources/lang/pt-PT/admin/groups/table.php b/resources/lang/pt-PT/admin/groups/table.php index 1e37494de6..1e3fd51607 100644 --- a/resources/lang/pt-PT/admin/groups/table.php +++ b/resources/lang/pt-PT/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Nome', 'users' => '# de Utilizadores', -); +]; diff --git a/resources/lang/pt-PT/admin/groups/titles.php b/resources/lang/pt-PT/admin/groups/titles.php index fba08e7e33..018e419661 100644 --- a/resources/lang/pt-PT/admin/groups/titles.php +++ b/resources/lang/pt-PT/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Sobre Grupos', 'about_groups' => 'Os grupos são usados para generalizar as permissões do utilizador.', 'group_management' => 'Gestão de Grupos', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permitir', 'deny' => 'Recusar', -); +]; diff --git a/resources/lang/pt-PT/admin/hardware/form.php b/resources/lang/pt-PT/admin/hardware/form.php index 15f7809eaf..8c375a841c 100644 --- a/resources/lang/pt-PT/admin/hardware/form.php +++ b/resources/lang/pt-PT/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmar Apagar artigos seleccionados', +return [ + 'bulk_delete' => 'Confirmar Apagar artigos seleccionados', 'bulk_delete_help' => 'Reveja os ativos para apagar abaixo. Depois de apagados, estes ativos podem ser restaurados, mas não estarão associados aos utilizadores.', 'bulk_delete_warn' => 'Vai apagar :asset_count ativos.', - 'bulk_update' => 'Atualização de ativos em massa', - 'bulk_update_help' => 'Este formulário permite a atualização em massa de ativos. Preencha apenas os atributos que precisam de alteração. Qualquer atributo deixado em branco permanecerá inalterado. ', - 'bulk_update_warn' => 'Está prestes a editar as propriedades :asset_count dos ativos.', + 'bulk_update' => 'Atualização de ativos em massa', + 'bulk_update_help' => 'Este formulário permite a atualização em massa de ativos. Preencha apenas os atributos que precisam de alteração. Qualquer atributo deixado em branco permanecerá inalterado. ', + 'bulk_update_warn' => 'Está prestes a editar as propriedades :asset_count dos ativos.', 'checkedout_to' => 'Alocado a', 'checkout_date' => 'Data de alocação', 'checkin_date' => 'Data de devolução', @@ -38,7 +38,6 @@ return array( 'tag' => 'Etiqueta do Ativo', 'update' => 'Atualização do ativo', 'warranty' => 'Garantia', - 'warranty_expires' => 'Garantia expira', + 'warranty_expires' => 'Garantia expira', 'years' => 'anos', -) -; +]; diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php index 07a795def2..eb6291d702 100644 --- a/resources/lang/pt-PT/admin/hardware/general.php +++ b/resources/lang/pt-PT/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Sobre os artigos', 'about_assets_text' => 'Artigos são itens seguidos por números de serie ou "asset tags". Eles tendem a ser itens de maior valor, onde a identificação de um item específico importa.', - 'archived' => 'Arquivado', + 'archived' => 'Arquivado', 'asset' => 'Ativo', 'bulk_checkout' => 'Artigos em checktout', 'checkin' => 'Devolver Ativo', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pendente', 'undeployable' => 'Não implementável', 'view' => 'Ver Artigo', -); +]; diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php index 7414855be4..fcdfd2fb05 100644 --- a/resources/lang/pt-PT/admin/hardware/message.php +++ b/resources/lang/pt-PT/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Aviso: Este artigo foi assinalado como "não implementável". Se este estado mudou, por favor atualize o estado do artigo.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Boa tentativa. Esse artigo não existe ou não é solicitável.', 'assoc_users' => 'Este artigo está correntemente alocado a um utilizador e não pode ser removido. Por favor devolva o artigo e de seguida tente remover novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Não foi possível criar o Artigo. Por favor, tente novamente. :(', - 'success' => 'Artigo criado com sucesso. :)' - ), + 'success' => 'Artigo criado com sucesso. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Artigo não foi atualizado. Por favor, tente novamente', 'success' => 'Artigo atualizado com sucesso.', 'nothing_updated' => 'Nenhum atributo foi selecionado, portanto nada foi atualizado.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'O Artigo não foi restaurado, por favor tente novamente', - 'success' => 'Artigo restaurado com sucesso.' - ), + 'success' => 'Artigo restaurado com sucesso.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'A auditoria de ativos não teve êxito. Por favor, tente novamente.', - 'success' => 'Auditoria de ativos logada com sucesso.' - ), + 'success' => 'Auditoria de ativos logada com sucesso.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ficheiro não removido. Por favor, tente novamente.', 'success' => 'Ficheiro removido com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ficheiro(s) não submetidos. Por favor, tente novamente.', 'success' => 'Ficheiro(s) submetidos com sucesso.', 'nofiles' => 'Não selecionou nenhum ficheiro para submissão, ou o ficheiro que pretende submeter é demasiado grande', 'invalidfiles' => 'Um ou mais ficheiros são demasiado grandes ou trata-se de um tipo de ficheiro não permitido. Os tipos de ficheiro permitidos são png, gif, jpg, jpeg, doc, docx, pdf e txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Alguns itens não foram importados corretamente.', 'errorDetail' => 'Os seguintes itens não foram importados devido a erros.', - 'success' => "O seu ficheiro foi importado", - 'file_delete_success' => "Ficheiro eliminado com sucesso", - 'file_delete_error' => "Não foi possível eliminar o ficheiro", - ), + 'success' => 'O seu ficheiro foi importado', + 'file_delete_success' => 'Ficheiro eliminado com sucesso', + 'file_delete_error' => 'Não foi possível eliminar o ficheiro', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza de que pretende eliminar este artigo?', 'error' => 'Ocorreu um problema ao remover o artigo. Por favor, tente novamente.', 'nothing_updated' => 'Nenhum recurso foi selecionado, então nada foi excluído.', - 'success' => 'O artigo foi removido com sucesso.' - ), + 'success' => 'O artigo foi removido com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Não foi possível alocar o artigo, por favor tente novamente', 'success' => 'Artigo alocado com sucesso.', 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', 'not_available' => 'Esse recurso não está disponível para checkout!', - 'no_assets_selected' => 'Deve escolher pelo menos um artigo da lista' - ), + 'no_assets_selected' => 'Deve escolher pelo menos um artigo da lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Não foi possível devolver o artigo, por favor tente novamente', 'success' => 'Artigo devolvido com sucesso.', 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', 'already_checked_in' => 'Este artigo já foi devolvido.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Ativo não foi solicitado, por favor tente novamente', 'success' => 'Ativo solicitado com sucesso.', - 'canceled' => 'Requisição cancelado com sucesso' - ) + 'canceled' => 'Requisição cancelado com sucesso', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/hardware/table.php b/resources/lang/pt-PT/admin/hardware/table.php index dd5777ef9d..c7e55cba5c 100644 --- a/resources/lang/pt-PT/admin/hardware/table.php +++ b/resources/lang/pt-PT/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Etiqueta de Artigo', 'asset_model' => 'Modelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Artigo ', 'image' => 'Imagem do equipamento', 'days_without_acceptance' => 'Dias sem aceitação', - 'monthly_depreciation' => 'Depreciação Mensal' + 'monthly_depreciation' => 'Depreciação Mensal', -); +]; diff --git a/resources/lang/pt-PT/admin/kits/general.php b/resources/lang/pt-PT/admin/kits/general.php index c561ffbc26..910d281989 100644 --- a/resources/lang/pt-PT/admin/kits/general.php +++ b/resources/lang/pt-PT/admin/kits/general.php @@ -1,6 +1,6 @@ 'Sobre Kits predefinidos', 'about_kits_text' => 'Kits predefinidos permitem que você verifique rapidamente uma coleção de itens (bens, licenças, etc.) para um utilizador. Isso pode ser útil quando o processo de integração é consistente entre vários utilizadores e todos recebem os mesmos itens.', 'checkout' => 'Alocação do kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/pt-PT/admin/licenses/form.php b/resources/lang/pt-PT/admin/licenses/form.php index 3ec5b9396b..f6c7424751 100644 --- a/resources/lang/pt-PT/admin/licenses/form.php +++ b/resources/lang/pt-PT/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Artigo', 'checkin' => 'Devolver', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenciado ao E-mail', 'to_name' => 'Licenciado ao Nome', 'update' => 'Atualizar Licença', - 'checkout_help' => 'Deve registar uma licença para uma pessoa ou hardware. Podem selecionar ambos, mas o proprietário do artigo deve coincidir com a pessoa a quem está a alocar o artigo.' -); + 'checkout_help' => 'Deve registar uma licença para uma pessoa ou hardware. Podem selecionar ambos, mas o proprietário do artigo deve coincidir com a pessoa a quem está a alocar o artigo.', +]; diff --git a/resources/lang/pt-PT/admin/licenses/general.php b/resources/lang/pt-PT/admin/licenses/general.php index b4b78a9324..8a58248e75 100644 --- a/resources/lang/pt-PT/admin/licenses/general.php +++ b/resources/lang/pt-PT/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Sobre as Licenças', 'about_licenses' => 'As licenças são usadas para controlar o software. Eles têm um número especificado de lugares disponíveis para atribuir', 'checkin' => 'Devolver instalação da Licença', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licenças de Software', 'user' => 'Utilizador', 'view' => 'Ver Licença', -); +]; diff --git a/resources/lang/pt-PT/admin/licenses/message.php b/resources/lang/pt-PT/admin/licenses/message.php index 370833df8c..d347cfd834 100644 --- a/resources/lang/pt-PT/admin/licenses/message.php +++ b/resources/lang/pt-PT/admin/licenses/message.php @@ -1,6 +1,6 @@ 'A Licença não existe.', 'user_does_not_exist' => 'Utilizador não existe.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Você deve selecionar um recurso ou um usuário, mas não ambos.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licença não foi criada, por favor tente novamente.', - 'success' => 'Licença criada com sucesso.' - ), + 'success' => 'Licença criada com sucesso.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ficheiro não removido. Por favor, tente novamente.', 'success' => 'Ficheiro removido com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ficheiro(s) não submetidos. Por favor, tente novamente.', 'success' => 'Ficheiro(s) submetidos com sucesso.', 'nofiles' => 'Não selecionou nenhum ficheiro para submissão, ou o ficheiro que pretende submeter é demasiado grande', 'invalidfiles' => 'Um ou mais ficheiros excedem o tamanho ou são do tipo de ficheiro não é permitido. Os tipos permitidos são png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licença não foi atualizada, por favor tente novamente', - 'success' => 'Licença atualizada com sucesso.' - ), + 'success' => 'Licença atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover esta licença?', 'error' => 'Ocorreu um problema ao remover esta licença. Por favor, tente novamente.', - 'success' => 'A licença foi removida com sucesso.' - ), + 'success' => 'A licença foi removida com sucesso.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ocorreu um problema ao atribuir esta licença. Por favor, tente novamente.', - 'success' => 'A licença foi alocada com sucesso' - ), + 'success' => 'A licença foi alocada com sucesso', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ocorreu um problema ao devolver esta licença. Por favor, tente novamente.', - 'success' => 'A licença foi devolvida com sucesso' - ), + 'success' => 'A licença foi devolvida com sucesso', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/licenses/table.php b/resources/lang/pt-PT/admin/licenses/table.php index f800d49c83..abf24adbb2 100644 --- a/resources/lang/pt-PT/admin/licenses/table.php +++ b/resources/lang/pt-PT/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Atribuído a', 'checkout' => 'Entrada/Saída', @@ -14,4 +14,4 @@ return array( 'serial' => 'Nº de Série', 'title' => 'Licença', -); +]; diff --git a/resources/lang/pt-PT/admin/locations/message.php b/resources/lang/pt-PT/admin/locations/message.php index bb2f1bbbaa..bf1f30c07e 100644 --- a/resources/lang/pt-PT/admin/locations/message.php +++ b/resources/lang/pt-PT/admin/locations/message.php @@ -1,27 +1,26 @@ 'Localização não existe.', 'assoc_users' => 'Esta localização está atualmente associada com pelo menos um utilizador e não pode ser removida. Atualize este utilizadores de modo a não referenciarem mais este local e tente novamente. ', 'assoc_assets' => 'Esta localização está atualmente associada com pelo menos um artigo e não pode ser removida. Atualize este artigos de modo a não referenciarem mais este local e tente novamente. ', 'assoc_child_loc' => 'Esta localização contém pelo menos uma sub-localização e não pode ser removida. Por favor, atualize as localizações para não referenciarem mais esta localização e tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'Não foi possível criar a localização. Por favor, tente novamente.', - 'success' => 'Localização criada com sucesso.' - ), + 'success' => 'Localização criada com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'A localização não foi atualizada. Por favor, tente novamente', - 'success' => 'Localização atualizada com sucesso.' - ), + 'success' => 'Localização atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover esta localização?', 'error' => 'Ocorreu um problema ao remover esta localização. Por favor, tente novamente.', - 'success' => 'A localização foi removida com sucesso.' - ) + 'success' => 'A localização foi removida com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/locations/table.php b/resources/lang/pt-PT/admin/locations/table.php index fb155ba10d..7f8dbeea1d 100644 --- a/resources/lang/pt-PT/admin/locations/table.php +++ b/resources/lang/pt-PT/admin/locations/table.php @@ -1,6 +1,6 @@ 'Sobre as Localizações', 'about_locations' => 'As localizações são usadas para seguir informações de utilizadores, assets, e outros itens', 'assets_rtd' => 'Artigos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Pertence a', 'currency' => 'Moeda', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/pt-PT/admin/manufacturers/message.php b/resources/lang/pt-PT/admin/manufacturers/message.php index 745b8d2cd9..fc642c9097 100644 --- a/resources/lang/pt-PT/admin/manufacturers/message.php +++ b/resources/lang/pt-PT/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'O fabricante não existe.', 'assoc_users' => 'O fabricante está atualmente associado com pelo menos um modelo e não pode ser removido. Atualize os modelos para que não referenciem mais este fabricante e tente novamente. ', - 'create' => array( + 'create' => [ 'error' => 'Não foi possível criar o fabricante, por favor tente novamente.', - 'success' => 'Fabricante criado com sucesso.' - ), + 'success' => 'Fabricante criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'O fabricante não foi atualizado. Por favor, tente novamente', - 'success' => 'Fabricante atualizado com sucesso.' - ), + 'success' => 'Fabricante atualizado com sucesso.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Não foi possível restaurar o fabricante, por favor tente novamente', - 'success' => 'Fabricante restaurado com sucesso.' - ), + 'success' => 'Fabricante restaurado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover este fabricante?', 'error' => 'Ocorreu um problema ao remover este fabricante. Por favor, tente novamente.', - 'success' => 'O fabricante foi removido com sucesso.' - ) + 'success' => 'O fabricante foi removido com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/manufacturers/table.php b/resources/lang/pt-PT/admin/manufacturers/table.php index 5a8637ea60..7ba403a98f 100644 --- a/resources/lang/pt-PT/admin/manufacturers/table.php +++ b/resources/lang/pt-PT/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Sobre os fabricantes', 'about_manufacturers_text' => 'Os fabricantes são as empresas que criam seus ativos. Você pode armazenar informações de contato de suporte importantes sobre eles aqui, que serão exibidas nas páginas de detalhes do recurso.', 'asset_manufacturers' => 'Fabricantes de Artigos', @@ -13,4 +13,4 @@ return array( 'update' => 'Atualizar Fabricante', 'url' => 'URL', -); +]; diff --git a/resources/lang/pt-PT/admin/models/general.php b/resources/lang/pt-PT/admin/models/general.php index a1575c6162..b941b7ac22 100644 --- a/resources/lang/pt-PT/admin/models/general.php +++ b/resources/lang/pt-PT/admin/models/general.php @@ -1,6 +1,6 @@ 'Sobre os modelos dos artigos', 'about_models_text' => 'Os Modelos dos artigos são uma maneira para agrupar artigos idênticos. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'O modelo foi removido. Clique aqui para o restaurar.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Esta prestes a eliminar :model_count modelos de artigos.', 'restore' => 'Restaurar Modelo', 'requestable' => 'Este modelo pode ser requisitado pelos utilizadores', - 'show_mac_address' => 'Mostrar endereço MAC dos artigos neste modelo', + 'show_mac_address' => 'Mostrar endereço MAC dos artigos neste modelo', 'view_deleted' => 'Ver removidos', 'view_models' => 'Ver modelos', 'fieldset' => 'Conjunto de campos', 'no_custom_field' => 'Sem campos customizados', 'add_default_values' => 'Adicione o seu Acordo de Licença de Uso Final', -); +]; diff --git a/resources/lang/pt-PT/admin/models/message.php b/resources/lang/pt-PT/admin/models/message.php index b06c6dfbb5..1a2a6f6935 100644 --- a/resources/lang/pt-PT/admin/models/message.php +++ b/resources/lang/pt-PT/admin/models/message.php @@ -1,42 +1,41 @@ 'O Modelo não existe.', 'assoc_users' => 'Este modelo está atualmente associado com pelo menos um artigo e não pode ser removido. Por favor, remova os artigos e depois tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'O Modelo não foi criado. Por favor tente novamente.', 'success' => 'Modelo criado com sucesso.', 'duplicate_set' => 'Já existe um Modelo de artigo com esse nome, fabricante e número de modelo.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'O Modelo não foi atualizado. Por favor tente novamente', - 'success' => 'Modelo atualizado com sucesso.' - ), + 'success' => 'Modelo atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover este modelo de artigo?', 'error' => 'Ocorreu um problema ao remover o modelo. Por favor, tente novamente.', - 'success' => 'O modelo foi removido com sucesso.' - ), + 'success' => 'O modelo foi removido com sucesso.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'O Modelo não foi restaurado, por favor tente novamente', - 'success' => 'Modelo restaurado com sucesso.' - ), + 'success' => 'Modelo restaurado com sucesso.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nenhum campo foi alterado, portanto, nada foi atualizado.', - 'success' => 'Modelos atualizados.' - ), + 'success' => 'Modelos atualizados.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nenhum modelo selecionado, por isso nenhum modelo foi eliminado.', 'success' => ':sucess_count modelo(s) eliminados!', - 'success_partial' => ':sucess_count modelo(s) eliminados, no entanto :fail_count não foram eliminados, porque ainda têm artigos associados.' - ), + 'success_partial' => ':sucess_count modelo(s) eliminados, no entanto :fail_count não foram eliminados, porque ainda têm artigos associados.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/models/table.php b/resources/lang/pt-PT/admin/models/table.php index ffaab53474..64589c1199 100644 --- a/resources/lang/pt-PT/admin/models/table.php +++ b/resources/lang/pt-PT/admin/models/table.php @@ -1,6 +1,6 @@ 'Criar Modelo de Artigo', 'created_at' => 'Criado em', @@ -14,4 +14,4 @@ return array( 'update' => 'Atualizar Modelo de Artigo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', -); +]; diff --git a/resources/lang/pt-PT/admin/reports/general.php b/resources/lang/pt-PT/admin/reports/general.php index e828737fda..7f2341789d 100644 --- a/resources/lang/pt-PT/admin/reports/general.php +++ b/resources/lang/pt-PT/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selecione as opções que pretende para o seu relatório de artigos.' -); +return [ + 'info' => 'Selecione as opções que pretende para o seu relatório de artigos.', +]; diff --git a/resources/lang/pt-PT/admin/reports/message.php b/resources/lang/pt-PT/admin/reports/message.php index 9c0c9518c8..2075e28c90 100644 --- a/resources/lang/pt-PT/admin/reports/message.php +++ b/resources/lang/pt-PT/admin/reports/message.php @@ -1,5 +1,5 @@ 'Deve selecionar pelo menos UMA opção.' -); +return [ + 'error' => 'Deve selecionar pelo menos UMA opção.', +]; diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php index dabe23cd68..c7f7d00d84 100644 --- a/resources/lang/pt-PT/admin/settings/general.php +++ b/resources/lang/pt-PT/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Dominio do Active Directory', 'ad_domain_help' => 'Em alguns casos isto e o mesmo que o dominio de email, mas nem sempre.', 'ad_append_domain_label' => 'Acrescentar nome de domínio', 'ad_append_domain' => 'Acrescentar nome de domínio ao campo de usuário', - 'ad_append_domain_help' => 'O utilizador não tem que escrever "username@domain.local", pode apenas digitar "username".' , + 'ad_append_domain_help' => 'O utilizador não tem que escrever "username@domain.local", pode apenas digitar "username".', 'admin_cc_email' => 'E-mail em CC', 'admin_cc_email_help' => 'Se prefere que seja enviada uma cópia do e-mail de checkin/checktout que é enviado aos utilizadores para uma conta de e-mail adicional, introduza o endereço de e-mail aqui. Caso contrário, deixe este campo em branco.', 'is_ad' => 'Isto é um servidor do Active Directoriy', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Alertas expiram (em dias)', 'alert_inv_threshold' => 'Alerta limite do inventário', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'IDs dos Artigos', 'audit_interval' => 'Intervalo de auditoria', 'audit_interval_help' => 'Se você for obrigado a auditar fisicamente seus ativos, insira o intervalo em meses.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Digite o código de autenticação de pois passos', 'two_factor_config_complete' => 'Enviar codigo', 'two_factor_enabled_edit_not_allowed' => 'O teu administrador não permite editar esta opção.', - 'two_factor_enrollment_text' => "A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registado, abre o Google Authenticator e lê o QR Code para registar o teu dispositivo. Uma vez registado, introduz o código abaixo", + 'two_factor_enrollment_text' => 'A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registado, abre o Google Authenticator e lê o QR Code para registar o teu dispositivo. Uma vez registado, introduz o código abaixo', 'require_accept_signature' => 'Requer assinatura', 'require_accept_signature_help_text' => 'Habilitar este recurso vai exigir que os utilizadores assinar fisicamente aceitando o artigo.', 'left' => 'esquerda', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Marcar esta caixa para garantir que os números de série são únicos', 'zerofill_count' => 'Comprimento de tags de artigos, incluindo zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/pt-PT/admin/settings/message.php b/resources/lang/pt-PT/admin/settings/message.php index 6a0593401a..3af95ac38b 100644 --- a/resources/lang/pt-PT/admin/settings/message.php +++ b/resources/lang/pt-PT/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ocorreu um erro ao atualizar. ', - 'success' => 'Configurações atualizadas com sucesso.' - ), - 'backup' => array( + 'success' => 'Configurações atualizadas com sucesso.', + ], + 'backup' => [ 'delete_confirm' => 'Tem a certeza que pretende eliminar o ficheiro de backup? Não poderá reverter a acção. ', 'file_deleted' => 'Ficheiro de backup eliminado com sucesso. ', 'generated' => 'Ficheiro de backup criado com sucesso.', 'file_not_found' => 'O ficheiro de backup não foi encontrado no servidor.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ocorreu um erro ao eliminar os dados. ', 'validation_failed' => 'A confirmação para limpar os dados correu mal. Digite a palavra "Apagar" na caixa de confirmação.', - 'success' => 'Os dados foram apagados com sucesso.' - ), + 'success' => 'Os dados foram apagados com sucesso.', + ], -); +]; diff --git a/resources/lang/pt-PT/admin/statuslabels/message.php b/resources/lang/pt-PT/admin/statuslabels/message.php index a6a37d8d01..5318ae1343 100644 --- a/resources/lang/pt-PT/admin/statuslabels/message.php +++ b/resources/lang/pt-PT/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Etiqueta de estado não existe.', 'assoc_assets' => 'Esta etiqueta de estado está associada a pelo menos um Asset e não pode ser apagada. Atualize os seus Assets para que não sejam usados novamente como referência a estes estado e tente novamente. ', - - 'create' => array( + 'create' => [ 'error' => 'Etiqueta de estado não foi criada, tente novamente.', - 'success' => 'Etiqueta de estado criada com sucesso.' - ), + 'success' => 'Etiqueta de estado criada com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Etiqueta de estado não foi atulizada, tente novamente', - 'success' => 'Etiqueta de estado atualizada com sucesso.' - ), + 'success' => 'Etiqueta de estado atualizada com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende eliminar esta etiqueta de estado?', 'error' => 'Ocorreu um erra ao eliminar a etiqueta de estado. Tente novamente.', - 'success' => 'A etiqueta de estado foi eliminada com sucesso.' - ), + 'success' => 'A etiqueta de estado foi eliminada com sucesso.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Esses ativos não podem ser atribuídos a ninguém.', 'deployable' => 'Esses ativos podem ser verificados. Uma vez que são atribuídos, eles assumirão um status meta de Deployed.', 'archived' => 'Esses ativos não podem ser verificados, e só aparecerão na visão arquivada. Isso é útil para manter informações sobre recursos para fins orçamentários / históricos, mas mantendo-os fora da lista de ativos do dia-a-dia.', 'pending' => 'Esses ativos ainda não podem ser atribuídos a qualquer pessoa, muitas vezes usado para itens que estão fora de reparo, mas é esperado que retornem à circulação.', - ), + ], -); +]; diff --git a/resources/lang/pt-PT/admin/statuslabels/table.php b/resources/lang/pt-PT/admin/statuslabels/table.php index 797c253541..0636c1b80e 100644 --- a/resources/lang/pt-PT/admin/statuslabels/table.php +++ b/resources/lang/pt-PT/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Acerca da Rótulos de Estados', 'archived' => 'Arquivado', 'create' => 'Criar Estado', @@ -16,4 +16,4 @@ return array( 'title' => 'Estados', 'undeployable' => 'Não implementável', 'update' => 'Atualizar Estado', -); +]; diff --git a/resources/lang/pt-PT/admin/suppliers/message.php b/resources/lang/pt-PT/admin/suppliers/message.php index f8acf5a32e..90e0274bbe 100644 --- a/resources/lang/pt-PT/admin/suppliers/message.php +++ b/resources/lang/pt-PT/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Fornecedor não existente.', - - 'create' => array( + 'create' => [ 'error' => 'Não foi possível criar o Fornecedor, por favor tente novamente.', - 'success' => 'Fornecedor criado com sucesso.' - ), + 'success' => 'Fornecedor criado com sucesso.', + ], - 'update' => array( + 'update' => [ 'error' => 'Não foi possível atualizar o Fornecedor, por favor tente novamente', - 'success' => 'Fornecedor atualizado com sucesso.' - ), + 'success' => 'Fornecedor atualizado com sucesso.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tem a certeza que pretende remover este fornecedor?', 'error' => 'Ocorreu um problema ao remover este fornecedor. Por favor, tente novamente.', 'success' => 'Fornecedor removido com sucesso.', 'assoc_assets' => 'Este fornecedor esta atualmente associado a :asset_count artigo(s) e não pode ser eliminado. Por favor, atualize os artigos para que não referenciem este fornecedor e tente novamente.', 'assoc_licenses' => 'Este fornecedor esta atualmente associado a :licenses_count licença(s) e não pode ser eliminado. Por favor, atualize as suas licenças para que não referenciem este fornecedor e tente novamente.', 'assoc_maintenances' => 'Este fornecedor esta atualmente associado a :asset_maintenances_count manutenção(ões) e não pode ser eliminado. Por favor, atualize as suas manutenções de artigos para que não referenciem este fornecedor e tente novamente.', - ) + ], -); +]; diff --git a/resources/lang/pt-PT/admin/suppliers/table.php b/resources/lang/pt-PT/admin/suppliers/table.php index aa774562ef..9fac845605 100644 --- a/resources/lang/pt-PT/admin/suppliers/table.php +++ b/resources/lang/pt-PT/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Sobre os fornecedores', 'about_suppliers_text' => 'Fornecedores são usados para seguir a origem de itens', 'address' => 'Morada do Fornecedor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ver Artigos para', 'zip' => 'Código postal', -); +]; diff --git a/resources/lang/pt-PT/admin/users/general.php b/resources/lang/pt-PT/admin/users/general.php index 7720c8fc50..0c68365ed9 100644 --- a/resources/lang/pt-PT/admin/users/general.php +++ b/resources/lang/pt-PT/admin/users/general.php @@ -1,7 +1,6 @@ 'Este utilizador pode fazer login', 'activated_disabled_help_text' => 'Não pode editar o estado da activação para a sua própria conta.', 'assets_user' => 'Artigos alocados a :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editar Utilizador', 'filetype_info' => 'Os tipos de ficheiro permitidos são png, gif, jpg, jpeg, doc, docx, pdf, txt, zip e rar.', 'history_user' => 'Histórico para :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Clique aqui para restaurá-los.', 'last_login' => 'Último início de sessão', 'ldap_config_text' => 'As definições de configuração do LDAP podem ser encontradas em Administrador > Definições. A localização (opcional) selecionada vai ser defenida para todos os utilizadores importados.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'As configurações de admin actuais permitem a aplicação selectiva de autenticação de dois passos. ', 'two_factor_enrolled' => 'Dispositivo A2P Registado ', 'two_factor_active' => 'A2P Activa ', - ); + ]; diff --git a/resources/lang/pt-PT/admin/users/message.php b/resources/lang/pt-PT/admin/users/message.php index 42a30ccef4..471bb8a8cc 100644 --- a/resources/lang/pt-PT/admin/users/message.php +++ b/resources/lang/pt-PT/admin/users/message.php @@ -1,6 +1,6 @@ 'Aceitou este artigo com sucesso.', 'declined' => 'Recusou este artigo com sucesso.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'A integração com LDAP não foi configurada para este instalação.', 'password_resets_sent' => 'Os usuários selecionados que são ativados e têm um endereço de e-mail válido receberam um link de redefinição de senha.', - - 'success' => array( + 'success' => [ 'create' => 'Utilizador criado com sucesso.', 'update' => 'Utilizador atualizado com sucesso.', 'update_bulk' => 'Os usuários foram atualizados com sucesso!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'A suspensão do Utilizador foi removida com sucesso.', 'restored' => 'Utilizador restaurado com sucesso.', 'import' => 'Utilizadores importados com sucesso.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Ocorreu um problema ao criar o utilizador. Por favor, tente novamente.', 'update' => 'Ocorreu um problema ao atualizar o utilizador. Por favor, tente novamente.', 'delete' => 'Ocorreu um problema ao remover o utilizador. Por favor, tente novamente.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Não foi possível pesquisar no servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:', 'ldap_could_not_get_entries' => 'Não foi possível obter registos do servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:', 'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ficheiro não removido. Por favor, tente novamente.', 'success' => 'Ficheiro removido com sucesso.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Ficheiro(s) não submetidos. Por favor, tente novamente.', 'success' => 'Ficheiro(s) submetidos com sucesso.', 'nofiles' => 'Não selecionou nenhum ficheiro para submissão', 'invalidfiles' => 'Um ou mais ficheiros são demasiado grandes ou trata-se de um tipo de ficheiro não permitido. Os tipos de ficheiro permitidos são png, gif, jpg, jpeg, doc, docx, pdf e txt.', - ), + ], -); +]; diff --git a/resources/lang/pt-PT/admin/users/table.php b/resources/lang/pt-PT/admin/users/table.php index aab070b45f..335e5e6848 100644 --- a/resources/lang/pt-PT/admin/users/table.php +++ b/resources/lang/pt-PT/admin/users/table.php @@ -1,6 +1,6 @@ 'Ativo', 'allow' => 'Permitir', 'checkedout' => 'Artigos', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Mostrar Utilizadores Ativos', 'show_deleted' => 'Mostrar Utilizadores Removidos', 'title' => 'Título', - 'to_restore_them' => 'para restaurá-los.', + 'to_restore_them' => 'para restaurá-los.', 'updateuser' => 'Atualizar utilizador', 'username' => 'Nome de utilizador', - 'user_deleted_text' => 'Este usuário foi marcado como excluído.', + 'user_deleted_text' => 'Este usuário foi marcado como excluído.', 'username_note' => '(Isto é usado apenas para vinculação com a Active Directory, para para login)', 'cloneuser' => 'Clonar Utilizador', 'viewusers' => 'Ver Utilizadores', -); +]; diff --git a/resources/lang/pt-PT/auth/general.php b/resources/lang/pt-PT/auth/general.php index 830144359e..279320d4ba 100644 --- a/resources/lang/pt-PT/auth/general.php +++ b/resources/lang/pt-PT/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/pt-PT/auth/message.php b/resources/lang/pt-PT/auth/message.php index db9f53b29c..b11b894a60 100644 --- a/resources/lang/pt-PT/auth/message.php +++ b/resources/lang/pt-PT/auth/message.php @@ -1,6 +1,6 @@ 'Já existe uma conta com este email.', 'account_not_found' => 'O username ou password estão incorretos.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Este utilizador foi desabilitado.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Ocorreu um problema com o inicio de sessão. Por favor, tente novamente.', 'success' => 'Autenticação bem sucedida.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Ocorreu um problema ao criar a sua conta. Por favor, tente novamente.', 'success' => 'Conta criada com sucesso.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Ocorreu um problema a tentar obter um código para restauro da password. Por favor, tente novamente.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Ocorreu um problema com o restauro da sua password. Por favor, tente novamente.', 'success' => 'A sua password foi restaurada com sucesso.', - ), + ], - -); +]; diff --git a/resources/lang/pt-PT/button.php b/resources/lang/pt-PT/button.php index 175026fb80..c81997f370 100644 --- a/resources/lang/pt-PT/button.php +++ b/resources/lang/pt-PT/button.php @@ -1,6 +1,6 @@ 'Ações', 'add' => 'Adicionar Novo', 'cancel' => 'Cancelar', @@ -11,7 +11,7 @@ return array( 'request' => 'Solicitar', 'submit' => 'Submeter', 'upload' => 'Carregar', - 'select_file' => 'Selecione o arquivo...', + 'select_file' => 'Selecione o arquivo...', 'select_files' => 'Selecionar ficheiros...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index 4488ae5e51..824fc8598c 100644 --- a/resources/lang/pt-PT/general.php +++ b/resources/lang/pt-PT/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Pedidos', 'city' => 'Cidade', - 'click_here' => 'Clique aqui', + 'click_here' => 'Clique aqui', 'clear_selection' => 'Limpar seleção', 'companies' => 'Empresas', 'company' => 'Empresa', 'component' => 'Componente', 'components' => 'Componentes', - 'complete' => 'Completo', + 'complete' => 'Completo', 'consumable' => 'Consumível', 'consumables' => 'Consumíveis', 'country' => 'País', diff --git a/resources/lang/pt-PT/help.php b/resources/lang/pt-PT/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/pt-PT/help.php +++ b/resources/lang/pt-PT/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/pt-PT/mail.php b/resources/lang/pt-PT/mail.php index eae027d9cc..cd00a84ec4 100644 --- a/resources/lang/pt-PT/mail.php +++ b/resources/lang/pt-PT/mail.php @@ -1,6 +1,6 @@ 'Um utilizador cancelou um pedido de artigo no site', 'a_user_requested' => 'Um utilizador solicitou um artigo no site', 'accessory_name' => 'Nome do acessório:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/pt-PT/pagination.php b/resources/lang/pt-PT/pagination.php index c0e3214e25..7509ea3f2a 100644 --- a/resources/lang/pt-PT/pagination.php +++ b/resources/lang/pt-PT/pagination.php @@ -1,6 +1,6 @@ 'Seguinte »', -); +]; diff --git a/resources/lang/pt-PT/passwords.php b/resources/lang/pt-PT/passwords.php index 6e8e65a4ef..4ff0538b6b 100644 --- a/resources/lang/pt-PT/passwords.php +++ b/resources/lang/pt-PT/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'O link com a senha de acesso foi enviado com sucesso!', 'user' => 'Nenhum Utilizador activo encontrado com esse e-mail.', ]; - diff --git a/resources/lang/pt-PT/reminders.php b/resources/lang/pt-PT/reminders.php index ee8d849c17..2177cd8279 100644 --- a/resources/lang/pt-PT/reminders.php +++ b/resources/lang/pt-PT/reminders.php @@ -1,6 +1,6 @@ "A Password deve conter no mínimo 6 caracteres and corresponder à confirmação.", + 'password' => 'A Password deve conter no mínimo 6 caracteres and corresponder à confirmação.', - "user" => "Nome de utilizador ou email incorreto", + 'user' => 'Nome de utilizador ou email incorreto', - "token" => "O token de restauro desta password é inválido.", + 'token' => 'O token de restauro desta password é inválido.', - "sent" => "Se foi encontrado um email correspondente, o alerta de password foi enviado!", + 'sent' => 'Se foi encontrado um email correspondente, o alerta de password foi enviado!', -); +]; diff --git a/resources/lang/pt-PT/table.php b/resources/lang/pt-PT/table.php index e6c7b0ef36..6fe2e313e3 100644 --- a/resources/lang/pt-PT/table.php +++ b/resources/lang/pt-PT/table.php @@ -1,10 +1,10 @@ 'Ações', 'action' => 'Ação', 'by' => 'Por', 'item' => 'Item', -); +]; diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php index 3d3542c6b2..772350b3ed 100644 --- a/resources/lang/pt-PT/validation.php +++ b/resources/lang/pt-PT/validation.php @@ -1,6 +1,6 @@ 'Este :attribute já existe.', 'uploaded' => 'O atributo: não foi possível carregar.', 'url' => 'O formato do :attribute é inválido.', - "unique_undeleted" => "O :atribute deve ser único.", + 'unique_undeleted' => 'O :atribute deve ser único.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "O campo: atributo contém um caractere que não é permitido.", - "email_array" => "Um ou mais endereços de e-mail são inválidos.", - "hashed_pass" => "Sua senha atual está incorreta", + 'alpha_space' => 'O campo: atributo contém um caractere que não é permitido.', + 'email_array' => 'Um ou mais endereços de e-mail são inválidos.', + 'hashed_pass' => 'Sua senha atual está incorreta', 'dumbpwd' => 'Essa senha é muito comum.', - "statuslabel_type" => "Você deve selecionar um tipo de etiqueta de status válido", + 'statuslabel_type' => 'Você deve selecionar um tipo de etiqueta de status válido', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ro/admin/accessories/general.php b/resources/lang/ro/admin/accessories/general.php index f7a7d204e3..20f38846d0 100644 --- a/resources/lang/ro/admin/accessories/general.php +++ b/resources/lang/ro/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Categorie Accesorii', 'accessory_name' => 'Nume Accesoriu', 'checkout' => 'Predare accesoriu', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Foloseste EULA general implicita in loc.', 'use_default_eula_disabled' => 'Foloseste EULA general implicita. EULA implicita nu a fost gasita. A se crea una in Setari.', -); +]; diff --git a/resources/lang/ro/admin/accessories/message.php b/resources/lang/ro/admin/accessories/message.php index 5a668f03e5..54b8c91081 100644 --- a/resources/lang/ro/admin/accessories/message.php +++ b/resources/lang/ro/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Accesoriul [:id] nu există.', 'assoc_users' => 'Acest accesoriu are în prezent : count elemente predate la utilizatori. Vă rugăm să verificaţi accesoriile și încercați din nou. ', - 'create' => array( + 'create' => [ 'error' => 'Accesoriul nu a fost adaugat, va rugam incercati din nou.', - 'success' => 'Accesoriu adaugat cu succes.' - ), + 'success' => 'Accesoriu adaugat cu succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Accesoriul nu a fost actualizat, va rugam incercati din nou,', - 'success' => 'Accesoriu actualizat cu succes.' - ), + 'success' => 'Accesoriu actualizat cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți acest accesoriu?', 'error' => 'A apărut o problemă la ştergerea accesoriului. Vă rugăm să încercaţi din nou.', - 'success' => 'Accesoriul a fost şters cu succes.' - ), + 'success' => 'Accesoriul a fost şters cu succes.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accesoriu nu a fost predat, vă rugăm să încercaţi din nou', 'success' => 'Accesoriu a fost predat.', - 'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.' - ), + 'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accesoriul nu a fost primit, vă rugăm să încercaţi din nou', 'success' => 'Accesoriu primit cu succes.', - 'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.' - ) + 'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.', + ], - -); +]; diff --git a/resources/lang/ro/admin/accessories/table.php b/resources/lang/ro/admin/accessories/table.php index 614a95a501..04f220fcce 100644 --- a/resources/lang/ro/admin/accessories/table.php +++ b/resources/lang/ro/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Descărcați CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Descărcați CSV', + 'eula_text' => 'EULA', 'id' => 'ID-ul', 'require_acceptance' => 'Acceptare', 'title' => 'Nume de accesoriu', - -); +]; diff --git a/resources/lang/ro/admin/asset_maintenances/form.php b/resources/lang/ro/admin/asset_maintenances/form.php index 030ce99572..53b2d24942 100644 --- a/resources/lang/ro/admin/asset_maintenances/form.php +++ b/resources/lang/ro/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'zi', 'notes' => 'notițe', 'update' => 'Actualizați', - 'create' => 'Crea' + 'create' => 'Crea', ]; diff --git a/resources/lang/ro/admin/asset_maintenances/message.php b/resources/lang/ro/admin/asset_maintenances/message.php index 650b49aedc..0e181ec618 100644 --- a/resources/lang/ro/admin/asset_maintenances/message.php +++ b/resources/lang/ro/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți această întreținere a activelor?', 'error' => 'A apărut o problemă cu ștergerea întreținerii materialelor. Vă rugăm să încercați din nou.', - 'success' => 'Întreținerea activelor a fost ștearsă cu succes.' + 'success' => 'Întreținerea activelor a fost ștearsă cu succes.', ], 'create' => [ 'error' => 'Întreținerea activelor nu a fost creată, încercați din nou.', - 'success' => 'Întreținerea activelor a fost creată cu succes.' + 'success' => 'Întreținerea activelor a fost creată cu succes.', ], 'edit' => [ 'error' => 'Întreținerea activelor nu a fost modificată, încercați din nou.', - 'success' => 'Întreținerea activelor a fost editată cu succes.' + 'success' => 'Întreținerea activelor a fost editată cu succes.', ], 'asset_maintenance_incomplete' => 'Nu a fost finalizată încă', 'warranty' => 'garanţie', 'not_warranty' => 'Nu garanție', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ro/admin/asset_maintenances/table.php b/resources/lang/ro/admin/asset_maintenances/table.php index dd66450268..7253836a73 100644 --- a/resources/lang/ro/admin/asset_maintenances/table.php +++ b/resources/lang/ro/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Întreținerea activelor', 'asset_name' => 'Numele activului', 'is_warranty' => 'garanţie', - 'dl_csv' => 'Descărcați CSV' + 'dl_csv' => 'Descărcați CSV', ]; diff --git a/resources/lang/ro/admin/categories/general.php b/resources/lang/ro/admin/categories/general.php index 8c3ae68253..b79264a058 100644 --- a/resources/lang/ro/admin/categories/general.php +++ b/resources/lang/ro/admin/categories/general.php @@ -1,6 +1,6 @@ 'Categoriile de active', 'category_name' => 'Nume categorii', 'checkin_email' => 'Trimiteți e-mail utilizatorului la logare / iesire.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Utilizați în schimb implicit EULA.', 'use_default_eula_disabled' => 'Foloseste EULA general implicita. EULA implicita nu a fost gasita. A se crea una in Setari.', -); +]; diff --git a/resources/lang/ro/admin/categories/message.php b/resources/lang/ro/admin/categories/message.php index b97c82deae..dfbd8df6af 100644 --- a/resources/lang/ro/admin/categories/message.php +++ b/resources/lang/ro/admin/categories/message.php @@ -1,25 +1,25 @@ 'Categoria nu exista.', 'assoc_models' => 'Această categorie este în prezent asociată cu cel puțin un model și nu poate fi ștearsă. Actualizați-vă modelele astfel încât să nu mai faceți referire la această categorie și încercați din nou.', 'assoc_items' => 'Această categorie este în prezent asociată cu cel puțin una: asset_type și nu poate fi ștearsă. Vă rugăm să vă actualizați: asset_type pentru a nu mai face referire la această categorie și încercați din nou.', - 'create' => array( + 'create' => [ 'error' => 'Categoria nu a fost creata, va rugam incercati iar.', - 'success' => 'Categoria a fost creata.' - ), + 'success' => 'Categoria a fost creata.', + ], - 'update' => array( + 'update' => [ 'error' => 'Categoria nu a fost actualizata, va rugam incercati iar', - 'success' => 'Categoria a fost actualizata.' - ), + 'success' => 'Categoria a fost actualizata.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti aceasta categorie?', 'error' => 'A aparut o problema la stergerea categoriei. Va rugam incercati iar.', - 'success' => 'Categoria a fost stearsa.' - ) + 'success' => 'Categoria a fost stearsa.', + ], -); +]; diff --git a/resources/lang/ro/admin/categories/table.php b/resources/lang/ro/admin/categories/table.php index 8858a029c1..4c78460f59 100644 --- a/resources/lang/ro/admin/categories/table.php +++ b/resources/lang/ro/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parinte', 'require_acceptance' => 'Acceptare', 'title' => 'Numele categoriei de active', -); +]; diff --git a/resources/lang/ro/admin/companies/general.php b/resources/lang/ro/admin/companies/general.php index 614455514d..e0328548ca 100644 --- a/resources/lang/ro/admin/companies/general.php +++ b/resources/lang/ro/admin/companies/general.php @@ -1,4 +1,5 @@ 'Selectați Companie', ]; diff --git a/resources/lang/ro/admin/companies/message.php b/resources/lang/ro/admin/companies/message.php index af8f08fcc0..2eefc130c0 100644 --- a/resources/lang/ro/admin/companies/message.php +++ b/resources/lang/ro/admin/companies/message.php @@ -1,18 +1,19 @@ 'Compania nu există.', 'assoc_users' => 'Această companie este în prezent asociată cu cel puțin un model și nu poate fi ștearsă. Actualizați-vă modelele pentru a nu mai referi această companie și încercați din nou.', - 'create' => array( + 'create' => [ 'error' => 'Compania nu a fost creată, încercați din nou.', - 'success' => 'Compania a creat cu succes.' - ), - 'update' => array( + 'success' => 'Compania a creat cu succes.', + ], + 'update' => [ 'error' => 'Compania nu a fost actualizată, încercați din nou', - 'success' => 'Compania a fost actualizată cu succes.' - ), - 'delete' => array( + 'success' => 'Compania a fost actualizată cu succes.', + ], + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți această companie?', 'error' => 'A apărut o problemă cu ștergerea companiei. Vă rugăm să încercați din nou.', - 'success' => 'Compania a fost șters cu succes.' - ) -); + 'success' => 'Compania a fost șters cu succes.', + ], +]; diff --git a/resources/lang/ro/admin/companies/table.php b/resources/lang/ro/admin/companies/table.php index 55070356a7..962b498896 100644 --- a/resources/lang/ro/admin/companies/table.php +++ b/resources/lang/ro/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companii', 'create' => 'Creați o companie', 'title' => 'Companie', 'update' => 'Actualizați compania', 'name' => 'Numele Companiei', 'id' => 'ID-ul', -); +]; diff --git a/resources/lang/ro/admin/components/general.php b/resources/lang/ro/admin/components/general.php index b3e052bf55..c631304bed 100644 --- a/resources/lang/ro/admin/components/general.php +++ b/resources/lang/ro/admin/components/general.php @@ -1,6 +1,6 @@ 'Numele componentei', 'checkin' => 'Verificați componenta', 'checkout' => 'Componenta de verificare', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Rămas', 'total' => 'Total', 'update' => 'Actualizați componenta', -); +]; diff --git a/resources/lang/ro/admin/components/message.php b/resources/lang/ro/admin/components/message.php index 053b9cb7d9..8d1586940d 100644 --- a/resources/lang/ro/admin/components/message.php +++ b/resources/lang/ro/admin/components/message.php @@ -1,36 +1,35 @@ 'Componenta nu există.', - 'create' => array( + 'create' => [ 'error' => 'Componenta nu a fost creată, încercați din nou.', - 'success' => 'Componenta a fost creată cu succes.' - ), + 'success' => 'Componenta a fost creată cu succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Componenta nu a fost actualizată, încercați din nou', - 'success' => 'Componenta sa actualizat cu succes.' - ), + 'success' => 'Componenta sa actualizat cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți această componentă?', 'error' => 'A apărut o problemă de ștergere a componentei. Vă rugăm să încercați din nou.', - 'success' => 'Componenta a fost șters cu succes.' - ), + 'success' => 'Componenta a fost șters cu succes.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Componenta nu a fost verificată, încercați din nou', 'success' => 'Componenta verificată cu succes.', - 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.' - ), + 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Componenta nu a fost verificată, încercați din nou', 'success' => 'Componenta a fost verificată cu succes.', - 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.' - ) + 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.', + ], - -); +]; diff --git a/resources/lang/ro/admin/components/table.php b/resources/lang/ro/admin/components/table.php index e81035a29c..c51c0901a0 100644 --- a/resources/lang/ro/admin/components/table.php +++ b/resources/lang/ro/admin/components/table.php @@ -1,5 +1,5 @@ 'Numele componentei', -); +]; diff --git a/resources/lang/ro/admin/consumables/general.php b/resources/lang/ro/admin/consumables/general.php index 5d70a0c388..b0e684ae4c 100644 --- a/resources/lang/ro/admin/consumables/general.php +++ b/resources/lang/ro/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Verificați consumul pentru utilizator', 'consumable_name' => 'Nume consumabile', 'create' => 'Creați consumabile', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Rămas', 'total' => 'Total', 'update' => 'Actualizați consumabilele', -); +]; diff --git a/resources/lang/ro/admin/consumables/message.php b/resources/lang/ro/admin/consumables/message.php index e59dcf5d49..4fd625cc32 100644 --- a/resources/lang/ro/admin/consumables/message.php +++ b/resources/lang/ro/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumul nu există.', - 'create' => array( + 'create' => [ 'error' => 'Consumul nu a fost creat, încercați din nou.', - 'success' => 'Consumul a fost creat cu succes.' - ), + 'success' => 'Consumul a fost creat cu succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumul nu a fost actualizat, încercați din nou', - 'success' => 'Consumul a fost actualizat cu succes.' - ), + 'success' => 'Consumul a fost actualizat cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți acest consumabil?', 'error' => 'A apărut o problemă cu ștergerea consumabilelor. Vă rugăm să încercați din nou.', - 'success' => 'Consumul a fost șters cu succes.' - ), + 'success' => 'Consumul a fost șters cu succes.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumul nu a fost verificat, încercați din nou', 'success' => 'Consumul a fost verificat cu succes.', - 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.' - ), + 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumul nu a fost verificat, încercați din nou', 'success' => 'Consumul a fost verificat cu succes.', - 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.' - ) + 'user_does_not_exist' => 'Acest utilizator este nevalid. Vă rugăm să încercați din nou.', + ], - -); +]; diff --git a/resources/lang/ro/admin/consumables/table.php b/resources/lang/ro/admin/consumables/table.php index d82e81fbdd..72e2e3da78 100644 --- a/resources/lang/ro/admin/consumables/table.php +++ b/resources/lang/ro/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Nume consumabile', -); +]; diff --git a/resources/lang/ro/admin/custom_fields/general.php b/resources/lang/ro/admin/custom_fields/general.php index ec07d2a1e2..d12a521ba3 100644 --- a/resources/lang/ro/admin/custom_fields/general.php +++ b/resources/lang/ro/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'câmpuri customizate', 'field' => 'Camp', 'about_fieldsets_title' => 'Despre câmpuri', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Noul câmp personalizat', 'value_encrypted' => 'Valoarea acestui câmp este criptată în baza de date. Numai utilizatorii de administrare vor putea vizualiza valoarea decriptată', 'show_in_email' => 'Includeți valoarea acestui câmp în e-mailurile trimise utilizatorului? Căsuțele criptate nu pot fi incluse în e-mailuri.', -); +]; diff --git a/resources/lang/ro/admin/custom_fields/message.php b/resources/lang/ro/admin/custom_fields/message.php index 4f16c15a18..c1c3b6a2df 100644 --- a/resources/lang/ro/admin/custom_fields/message.php +++ b/resources/lang/ro/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Acest câmp nu există.', 'already_added' => 'Câmpul deja adăugat', - 'create' => array( + 'create' => [ 'error' => 'Câmpul nu a fost creat, încercați din nou.', 'success' => 'Câmpul a fost creat.', - 'assoc_success' => 'Câmpul a fost adăugat cu succes la setul de câmp' - ), + 'assoc_success' => 'Câmpul a fost adăugat cu succes la setul de câmp', + ], - 'update' => array( + 'update' => [ 'error' => 'Câmpul nu a fost actualizat, încercați din nou', - 'success' => 'Câmpul sa actualizat cu succes.' - ), + 'success' => 'Câmpul sa actualizat cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți acest câmp?', 'error' => 'A apărut o problemă cu ștergerea câmpului. Vă rugăm să încercați din nou.', 'success' => 'Câmpul a fost șters cu succes.', 'in_use' => 'Câmpul este încă în uz.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Setul de câmp nu există', - 'create' => array( + 'create' => [ 'error' => 'Setul de câmp nu a fost creat, încercați din nou.', - 'success' => 'Setul de campuri a fost creat cu succes.' - ), + 'success' => 'Setul de campuri a fost creat cu succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Setul de câmp nu a fost actualizat, încercați din nou', - 'success' => 'Setul de câmpuri sa actualizat cu succes.' - ), + 'success' => 'Setul de câmpuri sa actualizat cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți acest set de câmpuri?', 'error' => 'A apărut o problemă la ștergerea setului de câmpuri. Vă rugăm să încercați din nou.', 'success' => 'Setul de câmpuri a fost șters cu succes.', 'in_use' => 'Setul de câmp este încă în uz.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ro/admin/departments/message.php b/resources/lang/ro/admin/departments/message.php index cb639a43cf..0d93dcd342 100644 --- a/resources/lang/ro/admin/departments/message.php +++ b/resources/lang/ro/admin/departments/message.php @@ -1,21 +1,21 @@ 'Departamentul nu există.', 'assoc_users' => 'Acest departament este în prezent asociat cu cel puțin un utilizator și nu poate fi șters. Actualizați-vă utilizatorii astfel încât să nu mai faceți referire la acest departament și încercați din nou.', - 'create' => array( + 'create' => [ 'error' => 'Departamentul nu a fost creat, încercați din nou.', - 'success' => 'Departamentul a creat cu succes.' - ), - 'update' => array( + 'success' => 'Departamentul a creat cu succes.', + ], + 'update' => [ 'error' => 'Departamentul nu a fost actualizat, încercați din nou', - 'success' => 'Departamentul a fost actualizat cu succes.' - ), - 'delete' => array( + 'success' => 'Departamentul a fost actualizat cu succes.', + ], + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți acest departament?', 'error' => 'A apărut o problemă cu ștergerea departamentului. Vă rugăm să încercați din nou.', - 'success' => 'Departamentul a fost șters cu succes.' - ) + 'success' => 'Departamentul a fost șters cu succes.', + ], -); +]; diff --git a/resources/lang/ro/admin/departments/table.php b/resources/lang/ro/admin/departments/table.php index 0aa1ae1241..2fe3e94e19 100644 --- a/resources/lang/ro/admin/departments/table.php +++ b/resources/lang/ro/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID-ul', 'name' => 'numele departamentului', @@ -8,4 +8,4 @@ return array( 'location' => 'Locație', 'create' => 'Creați un departament', 'update' => 'Actualizați Departamentul', - ); + ]; diff --git a/resources/lang/ro/admin/depreciations/general.php b/resources/lang/ro/admin/depreciations/general.php index d5da498ac0..72ae25fe88 100644 --- a/resources/lang/ro/admin/depreciations/general.php +++ b/resources/lang/ro/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Despre deprecierea activelor', 'about_depreciations' => 'Poti sa setezi deprecierea activelor bazat pe depreciere in linie.', 'asset_depreciations' => 'Deprecierea activelor', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Numarul de luni', 'update' => 'Actualizați amortizarea', -); +]; diff --git a/resources/lang/ro/admin/depreciations/message.php b/resources/lang/ro/admin/depreciations/message.php index 794dcfbc5e..46de7173ed 100644 --- a/resources/lang/ro/admin/depreciations/message.php +++ b/resources/lang/ro/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Clasa de deprecieri nu exista.', 'assoc_users' => 'Aceasta depreciere este momentan asociata cu unul sau mai multe modele si nu poate fi stearsa. Va rugam stergeti modelele asociate si incercati iar stergerea. ', - - 'create' => array( + 'create' => [ 'error' => 'Clasa de deprecieri nu a fost creata, va rugam incercati iar. :(', - 'success' => 'Clasa de depreciere a fost creata. :)' - ), + 'success' => 'Clasa de depreciere a fost creata. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Clasa de depreciere nu a fost actualizata. Incercati iar', - 'success' => 'Clasa de deprecieri a fost creata.' - ), + 'success' => 'Clasa de deprecieri a fost creata.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Esti sigur ca vrei sa stergi clasa de deprecieri?', 'error' => 'S-a intampinat o problema la stergerea clasei de deprecieri. Va rugam incercati iar.', - 'success' => 'Clasa de deprecieri a fost creata cu succes.' - ) + 'success' => 'Clasa de deprecieri a fost creata cu succes.', + ], -); +]; diff --git a/resources/lang/ro/admin/depreciations/table.php b/resources/lang/ro/admin/depreciations/table.php index d894ce4c58..70e47c3986 100644 --- a/resources/lang/ro/admin/depreciations/table.php +++ b/resources/lang/ro/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Luni', 'term' => 'Perioada', 'title' => 'Nume ', -); +]; diff --git a/resources/lang/ro/admin/groups/message.php b/resources/lang/ro/admin/groups/message.php index 6b51d16c88..0b80b8e6dc 100644 --- a/resources/lang/ro/admin/groups/message.php +++ b/resources/lang/ro/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grupul exista deja!', 'group_not_found' => 'Grupul [:id] nu exista.', 'group_name_required' => 'Campul "Nume" este obligatoriu', - 'success' => array( + 'success' => [ 'create' => 'Grupul a fost creat.', 'update' => 'Grupul a fost actualizat.', 'delete' => 'Grupul a fost sters.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti acest grup?', 'create' => 'S-a intampinat o problema la stergerea grupului. Va rugam incercati iar.', 'update' => 'S-a intampinat o problema la actualizarea grupului. Va rugam incercati iar.', 'delete' => 'S-a intampinat o problema la stergerea grupului. Va rugam incercati iar.', - ), + ], -); +]; diff --git a/resources/lang/ro/admin/groups/table.php b/resources/lang/ro/admin/groups/table.php index 3550f8c69f..680032d51e 100644 --- a/resources/lang/ro/admin/groups/table.php +++ b/resources/lang/ro/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Nume', 'users' => '# de useri', -); +]; diff --git a/resources/lang/ro/admin/groups/titles.php b/resources/lang/ro/admin/groups/titles.php index c8015b4c07..e07ac21348 100644 --- a/resources/lang/ro/admin/groups/titles.php +++ b/resources/lang/ro/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Despre Grupuri', 'about_groups' => 'Grupurile sunt folosite pentru generalizarea permisiunilor utilizatorilor.', 'group_management' => 'Management grupuri', @@ -11,4 +11,4 @@ return array( 'allow' => 'Permite', 'deny' => 'Refuza', -); +]; diff --git a/resources/lang/ro/admin/hardware/form.php b/resources/lang/ro/admin/hardware/form.php index b0e8053f0a..8fe6609c10 100644 --- a/resources/lang/ro/admin/hardware/form.php +++ b/resources/lang/ro/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirmarea activelor șterse în bloc', +return [ + 'bulk_delete' => 'Confirmarea activelor șterse în bloc', 'bulk_delete_help' => 'Consultați mai jos activele pentru ștergerea în bloc. Odată șterse, aceste active pot fi restaurate, dar nu vor mai fi asociate cu utilizatorii cărora li se alocă în prezent.', 'bulk_delete_warn' => 'Sunteți pe cale să ștergeți: active_count assets.', - 'bulk_update' => 'Actualizarea activelor în bloc', - 'bulk_update_help' => 'Acest formular vă permite să actualizați simultan mai multe elemente. Completați câmpurile pe care trebuie să le schimbați. Toate câmpurile rămase necompletate vor rămâne neschimbate.', - 'bulk_update_warn' => 'Sunteți pe punctul de a edita proprietățile: active_count assets.', + 'bulk_update' => 'Actualizarea activelor în bloc', + 'bulk_update_help' => 'Acest formular vă permite să actualizați simultan mai multe elemente. Completați câmpurile pe care trebuie să le schimbați. Toate câmpurile rămase necompletate vor rămâne neschimbate.', + 'bulk_update_warn' => 'Sunteți pe punctul de a edita proprietățile: active_count assets.', 'checkedout_to' => 'Alocat la', 'checkout_date' => 'Verifica data', 'checkin_date' => 'Verificați data', @@ -38,7 +38,6 @@ return array( 'tag' => 'Eticheta activ', 'update' => 'Actualizeaza activ', 'warranty' => 'Garantie', - 'warranty_expires' => 'Garanția expiră', + 'warranty_expires' => 'Garanția expiră', 'years' => 'Ani', -) -; +]; diff --git a/resources/lang/ro/admin/hardware/general.php b/resources/lang/ro/admin/hardware/general.php index 226b6add2b..c0997717fc 100644 --- a/resources/lang/ro/admin/hardware/general.php +++ b/resources/lang/ro/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Despre Active', 'about_assets_text' => 'Activele sunt elemente urmărite prin numărul de serie sau eticheta de activ. Ele tind să fie elemente de valoare mai mare în cazul în care identificarea unui anumit element contează.', - 'archived' => 'Arhivate', + 'archived' => 'Arhivate', 'asset' => 'Activ', 'bulk_checkout' => 'Predă activ', 'checkin' => 'Verifica activ', @@ -19,4 +19,4 @@ return array( 'pending' => 'In asteptare', 'undeployable' => 'Nelansabil', 'view' => 'Vizualizeaza activ', -); +]; diff --git a/resources/lang/ro/admin/hardware/message.php b/resources/lang/ro/admin/hardware/message.php index a3d1fa065d..c6a0be1645 100644 --- a/resources/lang/ro/admin/hardware/message.php +++ b/resources/lang/ro/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Warning: Acest activ a fost marcat ca fiind în prezent nedelimitat. Dacă această stare sa modificat, actualizați starea activelor.', 'does_not_exist' => 'Activul nu exista.', 'does_not_exist_or_not_requestable' => 'Bună încercare. Acest bun nu există sau nu este solicitat.', 'assoc_users' => 'Acest activ este predat catre un utilizator si nu se poate sterge. Va rugam verificati activul, dupa care incercati sa-l stergeti iar. ', - 'create' => array( + 'create' => [ 'error' => 'Activul nu a fost creat, va rugam incercati iar. :(', - 'success' => 'Activul a fost creat. :)' - ), + 'success' => 'Activul a fost creat. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Activul nu a fost actualizat, va rugam incercati iar', 'success' => 'Activul a fost actualizat.', 'nothing_updated' => 'Nu au fost selectate câmpuri, deci nimic nu a fost actualizat.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset nu a fost restaurat, încercați din nou', - 'success' => 'Activul a fost restaurat cu succes.' - ), + 'success' => 'Activul a fost restaurat cu succes.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Analiza activelor nu a avut succes. Vă rugăm să încercați din nou.', - 'success' => 'Analiza activelor a fost înregistrată cu succes.' - ), + 'success' => 'Analiza activelor a fost înregistrată cu succes.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fișierul nu a fost șters. Vă rugăm să încercați din nou.', 'success' => 'Fișierul a fost șters cu succes.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fișierul nu a fost încărcat. Vă rugăm să încercați din nou.', 'success' => 'Fișierul a fost încărcat cu succes.', 'nofiles' => 'Nu ați selectat niciun fișier pentru încărcare sau fișierul pe care încercați să îl încărcați este prea mare', 'invalidfiles' => 'Unul sau mai multe fișiere este prea mare sau este un tip de fișier care nu este permis. Tipurile de fișiere permise sunt png, gif, jpg, doc, docx, pdf și txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Unele elemente nu au importat corect.', 'errorDetail' => 'Următoarele elemente nu au fost importate din cauza erorilor.', - 'success' => "Fișierul dvs. a fost importat", - 'file_delete_success' => "Fișierul dvs. a fost șters cu succes", - 'file_delete_error' => "Fișierul nu a putut fi șters", - ), + 'success' => 'Fișierul dvs. a fost importat', + 'file_delete_success' => 'Fișierul dvs. a fost șters cu succes', + 'file_delete_error' => 'Fișierul nu a putut fi șters', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti acest activ?', 'error' => 'S-a intampinat o problema la stergerea activului. Va rugam incercati iar.', 'nothing_updated' => 'Nu au fost selectate active, deci nimic nu a fost șters.', - 'success' => 'Activul a fost sters.' - ), + 'success' => 'Activul a fost sters.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Activul nu a fost predat, va rugam incercati iar', 'success' => 'Activul a fost predat.', 'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.', 'not_available' => 'Activul respectiv nu este disponibil pentru checkout!', - 'no_assets_selected' => 'Trebuie să selectați cel puțin un articol din lista' - ), + 'no_assets_selected' => 'Trebuie să selectați cel puțin un articol din lista', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Activul nu a fost primit, va rugam incercati iar', 'success' => 'Activul a fost primit.', 'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.', 'already_checked_in' => 'Activul respectiv este deja înregistrat.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Nu a fost solicitat un activ, încercați din nou', 'success' => 'Activele solicitate cu succes.', - 'canceled' => 'Solicitarea de checkout a fost anulată cu succes' - ) + 'canceled' => 'Solicitarea de checkout a fost anulată cu succes', + ], -); +]; diff --git a/resources/lang/ro/admin/hardware/table.php b/resources/lang/ro/admin/hardware/table.php index 6ac8547ef0..699d06bada 100644 --- a/resources/lang/ro/admin/hardware/table.php +++ b/resources/lang/ro/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Eticheta activ', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Activ ', 'image' => 'Imagine dispozitiv', 'days_without_acceptance' => 'Zile fără acceptare', - 'monthly_depreciation' => 'Depreciere lunară' + 'monthly_depreciation' => 'Depreciere lunară', -); +]; diff --git a/resources/lang/ro/admin/kits/general.php b/resources/lang/ro/admin/kits/general.php index 3721bc3df2..0cbf5de286 100644 --- a/resources/lang/ro/admin/kits/general.php +++ b/resources/lang/ro/admin/kits/general.php @@ -1,6 +1,6 @@ 'Despre kit-uri predefinite', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ro/admin/licenses/form.php b/resources/lang/ro/admin/licenses/form.php index 5391c8f5cc..3a1cc4f053 100644 --- a/resources/lang/ro/admin/licenses/form.php +++ b/resources/lang/ro/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Activ', 'checkin' => 'Primire', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licentiat catre E-mail', 'to_name' => 'Licentiat catre nume', 'update' => 'Actualizeaza licenta', - 'checkout_help' => 'Trebuie sa predati licenta catre un activ sau catre o persoana. Puteti selecta ambele, dar proprietarul activului trebuie sa fie la fel cu persoana caruia ii predati activul.' -); + 'checkout_help' => 'Trebuie sa predati licenta catre un activ sau catre o persoana. Puteti selecta ambele, dar proprietarul activului trebuie sa fie la fel cu persoana caruia ii predati activul.', +]; diff --git a/resources/lang/ro/admin/licenses/general.php b/resources/lang/ro/admin/licenses/general.php index 61bc9da381..ca25a2c8db 100644 --- a/resources/lang/ro/admin/licenses/general.php +++ b/resources/lang/ro/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Despre Licențe', 'about_licenses' => 'Licențele sunt utilizate pentru a urmări software-ul. Ei au un număr specific de locuri care pot fi verificate pentru persoane fizice', 'checkin' => 'Primire locuri licenta', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licente software', 'user' => 'Utilizator', 'view' => 'Vizualizeaza licenta', -); +]; diff --git a/resources/lang/ro/admin/licenses/message.php b/resources/lang/ro/admin/licenses/message.php index b54d14d1c1..e16f8ec663 100644 --- a/resources/lang/ro/admin/licenses/message.php +++ b/resources/lang/ro/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licenta nu exista.', 'user_does_not_exist' => 'Utilizatorul nu exista.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Trebuie să selectați un material sau un utilizator, dar nu ambele.', 'not_found' => 'Licența nu a fost găsită', - - 'create' => array( + 'create' => [ 'error' => 'Licenta nu a fost creata, va rugam incercati iar.', - 'success' => 'Licenta a fost creata.' - ), + 'success' => 'Licenta a fost creata.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fisierul n-a fost sters. Incercati iar.', 'success' => 'Fisierul a fost sters.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fisierul/Fisierele nu au fost uploadate. Incecati iar.', 'success' => 'Fisierul/Fisierele au fost uploadate.', 'nofiles' => 'Nu ați selectat niciun fișier pentru încărcare sau fișierul pe care încercați să îl încărcați este prea mare', 'invalidfiles' => 'Unul sau mai multe fișiere este prea mare sau este un tip de fișier care nu este permis. Tipurile de fișiere permise sunt png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml și lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licenta nu a fost actualizata, va rugam incercati iar', - 'success' => 'Licenta a fost actualizata.' - ), + 'success' => 'Licenta a fost actualizata.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca doriti sa stergeti aceasta licenta?', 'error' => 'A aparut o problema la stergerea licentei. Va rugam sa incercati iar.', - 'success' => 'Licenta a fost stearsa.' - ), + 'success' => 'Licenta a fost stearsa.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'A aparut o problema la predarea licentei. Va rugam incercati iar.', - 'success' => 'Licenta a fost predata' - ), + 'success' => 'Licenta a fost predata', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'A aparut o problema la primirea licentei. Va rugam incercati iar.', - 'success' => 'Licenta a fost primita' - ), + 'success' => 'Licenta a fost primita', + ], -); +]; diff --git a/resources/lang/ro/admin/licenses/table.php b/resources/lang/ro/admin/licenses/table.php index 8293bddd81..e55bc6b72b 100644 --- a/resources/lang/ro/admin/licenses/table.php +++ b/resources/lang/ro/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Desemnata catre', 'checkout' => 'Predat/Primit', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Licenta', -); +]; diff --git a/resources/lang/ro/admin/locations/message.php b/resources/lang/ro/admin/locations/message.php index 29f7d59c06..f3337bdd7c 100644 --- a/resources/lang/ro/admin/locations/message.php +++ b/resources/lang/ro/admin/locations/message.php @@ -1,27 +1,26 @@ 'Locatia nu exista.', 'assoc_users' => 'Aceasta locatie este momentan asociata cu cel putin inca un alt utilizator si nu poate fi stearsa. Va rugam actualizati utilizatorii care nu mai apartin de aceasta locatie si incercati iar. ', 'assoc_assets' => 'Această locație este în prezent asociată cu cel puțin un material și nu poate fi ștearsă. Actualizați-vă activele astfel încât acestea să nu mai fie menționate și să încercați din nou.', 'assoc_child_loc' => 'Această locație este în prezent părinte pentru cel puțin o locație copil și nu poate fi ștearsă. Actualizați locațiile dvs. pentru a nu mai referi această locație și încercați din nou.', - - 'create' => array( + 'create' => [ 'error' => 'Locatia nu a fost creata, va rugam incercati iar.', - 'success' => 'Locatia a fost creata.' - ), + 'success' => 'Locatia a fost creata.', + ], - 'update' => array( + 'update' => [ 'error' => 'Locatia nu a fost actualizata, va rugam incercati iar', - 'success' => 'Locatia a fost actualizata.' - ), + 'success' => 'Locatia a fost actualizata.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti aceasta locatie?', 'error' => 'A aparut o problema la stergerea locatiei. Va rugam incercati iar.', - 'success' => 'Locatia a fost stearsa.' - ) + 'success' => 'Locatia a fost stearsa.', + ], -); +]; diff --git a/resources/lang/ro/admin/locations/table.php b/resources/lang/ro/admin/locations/table.php index 9e5ec71323..55a135810c 100644 --- a/resources/lang/ro/admin/locations/table.php +++ b/resources/lang/ro/admin/locations/table.php @@ -1,6 +1,6 @@ 'Despre Locații', 'about_locations' => 'Locațiile sunt utilizate pentru a urmări informațiile despre locație pentru utilizatori, active și alte elemente', 'assets_rtd' => 'bunuri', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Mamă', 'currency' => 'Locație Monedă', 'ldap_ou' => 'LDAP Căutați OU', - ); + ]; diff --git a/resources/lang/ro/admin/manufacturers/message.php b/resources/lang/ro/admin/manufacturers/message.php index 138fba4cd8..86ac33426e 100644 --- a/resources/lang/ro/admin/manufacturers/message.php +++ b/resources/lang/ro/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Producatorul nu exista.', 'assoc_users' => 'Acest producator este momentan asociat cu cel putin inca un model si nu poate fi sters. Va rugam actualizati modelele care nu mai au legatura cu acest producator si incercati iar. ', - 'create' => array( + 'create' => [ 'error' => 'Producatorul nu a fost creat, incercati iar.', - 'success' => 'Producatorul a fost creat.' - ), + 'success' => 'Producatorul a fost creat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Producatorul nu a fost actualizat, incercati iar', - 'success' => 'Producatorul a fost actualizat.' - ), + 'success' => 'Producatorul a fost actualizat.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Producătorul nu a fost restabilit, încercați din nou', - 'success' => 'Producătorul a fost restabilit cu succes.' - ), + 'success' => 'Producătorul a fost restabilit cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti producatorul?', 'error' => 'A aparut o problema la stergerea producatorului. Va rugam incercati iar.', - 'success' => 'Producatorul a fost sters.' - ) + 'success' => 'Producatorul a fost sters.', + ], -); +]; diff --git a/resources/lang/ro/admin/manufacturers/table.php b/resources/lang/ro/admin/manufacturers/table.php index 431811b52c..9cd51076c7 100644 --- a/resources/lang/ro/admin/manufacturers/table.php +++ b/resources/lang/ro/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Despre producători', 'about_manufacturers_text' => 'Producătorii sunt companiile care vă creează activele. Puteți să stocați aici informații importante despre persoanele de contact despre acestea, care vor fi afișate pe paginile detaliilor despre materiale.', 'asset_manufacturers' => 'Producatori de active', @@ -13,4 +13,4 @@ return array( 'update' => 'Actualizeaza producator', 'url' => 'URL-', -); +]; diff --git a/resources/lang/ro/admin/models/general.php b/resources/lang/ro/admin/models/general.php index b7319de234..dd3d631db2 100644 --- a/resources/lang/ro/admin/models/general.php +++ b/resources/lang/ro/admin/models/general.php @@ -1,6 +1,6 @@ 'Despre modelele de active', 'about_models_text' => 'Modelele de activ sunt o modalitate de a grupa active identice. "MBP 2013", "iPhone 6s" etc.', 'deleted' => 'Modelul a fost sters. Apasati aici pentru a-l restaura.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Sunteți pe cale să ștergeți modelul de echipament: model_count.', 'restore' => 'Restaurare model', 'requestable' => 'Utilizatorii pot solicita acest model', - 'show_mac_address' => 'Arata campul Adresa MAC in acest model', + 'show_mac_address' => 'Arata campul Adresa MAC in acest model', 'view_deleted' => 'Vizualizare Sterse', 'view_models' => 'Vizualizare Modele', 'fieldset' => 'FIELDSET', 'no_custom_field' => 'Nu există câmpuri personalizate', 'add_default_values' => 'Adăugați valori implicite', -); +]; diff --git a/resources/lang/ro/admin/models/message.php b/resources/lang/ro/admin/models/message.php index f83005db44..d88d86f404 100644 --- a/resources/lang/ro/admin/models/message.php +++ b/resources/lang/ro/admin/models/message.php @@ -1,42 +1,41 @@ 'Modelul nu exista.', 'assoc_users' => 'Acest model este momentan asociat cu cel putin unul sau mai multe active si nu poate fi sters. Va rugam sa stergeti activul si dupa incercati iar. ', - - 'create' => array( + 'create' => [ 'error' => 'Modelul nu a fost creat, incercati iar.', 'success' => 'Modelul a fost creat.', 'duplicate_set' => 'Un model de activ cu numele, producătorul și numărul modelului există deja.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modelul nu a fost actualizat, va rugam incercati iar', - 'success' => 'Modelul a fost actualizat.' - ), + 'success' => 'Modelul a fost actualizat.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca doriti sa stergeti acest model de activ?', 'error' => 'A aparut o problema la stergerea modelului. Incercati iar.', - 'success' => 'Modelul a fost sters.' - ), + 'success' => 'Modelul a fost sters.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modelul nu a fost restabilit, încercați din nou', - 'success' => 'Modelul a fost restaurat cu succes.' - ), + 'success' => 'Modelul a fost restaurat cu succes.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Nu au fost modificate câmpuri, deci nimic nu a fost actualizat.', - 'success' => 'Modelele au fost actualizate.' - ), + 'success' => 'Modelele au fost actualizate.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nu au fost selectate câmpuri, deci nimic nu a fost actualizat.', 'success' => 'Au fost șterse :success_count model(e)!', - 'success_partial' => 'Au fost șterse :success_count modele, cu toate acestea :fail_count nu au putut fi șterse deoarece au în continuare active asociate cu acestea.' - ), + 'success_partial' => 'Au fost șterse :success_count modele, cu toate acestea :fail_count nu au putut fi șterse deoarece au în continuare active asociate cu acestea.', + ], -); +]; diff --git a/resources/lang/ro/admin/models/table.php b/resources/lang/ro/admin/models/table.php index 66c0f405f9..be0c3462dd 100644 --- a/resources/lang/ro/admin/models/table.php +++ b/resources/lang/ro/admin/models/table.php @@ -1,6 +1,6 @@ 'Creeaza model de activ', 'created_at' => 'Creat la', @@ -14,4 +14,4 @@ return array( 'update' => 'Actualizeaza model activ', 'clone' => 'Cloneaza model', 'edit' => 'Editeaza model', -); +]; diff --git a/resources/lang/ro/admin/reports/general.php b/resources/lang/ro/admin/reports/general.php index 7b5da4cad2..0541c7bd32 100644 --- a/resources/lang/ro/admin/reports/general.php +++ b/resources/lang/ro/admin/reports/general.php @@ -1,5 +1,5 @@ 'Selectati optiunile dorite pentru raportul de active.' -); +return [ + 'info' => 'Selectati optiunile dorite pentru raportul de active.', +]; diff --git a/resources/lang/ro/admin/reports/message.php b/resources/lang/ro/admin/reports/message.php index 46d8b10337..0e6f399410 100644 --- a/resources/lang/ro/admin/reports/message.php +++ b/resources/lang/ro/admin/reports/message.php @@ -1,5 +1,5 @@ 'Trebuie sa selectati cel putin o optiune.' -); +return [ + 'error' => 'Trebuie sa selectati cel putin o optiune.', +]; diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php index 9a564c06e6..b3bb5f76e4 100644 --- a/resources/lang/ro/admin/settings/general.php +++ b/resources/lang/ro/admin/settings/general.php @@ -1,12 +1,12 @@ 'Director activ', 'ad_domain' => 'Domeniu Active Directory', 'ad_domain_help' => 'Acest lucru este uneori același cu domeniul dvs. de e-mail, dar nu întotdeauna.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC e-mail', 'admin_cc_email_help' => 'Dacă doriți să trimiteți o copie a e-mailurilor de predare/ primire trimise utilizatorilor către un cont de e-mail suplimentar, introduceți-l aici. În caz contrar, lăsați acest câmp necompletat.', 'is_ad' => 'Acesta este un server Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Termenul de expirare a alertelor (în zile)', 'alert_inv_threshold' => 'Ajustarea pragului de inventar', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID-uri de active', 'audit_interval' => 'Interval de audit', 'audit_interval_help' => 'Dacă vi se cere să efectuați un audit fizic în mod regulat, introduceți intervalul în luni.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Introduceți codul cu doi factori', 'two_factor_config_complete' => 'Trimiteți codul', 'two_factor_enabled_edit_not_allowed' => 'Administratorul nu vă permite să editați această setare.', - 'two_factor_enrollment_text' => "Este necesară autentificarea cu două factori, cu toate acestea, dispozitivul dvs. nu a fost încă înscris. Deschideți aplicația Google Authenticator și scanați codul QR de mai jos pentru a vă înregistra dispozitivul. După ce ați înscris dispozitivul, introduceți codul de mai jos", + 'two_factor_enrollment_text' => 'Este necesară autentificarea cu două factori, cu toate acestea, dispozitivul dvs. nu a fost încă înscris. Deschideți aplicația Google Authenticator și scanați codul QR de mai jos pentru a vă înregistra dispozitivul. După ce ați înscris dispozitivul, introduceți codul de mai jos', 'require_accept_signature' => 'Solicită semnătura', 'require_accept_signature_help_text' => 'Activarea acestei funcții va impune utilizatorilor să se deconecteze fizic la acceptarea unui activ.', 'left' => 'stânga', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Verificarea acestei casete va impune o constrângere de unicitate în serialele de active', 'zerofill_count' => 'Lungimea etichetelor de activ, inclusiv zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ro/admin/settings/message.php b/resources/lang/ro/admin/settings/message.php index ad3d1222c6..fa7e7a71cc 100644 --- a/resources/lang/ro/admin/settings/message.php +++ b/resources/lang/ro/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'A aparut o eroare la actualizare. ', - 'success' => 'Setari au fost actualizate.' - ), - 'backup' => array( + 'success' => 'Setari au fost actualizate.', + ], + 'backup' => [ 'delete_confirm' => 'Sigur doriți să ștergeți acest fișier de rezervă? Această acțiune nu poate fi anulată.', 'file_deleted' => 'Fișierul de rezervă a fost șters cu succes.', 'generated' => 'Un nou dosar de rezervă a fost creat cu succes.', 'file_not_found' => 'Acest fișier de rezervă nu a putut fi găsit pe server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'A apărut o eroare în timpul epurării.', 'validation_failed' => 'Confirmarea dvs. de purjare este incorectă. Introduceți cuvântul "DELETE" în caseta de confirmare.', - 'success' => 'Înregistrările șterse au fost eliminate cu succes.' - ), + 'success' => 'Înregistrările șterse au fost eliminate cu succes.', + ], -); +]; diff --git a/resources/lang/ro/admin/statuslabels/message.php b/resources/lang/ro/admin/statuslabels/message.php index 60b1268c90..8e9a31067b 100644 --- a/resources/lang/ro/admin/statuslabels/message.php +++ b/resources/lang/ro/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Eticheta de stare nu există.', 'assoc_assets' => 'Această etichetă de stare este în prezent asociată cu cel puțin un singur activ și nu poate fi ștearsă. Actualizați-vă activele astfel încât să nu mai faceți referire la această stare și încercați din nou.', - - 'create' => array( + 'create' => [ 'error' => 'Eticheta de stare nu a fost creată, încercați din nou.', - 'success' => 'Eticheta de stare a fost creată cu succes.' - ), + 'success' => 'Eticheta de stare a fost creată cu succes.', + ], - 'update' => array( + 'update' => [ 'error' => 'Eticheta de stare nu a fost actualizată, încercați din nou', - 'success' => 'Eticheta de stare a fost actualizată cu succes.' - ), + 'success' => 'Eticheta de stare a fost actualizată cu succes.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sigur doriți să ștergeți această etichetă de stare?', 'error' => 'A apărut o problemă la ștergerea etichetei de stare. Vă rugăm să încercați din nou.', - 'success' => 'Eticheta de stare a fost șters cu succes.' - ), + 'success' => 'Eticheta de stare a fost șters cu succes.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Aceste active nu pot fi atribuite nimănui.', 'deployable' => 'Aceste active pot fi verificate. Odată ce sunt atribuite, vor avea un status meta de Deployed.', 'archived' => 'Aceste active nu pot fi verificate și vor apărea numai în vizualizarea Arhivat. Acest lucru este util pentru păstrarea informațiilor despre active în scopuri bugetare / istorice, dar păstrându-le din lista activelor zilnice.', 'pending' => 'Aceste bunuri nu pot fi încă alocate nimănui, adesea folosite pentru articole care urmează să fie reparate, dar se așteaptă ca acestea să revină în circulație.', - ), + ], -); +]; diff --git a/resources/lang/ro/admin/statuslabels/table.php b/resources/lang/ro/admin/statuslabels/table.php index 1fd49a8f80..c2ead6b5b3 100644 --- a/resources/lang/ro/admin/statuslabels/table.php +++ b/resources/lang/ro/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Despre etichete status', 'archived' => 'Arhivat', 'create' => 'Creeaza eticheta status', @@ -16,4 +16,4 @@ return array( 'title' => 'Etichete status', 'undeployable' => 'Nelansabil', 'update' => 'Actualizeaza eticheta status', -); +]; diff --git a/resources/lang/ro/admin/suppliers/message.php b/resources/lang/ro/admin/suppliers/message.php index 91ccc15767..9ca3676543 100644 --- a/resources/lang/ro/admin/suppliers/message.php +++ b/resources/lang/ro/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Furnizorul nu exista.', - - 'create' => array( + 'create' => [ 'error' => 'Furnizorul nu a fost creat, va rugam incercati iar.', - 'success' => 'Furnizorul a fost creat.' - ), + 'success' => 'Furnizorul a fost creat.', + ], - 'update' => array( + 'update' => [ 'error' => 'Furnizorul nu a fost actualizat, va rugam incercati iar', - 'success' => 'Furnizorul a fost actualizat.' - ), + 'success' => 'Furnizorul a fost actualizat.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Sunteti sigur ca vreti sa stergeti acest furnizor?', 'error' => 'A aparut o problema la stergerea furnizorului. Va rugam incercati iar.', 'success' => 'Furnizorul a fost sters.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ro/admin/suppliers/table.php b/resources/lang/ro/admin/suppliers/table.php index 4d0db4035d..7baf31da9d 100644 --- a/resources/lang/ro/admin/suppliers/table.php +++ b/resources/lang/ro/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Despre Furnizori', 'about_suppliers_text' => 'Furnizorii sunt utilizați pentru a urmări sursa de articole', 'address' => 'Adresa furnizor', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Vezi active pentru', 'zip' => 'Cod postal', -); +]; diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php index 7fa6413cfa..ff390201a0 100644 --- a/resources/lang/ro/admin/users/general.php +++ b/resources/lang/ro/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Activul desemnat catre :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Editeaza utilizator', 'filetype_info' => 'Tipurile de fișiere permise sunt png, gif, jpg, jpeg, doc, docx, pdf, txt, zip și rar.', 'history_user' => 'Istoric pentru :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Faceți clic aici pentru a le restaura.', 'last_login' => 'Ultima logare', 'ldap_config_text' => 'Setările de configurare LDAP pot fi găsite pe Administrator> Setări. Locația selectată (opțional) va fi setată pentru toți utilizatorii importați.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Setările dvs. actuale de administrare permit executarea selectivă a autentificării cu două factori.', 'two_factor_enrolled' => 'Dispozitivul 2FA Înregistrat', 'two_factor_active' => '2FA Active', - ); + ]; diff --git a/resources/lang/ro/admin/users/message.php b/resources/lang/ro/admin/users/message.php index 77783432b2..2da8c633c2 100644 --- a/resources/lang/ro/admin/users/message.php +++ b/resources/lang/ro/admin/users/message.php @@ -1,6 +1,6 @@ 'Ați acceptat cu succes acest activ.', 'declined' => 'Ați refuzat cu succes acest activ.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integrarea LDAP nu a fost configurată pentru această instalare.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Utilizatorul a fost creat.', 'update' => 'Utilizatorul a fost actualizat.', 'update_bulk' => 'Utilizatorii au fost actualizați cu succes!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Utilizatorul a fost activat.', 'restored' => 'Utilizatorul a fost restaurat.', 'import' => 'Utilizatorii importați cu succes.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'A aparut o problema la crearea utilizatorului. Incercati iar.', 'update' => 'A aparut o problema la actualizarea utilizatorului. Incercati iar.', 'delete' => 'A aparut o problema la stergerea utilizatorului. Incercati iar.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Căutarea serverului LDAP nu a putut fi efectuată. Verificați configurația serverului LDAP în fișierul de configurare LDAP.
Error de la LDAP Server:', 'ldap_could_not_get_entries' => 'Nu s-au putut obține intrări de pe serverul LDAP. Verificați configurația serverului LDAP în fișierul de configurare LDAP.
Error de la LDAP Server:', 'password_ldap' => 'Parola pentru acest cont este gestionată de LDAP / Active Directory. Contactați departamentul IT pentru a vă schimba parola.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fișierul nu a fost șters. Vă rugăm să încercați din nou.', 'success' => 'Fișierul a fost șters cu succes.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fișierul nu a fost încărcat. Vă rugăm să încercați din nou.', 'success' => 'Fișierul a fost încărcat cu succes.', 'nofiles' => 'Nu ați selectat niciun fișier pentru încărcare', 'invalidfiles' => 'Unul sau mai multe fișiere este prea mare sau este un tip de fișier care nu este permis. Tipurile de fișiere permise sunt png, gif, jpg, doc, docx, pdf și txt.', - ), + ], -); +]; diff --git a/resources/lang/ro/admin/users/table.php b/resources/lang/ro/admin/users/table.php index 3e8eecae0d..91975ec7b4 100644 --- a/resources/lang/ro/admin/users/table.php +++ b/resources/lang/ro/admin/users/table.php @@ -1,6 +1,6 @@ 'Activ', 'allow' => 'Permite', 'checkedout' => 'Active', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Afișați utilizatorii curenți', 'show_deleted' => 'Afișați utilizatorii șterși', 'title' => 'Titlu', - 'to_restore_them' => 'pentru a le restabili.', + 'to_restore_them' => 'pentru a le restabili.', 'updateuser' => 'Actualizeaza utilizator', 'username' => 'Utilizator', - 'user_deleted_text' => 'Acest utilizator a fost marcat ca șters.', + 'user_deleted_text' => 'Acest utilizator a fost marcat ca șters.', 'username_note' => '(Folosit numai pentru legatura cu Active Directory, nu pentru logare.)', 'cloneuser' => 'Cloneaza utilizator', 'viewusers' => 'Vezi utilizatori', -); +]; diff --git a/resources/lang/ro/auth/general.php b/resources/lang/ro/auth/general.php index a4640a445b..e583e61594 100644 --- a/resources/lang/ro/auth/general.php +++ b/resources/lang/ro/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ro/auth/message.php b/resources/lang/ro/auth/message.php index 9526afa804..864e55fc66 100644 --- a/resources/lang/ro/auth/message.php +++ b/resources/lang/ro/auth/message.php @@ -1,6 +1,6 @@ 'Exista deja un cont cu aceasta adresa de e-mail.', 'account_not_found' => 'Numele de utilizator sau parola este incorecta.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Acest utilizator este banat.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'A aparut o problema la logare, va rugam incercati iar.', 'success' => 'V-ati logat cu succes.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'A aparut o problema in timp ce incercam sa va creem contul, incercati iar.', 'success' => 'Cont creat.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'A aparut o problema in timp ce se crea un cod de resetare parola, va rugam incercati iar.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'A aparut o problema in timp ce incercam sa resetam parola, incercati iar.', 'success' => 'Parola a fost schimbata.', - ), + ], - -); +]; diff --git a/resources/lang/ro/button.php b/resources/lang/ro/button.php index 5770f91aec..c21a4aad1d 100644 --- a/resources/lang/ro/button.php +++ b/resources/lang/ro/button.php @@ -1,6 +1,6 @@ 'Actiuni', 'add' => 'Adauga', 'cancel' => 'Anuleaza', @@ -11,7 +11,7 @@ return array( 'request' => 'Cerere', 'submit' => 'Trimiteti', 'upload' => 'Incarca', - 'select_file' => 'Selectați Fișier ...', + 'select_file' => 'Selectați Fișier ...', 'select_files' => 'Selectați Fișier...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php index 5378508465..c22a52280c 100644 --- a/resources/lang/ro/general.php +++ b/resources/lang/ro/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Oras', - 'click_here' => 'Click aici', + 'click_here' => 'Click aici', 'clear_selection' => 'Clear Selection', 'companies' => 'Companii', 'company' => 'Companie', 'component' => 'component', 'components' => 'Componente', - 'complete' => 'Complet', + 'complete' => 'Complet', 'consumable' => 'Consumabil', 'consumables' => 'Consumabile', 'country' => 'Tara', diff --git a/resources/lang/ro/help.php b/resources/lang/ro/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ro/help.php +++ b/resources/lang/ro/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ro/mail.php b/resources/lang/ro/mail.php index 0b6c9b0768..c0a3bccef5 100644 --- a/resources/lang/ro/mail.php +++ b/resources/lang/ro/mail.php @@ -1,6 +1,6 @@ 'Un utilizator a anulat o solicitare de element pe site', 'a_user_requested' => 'Un utilizator a solicitat un element de pe site', 'accessory_name' => 'Nume accesoriu:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ro/pagination.php b/resources/lang/ro/pagination.php index 3f1350d64e..f14c69d329 100644 --- a/resources/lang/ro/pagination.php +++ b/resources/lang/ro/pagination.php @@ -1,6 +1,6 @@ 'Urmatorul »', -); +]; diff --git a/resources/lang/ro/passwords.php b/resources/lang/ro/passwords.php index e8d1f79d12..cb6bdbbf12 100644 --- a/resources/lang/ro/passwords.php +++ b/resources/lang/ro/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Linkul dvs. de parolă a fost trimis!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/ro/reminders.php b/resources/lang/ro/reminders.php index 12758b84f5..f43306f212 100644 --- a/resources/lang/ro/reminders.php +++ b/resources/lang/ro/reminders.php @@ -1,6 +1,6 @@ "Parolele trebuie sa fie de cel putin 6 caractere si sa fie la fel ca si confirmarea.", + 'password' => 'Parolele trebuie sa fie de cel putin 6 caractere si sa fie la fel ca si confirmarea.', - "user" => "Utilizator sau e-mail gresit", + 'user' => 'Utilizator sau e-mail gresit', - "token" => "Acest token este invalid.", + 'token' => 'Acest token este invalid.', - "sent" => "Daca s-a gasit adresa de e-mail, atunci veti primi un reminder la parola!", + 'sent' => 'Daca s-a gasit adresa de e-mail, atunci veti primi un reminder la parola!', -); +]; diff --git a/resources/lang/ro/table.php b/resources/lang/ro/table.php index c7e946ed86..c0d02c01ed 100644 --- a/resources/lang/ro/table.php +++ b/resources/lang/ro/table.php @@ -1,10 +1,10 @@ 'Actiuni', 'action' => 'Actiune', 'by' => 'Facut de', 'item' => 'Articol', -); +]; diff --git a/resources/lang/ro/validation.php b/resources/lang/ro/validation.php index e4b9932287..7e6a6e5f9a 100644 --- a/resources/lang/ro/validation.php +++ b/resources/lang/ro/validation.php @@ -1,6 +1,6 @@ ':attribute este deja folosit.', 'uploaded' => 'Atributul: nu a reușit să se încarce.', 'url' => 'Formatul :attribute nu este valid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Câmpul atributului: conține un caracter care nu este permis.", - "email_array" => "Una sau mai multe adrese de e-mail este nevalidă.", - "hashed_pass" => "Parola curentă este incorectă", + 'alpha_space' => 'Câmpul atributului: conține un caracter care nu este permis.', + 'email_array' => 'Una sau mai multe adrese de e-mail este nevalidă.', + 'hashed_pass' => 'Parola curentă este incorectă', 'dumbpwd' => 'Această parolă este prea obișnuită.', - "statuslabel_type" => "Trebuie să selectați un tip de etichetă de stare validă", + 'statuslabel_type' => 'Trebuie să selectați un tip de etichetă de stare validă', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ru/admin/accessories/general.php b/resources/lang/ru/admin/accessories/general.php index 347214ee41..547bcb9232 100644 --- a/resources/lang/ru/admin/accessories/general.php +++ b/resources/lang/ru/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Категория аксессуара', 'accessory_name' => 'Имя аксессуара', 'checkout' => 'Отвязать прочее', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Использовать главное пользовательское соглашение по умолчанию.', 'use_default_eula_disabled' => 'Использовать основное пользовательское соглашение. Не задано основное пользовательское соглашение. Добавьте его в Настройках.', -); +]; diff --git a/resources/lang/ru/admin/accessories/message.php b/resources/lang/ru/admin/accessories/message.php index 4304b2b643..e845d7daed 100644 --- a/resources/lang/ru/admin/accessories/message.php +++ b/resources/lang/ru/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Аксессуар [:id] не существует.', 'assoc_users' => 'Данный аксессуар выдан пользователям в количестве :count. Сделайте возврат аксессуара и попробуйте снова. ', - 'create' => array( + 'create' => [ 'error' => 'Аксесуар не был создан, попробуйте ещё раз.', - 'success' => 'Аксесуар успешно создан.' - ), + 'success' => 'Аксесуар успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Аксесуар не обновлён, попробуйте ещё раз', - 'success' => 'Аксесуар успешно обновлён.' - ), + 'success' => 'Аксесуар успешно обновлён.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить этот компонент?', 'error' => 'Невозможно удалить компонент. Пожалуйста, попробуйте еще раз.', - 'success' => 'Копонент удален успешно.' - ), + 'success' => 'Копонент удален успешно.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ошибка при выдаче аксессуара. Повторите попытку', 'success' => 'Аксессуар успешно выдан.', - 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.' - ), + 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ошибка при возврате аксессуара. Повторите попытку', 'success' => 'Аксессуар успешно возвращен.', - 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.' - ) + 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.', + ], - -); +]; diff --git a/resources/lang/ru/admin/accessories/table.php b/resources/lang/ru/admin/accessories/table.php index f452ee49da..e83ffaf5c7 100644 --- a/resources/lang/ru/admin/accessories/table.php +++ b/resources/lang/ru/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Загрузить CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Загрузить CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Принятие', 'title' => 'Название аксессуара', - -); +]; diff --git a/resources/lang/ru/admin/asset_maintenances/form.php b/resources/lang/ru/admin/asset_maintenances/form.php index b37f484f5c..6b8beb0856 100644 --- a/resources/lang/ru/admin/asset_maintenances/form.php +++ b/resources/lang/ru/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Время обслуживания (в днях)', 'notes' => 'Примечания', 'update' => 'Обновить статус', - 'create' => 'Создать' + 'create' => 'Создать', ]; diff --git a/resources/lang/ru/admin/asset_maintenances/message.php b/resources/lang/ru/admin/asset_maintenances/message.php index 04dbcad26c..f3f2beaa02 100644 --- a/resources/lang/ru/admin/asset_maintenances/message.php +++ b/resources/lang/ru/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Вы уверены что хотите удалить?', 'error' => 'При удалении возникла проблема. Пожалуйста попробуйте еще раз.', - 'success' => 'Удалено.' + 'success' => 'Удалено.', ], 'create' => [ 'error' => 'Не выполнено, попробуйте еще раз.', - 'success' => 'Выполнено.' + 'success' => 'Выполнено.', ], 'edit' => [ 'error' => 'Обслуживание активов не было отредактировано, повторите попытку.', - 'success' => 'Управление активами отредактировано успешно.' + 'success' => 'Управление активами отредактировано успешно.', ], 'asset_maintenance_incomplete' => 'Ещё не готово', 'warranty' => 'Гарантия', 'not_warranty' => 'Гарантии нет/истекла', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ru/admin/asset_maintenances/table.php b/resources/lang/ru/admin/asset_maintenances/table.php index ca92426162..733724fa83 100644 --- a/resources/lang/ru/admin/asset_maintenances/table.php +++ b/resources/lang/ru/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Заголовок', 'asset_name' => 'Имя ресурса', 'is_warranty' => 'Гарантия', - 'dl_csv' => 'Загрузить CSV' + 'dl_csv' => 'Загрузить CSV', ]; diff --git a/resources/lang/ru/admin/categories/general.php b/resources/lang/ru/admin/categories/general.php index 85da68624a..0add5c0e8c 100644 --- a/resources/lang/ru/admin/categories/general.php +++ b/resources/lang/ru/admin/categories/general.php @@ -1,6 +1,6 @@ 'Категории активов', 'category_name' => 'Имя категории', 'checkin_email' => 'Отправить email пользователю при выдаче или возврате.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Использовать главное пользовательское соглашение по умолчанию.', 'use_default_eula_disabled' => 'Использовать основное пользовательское соглашение. Не задано основное пользовательское соглашение. Добавьте его в Настройках.', -); +]; diff --git a/resources/lang/ru/admin/categories/message.php b/resources/lang/ru/admin/categories/message.php index ba3d5a3fbf..aeec335d20 100644 --- a/resources/lang/ru/admin/categories/message.php +++ b/resources/lang/ru/admin/categories/message.php @@ -1,25 +1,25 @@ 'Категория не существует.', 'assoc_models' => 'Эта категория уже связана с одной или несколькими моделями и не может быть удалена. Пожалуйста обновите категории в моделях и повторите попытку. ', 'assoc_items' => 'Эта категория связана с одним или несколькими типами активов и не может быть удалена. Пожалуйста обновите категории типов активов и повторите попытку. ', - 'create' => array( + 'create' => [ 'error' => 'Категория не создана, пожалуйста попробуйте снова.', - 'success' => 'Категория успешно создана.' - ), + 'success' => 'Категория успешно создана.', + ], - 'update' => array( + 'update' => [ 'error' => 'Категория не изменена, пожалуйста попробуйте снова', - 'success' => 'Категория успешно изменена.' - ), + 'success' => 'Категория успешно изменена.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены что хотите удалить категорию?', 'error' => 'При удалении категории возникла проблема. Пожалуйста попробуйте снова.', - 'success' => 'Категория успешно удалена.' - ) + 'success' => 'Категория успешно удалена.', + ], -); +]; diff --git a/resources/lang/ru/admin/categories/table.php b/resources/lang/ru/admin/categories/table.php index 9933c0d8e2..9225a3813f 100644 --- a/resources/lang/ru/admin/categories/table.php +++ b/resources/lang/ru/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Родительская категория', 'require_acceptance' => 'Подтверждение', 'title' => 'Имя категории актива', -); +]; diff --git a/resources/lang/ru/admin/companies/general.php b/resources/lang/ru/admin/companies/general.php index 3459be01da..ea26c0e8b7 100644 --- a/resources/lang/ru/admin/companies/general.php +++ b/resources/lang/ru/admin/companies/general.php @@ -1,4 +1,5 @@ 'Выберите компанию', ]; diff --git a/resources/lang/ru/admin/companies/message.php b/resources/lang/ru/admin/companies/message.php index 9e9a532cbb..68fcca9cb8 100644 --- a/resources/lang/ru/admin/companies/message.php +++ b/resources/lang/ru/admin/companies/message.php @@ -1,18 +1,19 @@ 'Компания не существует.', 'assoc_users' => 'Эта компания на данный момент связана по крайней мере с одной моделью и не может быть удалена. Пожалуйста обновите модели, убрав ссылку на эту компанию, и попробуйте снова. ', - 'create' => array( + 'create' => [ 'error' => 'Компания не была создана, попробуйте ещё раз.', - 'success' => 'Компания создана успешно.' - ), - 'update' => array( + 'success' => 'Компания создана успешно.', + ], + 'update' => [ 'error' => 'Компания не была обновлена, попробуйте ещё раз', - 'success' => 'Компания обновлена успешно.' - ), - 'delete' => array( + 'success' => 'Компания обновлена успешно.', + ], + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить эту компанию?', 'error' => 'Возникла проблема при удалении компании. Пожалуйста попробуйте снова.', - 'success' => 'Компания была успешно удалена.' - ) -); + 'success' => 'Компания была успешно удалена.', + ], +]; diff --git a/resources/lang/ru/admin/companies/table.php b/resources/lang/ru/admin/companies/table.php index a8197a1121..d002e1c8f8 100644 --- a/resources/lang/ru/admin/companies/table.php +++ b/resources/lang/ru/admin/companies/table.php @@ -1,9 +1,10 @@ 'Компании', 'create' => 'Создать компанию', 'title' => 'Компания', 'update' => 'Обновить компанию', 'name' => 'Название компании', 'id' => 'ID', -); +]; diff --git a/resources/lang/ru/admin/components/general.php b/resources/lang/ru/admin/components/general.php index b7aa9633d5..95f9aad1c5 100644 --- a/resources/lang/ru/admin/components/general.php +++ b/resources/lang/ru/admin/components/general.php @@ -1,6 +1,6 @@ 'Наименование компонента', 'checkin' => 'Привязать компонент', 'checkout' => 'Отвязать компонент', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Остаток', 'total' => 'Всего', 'update' => 'Обновить компонент', -); +]; diff --git a/resources/lang/ru/admin/components/message.php b/resources/lang/ru/admin/components/message.php index 8f621e5912..c1b84ef3ef 100644 --- a/resources/lang/ru/admin/components/message.php +++ b/resources/lang/ru/admin/components/message.php @@ -1,36 +1,35 @@ 'Компонент не существует.', - 'create' => array( + 'create' => [ 'error' => 'Не удалось создать компонент, попробуйте еще раз.', - 'success' => 'Компонент успешно создан.' - ), + 'success' => 'Компонент успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Не удалось обновить компонент, попробуйте еще раз', - 'success' => 'Компонент успешно обновлен.' - ), + 'success' => 'Компонент успешно обновлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить этот компонент?', 'error' => 'Возникла проблема при удалении компонента, пожалуйста попробуйте еще раз.', - 'success' => 'Компонент успешно удален.' - ), + 'success' => 'Компонент успешно удален.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Не удалось отвязать компонент, пожалуйста попробуйте еще раз', 'success' => 'Связь с компонентом успешно удалена.', - 'user_does_not_exist' => 'Неверный пользователь. Попробуйте еще раз.' - ), + 'user_does_not_exist' => 'Неверный пользователь. Попробуйте еще раз.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Не удалось привязать компонент, пожалуйста попробуйте еще раз', 'success' => 'Компонент успешно привязан.', - 'user_does_not_exist' => 'Неверный пользователь. Пожалуйста, попробуйте еще раз.' - ) + 'user_does_not_exist' => 'Неверный пользователь. Пожалуйста, попробуйте еще раз.', + ], - -); +]; diff --git a/resources/lang/ru/admin/components/table.php b/resources/lang/ru/admin/components/table.php index ec03b69ad1..d9d6ed8fea 100644 --- a/resources/lang/ru/admin/components/table.php +++ b/resources/lang/ru/admin/components/table.php @@ -1,5 +1,5 @@ 'Наименование компонента', -); +]; diff --git a/resources/lang/ru/admin/consumables/general.php b/resources/lang/ru/admin/consumables/general.php index 0738a7d215..4a2afc7654 100644 --- a/resources/lang/ru/admin/consumables/general.php +++ b/resources/lang/ru/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Выдать расходники пользователю', 'consumable_name' => 'Название расходного материала', 'create' => 'Создать расходный материал', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Осталось', 'total' => 'Всего', 'update' => 'Обновить расходный материал', -); +]; diff --git a/resources/lang/ru/admin/consumables/message.php b/resources/lang/ru/admin/consumables/message.php index 0780066dd0..12d754418b 100644 --- a/resources/lang/ru/admin/consumables/message.php +++ b/resources/lang/ru/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Расходный материал не существует.', - 'create' => array( + 'create' => [ 'error' => 'Расходный материал не создан, попробуйте ещё раз.', - 'success' => 'Расходный материал успешно создан.' - ), + 'success' => 'Расходный материал успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Расходный материал не был обновлён, попробуйте ещё раз', - 'success' => 'Расходный материал успешно обновлён.' - ), + 'success' => 'Расходный материал успешно обновлён.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить расходный материал?', 'error' => 'В процессе удаления расходного материала произошла ошибка. Попробуйте ещё раз.', - 'success' => 'Расходный материал успешно удалён.' - ), + 'success' => 'Расходный материал успешно удалён.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Расходный материал не был выдан, попробуйте ещё раз', 'success' => 'Расходный материал успешно выдан.', - 'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.' - ), + 'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Расходный материал не был принят, попробуйте ещё раз', 'success' => 'Расходный материал успешно принят.', - 'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.' - ) + 'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.', + ], - -); +]; diff --git a/resources/lang/ru/admin/consumables/table.php b/resources/lang/ru/admin/consumables/table.php index 8d7f9ad6d4..eb9863b15c 100644 --- a/resources/lang/ru/admin/consumables/table.php +++ b/resources/lang/ru/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Название расходного материала', -); +]; diff --git a/resources/lang/ru/admin/custom_fields/general.php b/resources/lang/ru/admin/custom_fields/general.php index a8b94d0d16..1e8de3f3f0 100644 --- a/resources/lang/ru/admin/custom_fields/general.php +++ b/resources/lang/ru/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Настраиваемые поля', 'field' => 'Поле', 'about_fieldsets_title' => 'О наборах полей', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Новое настраиваемое поле', 'value_encrypted' => 'Значение этого поля зашифровано в базе данных. Только администраторам будет доступно для просмотра расшифрованное значение', 'show_in_email' => 'Включить значение этого поля в письма, которое будет отправлено пользователю? Зашифрованные поля не могут быть включены в сообщения электронной почты.', -); +]; diff --git a/resources/lang/ru/admin/custom_fields/message.php b/resources/lang/ru/admin/custom_fields/message.php index 0d074fc69c..0ed7d739bb 100644 --- a/resources/lang/ru/admin/custom_fields/message.php +++ b/resources/lang/ru/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Это поле не существует.', 'already_added' => 'Поле уже добавлено', - 'create' => array( + 'create' => [ 'error' => 'Поле не было создано, попробуйте ещё раз.', 'success' => 'Поле успешно создано.', - 'assoc_success' => 'Поле успешно добавлено в набор.' - ), + 'assoc_success' => 'Поле успешно добавлено в набор.', + ], - 'update' => array( + 'update' => [ 'error' => 'Поле не было обновлено, попробуйте ещё раз', - 'success' => 'Поле успешно обновлено.' - ), + 'success' => 'Поле успешно обновлено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить это поле?', 'error' => 'При удалении поля возникла ошибка. Попробуйте еще раз.', 'success' => 'Поле было успешно удалено.', 'in_use' => 'Поле ещё используется.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Набор полей не существует', - 'create' => array( + 'create' => [ 'error' => 'Набор полей не был создан, попробуйте ещё раз.', - 'success' => 'Набор полей создан успешно.' - ), + 'success' => 'Набор полей создан успешно.', + ], - 'update' => array( + 'update' => [ 'error' => 'Набор полей не был обновлен, попробуйте ещё раз', - 'success' => 'Набор полей успешно обновлён.' - ), + 'success' => 'Набор полей успешно обновлён.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить этот набор полей?', 'error' => 'При удалении набора полей возникла ошибка. Попробуйте еще раз.', 'success' => 'Набор полей был успешно удален.', 'in_use' => 'Набор полей всё ещё используется.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ru/admin/departments/message.php b/resources/lang/ru/admin/departments/message.php index a81a1f977c..174b542c5b 100644 --- a/resources/lang/ru/admin/departments/message.php +++ b/resources/lang/ru/admin/departments/message.php @@ -1,21 +1,21 @@ 'Департамент не существует.', 'assoc_users' => 'Департамент в данный момент связан с одним или несколькими пользователями и не может быть удалён. Удалите или измените связи в пользователях и попробуйте ещё раз. ', - 'create' => array( + 'create' => [ 'error' => 'Департамент не был создан, попробуйте ещё раз.', - 'success' => 'Департамент успешно создан.' - ), - 'update' => array( + 'success' => 'Департамент успешно создан.', + ], + 'update' => [ 'error' => 'Департамент не был изменён, попробуйте ещё раз', - 'success' => 'Департамент успешно изменён.' - ), - 'delete' => array( + 'success' => 'Департамент успешно изменён.', + ], + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить этот департамент?', 'error' => 'При удалении департамента возникла проблема. Пожалуйста, попробуйте ещё раз.', - 'success' => 'Департамент был успешно удалён.' - ) + 'success' => 'Департамент был успешно удалён.', + ], -); +]; diff --git a/resources/lang/ru/admin/departments/table.php b/resources/lang/ru/admin/departments/table.php index 3c88e259b3..e96d2055ab 100644 --- a/resources/lang/ru/admin/departments/table.php +++ b/resources/lang/ru/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Название департамента', @@ -8,4 +8,4 @@ return array( 'location' => 'Расположение', 'create' => 'Создать департамент', 'update' => 'Изменить департамент', - ); + ]; diff --git a/resources/lang/ru/admin/depreciations/general.php b/resources/lang/ru/admin/depreciations/general.php index 8043ef5dd9..1b29636370 100644 --- a/resources/lang/ru/admin/depreciations/general.php +++ b/resources/lang/ru/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'О износе активов', 'about_depreciations' => 'Этот раздел служит для настройки расчета вычисления степени износа активов.', 'asset_depreciations' => 'Износ активов', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Количество месяцев', 'update' => 'Обновить амортизацию', -); +]; diff --git a/resources/lang/ru/admin/depreciations/message.php b/resources/lang/ru/admin/depreciations/message.php index 6964ce7ffc..05b529bc64 100644 --- a/resources/lang/ru/admin/depreciations/message.php +++ b/resources/lang/ru/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Класс амортизации не существует.', 'assoc_users' => 'Данная амортизация связана с одной или несколькими моделями, и не может быть удалена. Удалите либо измените связанные модели. ', - - 'create' => array( + 'create' => [ 'error' => 'Класс амортизации не был создан, попробуйте еще раз.', - 'success' => 'Класс амортизации успешно создан.' - ), + 'success' => 'Класс амортизации успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Класс амортизации не был обновлен, попробуйте еще раз', - 'success' => 'Класс амортизации успешно обновлен.' - ), + 'success' => 'Класс амортизации успешно обновлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить класс амортизации?', 'error' => 'При удалении класса амортизации произошла ошибка. Попробуйте еще раз.', - 'success' => 'Класс амортизации успешно удален.' - ) + 'success' => 'Класс амортизации успешно удален.', + ], -); +]; diff --git a/resources/lang/ru/admin/depreciations/table.php b/resources/lang/ru/admin/depreciations/table.php index 63c8cb33a5..ce10ec8f22 100644 --- a/resources/lang/ru/admin/depreciations/table.php +++ b/resources/lang/ru/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Месяцев', 'term' => 'Срок', 'title' => 'Название ', -); +]; diff --git a/resources/lang/ru/admin/groups/message.php b/resources/lang/ru/admin/groups/message.php index 577238b092..10296ac876 100644 --- a/resources/lang/ru/admin/groups/message.php +++ b/resources/lang/ru/admin/groups/message.php @@ -1,22 +1,22 @@ 'Группа уже существует!', 'group_not_found' => 'Группа [:id] не существует.', 'group_name_required' => 'Поле "Имя" является обязательным', - 'success' => array( + 'success' => [ 'create' => 'Группа успешно создана.', 'update' => 'Группа успешно изменена.', 'delete' => 'Группа успешно удалена.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены что хотите удалить эту группу?', 'create' => 'При созданий группы возникла проблема. Пожалуйста попробуйте снова.', 'update' => 'При изменении группы возникла проблема. Пожалуйста попробуйте снова.', 'delete' => 'При удалении группы возникла проблема. Пожалуйста попробуйте снова.', - ), + ], -); +]; diff --git a/resources/lang/ru/admin/groups/table.php b/resources/lang/ru/admin/groups/table.php index 5cf4ea2eb2..97c9b08bff 100644 --- a/resources/lang/ru/admin/groups/table.php +++ b/resources/lang/ru/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Название', 'users' => 'Кол-во пользователей', -); +]; diff --git a/resources/lang/ru/admin/groups/titles.php b/resources/lang/ru/admin/groups/titles.php index c20033be18..14fc762b78 100644 --- a/resources/lang/ru/admin/groups/titles.php +++ b/resources/lang/ru/admin/groups/titles.php @@ -1,6 +1,6 @@ 'О группах', 'about_groups' => 'Группы используются для обобщения разрешений пользователей.', 'group_management' => 'Управление группой', @@ -11,4 +11,4 @@ return array( 'allow' => 'Разрешить', 'deny' => 'Запретить', -); +]; diff --git a/resources/lang/ru/admin/hardware/form.php b/resources/lang/ru/admin/hardware/form.php index 93cc4d0332..b95782dc83 100644 --- a/resources/lang/ru/admin/hardware/form.php +++ b/resources/lang/ru/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Подвердите массовое удаление активов', +return [ + 'bulk_delete' => 'Подвердите массовое удаление активов', 'bulk_delete_help' => 'Просмотрите активны, выбранные для удаления. После удаления активы могут быть восстановлены, но уже не будет привязаны к пользователям, к которым они привязаны сейчас.', 'bulk_delete_warn' => 'Вы собираетесь удалить :asset_count активов.', - 'bulk_update' => 'Редактировать выбранное', - 'bulk_update_help' => 'Эта форма позволяет Вам обновить несколько объектов за раз. Заполняйте только те поля, которые нужно изменить. Пустые поля останутся без изменений. ', - 'bulk_update_warn' => 'Редактирование свойств :asset_count assets.', + 'bulk_update' => 'Редактировать выбранное', + 'bulk_update_help' => 'Эта форма позволяет Вам обновить несколько объектов за раз. Заполняйте только те поля, которые нужно изменить. Пустые поля останутся без изменений. ', + 'bulk_update_warn' => 'Редактирование свойств :asset_count assets.', 'checkedout_to' => 'Привязан к', 'checkout_date' => 'Дата выдачи', 'checkin_date' => 'Дата возврата', @@ -38,7 +38,6 @@ return array( 'tag' => 'Тег актива', 'update' => 'Изменить актив', 'warranty' => 'Гарантия', - 'warranty_expires' => 'Срок действия гарантии', + 'warranty_expires' => 'Срок действия гарантии', 'years' => 'Лет', -) -; +]; diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php index 9e99343023..a153f78548 100644 --- a/resources/lang/ru/admin/hardware/general.php +++ b/resources/lang/ru/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Об активах', 'about_assets_text' => 'Активы - вещи, которые отслеживаются по серийному номеру или инвентарному номеру. Они, как правило, являются ценными.', - 'archived' => 'Архивированные', + 'archived' => 'Архивированные', 'asset' => 'Актив', 'bulk_checkout' => 'Выдать актив пользователю', 'checkin' => 'Вернуть актив на склад', @@ -19,4 +19,4 @@ return array( 'pending' => 'Ожидание', 'undeployable' => 'Выданные', 'view' => 'Показать актив', -); +]; diff --git a/resources/lang/ru/admin/hardware/message.php b/resources/lang/ru/admin/hardware/message.php index fdaa204ee3..0b0008697d 100644 --- a/resources/lang/ru/admin/hardware/message.php +++ b/resources/lang/ru/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Внимание: Этот актив был помечен как выданный. Если этот статус изменился, необходимо его обновить.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Почти получилось. Актив не существует и не доступен для выдачи.', 'assoc_users' => 'Этот актив в настоящее время привязан к пользователю и не может быть удален. Пожалуйста сначала снимите привязку, и затем попробуйте удалить снова. ', - 'create' => array( + 'create' => [ 'error' => 'Актив не был создан, пожалуйста попробуйте снова. :(', - 'success' => 'Актив успешно создан. :)' - ), + 'success' => 'Актив успешно создан. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Актив не был изменен, пожалуйста попробуйте снова', 'success' => 'Актив успешно изменен.', 'nothing_updated' => 'Поля не выбраны, нечего обновлять.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Актив не был восстановлен, повторите попытку', - 'success' => 'Актив успешно восстановлен.' - ), + 'success' => 'Актив успешно восстановлен.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Аудит активов не увенчался успехом. Пожалуйста, попробуйте еще раз.', - 'success' => 'Аудит успешно выполнен.' - ), + 'success' => 'Аудит успешно выполнен.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Не удалось удалить файл. Повторите попытку.', 'success' => 'Файл успешно удален.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Не удалось загрузить файл(ы). Повторите попытку.', 'success' => 'Файл(ы) успешно загружены.', 'nofiles' => 'Не выбрано ни одного файла для загрузки или файл, который вы пытаетесь загрузить, слишком большой', 'invalidfiles' => 'Один или несколько ваших файлов слишком большого размера или имеют неподдерживаемый формат. Разрешены только следующие форматы файлов: png, gif, jpg, doc, docx, pdf, txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Некоторые элементы не были импортированы корректно.', 'errorDetail' => 'Следующие элементы не были импортированы из за ошибок.', - 'success' => "Ваш файл был импортирован", - 'file_delete_success' => "Ваш файл был успешно удален", - 'file_delete_error' => "Невозможно удалить файл", - ), + 'success' => 'Ваш файл был импортирован', + 'file_delete_success' => 'Ваш файл был успешно удален', + 'file_delete_error' => 'Невозможно удалить файл', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены что хотите удалить этот актив?', 'error' => 'При удалении актива возникла проблема. Пожалуйста попробуйте снова.', 'nothing_updated' => 'Ни один из активов не выбран, поэтому ничего не удалено.', - 'success' => 'Актив был успешно удален.' - ), + 'success' => 'Актив был успешно удален.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Актив не был привязан, пожалуйста попробуйте снова', 'success' => 'Актив успешно привязан.', 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.', 'not_available' => 'Данный актив недоступен к выдаче!', - 'no_assets_selected' => 'Вы должны выбрать хотя бы один актив из списка' - ), + 'no_assets_selected' => 'Вы должны выбрать хотя бы один актив из списка', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Актив не был отвязан, пожалуйста попробуйте снова', 'success' => 'Актив успешно отвязан.', 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.', 'already_checked_in' => 'Этот актив уже привязан.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Актив не был запрошен, попробуйте ещё раз', 'success' => 'Актив запрошен успешно.', - 'canceled' => 'Запрос актива успешно отменен' - ) + 'canceled' => 'Запрос актива успешно отменен', + ], -); +]; diff --git a/resources/lang/ru/admin/hardware/table.php b/resources/lang/ru/admin/hardware/table.php index e436562740..906130fc8f 100644 --- a/resources/lang/ru/admin/hardware/table.php +++ b/resources/lang/ru/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Тег', 'asset_model' => 'Модель', @@ -20,6 +20,6 @@ return array( 'title' => 'Актив ', 'image' => 'Изображение устройства', 'days_without_acceptance' => 'Дней без принятия', - 'monthly_depreciation' => 'Ежемесячная амортизация' + 'monthly_depreciation' => 'Ежемесячная амортизация', -); +]; diff --git a/resources/lang/ru/admin/kits/general.php b/resources/lang/ru/admin/kits/general.php index 92c7b10c2d..a2538897c1 100644 --- a/resources/lang/ru/admin/kits/general.php +++ b/resources/lang/ru/admin/kits/general.php @@ -1,6 +1,6 @@ 'О готовых наборах', 'about_kits_text' => 'Готовые Наборы позволяют быстро выдать несколько предметов (активов, лицензий, и т. д.) пользователю. Это может быть очень удобно, когда Вы сталкиваетесь с процессом массовой выдачи предметов большому количеству пользователей или же Ваши пользователи часто получают одни и те же предметы.', 'checkout' => 'Выдать готовый набор ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Недостаточно доступных единиц :consumable для выдачи. Необходимое количество - :qty ед. ', 'none_accessory' => 'Недостаточно единиц :accessory для выдачи. Необходимое количество - :qty ед. ', -); +]; diff --git a/resources/lang/ru/admin/licenses/form.php b/resources/lang/ru/admin/licenses/form.php index c3ab4eff5f..78ecc931ad 100644 --- a/resources/lang/ru/admin/licenses/form.php +++ b/resources/lang/ru/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Актив', 'checkin' => 'Привязать', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Лицензирован на E-mail', 'to_name' => 'Лицензировано на имя', 'update' => 'Обновить лицензию', - 'checkout_help' => 'Вы должны привязать лицензию к физическому активу или человеку. Вы можете выбрать оба варианта, но владелец актива должен соответствовать человеку привязанному к этому активу.' -); + 'checkout_help' => 'Вы должны привязать лицензию к физическому активу или человеку. Вы можете выбрать оба варианта, но владелец актива должен соответствовать человеку привязанному к этому активу.', +]; diff --git a/resources/lang/ru/admin/licenses/general.php b/resources/lang/ru/admin/licenses/general.php index 7b5f736bcc..6494931686 100644 --- a/resources/lang/ru/admin/licenses/general.php +++ b/resources/lang/ru/admin/licenses/general.php @@ -1,6 +1,6 @@ 'О лицензиях', 'about_licenses' => 'Лицензии используются для отслеживания программного обеспечения. Как правило, количество пользователей, которые могут их использовать - ограничено', 'checkin' => 'Отвязать лицензию', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Лицензии ПО', 'user' => 'Пользователь', 'view' => 'Показать лицензию', -); +]; diff --git a/resources/lang/ru/admin/licenses/message.php b/resources/lang/ru/admin/licenses/message.php index 62665e00e1..37b8376187 100644 --- a/resources/lang/ru/admin/licenses/message.php +++ b/resources/lang/ru/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Лицензия не существует.', 'user_does_not_exist' => 'Пользователь не существует.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Вы должны выбрать актив или пользователя, но не оба.', 'not_found' => 'Лицензия не найдена', - - 'create' => array( + 'create' => [ 'error' => 'Невозможно создать лицензию, повторите попытку.', - 'success' => 'Лицензия успешно создана.' - ), + 'success' => 'Лицензия успешно создана.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Не удалось удалить файл. Повторите попытку.', 'success' => 'Файл успешно удален.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Не удалось загрузить файл(ы). Повторите попытку.', 'success' => 'Файл(ы) успешно загружены.', 'nofiles' => 'Не выбрано ни одного файла для загрузки или файл, который вы пытаетесь загрузить, слишком большой', 'invalidfiles' => 'Один из ваших файлов слишком большой или имеет запрещенный тип файла. Резрешенные типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, и lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Невозможно обновить лицензию, повторите попытку', - 'success' => 'Лицензия успешно обновлена.' - ), + 'success' => 'Лицензия успешно обновлена.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить эту лицензию?', 'error' => 'При удалении лицензии возникли проблемы. Повторите попытку.', - 'success' => 'Лицензия успешно удалена.' - ), + 'success' => 'Лицензия успешно удалена.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'При выдаче лицензии произошла ошибка. Повторите попытку.', - 'success' => 'Лицензия успешно назначена' - ), + 'success' => 'Лицензия успешно назначена', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'При возврате лицензии произошла ошибка. Попробуйте еще раз.', - 'success' => 'Лицензия успешно назначена' - ), + 'success' => 'Лицензия успешно назначена', + ], -); +]; diff --git a/resources/lang/ru/admin/licenses/table.php b/resources/lang/ru/admin/licenses/table.php index b6d33fa250..6c0720e0bb 100644 --- a/resources/lang/ru/admin/licenses/table.php +++ b/resources/lang/ru/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Выдано', 'checkout' => 'Выдача/Возврат', @@ -14,4 +14,4 @@ return array( 'serial' => 'Серийный номер', 'title' => 'Лицензия', -); +]; diff --git a/resources/lang/ru/admin/locations/message.php b/resources/lang/ru/admin/locations/message.php index a5317ed843..a32f59b004 100644 --- a/resources/lang/ru/admin/locations/message.php +++ b/resources/lang/ru/admin/locations/message.php @@ -1,27 +1,26 @@ 'Статус актива не существует.', 'assoc_users' => 'Данный статус связан с одним или несколькими активами, и не может быть удален. Удалите либо измените связанные активы. ', 'assoc_assets' => 'Это месторасположение связано как минимум с одним активом и не может быть удалено. Измените ваши активы так, чтобы они не ссылались на это месторасположение и попробуйте ещё раз. ', 'assoc_child_loc' => 'У этого месторасположения является родительским и у него есть как минимум одно месторасположение уровнем ниже. Поэтому оно не может быть удалено. Обновите ваши месторасположения, так чтобы не ссылаться на него и попробуйте снова. ', - - 'create' => array( + 'create' => [ 'error' => 'Статус актива не был создан, попробуйте еще раз.', - 'success' => 'Статус актива успешно создан.' - ), + 'success' => 'Статус актива успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Статус актива не был обновлен, попробуйте еще раз', - 'success' => 'Статус актива успешно обновлен.' - ), + 'success' => 'Статус актива успешно обновлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверено, что хотите удалить этот статус?', 'error' => 'При удалении статуса актива произошла ошибка. Попробуйте еще раз.', - 'success' => 'Статус актива успешно удален.' - ) + 'success' => 'Статус актива успешно удален.', + ], -); +]; diff --git a/resources/lang/ru/admin/locations/table.php b/resources/lang/ru/admin/locations/table.php index 692dcfa2c0..1eed58c1c9 100644 --- a/resources/lang/ru/admin/locations/table.php +++ b/resources/lang/ru/admin/locations/table.php @@ -1,6 +1,6 @@ 'О местонахождениях', 'about_locations' => 'Местонахождения используются для отслеживания информации о месте находжения активов, и прочих элементов', 'assets_rtd' => 'Активы', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Родитель', 'currency' => 'Валюта местонахождения', 'ldap_ou' => 'Поиск в LDAP OU', - ); + ]; diff --git a/resources/lang/ru/admin/manufacturers/message.php b/resources/lang/ru/admin/manufacturers/message.php index eb55e40ee4..c366efed9b 100644 --- a/resources/lang/ru/admin/manufacturers/message.php +++ b/resources/lang/ru/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Производителя не существует.', 'assoc_users' => 'Этот производитель сейчас связан с как минимум одной моделью и не может быть удален. Для удаления необходимо удалить связь модели с производителем. ', - 'create' => array( + 'create' => [ 'error' => 'Невозможно создать производителя, повторите попытку.', - 'success' => 'Производитель успешно создан.' - ), + 'success' => 'Производитель успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Производитель не был обновлен, повторите попытку', - 'success' => 'Производитель успешно обновлен.' - ), + 'success' => 'Производитель успешно обновлен.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Производитель не был восстановлен, повторите попытку', - 'success' => 'Производитель успешно восстановлен.' - ), + 'success' => 'Производитель успешно восстановлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы действительно хотите удалить производителя?', 'error' => 'При удалении производителя возникла ошибка. Повторите попытку.', - 'success' => 'Производитель успешно удален.' - ) + 'success' => 'Производитель успешно удален.', + ], -); +]; diff --git a/resources/lang/ru/admin/manufacturers/table.php b/resources/lang/ru/admin/manufacturers/table.php index c878296418..f6c29d299a 100644 --- a/resources/lang/ru/admin/manufacturers/table.php +++ b/resources/lang/ru/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'О производителях', 'about_manufacturers_text' => 'Производители - компании, создающие ваши активы. Вы можете хранить здесь важные контактные данные, которые будут отображаться вместе с подробностями о ваших активах.', 'asset_manufacturers' => 'Производители оборудования', @@ -13,4 +13,4 @@ return array( 'update' => 'Обновить производителя', 'url' => 'Адрес', -); +]; diff --git a/resources/lang/ru/admin/models/general.php b/resources/lang/ru/admin/models/general.php index eb9947b5c0..8fbc01e29f 100644 --- a/resources/lang/ru/admin/models/general.php +++ b/resources/lang/ru/admin/models/general.php @@ -1,6 +1,6 @@ 'О моделях активов', 'about_models_text' => 'Модели активов это способ группировки идентичных активов. Например, "MacBookPro 2013, iPhone 6s", и т. д.', 'deleted' => 'Эта модель была удалена. Нажмите здесь, чтобы восстановить.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Вы собираетесь удалить :model_count моделей активов.', 'restore' => 'Восстановить модель', 'requestable' => 'Данная модель может быть запрошена пользователем', - 'show_mac_address' => 'Отображать поле MAC адрес для данной модели', + 'show_mac_address' => 'Отображать поле MAC адрес для данной модели', 'view_deleted' => 'Просмотр удаленных', 'view_models' => 'Просмотр моделей', 'fieldset' => 'Набор полей', 'no_custom_field' => 'Нет пользовательских полей', 'add_default_values' => 'Добавить значения по умолчанию', -); +]; diff --git a/resources/lang/ru/admin/models/message.php b/resources/lang/ru/admin/models/message.php index 9e798979c0..e99b0622ff 100644 --- a/resources/lang/ru/admin/models/message.php +++ b/resources/lang/ru/admin/models/message.php @@ -1,42 +1,41 @@ 'Модель не существует.', 'assoc_users' => 'Данная модель связана с одним или несколькими активами, и не может быть удалена. Удалите либо измените связанные активы. ', - - 'create' => array( + 'create' => [ 'error' => 'Модель не была создана, повторите еще раз.', 'success' => 'Модель успешно создана.', 'duplicate_set' => 'Модель с таким именем, производителем и номером уже существует.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Невозможно обновить Модель, повторите еще раз', - 'success' => 'Модель успешно обновлена.' - ), + 'success' => 'Модель успешно обновлена.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить данную модель актива?', 'error' => 'При удалении модели возникла ошибка. Повторите еще раз.', - 'success' => 'Модель успешно удалена.' - ), + 'success' => 'Модель успешно удалена.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Модель не была восстановлена, повторите попытку', - 'success' => 'Модель успешно восстановлена.' - ), + 'success' => 'Модель успешно восстановлена.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Никаких изменений нет, поэтому ничего не обновлено.', - 'success' => 'Модели обновлены.' - ), + 'success' => 'Модели обновлены.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Ни одна модель не выбрана, поэтому нечего удалить.', 'success' => 'Удалено :success_count моделей(ль)!', - 'success_partial' => 'Удалено : success_count моделей(ль), однако: fail_count моделей не удалены, потому что они всё ещё имеют связанные с ними активы.' - ), + 'success_partial' => 'Удалено : success_count моделей(ль), однако: fail_count моделей не удалены, потому что они всё ещё имеют связанные с ними активы.', + ], -); +]; diff --git a/resources/lang/ru/admin/models/table.php b/resources/lang/ru/admin/models/table.php index 4d5f29b9a9..bd381302f8 100644 --- a/resources/lang/ru/admin/models/table.php +++ b/resources/lang/ru/admin/models/table.php @@ -1,6 +1,6 @@ 'Создать модель актива', 'created_at' => 'Создано', @@ -14,4 +14,4 @@ return array( 'update' => 'Измененить модель актива', 'clone' => 'Клонировать модель', 'edit' => 'Изменить модель', -); +]; diff --git a/resources/lang/ru/admin/reports/general.php b/resources/lang/ru/admin/reports/general.php index c1bf5cad5c..a187fd2157 100644 --- a/resources/lang/ru/admin/reports/general.php +++ b/resources/lang/ru/admin/reports/general.php @@ -1,5 +1,5 @@ 'Выберите опции, которые должны отображаться в отчете актива.' -); +return [ + 'info' => 'Выберите опции, которые должны отображаться в отчете актива.', +]; diff --git a/resources/lang/ru/admin/reports/message.php b/resources/lang/ru/admin/reports/message.php index 4fbceef207..5afdcc1795 100644 --- a/resources/lang/ru/admin/reports/message.php +++ b/resources/lang/ru/admin/reports/message.php @@ -1,5 +1,5 @@ 'Необходимо выбрать как минимум ОДНУ опцию.' -); +return [ + 'error' => 'Необходимо выбрать как минимум ОДНУ опцию.', +]; diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php index deca2c495b..3be8c2e8f6 100644 --- a/resources/lang/ru/admin/settings/general.php +++ b/resources/lang/ru/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Домен Active Directory', 'ad_domain_help' => 'Обычно, то же, что и ваш домен, но не всегда.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'Скрытая копия', 'admin_cc_email_help' => 'Если вы хотите отправлять копии писем, что приходят пользователям при выдаче/возврате, на какой-то дополнительный адрес электронной почты, то введите его здесь. В противном случае оставьте это поле пустым.', 'is_ad' => 'У вас сервер Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Предупреждение об истечении срока (в днях)', 'alert_inv_threshold' => 'Порог оповещения о запасах', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID актива', 'audit_interval' => 'Интервал аудита', 'audit_interval_help' => 'Если вам требуется регулярно физически проверять свои активы, введите интервал в месяцах.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Введите Двухфакторный код', 'two_factor_config_complete' => 'Подтвердить код', 'two_factor_enabled_edit_not_allowed' => 'Ваш администратор не позволяет изменять этот параметр.', - 'two_factor_enrollment_text' => "Требуется двухфакторная аутентификация, однако ваше устройство еще не зарегистрировано. Откройте приложение Google Authenticator и отсканируйте QR-код ниже, чтобы зарегистрировать свое устройство. После того, как вы зарегистрируете свое устройство, введите приведенный ниже код", + 'two_factor_enrollment_text' => 'Требуется двухфакторная аутентификация, однако ваше устройство еще не зарегистрировано. Откройте приложение Google Authenticator и отсканируйте QR-код ниже, чтобы зарегистрировать свое устройство. После того, как вы зарегистрируете свое устройство, введите приведенный ниже код', 'require_accept_signature' => 'Требуется подпись', 'require_accept_signature_help_text' => 'Включение этой функции потребует от пользователей физического выхода из системы при принятии актива.', 'left' => 'слева', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Установка этого флажка включает ограничение по уникальности на серии активов', 'zerofill_count' => 'Длина инвентарного номера, включая заполнение нулями', 'username_format_help' => 'Этот параметр используется только в процессе импорта, если имя пользователя не предоставляется и мы должны сгенерировать его для Вас.', -); +]; diff --git a/resources/lang/ru/admin/settings/message.php b/resources/lang/ru/admin/settings/message.php index dcf4d4bb8c..81ffa2d6e8 100644 --- a/resources/lang/ru/admin/settings/message.php +++ b/resources/lang/ru/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'При обновлении произошла ошибка. ', - 'success' => 'Настройки успешно обновлены.' - ), - 'backup' => array( + 'success' => 'Настройки успешно обновлены.', + ], + 'backup' => [ 'delete_confirm' => 'Вы уверены, что хотите удалить резервную копию? Это действие нельзя отменить. ', 'file_deleted' => 'Резервная копия успешно удалена. ', 'generated' => 'Новая резервная копия успешно создана.', 'file_not_found' => 'Эта резервная копия не найдена на сервере.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Возникла ошибка при попытке очистки. ', 'validation_failed' => 'Ваш текст подтверждения очистки неверен. Пожалуйста, наберите слово "DELETE" в поле подтверждения.', - 'success' => 'Удаленные записи успешно очищены.' - ), + 'success' => 'Удаленные записи успешно очищены.', + ], -); +]; diff --git a/resources/lang/ru/admin/statuslabels/message.php b/resources/lang/ru/admin/statuslabels/message.php index ae0bfc94fc..e4834e6af8 100644 --- a/resources/lang/ru/admin/statuslabels/message.php +++ b/resources/lang/ru/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Ярлык состояния не существует.', 'assoc_assets' => 'Этот ярлык состояния связан как минимум с одним активом и не может быть удален. Измените состояние ваших активов и попробуйте ещё раз. ', - - 'create' => array( + 'create' => [ 'error' => 'Ярлык состояния не создан, попробуйте еще раз.', - 'success' => 'Ярлык состояния успешно создан.' - ), + 'success' => 'Ярлык состояния успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ярлык состояния не обновлен, попробуйте еще раз', - 'success' => 'Ярлык состояния успешно обновлен.' - ), + 'success' => 'Ярлык состояния успешно обновлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены что хотите удалить это состояние?', 'error' => 'При удалении состояния возникла проблема. Пожалуйста попробуйте снова.', - 'success' => 'Ярлык состояние был успешно удален.' - ), + 'success' => 'Ярлык состояние был успешно удален.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Эти активы не могут быть назначены никому.', 'deployable' => 'Эти активы можно проверить. После того, как они будут назначены, они будут принимать мета статус: Deployed.', 'archived' => 'Эти активы не могут быть проверены и будут отображаться только в архивированном виде. Это полезно для сохранения информации об активах для составления бюджета / исторических целей, но не оставляя их вне списка текущих активов.', 'pending' => 'Эти активы еще не могут быть назначены никому, часто используемым для предметов, которые не подлежат ремонту, но, как ожидается, возвращаются в обращение.', - ), + ], -); +]; diff --git a/resources/lang/ru/admin/statuslabels/table.php b/resources/lang/ru/admin/statuslabels/table.php index f5445e36e7..48600a1a23 100644 --- a/resources/lang/ru/admin/statuslabels/table.php +++ b/resources/lang/ru/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Справка по статусам активов', 'archived' => 'Архивные', 'create' => 'Создать статус актива', @@ -16,4 +16,4 @@ return array( 'title' => 'Статус активов', 'undeployable' => 'Недоступные', 'update' => 'Изменить статус актива', -); +]; diff --git a/resources/lang/ru/admin/suppliers/message.php b/resources/lang/ru/admin/suppliers/message.php index 35f20ee7f4..9f88413a9a 100644 --- a/resources/lang/ru/admin/suppliers/message.php +++ b/resources/lang/ru/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Поставщик не существует.', - - 'create' => array( + 'create' => [ 'error' => 'Поставщик не был создан, попробуйте еще раз.', - 'success' => 'Поставщик успешно создан.' - ), + 'success' => 'Поставщик успешно создан.', + ], - 'update' => array( + 'update' => [ 'error' => 'Поставщик не был обновлен, попробуйте еще раз', - 'success' => 'Поставщик успешно обновлен.' - ), + 'success' => 'Поставщик успешно обновлен.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Вы уверены, что хотите удалить данного поставщика?', 'error' => 'При удалении поставщика произошла ошибка. Попробуйте еще раз.', 'success' => 'Поставщик успешно удален.', 'assoc_assets' => 'Этот поставщик в настоящее время связан с :asset_count активом(активами) и не может быть удален. Обновите свои активы, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', 'assoc_licenses' => 'Этот поставщик в настоящее время связан с: license_count лицензией(лицензиями) и не может быть удален. Обновите свои лицензии, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', 'assoc_maintenances' => 'Этот поставщик в настоящее время связан с:asset_maintenances_count активом(активами)на обслуживании и не может быть удален. Пожалуйста, обновите информацию о своих активах на ремонте, чтобы больше не ссылаться на этого поставщика и повторите попытку. ', - ) + ], -); +]; diff --git a/resources/lang/ru/admin/suppliers/table.php b/resources/lang/ru/admin/suppliers/table.php index 595bafe581..18c0b7d23e 100644 --- a/resources/lang/ru/admin/suppliers/table.php +++ b/resources/lang/ru/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'О поставщиках', 'about_suppliers_text' => 'Поставщики используются для отслеживания источника поставок', 'address' => 'Адрес поставщика', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Список активов от', 'zip' => 'Почтовый индекс', -); +]; diff --git a/resources/lang/ru/admin/users/general.php b/resources/lang/ru/admin/users/general.php index 30d72c7a0d..efe81f35dc 100644 --- a/resources/lang/ru/admin/users/general.php +++ b/resources/lang/ru/admin/users/general.php @@ -1,7 +1,6 @@ 'Этот пользователь может войти в систему', 'activated_disabled_help_text' => 'Вы не можете редактировать статус активации своей учетной записи.', 'assets_user' => 'Актив привязан к :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Редактировать пользователя', 'filetype_info' => 'Разрешенные типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.', 'history_user' => 'История для :name', - 'info' => 'Информация', + 'info' => 'Информация', 'restore_user' => 'Нажмите здесь, чтобы восстановить их.', 'last_login' => 'Последний вход', 'ldap_config_text' => 'Параметры конфигурации LDAP можно найти Администратор > Параметры. Выбранное местоположение будет установлено для всех импортируемых пользователей. (Необязательно).', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Ваши текущие параметры администрирования разрешают избирательное применение двухфакторной аутентификации. ', 'two_factor_enrolled' => 'Устройства для 2-ух факторной аутентификации настроены ', 'two_factor_active' => 'Устройства для 2-ух факторной аутентификации активны ', - ); + ]; diff --git a/resources/lang/ru/admin/users/message.php b/resources/lang/ru/admin/users/message.php index b0ecae1f41..e2b529a838 100644 --- a/resources/lang/ru/admin/users/message.php +++ b/resources/lang/ru/admin/users/message.php @@ -1,6 +1,6 @@ 'Вы успешно приняли актив.', 'declined' => 'Вы успешно отклонили актив.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Интеграция с LDAP не настроена для этой инсталляции.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Пользователь успешно создан.', 'update' => 'Пользователь успешно изменен.', 'update_bulk' => 'Пользователи успешно изменены!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Пользователь успешно разморожен.', 'restored' => 'Пользователь успешно восстановлен.', 'import' => 'Пользователи успешно импортированы.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'При создании пользователя возникла проблема. Пожалуйста попробуйте снова.', 'update' => 'При изменении пользователя возникла проблема. Пожалуйста попробуйте снова.', 'delete' => 'При удалении пользователя возникла проблема. Пожалуйста попробуйте снова.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Не могу найти сервер LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:', 'ldap_could_not_get_entries' => 'Не могу загрузить записи с сервера LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:', 'password_ldap' => 'Пароль для этой учетной записи управляется LDAP/Active Directory. Пожалуйста, свяжитесь с департаментом ИТ, чтобы изменить свой пароль. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Не удалось удалить файл. Повторите попытку.', 'success' => 'Файл успешно удален.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Не удалось загрузить файл(ы). Повторите попытку.', 'success' => 'Файл(ы) успешно загружены.', 'nofiles' => 'Не выбраны файлы для загрузки', 'invalidfiles' => 'Один или несколько ваших файлов слишком большого размера или имеют неподдерживаемый формат. Разрешены только следующие форматы файлов: png, gif, jpg, doc, docx, pdf, txt.', - ), + ], -); +]; diff --git a/resources/lang/ru/admin/users/table.php b/resources/lang/ru/admin/users/table.php index 128ed8a3cb..b7a9e67346 100644 --- a/resources/lang/ru/admin/users/table.php +++ b/resources/lang/ru/admin/users/table.php @@ -1,6 +1,6 @@ 'Активен', 'allow' => 'Разрешить', 'checkedout' => 'Активы', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Показать текущих пользователей', 'show_deleted' => 'Показать удаленных пользователей', 'title' => 'Название', - 'to_restore_them' => 'чтобы восстановить их.', + 'to_restore_them' => 'чтобы восстановить их.', 'updateuser' => 'Обновить пользователя', 'username' => 'Имя Пользователя', - 'user_deleted_text' => 'Этот пользователь был помечен как удаленный.', + 'user_deleted_text' => 'Этот пользователь был помечен как удаленный.', 'username_note' => '(Это используется для связи с Active Directory, а не для входа.)', 'cloneuser' => 'Дублировать пользователя', 'viewusers' => 'Просмотр пользователей', -); +]; diff --git a/resources/lang/ru/auth/general.php b/resources/lang/ru/auth/general.php index 700fe6a963..3db554e203 100644 --- a/resources/lang/ru/auth/general.php +++ b/resources/lang/ru/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Введите своё Имя Пользователя, чтобы получить ссылку для сброса пароля.', 'username_help_bottom' => 'Ваши Имя Пользователя и Ваш E-Mail могут быть одинаковыми, но могут и не быть, в зависимости от Вашей конфигурации. Если Вы не можете вспомнить Ваше Имя Пользователя - обратитесь к Вашему системному администратору.

Имена Пользователя, к которым не привязан адрес электронной почты, не смогут получить ссылку на сброс пароля. ', ]; - diff --git a/resources/lang/ru/auth/message.php b/resources/lang/ru/auth/message.php index c1220504c6..27b31546a9 100644 --- a/resources/lang/ru/auth/message.php +++ b/resources/lang/ru/auth/message.php @@ -1,6 +1,6 @@ 'Учетная запись с таким адресом электронной почты уже существует.', 'account_not_found' => 'Неверный Логин или Пароль.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Эта учетная запись заблокирована.', 'throttle' => 'Слишком много неудачных попыток входа. Пожалуйста, попробуйте через :minutes минут.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Ваше устройство уже зарегистрировано.', 'success' => 'Вы успешно вошли.', 'code_required' => 'Требуется Двух-Факторный код подтверждения.', 'invalid_code' => 'Недействительный Двух-Факторный код подтверждения.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'При попытке входа возникла проблема, пожалуйста попробуйте позже.', 'success' => 'Вы успешно авторизованы.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'При попытке входа возникла проблема, пожалуйста попробуйте позже.', 'success' => 'Вы успешно вышли из системы.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'При попытке создания вашей учетной записи возникла проблема, пожалуйста попробуйте позже.', 'success' => 'Учетная запись успешно создана.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'При попытке сброса возникла проблема, пожалуйста попробуйте позже.', 'success' => 'Если данный адрес электронной почты существует в нашей системе - будет отправлено письмо с возможностью восстановление пароля.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'При попытке сбросить ваш пароль возникла проблема, пожалуйста попробуйте позже.', 'success' => 'Ваш пароль успешно изменен.', - ), + ], - -); +]; diff --git a/resources/lang/ru/button.php b/resources/lang/ru/button.php index 4579bd8b8f..9fa9c524fd 100644 --- a/resources/lang/ru/button.php +++ b/resources/lang/ru/button.php @@ -1,6 +1,6 @@ 'Действия', 'add' => 'Добавить', 'cancel' => 'Отмена', @@ -11,7 +11,7 @@ return array( 'request' => 'Требовать', 'submit' => 'Принять', 'upload' => 'Загрузка', - 'select_file' => 'Выберите файл...', + 'select_file' => 'Выберите файл...', 'select_files' => 'Выбрать файлы...', 'generate_labels' => '{1} Сгенерировать этикетку[2,*] Cгенерировать этикетки', -); +]; diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php index 0d65bd4745..bc63098f37 100644 --- a/resources/lang/ru/general.php +++ b/resources/lang/ru/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Привязать', 'user_requests_count' => 'Запросы', 'city' => 'Город', - 'click_here' => 'Нажмите здесь', + 'click_here' => 'Нажмите здесь', 'clear_selection' => 'Очистить выбор', 'companies' => 'Компании', 'company' => 'Компания', 'component' => 'Компонент', 'components' => 'Компоненты', - 'complete' => 'Завершен', + 'complete' => 'Завершен', 'consumable' => 'Расходный материал', 'consumables' => 'Расходные материалы', 'country' => 'Страна', diff --git a/resources/lang/ru/help.php b/resources/lang/ru/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ru/help.php +++ b/resources/lang/ru/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php index 17bbc54e5d..8ae38c8125 100644 --- a/resources/lang/ru/mail.php +++ b/resources/lang/ru/mail.php @@ -1,6 +1,6 @@ 'Пользователь отменил запрос элемента на веб-сайте', 'a_user_requested' => 'Пользователь запросил элемент на веб-сайте', 'accessory_name' => 'Аксессуар:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'Посмотреть активы' -); + 'your_assets' => 'Посмотреть активы', +]; diff --git a/resources/lang/ru/pagination.php b/resources/lang/ru/pagination.php index 6567e6b411..2a5be9264c 100644 --- a/resources/lang/ru/pagination.php +++ b/resources/lang/ru/pagination.php @@ -1,6 +1,6 @@ 'Следующий »', -); +]; diff --git a/resources/lang/ru/passwords.php b/resources/lang/ru/passwords.php index 054a9a1bd7..7fd7cc587c 100644 --- a/resources/lang/ru/passwords.php +++ b/resources/lang/ru/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Ваша ссылка с паролем отправлена!', 'user' => 'Активных пользователей с указанным email-ом не найдено.', ]; - diff --git a/resources/lang/ru/reminders.php b/resources/lang/ru/reminders.php index 329051d4dc..02a1386968 100644 --- a/resources/lang/ru/reminders.php +++ b/resources/lang/ru/reminders.php @@ -1,6 +1,6 @@ "Пароли должны совпадать и содержать минимум 6 символов.", + 'password' => 'Пароли должны совпадать и содержать минимум 6 символов.', - "user" => "Имя пользователя или адрес почты не верен", + 'user' => 'Имя пользователя или адрес почты не верен', - "token" => "Этот токен сброса пароля просрочен или неверен.", + 'token' => 'Этот токен сброса пароля просрочен или неверен.', - "sent" => "Если такой адрес почты будет найден, напоминание пароля будет отправлено!", + 'sent' => 'Если такой адрес почты будет найден, напоминание пароля будет отправлено!', -); +]; diff --git a/resources/lang/ru/table.php b/resources/lang/ru/table.php index ef26a02f4a..c98e35a7a5 100644 --- a/resources/lang/ru/table.php +++ b/resources/lang/ru/table.php @@ -1,10 +1,10 @@ 'Действия', 'action' => 'Действие', 'by' => 'Кем', 'item' => 'Предмет', -); +]; diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php index e1c5be90b9..78fe2b6689 100644 --- a/resources/lang/ru/validation.php +++ b/resources/lang/ru/validation.php @@ -1,6 +1,6 @@ ':attribute уже занят.', 'uploaded' => 'Атрибут: не удалось загрузить.', 'url' => 'Неправильный формат :attribute.', - "unique_undeleted" => "Свойство :attribute должно быть уникальным.", + 'unique_undeleted' => 'Свойство :attribute должно быть уникальным.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Поле атрибута: содержит символ, который не разрешен.", - "email_array" => "Один или несколько адресов электронной почты недействительны.", - "hashed_pass" => "Ваш текущий пароль неверен", + 'alpha_space' => 'Поле атрибута: содержит символ, который не разрешен.', + 'email_array' => 'Один или несколько адресов электронной почты недействительны.', + 'hashed_pass' => 'Ваш текущий пароль неверен', 'dumbpwd' => 'Этот пароль слишком распространен.', - "statuslabel_type" => "Вы должны выбрать допустимый тип метки статуса", + 'statuslabel_type' => 'Вы должны выбрать допустимый тип метки статуса', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/sl/admin/accessories/general.php b/resources/lang/sl/admin/accessories/general.php index af5853f933..e2ba18d8f8 100644 --- a/resources/lang/sl/admin/accessories/general.php +++ b/resources/lang/sl/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorija Dodatki', 'accessory_name' => 'Ime Dodatka', 'checkout' => 'Izdaj Dodatek', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Uporabite privzeto EULA namesto tega.', 'use_default_eula_disabled' => 'Namesto tega uporabite privzeto EULA. Ni privzetega EULA. Dodajte ga v Nastavitvah.', -); +]; diff --git a/resources/lang/sl/admin/accessories/message.php b/resources/lang/sl/admin/accessories/message.php index a527695e45..27813e0f41 100644 --- a/resources/lang/sl/admin/accessories/message.php +++ b/resources/lang/sl/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Ta dodatek trenutno vsebuje: štetje predmetov, elementov ki so izdani uporabnikom. Preverite dodatke in poskusite znova. ', - 'create' => array( + 'create' => [ 'error' => 'Dodatek ni bila ustvarjen, poskusite znova.', - 'success' => 'Dodatek je bil uspešno ustvarjen.' - ), + 'success' => 'Dodatek je bil uspešno ustvarjen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dodatek ni bil posodobljen, poskusite znova', - 'success' => 'Dodatek je bil uspešno posodobljen.' - ), + 'success' => 'Dodatek je bil uspešno posodobljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta dodatek?', 'error' => 'Prišlo je do napake pri brisanju dodatka. Prosim poskusite ponovno.', - 'success' => 'Dodatek je bil uspešno izbrisan.' - ), + 'success' => 'Dodatek je bil uspešno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Dodatek ni bil izdan, poskusite znova', 'success' => 'Dodatek uspešno izdan.', - 'user_does_not_exist' => 'Uporabnik je napačen. Prosim poskusite ponovno.' - ), + 'user_does_not_exist' => 'Uporabnik je napačen. Prosim poskusite ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Dodatek ni bil sprejet, poskusite znova', 'success' => 'Dodatek uspešno sprejet.', - 'user_does_not_exist' => 'Uporabnik ne obstaja. Prosim poskusite ponovno.' - ) + 'user_does_not_exist' => 'Uporabnik ne obstaja. Prosim poskusite ponovno.', + ], - -); +]; diff --git a/resources/lang/sl/admin/accessories/table.php b/resources/lang/sl/admin/accessories/table.php index 5992630b1b..ffaf6c46b2 100644 --- a/resources/lang/sl/admin/accessories/table.php +++ b/resources/lang/sl/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Prenesi CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Prenesi CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Sprejemljivost', 'title' => 'Ime Dodatka', - -); +]; diff --git a/resources/lang/sl/admin/asset_maintenances/form.php b/resources/lang/sl/admin/asset_maintenances/form.php index d6f49f15e9..937a11ec8b 100644 --- a/resources/lang/sl/admin/asset_maintenances/form.php +++ b/resources/lang/sl/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dnevi', 'notes' => 'Opombe', 'update' => 'Posodobi', - 'create' => 'Ustvari' + 'create' => 'Ustvari', ]; diff --git a/resources/lang/sl/admin/asset_maintenances/message.php b/resources/lang/sl/admin/asset_maintenances/message.php index 82028b42a8..6a1ad3773e 100644 --- a/resources/lang/sl/admin/asset_maintenances/message.php +++ b/resources/lang/sl/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Ste prepričani, da želite izbrisati to vzdrževanje sredstva?', 'error' => 'Prišlo je do težave z brisanjem vzdrževanja sredstva. Prosim poskusite ponovno.', - 'success' => 'Vzdrževanje sredstva je bilo uspešno izbrisano.' + 'success' => 'Vzdrževanje sredstva je bilo uspešno izbrisano.', ], 'create' => [ 'error' => 'Vzdrževanje sredstev ni bilo ustvarjeno, poskusite znova.', - 'success' => 'Vzdrževanje sredstev je uspešno ustvarjeno.' + 'success' => 'Vzdrževanje sredstev je uspešno ustvarjeno.', ], 'edit' => [ 'error' => 'Vzdrževanje sredstev ni bilo urejeno, poskusite znova.', - 'success' => 'Vzdrževanje sredstev je uspešno urejeno.' + 'success' => 'Vzdrževanje sredstev je uspešno urejeno.', ], 'asset_maintenance_incomplete' => 'Še ni končano', 'warranty' => 'Garancija', 'not_warranty' => 'Ni garancije', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/sl/admin/asset_maintenances/table.php b/resources/lang/sl/admin/asset_maintenances/table.php index 5dfa8a668e..b9e7f91534 100644 --- a/resources/lang/sl/admin/asset_maintenances/table.php +++ b/resources/lang/sl/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Vzdrževanje sredstev', 'asset_name' => 'Ime sredstva', 'is_warranty' => 'Garancija', - 'dl_csv' => 'Prenesi CSV' + 'dl_csv' => 'Prenesi CSV', ]; diff --git a/resources/lang/sl/admin/categories/general.php b/resources/lang/sl/admin/categories/general.php index a17449cf78..4263daccf4 100644 --- a/resources/lang/sl/admin/categories/general.php +++ b/resources/lang/sl/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorije sredstev', 'category_name' => 'Ime kategorije', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Uporabite privzeto EULA namesto tega.', 'use_default_eula_disabled' => 'Namesto tega uporabite privzeto EULA. Ni privzete EULA. Dodajte jo v Nastavitvah.', -); +]; diff --git a/resources/lang/sl/admin/categories/message.php b/resources/lang/sl/admin/categories/message.php index e53353661e..823995afae 100644 --- a/resources/lang/sl/admin/categories/message.php +++ b/resources/lang/sl/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorija ne obstaja.', 'assoc_models' => 'Ta kategorija je trenutno povezana z vsaj enim modelom in je ni mogoče izbrisati. Prosimo, posodobite svoje modele, da ne bodo več vsebovali te kategorije in poskusite znova. ', 'assoc_items' => 'Ta kategorija je trenutno povezana z vsaj eno: asset_type in je ni mogoče izbrisati. Posodobite svoje: asset_type, da ne bo več vseboval te kategorije in poskusite znova. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorija ni bila ustvarjena, poskusite znova.', - 'success' => 'Kategorija je bila uspešno ustvarjena.' - ), + 'success' => 'Kategorija je bila uspešno ustvarjena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorija ni bila posodobljena, poskusite znova', - 'success' => 'Kategorija uspešno posodobljena.' - ), + 'success' => 'Kategorija uspešno posodobljena.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to kategorijo?', 'error' => 'Prišlo je do težave z izbrisom kategorije. Prosim poskusite ponovno.', - 'success' => 'Kategorija je bila uspešno izbrisana.' - ) + 'success' => 'Kategorija je bila uspešno izbrisana.', + ], -); +]; diff --git a/resources/lang/sl/admin/categories/table.php b/resources/lang/sl/admin/categories/table.php index 2af2eb4b3b..e55352b562 100644 --- a/resources/lang/sl/admin/categories/table.php +++ b/resources/lang/sl/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Starš', 'require_acceptance' => 'Sprejemljivost', 'title' => 'Ime kategorije sredstva', -); +]; diff --git a/resources/lang/sl/admin/companies/general.php b/resources/lang/sl/admin/companies/general.php index dcbb93ba9a..210badc644 100644 --- a/resources/lang/sl/admin/companies/general.php +++ b/resources/lang/sl/admin/companies/general.php @@ -1,4 +1,5 @@ 'Izberite podjetje', ]; diff --git a/resources/lang/sl/admin/companies/message.php b/resources/lang/sl/admin/companies/message.php index 131c7b0600..4da4eab7bd 100644 --- a/resources/lang/sl/admin/companies/message.php +++ b/resources/lang/sl/admin/companies/message.php @@ -1,18 +1,19 @@ 'Podjetje ne obstaja.', 'assoc_users' => 'To podjetje je trenutno povezano z vsaj enim modelom in ga ni mogoče izbrisati. Prosimo, posodobite svoje modele, da ne bodo več vsebovali te družbe in poskusili znova.', - 'create' => array( + 'create' => [ 'error' => 'Podjetje ni bilo ustvarjeno, poskusite znova.', - 'success' => 'Podjetje je uspešno ustvarjeno.' - ), - 'update' => array( + 'success' => 'Podjetje je uspešno ustvarjeno.', + ], + 'update' => [ 'error' => 'Podjetje ni bilo posodobljeno, poskusite znova', - 'success' => 'Podjetje uspešno posodobljeno.' - ), - 'delete' => array( + 'success' => 'Podjetje uspešno posodobljeno.', + ], + 'delete' => [ 'confirm' => 'Ste prepričani, da želite izbrisati to podjetje?', 'error' => 'Prišlo je do težave pri brisanju podjetja. Prosim poskusite ponovno.', - 'success' => 'Podjetje je bilo uspešno izbrisano.' - ) -); + 'success' => 'Podjetje je bilo uspešno izbrisano.', + ], +]; diff --git a/resources/lang/sl/admin/companies/table.php b/resources/lang/sl/admin/companies/table.php index 10de2bb161..e8dbc810da 100644 --- a/resources/lang/sl/admin/companies/table.php +++ b/resources/lang/sl/admin/companies/table.php @@ -1,9 +1,10 @@ 'Podjetja', 'create' => 'Ustvari podjetje', 'title' => 'Podjetje', 'update' => 'Posodobi podjetje', 'name' => 'Naziv podjetja', 'id' => 'ID', -); +]; diff --git a/resources/lang/sl/admin/components/general.php b/resources/lang/sl/admin/components/general.php index 7f7bfb7097..d6550b8297 100644 --- a/resources/lang/sl/admin/components/general.php +++ b/resources/lang/sl/admin/components/general.php @@ -1,6 +1,6 @@ 'Ime komponente', 'checkin' => 'Prevzem komponent', 'checkout' => 'Izdaja komponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Ostanek', 'total' => 'Skupaj', 'update' => 'Posodobi komponento', -); +]; diff --git a/resources/lang/sl/admin/components/message.php b/resources/lang/sl/admin/components/message.php index 7879f99ca6..ee66fe1488 100644 --- a/resources/lang/sl/admin/components/message.php +++ b/resources/lang/sl/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenta ne obstaja.', - 'create' => array( + 'create' => [ 'error' => 'Komponenta ni bila ustvarjena, poskusite znova.', - 'success' => 'Komponenta je bila uspešno ustvarjena.' - ), + 'success' => 'Komponenta je bila uspešno ustvarjena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenta ni bila posodobljena, poskusite znova', - 'success' => 'Komponenta je bila uspešno posodobljena.' - ), + 'success' => 'Komponenta je bila uspešno posodobljena.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to komponento?', 'error' => 'Prišlo je do težave pri brisanju komponente. Prosim poskusite ponovno.', - 'success' => 'Komponenta je bila uspešno izbrisana.' - ), + 'success' => 'Komponenta je bila uspešno izbrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponenta ni bila izdana, poskusite znova', 'success' => 'Komponenta je bila uspešno izdana.', - 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.' - ), + 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenta ni bila prevzeta, poskusite znova', 'success' => 'Komponenta je bila uspešno prevzeta.', - 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.' - ) + 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.', + ], - -); +]; diff --git a/resources/lang/sl/admin/components/table.php b/resources/lang/sl/admin/components/table.php index 6fd506d61b..3e58db5c30 100644 --- a/resources/lang/sl/admin/components/table.php +++ b/resources/lang/sl/admin/components/table.php @@ -1,5 +1,5 @@ 'Ime komponente', -); +]; diff --git a/resources/lang/sl/admin/consumables/general.php b/resources/lang/sl/admin/consumables/general.php index c655f95f1a..dfa63e96ab 100644 --- a/resources/lang/sl/admin/consumables/general.php +++ b/resources/lang/sl/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Izdaja potrošnega materiala uporabniku', 'consumable_name' => 'Ime potrošnega materiala', 'create' => 'Ustvari potrošni material', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Preostanek', 'total' => 'Skupaj', 'update' => 'Posodobi potrošni material', -); +]; diff --git a/resources/lang/sl/admin/consumables/message.php b/resources/lang/sl/admin/consumables/message.php index 32da69fd6a..c006c9cf66 100644 --- a/resources/lang/sl/admin/consumables/message.php +++ b/resources/lang/sl/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Potrošni material ne obstaja.', - 'create' => array( + 'create' => [ 'error' => 'Potrošni material ni bil ustvarjen, poskusite znova.', - 'success' => 'Potrošni material uspešno ustvarjen.' - ), + 'success' => 'Potrošni material uspešno ustvarjen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Potrošni material ni bil posodobljen, poskusite znova', - 'success' => 'Potrošni material uspešno posodobljen.' - ), + 'success' => 'Potrošni material uspešno posodobljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta potrošni material?', 'error' => 'Prišlo je do težave z brisanjem potrošnega materiala. Prosim poskusite ponovno.', - 'success' => 'Potrošni material je bil uspešno izbrisan.' - ), + 'success' => 'Potrošni material je bil uspešno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Potrošni material ni bil izdan, poskusite znova', 'success' => 'Potrošni material uspešno izdan.', - 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.' - ), + 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Potrošni material ni bil prevzet, poskusite znova', 'success' => 'Potrošni material uspešno prevzet.', - 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.' - ) + 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.', + ], - -); +]; diff --git a/resources/lang/sl/admin/consumables/table.php b/resources/lang/sl/admin/consumables/table.php index 46afda9008..33f65d2ae2 100644 --- a/resources/lang/sl/admin/consumables/table.php +++ b/resources/lang/sl/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Ime potrošnega materiala', -); +]; diff --git a/resources/lang/sl/admin/custom_fields/general.php b/resources/lang/sl/admin/custom_fields/general.php index 215ed99ff4..595147e3b0 100644 --- a/resources/lang/sl/admin/custom_fields/general.php +++ b/resources/lang/sl/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Polja po meri', 'field' => 'Polje', 'about_fieldsets_title' => 'O setih polj', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Novo polje po meri', 'value_encrypted' => 'Vrednost tega polja je šifrirana v bazi podatkov. Dešifrirane vrednosti bodo lahko videli samo skrbniki sistema', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/sl/admin/custom_fields/message.php b/resources/lang/sl/admin/custom_fields/message.php index cf5859733f..f23494e6f2 100644 --- a/resources/lang/sl/admin/custom_fields/message.php +++ b/resources/lang/sl/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'To polje ne obstaja.', 'already_added' => 'Polje je že dodano', - 'create' => array( + 'create' => [ 'error' => 'Polje ni bilo ustvarjeno, poskusite znova.', 'success' => 'Polje je uspešno ustvarjeno.', - 'assoc_success' => 'Polje je uspešno dodano v set polj.' - ), + 'assoc_success' => 'Polje je uspešno dodano v set polj.', + ], - 'update' => array( + 'update' => [ 'error' => 'Polje ni bilo posodobljeno, poskusite znova', - 'success' => 'Polje je bilo uspešno posodobljeno.' - ), + 'success' => 'Polje je bilo uspešno posodobljeno.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to polje?', 'error' => 'Prišlo je do težave z brisanjem polja. Prosim poskusite ponovno.', 'success' => 'Polje je bilo uspešno izbrisano.', 'in_use' => 'Polje je še vedno v uporabi.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Set polj ne obstaja', - 'create' => array( + 'create' => [ 'error' => 'Set polj ni bil ustvarjen, poskusite znova.', - 'success' => 'Set polkj je bil uspešno ustvarjen.' - ), + 'success' => 'Set polkj je bil uspešno ustvarjen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Set polj ni bil posodobljen, poskusite znova', - 'success' => 'Set polj je bil uspešno posodobljen.' - ), + 'success' => 'Set polj je bil uspešno posodobljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta set polj?', 'error' => 'Prišlo je do težave z brisanjem seta polj. Prosim poskusite ponovno.', 'success' => 'Set polj je uspešno izbrisano.', 'in_use' => 'Set polj je še vedno v uporabi.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/sl/admin/departments/message.php b/resources/lang/sl/admin/departments/message.php index 6f90d2cdd9..cd29268470 100644 --- a/resources/lang/sl/admin/departments/message.php +++ b/resources/lang/sl/admin/departments/message.php @@ -1,21 +1,21 @@ 'Oddelek ne obstaja.', 'assoc_users' => 'Ta oddelek je trenutno povezan z vsaj enim uporabnikom in ga ni mogoče izbrisati. Prosimo, posodobite svoje uporabnike, da ne bodo več vsebovali tega oddelka in poskusili znova. ', - 'create' => array( + 'create' => [ 'error' => 'Oddelek ni bil ustvarjen, poskusite znova.', - 'success' => 'Oddelek je uspešno ustvarjen.' - ), - 'update' => array( + 'success' => 'Oddelek je uspešno ustvarjen.', + ], + 'update' => [ 'error' => 'Oddelek ni bil posodobljen, poskusite znova', - 'success' => 'Oddelek je uspešno posodobljen.' - ), - 'delete' => array( + 'success' => 'Oddelek je uspešno posodobljen.', + ], + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta oddelek?', 'error' => 'Prišlo je do težave pri brisanju oddelka. Prosim poskusite ponovno.', - 'success' => 'Oddelek je bil uspešno izbrisan.' - ) + 'success' => 'Oddelek je bil uspešno izbrisan.', + ], -); +]; diff --git a/resources/lang/sl/admin/departments/table.php b/resources/lang/sl/admin/departments/table.php index eda41d0aba..a0f45b67ce 100644 --- a/resources/lang/sl/admin/departments/table.php +++ b/resources/lang/sl/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Ime oddelka', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokacija', 'create' => 'Ustvari oddelek', 'update' => 'Posodobi oddelek', - ); + ]; diff --git a/resources/lang/sl/admin/depreciations/general.php b/resources/lang/sl/admin/depreciations/general.php index 0cc9709e85..4ca4be5acc 100644 --- a/resources/lang/sl/admin/depreciations/general.php +++ b/resources/lang/sl/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'O amortizaciji sredstev', 'about_depreciations' => 'Za amortizacijo sredstev lahko določite amortizacijo sredstev, ki temelji na enakomerni amortizaciji.', 'asset_depreciations' => 'Amortizacija sredstev', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Število mesecev', 'update' => 'Posodobi amortizacijo', -); +]; diff --git a/resources/lang/sl/admin/depreciations/message.php b/resources/lang/sl/admin/depreciations/message.php index 2fa2a5d6c6..396efc9bd1 100644 --- a/resources/lang/sl/admin/depreciations/message.php +++ b/resources/lang/sl/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Amortizacijski razred ne obstaja.', 'assoc_users' => 'Ta amortizacija je trenutno povezana z enim ali več modeli in je ni mogoče izbrisati. Izbrišite modele in poskusite znova izbrisati. ', - - 'create' => array( + 'create' => [ 'error' => 'Amortizacijski razred ni bil ustvarjen, poskusite znova. :(', - 'success' => 'Amortizacijski razred je bil uspešno ustvarjen. :)' - ), + 'success' => 'Amortizacijski razred je bil uspešno ustvarjen. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Amortizacijski razred ni bil posodobljen, poskusite znova', - 'success' => 'Amortizacijski razred je bil uspešno posodobljen.' - ), + 'success' => 'Amortizacijski razred je bil uspešno posodobljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta razred amortizacije?', 'error' => 'Prišlo je do težave z izbrisom amortizacijskega razreda. Prosim poskusite ponovno.', - 'success' => 'Amortizacijski razred je bil uspešno izbrisan.' - ) + 'success' => 'Amortizacijski razred je bil uspešno izbrisan.', + ], -); +]; diff --git a/resources/lang/sl/admin/depreciations/table.php b/resources/lang/sl/admin/depreciations/table.php index 71132adbc4..30654c6228 100644 --- a/resources/lang/sl/admin/depreciations/table.php +++ b/resources/lang/sl/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Mesecev', 'term' => 'Čas', 'title' => 'Ime ', -); +]; diff --git a/resources/lang/sl/admin/groups/message.php b/resources/lang/sl/admin/groups/message.php index ebe804b14d..4258f19685 100644 --- a/resources/lang/sl/admin/groups/message.php +++ b/resources/lang/sl/admin/groups/message.php @@ -1,22 +1,22 @@ 'Skupina že obstaja!', 'group_not_found' => 'Skupina [: id] ne obstaja.', 'group_name_required' => 'Polje ime je obvezno', - 'success' => array( + 'success' => [ 'create' => 'Skupina je bila uspešno ustvarjena.', 'update' => 'Skupina je bila uspešno posodobljena.', 'delete' => 'Skupina je bila uspešno izbrisana.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to skupino?', 'create' => 'Pri ustvarjanju skupine je prišlo do težave. Prosim poskusite ponovno.', 'update' => 'Prišlo je do težave pri posodabljanju skupine. Prosim poskusite ponovno.', 'delete' => 'Prišlo je do težave pri brisanju skupine. Prosim poskusite ponovno.', - ), + ], -); +]; diff --git a/resources/lang/sl/admin/groups/table.php b/resources/lang/sl/admin/groups/table.php index 2963052e12..f938139b99 100644 --- a/resources/lang/sl/admin/groups/table.php +++ b/resources/lang/sl/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Ime', 'users' => 'Število uporabnikov', -); +]; diff --git a/resources/lang/sl/admin/groups/titles.php b/resources/lang/sl/admin/groups/titles.php index d773e2af17..11d32f62ab 100644 --- a/resources/lang/sl/admin/groups/titles.php +++ b/resources/lang/sl/admin/groups/titles.php @@ -1,6 +1,6 @@ 'O skupinah', 'about_groups' => 'Skupine se uporabljajo za določanje uporabniških pravic.', 'group_management' => 'Upravljanje skupine', @@ -11,4 +11,4 @@ return array( 'allow' => 'Dovoli', 'deny' => 'Zavrni', -); +]; diff --git a/resources/lang/sl/admin/hardware/form.php b/resources/lang/sl/admin/hardware/form.php index fcb91278e9..5cadb0e5ec 100644 --- a/resources/lang/sl/admin/hardware/form.php +++ b/resources/lang/sl/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Potrdite množičn izbris sredstev', +return [ + 'bulk_delete' => 'Potrdite množičn izbris sredstev', 'bulk_delete_help' => 'Pregled sredstev za množično brisanje je v seznamu spodaj. Ko bodo sredstva izbrisana, jih je mogoče obnoviti, vendar ne bodo povezana z nobenimi uporabnikom, kot so jim trenutno dodeljena.', 'bulk_delete_warn' => 'Brisali boste: asset_count sredstev.', - 'bulk_update' => 'Množično posodabljanje sredstev', - 'bulk_update_help' => 'Ta obrazec vam omogoča, da posodobite več sredstev hkrati. Izpolnite le polja, ki jih morate spremeniti. Vsa polja, ki ostanejo prazna, bodo ostala nespremenjena. ', - 'bulk_update_warn' => 'Uredili boste lastnosti asset_count sredstev.', + 'bulk_update' => 'Množično posodabljanje sredstev', + 'bulk_update_help' => 'Ta obrazec vam omogoča, da posodobite več sredstev hkrati. Izpolnite le polja, ki jih morate spremeniti. Vsa polja, ki ostanejo prazna, bodo ostala nespremenjena. ', + 'bulk_update_warn' => 'Uredili boste lastnosti asset_count sredstev.', 'checkedout_to' => 'Izdano osebi', 'checkout_date' => 'Datum izdaje', 'checkin_date' => 'Datum sprejema', @@ -38,7 +38,6 @@ return array( 'tag' => 'Oznaka sredstva', 'update' => 'Posodobitev sredstva', 'warranty' => 'Garancija', - 'warranty_expires' => 'Garancija poteče', + 'warranty_expires' => 'Garancija poteče', 'years' => 'let', -) -; +]; diff --git a/resources/lang/sl/admin/hardware/general.php b/resources/lang/sl/admin/hardware/general.php index 8e95eec557..ca9d916e0a 100644 --- a/resources/lang/sl/admin/hardware/general.php +++ b/resources/lang/sl/admin/hardware/general.php @@ -1,9 +1,9 @@ 'O sredstvih', 'about_assets_text' => 'Sredstva so stvari, ki so sledene po serijski številki ali oznaki sredstva. Ponavadi so stvari z višjo vrednostjo, pri katerih je opredelitev določenega predmeta pomembna.', - 'archived' => 'Arhivirano', + 'archived' => 'Arhivirano', 'asset' => 'Sredstev', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Sprejem sredstev', @@ -19,4 +19,4 @@ return array( 'pending' => 'Na čakanju', 'undeployable' => 'Nerazdeljeno', 'view' => 'Ogled sredstva', -); +]; diff --git a/resources/lang/sl/admin/hardware/message.php b/resources/lang/sl/admin/hardware/message.php index bc3c6117df..be424d06bb 100644 --- a/resources/lang/sl/admin/hardware/message.php +++ b/resources/lang/sl/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Opozorilo: To sredstvo je bilo označeno kot trenutno nerazdeljeno. Če se je ta status spremenil, posodobite status sredstva.', 'does_not_exist' => 'Sredstvo ne obstaja.', 'does_not_exist_or_not_requestable' => 'Dober poskus. To sredstvo ne obstaja ali ga ni mogoče zahtevati.', 'assoc_users' => 'To sredstvo je trenutno izdano uporabniku in ga ni mogoče izbrisati. Najprej preverite sredstvo in poskusite znova izbrisati. ', - 'create' => array( + 'create' => [ 'error' => 'Sredstvo ni bilo ustvarjeno, poskusite znova. :(', - 'success' => 'Sredstvo je uspešno ustvarjeno. :)' - ), + 'success' => 'Sredstvo je uspešno ustvarjeno. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Sredstvo ni bilo posodobljeno, poskusite znova', 'success' => 'Sredstvo je uspešno posodobljeno.', 'nothing_updated' => 'Nobeno polje ni bilo izbrana, zato nebo nič posodobljeno.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Sredstvo ni bilo obnovljeno, poskusite znova', - 'success' => 'Sredstvo je bilo uspešno obnovljeno.' - ), + 'success' => 'Sredstvo je bilo uspešno obnovljeno.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Revizija sredstva je bila neuspešna. Prosim poskusite ponovno.', - 'success' => 'Revizija sredstva je uspešno zabeležena.' - ), + 'success' => 'Revizija sredstva je uspešno zabeležena.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka ni izbrisana. Prosim poskusite ponovno.', 'success' => 'Datoteka je uspešno izbrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteka(e) niso naložene. Prosim poskusite ponovno.', 'success' => 'Datoteka(e) so bile uspešno naložene.', 'nofiles' => 'Niste izbrali nobenih datotek za nalaganje, ali je datoteka ki jo poskušate naložiti prevelika', 'invalidfiles' => 'Ena ali več vaših datotek je prevelika ali pa je tip datoteke, ki ni dovoljen. Dovoljeni tipi datotek so png, gif, jpg, doc, docx, pdf in txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Nekateri elementi niso bili pravilno uvoženi.', 'errorDetail' => 'Naslednji elementi niso bili uvoženi zaradi napak.', - 'success' => "Vaša datoteka je bila uvožena", - 'file_delete_success' => "Vaša datoteka je bila uspešno izbrisana", - 'file_delete_error' => "Datoteke ni bilo mogoče izbrisati", - ), + 'success' => 'Vaša datoteka je bila uvožena', + 'file_delete_success' => 'Vaša datoteka je bila uspešno izbrisana', + 'file_delete_error' => 'Datoteke ni bilo mogoče izbrisati', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to sredstvo?', 'error' => 'Prišlo je do težave z izbrisom sredstva. Prosim poskusite ponovno.', 'nothing_updated' => 'Nobena sredstva niso bila izbrana, zato ni bilo nič izbrisanih.', - 'success' => 'Sredstvo je bilo uspešno izbrisano.' - ), + 'success' => 'Sredstvo je bilo uspešno izbrisano.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Sredstvo ni bila izdano, poskusite znova', 'success' => 'Sredstvo je bilo uspešno izdano.', 'user_does_not_exist' => 'Ta uporabnik ni veljaven. Prosim poskusite ponovno.', 'not_available' => 'To sredstvo ni na voljo za izdajo!', - 'no_assets_selected' => 'Na seznamu morate izbrati vsaj eno sredstev' - ), + 'no_assets_selected' => 'Na seznamu morate izbrati vsaj eno sredstev', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Sredstev ni bilo prevzeto, poskusite znova', 'success' => 'Sredstev je bilo uspešno prevzeta.', 'user_does_not_exist' => 'Ta uporabnik je neveljaven. Prosim poskusite ponovno.', 'already_checked_in' => 'Ta sredstev je že izdana.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Sredstev ni bila zahtevana, poskusite znova', 'success' => 'Sredstev je uspešno zahtevana.', - 'canceled' => 'Zahteva za izdajo je bila uspešno preklicana' - ) + 'canceled' => 'Zahteva za izdajo je bila uspešno preklicana', + ], -); +]; diff --git a/resources/lang/sl/admin/hardware/table.php b/resources/lang/sl/admin/hardware/table.php index 0440c690e5..3673579a5c 100644 --- a/resources/lang/sl/admin/hardware/table.php +++ b/resources/lang/sl/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Oznaka sredstva', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Sredstvo ', 'image' => 'Slika naprave', 'days_without_acceptance' => 'Dnevi brez sprejema', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/sl/admin/kits/general.php b/resources/lang/sl/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/sl/admin/kits/general.php +++ b/resources/lang/sl/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/sl/admin/licenses/form.php b/resources/lang/sl/admin/licenses/form.php index 201ef8dcae..184b6b2bea 100644 --- a/resources/lang/sl/admin/licenses/form.php +++ b/resources/lang/sl/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Sredstev', 'checkin' => 'Sprejem', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licenca registrirana na e-pošto', 'to_name' => 'Licenca registrirana na ime', 'update' => 'Posodobi licenco', - 'checkout_help' => 'Preveriti je potrebno ali je licenca vezana na strojno opremo ali osebo. Izberete lahko obe, vendar mora lastnik sredstva ustrezati osebi, s katero preverjate sredstva.' -); + 'checkout_help' => 'Preveriti je potrebno ali je licenca vezana na strojno opremo ali osebo. Izberete lahko obe, vendar mora lastnik sredstva ustrezati osebi, s katero preverjate sredstva.', +]; diff --git a/resources/lang/sl/admin/licenses/general.php b/resources/lang/sl/admin/licenses/general.php index 06ce742108..187a20101b 100644 --- a/resources/lang/sl/admin/licenses/general.php +++ b/resources/lang/sl/admin/licenses/general.php @@ -1,6 +1,6 @@ 'O licencah', 'about_licenses' => 'Licence se uporabljajo za sledenje programske opreme. Imajo določeno število prostih mest, ki jih je mogoče izdati posameznikom', 'checkin' => 'Prevzem licenčnih mest', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licence za programsko opremo', 'user' => 'Uporabnik', 'view' => 'Ogled licence', -); +]; diff --git a/resources/lang/sl/admin/licenses/message.php b/resources/lang/sl/admin/licenses/message.php index f2e9994fe1..463b2899b6 100644 --- a/resources/lang/sl/admin/licenses/message.php +++ b/resources/lang/sl/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licenca ne obstaja.', 'user_does_not_exist' => 'Uporabnik ne obstaja.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Izbrati morate sredstvo ali uporabnika, vendar ne obojega.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licenca ni bila ustvarjena, poskusite znova.', - 'success' => 'Licenca je bila ustvarjena uspešno.' - ), + 'success' => 'Licenca je bila ustvarjena uspešno.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka ni izbrisana. Prosim poskusite ponovno.', 'success' => 'Datoteka je uspešno izbrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteka(e) niso naložene. Prosim poskusite ponovno.', 'success' => 'Datoteka(e) so bile uspešno naložene.', 'nofiles' => 'Niste izbrali nobenih datotek za nalaganje, ali je datoteka ki jo poskušate naložiti prevelika', 'invalidfiles' => 'Ena ali več vaših datotek je prevelika ali pa je tip datoteke, ki ni dovoljen. Dovoljeni tipi datotek so png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml in lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licenca ni bila posodobljena, poskusite znova', - 'success' => 'Licenca je bila posodobljena uspešno.' - ), + 'success' => 'Licenca je bila posodobljena uspešno.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to licenco?', 'error' => 'Prišlo je do težave z brisanjem licence. Prosim poskusite ponovno.', - 'success' => 'Licenca je bila uspešno izbrisana.' - ), + 'success' => 'Licenca je bila uspešno izbrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Prišlo je do težave pri izdji licence. Prosim poskusite ponovno.', - 'success' => 'Licenca je uspešno izdana' - ), + 'success' => 'Licenca je uspešno izdana', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Prišlo je do težave pri prevzemu licence. Prosim poskusite ponovno.', - 'success' => 'Licenca je uspešno prevzeta' - ), + 'success' => 'Licenca je uspešno prevzeta', + ], -); +]; diff --git a/resources/lang/sl/admin/licenses/table.php b/resources/lang/sl/admin/licenses/table.php index 34dea18ec5..c189aa4fce 100644 --- a/resources/lang/sl/admin/licenses/table.php +++ b/resources/lang/sl/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Dodeljena', 'checkout' => 'Prejeto/Izdano', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serijska številka', 'title' => 'Licenca', -); +]; diff --git a/resources/lang/sl/admin/locations/message.php b/resources/lang/sl/admin/locations/message.php index 19ae2fc3be..d051e7ccdc 100644 --- a/resources/lang/sl/admin/locations/message.php +++ b/resources/lang/sl/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokacija ne obstaja.', 'assoc_users' => 'Ta lokacija je trenutno povezana z vsaj enim uporabnikom in je ni mogoče izbrisati. Prosimo, posodobite svoje uporabnike, da ne bodo več vsebovali te lokacije in poskusite znova. ', 'assoc_assets' => 'Ta lokacija je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Prosimo, posodobite svoja sredstva, da ne bodo več vsebovali te lokacije in poskusite znova. ', 'assoc_child_loc' => 'Ta lokacija je trenutno starš vsaj ene lokacije otroka in je ni mogoče izbrisati. Posodobite svoje lokacije, da ne bodo več vsebovale te lokacije in poskusite znova. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokacija ni bila ustvarjena, poskusite znova.', - 'success' => 'Lokacija je bila uspešno ustvarjena.' - ), + 'success' => 'Lokacija je bila uspešno ustvarjena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokacija ni posodobljena, poskusite znova', - 'success' => 'Lokacija je bila posodobljena.' - ), + 'success' => 'Lokacija je bila posodobljena.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to lokacijo?', 'error' => 'Prišlo je do težave z brisanjem lokacije. Prosim poskusite ponovno.', - 'success' => 'Lokacija je bila uspešno izbrisana.' - ) + 'success' => 'Lokacija je bila uspešno izbrisana.', + ], -); +]; diff --git a/resources/lang/sl/admin/locations/table.php b/resources/lang/sl/admin/locations/table.php index b92b976bdc..3f951f044c 100644 --- a/resources/lang/sl/admin/locations/table.php +++ b/resources/lang/sl/admin/locations/table.php @@ -1,6 +1,6 @@ 'O lokacijah', 'about_locations' => 'Lokacije se uporabljajo za sledenje informacij o lokaciji uporabnika, sredstva in drugih elementov', 'assets_rtd' => 'Sredstva', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Starš', 'currency' => 'Lokalna valuta', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/sl/admin/manufacturers/message.php b/resources/lang/sl/admin/manufacturers/message.php index 7972144bf1..8b9f606309 100644 --- a/resources/lang/sl/admin/manufacturers/message.php +++ b/resources/lang/sl/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Proizvajalec ne obstaja.', 'assoc_users' => 'Ta proizvajalec je trenutno povezan z vsaj enim modelom in ga ni mogoče izbrisati. Prosimo, posodobite svoje modele, da ne bodo vsebovali tega proizvajalca in poskusili znova. ', - 'create' => array( + 'create' => [ 'error' => 'Proizvajalec ni bil ustvarjen, poskusite znova.', - 'success' => 'Proizvajalec je uspešno ustvarjen.' - ), + 'success' => 'Proizvajalec je uspešno ustvarjen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proizvajalec ni bil posodobljen, poskusite znova', - 'success' => 'Proizvajalec je uspešno posodobljen.' - ), + 'success' => 'Proizvajalec je uspešno posodobljen.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati tega proizvajalca?', 'error' => 'Pri izbrisu proizvajalca je prišlo do težave. Prosim poskusite ponovno.', - 'success' => 'Proizvajalec je bil uspešno izbrisan.' - ) + 'success' => 'Proizvajalec je bil uspešno izbrisan.', + ], -); +]; diff --git a/resources/lang/sl/admin/manufacturers/table.php b/resources/lang/sl/admin/manufacturers/table.php index 2e2dad4c80..1e66c10f4b 100644 --- a/resources/lang/sl/admin/manufacturers/table.php +++ b/resources/lang/sl/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'O proizvajalcih', 'about_manufacturers_text' => 'Proizvajalci so podjetja, ki ustvarjajo vaša sredstva. Tukaj lahko shranite pomembne kontaktne informacije o stikih, ki bodo prikazane na straneh s podrobnostmi o sredstvih.', 'asset_manufacturers' => 'Proizvajalci sredstev', @@ -13,4 +13,4 @@ return array( 'update' => 'Posodobi proizvajalca', 'url' => 'URL', -); +]; diff --git a/resources/lang/sl/admin/models/general.php b/resources/lang/sl/admin/models/general.php index de44766bda..94efac83d1 100644 --- a/resources/lang/sl/admin/models/general.php +++ b/resources/lang/sl/admin/models/general.php @@ -1,6 +1,6 @@ 'O modelih sredstev', 'about_models_text' => 'Modeli sredstev so način za združevanje identičnih sredstev. "MBP 2013", "IPhone 6s" itd.', 'deleted' => 'Ta model je bil izbrisan. Kliknite tukaj, da ga obnovite.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Izbrisali boste :modelov_count modelov sredstev.', 'restore' => 'Obnovi model', 'requestable' => 'Uporabniki lahko zahtevajo ta model', - 'show_mac_address' => 'V tem modelu prikažite polje MAC naslov v sredstvih', + 'show_mac_address' => 'V tem modelu prikažite polje MAC naslov v sredstvih', 'view_deleted' => 'Ogled izbrisan', 'view_models' => 'Ogled modelov', 'fieldset' => 'Set polj', 'no_custom_field' => 'Ni polj po meri', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/sl/admin/models/message.php b/resources/lang/sl/admin/models/message.php index d710a868d1..bc16600775 100644 --- a/resources/lang/sl/admin/models/message.php +++ b/resources/lang/sl/admin/models/message.php @@ -1,42 +1,41 @@ 'Model ne obstaja.', 'assoc_users' => 'Ta model je trenutno povezan z enim ali več sredstvi in ​​ga ni mogoče izbrisati. Prosimo, izbrišite sredstva in poskusite zbrisati znova. ', - - 'create' => array( + 'create' => [ 'error' => 'Model ni bil ustvarjen, poskusite znova.', 'success' => 'Model je bil uspešno ustvarjen.', 'duplicate_set' => 'Model sredstva s tem imenom, proizvajalcem in številko modela že obstaja.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model ni bil posodobljen, poskusite znova', - 'success' => 'Model je bil uspešno posodobljen.' - ), + 'success' => 'Model je bil uspešno posodobljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati ta model sredstva?', 'error' => 'Prišlo je do težave pri brisanju modela. Prosim poskusite ponovno.', - 'success' => 'Model je bil uspešno izbrisan.' - ), + 'success' => 'Model je bil uspešno izbrisan.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model ni bil obnovljen, poskusite znova', - 'success' => 'Model je bil uspešno obnovljen.' - ), + 'success' => 'Model je bil uspešno obnovljen.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Polja niso bila spremenjena, nič ni posodobljeno.', - 'success' => 'Modeli so posodobljeni.' - ), + 'success' => 'Modeli so posodobljeni.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Modeli niso bili izbrani, nič ni izbrisano.', 'success' => ': model (i) so izbrisani!', - 'success_partial' => ': modeli so bili izbrisani, vendar: fail_count ni bilo mogoče izbrisati, ker so še vedno sredstva, povezana z njimi.' - ), + 'success_partial' => ': modeli so bili izbrisani, vendar: fail_count ni bilo mogoče izbrisati, ker so še vedno sredstva, povezana z njimi.', + ], -); +]; diff --git a/resources/lang/sl/admin/models/table.php b/resources/lang/sl/admin/models/table.php index 2cb9698acb..06bdbadfa5 100644 --- a/resources/lang/sl/admin/models/table.php +++ b/resources/lang/sl/admin/models/table.php @@ -1,6 +1,6 @@ 'Ustvarite model sredstva', 'created_at' => 'Ustvarjen ob', @@ -14,4 +14,4 @@ return array( 'update' => 'Posodobi model sredstva', 'clone' => 'Kloniraj model', 'edit' => 'Uredi model', -); +]; diff --git a/resources/lang/sl/admin/reports/general.php b/resources/lang/sl/admin/reports/general.php index 9d6ed35145..38cf1a4a06 100644 --- a/resources/lang/sl/admin/reports/general.php +++ b/resources/lang/sl/admin/reports/general.php @@ -1,5 +1,5 @@ 'Izberite možnosti, ki jih želite za poročilo o sredstvih.' -); +return [ + 'info' => 'Izberite možnosti, ki jih želite za poročilo o sredstvih.', +]; diff --git a/resources/lang/sl/admin/reports/message.php b/resources/lang/sl/admin/reports/message.php index 9fee01dea9..61daa4aa95 100644 --- a/resources/lang/sl/admin/reports/message.php +++ b/resources/lang/sl/admin/reports/message.php @@ -1,5 +1,5 @@ 'Izbrati morate vsaj eno možnost.' -); +return [ + 'error' => 'Izbrati morate vsaj eno možnost.', +]; diff --git a/resources/lang/sl/admin/settings/general.php b/resources/lang/sl/admin/settings/general.php index 1a624e9c85..cb7316805c 100644 --- a/resources/lang/sl/admin/settings/general.php +++ b/resources/lang/sl/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Domena Active Directory', 'ad_domain_help' => 'To je včasih enako kot vaša domena e-pošte, vendar ne vedno.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'To je strežnik Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Prag za opozorilo pri poteku (v dneh)', 'alert_inv_threshold' => 'Prag za opozorilo pri inventuri', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID sredstva', 'audit_interval' => 'Revizijski interval', 'audit_interval_help' => 'Če boste morali redno fizično pregledovati svoja sredstva, vnesite interval v mesecih.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Vnesite dvo-stopenjsko kodo', 'two_factor_config_complete' => 'Pošlji kodo', 'two_factor_enabled_edit_not_allowed' => 'Vaš skrbnik vam ne dovoli urejanja te nastavitve.', - 'two_factor_enrollment_text' => "Zahtevano je dvo-stopenjsko preverjanje pristnosti, vendar vaša naprava še ni bila včlanjena. Odprite aplikacijo Google Authenticator in si oglejte spodnjo kodo QR, če želite vnesti svojo napravo. Ko vnesete napravo, vnesite spodnjo kodo", + 'two_factor_enrollment_text' => 'Zahtevano je dvo-stopenjsko preverjanje pristnosti, vendar vaša naprava še ni bila včlanjena. Odprite aplikacijo Google Authenticator in si oglejte spodnjo kodo QR, če želite vnesti svojo napravo. Ko vnesete napravo, vnesite spodnjo kodo', 'require_accept_signature' => 'Zahtevaj podpis', 'require_accept_signature_help_text' => 'Če omogočite to funkcijo, se bodo uporabniki morali fizično odjaviti ob sprejemu sredstva.', 'left' => 'levo', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Dolžina oznak sredstev, vključno z zerofilom', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/sl/admin/settings/message.php b/resources/lang/sl/admin/settings/message.php index 3086d28668..88f4dc63f9 100644 --- a/resources/lang/sl/admin/settings/message.php +++ b/resources/lang/sl/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Med posodabljanjem je prišlo do napake. ', - 'success' => 'Nastavitve so bile posodobljene uspešno.' - ), - 'backup' => array( + 'success' => 'Nastavitve so bile posodobljene uspešno.', + ], + 'backup' => [ 'delete_confirm' => 'Ali ste prepričani, da želite izbrisati to varnostno datoteko? To dejanje ni mogoče razveljaviti. ', 'file_deleted' => 'Varnostna datoteka je bila uspešno izbrisana. ', 'generated' => 'Ustvarjena je bila nova varnostna kopija.', 'file_not_found' => 'To varnostno datoteko ni bilo mogoče najti na strežniku.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Pri čiščenju je prišlo do napake. ', 'validation_failed' => 'Vaša potrditev čiščenja je napačna. V polje za potrditev vnesite besedo »DELETE«.', - 'success' => 'Izbrisani zapisi so bili uspešno počiščeni.' - ), + 'success' => 'Izbrisani zapisi so bili uspešno počiščeni.', + ], -); +]; diff --git a/resources/lang/sl/admin/statuslabels/message.php b/resources/lang/sl/admin/statuslabels/message.php index 59389399e8..f5d86568ad 100644 --- a/resources/lang/sl/admin/statuslabels/message.php +++ b/resources/lang/sl/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Oznaka statusa ne obstaja.', 'assoc_assets' => 'Ta oznaka statusa je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Posodobite svoja sredstva, da ne bodo več v tem stanju in poskusite znova. ', - - 'create' => array( + 'create' => [ 'error' => 'Oznaka statusa ni bila ustvarjena, poskusite znova.', - 'success' => 'Oznaka statusa je bil uspešno ustvarjena.' - ), + 'success' => 'Oznaka statusa je bil uspešno ustvarjena.', + ], - 'update' => array( + 'update' => [ 'error' => 'Oznaka statusa ni bila posodobljena, poskusite znova', - 'success' => 'Oznaka statusa je bila uspešno posodobljena.' - ), + 'success' => 'Oznaka statusa je bila uspešno posodobljena.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati to oznako statusa?', 'error' => 'Prišlo je do težave z izbrisom oznake statusa. Prosim poskusite ponovno.', - 'success' => 'Oznaka statusa je bila uspešno izbrisana.' - ), + 'success' => 'Oznaka statusa je bila uspešno izbrisana.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Tega sredstva ni mogoče dodeliti nikomur.', 'deployable' => 'Teh sredstev ni mogoče izdati. Ko bodo dodeljeni, bodo prevzeli meta status Razporejeno.', 'archived' => 'Teh sredstev ni mogoče izdati in se bodo prikazala samo v pogledu Arhivirano. To je koristno za ohranjanje informacij o sredstvih za računovodske namene / zgodovinske namene, vendar jih ni na seznamu uporabnih sredstev.', 'pending' => 'Teh sredstev trnutno ni mogoče dodeliti nikomur, pogosto se uporablja za sredstva, ki so ne popravilu, in se pričakuje, da se bodo vrnila v obtok.', - ), + ], -); +]; diff --git a/resources/lang/sl/admin/statuslabels/table.php b/resources/lang/sl/admin/statuslabels/table.php index 3e11b9040e..524cb9ed14 100644 --- a/resources/lang/sl/admin/statuslabels/table.php +++ b/resources/lang/sl/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'O oznakah stanja', 'archived' => 'Arhivirano', 'create' => 'Ustvari oznako stanja', @@ -16,4 +16,4 @@ return array( 'title' => 'Oznake statusa', 'undeployable' => 'Nerazporejeno', 'update' => 'Posodobi statusno oznako', -); +]; diff --git a/resources/lang/sl/admin/suppliers/message.php b/resources/lang/sl/admin/suppliers/message.php index 78af2c12a3..bd2e841415 100644 --- a/resources/lang/sl/admin/suppliers/message.php +++ b/resources/lang/sl/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Dobavitelj ne obstaja.', - - 'create' => array( + 'create' => [ 'error' => 'Dobavitelj ni bil ustvarjen, poskusite znova.', - 'success' => 'Dobavitelj je bil uspešno ustvarjen.' - ), + 'success' => 'Dobavitelj je bil uspešno ustvarjen.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dobavitelj ni bil posodobljen, poskusite znova', - 'success' => 'Dobavitelj uspešno posodabljen.' - ), + 'success' => 'Dobavitelj uspešno posodabljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ali ste prepričani, da želite izbrisati tega dobavitelja?', 'error' => 'Prišlo je do težave z izbrisom dobavitelja. Prosim poskusite ponovno.', 'success' => 'Dobavitelj je bil uspešno izbrisan.', 'assoc_assets' => 'Ta dobavitelj je trenutno povezan z: asset_count sredstvi in ga ni mogoče izbrisati. Prosimo, posodobite svoja sredstva, da ne bodo več vsebovala tega dobavitelja in poskusite znova. ', 'assoc_licenses' => 'Ta dobavitelj je trenutno povezan z :licence_count licencami in ga ni mogoče izbrisati. Prosimo, posodobite svoje licence, da ne bodo več vsebovale tega dobavitelja in poskusite znova. ', 'assoc_maintenances' => 'Ta dobavitelj je trenutno povezan z :assets_maintenances_count sredstvi za vzdrževanje in je ni mogoče izbrisati. Prosimo, posodobite svoja sredstva za vzdrževanje, da ne bo več vsebovala tega dobavitelja in poskusite znova. ', - ) + ], -); +]; diff --git a/resources/lang/sl/admin/suppliers/table.php b/resources/lang/sl/admin/suppliers/table.php index cc7f184845..ef979ac08f 100644 --- a/resources/lang/sl/admin/suppliers/table.php +++ b/resources/lang/sl/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'O dobaviteljih', 'about_suppliers_text' => 'Dobavitelji se uporabljajo za sledenje vira dobavljivosti', 'address' => 'Naslov dobavitelja', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Ogled sredstev za', 'zip' => 'Poštna številka', -); +]; diff --git a/resources/lang/sl/admin/users/general.php b/resources/lang/sl/admin/users/general.php index 5c08e7608d..86c79a6f21 100644 --- a/resources/lang/sl/admin/users/general.php +++ b/resources/lang/sl/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Sredstva dodeljena osebi: ime', @@ -13,7 +12,7 @@ return array( 'edit' => 'Uredi uporabnika', 'filetype_info' => 'Dovoljene oblike datotek so png, gif, jpg, jpeg, doc, docx, pdf, txt, zip in rar.', 'history_user' => 'Zgodovina za :name', - 'info' => 'Informacije', + 'info' => 'Informacije', 'restore_user' => 'Kliknite tukaj, da jih obnovite.', 'last_login' => 'Zadnja prijava', 'ldap_config_text' => 'Nastavitve konfiguracije LDAP-a lahko najdete v zavihku Admin> Nastavitve. Izbrana lokacija bo nastavljena za vse uvožene uporabnike.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Vaše trenutne nastavitve skrbnika omogočajo selektivno uveljavljanje dvotaktne pristnosti. ', 'two_factor_enrolled' => 'Vgrajena naprava 2FA ', 'two_factor_active' => '2FA aktivna ', - ); + ]; diff --git a/resources/lang/sl/admin/users/message.php b/resources/lang/sl/admin/users/message.php index 446c75442f..20b1eba32f 100644 --- a/resources/lang/sl/admin/users/message.php +++ b/resources/lang/sl/admin/users/message.php @@ -1,6 +1,6 @@ 'To sredstev ste uspešno sprejeli.', 'declined' => 'To sredstev ste uspešno zavrnili.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Integracija LDAP za to namestitev ni bila konfigurirana.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Uporabnik je bil uspešno ustvarjen.', 'update' => 'Uporabnik je bil uspešno posodobljen.', 'update_bulk' => 'Uporabniki so bili uspešno posodobljeni!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Uporabnik je bil uspešno od-suspendiran.', 'restored' => 'Uporabnik je bil uspešno obnovljen.', 'import' => 'Uporabniki so bili uvoženi uspešno.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Pri ustvarjanju uporabnika je prišlo do težave. Prosim poskusite ponovno.', 'update' => 'Prišlo je do težave pri posodabljanju uporabnika. Prosim poskusite ponovno.', 'delete' => 'Pri brisanju uporabnika je prišlo do težave. Prosim poskusite ponovno.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Strežnika LDAP ni bilo mogoče najti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP:', 'ldap_could_not_get_entries' => 'Vnose iz strežnika LDAP ni bilo mogoče pridobiti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP.
Napaka strežnika LDAP:', 'password_ldap' => 'Geslo za ta račun upravlja LDAP / Active Directory. Za spremembo gesla se obrnite na oddelek IT. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka ni izbrisana. Prosim poskusite ponovno.', 'success' => 'Datoteka je uspešno izbrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteka(e) niso naložene. Prosim poskusite ponovno.', 'success' => 'Datoteka(e) so bile uspešno naložene.', 'nofiles' => 'Niste izbrali nobenih datotek za nalaganje', 'invalidfiles' => 'Ena ali več vaših datotek je prevelika ali pa je tip datoteke, ki ni dovoljen. Dovoljeni tipi datotek so png, gif, jpg, doc, docx, pdf in txt.', - ), + ], -); +]; diff --git a/resources/lang/sl/admin/users/table.php b/resources/lang/sl/admin/users/table.php index 95a8bccb8b..20d6e63de9 100644 --- a/resources/lang/sl/admin/users/table.php +++ b/resources/lang/sl/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktivna', 'allow' => 'Dovoli', 'checkedout' => 'Sredstva', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Prikaži trenutne uporabnike', 'show_deleted' => 'Prikaži izbrisane uporabnike', 'title' => 'Naslov', - 'to_restore_them' => 'da jih obnovite.', + 'to_restore_them' => 'da jih obnovite.', 'updateuser' => 'Posodobi uporabnika', 'username' => 'Uporabniško ime', - 'user_deleted_text' => 'Ta uporabnik je bil označen kot izbrisan.', + 'user_deleted_text' => 'Ta uporabnik je bil označen kot izbrisan.', 'username_note' => '(Ta uporabnik se uporablja samo za povezavo z Active Directory, in ne za prijavo.)', 'cloneuser' => 'Kloniraj uporabnika', 'viewusers' => 'Ogled uporabnikov', -); +]; diff --git a/resources/lang/sl/auth/general.php b/resources/lang/sl/auth/general.php index 50e02a7460..1d1b68676a 100644 --- a/resources/lang/sl/auth/general.php +++ b/resources/lang/sl/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/sl/auth/message.php b/resources/lang/sl/auth/message.php index 9c86406a2b..a7baa13350 100644 --- a/resources/lang/sl/auth/message.php +++ b/resources/lang/sl/auth/message.php @@ -1,6 +1,6 @@ 'Račun s tem e-poštnim naslovom že obstaja.', 'account_not_found' => 'Uporabniško ime ali geslo ni pravilno.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ta uporabniški račun je onemogočen.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Pri poskusu prijave je prišlo do težave, poskusite znova.', 'success' => 'Uspešno ste se prijavili.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Pri poskusu ustvarjanja računa je prišlo do težave, poskusite znova.', 'success' => 'Račun je uspešno ustvarjen.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Med poskusom ponastavitve gesla za ponastavitev je prišlo do težave, poskusite znova.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Pri poskusu ponastavitve gesla je prišlo do težave, poskusite znova.', 'success' => 'Vaše geslo je bilo uspešno ponastavljeno.', - ), + ], - -); +]; diff --git a/resources/lang/sl/button.php b/resources/lang/sl/button.php index 1e347fe8a1..01a4c5c2d2 100644 --- a/resources/lang/sl/button.php +++ b/resources/lang/sl/button.php @@ -1,6 +1,6 @@ 'Dejanja', 'add' => 'Dodaj Novo', 'cancel' => 'Prekliči', @@ -11,7 +11,7 @@ return array( 'request' => 'Zahteva', 'submit' => 'Pošlji', 'upload' => 'Naloži', - 'select_file' => 'Izberite datoteko...', + 'select_file' => 'Izberite datoteko...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php index 1d50d6c363..518ecc9f6b 100644 --- a/resources/lang/sl/general.php +++ b/resources/lang/sl/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Mesto', - 'click_here' => 'Kliknite tukaj', + 'click_here' => 'Kliknite tukaj', 'clear_selection' => 'Počisti izbor', 'companies' => 'Podjetja', 'company' => 'Podjetje', 'component' => 'Komponenta', 'components' => 'Komponente', - 'complete' => 'Končano', + 'complete' => 'Končano', 'consumable' => 'Potrošni material', 'consumables' => 'Potrošni material', 'country' => 'Država', diff --git a/resources/lang/sl/help.php b/resources/lang/sl/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/sl/help.php +++ b/resources/lang/sl/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/sl/mail.php b/resources/lang/sl/mail.php index 2c359198ea..30e9e3440b 100644 --- a/resources/lang/sl/mail.php +++ b/resources/lang/sl/mail.php @@ -1,6 +1,6 @@ 'Uporabnik je preklical zahtevo za sredstev na spletnem mestu', 'a_user_requested' => 'Uporabnik je zahteval sredstev na spletnem mestu', 'accessory_name' => 'Ime Dodatka:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/sl/pagination.php b/resources/lang/sl/pagination.php index 8897b161f4..06f360cc7a 100644 --- a/resources/lang/sl/pagination.php +++ b/resources/lang/sl/pagination.php @@ -1,6 +1,6 @@ 'Naslednja »', -); +]; diff --git a/resources/lang/sl/passwords.php b/resources/lang/sl/passwords.php index 7149af5cd4..750cfd46e2 100644 --- a/resources/lang/sl/passwords.php +++ b/resources/lang/sl/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Povezava za vaše geslo je bila poslana!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/sl/reminders.php b/resources/lang/sl/reminders.php index 6275ec3b04..3c3f745f8a 100644 --- a/resources/lang/sl/reminders.php +++ b/resources/lang/sl/reminders.php @@ -1,6 +1,6 @@ "Gesla morajo biti dolga vsaj šest znakov in ustrezati potrditvi.", + 'password' => 'Gesla morajo biti dolga vsaj šest znakov in ustrezati potrditvi.', - "user" => "Uporabniško ime ali e-poštni naslov je napačno", + 'user' => 'Uporabniško ime ali e-poštni naslov je napačno', - "token" => "Token za ponastavitev gesla je neveljaven.", + 'token' => 'Token za ponastavitev gesla je neveljaven.', - "sent" => "Če je bil najden ujemajoč e-poštni naslov, je bil poslan opomnik za geslo!", + 'sent' => 'Če je bil najden ujemajoč e-poštni naslov, je bil poslan opomnik za geslo!', -); +]; diff --git a/resources/lang/sl/table.php b/resources/lang/sl/table.php index e606efa263..bbd49d8a17 100644 --- a/resources/lang/sl/table.php +++ b/resources/lang/sl/table.php @@ -1,10 +1,10 @@ 'Dejanja', 'action' => 'Dejanje', 'by' => 'Od', 'item' => 'Element', -); +]; diff --git a/resources/lang/sl/validation.php b/resources/lang/sl/validation.php index 8332617bde..511bec2e22 100644 --- a/resources/lang/sl/validation.php +++ b/resources/lang/sl/validation.php @@ -1,6 +1,6 @@ 'Atribut je bil že sprejet.', 'uploaded' => 'Atribut se ni uspel naložiti.', 'url' => 'Oblika atributa je neveljavna.', - "unique_undeleted" => "Atribut mora biti edinstven.", + 'unique_undeleted' => 'Atribut mora biti edinstven.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Polje atributa vsebuje znak, ki ni dovoljen.", - "email_array" => "En ali več e-poštnih naslovov je napačnih.", - "hashed_pass" => "Vaše trenutno geslo je napačno", + 'alpha_space' => 'Polje atributa vsebuje znak, ki ni dovoljen.', + 'email_array' => 'En ali več e-poštnih naslovov je napačnih.', + 'hashed_pass' => 'Vaše trenutno geslo je napačno', 'dumbpwd' => 'To geslo je preveč pogosto.', - "statuslabel_type" => "Izbrati morate veljavn status oznake", + 'statuslabel_type' => 'Izbrati morate veljavn status oznake', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/sr-CS/admin/accessories/general.php b/resources/lang/sr-CS/admin/accessories/general.php index 51dc61e776..c6d0c84d1f 100644 --- a/resources/lang/sr-CS/admin/accessories/general.php +++ b/resources/lang/sr-CS/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorija pribora', 'accessory_name' => 'Naziv pribora', 'checkout' => 'Izdaj pribor', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Umesto ovoga upotrebite primarnu postavku EULA.', 'use_default_eula_disabled' => 'Koristi osnovnu, default EULA. Nema primarne, default EULA. Dodajte jednu u Postavke.', -); +]; diff --git a/resources/lang/sr-CS/admin/accessories/message.php b/resources/lang/sr-CS/admin/accessories/message.php index a3b86f34ba..f80643a3f4 100644 --- a/resources/lang/sr-CS/admin/accessories/message.php +++ b/resources/lang/sr-CS/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Ovaj pribor trenutno ima :count stavku označenu korisnicima. Proverite pribor i pokušajte ponovo. ', - 'create' => array( + 'create' => [ 'error' => 'Pribor nije kreiran. Pokušajte ponovo.', - 'success' => 'Pribor je uspešno kreiran.' - ), + 'success' => 'Pribor je uspešno kreiran.', + ], - 'update' => array( + 'update' => [ 'error' => 'Pribor nije ažuriran. Pokušajte ponovo', - 'success' => 'Pribor je uspešno ažuriran.' - ), + 'success' => 'Pribor je uspešno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite brisanje pribora?', 'error' => 'Došlo je do problema s brisanjem dodatne opreme, pribora. Molim pokušajte ponovo.', - 'success' => 'Pribor je uspešno izbrisan.' - ), + 'success' => 'Pribor je uspešno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Pribor nije potvrdjen, pokušajte ponovo', 'success' => 'Pribor je uspešno proveren.', - 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušajte ponovo.' - ), + 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušajte ponovo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Pribor nije prijavljen, pokušajte ponovo', 'success' => 'Pribor je uspešno prijavljen.', - 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.' - ) + 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.', + ], - -); +]; diff --git a/resources/lang/sr-CS/admin/accessories/table.php b/resources/lang/sr-CS/admin/accessories/table.php index 108bd201cc..29842fceda 100644 --- a/resources/lang/sr-CS/admin/accessories/table.php +++ b/resources/lang/sr-CS/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Prihvatanje', 'title' => 'Naziv dodatne opreme, pribora', - -); +]; diff --git a/resources/lang/sr-CS/admin/asset_maintenances/form.php b/resources/lang/sr-CS/admin/asset_maintenances/form.php index bdb85a424d..2e22af3f70 100644 --- a/resources/lang/sr-CS/admin/asset_maintenances/form.php +++ b/resources/lang/sr-CS/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dani', 'notes' => 'Zabeleške', 'update' => 'Ažuriraj', - 'create' => 'Kreiraj' + 'create' => 'Kreiraj', ]; diff --git a/resources/lang/sr-CS/admin/asset_maintenances/message.php b/resources/lang/sr-CS/admin/asset_maintenances/message.php index ebb92f3f93..5b49c31976 100644 --- a/resources/lang/sr-CS/admin/asset_maintenances/message.php +++ b/resources/lang/sr-CS/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovo održavanje imovine?', 'error' => 'Došlo je do problema s brisanjem održavanja imovine. Molim pokušaj te ponovo.', - 'success' => 'Održavanje imovine uspešno izbrisano.' + 'success' => 'Održavanje imovine uspešno izbrisano.', ], 'create' => [ 'error' => 'Održavanje imovine nije kreirano, pokušajte ponovo.', - 'success' => 'Održavanje imovine uspešno kreirano.' + 'success' => 'Održavanje imovine uspešno kreirano.', ], 'edit' => [ 'error' => 'Održavanje imovine nije uređeno, pokušajte ponovo.', - 'success' => 'Održavanje imovine uspješno je uređeno.' + 'success' => 'Održavanje imovine uspješno je uređeno.', ], 'asset_maintenance_incomplete' => 'Nije još završeno', 'warranty' => 'Garancija', 'not_warranty' => 'Bez garancije', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/sr-CS/admin/asset_maintenances/table.php b/resources/lang/sr-CS/admin/asset_maintenances/table.php index f9d2dbb600..d9c0a673be 100644 --- a/resources/lang/sr-CS/admin/asset_maintenances/table.php +++ b/resources/lang/sr-CS/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Održavanje imovine', 'asset_name' => 'Naziv imovine', 'is_warranty' => 'Garancija', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/sr-CS/admin/categories/general.php b/resources/lang/sr-CS/admin/categories/general.php index 0ac263c0b4..96437a9b67 100644 --- a/resources/lang/sr-CS/admin/categories/general.php +++ b/resources/lang/sr-CS/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorije resursa', 'category_name' => 'Naziv kategorije', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Umesto toga upotrebite primarnu, default postavku EULA.', 'use_default_eula_disabled' => 'Upotrebi primarnu default EULA. Nije postavljena primarna default EULA. Dodajte jednu u Postavke.', -); +]; diff --git a/resources/lang/sr-CS/admin/categories/message.php b/resources/lang/sr-CS/admin/categories/message.php index 523ed58bc5..a3c994cf89 100644 --- a/resources/lang/sr-CS/admin/categories/message.php +++ b/resources/lang/sr-CS/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorija ne postoji.', 'assoc_models' => 'Ova je kategorija trenutno povezana sa barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da se više ne referenciraju na ovu kategoriju i pokušajte ponovno. ', 'assoc_items' => 'Ova je kategorija trenutno povezana s najmanje jednim: asset_type i ne može se izbrisati. Ažurirajte svoj: asset_type da se više ne referencira na ovu kategoriju i pokušajte ponovo. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorija nije kreirana, pokušajte ponovo.', - 'success' => 'Kategorija je uspješno kreirana.' - ), + 'success' => 'Kategorija je uspješno kreirana.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorija nije ažurirana, pokušajte ponovo', - 'success' => 'Kategorija je uspješno ažurirana.' - ), + 'success' => 'Kategorija je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovu kategoriju?', 'error' => 'Došlo je do problema s brisanjem kategorije. Molim pokušaj te ponovo.', - 'success' => 'Kategorija je uspešno izbrisana.' - ) + 'success' => 'Kategorija je uspešno izbrisana.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/categories/table.php b/resources/lang/sr-CS/admin/categories/table.php index 18525167cf..c4451538af 100644 --- a/resources/lang/sr-CS/admin/categories/table.php +++ b/resources/lang/sr-CS/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Nadredjen', 'require_acceptance' => 'Prihvatanje', 'title' => 'Naziv kategorije imovine', -); +]; diff --git a/resources/lang/sr-CS/admin/companies/general.php b/resources/lang/sr-CS/admin/companies/general.php index ee86624bf6..a5608a6a9e 100644 --- a/resources/lang/sr-CS/admin/companies/general.php +++ b/resources/lang/sr-CS/admin/companies/general.php @@ -1,4 +1,5 @@ 'Odaberite firmu', ]; diff --git a/resources/lang/sr-CS/admin/companies/message.php b/resources/lang/sr-CS/admin/companies/message.php index 81f69e4eb8..7852e338be 100644 --- a/resources/lang/sr-CS/admin/companies/message.php +++ b/resources/lang/sr-CS/admin/companies/message.php @@ -1,18 +1,19 @@ 'Firma ne postoji.', 'assoc_users' => 'Firma je trenutno povezana s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da se više ne referenciraju na tu firmu i pokušajte ponovno. ', - 'create' => array( + 'create' => [ 'error' => 'Tvrtka nije kreirana, pokušajte ponovo.', - 'success' => 'Firma je uspešno kreirana.' - ), - 'update' => array( + 'success' => 'Firma je uspešno kreirana.', + ], + 'update' => [ 'error' => 'Firma nije ažurirana, pokušajte ponovo', - 'success' => 'Firma je uspešno ažurirana.' - ), - 'delete' => array( + 'success' => 'Firma je uspešno ažurirana.', + ], + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovu firmu?', 'error' => 'Došlo je do problema s brisanjem firme. Molim pokušaj te ponovo.', - 'success' => 'Firma je uspešno izbrisana.' - ) -); + 'success' => 'Firma je uspešno izbrisana.', + ], +]; diff --git a/resources/lang/sr-CS/admin/companies/table.php b/resources/lang/sr-CS/admin/companies/table.php index b91788dead..c9e50ec07a 100644 --- a/resources/lang/sr-CS/admin/companies/table.php +++ b/resources/lang/sr-CS/admin/companies/table.php @@ -1,9 +1,10 @@ 'Firme', 'create' => 'Kreiraj firmu', 'title' => 'Firma', 'update' => 'Ažuriraj firmu', 'name' => 'Nayiv firme', 'id' => 'ID', -); +]; diff --git a/resources/lang/sr-CS/admin/components/general.php b/resources/lang/sr-CS/admin/components/general.php index a811317a49..009a506107 100644 --- a/resources/lang/sr-CS/admin/components/general.php +++ b/resources/lang/sr-CS/admin/components/general.php @@ -1,6 +1,6 @@ 'Naziv komponente', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Preostalo', 'total' => 'Ukupno', 'update' => 'Ažuriraj komponentu', -); +]; diff --git a/resources/lang/sr-CS/admin/components/message.php b/resources/lang/sr-CS/admin/components/message.php index 3f39dcec93..cd70968767 100644 --- a/resources/lang/sr-CS/admin/components/message.php +++ b/resources/lang/sr-CS/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenta ne postoji.', - 'create' => array( + 'create' => [ 'error' => 'Komponenta nije kreirana, pokušajte ponovo.', - 'success' => 'Komponenta je uspešno kreirana.' - ), + 'success' => 'Komponenta je uspešno kreirana.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenta nije ažurirana, pokušajte ponovo', - 'success' => 'Komponenta je uspešno ažurirana.' - ), + 'success' => 'Komponenta je uspešno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovu komponentu?', 'error' => 'Došlo je do problema s brisanjem komponente. Molim pokušaj te ponovo.', - 'success' => 'Komponenta je uspješno izbrisana.' - ), + 'success' => 'Komponenta je uspješno izbrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.' - ), + 'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušaj te ponovo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenta nije prijavljena, pokušajte ponovo', 'success' => 'Komponenta je uspešno prijavljena.', - 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušajte ponovo.' - ) + 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušajte ponovo.', + ], - -); +]; diff --git a/resources/lang/sr-CS/admin/components/table.php b/resources/lang/sr-CS/admin/components/table.php index ce4c5edb94..544ba7538a 100644 --- a/resources/lang/sr-CS/admin/components/table.php +++ b/resources/lang/sr-CS/admin/components/table.php @@ -1,5 +1,5 @@ 'Naziv komponente', -); +]; diff --git a/resources/lang/sr-CS/admin/consumables/general.php b/resources/lang/sr-CS/admin/consumables/general.php index 26e154ba22..54cd8e1799 100644 --- a/resources/lang/sr-CS/admin/consumables/general.php +++ b/resources/lang/sr-CS/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Naziv potrošnog materijala', 'create' => 'Kreiraj potrošni materijal', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Preostalo', 'total' => 'Ukupno', 'update' => 'Ažuriraj potrošni materijal', -); +]; diff --git a/resources/lang/sr-CS/admin/consumables/message.php b/resources/lang/sr-CS/admin/consumables/message.php index 2b0cd5b67e..08ca40e5a1 100644 --- a/resources/lang/sr-CS/admin/consumables/message.php +++ b/resources/lang/sr-CS/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Potrošni materijal ne postoji.', - 'create' => array( + 'create' => [ 'error' => 'Potrošni materijal nije kreiran, pokušajte ponovo.', - 'success' => 'Potrošni materijal uspešno kreiran.' - ), + 'success' => 'Potrošni materijal uspešno kreiran.', + ], - 'update' => array( + 'update' => [ 'error' => 'Potrošni materijal nije ažuriran, pokušajte ponovo', - 'success' => 'Potrošni materijal uspešno ažuriran.' - ), + 'success' => 'Potrošni materijal uspešno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovaj potrošni materijal?', 'error' => 'Došlo je do problema s brisanjem potrošnog materijala. Molim pokušaj te ponovo.', - 'success' => 'Potrošni materijal je uspešno izbrisan.' - ), + 'success' => 'Potrošni materijal je uspešno izbrisan.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.' - ), + 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.' - ) + 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušaj te ponovo.', + ], - -); +]; diff --git a/resources/lang/sr-CS/admin/consumables/table.php b/resources/lang/sr-CS/admin/consumables/table.php index 8c69a46692..2e4a242ab8 100644 --- a/resources/lang/sr-CS/admin/consumables/table.php +++ b/resources/lang/sr-CS/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Naziv potrošnog materijala', -); +]; diff --git a/resources/lang/sr-CS/admin/custom_fields/general.php b/resources/lang/sr-CS/admin/custom_fields/general.php index d4062a7d42..c23c06f37f 100644 --- a/resources/lang/sr-CS/admin/custom_fields/general.php +++ b/resources/lang/sr-CS/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Dodatna Polja', 'field' => 'Polje', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Novo prilagodjeno polje', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/sr-CS/admin/custom_fields/message.php b/resources/lang/sr-CS/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/sr-CS/admin/custom_fields/message.php +++ b/resources/lang/sr-CS/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/sr-CS/admin/departments/message.php b/resources/lang/sr-CS/admin/departments/message.php index 3593efeba5..fb5605bb6b 100644 --- a/resources/lang/sr-CS/admin/departments/message.php +++ b/resources/lang/sr-CS/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department ne postoji.', 'assoc_users' => 'Ovaj je department je trenutno povezan s barem jednim korisnikom i ne može se izbrisati. Ažurirajte svoje korisnike da se više ne referenciraju na ovaj department i pokušajte ponovo. ', - 'create' => array( + 'create' => [ 'error' => 'Dep. nije kreiran, pokušajte ponovo.', - 'success' => 'Dep. uspešno kreiran.' - ), - 'update' => array( + 'success' => 'Dep. uspešno kreiran.', + ], + 'update' => [ 'error' => 'Dep. nije ažuriran, pokušajte ponovo', - 'success' => 'Dep. uspešno ažuriran.' - ), - 'delete' => array( + 'success' => 'Dep. uspešno ažuriran.', + ], + 'delete' => [ 'confirm' => 'Da li ste sigurni da želite izbrisati ovaj dep.?', 'error' => 'Došlo je do problema s brisanjem dep. Molim pokušaj te ponovo.', - 'success' => 'Dep. je uspešno izbrisan.' - ) + 'success' => 'Dep. je uspešno izbrisan.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/departments/table.php b/resources/lang/sr-CS/admin/departments/table.php index 2196e45a0a..0bd37e6980 100644 --- a/resources/lang/sr-CS/admin/departments/table.php +++ b/resources/lang/sr-CS/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Naziv Departmenta', @@ -8,4 +8,4 @@ return array( 'location' => 'Lokacija', 'create' => 'Kreiraj department', 'update' => 'Ažuriraj department', - ); + ]; diff --git a/resources/lang/sr-CS/admin/depreciations/general.php b/resources/lang/sr-CS/admin/depreciations/general.php index 461895609e..6cefe0cea8 100644 --- a/resources/lang/sr-CS/admin/depreciations/general.php +++ b/resources/lang/sr-CS/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'O amortizacijama imovine', 'about_depreciations' => 'Možete postaviti amortizaciju imovine na osnovu linearne amortizacije.', 'asset_depreciations' => 'Amortizacija imovine', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Broj meseci', 'update' => 'Ažuriraj amortizaciju', -); +]; diff --git a/resources/lang/sr-CS/admin/depreciations/message.php b/resources/lang/sr-CS/admin/depreciations/message.php index 2e28b92a51..477e5b7d13 100644 --- a/resources/lang/sr-CS/admin/depreciations/message.php +++ b/resources/lang/sr-CS/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Klasa amortizacije ne postoji.', 'assoc_users' => 'Amortizacija je trenutno povezana s jednim ili više modela i ne može se izbrisati. Izbrišite modele i pokušajte ponovo izbrisati. ', - - 'create' => array( + 'create' => [ 'error' => 'Klasa amortizacije nije kreirana, pokušajte ponovo. :(', - 'success' => 'Klasa amortizacije uspješno je kreirana. :)' - ), + 'success' => 'Klasa amortizacije uspješno je kreirana. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Klasa amortizacije nije ažurirana, pokušajte ponovo', - 'success' => 'Klasa amortizacije uspešno ažurirana.' - ), + 'success' => 'Klasa amortizacije uspešno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu klasu amortizacije?', 'error' => 'Došlo je do problema s brisanjem klase amortizacije. Molim pokušajte ponovo.', - 'success' => 'Klasa amortizacije uspešno je izbrisana.' - ) + 'success' => 'Klasa amortizacije uspešno je izbrisana.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/depreciations/table.php b/resources/lang/sr-CS/admin/depreciations/table.php index 92f7fb78f9..cf0a091382 100644 --- a/resources/lang/sr-CS/admin/depreciations/table.php +++ b/resources/lang/sr-CS/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Meseci', 'term' => 'Termin', 'title' => 'Naziv ', -); +]; diff --git a/resources/lang/sr-CS/admin/groups/message.php b/resources/lang/sr-CS/admin/groups/message.php index f54b4f72a7..436d0d4ffb 100644 --- a/resources/lang/sr-CS/admin/groups/message.php +++ b/resources/lang/sr-CS/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grupa već postoji!', 'group_not_found' => 'Grupa [: id] ne postoji.', 'group_name_required' => 'Polje naziv je obavezno', - 'success' => array( + 'success' => [ 'create' => 'Grupa je uspešno kreirana.', 'update' => 'Grupa je uspešno ažurirana.', 'delete' => 'Grupa je uspešno izbrisana.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu grupu?', 'create' => 'Došlo je do problema u kreiranju grupe. Molim pokušajte ponovo.', 'update' => 'Došlo je do problema s ažuriranjem grupe. Molim pokušajte ponovo.', 'delete' => 'Došlo je do problema sa brisanjem grupe. Molim pokušajte ponovo.', - ), + ], -); +]; diff --git a/resources/lang/sr-CS/admin/groups/table.php b/resources/lang/sr-CS/admin/groups/table.php index 71d9b08b11..415f40fe00 100644 --- a/resources/lang/sr-CS/admin/groups/table.php +++ b/resources/lang/sr-CS/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Naziv', 'users' => '# korisnika', -); +]; diff --git a/resources/lang/sr-CS/admin/groups/titles.php b/resources/lang/sr-CS/admin/groups/titles.php index 71ee34474f..8e32da1cef 100644 --- a/resources/lang/sr-CS/admin/groups/titles.php +++ b/resources/lang/sr-CS/admin/groups/titles.php @@ -1,6 +1,6 @@ 'O grupama', 'about_groups' => 'Grupe se koriste za generalizovanje korisničkih dozvola.', 'group_management' => 'Upravljanje grupom', @@ -11,4 +11,4 @@ return array( 'allow' => 'Dozvoli', 'deny' => 'Zabrani', -); +]; diff --git a/resources/lang/sr-CS/admin/hardware/form.php b/resources/lang/sr-CS/admin/hardware/form.php index 2a9a2edd37..5077a520a4 100644 --- a/resources/lang/sr-CS/admin/hardware/form.php +++ b/resources/lang/sr-CS/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Potvrda grupnog brisanja imovine', +return [ + 'bulk_delete' => 'Potvrda grupnog brisanja imovine', 'bulk_delete_help' => 'Pregledajte stavke za grupno brisanje. Jednom izbrisana, ta se sredstva mogu vratiti, ali više neće biti povezana s korisnicima koji su trenutno dodeljeni.', 'bulk_delete_warn' => 'Izbrisaćete: asset_count assets.', - 'bulk_update' => 'Grupno ažuriranje imovine', - 'bulk_update_help' => 'Ova forma vam omogućava da ažururate više stavki odjednom. Popunite samo polja koja želite da izmenite. Nepopunjena polja ostaće nepromenjena. ', - 'bulk_update_warn' => 'Nameravate da manjate svojstva: imovine asset_count.', + 'bulk_update' => 'Grupno ažuriranje imovine', + 'bulk_update_help' => 'Ova forma vam omogućava da ažururate više stavki odjednom. Popunite samo polja koja želite da izmenite. Nepopunjena polja ostaće nepromenjena. ', + 'bulk_update_warn' => 'Nameravate da manjate svojstva: imovine asset_count.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Oznaka imovine', 'update' => 'Ažuriranje imovine', 'warranty' => 'Garancija', - 'warranty_expires' => 'Garancija ističe', + 'warranty_expires' => 'Garancija ističe', 'years' => 'godina', -) -; +]; diff --git a/resources/lang/sr-CS/admin/hardware/general.php b/resources/lang/sr-CS/admin/hardware/general.php index 7e13952ba0..cf89f0bb4c 100644 --- a/resources/lang/sr-CS/admin/hardware/general.php +++ b/resources/lang/sr-CS/admin/hardware/general.php @@ -1,9 +1,9 @@ 'O imovini', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Arhivirano', + 'archived' => 'Arhivirano', 'asset' => 'Imovina', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'U čekanju', 'undeployable' => 'Ne može da se razmesti', 'view' => 'Prikaz imovine', -); +]; diff --git a/resources/lang/sr-CS/admin/hardware/message.php b/resources/lang/sr-CS/admin/hardware/message.php index 6472c9c02a..afe3dffadb 100644 --- a/resources/lang/sr-CS/admin/hardware/message.php +++ b/resources/lang/sr-CS/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Upozorenje: Ovaj resurs, imovina je označena kao trenutno nedeljiva. Ako se ovaj status promenio, ažurirajte status imovine.', 'does_not_exist' => 'Imovina ne postoji.', 'does_not_exist_or_not_requestable' => 'Dobar pokušaj. Ta imovina ne postoji ili nije moguće da se potražuje.', 'assoc_users' => 'Ovaj je resurs trenutno poveren korisniku i ne može se izbrisati. Najprije proverite resurs, a zatim ponovo pokušajte brisanje. ', - 'create' => array( + 'create' => [ 'error' => 'Imovina, resurs nije kreiran, pokušajte ponovo. :(', - 'success' => 'Imovina, resurs uspešno kreiran. :)' - ), + 'success' => 'Imovina, resurs uspešno kreiran. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Imovina nije ažurirana, pokušajte ponovo', 'success' => 'Imovina je uspešno ažurirana.', 'nothing_updated' => 'Nije odabrano nijedno polje, tako da ništa nije ažurirano.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Imovina nije obnovljena, pokušajte ponovo', - 'success' => 'Imovina je uspešno obnovljena.' - ), + 'success' => 'Imovina je uspešno obnovljena.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Provera imovine nije uspela. Molim pokušajte ponovo.', - 'success' => 'Provera imovine uspešno je evidentirana.' - ), + 'success' => 'Provera imovine uspešno je evidentirana.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Fajl nije izbrisan. Molim pokušajte ponovo.', 'success' => 'Fajl uspešno obrisan.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fajl(ovi) nisu preneseni. Pokušajte ponovo.', 'success' => 'Fajl(ovi) uspešno preneseni. Pokušajte ponovo.', 'nofiles' => 'Niste odabrali nijedan fajl za prenos ili je fajl prevelik', 'invalidfiles' => 'Jedn ili više fajlova su preveliki ili je vrsta fajla koja nije dopuštena. Dopuštene vrste su png, gif, jpg, doc, docx, pdf i txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Neke stavke nisu pravilno uvezene.', 'errorDetail' => 'Sledeće stavke nisu uvezene zbog grešaka.', - 'success' => "Vaš fajl je importovan", - 'file_delete_success' => "Vaš je fajl uspešno izbrisan", - 'file_delete_error' => "Fajl nime moguće izbrisati", - ), + 'success' => 'Vaš fajl je importovan', + 'file_delete_success' => 'Vaš je fajl uspešno izbrisan', + 'file_delete_error' => 'Fajl nime moguće izbrisati', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj resurs?', 'error' => 'Došlo je do problema s brisanjem resursa. Molim pokušajte ponovo.', 'nothing_updated' => 'Nijedna imovina nije odabrana, tako da ništa nije izbrisano.', - 'success' => 'Imovina je uspešno obrisana.' - ), + 'success' => 'Imovina je uspešno obrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Imovina nije odjavljena, pokušajte ponovo', 'success' => 'Imovina je uspešno odjavljena.', 'user_does_not_exist' => 'Korisnik je nevažeći. Molim pokušajte ponovo.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa' - ), + 'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Imovina nije prijavljena. Pokušajte ponovo', 'success' => 'Imovina je uspešno prijavljena.', 'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim pokušajte ponovo.', 'already_checked_in' => 'Imovina je već prijavljena.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Imovina nije zatražena, pokušajte ponovo', 'success' => 'Imovina je uspešno zatražena.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/hardware/table.php b/resources/lang/sr-CS/admin/hardware/table.php index f9a489b157..cf935be6eb 100644 --- a/resources/lang/sr-CS/admin/hardware/table.php +++ b/resources/lang/sr-CS/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Oznaka imovine', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Imovina ', 'image' => 'Slika uređaja', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/sr-CS/admin/kits/general.php b/resources/lang/sr-CS/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/sr-CS/admin/kits/general.php +++ b/resources/lang/sr-CS/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/sr-CS/admin/licenses/form.php b/resources/lang/sr-CS/admin/licenses/form.php index ee48a88c84..478f9f51ea 100644 --- a/resources/lang/sr-CS/admin/licenses/form.php +++ b/resources/lang/sr-CS/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Imovina', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licencirano za ime', 'update' => 'Ažuriraj licencu', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/sr-CS/admin/licenses/general.php b/resources/lang/sr-CS/admin/licenses/general.php index 4c76ec7d96..48f0332079 100644 --- a/resources/lang/sr-CS/admin/licenses/general.php +++ b/resources/lang/sr-CS/admin/licenses/general.php @@ -1,6 +1,6 @@ 'O licencama', 'about_licenses' => 'Licence se koriste za praćenje softvera. Imaju određeni broj mesta koja se mogu dodeliti pojedincima', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Licence za softver', 'user' => 'Korisnik', 'view' => 'Prikaži licencu', -); +]; diff --git a/resources/lang/sr-CS/admin/licenses/message.php b/resources/lang/sr-CS/admin/licenses/message.php index 4031d9371e..929b104e9d 100644 --- a/resources/lang/sr-CS/admin/licenses/message.php +++ b/resources/lang/sr-CS/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lokacija ne postoji.', 'user_does_not_exist' => 'Korisnik ne postoji.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Morate odabrati neku vrstu imovine ili korisnika, ali ne oboje.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Licenca nije kreirana, pokušajte ponovo.', - 'success' => 'Licenca je uspješno kreirana.' - ), + 'success' => 'Licenca je uspješno kreirana.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka nije izbrisana. Molim pokušajte ponovo.', 'success' => 'Datoteka je uspešno obrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteke nisu prenesene. Molim pokušajte ponovo.', 'success' => 'Datoteke su uspešno učitane.', 'nofiles' => 'Niste odabrali nijednu datoteku za prenos ili je datoteka koju pokušavate preneti prevelika', 'invalidfiles' => 'Jedna ili više datoteka je prevelika ili je vrsta datoteke koja nije dopuštena. Dopuštene vrste datoteka su png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml i lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licenca nije ažurirana, pokušajte ponovo', - 'success' => 'Licenca je uspješno ažurirana.' - ), + 'success' => 'Licenca je uspješno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovu licencu?', 'error' => 'Došlo je do problema sa brisanjem licence. Molim pokušajte ponovo.', - 'success' => 'Licenca je uspešno obrisana.' - ), + 'success' => 'Licenca je uspešno obrisana.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Došlo je do problema prilikom provere licence. Molim pokušajte ponovo.', - 'success' => 'Licenca je uspešno proverena' - ), + 'success' => 'Licenca je uspešno proverena', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Došlo je do problema prilikom provere licence. Molim pokušajte ponovo.', - 'success' => 'Licenca je uspešno proverena' - ), + 'success' => 'Licenca je uspešno proverena', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/licenses/table.php b/resources/lang/sr-CS/admin/licenses/table.php index 1bb8ba5671..62f50cae4c 100644 --- a/resources/lang/sr-CS/admin/licenses/table.php +++ b/resources/lang/sr-CS/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Dodeljena', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Licenca', -); +]; diff --git a/resources/lang/sr-CS/admin/locations/message.php b/resources/lang/sr-CS/admin/locations/message.php index e631cf5acd..6be1693e20 100644 --- a/resources/lang/sr-CS/admin/locations/message.php +++ b/resources/lang/sr-CS/admin/locations/message.php @@ -1,27 +1,26 @@ 'Lokacija ne postoji.', 'assoc_users' => 'Ta je lokacija trenutno povezana s barem jednim korisnikom i ne može se izbrisati. Ažurirajte korisnike da više se ne referenciraju na ovu lokaciju i pokušajte ponovno. ', 'assoc_assets' => 'Ta je lokacija trenutno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte resurs da se više ne referencira na tu lokaciju i pokušajte ponovno. ', 'assoc_child_loc' => 'Ta je lokacija trenutno roditelj najmanje jednoj podredjenoj lokaciji i ne može se izbrisati. Ažurirajte svoje lokacije da se više ne referenciraju na ovu lokaciju i pokušajte ponovo. ', - - 'create' => array( + 'create' => [ 'error' => 'Lokacija nije kreirana, pokušajte ponovo.', - 'success' => 'Lokacija je uspešno kreirana.' - ), + 'success' => 'Lokacija je uspešno kreirana.', + ], - 'update' => array( + 'update' => [ 'error' => 'Lokacija nije ažurirana, pokušajte ponovo', - 'success' => 'Lokacija je uspešno ažurirana.' - ), + 'success' => 'Lokacija je uspešno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati tu lokaciju?', 'error' => 'Došlo je do problema s brisanjem lokacije. Molim pokušajte ponovo.', - 'success' => 'Lokacija je uspešno obrisana.' - ) + 'success' => 'Lokacija je uspešno obrisana.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/locations/table.php b/resources/lang/sr-CS/admin/locations/table.php index d084091b20..0c60531133 100644 --- a/resources/lang/sr-CS/admin/locations/table.php +++ b/resources/lang/sr-CS/admin/locations/table.php @@ -1,6 +1,6 @@ 'O lokacijama', 'about_locations' => 'Lokacije se upotrebljavaju za praćenje podataka o lokaciji korisnika, imovine i ostalih stavki', 'assets_rtd' => 'Imovina', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Valuta lokacije', 'ldap_ou' => 'LDAP pretraživanje OU', - ); + ]; diff --git a/resources/lang/sr-CS/admin/manufacturers/message.php b/resources/lang/sr-CS/admin/manufacturers/message.php index 9e2b26804b..69cbcb2195 100644 --- a/resources/lang/sr-CS/admin/manufacturers/message.php +++ b/resources/lang/sr-CS/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Proizvođač ne postoji.', 'assoc_users' => 'Ovaj je proizvođač trenutno povezan s barem jednim modelom i ne može se izbrisati. Ažurirajte svoje modele da se više ne referenciraju na ovog proizvođača i pokušajte ponovno. ', - 'create' => array( + 'create' => [ 'error' => 'Proizvođač nije kreiran, pokušajte ponovo.', - 'success' => 'Proizvođač je uspešno kreiran.' - ), + 'success' => 'Proizvođač je uspešno kreiran.', + ], - 'update' => array( + 'update' => [ 'error' => 'Proizvođač nije ažuriran, pokušajte ponovo', - 'success' => 'Proizvođač je uspešno ažuriran.' - ), + 'success' => 'Proizvođač je uspešno ažuriran.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Proizvodjač nije obnovljen, pokušajte ponovo', - 'success' => 'Proizvodjač je uspešno obnovljen.' - ), + 'success' => 'Proizvodjač je uspešno obnovljen.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovog proizvodjača?', 'error' => 'Došlo je do problema sa brisanjem proizvodjača. Molim pokušajte ponovo.', - 'success' => 'Proizvodjač je uspešno izbrisan.' - ) + 'success' => 'Proizvodjač je uspešno izbrisan.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/manufacturers/table.php b/resources/lang/sr-CS/admin/manufacturers/table.php index 75e52c5e02..41e5711102 100644 --- a/resources/lang/sr-CS/admin/manufacturers/table.php +++ b/resources/lang/sr-CS/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'O proizvođačima', 'about_manufacturers_text' => 'Proizvođači su firme koje prave vašu imovinu. Ovde možete uneti važne informacije o kontaktima za podršku i ovi podaci će se prikazati na stranicama sa detaljima o imovini.', 'asset_manufacturers' => 'Prodavači imovine', @@ -13,4 +13,4 @@ return array( 'update' => 'Ažuriraj proizvođača', 'url' => 'URL', -); +]; diff --git a/resources/lang/sr-CS/admin/models/general.php b/resources/lang/sr-CS/admin/models/general.php index 80a3180a92..c59854046c 100644 --- a/resources/lang/sr-CS/admin/models/general.php +++ b/resources/lang/sr-CS/admin/models/general.php @@ -1,6 +1,6 @@ 'O modelu imovine', 'about_models_text' => 'Modeli imovine su način grupisanja identične imovine. "MBP 2013", "IPhone 6s" itd.', 'deleted' => 'Ovaj je model izbrisan. Kliknite ovde da biste ga vratili.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Želite da obrišete :model_count asset models.', 'restore' => 'Vraćanje modela', 'requestable' => 'Korisnici mogu zatražiti ovaj model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'Prikaži izbrisano', 'view_models' => 'Pogledajte modele', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/sr-CS/admin/models/message.php b/resources/lang/sr-CS/admin/models/message.php index c63a1b282a..f7e6a7731a 100644 --- a/resources/lang/sr-CS/admin/models/message.php +++ b/resources/lang/sr-CS/admin/models/message.php @@ -1,42 +1,41 @@ 'Model ne postoji.', 'assoc_users' => 'Ovaj je model trenutno povezan s jednom ili više imovina i ne može se izbrisati. Izbrišite imovinu pa pokušajte ponovo. ', - - 'create' => array( + 'create' => [ 'error' => 'Model nije kreiran, pokušajte ponovo.', 'success' => 'Model je uspešno kreiran.', 'duplicate_set' => 'Model imovine s tim nazivom, proizvođačem i brojem modela već postoji.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model nije ažuriran, pokušajte ponovo', - 'success' => 'Model je uspešno ažuriran.' - ), + 'success' => 'Model je uspešno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovaj model imovine?', 'error' => 'Došlo je do problema s brisanjem modela. Molim pokušajte ponovo.', - 'success' => 'Model je uspešno izbrisan.' - ), + 'success' => 'Model je uspešno izbrisan.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model nije obnovljen, pokušajte ponovo', - 'success' => 'Model je uspešno obnovljen.' - ), + 'success' => 'Model je uspešno obnovljen.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Polja nisu menjana, tako da ništa nije ažurirano.', - 'success' => 'Modeli su ažurirani.' - ), + 'success' => 'Modeli su ažurirani.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Nijedan model nije odabran, tako da ništa nije izbrisano.', 'success' => ':success_count model(a) izbrisan(o)!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/models/table.php b/resources/lang/sr-CS/admin/models/table.php index 654d3d9ff3..240710f9fb 100644 --- a/resources/lang/sr-CS/admin/models/table.php +++ b/resources/lang/sr-CS/admin/models/table.php @@ -1,6 +1,6 @@ 'Kreiraj model imovine', 'created_at' => 'Kreirano', @@ -14,4 +14,4 @@ return array( 'update' => 'Ažuriraj model imovine', 'clone' => 'Kloniraj model', 'edit' => 'Uredi model', -); +]; diff --git a/resources/lang/sr-CS/admin/reports/general.php b/resources/lang/sr-CS/admin/reports/general.php index 6076bafb8f..6576c1997b 100644 --- a/resources/lang/sr-CS/admin/reports/general.php +++ b/resources/lang/sr-CS/admin/reports/general.php @@ -1,5 +1,5 @@ 'Odaberite željene opcije za izveštaj o imovini.' -); +return [ + 'info' => 'Odaberite željene opcije za izveštaj o imovini.', +]; diff --git a/resources/lang/sr-CS/admin/reports/message.php b/resources/lang/sr-CS/admin/reports/message.php index 827fb0f52e..0b20d52624 100644 --- a/resources/lang/sr-CS/admin/reports/message.php +++ b/resources/lang/sr-CS/admin/reports/message.php @@ -1,5 +1,5 @@ 'Morate odabrati barem jednu opciju.' -); +return [ + 'error' => 'Morate odabrati barem jednu opciju.', +]; diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php index a1e4e16036..8ea8af4db2 100644 --- a/resources/lang/sr-CS/admin/settings/general.php +++ b/resources/lang/sr-CS/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'Ovo je ponekad isto kao i vaš domen e-pošte, ali ne uvek.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Ovo je Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Interval revizije', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Dužina oznake sredstva, uključujući i popunu nulama', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php index 15408b7e16..529682abc5 100644 --- a/resources/lang/sr-CS/admin/settings/message.php +++ b/resources/lang/sr-CS/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Došlo je do pogreške prilikom ažuriranja. ', - 'success' => 'Postavke su uspešno ažurirane.' - ), - 'backup' => array( + 'success' => 'Postavke su uspešno ažurirane.', + ], + 'backup' => [ 'delete_confirm' => 'Jeste li sigurni da želite izbrisati tu backup datoteku? Ova se akcija ne može poništiti. ', 'file_deleted' => 'Sigurnosna kopija datoteke je uspešno izbrisana. ', 'generated' => 'Nova sigurnosna kopija datoteke uspešno je kreirana.', 'file_not_found' => 'Sigurnosna kopija datoteke nije na serveru.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Došlo je do pogreške prilikom brisanja. ', 'validation_failed' => 'Vaša potvrda o brisanju nije ispravna. Upišite reč "DELETE" u okvir potvrde.', - 'success' => 'Zapisi su uspešno i trajno obrisani.' - ), + 'success' => 'Zapisi su uspešno i trajno obrisani.', + ], -); +]; diff --git a/resources/lang/sr-CS/admin/statuslabels/message.php b/resources/lang/sr-CS/admin/statuslabels/message.php index c3260e0f77..3160b24de7 100644 --- a/resources/lang/sr-CS/admin/statuslabels/message.php +++ b/resources/lang/sr-CS/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Oznaka statusa ne postoji.', 'assoc_assets' => 'Oznaka statusa je trenutno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte resurs da se više ne referencira na tu oznaku statusa i pokušajte ponovno. ', - - 'create' => array( + 'create' => [ 'error' => 'Oznaka statusa nije kreirana, pokušajte ponovo.', - 'success' => 'Oznaka statusa je uspešno kreirana.' - ), + 'success' => 'Oznaka statusa je uspešno kreirana.', + ], - 'update' => array( + 'update' => [ 'error' => 'Oznaka statusa nije ažurirana, pokušajte ponovo', - 'success' => 'Oznaka statusa je uspešno ažurirana.' - ), + 'success' => 'Oznaka statusa je uspešno ažurirana.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite da izbrišete ovu oznaku statusa?', 'error' => 'Došlo je do problema sa brisanjem oznake statusa. Molim pokušajte ponovo.', - 'success' => 'Oznaka statusa je uspešno izbrisana.' - ), + 'success' => 'Oznaka statusa je uspešno izbrisana.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Ova imovina ne može biti dodeljena nikome.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/sr-CS/admin/statuslabels/table.php b/resources/lang/sr-CS/admin/statuslabels/table.php index 9592977532..96fb9f6dbd 100644 --- a/resources/lang/sr-CS/admin/statuslabels/table.php +++ b/resources/lang/sr-CS/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'O oznakama statusa', 'archived' => 'Arhivirano', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Oznake statusa', 'undeployable' => 'Undeployable', 'update' => 'Ažuriranje oznake statusa', -); +]; diff --git a/resources/lang/sr-CS/admin/suppliers/message.php b/resources/lang/sr-CS/admin/suppliers/message.php index 59a06830bb..4286691b00 100644 --- a/resources/lang/sr-CS/admin/suppliers/message.php +++ b/resources/lang/sr-CS/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Dobavljač ne postoji.', - - 'create' => array( + 'create' => [ 'error' => 'Dobavljač nije kreiran, pokušajte ponovo.', - 'success' => 'Dobavljač je uspešno kreiran.' - ), + 'success' => 'Dobavljač je uspešno kreiran.', + ], - 'update' => array( + 'update' => [ 'error' => 'Dobavljač nije ažuriran, pokušajte ponovo', - 'success' => 'Dobavljač je uspešno ažuriran.' - ), + 'success' => 'Dobavljač je uspešno ažuriran.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Jeste li sigurni da želite izbrisati ovog dobavljača?', 'error' => 'Došlo je do problema sa brisanjem dobavljača. Molim pokušajte ponovo.', 'success' => 'Dobavljač je uspešno izbrisan.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/sr-CS/admin/suppliers/table.php b/resources/lang/sr-CS/admin/suppliers/table.php index 73a647d237..99e8b06d4e 100644 --- a/resources/lang/sr-CS/admin/suppliers/table.php +++ b/resources/lang/sr-CS/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'O Dobavljačima', 'about_suppliers_text' => 'Dobavljači se koriste za praćenje porekla stavki', 'address' => 'Adresa dobavljača', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Prikaži imovinu za', 'zip' => 'Poštanski broj', -); +]; diff --git a/resources/lang/sr-CS/admin/users/general.php b/resources/lang/sr-CS/admin/users/general.php index 590238cb3f..6562fb2081 100644 --- a/resources/lang/sr-CS/admin/users/general.php +++ b/resources/lang/sr-CS/admin/users/general.php @@ -1,7 +1,6 @@ 'Ovaj korisnik može da se uloguje', 'activated_disabled_help_text' => 'Ne možete da menjate status aktivacije za sopstveni nalog.', 'assets_user' => 'Imovina dodijeljena za :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Dopuštene vrste datoteka su png, gif, jpg, jpeg, doc, docx, pdf, txt, zip i rar.', 'history_user' => 'Istorija za :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Kliknite ovdje da biste ih vratili.', 'last_login' => 'Poslednja prijava', 'ldap_config_text' => 'Postavke LDAP konfiguracije mogu se pronaći u Administrator> Postavke. Odabrana lokacija (opcionalno) će biti podešena za sve importovane korisnike.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/sr-CS/admin/users/message.php b/resources/lang/sr-CS/admin/users/message.php index e5e45b5d78..df47f31de7 100644 --- a/resources/lang/sr-CS/admin/users/message.php +++ b/resources/lang/sr-CS/admin/users/message.php @@ -1,6 +1,6 @@ 'Uspješno ste prihvatili ovaj resurs.', 'declined' => 'Uspješno ste odbili ovaj resurs.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integracija nije konfigurisana za ovu instalaciju.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Korisnik je uspešno kreiran.', 'update' => 'Korisnik je uspešno ažuriran.', 'update_bulk' => 'Korisnici su uspešno ažurirani!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'Korisnik je uspešno obnovljen.', 'import' => 'Korisnici su uspješno importovani.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Pojavio se problem pri kreiranju korisnika. Molim pokušajte ponovo.', 'update' => 'Došlo je do problema s ažuriranjem korisnika. Molim pokušajte ponovo.', 'delete' => 'Došlo je do problema s brisanjem korisnika. Molim pokušajte ponovo.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Nije moguće pretražiti LDAP server. Proverite konfiguraciju LDAP servera.
Greška sa LDAP servera:', 'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti zapise sa LDAP servera. Proverite konfiguraciju LDAP servera.
Greška sa LDAP servera:', 'password_ldap' => 'Lozinku za ovaj nalog kontroliše LDAP / Active Directory. Obratite se IT centru za promenu lozinke. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Datoteka nije izbrisana. Molim pokušajte ponovo.', 'success' => 'Datoteka je uspešno obrisana.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Datoteke nisu prenesene. Molim pokušajte ponovo.', 'success' => 'Datoteke su uspješno učitane.', 'nofiles' => 'Niste odabrali nijednu datoteku za prenos', 'invalidfiles' => 'Jedna ili više datoteka je prevelika ili je vrsta datoteke koja nije dopuštena. Dopuštene vrste datoteka su png, gif, jpg, doc, docx, pdf i txt.', - ), + ], -); +]; diff --git a/resources/lang/sr-CS/admin/users/table.php b/resources/lang/sr-CS/admin/users/table.php index f3007bf866..dae34738cb 100644 --- a/resources/lang/sr-CS/admin/users/table.php +++ b/resources/lang/sr-CS/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktivan', 'allow' => 'Dopustiti', 'checkedout' => 'Imovina', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Prikaži trenutne korisnike', 'show_deleted' => 'Prikaži izbrisane korisnike', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Ažuriranje korisnika', 'username' => 'Korisničko ime', - 'user_deleted_text' => 'Ovaj je korisnik označen kao izbrisan.', + 'user_deleted_text' => 'Ovaj je korisnik označen kao izbrisan.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Kloniraj korisnika', 'viewusers' => 'Prikaži korisnike', -); +]; diff --git a/resources/lang/sr-CS/auth/general.php b/resources/lang/sr-CS/auth/general.php index b8e93ff147..421634c885 100644 --- a/resources/lang/sr-CS/auth/general.php +++ b/resources/lang/sr-CS/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/sr-CS/auth/message.php b/resources/lang/sr-CS/auth/message.php index b8056bb3d6..4dc7eef190 100644 --- a/resources/lang/sr-CS/auth/message.php +++ b/resources/lang/sr-CS/auth/message.php @@ -1,6 +1,6 @@ 'Nalog sa ovom e-poštom već postoji.', 'account_not_found' => 'Korisničko ime ili lozinka nisu ispravni.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Ovaj je korisnički nalog je zabranjen.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Došlo je do problema prilikom pokušaja prijavljivanja, pokušajte ponovo.', 'success' => 'Uspešno ste se prijavili.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Došlo je do problema prilikom pokušaja kreiranja naloga, pokušajte ponovo.', 'success' => 'Nalog je uspešno kreiran.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Pojavio se problem prilikom pokušaja ponovnog unosa lozinke, pokušajte ponovo.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Problem prilikom resetovanja lozinke, pokušajte ponovo.', 'success' => 'Vaša je lozinka uspešno resetovana.', - ), + ], - -); +]; diff --git a/resources/lang/sr-CS/button.php b/resources/lang/sr-CS/button.php index d02af39694..bbc5ba36aa 100644 --- a/resources/lang/sr-CS/button.php +++ b/resources/lang/sr-CS/button.php @@ -1,6 +1,6 @@ 'Akcije', 'add' => 'Dodaj Novo', 'cancel' => 'Otkaži', @@ -11,7 +11,7 @@ return array( 'request' => 'Zahtev', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Odaberite datoteku...', + 'select_file' => 'Odaberite datoteku...', 'select_files' => 'Odaberite datoteke...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php index 37b48d8963..ed3237cb9c 100644 --- a/resources/lang/sr-CS/general.php +++ b/resources/lang/sr-CS/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Zahtevi', 'city' => 'Grad', - 'click_here' => 'Kliknite ovde', + 'click_here' => 'Kliknite ovde', 'clear_selection' => 'Poništi izbor', 'companies' => 'Firme', 'company' => 'Firma', 'component' => 'Komponenta', 'components' => 'Komponente', - 'complete' => 'Završeno', + 'complete' => 'Završeno', 'consumable' => 'Potrošni materijal', 'consumables' => 'Potrošni materijal', 'country' => 'Zemlja', diff --git a/resources/lang/sr-CS/help.php b/resources/lang/sr-CS/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/sr-CS/help.php +++ b/resources/lang/sr-CS/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/sr-CS/mail.php b/resources/lang/sr-CS/mail.php index 802b097d7c..1c751055ca 100644 --- a/resources/lang/sr-CS/mail.php +++ b/resources/lang/sr-CS/mail.php @@ -1,6 +1,6 @@ 'Korisnik je otkazao zahtev za stavke na Web lokaciji', 'a_user_requested' => 'Korisnik je zatražio stavke na Web lokaciji', 'accessory_name' => 'Naziv dodatne opreme, pribora:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/sr-CS/pagination.php b/resources/lang/sr-CS/pagination.php index e2ceb371ee..565404778e 100644 --- a/resources/lang/sr-CS/pagination.php +++ b/resources/lang/sr-CS/pagination.php @@ -1,6 +1,6 @@ 'Sljedeća »', -); +]; diff --git a/resources/lang/sr-CS/passwords.php b/resources/lang/sr-CS/passwords.php index 5018f744b4..395d2b19e4 100644 --- a/resources/lang/sr-CS/passwords.php +++ b/resources/lang/sr-CS/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Veza lozinke je poslata!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/sr-CS/reminders.php b/resources/lang/sr-CS/reminders.php index 1ecd7c0c5b..979c404089 100644 --- a/resources/lang/sr-CS/reminders.php +++ b/resources/lang/sr-CS/reminders.php @@ -1,6 +1,6 @@ "Lozinke moraju imati šest znakova i odgovarati potvrdi.", + 'password' => 'Lozinke moraju imati šest znakova i odgovarati potvrdi.', - "user" => "Korisničko ime ili e-adresa nisu ispravni", + 'user' => 'Korisničko ime ili e-adresa nisu ispravni', - "token" => "Token za reset lozinke nije ispravan.", + 'token' => 'Token za reset lozinke nije ispravan.', - "sent" => "Ako je pronađena odgovarajuća adresa e-pošte, podsetnik za lozinku je poslat!", + 'sent' => 'Ako je pronađena odgovarajuća adresa e-pošte, podsetnik za lozinku je poslat!', -); +]; diff --git a/resources/lang/sr-CS/table.php b/resources/lang/sr-CS/table.php index eca3dcae76..58247918ca 100644 --- a/resources/lang/sr-CS/table.php +++ b/resources/lang/sr-CS/table.php @@ -1,10 +1,10 @@ 'Akcije', 'action' => 'Akcija', 'by' => 'By', 'item' => 'Artikal', -); +]; diff --git a/resources/lang/sr-CS/validation.php b/resources/lang/sr-CS/validation.php index d5b3f5bdae..cb2c6995b4 100644 --- a/resources/lang/sr-CS/validation.php +++ b/resources/lang/sr-CS/validation.php @@ -1,6 +1,6 @@ ':attribute je već zauzet.', 'uploaded' => ':attribute nije prenet.', 'url' => ':attribute format je neispravan.', - "unique_undeleted" => ":attribute mora biti jedinstven.", + 'unique_undeleted' => ':attribute mora biti jedinstven.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute polje sadrži znak koji nije dozvoljen.", - "email_array" => "Jedna ili više email adresa nisu ispravne.", - "hashed_pass" => "Vaša lozinka je neispravna", + 'alpha_space' => ':attribute polje sadrži znak koji nije dozvoljen.', + 'email_array' => 'Jedna ili više email adresa nisu ispravne.', + 'hashed_pass' => 'Vaša lozinka je neispravna', 'dumbpwd' => 'Lozinka nije sigurna.', - "statuslabel_type" => "Morate odabrati ispravnu vrstu oznake statusa", + 'statuslabel_type' => 'Morate odabrati ispravnu vrstu oznake statusa', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/sv-SE/admin/accessories/general.php b/resources/lang/sv-SE/admin/accessories/general.php index ef2e34f563..dd900ebb74 100644 --- a/resources/lang/sv-SE/admin/accessories/general.php +++ b/resources/lang/sv-SE/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Tillbehörskategori', 'accessory_name' => 'Tillbehörsnamn', 'checkout' => 'Checka ut tillbehör', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Använd den primära EULA:n istället.', 'use_default_eula_disabled' => 'Använd den primära EULA:n istället. Ingen primär EULA är satt. Vänligen lägg till en i Inställningar.', -); +]; diff --git a/resources/lang/sv-SE/admin/accessories/message.php b/resources/lang/sv-SE/admin/accessories/message.php index d8333f1aba..6865371935 100644 --- a/resources/lang/sv-SE/admin/accessories/message.php +++ b/resources/lang/sv-SE/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Tillbehöret [:id] finns inte.', 'assoc_users' => 'Detta tillbehör har för närvarande :count objekt utcheckade till användare. Checka in tillbehöret och försök igen. ', - 'create' => array( + 'create' => [ 'error' => 'Tillbehöret skapades inte, vänligen försök igen.', - 'success' => 'Tillbehöret skapades.' - ), + 'success' => 'Tillbehöret skapades.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tillbehöret uppdaterades inte, försök igen', - 'success' => 'Tillbehöret uppdaterades.' - ), + 'success' => 'Tillbehöret uppdaterades.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill ta bort det här tillbehöret?', 'error' => 'Ett problem uppstod då tillbehöret skulle tas bort. Vänligen försök igen.', - 'success' => 'Tillbehöret togs bort.' - ), + 'success' => 'Tillbehöret togs bort.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tillbehöret checkades inte ut. Vänligen försök igen', 'success' => 'Tillbehöret checkades ut.', - 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.' - ), + 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tillbehöret checkades inte in. Vänligen försök igen', 'success' => 'Tillbehöret checkades in.', - 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.' - ) + 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.', + ], - -); +]; diff --git a/resources/lang/sv-SE/admin/accessories/table.php b/resources/lang/sv-SE/admin/accessories/table.php index e72c3481ab..cd7eb16a81 100644 --- a/resources/lang/sv-SE/admin/accessories/table.php +++ b/resources/lang/sv-SE/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Ladda ner CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Ladda ner CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Godkännande', 'title' => 'Tillbehörsnamn', - -); +]; diff --git a/resources/lang/sv-SE/admin/asset_maintenances/form.php b/resources/lang/sv-SE/admin/asset_maintenances/form.php index 3e769dda7d..92df15e01b 100644 --- a/resources/lang/sv-SE/admin/asset_maintenances/form.php +++ b/resources/lang/sv-SE/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Dagar', 'notes' => 'Anteckningar', 'update' => 'Uppdatera', - 'create' => 'Skapa' + 'create' => 'Skapa', ]; diff --git a/resources/lang/sv-SE/admin/asset_maintenances/message.php b/resources/lang/sv-SE/admin/asset_maintenances/message.php index 22743c16e5..e4012188f9 100644 --- a/resources/lang/sv-SE/admin/asset_maintenances/message.php +++ b/resources/lang/sv-SE/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'År du säker på att du vill radera inventarieunderhållet?', 'error' => 'Ett fel uppstod vid radering av underhåll av tillgång. Var god försök igen.', - 'success' => 'Underhåll av tillgången raderades.' + 'success' => 'Underhåll av tillgången raderades.', ], 'create' => [ 'error' => 'Underhåll av tillgången skapades inte. Var god försök igen.', - 'success' => 'Underhåll av tillgången skapades.' + 'success' => 'Underhåll av tillgången skapades.', ], 'edit' => [ 'error' => 'Underhåll av tillgång var inte redigerat, försök igen.', - 'success' => 'Underhåll av tillgång ändrades framgångsrikt.' + 'success' => 'Underhåll av tillgång ändrades framgångsrikt.', ], 'asset_maintenance_incomplete' => 'Inte klar ännu', 'warranty' => 'Garanti', 'not_warranty' => 'Inte garanti', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/sv-SE/admin/asset_maintenances/table.php b/resources/lang/sv-SE/admin/asset_maintenances/table.php index c1df4e4dfa..0fdfef10e5 100644 --- a/resources/lang/sv-SE/admin/asset_maintenances/table.php +++ b/resources/lang/sv-SE/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Inventarieunderhåll', 'asset_name' => 'Namn på tillgång', 'is_warranty' => 'Garanti', - 'dl_csv' => 'Ladda ner CSV' + 'dl_csv' => 'Ladda ner CSV', ]; diff --git a/resources/lang/sv-SE/admin/categories/general.php b/resources/lang/sv-SE/admin/categories/general.php index f568b3db87..611fa9d389 100644 --- a/resources/lang/sv-SE/admin/categories/general.php +++ b/resources/lang/sv-SE/admin/categories/general.php @@ -1,6 +1,6 @@ 'Kategorier', 'category_name' => 'Kategorinamn', 'checkin_email' => 'Skicka e-post till användaren vid incheckning / utcheckning.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Använd standard-licensavtal, EULA istället.', 'use_default_eula_disabled' => 'Använd den primära licensavtalet, EULA:n, istället. Inget primärt licensavtal, EULA, är satt. Vänligen lägg till en under Inställningar.', -); +]; diff --git a/resources/lang/sv-SE/admin/categories/message.php b/resources/lang/sv-SE/admin/categories/message.php index 6c56770f71..750e375f2c 100644 --- a/resources/lang/sv-SE/admin/categories/message.php +++ b/resources/lang/sv-SE/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategorin existerar inte.', 'assoc_models' => 'Denna kategori är för närvarande associerad med åtminstone en modell och kan inte raderas. Uppdatera dina modeller så att inga associationer finns till denna kategori och försök igen. ', 'assoc_items' => 'Denna kategori är för närvarande associerad med åtminstone en :asset_type och kan inte raderas. Uppdatera din :asset_type så att inga associationer finns till denna kategori och försök igen. ', - 'create' => array( + 'create' => [ 'error' => 'Kategorin kunde inte skapas, försök igen.', - 'success' => 'Kategorin skapades.' - ), + 'success' => 'Kategorin skapades.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategorin uppdaterades inte, vänligen försök igen.', - 'success' => 'Kategorin uppdaterades.' - ), + 'success' => 'Kategorin uppdaterades.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna kategori?', 'error' => 'Ett problem uppstod när kategorin skulle raderas. Försök igen.', - 'success' => 'Kategorin raderades.' - ) + 'success' => 'Kategorin raderades.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/categories/table.php b/resources/lang/sv-SE/admin/categories/table.php index 8c25729968..c765786d34 100644 --- a/resources/lang/sv-SE/admin/categories/table.php +++ b/resources/lang/sv-SE/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Överordnad', 'require_acceptance' => 'Godkännande', 'title' => 'Namn på kategori', -); +]; diff --git a/resources/lang/sv-SE/admin/companies/general.php b/resources/lang/sv-SE/admin/companies/general.php index ac9f209a1d..ea667b4369 100644 --- a/resources/lang/sv-SE/admin/companies/general.php +++ b/resources/lang/sv-SE/admin/companies/general.php @@ -1,4 +1,5 @@ 'Välj företag', ]; diff --git a/resources/lang/sv-SE/admin/companies/message.php b/resources/lang/sv-SE/admin/companies/message.php index 6d8208dced..e3f000b1ec 100644 --- a/resources/lang/sv-SE/admin/companies/message.php +++ b/resources/lang/sv-SE/admin/companies/message.php @@ -1,18 +1,19 @@ 'Företaget finns inte.', 'assoc_users' => 'Detta företag är för närvarande är associerade med minst en modell och kan inte tas bort. Vänligen uppdatera din modeller för att inte längre referera till detta företag och försök igen. ', - 'create' => array( + 'create' => [ 'error' => 'Företaget skapades inte, försök igen.', - 'success' => 'Företaget har skapats.' - ), - 'update' => array( + 'success' => 'Företaget har skapats.', + ], + 'update' => [ 'error' => 'Företaget har inte uppdaterats, försök igen', - 'success' => 'Företaget uppdaterades.' - ), - 'delete' => array( + 'success' => 'Företaget uppdaterades.', + ], + 'delete' => [ 'confirm' => 'Är du säker på att du vill ta bort det här företaget?', 'error' => 'Ett problem uppstod när företaget skulle tas bort. Vänligen försök igen.', - 'success' => 'Företaget har tagits bort.' - ) -); + 'success' => 'Företaget har tagits bort.', + ], +]; diff --git a/resources/lang/sv-SE/admin/companies/table.php b/resources/lang/sv-SE/admin/companies/table.php index 40d1bbb110..fdb8bead0c 100644 --- a/resources/lang/sv-SE/admin/companies/table.php +++ b/resources/lang/sv-SE/admin/companies/table.php @@ -1,9 +1,10 @@ 'Företag', 'create' => 'Skapa företag', 'title' => 'Företag', 'update' => 'Uppdatera företag', 'name' => 'Företagsnamn', 'id' => 'ID', -); +]; diff --git a/resources/lang/sv-SE/admin/components/general.php b/resources/lang/sv-SE/admin/components/general.php index 8ceddbcdd8..2ec85bfb05 100644 --- a/resources/lang/sv-SE/admin/components/general.php +++ b/resources/lang/sv-SE/admin/components/general.php @@ -1,6 +1,6 @@ 'Komponentnamn', 'checkin' => 'Checka in komponent', 'checkout' => 'Checka ut komponent', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Återstående', 'total' => 'Totalt', 'update' => 'Uppdatera komponent', -); +]; diff --git a/resources/lang/sv-SE/admin/components/message.php b/resources/lang/sv-SE/admin/components/message.php index a7b01d47f4..a214eaf4af 100644 --- a/resources/lang/sv-SE/admin/components/message.php +++ b/resources/lang/sv-SE/admin/components/message.php @@ -1,36 +1,35 @@ 'Komponenten existerar inte.', - 'create' => array( + 'create' => [ 'error' => 'Komponent skapades inte, försök igen.', - 'success' => 'Komponent skapad framgångsrikt.' - ), + 'success' => 'Komponent skapad framgångsrikt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Komponenten uppdaterades inte, var god försök igen', - 'success' => 'Komponent uppdaterad framgångsrikt.' - ), + 'success' => 'Komponent uppdaterad framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera den här komponenten?', 'error' => 'Det gick inte att ta bort komponenten. Var god försök igen.', - 'success' => 'Komponenten har tagits bort.' - ), + 'success' => 'Komponenten har tagits bort.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Komponenten var inte utcheckad, försök igen', 'success' => 'Komponent utcheckad framgångsrikt.', - 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.' - ), + 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Komponenten har inte kontrollerats, var vänlig försök igen', 'success' => 'Komponent incheckad framgångsrikt.', - 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.' - ) + 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', + ], - -); +]; diff --git a/resources/lang/sv-SE/admin/components/table.php b/resources/lang/sv-SE/admin/components/table.php index f218a869c9..ae8eb4e6a7 100644 --- a/resources/lang/sv-SE/admin/components/table.php +++ b/resources/lang/sv-SE/admin/components/table.php @@ -1,5 +1,5 @@ 'Komponentnamn', -); +]; diff --git a/resources/lang/sv-SE/admin/consumables/general.php b/resources/lang/sv-SE/admin/consumables/general.php index c053250e91..498c541fc3 100644 --- a/resources/lang/sv-SE/admin/consumables/general.php +++ b/resources/lang/sv-SE/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Förbrukningsvaror', 'consumable_name' => 'Namn på förbrukningsvara', 'create' => 'Skapa förbrukningvara', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Återstående', 'total' => 'Totalt', 'update' => 'Uppdatera förbrukningsvara', -); +]; diff --git a/resources/lang/sv-SE/admin/consumables/message.php b/resources/lang/sv-SE/admin/consumables/message.php index 3c58c06e46..7a717c87ef 100644 --- a/resources/lang/sv-SE/admin/consumables/message.php +++ b/resources/lang/sv-SE/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Förbrukningsartiklar existerar inte.', - 'create' => array( + 'create' => [ 'error' => 'Förbrukningsbarhet skapades inte, försök igen.', - 'success' => 'Förbrukningsbar skapad framgångsrik.' - ), + 'success' => 'Förbrukningsbar skapad framgångsrik.', + ], - 'update' => array( + 'update' => [ 'error' => 'Förbrukningsvaror uppdaterades inte, var god försök igen', - 'success' => 'Förbrukningsvaror uppdateras framgångsrikt.' - ), + 'success' => 'Förbrukningsvaror uppdateras framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna förbrukningsartiklar?', 'error' => 'Det gick inte att ta bort förbrukningen. Var god försök igen.', - 'success' => 'Konsumtionen har tagits bort.' - ), + 'success' => 'Konsumtionen har tagits bort.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Förbrukningsartiklarna är inte utcheckade, försök igen', 'success' => 'Förbrukningsbar utcheckad framgångsrik.', - 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.' - ), + 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Förbrukningsartiklarna kontrollerades inte, försök igen', 'success' => 'Konsumtionskontrollen kontrolleras framgångsrikt.', - 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.' - ) + 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', + ], - -); +]; diff --git a/resources/lang/sv-SE/admin/consumables/table.php b/resources/lang/sv-SE/admin/consumables/table.php index c91d1a9abd..f9e36eedc8 100644 --- a/resources/lang/sv-SE/admin/consumables/table.php +++ b/resources/lang/sv-SE/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Förbrukningsnamn', -); +]; diff --git a/resources/lang/sv-SE/admin/custom_fields/general.php b/resources/lang/sv-SE/admin/custom_fields/general.php index 772ab91d34..730badfb1b 100644 --- a/resources/lang/sv-SE/admin/custom_fields/general.php +++ b/resources/lang/sv-SE/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Anpassade fält', 'field' => 'Fält', 'about_fieldsets_title' => 'Om fältsamlingar', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Nytt anpassat fält', 'value_encrypted' => 'Värdet på det här fältet är krypterat i databasen. Endast adminanvändare kan se det dekrypterade värdet', 'show_in_email' => 'Inkludera värdet på det här fältet i utcheckning mailen som skickas till användarna? Krypterade fält kan inte inkluderas i e-postmeddelanden.', -); +]; diff --git a/resources/lang/sv-SE/admin/custom_fields/message.php b/resources/lang/sv-SE/admin/custom_fields/message.php index fef4e94dda..5c7b6f4555 100644 --- a/resources/lang/sv-SE/admin/custom_fields/message.php +++ b/resources/lang/sv-SE/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Det fältet existerar inte.', 'already_added' => 'Fält som redan lagts till', - 'create' => array( + 'create' => [ 'error' => 'Fältet skapades inte, var vänlig försök igen.', 'success' => 'Fält skapat framgångsrikt.', - 'assoc_success' => 'Fält med framgång tillfogas till fältet.' - ), + 'assoc_success' => 'Fält med framgång tillfogas till fältet.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fältet uppdaterades inte, var vänlig försök igen', - 'success' => 'Fältet uppdateras framgångsrikt.' - ), + 'success' => 'Fältet uppdateras framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera det här fältet?', 'error' => 'Det gick inte att ta bort fältet. Var god försök igen.', 'success' => 'Fältet raderades framgångsrikt.', 'in_use' => 'Fältet är fortfarande i bruk.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset existerar inte', - 'create' => array( + 'create' => [ 'error' => 'Fieldset skapades inte, försök igen.', - 'success' => 'Fältet skapades framgångsrikt.' - ), + 'success' => 'Fältet skapades framgångsrikt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset uppdaterades inte, försök igen', - 'success' => 'Fältet uppdateras framgångsrikt.' - ), + 'success' => 'Fältet uppdateras framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera den här fältet?', 'error' => 'Det gick inte att ta bort fältet. Var god försök igen.', 'success' => 'Fältet raderades framgångsrikt.', 'in_use' => 'Fieldset är fortfarande i bruk.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/sv-SE/admin/departments/message.php b/resources/lang/sv-SE/admin/departments/message.php index 8f06bd4d9e..d14402d412 100644 --- a/resources/lang/sv-SE/admin/departments/message.php +++ b/resources/lang/sv-SE/admin/departments/message.php @@ -1,21 +1,21 @@ 'Avdelningen existerar inte.', 'assoc_users' => 'Den här avdelningen är för närvarande associerad med minst en användare och kan inte raderas. Uppdatera dina användare för att inte längre referera till den här avdelningen och försök igen.', - 'create' => array( + 'create' => [ 'error' => 'Avdelningen skapades inte, var god försök igen.', - 'success' => 'Institutionen skapades framgångsrikt.' - ), - 'update' => array( + 'success' => 'Institutionen skapades framgångsrikt.', + ], + 'update' => [ 'error' => 'Avdelningen uppdaterades inte, var god försök igen', - 'success' => 'Avdelning uppdaterad framgångsrikt.' - ), - 'delete' => array( + 'success' => 'Avdelning uppdaterad framgångsrikt.', + ], + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera den här avdelningen?', 'error' => 'Det gick inte att ta bort avdelningen. Var god försök igen.', - 'success' => 'Avdelningen har tagits bort framgångsrikt.' - ) + 'success' => 'Avdelningen har tagits bort framgångsrikt.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/departments/table.php b/resources/lang/sv-SE/admin/departments/table.php index c261283075..0cfac6aabd 100644 --- a/resources/lang/sv-SE/admin/departments/table.php +++ b/resources/lang/sv-SE/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Avdelningsnamn', @@ -8,4 +8,4 @@ return array( 'location' => 'Plats', 'create' => 'Skapa avdelning', 'update' => 'Uppdateringsavdelning', - ); + ]; diff --git a/resources/lang/sv-SE/admin/depreciations/general.php b/resources/lang/sv-SE/admin/depreciations/general.php index 5270d5bf2c..c96f70bcfe 100644 --- a/resources/lang/sv-SE/admin/depreciations/general.php +++ b/resources/lang/sv-SE/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Om avskrivning av tillgångar', 'about_depreciations' => 'Du kan ställa in avskrivning av tillgångar baserat på linjär avskrivning.', 'asset_depreciations' => 'Avskrivningar av tillgångar', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Antal Månader', 'update' => 'Uppdatera avskrivningar', -); +]; diff --git a/resources/lang/sv-SE/admin/depreciations/message.php b/resources/lang/sv-SE/admin/depreciations/message.php index 3464c7d3f1..0860fb77d3 100644 --- a/resources/lang/sv-SE/admin/depreciations/message.php +++ b/resources/lang/sv-SE/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Denna avskrivningskategori existerar inte.', 'assoc_users' => 'Denna avskrivning är för närvarande kopplad till en eller flera modeller och kan inte raderas. Ta bort modellerna och försök sedan radera igen.', - - 'create' => array( + 'create' => [ 'error' => 'Avskrivningsklassen skapades inte, försök igen. :(', - 'success' => 'Avskrivningsklassen skapades framgångsrikt. :)' - ), + 'success' => 'Avskrivningsklassen skapades framgångsrikt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Avskrivningsklassen uppdaterades inte, var god försök igen', - 'success' => 'Avskrivningsklassen uppdaterades framgångsrikt.' - ), + 'success' => 'Avskrivningsklassen uppdaterades framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill ta bort denna avskrivningsklass?', 'error' => 'Det gick inte att ta bort avskrivningsklassen. Var god försök igen.', - 'success' => 'Avskrivningsklassen har tagits bort.' - ) + 'success' => 'Avskrivningsklassen har tagits bort.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/depreciations/table.php b/resources/lang/sv-SE/admin/depreciations/table.php index 1817c5a1ce..e8728cb183 100644 --- a/resources/lang/sv-SE/admin/depreciations/table.php +++ b/resources/lang/sv-SE/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Månader', 'term' => 'Löptid', 'title' => 'Namn ', -); +]; diff --git a/resources/lang/sv-SE/admin/groups/message.php b/resources/lang/sv-SE/admin/groups/message.php index ae2b9253c5..912be8bcbc 100644 --- a/resources/lang/sv-SE/admin/groups/message.php +++ b/resources/lang/sv-SE/admin/groups/message.php @@ -1,22 +1,22 @@ 'Gruppen existerar redan!', 'group_not_found' => 'Grupp [:id] existerar inte.', 'group_name_required' => 'Namnfältet är obligatoriskt', - 'success' => array( + 'success' => [ 'create' => 'Gruppen skapades.', 'update' => 'Gruppen uppdaterades.', 'delete' => 'Gruppen raderades.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna grupp?', 'create' => 'Det uppstod ett problem med att skapa gruppen. Var god försök igen.', 'update' => 'Det uppstod ett problem med att uppdatera gruppen. Var god försök igen.', 'delete' => 'Det uppstod ett problem med att ta bort gruppen. Var god försök igen.', - ), + ], -); +]; diff --git a/resources/lang/sv-SE/admin/groups/table.php b/resources/lang/sv-SE/admin/groups/table.php index 7dcf510e45..1b28b0670b 100644 --- a/resources/lang/sv-SE/admin/groups/table.php +++ b/resources/lang/sv-SE/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'Namn', 'users' => '# användare', -); +]; diff --git a/resources/lang/sv-SE/admin/groups/titles.php b/resources/lang/sv-SE/admin/groups/titles.php index ba4378daad..e08b8224bf 100644 --- a/resources/lang/sv-SE/admin/groups/titles.php +++ b/resources/lang/sv-SE/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Om grupper', 'about_groups' => 'Grupper används för att generalisera användarbehörigheter.', 'group_management' => 'Grupphantering', @@ -11,4 +11,4 @@ return array( 'allow' => 'Tillåt', 'deny' => 'Neka', -); +]; diff --git a/resources/lang/sv-SE/admin/hardware/form.php b/resources/lang/sv-SE/admin/hardware/form.php index c8b13fd1de..3233f212d8 100644 --- a/resources/lang/sv-SE/admin/hardware/form.php +++ b/resources/lang/sv-SE/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Bekräfta storlekar för borttagning av bulk', +return [ + 'bulk_delete' => 'Bekräfta storlekar för borttagning av bulk', 'bulk_delete_help' => 'Granska tillgångarna för delad borttagning nedan. En gång raderas kan dessa tillgångar återställas, men de kommer inte längre att vara associerade med några användare de tilldelas för närvarande.', 'bulk_delete_warn' => 'Du håller på att ta bort: asset_count-tillgångar.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'I det här formuläret kan du uppdatera flera tillgångar på en gång. Fyll bara i de fält du behöver ändra. Alla fält som lämnas tomma kommer att förbli oförändrade.', - 'bulk_update_warn' => 'Du håller på att redigera egenskaperna hos: asset_count-tillgångar.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'I det här formuläret kan du uppdatera flera tillgångar på en gång. Fyll bara i de fält du behöver ändra. Alla fält som lämnas tomma kommer att förbli oförändrade.', + 'bulk_update_warn' => 'Du håller på att redigera egenskaperna hos: asset_count-tillgångar.', 'checkedout_to' => 'Utcheckad till', 'checkout_date' => 'Utcheckningsdatum', 'checkin_date' => 'Incheckningsdatum', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Garanti', - 'warranty_expires' => 'Garantin löper ut', + 'warranty_expires' => 'Garantin löper ut', 'years' => 'år', -) -; +]; diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php index 11c861552b..832949dc7c 100644 --- a/resources/lang/sv-SE/admin/hardware/general.php +++ b/resources/lang/sv-SE/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Om tillgångar', 'about_assets_text' => 'Tillgångar är poster som spåras med serienummer eller tillgångstagg. De tenderar att vara mer värdefulla saker där identifiering av en viss sak är viktig.', - 'archived' => 'Arkiverade', + 'archived' => 'Arkiverade', 'asset' => 'Tillgång', 'bulk_checkout' => 'Checkout tillgångar', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Väntande', 'undeployable' => 'Undeployable', 'view' => 'Visa tillgång', -); +]; diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php index 6de8cd9174..8d20cebbfa 100644 --- a/resources/lang/sv-SE/admin/hardware/message.php +++ b/resources/lang/sv-SE/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Varning: Den här tillgången har markerats som omöjlig för närvarande. Om denna status har ändrats uppdaterar du tillgångsstatusen.', 'does_not_exist' => 'Tillgång existerar inte.', 'does_not_exist_or_not_requestable' => 'Bra försök. Den tillgången existerar inte eller är inte tillgänglig.', 'assoc_users' => 'Denna tillgång kontrolleras för närvarande till en användare och kan inte raderas. Kontrollera tillgången först och försök sedan radera igen.', - 'create' => array( + 'create' => [ 'error' => 'Tillgången skapades inte, försök igen. :(', - 'success' => 'Asset skapades framgångsrikt. :)' - ), + 'success' => 'Asset skapades framgångsrikt. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Tillgången var inte uppdaterad, försök igen', 'success' => 'Asset uppdaterad framgångsrikt.', 'nothing_updated' => 'Inga fält valdes, så ingenting uppdaterades.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Tillgången återställdes inte, försök igen', - 'success' => 'Tillgången återställs framgångsrikt.' - ), + 'success' => 'Tillgången återställs framgångsrikt.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Inventeringen av tillgången misslyckades. Var god försök igen.', - 'success' => 'Inventeringen av tillgången har loggats.' - ), + 'success' => 'Inventeringen av tillgången har loggats.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen har inte tagits bort. Var god försök igen.', 'success' => 'Filen har tagits bort.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) inte uppladdade. Var god försök igen.', 'success' => 'Filer som har laddats upp.', 'nofiles' => 'Du valde inte några filer för uppladdning, eller filen du försöker ladda upp är för stor', 'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Vissa objekt importerades inte korrekt.', 'errorDetail' => 'Följande objekt importerades inte på grund av fel.', - 'success' => "Din fil har importerats", - 'file_delete_success' => "Din fil har tagits bort", - 'file_delete_error' => "Filen kunde inte raderas", - ), + 'success' => 'Din fil har importerats', + 'file_delete_success' => 'Din fil har tagits bort', + 'file_delete_error' => 'Filen kunde inte raderas', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera den här tillgången?', 'error' => 'Det gick inte att ta bort tillgången. Var god försök igen.', 'nothing_updated' => 'Inga tillgångar valdes, så ingenting togs bort.', - 'success' => 'Tillgången raderades framgångsrikt.' - ), + 'success' => 'Tillgången raderades framgångsrikt.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tillgången utcheckades inte, försök igen', 'success' => 'Tillgången checkas ut framgångsrikt.', 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', 'not_available' => 'Den tillgången är inte tillgänglig för kassan!', - 'no_assets_selected' => 'Du måste välja minst en tillgång från listan' - ), + 'no_assets_selected' => 'Du måste välja minst en tillgång från listan', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tillgången kontrollerades inte, försök igen', 'success' => 'Asset kontrolleras framgångsrikt.', 'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.', 'already_checked_in' => 'Den tillgången är redan incheckad.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Tillgången begärdes inte, försök igen', 'success' => 'Tillgången begärdes framgångsrikt.', - 'canceled' => 'Checkout förfrågan har avbrutits' - ) + 'canceled' => 'Checkout förfrågan har avbrutits', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/hardware/table.php b/resources/lang/sv-SE/admin/hardware/table.php index c3bb88245e..eee2f6c0ad 100644 --- a/resources/lang/sv-SE/admin/hardware/table.php +++ b/resources/lang/sv-SE/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Modell', @@ -20,6 +20,6 @@ return array( 'title' => 'Tillgång', 'image' => 'Enhetsbild', 'days_without_acceptance' => 'Dagar utan godkännande', - 'monthly_depreciation' => 'Månatlig avskrivning' + 'monthly_depreciation' => 'Månatlig avskrivning', -); +]; diff --git a/resources/lang/sv-SE/admin/kits/general.php b/resources/lang/sv-SE/admin/kits/general.php index ebbff82d68..552b53d9cb 100644 --- a/resources/lang/sv-SE/admin/kits/general.php +++ b/resources/lang/sv-SE/admin/kits/general.php @@ -1,6 +1,6 @@ 'Om fördefinierade produktpaket', 'about_kits_text' => 'Fördefinierade produktpaket låter dig snabbt checka ut en samling artiklar (tillgångar, licenser, etc) till en användare. Detta kan vara till hjälp när din registreringsprocess är konsekvent för många användare och alla användare får samma objekt.', 'checkout' => 'Checka ut produktpaket ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Det finns inte tillräckligt antal tillgängliga av : consumable att checka ut. :qty krävs. ', 'none_accessory' => 'Det finns inte tillräckligt antal tillgängliga av : accessory att checka ut. :qty krävs. ', -); +]; diff --git a/resources/lang/sv-SE/admin/licenses/form.php b/resources/lang/sv-SE/admin/licenses/form.php index 08a6b09d20..591a3ecf00 100644 --- a/resources/lang/sv-SE/admin/licenses/form.php +++ b/resources/lang/sv-SE/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Tillgång', 'checkin' => 'Checka in', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensierad till Email', 'to_name' => 'Licensierad till Namn', 'update' => 'Uppdateringslicens', - 'checkout_help' => 'Du måste kolla en licens ut till en maskinvaru tillgång eller en person. Du kan välja båda, men ägaren av tillgången måste matcha den person du kontrollerar tillgången ut till.' -); + 'checkout_help' => 'Du måste kolla en licens ut till en maskinvaru tillgång eller en person. Du kan välja båda, men ägaren av tillgången måste matcha den person du kontrollerar tillgången ut till.', +]; diff --git a/resources/lang/sv-SE/admin/licenses/general.php b/resources/lang/sv-SE/admin/licenses/general.php index 53c13c17f1..1d5db6a368 100644 --- a/resources/lang/sv-SE/admin/licenses/general.php +++ b/resources/lang/sv-SE/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Om licenser', 'about_licenses' => 'Licenser används för att spåra programvara. De har ett visst antal platser som kan checkas ut till individer', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Programvarulicenser', 'user' => 'Användare', 'view' => 'Visa licens', -); +]; diff --git a/resources/lang/sv-SE/admin/licenses/message.php b/resources/lang/sv-SE/admin/licenses/message.php index 3745c4b493..b19bfc186c 100644 --- a/resources/lang/sv-SE/admin/licenses/message.php +++ b/resources/lang/sv-SE/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Licensen finns inte.', 'user_does_not_exist' => 'Användare finns inte.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Du måste välja en tillgång eller en användare, men inte båda.', 'not_found' => 'Licensen hittades inte', - - 'create' => array( + 'create' => [ 'error' => 'Licensen skapades inte, försök igen.', - 'success' => 'Licensen skapades framgångsrikt.' - ), + 'success' => 'Licensen skapades framgångsrikt.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen har inte tagits bort. Var god försök igen.', 'success' => 'Filen har tagits bort.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) inte uppladdade. Var god försök igen.', 'success' => 'Filer som har laddats upp.', 'nofiles' => 'Du valde inte några filer för uppladdning, eller filen du försöker ladda upp är för stor', 'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml och lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Licensen uppdaterades inte, var god försök igen', - 'success' => 'Licensen uppdateras framgångsrikt.' - ), + 'success' => 'Licensen uppdateras framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna licens?', 'error' => 'Det gick inte att ta bort licensen. Var god försök igen.', - 'success' => 'Licensen har tagits bort.' - ), + 'success' => 'Licensen har tagits bort.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Det gick inte att kontrollera licensen. Var god försök igen.', - 'success' => 'Licensen utcheckades framgångsrikt' - ), + 'success' => 'Licensen utcheckades framgångsrikt', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Det gick inte att kontrollera licensen. Var god försök igen.', - 'success' => 'Licensen incheckades med framgång' - ), + 'success' => 'Licensen incheckades med framgång', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/licenses/table.php b/resources/lang/sv-SE/admin/licenses/table.php index f2410e0d30..2d581b28f4 100644 --- a/resources/lang/sv-SE/admin/licenses/table.php +++ b/resources/lang/sv-SE/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Tilldelats', 'checkout' => 'In ut', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serie', 'title' => 'Licens', -); +]; diff --git a/resources/lang/sv-SE/admin/locations/message.php b/resources/lang/sv-SE/admin/locations/message.php index 95bb95cad0..bbd9fc154e 100644 --- a/resources/lang/sv-SE/admin/locations/message.php +++ b/resources/lang/sv-SE/admin/locations/message.php @@ -1,27 +1,26 @@ 'Platsen finns inte.', 'assoc_users' => 'Platsen är associerad med minst en användare och kan inte tas bort. Vänligen uppdatera dina användare så dom inte refererar till denna plats och försök igen.', 'assoc_assets' => 'Platsen är associerad med minst en tillgång och kan inte tas bort. Vänligen uppdatera dina tillgångar så dom inte refererar till denna plats och försök igen. ', 'assoc_child_loc' => 'Denna plats är för närvarande överliggande för minst en annan plats och kan inte tas bort. Vänligen uppdatera dina platser så dom inte längre refererar till denna och försök igen.', - - 'create' => array( + 'create' => [ 'error' => 'Platsen kunde inte skapas. Vänligen försök igen.', - 'success' => 'Platsen skapades.' - ), + 'success' => 'Platsen skapades.', + ], - 'update' => array( + 'update' => [ 'error' => 'Platsen kunde inte uppdateras. Vänligen försök igen', - 'success' => 'Platsen uppdaterades.' - ), + 'success' => 'Platsen uppdaterades.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker du vill ta bort denna plats?', 'error' => 'Ett fel inträffade när denna plats skulle tas bort. Vänligen försök igen.', - 'success' => 'Platsen har tagits bort.' - ) + 'success' => 'Platsen har tagits bort.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/locations/table.php b/resources/lang/sv-SE/admin/locations/table.php index c0cf59717c..2203a96a4a 100644 --- a/resources/lang/sv-SE/admin/locations/table.php +++ b/resources/lang/sv-SE/admin/locations/table.php @@ -1,6 +1,6 @@ 'Om platser', 'about_locations' => 'Platser används för att spåra platsinformation för användare, tillgångar och andra objekt', 'assets_rtd' => 'Tillgångar', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Förälder', 'currency' => 'Platsvaluta', 'ldap_ou' => 'LDAP-sökning OU', - ); + ]; diff --git a/resources/lang/sv-SE/admin/manufacturers/message.php b/resources/lang/sv-SE/admin/manufacturers/message.php index ac230410c7..8664bbf0ea 100644 --- a/resources/lang/sv-SE/admin/manufacturers/message.php +++ b/resources/lang/sv-SE/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Tillverkaren existerar inte.', 'assoc_users' => 'Tillverkaren är för tillfället associerad med en modell och kan inte tas bort. Vänligen uppdatera dina modeller till att inte vara associerade med denna tillverkare och försök igen. ', - 'create' => array( + 'create' => [ 'error' => 'Tillverkaren kunde inte skapas. Vänligen försök igen.', - 'success' => 'Tillverkaren skapades utan problem.' - ), + 'success' => 'Tillverkaren skapades utan problem.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tillverkaren kunde inte uppdateras, vänligen försök igen', - 'success' => 'Tillverkaren uppdaterades utan problem.' - ), + 'success' => 'Tillverkaren uppdaterades utan problem.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Tillverkaren kunde inte återskapas. Vänligen försök igen', - 'success' => 'Tillverkaren återskapades utan problem.' - ), + 'success' => 'Tillverkaren återskapades utan problem.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill ta bort?', 'error' => 'Det gick inte att ta bort tillverkaren. Vänligen försök igen.', - 'success' => 'Tillverkaren har tagits bort.' - ) + 'success' => 'Tillverkaren har tagits bort.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/manufacturers/table.php b/resources/lang/sv-SE/admin/manufacturers/table.php index a54ae28bf1..08af0f2de8 100644 --- a/resources/lang/sv-SE/admin/manufacturers/table.php +++ b/resources/lang/sv-SE/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Om tillverkare', 'about_manufacturers_text' => 'Tillverkare är de företag som skapar dina tillgångar. Du kan lagra viktig supportkontaktinformation om dem här, som kommer att visas på dina tillgångssidor.', 'asset_manufacturers' => 'Tillverkare', @@ -13,4 +13,4 @@ return array( 'update' => 'Uppdatera Tillverkare', 'url' => 'URL', -); +]; diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php index 7ec842a464..193d00c4c5 100644 --- a/resources/lang/sv-SE/admin/models/general.php +++ b/resources/lang/sv-SE/admin/models/general.php @@ -1,6 +1,6 @@ 'Om modeller', 'about_models_text' => 'Modeller är ett sätt att gruppera identiska tillgångar. "Galaxy S20", "iPhone 12", etc.', 'deleted' => 'Den här modellen har tagits bort. Klicka här för att återskapa.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Du håller på att ta bort: model_count modeller.', 'restore' => 'Återskapa Modell', 'requestable' => 'Användare kan begära denna modell', - 'show_mac_address' => 'Visa fältet MAC-adress för tillgångar av denna modell', + 'show_mac_address' => 'Visa fältet MAC-adress för tillgångar av denna modell', 'view_deleted' => 'Visa Borttagna', 'view_models' => 'Visa modeller', 'fieldset' => 'Fältsamling', 'no_custom_field' => 'Inga anpassade fält', 'add_default_values' => 'Lägg till standardvärden', -); +]; diff --git a/resources/lang/sv-SE/admin/models/message.php b/resources/lang/sv-SE/admin/models/message.php index 76830cffec..b34286f377 100644 --- a/resources/lang/sv-SE/admin/models/message.php +++ b/resources/lang/sv-SE/admin/models/message.php @@ -1,42 +1,41 @@ 'Modellen finns inte.', 'assoc_users' => 'Denna modell är redan associerad med en eller flera tillgångar och kan inte tas bort. Ta bort tillgången och försök sedan igen. ', - - 'create' => array( + 'create' => [ 'error' => 'Modellen skapades inte, försök igen.', 'success' => 'Modellen skapad.', 'duplicate_set' => 'En tillgångsmodell med det namnet, tillverkaren och modellnumret finns redan.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Modellen uppdaterades inte, försök igen', - 'success' => 'Modellen uppdaterad.' - ), + 'success' => 'Modellen uppdaterad.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill ta bort denna modell?', 'error' => 'Problem att ta bort modellen. Försök igen.', - 'success' => 'Modellen borttagen.' - ), + 'success' => 'Modellen borttagen.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Modellen återskapades inte, försök igen', - 'success' => 'Modellen återskapades.' - ), + 'success' => 'Modellen återskapades.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Inga fält ändrades, så ingenting uppdaterades.', - 'success' => 'Modeller uppdaterades.' - ), + 'success' => 'Modeller uppdaterades.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Inga tillgångar valdes, så ingenting togs bort.', 'success' => ': success_count modell (er) borttagen!', - 'success_partial' => ':success_count modell(erna) raderades, men :fail_count kunde inte raderas eftersom de fortfarande har tillgångar kopplade till sig.' - ), + 'success_partial' => ':success_count modell(erna) raderades, men :fail_count kunde inte raderas eftersom de fortfarande har tillgångar kopplade till sig.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/models/table.php b/resources/lang/sv-SE/admin/models/table.php index 85395d261a..1d9b0a230d 100644 --- a/resources/lang/sv-SE/admin/models/table.php +++ b/resources/lang/sv-SE/admin/models/table.php @@ -1,6 +1,6 @@ 'Skapa Modell', 'created_at' => 'Skapad den', @@ -14,4 +14,4 @@ return array( 'update' => 'Uppdatera modell', 'clone' => 'Kopiera Modell', 'edit' => 'Ändra Modell', -); +]; diff --git a/resources/lang/sv-SE/admin/reports/general.php b/resources/lang/sv-SE/admin/reports/general.php index 3f959f465b..0506459e14 100644 --- a/resources/lang/sv-SE/admin/reports/general.php +++ b/resources/lang/sv-SE/admin/reports/general.php @@ -1,5 +1,5 @@ 'Välj de alternativ du vill ha för din tillgångsrapport.' -); +return [ + 'info' => 'Välj de alternativ du vill ha för din tillgångsrapport.', +]; diff --git a/resources/lang/sv-SE/admin/reports/message.php b/resources/lang/sv-SE/admin/reports/message.php index 9260f0b343..0173976ae4 100644 --- a/resources/lang/sv-SE/admin/reports/message.php +++ b/resources/lang/sv-SE/admin/reports/message.php @@ -1,5 +1,5 @@ 'Du måste välja minst ett alternativ.' -); +return [ + 'error' => 'Du måste välja minst ett alternativ.', +]; diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php index 10f4606cbb..b116d3cdd5 100644 --- a/resources/lang/sv-SE/admin/settings/general.php +++ b/resources/lang/sv-SE/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory-domän', 'ad_domain_help' => 'Detta är ibland samma som din e-post domän, men inte alltid.', 'ad_append_domain_label' => 'Lägg till domännamn', 'ad_append_domain' => 'Lägg till domännamn i fältet användarnamn', - 'ad_append_domain_help' => 'Användaren behöver inte skriva "username@domain.local", det räcker att skriva "username".' , + 'ad_append_domain_help' => 'Användaren behöver inte skriva "username@domain.local", det räcker att skriva "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'Om du vill skicka en kopia av checkin / checkout-e-postmeddelanden som skickas till användare till ett extra e-postkonto, skriv det här. Annars lämnar du fältet tomt.', 'is_ad' => 'Detta är en Active Directory-server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Utgående varningströskel (i dagar)', 'alert_inv_threshold' => 'Varna om lågt lagersaldo', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Tillgångs-ID', 'audit_interval' => 'Inventeringsintervall', 'audit_interval_help' => 'Om ni är i behov av regelbunden fysisk inventering av era tillgångar anger du intervallet i månader.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Ange tvåfaktorskod', 'two_factor_config_complete' => 'Skicka kod', 'two_factor_enabled_edit_not_allowed' => 'Din administratör tillåter dig inte att redigera den här inställningen.', - 'two_factor_enrollment_text' => "Tvåfaktorsautentisering krävs, men din enhet har inte registrerats än. Öppna din Google Authenticator-app och skanna QR-koden nedan för att registrera din enhet. När enheten är registrerad anger du koden nedan", + 'two_factor_enrollment_text' => 'Tvåfaktorsautentisering krävs, men din enhet har inte registrerats än. Öppna din Google Authenticator-app och skanna QR-koden nedan för att registrera din enhet. När enheten är registrerad anger du koden nedan', 'require_accept_signature' => 'Kräver signatur', 'require_accept_signature_help_text' => 'Aktivering av denna funktion kräver att användarna fysiskt loggar av när de accepterar en tillgång.', 'left' => 'vänster', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Genom att kryssa denna ruta skapas ett krav på unikt serienummer för varje enhet', 'zerofill_count' => 'Längd på tillgångstaggar, inklusive zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/sv-SE/admin/settings/message.php b/resources/lang/sv-SE/admin/settings/message.php index b56533147b..026089132a 100644 --- a/resources/lang/sv-SE/admin/settings/message.php +++ b/resources/lang/sv-SE/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Ett fel har uppstått under uppdateringen.', - 'success' => 'Inställningarna uppdaterades framgångsrikt.' - ), - 'backup' => array( + 'success' => 'Inställningarna uppdaterades framgångsrikt.', + ], + 'backup' => [ 'delete_confirm' => 'Är du säker på att du vill ta bort den här säkerhetskopieringsfilen? Den här åtgärden kan inte ångras.', 'file_deleted' => 'Säkerhetsfilen har tagits bort.', 'generated' => 'En ny säkerhetskopieringsfil skapades med framgång.', 'file_not_found' => 'Den säkerhetskopieringsfilen kunde inte hittas på servern.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Ett fel har uppstått vid spolning.', 'validation_failed' => 'Din rengöringsbekräftelse är felaktig. Vänligen skriv ordet "DELETE" i bekräftelsen rutan.', - 'success' => 'Raderade poster som rensats framgångsrikt.' - ), + 'success' => 'Raderade poster som rensats framgångsrikt.', + ], -); +]; diff --git a/resources/lang/sv-SE/admin/statuslabels/message.php b/resources/lang/sv-SE/admin/statuslabels/message.php index c09d8fc1d5..5fb8037414 100644 --- a/resources/lang/sv-SE/admin/statuslabels/message.php +++ b/resources/lang/sv-SE/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label existerar inte.', 'assoc_assets' => 'Denna statusetikett är för närvarande associerad med minst en tillgång och kan inte raderas. Uppdatera dina tillgångar för att inte längre referera till denna status och försök igen.', - - 'create' => array( + 'create' => [ 'error' => 'Statusetiketten skapades inte, försök igen.', - 'success' => 'Status Label skapades framgångsrikt.' - ), + 'success' => 'Status Label skapades framgångsrikt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Statusetiketten uppdaterades inte, var god försök igen', - 'success' => 'Statusetiketten uppdateras framgångsrikt.' - ), + 'success' => 'Statusetiketten uppdateras framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna statusetikett?', 'error' => 'Det gick inte att ta bort statusetiketten. Var god försök igen.', - 'success' => 'Statusetiketten har tagits bort.' - ), + 'success' => 'Statusetiketten har tagits bort.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Dessa tillgångar kan inte tilldelas någon.', 'deployable' => 'Dessa tillgångar kan checkas ut. När de har tilldelats, antar de en metastatus på Deployed.', 'archived' => 'Dessa tillgångar kan inte checkas ut och visas bara i arkiverad vy. Detta är användbart för att behålla information om tillgångar för budgetering / historiska ändamål men att hålla dem borta från den dagliga tillgångslistan.', 'pending' => 'Dessa tillgångar kan ännu inte tilldelas någon som ofta används för föremål som är ute för reparation, men förväntas återgå till omlopp.', - ), + ], -); +]; diff --git a/resources/lang/sv-SE/admin/statuslabels/table.php b/resources/lang/sv-SE/admin/statuslabels/table.php index 04b83bc864..cc2c56e5a7 100644 --- a/resources/lang/sv-SE/admin/statuslabels/table.php +++ b/resources/lang/sv-SE/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Om statusetiketter', 'archived' => 'Arkiverade', 'create' => 'Skapa statusetikett', @@ -16,4 +16,4 @@ return array( 'title' => 'Statusetiketter', 'undeployable' => 'Ej tillgänglig', 'update' => 'Uppdatera statusetikett', -); +]; diff --git a/resources/lang/sv-SE/admin/suppliers/message.php b/resources/lang/sv-SE/admin/suppliers/message.php index 650a3cce6e..8039f8127e 100644 --- a/resources/lang/sv-SE/admin/suppliers/message.php +++ b/resources/lang/sv-SE/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Leverantören finns inte.', - - 'create' => array( + 'create' => [ 'error' => 'Leverantören skapades inte, var god försök igen.', - 'success' => 'Leverantören skapades framgångsrikt.' - ), + 'success' => 'Leverantören skapades framgångsrikt.', + ], - 'update' => array( + 'update' => [ 'error' => 'Leverantören uppdaterades inte, var god försök igen', - 'success' => 'Leverantören uppdaterades framgångsrikt.' - ), + 'success' => 'Leverantören uppdaterades framgångsrikt.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Är du säker på att du vill radera denna leverantör?', 'error' => 'Det uppstod ett problem med att ta bort leverantören. Var god försök igen.', 'success' => 'Leverantören har tagits bort.', 'assoc_assets' => 'Denna leverantör är för närvarande är associerad med: asset_count tillgång(ar) och kan inte tas bort. Vänligen uppdatera dina tillgångar för att inte längre referera denna leverantör och försök igen. ', 'assoc_licenses' => 'Denna leverantör är för närvarande är associerade med: licenses_count licenser (s) och kan inte tas bort. Vänligen uppdatera dina licenser för att inte längre referera denna leverantör och försök igen. ', 'assoc_maintenances' => 'Denna leverantör är för närvarande associerad med: asset_maintenances_count asset maintenances (s) och kan inte raderas. Var vänlig uppdatera dina tillgångsinrättningar för att inte längre referera till denna leverantör och försök igen. ', - ) + ], -); +]; diff --git a/resources/lang/sv-SE/admin/suppliers/table.php b/resources/lang/sv-SE/admin/suppliers/table.php index 52a512df09..eb75da0971 100644 --- a/resources/lang/sv-SE/admin/suppliers/table.php +++ b/resources/lang/sv-SE/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Om leverantörer', 'about_suppliers_text' => 'Leverantörer används för att spåra källan till objekt', 'address' => 'Leverantörsadress', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Visa tillgångar för', 'zip' => 'postnummer', -); +]; diff --git a/resources/lang/sv-SE/admin/users/general.php b/resources/lang/sv-SE/admin/users/general.php index 97725d61a1..81517e23ec 100644 --- a/resources/lang/sv-SE/admin/users/general.php +++ b/resources/lang/sv-SE/admin/users/general.php @@ -1,7 +1,6 @@ 'Den här användaren kan logga in', 'activated_disabled_help_text' => 'Du kan inte redigera aktiveringsstatus för ditt eget konto.', 'assets_user' => 'Tillgångar tilldelade: namn', @@ -13,7 +12,7 @@ return array( 'edit' => 'Redigera användare', 'filetype_info' => 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip och rar.', 'history_user' => 'Historia för: namn', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Klicka här för att återställa dem.', 'last_login' => 'Senaste inloggning', 'ldap_config_text' => 'LDAP-konfigurationsinställningar finns Admin> Inställningar. Den (valfria) valda platsen kommer att ställas in för alla importerade användare.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Dina nuvarande administratörsinställningar tillåter selektiv tillämpning av tvåfaktorsautentisering. ', 'two_factor_enrolled' => '2FA-enhet inskriven', 'two_factor_active' => '2FA Aktiv', - ); + ]; diff --git a/resources/lang/sv-SE/admin/users/message.php b/resources/lang/sv-SE/admin/users/message.php index 6910b503ed..bb6fcee6de 100644 --- a/resources/lang/sv-SE/admin/users/message.php +++ b/resources/lang/sv-SE/admin/users/message.php @@ -1,6 +1,6 @@ 'Du har framgångsrikt godkänt den här tillgången.', 'declined' => 'Du har framgångsrikt nekat den här tillgången.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP-integrationen har inte konfigurerats för den här installationen.', 'password_resets_sent' => 'De valda användare som är aktiverade och har en giltig e-postadress har skickats en länk för att återställa lösenordet.', - - 'success' => array( + 'success' => [ 'create' => 'Användaren skapades med framgång.', 'update' => 'Användaren har uppdaterats.', 'update_bulk' => 'Användarna uppdaterades med framgång!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Användaren blev framgångsrikt uppslagen.', 'restored' => 'Användaren lyckades återställas.', 'import' => 'Användare importerades framgångsrikt.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Det var ett problem att skapa användaren. Var god försök igen.', 'update' => 'Det gick inte att uppdatera användaren. Var god försök igen.', 'delete' => 'Det gick inte att ta bort användaren. Var god försök igen.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Det gick inte att söka på LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Fel från LDAP-servern:', 'ldap_could_not_get_entries' => 'Det gick inte att få poster från LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen.
Fel från LDAP-servern:', 'password_ldap' => 'Lösenordet för det här kontot hanteras av LDAP / Active Directory. Vänligen kontakta din IT-avdelning för att ändra ditt lösenord.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Filen har inte tagits bort. Var god försök igen.', 'success' => 'Filen har tagits bort.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Fil (er) inte uppladdade. Var god försök igen.', 'success' => 'Filer som har laddats upp.', 'nofiles' => 'Du valde inte några filer för uppladdning', 'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.', - ), + ], -); +]; diff --git a/resources/lang/sv-SE/admin/users/table.php b/resources/lang/sv-SE/admin/users/table.php index 057f6270e9..a802c92d04 100644 --- a/resources/lang/sv-SE/admin/users/table.php +++ b/resources/lang/sv-SE/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktiva', 'allow' => 'Tillåta', 'checkedout' => 'Tillgångar', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Visa nuvarande användare', 'show_deleted' => 'Visa borttagna användare', 'title' => 'Titel', - 'to_restore_them' => 'att återställa dem.', + 'to_restore_them' => 'att återställa dem.', 'updateuser' => 'Uppdatera användaren', 'username' => 'Användarnamn', - 'user_deleted_text' => 'Den här användaren har markerats som borttagen.', + 'user_deleted_text' => 'Den här användaren har markerats som borttagen.', 'username_note' => '(Detta används endast för Active Directory-bindning, inte för inloggning.)', 'cloneuser' => 'Klonanvändare', 'viewusers' => 'Visa användare', -); +]; diff --git a/resources/lang/sv-SE/auth/general.php b/resources/lang/sv-SE/auth/general.php index e01c9c9c72..f154ad7b15 100644 --- a/resources/lang/sv-SE/auth/general.php +++ b/resources/lang/sv-SE/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/sv-SE/auth/message.php b/resources/lang/sv-SE/auth/message.php index a20cb6a4e3..d927770987 100644 --- a/resources/lang/sv-SE/auth/message.php +++ b/resources/lang/sv-SE/auth/message.php @@ -1,6 +1,6 @@ 'Ett konto med denna e-postadress finns redan.', 'account_not_found' => 'Användarnamnet eller lösenordet är felaktigt.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Detta användarkonto har blivit avstängt.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Det uppstod ett problem när du försökte logga in, försök igen.', 'success' => 'Din inloggning lyckades.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Det uppstod ett problem med att skapa ditt konto, försök igen.', 'success' => 'Kontot har skapats.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Det uppstod ett problem med att nollställa ditt lösenord, var god försök igen.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Det uppstod ett problem med nollställning av ditt lösenord, var god försök igen.', 'success' => 'Ditt lösenord har återställts.', - ), + ], - -); +]; diff --git a/resources/lang/sv-SE/button.php b/resources/lang/sv-SE/button.php index 09cd5d4d63..a964e2a2a1 100644 --- a/resources/lang/sv-SE/button.php +++ b/resources/lang/sv-SE/button.php @@ -1,6 +1,6 @@ 'Åtgärder', 'add' => 'Lägg till ny', 'cancel' => 'Avbryt', @@ -11,7 +11,7 @@ return array( 'request' => 'Begäran', 'submit' => 'Skicka', 'upload' => 'Ladda upp', - 'select_file' => 'Välj fil...', + 'select_file' => 'Välj fil...', 'select_files' => 'Välj filer...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php index 698ff32f14..3f1520ca4a 100644 --- a/resources/lang/sv-SE/general.php +++ b/resources/lang/sv-SE/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Inregristreringar', 'user_requests_count' => 'Förfrågningar', 'city' => 'Ort', - 'click_here' => 'Klicka här', + 'click_here' => 'Klicka här', 'clear_selection' => 'Rensa urvalet', 'companies' => 'Företag', 'company' => 'Företag', 'component' => 'Komponent', 'components' => 'Komponenter', - 'complete' => 'Komplett', + 'complete' => 'Komplett', 'consumable' => 'Förbrukningsmaterial', 'consumables' => 'Förbrukningsmaterial', 'country' => 'Land', diff --git a/resources/lang/sv-SE/help.php b/resources/lang/sv-SE/help.php index c1546c6586..bb8ef1d004 100644 --- a/resources/lang/sv-SE/help.php +++ b/resources/lang/sv-SE/help.php @@ -1,6 +1,6 @@ "Mer information", + 'more_info_title' => 'Mer information', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/sv-SE/mail.php b/resources/lang/sv-SE/mail.php index 6cb48a510b..8cc22f1010 100644 --- a/resources/lang/sv-SE/mail.php +++ b/resources/lang/sv-SE/mail.php @@ -1,6 +1,6 @@ 'En användare har avbrutit en artikelförfrågan på webbplatsen', 'a_user_requested' => 'En användare har efterfrågat en artikel webbplatsen', 'accessory_name' => 'Tillbehörsnamn:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'Visa dina tillgångar' -); + 'your_assets' => 'Visa dina tillgångar', +]; diff --git a/resources/lang/sv-SE/pagination.php b/resources/lang/sv-SE/pagination.php index 763a842c3e..3e1f99a2ee 100644 --- a/resources/lang/sv-SE/pagination.php +++ b/resources/lang/sv-SE/pagination.php @@ -1,6 +1,6 @@ 'Nästa »', -); +]; diff --git a/resources/lang/sv-SE/passwords.php b/resources/lang/sv-SE/passwords.php index 2d53935f3a..610e992df2 100644 --- a/resources/lang/sv-SE/passwords.php +++ b/resources/lang/sv-SE/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Din lösenordslänk har skickats!', 'user' => 'Ingen aktiv användare med denna e-postadress hittades.', ]; - diff --git a/resources/lang/sv-SE/reminders.php b/resources/lang/sv-SE/reminders.php index 5eceef1eed..9475f8f168 100644 --- a/resources/lang/sv-SE/reminders.php +++ b/resources/lang/sv-SE/reminders.php @@ -1,6 +1,6 @@ "Lösenord måste vara sex tecken och matcha lösenordsbekräftelsen.", + 'password' => 'Lösenord måste vara sex tecken och matcha lösenordsbekräftelsen.', - "user" => "Användarnamnet eller e-postadressen är felaktigt", + 'user' => 'Användarnamnet eller e-postadressen är felaktigt', - "token" => "Denna token för lösenordsåterställning är ogiltig.", + 'token' => 'Denna token för lösenordsåterställning är ogiltig.', - "sent" => "Om en matchande e-postadress hittades, har en lösenordspåminnelse skickats!", + 'sent' => 'Om en matchande e-postadress hittades, har en lösenordspåminnelse skickats!', -); +]; diff --git a/resources/lang/sv-SE/table.php b/resources/lang/sv-SE/table.php index 09544ca5c9..c0b14f37f4 100644 --- a/resources/lang/sv-SE/table.php +++ b/resources/lang/sv-SE/table.php @@ -1,10 +1,10 @@ 'Handlingar', 'action' => 'Handling', 'by' => 'Av', 'item' => 'Artikel', -); +]; diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php index 4725d1c36c..9d73c9113b 100644 --- a/resources/lang/sv-SE/validation.php +++ b/resources/lang/sv-SE/validation.php @@ -1,6 +1,6 @@ ':attribute är upptaget.', 'uploaded' => 'Uppladdningen av :attribute misslyckades.', 'url' => ':attribute Formatet är ogiltigt.', - "unique_undeleted" => ":attribute måste vara unikt.", + 'unique_undeleted' => ':attribute måste vara unikt.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Fältet :attribute innehåller ett tecken som inte är tillåtet.", - "email_array" => "En eller flera e-postadresser är ogiltiga.", - "hashed_pass" => "Ditt nuvarande lösenord är felaktigt", + 'alpha_space' => 'Fältet :attribute innehåller ett tecken som inte är tillåtet.', + 'email_array' => 'En eller flera e-postadresser är ogiltiga.', + 'hashed_pass' => 'Ditt nuvarande lösenord är felaktigt', 'dumbpwd' => 'Det angivna lösenordet är för vanligt.', - "statuslabel_type" => "Du måste ange en giltig typ av statusetikett", + 'statuslabel_type' => 'Du måste ange en giltig typ av statusetikett', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ta/admin/accessories/general.php b/resources/lang/ta/admin/accessories/general.php index 01c5cb9285..738ebcf522 100644 --- a/resources/lang/ta/admin/accessories/general.php +++ b/resources/lang/ta/admin/accessories/general.php @@ -1,6 +1,6 @@ 'துணை வகை', 'accessory_name' => 'துணை பெயர்', 'checkout' => 'புதுப்பித்துக்கொள்ளும் சேவை', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'பதிலாக primary இயல்புநிலை EULA ஐப் பயன்படுத்துக.', 'use_default_eula_disabled' => ' முதன்மை இயல்புநிலை EULA ஐப் பயன்படுத்தவும் . முதன்மை இயல்புநிலை EULA அமைக்கப்படவில்லை. அமைப்புகளில் ஒன்றைச் சேர்க்கவும்.', -); +]; diff --git a/resources/lang/ta/admin/accessories/message.php b/resources/lang/ta/admin/accessories/message.php index b562d75ba6..df23623e32 100644 --- a/resources/lang/ta/admin/accessories/message.php +++ b/resources/lang/ta/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'தற்போது இந்த இணைப்பு உள்ளது: பயனர்களை சோதிக்கப்படும் எண்ணைக் கணக்கிடு. ஆபரணங்களை சரிபார்த்து மீண்டும் முயற்சிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'துணை உருவாக்கம் செய்யப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'துணை வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'துணை வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'இணைப்பு புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'துணை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'துணை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'நிச்சயமாக இந்த துணை நீக்க விரும்புகிறீர்களா?', 'error' => 'துணை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'துணை வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'துணை வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'அசெஸரி அவுட் சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'அசெஸரி வெற்றிகரமாக சோதிக்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ), + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'அசெஸரி சோதிக்கப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்', 'success' => 'அசெஸரி வெற்றிகரமாக சரிபார்க்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ) + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - -); +]; diff --git a/resources/lang/ta/admin/accessories/table.php b/resources/lang/ta/admin/accessories/table.php index a7236efd84..a2563c35e2 100644 --- a/resources/lang/ta/admin/accessories/table.php +++ b/resources/lang/ta/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV ஐ பதிவிறக்குக', - 'eula_text' => 'இறுதிப் பயனர் உரிம ஒப்பந்தம்', +return [ + 'dl_csv' => 'CSV ஐ பதிவிறக்குக', + 'eula_text' => 'இறுதிப் பயனர் உரிம ஒப்பந்தம்', 'id' => 'ஐடி', 'require_acceptance' => 'ஏற்றுக்கொள்ளுதல்', 'title' => 'துணை பெயர்', - -); +]; diff --git a/resources/lang/ta/admin/asset_maintenances/form.php b/resources/lang/ta/admin/asset_maintenances/form.php index b82e2ec90f..4692b75a20 100644 --- a/resources/lang/ta/admin/asset_maintenances/form.php +++ b/resources/lang/ta/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'நாட்களில்', 'notes' => 'குறிப்புக்கள்', 'update' => 'புதுப்பிக்கப்பட்டது', - 'create' => 'உருவாக்கவும்' + 'create' => 'உருவாக்கவும்', ]; diff --git a/resources/lang/ta/admin/asset_maintenances/message.php b/resources/lang/ta/admin/asset_maintenances/message.php index 49cb26cb97..4a1625b2c8 100644 --- a/resources/lang/ta/admin/asset_maintenances/message.php +++ b/resources/lang/ta/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'நிச்சயமாக இந்த சொத்து பராமரிப்பு நீக்க வேண்டுமா?', 'error' => 'சொத்து பராமரிப்பு நீக்கப்பட்ட ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக நீக்கப்பட்டது.' + 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக நீக்கப்பட்டது.', ], 'create' => [ 'error' => 'சொத்து பராமரிப்பு உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக உருவாக்கப்பட்டது.' + 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக உருவாக்கப்பட்டது.', ], 'edit' => [ 'error' => 'சொத்து பராமரிப்பு திருத்தப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக திருத்தப்பட்டது.' + 'success' => 'சொத்து பராமரிப்பு வெற்றிகரமாக திருத்தப்பட்டது.', ], 'asset_maintenance_incomplete' => 'இதுவரையிலும் முடிக்கப்படவில்லை', 'warranty' => 'உத்தரவாதத்தை', 'not_warranty' => 'உத்தரவாதம் இல்லை', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ta/admin/asset_maintenances/table.php b/resources/lang/ta/admin/asset_maintenances/table.php index ffe64e7b78..b73455c148 100644 --- a/resources/lang/ta/admin/asset_maintenances/table.php +++ b/resources/lang/ta/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'சொத்து பராமரிப்பு', 'asset_name' => 'சொத்து பெயர்', 'is_warranty' => 'உத்தரவாதத்தை', - 'dl_csv' => 'CSV ஐ பதிவிறக்குக' + 'dl_csv' => 'CSV ஐ பதிவிறக்குக', ]; diff --git a/resources/lang/ta/admin/categories/general.php b/resources/lang/ta/admin/categories/general.php index fd7237afb9..0efe3084f4 100644 --- a/resources/lang/ta/admin/categories/general.php +++ b/resources/lang/ta/admin/categories/general.php @@ -1,6 +1,6 @@ 'சொத்து வகைகள்', 'category_name' => 'வகை பெயர்', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'பதிலாக primary இயல்புநிலை EULA ஐப் பயன்படுத்துக.', 'use_default_eula_disabled' => ' முதன்மை இயல்புநிலை EULA ஐப் பயன்படுத்தவும் . முதன்மை இயல்புநிலை EULA அமைக்கப்படவில்லை. அமைப்புகளில் ஒன்றைச் சேர்க்கவும்.', -); +]; diff --git a/resources/lang/ta/admin/categories/message.php b/resources/lang/ta/admin/categories/message.php index e90faccec1..5eb44fdb39 100644 --- a/resources/lang/ta/admin/categories/message.php +++ b/resources/lang/ta/admin/categories/message.php @@ -1,25 +1,25 @@ 'பகுப்பு இல்லை.', 'assoc_models' => 'இந்த வகை தற்போது குறைந்தபட்சம் ஒரு மாதிரியுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த வகைகளை இனி குறிப்பிடவும் உங்கள் மாதிரியைப் புதுப்பிக்கவும் மீண்டும் முயற்சிக்கவும்.', 'assoc_items' => 'இந்த வகை தற்போது குறைந்தபட்சம் ஒன்றுடன் தொடர்புடையது: சொத்து வகை _ வகை மற்றும் நீக்கப்பட முடியாது. தயவுசெய்து தயவுசெய்து உங்கள் வகை: asset_type ஐ இனி இந்த பிரிவை குறிப்பிடாமல் புதுப்பிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'வகையை உருவாக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'வகை வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'வகை வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'வகை புதுப்பிக்கப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்', - 'success' => 'வகை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'வகை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த வகையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'வகையை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'வகை வெற்றிகரமாக நீக்கப்பட்டது.' - ) + 'success' => 'வகை வெற்றிகரமாக நீக்கப்பட்டது.', + ], -); +]; diff --git a/resources/lang/ta/admin/categories/table.php b/resources/lang/ta/admin/categories/table.php index e43c5b96e8..325b98f94c 100644 --- a/resources/lang/ta/admin/categories/table.php +++ b/resources/lang/ta/admin/categories/table.php @@ -1,10 +1,10 @@ 'இறுதிப் பயனர் உரிம ஒப்பந்தம்', +return [ + 'eula_text' => 'இறுதிப் பயனர் உரிம ஒப்பந்தம்', 'id' => 'ஐடி', 'parent' => 'பெற்றோர்', 'require_acceptance' => 'ஏற்றுக்கொள்ளுதல்', 'title' => 'சொத்து வகை பெயர்', -); +]; diff --git a/resources/lang/ta/admin/companies/general.php b/resources/lang/ta/admin/companies/general.php index 71019a9e51..737b0d4dfb 100644 --- a/resources/lang/ta/admin/companies/general.php +++ b/resources/lang/ta/admin/companies/general.php @@ -1,4 +1,5 @@ 'நிறுவனம் தேர்ந்தெடு', ]; diff --git a/resources/lang/ta/admin/companies/message.php b/resources/lang/ta/admin/companies/message.php index aa8209e990..628059ae1b 100644 --- a/resources/lang/ta/admin/companies/message.php +++ b/resources/lang/ta/admin/companies/message.php @@ -1,18 +1,19 @@ 'நிறுவனம் இல்லை.', 'assoc_users' => 'இந்த நிறுவனம் தற்போது குறைந்தது ஒரு மாதிரியுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த நிறுவனத்தை இனி குறிப்பிடாமல் உங்கள் மாடல்களை புதுப்பிக்கவும் மீண்டும் முயற்சிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'நிறுவனம் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'நிறுவனம் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), - 'update' => array( + 'success' => 'நிறுவனம் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], + 'update' => [ 'error' => 'நிறுவனம் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'நிறுவனம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), - 'delete' => array( + 'success' => 'நிறுவனம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], + 'delete' => [ 'confirm' => 'இந்த நிறுவனத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'நிறுவனத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'நிறுவனம் வெற்றிகரமாக நீக்கப்பட்டது.' - ) -); + 'success' => 'நிறுவனம் வெற்றிகரமாக நீக்கப்பட்டது.', + ], +]; diff --git a/resources/lang/ta/admin/companies/table.php b/resources/lang/ta/admin/companies/table.php index 1898d4af6e..4e9ae34d46 100644 --- a/resources/lang/ta/admin/companies/table.php +++ b/resources/lang/ta/admin/companies/table.php @@ -1,9 +1,10 @@ 'நிறுவனங்கள்', 'create' => 'நிறுவனம் உருவாக்கவும்', 'title' => 'நிறுவனம்', 'update' => 'கம்பெனி புதுப்பிக்கவும்', 'name' => 'நிறுவனத்தின் பெயர்', 'id' => 'ஐடி', -); +]; diff --git a/resources/lang/ta/admin/components/general.php b/resources/lang/ta/admin/components/general.php index a398121fdc..5c672b6ad5 100644 --- a/resources/lang/ta/admin/components/general.php +++ b/resources/lang/ta/admin/components/general.php @@ -1,6 +1,6 @@ 'கூறு பெயர்', 'checkin' => 'செக்கோன் உபகரண', 'checkout' => 'புதுப்பிப்பு உபகரண', @@ -12,4 +12,4 @@ return array( 'remaining' => 'மீதமுள்ள', 'total' => 'மொத்த', 'update' => 'உபகரணத்தை புதுப்பிக்கவும்', -); +]; diff --git a/resources/lang/ta/admin/components/message.php b/resources/lang/ta/admin/components/message.php index 5c105450ee..04690b6278 100644 --- a/resources/lang/ta/admin/components/message.php +++ b/resources/lang/ta/admin/components/message.php @@ -1,36 +1,35 @@ 'கூறு இல்லை.', - 'create' => array( + 'create' => [ 'error' => 'கூறு உருவாக்கப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'கூறு வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'கூறு வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'கூறு புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'உபகரணமானது வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'உபகரணமானது வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'நிச்சயமாக இந்த உறுப்பு நீக்க வேண்டுமா?', 'error' => 'கூறு நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'கூறு வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'கூறு வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'உபகரணத்தை சோதிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'உபகரணமானது வெற்றிகரமாக சரிபார்க்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ), + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'உபகரணத்தை சோதிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'உபகரணமானது வெற்றிகரமாக சரிபார்க்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ) + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - -); +]; diff --git a/resources/lang/ta/admin/components/table.php b/resources/lang/ta/admin/components/table.php index 3a1ca5c873..4c016f470c 100644 --- a/resources/lang/ta/admin/components/table.php +++ b/resources/lang/ta/admin/components/table.php @@ -1,5 +1,5 @@ 'கூறு பெயர்', -); +]; diff --git a/resources/lang/ta/admin/consumables/general.php b/resources/lang/ta/admin/consumables/general.php index e134d0b918..fcc36fafa9 100644 --- a/resources/lang/ta/admin/consumables/general.php +++ b/resources/lang/ta/admin/consumables/general.php @@ -1,6 +1,6 @@ 'பயனர் நுகர்வோர் காசோலை', 'consumable_name' => 'நுகர்வோர் பெயர்', 'create' => 'நுகர்வோர் உருவாக்க', @@ -8,4 +8,4 @@ return array( 'remaining' => 'மீதமுள்ள', 'total' => 'மொத்த', 'update' => 'நுகர்வோர் புதுப்பிக்கவும்', -); +]; diff --git a/resources/lang/ta/admin/consumables/message.php b/resources/lang/ta/admin/consumables/message.php index 1ac3840a5b..c3901f0c64 100644 --- a/resources/lang/ta/admin/consumables/message.php +++ b/resources/lang/ta/admin/consumables/message.php @@ -1,36 +1,35 @@ 'நுகர்வோர் இல்லை.', - 'create' => array( + 'create' => [ 'error' => 'நுகர்வோர் உருவாக்கப்படவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'நுகர்வோர் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'நுகர்வோர் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'நுகர்வோர் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'நுகர்வோர் வெற்றிகரமாக மேம்படுத்தப்பட்டது.' - ), + 'success' => 'நுகர்வோர் வெற்றிகரமாக மேம்படுத்தப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'நீங்கள் இந்த நுகர்வு நீக்க விரும்புகிறீர்களா?', 'error' => 'நுகர்வு நீக்கம் ஒரு பிரச்சினை இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'நுகர்வோர் வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'நுகர்வோர் வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'நுகர்வோர் சரிபார்க்கப்படவில்லை, தயவு செய்து மீண்டும் முயற்சிக்கவும்', 'success' => 'நுகர்வோர் வெற்றிகரமாக சோதிக்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ), + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'நுகர்வோர் சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'நுகர்வோர் வெற்றிகரமாக சோதிக்கப்பட்டது.', - 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.' - ) + 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', + ], - -); +]; diff --git a/resources/lang/ta/admin/consumables/table.php b/resources/lang/ta/admin/consumables/table.php index 06a1cf008a..5cc2f6aefa 100644 --- a/resources/lang/ta/admin/consumables/table.php +++ b/resources/lang/ta/admin/consumables/table.php @@ -1,5 +1,5 @@ 'நுகர்வோர் பெயர்', -); +]; diff --git a/resources/lang/ta/admin/custom_fields/general.php b/resources/lang/ta/admin/custom_fields/general.php index 79f1b7658a..0f3469cf36 100644 --- a/resources/lang/ta/admin/custom_fields/general.php +++ b/resources/lang/ta/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'விருப்ப புலங்கள்', 'field' => 'களம்', 'about_fieldsets_title' => 'புலங்கள் பற்றி', @@ -29,4 +29,4 @@ return array( 'create_field' => 'புதிய தனிப்பயன் புலம்', 'value_encrypted' => 'இந்த புலத்தின் மதிப்பு தரவுத்தளத்தில் குறியாக்கம் செய்யப்பட்டுள்ளது. நிர்வாக பயனர்கள் மட்டுமே குறியாக்கப்பட்ட மதிப்புகளைக் காண முடியும்', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/ta/admin/custom_fields/message.php b/resources/lang/ta/admin/custom_fields/message.php index 940a31778b..0a48813863 100644 --- a/resources/lang/ta/admin/custom_fields/message.php +++ b/resources/lang/ta/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'அந்த புலம் இல்லை.', 'already_added' => 'புலம் ஏற்கனவே சேர்க்கப்பட்டது', - 'create' => array( + 'create' => [ 'error' => 'புலம் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', 'success' => 'புலம் வெற்றிகரமாக உருவாக்கப்பட்டது.', - 'assoc_success' => 'Fieldet க்கு புலம் வெற்றிகரமாக சேர்க்கப்பட்டது.' - ), + 'assoc_success' => 'Fieldet க்கு புலம் வெற்றிகரமாக சேர்க்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'புலம் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'புலம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'புலம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'நிச்சயமாக இந்த புலம் நீக்க வேண்டுமா?', 'error' => 'களத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'புலம் வெற்றிகரமாக நீக்கப்பட்டது.', 'in_use' => 'புலம் இன்னும் பயன்படுத்தப்படுகிறது.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'புலத்தில் இல்லை', - 'create' => array( + 'create' => [ 'error' => 'புலத்தை உருவாக்கவில்லை, தயவு செய்து மீண்டும் முயற்சி செய்க.', - 'success' => 'புலத்தில் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'புலத்தில் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'புலத்தை புதுப்பிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'புலத்தில் வெற்றிகரமாக மேம்படுத்தப்பட்டது.' - ), + 'success' => 'புலத்தில் வெற்றிகரமாக மேம்படுத்தப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த துறையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'களஞ்சியத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'Fieldset வெற்றிகரமாக நீக்கப்பட்டது.', 'in_use' => 'புலத்தில் இன்னும் பயன்படுத்தப்படுகிறது.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ta/admin/departments/message.php b/resources/lang/ta/admin/departments/message.php index 6c7970e0a6..2ab2a68835 100644 --- a/resources/lang/ta/admin/departments/message.php +++ b/resources/lang/ta/admin/departments/message.php @@ -1,21 +1,21 @@ 'துறை இல்லை.', 'assoc_users' => 'இந்தத் துறை தற்போது குறைந்தது ஒரு பயனருடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. தயவுசெய்து உங்கள் துறையை இனி இந்த துறையை குறிப்பிடாமல் புதுப்பிக்கவும் மற்றும் மீண்டும் முயற்சிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'துறை உருவாக்கப்பட்டது இல்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'துறை வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), - 'update' => array( + 'success' => 'துறை வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], + 'update' => [ 'error' => 'துறை புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'துறை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), - 'delete' => array( + 'success' => 'துறை வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], + 'delete' => [ 'confirm' => 'இந்தத் துறையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'திணைக்களம் நீக்கப்பட்ட ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'துறை வெற்றிகரமாக நீக்கப்பட்டது.' - ) + 'success' => 'துறை வெற்றிகரமாக நீக்கப்பட்டது.', + ], -); +]; diff --git a/resources/lang/ta/admin/departments/table.php b/resources/lang/ta/admin/departments/table.php index 9bb761aa3b..cb7257f3ef 100644 --- a/resources/lang/ta/admin/departments/table.php +++ b/resources/lang/ta/admin/departments/table.php @@ -1,6 +1,6 @@ 'ஐடி', 'name' => 'துறை பெயர்', @@ -8,4 +8,4 @@ return array( 'location' => 'இருப்பிடம்', 'create' => 'திணைக்களம் உருவாக்கவும்', 'update' => 'புதுப்பிப்பு துறை', - ); + ]; diff --git a/resources/lang/ta/admin/depreciations/general.php b/resources/lang/ta/admin/depreciations/general.php index 36cef27ac0..bbcc9bdd3e 100644 --- a/resources/lang/ta/admin/depreciations/general.php +++ b/resources/lang/ta/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'சொத்து துயரங்கள் பற்றி', 'about_depreciations' => 'நேராக வரி தேய்மானத்தை அடிப்படையாகக் கொண்ட சொத்துக்களை அடமானம் செய்வதற்கு சொத்து இழப்புகளை நீங்கள் அமைக்கலாம்.', 'asset_depreciations' => 'சொத்து குறைபாடுகள்', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'மாதங்களின் எண்ணிக்கை', 'update' => 'தேய்மானம் புதுப்பிக்கவும்', -); +]; diff --git a/resources/lang/ta/admin/depreciations/message.php b/resources/lang/ta/admin/depreciations/message.php index e9e712c45e..e51193f57f 100644 --- a/resources/lang/ta/admin/depreciations/message.php +++ b/resources/lang/ta/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'தேய்மானம் வகுப்பு இல்லை.', 'assoc_users' => 'இந்த தேய்மானம் ஒன்று ஒன்று அல்லது அதற்கு மேற்பட்ட மாதிரிகளுடன் தொடர்புடையது, மேலும் நீக்கப்பட முடியாது. மாதிரிகள் நீக்கி, மீண்டும் நீக்கி முயற்சிக்கவும்.', - - 'create' => array( + 'create' => [ 'error' => 'தேய்மானம் வகுப்பு உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும். :(', - 'success' => 'தேய்மானம் வகுப்பு வெற்றிகரமாக உருவாக்கப்பட்டது. :)' - ), + 'success' => 'தேய்மானம் வகுப்பு வெற்றிகரமாக உருவாக்கப்பட்டது. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'தேய்மானம் தரமதிப்பு புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'துடைக்கும் வர்க்கம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'துடைக்கும் வர்க்கம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த தேய்மானத் தரத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'தேய்மானம் வகுப்பை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'தேய்மானம் வகுப்பு வெற்றிகரமாக நீக்கப்பட்டது.' - ) + 'success' => 'தேய்மானம் வகுப்பு வெற்றிகரமாக நீக்கப்பட்டது.', + ], -); +]; diff --git a/resources/lang/ta/admin/depreciations/table.php b/resources/lang/ta/admin/depreciations/table.php index f9c3b089a1..b9fbf5d304 100644 --- a/resources/lang/ta/admin/depreciations/table.php +++ b/resources/lang/ta/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ஐடி', 'months' => 'மாதங்கள்', 'term' => 'கால', 'title' => 'பெயர்', -); +]; diff --git a/resources/lang/ta/admin/groups/message.php b/resources/lang/ta/admin/groups/message.php index 709bca3651..8b636ffab1 100644 --- a/resources/lang/ta/admin/groups/message.php +++ b/resources/lang/ta/admin/groups/message.php @@ -1,22 +1,22 @@ 'குழு ஏற்கனவே உள்ளது!', 'group_not_found' => 'குழு [: id] இல்லை.', 'group_name_required' => 'பெயர் புலம் தேவை', - 'success' => array( + 'success' => [ 'create' => 'குழு வெற்றிகரமாக உருவாக்கப்பட்டது.', 'update' => 'குழு வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', 'delete' => 'குழு வெற்றிகரமாக நீக்கப்பட்டது.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த குழுவையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'create' => 'குழுவை உருவாக்கும் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'update' => 'குழுவை புதுப்பிப்பதில் சிக்கல் ஏற்பட்டது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'delete' => 'குழுவை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - ), + ], -); +]; diff --git a/resources/lang/ta/admin/groups/table.php b/resources/lang/ta/admin/groups/table.php index 0b89c2f872..9c0ef47868 100644 --- a/resources/lang/ta/admin/groups/table.php +++ b/resources/lang/ta/admin/groups/table.php @@ -1,9 +1,9 @@ 'ஐடி', 'name' => 'பெயர்', 'users' => '# பயனர்கள்', -); +]; diff --git a/resources/lang/ta/admin/groups/titles.php b/resources/lang/ta/admin/groups/titles.php index 775116ba50..d251a7b17a 100644 --- a/resources/lang/ta/admin/groups/titles.php +++ b/resources/lang/ta/admin/groups/titles.php @@ -1,6 +1,6 @@ 'குழுக்கள் பற்றி', 'about_groups' => 'பயனர் அனுமதிகள் பொதுமைப்படுத்த குழுக்கள் பயன்படுத்தப்படுகின்றன.', 'group_management' => 'குழு மேலாண்மை', @@ -11,4 +11,4 @@ return array( 'allow' => 'அனுமதி', 'deny' => 'மறு', -); +]; diff --git a/resources/lang/ta/admin/hardware/form.php b/resources/lang/ta/admin/hardware/form.php index b7ac6ea9bf..0014cd0204 100644 --- a/resources/lang/ta/admin/hardware/form.php +++ b/resources/lang/ta/admin/hardware/form.php @@ -1,12 +1,12 @@ 'பெரும்பங்கு சொத்துக்களை நீக்குவதை உறுதிப்படுத்தவும்', +return [ + 'bulk_delete' => 'பெரும்பங்கு சொத்துக்களை நீக்குவதை உறுதிப்படுத்தவும்', 'bulk_delete_help' => 'கீழே மொத்த நீக்குவதற்கான சொத்துக்களை மதிப்பாய்வு செய்யவும். நீக்கப்பட்டவுடன், இந்த சொத்துகள் மீட்டமைக்கப்படலாம், ஆனால் அவை தற்போது எந்த பயனர்களையும் தற்போது ஒதுக்கப்படும்.', 'bulk_delete_warn' => 'நீங்கள் நீக்குவது: asset_count சொத்துகள்.', - 'bulk_update' => 'மொத்த புதுப்பித்தல் சொத்துகள்', - 'bulk_update_help' => 'இந்த படிவம் ஒரே நேரத்தில் பல சொத்துக்களை புதுப்பிக்க உதவுகிறது. நீங்கள் மாற்ற வேண்டிய துறைகள் மட்டுமே நிரப்பவும். காலியாக உள்ள எந்த புலமும் மாறாமல் இருக்கும்.', - 'bulk_update_warn' => 'சொத்துக்களின் திருத்தங்களை நீங்கள் திருத்திக் கொள்ள உள்ளீர்கள்: asset_count assets.', + 'bulk_update' => 'மொத்த புதுப்பித்தல் சொத்துகள்', + 'bulk_update_help' => 'இந்த படிவம் ஒரே நேரத்தில் பல சொத்துக்களை புதுப்பிக்க உதவுகிறது. நீங்கள் மாற்ற வேண்டிய துறைகள் மட்டுமே நிரப்பவும். காலியாக உள்ள எந்த புலமும் மாறாமல் இருக்கும்.', + 'bulk_update_warn' => 'சொத்துக்களின் திருத்தங்களை நீங்கள் திருத்திக் கொள்ள உள்ளீர்கள்: asset_count assets.', 'checkedout_to' => 'அவுட் சரிபார்க்கப்பட்டது', 'checkout_date' => 'புதுப்பிப்பு தேதி', 'checkin_date' => 'சரி தேதி', @@ -38,7 +38,6 @@ return array( 'tag' => 'சொத்து டேக்', 'update' => 'சொத்து புதுப்பிப்பு', 'warranty' => 'உத்தரவாதத்தை', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'ஆண்டுகள்', -) -; +]; diff --git a/resources/lang/ta/admin/hardware/general.php b/resources/lang/ta/admin/hardware/general.php index cc6a92af29..113c9ff190 100644 --- a/resources/lang/ta/admin/hardware/general.php +++ b/resources/lang/ta/admin/hardware/general.php @@ -1,9 +1,9 @@ 'சொத்துகள் பற்றி', 'about_assets_text' => 'சொத்துகள் வரிசை எண் அல்லது சொத்து குறிச்சொல் மூலம் கண்காணிக்கப்படும் உருப்படிகளாக இருக்கின்றன. ஒரு குறிப்பிட்ட உருப்படி விஷயங்களை அடையாளம் காண்பிக்கும் அதிக மதிப்புள்ள பொருட்களாக அவை இருக்கும்.', - 'archived' => 'காப்பகப்படுத்தியவை', + 'archived' => 'காப்பகப்படுத்தியவை', 'asset' => 'சொத்து', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'சரிபார்ப்பு சொத்து', @@ -19,4 +19,4 @@ return array( 'pending' => 'நிலுவையில்', 'undeployable' => 'Undeployable', 'view' => 'சொத்து காண்க', -); +]; diff --git a/resources/lang/ta/admin/hardware/message.php b/resources/lang/ta/admin/hardware/message.php index b20d58cde0..00de3417ba 100644 --- a/resources/lang/ta/admin/hardware/message.php +++ b/resources/lang/ta/admin/hardware/message.php @@ -1,82 +1,80 @@ ' எச்சரிக்கை: இந்த சொத்து தற்போது undeployable என குறிக்கப்பட்டுள்ளது. இந்த நிலை மாறியிருந்தால், சொத்து நிலையை புதுப்பிக்கவும்.', 'does_not_exist' => 'சொத்து இல்லை.', 'does_not_exist_or_not_requestable' => 'நல்ல முயற்சி. அந்த சொத்து இல்லை அல்லது கோரிக்கை இல்லை.', 'assoc_users' => 'இந்த சொத்து தற்போது ஒரு பயனர் வெளியே சோதிக்கப்பட்டது மற்றும் நீக்க முடியாது. முதலில் சொத்தை சரிபார்த்து, மீண்டும் நீக்கி முயற்சிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'சொத்து உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும். :(', - 'success' => 'சொத்து வெற்றிகரமாக உருவாக்கப்பட்டது. :)' - ), + 'success' => 'சொத்து வெற்றிகரமாக உருவாக்கப்பட்டது. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'சொத்து புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'சொத்து வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', 'nothing_updated' => 'எந்த துறைகளும் தேர்ந்தெடுக்கப்படவில்லை, அதனால் எதுவும் புதுப்பிக்கப்படவில்லை.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'சொத்து மீட்டமைக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'சொத்து வெற்றிகரமாக மீட்டமைக்கப்பட்டது.' - ), + 'success' => 'சொத்து வெற்றிகரமாக மீட்டமைக்கப்பட்டது.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'சொத்து தணிக்கை தோல்வியடைந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'சொத்து தணிக்கை வெற்றிகரமாக உள்நுழைந்தது.' - ), + 'success' => 'சொத்து தணிக்கை வெற்றிகரமாக உள்நுழைந்தது.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'கோப்பு நீக்கப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு வெற்றிகரமாக நீக்கப்பட்டது.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'கோப்பு (கள்) பதிவேற்றப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு (கள்) வெற்றிகரமாக பதிவேற்றப்பட்டது.', 'nofiles' => 'பதிவேற்றுவதற்கான எந்தவொரு கோப்பையும் நீங்கள் தேர்ந்தெடுக்கவில்லை அல்லது நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்பு மிகப்பெரியது', 'invalidfiles' => 'உங்கள் கோப்புகளில் ஒன்று அல்லது அதற்கு மேற்பட்டவை மிக அதிகமாக உள்ளது அல்லது அனுமதிக்கப்படாத கோப்பு வகை உள்ளது. அனுமதிக்கப்பட்ட கோப்புரிமைகள் png, gif, jpg, doc, docx, pdf மற்றும் txt ஆகியவை.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'சில உருப்படிகளை சரியாக இறக்குமதி செய்யவில்லை.', 'errorDetail' => 'பிழைகள் காரணமாக பின்வரும் உருப்படிகளை இறக்குமதி செய்யப்படவில்லை.', - 'success' => "உங்கள் கோப்பு இறக்குமதி செய்யப்பட்டது", - 'file_delete_success' => "உங்கள் கோப்பு வெற்றிகரமாக நீக்கப்பட்டது", - 'file_delete_error' => "கோப்பை நீக்க முடியவில்லை", - ), + 'success' => 'உங்கள் கோப்பு இறக்குமதி செய்யப்பட்டது', + 'file_delete_success' => 'உங்கள் கோப்பு வெற்றிகரமாக நீக்கப்பட்டது', + 'file_delete_error' => 'கோப்பை நீக்க முடியவில்லை', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த சொத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'சொத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'nothing_updated' => 'சொத்துகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை, எனவே எதுவும் நீக்கப்படவில்லை.', - 'success' => 'சொத்து வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'சொத்து வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'சொத்து சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'சொத்து வெற்றிகரமாக சரிபார்க்கப்பட்டது.', 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'not_available' => 'புதுப்பித்துக்காக அந்த சொத்து கிடைக்கவில்லை!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'சொத்து சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'சொத்து வெற்றிகரமாக சரிபார்க்கப்பட்டது.', 'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'already_checked_in' => 'அந்தச் சொத்து ஏற்கனவே சோதிக்கப்பட்டுள்ளது.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'சொத்து கோரப்படவில்லை, மீண்டும் முயற்சிக்கவும்', 'success' => 'சொத்து வெற்றிகரமாக கோரப்பட்டது.', - 'canceled' => 'புதுப்பித்து கோரிக்கை வெற்றிகரமாக ரத்துசெய்யப்பட்டது' - ) + 'canceled' => 'புதுப்பித்து கோரிக்கை வெற்றிகரமாக ரத்துசெய்யப்பட்டது', + ], -); +]; diff --git a/resources/lang/ta/admin/hardware/table.php b/resources/lang/ta/admin/hardware/table.php index dbf461e076..6316ef6767 100644 --- a/resources/lang/ta/admin/hardware/table.php +++ b/resources/lang/ta/admin/hardware/table.php @@ -1,6 +1,6 @@ 'சொத்து டேக்', 'asset_model' => 'மாதிரி', @@ -20,6 +20,6 @@ return array( 'title' => 'சொத்து', 'image' => 'சாதன படம்', 'days_without_acceptance' => 'ஏற்றுக்கொள்ளாத நாட்கள்', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/ta/admin/kits/general.php b/resources/lang/ta/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ta/admin/kits/general.php +++ b/resources/lang/ta/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ta/admin/licenses/form.php b/resources/lang/ta/admin/licenses/form.php index c46f919a60..8510174818 100644 --- a/resources/lang/ta/admin/licenses/form.php +++ b/resources/lang/ta/admin/licenses/form.php @@ -1,6 +1,6 @@ 'சொத்து', 'checkin' => 'புதுப்பிப்பது', @@ -18,5 +18,5 @@ return array( 'to_email' => 'மின்னஞ்சல் அனுமதிப்பத்திரம்', 'to_name' => 'பெயர் உரிமம் பெற்றது', 'update' => 'உரிமம் புதுப்பிக்கவும்', - 'checkout_help' => 'நீங்கள் ஒரு வன்பொருள் சொத்து அல்லது ஒரு நபருக்கு உரிமம் பெற வேண்டும். நீங்கள் இருவரும் தேர்ந்தெடுக்கலாம், ஆனால் சொத்து உரிமையாளர் நீங்கள் சொத்துக்களை சரிபார்க்கும் நபருடன் பொருந்த வேண்டும்.' -); + 'checkout_help' => 'நீங்கள் ஒரு வன்பொருள் சொத்து அல்லது ஒரு நபருக்கு உரிமம் பெற வேண்டும். நீங்கள் இருவரும் தேர்ந்தெடுக்கலாம், ஆனால் சொத்து உரிமையாளர் நீங்கள் சொத்துக்களை சரிபார்க்கும் நபருடன் பொருந்த வேண்டும்.', +]; diff --git a/resources/lang/ta/admin/licenses/general.php b/resources/lang/ta/admin/licenses/general.php index 078dc2c34d..a597be1676 100644 --- a/resources/lang/ta/admin/licenses/general.php +++ b/resources/lang/ta/admin/licenses/general.php @@ -1,6 +1,6 @@ 'உரிமங்கள் பற்றி', 'about_licenses' => 'மென்பொருள் கண்காணிக்க பயன்படுகிறது. தனிநபர்களிடம் சோதிக்கப்படக்கூடிய குறிப்பிட்ட எண்ணிக்கையிலான இடங்களை அவர்கள் கொண்டுள்ளனர்', 'checkin' => 'Checkin உரிமத்தின் இடம்', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'மென்பொருள் உரிமங்கள்', 'user' => 'பயனர்', 'view' => 'உரிமத்தைக் காட்டு', -); +]; diff --git a/resources/lang/ta/admin/licenses/message.php b/resources/lang/ta/admin/licenses/message.php index 15da44d283..89d0ca0780 100644 --- a/resources/lang/ta/admin/licenses/message.php +++ b/resources/lang/ta/admin/licenses/message.php @@ -1,6 +1,6 @@ 'உரிமம் இல்லை.', 'user_does_not_exist' => 'பயனர் இல்லை.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'நீங்கள் ஒரு சொத்து அல்லது ஒரு பயனர் தேர்ந்தெடுக்க வேண்டும், ஆனால் இருவரும் அல்ல.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'உரிமம் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உரிமம் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'உரிமம் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'கோப்பு நீக்கப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு வெற்றிகரமாக நீக்கப்பட்டது.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'கோப்பு (கள்) பதிவேற்றப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு (கள்) வெற்றிகரமாக பதிவேற்றப்பட்டது.', 'nofiles' => 'பதிவேற்றுவதற்கான எந்தவொரு கோப்பையும் நீங்கள் தேர்ந்தெடுக்கவில்லை அல்லது நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்பு மிகப்பெரியது', 'invalidfiles' => 'உங்கள் கோப்புகளில் ஒன்று அல்லது அதற்கு மேற்பட்டவை மிக அதிகமாக உள்ளது அல்லது அனுமதிக்கப்படாத கோப்பு வகை உள்ளது. அனுமதிக்கப்பட்ட கோப்புரிமைகள் png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, மற்றும் lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'உரிமம் புதுப்பிக்கப்படவில்லை, தயவு செய்து மீண்டும் முயற்சிக்கவும்', - 'success' => 'உரிமம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'உரிமம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த உரிமத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'உரிமத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உரிமம் வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'உரிமம் வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'உரிமத்தை சரிபார்க்க ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது' - ), + 'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'உரிமத்தில் சோதனை ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது' - ), + 'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது', + ], -); +]; diff --git a/resources/lang/ta/admin/licenses/table.php b/resources/lang/ta/admin/licenses/table.php index 01eaf15886..7b922670bd 100644 --- a/resources/lang/ta/admin/licenses/table.php +++ b/resources/lang/ta/admin/licenses/table.php @@ -1,6 +1,6 @@ 'ஒதுக்கப்படும்', 'checkout' => 'உள்ளே வெளியே', @@ -14,4 +14,4 @@ return array( 'serial' => 'சீரியல்', 'title' => 'உரிமம்', -); +]; diff --git a/resources/lang/ta/admin/locations/message.php b/resources/lang/ta/admin/locations/message.php index 6704c8ec67..c9b84f60d7 100644 --- a/resources/lang/ta/admin/locations/message.php +++ b/resources/lang/ta/admin/locations/message.php @@ -1,27 +1,26 @@ 'இருப்பிடம் இல்லை.', 'assoc_users' => 'தற்போது இந்த இடம் குறைந்தபட்சம் ஒரு பயனருடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. தயவுசெய்து இந்த இடத்தை இனி குறிப்பிடாமல் உங்கள் பயனர்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.', 'assoc_assets' => 'இந்த இடம் தற்போது குறைந்தது ஒரு சொத்துடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் உங்கள் சொத்துக்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.', 'assoc_child_loc' => 'இந்த இடம் தற்போது குறைந்தது ஒரு குழந்தையின் இருப்பிடத்தின் பெற்றோர் மற்றும் அதை நீக்க முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் இருக்க உங்கள் இருப்பிடங்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.', - - 'create' => array( + 'create' => [ 'error' => 'இருப்பிடம் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'இடம் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'இடம் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'இருப்பிடம் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'இருப்பிடம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'இருப்பிடம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த இருப்பிடத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'இருப்பிடத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'இடம் வெற்றிகரமாக நீக்கப்பட்டது.' - ) + 'success' => 'இடம் வெற்றிகரமாக நீக்கப்பட்டது.', + ], -); +]; diff --git a/resources/lang/ta/admin/locations/table.php b/resources/lang/ta/admin/locations/table.php index 24dbc7ccfa..431fef50f0 100644 --- a/resources/lang/ta/admin/locations/table.php +++ b/resources/lang/ta/admin/locations/table.php @@ -1,6 +1,6 @@ 'இடங்கள் பற்றி', 'about_locations' => 'பயனர்கள், சொத்துக்கள் மற்றும் பிற பொருட்களுக்கான இருப்பிட தகவலைக் கண்டறிய இடங்கள் பயன்படுத்தப்படுகின்றன', 'assets_rtd' => 'சொத்துக்கள்', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'பெற்றோர்', 'currency' => 'இருப்பிடம் நாணய', 'ldap_ou' => 'LDAP தேடல் OU', - ); + ]; diff --git a/resources/lang/ta/admin/manufacturers/message.php b/resources/lang/ta/admin/manufacturers/message.php index 9407c4f84e..f9383d5554 100644 --- a/resources/lang/ta/admin/manufacturers/message.php +++ b/resources/lang/ta/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'உற்பத்தியாளர் இல்லை.', 'assoc_users' => 'இந்த உற்பத்தியாளர் தற்போது குறைந்தது ஒரு மாதிரியுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த உற்பத்தியாளரை இனி குறிப்பிடுவதற்கு உங்கள் மாதிரியைப் புதுப்பிக்கவும் மீண்டும் முயற்சிக்கவும்.', - 'create' => array( + 'create' => [ 'error' => 'உற்பத்தியாளர் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'உற்பத்தியாளர் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த உற்பத்தியாளரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'தயாரிப்பாளரை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக நீக்கப்பட்டது.' - ) + 'success' => 'உற்பத்தியாளர் வெற்றிகரமாக நீக்கப்பட்டது.', + ], -); +]; diff --git a/resources/lang/ta/admin/manufacturers/table.php b/resources/lang/ta/admin/manufacturers/table.php index 700c409a2b..549268e36e 100644 --- a/resources/lang/ta/admin/manufacturers/table.php +++ b/resources/lang/ta/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'உற்பத்தியாளர்கள் பற்றி', 'about_manufacturers_text' => 'உற்பத்தியாளர்கள் உங்கள் சொத்துக்களை உருவாக்கும் நிறுவனங்கள். நீங்கள் இங்குள்ள முக்கியமான ஆதரவு தொடர்பு தகவலை இங்கே சேமித்து வைக்கலாம், இது உங்கள் சொத்து விவரம் பக்கங்களில் காண்பிக்கப்படும்.', 'asset_manufacturers' => 'சொத்து உற்பத்தியாளர்கள்', @@ -13,4 +13,4 @@ return array( 'update' => 'உற்பத்தியாளர் புதுப்பிக்கவும்', 'url' => 'URL ஐ', -); +]; diff --git a/resources/lang/ta/admin/models/general.php b/resources/lang/ta/admin/models/general.php index 2252736287..04bb24352f 100644 --- a/resources/lang/ta/admin/models/general.php +++ b/resources/lang/ta/admin/models/general.php @@ -1,6 +1,6 @@ 'சொத்து மாடல்களைப் பற்றி', 'about_models_text' => 'சொத்து மாதிரிகள் ஒரே மாதிரியான சொத்துக்களை குழுவாக மாற்றுகின்றன. "MBP 2013", "ஐபோன் 6s", முதலியன', 'deleted' => 'இந்த மாதிரி நீக்கப்பட்டது. அதை மீட்டமைக்க இங்கு கிளிக் செய்க. .', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'மாடலை மீட்டெடுக்கவும்', 'requestable' => 'பயனர்கள் இந்த மாதிரியைக் கோரலாம்', - 'show_mac_address' => 'இந்த மாடலில் சொத்துகளில் MAC முகவரியினைக் காட்டு', + 'show_mac_address' => 'இந்த மாடலில் சொத்துகளில் MAC முகவரியினைக் காட்டு', 'view_deleted' => 'காண்க நீக்கப்பட்டது', 'view_models' => 'மாதிரிகள் காண்க', 'fieldset' => 'fieldset', 'no_custom_field' => 'விருப்ப துறைகள் இல்லை', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/ta/admin/models/message.php b/resources/lang/ta/admin/models/message.php index f6dd2d4da1..b76fec8f25 100644 --- a/resources/lang/ta/admin/models/message.php +++ b/resources/lang/ta/admin/models/message.php @@ -1,42 +1,41 @@ 'மாதிரி இல்லை.', 'assoc_users' => 'தற்போது இந்த மாதிரி ஒன்று ஒன்று அல்லது அதற்கு மேற்பட்ட சொத்துக்களுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. சொத்துக்களை நீக்கிவிட்டு மீண்டும் நீக்குவதற்கு முயற்சிக்கவும்.', - - 'create' => array( + 'create' => [ 'error' => 'மாதிரி உருவாக்கப்பட்டது இல்லை, மீண்டும் முயற்சிக்கவும்.', 'success' => 'மாதிரி வெற்றிகரமாக உருவாக்கப்பட்டது.', 'duplicate_set' => 'அந்த பெயர், உற்பத்தியாளர் மற்றும் மாதிரி எண்ணுடன் ஏற்கனவே ஒரு சொத்து மாதிரி உள்ளது.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'மாதிரி புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'மாடல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'மாடல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த சொத்து மாடலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'மாதிரியை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'மாதிரி வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'மாதிரி வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'மாடல் மீட்டமைக்கப்படவில்லை, தயவு செய்து மீண்டும் முயற்சிக்கவும்', - 'success' => 'மாடல் வெற்றிகரமாக மீட்கப்பட்டது.' - ), + 'success' => 'மாடல் வெற்றிகரமாக மீட்கப்பட்டது.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'எந்த துறைகளும் மாற்றப்படவில்லை, அதனால் எதுவும் புதுப்பிக்கப்படவில்லை.', - 'success' => 'மாதிரிகள் புதுப்பிக்கப்பட்டன.' - ), + 'success' => 'மாதிரிகள் புதுப்பிக்கப்பட்டன.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/ta/admin/models/table.php b/resources/lang/ta/admin/models/table.php index 76047d239d..8e6a431009 100644 --- a/resources/lang/ta/admin/models/table.php +++ b/resources/lang/ta/admin/models/table.php @@ -1,6 +1,6 @@ 'சொத்து மாதிரி உருவாக்கவும்', 'created_at' => 'இல் உருவாக்கப்பட்டது', @@ -14,4 +14,4 @@ return array( 'update' => 'சொத்து மாதிரியை புதுப்பி', 'clone' => 'குளோன் மாதிரி', 'edit' => 'மாதிரி திருத்தவும்', -); +]; diff --git a/resources/lang/ta/admin/reports/general.php b/resources/lang/ta/admin/reports/general.php index 9846f3bbb8..1777c6cf11 100644 --- a/resources/lang/ta/admin/reports/general.php +++ b/resources/lang/ta/admin/reports/general.php @@ -1,5 +1,5 @@ 'உங்கள் சொத்து அறிக்கையில் நீங்கள் விரும்பும் விருப்பங்களைத் தேர்ந்தெடுக்கவும்.' -); +return [ + 'info' => 'உங்கள் சொத்து அறிக்கையில் நீங்கள் விரும்பும் விருப்பங்களைத் தேர்ந்தெடுக்கவும்.', +]; diff --git a/resources/lang/ta/admin/reports/message.php b/resources/lang/ta/admin/reports/message.php index 64ea8dbb67..fccbeb1b8e 100644 --- a/resources/lang/ta/admin/reports/message.php +++ b/resources/lang/ta/admin/reports/message.php @@ -1,5 +1,5 @@ 'நீங்கள் குறைந்தது ஒரு விருப்பத்தை தேர்ந்தெடுக்க வேண்டும்.' -); +return [ + 'error' => 'நீங்கள் குறைந்தது ஒரு விருப்பத்தை தேர்ந்தெடுக்க வேண்டும்.', +]; diff --git a/resources/lang/ta/admin/settings/general.php b/resources/lang/ta/admin/settings/general.php index 056ed7395d..df53b34005 100644 --- a/resources/lang/ta/admin/settings/general.php +++ b/resources/lang/ta/admin/settings/general.php @@ -1,12 +1,12 @@ 'செயலில் உள்ள அடைவு', 'ad_domain' => 'Active Directory டொமைன்', 'ad_domain_help' => 'இது சில நேரங்களில் உங்கள் மின்னஞ்சல் டொமைன் போலவே இருக்கும், ஆனால் எப்போதும் இல்லை.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'இது ஒரு Active Directory சேவையகம்', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'அலாரங்கள் முற்றுப்பெறல் (நாட்களில்)', 'alert_inv_threshold' => 'சரக்கு அலர்ட் த்ரொல்ஹோல்', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'சொத்து ID கள்', 'audit_interval' => 'ஆடிட் இடைவேளை', 'audit_interval_help' => 'நீங்கள் வழக்கமாக உங்கள் சொத்துக்களைத் தணிக்கை செய்ய வேண்டும் என்றால், மாதங்களில் இடைவெளியை உள்ளிடவும்.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'இரு காரணி குறியீடு உள்ளிடவும்', 'two_factor_config_complete' => 'கோட் சமர்ப்பிக்கவும்', 'two_factor_enabled_edit_not_allowed' => 'இந்த அமைப்பைத் திருத்த உங்கள் நிர்வாகி அனுமதிக்கவில்லை.', - 'two_factor_enrollment_text' => "இரண்டு காரணி அங்கீகாரம் தேவைப்படுகிறது, ஆனால் உங்கள் சாதனம் இதுவரை பதிவுசெய்யப்படவில்லை. உங்கள் Google Authenticator பயன்பாட்டைத் திறந்து உங்கள் சாதனத்தை சேர்ப்பதற்கு கீழே உள்ள QR குறியீட்டை ஸ்கேன் செய்யவும். உங்கள் சாதனத்தை நீங்கள் சேர்ந்தவுடன், கீழே உள்ள குறியீட்டை உள்ளிடுக", + 'two_factor_enrollment_text' => 'இரண்டு காரணி அங்கீகாரம் தேவைப்படுகிறது, ஆனால் உங்கள் சாதனம் இதுவரை பதிவுசெய்யப்படவில்லை. உங்கள் Google Authenticator பயன்பாட்டைத் திறந்து உங்கள் சாதனத்தை சேர்ப்பதற்கு கீழே உள்ள QR குறியீட்டை ஸ்கேன் செய்யவும். உங்கள் சாதனத்தை நீங்கள் சேர்ந்தவுடன், கீழே உள்ள குறியீட்டை உள்ளிடுக', 'require_accept_signature' => 'கையொப்பம் தேவை', 'require_accept_signature_help_text' => 'இந்த அம்சத்தை இயக்குவதால், சொத்துக்களை ஏற்கும் வகையில் பயனர்கள் உடனே உள்நுழைய வேண்டும்.', 'left' => 'விட்டு', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'சொரெஃபைல் உள்ளிட்ட சொத்தின் குறிச்சொற்களை நீளம்', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ta/admin/settings/message.php b/resources/lang/ta/admin/settings/message.php index 24f2f62340..bb9675dda5 100644 --- a/resources/lang/ta/admin/settings/message.php +++ b/resources/lang/ta/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'புதுப்பித்தல் போது ஒரு பிழை ஏற்பட்டது.', - 'success' => 'அமைப்புகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன.' - ), - 'backup' => array( + 'success' => 'அமைப்புகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன.', + ], + 'backup' => [ 'delete_confirm' => 'இந்த காப்புப் பிரதி கோப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா? இந்த செயலைச் செயல்தவிர்க்க முடியாது.', 'file_deleted' => 'காப்புப்பதிவு வெற்றிகரமாக நீக்கப்பட்டது.', 'generated' => 'ஒரு புதிய காப்புப்பதிவு வெற்றிகரமாக உருவாக்கப்பட்டது.', 'file_not_found' => 'அந்த காப்புப் பிரதி சர்வரில் கண்டுபிடிக்க முடியவில்லை.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'அகற்றும் போது பிழை ஏற்பட்டது.', 'validation_failed' => 'உங்கள் தூய்மைப்படுத்தல் உறுதிப்படுத்தல் தவறானது. உறுதிப்படுத்தல் பெட்டியில் "DELETE" என்ற வார்த்தையை தயவுசெய்து தட்டச்சு செய்யவும்.', - 'success' => 'நீக்கப்பட்ட பதிவுகள் வெற்றிகரமாக நீக்கப்பட்டன.' - ), + 'success' => 'நீக்கப்பட்ட பதிவுகள் வெற்றிகரமாக நீக்கப்பட்டன.', + ], -); +]; diff --git a/resources/lang/ta/admin/statuslabels/message.php b/resources/lang/ta/admin/statuslabels/message.php index c3bf161897..6d8484c1f3 100644 --- a/resources/lang/ta/admin/statuslabels/message.php +++ b/resources/lang/ta/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'நிலை லேபிள் இல்லை.', 'assoc_assets' => 'இந்த தகுதி லேபிள் தற்போது குறைந்தது ஒரு சொத்துடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. தயவு செய்து உங்கள் சொத்துக்களை இனி இந்த நிலையை குறிப்பிடாமல் புதுப்பிக்கவும்.', - - 'create' => array( + 'create' => [ 'error' => 'நிலை லேபிள் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'நிலை லேபிள் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'நிலை லேபிள் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'நிலைவட்டு லேபிள் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'தகுதி லேபிள் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'தகுதி லேபிள் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த நிலைப்பட்டியலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'நிலை லேபிள் நீக்கப்பட்ட ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', - 'success' => 'தகுதி லேபிள் வெற்றிகரமாக நீக்கப்பட்டது.' - ), + 'success' => 'தகுதி லேபிள் வெற்றிகரமாக நீக்கப்பட்டது.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'இந்த சொத்துக்களை யாருக்கும் ஒதுக்க முடியாது.', 'deployable' => 'இந்த சொத்துகள் சோதிக்கப்படலாம். அவர்கள் நியமிக்கப்பட்டவுடன், அவர்கள் Deployed என்ற மெட்டா நிலைப்பாட்டை எடுப்பார்கள்.', 'archived' => 'இந்த சொத்துகள் சரிபார்க்கப்படாது, மேலும் காப்பகப்படுத்தப்பட்ட காட்சியில் மட்டுமே காண்பிக்கப்படும். இது வரவு செலவுத் திட்டத்திற்கான / வரலாற்று நோக்கங்களுக்காக சொத்துக்களைப் பற்றிய தகவலைத் தக்கவைத்துக்கொள்வதற்கும், தினசரி சொத்து பட்டியலில் இருந்து அவற்றைப் பாதுகாப்பதற்கும் பயனுள்ளதாக இருக்கும்.', 'pending' => 'இந்த சொத்துக்கள் இன்னும் யாருக்கும் ஒதுக்கப்பட முடியாது, பெரும்பாலும் பழுதுக்காக வெளியேற்றப்பட்ட பொருட்களுக்குப் பயன்படுத்தப்படுகின்றன, ஆனால் புழக்கத்திற்கு திரும்ப எதிர்பார்க்கப்படுகிறது.', - ), + ], -); +]; diff --git a/resources/lang/ta/admin/statuslabels/table.php b/resources/lang/ta/admin/statuslabels/table.php index cf2a70dd86..ae41b69a3c 100644 --- a/resources/lang/ta/admin/statuslabels/table.php +++ b/resources/lang/ta/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'தகுதி லேபிள்களைப் பற்றி', 'archived' => 'காப்பகப்படுத்தியவை', 'create' => 'நிலை லேபிள் உருவாக்கவும்', @@ -16,4 +16,4 @@ return array( 'title' => 'நிலை லேபிள்கள்', 'undeployable' => 'Undeployable', 'update' => 'Status Label ஐப் புதுப்பிக்கவும்', -); +]; diff --git a/resources/lang/ta/admin/suppliers/message.php b/resources/lang/ta/admin/suppliers/message.php index ddbc83b463..046fc7faaa 100644 --- a/resources/lang/ta/admin/suppliers/message.php +++ b/resources/lang/ta/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'சப்ளையர் இல்லை.', - - 'create' => array( + 'create' => [ 'error' => 'சப்ளையர் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.', - 'success' => 'சப்ளையர் வெற்றிகரமாக உருவாக்கப்பட்டது.' - ), + 'success' => 'சப்ளையர் வெற்றிகரமாக உருவாக்கப்பட்டது.', + ], - 'update' => array( + 'update' => [ 'error' => 'சப்ளையர் புதுப்பிக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்', - 'success' => 'சப்ளையர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.' - ), + 'success' => 'சப்ளையர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'இந்த சப்ளையரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?', 'error' => 'சப்ளையரை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'சப்ளையர் வெற்றிகரமாக நீக்கப்பட்டது.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ta/admin/suppliers/table.php b/resources/lang/ta/admin/suppliers/table.php index 8f486be68a..45c8e40772 100644 --- a/resources/lang/ta/admin/suppliers/table.php +++ b/resources/lang/ta/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'சப்ளையர்கள் பற்றி', 'about_suppliers_text' => 'சப்ளையர்கள் உருப்படிகளின் மூலத்தைக் கண்டறிய பயன்படுகிறது', 'address' => 'சப்ளையர் முகவரி', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'சொத்துகளுக்கான பார்வை', 'zip' => 'அஞ்சல் குறியீடு', -); +]; diff --git a/resources/lang/ta/admin/users/general.php b/resources/lang/ta/admin/users/general.php index e0ea9f8f7b..c0529fb150 100644 --- a/resources/lang/ta/admin/users/general.php +++ b/resources/lang/ta/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'பெயரிடப்பட்ட சொத்துகள்: பெயர்', @@ -13,7 +12,7 @@ return array( 'edit' => 'பயனர் திருத்து', 'filetype_info' => 'அனுமதிக்கப்பட்ட கோப்புரிமைகள் png, gif, jpg, jpeg, doc, docx, pdf, txt, zip மற்றும் rar ஆகியவை.', 'history_user' => 'வரலாறு: பெயர்', - 'info' => 'தகவல்', + 'info' => 'தகவல்', 'restore_user' => 'அவற்றை மீட்டெடுக்க இங்கு கிளிக் செய்க.', 'last_login' => 'கடைசி தேதி', 'ldap_config_text' => 'LDAP உள்ளமைவு அமைப்புகள் நிர்வாகம்> அமைப்புகள். இறக்குமதி செய்யப்பட்ட அனைத்து பயனர்களுக்கும் (விரும்பினால்) தேர்ந்தெடுக்கப்பட்ட இடம் அமைக்கப்படும்.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'உங்கள் தற்போதைய நிர்வாக அமைப்புகள் இரண்டு காரணி அங்கீகரிப்பின் தேர்ந்தெடுக்கப்பட்ட செயல்பாட்டை அனுமதிக்கின்றன.', 'two_factor_enrolled' => '2FA சாதனம் பதிவுசெய்யப்பட்டது', 'two_factor_active' => '2FA செயலில்', - ); + ]; diff --git a/resources/lang/ta/admin/users/message.php b/resources/lang/ta/admin/users/message.php index 597d86bc05..6014203850 100644 --- a/resources/lang/ta/admin/users/message.php +++ b/resources/lang/ta/admin/users/message.php @@ -1,6 +1,6 @@ 'இந்த சொத்தை வெற்றிகரமாக ஏற்றுக்கொண்டீர்கள்.', 'declined' => 'இந்த சொத்து வெற்றிகரமாக நிராகரித்தது.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'இந்த நிறுவலுக்கு LDAP ஒருங்கிணைப்பு கட்டமைக்கப்படவில்லை.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'பயனர் வெற்றிகரமாக உருவாக்கப்பட்டது.', 'update' => 'பயனர் வெற்றிகரமாக மேம்படுத்தப்பட்டது.', 'update_bulk' => 'பயனர்கள் வெற்றிகரமாக மேம்படுத்தப்பட்டன!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'பயனர் வெற்றிகரமாக தடுக்கப்படவில்லை.', 'restored' => 'பயனர் வெற்றிகரமாக மீட்டமைக்கப்பட்டார்.', 'import' => 'பயனர்கள் வெற்றிகரமாக இறக்குமதி செய்தனர்.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'பயனர் உருவாக்கும் சிக்கல் ஏற்பட்டது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'update' => 'பயனரைப் புதுப்பிப்பதில் சிக்கல் ஏற்பட்டது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'delete' => 'பயனரை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAP சேவையகத்தை தேட முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும்.
LDAP சேவையகத்திலிருந்து பிழை:', 'ldap_could_not_get_entries' => 'LDAP சேவையகத்திலிருந்து உள்ளீடுகளை பெற முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும்.
LDAP சேவையகத்திலிருந்து பிழை:', 'password_ldap' => 'இந்த கணக்கிற்கான கடவுச்சொல் LDAP / Active Directory மூலம் நிர்வகிக்கப்படுகிறது. உங்கள் கடவுச்சொல்லை மாற்ற உங்கள் IT பிரிவை தொடர்பு கொள்ளவும்.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'கோப்பு நீக்கப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு வெற்றிகரமாக நீக்கப்பட்டது.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'கோப்பு (கள்) பதிவேற்றப்படவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'கோப்பு (கள்) வெற்றிகரமாக பதிவேற்றப்பட்டது.', 'nofiles' => 'பதிவேற்றுவதற்கான எந்தவொரு கோப்பையும் நீங்கள் தேர்ந்தெடுக்கவில்லை', 'invalidfiles' => 'உங்கள் கோப்புகளில் ஒன்று அல்லது அதற்கு மேற்பட்டவை மிக அதிகமாக உள்ளது அல்லது அனுமதிக்கப்படாத கோப்பு வகை உள்ளது. அனுமதிக்கப்பட்ட கோப்புரிமைகள் png, gif, jpg, doc, docx, pdf மற்றும் txt ஆகியவை.', - ), + ], -); +]; diff --git a/resources/lang/ta/admin/users/table.php b/resources/lang/ta/admin/users/table.php index f7ca235e26..4f01e8ff23 100644 --- a/resources/lang/ta/admin/users/table.php +++ b/resources/lang/ta/admin/users/table.php @@ -1,6 +1,6 @@ 'செயலில்', 'allow' => 'அனுமதி', 'checkedout' => 'சொத்துக்கள்', @@ -28,11 +28,11 @@ return array( 'show_current' => 'தற்போதைய பயனர்களைக் காட்டு', 'show_deleted' => 'நீக்கப்பட்ட பயனர்களைக் காண்பி', 'title' => 'தலைப்பு', - 'to_restore_them' => 'அவற்றை மீட்டெடுக்க', + 'to_restore_them' => 'அவற்றை மீட்டெடுக்க', 'updateuser' => 'பயனர் புதுப்பிக்கவும்', 'username' => 'பயனர்பெயர்', - 'user_deleted_text' => 'இந்த பயனர் நீக்கப்பட்டதாக குறிக்கப்பட்டுள்ளது.', + 'user_deleted_text' => 'இந்த பயனர் நீக்கப்பட்டதாக குறிக்கப்பட்டுள்ளது.', 'username_note' => '(இது உள்நுழைவுக்காக அல்ல, செயலில் உள்ள டைரக்டரிக்கு மட்டுமே பயன்படுத்தப்படுகிறது.)', 'cloneuser' => 'குளோன் பயனர்', 'viewusers' => 'பயனர்களைக் காண்க', -); +]; diff --git a/resources/lang/ta/auth/general.php b/resources/lang/ta/auth/general.php index 71e3b34f9b..162522c964 100644 --- a/resources/lang/ta/auth/general.php +++ b/resources/lang/ta/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ta/auth/message.php b/resources/lang/ta/auth/message.php index 56907b1ace..9402a56a26 100644 --- a/resources/lang/ta/auth/message.php +++ b/resources/lang/ta/auth/message.php @@ -1,6 +1,6 @@ 'இந்த மின்னஞ்சலுடன் ஒரு கணக்கு ஏற்கனவே உள்ளது.', 'account_not_found' => 'பயனர் பெயர் அல்லது கடவுச்சொல் தவறானது.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'இந்த பயனர் கணக்கு தடைசெய்யப்பட்டுள்ளது.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'உங்களை உள்நுழைய முயற்சிக்கும்போது சிக்கல் ஏற்பட்டது, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.', 'success' => 'வெற்றிகரமாக உள்நுழைந்துள்ளீர்கள்.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'உங்கள் கணக்கை உருவாக்க முயற்சிக்கும்போது ஒரு சிக்கல் ஏற்பட்டது, மீண்டும் முயற்சிக்கவும்.', 'success' => 'கணக்கு வெற்றிகரமாக உருவாக்கப்பட்டது.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'மீட்டமை கடவுச்சொல் குறியீட்டை பெற முயற்சிக்கும் போது சிக்கல் ஏற்பட்டது, மீண்டும் முயற்சிக்கவும்.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க முயற்சிக்கும் போது ஒரு சிக்கல் ஏற்பட்டது, மீண்டும் முயற்சிக்கவும்.', 'success' => 'உங்கள் கடவுச்சொல் வெற்றிகரமாக மீட்டமைக்கப்பட்டது.', - ), + ], - -); +]; diff --git a/resources/lang/ta/button.php b/resources/lang/ta/button.php index 5018a21ea1..3fa9e62be4 100644 --- a/resources/lang/ta/button.php +++ b/resources/lang/ta/button.php @@ -1,6 +1,6 @@ 'செயல்கள்', 'add' => 'புதிதாக சேர்க்கவும்', 'cancel' => 'ரத்து', @@ -11,7 +11,7 @@ return array( 'request' => 'வேண்டுகோள்', 'submit' => 'சமர்ப்பி', 'upload' => 'பதிவேற்றம்', - 'select_file' => 'கோப்பு தேர்ந்தெடு ...', + 'select_file' => 'கோப்பு தேர்ந்தெடு ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php index 03936f0f54..092446f6f0 100644 --- a/resources/lang/ta/general.php +++ b/resources/lang/ta/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'வேண்டுகோள்', 'city' => 'பெருநகரம்', - 'click_here' => 'இங்கே கிளிக் செய்யவும்', + 'click_here' => 'இங்கே கிளிக் செய்யவும்', 'clear_selection' => 'Clear Selection', 'companies' => 'நிறுவனங்கள்', 'company' => 'நிறுவனம்', 'component' => 'உபகரண', 'components' => 'கூறுகள்', - 'complete' => 'முழுமையான', + 'complete' => 'முழுமையான', 'consumable' => 'பயன்படுத்தக்கூடிய', 'consumables' => 'நுகர்பொருள்கள்', 'country' => 'நாடு', diff --git a/resources/lang/ta/help.php b/resources/lang/ta/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ta/help.php +++ b/resources/lang/ta/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ta/mail.php b/resources/lang/ta/mail.php index 76156f656d..629d8c777c 100644 --- a/resources/lang/ta/mail.php +++ b/resources/lang/ta/mail.php @@ -1,6 +1,6 @@ 'வலைத்தளத்தில் பயனர் ஒரு உருப்படி கோரிக்கையை ரத்து செய்துள்ளார்', 'a_user_requested' => 'வலைத்தளத்தில் பயனர் ஒரு உருப்படியைக் கோரியுள்ளார்', 'accessory_name' => 'துணை பெயர்:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ta/pagination.php b/resources/lang/ta/pagination.php index 7ed9bb2e9e..caa935f6f1 100644 --- a/resources/lang/ta/pagination.php +++ b/resources/lang/ta/pagination.php @@ -1,6 +1,6 @@ 'அடுத்த »', -); +]; diff --git a/resources/lang/ta/passwords.php b/resources/lang/ta/passwords.php index 5e69ba81af..44cace1bff 100644 --- a/resources/lang/ta/passwords.php +++ b/resources/lang/ta/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'உங்கள் கடவுச்சொல் இணைப்பு அனுப்பப்பட்டது!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/ta/reminders.php b/resources/lang/ta/reminders.php index 381fc13cf2..5bb21b20b1 100644 --- a/resources/lang/ta/reminders.php +++ b/resources/lang/ta/reminders.php @@ -1,6 +1,6 @@ "கடவுச்சொற்கள் ஆறு எழுத்துகள் இருக்க வேண்டும் மற்றும் உறுதிப்படுத்தல் பொருத்த வேண்டும்.", + 'password' => 'கடவுச்சொற்கள் ஆறு எழுத்துகள் இருக்க வேண்டும் மற்றும் உறுதிப்படுத்தல் பொருத்த வேண்டும்.', - "user" => "பயனர்பெயர் அல்லது மின்னஞ்சல் முகவரி தவறானது", + 'user' => 'பயனர்பெயர் அல்லது மின்னஞ்சல் முகவரி தவறானது', - "token" => "இந்த கடவுச்சொல் மீட்டமை டோக்கன் தவறானது.", + 'token' => 'இந்த கடவுச்சொல் மீட்டமை டோக்கன் தவறானது.', - "sent" => "பொருத்தமான மின்னஞ்சல் முகவரி இருந்தால், கடவுச்சொல் நினைவூட்டல் அனுப்பப்பட்டது!", + 'sent' => 'பொருத்தமான மின்னஞ்சல் முகவரி இருந்தால், கடவுச்சொல் நினைவூட்டல் அனுப்பப்பட்டது!', -); +]; diff --git a/resources/lang/ta/table.php b/resources/lang/ta/table.php index 3407744552..c000c32002 100644 --- a/resources/lang/ta/table.php +++ b/resources/lang/ta/table.php @@ -1,10 +1,10 @@ 'செயல்கள்', 'action' => 'அதிரடி', 'by' => 'மூலம்', 'item' => 'பொருள்', -); +]; diff --git a/resources/lang/ta/validation.php b/resources/lang/ta/validation.php index 75d3c50186..1399ed62ca 100644 --- a/resources/lang/ta/validation.php +++ b/resources/lang/ta/validation.php @@ -1,6 +1,6 @@ ': பண்பு ஏற்கனவே ஏற்கப்பட்டுள்ளது.', 'uploaded' => ': பண்புக்கூறு பதிவேற்றத் தவறியது.', 'url' => 'பண்புக்கூறு வடிவமைப்பு தவறானது.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "பண்புக்கூறு துறையில் அனுமதிக்கப்படாத ஒரு பாத்திரம் உள்ளது.", - "email_array" => "ஒன்று அல்லது அதற்கு மேற்பட்ட மின்னஞ்சல் முகவரிகள் தவறானவை.", - "hashed_pass" => "உங்கள் தற்போதைய கடவுச்சொல் தவறானது", + 'alpha_space' => 'பண்புக்கூறு துறையில் அனுமதிக்கப்படாத ஒரு பாத்திரம் உள்ளது.', + 'email_array' => 'ஒன்று அல்லது அதற்கு மேற்பட்ட மின்னஞ்சல் முகவரிகள் தவறானவை.', + 'hashed_pass' => 'உங்கள் தற்போதைய கடவுச்சொல் தவறானது', 'dumbpwd' => 'அந்த கடவுச்சொல் மிகவும் பொதுவானது.', - "statuslabel_type" => "செல்லுபடியாகும் நிலை லேபிள் வகை தேர்ந்தெடுக்க வேண்டும்", + 'statuslabel_type' => 'செல்லுபடியாகும் நிலை லேபிள் வகை தேர்ந்தெடுக்க வேண்டும்', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/th/admin/accessories/general.php b/resources/lang/th/admin/accessories/general.php index f347748b4d..75d2806051 100644 --- a/resources/lang/th/admin/accessories/general.php +++ b/resources/lang/th/admin/accessories/general.php @@ -1,6 +1,6 @@ 'หมวดหมู่อุปกรณ์เสริม', 'accessory_name' => 'ชื่ออุปกรณ์เสริม', 'checkout' => 'เชคเอาท์อุปกรณ์เสริม', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'ใช้เป็นข้อกำหนดการใช้งานหลักแทน', 'use_default_eula_disabled' => 'ใช้ข้อกำหนดการใช้งานหลักแทน ค่าเริ่มต้นหลักจะตั้งข้อกำหนดการใช้งาน กรุณาเพิ่มในการตั้งค่า', -); +]; diff --git a/resources/lang/th/admin/accessories/message.php b/resources/lang/th/admin/accessories/message.php index f94571f673..7f69015ddf 100644 --- a/resources/lang/th/admin/accessories/message.php +++ b/resources/lang/th/admin/accessories/message.php @@ -1,37 +1,36 @@ '[;id] อุปกรณ์เสริม ไม่มีอยู่', 'assoc_users' => 'อุปกรณ์เสริมนี้ได้เช็คเอ้าท์ให้ผู้ใช้งานแล้วจำนวน :count รายการในปัจจุบัน กรุณาเช็คอินอุปกรณ์เสริม และลองอีกครั้ง ', - 'create' => array( + 'create' => [ 'error' => 'อุปกรณ์เสริมยังไม่ได้ถูกสร้าง กรุณาลองใหม่อีกครั้ง', - 'success' => 'อุปกรณ์เสริมได้ถูกสร้างเรียบร้อยแล้ว' - ), + 'success' => 'อุปกรณ์เสริมได้ถูกสร้างเรียบร้อยแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้แก้ไขอุปกรณ์เสริม กรุณาลองใหม่', - 'success' => 'แก้ไขอุปกรณ์เสริมสำเร็จ' - ), + 'success' => 'แก้ไขอุปกรณ์เสริมสำเร็จ', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบอุปกรณ์เสริมนี้?', 'error' => 'มีปัญหาขณะลบอุปกรณ์เสริมนี้ กรุณาลองอีกครั้ง.', - 'success' => 'ลบอุปกรณ์เสริมเรียบร้อยแล้ว' - ), + 'success' => 'ลบอุปกรณ์เสริมเรียบร้อยแล้ว', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'อุปกรณ์เสริมยังไม่ถูกเช็คเอ้าท์ กรุณาลองอีกครั้ง', 'success' => 'อุปกรณ์เสริมเช็คเอ้าท์เรียบร้อยแล้ว', - 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง' - ), + 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'อุปกรณ์เสริมยังไม่ถูกเช็คอิน กรุณาลองอีกครั้ง', 'success' => 'อุปกรณ์เสริมเช็คอินเรียบร้อยแล้ว.', - 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.' - ) + 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.', + ], - -); +]; diff --git a/resources/lang/th/admin/accessories/table.php b/resources/lang/th/admin/accessories/table.php index 28de60b54c..355b5c5653 100644 --- a/resources/lang/th/admin/accessories/table.php +++ b/resources/lang/th/admin/accessories/table.php @@ -1,11 +1,10 @@ 'ดาวน์โหลด CSV', - 'eula_text' => 'ข้อกำหนดการใช้งาน', +return [ + 'dl_csv' => 'ดาวน์โหลด CSV', + 'eula_text' => 'ข้อกำหนดการใช้งาน', 'id' => 'ไอดี', 'require_acceptance' => 'การยอมรับ', 'title' => 'ชื่ออุปกรณ์เสริม', - -); +]; diff --git a/resources/lang/th/admin/asset_maintenances/form.php b/resources/lang/th/admin/asset_maintenances/form.php index 1f896fc47a..08c0b940d1 100644 --- a/resources/lang/th/admin/asset_maintenances/form.php +++ b/resources/lang/th/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'ระยะเวลาการซ่อมบำรุงสินทรัพย์ (หน่วยเป็น วัน)', 'notes' => 'หมายเหตุ', 'update' => 'แก้ไขการซ่อมบำรุงสินทรัพย์', - 'create' => 'สร้างการซ่อมบำรุงสินทรัพย์' + 'create' => 'สร้างการซ่อมบำรุงสินทรัพย์', ]; diff --git a/resources/lang/th/admin/asset_maintenances/message.php b/resources/lang/th/admin/asset_maintenances/message.php index 862235e481..49b7a05aaf 100644 --- a/resources/lang/th/admin/asset_maintenances/message.php +++ b/resources/lang/th/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'คุณต้องการที่จะลบการซ่อมบำรุงสินทรัพย์นี้?', 'error' => 'มีปัญหาระหว่างการลบการซ่อมบำรุงสินทรัพย์ กรุณาลองอีกครั้ง', - 'success' => 'การซ่อมบำรุงสินทรัพย์ถูกลบเรียบร้อยแล้ว' + 'success' => 'การซ่อมบำรุงสินทรัพย์ถูกลบเรียบร้อยแล้ว', ], 'create' => [ 'error' => 'การซ่อมบำรุงสินทรัพย์ยังไม่ถูกสร้าง กรุณาลองอีกครั้ง', - 'success' => 'สร้างการซ่อมบำรุงสินทรัพย์เรียบร้อยแล้ว' + 'success' => 'สร้างการซ่อมบำรุงสินทรัพย์เรียบร้อยแล้ว', ], 'edit' => [ 'error' => 'ไม่ได้แก้ไขการบำรุงรักษาสินทรัพย์โปรดลองอีกครั้ง', - 'success' => 'การบำรุงรักษาสินทรัพย์เสร็จเรียบร้อยแล้ว' + 'success' => 'การบำรุงรักษาสินทรัพย์เสร็จเรียบร้อยแล้ว', ], 'asset_maintenance_incomplete' => 'ยังไม่แล้วเสร็จ', 'warranty' => 'การรับประกัน', 'not_warranty' => 'ไม่มีการรับประกัน', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/th/admin/asset_maintenances/table.php b/resources/lang/th/admin/asset_maintenances/table.php index 5b5f02deb2..b9597a4dad 100644 --- a/resources/lang/th/admin/asset_maintenances/table.php +++ b/resources/lang/th/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'การซ่อมบำรุงสินทรัพย์', 'asset_name' => 'ชื่อสินทรัพย์', 'is_warranty' => 'การรับประกัน', - 'dl_csv' => 'ดาวน์โหลด CSV' + 'dl_csv' => 'ดาวน์โหลด CSV', ]; diff --git a/resources/lang/th/admin/categories/general.php b/resources/lang/th/admin/categories/general.php index 317db41f00..8aa824cce2 100644 --- a/resources/lang/th/admin/categories/general.php +++ b/resources/lang/th/admin/categories/general.php @@ -1,6 +1,6 @@ 'หมวดหมู่ทรัพย์สิน', 'category_name' => 'ชื่อหมวดหมู่', 'checkin_email' => 'ส่งอีเมลไปยังผู้ใช้เมื่อเช็คอิน / เช็คเอาต์', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'ใช้เป็นข้อกำหนดการใช้งานหลักแทน.', 'use_default_eula_disabled' => 'ใช้ค่าเริ่มต้นข้อกำหนดการใช้งานหลักแทน ค่าเริ่มต้นหลักของข้อกำหนดการใช้งานไม่ได้ถูกตั้งค่าไว้ กรุณาเพิ่มในการตั้งค่า', -); +]; diff --git a/resources/lang/th/admin/categories/message.php b/resources/lang/th/admin/categories/message.php index 92bed1972f..2fce8dd269 100644 --- a/resources/lang/th/admin/categories/message.php +++ b/resources/lang/th/admin/categories/message.php @@ -1,25 +1,25 @@ 'ยังไม่มีหมวดหมู่', 'assoc_models' => 'หมวดหมู่นี้เชื่อมโยงกับโมเดลอย่างน้อยหนึ่งรายการและไม่สามารถลบออกได้ โปรดอัปเดตโมเดลของคุณเพื่อไม่ให้อ้างอิงหมวดหมู่นี้อีกแล้วลองอีกครั้ง', 'assoc_items' => 'หมวดหมู่นี้มีการเชื่อมโยงกับ asset_type อย่างน้อยหนึ่งรายการและไม่สามารถลบได้ โปรดอัปเดต: asset_type เพื่อไม่ให้อ้างอิงหมวดหมู่นี้อีกแล้วลองอีกครั้ง', - 'create' => array( + 'create' => [ 'error' => 'ยังไม่ได้สร้างหมวดหมู่ กรุณาลองอีกครั้ง.', - 'success' => 'สร้างหมวดหมู่เรียบร้อยแล้ว.' - ), + 'success' => 'สร้างหมวดหมู่เรียบร้อยแล้ว.', + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้ปรับปรุงหมวดหมู่ กรุณาลองอีกครั้ง', - 'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว.' - ), + 'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่ต้องการจะลบหมวดหมู่นี้?', 'error' => 'มีปัญหาขณะลบหมวดหมู่นี้ กรุณาลองอีกครั้ง.', - 'success' => 'ลบหมวดหมู่เรียบร้อยแล้ว.' - ) + 'success' => 'ลบหมวดหมู่เรียบร้อยแล้ว.', + ], -); +]; diff --git a/resources/lang/th/admin/categories/table.php b/resources/lang/th/admin/categories/table.php index 1fec08bab7..047ca6fa8d 100644 --- a/resources/lang/th/admin/categories/table.php +++ b/resources/lang/th/admin/categories/table.php @@ -1,10 +1,10 @@ 'ข้อกำหนดการใช้งาน', +return [ + 'eula_text' => 'ข้อกำหนดการใช้งาน', 'id' => 'ไอดี', 'parent' => 'หมวดแม่', 'require_acceptance' => 'การยอมรับ', 'title' => 'ชื่อหมวดหมู่สินทรัพย์', -); +]; diff --git a/resources/lang/th/admin/companies/general.php b/resources/lang/th/admin/companies/general.php index abc8040369..e42a8c075f 100644 --- a/resources/lang/th/admin/companies/general.php +++ b/resources/lang/th/admin/companies/general.php @@ -1,4 +1,5 @@ 'เลือก บริษัท', ]; diff --git a/resources/lang/th/admin/companies/message.php b/resources/lang/th/admin/companies/message.php index 3cd5b38fb6..5003d1bd01 100644 --- a/resources/lang/th/admin/companies/message.php +++ b/resources/lang/th/admin/companies/message.php @@ -1,18 +1,19 @@ 'ไม่มี บริษัท', 'assoc_users' => 'บริษัท นี้เชื่อมโยงกับโมเดลอย่างน้อยหนึ่งรายการและไม่สามารถลบได้ โปรดอัปเดตโมเดลของคุณเพื่อไม่ให้ บริษัท นี้อ้างอิงอีกต่อไปและลองอีกครั้ง', - 'create' => array( + 'create' => [ 'error' => 'บริษัท ไม่ได้สร้างโปรดลองอีกครั้ง', - 'success' => 'บริษัท สร้างสำเร็จแล้ว' - ), - 'update' => array( + 'success' => 'บริษัท สร้างสำเร็จแล้ว', + ], + 'update' => [ 'error' => 'บริษัท ไม่ได้รับการปรับปรุงโปรดลองอีกครั้ง', - 'success' => 'อัปเดต บริษัท สำเร็จแล้ว' - ), - 'delete' => array( + 'success' => 'อัปเดต บริษัท สำเร็จแล้ว', + ], + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบ บริษัท นี้', 'error' => 'เกิดปัญหาในการลบ บริษัท กรุณาลองอีกครั้ง.', - 'success' => 'บริษัท ถูกลบเรียบร้อยแล้ว' - ) -); + 'success' => 'บริษัท ถูกลบเรียบร้อยแล้ว', + ], +]; diff --git a/resources/lang/th/admin/companies/table.php b/resources/lang/th/admin/companies/table.php index 0a4a76a266..ae08a4697d 100644 --- a/resources/lang/th/admin/companies/table.php +++ b/resources/lang/th/admin/companies/table.php @@ -1,9 +1,10 @@ 'บริษัท', 'create' => 'สร้าง บริษัท', 'title' => 'บริษัท', 'update' => 'ปรับปรุง บริษัท', 'name' => 'ชื่อ บริษัท', 'id' => 'ID', -); +]; diff --git a/resources/lang/th/admin/components/general.php b/resources/lang/th/admin/components/general.php index 570e0fc33d..3cc5648a04 100644 --- a/resources/lang/th/admin/components/general.php +++ b/resources/lang/th/admin/components/general.php @@ -1,6 +1,6 @@ 'ชื่อคอมโพเนนต์', 'checkin' => 'คอมโพเนนต์ Checkin', 'checkout' => 'ส่วนประกอบ Checkout', @@ -12,4 +12,4 @@ return array( 'remaining' => 'ที่เหลืออยู่', 'total' => 'ทั้งหมด', 'update' => 'อัพเดตคอมโพเนนต์', -); +]; diff --git a/resources/lang/th/admin/components/message.php b/resources/lang/th/admin/components/message.php index 2cb04d1ea6..75554942e8 100644 --- a/resources/lang/th/admin/components/message.php +++ b/resources/lang/th/admin/components/message.php @@ -1,36 +1,35 @@ 'คอมโพเนนต์ไม่มีอยู่', - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างคอมโพเนนต์โปรดลองอีกครั้ง', - 'success' => 'สร้างคอมโพเนนต์เรียบร้อยแล้ว' - ), + 'success' => 'สร้างคอมโพเนนต์เรียบร้อยแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'คอมโพเนนต์ไม่ได้รับการอัปเดตโปรดลองอีกครั้ง', - 'success' => 'คอมโพเนนต์สำเร็จแล้ว' - ), + 'success' => 'คอมโพเนนต์สำเร็จแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบคอมโพเนนต์นี้', 'error' => 'เกิดปัญหาในการลบคอมโพเนนต์ กรุณาลองอีกครั้ง.', - 'success' => 'คอมโพเนนต์ถูกลบเรียบร้อยแล้ว' - ), + 'success' => 'คอมโพเนนต์ถูกลบเรียบร้อยแล้ว', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'ตรวจสอบคอมโพเนนต์แล้วโปรดลองอีกครั้ง', 'success' => 'ตรวจสอบคอมโพเนนต์เรียบร้อยแล้ว', - 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.' - ), + 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'คอมโพเนนต์ไม่ได้รับการตรวจสอบโปรดลองอีกครั้ง', 'success' => 'ตรวจสอบคอมโพเนนต์เรียบร้อยแล้ว', - 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.' - ) + 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.', + ], - -); +]; diff --git a/resources/lang/th/admin/components/table.php b/resources/lang/th/admin/components/table.php index 061b0fddf3..cad287716c 100644 --- a/resources/lang/th/admin/components/table.php +++ b/resources/lang/th/admin/components/table.php @@ -1,5 +1,5 @@ 'ชื่อคอมโพเนนต์', -); +]; diff --git a/resources/lang/th/admin/consumables/general.php b/resources/lang/th/admin/consumables/general.php index 892abb6cc5..8f33c8085d 100644 --- a/resources/lang/th/admin/consumables/general.php +++ b/resources/lang/th/admin/consumables/general.php @@ -1,6 +1,6 @@ 'ชำระเงินผ่าน Checkout สำหรับผู้ใช้', 'consumable_name' => 'ชื่อวัสดุสิ้นเปลือง', 'create' => 'สร้างวัสดุสิ้นเปลือง', @@ -8,4 +8,4 @@ return array( 'remaining' => 'คงค้าง', 'total' => 'รวมทั้งหมด', 'update' => 'ปรับปรุงวัสดุสิ้นเปลือง', -); +]; diff --git a/resources/lang/th/admin/consumables/message.php b/resources/lang/th/admin/consumables/message.php index 5c85c464a8..b7824e26d1 100644 --- a/resources/lang/th/admin/consumables/message.php +++ b/resources/lang/th/admin/consumables/message.php @@ -1,36 +1,35 @@ 'ไม่มีรายการวัสดุสิ้นเปลืองนี้', - 'create' => array( + 'create' => [ 'error' => 'ยังไม่ได้สร้างวัสดุสิ้นเปลือง กรุณาลองใหม่อีกครั้ง', - 'success' => 'สร้างวัสดุสิ้นเปลืองเรียบร้อยแล้ว' - ), + 'success' => 'สร้างวัสดุสิ้นเปลืองเรียบร้อยแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้ปรับปรุงวัสดุสิ้นเปลือง กรุณาลองใหม่อีกครั้ง', - 'success' => 'ปรับปรุงวัสดุสิ้นเปลืองเรียบร้อยแล้ว.' - ), + 'success' => 'ปรับปรุงวัสดุสิ้นเปลืองเรียบร้อยแล้ว.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลการสิ้นเปลืองนี้', 'error' => 'มีปัญหาระหว่างการลบวัสดุสิ้นเปลือง กรุณาลองอีกครั้ง', - 'success' => 'การสิ้นเปลืองถูกลบเรียบร้อยแล้ว' - ), + 'success' => 'การสิ้นเปลืองถูกลบเรียบร้อยแล้ว', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'วัสดุสิ้นเปลืองยังไม่ถูกเช็คเอ้าท์ กรุณาลองใหม่อีกครั้ง', 'success' => 'เช็คเอ้าท์วัสดุสิ้นเปลืองแล้ว', - 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.' - ), + 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'วัสดุสิ้นเปลืองยังไม่ถูกเช็คอิน กรุณาลองใหม่อีกครั้ง', 'success' => 'เช็คอินวัสดุสิ้นเปลืองแล้ว.', - 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.' - ) + 'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง.', + ], - -); +]; diff --git a/resources/lang/th/admin/consumables/table.php b/resources/lang/th/admin/consumables/table.php index b0cb6caa25..21eb32fb85 100644 --- a/resources/lang/th/admin/consumables/table.php +++ b/resources/lang/th/admin/consumables/table.php @@ -1,5 +1,5 @@ 'ชื่อวัสดุสิ้นเปลือง', -); +]; diff --git a/resources/lang/th/admin/custom_fields/general.php b/resources/lang/th/admin/custom_fields/general.php index 2a9d2ee718..d00cfe679e 100644 --- a/resources/lang/th/admin/custom_fields/general.php +++ b/resources/lang/th/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'ฟิลด์ที่กำหนดเอง', 'field' => 'สนาม', 'about_fieldsets_title' => 'เกี่ยวกับ Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'ฟิลด์ที่กำหนดเองใหม่', 'value_encrypted' => 'ค่าของฟิลด์นี้ถูกเข้ารหัสในฐานข้อมูล เฉพาะผู้ดูแลระบบเท่านั้นที่สามารถดูค่าที่ถอดรหัสได้', 'show_in_email' => 'ใส่ค่าของฟิลด์นี้ลงในอีเมลเช็คเอาต์ที่ส่งถึงผู้ใช้หรือไม่? ฟิลด์ที่เข้ารหัสไม่สามารถรวมอยู่ในอีเมลได้', -); +]; diff --git a/resources/lang/th/admin/custom_fields/message.php b/resources/lang/th/admin/custom_fields/message.php index f7a576f98a..39d9c72e4f 100644 --- a/resources/lang/th/admin/custom_fields/message.php +++ b/resources/lang/th/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'ฟิลด์นั้นไม่มีอยู่', 'already_added' => 'ฟิลด์ถูกเพิ่มแล้ว', - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างฟิลด์โปรดลองอีกครั้ง', 'success' => 'สร้างฟิลด์สำเร็จแล้ว', - 'assoc_success' => 'ฟิลด์ถูกเพิ่มเข้าไปใน fieldset สำเร็จแล้ว' - ), + 'assoc_success' => 'ฟิลด์ถูกเพิ่มเข้าไปใน fieldset สำเร็จแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ฟิลด์ไม่ได้รับการอัปเดตโปรดลองอีกครั้ง', - 'success' => 'ปรับปรุงข้อมูลสำเร็จแล้ว' - ), + 'success' => 'ปรับปรุงข้อมูลสำเร็จแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลนี้', 'error' => 'เกิดปัญหาในการนำออกฟิลด์ กรุณาลองอีกครั้ง.', 'success' => 'ฟิลด์ถูกลบเรียบร้อยแล้ว', 'in_use' => 'ฟิลด์ยังคงใช้งานอยู่', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'ไม่พบ Fieldset', - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้าง Fieldset โปรดลองอีกครั้ง', - 'success' => 'สร้างฟิลด์สำเร็จแล้ว' - ), + 'success' => 'สร้างฟิลด์สำเร็จแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ไม่ได้อัปเดต Fieldset โปรดลองอีกครั้ง', - 'success' => 'อัปเดตฟิลด์สำเร็จแล้ว' - ), + 'success' => 'อัปเดตฟิลด์สำเร็จแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบชุดข้อมูลฟิลด์นี้', 'error' => 'เกิดปัญหาในการลบ fieldset กรุณาลองอีกครั้ง.', 'success' => 'ฟิลด์ถูกลบเรียบร้อยแล้ว', 'in_use' => 'Fieldset ยังคงใช้อยู่', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/th/admin/departments/message.php b/resources/lang/th/admin/departments/message.php index eef274bf91..655ff9a4f9 100644 --- a/resources/lang/th/admin/departments/message.php +++ b/resources/lang/th/admin/departments/message.php @@ -1,21 +1,21 @@ 'ไม่มีแผนก', 'assoc_users' => 'แผนกนี้มีการเชื่อมโยงกับผู้ใช้อย่างน้อยหนึ่งรายและไม่สามารถลบได้ โปรดอัปเดตผู้ใช้เพื่ออ้างถึงแผนกนี้อีกครั้งและลองอีกครั้ง', - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างแผนกโปรดลองอีกครั้ง', - 'success' => 'สร้างแผนกเรียบร้อยแล้ว' - ), - 'update' => array( + 'success' => 'สร้างแผนกเรียบร้อยแล้ว', + ], + 'update' => [ 'error' => 'แผนกไม่ได้รับการปรับปรุงโปรดลองอีกครั้ง', - 'success' => 'อัปเดตแผนกเรียบร้อยแล้ว' - ), - 'delete' => array( + 'success' => 'อัปเดตแผนกเรียบร้อยแล้ว', + ], + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบแผนกนี้', 'error' => 'เกิดปัญหาในการลบแผนก กรุณาลองอีกครั้ง.', - 'success' => 'แผนกนี้ถูกลบเรียบร้อยแล้ว' - ) + 'success' => 'แผนกนี้ถูกลบเรียบร้อยแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/departments/table.php b/resources/lang/th/admin/departments/table.php index ddfba6e2a5..5464352a45 100644 --- a/resources/lang/th/admin/departments/table.php +++ b/resources/lang/th/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'ชื่อห้างสรรพสินค้า', @@ -8,4 +8,4 @@ return array( 'location' => 'ที่ตั้ง', 'create' => 'สร้างแผนก', 'update' => 'ฝ่ายอัปเดต', - ); + ]; diff --git a/resources/lang/th/admin/depreciations/general.php b/resources/lang/th/admin/depreciations/general.php index 099713274c..1eb8ffd540 100644 --- a/resources/lang/th/admin/depreciations/general.php +++ b/resources/lang/th/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'เกี่ยวกับค่าเสื่อมราคาสินทรัพย์', 'about_depreciations' => 'คุณสามารถกำหนดการคิดค่าเสื่อมราคาเพื่อตัดค่าเสื่อมราคาโดยวิธีการคิดค่าเสื่อมราคาแบบเส้นตรง', 'asset_depreciations' => 'ค่าเสื่อมราคาสินทรัพย์', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'จำนวนเดือน', 'update' => 'อัปเดตค่าเสื่อมราคา', -); +]; diff --git a/resources/lang/th/admin/depreciations/message.php b/resources/lang/th/admin/depreciations/message.php index ba669dcb20..051f00af36 100644 --- a/resources/lang/th/admin/depreciations/message.php +++ b/resources/lang/th/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'ไม่มีหมวดค่าเสื่อมราคา', 'assoc_users' => 'ค่าเสื่อมราคานี้มีความเกี่ยวข้องกับโมเดลอื่นๆ และจะไม่สามารถลบได้ กรุณาลบโมเดล จากนั้นลองลบอีกครั้ง ', - - 'create' => array( + 'create' => [ 'error' => 'ยังไม่ได้สร้างหมวดค่าเสื่อมราคา กรุณาลองอีกครั้ง', - 'success' => 'สร้างหมวดค่าเสื่อมราคาเรียบร้อยแล้ว' - ), + 'success' => 'สร้างหมวดค่าเสื่อมราคาเรียบร้อยแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้ปรับปรุงหมวดค่าเสื่อมราคา กรุณาลองใหม่อีกครั้ง', - 'success' => 'ปรับปุงหมวดค่าเสื่อมราคาเรียบร้อยแล้ว' - ), + 'success' => 'ปรับปุงหมวดค่าเสื่อมราคาเรียบร้อยแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบหมวดค่าเสื่อมราคานี้?', 'error' => 'มีปัญหาระหว่างการลบหมวดค่าเสื่อมราคา กรุณาลองใหม่อีกครั้ง', - 'success' => 'หมวดค่าเสื่อมราคาถูกลบแล้ว' - ) + 'success' => 'หมวดค่าเสื่อมราคาถูกลบแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/depreciations/table.php b/resources/lang/th/admin/depreciations/table.php index f74e2124da..215ae6ef3f 100644 --- a/resources/lang/th/admin/depreciations/table.php +++ b/resources/lang/th/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ไอดี', 'months' => 'เดือน', 'term' => 'ระยะเวลา', 'title' => 'ชื่อ ', -); +]; diff --git a/resources/lang/th/admin/groups/message.php b/resources/lang/th/admin/groups/message.php index 14e71677fb..aa10a5569b 100644 --- a/resources/lang/th/admin/groups/message.php +++ b/resources/lang/th/admin/groups/message.php @@ -1,22 +1,22 @@ 'มีกลุ่มอยู่แล้ว', 'group_not_found' => 'ไม่มีกลุ่ม [:id]', 'group_name_required' => 'ต้องกำหนดชื่อฟิลด์', - 'success' => array( + 'success' => [ 'create' => 'สร้างกลุ่มเรียบร้อยแล้ว', 'update' => 'ปรับปรุงกลุ่มเรียบร้อยแล้ว', 'delete' => 'ลบกลุ่มเรียบร้อยแล้ว', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบกลุ่มนี้?', 'create' => 'มีปัญหาระหว่างการสร้างกลุ่ม กรุณาลองใหม่อีกครั้ง', 'update' => 'มีปัญหาระหว่างปรับปรุงกลุ่ม กรุณาลองใหม่อีกครั้ง.', 'delete' => 'มีปัญหาระหว่างการลบกลุ่ม กรุณาลองใหม่อีกครั้ง.', - ), + ], -); +]; diff --git a/resources/lang/th/admin/groups/table.php b/resources/lang/th/admin/groups/table.php index 65df788bdd..b1ad873ee4 100644 --- a/resources/lang/th/admin/groups/table.php +++ b/resources/lang/th/admin/groups/table.php @@ -1,9 +1,9 @@ 'ไอดี', 'name' => 'ชื่อ', 'users' => '# ของผู้ใช้งาน', -); +]; diff --git a/resources/lang/th/admin/groups/titles.php b/resources/lang/th/admin/groups/titles.php index b4993ad7df..ef5eb29191 100644 --- a/resources/lang/th/admin/groups/titles.php +++ b/resources/lang/th/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'กลุ่มใช้ในการให้สิทธิ์ผู้ใช้ทั่วไป', 'group_management' => 'การจัดการกลุ่ม', @@ -11,4 +11,4 @@ return array( 'allow' => 'อนุญาต', 'deny' => 'ไม่อนุญาต', -); +]; diff --git a/resources/lang/th/admin/hardware/form.php b/resources/lang/th/admin/hardware/form.php index c9daf7358f..1bc7d82f54 100644 --- a/resources/lang/th/admin/hardware/form.php +++ b/resources/lang/th/admin/hardware/form.php @@ -1,12 +1,12 @@ 'ยืนยันการลบเนื้อหาเป็นกลุ่ม', +return [ + 'bulk_delete' => 'ยืนยันการลบเนื้อหาเป็นกลุ่ม', 'bulk_delete_help' => 'ตรวจทานเนื้อหาสำหรับการลบจำนวนมากด้านล่าง เมื่อลบแล้วเนื้อหาเหล่านี้สามารถเรียกคืนได้ แต่จะไม่มีการเชื่อมโยงกับผู้ใช้ที่ได้รับมอบหมายอยู่ในขณะนี้อีกต่อไป', 'bulk_delete_warn' => 'คุณกำลังจะลบ: asset_count', - 'bulk_update' => 'ปรับปรุงสินทรัพย์แบบหลายรายการ', - 'bulk_update_help' => 'ฟอร์มนี้อนุญาตให้คุณปรับปรุงสินทรัพย์แบบหลายรายการในครั้งเดียว เพียงกรอกข้อมูลที่ต้องการเปลี่ยนแปลงลงในช่อง ช่องใดที่ไม่ได้กรอกข้อมูลจะไม่มีการเปลี่ยนแปลงใดๆ ', - 'bulk_update_warn' => 'คุณกำลังแก้ไขคุณสมบัติของสินทรัพย์ :asset_count', + 'bulk_update' => 'ปรับปรุงสินทรัพย์แบบหลายรายการ', + 'bulk_update_help' => 'ฟอร์มนี้อนุญาตให้คุณปรับปรุงสินทรัพย์แบบหลายรายการในครั้งเดียว เพียงกรอกข้อมูลที่ต้องการเปลี่ยนแปลงลงในช่อง ช่องใดที่ไม่ได้กรอกข้อมูลจะไม่มีการเปลี่ยนแปลงใดๆ ', + 'bulk_update_warn' => 'คุณกำลังแก้ไขคุณสมบัติของสินทรัพย์ :asset_count', 'checkedout_to' => 'เช็คเอ้าท์ให้กับ', 'checkout_date' => 'วันที่เช็คเอ้าท์', 'checkin_date' => 'วันที่เช็คอิน', @@ -38,7 +38,6 @@ return array( 'tag' => 'รหัสทรัพย์สิน', 'update' => 'ปรับปรุงสินทรัพย์', 'warranty' => 'การรับประกัน', - 'warranty_expires' => 'การรับประกันหมดอายุ', + 'warranty_expires' => 'การรับประกันหมดอายุ', 'years' => 'ปี', -) -; +]; diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php index 99ac313fec..0d83abf81a 100644 --- a/resources/lang/th/admin/hardware/general.php +++ b/resources/lang/th/admin/hardware/general.php @@ -1,9 +1,9 @@ 'เกี่ยวกับสินทรัพย์', 'about_assets_text' => 'สินทรัพย์คือรายการที่ติดตามโดยใช้หมายเลขซีเรียลหรือแท็กเนื้อหา พวกเขามีแนวโน้มที่จะเป็นรายการมูลค่าที่สูงขึ้นซึ่งจะระบุรายการที่เฉพาะเจาะจง', - 'archived' => 'ถูกเก็บไว้', + 'archived' => 'ถูกเก็บไว้', 'asset' => 'สินทรัพย์', 'bulk_checkout' => 'ตรวจสอบสินทรัพย์', 'checkin' => 'เช็คอินสินทรัพย์', @@ -19,4 +19,4 @@ return array( 'pending' => 'อยู่ระหว่างดำเนินการ', 'undeployable' => 'ไม่สามารถนำไปใช้งานได้', 'view' => 'ดูสินทรัพย์', -); +]; diff --git a/resources/lang/th/admin/hardware/message.php b/resources/lang/th/admin/hardware/message.php index 2e7a3297ce..16c8b5fd4e 100644 --- a/resources/lang/th/admin/hardware/message.php +++ b/resources/lang/th/admin/hardware/message.php @@ -1,82 +1,80 @@ 'คำเตือน: สินทรัพย์นี้ถูกกำหนดสถานะให้ไม่สามารถใช้งานได้ หากสถานะนี้ถูกเปลี่ยน กรุณาอัพเดทสถานะสินทรัพย์ด้วย', 'does_not_exist' => 'ไม่มีสินทรัพย์', 'does_not_exist_or_not_requestable' => 'พยายามได้ดี. เนื้อหาดังกล่าวไม่มีอยู่หรือไม่ได้รับการร้องขอ', 'assoc_users' => 'ขณะนี้มีการตรวจสอบเนื้อหานี้แก่ผู้ใช้และไม่สามารถลบออกได้ โปรดตรวจสอบเนื้อหาเป็นครั้งแรกจากนั้นลองลบอีกครั้ง', - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างเนื้อหาโปรดลองอีกครั้ง :(', - 'success' => 'สร้างเนื้อหาสำเร็จแล้ว :)' - ), + 'success' => 'สร้างเนื้อหาสำเร็จแล้ว :)', + ], - 'update' => array( + 'update' => [ 'error' => 'ไม่ได้อัปเดตเนื้อหาโปรดลองอีกครั้ง', 'success' => 'อัปเดตเนื้อหาสำเร็จแล้ว', 'nothing_updated' => 'ไม่มีการเลือกเขตข้อมูลดังนั้นไม่มีการอัปเดตอะไรเลย', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'ไม่ได้กู้คืนเนื้อหาโปรดลองอีกครั้ง', - 'success' => 'กู้คืนเนื้อหาเรียบร้อยแล้ว' - ), + 'success' => 'กู้คืนเนื้อหาเรียบร้อยแล้ว', + ], - 'audit' => array( + 'audit' => [ 'error' => 'การตรวจสอบสินทรัพย์ไม่สำเร็จ กรุณาลองอีกครั้ง.', - 'success' => 'บันทึกการตรวจสอบสินทรัพย์สำเร็จแล้ว' - ), + 'success' => 'บันทึกการตรวจสอบสินทรัพย์สำเร็จแล้ว', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ไฟล์ไม่ถูกลบ กรุณาลองอีกครั้ง.', 'success' => 'ไฟล์ถูกลบเรียบร้อยแล้ว', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ไฟล์ไม่ได้อัปโหลด กรุณาลองอีกครั้ง.', 'success' => 'ไฟล์ที่อัปโหลดเรียบร้อยแล้ว', 'nofiles' => 'คุณไม่ได้เลือกไฟล์ใด ๆ สำหรับการอัปโหลดหรือไฟล์ที่คุณกำลังพยายามอัปโหลดมีขนาดใหญ่เกินไป', 'invalidfiles' => 'ไฟล์ของคุณอย่างน้อยหนึ่งไฟล์มีขนาดใหญ่เกินไปหรือเป็นไฟล์ที่ไม่ได้รับอนุญาต ไฟล์ที่อนุญาตคือ png, gif, jpg, doc, docx, pdf และ txt', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'บางรายการไม่สามารถนำเข้าได้อย่างถูกต้อง', 'errorDetail' => 'รายการต่อไปนี้ไม่ได้นำเข้าเนื่องจากมีข้อผิดพลาด', - 'success' => "ไฟล์ของคุณถูกนำเข้าแล้ว", - 'file_delete_success' => "ไฟล์ของคุณถูกลบเรียบร้อยแล้ว", - 'file_delete_error' => "ไม่สามารถลบไฟล์ได้", - ), + 'success' => 'ไฟล์ของคุณถูกนำเข้าแล้ว', + 'file_delete_success' => 'ไฟล์ของคุณถูกลบเรียบร้อยแล้ว', + 'file_delete_error' => 'ไม่สามารถลบไฟล์ได้', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบเนื้อหานี้', 'error' => 'เกิดปัญหาในการลบเนื้อหา กรุณาลองอีกครั้ง.', 'nothing_updated' => 'ไม่มีการเลือกเนื้อหาใด ๆ ดังนั้นจึงไม่มีสิ่งใดถูกลบ', - 'success' => 'เนื้อหาถูกลบเรียบร้อยแล้ว' - ), + 'success' => 'เนื้อหาถูกลบเรียบร้อยแล้ว', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'ไม่ได้ตรวจสอบเนื้อหาโปรดลองอีกครั้ง', 'success' => 'ตรวจสอบสินทรัพย์เรียบร้อยแล้ว', 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.', 'not_available' => 'เนื้อหาดังกล่าวไม่สามารถใช้ได้สำหรับเช็คเอาท์!', - 'no_assets_selected' => 'คุณต้องเลือกอย่างน้อยหนึ่งสินทรัพย์จากรายการ' - ), + 'no_assets_selected' => 'คุณต้องเลือกอย่างน้อยหนึ่งสินทรัพย์จากรายการ', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'ไม่ได้เช็คอินเนื้อหาโปรดลองอีกครั้ง', 'success' => 'ตรวจสอบเนื้อหาเรียบร้อยแล้ว', 'user_does_not_exist' => 'ผู้ใช้รายนั้นไม่ถูกต้อง กรุณาลองอีกครั้ง.', 'already_checked_in' => 'มีการตรวจสอบเนื้อหาดังกล่าวแล้ว', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'ไม่ได้ร้องขอเนื้อหาโปรดลองอีกครั้ง', 'success' => 'ขอรับสินทรัพย์สำเร็จแล้ว', - 'canceled' => 'ยกเลิกคำขอชำระเงินเรียบร้อยแล้ว' - ) + 'canceled' => 'ยกเลิกคำขอชำระเงินเรียบร้อยแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/hardware/table.php b/resources/lang/th/admin/hardware/table.php index 9e91290ab2..4ece3b1947 100644 --- a/resources/lang/th/admin/hardware/table.php +++ b/resources/lang/th/admin/hardware/table.php @@ -1,6 +1,6 @@ 'แท็กเนื้อหา', 'asset_model' => 'แบบ', @@ -20,6 +20,6 @@ return array( 'title' => 'สินทรัพย์', 'image' => 'ภาพอุปกรณ์', 'days_without_acceptance' => 'วันโดยปราศจากการยอมรับ', - 'monthly_depreciation' => 'ค่าเสื่อมราคารายเดือน' + 'monthly_depreciation' => 'ค่าเสื่อมราคารายเดือน', -); +]; diff --git a/resources/lang/th/admin/kits/general.php b/resources/lang/th/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/th/admin/kits/general.php +++ b/resources/lang/th/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/th/admin/licenses/form.php b/resources/lang/th/admin/licenses/form.php index 5f8a54d236..4ba38b8237 100644 --- a/resources/lang/th/admin/licenses/form.php +++ b/resources/lang/th/admin/licenses/form.php @@ -1,6 +1,6 @@ 'สินทรัพย์', 'checkin' => 'เช็คอิน', @@ -18,5 +18,5 @@ return array( 'to_email' => 'ได้รับอนุญาตให้ใช้อีเมล', 'to_name' => 'ได้รับอนุญาตให้ตั้งชื่อ', 'update' => 'อัปเดตสัญญาอนุญาต', - 'checkout_help' => 'คุณต้องตรวจสอบใบอนุญาตออกไปกับเนื้อหาฮาร์ดแวร์หรือบุคคล คุณสามารถเลือกทั้งคู่ แต่เจ้าของเนื้อหาต้องตรงกับบุคคลที่คุณกำลังตรวจสอบเนื้อหาออกไป' -); + 'checkout_help' => 'คุณต้องตรวจสอบใบอนุญาตออกไปกับเนื้อหาฮาร์ดแวร์หรือบุคคล คุณสามารถเลือกทั้งคู่ แต่เจ้าของเนื้อหาต้องตรงกับบุคคลที่คุณกำลังตรวจสอบเนื้อหาออกไป', +]; diff --git a/resources/lang/th/admin/licenses/general.php b/resources/lang/th/admin/licenses/general.php index 74b4c2a39f..be98442327 100644 --- a/resources/lang/th/admin/licenses/general.php +++ b/resources/lang/th/admin/licenses/general.php @@ -1,6 +1,6 @@ 'เกี่ยวกับใบอนุญาต', 'about_licenses' => 'ใบอนุญาตใช้ในการติดตามซอฟต์แวร์ พวกเขามีจำนวนที่นั่งที่ระบุซึ่งสามารถเช็คเอาท์ให้บุคคลอื่นได้', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'ใบอนุญาตซอฟต์แวร์', 'user' => 'ผู้ใช้งาน', 'view' => 'ดูใบอนุญาต', -); +]; diff --git a/resources/lang/th/admin/licenses/message.php b/resources/lang/th/admin/licenses/message.php index ed4f7cc7a5..95f145b498 100644 --- a/resources/lang/th/admin/licenses/message.php +++ b/resources/lang/th/admin/licenses/message.php @@ -1,6 +1,6 @@ 'ไม่มีสัญญาอนุญาต', 'user_does_not_exist' => 'ไม่มีผู้ใช้', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'คุณต้องเลือกเนื้อหาหรือผู้ใช้ แต่ไม่ใช่ทั้งสองอย่าง', 'not_found' => 'ไม่พบใบอนุญาต', - - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างสัญญาอนุญาตโปรดลองอีกครั้ง', - 'success' => 'สร้างสัญญาอนุญาตเรียบร้อยแล้ว' - ), + 'success' => 'สร้างสัญญาอนุญาตเรียบร้อยแล้ว', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ไฟล์ไม่ถูกลบ กรุณาลองอีกครั้ง.', 'success' => 'ไฟล์ถูกลบเรียบร้อยแล้ว', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ไฟล์ไม่ได้อัปโหลด กรุณาลองอีกครั้ง.', 'success' => 'ไฟล์ที่อัปโหลดเรียบร้อยแล้ว', 'nofiles' => 'คุณไม่ได้เลือกไฟล์ใด ๆ สำหรับการอัปโหลดหรือไฟล์ที่คุณกำลังพยายามอัปโหลดมีขนาดใหญ่เกินไป', 'invalidfiles' => 'ไฟล์ของคุณอย่างน้อยหนึ่งไฟล์มีขนาดใหญ่เกินไปหรือเป็นไฟล์ที่ไม่ได้รับอนุญาต ไฟล์ที่อนุญาตคือ png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml และ lic', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'สัญญาอนุญาตไม่ได้รับการปรับปรุงโปรดลองอีกครั้ง', - 'success' => 'มีการอัปเดตใบอนุญาตเรียบร้อยแล้ว' - ), + 'success' => 'มีการอัปเดตใบอนุญาตเรียบร้อยแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบสัญญาอนุญาตนี้', 'error' => 'เกิดปัญหาในการนำออกใบอนุญาต กรุณาลองอีกครั้ง.', - 'success' => 'ใบอนุญาตถูกลบเรียบร้อยแล้ว' - ), + 'success' => 'ใบอนุญาตถูกลบเรียบร้อยแล้ว', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'มีปัญหาในการตรวจสอบใบอนุญาต กรุณาลองอีกครั้ง.', - 'success' => 'ออกใบอนุญาตแล้ว' - ), + 'success' => 'ออกใบอนุญาตแล้ว', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'เกิดปัญหาในการตรวจสอบใบอนุญาต กรุณาลองอีกครั้ง.', - 'success' => 'ใบอนุญาตได้รับการตรวจสอบเรียบร้อยแล้ว' - ), + 'success' => 'ใบอนุญาตได้รับการตรวจสอบเรียบร้อยแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/licenses/table.php b/resources/lang/th/admin/licenses/table.php index 993a5175b2..c314e06f0c 100644 --- a/resources/lang/th/admin/licenses/table.php +++ b/resources/lang/th/admin/licenses/table.php @@ -1,6 +1,6 @@ 'ได้รับมอบหมายให้', 'checkout' => 'In / Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'อนุกรม', 'title' => 'การอนุญาต', -); +]; diff --git a/resources/lang/th/admin/locations/message.php b/resources/lang/th/admin/locations/message.php index 0b3ffa3873..5c59c2feb8 100644 --- a/resources/lang/th/admin/locations/message.php +++ b/resources/lang/th/admin/locations/message.php @@ -1,27 +1,26 @@ 'ไม่มีสถานที่นี้.', 'assoc_users' => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ', 'assoc_assets' => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ', 'assoc_child_loc' => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับหมวดสถานที่ใดที่หนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงสถานที่ของท่านไม่ให้มีส่วนเกี่ยวข้องกับหมวดสถานที่นี้ และลองอีกครั้ง. ', - - 'create' => array( + 'create' => [ 'error' => 'สถานที่ยังไม่ถูกสร้าง กรุณาลองใหม่อีกครั้ง.', - 'success' => 'สร้างสถานที่เรียบร้อยแล้ว.' - ), + 'success' => 'สร้างสถานที่เรียบร้อยแล้ว.', + ], - 'update' => array( + 'update' => [ 'error' => 'สถานที่ยังไม่ถูกปรับปรุง กรุณาลองใหม่อีกครั้ง', - 'success' => 'ปรับปรุงสถานที่เรียบร้อยแล้ว.' - ), + 'success' => 'ปรับปรุงสถานที่เรียบร้อยแล้ว.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบสถานที่นี้?', 'error' => 'มีปัญหาระหว่างการลบสถานที่ กรุณาลองใหม่อีกครั้ง.', - 'success' => 'ลบสถานที่เรียบร้อยแล้ว.' - ) + 'success' => 'ลบสถานที่เรียบร้อยแล้ว.', + ], -); +]; diff --git a/resources/lang/th/admin/locations/table.php b/resources/lang/th/admin/locations/table.php index af3f45ebe7..a8b005705c 100644 --- a/resources/lang/th/admin/locations/table.php +++ b/resources/lang/th/admin/locations/table.php @@ -1,6 +1,6 @@ 'เกี่ยวกับสถานที่', 'about_locations' => 'สถานที่ถูกใช้เพื่อติดตามข้อมูลตำแหน่งสำหรับผู้ใช้เนื้อหาและรายการอื่น ๆ', 'assets_rtd' => 'สินทรัพย์', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'หมวดแม่', 'currency' => 'สกุลเงินตามสถานที่', 'ldap_ou' => 'LDU Search OU', - ); + ]; diff --git a/resources/lang/th/admin/manufacturers/message.php b/resources/lang/th/admin/manufacturers/message.php index 0dac5bc316..eb07adf01b 100644 --- a/resources/lang/th/admin/manufacturers/message.php +++ b/resources/lang/th/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'ยังไม่มีผู้ผลิต', 'assoc_users' => 'ผู้ผลิตนี้มีความสัมพันธ์ในรายการโมเดลอย่างน้อยหนึ่งรายการในปัจจุบัน และไม่สามารถลบได้ กรุณาอัพเดทโมเดลของคุณออกจากความสัมพันธ์ดังกล่าว และลองอีกครั้ง ', - 'create' => array( + 'create' => [ 'error' => 'ยังไม่ได้สร้างผู้ผลิต กรุณาลองใหม่อีกครั้ง', - 'success' => 'สร้างผู้ผลิตเรียบร้อยแล้ว' - ), + 'success' => 'สร้างผู้ผลิตเรียบร้อยแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้ปรับปรุงผู้ผลิต กรุณาลองใหม่อีกครั้ง', - 'success' => 'ปรับปรุงผู้ผลิตเรียบร้อยแล้ว' - ), + 'success' => 'ปรับปรุงผู้ผลิตเรียบร้อยแล้ว', + ], - 'restore' => array( + 'restore' => [ 'error' => 'ยังไม่ได้ปรับปรุงผู้ผลิต กรุณาลองใหม่อีกครั้ง', - 'success' => 'กู้คืนข้อมูลผู้ผลิตเรียบร้อยแล้ว' - ), + 'success' => 'กู้คืนข้อมูลผู้ผลิตเรียบร้อยแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบผู้ผลิตนี้?', 'error' => 'มีปัญหาระหว่างการลบผู้ผลิต กรุณาลองใหม่อีกครั้ง', - 'success' => 'ลบผู้ผลิตเรียบร้อยแล้ว' - ) + 'success' => 'ลบผู้ผลิตเรียบร้อยแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/manufacturers/table.php b/resources/lang/th/admin/manufacturers/table.php index 971c670306..8ab9408777 100644 --- a/resources/lang/th/admin/manufacturers/table.php +++ b/resources/lang/th/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'เกี่ยวกับผู้ผลิต', 'about_manufacturers_text' => 'ผู้ผลิตเป็น บริษัท ที่สร้างสินทรัพย์ของคุณ คุณสามารถจัดเก็บข้อมูลการติดต่อฝ่ายสนับสนุนที่สำคัญไว้ที่นี่ซึ่งจะปรากฏในหน้ารายละเอียดสินทรัพย์ของคุณ', 'asset_manufacturers' => 'ผู้ผลิตสินทรัพย์', @@ -13,4 +13,4 @@ return array( 'update' => 'ปรับปรุงผู้ผลิต', 'url' => 'URL', -); +]; diff --git a/resources/lang/th/admin/models/general.php b/resources/lang/th/admin/models/general.php index 0a3f891ae5..edf863e11f 100644 --- a/resources/lang/th/admin/models/general.php +++ b/resources/lang/th/admin/models/general.php @@ -1,6 +1,6 @@ 'เกี่ยวกับโมเดลสินทรัพย์', 'about_models_text' => 'โมเดลสินทรัพย์คือวิธีการจัดกลุ่มเนื้อหาที่เหมือนกัน "MBP 2013", "IPhone 6s" ฯลฯ', 'deleted' => 'โมเดลนี้ถูกลบแล้ว Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'คุณกำลังจะลบ: asset_count', 'restore' => 'กู้คืนโมเดล', 'requestable' => 'ผู้ใช้สามารถขอรับโมเดลนี้ได้', - 'show_mac_address' => 'แสดง MAC address ในสินทรัพย์ของโมเดลนี้', + 'show_mac_address' => 'แสดง MAC address ในสินทรัพย์ของโมเดลนี้', 'view_deleted' => 'ดูที่ถูกลบ', 'view_models' => 'ดูโมเดล', 'fieldset' => 'fieldset', 'no_custom_field' => 'ไม่มีฟิลด์ที่กำหนดเอง', 'add_default_values' => 'เพิ่มค่าเริ่มต้น', -); +]; diff --git a/resources/lang/th/admin/models/message.php b/resources/lang/th/admin/models/message.php index 9b746940a6..3370716774 100644 --- a/resources/lang/th/admin/models/message.php +++ b/resources/lang/th/admin/models/message.php @@ -1,42 +1,41 @@ 'ไม่มีโมเดลนี้', 'assoc_users' => 'โมเดลนี้มีความสัมพันธ์กับสินทรัพย์หนึ่ง หรือมากกว่าในปัจจุบัน และจะไม่สามารถลบได้ กรุณาลบสินทรัพย์และลองอีกครั้ง ', - - 'create' => array( + 'create' => [ 'error' => 'ยังไม่ได้สร้างโมเดล กรุณาลองใหม่อีกครั้ง', 'success' => 'สร้างโมเดียลเรียบร้อยแล้ว', 'duplicate_set' => 'มีชื่อโมเดลสินทรัพย์ ผู้ผลิต และหมายเลขโมเดลแล้ว', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'ยังไม่ได้ปรับปรุงโมเดล กรุณาลองใหม่อีกครั้ง', - 'success' => 'ปรับปรุงโมเดลเรียบร้อยแล้ว' - ), + 'success' => 'ปรับปรุงโมเดลเรียบร้อยแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจที่จะลบโมเดลนี้?', 'error' => 'มีปัญหาระหว่างลบโมเดล กรุณาลองใหม่อีกครั้ง.', - 'success' => 'ลบโมเดลเรียบร้อยแล้ว' - ), + 'success' => 'ลบโมเดลเรียบร้อยแล้ว', + ], - 'restore' => array( + 'restore' => [ 'error' => 'ยังไม่ได้กู้คืนโมเดล กรุณาลองใหม่อีกครั้ง', - 'success' => 'กู้คืนโมเดลเรียบร้อยแล้ว' - ), + 'success' => 'กู้คืนโมเดลเรียบร้อยแล้ว', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'ไม่มีการเปลี่ยนแปลงเขตข้อมูลดังนั้นไม่มีอะไรที่ได้รับการปรับปรุง', - 'success' => 'อัปเดตโมเดลแล้ว' - ), + 'success' => 'อัปเดตโมเดลแล้ว', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'ไม่มีการเลือกรายการใด ๆ ดังนั้นจึงไม่มีสิ่งใดถูกลบ', 'success' => ': แบบจำลอง success_count ลบ', - 'success_partial' => ': success_count โมเดลถูกลบแล้วอย่างไรก็ตาม: ไม่สามารถลบข้อมูล fail_count เนื่องจากยังมีเนื้อหาที่เชื่อมโยงอยู่' - ), + 'success_partial' => ': success_count โมเดลถูกลบแล้วอย่างไรก็ตาม: ไม่สามารถลบข้อมูล fail_count เนื่องจากยังมีเนื้อหาที่เชื่อมโยงอยู่', + ], -); +]; diff --git a/resources/lang/th/admin/models/table.php b/resources/lang/th/admin/models/table.php index 77379d418f..0c2cb00c3c 100644 --- a/resources/lang/th/admin/models/table.php +++ b/resources/lang/th/admin/models/table.php @@ -1,6 +1,6 @@ 'สร้างโมเดล', 'created_at' => 'สร้างที่', @@ -14,4 +14,4 @@ return array( 'update' => 'อัพเดทรุ่นสินทรัพย์', 'clone' => 'คัดลอกแบบรุ่น', 'edit' => 'แก้ไขรุ่น', -); +]; diff --git a/resources/lang/th/admin/reports/general.php b/resources/lang/th/admin/reports/general.php index b7bb41f0d0..cbc6a94196 100644 --- a/resources/lang/th/admin/reports/general.php +++ b/resources/lang/th/admin/reports/general.php @@ -1,5 +1,5 @@ 'เลือกออฟชั่นสำหรับรายงานสินทรัพย์ที่คุณต้องการ' -); +return [ + 'info' => 'เลือกออฟชั่นสำหรับรายงานสินทรัพย์ที่คุณต้องการ', +]; diff --git a/resources/lang/th/admin/reports/message.php b/resources/lang/th/admin/reports/message.php index 7fe4824834..c534f8f95d 100644 --- a/resources/lang/th/admin/reports/message.php +++ b/resources/lang/th/admin/reports/message.php @@ -1,5 +1,5 @@ 'คุณต้องเลือกอย่างน้อยหนึ่งออฟชั่น' -); +return [ + 'error' => 'คุณต้องเลือกอย่างน้อยหนึ่งออฟชั่น', +]; diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php index 6aed253c37..a0486b0362 100644 --- a/resources/lang/th/admin/settings/general.php +++ b/resources/lang/th/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'โดเมน Active Directory', 'ad_domain_help' => 'นี่เป็นบางครั้งเหมือนกับโดเมนอีเมลของคุณ แต่ไม่บ่อยนัก', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'อีเมล สำเนาถึง', 'admin_cc_email_help' => 'หากคุณต้องการส่งสำเนาเช็คอิน / เช็คเอาต์อีเมลที่ส่งถึงผู้ใช้ไปยังบัญชีอีเมลอื่นให้ป้อนได้ที่นี่ มิฉะนั้นปล่อยให้ฟิลด์นี้ว่างเปล่า', 'is_ad' => 'นี่คือเซิร์ฟเวอร์ Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'เกณฑ์การเตือนที่หมดอายุ (เป็นวัน)', 'alert_inv_threshold' => 'เกณฑ์การแจ้งเตือนพื้นที่โฆษณา', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'รหัสทรัพย์สิน', 'audit_interval' => 'ช่วงการตรวจสอบ', 'audit_interval_help' => 'หากคุณจำเป็นต้องตรวจสอบสินทรัพย์ของคุณอย่างสม่ำเสมอให้ป้อนช่วงเวลาเป็นเดือน ๆ', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'ป้อนรหัสสองปัจจัย', 'two_factor_config_complete' => 'ส่งรหัส', 'two_factor_enabled_edit_not_allowed' => 'ผู้ดูแลระบบของคุณไม่อนุญาตให้คุณแก้ไขการตั้งค่านี้', - 'two_factor_enrollment_text' => "จำเป็นต้องมีการตรวจสอบสิทธิ์สองปัจจัย แต่อุปกรณ์ของคุณยังไม่ได้ลงทะเบียน เปิดแอป Google Authenticator และสแกนโค้ด QR ด้านล่างเพื่อลงทะเบียนอุปกรณ์ของคุณ เมื่อคุณลงทะเบียนอุปกรณ์แล้วให้ป้อนรหัสด้านล่าง", + 'two_factor_enrollment_text' => 'จำเป็นต้องมีการตรวจสอบสิทธิ์สองปัจจัย แต่อุปกรณ์ของคุณยังไม่ได้ลงทะเบียน เปิดแอป Google Authenticator และสแกนโค้ด QR ด้านล่างเพื่อลงทะเบียนอุปกรณ์ของคุณ เมื่อคุณลงทะเบียนอุปกรณ์แล้วให้ป้อนรหัสด้านล่าง', 'require_accept_signature' => 'ต้องการลายเซ็น', 'require_accept_signature_help_text' => 'การเปิดใช้งานคุณลักษณะนี้จะกำหนดให้ผู้ใช้ลงชื่อเข้าใช้เพื่อยอมรับเนื้อหา', 'left' => 'ซ้าย', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'การทำเครื่องหมายในช่องนี้จะบังคับใช้ข้อ จำกัด เฉพาะใน serials ของเนื้อหา', 'zerofill_count' => 'ความยาวของแท็กเนื้อหารวมทั้ง zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/th/admin/settings/message.php b/resources/lang/th/admin/settings/message.php index 769fbc67bf..d922579015 100644 --- a/resources/lang/th/admin/settings/message.php +++ b/resources/lang/th/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'เกิด error ระหว่างการอัพเดตข้อมูล ', - 'success' => 'อัพเดตการตั้งค่าเรียบร้อยแล้ว' - ), - 'backup' => array( + 'success' => 'อัพเดตการตั้งค่าเรียบร้อยแล้ว', + ], + 'backup' => [ 'delete_confirm' => 'คุณแน่ใจที่จะลบข้อมูลสำรองนี้? การดำเนินการนี้จะไม่สามารถกู้คืนได้ ', 'file_deleted' => 'ลบข้อมูลสำรองเรียบร้อยแล้ว ', 'generated' => 'ไฟล์ข้อมูลสำรองถูกสร้างเรียบร้อยแล้ว', 'file_not_found' => 'ไม่พบไฟล์ข้อมูลสำรองบนเซิฟเวอร์', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'เกิดข้อผิดพลาดขณะล้างข้อมูล', 'validation_failed' => 'การยืนยันการล้างข้อมูลของคุณไม่ถูกต้อง โปรดพิมพ์คำว่า "DELETE" ในช่องยืนยัน', - 'success' => 'ล้างระเบียนเรียบร้อยแล้ว' - ), + 'success' => 'ล้างระเบียนเรียบร้อยแล้ว', + ], -); +]; diff --git a/resources/lang/th/admin/statuslabels/message.php b/resources/lang/th/admin/statuslabels/message.php index fff5ca8bff..ae6ea89e76 100644 --- a/resources/lang/th/admin/statuslabels/message.php +++ b/resources/lang/th/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'ไม่มีป้ายสถานะ', 'assoc_assets' => 'ป้ายสถานะนี้เชื่อมโยงกับสินทรัพย์อย่างน้อยหนึ่งรายการและไม่สามารถลบได้ โปรดอัปเดตเนื้อหาของคุณเพื่อไม่ให้อ้างอิงสถานะนี้อีกแล้วลองอีกครั้ง', - - 'create' => array( + 'create' => [ 'error' => 'ไม่ได้สร้างป้ายสถานะโปรดลองอีกครั้ง', - 'success' => 'สร้างป้ายสถานะสำเร็จแล้ว' - ), + 'success' => 'สร้างป้ายสถานะสำเร็จแล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ป้ายสถานะไม่ได้รับการอัปเดตโปรดลองอีกครั้ง', - 'success' => 'อัปเดตป้ายสถานะสำเร็จแล้ว' - ), + 'success' => 'อัปเดตป้ายสถานะสำเร็จแล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบป้ายสถานะนี้', 'error' => 'มีปัญหาในการลบป้ายสถานะ กรุณาลองอีกครั้ง.', - 'success' => 'ป้ายสถานะถูกลบเรียบร้อยแล้ว' - ), + 'success' => 'ป้ายสถานะถูกลบเรียบร้อยแล้ว', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'ไม่สามารถกำหนดเนื้อหาเหล่านี้ให้กับทุกคนได้', 'deployable' => 'สามารถตรวจสอบสินทรัพย์เหล่านี้ได้ เมื่อได้รับมอบหมายแล้วพวกเขาจะถือว่าสถานะ meta ของ Deployed', 'archived' => 'ไม่สามารถตรวจสอบเนื้อหาเหล่านี้ได้และจะปรากฏเฉพาะในมุมมองที่เก็บถาวรเท่านั้น วิธีนี้มีประโยชน์สำหรับการเก็บรักษาข้อมูลเกี่ยวกับสินทรัพย์เพื่อการจัดทำงบประมาณ / วัตถุประสงค์ทางประวัติศาสตร์ แต่จะช่วยให้พวกเขาออกจากรายชื่อสินทรัพย์แบบวันต่อวัน', 'pending' => 'สินทรัพย์เหล่านี้ยังไม่สามารถกำหนดให้กับทุกคนซึ่งมักใช้สำหรับรายการที่ไม่ได้รับการซ่อม แต่คาดว่าจะกลับสู่การหมุนเวียน', - ), + ], -); +]; diff --git a/resources/lang/th/admin/statuslabels/table.php b/resources/lang/th/admin/statuslabels/table.php index e6fd4bf759..df1e04bab2 100644 --- a/resources/lang/th/admin/statuslabels/table.php +++ b/resources/lang/th/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'เกี่ยวกับป้ายสถานะ', 'archived' => 'ที่เก็บถาวร', 'create' => 'สร้างป้ายสถานะ', @@ -16,4 +16,4 @@ return array( 'title' => 'ป้ายสถานะ', 'undeployable' => 'ไม่สามารถนำไปใช้งานได้', 'update' => 'ปรับปรุงป้ายสถานะ', -); +]; diff --git a/resources/lang/th/admin/suppliers/message.php b/resources/lang/th/admin/suppliers/message.php index 220374a2d6..1a97080a7b 100644 --- a/resources/lang/th/admin/suppliers/message.php +++ b/resources/lang/th/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'ไม่มีซัพพลายเออร์', - - 'create' => array( + 'create' => [ 'error' => 'ซัพพลายเออร์ยังไม่ถูกสร้าง กรุณราลองใหม่อีกครั้ง', - 'success' => 'สร้างซัพพลายเออร์เสร็จสมบูรณ์แล้ว' - ), + 'success' => 'สร้างซัพพลายเออร์เสร็จสมบูรณ์แล้ว', + ], - 'update' => array( + 'update' => [ 'error' => 'ไม่ได้อัพเดทซัพพลายเออร์ กรุณาลองใหม่อีกครั้ง', - 'success' => 'อัพเดทซัพพลายเออร์เสร็จสมบูรณ์แล้ว' - ), + 'success' => 'อัพเดทซัพพลายเออร์เสร็จสมบูรณ์แล้ว', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'คุณแน่ใจว่าคุณตั้งใจจะลบซัพพลายเออร์นี้?', 'error' => 'มีปัญหาระหว่างลบซัพพลายเออร์ กรุณาลองใหม่อีกครั้ง', 'success' => 'ลบซัพพลายเออร์เสร็จสมบูรณ์แล้ว', 'assoc_assets' => 'ซัพพลายเออร์นี้มีความเกี่ยวข้องอยู่กับรายการอื่นอย่างน้อยหนึ่งรายการในปัจจุบัน และจะไม่สามารถลบได้ กรุณาแก้ไขโดยการเอารายการดังกล่าวออกจากความเกี่ยวข้องหรืออ้างอิง และลองใหม่อีกครั้ง ', 'assoc_licenses' => 'ซัพพลายเออร์นี้มีความเกี่ยวข้องอยู่กับรายการอื่นอย่างน้อยหนึ่งรายการในปัจจุบัน และจะไม่สามารถลบได้ กรุณาแก้ไขโดยการเอารายการดังกล่าวออกจากความเกี่ยวข้องหรืออ้างอิง และลองใหม่อีกครั้ง ', 'assoc_maintenances' => 'ซัพพลายเออร์นี้มีความเกี่ยวข้องอยู่กับรายการอื่นอย่างน้อยหนึ่งรายการในปัจจุบัน และจะไม่สามารถลบได้ กรุณาแก้ไขโดยการเอารายการดังกล่าวออกจากความเกี่ยวข้องหรืออ้างอิง และลองใหม่อีกครั้ง ', - ) + ], -); +]; diff --git a/resources/lang/th/admin/suppliers/table.php b/resources/lang/th/admin/suppliers/table.php index 8c2c01c442..e8fc70373a 100644 --- a/resources/lang/th/admin/suppliers/table.php +++ b/resources/lang/th/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'เกี่ยวกับซัพพลายเออร์', 'about_suppliers_text' => 'ซัพพลายเออร์ใช้เพื่อติดตามแหล่งที่มาของสินค้า', 'address' => 'ที่อยู่ซัพพลายเออร์', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'ดูทรัพย์สินสำหรับ', 'zip' => 'รหัสไปรษณีย์', -); +]; diff --git a/resources/lang/th/admin/users/general.php b/resources/lang/th/admin/users/general.php index 15797620dc..bf6114965b 100644 --- a/resources/lang/th/admin/users/general.php +++ b/resources/lang/th/admin/users/general.php @@ -1,7 +1,6 @@ 'ผู้ใช้รายนี้สามารถเข้าระบบได้', 'activated_disabled_help_text' => 'คุณไม่สามารถแก้ไขสถานะเปิดใช้งานสำหรับบัญชีของคุณเอง', 'assets_user' => 'ทรัพย์สินที่กำหนดให้ :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'แก้ไขผู้ใช้', 'filetype_info' => 'ประเภทของไฟล์ที่อนุญาตแล้ว มีดังนี้ png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar', 'history_user' => 'ประวัติของ :name', - 'info' => 'ข้อมูล', + 'info' => 'ข้อมูล', 'restore_user' => 'คลิกที่นี่เพื่อเรียกคืน', 'last_login' => 'เข้าสู่ระบบล่าสุด', 'ldap_config_text' => 'คุณสามารถตั้งค่าการกำหนดค่า LDAP ได้ Admin> การตั้งค่า สถานที่ที่เลือก (เลือกได้) จะถูกตั้งค่าสำหรับผู้ใช้ที่นำเข้าทั้งหมด', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'การตั้งค่าผู้ดูแลระบบปัจจุบันช่วยให้สามารถใช้การตรวจสอบสิทธิ์แบบสองปัจจัยได้อย่างมีประสิทธิภาพ', 'two_factor_enrolled' => 'อุปกรณ์ 2FA ที่ลงทะเบียนแล้ว', 'two_factor_active' => '2FA Active', - ); + ]; diff --git a/resources/lang/th/admin/users/message.php b/resources/lang/th/admin/users/message.php index c51b52eab5..d6eab422d2 100644 --- a/resources/lang/th/admin/users/message.php +++ b/resources/lang/th/admin/users/message.php @@ -1,6 +1,6 @@ 'คุณยอมรับสินทรัพย์นี้เรียบร้อยแล้ว', 'declined' => 'คุณปฏิเสธสินทรัพย์นี้เรียบร้อยแล้ว', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'การทำงานร่วมกับ LDAP ไม่ได้ถูกตั้งค่าไว้สำหรับการติดตั้งนี้', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'สร้างผู้ใช้งานเสร็จสมบูรณ์แล้ว', 'update' => 'แก้ไขผู้ใช้งานเสร็จสมบูรณ์แล้ว', 'update_bulk' => 'อัปเดตผู้ใช้สำเร็จแล้ว!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'ยกเลิกระงับผู้ใช้งานเสร็จสมบูรณ์แล้ว', 'restored' => 'กู้คืนผู้ใช้งานเสร็จสมบูรณ์แล้ว', 'import' => 'นำเข้าผู้ใช้งานเสร็จสมบูรณ์แล้ว', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'มีปัญหาระหว่างการสร้างผู้ใช้งาน กรุณาลองใหม่อีกครั้ง', 'update' => 'มีปัญหาระหว่างปรับปรุงข้อมูลผู้ใช้ กรุณาลองใหม่อีกครั้ง', 'delete' => 'มีปัญหาระหว่างลบผู้ใช้งาน กรุณาลองใหม่อีกครั้ง', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'ไม่สามารถค้นหา LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:', 'ldap_could_not_get_entries' => 'ไม่สามารถดึงข้อมูลจาก LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:', 'password_ldap' => 'รหัสผ่านสำหรับบัญชีนี้ได้รับการจัดการโดย LDAP / Active Directory โปรดติดต่อฝ่ายไอทีของคุณเพื่อเปลี่ยนรหัสผ่านของคุณ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'ไฟล์ยังไม่ถูกลบ กรุณาลองใหม่อีกครั้ง', 'success' => 'ไฟล์ถูกลบเรียบร้อยแล้ว', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'ไฟล์ยังไม่ถูกอัพโหลด กรุณาลองอีกครั้ง', 'success' => 'ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว', 'nofiles' => 'คุณยังไม่ได้เลือกไฟล์สำหรับอัพโหลด', 'invalidfiles' => 'ไฟล์ข้อมูลของคุณมีขนาดใหญ่เกินไป หรือประเภทของไฟล์ไม่ได้รับการอนุญาต ประเภทของไฟล์ที่ได้รับอนุญาตแล้วมีดังนี้ png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/th/admin/users/table.php b/resources/lang/th/admin/users/table.php index 8adb331dfa..b83a355b0f 100644 --- a/resources/lang/th/admin/users/table.php +++ b/resources/lang/th/admin/users/table.php @@ -1,6 +1,6 @@ 'ใช้งาน', 'allow' => 'อนุญาต', 'checkedout' => 'ทรัพย์สิน', @@ -28,11 +28,11 @@ return array( 'show_current' => 'แสดงผู้ใช้งานปัจจุบัน', 'show_deleted' => 'แสดงผู้ใช้งานที่ถูกลบแล้ว', 'title' => 'ชื่อเรื่อง', - 'to_restore_them' => 'เพื่อเรียกคืน', + 'to_restore_them' => 'เพื่อเรียกคืน', 'updateuser' => 'แก้ไขผู้ใช้งาน', 'username' => 'ชื่อผู้ใช้', - 'user_deleted_text' => 'ผู้ใช้นี้ถูกทำเครื่องหมายว่าลบแล้ว', + 'user_deleted_text' => 'ผู้ใช้นี้ถูกทำเครื่องหมายว่าลบแล้ว', 'username_note' => '(ส่วนนี้มีผลเฉพาะกับ Active Directory เท่านั้น ไม่ใช่สำหรับการเข้าสู่ระบบ)', 'cloneuser' => 'คัดลอกผู้ใช้งาน', 'viewusers' => 'ดูผู้ใช้งาน', -); +]; diff --git a/resources/lang/th/auth/general.php b/resources/lang/th/auth/general.php index 61b1482519..f3434d6010 100644 --- a/resources/lang/th/auth/general.php +++ b/resources/lang/th/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/th/auth/message.php b/resources/lang/th/auth/message.php index 278172f70c..632d67e0b5 100644 --- a/resources/lang/th/auth/message.php +++ b/resources/lang/th/auth/message.php @@ -1,6 +1,6 @@ 'อีเมลนี้มีการลงทะเบียนในระบบแล้ว', 'account_not_found' => 'บัญชีผู้ใช้งาน หรือรหัสผ่าน ไม่ถูกต้อง', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'บัญชีผู้ใช้นี้ถูกห้ามใช้งาน', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'มีปัญหาขณะกำลังเข้าสู่ระบบ กรุณาลองอีกครั้ง', 'success' => 'คุณได้เข้าสู่ระบบเรียบร้อย', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'มีปัญหาในการเปิดใช้งานบัญชีผู้ใช้ของคุณ โปรดลองอีกครั้ง', 'success' => 'สร้างบัญชีผู้ใช้เสร็จเรียบร้อย', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'มีปัญหาในการรับรหัสตั้งค่ารหัสผ่านใหม่ โปรดลองอีกครั้ง', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'มีปัญหาในการตั้งค่ารหัสผ่านใหม่ กรุณาลองอีกครั้ง', 'success' => 'รหัสผ่านบัญชีผู้ใช้ของคุณได้รับการตั้งค่าใหม่เรียบร้อยแล้ว', - ), + ], - -); +]; diff --git a/resources/lang/th/button.php b/resources/lang/th/button.php index c3701367e4..9e2a13ce33 100644 --- a/resources/lang/th/button.php +++ b/resources/lang/th/button.php @@ -1,6 +1,6 @@ 'การกระทำ', 'add' => 'เพิ่มใหม่', 'cancel' => 'ยกเลิก', @@ -11,7 +11,7 @@ return array( 'request' => 'ร้องขอ', 'submit' => 'ตกลง', 'upload' => 'อัพโหลด', - 'select_file' => 'เลือกไฟล์...', + 'select_file' => 'เลือกไฟล์...', 'select_files' => 'เลือกไฟล์...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php index f1658b08bc..0b1781d435 100644 --- a/resources/lang/th/general.php +++ b/resources/lang/th/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'เช็คอิน', 'user_requests_count' => 'คำร้องขอ', 'city' => 'เมือง', - 'click_here' => 'คลิกที่นี่', + 'click_here' => 'คลิกที่นี่', 'clear_selection' => 'ยกเลิกการเลือก', 'companies' => 'บริษัท', 'company' => 'บริษัท', 'component' => 'ตัวแทน', 'components' => 'ส่วนประกอบ', - 'complete' => 'สมบูรณ์', + 'complete' => 'สมบูรณ์', 'consumable' => 'การใช้งาน', 'consumables' => 'การใช้งาน', 'country' => 'ประเทศ', diff --git a/resources/lang/th/help.php b/resources/lang/th/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/th/help.php +++ b/resources/lang/th/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/th/mail.php b/resources/lang/th/mail.php index cdec79bc2f..c5e2ca0c23 100644 --- a/resources/lang/th/mail.php +++ b/resources/lang/th/mail.php @@ -1,6 +1,6 @@ 'ผู้ใช้ยกเลิกคำร้องขอสินค้าในเว็บไซต์แล้ว', 'a_user_requested' => 'ผู้ใช้ร้องขอรายการบนเว็บไซต์', 'accessory_name' => 'ชื่ออุปกรณ์เสริม:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/th/pagination.php b/resources/lang/th/pagination.php index 2c1ac0d3b8..4f65640925 100644 --- a/resources/lang/th/pagination.php +++ b/resources/lang/th/pagination.php @@ -1,6 +1,6 @@ 'ต่อไป »', -); +]; diff --git a/resources/lang/th/passwords.php b/resources/lang/th/passwords.php index 0df2f352e2..b61cfbb36b 100644 --- a/resources/lang/th/passwords.php +++ b/resources/lang/th/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'ลิงค์รหัสผ่านของคุณถูกส่ง!', 'user' => 'ไม่พบผู้ใช้งานดังกล่าวกับอีเมล์นี้', ]; - diff --git a/resources/lang/th/reminders.php b/resources/lang/th/reminders.php index 8ae96bc63b..85d4091b86 100644 --- a/resources/lang/th/reminders.php +++ b/resources/lang/th/reminders.php @@ -1,6 +1,6 @@ "รหัสผ่านต้องมีอย่างน้อย 6 ตัวอักษร และตรงตามรูปแบบที่กำหนด", + 'password' => 'รหัสผ่านต้องมีอย่างน้อย 6 ตัวอักษร และตรงตามรูปแบบที่กำหนด', - "user" => "ชื่อผู้ใช้หรืออีเมลแอดเดรสไม่ถูกต้อง", + 'user' => 'ชื่อผู้ใช้หรืออีเมลแอดเดรสไม่ถูกต้อง', - "token" => "Token รีเซ็ตรหัสผ่านไม่ถูกต้อง", + 'token' => 'Token รีเซ็ตรหัสผ่านไม่ถูกต้อง', - "sent" => "ถ้าหากอีเมลที่คุณกรอกเป็นอีเมลที่ถูกต้อง ระบบได้ทำการส่งรหัสผ่านใหม่ให้ท่านแล้ว!", + 'sent' => 'ถ้าหากอีเมลที่คุณกรอกเป็นอีเมลที่ถูกต้อง ระบบได้ทำการส่งรหัสผ่านใหม่ให้ท่านแล้ว!', -); +]; diff --git a/resources/lang/th/table.php b/resources/lang/th/table.php index 60bf03349f..381c101424 100644 --- a/resources/lang/th/table.php +++ b/resources/lang/th/table.php @@ -1,10 +1,10 @@ 'การกระทำ', 'action' => 'การกระทำ', 'by' => 'โดย', 'item' => 'รายการ', -); +]; diff --git a/resources/lang/th/validation.php b/resources/lang/th/validation.php index 7a69220506..8ebb947a5a 100644 --- a/resources/lang/th/validation.php +++ b/resources/lang/th/validation.php @@ -1,6 +1,6 @@ ':attribute กำลังใช้งานอยู่', 'uploaded' => 'แอตทริบิวต์: ล้มเหลวในการอัปโหลด', 'url' => 'รูปแบบของ :attribute ไม่ถูกต้อง', - "unique_undeleted" => "แอตทริบิวต์ต้องไม่ซ้ำกัน", + 'unique_undeleted' => 'แอตทริบิวต์ต้องไม่ซ้ำกัน', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "ฟิลด์แอ็ตทริบิวต์: มีอักขระที่ไม่ได้รับอนุญาต", - "email_array" => "ที่อยู่อีเมลไม่ถูกต้อง", - "hashed_pass" => "รหัสผ่านปัจจุบันของคุณไม่ถูกต้อง", + 'alpha_space' => 'ฟิลด์แอ็ตทริบิวต์: มีอักขระที่ไม่ได้รับอนุญาต', + 'email_array' => 'ที่อยู่อีเมลไม่ถูกต้อง', + 'hashed_pass' => 'รหัสผ่านปัจจุบันของคุณไม่ถูกต้อง', 'dumbpwd' => 'รหัสผ่านที่ใช้กันอยู่ทั่วไป', - "statuslabel_type" => "คุณต้องเลือกประเภทป้ายสถานะที่ถูกต้อง", + 'statuslabel_type' => 'คุณต้องเลือกประเภทป้ายสถานะที่ถูกต้อง', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/tl/admin/accessories/general.php b/resources/lang/tl/admin/accessories/general.php index 96470c14f4..c01bac167b 100644 --- a/resources/lang/tl/admin/accessories/general.php +++ b/resources/lang/tl/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Kategorya ng accessory', 'accessory_name' => 'Pangalan ng accessory', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/tl/admin/accessories/message.php b/resources/lang/tl/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/tl/admin/accessories/message.php +++ b/resources/lang/tl/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/tl/admin/accessories/table.php b/resources/lang/tl/admin/accessories/table.php index 311db913fb..76d7295e5e 100644 --- a/resources/lang/tl/admin/accessories/table.php +++ b/resources/lang/tl/admin/accessories/table.php @@ -1,11 +1,10 @@ 'I-Download ang CSV', - 'eula_text' => 'Ang EULA', +return [ + 'dl_csv' => 'I-Download ang CSV', + 'eula_text' => 'Ang EULA', 'id' => 'Ang ID', 'require_acceptance' => 'Pagtanggap', 'title' => 'Ang Pangalan ng Accessory', - -); +]; diff --git a/resources/lang/tl/admin/asset_maintenances/form.php b/resources/lang/tl/admin/asset_maintenances/form.php index b743dcdda8..2b8d85ae76 100644 --- a/resources/lang/tl/admin/asset_maintenances/form.php +++ b/resources/lang/tl/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Ang mga araw', 'notes' => 'Ang mga Palatandaan', 'update' => 'I-update', - 'create' => 'Lumikha' + 'create' => 'Lumikha', ]; diff --git a/resources/lang/tl/admin/asset_maintenances/message.php b/resources/lang/tl/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/tl/admin/asset_maintenances/message.php +++ b/resources/lang/tl/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/tl/admin/asset_maintenances/table.php b/resources/lang/tl/admin/asset_maintenances/table.php index 0ad2584b2e..a895123287 100644 --- a/resources/lang/tl/admin/asset_maintenances/table.php +++ b/resources/lang/tl/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Propyedad sa Kinabubuhay', 'asset_name' => 'Sa Ngalan ng Propyedad', 'is_warranty' => 'Garantiya', - 'dl_csv' => 'I-download sa CSV' + 'dl_csv' => 'I-download sa CSV', ]; diff --git a/resources/lang/tl/admin/categories/general.php b/resources/lang/tl/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/tl/admin/categories/general.php +++ b/resources/lang/tl/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/tl/admin/categories/message.php b/resources/lang/tl/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/tl/admin/categories/message.php +++ b/resources/lang/tl/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/tl/admin/categories/table.php b/resources/lang/tl/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/tl/admin/categories/table.php +++ b/resources/lang/tl/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/tl/admin/companies/general.php b/resources/lang/tl/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/tl/admin/companies/general.php +++ b/resources/lang/tl/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/tl/admin/companies/message.php b/resources/lang/tl/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/tl/admin/companies/message.php +++ b/resources/lang/tl/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/tl/admin/companies/table.php b/resources/lang/tl/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/tl/admin/companies/table.php +++ b/resources/lang/tl/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/tl/admin/components/general.php b/resources/lang/tl/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/tl/admin/components/general.php +++ b/resources/lang/tl/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/tl/admin/components/message.php b/resources/lang/tl/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/tl/admin/components/message.php +++ b/resources/lang/tl/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/tl/admin/components/table.php b/resources/lang/tl/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/tl/admin/components/table.php +++ b/resources/lang/tl/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/tl/admin/consumables/general.php b/resources/lang/tl/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/tl/admin/consumables/general.php +++ b/resources/lang/tl/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/tl/admin/consumables/message.php b/resources/lang/tl/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/tl/admin/consumables/message.php +++ b/resources/lang/tl/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/tl/admin/consumables/table.php b/resources/lang/tl/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/tl/admin/consumables/table.php +++ b/resources/lang/tl/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/tl/admin/custom_fields/general.php b/resources/lang/tl/admin/custom_fields/general.php index c8d2a70a71..011f983f77 100644 --- a/resources/lang/tl/admin/custom_fields/general.php +++ b/resources/lang/tl/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/tl/admin/custom_fields/message.php b/resources/lang/tl/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/tl/admin/custom_fields/message.php +++ b/resources/lang/tl/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/tl/admin/departments/message.php b/resources/lang/tl/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/tl/admin/departments/message.php +++ b/resources/lang/tl/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/tl/admin/departments/table.php b/resources/lang/tl/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/tl/admin/departments/table.php +++ b/resources/lang/tl/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/tl/admin/depreciations/general.php b/resources/lang/tl/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/tl/admin/depreciations/general.php +++ b/resources/lang/tl/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/tl/admin/depreciations/message.php b/resources/lang/tl/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/tl/admin/depreciations/message.php +++ b/resources/lang/tl/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/tl/admin/depreciations/table.php b/resources/lang/tl/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/tl/admin/depreciations/table.php +++ b/resources/lang/tl/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/tl/admin/groups/message.php b/resources/lang/tl/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/tl/admin/groups/message.php +++ b/resources/lang/tl/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/tl/admin/groups/table.php b/resources/lang/tl/admin/groups/table.php index 13c43c3bc1..e32b8ebbea 100644 --- a/resources/lang/tl/admin/groups/table.php +++ b/resources/lang/tl/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Ngalan', 'users' => '# ng mga Gumagamit', -); +]; diff --git a/resources/lang/tl/admin/groups/titles.php b/resources/lang/tl/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/tl/admin/groups/titles.php +++ b/resources/lang/tl/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/tl/admin/hardware/form.php b/resources/lang/tl/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/tl/admin/hardware/form.php +++ b/resources/lang/tl/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/tl/admin/hardware/general.php b/resources/lang/tl/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/tl/admin/hardware/general.php +++ b/resources/lang/tl/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/tl/admin/hardware/message.php b/resources/lang/tl/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/tl/admin/hardware/message.php +++ b/resources/lang/tl/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/tl/admin/hardware/table.php b/resources/lang/tl/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/tl/admin/hardware/table.php +++ b/resources/lang/tl/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/tl/admin/kits/general.php b/resources/lang/tl/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/tl/admin/kits/general.php +++ b/resources/lang/tl/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/tl/admin/licenses/form.php b/resources/lang/tl/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/tl/admin/licenses/form.php +++ b/resources/lang/tl/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/tl/admin/licenses/general.php b/resources/lang/tl/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/tl/admin/licenses/general.php +++ b/resources/lang/tl/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/tl/admin/licenses/message.php b/resources/lang/tl/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/tl/admin/licenses/message.php +++ b/resources/lang/tl/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/tl/admin/licenses/table.php b/resources/lang/tl/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/tl/admin/licenses/table.php +++ b/resources/lang/tl/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/tl/admin/locations/message.php b/resources/lang/tl/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/tl/admin/locations/message.php +++ b/resources/lang/tl/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/tl/admin/locations/table.php b/resources/lang/tl/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/tl/admin/locations/table.php +++ b/resources/lang/tl/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/tl/admin/manufacturers/message.php b/resources/lang/tl/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/tl/admin/manufacturers/message.php +++ b/resources/lang/tl/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/tl/admin/manufacturers/table.php b/resources/lang/tl/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/tl/admin/manufacturers/table.php +++ b/resources/lang/tl/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/tl/admin/models/general.php b/resources/lang/tl/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/tl/admin/models/general.php +++ b/resources/lang/tl/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/tl/admin/models/message.php b/resources/lang/tl/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/tl/admin/models/message.php +++ b/resources/lang/tl/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/tl/admin/models/table.php b/resources/lang/tl/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/tl/admin/models/table.php +++ b/resources/lang/tl/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/tl/admin/reports/general.php b/resources/lang/tl/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/tl/admin/reports/general.php +++ b/resources/lang/tl/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/tl/admin/reports/message.php b/resources/lang/tl/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/tl/admin/reports/message.php +++ b/resources/lang/tl/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/tl/admin/settings/general.php b/resources/lang/tl/admin/settings/general.php index 2c5c667db2..3650b747cb 100644 --- a/resources/lang/tl/admin/settings/general.php +++ b/resources/lang/tl/admin/settings/general.php @@ -1,12 +1,12 @@ 'Ang Aktibong Direktorya', 'ad_domain' => 'Ang Aktibong Directory domain', 'ad_domain_help' => 'Ito ay minsan kapareho ng iyong email domain, pero hindi palagi.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Ito ay isang Aktibong serber ng Direktorya', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ang pagka-expire ng Alert Threshold (sa iilang araw)', 'alert_inv_threshold' => 'Ang Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Ang mga ID ng Asset', 'audit_interval' => 'Ang Pagitan ng Pag-audit', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/tl/admin/settings/message.php b/resources/lang/tl/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/tl/admin/settings/message.php +++ b/resources/lang/tl/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/tl/admin/statuslabels/message.php b/resources/lang/tl/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/tl/admin/statuslabels/message.php +++ b/resources/lang/tl/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/tl/admin/statuslabels/table.php b/resources/lang/tl/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/tl/admin/statuslabels/table.php +++ b/resources/lang/tl/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/tl/admin/suppliers/message.php b/resources/lang/tl/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/tl/admin/suppliers/message.php +++ b/resources/lang/tl/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/tl/admin/suppliers/table.php b/resources/lang/tl/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/tl/admin/suppliers/table.php +++ b/resources/lang/tl/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/tl/admin/users/general.php b/resources/lang/tl/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/tl/admin/users/general.php +++ b/resources/lang/tl/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/tl/admin/users/message.php b/resources/lang/tl/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/tl/admin/users/message.php +++ b/resources/lang/tl/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/tl/admin/users/table.php b/resources/lang/tl/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/tl/admin/users/table.php +++ b/resources/lang/tl/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/tl/auth/general.php b/resources/lang/tl/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/tl/auth/general.php +++ b/resources/lang/tl/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/tl/auth/message.php b/resources/lang/tl/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/tl/auth/message.php +++ b/resources/lang/tl/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/tl/button.php b/resources/lang/tl/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/tl/button.php +++ b/resources/lang/tl/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/tl/general.php b/resources/lang/tl/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/tl/general.php +++ b/resources/lang/tl/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/tl/help.php b/resources/lang/tl/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/tl/help.php +++ b/resources/lang/tl/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/tl/mail.php b/resources/lang/tl/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/tl/mail.php +++ b/resources/lang/tl/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/tl/pagination.php b/resources/lang/tl/pagination.php index 124c6b5d95..10e0158b7c 100644 --- a/resources/lang/tl/pagination.php +++ b/resources/lang/tl/pagination.php @@ -1,6 +1,6 @@ 'Kasunod »', -); +]; diff --git a/resources/lang/tl/passwords.php b/resources/lang/tl/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/tl/passwords.php +++ b/resources/lang/tl/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/tl/reminders.php b/resources/lang/tl/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/tl/reminders.php +++ b/resources/lang/tl/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/tl/table.php b/resources/lang/tl/table.php index ad84acb5a4..683407ceb4 100644 --- a/resources/lang/tl/table.php +++ b/resources/lang/tl/table.php @@ -1,10 +1,10 @@ 'Mga kilos', 'action' => 'Kilos', 'by' => 'Batay sa', 'item' => 'Aytem', -); +]; diff --git a/resources/lang/tl/validation.php b/resources/lang/tl/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/tl/validation.php +++ b/resources/lang/tl/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/tr/admin/accessories/general.php b/resources/lang/tr/admin/accessories/general.php index 5a7ff849bd..db28ac215c 100644 --- a/resources/lang/tr/admin/accessories/general.php +++ b/resources/lang/tr/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Aksesuar Kategorisi', 'accessory_name' => 'Aksesuar Adı', 'checkout' => 'Aksesuar Çıkışı', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => '\'yı Varsayılan Sözleşme yerine kullan.', 'use_default_eula_disabled' => 'Varsayılan sözleşmeyi kullan Varsayılan sözleşme tanımlı değil. Lütfen Ayarlar\'dan ekleyiniz.', -); +]; diff --git a/resources/lang/tr/admin/accessories/message.php b/resources/lang/tr/admin/accessories/message.php index 6e3bbe875c..33d5130c89 100644 --- a/resources/lang/tr/admin/accessories/message.php +++ b/resources/lang/tr/admin/accessories/message.php @@ -1,37 +1,36 @@ '[:id] numaralı aksesuar bulunmuyor.', 'assoc_users' => 'Bu aksesuardan :count adet kullanıcılara çıkış yapıldı. Lütfen aksesuar girişi yapınız ve tekrar deneyin.', - 'create' => array( + 'create' => [ 'error' => 'Aksesuar oluşturma başarısız. lütfen tekrar deneyin.', - 'success' => 'Aksesuar başarıyla güncellendi.' - ), + 'success' => 'Aksesuar başarıyla güncellendi.', + ], - 'update' => array( + 'update' => [ 'error' => 'Aksesuar güncellenmedi. Lütfen tekrar deneyin', - 'success' => 'Aksesuar başarı ile güncellendi.' - ), + 'success' => 'Aksesuar başarı ile güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu Aksesuar silmek istediğinizden emin misiniz?', 'error' => 'Aksesuarı silerken bir hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Aksesuar başarıyla silindi.' - ), + 'success' => 'Aksesuar başarıyla silindi.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Aksesuar çıkışı yapılamadı, lütfen tekrar deneyin', 'success' => 'Aksesuar çıkışı yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ), + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Aksesuar girişi yapılamadı, lütfen tekrar deneyin', 'success' => 'Aksesuar girişi yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ) + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - -); +]; diff --git a/resources/lang/tr/admin/accessories/table.php b/resources/lang/tr/admin/accessories/table.php index da1ff4a284..ec36d18e38 100644 --- a/resources/lang/tr/admin/accessories/table.php +++ b/resources/lang/tr/admin/accessories/table.php @@ -1,11 +1,10 @@ 'CSV olarak indir', - 'eula_text' => 'Son Kullanıcı Lisans Sözleşmesi', +return [ + 'dl_csv' => 'CSV olarak indir', + 'eula_text' => 'Son Kullanıcı Lisans Sözleşmesi', 'id' => 'ID', 'require_acceptance' => 'Onaylama', 'title' => 'Aksesuar Adı', - -); +]; diff --git a/resources/lang/tr/admin/asset_maintenances/form.php b/resources/lang/tr/admin/asset_maintenances/form.php index b808675ee0..4028e26b0f 100644 --- a/resources/lang/tr/admin/asset_maintenances/form.php +++ b/resources/lang/tr/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Günler', 'notes' => 'Notlar', 'update' => 'Güncelle', - 'create' => 'Oluştur' + 'create' => 'Oluştur', ]; diff --git a/resources/lang/tr/admin/asset_maintenances/message.php b/resources/lang/tr/admin/asset_maintenances/message.php index 9d12978b5a..f28a04aca0 100644 --- a/resources/lang/tr/admin/asset_maintenances/message.php +++ b/resources/lang/tr/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Varlık bakımını silmek istediğinizden emin misiniz?', 'error' => 'Varlık bakımını silerken bir hata oluştu. Lütfen tekrar deneyiniz.', - 'success' => 'Varlık bakımı başarıyla silindi.' + 'success' => 'Varlık bakımı başarıyla silindi.', ], 'create' => [ 'error' => 'Varlık bakımı oluşturulumadı, lütfen tekrar deneyin.', - 'success' => 'Varlık Bakımı başarıyla oluşturuldu.' + 'success' => 'Varlık Bakımı başarıyla oluşturuldu.', ], 'edit' => [ 'error' => 'Varlık Bakımı düzenlenmedi, lütfen tekrar deneyin.', - 'success' => 'Varlık Bakımı başarıyla düzenlendi.' + 'success' => 'Varlık Bakımı başarıyla düzenlendi.', ], 'asset_maintenance_incomplete' => 'Henüz Tamamlanmadı', 'warranty' => 'Garanti', 'not_warranty' => 'Garanti Yok', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/tr/admin/asset_maintenances/table.php b/resources/lang/tr/admin/asset_maintenances/table.php index dcdc72955d..8f3475b08a 100644 --- a/resources/lang/tr/admin/asset_maintenances/table.php +++ b/resources/lang/tr/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Demirbaş bakımı', 'asset_name' => 'Demirbaş adı', 'is_warranty' => 'Garanti', - 'dl_csv' => 'CSV olarak indir' + 'dl_csv' => 'CSV olarak indir', ]; diff --git a/resources/lang/tr/admin/categories/general.php b/resources/lang/tr/admin/categories/general.php index efd705f2b2..49c0f4a276 100644 --- a/resources/lang/tr/admin/categories/general.php +++ b/resources/lang/tr/admin/categories/general.php @@ -1,6 +1,6 @@ 'Demirbaş Kategorileri', 'category_name' => 'Kategori Adı', 'checkin_email' => 'Kullanıcıyı e-posta ile bilgilendir (iade etme / kullanıma alma).', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => '\'yı Varsayılan Sözleşme yerine kullan.', 'use_default_eula_disabled' => 'Varsayılan sözleşmeyi kullan Varsayılan sözleşme tanımlı değil. Lütfen Ayarlar\'dan ekleyiniz.', -); +]; diff --git a/resources/lang/tr/admin/categories/message.php b/resources/lang/tr/admin/categories/message.php index 3833ba7fd1..3e64595913 100644 --- a/resources/lang/tr/admin/categories/message.php +++ b/resources/lang/tr/admin/categories/message.php @@ -1,25 +1,25 @@ 'Kategori mevcut değil.', 'assoc_models' => 'Bu kategori en az 1 adet model ile ilişkili ve silinemez. Lütfen Modelleri güncelleyerek bu kategori ile bağını kesin ve tekrar deneyin. ', 'assoc_items' => 'Bu kategori en az 1 adet model ile ilişkili ve silinemez. Lütfen Modelleri güncelleyerek bu kategori ile bağını kesin ve tekrar deneyin. ', - 'create' => array( + 'create' => [ 'error' => 'Kategori oluşturulamadı. Lütfen tekrar deneyin.', - 'success' => 'Kategori oluşturuldu.' - ), + 'success' => 'Kategori oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Kategori güncellenemedi, Lütfen tekrar deneyin', - 'success' => 'Kategori güncellendi.' - ), + 'success' => 'Kategori güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu kategoriyi silmek istediğinize emin misiniz?', 'error' => 'Bu kategoriyi silerken bir hata ile karşılaşıldı. Lütfen tekrar deneyin.', - 'success' => 'Kategori silindi.' - ) + 'success' => 'Kategori silindi.', + ], -); +]; diff --git a/resources/lang/tr/admin/categories/table.php b/resources/lang/tr/admin/categories/table.php index 0e04d42130..e5c51a6df2 100644 --- a/resources/lang/tr/admin/categories/table.php +++ b/resources/lang/tr/admin/categories/table.php @@ -1,10 +1,10 @@ 'Son Kullanıcı Lisans Sözleşmesi', +return [ + 'eula_text' => 'Son Kullanıcı Lisans Sözleşmesi', 'id' => 'ID', 'parent' => 'Üst', 'require_acceptance' => 'Onaylama', 'title' => 'Demirbaş Kategori Adı', -); +]; diff --git a/resources/lang/tr/admin/companies/general.php b/resources/lang/tr/admin/companies/general.php index 56bd9d93c6..c495429b01 100644 --- a/resources/lang/tr/admin/companies/general.php +++ b/resources/lang/tr/admin/companies/general.php @@ -1,4 +1,5 @@ 'Firma Seç', ]; diff --git a/resources/lang/tr/admin/companies/message.php b/resources/lang/tr/admin/companies/message.php index b6f12ae188..ef29564c8d 100644 --- a/resources/lang/tr/admin/companies/message.php +++ b/resources/lang/tr/admin/companies/message.php @@ -1,18 +1,19 @@ 'Firma yok.', 'assoc_users' => 'Bu firma şu anda en az bir model ile ilişkili ve silinemez. Lütfen ilişkili modelden bu firmayı kaldırarak tekrar deneyin. ', - 'create' => array( + 'create' => [ 'error' => 'Firma oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Firma başarıyla oluşturuldu.' - ), - 'update' => array( + 'success' => 'Firma başarıyla oluşturuldu.', + ], + 'update' => [ 'error' => 'Firma güncelleştirilmedi, lütfen tekrar deneyin', - 'success' => 'Firma Başarıyla Güncellendi.' - ), - 'delete' => array( + 'success' => 'Firma Başarıyla Güncellendi.', + ], + 'delete' => [ 'confirm' => 'Bu firmayı silmek istediğinize emin misiniz?', 'error' => 'Firmayı silerken bir sorun oluştu. Lütfen yeniden deneyin.', - 'success' => 'Firma başarıyla silindi.' - ) -); + 'success' => 'Firma başarıyla silindi.', + ], +]; diff --git a/resources/lang/tr/admin/companies/table.php b/resources/lang/tr/admin/companies/table.php index 481a226128..e474380d20 100644 --- a/resources/lang/tr/admin/companies/table.php +++ b/resources/lang/tr/admin/companies/table.php @@ -1,9 +1,10 @@ 'Firmalar', 'create' => 'Firma Oluştur', 'title' => 'Firma', 'update' => 'Firmayı Güncelle', 'name' => 'Firma İsmi', 'id' => 'ID', -); +]; diff --git a/resources/lang/tr/admin/components/general.php b/resources/lang/tr/admin/components/general.php index f189c1d8cf..82791b05d8 100644 --- a/resources/lang/tr/admin/components/general.php +++ b/resources/lang/tr/admin/components/general.php @@ -1,6 +1,6 @@ 'Bileşen adı', 'checkin' => 'Bileşeni Kabul Et', 'checkout' => 'Bileşeni teslim et', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Kalan', 'total' => 'Toplam', 'update' => 'Bileşeni düzenle', -); +]; diff --git a/resources/lang/tr/admin/components/message.php b/resources/lang/tr/admin/components/message.php index 3b46880f7d..0f69f999ac 100644 --- a/resources/lang/tr/admin/components/message.php +++ b/resources/lang/tr/admin/components/message.php @@ -1,36 +1,35 @@ 'Bileşen mevcut değil.', - 'create' => array( + 'create' => [ 'error' => 'Bileşen oluşturulmadı, lütfen yeniden deneyin.', - 'success' => 'Bileşeni başarıyla oluşturuldu.' - ), + 'success' => 'Bileşeni başarıyla oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Bileşen güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Bileşen başarıyla güncelleştirildi.' - ), + 'success' => 'Bileşen başarıyla güncelleştirildi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu bileşeni silmek istediğinizden emin misiniz?', 'error' => 'Bileşen silinirken sorun oluştu. Lütfen yeniden deneyin.', - 'success' => 'Bileşen başarıyla silindi.' - ), + 'success' => 'Bileşen başarıyla silindi.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Bileşeni çıkışı yapılamadı, lütfen tekrar deneyin', 'success' => 'Bileşen çıkışı başarıyla yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ), + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Bileşen girişi yapılamadı, lütfen tekrar deneyin', 'success' => 'Bileşen girişi başarıyla yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ) + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - -); +]; diff --git a/resources/lang/tr/admin/components/table.php b/resources/lang/tr/admin/components/table.php index d751492131..0a97410475 100644 --- a/resources/lang/tr/admin/components/table.php +++ b/resources/lang/tr/admin/components/table.php @@ -1,5 +1,5 @@ 'Bileşen adı', -); +]; diff --git a/resources/lang/tr/admin/consumables/general.php b/resources/lang/tr/admin/consumables/general.php index 51e10e4caf..dbfad969f6 100644 --- a/resources/lang/tr/admin/consumables/general.php +++ b/resources/lang/tr/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Kullanıcıya Sarf malzemesi Satın Alma', 'consumable_name' => 'Sarf Malzemesi Adı', 'create' => 'Sarf Malzemesi Oluştur', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Kalan', 'total' => 'Toplam', 'update' => 'Sarf malzemesini Güncelle', -); +]; diff --git a/resources/lang/tr/admin/consumables/message.php b/resources/lang/tr/admin/consumables/message.php index 13a2d0016f..9b3982e021 100644 --- a/resources/lang/tr/admin/consumables/message.php +++ b/resources/lang/tr/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Sarf malzemesi mevcut değil.', - 'create' => array( + 'create' => [ 'error' => 'Sarf malzemesi oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Sarf malzemesi oluşturuldu.' - ), + 'success' => 'Sarf malzemesi oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Sarf malzemesi oluşturulamadı, lütfen tekrar deneyin', - 'success' => 'Sarf malzemesi güncellendi.' - ), + 'success' => 'Sarf malzemesi güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu sarf malzemesini silmek istediğinizden emin misiniz?', 'error' => 'Sarf malzemesi\'ni silerken hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Sarf malzemesi başarıyla silindi.' - ), + 'success' => 'Sarf malzemesi başarıyla silindi.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Sarf malzemesi çıkışı yapılamadı, lütfen tekrar deneyin', 'success' => 'Sarf malzemesi çıkışı yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ), + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Sarf malzemesi girişi yapılamadı, lütfen tekrar deneyin', 'success' => 'Sarf malzemesi girişi yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' - ) + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + ], - -); +]; diff --git a/resources/lang/tr/admin/consumables/table.php b/resources/lang/tr/admin/consumables/table.php index c162c4678c..15a8eb209a 100644 --- a/resources/lang/tr/admin/consumables/table.php +++ b/resources/lang/tr/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Sarf Malzemesi Adı', -); +]; diff --git a/resources/lang/tr/admin/custom_fields/general.php b/resources/lang/tr/admin/custom_fields/general.php index da7cd5314d..71fd74bcc7 100644 --- a/resources/lang/tr/admin/custom_fields/general.php +++ b/resources/lang/tr/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Özel alanlar', 'field' => 'Alan', 'about_fieldsets_title' => 'Alan kümeleri hakkında', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Yeni özel alan', 'value_encrypted' => 'Bu alanın değeri veritabanında şifrelidir. Yalnızca yönetici kullanıcıları şifresi çözülen değeri görüntüleyebilir', 'show_in_email' => 'Bu alandaki değer kullanıcıya gönderilen ödeme e-postalara dahil edilsin mi? Şifreli alanlar e-postalarda yer alamaz.', -); +]; diff --git a/resources/lang/tr/admin/custom_fields/message.php b/resources/lang/tr/admin/custom_fields/message.php index 356bbd0316..695dedcd24 100644 --- a/resources/lang/tr/admin/custom_fields/message.php +++ b/resources/lang/tr/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Bu alan geçersiz.', 'already_added' => 'Alan zaten mevcut', - 'create' => array( + 'create' => [ 'error' => 'Alan oluşturulamadı. Lütfen tekrar deneyin.', 'success' => 'Alan başarıyla oluşturuldu.', - 'assoc_success' => 'Alan, alan kümesine başarıyla eklendi.' - ), + 'assoc_success' => 'Alan, alan kümesine başarıyla eklendi.', + ], - 'update' => array( + 'update' => [ 'error' => 'Alan güncellenmedi. Lütfen tekrar deneyin', - 'success' => 'Alan başarıyla güncellendi.' - ), + 'success' => 'Alan başarıyla güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu alanı silmek istediğinizden emin misiniz?', 'error' => 'Silme işleminde başarısız. Lütfen tekrar deneyiniz.', 'success' => 'Alan başarıyla silindi.', 'in_use' => 'Alan hala kullanımda.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Alan kümesi yok', - 'create' => array( + 'create' => [ 'error' => 'Alan kümesi olşturulamadı, lütfen yeniden deneyin.', - 'success' => 'Alan kümesi başarıyla oluşturuldu.' - ), + 'success' => 'Alan kümesi başarıyla oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Alan güncelleştirilmedi, lütfen tekrar deneyin', - 'success' => 'Alan başarıyla güncelleştirildi.' - ), + 'success' => 'Alan başarıyla güncelleştirildi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu alanı silmek istediğinizden emin misiniz?', 'error' => 'Alanı silinirken bir sorun oluştu. Lütfen yeniden deneyin.', 'success' => 'Alan başarıyla silindi.', 'in_use' => 'Alan hala kullanılıyor.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/tr/admin/departments/message.php b/resources/lang/tr/admin/departments/message.php index 26aa99155e..9954e416d6 100644 --- a/resources/lang/tr/admin/departments/message.php +++ b/resources/lang/tr/admin/departments/message.php @@ -1,21 +1,21 @@ 'Bölüm mevcut değil.', 'assoc_users' => 'Bu bölüm şu anda en az bir kullanıcı ile ilişkili ve silinemez. Bölümü silebilmek için ilişkili kullanıcıları güncelleyin. ', - 'create' => array( + 'create' => [ 'error' => 'Bölüm oluşturulmadı, lütfen yeniden deneyin.', - 'success' => 'Bölüm başarıyla oluşturuldu.' - ), - 'update' => array( + 'success' => 'Bölüm başarıyla oluşturuldu.', + ], + 'update' => [ 'error' => 'Bölüm güncelleştirilmedi, lütfen tekrar deneyin', - 'success' => 'Bölüm başarıyla güncelleştirildi.' - ), - 'delete' => array( + 'success' => 'Bölüm başarıyla güncelleştirildi.', + ], + 'delete' => [ 'confirm' => 'Bu bölümü silmek istediğinizden emin misiniz?', 'error' => 'Bölüm silinirken bir sorun oluştu. Lütfen yeniden deneyin.', - 'success' => 'Bölüm başarıyla silindi.' - ) + 'success' => 'Bölüm başarıyla silindi.', + ], -); +]; diff --git a/resources/lang/tr/admin/departments/table.php b/resources/lang/tr/admin/departments/table.php index d277a03288..53d5b99ab8 100644 --- a/resources/lang/tr/admin/departments/table.php +++ b/resources/lang/tr/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Bölüm Adı', @@ -8,4 +8,4 @@ return array( 'location' => 'Konum', 'create' => 'Bölüm Oluştur', 'update' => 'Bölümü Güncelle', - ); + ]; diff --git a/resources/lang/tr/admin/depreciations/general.php b/resources/lang/tr/admin/depreciations/general.php index b748ddaa7c..c710cea181 100644 --- a/resources/lang/tr/admin/depreciations/general.php +++ b/resources/lang/tr/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Demirbaş Amortismanları Hakkında', 'about_depreciations' => 'Demirbaş amortismanını sabit bir oran ile düşecek şekilde ayarlayabilirsiniz.', 'asset_depreciations' => 'Demirbaş Amortismanları', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Ay Sayısı', 'update' => 'Değer Kaybını Güncelle', -); +]; diff --git a/resources/lang/tr/admin/depreciations/message.php b/resources/lang/tr/admin/depreciations/message.php index 85ccd777e9..83a9f0cb09 100644 --- a/resources/lang/tr/admin/depreciations/message.php +++ b/resources/lang/tr/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Amortisman sınıfı mevcut değil.', 'assoc_users' => 'Bu amortisman bir ya da daha çok model ile ilişkili ve silinemez. Lütfen önce modelleri siliniz, ardından tekrar deneyin. ', - - 'create' => array( + 'create' => [ 'error' => 'Amortisman sınıfı oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Amortisman sınıfı oluşturuldu.' - ), + 'success' => 'Amortisman sınıfı oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Amortisman sınıfı güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Amortisman sınıfı güncellendi.' - ), + 'success' => 'Amortisman sınıfı güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Amortisman sınıfını silmek istediğinize emin misiniz?', 'error' => 'Amortisman sınıfını silerken bir hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Amortisman sınıfı silindi.' - ) + 'success' => 'Amortisman sınıfı silindi.', + ], -); +]; diff --git a/resources/lang/tr/admin/depreciations/table.php b/resources/lang/tr/admin/depreciations/table.php index 65610babee..ffa4041e2a 100644 --- a/resources/lang/tr/admin/depreciations/table.php +++ b/resources/lang/tr/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Ay', 'term' => 'Süre', 'title' => 'İsim', -); +]; diff --git a/resources/lang/tr/admin/groups/message.php b/resources/lang/tr/admin/groups/message.php index cc1b3dae12..082d6c3fc7 100644 --- a/resources/lang/tr/admin/groups/message.php +++ b/resources/lang/tr/admin/groups/message.php @@ -1,22 +1,22 @@ 'Grup zaten mevcut.', 'group_not_found' => 'Grup [:id] mevcut değil.', 'group_name_required' => 'İsim alanı zorunludur', - 'success' => array( + 'success' => [ 'create' => 'Grup oluşturuldu.', 'update' => 'Grup güncellendi.', 'delete' => 'Grup silindi.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Grubu silmek istediğinize emin misiniz?', 'create' => 'Grup silinirken bir problem oluştu. Lütfen tekrar deneyin.', 'update' => 'Grup güncellenirken bir problem oluştu. Lütfen tekrar deneyin.', 'delete' => 'Grup silinirken bir problem oluştu. Lütfen tekrar deneyin.', - ), + ], -); +]; diff --git a/resources/lang/tr/admin/groups/table.php b/resources/lang/tr/admin/groups/table.php index dc4d5ccfef..95b6949d5a 100644 --- a/resources/lang/tr/admin/groups/table.php +++ b/resources/lang/tr/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => 'İsim', 'users' => '# Kullanıcı', -); +]; diff --git a/resources/lang/tr/admin/groups/titles.php b/resources/lang/tr/admin/groups/titles.php index 95e535e291..14c4df22be 100644 --- a/resources/lang/tr/admin/groups/titles.php +++ b/resources/lang/tr/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Gruplar hakkında', 'about_groups' => 'Gruplar, kullanıcı izinlerini genellemek için kullanılır.', 'group_management' => 'Grup Yönetimi', @@ -11,4 +11,4 @@ return array( 'allow' => 'Kabul Et', 'deny' => 'Reddet', -); +]; diff --git a/resources/lang/tr/admin/hardware/form.php b/resources/lang/tr/admin/hardware/form.php index 0e448ef93b..c78c5239d1 100644 --- a/resources/lang/tr/admin/hardware/form.php +++ b/resources/lang/tr/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Toplu varlık silmeyi onaylıyor musunuz?', +return [ + 'bulk_delete' => 'Toplu varlık silmeyi onaylıyor musunuz?', 'bulk_delete_help' => 'Toplu silme için aşağıdaki Varlıkları gözden geçirin. Silindikten sonra bu varlıkların geri yüklenebilir fakat atanmış olan herhangi bir kullanıcı ile ilişkili olmayacaktır.', 'bulk_delete_warn' => ':asset_count adet varlığı düzenlemek üzeresiniz.', - 'bulk_update' => 'Demirbaşları Toplu Güncelle', - 'bulk_update_help' => 'Bu form birden çok demirbaşı tek seferde güncellemenizi sağlar. Lütfen sadece değiştirmek istediğiniz alanları doldurunuz. Değiştirilmesini istemediğiniz alanları boş bırakınız. ', - 'bulk_update_warn' => ':asset_count adet demirbaşı düzenlemek üzeresiniz.', + 'bulk_update' => 'Demirbaşları Toplu Güncelle', + 'bulk_update_help' => 'Bu form birden çok demirbaşı tek seferde güncellemenizi sağlar. Lütfen sadece değiştirmek istediğiniz alanları doldurunuz. Değiştirilmesini istemediğiniz alanları boş bırakınız. ', + 'bulk_update_warn' => ':asset_count adet demirbaşı düzenlemek üzeresiniz.', 'checkedout_to' => 'Çıkış Yapılmış Olan Kişi', 'checkout_date' => 'Çıkış Tarihi', 'checkin_date' => 'Giriş Tarihi', @@ -38,7 +38,6 @@ return array( 'tag' => 'Demirbaş Etiketi', 'update' => 'Demirbaş Güncelle', 'warranty' => 'Garanti', - 'warranty_expires' => 'Garanti Süresi Sona Erdi', + 'warranty_expires' => 'Garanti Süresi Sona Erdi', 'years' => 'yıl', -) -; +]; diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php index 84cd48ffd5..cdd2677fbf 100644 --- a/resources/lang/tr/admin/hardware/general.php +++ b/resources/lang/tr/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Varlıklar hakkında', 'about_assets_text' => 'Varlıklar Demirbaştır seri numarası veya varlık etiketi ile takibi yapılır. Bu nedenle değerli varlıklar benzersiz varlık kimliği ile ilişkilendirilirler.', - 'archived' => 'Arşivlenmiş', + 'archived' => 'Arşivlenmiş', 'asset' => 'Demirbaş', 'bulk_checkout' => 'Varlıkları Kullanıma Alma', 'checkin' => 'Demirbaş Girişi Yap', @@ -19,4 +19,4 @@ return array( 'pending' => 'Bekliyor', 'undeployable' => 'Dağtılamaz', 'view' => 'Demirbaşı Görüntüle', -); +]; diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php index 52890acc87..ee3dc0fecc 100644 --- a/resources/lang/tr/admin/hardware/message.php +++ b/resources/lang/tr/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Uyarı: Bu demirbaş dağıtılamaz olarak işlaretlenmiş. Eğer durumu değişti ise, lütfen Demirbaş Durumu\'nu güncelleyiniz.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'İyi denemeydi. Bu varlık mevcut değil veya talep edilebilir değil.', 'assoc_users' => 'Bu demirbaş kullanıcıya çıkış yapılmış olaran görülüyor ve silinemez. Lütfen önce demirbaş girişi yapınız, ardından tekrar siliniz. ', - 'create' => array( + 'create' => [ 'error' => 'Demirbaş oluşturulamadı, lütfen tekrar deneyin. ', - 'success' => 'Demirbaş oluşturuldu.' - ), + 'success' => 'Demirbaş oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Demirbaş güncellenemedi, lütfen tekrar deneyin', 'success' => 'Demirbaş güncellendi.', 'nothing_updated' => 'Hiçbir alan seçilmedi, dolayısıyla hiç bir alan güncellenmedi.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Demirbaş geri getirilemedi, lütfen tekrar deneyin', - 'success' => 'Demirbaş geri getirildi.' - ), + 'success' => 'Demirbaş geri getirildi.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Varlık denetimi başarısız oldu. Lütfen tekrar deneyin.', - 'success' => 'Varlık denetimi başarıyla günlüğe kaydedildi.' - ), + 'success' => 'Varlık denetimi başarıyla günlüğe kaydedildi.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Dosya silinemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya silindi.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Dosya(lar) yüklenemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya(lar) yüklendi.', 'nofiles' => 'Yükleme için herhangi bir dosya seçmediniz veya karşıya yüklemeye çalıştığınız dosya çok büyük', 'invalidfiles' => 'Bir ya da daha fazla dosya izin verilen boyuttan daha büyük ya da izin verilmeyen bir dosya tipi seçtiniz. Lütfen dosya boyutu ve tipini kontrol ediniz.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Bazı öğeler doğru şekilde içe aktarılamadı.', 'errorDetail' => 'Aşağıdaki öğeler hatalar nedeniyle alınamadı.', - 'success' => "Dosyanızı içe aktarıldı", - 'file_delete_success' => "Dosyanız başarıyla silindi", - 'file_delete_error' => "Dosya silenemedi", - ), + 'success' => 'Dosyanızı içe aktarıldı', + 'file_delete_success' => 'Dosyanız başarıyla silindi', + 'file_delete_error' => 'Dosya silenemedi', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Demirbaşı silmek istediğinize emin misiniz?', 'error' => 'Demirbaş silinirken bir problem oluştu. Lütfen tekrar deneyin.', 'nothing_updated' => 'Herhangi bir varlık seçilmediği için silinemedi.', - 'success' => 'Demirbaş silindi.' - ), + 'success' => 'Demirbaş silindi.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Demirbaş çıkışı yapılamadı. Lütfen tekrar deneyin', 'success' => 'Demirbaş çıkışı yapıldı.', 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', 'not_available' => 'Bu varlık için atama yapılamaz!', - 'no_assets_selected' => 'Listeden en az bir varlık seçmelisiniz' - ), + 'no_assets_selected' => 'Listeden en az bir varlık seçmelisiniz', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Demirbaş girişi yapılamadı. Lütfen tekrar deneyin', 'success' => 'Demirbaş girişi yapıldı.', 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', 'already_checked_in' => 'Bu varlık zaten atanmış.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Varlık talep edilmemiş, lütfen tekrar deneyin', 'success' => 'Varlık talep edildi.', - 'canceled' => 'Varlık talebi reddedildi' - ) + 'canceled' => 'Varlık talebi reddedildi', + ], -); +]; diff --git a/resources/lang/tr/admin/hardware/table.php b/resources/lang/tr/admin/hardware/table.php index 253e58a7a0..94d1f6d8a5 100644 --- a/resources/lang/tr/admin/hardware/table.php +++ b/resources/lang/tr/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Demirbaş Etiketi', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Demirbaş ', 'image' => 'Cihaz resmi', 'days_without_acceptance' => 'Kabul edilmeden geçen gün', - 'monthly_depreciation' => 'Aylık Amortisman' + 'monthly_depreciation' => 'Aylık Amortisman', -); +]; diff --git a/resources/lang/tr/admin/kits/general.php b/resources/lang/tr/admin/kits/general.php index e84502b2d7..8dfd16bac6 100644 --- a/resources/lang/tr/admin/kits/general.php +++ b/resources/lang/tr/admin/kits/general.php @@ -1,6 +1,6 @@ 'Ön Tanımlı Kitler Hakkında', 'about_kits_text' => 'Ön Tanımlı Kit (sarf malzeme, lisans vb).', 'checkout' => 'Çıkış Tarihi ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Yeterli sayıda :consumable olmadığından çıkış yapılamıyor. :qty adet gereklidir. ', 'none_accessory' => 'Çıkış yapılabilecek sayıda :accessory bulunmamaktadır. :qty adet gereklidir. ', -); +]; diff --git a/resources/lang/tr/admin/licenses/form.php b/resources/lang/tr/admin/licenses/form.php index 58f7450e2d..f8ba6e29b7 100644 --- a/resources/lang/tr/admin/licenses/form.php +++ b/resources/lang/tr/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Demirbaş', 'checkin' => 'Giriş', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Lisans E-Postası', 'to_name' => 'Lisans Adı', 'update' => 'Lisansı Güncelle', - 'checkout_help' => 'Lisansı bir donanıma ya da kişiye atamak zorundasınız. İsterseniz her ikisini de seçebilirsiniz, fakat atama yapılan donanım atama yapılan kişiye çıkış yapılmış olmalıdır.' -); + 'checkout_help' => 'Lisansı bir donanıma ya da kişiye atamak zorundasınız. İsterseniz her ikisini de seçebilirsiniz, fakat atama yapılan donanım atama yapılan kişiye çıkış yapılmış olmalıdır.', +]; diff --git a/resources/lang/tr/admin/licenses/general.php b/resources/lang/tr/admin/licenses/general.php index 2b64606501..0cd13f83db 100644 --- a/resources/lang/tr/admin/licenses/general.php +++ b/resources/lang/tr/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Lisanslar Hakkında', 'about_licenses' => 'Lisanslar yazılım takibi için kullanılır. Kullanıcı sayısı kadar kişide kullanılabilir', 'checkin' => 'Lisans Kullanıcısı Girişi', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Yazılım Lisansları', 'user' => 'Kullanıcı', 'view' => 'Lisansı Göster', -); +]; diff --git a/resources/lang/tr/admin/licenses/message.php b/resources/lang/tr/admin/licenses/message.php index 5437fe1232..36b6af43f1 100644 --- a/resources/lang/tr/admin/licenses/message.php +++ b/resources/lang/tr/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Lisans mevcut değil.', 'user_does_not_exist' => 'Kullanıcı mevcut değil.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Bir varlık veya kullanıcı seçmelisiniz, ancak her ikisini birden değil.', 'not_found' => 'Lisans bulunamadı', - - 'create' => array( + 'create' => [ 'error' => 'Lisans oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Lisans oluşturuldu.' - ), + 'success' => 'Lisans oluşturuldu.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Dosya silinemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya silindi.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Dosya(lar) yüklenemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya(lar) yüklendi.', 'nofiles' => 'Yükleme için herhangi bir dosya seçmediniz veya karşıya yüklemeye çalıştığınız dosya çok büyük', 'invalidfiles' => 'Bir veya daha fazla dosya çok büyük veya izin verilmeyen bir dosya türü. İzin verilen dosya türleri; png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Lisans güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Lisans güncellendi.' - ), + 'success' => 'Lisans güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Lisansı silmek istediğinize emin misiniz?', 'error' => 'Lisansı silerken bir hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Lisans silindi.' - ), + 'success' => 'Lisans silindi.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Lisans çıkışı yapılırken hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Lisans çıkışı yapıldı.' - ), + 'success' => 'Lisans çıkışı yapıldı.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Lisans girişi yapılırken hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Lisans girişi yapıldı' - ), + 'success' => 'Lisans girişi yapıldı', + ], -); +]; diff --git a/resources/lang/tr/admin/licenses/table.php b/resources/lang/tr/admin/licenses/table.php index bb4e61743d..3b248609f5 100644 --- a/resources/lang/tr/admin/licenses/table.php +++ b/resources/lang/tr/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Atanan', 'checkout' => 'Giriş/Çıkış', @@ -14,4 +14,4 @@ return array( 'serial' => 'Seri No', 'title' => 'Lisans', -); +]; diff --git a/resources/lang/tr/admin/locations/message.php b/resources/lang/tr/admin/locations/message.php index 68de5114fb..d82ed60a1c 100644 --- a/resources/lang/tr/admin/locations/message.php +++ b/resources/lang/tr/admin/locations/message.php @@ -1,27 +1,26 @@ 'Konum mevcut değil.', 'assoc_users' => 'Konum en az 1 kullanıcı ile ilişkili durumda ve silinemez. Lütfen önce kullanıcıları güncelleyerek konumu boşaltın ve tekrar deneyin. ', 'assoc_assets' => 'Bu konum şu anda en az bir varlık ile ilişkili ve silinemez. Lütfen artık bu konumu kullanabilmek için varlık konumlarını güncelleştirin.', 'assoc_child_loc' => 'Bu konum şu anda en az bir alt konum üstüdür ve silinemez. Lütfen artık bu konuma ait alt konumları güncelleyin. ', - - 'create' => array( + 'create' => [ 'error' => 'Konum oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Konum oluşturuldu.' - ), + 'success' => 'Konum oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Konum güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Konum güncellendi.' - ), + 'success' => 'Konum güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Konumu silmek istediğinize emin misiniz?', 'error' => 'Konum silinirken bir hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Konum silindi.' - ) + 'success' => 'Konum silindi.', + ], -); +]; diff --git a/resources/lang/tr/admin/locations/table.php b/resources/lang/tr/admin/locations/table.php index 4c8ab93d2c..02262692d8 100644 --- a/resources/lang/tr/admin/locations/table.php +++ b/resources/lang/tr/admin/locations/table.php @@ -1,6 +1,6 @@ 'Lokasyonlar hakkında', 'about_locations' => 'Konum bilgileri kullanıcılar, varlıklar ve diğer nesneleri izlemek için kullanılır', 'assets_rtd' => 'Varlıklar', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Üst', 'currency' => 'Lokasyon Para Birimi', 'ldap_ou' => 'LDAP arama OU', - ); + ]; diff --git a/resources/lang/tr/admin/manufacturers/message.php b/resources/lang/tr/admin/manufacturers/message.php index e6a894ec17..ad83f4bc69 100644 --- a/resources/lang/tr/admin/manufacturers/message.php +++ b/resources/lang/tr/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Üretici mevcut değil.', 'assoc_users' => 'Üretici en az 1 model ile ilişkili durumda ve silinemez. Lütfen önce modelleri güncelleyerek üreticiyi boşa çıkarın ve tekrar deneyin. ', - 'create' => array( + 'create' => [ 'error' => 'Üretici oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Üretici oluşturuldu.' - ), + 'success' => 'Üretici oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Üretici güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Üretici güncellendi.' - ), + 'success' => 'Üretici güncellendi.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Üretici geri yüklenmedi, lütfen tekrar deneyin', - 'success' => 'Üretici başarıyla geri yüklendi.' - ), + 'success' => 'Üretici başarıyla geri yüklendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Üreticiyi silmek istediğinize emin misiniz?', 'error' => 'Üretici silinirken bir hata oluştu. Lütfen tekrar deneyin.', - 'success' => 'Üretici silindi.' - ) + 'success' => 'Üretici silindi.', + ], -); +]; diff --git a/resources/lang/tr/admin/manufacturers/table.php b/resources/lang/tr/admin/manufacturers/table.php index 8140ec5f2f..727a9604d8 100644 --- a/resources/lang/tr/admin/manufacturers/table.php +++ b/resources/lang/tr/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Üreticiler hakkında', 'about_manufacturers_text' => 'Üreticiler varlıkları oluşturan şirketledir. Önemli servis sağlayıcı bilgilerinizi burada saklayabilirsiniz. Varlıkların detay kısmında bu bilgilere ulaşabilirsiniz.', 'asset_manufacturers' => 'Demirbaş Üreticileri', @@ -13,4 +13,4 @@ return array( 'update' => 'Üretici Güncelle', 'url' => 'URL', -); +]; diff --git a/resources/lang/tr/admin/models/general.php b/resources/lang/tr/admin/models/general.php index b844d2213d..f1806a2494 100644 --- a/resources/lang/tr/admin/models/general.php +++ b/resources/lang/tr/admin/models/general.php @@ -1,6 +1,6 @@ 'Varlık Modelleri Hakkında', 'about_models_text' => 'Varlık Modelleri, özdeş varlıkları gruplamanın bir yoludur. Örn: "Tiny M73", "Samsung A7", vb.', 'deleted' => 'Model silindi. Geri getirmek için buraya tıklayınız.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => ':model_count varlık modellerini silmek üzeresiniz.', 'restore' => 'Modeli geri getir', 'requestable' => 'Kullanıcılar bu modeli talep edebilir', - 'show_mac_address' => 'Bu model demirbaşta MAC adresi göster', + 'show_mac_address' => 'Bu model demirbaşta MAC adresi göster', 'view_deleted' => 'Silinenleri görüntüle', 'view_models' => 'Modelleri görüntüle', 'fieldset' => 'Alan', 'no_custom_field' => 'Özel alan yok', 'add_default_values' => 'Varsayılan değerleri ekle', -); +]; diff --git a/resources/lang/tr/admin/models/message.php b/resources/lang/tr/admin/models/message.php index 05e3dda1b9..1883f7f709 100644 --- a/resources/lang/tr/admin/models/message.php +++ b/resources/lang/tr/admin/models/message.php @@ -1,42 +1,41 @@ 'Model mevcut değil.', 'assoc_users' => 'Model bir ya da daha çok demirbaş ile ilişkili ve silinemez. Lütfen demirbaşları silin ve tekrar deneyin. ', - - 'create' => array( + 'create' => [ 'error' => 'Klasör oluşturulmadı, lütfen tekrar deneyin.', 'success' => 'Model oluşturuldu.', 'duplicate_set' => 'Bu üretici ve model numarası ile bir varlık ve model zaten var.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Model güncellendi.' - ), + 'success' => 'Model güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu demirbaş modelini silmek istediğinize emin misiniz?', 'error' => 'Demirbaş silinirken bir problem oluştu. Lütfen tekrar deneyin.', - 'success' => 'Model silindi.' - ), + 'success' => 'Model silindi.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model geri getirilemedi, lütfen tekrar deneyin', - 'success' => 'Model geri getirildi.' - ), + 'success' => 'Model geri getirildi.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Hiçbir alan değiştirilmedi, dolayısıyla hiç bir alan güncellenmedi.', - 'success' => 'Model güncellendi.' - ), + 'success' => 'Model güncellendi.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Hiçbir model seçilmedi, bu nedenle hiçbir şey silinmedi.', 'success' => ': success_count model (ler) silindi!', - 'success_partial' => ':success_count adet model(ler) silindi, ancak :fail_count adet için silme işlemini tamamlayamadık, çünkü bunlar halâ varlıklarla ilişkilendirilmiş durumda.' - ), + 'success_partial' => ':success_count adet model(ler) silindi, ancak :fail_count adet için silme işlemini tamamlayamadık, çünkü bunlar halâ varlıklarla ilişkilendirilmiş durumda.', + ], -); +]; diff --git a/resources/lang/tr/admin/models/table.php b/resources/lang/tr/admin/models/table.php index 939ef6cf9b..0b792e9d13 100644 --- a/resources/lang/tr/admin/models/table.php +++ b/resources/lang/tr/admin/models/table.php @@ -1,6 +1,6 @@ 'Demirbaş Modeli Oluştur', 'created_at' => 'Şurada oluşturuldu', @@ -14,4 +14,4 @@ return array( 'update' => 'Demirbaş Modeli Güncelle', 'clone' => 'Modeli Kopyala', 'edit' => 'Modeli Düzenle', -); +]; diff --git a/resources/lang/tr/admin/reports/general.php b/resources/lang/tr/admin/reports/general.php index 9e2436d084..3da6010268 100644 --- a/resources/lang/tr/admin/reports/general.php +++ b/resources/lang/tr/admin/reports/general.php @@ -1,5 +1,5 @@ 'Demirbaş Raporu için istediğiniz seçenekleri seçiniz.' -); +return [ + 'info' => 'Demirbaş Raporu için istediğiniz seçenekleri seçiniz.', +]; diff --git a/resources/lang/tr/admin/reports/message.php b/resources/lang/tr/admin/reports/message.php index ab916a50aa..9a8bafd572 100644 --- a/resources/lang/tr/admin/reports/message.php +++ b/resources/lang/tr/admin/reports/message.php @@ -1,5 +1,5 @@ 'En az 1 seçenek seçmeniz gerekiyor.' -); +return [ + 'error' => 'En az 1 seçenek seçmeniz gerekiyor.', +]; diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php index a0082a6206..1775d4ec68 100644 --- a/resources/lang/tr/admin/settings/general.php +++ b/resources/lang/tr/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory etki alanı', 'ad_domain_help' => 'Mail etki alanı gibidir fakat her zaman aynı olmayabilir.', 'ad_append_domain_label' => 'Alan adını sonuna ekle', 'ad_append_domain' => 'Alan adını kullanıcı adının sonuna ekle', - 'ad_append_domain_help' => 'Kullanıcı "kullanıcıadı@alan.adı" yazmak zorunda değil, bunun yerine "kullanıcıadı" yazabilir.' , + 'ad_append_domain_help' => 'Kullanıcı "kullanıcıadı@alan.adı" yazmak zorunda değil, bunun yerine "kullanıcıadı" yazabilir.', 'admin_cc_email' => 'CC e-Posta', 'admin_cc_email_help' => 'Kullanıcılar bir ek e-posta hesabına gönderilen iade etme/kullanıma alma e-posta bir kopyasını göndermek isterseniz, buraya girin. Aksi takdirde bu alanı boş bırakın.', 'is_ad' => 'Active Directory sunucusudur', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Uyarı bitiş zamanı (gün içinde)', 'alert_inv_threshold' => 'Son uyarı zamanı', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Demirbaş No', 'audit_interval' => 'Denetim Aralığı', 'audit_interval_help' => 'Varlıklarınızı düzenli olarak fiziksel olarak denetlemeniz gerekiyorsa, aralığı ay olarak girin.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'İki Aşamalı Kod Girin', 'two_factor_config_complete' => 'Kodu Gönder', 'two_factor_enabled_edit_not_allowed' => 'Yöneticiniz bu ayarı düzenlemeniz için izin vermiyor.', - 'two_factor_enrollment_text' => "Cihazınız henüz kayıtlı değil ancak iki aşamalı kimlik doğrulama gereklidir. Google kimlik doğrulayıcısı app açmak ve tarama QR kodu cihazınızı kayıt için aşağıdaki. Aygıtınız kayıtlı sonra aşağıdaki kodu girin", + 'two_factor_enrollment_text' => 'Cihazınız henüz kayıtlı değil ancak iki aşamalı kimlik doğrulama gereklidir. Google kimlik doğrulayıcısı app açmak ve tarama QR kodu cihazınızı kayıt için aşağıdaki. Aygıtınız kayıtlı sonra aşağıdaki kodu girin', 'require_accept_signature' => 'İmza Gerekli', 'require_accept_signature_help_text' => 'Bu özelliği etkinleştirmek kullanıcıların fiziksel olarak bir varlık kabul evrağı imzalaması gerekir.', 'left' => 'sol', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Bu kutunun işaretlenmesi, varlık serileri üzerinde benzersiz bir kısıtlama uygular', 'zerofill_count' => 'Varlık etiketlerinin uzunluğu, boşluksuz olmak üzere', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/tr/admin/settings/message.php b/resources/lang/tr/admin/settings/message.php index 322285daa6..2b1d1f9e4f 100644 --- a/resources/lang/tr/admin/settings/message.php +++ b/resources/lang/tr/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Güncelleme yapılırken bir hata oluştu. ', - 'success' => 'Ayarlar güncellendi.' - ), - 'backup' => array( + 'success' => 'Ayarlar güncellendi.', + ], + 'backup' => [ 'delete_confirm' => 'Bu yedek dosyayı silmek istediğinizden emin misiniz? Bu eylem geri alınamaz. ', 'file_deleted' => 'Yedek dosyası başarıyla silindi.', 'generated' => 'Yeni bir yedekleme dosyası başarıyla oluşturuldu.', 'file_not_found' => 'Bu yedek dosyası sunucuda bulunamadı.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Temizleme sırasında bir hata oluştu. ', 'validation_failed' => 'Temizle onay kodu yanlıştır. Lütfen onay kutusuna "DELETE" yazın.', - 'success' => 'Silinen kayıtları başarıyla temizlendi.' - ), + 'success' => 'Silinen kayıtları başarıyla temizlendi.', + ], -); +]; diff --git a/resources/lang/tr/admin/statuslabels/message.php b/resources/lang/tr/admin/statuslabels/message.php index 6736ac59a2..5c15d2454a 100644 --- a/resources/lang/tr/admin/statuslabels/message.php +++ b/resources/lang/tr/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Durum etiket yok.', 'assoc_assets' => 'Bu durum etiketi şu anda en az bir varlık ile ilişkili ve silinemez. Lütfen artık bu durum başvuru ve yeniden denemek için sabit kıymetleri güncelleştirin. ', - - 'create' => array( + 'create' => [ 'error' => 'Durum etiketi oluşturulamadı, lütfen yeniden deneyin.', - 'success' => 'Durum etiketi başarıyla oluşturuldu.' - ), + 'success' => 'Durum etiketi başarıyla oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Durum etiket güncelleştirilmedi, lütfen tekrar deneyin', - 'success' => 'Durum etiketi başarıyla güncelleştirildi.' - ), + 'success' => 'Durum etiketi başarıyla güncelleştirildi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bu durum etiketi silmek istediğinizden emin misiniz?', 'error' => 'Durum etiketi silerken bir sorun oluştu. Lütfen yeniden deneyin.', - 'success' => 'Durum etiketi başarıyla silindi.' - ), + 'success' => 'Durum etiketi başarıyla silindi.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Bu varlıklar kimseye atanamaz.', 'deployable' => 'Bu varlıklar kontrol edilebilir. Bunlar atandıktan sonra, Devlete bir meta statüsü üstleneceklerdir.', 'archived' => 'Bu öğeler kontrol edilemez ve yalnızca Arşivlenmiş görünümde görünür. Bu, bütçeleme / tarihi amaçlar için varlıklarla ilgili bilgileri korumakta, ancak bunları günlük günlük varlık listesinin dışında tutmak için kullanışlıdır.', 'pending' => 'Bu varlıklar kimseye atanamıyor, genellikle onarım için olan ancak dolaşıma dönmesi beklenen öğeler için kullanılıyor.', - ), + ], -); +]; diff --git a/resources/lang/tr/admin/statuslabels/table.php b/resources/lang/tr/admin/statuslabels/table.php index e0a7f8e208..04ad8950bc 100644 --- a/resources/lang/tr/admin/statuslabels/table.php +++ b/resources/lang/tr/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Durum Etiketi Hakkında', 'archived' => 'Arşivlenmiş', 'create' => 'Durum Etiketi Oluştur', @@ -16,4 +16,4 @@ return array( 'title' => 'Durum Etiketleri', 'undeployable' => 'Dağtılamaz', 'update' => 'Durum Etiketi Güncelle', -); +]; diff --git a/resources/lang/tr/admin/suppliers/message.php b/resources/lang/tr/admin/suppliers/message.php index a34f37e4ac..211c5c8693 100644 --- a/resources/lang/tr/admin/suppliers/message.php +++ b/resources/lang/tr/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Tedarikçi mevcut değil.', - - 'create' => array( + 'create' => [ 'error' => 'Tedarikçi oluşturulamadı, lütfen tekrar deneyin.', - 'success' => 'Tedarikçi oluşturuldu.' - ), + 'success' => 'Tedarikçi oluşturuldu.', + ], - 'update' => array( + 'update' => [ 'error' => 'Tedarikçi güncellenemedi, lütfen tekrar deneyin', - 'success' => 'Tedarikçi güncellendi.' - ), + 'success' => 'Tedarikçi güncellendi.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Tedarikçiyi silmek istediğinize emin misiniz?', 'error' => 'Tedarikçi silinirken bir hata oluştu. Lütfen tekrar deneyin.', 'success' => 'Tedarikçi silindi.', 'assoc_assets' => 'Bu tedarikçi halihazırda :asset_count asset(s) ilişkili durumda ve silinemez. Lütfen varlıklarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', 'assoc_licenses' => 'Bu tedarikçi halihazırda :licenses_count licences(s) ilişkili durumda ve silinemez. Lütfen lisanslarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', 'assoc_maintenances' => 'Bu tedarikçi halihazırda :asset_maintenances_count asset maintenances(s) ilişkili durumda ve silinemez. Lütfen varlık bakımlarınızı bu tedarikçi ile ilişkisi olmayacak şekilde güncelleyin ve yeniden deneyin. ', - ) + ], -); +]; diff --git a/resources/lang/tr/admin/suppliers/table.php b/resources/lang/tr/admin/suppliers/table.php index 24bf5be22a..bfa8a4f27f 100644 --- a/resources/lang/tr/admin/suppliers/table.php +++ b/resources/lang/tr/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Tedarikçiler Hakkında', 'about_suppliers_text' => 'Tedarikçiler, varlıkların kaynağını izlemek için kullanılır', 'address' => 'Tedarikçi Adresi', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Demirbaşları görüntüle', 'zip' => 'Posta kodu', -); +]; diff --git a/resources/lang/tr/admin/users/general.php b/resources/lang/tr/admin/users/general.php index 34ea6a80dc..09a69a6df7 100644 --- a/resources/lang/tr/admin/users/general.php +++ b/resources/lang/tr/admin/users/general.php @@ -1,7 +1,6 @@ 'Bu kullanıcı giriş yapabilir', 'activated_disabled_help_text' => 'Kendi hesabınız için aktivasyon durumunu düzenleyemezsiniz.', 'assets_user' => 'Demirbaşlar şu kişiye atandı :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Kullanıcıyı Düzenle', 'filetype_info' => 'İzin verilen dosya türleri; png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', 'history_user' => ':name Kişisi ile iligli geçmiş', - 'info' => 'Bilgi', + 'info' => 'Bilgi', 'restore_user' => 'Onları geri yüklemek için buraya tıklayın.', 'last_login' => 'Son oturum açma tarihi', 'ldap_config_text' => 'LDAP yapılandırma ayarları Yönetici> Ayarlar\'da bulunabilir. Seçilen yer (isteğe bağlı), tüm içe aktarılan kullanıcılar için ayarlanır.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Mevcut yönetici ayarlarınız, iki aşamalı kimlik doğrulamasının seçici olarak uygulanmasına izin verir. ', 'two_factor_enrolled' => 'Kayıtlı 2FA Cihazı ', 'two_factor_active' => '2FA Etkin ', - ); + ]; diff --git a/resources/lang/tr/admin/users/message.php b/resources/lang/tr/admin/users/message.php index c0cd4558a0..55fd03dda6 100644 --- a/resources/lang/tr/admin/users/message.php +++ b/resources/lang/tr/admin/users/message.php @@ -1,6 +1,6 @@ 'Bu aksesuarı başarıyla kabul ettiniz.', 'declined' => 'Bu varlığı başarıyla reddettiniz.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP entegrasyonu bu yükleme için yapılandırılmamış.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Kullanıcı başarıyla oluşturuldu.', 'update' => 'Kullanıcı başarıyla güncelleştirildi.', 'update_bulk' => 'Kullanıcılar başarıyla güncelleştirildi!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Kullanıcı erişimi açıldı.', 'restored' => 'Kullanıcı başarıyla geri yüklendi.', 'import' => 'Kullanıcılar başarıyla içe aktarıldı.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Kullanıcı oluştururken bir sorun oluştu. Lütfen yeniden deneyin.', 'update' => 'Kullanıcı oluştururken bir sorun oluştu. Lütfen yeniden deneyin.', 'delete' => 'Kullanıcı silinirken bir problem oluştu. Lütfen tekrar deneyin.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin.
LDAP sunucusundan Hata:', 'ldap_could_not_get_entries' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin.
LDAP sunucusundan Hata:', 'password_ldap' => 'Bu hesabın parolası LDAP / Active Directory tarafından yönetilir. Lütfen şifrenizi değiştirmek için BT departmanınızla iletişime geçin.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Dosya silinemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya silindi.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Dosya(lar) yüklenemedi. Lütfen tekrar deneyin.', 'success' => 'Dosya(lar) yüklendi.', 'nofiles' => 'Yükleme için hiç bir dosya seçmediniz', 'invalidfiles' => 'Bir veya daha fazla dosya çok büyük veya izin verilmeyen bir dosya türü. İzin verilen dosya türleri png, Gif, jpg, doc, docx, pdf, txt.', - ), + ], -); +]; diff --git a/resources/lang/tr/admin/users/table.php b/resources/lang/tr/admin/users/table.php index ad3eb05e69..6b0e1066af 100644 --- a/resources/lang/tr/admin/users/table.php +++ b/resources/lang/tr/admin/users/table.php @@ -1,6 +1,6 @@ 'Aktif', 'allow' => 'Kabul Et', 'checkedout' => 'Demirbaşlar', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Geçerli Kullanıcıları Göster', 'show_deleted' => 'Silinen Kullanıcıları Göster', 'title' => 'Başlık', - 'to_restore_them' => 'geri yüklemek için.', + 'to_restore_them' => 'geri yüklemek için.', 'updateuser' => 'Kullanıcıyı Güncelle', 'username' => 'Kullanıcı Adı', - 'user_deleted_text' => 'Bu kullanıcı silindi olarak işaretlenmiş.', + 'user_deleted_text' => 'Bu kullanıcı silindi olarak işaretlenmiş.', 'username_note' => '(Bu yalnızca Active Directory bağlama için kullanılır, giriş için değildir.)', 'cloneuser' => 'Kullanıcıyı Kopyala', 'viewusers' => 'Kullanıcıları Görüntüle', -); +]; diff --git a/resources/lang/tr/auth/general.php b/resources/lang/tr/auth/general.php index 0d09457da1..34b7ce0544 100644 --- a/resources/lang/tr/auth/general.php +++ b/resources/lang/tr/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'E-posta ile bir şifre sıfırlama bağlantısı almak için kullanıcı adınızı girin.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/tr/auth/message.php b/resources/lang/tr/auth/message.php index b6f62f6353..87341ffc4f 100644 --- a/resources/lang/tr/auth/message.php +++ b/resources/lang/tr/auth/message.php @@ -1,6 +1,6 @@ 'Bu email adresi ile tanımlanmış bir hesap var.', 'account_not_found' => 'Kullanıcı adı veya şifresi yanlış.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Hesabınız engellenmiş.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Bir problem ile karşılaştık, lütfen tekrar deneyin.', 'success' => 'Başarıyla giriş yaptınız.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Hesabınızı oluştururken bir hata oluştu, lütfen tekrar deneyiniz.', 'success' => 'Hesap başarılı bir şekilde oluşturuldu.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Şifre resetleme kodu oluştururken bir hata oluştu, lütfen tekrar deneyiniz.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Şifrenizi sıfırlarken bir hata oluştu, lütfen tekrar deneyiniz.', 'success' => 'Şifreniz başarı ile sıfırlandı.', - ), + ], - -); +]; diff --git a/resources/lang/tr/button.php b/resources/lang/tr/button.php index 68fd7509e3..dfd2babc67 100644 --- a/resources/lang/tr/button.php +++ b/resources/lang/tr/button.php @@ -1,6 +1,6 @@ 'Hareketler', 'add' => 'Yeni ekle', 'cancel' => 'İptal', @@ -11,7 +11,7 @@ return array( 'request' => 'İstek', 'submit' => 'Gönder', 'upload' => 'Yükle', - 'select_file' => 'Dosya Seç...', + 'select_file' => 'Dosya Seç...', 'select_files' => 'Dosyaları seçin...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php index b838f328d8..cf791957a5 100644 --- a/resources/lang/tr/general.php +++ b/resources/lang/tr/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Girişler', 'user_requests_count' => 'İstekler', 'city' => 'Şehir', - 'click_here' => 'Buraya Tıklayın', + 'click_here' => 'Buraya Tıklayın', 'clear_selection' => 'Seçimi Temizle', 'companies' => 'Şirketler', 'company' => 'Şirket', 'component' => 'Bileşen', 'components' => 'Bileşenler', - 'complete' => 'Tamamla', + 'complete' => 'Tamamla', 'consumable' => 'Sarf Malzeme', 'consumables' => 'Sarf Malzemeleri', 'country' => 'Ülke', diff --git a/resources/lang/tr/help.php b/resources/lang/tr/help.php index f51030df19..56e7edda26 100644 --- a/resources/lang/tr/help.php +++ b/resources/lang/tr/help.php @@ -1,6 +1,6 @@ "Daha Fazla Bilgi", + 'more_info_title' => 'Daha Fazla Bilgi', - "audit_help" => "Bu kutucuğu işaretlediğinizde varlık kaydı yeni lokasyonu gösterir. İşaretlenmemiş olarak bırakırsanız denetim kayıtlarında basitçe lokasyonu not edecektir.

Eğer varlığın çıkışı yapılmışsa, çıkışı yapılan kişiyi, varlığı veya lokasyonu değiştirmeyecektir.", + 'audit_help' => 'Bu kutucuğu işaretlediğinizde varlık kaydı yeni lokasyonu gösterir. İşaretlenmemiş olarak bırakırsanız denetim kayıtlarında basitçe lokasyonu not edecektir.

Eğer varlığın çıkışı yapılmışsa, çıkışı yapılan kişiyi, varlığı veya lokasyonu değiştirmeyecektir.', 'assets' => 'Varlıklar seri numaraları veya varlık etiketleri ile takip edilir. Bunlar bir öğeyi belirlemek için daha yüksek öneme sahip olma eğilimindedir.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Demirbaş amortismanını sabit bir oran ile düşecek şekilde ayarlayabilirsiniz.', - - -); +]; diff --git a/resources/lang/tr/mail.php b/resources/lang/tr/mail.php index 43c87519e7..f59520697a 100644 --- a/resources/lang/tr/mail.php +++ b/resources/lang/tr/mail.php @@ -1,6 +1,6 @@ 'Bir kullanıcı web sitede öğe talebinden vazgeçti', 'a_user_requested' => 'Bir kullanıcı websitede bir öğe talebinde bulundu', 'accessory_name' => 'Aksesuar Adı:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/tr/pagination.php b/resources/lang/tr/pagination.php index e80c32d160..51f352dde3 100644 --- a/resources/lang/tr/pagination.php +++ b/resources/lang/tr/pagination.php @@ -1,6 +1,6 @@ 'Sonraki »', -); +]; diff --git a/resources/lang/tr/passwords.php b/resources/lang/tr/passwords.php index f8f8694836..e665d85233 100644 --- a/resources/lang/tr/passwords.php +++ b/resources/lang/tr/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Şifre bağlantısı gönderildi!', 'user' => 'Bu e-posta ile eşleşen hiçbir etkin kullanıcı bulunamadı.', ]; - diff --git a/resources/lang/tr/reminders.php b/resources/lang/tr/reminders.php index 5e84b4eac6..c672f05162 100644 --- a/resources/lang/tr/reminders.php +++ b/resources/lang/tr/reminders.php @@ -1,6 +1,6 @@ "Şifre en az 6 karakter olmalı ve birbiriyle eşleşmeli.", + 'password' => 'Şifre en az 6 karakter olmalı ve birbiriyle eşleşmeli.', - "user" => "Kullanıcı adı veya e-mail adresi hatalı", + 'user' => 'Kullanıcı adı veya e-mail adresi hatalı', - "token" => "Şifre sıfırlama anahtarı geçersiz.", + 'token' => 'Şifre sıfırlama anahtarı geçersiz.', - "sent" => "Eşleşen email bulunsaydı, şifre gönderilirdi!", + 'sent' => 'Eşleşen email bulunsaydı, şifre gönderilirdi!', -); +]; diff --git a/resources/lang/tr/table.php b/resources/lang/tr/table.php index c4d85cebe0..026bffefef 100644 --- a/resources/lang/tr/table.php +++ b/resources/lang/tr/table.php @@ -1,10 +1,10 @@ 'Hareketler', 'action' => 'Hareket', 'by' => 'Tarafından', 'item' => 'Ürün', -); +]; diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php index f70c415436..7b72083444 100644 --- a/resources/lang/tr/validation.php +++ b/resources/lang/tr/validation.php @@ -1,6 +1,6 @@ ':attribute zaten alınmış.', 'uploaded' => ': Özniteliği yüklenemedi.', 'url' => ':attribute biçim geçersiz.', - "unique_undeleted" => ":attribute benzersiz olmalıdır.", + 'unique_undeleted' => ':attribute benzersiz olmalıdır.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ": Attribute alanı, izin verilmeyen bir karakter içeriyor.", - "email_array" => "Bir veya daha fazla e-posta adresi geçersiz.", - "hashed_pass" => "Geçerli şifre yanlış", + 'alpha_space' => ': Attribute alanı, izin verilmeyen bir karakter içeriyor.', + 'email_array' => 'Bir veya daha fazla e-posta adresi geçersiz.', + 'hashed_pass' => 'Geçerli şifre yanlış', 'dumbpwd' => 'Bu şifre çok yaygındır.', - "statuslabel_type" => "Geçerli bir durum etiketi türü seçmelisiniz", + 'statuslabel_type' => 'Geçerli bir durum etiketi türü seçmelisiniz', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/uk/admin/accessories/general.php b/resources/lang/uk/admin/accessories/general.php index 4ced62dffc..7117488a37 100644 --- a/resources/lang/uk/admin/accessories/general.php +++ b/resources/lang/uk/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Категорія аксесуарів', 'accessory_name' => 'Назва аксесуара', 'checkout' => 'Видати аксесуар', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/uk/admin/accessories/message.php b/resources/lang/uk/admin/accessories/message.php index fc1bd83344..58bacf644a 100644 --- a/resources/lang/uk/admin/accessories/message.php +++ b/resources/lang/uk/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'Аксесуар успішно створено.' - ), + 'success' => 'Аксесуар успішно створено.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'Аксесуар успішно видалено.' - ), + 'success' => 'Аксесуар успішно видалено.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Аксесуар успішно видано.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/uk/admin/accessories/table.php b/resources/lang/uk/admin/accessories/table.php index d93c6fd27b..f83d90f9cb 100644 --- a/resources/lang/uk/admin/accessories/table.php +++ b/resources/lang/uk/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Назва аксесуара', - -); +]; diff --git a/resources/lang/uk/admin/asset_maintenances/form.php b/resources/lang/uk/admin/asset_maintenances/form.php index 543d3e9f0b..3ddd188f8c 100644 --- a/resources/lang/uk/admin/asset_maintenances/form.php +++ b/resources/lang/uk/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Днів', 'notes' => 'Нотатки', 'update' => 'Оновити', - 'create' => 'Створити' + 'create' => 'Створити', ]; diff --git a/resources/lang/uk/admin/asset_maintenances/message.php b/resources/lang/uk/admin/asset_maintenances/message.php index 2b21bf6ce0..fcf48b3349 100644 --- a/resources/lang/uk/admin/asset_maintenances/message.php +++ b/resources/lang/uk/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Ще не завершено', 'warranty' => 'Гарантійний', 'not_warranty' => 'Не гарантійний', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/uk/admin/asset_maintenances/table.php b/resources/lang/uk/admin/asset_maintenances/table.php index 8b4e148d13..9c7e623b81 100644 --- a/resources/lang/uk/admin/asset_maintenances/table.php +++ b/resources/lang/uk/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Обслуговування активів', 'asset_name' => 'Назва активу', 'is_warranty' => 'Гарантія', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/uk/admin/categories/general.php b/resources/lang/uk/admin/categories/general.php index f3f393baa2..79e245faab 100644 --- a/resources/lang/uk/admin/categories/general.php +++ b/resources/lang/uk/admin/categories/general.php @@ -1,6 +1,6 @@ 'Категорії активів', 'category_name' => 'Назва категорії', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Використовувати основну EULA.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/uk/admin/categories/message.php b/resources/lang/uk/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/uk/admin/categories/message.php +++ b/resources/lang/uk/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/uk/admin/categories/table.php b/resources/lang/uk/admin/categories/table.php index e5a2b683a5..79d7d85123 100644 --- a/resources/lang/uk/admin/categories/table.php +++ b/resources/lang/uk/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Батьківський', 'require_acceptance' => 'Acceptance', 'title' => 'Назва категорії актива', -); +]; diff --git a/resources/lang/uk/admin/companies/general.php b/resources/lang/uk/admin/companies/general.php index a1e6584a89..0afb3be81c 100644 --- a/resources/lang/uk/admin/companies/general.php +++ b/resources/lang/uk/admin/companies/general.php @@ -1,4 +1,5 @@ 'Оберіть компанію', ]; diff --git a/resources/lang/uk/admin/companies/message.php b/resources/lang/uk/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/uk/admin/companies/message.php +++ b/resources/lang/uk/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/uk/admin/companies/table.php b/resources/lang/uk/admin/companies/table.php index f081b10ca7..f0ba86510d 100644 --- a/resources/lang/uk/admin/companies/table.php +++ b/resources/lang/uk/admin/companies/table.php @@ -1,9 +1,10 @@ 'Компанії', 'create' => 'Створити компанію', 'title' => 'Компанія', 'update' => 'Оновити компанію', 'name' => 'Назва компанії', 'id' => 'ID', -); +]; diff --git a/resources/lang/uk/admin/components/general.php b/resources/lang/uk/admin/components/general.php index 4837ad900f..a89ce322b9 100644 --- a/resources/lang/uk/admin/components/general.php +++ b/resources/lang/uk/admin/components/general.php @@ -1,6 +1,6 @@ 'Назва компонента', 'checkin' => 'Прийняти компонент', 'checkout' => 'Видати компонент', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Залишилось', 'total' => 'Загалом', 'update' => 'Оновити компонент', -); +]; diff --git a/resources/lang/uk/admin/components/message.php b/resources/lang/uk/admin/components/message.php index b1ba4de11f..fb3a65eb67 100644 --- a/resources/lang/uk/admin/components/message.php +++ b/resources/lang/uk/admin/components/message.php @@ -1,36 +1,35 @@ 'Компонент не існує.', - 'create' => array( + 'create' => [ 'error' => 'Компонент не створився, спробуйте ще раз.', - 'success' => 'Компонент успішно створено.' - ), + 'success' => 'Компонент успішно створено.', + ], - 'update' => array( + 'update' => [ 'error' => 'Компонент не оновився, спробуйте ще раз', - 'success' => 'Компонент успішно оновлено.' - ), + 'success' => 'Компонент успішно оновлено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені, що хочете видалити цей компонент?', 'error' => 'Виникла проблема при видаленні компонента. Спробуйте ще раз.', - 'success' => 'Компонент було успішно видалено.' - ), + 'success' => 'Компонент було успішно видалено.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Компонент не було видано, спробуйте ще раз', 'success' => 'Копонент успішно видано.', - 'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.' - ), + 'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Компонент не було видано, спробуйте ще раз', 'success' => 'Компонент успішно прийнято.', - 'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.' - ) + 'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.', + ], - -); +]; diff --git a/resources/lang/uk/admin/components/table.php b/resources/lang/uk/admin/components/table.php index d8e540c61d..b2ca0e4522 100644 --- a/resources/lang/uk/admin/components/table.php +++ b/resources/lang/uk/admin/components/table.php @@ -1,5 +1,5 @@ 'Назва компоненту', -); +]; diff --git a/resources/lang/uk/admin/consumables/general.php b/resources/lang/uk/admin/consumables/general.php index 2611a9a6b6..df7c258fcd 100644 --- a/resources/lang/uk/admin/consumables/general.php +++ b/resources/lang/uk/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Видати витратний матеріал користувачу', 'consumable_name' => 'Назва витратного матеріалу', 'create' => 'Створити витратний матеріал', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Залишилось', 'total' => 'Загалом', 'update' => 'Оновити витратний матеріал', -); +]; diff --git a/resources/lang/uk/admin/consumables/message.php b/resources/lang/uk/admin/consumables/message.php index 957281f8e6..3ff840c978 100644 --- a/resources/lang/uk/admin/consumables/message.php +++ b/resources/lang/uk/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Витратний матеріал не існує.', - 'create' => array( + 'create' => [ 'error' => 'Витратний матеріал не було створено, спробуйте ще раз.', - 'success' => 'Витратний матеріал успішно створено.' - ), + 'success' => 'Витратний матеріал успішно створено.', + ], - 'update' => array( + 'update' => [ 'error' => 'Витратний матеріал не було оновлено, спробуйте ще раз', - 'success' => 'Витратний матеріал успішно оновлено.' - ), + 'success' => 'Витратний матеріал успішно оновлено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені що хочете видалити цей витратний матеріал?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'Вказаного користувача не існує. Спробуйте ще раз.' - ) + 'user_does_not_exist' => 'Вказаного користувача не існує. Спробуйте ще раз.', + ], - -); +]; diff --git a/resources/lang/uk/admin/consumables/table.php b/resources/lang/uk/admin/consumables/table.php index e58bcea42c..e75957145d 100644 --- a/resources/lang/uk/admin/consumables/table.php +++ b/resources/lang/uk/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Назва витратного матеріалу', -); +]; diff --git a/resources/lang/uk/admin/custom_fields/general.php b/resources/lang/uk/admin/custom_fields/general.php index 23092ec797..a527078af2 100644 --- a/resources/lang/uk/admin/custom_fields/general.php +++ b/resources/lang/uk/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/uk/admin/custom_fields/message.php b/resources/lang/uk/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/uk/admin/custom_fields/message.php +++ b/resources/lang/uk/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/uk/admin/departments/message.php b/resources/lang/uk/admin/departments/message.php index 820c348737..c3dcacc286 100644 --- a/resources/lang/uk/admin/departments/message.php +++ b/resources/lang/uk/admin/departments/message.php @@ -1,21 +1,21 @@ 'Розташування не існує.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Розташування успішно створено.' - ), - 'update' => array( + 'success' => 'Розташування успішно створено.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/uk/admin/departments/table.php b/resources/lang/uk/admin/departments/table.php index fb5ee21829..5013e63add 100644 --- a/resources/lang/uk/admin/departments/table.php +++ b/resources/lang/uk/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Назва відділу', @@ -8,4 +8,4 @@ return array( 'location' => 'Розташування', 'create' => 'Створити відділ', 'update' => 'Оновити відділ', - ); + ]; diff --git a/resources/lang/uk/admin/depreciations/general.php b/resources/lang/uk/admin/depreciations/general.php index cd37f8ce36..041b64d04c 100644 --- a/resources/lang/uk/admin/depreciations/general.php +++ b/resources/lang/uk/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Кількість місяців', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/uk/admin/depreciations/message.php b/resources/lang/uk/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/uk/admin/depreciations/message.php +++ b/resources/lang/uk/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/uk/admin/depreciations/table.php b/resources/lang/uk/admin/depreciations/table.php index aa4f016e11..f50c7bf267 100644 --- a/resources/lang/uk/admin/depreciations/table.php +++ b/resources/lang/uk/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'міс.', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/uk/admin/groups/message.php b/resources/lang/uk/admin/groups/message.php index 1b3eed7e00..2b5e0da7c5 100644 --- a/resources/lang/uk/admin/groups/message.php +++ b/resources/lang/uk/admin/groups/message.php @@ -1,22 +1,22 @@ 'Група вже існує!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Групу успішно створено.', 'update' => 'Групу успішно оновлено.', 'delete' => 'Групу успішно видалено.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені, що бажаєте видалити цю групу?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/uk/admin/groups/table.php b/resources/lang/uk/admin/groups/table.php index b8309ec720..9ad0603a53 100644 --- a/resources/lang/uk/admin/groups/table.php +++ b/resources/lang/uk/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Назва', 'users' => '# користувачів', -); +]; diff --git a/resources/lang/uk/admin/groups/titles.php b/resources/lang/uk/admin/groups/titles.php index dec4d7a4fb..beca6d9ce7 100644 --- a/resources/lang/uk/admin/groups/titles.php +++ b/resources/lang/uk/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Про групи', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Дозволити', 'deny' => 'Заборонити', -); +]; diff --git a/resources/lang/uk/admin/hardware/form.php b/resources/lang/uk/admin/hardware/form.php index 2cbfecf213..699f767d11 100644 --- a/resources/lang/uk/admin/hardware/form.php +++ b/resources/lang/uk/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Видано', 'checkout_date' => 'Дата видачі', 'checkin_date' => 'Дата повернення', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Оновити актив', 'warranty' => 'Гарантія', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'р.', -) -; +]; diff --git a/resources/lang/uk/admin/hardware/general.php b/resources/lang/uk/admin/hardware/general.php index 9eb67e294b..c14a76e526 100644 --- a/resources/lang/uk/admin/hardware/general.php +++ b/resources/lang/uk/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Про активи', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Архівний', + 'archived' => 'Архівний', 'asset' => 'Актив', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Прийняти актив', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'Переглянути актив', -); +]; diff --git a/resources/lang/uk/admin/hardware/message.php b/resources/lang/uk/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/uk/admin/hardware/message.php +++ b/resources/lang/uk/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/uk/admin/hardware/table.php b/resources/lang/uk/admin/hardware/table.php index 27fb0d3844..56fb11ac11 100644 --- a/resources/lang/uk/admin/hardware/table.php +++ b/resources/lang/uk/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Тег активу', 'asset_model' => 'Модель', @@ -20,6 +20,6 @@ return array( 'title' => 'Актив ', 'image' => 'Зображення пристрою', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/uk/admin/kits/general.php b/resources/lang/uk/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/uk/admin/kits/general.php +++ b/resources/lang/uk/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/uk/admin/licenses/form.php b/resources/lang/uk/admin/licenses/form.php index dadbef4684..f04351ea78 100644 --- a/resources/lang/uk/admin/licenses/form.php +++ b/resources/lang/uk/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Актив', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/uk/admin/licenses/general.php b/resources/lang/uk/admin/licenses/general.php index 5b7f4b19af..ee152c3e0a 100644 --- a/resources/lang/uk/admin/licenses/general.php +++ b/resources/lang/uk/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Про ліцензії', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Ліцензії на програмне забезпечення', 'user' => 'Користувач', 'view' => 'Переглянути ліцензію', -); +]; diff --git a/resources/lang/uk/admin/licenses/message.php b/resources/lang/uk/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/uk/admin/licenses/message.php +++ b/resources/lang/uk/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/uk/admin/licenses/table.php b/resources/lang/uk/admin/licenses/table.php index 55bb028d8b..c5e47a8aa8 100644 --- a/resources/lang/uk/admin/licenses/table.php +++ b/resources/lang/uk/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Призначено', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Серійник', 'title' => 'Ліцензія', -); +]; diff --git a/resources/lang/uk/admin/locations/message.php b/resources/lang/uk/admin/locations/message.php index d8ede8d017..e9c6430a10 100644 --- a/resources/lang/uk/admin/locations/message.php +++ b/resources/lang/uk/admin/locations/message.php @@ -1,27 +1,26 @@ 'Розташування не існує.', 'assoc_users' => 'Розташування зараз пов\'язано як мінімум з одним користувачем та не може бути видалено. Оновіть ваших користувачів, так щоб вони не були більше пов\'язані з розташуванням і спробуйте ще раз. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Розташування успішно створено.' - ), + 'success' => 'Розташування успішно створено.', + ], - 'update' => array( + 'update' => [ 'error' => 'Розташування не було оновлено, спробуйте ще раз', - 'success' => 'Розташування успішно створено.' - ), + 'success' => 'Розташування успішно створено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені, що хочете видати це розташування?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'Розташування було успішно видалено.' - ) + 'success' => 'Розташування було успішно видалено.', + ], -); +]; diff --git a/resources/lang/uk/admin/locations/table.php b/resources/lang/uk/admin/locations/table.php index 8deb56c2b2..3abb657d6f 100644 --- a/resources/lang/uk/admin/locations/table.php +++ b/resources/lang/uk/admin/locations/table.php @@ -1,6 +1,6 @@ 'Про розташування', 'about_locations' => 'Розташування використовуються для відсліджування інформації про місцеположення для користувачів, активів та іншого', 'assets_rtd' => 'Активи', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Батьківський', 'currency' => 'Валюта розташування', 'ldap_ou' => 'Пошук OU в LDAP', - ); + ]; diff --git a/resources/lang/uk/admin/manufacturers/message.php b/resources/lang/uk/admin/manufacturers/message.php index 8518bff2e3..c0ac12f544 100644 --- a/resources/lang/uk/admin/manufacturers/message.php +++ b/resources/lang/uk/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Виробник не існує.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Виробник успішно створений.' - ), + 'success' => 'Виробник успішно створений.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Виробника успішно оновлено.' - ), + 'success' => 'Виробника успішно оновлено.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені що хочете видалити виробника?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'Виробник успішно видалений.' - ) + 'success' => 'Виробник успішно видалений.', + ], -); +]; diff --git a/resources/lang/uk/admin/manufacturers/table.php b/resources/lang/uk/admin/manufacturers/table.php index d81f020360..8205f5000a 100644 --- a/resources/lang/uk/admin/manufacturers/table.php +++ b/resources/lang/uk/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Про виробників', 'about_manufacturers_text' => 'Виробники це компанії, що виготовляються ваші активи. Ви можете зберігати необхідну контактну інформацію про них, що буде відображатися на сторінках з детальним описом актвів.', 'asset_manufacturers' => 'Виробники активів', @@ -13,4 +13,4 @@ return array( 'update' => 'Оновити виробника', 'url' => 'URL', -); +]; diff --git a/resources/lang/uk/admin/models/general.php b/resources/lang/uk/admin/models/general.php index 68ba2654c7..24858c4188 100644 --- a/resources/lang/uk/admin/models/general.php +++ b/resources/lang/uk/admin/models/general.php @@ -1,6 +1,6 @@ 'Про моделі активів', 'about_models_text' => 'Моделі активів це спосіб групування ідентичних активів. Наприклад, «Lenovo G700», «Nokia 3310», тощо.', 'deleted' => 'Цю мадель видалено. Натисніть для її відновлення.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Відновити модель', 'requestable' => 'Користувачі можуть створювати запит на цю модель', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'Переглянути видалені', 'view_models' => 'Переглянути моделі', 'fieldset' => 'Набір полів', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/uk/admin/models/message.php b/resources/lang/uk/admin/models/message.php index f09a3d9142..de0a527f2a 100644 --- a/resources/lang/uk/admin/models/message.php +++ b/resources/lang/uk/admin/models/message.php @@ -1,42 +1,41 @@ 'Модель не існує.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Модель успішно створено.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви впевнені, що хочете видалити цю модель?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'Модель успішно видалено.' - ), + 'success' => 'Модель успішно видалено.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Моделі оновлено.' - ), + 'success' => 'Моделі оновлено.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/uk/admin/models/table.php b/resources/lang/uk/admin/models/table.php index baeba3635d..0691e3feb7 100644 --- a/resources/lang/uk/admin/models/table.php +++ b/resources/lang/uk/admin/models/table.php @@ -1,6 +1,6 @@ 'Створити модель активу', 'created_at' => 'Створено', @@ -14,4 +14,4 @@ return array( 'update' => 'Оновити модель активу', 'clone' => 'Клонувати модель', 'edit' => 'Редагувати модель', -); +]; diff --git a/resources/lang/uk/admin/reports/general.php b/resources/lang/uk/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/uk/admin/reports/general.php +++ b/resources/lang/uk/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/uk/admin/reports/message.php b/resources/lang/uk/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/uk/admin/reports/message.php +++ b/resources/lang/uk/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/uk/admin/settings/general.php b/resources/lang/uk/admin/settings/general.php index dcf07b14f9..934e46cd55 100644 --- a/resources/lang/uk/admin/settings/general.php +++ b/resources/lang/uk/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Домен Active directory', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Це сервер Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID активів', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/uk/admin/settings/message.php b/resources/lang/uk/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/uk/admin/settings/message.php +++ b/resources/lang/uk/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/uk/admin/statuslabels/message.php b/resources/lang/uk/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/uk/admin/statuslabels/message.php +++ b/resources/lang/uk/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/uk/admin/statuslabels/table.php b/resources/lang/uk/admin/statuslabels/table.php index 92a08218f8..05c5544c3f 100644 --- a/resources/lang/uk/admin/statuslabels/table.php +++ b/resources/lang/uk/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/uk/admin/suppliers/message.php b/resources/lang/uk/admin/suppliers/message.php index ee03ab5b07..62418a9f2f 100644 --- a/resources/lang/uk/admin/suppliers/message.php +++ b/resources/lang/uk/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Постачальник не існує.', - - 'create' => array( + 'create' => [ 'error' => 'Постачальник не був створений, будь ласка, повторіть спробу.', - 'success' => 'Постачальник успішно створений.' - ), + 'success' => 'Постачальник успішно створений.', + ], - 'update' => array( + 'update' => [ 'error' => 'Постачальника не було оновлено, будь ласка, спробуйте ще раз', - 'success' => 'Постачальника успішно оновлено.' - ), + 'success' => 'Постачальника успішно оновлено.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ви дійсно хочете видалити цього постачальника?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Постачальника успішно видалено.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/uk/admin/suppliers/table.php b/resources/lang/uk/admin/suppliers/table.php index 8fcacff42e..6b4a82451a 100644 --- a/resources/lang/uk/admin/suppliers/table.php +++ b/resources/lang/uk/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Про постачальників', 'about_suppliers_text' => 'Постачальники використовуються для відстеження джерела появи активів', 'address' => 'Адреса постачальника', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Переглянути активи для', 'zip' => 'Поштовий код', -); +]; diff --git a/resources/lang/uk/admin/users/general.php b/resources/lang/uk/admin/users/general.php index a4a8e92339..b5ec0cebf3 100644 --- a/resources/lang/uk/admin/users/general.php +++ b/resources/lang/uk/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Редагувати користувача', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Інфо', + 'info' => 'Інфо', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Останній вхід', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/uk/admin/users/message.php b/resources/lang/uk/admin/users/message.php index 678f8a9a75..1325dc5261 100644 --- a/resources/lang/uk/admin/users/message.php +++ b/resources/lang/uk/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'Файл успішно видалено.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/uk/admin/users/table.php b/resources/lang/uk/admin/users/table.php index a41abfe004..72f6b02026 100644 --- a/resources/lang/uk/admin/users/table.php +++ b/resources/lang/uk/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Дозволити', 'checkedout' => 'Активи', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Показати поточних користувачів', 'show_deleted' => 'Показати видалених користувачів', 'title' => 'Назва', - 'to_restore_them' => 'щоб відновити їх.', + 'to_restore_them' => 'щоб відновити їх.', 'updateuser' => 'Оновити користувача', 'username' => 'Ім\'я кристувача', - 'user_deleted_text' => 'Цього користувача було позначено видаленим.', + 'user_deleted_text' => 'Цього користувача було позначено видаленим.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Клонувати користувача', 'viewusers' => 'Переглянути користувачів', -); +]; diff --git a/resources/lang/uk/auth/general.php b/resources/lang/uk/auth/general.php index 981f3b2566..0f8ea1af91 100644 --- a/resources/lang/uk/auth/general.php +++ b/resources/lang/uk/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Введіть ваше ім\'я користувача, щоб отримати посилання для зміни пароля.', 'username_help_bottom' => 'Ваше ім\'я користувача та електронна адреса можуть бути однаковими, але можуть не бути, в залежності від вашої конфігурації. Якщо ви не можете згадати своє ім\'я користувача, зверніться до адміністратора.

Якщо ім\'я користувача не має пов\'язаної електронної пошти, то неможливо надіслати посилання для зміни пароля. ', ]; - diff --git a/resources/lang/uk/auth/message.php b/resources/lang/uk/auth/message.php index b71075f4bf..d4a2dc027c 100644 --- a/resources/lang/uk/auth/message.php +++ b/resources/lang/uk/auth/message.php @@ -1,6 +1,6 @@ 'Обліковий запис з цією електронною адресою вже існує.', 'account_not_found' => 'Неправильне ім\'я користувача або пароль.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Цей аккаунт заблоковано.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Під час спроби входу в систему сталася помилка. Будь ласка, спробуйте ще раз.', 'success' => 'Ви успішно увійшли в систему.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Сталася помилка під час створення свого облікового запису, будь ласка, спробуйте ще раз.', 'success' => 'Обліковий запис успішно створено.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/uk/button.php b/resources/lang/uk/button.php index 505f63e512..dc40d3099e 100644 --- a/resources/lang/uk/button.php +++ b/resources/lang/uk/button.php @@ -1,6 +1,6 @@ 'Дії', 'add' => 'Додати новий', 'cancel' => 'Скасувати', @@ -11,7 +11,7 @@ return array( 'request' => 'Запит', 'submit' => 'Зберегти', 'upload' => 'Upload', - 'select_file' => 'Обрати файл...', + 'select_file' => 'Обрати файл...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/uk/general.php b/resources/lang/uk/general.php index 08e6076aff..f18ff6bfe6 100644 --- a/resources/lang/uk/general.php +++ b/resources/lang/uk/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Місто', - 'click_here' => 'Натисніть тут', + 'click_here' => 'Натисніть тут', 'clear_selection' => 'Очистити поле', 'companies' => 'Компанії', 'company' => 'Компанія', 'component' => 'Компонент', 'components' => 'Компоненти', - 'complete' => 'Завершити', + 'complete' => 'Завершити', 'consumable' => 'Витратний', 'consumables' => 'Витратні матеріали', 'country' => 'Країна', diff --git a/resources/lang/uk/help.php b/resources/lang/uk/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/uk/help.php +++ b/resources/lang/uk/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/uk/mail.php b/resources/lang/uk/mail.php index 209d0ac352..801ec29eab 100644 --- a/resources/lang/uk/mail.php +++ b/resources/lang/uk/mail.php @@ -1,6 +1,6 @@ 'Користувач скасував запит на об\'єкт на веб-сайті', 'a_user_requested' => 'Користувач надіслав запит на об\'єкт на веб-сайті', 'accessory_name' => 'Назва аксесуара:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/uk/pagination.php b/resources/lang/uk/pagination.php index 571df83901..06f647656c 100644 --- a/resources/lang/uk/pagination.php +++ b/resources/lang/uk/pagination.php @@ -1,6 +1,6 @@ 'Наступна »', -); +]; diff --git a/resources/lang/uk/passwords.php b/resources/lang/uk/passwords.php index 02737db694..a216a1f150 100644 --- a/resources/lang/uk/passwords.php +++ b/resources/lang/uk/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Лінк на пароль було надіслано!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/uk/reminders.php b/resources/lang/uk/reminders.php index 3cf504949d..0fe8a3b61b 100644 --- a/resources/lang/uk/reminders.php +++ b/resources/lang/uk/reminders.php @@ -1,6 +1,6 @@ "Паролі повинні складатися з шести символів і відповідати вимогам безпеки.", + 'password' => 'Паролі повинні складатися з шести символів і відповідати вимогам безпеки.', - "user" => "Ім'я користувача або електронна адреса невірна", + 'user' => "Ім'я користувача або електронна адреса невірна", - "token" => "Токен для скидання паролю невірний.", + 'token' => 'Токен для скидання паролю невірний.', - "sent" => "Якщо електронна адреса вірна, нагадування пароля буде відправлено!", + 'sent' => 'Якщо електронна адреса вірна, нагадування пароля буде відправлено!', -); +]; diff --git a/resources/lang/uk/table.php b/resources/lang/uk/table.php index 9ad145bdb1..dc2cb25190 100644 --- a/resources/lang/uk/table.php +++ b/resources/lang/uk/table.php @@ -1,10 +1,10 @@ 'Дії', 'action' => 'Дія', 'by' => 'Ким', 'item' => 'Елемент', -); +]; diff --git a/resources/lang/uk/validation.php b/resources/lang/uk/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/uk/validation.php +++ b/resources/lang/uk/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/ur-PK/admin/accessories/general.php b/resources/lang/ur-PK/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/ur-PK/admin/accessories/general.php +++ b/resources/lang/ur-PK/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/ur-PK/admin/accessories/message.php b/resources/lang/ur-PK/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/ur-PK/admin/accessories/message.php +++ b/resources/lang/ur-PK/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ur-PK/admin/accessories/table.php b/resources/lang/ur-PK/admin/accessories/table.php index e02d9f22e4..69c4d46aab 100644 --- a/resources/lang/ur-PK/admin/accessories/table.php +++ b/resources/lang/ur-PK/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Download CSV', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => 'Download CSV', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', 'title' => 'Accessory Name', - -); +]; diff --git a/resources/lang/ur-PK/admin/asset_maintenances/form.php b/resources/lang/ur-PK/admin/asset_maintenances/form.php index 2aa005c45f..1cf3b4ce57 100644 --- a/resources/lang/ur-PK/admin/asset_maintenances/form.php +++ b/resources/lang/ur-PK/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', 'update' => 'Update', - 'create' => 'Create' + 'create' => 'Create', ]; diff --git a/resources/lang/ur-PK/admin/asset_maintenances/message.php b/resources/lang/ur-PK/admin/asset_maintenances/message.php index d121115825..b44f618207 100644 --- a/resources/lang/ur-PK/admin/asset_maintenances/message.php +++ b/resources/lang/ur-PK/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset maintenance?', 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'success' => 'The asset maintenance was deleted successfully.', ], 'create' => [ 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'success' => 'Asset Maintenance created successfully.', ], 'edit' => [ 'error' => 'Asset Maintenance was not edited, please try again.', - 'success' => 'Asset Maintenance edited successfully.' + 'success' => 'Asset Maintenance edited successfully.', ], 'asset_maintenance_incomplete' => 'Not Completed Yet', 'warranty' => 'Warranty', 'not_warranty' => 'Not Warranty', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/ur-PK/admin/asset_maintenances/table.php b/resources/lang/ur-PK/admin/asset_maintenances/table.php index f3a6be60f9..3ba895038d 100644 --- a/resources/lang/ur-PK/admin/asset_maintenances/table.php +++ b/resources/lang/ur-PK/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Asset Maintenance', 'asset_name' => 'Asset Name', 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'dl_csv' => 'Download CSV', ]; diff --git a/resources/lang/ur-PK/admin/categories/general.php b/resources/lang/ur-PK/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/ur-PK/admin/categories/general.php +++ b/resources/lang/ur-PK/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/ur-PK/admin/categories/message.php b/resources/lang/ur-PK/admin/categories/message.php index 48cf5478e1..0ccfc36db7 100644 --- a/resources/lang/ur-PK/admin/categories/message.php +++ b/resources/lang/ur-PK/admin/categories/message.php @@ -1,25 +1,25 @@ 'Category does not exist.', 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Category was not created, please try again.', - 'success' => 'Category created successfully.' - ), + 'success' => 'Category created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' - ), + 'success' => 'Category updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this category?', 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' - ) + 'success' => 'The category was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/categories/table.php b/resources/lang/ur-PK/admin/categories/table.php index a3ee96ae7f..9daa9df2ad 100644 --- a/resources/lang/ur-PK/admin/categories/table.php +++ b/resources/lang/ur-PK/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Parent', 'require_acceptance' => 'Acceptance', 'title' => 'Asset Category Name', -); +]; diff --git a/resources/lang/ur-PK/admin/companies/general.php b/resources/lang/ur-PK/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/ur-PK/admin/companies/general.php +++ b/resources/lang/ur-PK/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/ur-PK/admin/companies/message.php b/resources/lang/ur-PK/admin/companies/message.php index a6db573519..b44bdd4b85 100644 --- a/resources/lang/ur-PK/admin/companies/message.php +++ b/resources/lang/ur-PK/admin/companies/message.php @@ -1,18 +1,19 @@ 'Company does not exist.', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' - ), - 'update' => array( + 'success' => 'Company created successfully.', + ], + 'update' => [ 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' - ), - 'delete' => array( + 'success' => 'Company updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this company?', 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' - ) -); + 'success' => 'The Company was deleted successfully.', + ], +]; diff --git a/resources/lang/ur-PK/admin/companies/table.php b/resources/lang/ur-PK/admin/companies/table.php index 2f86126ff2..465b02465b 100644 --- a/resources/lang/ur-PK/admin/companies/table.php +++ b/resources/lang/ur-PK/admin/companies/table.php @@ -1,9 +1,10 @@ 'Companies', 'create' => 'Create Company', 'title' => 'Company', 'update' => 'Update Company', 'name' => 'Company Name', 'id' => 'ID', -); +]; diff --git a/resources/lang/ur-PK/admin/components/general.php b/resources/lang/ur-PK/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/ur-PK/admin/components/general.php +++ b/resources/lang/ur-PK/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/ur-PK/admin/components/message.php b/resources/lang/ur-PK/admin/components/message.php index 1d13970f23..cd59ba7b14 100644 --- a/resources/lang/ur-PK/admin/components/message.php +++ b/resources/lang/ur-PK/admin/components/message.php @@ -1,36 +1,35 @@ 'Component does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' - ), + 'success' => 'Component created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' - ), + 'success' => 'Component updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this component?', 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' - ), + 'success' => 'The component was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Component was not checked out, please try again', 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Component was not checked in, please try again', 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ur-PK/admin/components/table.php b/resources/lang/ur-PK/admin/components/table.php index 3d4fed6a7f..8bf1410242 100644 --- a/resources/lang/ur-PK/admin/components/table.php +++ b/resources/lang/ur-PK/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', -); +]; diff --git a/resources/lang/ur-PK/admin/consumables/general.php b/resources/lang/ur-PK/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/ur-PK/admin/consumables/general.php +++ b/resources/lang/ur-PK/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/ur-PK/admin/consumables/message.php b/resources/lang/ur-PK/admin/consumables/message.php index 48a3cfbd9f..75a9ad087e 100644 --- a/resources/lang/ur-PK/admin/consumables/message.php +++ b/resources/lang/ur-PK/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Consumable does not exist.', - 'create' => array( + 'create' => [ 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' - ), + 'success' => 'Consumable created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' - ), + 'success' => 'Consumable updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this consumable?', 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' - ), + 'success' => 'The consumable was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Consumable was not checked out, please try again', 'success' => 'Consumable checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Consumable was not checked in, please try again', 'success' => 'Consumable checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/ur-PK/admin/consumables/table.php b/resources/lang/ur-PK/admin/consumables/table.php index bb76721f17..027333935d 100644 --- a/resources/lang/ur-PK/admin/consumables/table.php +++ b/resources/lang/ur-PK/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Consumable Name', -); +]; diff --git a/resources/lang/ur-PK/admin/custom_fields/general.php b/resources/lang/ur-PK/admin/custom_fields/general.php index c8d2a70a71..011f983f77 100644 --- a/resources/lang/ur-PK/admin/custom_fields/general.php +++ b/resources/lang/ur-PK/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'New Custom Field', 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/ur-PK/admin/custom_fields/message.php b/resources/lang/ur-PK/admin/custom_fields/message.php index ed66a6ba16..c5d1134d5f 100644 --- a/resources/lang/ur-PK/admin/custom_fields/message.php +++ b/resources/lang/ur-PK/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'That field does not exist.', 'already_added' => 'Field already added', - 'create' => array( + 'create' => [ 'error' => 'Field was not created, please try again.', 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' - ), + 'assoc_success' => 'Field successfully added to fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' - ), + 'success' => 'Field updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this field?', 'error' => 'There was an issue deleting the field. Please try again.', 'success' => 'The field was deleted successfully.', 'in_use' => 'Field is still in use.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset does not exist', - 'create' => array( + 'create' => [ 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' - ), + 'success' => 'Fieldset created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' - ), + 'success' => 'Fieldset updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this fieldset?', 'error' => 'There was an issue deleting the fieldset. Please try again.', 'success' => 'The fieldset was deleted successfully.', 'in_use' => 'Fieldset is still in use.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/ur-PK/admin/departments/message.php b/resources/lang/ur-PK/admin/departments/message.php index d65f4fbb2b..14acca576c 100644 --- a/resources/lang/ur-PK/admin/departments/message.php +++ b/resources/lang/ur-PK/admin/departments/message.php @@ -1,21 +1,21 @@ 'Department does not exist.', 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Department was not created, please try again.', - 'success' => 'Department created successfully.' - ), - 'update' => array( + 'success' => 'Department created successfully.', + ], + 'update' => [ 'error' => 'Department was not updated, please try again', - 'success' => 'Department updated successfully.' - ), - 'delete' => array( + 'success' => 'Department updated successfully.', + ], + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this department?', 'error' => 'There was an issue deleting the department. Please try again.', - 'success' => 'The department was deleted successfully.' - ) + 'success' => 'The department was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/departments/table.php b/resources/lang/ur-PK/admin/departments/table.php index 76494247be..b9e94f80cc 100644 --- a/resources/lang/ur-PK/admin/departments/table.php +++ b/resources/lang/ur-PK/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Department Name', @@ -8,4 +8,4 @@ return array( 'location' => 'Location', 'create' => 'Create Department', 'update' => 'Update Department', - ); + ]; diff --git a/resources/lang/ur-PK/admin/depreciations/general.php b/resources/lang/ur-PK/admin/depreciations/general.php index 1fca0e2cb7..e0b02c009d 100644 --- a/resources/lang/ur-PK/admin/depreciations/general.php +++ b/resources/lang/ur-PK/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'About Asset Depreciations', 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'asset_depreciations' => 'Asset Depreciations', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', -); +]; diff --git a/resources/lang/ur-PK/admin/depreciations/message.php b/resources/lang/ur-PK/admin/depreciations/message.php index c20e52c13c..235c52d7e8 100644 --- a/resources/lang/ur-PK/admin/depreciations/message.php +++ b/resources/lang/ur-PK/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Depreciation class does not exist.', 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' - ), + 'success' => 'Depreciation class created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' - ), + 'success' => 'Depreciation class updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this depreciation class?', 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' - ) + 'success' => 'The depreciation class was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/depreciations/table.php b/resources/lang/ur-PK/admin/depreciations/table.php index 5ba01d132c..a0d32d968d 100644 --- a/resources/lang/ur-PK/admin/depreciations/table.php +++ b/resources/lang/ur-PK/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Months', 'term' => 'Term', 'title' => 'Name ', -); +]; diff --git a/resources/lang/ur-PK/admin/groups/message.php b/resources/lang/ur-PK/admin/groups/message.php index f14b6339e8..5d7786b158 100644 --- a/resources/lang/ur-PK/admin/groups/message.php +++ b/resources/lang/ur-PK/admin/groups/message.php @@ -1,22 +1,22 @@ 'Group already exists!', 'group_not_found' => 'Group [:id] does not exist.', 'group_name_required' => 'The name field is required', - 'success' => array( + 'success' => [ 'create' => 'Group was successfully created.', 'update' => 'Group was successfully updated.', 'delete' => 'Group was successfully deleted.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', - ), + ], -); +]; diff --git a/resources/lang/ur-PK/admin/groups/table.php b/resources/lang/ur-PK/admin/groups/table.php index 61f060a116..1fe63604f8 100644 --- a/resources/lang/ur-PK/admin/groups/table.php +++ b/resources/lang/ur-PK/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Name', 'users' => '# of Users', -); +]; diff --git a/resources/lang/ur-PK/admin/groups/titles.php b/resources/lang/ur-PK/admin/groups/titles.php index 99e8cc1f6f..8807f5e54a 100644 --- a/resources/lang/ur-PK/admin/groups/titles.php +++ b/resources/lang/ur-PK/admin/groups/titles.php @@ -1,6 +1,6 @@ 'About Groups', 'about_groups' => 'Groups are used to generalize user permissions.', 'group_management' => 'Group Management', @@ -11,4 +11,4 @@ return array( 'allow' => 'Allow', 'deny' => 'Deny', -); +]; diff --git a/resources/lang/ur-PK/admin/hardware/form.php b/resources/lang/ur-PK/admin/hardware/form.php index 9b3ac32410..86a40a5fa2 100644 --- a/resources/lang/ur-PK/admin/hardware/form.php +++ b/resources/lang/ur-PK/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Confirm Bulk Delete Assets', +return [ + 'bulk_delete' => 'Confirm Bulk Delete Assets', 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', + 'bulk_update' => 'Bulk Update Assets', + 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', @@ -38,7 +38,6 @@ return array( 'tag' => 'Asset Tag', 'update' => 'Asset Update', 'warranty' => 'Warranty', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'years', -) -; +]; diff --git a/resources/lang/ur-PK/admin/hardware/general.php b/resources/lang/ur-PK/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/ur-PK/admin/hardware/general.php +++ b/resources/lang/ur-PK/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/ur-PK/admin/hardware/message.php b/resources/lang/ur-PK/admin/hardware/message.php index e087cad26f..ae18cf51ea 100644 --- a/resources/lang/ur-PK/admin/hardware/message.php +++ b/resources/lang/ur-PK/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Warning: This asset has been marked as currently undeployable. If this status has changed, please update the asset status.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', - 'create' => array( + 'create' => [ 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' - ), + 'success' => 'Asset created successfully. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Asset was not updated, please try again', 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Asset was not restored, please try again', - 'success' => 'Asset restored successfully.' - ), + 'success' => 'Asset restored successfully.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Asset audit was unsuccessful. Please try again.', - 'success' => 'Asset audit successfully logged.' - ), + 'success' => 'Asset audit successfully logged.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Some items did not import correctly.', 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", - ), + 'success' => 'Your file has been imported', + 'file_delete_success' => 'Your file has been been successfully deleted', + 'file_delete_error' => 'The file was unable to be deleted', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.', - 'success' => 'The asset was deleted successfully.' - ), + 'success' => 'The asset was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'not_available' => 'That asset is not available for checkout!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Asset was not checked in, please try again', 'success' => 'Asset checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', 'already_checked_in' => 'That asset is already checked in.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Asset was not requested, please try again', 'success' => 'Asset requested successfully.', - 'canceled' => 'Checkout request successfully canceled' - ) + 'canceled' => 'Checkout request successfully canceled', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/hardware/table.php b/resources/lang/ur-PK/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/ur-PK/admin/hardware/table.php +++ b/resources/lang/ur-PK/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/ur-PK/admin/kits/general.php b/resources/lang/ur-PK/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/ur-PK/admin/kits/general.php +++ b/resources/lang/ur-PK/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/ur-PK/admin/licenses/form.php b/resources/lang/ur-PK/admin/licenses/form.php index ce29167874..90fa8b8562 100644 --- a/resources/lang/ur-PK/admin/licenses/form.php +++ b/resources/lang/ur-PK/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Asset', 'checkin' => 'Checkin', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Licensed to Email', 'to_name' => 'Licensed to Name', 'update' => 'Update License', - 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.' -); + 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.', +]; diff --git a/resources/lang/ur-PK/admin/licenses/general.php b/resources/lang/ur-PK/admin/licenses/general.php index 25a536ec56..a4d79a5c40 100644 --- a/resources/lang/ur-PK/admin/licenses/general.php +++ b/resources/lang/ur-PK/admin/licenses/general.php @@ -1,6 +1,6 @@ 'About Licenses', 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals', 'checkin' => 'Checkin License Seat', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Software Licenses', 'user' => 'User', 'view' => 'View License', -); +]; diff --git a/resources/lang/ur-PK/admin/licenses/message.php b/resources/lang/ur-PK/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/ur-PK/admin/licenses/message.php +++ b/resources/lang/ur-PK/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/licenses/table.php b/resources/lang/ur-PK/admin/licenses/table.php index dfce4136cb..f5520afe52 100644 --- a/resources/lang/ur-PK/admin/licenses/table.php +++ b/resources/lang/ur-PK/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Assigned To', 'checkout' => 'In/Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'License', -); +]; diff --git a/resources/lang/ur-PK/admin/locations/message.php b/resources/lang/ur-PK/admin/locations/message.php index 3ba1eed3b6..2aac2141cb 100644 --- a/resources/lang/ur-PK/admin/locations/message.php +++ b/resources/lang/ur-PK/admin/locations/message.php @@ -1,27 +1,26 @@ 'Location does not exist.', 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' - ), + 'success' => 'Location created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' - ), + 'success' => 'Location updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this location?', 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' - ) + 'success' => 'The location was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/locations/table.php b/resources/lang/ur-PK/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/ur-PK/admin/locations/table.php +++ b/resources/lang/ur-PK/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/ur-PK/admin/manufacturers/message.php b/resources/lang/ur-PK/admin/manufacturers/message.php index 21a4bc5aaf..eac9e700ec 100644 --- a/resources/lang/ur-PK/admin/manufacturers/message.php +++ b/resources/lang/ur-PK/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Manufacturer does not exist.', 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', - 'create' => array( + 'create' => [ 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' - ), + 'success' => 'Manufacturer created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' - ), + 'success' => 'Manufacturer updated successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this manufacturer?', 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' - ) + 'success' => 'The Manufacturer was deleted successfully.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/manufacturers/table.php b/resources/lang/ur-PK/admin/manufacturers/table.php index 4e3ea9904d..05a79f5700 100644 --- a/resources/lang/ur-PK/admin/manufacturers/table.php +++ b/resources/lang/ur-PK/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'About manufacturers', 'about_manufacturers_text' => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.', 'asset_manufacturers' => 'Asset Manufacturers', @@ -13,4 +13,4 @@ return array( 'update' => 'Update Manufacturer', 'url' => 'URL', -); +]; diff --git a/resources/lang/ur-PK/admin/models/general.php b/resources/lang/ur-PK/admin/models/general.php index 3281cfe0fc..6b38932347 100644 --- a/resources/lang/ur-PK/admin/models/general.php +++ b/resources/lang/ur-PK/admin/models/general.php @@ -1,6 +1,6 @@ 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', 'deleted' => 'This model has been deleted. Click here to restore it.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Restore Model', 'requestable' => 'Users may request this model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', 'fieldset' => 'Fieldset', 'no_custom_field' => 'No custom fields', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/ur-PK/admin/models/message.php b/resources/lang/ur-PK/admin/models/message.php index e3b29d5b4b..c2c7d7c627 100644 --- a/resources/lang/ur-PK/admin/models/message.php +++ b/resources/lang/ur-PK/admin/models/message.php @@ -1,42 +1,41 @@ 'Model does not exist.', 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', - - 'create' => array( + 'create' => [ 'error' => 'Model was not created, please try again.', 'success' => 'Model created successfully.', 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' - ), + 'success' => 'Model updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this asset model?', 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' - ), + 'success' => 'The model was deleted successfully.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' - ), + 'success' => 'Model restored successfully.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'No fields were changed, so nothing was updated.', - 'success' => 'Models updated.' - ), + 'success' => 'Models updated.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/models/table.php b/resources/lang/ur-PK/admin/models/table.php index 11a512b3d3..8ca54d5a8f 100644 --- a/resources/lang/ur-PK/admin/models/table.php +++ b/resources/lang/ur-PK/admin/models/table.php @@ -1,6 +1,6 @@ 'Create Asset Model', 'created_at' => 'Created at', @@ -14,4 +14,4 @@ return array( 'update' => 'Update Asset Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', -); +]; diff --git a/resources/lang/ur-PK/admin/reports/general.php b/resources/lang/ur-PK/admin/reports/general.php index b03b97546f..65e2bb1d73 100644 --- a/resources/lang/ur-PK/admin/reports/general.php +++ b/resources/lang/ur-PK/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' -); +return [ + 'info' => 'Select the options you want for your asset report.', +]; diff --git a/resources/lang/ur-PK/admin/reports/message.php b/resources/lang/ur-PK/admin/reports/message.php index d4c8f8198f..75b8533fb7 100644 --- a/resources/lang/ur-PK/admin/reports/message.php +++ b/resources/lang/ur-PK/admin/reports/message.php @@ -1,5 +1,5 @@ 'You must select at least ONE option.' -); +return [ + 'error' => 'You must select at least ONE option.', +]; diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/ur-PK/admin/settings/general.php +++ b/resources/lang/ur-PK/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/ur-PK/admin/settings/message.php b/resources/lang/ur-PK/admin/settings/message.php index 736d5c3e9e..621522293a 100644 --- a/resources/lang/ur-PK/admin/settings/message.php +++ b/resources/lang/ur-PK/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' - ), - 'backup' => array( + 'success' => 'Settings updated successfully.', + ], + 'backup' => [ 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', 'file_deleted' => 'The backup file was successfully deleted. ', 'generated' => 'A new backup file was successfully created.', 'file_not_found' => 'That backup file could not be found on the server.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'An error has occurred while purging. ', 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' - ), + 'success' => 'Deleted records successfully purged.', + ], -); +]; diff --git a/resources/lang/ur-PK/admin/statuslabels/message.php b/resources/lang/ur-PK/admin/statuslabels/message.php index 2937f84978..fd1c8d1b2c 100644 --- a/resources/lang/ur-PK/admin/statuslabels/message.php +++ b/resources/lang/ur-PK/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Status Label does not exist.', 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', - - 'create' => array( + 'create' => [ 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' - ), + 'success' => 'Status Label created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' - ), + 'success' => 'Status Label updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this Status Label?', 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' - ), + 'success' => 'The Status Label was deleted successfully.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'These assets cannot be assigned to anyone.', 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', 'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.', 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.', - ), + ], -); +]; diff --git a/resources/lang/ur-PK/admin/statuslabels/table.php b/resources/lang/ur-PK/admin/statuslabels/table.php index 27befb5ef7..ca62aed58a 100644 --- a/resources/lang/ur-PK/admin/statuslabels/table.php +++ b/resources/lang/ur-PK/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', @@ -16,4 +16,4 @@ return array( 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', -); +]; diff --git a/resources/lang/ur-PK/admin/suppliers/message.php b/resources/lang/ur-PK/admin/suppliers/message.php index cea332748f..7d594bfe3e 100644 --- a/resources/lang/ur-PK/admin/suppliers/message.php +++ b/resources/lang/ur-PK/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Supplier does not exist.', - - 'create' => array( + 'create' => [ 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' - ), + 'success' => 'Supplier created successfully.', + ], - 'update' => array( + 'update' => [ 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' - ), + 'success' => 'Supplier updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this supplier?', 'error' => 'There was an issue deleting the supplier. Please try again.', 'success' => 'Supplier was deleted successfully.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/ur-PK/admin/suppliers/table.php b/resources/lang/ur-PK/admin/suppliers/table.php index 2a7b07ca93..96c77dd7f3 100644 --- a/resources/lang/ur-PK/admin/suppliers/table.php +++ b/resources/lang/ur-PK/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'About Suppliers', 'about_suppliers_text' => 'Suppliers are used to track the source of items', 'address' => 'Supplier Address', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'View Assets for', 'zip' => 'Postal Code', -); +]; diff --git a/resources/lang/ur-PK/admin/users/general.php b/resources/lang/ur-PK/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/ur-PK/admin/users/general.php +++ b/resources/lang/ur-PK/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/ur-PK/admin/users/message.php b/resources/lang/ur-PK/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/ur-PK/admin/users/message.php +++ b/resources/lang/ur-PK/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/ur-PK/admin/users/table.php b/resources/lang/ur-PK/admin/users/table.php index 9bbe883e19..982dbf3c94 100644 --- a/resources/lang/ur-PK/admin/users/table.php +++ b/resources/lang/ur-PK/admin/users/table.php @@ -1,6 +1,6 @@ 'Active', 'allow' => 'Allow', 'checkedout' => 'Assets', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Show Current Users', 'show_deleted' => 'Show Deleted Users', 'title' => 'Title', - 'to_restore_them' => 'to restore them.', + 'to_restore_them' => 'to restore them.', 'updateuser' => 'Update User', 'username' => 'Username', - 'user_deleted_text' => 'This user has been marked as deleted.', + 'user_deleted_text' => 'This user has been marked as deleted.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Clone User', 'viewusers' => 'View Users', -); +]; diff --git a/resources/lang/ur-PK/auth/general.php b/resources/lang/ur-PK/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/ur-PK/auth/general.php +++ b/resources/lang/ur-PK/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/ur-PK/auth/message.php b/resources/lang/ur-PK/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/ur-PK/auth/message.php +++ b/resources/lang/ur-PK/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/ur-PK/button.php b/resources/lang/ur-PK/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/ur-PK/button.php +++ b/resources/lang/ur-PK/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/ur-PK/general.php +++ b/resources/lang/ur-PK/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/ur-PK/help.php b/resources/lang/ur-PK/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/ur-PK/help.php +++ b/resources/lang/ur-PK/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/ur-PK/mail.php b/resources/lang/ur-PK/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/ur-PK/mail.php +++ b/resources/lang/ur-PK/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/ur-PK/pagination.php b/resources/lang/ur-PK/pagination.php index b573b51e91..b9940a133a 100644 --- a/resources/lang/ur-PK/pagination.php +++ b/resources/lang/ur-PK/pagination.php @@ -1,6 +1,6 @@ 'Next »', -); +]; diff --git a/resources/lang/ur-PK/passwords.php b/resources/lang/ur-PK/passwords.php index 61fe7fbd43..6205ef774d 100644 --- a/resources/lang/ur-PK/passwords.php +++ b/resources/lang/ur-PK/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Your password link has been sent!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/ur-PK/reminders.php b/resources/lang/ur-PK/reminders.php index e7a476e3a2..a8ee7dda97 100644 --- a/resources/lang/ur-PK/reminders.php +++ b/resources/lang/ur-PK/reminders.php @@ -1,6 +1,6 @@ "Passwords must be six characters and match the confirmation.", + 'password' => 'Passwords must be six characters and match the confirmation.', - "user" => "Username or email address is incorrect", + 'user' => 'Username or email address is incorrect', - "token" => "This password reset token is invalid.", + 'token' => 'This password reset token is invalid.', - "sent" => "If a matching email address was found, a password reminder has been sent!", + 'sent' => 'If a matching email address was found, a password reminder has been sent!', -); +]; diff --git a/resources/lang/ur-PK/table.php b/resources/lang/ur-PK/table.php index f7a49d86c1..e5de4c440e 100644 --- a/resources/lang/ur-PK/table.php +++ b/resources/lang/ur-PK/table.php @@ -1,10 +1,10 @@ 'Actions', 'action' => 'Action', 'by' => 'By', 'item' => 'Item', -); +]; diff --git a/resources/lang/ur-PK/validation.php b/resources/lang/ur-PK/validation.php index 23116776e3..4924a0f398 100644 --- a/resources/lang/ur-PK/validation.php +++ b/resources/lang/ur-PK/validation.php @@ -1,6 +1,6 @@ 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "The :attribute field contains a character that is not allowed.", - "email_array" => "One or more email addresses is invalid.", - "hashed_pass" => "Your current password is incorrect", + 'alpha_space' => 'The :attribute field contains a character that is not allowed.', + 'email_array' => 'One or more email addresses is invalid.', + 'hashed_pass' => 'Your current password is incorrect', 'dumbpwd' => 'That password is too common.', - "statuslabel_type" => "You must select a valid status label type", + 'statuslabel_type' => 'You must select a valid status label type', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/vi/admin/accessories/general.php b/resources/lang/vi/admin/accessories/general.php index afbf585945..bf97c44a08 100644 --- a/resources/lang/vi/admin/accessories/general.php +++ b/resources/lang/vi/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Hạng Mục Phụ Kiện', 'accessory_name' => 'Tên Phụ Kiện', 'checkout' => 'Xuất kho Phụ kiện', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Dùng điều khoản sử dụng mặc định.', 'use_default_eula_disabled' => 'Dùng điều khoản sử dụng mặc định. Điều khoản sử dụng chưa được thiết lập. Hãy thêm một cái vào trong phần Settings.', -); +]; diff --git a/resources/lang/vi/admin/accessories/message.php b/resources/lang/vi/admin/accessories/message.php index 11c27cec0a..ee33e230b4 100644 --- a/resources/lang/vi/admin/accessories/message.php +++ b/resources/lang/vi/admin/accessories/message.php @@ -1,37 +1,36 @@ 'Phụ kiện [:id] Không tồn tại.', 'assoc_users' => 'Phụ kiện này hiện có :count cái đã giao cho người dùng. Bạn hãy nhập lại vào trong phần phụ kiện và thử lại lần nữa. ', - 'create' => array( + 'create' => [ 'error' => 'Phụ kiện chưa tạo, hãy thử một lần nữa.', - 'success' => 'Phụ kiện đã được tạo thành công.' - ), + 'success' => 'Phụ kiện đã được tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Phụ kiện chưa được cập nhật, vui lòng thử lại', - 'success' => 'Phụ kiện đã được cập nhật thành công.' - ), + 'success' => 'Phụ kiện đã được cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xoá phụ kiện này không?', 'error' => 'Có lỗi xảy ra khi xoá phụ kiện. Vui lòng thử lại.', - 'success' => 'Phụ kiện đã được xoá thành công.' - ), + 'success' => 'Phụ kiện đã được xoá thành công.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Phụ kiện chưa được xuất kho. Bạn hãy thử lại', 'success' => 'Phụ kiện được xuất kho thành công.', - 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.' - ), + 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Phụ kiện chưa được kho. Bạn hãy thử lại', 'success' => 'Phuk kiện được nhập kho thành công.', - 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.' - ) + 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.', + ], - -); +]; diff --git a/resources/lang/vi/admin/accessories/table.php b/resources/lang/vi/admin/accessories/table.php index 4c79d3bca3..724754e08e 100644 --- a/resources/lang/vi/admin/accessories/table.php +++ b/resources/lang/vi/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Tải xuống CSV', - 'eula_text' => 'Điều khoản sử dụng cho người dùng cuối', +return [ + 'dl_csv' => 'Tải xuống CSV', + 'eula_text' => 'Điều khoản sử dụng cho người dùng cuối', 'id' => 'Định danh', 'require_acceptance' => 'Chấp nhận', 'title' => 'Tên phụ kiện', - -); +]; diff --git a/resources/lang/vi/admin/asset_maintenances/form.php b/resources/lang/vi/admin/asset_maintenances/form.php index 239e34acb3..037affe99c 100644 --- a/resources/lang/vi/admin/asset_maintenances/form.php +++ b/resources/lang/vi/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Thời gian bảo trì tài sản (ngày)', 'notes' => 'Ghi chú', 'update' => 'Cập nhật tài sản đang bảo trì', - 'create' => 'Tạo Bảo hành Tài sản' + 'create' => 'Tạo Bảo hành Tài sản', ]; diff --git a/resources/lang/vi/admin/asset_maintenances/message.php b/resources/lang/vi/admin/asset_maintenances/message.php index 546663627e..b7282fa9f0 100644 --- a/resources/lang/vi/admin/asset_maintenances/message.php +++ b/resources/lang/vi/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa tài sản đang bảo trì?', 'error' => 'Có vấn đề xảy ra khi xóa tài sản đang bảo trì. Vui lòng thử lại.', - 'success' => 'Tài sản đang bảo trì đã được xóa thành công.' + 'success' => 'Tài sản đang bảo trì đã được xóa thành công.', ], 'create' => [ 'error' => 'Tài sản đang bảo trì chưa được tạo, xin vui lòng thử lại.', - 'success' => 'Tài sản đang bảo trì được tạo thành công.' + 'success' => 'Tài sản đang bảo trì được tạo thành công.', ], 'edit' => [ 'error' => 'Bảo trì Tài sản không được chỉnh sửa, vui lòng thử lại.', - 'success' => 'Bảo trì Tài sản đã được chỉnh sửa thành công.' + 'success' => 'Bảo trì Tài sản đã được chỉnh sửa thành công.', ], 'asset_maintenance_incomplete' => 'Chưa hoàn thành', 'warranty' => 'Bảo hành', 'not_warranty' => 'Không có bảo hành', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/vi/admin/asset_maintenances/table.php b/resources/lang/vi/admin/asset_maintenances/table.php index 4dc3568397..515d87dd72 100644 --- a/resources/lang/vi/admin/asset_maintenances/table.php +++ b/resources/lang/vi/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Tài sản đang bảo trì', 'asset_name' => 'Tên tài sản', 'is_warranty' => 'Bảo hành', - 'dl_csv' => 'Tải tập tin định dạng CSV' + 'dl_csv' => 'Tải tập tin định dạng CSV', ]; diff --git a/resources/lang/vi/admin/categories/general.php b/resources/lang/vi/admin/categories/general.php index 418faa53b3..b154ad7ee9 100644 --- a/resources/lang/vi/admin/categories/general.php +++ b/resources/lang/vi/admin/categories/general.php @@ -1,6 +1,6 @@ 'Danh mục tài sản', 'category_name' => 'Tên hạng mục', 'checkin_email' => 'Gửi email đến người dùng khi checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Sử dụng giá trị EULA mặc đinh để thay vào.', 'use_default_eula_disabled' => 'Sử dụng giá trị EULA mặc định để thay thế. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/vi/admin/categories/message.php b/resources/lang/vi/admin/categories/message.php index 8eb36e581d..04178d145f 100644 --- a/resources/lang/vi/admin/categories/message.php +++ b/resources/lang/vi/admin/categories/message.php @@ -1,25 +1,25 @@ 'Hạng mục không tồn tại.', 'assoc_models' => 'Danh mục này hiện đang liên kết với một kiểu nào đó nên không thể xoá. Vui lòng cập nhật kiểu có liên quan để ngừng liên kết với danh mục này và thử xoá lại.', 'assoc_items' => 'Danh mục này hiện đang liên kết với :asset_type nào đó nên không thể xoá. Vui lòng cập nhật :asset_type có liên quan để ngừng liên kết với danh mục này và thử xoá lại.', - 'create' => array( + 'create' => [ 'error' => 'Hạng mục chưa được tạo. Bạn hãy thử lại.', - 'success' => 'Hạng mục đã được khởi tạo thành công.' - ), + 'success' => 'Hạng mục đã được khởi tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Hạng mục chưa được cập nhật. Bạn hãy thử lại', - 'success' => 'Hạng mục được cập nhật thành công.' - ), + 'success' => 'Hạng mục được cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xoá hạng mục này?', 'error' => 'Có vấn đề xảy ra khi xoá hạng mục này. Bạn hãy thử lại.', - 'success' => 'Hạng mục này đã được xoá thành công.' - ) + 'success' => 'Hạng mục này đã được xoá thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/categories/table.php b/resources/lang/vi/admin/categories/table.php index cb906384de..97f1f5f3cf 100644 --- a/resources/lang/vi/admin/categories/table.php +++ b/resources/lang/vi/admin/categories/table.php @@ -1,10 +1,10 @@ 'Điều khoản sử dụng cho người dùng cuối', +return [ + 'eula_text' => 'Điều khoản sử dụng cho người dùng cuối', 'id' => 'Định danh', 'parent' => 'Mục cha', 'require_acceptance' => 'Chấp nhận', 'title' => 'Tên hạng mục tài sản', -); +]; diff --git a/resources/lang/vi/admin/companies/general.php b/resources/lang/vi/admin/companies/general.php index 06cdcf73c0..07fcc99a1d 100644 --- a/resources/lang/vi/admin/companies/general.php +++ b/resources/lang/vi/admin/companies/general.php @@ -1,4 +1,5 @@ 'Chọn công ty', ]; diff --git a/resources/lang/vi/admin/companies/message.php b/resources/lang/vi/admin/companies/message.php index b2c8c99d32..d486cf3a9e 100644 --- a/resources/lang/vi/admin/companies/message.php +++ b/resources/lang/vi/admin/companies/message.php @@ -1,18 +1,19 @@ 'Công ty này không tồn tại.', 'assoc_users' => 'Công ty này hiện đang liên kết với ít nhất một mô hình và không thể bị xóa. Hãy cập nhật mô hình của bạn để không còn tham khảo công ty này nữa và thử lại.', - 'create' => array( + 'create' => [ 'error' => 'Công ty chưa được tạo, hãy thử lại.', - 'success' => 'Công ty thành công.' - ), - 'update' => array( + 'success' => 'Công ty thành công.', + ], + 'update' => [ 'error' => 'Công ty không được cập nhật, vui lòng thử lại', - 'success' => 'Công ty đã được cập nhật thành công.' - ), - 'delete' => array( + 'success' => 'Công ty đã được cập nhật thành công.', + ], + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xóa công ty này?', 'error' => 'Đã xảy ra sự cố khi xóa công ty. Vui lòng thử lại.', - 'success' => 'Công ty đã bị xóa thành công.' - ) -); + 'success' => 'Công ty đã bị xóa thành công.', + ], +]; diff --git a/resources/lang/vi/admin/companies/table.php b/resources/lang/vi/admin/companies/table.php index f9cb60dc1b..3e6b6e705d 100644 --- a/resources/lang/vi/admin/companies/table.php +++ b/resources/lang/vi/admin/companies/table.php @@ -1,9 +1,10 @@ 'Các công ty', 'create' => 'Tạo công ty', 'title' => 'Công ty', 'update' => 'Cập nhật Công ty', 'name' => 'Tên công ty', 'id' => 'ID', -); +]; diff --git a/resources/lang/vi/admin/components/general.php b/resources/lang/vi/admin/components/general.php index e32e296e24..0badf1860b 100644 --- a/resources/lang/vi/admin/components/general.php +++ b/resources/lang/vi/admin/components/general.php @@ -1,6 +1,6 @@ 'Tên thành phần', 'checkin' => 'Hợp phần Checkin', 'checkout' => 'Hợp phần thanh toán', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Còn lại', 'total' => 'Tổng số', 'update' => 'Cập nhật Hợp phần', -); +]; diff --git a/resources/lang/vi/admin/components/message.php b/resources/lang/vi/admin/components/message.php index 7fed42c951..df8f5b3a53 100644 --- a/resources/lang/vi/admin/components/message.php +++ b/resources/lang/vi/admin/components/message.php @@ -1,36 +1,35 @@ 'Hợp phần không tồn tại.', - 'create' => array( + 'create' => [ 'error' => 'Hợp phần đã không được tạo, vui lòng thử lại.', - 'success' => 'Thành phần thành công.' - ), + 'success' => 'Thành phần thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Hợp phần đã không được cập nhật, vui lòng thử lại', - 'success' => 'Thành phần được cập nhật thành công.' - ), + 'success' => 'Thành phần được cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xoá thành phần này?', 'error' => 'Đã xảy ra sự cố khi xóa thành phần này. Vui lòng thử lại.', - 'success' => 'Thành phần đã được xóa thành công.' - ), + 'success' => 'Thành phần đã được xóa thành công.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Hợp phần đã không được kiểm tra, hãy thử lại', 'success' => 'Thành phần được kiểm tra thành công.', - 'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.' - ), + 'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Không kiểm tra thành phần, vui lòng thử lại', 'success' => 'Đã kiểm tra thành công thành phần.', - 'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.' - ) + 'user_does_not_exist' => 'Người dùng đó không hợp lệ. Vui lòng thử lại.', + ], - -); +]; diff --git a/resources/lang/vi/admin/components/table.php b/resources/lang/vi/admin/components/table.php index eb2628e968..8d4605e8fa 100644 --- a/resources/lang/vi/admin/components/table.php +++ b/resources/lang/vi/admin/components/table.php @@ -1,5 +1,5 @@ 'Tên thành phần', -); +]; diff --git a/resources/lang/vi/admin/consumables/general.php b/resources/lang/vi/admin/consumables/general.php index f8e4cc0d3d..92bb008d05 100644 --- a/resources/lang/vi/admin/consumables/general.php +++ b/resources/lang/vi/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Thanh toán cho người tiêu dùng', 'consumable_name' => 'Tên vật tư phụ', 'create' => 'Tạo vật tư phụ', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Còn lại', 'total' => 'Tổng số', 'update' => 'Cập nhật vật tư phụ', -); +]; diff --git a/resources/lang/vi/admin/consumables/message.php b/resources/lang/vi/admin/consumables/message.php index 86edc8e97f..f802edb64b 100644 --- a/resources/lang/vi/admin/consumables/message.php +++ b/resources/lang/vi/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Vật tư phụ không tồn tại.', - 'create' => array( + 'create' => [ 'error' => 'Vật tư phụ chưa tạo, xin vui lòng thử lại.', - 'success' => 'Vật tư phụ đã tạo thành công.' - ), + 'success' => 'Vật tư phụ đã tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Vật tư phụ chưa cập nhật, xin vui lòng thử lại', - 'success' => 'Vật tư phụ đã cập nhật thành công.' - ), + 'success' => 'Vật tư phụ đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xóa tài liệu này không?', 'error' => 'Có vấn đề khi xóa vật tư phụ. Xin vui lòng thử lại.', - 'success' => 'Tài liệu tiêu thụ đã bị xoá thành công.' - ), + 'success' => 'Tài liệu tiêu thụ đã bị xoá thành công.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Vật tư phụ chưa checkout, xin thử lại', 'success' => 'Vật tư phụ đã checkout thành công.', - 'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.' - ), + 'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Vật tư phụ chưa checkin, xin thử lại', 'success' => 'Vật tư phụ đã checkin thành công.', - 'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.' - ) + 'user_does_not_exist' => 'Người dùng này không tồn tại. Xin vui lòng thử lại.', + ], - -); +]; diff --git a/resources/lang/vi/admin/consumables/table.php b/resources/lang/vi/admin/consumables/table.php index 0de3246287..b19c208f29 100644 --- a/resources/lang/vi/admin/consumables/table.php +++ b/resources/lang/vi/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Tên vật tư phụ', -); +]; diff --git a/resources/lang/vi/admin/custom_fields/general.php b/resources/lang/vi/admin/custom_fields/general.php index 718d2f0041..2b9bf406e1 100644 --- a/resources/lang/vi/admin/custom_fields/general.php +++ b/resources/lang/vi/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Trường tùy chỉnh', 'field' => 'Cánh đồng', 'about_fieldsets_title' => 'Giới thiệu về các trường', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Trường tùy chỉnh mới', 'value_encrypted' => 'Giá trị của trường này được mã hóa trong cơ sở dữ liệu. Chỉ những người dùng quản trị mới có thể xem được giá trị được giải mã', 'show_in_email' => 'Bao gồm giá trị của trường này trong email thanh toán được gửi tới người dùng? Các trường được mã hóa không thể được bao gồm trong email.', -); +]; diff --git a/resources/lang/vi/admin/custom_fields/message.php b/resources/lang/vi/admin/custom_fields/message.php index 8706b2cfba..111a0b636e 100644 --- a/resources/lang/vi/admin/custom_fields/message.php +++ b/resources/lang/vi/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Lĩnh vực đó không tồn tại.', 'already_added' => 'Trường đã được thêm', - 'create' => array( + 'create' => [ 'error' => 'Trường không được tạo, vui lòng thử lại.', 'success' => 'Trường được tạo thành công.', - 'assoc_success' => 'Trường đã được thêm vào fieldset.' - ), + 'assoc_success' => 'Trường đã được thêm vào fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Trường không được cập nhật, vui lòng thử lại', - 'success' => 'Trường cập nhật thành công.' - ), + 'success' => 'Trường cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xoá trường này không?', 'error' => 'Đã xảy ra sự cố khi xóa trường. Vui lòng thử lại.', 'success' => 'Trường đã bị xóa thành công.', 'in_use' => 'Trường vẫn đang được sử dụng.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'Fieldset không tồn tại', - 'create' => array( + 'create' => [ 'error' => 'Fieldset chưa được tạo, vui lòng thử lại.', - 'success' => 'Fieldset được tạo thành công.' - ), + 'success' => 'Fieldset được tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Fieldset chưa được cập nhật, vui lòng thử lại', - 'success' => 'Đã cập nhật thành công Fieldset.' - ), + 'success' => 'Đã cập nhật thành công Fieldset.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xóa bộ công việc này không?', 'error' => 'Có vấn đề xóa fieldset. Vui lòng thử lại.', 'success' => 'Fieldset đã bị xóa thành công.', 'in_use' => 'Fieldset vẫn đang được sử dụng.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/vi/admin/departments/message.php b/resources/lang/vi/admin/departments/message.php index cfa74d4fff..9d4e149072 100644 --- a/resources/lang/vi/admin/departments/message.php +++ b/resources/lang/vi/admin/departments/message.php @@ -1,21 +1,21 @@ 'Bộ không tồn tại.', 'assoc_users' => 'Bộ phận này hiện đang kết hợp với ít nhất một người dùng và không thể bị xóa. Hãy cập nhật người dùng của bạn để không tham khảo bộ phận này nữa và thử lại.', - 'create' => array( + 'create' => [ 'error' => 'Phòng không được tạo, vui lòng thử lại.', - 'success' => 'Bộ tạo thành công.' - ), - 'update' => array( + 'success' => 'Bộ tạo thành công.', + ], + 'update' => [ 'error' => 'Bộ chưa cập nhật, vui lòng thử lại', - 'success' => 'Phòng đã được cập nhật thành công.' - ), - 'delete' => array( + 'success' => 'Phòng đã được cập nhật thành công.', + ], + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xóa bộ phận này?', 'error' => 'Đã xảy ra sự cố khi xóa bộ phận. Vui lòng thử lại.', - 'success' => 'Bộ đã bị xóa thành công.' - ) + 'success' => 'Bộ đã bị xóa thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/departments/table.php b/resources/lang/vi/admin/departments/table.php index cc5c5b37dc..7557816fdf 100644 --- a/resources/lang/vi/admin/departments/table.php +++ b/resources/lang/vi/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Tên bộ phận', @@ -8,4 +8,4 @@ return array( 'location' => 'Vị trí', 'create' => 'Tạo bộ phận', 'update' => 'Bộ phận cập nhật', - ); + ]; diff --git a/resources/lang/vi/admin/depreciations/general.php b/resources/lang/vi/admin/depreciations/general.php index 8a9f328dfc..8f3afd9b5e 100644 --- a/resources/lang/vi/admin/depreciations/general.php +++ b/resources/lang/vi/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Thông tin về khấu hao tài sản', 'about_depreciations' => 'Bạn có thể thiết lập các loại khấu hao để khấu hao tài sản dựa trên straight-line khấu hao.', 'asset_depreciations' => 'Khấu hao tài sản', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Số lượng tháng', 'update' => 'Cập nhật khấu hao', -); +]; diff --git a/resources/lang/vi/admin/depreciations/message.php b/resources/lang/vi/admin/depreciations/message.php index 85b56e38ce..1d330371e7 100644 --- a/resources/lang/vi/admin/depreciations/message.php +++ b/resources/lang/vi/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Loại khấu hao không tồn tại.', 'assoc_users' => 'Khấu hao này hiện đang liên kết với một hoặc nhiều kiểu tài sản và không thể xóa. Xin vui lòng xóa kiểu tài sản có liên kết, và kế đến thử xóa lại lần nữa. ', - - 'create' => array( + 'create' => [ 'error' => 'Loại khấu hao này chưa tạo, vui lòng thử lại. :(', - 'success' => 'Loại khấu hao đã tạo thành công. :)' - ), + 'success' => 'Loại khấu hao đã tạo thành công. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Loại khấu hao chưa được cập nhật, xin thử lại', - 'success' => 'Loại khấu hao đã cập nhật thành công.' - ), + 'success' => 'Loại khấu hao đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa loại khấu hao này?', 'error' => 'Có vấn đề xảy ra khi xóa loại khấu nao. Xin thử lại.', - 'success' => 'Loại khấu hao này đã xóa thành công.' - ) + 'success' => 'Loại khấu hao này đã xóa thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/depreciations/table.php b/resources/lang/vi/admin/depreciations/table.php index b87ee77c9a..52d391d47c 100644 --- a/resources/lang/vi/admin/depreciations/table.php +++ b/resources/lang/vi/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Tháng', 'term' => 'Điều khoản', 'title' => 'Tên ', -); +]; diff --git a/resources/lang/vi/admin/groups/message.php b/resources/lang/vi/admin/groups/message.php index 7a8c41dd0f..6c21570c7a 100644 --- a/resources/lang/vi/admin/groups/message.php +++ b/resources/lang/vi/admin/groups/message.php @@ -1,22 +1,22 @@ 'Nhóm đã tồn tại!', 'group_not_found' => 'Nhóm [:id] không tồn tại.', 'group_name_required' => 'Trường tên thì bắt buộc', - 'success' => array( + 'success' => [ 'create' => 'Nhóm đã được tạo thành công.', 'update' => 'Nhóm đã cập nhật thành công.', 'delete' => 'Nhóm đã xóa thành công.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa nhóm này?', 'create' => 'Có vấn đề khi tạo nhóm. Xin vui lòng thử lại.', 'update' => 'Có vấn đề khi cập nhật nhóm. Xin vui lòng thử lại.', 'delete' => 'Có vấn đề khi xóa nhóm. Xin vui lòng thử lại.', - ), + ], -); +]; diff --git a/resources/lang/vi/admin/groups/table.php b/resources/lang/vi/admin/groups/table.php index 398db87123..cce6b02ad8 100644 --- a/resources/lang/vi/admin/groups/table.php +++ b/resources/lang/vi/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Tên', 'users' => '# của Người dùng', -); +]; diff --git a/resources/lang/vi/admin/groups/titles.php b/resources/lang/vi/admin/groups/titles.php index 5bf1639043..2cf4c94d67 100644 --- a/resources/lang/vi/admin/groups/titles.php +++ b/resources/lang/vi/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Giới Nhóm', 'about_groups' => 'Các nhóm được sử dụng để khái quát hóa quyền người dùng.', 'group_management' => 'Quản lý nhóm', @@ -11,4 +11,4 @@ return array( 'allow' => 'Cho phép', 'deny' => 'Từ chối', -); +]; diff --git a/resources/lang/vi/admin/hardware/form.php b/resources/lang/vi/admin/hardware/form.php index 503f3f790f..2219a50252 100644 --- a/resources/lang/vi/admin/hardware/form.php +++ b/resources/lang/vi/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Xác nhận Hàng loạt Xóa Tài sản', +return [ + 'bulk_delete' => 'Xác nhận Hàng loạt Xóa Tài sản', 'bulk_delete_help' => 'Xem lại tài sản để xóa hàng loạt dưới đây. Sau khi đã xóa, những nội dung này có thể được khôi phục, nhưng chúng sẽ không còn được kết hợp với bất kỳ người dùng nào hiện đang được chỉ định.', 'bulk_delete_warn' => 'Bạn sắp xóa: asset_count tài sản.', - 'bulk_update' => 'Cập nhật tài sản số lượng lớn', - 'bulk_update_help' => 'Form này cho phép bạn cập nhật nhiều tài sản cùng lúc. Chỉ điền vào ô bạn cần thay đổi. Bất kỳ ô nào để trống sẽ thông báo là chưa thay đổi. ', - 'bulk_update_warn' => 'Bạn muốn chỉnh sửa các thuộc tính của :asset_count assets.', + 'bulk_update' => 'Cập nhật tài sản số lượng lớn', + 'bulk_update_help' => 'Form này cho phép bạn cập nhật nhiều tài sản cùng lúc. Chỉ điền vào ô bạn cần thay đổi. Bất kỳ ô nào để trống sẽ thông báo là chưa thay đổi. ', + 'bulk_update_warn' => 'Bạn muốn chỉnh sửa các thuộc tính của :asset_count assets.', 'checkedout_to' => 'Checkout đến', 'checkout_date' => 'Ngày Checkout', 'checkin_date' => 'Ngày Checkin', @@ -38,7 +38,6 @@ return array( 'tag' => 'Thẻ tài sản', 'update' => 'Cập nhật tài sản', 'warranty' => 'Bảo hành', - 'warranty_expires' => 'Hết hạn bảo hành', + 'warranty_expires' => 'Hết hạn bảo hành', 'years' => 'năm', -) -; +]; diff --git a/resources/lang/vi/admin/hardware/general.php b/resources/lang/vi/admin/hardware/general.php index 89d770ee8c..fe8b90f34c 100644 --- a/resources/lang/vi/admin/hardware/general.php +++ b/resources/lang/vi/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Giới thiệu về Tài sản', 'about_assets_text' => 'Tài sản là các mục được theo dõi bằng số sê-ri hoặc thẻ nội dung. Chúng thường có giá trị cao hơn khi xác định một mục cụ thể.', - 'archived' => 'Đã lưu trữ', + 'archived' => 'Đã lưu trữ', 'asset' => 'Tài sản', 'bulk_checkout' => 'Checkout Tài sản', 'checkin' => 'Checkin tài sản', @@ -19,4 +19,4 @@ return array( 'pending' => 'Đang chờ', 'undeployable' => 'Không cho phép cấp phát', 'view' => 'Xem tài sản', -); +]; diff --git a/resources/lang/vi/admin/hardware/message.php b/resources/lang/vi/admin/hardware/message.php index 61d1a057d1..8083f3be5c 100644 --- a/resources/lang/vi/admin/hardware/message.php +++ b/resources/lang/vi/admin/hardware/message.php @@ -1,6 +1,6 @@ 'Cảnh báo: Tài sản này hiện tại đang được đánh dấu là không cho phép cấp phát. Nếu tình trạng này đã được thay đổi, xin vui lòng cập nhật tình trạng tài sản.', @@ -8,76 +8,74 @@ return array( 'does_not_exist_or_not_requestable' => 'Bạn đã cố gắng. Tài sản đó không tồn tại hoặc không cho phép đề xuất.', 'assoc_users' => 'Tài sản này hiện tại đã được checkout đến một người dùng và không thể xóa. Đầu tiên xin vui lòng kiểm tra lại tài sản, và cố gắng thử lần nữa. ', - 'create' => array( + 'create' => [ 'error' => 'Tài sản chưa được tạo, xin vui lòng thử lại. :(', - 'success' => 'Tài sản được tạo thành công. :)' - ), + 'success' => 'Tài sản được tạo thành công. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Tài sản chưa được cập nhật. Bạn hãy thử lại', 'success' => 'Tài sản được cập nhật thành công.', 'nothing_updated' => 'Bạn đã không chọn trường nào vì thế đã không có gì được cập nhật.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Tài sản không được khôi phục, bạn hãy thử lại', - 'success' => 'Tài sản được khôi phục thành công.' - ), + 'success' => 'Tài sản được khôi phục thành công.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Kiểm toán nội dung không thành công. Vui lòng thử lại.', - 'success' => 'Kiểm tra thành công tài sản.' - ), + 'success' => 'Kiểm tra thành công tài sản.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tập tin đã không được xoá. Bạn hãy thử lại.', 'success' => 'Tập tin đã được xoá thành công.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tập tin đã không được tải lên. Bạn hãy thử lại.', 'success' => 'Tập tin đã được tải lên thành công.', 'nofiles' => 'Bạn chưa chọn tập tin để tải lên, hoặc tập tin bạn đang chọn tải lên có dung lượng quá lớn', 'invalidfiles' => 'Một hoặc nhiều tập tin của bạn có dung lượng quá lớn hoặc có định dạng không được hỗ trợ. Những tập tin được hỗ trợ bao gồm: png, gif, jpg, doc, docx, pdf, và txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Một số mặt hàng không nhập chính xác.', 'errorDetail' => 'Các mục sau đây không được nhập khẩu vì lỗi.', - 'success' => "Tệp của bạn đã được nhập", - 'file_delete_success' => "Tập tin của bạn đã được xóa thành công", - 'file_delete_error' => "Không thể xóa tệp", - ), + 'success' => 'Tệp của bạn đã được nhập', + 'file_delete_success' => 'Tập tin của bạn đã được xóa thành công', + 'file_delete_error' => 'Không thể xóa tệp', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xoá bỏ tài sản này?', 'error' => 'Đã có vấn đề xảy ra khi xoá tài sản này. Bạn hãy thử lại xem.', 'nothing_updated' => 'Không có nội dung nào được chọn, vì vậy không có gì bị xóa.', - 'success' => 'Tài sản này được xoá thành công.' - ), + 'success' => 'Tài sản này được xoá thành công.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Tài sản chưa được checkout, xin vui lòng thử lại', 'success' => 'Tài sản đã checkout thành công.', 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.', 'not_available' => 'Tài sản đó không có sẵn để thanh toán!', - 'no_assets_selected' => 'Bạn phải chọn ít nhất một mục trong danh sách' - ), + 'no_assets_selected' => 'Bạn phải chọn ít nhất một mục trong danh sách', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Tài sản chưa được checkin, xin vui lòng thử lại', 'success' => 'Tài sản đã checkin thành công.', 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.', 'already_checked_in' => 'Nội dung đó đã được kiểm tra.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Tài sản không được yêu cầu, vui lòng thử lại', 'success' => 'Tài sản đã yêu cầu thành công.', - 'canceled' => 'Yêu cầu Thanh toán đã được hủy thành công' - ) + 'canceled' => 'Yêu cầu Thanh toán đã được hủy thành công', + ], -); +]; diff --git a/resources/lang/vi/admin/hardware/table.php b/resources/lang/vi/admin/hardware/table.php index dac370a490..d567a73ba8 100644 --- a/resources/lang/vi/admin/hardware/table.php +++ b/resources/lang/vi/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Thẻ tài sản', 'asset_model' => 'Loại', @@ -20,6 +20,6 @@ return array( 'title' => 'Tài sản ', 'image' => 'Hình ảnh Thiết bị', 'days_without_acceptance' => 'Những ngày không chấp nhận', - 'monthly_depreciation' => 'Khấu hao tháng' + 'monthly_depreciation' => 'Khấu hao tháng', -); +]; diff --git a/resources/lang/vi/admin/kits/general.php b/resources/lang/vi/admin/kits/general.php index 2533ea5f9a..81b2939322 100644 --- a/resources/lang/vi/admin/kits/general.php +++ b/resources/lang/vi/admin/kits/general.php @@ -1,6 +1,6 @@ 'Thông tin Bộ kit định danh', 'about_kits_text' => 'Bộ kit định danh cho phép bạn dễ dàng xuất kho một bộ các danh mục (tài sản, giấy phép, vv...) đến người dùng. Rất hữu dụng khi bạn cấp một bộ gồm nhiều danh mục đến nhiều người dùng.', 'checkout' => 'Xuất kho Bộ kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'Số lượng :consumable không đủ để xuất kho. Cần thêm :qty đơn vị. ', 'none_accessory' => 'Số lượng :accessory không đủ để xuất kho. Cần thêm :qty đơn vị. ', -); +]; diff --git a/resources/lang/vi/admin/licenses/form.php b/resources/lang/vi/admin/licenses/form.php index 981ef67736..cd55a679e4 100644 --- a/resources/lang/vi/admin/licenses/form.php +++ b/resources/lang/vi/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Tài sản', 'checkin' => 'Đăng ký vào', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Đã cấp phép cho email', 'to_name' => 'Đã cấp phép cho tên', 'update' => 'Cập nhập giấy phép sử dụng', - 'checkout_help' => 'Bạn phải kiểm tra bản quyền đã cấp phát đến phần cứng của tài sản hoặc một cá nhân. Bạn có thể lựa chọn cả hai, nhưng chủ thể của tài sản phải tương ứng với người mà bạn đang kiểm tra cấp phát tài sản.' -); + 'checkout_help' => 'Bạn phải kiểm tra bản quyền đã cấp phát đến phần cứng của tài sản hoặc một cá nhân. Bạn có thể lựa chọn cả hai, nhưng chủ thể của tài sản phải tương ứng với người mà bạn đang kiểm tra cấp phát tài sản.', +]; diff --git a/resources/lang/vi/admin/licenses/general.php b/resources/lang/vi/admin/licenses/general.php index 740dd56a87..dce3b6bda4 100644 --- a/resources/lang/vi/admin/licenses/general.php +++ b/resources/lang/vi/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Về giấy phép', 'about_licenses' => 'Giấy phép được sử dụng để theo dõi phần mềm. Họ có một số lượng ghế xác định mà có thể được kiểm tra ra cho cá nhân', 'checkin' => 'Checkin bản quyền đặt vào', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Bản quyền phần mềm', 'user' => 'Người dùng', 'view' => 'Xem bản quyền', -); +]; diff --git a/resources/lang/vi/admin/licenses/message.php b/resources/lang/vi/admin/licenses/message.php index af79dfc6a5..726ed78a91 100644 --- a/resources/lang/vi/admin/licenses/message.php +++ b/resources/lang/vi/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Bản quyền không tồn tại.', 'user_does_not_exist' => 'Người dùng không tồn tại.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Bạn phải chọn một nội dung hoặc người dùng, nhưng không phải cả hai.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Bản quyền chưa được tạo, xin vui lòng thử lại.', - 'success' => 'Bản quyền đã được tạo thành công.' - ), + 'success' => 'Bản quyền đã được tạo thành công.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tập tin không xóa được. Xin vui lòng thử lại.', 'success' => 'Tập tin đã xóa thành công.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tập tin không tải lên được. Xin vui lòng thử lại.', 'success' => 'Tập tin đã tải lên thành công.', 'nofiles' => 'Bạn chưa chọn bất kỳ tập tin nào để tải lên, hoặc tập tin bạn đang cố gắng tải lên có dung lượng quá lớn', 'invalidfiles' => 'Một hoặc nhiều tệp của bạn quá lớn hoặc là loại tập tin không được phép. Các loại tệp được cho phép là png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml và lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Bản quyền chưa được cập nhật, xin vui lòng thử lại', - 'success' => 'Bản quyền đã cập nhật thành công.' - ), + 'success' => 'Bản quyền đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa bản quyền này?', 'error' => 'Có vấn đề xảy ra khi xóa bản quyền này. Xin vui lòng thử lại.', - 'success' => 'Bản quyền đã xóa thành công.' - ), + 'success' => 'Bản quyền đã xóa thành công.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Có vấn đề xảy ra khi checkout bản quyền. Xin vui lòng thử lại.', - 'success' => 'Bản quyền đã được checkout thành công' - ), + 'success' => 'Bản quyền đã được checkout thành công', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Có vấn đề xảy ra khi checkin bản quyền. Xin vui lòng thử lại.', - 'success' => 'Bản quyền đã được checkin thành công' - ), + 'success' => 'Bản quyền đã được checkin thành công', + ], -); +]; diff --git a/resources/lang/vi/admin/licenses/table.php b/resources/lang/vi/admin/licenses/table.php index 5ae417e507..403bde3389 100644 --- a/resources/lang/vi/admin/licenses/table.php +++ b/resources/lang/vi/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Cấp phát đến', 'checkout' => 'Nhập/Xuất', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Bản quyền', -); +]; diff --git a/resources/lang/vi/admin/locations/message.php b/resources/lang/vi/admin/locations/message.php index ff330dde44..4def1ef152 100644 --- a/resources/lang/vi/admin/locations/message.php +++ b/resources/lang/vi/admin/locations/message.php @@ -1,27 +1,26 @@ 'Địa phương không tồn tại.', 'assoc_users' => 'Địa phương này hiện tại đang được liên kết với ít nhất một người dùng và không thể xóa. Xin vui lòng cập nhật người dùng của bạn để không có liên kết nào đến địa phương này và thử lại. ', 'assoc_assets' => 'Địa phương này hiện tại đã được liên kết với ít nhất một tài sản và không thể xóa. Xin vui lòng cập nhật tài sản của bạn để không còn liên kết với địa phương này nữa và thử lại. ', 'assoc_child_loc' => 'Địa phương này hiện tại là cấp parent của ít nhật một địa phương con và không thể xóa. Xin vui lòng cập nhật địa phương của bạn để không liên kết đến địa phương này và thử lại. ', - - 'create' => array( + 'create' => [ 'error' => 'Địa phương chưa tạo, xin vui lòng thử lại.', - 'success' => 'Địa phương đã tạo thành công.' - ), + 'success' => 'Địa phương đã tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Địa phương chưa cập nhật, xin vui lòng thử lại', - 'success' => 'Địa phương đã cập nhật thành công.' - ), + 'success' => 'Địa phương đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa địa phương này?', 'error' => 'Có vấn đề xảy ra khi xóa địa phương. Xin vui lòng thử lại.', - 'success' => 'Địa phương đã xóa thành công.' - ) + 'success' => 'Địa phương đã xóa thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/locations/table.php b/resources/lang/vi/admin/locations/table.php index e8f6ee2d18..f0dc66c802 100644 --- a/resources/lang/vi/admin/locations/table.php +++ b/resources/lang/vi/admin/locations/table.php @@ -1,6 +1,6 @@ 'Giới thiệu về Địa điểm', 'about_locations' => 'Vị trí được sử dụng để theo dõi thông tin vị trí cho người dùng, nội dung và các mục khác', 'assets_rtd' => 'Tài sản', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Tiền tệ địa phương', 'ldap_ou' => 'Tìm kiếm LDAP của OU', - ); + ]; diff --git a/resources/lang/vi/admin/manufacturers/message.php b/resources/lang/vi/admin/manufacturers/message.php index 18478fdc20..d865d8b06f 100644 --- a/resources/lang/vi/admin/manufacturers/message.php +++ b/resources/lang/vi/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Hãng sản xuất không tồn tại.', 'assoc_users' => 'Nhà sản xuất này hiện tại đang được liên kết với ít nhất một kiểu tài sản và không thể xóa. Xin vui lòng cập nhật kiểu tài sản của bạn để không liên kết đến nhà sản xuất này và thử lại. ', - 'create' => array( + 'create' => [ 'error' => 'Hãng sản xuất không được tạo. Bạn hãy thử lại.', - 'success' => 'Hãng sản xuất được tạo thành công.' - ), + 'success' => 'Hãng sản xuất được tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Hãng sản xuất không được tạo. Bạn hãy thử lại', - 'success' => 'Hãng sản xuất được tạo thành công.' - ), + 'success' => 'Hãng sản xuất được tạo thành công.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Hãng sản xuất chưa được phục hồi, vui lòng thử lại', - 'success' => 'Hãng sản xuất đã phục hồi thành công.' - ), + 'success' => 'Hãng sản xuất đã phục hồi thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc chắn muốn xoá hãng sản xuất này?', 'error' => 'Có vấn đề xảy ra khi xoá hãng sản xuất này. Bạn hãy thử lại.', - 'success' => 'Hãng sản xuất đã được xoá thành công.' - ) + 'success' => 'Hãng sản xuất đã được xoá thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/manufacturers/table.php b/resources/lang/vi/admin/manufacturers/table.php index 845503de36..13f3794910 100644 --- a/resources/lang/vi/admin/manufacturers/table.php +++ b/resources/lang/vi/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Giới thiệu về nhà sản xuất', 'about_manufacturers_text' => 'Các nhà sản xuất là những công ty tạo ra tài sản của bạn. Bạn có thể lưu trữ thông tin liên hệ hỗ trợ quan trọng về họ tại đây, sẽ được hiển thị trên trang chi tiết tài sản của bạn.', 'asset_manufacturers' => 'Hãng sản xuất', @@ -13,4 +13,4 @@ return array( 'update' => 'Cập nhật hãng sản xuất', 'url' => 'URL', -); +]; diff --git a/resources/lang/vi/admin/models/general.php b/resources/lang/vi/admin/models/general.php index b4ce16f0af..15fabe32d1 100644 --- a/resources/lang/vi/admin/models/general.php +++ b/resources/lang/vi/admin/models/general.php @@ -1,6 +1,6 @@ 'Giới thiệu về Mô hình Tài sản', 'about_models_text' => 'Mô hình Tài sản là một cách để nhóm các tài sản giống nhau. "MBP 2013", "IPhone 6", v.v ...', 'deleted' => 'Model này đã bị xoá. Bấm vào đây để khôi phục lại.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'Bạn sắp xóa :model_count asset models.', 'restore' => 'Khôi phục Model', 'requestable' => 'Người dùng có thể yêu cầu mô hình này', - 'show_mac_address' => 'Hiển thị trường địa chỉ MAC trong tài sản của model này', + 'show_mac_address' => 'Hiển thị trường địa chỉ MAC trong tài sản của model này', 'view_deleted' => 'Xem Model đã xoá', 'view_models' => 'Xem model', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Không có trường tùy chỉnh', 'add_default_values' => 'Thêm giá trị mặc định', -); +]; diff --git a/resources/lang/vi/admin/models/message.php b/resources/lang/vi/admin/models/message.php index e3c98ec1e7..cb2a155cec 100644 --- a/resources/lang/vi/admin/models/message.php +++ b/resources/lang/vi/admin/models/message.php @@ -1,42 +1,41 @@ 'Kiểu tài sản không tồn tại.', 'assoc_users' => 'Tài sản này hiện tại đang liên kết với ít nhất một hoặc nhiều tài sản và không thể xóa. Xin vui lòng xóa tài sản, và cố gắng thử lại lần nữa. ', - - 'create' => array( + 'create' => [ 'error' => 'Kiểu tài sản chưa được tạo, xin thử lại.', 'success' => 'Kiểu tài sản đã tạo thành công.', 'duplicate_set' => 'Kiểu tài sản này với tên, nhà sản xuất và mã tài sản thật sự đã tồn tại.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Kiểu tài sản chưa cập nhật, xin thử lại', - 'success' => 'Kiểu tài sản đã cập nhật thành công.' - ), + 'success' => 'Kiểu tài sản đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa kiểu tài sản này?', 'error' => 'Có vấn đề xảy ra khi xóa kiểu tài sản. Xin thử lại.', - 'success' => 'Kiểu tài sản đã xóa thành công.' - ), + 'success' => 'Kiểu tài sản đã xóa thành công.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Kiểu tài sản chưa được phục hồi, xin thử lại', - 'success' => 'Kiểu tài sản đã được phục hồi thành công.' - ), + 'success' => 'Kiểu tài sản đã được phục hồi thành công.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Không có trường nào được thay đổi, vì vậy không có gì được cập nhật.', - 'success' => 'Các mô hình được cập nhật.' - ), + 'success' => 'Các mô hình được cập nhật.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'Không có mục nào được chọn, nên không có gì bị xóa cả.', 'success' => ':succes_count model(s) đã được xóa!', - 'success_partial' => ':success_count model(s) kiểu tài sản đã được xóa, tuy nhiên có :fail_count loại không cho phép xóa vì chúng vẫn còn gắn liên kết đết tài sản.' - ), + 'success_partial' => ':success_count model(s) kiểu tài sản đã được xóa, tuy nhiên có :fail_count loại không cho phép xóa vì chúng vẫn còn gắn liên kết đết tài sản.', + ], -); +]; diff --git a/resources/lang/vi/admin/models/table.php b/resources/lang/vi/admin/models/table.php index 0046dc68d8..1d6376f395 100644 --- a/resources/lang/vi/admin/models/table.php +++ b/resources/lang/vi/admin/models/table.php @@ -1,6 +1,6 @@ 'Tạo kiểu tài sản', 'created_at' => 'Đã tạo lúc', @@ -14,4 +14,4 @@ return array( 'update' => 'Cập nhật kiểu tài sản', 'clone' => 'Nhân đôi kiểu tài sản', 'edit' => 'Cập nhật kiểu tài sản', -); +]; diff --git a/resources/lang/vi/admin/reports/general.php b/resources/lang/vi/admin/reports/general.php index f5edfb3bbd..6c5ce1de04 100644 --- a/resources/lang/vi/admin/reports/general.php +++ b/resources/lang/vi/admin/reports/general.php @@ -1,5 +1,5 @@ 'Chọn các tùy chọn bạn muốn cho báo cáo tài sản.' -); +return [ + 'info' => 'Chọn các tùy chọn bạn muốn cho báo cáo tài sản.', +]; diff --git a/resources/lang/vi/admin/reports/message.php b/resources/lang/vi/admin/reports/message.php index 43cfce05c2..e2cadbcd10 100644 --- a/resources/lang/vi/admin/reports/message.php +++ b/resources/lang/vi/admin/reports/message.php @@ -1,5 +1,5 @@ 'Bạn phải lựa chọn ít nhất một tùy chọn.' -); +return [ + 'error' => 'Bạn phải lựa chọn ít nhất một tùy chọn.', +]; diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php index 50aa247ebd..d3bf1bb8cd 100644 --- a/resources/lang/vi/admin/settings/general.php +++ b/resources/lang/vi/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Miền Active Directory', 'ad_domain_help' => 'Đôi khi giống như tên miền email của bạn, nhưng không phải luôn luôn.', 'ad_append_domain_label' => 'Nối tên miền', 'ad_append_domain' => 'Nối tên miền với trường tên người dùng', - 'ad_append_domain_help' => 'Người dùng không bắt buộc phải viết "username@domain.local", họ chỉ cần nhập "tên người dùng".' , + 'ad_append_domain_help' => 'Người dùng không bắt buộc phải viết "username@domain.local", họ chỉ cần nhập "tên người dùng".', 'admin_cc_email' => 'Gửi thêm 1 bản email đến người khác', 'admin_cc_email_help' => 'Nếu bạn muốn gửi email nhận/trả tài sản đến người dùng vào tài khoản email bổ sung, nhập nó ở đây. Nếu không thì để trống trường này.', 'is_ad' => 'Đây là một máy chủ Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ngưỡng Cảnh báo Hết hạn (theo ngày)', 'alert_inv_threshold' => 'Ngưỡng thông báo khoảng không quảng cáo', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'ID tài sản', 'audit_interval' => 'Khoảng Kiểm toán', 'audit_interval_help' => 'Nếu bạn được yêu cầu kiểm tra thường xuyên tài sản của mình, hãy nhập khoảng thời gian trong nhiều tháng.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Nhập mã số hai nhân tố', 'two_factor_config_complete' => 'Gửi Mã', 'two_factor_enabled_edit_not_allowed' => 'Quản trị viên của bạn không cho phép bạn chỉnh sửa cài đặt này.', - 'two_factor_enrollment_text' => "Yêu cầu xác thực hai yếu tố, tuy nhiên thiết bị của bạn chưa được đăng ký. Mở ứng dụng Google Authenticator của bạn và quét mã QR dưới đây để đăng ký thiết bị của bạn. Khi bạn đã đăng ký thiết bị của mình, hãy nhập mã dưới đây", + 'two_factor_enrollment_text' => 'Yêu cầu xác thực hai yếu tố, tuy nhiên thiết bị của bạn chưa được đăng ký. Mở ứng dụng Google Authenticator của bạn và quét mã QR dưới đây để đăng ký thiết bị của bạn. Khi bạn đã đăng ký thiết bị của mình, hãy nhập mã dưới đây', 'require_accept_signature' => 'Yêu cầu Chữ ký', 'require_accept_signature_help_text' => 'Bật tính năng này sẽ yêu cầu người dùng đăng ký về việc chấp nhận nội dung.', 'left' => 'trái', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Chọn hộp này các chuỗi tài sản có một mã duy nhất', 'zerofill_count' => 'Chiều dài của các thẻ thuộc tính, bao gồm zerofill', 'username_format_help' => 'Cài đặt này sẽ chỉ được sử dụng bởi quá trình import nếu tên người dùng không được cung cấp và chúng tôi sẽ tạo tên người dùng cho bạn.', -); +]; diff --git a/resources/lang/vi/admin/settings/message.php b/resources/lang/vi/admin/settings/message.php index c38508886b..5ea64cb51d 100644 --- a/resources/lang/vi/admin/settings/message.php +++ b/resources/lang/vi/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Có lỗi xảy ra khi cập nhật. ', - 'success' => 'Cập nhật cài đặt thành công.' - ), - 'backup' => array( + 'success' => 'Cập nhật cài đặt thành công.', + ], + 'backup' => [ 'delete_confirm' => 'Bạn có chắc chắn muốn xóa tệp sao lưu này? Hành động này không thể được hoàn tác.', 'file_deleted' => 'Tệp sao lưu đã được xoá thành công.', 'generated' => 'Một tập tin sao lưu mới được tạo thành công.', 'file_not_found' => 'Tập tin sao lưu không tìm thấy trên máy chủ.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Đã xảy ra lỗi trong khi xóa.', 'validation_failed' => 'Xác nhận thanh lọc của bạn không chính xác. Vui lòng nhập từ "DELETE" vào hộp xác nhận.', - 'success' => 'Đã xoá thành công hồ sơ thành công.' - ), + 'success' => 'Đã xoá thành công hồ sơ thành công.', + ], -); +]; diff --git a/resources/lang/vi/admin/statuslabels/message.php b/resources/lang/vi/admin/statuslabels/message.php index 468f9f8d98..5b96646f1c 100644 --- a/resources/lang/vi/admin/statuslabels/message.php +++ b/resources/lang/vi/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Nhãn Trạng thái không tồn tại.', 'assoc_assets' => 'Nhãn Trạng thái này hiện được liên kết với ít nhất một Tài sản và không thể bị xóa. Vui lòng cập nhật nội dung của bạn để không tham khảo trạng thái này nữa và thử lại.', - - 'create' => array( + 'create' => [ 'error' => 'Nhãn trạng thái không được tạo, vui lòng thử lại.', - 'success' => 'Nhãn trạng thái được tạo thành công.' - ), + 'success' => 'Nhãn trạng thái được tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Nhãn Tình trạng không được cập nhật, xin vui lòng thử lại', - 'success' => 'Nhãn trạng thái được tạo thành công.' - ), + 'success' => 'Nhãn trạng thái được tạo thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc bạn muốn xóa nhãn tình trạng này?', 'error' => 'Đã xảy ra sự cố khi xóa Nhãn trạng thái. Vui lòng thử lại.', - 'success' => 'Nhãn Trạng thái đã bị xóa thành công.' - ), + 'success' => 'Nhãn Trạng thái đã bị xóa thành công.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Những tài sản này không thể gán cho bất cứ ai.', 'deployable' => 'Những tài sản này có thể được kiểm tra. Khi được chỉ định, họ sẽ giả sử trạng thái meta là Doanh tác.', 'archived' => 'Không thể kiểm tra các tài sản này và sẽ chỉ hiển thị trong chế độ xem Thư mục lưu trữ. Điều này hữu ích cho việc giữ lại thông tin về tài sản cho mục đích lịch sử ngân sách nhưng giữ chúng khỏi danh mục tài sản hằng ngày.', 'pending' => 'Những tài sản này không thể được gán cho bất cứ ai, thường được sử dụng cho các vật phẩm được sửa chữa, nhưng dự kiến ​​sẽ quay trở lại lưu thông.', - ), + ], -); +]; diff --git a/resources/lang/vi/admin/statuslabels/table.php b/resources/lang/vi/admin/statuslabels/table.php index 06d0ac45ab..cef7621c54 100644 --- a/resources/lang/vi/admin/statuslabels/table.php +++ b/resources/lang/vi/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Về tình trạng nhãn', 'archived' => 'Đã lưu trữ', 'create' => 'Tạo tình trạng nhãn', @@ -16,4 +16,4 @@ return array( 'title' => 'Nhãn tình trạng', 'undeployable' => 'Không cho phép cấp phát', 'update' => 'Cập nhật tình trạng nhãn', -); +]; diff --git a/resources/lang/vi/admin/suppliers/message.php b/resources/lang/vi/admin/suppliers/message.php index e40bdf0eb9..e473bcf8f6 100644 --- a/resources/lang/vi/admin/suppliers/message.php +++ b/resources/lang/vi/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Nhà cung cấp không tồn tại.', - - 'create' => array( + 'create' => [ 'error' => 'Nhà cung cấp chưa được tạo, xin thử lại.', - 'success' => 'Nhà cung cấp đã tạo thành công.' - ), + 'success' => 'Nhà cung cấp đã tạo thành công.', + ], - 'update' => array( + 'update' => [ 'error' => 'Nhà cung cấp chưa được cập nhật, xin thử lại', - 'success' => 'Nhà cung cấp đã cập nhật thành công.' - ), + 'success' => 'Nhà cung cấp đã cập nhật thành công.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Bạn có chắc muốn xóa nhà cung cấp này?', 'error' => 'Có vấn đề xảy ra khi xóa nhà cung cấp. Xin thử lại.', 'success' => 'Nhà cung cấp đã xóa thành công.', 'assoc_assets' => 'Nhà cung cấp này hiện tại đang có liên kết với: asset_count tài sản và không thể xóa. Xin vui lòng cập nhật các tài sản để không còn liên kết với nhà cung cấp này và thử lại. ', 'assoc_licenses' => 'Nhà cung cấp này hiện tại đang có liên kết với: licenses_count license(s) và không thể xóa. Xin vui lòng cập nhật các licence để không còn liên kết với nhà cung cấp này và thử lại. ', 'assoc_maintenances' => 'Nhà cung cấp này hiện tại đang có liên kết với: asset_maintainces_count tài sản đang trong trạng thái bảo trì và không thể xóa. Xin vui lòng cập nhật các tài sản đó để không còn liên kết với nhà cung cấp này và thử lại. ', - ) + ], -); +]; diff --git a/resources/lang/vi/admin/suppliers/table.php b/resources/lang/vi/admin/suppliers/table.php index 8e1941f12d..5abf74cea2 100644 --- a/resources/lang/vi/admin/suppliers/table.php +++ b/resources/lang/vi/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Giới thiệu nhà cung cấp', 'about_suppliers_text' => 'Các nhà cung cấp được sử dụng để theo dõi nguồn hàng', 'address' => 'Địa chỉ nhà cung cấp', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Xem những tài sản của', 'zip' => 'Mã bưu điện', -); +]; diff --git a/resources/lang/vi/admin/users/general.php b/resources/lang/vi/admin/users/general.php index f43751cfb1..b2c18d308b 100644 --- a/resources/lang/vi/admin/users/general.php +++ b/resources/lang/vi/admin/users/general.php @@ -1,7 +1,6 @@ 'Người dùng này có thể đăng nhập', 'activated_disabled_help_text' => 'Bạn không thể sửa tình trạng kích hoạt của tài khoản quản trị.', 'assets_user' => 'Tài sản đã được cấp phát đến :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Sửa người dùng', 'filetype_info' => 'Cho phép loại tập tin are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Lịch sử cấp phát của :name', - 'info' => 'Thông tin', + 'info' => 'Thông tin', 'restore_user' => 'Nhấp vào đây để khôi phục chúng.', 'last_login' => 'Lần đăng nhập trước', 'ldap_config_text' => 'Bạn có thể tìm thấy cài đặt cấu hình LDAP Quản trị> Cài đặt. Địa điểm đã chọn (tùy chọn) sẽ được đặt cho tất cả người dùng được nhập.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Cài đặt quản trị hiện tại của bạn cho phép thực thi có chọn lọc xác thực hai yếu tố.', 'two_factor_enrolled' => 'Thiết bị 2FA đã đăng ký', 'two_factor_active' => '2FA Hoạt động', - ); + ]; diff --git a/resources/lang/vi/admin/users/message.php b/resources/lang/vi/admin/users/message.php index 5a92d97c39..1bcec93c67 100644 --- a/resources/lang/vi/admin/users/message.php +++ b/resources/lang/vi/admin/users/message.php @@ -1,6 +1,6 @@ 'Bạn đã xác nhận tài sản này thành công.', 'declined' => 'Bạn đã từ chối tài sản này thành công.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Tích hợp LDAP thì chưa được cấu hình cho cài đặt này.', 'password_resets_sent' => 'Những người dùng với trạng thái kích hoạt đã chọn và có địa chỉ email hợp lệ sẽ nhận được liên kết đặt lại mật khẩu.', - - 'success' => array( + 'success' => [ 'create' => 'Người dùng đã được tạo thành công.', 'update' => 'Người dùng đã được cập nhật thành công.', 'update_bulk' => 'Người dùng đã được cập nhật thành công!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Đã phục hồi người dùng bị tạm ngưng thành công.', 'restored' => 'Người dùng đã được phục hồi thành công.', 'import' => 'Nhập danh sách người dùng thành công.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Có vấn đề xảy ra khi tạo người dùng. Xin thử lại lần nữa.', 'update' => 'Có vấn đề xảy ra khi cập nhật người dùng. Xin thử lại lần nữa.', 'delete' => 'Có vấn đề xảy ra khi xóa người dùng. Xin thử lại lần nữa.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Không thể tìm thấy máy chủ LDAP. Xin vui lòng kiểm tra cấu hình cài đặt máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:', 'ldap_could_not_get_entries' => 'Không thể lấy các mục từ máy chủ LDAP. Xin vui lòng kiểm tra lại cấu hình máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:', 'password_ldap' => 'Mật khẩu cho tài khoản này được quản lý bởi LDAP / Active Directory. Vui lòng liên hệ với bộ phận CNTT của bạn để thay đổi mật khẩu.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Tập tin không xóa được. Xin vui lòng thử lại.', 'success' => 'Tập tin đã xóa thành công.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Tập tin không tải lên được. Xin vui lòng thử lại.', 'success' => 'Tập tin đã tải lên thành công.', 'nofiles' => 'Bạn đã không chọn tập tin nào để tải lên', 'invalidfiles' => 'Một hoặc nhiều tập tin của bạn có dung lượng quá lớn hoặc loại tập tin không cho phép tải lên. Chỉ cho phép những loại tập tin png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/vi/admin/users/table.php b/resources/lang/vi/admin/users/table.php index 30515151d7..52fe7e1cdb 100644 --- a/resources/lang/vi/admin/users/table.php +++ b/resources/lang/vi/admin/users/table.php @@ -1,6 +1,6 @@ 'Đang hoạt động', 'allow' => 'Cho phép', 'checkedout' => 'Tài sản', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Hiển thị người dùng hiện tại', 'show_deleted' => 'Hiển thị người dùng đã xóa', 'title' => 'Tiêu đề', - 'to_restore_them' => 'để khôi phục lại chúng.', + 'to_restore_them' => 'để khôi phục lại chúng.', 'updateuser' => 'Cập nhật người dùng', 'username' => 'Tên đăng nhập', - 'user_deleted_text' => 'Người dùng này đã bị đánh dấu là đã bị xóa.', + 'user_deleted_text' => 'Người dùng này đã bị đánh dấu là đã bị xóa.', 'username_note' => '(This is used for Active Directory binding only, not for login.)', 'cloneuser' => 'Nhân đôi người dùng', 'viewusers' => 'Xem Người dùng', -); +]; diff --git a/resources/lang/vi/auth/general.php b/resources/lang/vi/auth/general.php index aa2bf80f51..b6d8fb8424 100644 --- a/resources/lang/vi/auth/general.php +++ b/resources/lang/vi/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Nhập tên người dùng của bạn để nhận liên kết đặt lại mật khẩu.', 'username_help_bottom' => 'Tên người dùng và email của bạn có thể giống nhau hoặc không, tùy vào cách cấu hình của bạn. Nếu bạn không nhớ tên người dùng hãy liên hệ với quản trị viên.

Tên người dùng không được liên kết với email sẽ không nhận được liên kết đặt lại mật khẩu. ', ]; - diff --git a/resources/lang/vi/auth/message.php b/resources/lang/vi/auth/message.php index b9115f2bc5..f620f503fc 100644 --- a/resources/lang/vi/auth/message.php +++ b/resources/lang/vi/auth/message.php @@ -1,6 +1,6 @@ 'Tài khoản với email này đã thực sự tồn tại.', 'account_not_found' => 'Tên đăng nhập hoặc mật khẩu không đúng.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Tài khoản người dùng này đã bị cấm.', 'throttle' => 'Quá nhiều lần đăng nhập thất bại. Vui lòng thử lại trong khoảng :minutes phút.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Thiết bị của bạn đã được ghi danh.', 'success' => 'Bạn đã đăng nhập thành công.', 'code_required' => 'Mã xác thực hai yếu tố là bắt buộc.', 'invalid_code' => 'Mã xác thực hai yếu tố chưa đúng.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Có vấn đề khi bạn có gắng đăng nhập, xin thử lại.', 'success' => 'Bạn đã đăng nhập thành công.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'Có vấn đề khi đăng xuất, xin vui lòng thử lại.', 'success' => 'Đăng xuất thành công.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Có vấn đề khi cố gắng tạo tài khoản của bạn, xin thử lại.', 'success' => 'Tài khoản đã được tạo thành công.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Có vấn đề khi cố gắng nhận một mã phục hồi mật khẩu, xin thử lại.', 'success' => 'Nếu email đã cung cấp có tồn tại trên hệ thống, một email phục hồi mật khẩu sẽ được gửi.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Có vấn đề khi cố gắng khởi tạo lại mật khẩu của bạn, xin thử lại lần nữa.', 'success' => 'Mật khẩu của bạn đã được khởi tạo lại thành công.', - ), + ], - -); +]; diff --git a/resources/lang/vi/button.php b/resources/lang/vi/button.php index 10ede648f4..e08522cfb3 100644 --- a/resources/lang/vi/button.php +++ b/resources/lang/vi/button.php @@ -1,6 +1,6 @@ 'Thao tác', 'add' => 'Thêm mới', 'cancel' => 'Hủy', @@ -11,7 +11,7 @@ return array( 'request' => 'Yêu cầu', 'submit' => 'Gửi', 'upload' => 'Tải lên', - 'select_file' => 'Chọn tập tin...', + 'select_file' => 'Chọn tập tin...', 'select_files' => 'Chọn files...', 'generate_labels' => '{1} Nhãn Chung|[2,*] Nhiều Nhãn Chung', -); +]; diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php index 0ec3f787ac..23dbf582af 100644 --- a/resources/lang/vi/general.php +++ b/resources/lang/vi/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Đăng ký tài sản', 'user_requests_count' => 'Yêu cầu', 'city' => 'Thành phố', - 'click_here' => 'Bấm vào đây', + 'click_here' => 'Bấm vào đây', 'clear_selection' => 'Bỏ lựa chọn', 'companies' => 'Các công ty', 'company' => 'Công ty', 'component' => 'Hợp phần', 'components' => 'Các thành phần', - 'complete' => 'Hoàn thành', + 'complete' => 'Hoàn thành', 'consumable' => 'Vật tư phụ', 'consumables' => 'Vật tư phụ', 'country' => 'Nước', diff --git a/resources/lang/vi/help.php b/resources/lang/vi/help.php index e3b2b5aec8..0fe3c39977 100644 --- a/resources/lang/vi/help.php +++ b/resources/lang/vi/help.php @@ -1,6 +1,6 @@ "Đọc thêm", + 'more_info_title' => 'Đọc thêm', - "audit_help" => "Chọn hộp này sẽ chỉnh sửa bản ghi nội dung để phản ánh vị trí mới này. Bỏ chọn nó sẽ chỉ ghi lại vị trí trong nhật ký kiểm tra.

Lưu ý rằng nội dung này đã được kiểm tra, nó sẽ không thay đổi vị trí của người, tài sản hoặc vị trí mà nó được kiểm tra.", + 'audit_help' => 'Chọn hộp này sẽ chỉnh sửa bản ghi nội dung để phản ánh vị trí mới này. Bỏ chọn nó sẽ chỉ ghi lại vị trí trong nhật ký kiểm tra.

Lưu ý rằng nội dung này đã được kiểm tra, nó sẽ không thay đổi vị trí của người, tài sản hoặc vị trí mà nó được kiểm tra.', 'assets' => 'Nội dung là các mục được theo dõi bằng số sê-ri hoặc thẻ nội dung. Chúng có xu hướng trở thành những mặt hàng có giá trị cao hơn khi việc xác định một mặt hàng cụ thể rất quan trọng.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'Bạn có thể thiết lập khấu hao tài sản để khấu hao tài sản dựa trên khấu hao đường thẳng.', - - -); +]; diff --git a/resources/lang/vi/mail.php b/resources/lang/vi/mail.php index f177080fff..b532e70793 100644 --- a/resources/lang/vi/mail.php +++ b/resources/lang/vi/mail.php @@ -1,6 +1,6 @@ 'Người dùng đã hủy bỏ một khoản mục yêu cầu trên trang web', 'a_user_requested' => 'Người dùng đã yêu cầu một mục trên trang web', 'accessory_name' => 'Tên Phụ Kiện:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Báo cáo mong muốn cấp phát tài sản', 'Expected_Checkin_Notification' => 'Nhắn nhở: hạn chót cấp phát cho :name gần đến', 'Expected_Checkin_Date' => 'Một tài sản đã thu hồi về cho bạn vì đã hoàn lại vào ngày :date', - 'your_assets' => 'Xen qua tài sản của bạn' -); + 'your_assets' => 'Xen qua tài sản của bạn', +]; diff --git a/resources/lang/vi/pagination.php b/resources/lang/vi/pagination.php index e2a3976d65..35bfbc94b6 100644 --- a/resources/lang/vi/pagination.php +++ b/resources/lang/vi/pagination.php @@ -1,6 +1,6 @@ 'Tiếp theo »', -); +]; diff --git a/resources/lang/vi/passwords.php b/resources/lang/vi/passwords.php index 56539af35d..ef87421137 100644 --- a/resources/lang/vi/passwords.php +++ b/resources/lang/vi/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Mật khẩu của bạn đã được gửi đi!', 'user' => 'Không tìn thấy người dùng được kích hoạt với email này.', ]; - diff --git a/resources/lang/vi/reminders.php b/resources/lang/vi/reminders.php index 408f245f24..ecbf105417 100644 --- a/resources/lang/vi/reminders.php +++ b/resources/lang/vi/reminders.php @@ -1,6 +1,6 @@ "Mật khẩu phải có tối thiểu 6 ký tự và trùng với thông tin xác nhận.", + 'password' => 'Mật khẩu phải có tối thiểu 6 ký tự và trùng với thông tin xác nhận.', - "user" => "Tên đăng nhập và địa chỉ email không đúng", + 'user' => 'Tên đăng nhập và địa chỉ email không đúng', - "token" => "Token khởi tạo mật khẩu này không hợp lệ.", + 'token' => 'Token khởi tạo mật khẩu này không hợp lệ.', - "sent" => "Nếu tìm thấy một địa chỉ email phù hợp, một thông báo mật khẩu đã được gửi đi!", + 'sent' => 'Nếu tìm thấy một địa chỉ email phù hợp, một thông báo mật khẩu đã được gửi đi!', -); +]; diff --git a/resources/lang/vi/table.php b/resources/lang/vi/table.php index 0ede618d5a..9ee7af1459 100644 --- a/resources/lang/vi/table.php +++ b/resources/lang/vi/table.php @@ -1,10 +1,10 @@ 'Thao tác', 'action' => 'Tác vụ', 'by' => 'Bởi', 'item' => 'Mục', -); +]; diff --git a/resources/lang/vi/validation.php b/resources/lang/vi/validation.php index 6ea232712f..6bcf9e0dfe 100644 --- a/resources/lang/vi/validation.php +++ b/resources/lang/vi/validation.php @@ -1,6 +1,6 @@ ':attribute đã sẵn sàng.', 'uploaded' => 'Thuộc tính: không thể tải lên.', 'url' => 'Định dạng :attribute thì không hợp lý.', - "unique_undeleted" => "Thuộc tính: phải là duy nhất.", + 'unique_undeleted' => 'Thuộc tính: phải là duy nhất.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "Trường: attribute chứa một ký tự không được phép.", - "email_array" => "Một hoặc nhiều địa chỉ email không hợp lệ.", - "hashed_pass" => "Mật khẩu hiện tại của bạn không chính xác", + 'alpha_space' => 'Trường: attribute chứa một ký tự không được phép.', + 'email_array' => 'Một hoặc nhiều địa chỉ email không hợp lệ.', + 'hashed_pass' => 'Mật khẩu hiện tại của bạn không chính xác', 'dumbpwd' => 'Mật khẩu đó quá phổ biến.', - "statuslabel_type" => "Bạn phải chọn một loại nhãn tình trạng hợp lệ", + 'statuslabel_type' => 'Bạn phải chọn một loại nhãn tình trạng hợp lệ', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/zh-CN/admin/accessories/general.php b/resources/lang/zh-CN/admin/accessories/general.php index e34677f381..adb82b1e52 100644 --- a/resources/lang/zh-CN/admin/accessories/general.php +++ b/resources/lang/zh-CN/admin/accessories/general.php @@ -1,6 +1,6 @@ '配件类别', 'accessory_name' => '配件名称', 'checkout' => '借出配件', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => '用默认EULA（最终用户许可协议）进行替换', 'use_default_eula_disabled' => '使用默认EULA（最终用户许可协议）.没有设置默认EULA（最终用户许可协议），请在设置中增加一个。', -); +]; diff --git a/resources/lang/zh-CN/admin/accessories/message.php b/resources/lang/zh-CN/admin/accessories/message.php index f33e5de77f..d902d4f473 100644 --- a/resources/lang/zh-CN/admin/accessories/message.php +++ b/resources/lang/zh-CN/admin/accessories/message.php @@ -1,37 +1,36 @@ '配件[:id] 不存在。', 'assoc_users' => '配件目前状态：可用数量不足，请检查改配件再重试。', - 'create' => array( + 'create' => [ 'error' => '配件添加失败，请重试。', - 'success' => '配件添加成功。' - ), + 'success' => '配件添加成功。', + ], - 'update' => array( + 'update' => [ 'error' => '配件更新失败，请重试。', - 'success' => '配件更新成功。' - ), + 'success' => '配件更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除此配件？', 'error' => '删除配件出错，请重试。', - 'success' => '删除配件成功' - ), + 'success' => '删除配件成功', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '配件不能被预订，请重试。', 'success' => '配件成功预订。', - 'user_does_not_exist' => '无效用户，请重试。' - ), + 'user_does_not_exist' => '无效用户，请重试。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '附件未成功入库，请再试一次', 'success' => '配件入库成功。', - 'user_does_not_exist' => '无效用户，请重试。' - ) + 'user_does_not_exist' => '无效用户，请重试。', + ], - -); +]; diff --git a/resources/lang/zh-CN/admin/accessories/table.php b/resources/lang/zh-CN/admin/accessories/table.php index 7ae841be11..10af70bd7e 100644 --- a/resources/lang/zh-CN/admin/accessories/table.php +++ b/resources/lang/zh-CN/admin/accessories/table.php @@ -1,11 +1,10 @@ '下载CSV文件', - 'eula_text' => '最终用户许可协议', +return [ + 'dl_csv' => '下载CSV文件', + 'eula_text' => '最终用户许可协议', 'id' => 'ID', 'require_acceptance' => '验收', 'title' => '配件名称', - -); +]; diff --git a/resources/lang/zh-CN/admin/asset_maintenances/form.php b/resources/lang/zh-CN/admin/asset_maintenances/form.php index 54c3930dd2..5fdfc4d00e 100644 --- a/resources/lang/zh-CN/admin/asset_maintenances/form.php +++ b/resources/lang/zh-CN/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => '资产维护所需天数', 'notes' => '备注', 'update' => '创建资产维护', - 'create' => '更新资产维护' + 'create' => '更新资产维护', ]; diff --git a/resources/lang/zh-CN/admin/asset_maintenances/message.php b/resources/lang/zh-CN/admin/asset_maintenances/message.php index f29f19b43c..b31fae3438 100644 --- a/resources/lang/zh-CN/admin/asset_maintenances/message.php +++ b/resources/lang/zh-CN/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => ' 你确定要删除这条资产维护信息吗？', 'error' => '资产维护信息删除失败，请稍后重试', - 'success' => '资产维护信息已删除' + 'success' => '资产维护信息已删除', ], 'create' => [ 'error' => '资产维护信息创建失败，请重试', - 'success' => '资产维护信息已创建。' + 'success' => '资产维护信息已创建。', ], 'edit' => [ 'error' => '资产维护信息创建失败，请重试', - 'success' => '资产维护信息已成功编辑。' + 'success' => '资产维护信息已成功编辑。', ], 'asset_maintenance_incomplete' => '尚未完成', 'warranty' => '有质保', 'not_warranty' => '无质保', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/zh-CN/admin/asset_maintenances/table.php b/resources/lang/zh-CN/admin/asset_maintenances/table.php index f9082d965a..02e2bb693d 100644 --- a/resources/lang/zh-CN/admin/asset_maintenances/table.php +++ b/resources/lang/zh-CN/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => '资产维护', 'asset_name' => '资产名称', 'is_warranty' => '质保', - 'dl_csv' => '下载CSV文件' + 'dl_csv' => '下载CSV文件', ]; diff --git a/resources/lang/zh-CN/admin/categories/general.php b/resources/lang/zh-CN/admin/categories/general.php index 66a641509f..f5506db2b4 100644 --- a/resources/lang/zh-CN/admin/categories/general.php +++ b/resources/lang/zh-CN/admin/categories/general.php @@ -1,6 +1,6 @@ '资产分类', 'category_name' => '分类名称', 'checkin_email' => '在签入/签出时发送邮件给所有者。', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => '用默认EULA（最终用户许可协议）进行替换', 'use_default_eula_disabled' => '使用默认EULA（最终用户许可协议）替换.没有设置默认EULA（最终用户许可协议），请在设置中增加一个。', -); +]; diff --git a/resources/lang/zh-CN/admin/categories/message.php b/resources/lang/zh-CN/admin/categories/message.php index 68f33b8920..e72d2c7b9d 100644 --- a/resources/lang/zh-CN/admin/categories/message.php +++ b/resources/lang/zh-CN/admin/categories/message.php @@ -1,25 +1,25 @@ '分类不存在', 'assoc_models' => '此分类下至少还有一个相关资产型号，目前不能被删除，请你确定您的所有资产型号不在此分类下，然后重试。', 'assoc_items' => '此分类下至少还有一个相关资产类型，目前不能被删除，请你确定您的所有资产类型不在此分类下，然后重试。', - 'create' => array( + 'create' => [ 'error' => '分类创建失败，请重试。', - 'success' => '分类创建成功' - ), + 'success' => '分类创建成功', + ], - 'update' => array( + 'update' => [ 'error' => '分类更新失败，请重试', - 'success' => '分类更新成功' - ), + 'success' => '分类更新成功', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除这个分类吗？', 'error' => '删除分类出现异常，请重试。', - 'success' => '分类已经被成功删除。' - ) + 'success' => '分类已经被成功删除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/categories/table.php b/resources/lang/zh-CN/admin/categories/table.php index 662013ba94..69390cdfb7 100644 --- a/resources/lang/zh-CN/admin/categories/table.php +++ b/resources/lang/zh-CN/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA（最终用户许可协议）', +return [ + 'eula_text' => 'EULA（最终用户许可协议）', 'id' => '编号', 'parent' => '父类', 'require_acceptance' => '接受', 'title' => '资产分类名称', -); +]; diff --git a/resources/lang/zh-CN/admin/companies/general.php b/resources/lang/zh-CN/admin/companies/general.php index 80f603a2f2..4692b05895 100644 --- a/resources/lang/zh-CN/admin/companies/general.php +++ b/resources/lang/zh-CN/admin/companies/general.php @@ -1,4 +1,5 @@ '选择公司', ]; diff --git a/resources/lang/zh-CN/admin/companies/message.php b/resources/lang/zh-CN/admin/companies/message.php index d55b4d555a..30898d4a0b 100644 --- a/resources/lang/zh-CN/admin/companies/message.php +++ b/resources/lang/zh-CN/admin/companies/message.php @@ -1,18 +1,19 @@ '公司不存在', 'assoc_users' => '此公司下至少关联了一个模板，目前不能被删除，请你确定您的所有资产不在此公司下，然后重试。', - 'create' => array( + 'create' => [ 'error' => '新增公司失败，请重试。', - 'success' => '新增公司成功。' - ), - 'update' => array( + 'success' => '新增公司成功。', + ], + 'update' => [ 'error' => '更新公司失败，请重试。', - 'success' => '更新公司成功。' - ), - 'delete' => array( + 'success' => '更新公司成功。', + ], + 'delete' => [ 'confirm' => '确定要删除这个公司吗？', 'error' => '删除公司出错，请重试。', - 'success' => '删除公司成功。' - ) -); + 'success' => '删除公司成功。', + ], +]; diff --git a/resources/lang/zh-CN/admin/companies/table.php b/resources/lang/zh-CN/admin/companies/table.php index 8153aa74b7..d73fcbc6c0 100644 --- a/resources/lang/zh-CN/admin/companies/table.php +++ b/resources/lang/zh-CN/admin/companies/table.php @@ -1,9 +1,10 @@ '公司', 'create' => '新增公司', 'title' => '公司', 'update' => '更新公司', 'name' => '公司名称', 'id' => '编号', -); +]; diff --git a/resources/lang/zh-CN/admin/components/general.php b/resources/lang/zh-CN/admin/components/general.php index e7bc55d545..e3df5ec892 100644 --- a/resources/lang/zh-CN/admin/components/general.php +++ b/resources/lang/zh-CN/admin/components/general.php @@ -1,6 +1,6 @@ '名称', 'checkin' => '借入组件', 'checkout' => '借出组件', @@ -12,4 +12,4 @@ return array( 'remaining' => '剩余', 'total' => '总计', 'update' => '更新组件', -); +]; diff --git a/resources/lang/zh-CN/admin/components/message.php b/resources/lang/zh-CN/admin/components/message.php index 1b86333819..18cf956234 100644 --- a/resources/lang/zh-CN/admin/components/message.php +++ b/resources/lang/zh-CN/admin/components/message.php @@ -1,36 +1,35 @@ '组件不存在', - 'create' => array( + 'create' => [ 'error' => '新增组件失败，请重试。', - 'success' => '新增组件成功。' - ), + 'success' => '新增组件成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新组件失败，请重试。', - 'success' => '更新成功。' - ), + 'success' => '更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除这个组件吗？', 'error' => '删除组件出错，请重试。', - 'success' => '删除组件成功。' - ), + 'success' => '删除组件成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '借出组件失败，请重试。', 'success' => '借出组件成功。', - 'user_does_not_exist' => '无效用户，请重试。' - ), + 'user_does_not_exist' => '无效用户，请重试。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '借入组件失败，请重试。', 'success' => '借入组件成功。', - 'user_does_not_exist' => '无效用户，请重试。' - ) + 'user_does_not_exist' => '无效用户，请重试。', + ], - -); +]; diff --git a/resources/lang/zh-CN/admin/components/table.php b/resources/lang/zh-CN/admin/components/table.php index 7f016591f4..84a061a939 100644 --- a/resources/lang/zh-CN/admin/components/table.php +++ b/resources/lang/zh-CN/admin/components/table.php @@ -1,5 +1,5 @@ '名称', -); +]; diff --git a/resources/lang/zh-CN/admin/consumables/general.php b/resources/lang/zh-CN/admin/consumables/general.php index 44c0a95ed7..f98731d77b 100644 --- a/resources/lang/zh-CN/admin/consumables/general.php +++ b/resources/lang/zh-CN/admin/consumables/general.php @@ -1,6 +1,6 @@ '领取耗材给使用者', 'consumable_name' => '耗材名称', 'create' => '创建耗材', @@ -8,4 +8,4 @@ return array( 'remaining' => '剩余', 'total' => '总计', 'update' => '更新耗材', -); +]; diff --git a/resources/lang/zh-CN/admin/consumables/message.php b/resources/lang/zh-CN/admin/consumables/message.php index 0174a13f57..1a53b96aff 100644 --- a/resources/lang/zh-CN/admin/consumables/message.php +++ b/resources/lang/zh-CN/admin/consumables/message.php @@ -1,36 +1,35 @@ '耗材不存在。', - 'create' => array( + 'create' => [ 'error' => '耗材未被创建，请重试。', - 'success' => '耗材创建成功。' - ), + 'success' => '耗材创建成功。', + ], - 'update' => array( + 'update' => [ 'error' => '耗材未被更新，请重试。', - 'success' => '耗材更新成功。' - ), + 'success' => '耗材更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您确定希望删除此耗材？', 'error' => '删除耗材失败，请重试', - 'success' => '成功删除此耗材。' - ), + 'success' => '成功删除此耗材。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '耗材领取失败，请重试', 'success' => '耗材领取成功', - 'user_does_not_exist' => '无效用户，请重试。' - ), + 'user_does_not_exist' => '无效用户，请重试。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '耗材登记失败，请重试', 'success' => '耗材登记成功', - 'user_does_not_exist' => '无效用户，请重试。' - ) + 'user_does_not_exist' => '无效用户，请重试。', + ], - -); +]; diff --git a/resources/lang/zh-CN/admin/consumables/table.php b/resources/lang/zh-CN/admin/consumables/table.php index dd6588fa2a..5707a41994 100644 --- a/resources/lang/zh-CN/admin/consumables/table.php +++ b/resources/lang/zh-CN/admin/consumables/table.php @@ -1,5 +1,5 @@ '耗材名称', -); +]; diff --git a/resources/lang/zh-CN/admin/custom_fields/general.php b/resources/lang/zh-CN/admin/custom_fields/general.php index 993548a878..9342d3f6b8 100644 --- a/resources/lang/zh-CN/admin/custom_fields/general.php +++ b/resources/lang/zh-CN/admin/custom_fields/general.php @@ -1,6 +1,6 @@ '自定义字段', 'field' => '字段', 'about_fieldsets_title' => '关于字段集', @@ -29,4 +29,4 @@ return array( 'create_field' => '新增字段', 'value_encrypted' => '此字段的值已被加密。只有管理员用户能够查看已解密的值', 'show_in_email' => '是否在发送给用户的Email中包含此字段的值？邮件中不能包含加密的值。', -); +]; diff --git a/resources/lang/zh-CN/admin/custom_fields/message.php b/resources/lang/zh-CN/admin/custom_fields/message.php index 0def52baa9..38364f5935 100644 --- a/resources/lang/zh-CN/admin/custom_fields/message.php +++ b/resources/lang/zh-CN/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => '字段不存在', 'already_added' => '已经新增字段', - 'create' => array( + 'create' => [ 'error' => '新增字段失败，请重试', 'success' => '新增字段成功。', - 'assoc_success' => '增加字段到字段集成功' - ), + 'assoc_success' => '增加字段到字段集成功', + ], - 'update' => array( + 'update' => [ 'error' => '更新字段失败，请重试。', - 'success' => '更新字段成功' - ), + 'success' => '更新字段成功', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除这个字段？', 'error' => '删除字段失败，请重试。', 'success' => '删除字段成功', 'in_use' => '字段还在使用中', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => '现场集不存在', - 'create' => array( + 'create' => [ 'error' => '新增字段集失败，请重试', - 'success' => '新增字段集成功' - ), + 'success' => '新增字段集成功', + ], - 'update' => array( + 'update' => [ 'error' => '更新字段集失败，请重试。', - 'success' => '更新字段集成功' - ), + 'success' => '更新字段集成功', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定要删除这个字段集吗？', 'error' => '删除字段集失败，请重试。', 'success' => '删除字段集成功', 'in_use' => '字段集还在使用中', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/zh-CN/admin/departments/message.php b/resources/lang/zh-CN/admin/departments/message.php index be3b0ad8b7..3682d60928 100644 --- a/resources/lang/zh-CN/admin/departments/message.php +++ b/resources/lang/zh-CN/admin/departments/message.php @@ -1,21 +1,21 @@ '部门不存在', 'assoc_users' => '该位置下关联的还有其他用户，目前不能删除，请更新该用户的信息之后，再尝试删除。 ', - 'create' => array( + 'create' => [ 'error' => '部门没有创建，请重试。', - 'success' => '部门创建成功。' - ), - 'update' => array( + 'success' => '部门创建成功。', + ], + 'update' => [ 'error' => '部门没有更新，请重试', - 'success' => '部门更新成功。' - ), - 'delete' => array( + 'success' => '部门更新成功。', + ], + 'delete' => [ 'confirm' => '你确定要删除这个部门吗？', 'error' => '删除部门有一个问题。请再试一次。', - 'success' => '已成功删除该部门。' - ) + 'success' => '已成功删除该部门。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/departments/table.php b/resources/lang/zh-CN/admin/departments/table.php index 26a3c508cd..bf3a99face 100644 --- a/resources/lang/zh-CN/admin/departments/table.php +++ b/resources/lang/zh-CN/admin/departments/table.php @@ -1,6 +1,6 @@ '编号', 'name' => '部门名称', @@ -8,4 +8,4 @@ return array( 'location' => '位置', 'create' => '创建部门', 'update' => '更新部门', - ); + ]; diff --git a/resources/lang/zh-CN/admin/depreciations/general.php b/resources/lang/zh-CN/admin/depreciations/general.php index f64c9153ff..62deac96a2 100644 --- a/resources/lang/zh-CN/admin/depreciations/general.php +++ b/resources/lang/zh-CN/admin/depreciations/general.php @@ -1,6 +1,6 @@ '关于资产折旧', 'about_depreciations' => '你可以设置资产折旧时间期限', 'asset_depreciations' => '资产折旧', @@ -9,4 +9,4 @@ return array( 'number_of_months' => '月数', 'update' => '更新折旧', -); +]; diff --git a/resources/lang/zh-CN/admin/depreciations/message.php b/resources/lang/zh-CN/admin/depreciations/message.php index a9b99a24af..1a31394c84 100644 --- a/resources/lang/zh-CN/admin/depreciations/message.php +++ b/resources/lang/zh-CN/admin/depreciations/message.php @@ -1,25 +1,24 @@ '折旧类不存在', 'assoc_users' => '此折旧类型至少有一个相关资产与其牵连，请删除牵连的资产，然后重试。', - - 'create' => array( + 'create' => [ 'error' => '折旧类创建失败，请重试。:(', - 'success' => '折旧类创建成功。:)' - ), + 'success' => '折旧类创建成功。:)', + ], - 'update' => array( + 'update' => [ 'error' => '折旧类更新失败，请重试。', - 'success' => '折旧类更新成功' - ), + 'success' => '折旧类更新成功', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定删除这个折旧类吗？', 'error' => '删除折旧类的过程中出现了一些问题，请重试。', - 'success' => '折旧类已经成功被删除。' - ) + 'success' => '折旧类已经成功被删除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/depreciations/table.php b/resources/lang/zh-CN/admin/depreciations/table.php index 0db19546a6..17fe44f092 100644 --- a/resources/lang/zh-CN/admin/depreciations/table.php +++ b/resources/lang/zh-CN/admin/depreciations/table.php @@ -1,10 +1,10 @@ '编号', 'months' => '月数', 'term' => '条件', 'title' => '名称', -); +]; diff --git a/resources/lang/zh-CN/admin/groups/message.php b/resources/lang/zh-CN/admin/groups/message.php index 555709d02e..fda8448d55 100644 --- a/resources/lang/zh-CN/admin/groups/message.php +++ b/resources/lang/zh-CN/admin/groups/message.php @@ -1,22 +1,22 @@ '分组已经存在', 'group_not_found' => '分组[:id]不存在', 'group_name_required' => '名称为必填项', - 'success' => array( + 'success' => [ 'create' => '分组创建成功', 'update' => '分组更新成功', 'delete' => '分组删除成功', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定删除这个分组吗？', 'create' => '新增分组的过程中出现了一些问题，请重试。', 'update' => '更新分组过程中出现了一些问题，请重试。', 'delete' => '删除分组的过程中出现了一些问题，请重试。', - ), + ], -); +]; diff --git a/resources/lang/zh-CN/admin/groups/table.php b/resources/lang/zh-CN/admin/groups/table.php index 0c9ccb0e62..1d596481fc 100644 --- a/resources/lang/zh-CN/admin/groups/table.php +++ b/resources/lang/zh-CN/admin/groups/table.php @@ -1,9 +1,9 @@ '编号', 'name' => '名称', 'users' => '# 的用户', -); +]; diff --git a/resources/lang/zh-CN/admin/groups/titles.php b/resources/lang/zh-CN/admin/groups/titles.php index 45552dff8b..5f59259b84 100644 --- a/resources/lang/zh-CN/admin/groups/titles.php +++ b/resources/lang/zh-CN/admin/groups/titles.php @@ -1,6 +1,6 @@ '关于分组', 'about_groups' => '分组用来区分用户的权限。', 'group_management' => '分组管理', @@ -11,4 +11,4 @@ return array( 'allow' => '允许', 'deny' => '拒绝', -); +]; diff --git a/resources/lang/zh-CN/admin/hardware/form.php b/resources/lang/zh-CN/admin/hardware/form.php index 09c90f757c..15982a2a48 100644 --- a/resources/lang/zh-CN/admin/hardware/form.php +++ b/resources/lang/zh-CN/admin/hardware/form.php @@ -1,12 +1,12 @@ '批量删除确认', +return [ + 'bulk_delete' => '批量删除确认', 'bulk_delete_help' => '请在此确认将批量删除的资产。在删除后，资产可以恢复，但一切当前的用户关联将会丢失。', 'bulk_delete_warn' => '即将删除 :asset_count 项资产', - 'bulk_update' => '批量更新', - 'bulk_update_help' => '该表格允许你同时修改多项资产。请仅填写需要修改的字段，留空的字段不会做任何修改。 ', - 'bulk_update_warn' => '你即将同时修改 :asset_count 项资产的属性。', + 'bulk_update' => '批量更新', + 'bulk_update_help' => '该表格允许你同时修改多项资产。请仅填写需要修改的字段，留空的字段不会做任何修改。 ', + 'bulk_update_warn' => '你即将同时修改 :asset_count 项资产的属性。', 'checkedout_to' => '借出至', 'checkout_date' => '借出日期', 'checkin_date' => '登记日期', @@ -38,7 +38,6 @@ return array( 'tag' => '资产标签', 'update' => '更新资产', 'warranty' => '质保', - 'warranty_expires' => '保修期已过', + 'warranty_expires' => '保修期已过', 'years' => '年', -) -; +]; diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php index 8df5502ee6..f90cdd3c17 100644 --- a/resources/lang/zh-CN/admin/hardware/general.php +++ b/resources/lang/zh-CN/admin/hardware/general.php @@ -1,9 +1,9 @@ '关于资产', 'about_assets_text' => '资产是按照序列号或者资产标签跟踪的物品。可以标记特殊物品为高价值资产。', - 'archived' => '已存档', + 'archived' => '已存档', 'asset' => '资产', 'bulk_checkout' => '分配资产', 'checkin' => '借入资产', @@ -19,4 +19,4 @@ return array( 'pending' => '待处理', 'undeployable' => '不可部署', 'view' => '查看资产', -); +]; diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php index 9097f084d2..b91c1bf4ec 100644 --- a/resources/lang/zh-CN/admin/hardware/message.php +++ b/resources/lang/zh-CN/admin/hardware/message.php @@ -1,82 +1,80 @@ '警告: 该资产目前已经被标记为不可被分配，如果该资产状态已经改变，请刷新。', 'does_not_exist' => '资产不存在', 'does_not_exist_or_not_requestable' => '已重试，那个资产不存在或不可申请。', 'assoc_users' => '这个资产目前已经借给某个用户，不能被删除，请检查资产信息，然后再尝试删除。', - 'create' => array( + 'create' => [ 'error' => '资产创建失败，请重试。:(', - 'success' => '资产创建成功。 :)' - ), + 'success' => '资产创建成功。 :)', + ], - 'update' => array( + 'update' => [ 'error' => '资产更新失败，请重试。', 'success' => '资产更新成功。', 'nothing_updated' => '一个也没有选，所以什么也不会更新。', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => '资产未被恢复，请重试。', - 'success' => '资产恢复成功。' - ), + 'success' => '资产恢复成功。', + ], - 'audit' => array( + 'audit' => [ 'error' => '尝试一下', - 'success' => '资产审计已成功记录。' - ), + 'success' => '资产审计已成功记录。', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => '文件删除失败，请重试', 'success' => '文件已成功删除。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '文件上传失败，请重试。', 'success' => '文件已上传成功。', 'nofiles' => '尚未选择要上传的文件，或上传的文件过大。', 'invalidfiles' => '一个或多个文件过大或者属于不被允许的文件类型。允许上传的文件类型有PNG，GIF，JPG，DOC，DOCX，PDF和TXT。', - ), + ], - 'import' => array( + 'import' => [ 'error' => '某些字段没有正确导入', 'errorDetail' => '以下项由于错误未被导入', - 'success' => "您的文件已被导入", - 'file_delete_success' => "您的文件已成功删除", - 'file_delete_error' => "该文件无法被删除", - ), + 'success' => '您的文件已被导入', + 'file_delete_success' => '您的文件已成功删除', + 'file_delete_error' => '该文件无法被删除', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除这个资产吗？', 'error' => '删除资产的过程中出现了一点儿问题，请重试。', 'nothing_updated' => '没有选择任何资产，所以没有删除任何资产。', - 'success' => '资产成功被删除。' - ), + 'success' => '资产成功被删除。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '资产未被借出，请重试', 'success' => '资产借出成功。', 'user_does_not_exist' => '无效用户，请重试。', 'not_available' => '此资产无法借出', - 'no_assets_selected' => '您必须在这个列表中选择至少一项资产' - ), + 'no_assets_selected' => '您必须在这个列表中选择至少一项资产', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '资产还没有借入，请重试。', 'success' => '资产借入成功。', 'user_does_not_exist' => '无效用户，请重试。', 'already_checked_in' => '资产已经被申领', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => '未能成功请求分配资产，请重试。', 'success' => '成功请求资产', - 'canceled' => '借出申请已取消。' - ) + 'canceled' => '借出申请已取消。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/hardware/table.php b/resources/lang/zh-CN/admin/hardware/table.php index db804c08a8..76fadb6dd7 100644 --- a/resources/lang/zh-CN/admin/hardware/table.php +++ b/resources/lang/zh-CN/admin/hardware/table.php @@ -1,6 +1,6 @@ '资产标签', 'asset_model' => '型号', @@ -20,6 +20,6 @@ return array( 'title' => '资产', 'image' => '设备图片', 'days_without_acceptance' => '过期天数', - 'monthly_depreciation' => '每月折旧率' + 'monthly_depreciation' => '每月折旧率', -); +]; diff --git a/resources/lang/zh-CN/admin/kits/general.php b/resources/lang/zh-CN/admin/kits/general.php index 25fa855e0b..8a732f366f 100644 --- a/resources/lang/zh-CN/admin/kits/general.php +++ b/resources/lang/zh-CN/admin/kits/general.php @@ -1,6 +1,6 @@ '关于预定义工具包', 'about_kits_text' => '预定义工具包让您可以快速向用户签出一系列项目（资产、许可证等）。当您的入职流程在许多用户之间是一致的，并且所有用户都会收到相同的项目时，这将会很有帮助。', 'checkout' => '签出工具 ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => '没有足够的:consumable可用来签出，需要 :qty 。 ', 'none_accessory' => '没有足够的 :accessory 可用来签出，需要 :qty。 ', -); +]; diff --git a/resources/lang/zh-CN/admin/licenses/form.php b/resources/lang/zh-CN/admin/licenses/form.php index e3a8d583f4..96b139ece0 100644 --- a/resources/lang/zh-CN/admin/licenses/form.php +++ b/resources/lang/zh-CN/admin/licenses/form.php @@ -1,6 +1,6 @@ '资产', 'checkin' => '借入', @@ -18,5 +18,5 @@ return array( 'to_email' => '许可电子邮件', 'to_name' => '许可人名字', 'update' => '更新许可证', - 'checkout_help' => '请检查这个许可证是不是已经分配给了某个人或某个设备。你可以选择全部，但是资产归属人必须是相同的。' -); + 'checkout_help' => '请检查这个许可证是不是已经分配给了某个人或某个设备。你可以选择全部，但是资产归属人必须是相同的。', +]; diff --git a/resources/lang/zh-CN/admin/licenses/general.php b/resources/lang/zh-CN/admin/licenses/general.php index 312b3dd6cf..d651db3d7c 100644 --- a/resources/lang/zh-CN/admin/licenses/general.php +++ b/resources/lang/zh-CN/admin/licenses/general.php @@ -1,6 +1,6 @@ '关于许可证', 'about_licenses' => '许可证用于跟踪软件。 它们包含特殊位数的数字，可以借出给个人。', 'checkin' => '接入许可证数量', @@ -18,4 +18,4 @@ return array( 'software_licenses' => '软件许可证', 'user' => '用户', 'view' => '查看许可证', -); +]; diff --git a/resources/lang/zh-CN/admin/licenses/message.php b/resources/lang/zh-CN/admin/licenses/message.php index ecfd333934..8137737130 100644 --- a/resources/lang/zh-CN/admin/licenses/message.php +++ b/resources/lang/zh-CN/admin/licenses/message.php @@ -1,6 +1,6 @@ '许可证不存在', 'user_does_not_exist' => '用户不存在', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => '您必须选择资产或用户，但不能同时选择两者。', 'not_found' => '找不到许可证', - - 'create' => array( + 'create' => [ 'error' => '许可证没有被创建，请重试。', - 'success' => '许可证创建成功' - ), + 'success' => '许可证创建成功', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '该文件无法删除，请重试。', 'success' => '文件成功删除。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '文件上传失败，请重试。', 'success' => '文件上传成功。', 'nofiles' => '尚未选择要上传的文件，或上传的文件过大。', 'invalidfiles' => '一个或多个文件过大或文件类型不被允许。允许上传的文件类型有PNG，Gif，Jpg，Jpeg，Doc，Docx，Pdf，Txt，Zip，Rar，Rtf，Xml和LIC。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '许可证更新失败，请重试。', - 'success' => '许可证更新成功。' - ), + 'success' => '许可证更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定删除这条许可信息？', 'error' => '删除许可信息的过程中出现了一些问题，请重试。', - 'success' => '许可信息已经被成功删除。' - ), + 'success' => '许可信息已经被成功删除。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '分配（借出）许可证的过程中出现了一些问题，请重试。', - 'success' => '许可证已经成功借出' - ), + 'success' => '许可证已经成功借出', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '借入许可证的过程中出现了一些问题，请重试。', - 'success' => '许可证已经成功借入。' - ), + 'success' => '许可证已经成功借入。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/licenses/table.php b/resources/lang/zh-CN/admin/licenses/table.php index 9bd566a0a4..c2573c1560 100644 --- a/resources/lang/zh-CN/admin/licenses/table.php +++ b/resources/lang/zh-CN/admin/licenses/table.php @@ -1,6 +1,6 @@ '分配给', 'checkout' => '进/出', @@ -14,4 +14,4 @@ return array( 'serial' => '序列号', 'title' => '授权许可', -); +]; diff --git a/resources/lang/zh-CN/admin/locations/message.php b/resources/lang/zh-CN/admin/locations/message.php index dc79659b62..24698e9851 100644 --- a/resources/lang/zh-CN/admin/locations/message.php +++ b/resources/lang/zh-CN/admin/locations/message.php @@ -1,27 +1,26 @@ '位置不存在', 'assoc_users' => '该位置下管理的还有其他用户，目前不能删除，请更新该用户的信息之后，再尝试删除。', 'assoc_assets' => '删除失败，该位置已与其它资产关联。请先更新资产以取消关联，然后重试。 ', 'assoc_child_loc' => '删除失败，该位置是一个或多个子位置的上层节点。请更新地理位置信息以取消关联，然后重试。 ', - - 'create' => array( + 'create' => [ 'error' => '位置没有被创建，请重试。', - 'success' => '位置创建成功。' - ), + 'success' => '位置创建成功。', + ], - 'update' => array( + 'update' => [ 'error' => '位置没有被更新，请重试。', - 'success' => '位置更新成功。' - ), + 'success' => '位置更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定删除这个位置吗?', 'error' => '删除位置的过成中出现了一点儿问题，请重试。', - 'success' => '位置已经成功删除。' - ) + 'success' => '位置已经成功删除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/locations/table.php b/resources/lang/zh-CN/admin/locations/table.php index 4df778363e..98202b15de 100644 --- a/resources/lang/zh-CN/admin/locations/table.php +++ b/resources/lang/zh-CN/admin/locations/table.php @@ -1,6 +1,6 @@ '管理地理位置', 'about_locations' => '地理位置用来跟踪用户、资产和其他项目的位置信息。', 'assets_rtd' => '资产', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => '上级节点', 'currency' => '当地货币单位', 'ldap_ou' => 'LDAP中搜索组织单位（OU）', - ); + ]; diff --git a/resources/lang/zh-CN/admin/manufacturers/message.php b/resources/lang/zh-CN/admin/manufacturers/message.php index 63902c2791..7c0b620260 100644 --- a/resources/lang/zh-CN/admin/manufacturers/message.php +++ b/resources/lang/zh-CN/admin/manufacturers/message.php @@ -1,29 +1,29 @@ '制造商不存在', 'assoc_users' => '这个制造商下关联的还有其他资产，请确认后再重试。', - 'create' => array( + 'create' => [ 'error' => '制造商创建失败，请重试。', - 'success' => '制造商创建成功。' - ), + 'success' => '制造商创建成功。', + ], - 'update' => array( + 'update' => [ 'error' => '制造商没有被更新，请重试。', - 'success' => '制造商更新成功。' - ), + 'success' => '制造商更新成功。', + ], - 'restore' => array( + 'restore' => [ 'error' => '制造商未恢复，请重试', - 'success' => '制造商恢复成功。' - ), + 'success' => '制造商恢复成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '确定要删除这个制造商吗？', 'error' => '删除制造商的过程中出现了一点儿问题，请重试。', - 'success' => '制造商已经成功被删除。' - ) + 'success' => '制造商已经成功被删除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/manufacturers/table.php b/resources/lang/zh-CN/admin/manufacturers/table.php index 99e59a6340..303c2f2fde 100644 --- a/resources/lang/zh-CN/admin/manufacturers/table.php +++ b/resources/lang/zh-CN/admin/manufacturers/table.php @@ -1,6 +1,6 @@ '关于制造商', 'about_manufacturers_text' => '制造商是您资产的生产厂家。您可以保存一些重要的客服信息，可以方便进行故障报修等操作，这些信息将显示到资产的详情页中。', 'asset_manufacturers' => '资产制造商', @@ -13,4 +13,4 @@ return array( 'update' => '更新制造商', 'url' => 'URL', -); +]; diff --git a/resources/lang/zh-CN/admin/models/general.php b/resources/lang/zh-CN/admin/models/general.php index 9b015d478c..165236383f 100644 --- a/resources/lang/zh-CN/admin/models/general.php +++ b/resources/lang/zh-CN/admin/models/general.php @@ -1,6 +1,6 @@ '关于资产型号', 'about_models_text' => '资产型号是将相同资产分组的一种方式。"MBP 2013"、"IPhone 6s"等。', 'deleted' => '此型号已被删除。点击此处恢复。', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => '您即将删除:model_count资产型号。', 'restore' => '恢复型号', 'requestable' => '用户可申请此型号', - 'show_mac_address' => '在此型号资产中显示MAC地址', + 'show_mac_address' => '在此型号资产中显示MAC地址', 'view_deleted' => '查看已删除', 'view_models' => '查看已型号', 'fieldset' => '字段集', 'no_custom_field' => '没有自定义字段', 'add_default_values' => '添加默认值', -); +]; diff --git a/resources/lang/zh-CN/admin/models/message.php b/resources/lang/zh-CN/admin/models/message.php index 21a6dba5ce..15f057ae35 100644 --- a/resources/lang/zh-CN/admin/models/message.php +++ b/resources/lang/zh-CN/admin/models/message.php @@ -1,42 +1,41 @@ '模板不存在', 'assoc_users' => '本模板下目前还有相关的资产，不能被删除，请删除资产以后，再重试。', - - 'create' => array( + 'create' => [ 'error' => '模板没有被创建，请重试。', 'success' => '模板创建成功。', 'duplicate_set' => '资产名称、制造商和编号都相同的其它资产模板已存在。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '模板没有被更新，请重试。', - 'success' => '模板更新成功。' - ), + 'success' => '模板更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定删除这个模板吗？', 'error' => '删除模板的过程中出现了一点儿问题，请重试。', - 'success' => '模板已经成功被删除' - ), + 'success' => '模板已经成功被删除', + ], - 'restore' => array( + 'restore' => [ 'error' => '型号未被恢复，请重试。', - 'success' => '型号恢复成功。' - ), + 'success' => '型号恢复成功。', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => '没有字段被更改，因此没有更新任何内容。', - 'success' => '模板已更新。' - ), + 'success' => '模板已更新。', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => '没有型号被选中，所以没有删除任何东西。', 'success' => ':success_count 个已删除！', - 'success_partial' => ':success_count 个已删除, 但是 :fail_count 个因为还有关联资产所以没办法删除。' - ), + 'success_partial' => ':success_count 个已删除, 但是 :fail_count 个因为还有关联资产所以没办法删除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/models/table.php b/resources/lang/zh-CN/admin/models/table.php index c5325c717d..9d55b13c9a 100644 --- a/resources/lang/zh-CN/admin/models/table.php +++ b/resources/lang/zh-CN/admin/models/table.php @@ -1,6 +1,6 @@ '创建资产模板', 'created_at' => '创建于', @@ -14,4 +14,4 @@ return array( 'update' => '更新资产模板', 'clone' => '克隆模板', 'edit' => '编辑模板', -); +]; diff --git a/resources/lang/zh-CN/admin/reports/general.php b/resources/lang/zh-CN/admin/reports/general.php index 1c168b9294..821fc63959 100644 --- a/resources/lang/zh-CN/admin/reports/general.php +++ b/resources/lang/zh-CN/admin/reports/general.php @@ -1,5 +1,5 @@ '请选择你要报备资产的选项。' -); +return [ + 'info' => '请选择你要报备资产的选项。', +]; diff --git a/resources/lang/zh-CN/admin/reports/message.php b/resources/lang/zh-CN/admin/reports/message.php index cf0e4a14ad..fef78376ae 100644 --- a/resources/lang/zh-CN/admin/reports/message.php +++ b/resources/lang/zh-CN/admin/reports/message.php @@ -1,5 +1,5 @@ '你至少选择一个选项。' -); +return [ + 'error' => '你至少选择一个选项。', +]; diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php index 269db9efa7..575ddf8af1 100644 --- a/resources/lang/zh-CN/admin/settings/general.php +++ b/resources/lang/zh-CN/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory活动目录', 'ad_domain' => 'AD域', 'ad_domain_help' => '通常(但并非全部情况下)这与您的邮件域相同', 'ad_append_domain_label' => '附加域名', 'ad_append_domain' => '添加域名到用户名字段', - 'ad_append_domain_help' => '不要求用户输入“"username@domain.local"，他们只需输入“username”。' , + 'ad_append_domain_help' => '不要求用户输入“"username@domain.local"，他们只需输入“username”。', 'admin_cc_email' => '邮件抄送', 'admin_cc_email_help' => '如果你想给用户额外的邮件账户发送签入/签出副本，请在此输入邮箱地址，否则请留空。', 'is_ad' => '这是AD域服务器', @@ -15,7 +15,7 @@ return array( 'alert_interval' => '警报阈值(天)', 'alert_inv_threshold' => '库存警报阈值', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => '资产ID', 'audit_interval' => '盘点时间间隔', 'audit_interval_help' => '如果您需要定期盘点您的资产，请输入月数间隔。', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => '输入两步验证代码', 'two_factor_config_complete' => '发送两步验证代码', 'two_factor_enabled_edit_not_allowed' => '你的管理员不允许您编辑此设置。', - 'two_factor_enrollment_text' => "本系统强制两步验证，但您尚未登记您的移动设备。请启动您的 Google Authenticator 应用并扫描下方二维码以设置两步验证。在您完成后，请在下方输入生成的认证代码。", + 'two_factor_enrollment_text' => '本系统强制两步验证，但您尚未登记您的移动设备。请启动您的 Google Authenticator 应用并扫描下方二维码以设置两步验证。在您完成后，请在下方输入生成的认证代码。', 'require_accept_signature' => '需要签名', 'require_accept_signature_help_text' => '启用此功能将需要用户亲自签署来接受一项资产。', 'left' => '左', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => '选中此框将强制对资产序列进行唯一性约束', 'zerofill_count' => '资产标签长度，包括补零', 'username_format_help' => '只有在没有提供用户名并且我们必须为您生成用户名时，导入过程才会使用此设置。', -); +]; diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php index 5bbec1ad09..4e5a9b019c 100644 --- a/resources/lang/zh-CN/admin/settings/message.php +++ b/resources/lang/zh-CN/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '更新过程中出现了问题。', - 'success' => '设置配置信息更新成功。' - ), - 'backup' => array( + 'success' => '设置配置信息更新成功。', + ], + 'backup' => [ 'delete_confirm' => '你确定你想要删除该备份文件? 此操作无法撤消。 ', 'file_deleted' => '备份文件已成功删除。 ', 'generated' => '成功地创建了一个新的备份文件。', 'file_not_found' => '在服务器上找不到备份文件。', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => '清除过程中出现了错误。 ', 'validation_failed' => '你的清除确认不正确，请在输入框中输入“DELETE”。', - 'success' => '删除记录已被成功的清除。' - ), + 'success' => '删除记录已被成功的清除。', + ], -); +]; diff --git a/resources/lang/zh-CN/admin/statuslabels/message.php b/resources/lang/zh-CN/admin/statuslabels/message.php index 8b88aa8666..af4587d512 100644 --- a/resources/lang/zh-CN/admin/statuslabels/message.php +++ b/resources/lang/zh-CN/admin/statuslabels/message.php @@ -1,32 +1,31 @@ '状态标签不存在', 'assoc_assets' => '删除失败，该状态标签已与其它资产关联。请先更新资产以取消关联，然后重试。 ', - - 'create' => array( + 'create' => [ 'error' => '状态标签未被创建，请重试', - 'success' => '状态标签已成功创建' - ), + 'success' => '状态标签已成功创建', + ], - 'update' => array( + 'update' => [ 'error' => '状态标签未被更新，请重试', - 'success' => '状态标签已成功更新' - ), + 'success' => '状态标签已成功更新', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你是否确认删除此状态标签？', 'error' => '删除状态标签发生错误，请重试', - 'success' => '状态标签删除成功。' - ), + 'success' => '状态标签删除成功。', + ], - 'help' => array( + 'help' => [ 'undeployable' => '这些资产不能分配给任何人。', 'deployable' => '这些资产可以检出。一旦分配了它们，它们将承担一个元状态 Deployed。', 'archived' => '这些资产无法签出，只会显示在“存档”视图中。这有助于保留有关资产的预算/历史目的信息，但将其保留在日常资产清单之外。', 'pending' => '这些资产不能分配给任何人，经常用于修理的物品，但预计将重新流通。', - ), + ], -); +]; diff --git a/resources/lang/zh-CN/admin/statuslabels/table.php b/resources/lang/zh-CN/admin/statuslabels/table.php index 09a227e1cd..5d4c5bb142 100644 --- a/resources/lang/zh-CN/admin/statuslabels/table.php +++ b/resources/lang/zh-CN/admin/statuslabels/table.php @@ -1,6 +1,6 @@ '关于状态标签', 'archived' => '已存档', 'create' => '创建状态标签', @@ -16,4 +16,4 @@ return array( 'title' => '状态标签', 'undeployable' => '无法部署', 'update' => '更新状态标签', -); +]; diff --git a/resources/lang/zh-CN/admin/suppliers/message.php b/resources/lang/zh-CN/admin/suppliers/message.php index d818084d11..5d0562d2ef 100644 --- a/resources/lang/zh-CN/admin/suppliers/message.php +++ b/resources/lang/zh-CN/admin/suppliers/message.php @@ -1,27 +1,26 @@ '供应商不存在。', - - 'create' => array( + 'create' => [ 'error' => '供应商没有被创建，请重试。', - 'success' => '供应商创建成功。' - ), + 'success' => '供应商创建成功。', + ], - 'update' => array( + 'update' => [ 'error' => '供应商没有被更新，请重试。', - 'success' => '供应商更新成功。' - ), + 'success' => '供应商更新成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '你确定要删除这个供应商吗？', 'error' => '删除供应商的过程中出现了一点儿问题，请重试。', 'success' => '供应商成功被删除。', 'assoc_assets' => '此供应商下至少还有 :asset_count 个相关模板，目前不能被删除，请你确定您的所有资 产不在此分类下，然后重试。 ', 'assoc_licenses' => '此供应商目前与 :licenses_count 个许可证相关联，不能删除。请更新您的许可证，断开与此供应商的关联，然后重试。 ', 'assoc_maintenances' => '此供应商下至少还有 :asset_count 个相关模板，目前不能被删除，请你确定您的所有资产不在此分类下，然后重试。 ', - ) + ], -); +]; diff --git a/resources/lang/zh-CN/admin/suppliers/table.php b/resources/lang/zh-CN/admin/suppliers/table.php index 69fec0163e..d6d8237e25 100644 --- a/resources/lang/zh-CN/admin/suppliers/table.php +++ b/resources/lang/zh-CN/admin/suppliers/table.php @@ -1,6 +1,6 @@ '关于供应商', 'about_suppliers_text' => '供应商用来跟踪物品的来源', 'address' => '供应商地址', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => '查看资产关于', 'zip' => '邮政编码', -); +]; diff --git a/resources/lang/zh-CN/admin/users/general.php b/resources/lang/zh-CN/admin/users/general.php index c249ab3e91..be77970f4a 100644 --- a/resources/lang/zh-CN/admin/users/general.php +++ b/resources/lang/zh-CN/admin/users/general.php @@ -1,7 +1,6 @@ '该用户可以登录', 'activated_disabled_help_text' => '您无法编辑自己帐户的激活状态。', 'assets_user' => '分配给:name的资产', @@ -13,7 +12,7 @@ return array( 'edit' => '编辑用户', 'filetype_info' => '允许的文件类型有： png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar', 'history_user' => ':name的历史', - 'info' => '信息', + 'info' => '信息', 'restore_user' => '单击此处可将其还原。', 'last_login' => '上一次登陆', 'ldap_config_text' => 'LDAP配置在 管理 > 设置。所选位置将为导入的用户所用', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => '您当前的管理员设置允许使用双重认证。 ', 'two_factor_enrolled' => '双重认证设备登记', 'two_factor_active' => '启用双重认证', - ); + ]; diff --git a/resources/lang/zh-CN/admin/users/message.php b/resources/lang/zh-CN/admin/users/message.php index 353d262f8d..10e9d2263c 100644 --- a/resources/lang/zh-CN/admin/users/message.php +++ b/resources/lang/zh-CN/admin/users/message.php @@ -1,6 +1,6 @@ '你已成功接受此项资产。', 'declined' => '你已拒绝此项资产。', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => '安装过程中未启用LDAP集成的功能。', 'password_resets_sent' => '被选中的已激活并拥有有效电子邮件地址的用户已经收到了一个密码重置链接。', - - 'success' => array( + 'success' => [ 'create' => '用户创建成功', 'update' => '用户更新成功。', 'update_bulk' => '用户更新成功。', @@ -26,9 +25,9 @@ return array( 'unsuspend' => '用户解除停用', 'restored' => '用户成功被恢复。', 'import' => '导入用户成功', - ), + ], - 'error' => array( + 'error' => [ 'create' => '创建用户过程中出现了一些问题，请重试。', 'update' => '更新用户过程中出现了一些问题，请重试。', 'delete' => '删除用户过程中出现了一点儿问题，请重试。', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => '查询LDAP服务器失败，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:', 'ldap_could_not_get_entries' => '从LDAP服务器获取信息条目失败，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:', 'password_ldap' => '此帐户的密码由LDAP / Active Directory管理。请联系您的IT部门更改您的密码。', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '文件删除失败，请重试', 'success' => '文件已成功删除。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '文件上传失败，请重试。', 'success' => '文件已上传成功。', 'nofiles' => '您没有选择要上传的文件', 'invalidfiles' => '一个或多个文件过大或文件类型不被允许。允许上传的文件类型有PNG，GIF，JPG，DOC，DOCX，PDF和TXT。', - ), + ], -); +]; diff --git a/resources/lang/zh-CN/admin/users/table.php b/resources/lang/zh-CN/admin/users/table.php index b403fc6f1a..dfc2e3a68b 100644 --- a/resources/lang/zh-CN/admin/users/table.php +++ b/resources/lang/zh-CN/admin/users/table.php @@ -1,6 +1,6 @@ '激活', 'allow' => '允许', 'checkedout' => '资产', @@ -28,11 +28,11 @@ return array( 'show_current' => '已当前用户', 'show_deleted' => '已删除用户', 'title' => '职位', - 'to_restore_them' => '恢复它们。', + 'to_restore_them' => '恢复它们。', 'updateuser' => '更新用户', 'username' => '用户名', - 'user_deleted_text' => '此用户已被标记为已删除。', + 'user_deleted_text' => '此用户已被标记为已删除。', 'username_note' => '（这个是用来活动目录「Active Directory」的绑定，非用来登录）', 'cloneuser' => '克隆用户', 'viewusers' => '查看用户', -); +]; diff --git a/resources/lang/zh-CN/auth/general.php b/resources/lang/zh-CN/auth/general.php index b77bbec126..e5a104d316 100644 --- a/resources/lang/zh-CN/auth/general.php +++ b/resources/lang/zh-CN/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => '请输入您的 用户名 发送密码重置链接到邮箱。', 'username_help_bottom' => '您的用户名和邮箱地址可以相同，也可以不同，这取决于您的配置。如果您忘记了您的用户名，请与管理员联系。

没有关联电子邮件地址的用户名将不会通过电子邮件发送密码重置链接。 ', ]; - diff --git a/resources/lang/zh-CN/auth/message.php b/resources/lang/zh-CN/auth/message.php index 548570d262..ca2ed62313 100644 --- a/resources/lang/zh-CN/auth/message.php +++ b/resources/lang/zh-CN/auth/message.php @@ -1,6 +1,6 @@ '此邮箱已经被注册。', 'account_not_found' => '用户名或密码错误', @@ -9,37 +9,36 @@ return array( 'account_banned' => '账户已经被禁用', 'throttle' => '登录失败的次数太多。请在 :minutes分钟后重试。', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => '您的设备已经登记了。', 'success' => '恭喜，登陆成功。', 'code_required' => '需要两步验证码。', 'invalid_code' => '两步验证码无效。', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => '登陆过程中出现了一点儿问题，请重试。', 'success' => '恭喜，登陆成功。', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => '登陆过程中出现了一点儿问题，请重试。', 'success' => '恭喜，登陆成功。', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => '在创建您的账户的过程中出现了一点儿问题，请重试。', 'success' => '账户创建成功。', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => '重置密码过程中出现了一点儿问题，请重试。', 'success' => '如果该电子邮件地址存在于系统中，那么密码重置邮件已发送到您邮箱。', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => '再重置密码过程中出现了一点儿问题，请重试。', 'success' => '密码重置成功。', - ), + ], - -); +]; diff --git a/resources/lang/zh-CN/button.php b/resources/lang/zh-CN/button.php index 3e506ad204..dd84991391 100644 --- a/resources/lang/zh-CN/button.php +++ b/resources/lang/zh-CN/button.php @@ -1,6 +1,6 @@ '操作', 'add' => '新增', 'cancel' => '取消', @@ -11,7 +11,7 @@ return array( 'request' => '申请', 'submit' => '提交', 'upload' => '上传', - 'select_file' => '选择文件...', + 'select_file' => '选择文件...', 'select_files' => '选择文件...', 'generate_labels' => '{1} 生成标签|[2,*] 生成标签', -); +]; diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php index 074dd7bdc2..e89f07ed9d 100644 --- a/resources/lang/zh-CN/general.php +++ b/resources/lang/zh-CN/general.php @@ -44,13 +44,13 @@ 'checkins_count' => '签入', 'user_requests_count' => '请求', 'city' => '城市', - 'click_here' => '点击此处', + 'click_here' => '点击此处', 'clear_selection' => '清除选择', 'companies' => '公司', 'company' => '公司', 'component' => '组件', 'components' => '组件', - 'complete' => '完成', + 'complete' => '完成', 'consumable' => '消耗品', 'consumables' => '消耗品', 'country' => '国家', diff --git a/resources/lang/zh-CN/help.php b/resources/lang/zh-CN/help.php index 571d4b2559..6d24c36a5a 100644 --- a/resources/lang/zh-CN/help.php +++ b/resources/lang/zh-CN/help.php @@ -1,6 +1,6 @@ "更多信息", + 'more_info_title' => '更多信息', - "audit_help" => "勾选此框将编辑资产记录以反映这个新的位置。不选中它将只标记审计记录中的位置。

注意此资产已签出 它不会改变它签到的个人、资产或地点。", + 'audit_help' => '勾选此框将编辑资产记录以反映这个新的位置。不选中它将只标记审计记录中的位置。

注意此资产已签出 它不会改变它签到的个人、资产或地点。', 'assets' => '资产是指按序号或资产标签跟踪的物品，往往是指识别某一具体物品的价值较高的物品。', @@ -31,6 +31,4 @@ return array( 'depreciations' => '你可以设置资产折旧时间期限', - - -); +]; diff --git a/resources/lang/zh-CN/mail.php b/resources/lang/zh-CN/mail.php index 670217a372..057bfe8fe9 100644 --- a/resources/lang/zh-CN/mail.php +++ b/resources/lang/zh-CN/mail.php @@ -1,6 +1,6 @@ '用户已取消物品申请', 'a_user_requested' => '用户已申请物品', 'accessory_name' => '配件名称：', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => '预期的资产检查报告', 'Expected_Checkin_Notification' => '提醒：:name 签入截止日期已接近。', 'Expected_Checkin_Date' => '借出的资产将在 :date 重新签入', - 'your_assets' => '查看您的资产' -); + 'your_assets' => '查看您的资产', +]; diff --git a/resources/lang/zh-CN/pagination.php b/resources/lang/zh-CN/pagination.php index 88890d5ffa..92b29d3478 100644 --- a/resources/lang/zh-CN/pagination.php +++ b/resources/lang/zh-CN/pagination.php @@ -1,6 +1,6 @@ '下一步 »', -); +]; diff --git a/resources/lang/zh-CN/passwords.php b/resources/lang/zh-CN/passwords.php index 8e7cdf5c91..74cc3cd6fe 100644 --- a/resources/lang/zh-CN/passwords.php +++ b/resources/lang/zh-CN/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => '已发送您的密码链接 ！', 'user' => '未找到与该电子邮件匹配的活动用户。', ]; - diff --git a/resources/lang/zh-CN/reminders.php b/resources/lang/zh-CN/reminders.php index 08cab20d4a..82d2a3f174 100644 --- a/resources/lang/zh-CN/reminders.php +++ b/resources/lang/zh-CN/reminders.php @@ -1,6 +1,6 @@ "密码必须是按照规定格式的六个字符", + 'password' => '密码必须是按照规定格式的六个字符', - "user" => "用户名或电子邮件地址不正确", + 'user' => '用户名或电子邮件地址不正确', - "token" => "这个密码重置秘钥无效。", + 'token' => '这个密码重置秘钥无效。', - "sent" => "如果邮箱地址匹配，则密码已经发送。", + 'sent' => '如果邮箱地址匹配，则密码已经发送。', -); +]; diff --git a/resources/lang/zh-CN/table.php b/resources/lang/zh-CN/table.php index ae5de58af8..d856f07566 100644 --- a/resources/lang/zh-CN/table.php +++ b/resources/lang/zh-CN/table.php @@ -1,10 +1,10 @@ '操作', 'action' => '操作', 'by' => '经由', 'item' => '项目', -); +]; diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php index 2a07120fb5..a26339e8ef 100644 --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -1,6 +1,6 @@ ':attribute 已经被采用', 'uploaded' => '：属性无法上传。', 'url' => ':attribute 格式无效', - "unique_undeleted" => ":attribute 属性必须唯一。", + 'unique_undeleted' => ':attribute 属性必须唯一。', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "：属性字段包含不允许的字符。", - "email_array" => "一个或多个电子邮件地址无效。", - "hashed_pass" => "您当前的密码不正确", + 'alpha_space' => '：属性字段包含不允许的字符。', + 'email_array' => '一个或多个电子邮件地址无效。', + 'hashed_pass' => '您当前的密码不正确', 'dumbpwd' => '那个密码太常见了。', - "statuslabel_type" => "您必须选择有效的状态标签类型", + 'statuslabel_type' => '您必须选择有效的状态标签类型', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/zh-HK/admin/accessories/general.php b/resources/lang/zh-HK/admin/accessories/general.php index e9a2e69ff6..3759e15861 100644 --- a/resources/lang/zh-HK/admin/accessories/general.php +++ b/resources/lang/zh-HK/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Accessory Category', 'accessory_name' => 'Accessory Name', 'checkout' => 'Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/zh-HK/admin/accessories/message.php b/resources/lang/zh-HK/admin/accessories/message.php index a356463064..200ded07cc 100644 --- a/resources/lang/zh-HK/admin/accessories/message.php +++ b/resources/lang/zh-HK/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', - 'create' => array( + 'create' => [ 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' - ), + 'success' => 'The accessory was successfully created.', + ], - 'update' => array( + 'update' => [ 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' - ), + 'success' => 'The accessory was updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this accessory?', 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' - ), + 'success' => 'The accessory was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ), + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + 'user_does_not_exist' => 'That user is invalid. Please try again.', + ], - -); +]; diff --git a/resources/lang/zh-HK/admin/accessories/table.php b/resources/lang/zh-HK/admin/accessories/table.php index be80f30ab8..5a8176c19f 100644 --- a/resources/lang/zh-HK/admin/accessories/table.php +++ b/resources/lang/zh-HK/admin/accessories/table.php @@ -1,11 +1,10 @@ '下載CSV檔', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => '下載CSV檔', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => '接收', 'title' => '配件名稱', - -); +]; diff --git a/resources/lang/zh-HK/admin/asset_maintenances/form.php b/resources/lang/zh-HK/admin/asset_maintenances/form.php index 04a707e15e..bc611d3f5a 100644 --- a/resources/lang/zh-HK/admin/asset_maintenances/form.php +++ b/resources/lang/zh-HK/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => '資產維護所需天數', 'notes' => '備註', 'update' => '更新資產維護', - 'create' => '新建資產維護' + 'create' => '新建資產維護', ]; diff --git a/resources/lang/zh-HK/admin/asset_maintenances/message.php b/resources/lang/zh-HK/admin/asset_maintenances/message.php index add2fe4776..2b3572588f 100644 --- a/resources/lang/zh-HK/admin/asset_maintenances/message.php +++ b/resources/lang/zh-HK/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '您確定要刪除此筆資產維護訊息嗎？', 'error' => '資產維護訊息刪除失敗。請再試一次', - 'success' => '資產維護訊息已刪除。' + 'success' => '資產維護訊息已刪除。', ], 'create' => [ 'error' => '資產維護訊息新增失敗。請再試一次', - 'success' => '資產維護訊息已新增。' + 'success' => '資產維護訊息已新增。', ], 'edit' => [ 'error' => '資產維護訊息修改失敗。請再試一次', - 'success' => '資產維護訊息已修改。' + 'success' => '資產維護訊息已修改。', ], 'asset_maintenance_incomplete' => '尚未完成', 'warranty' => '保固', 'not_warranty' => '無保固', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/zh-HK/admin/asset_maintenances/table.php b/resources/lang/zh-HK/admin/asset_maintenances/table.php index 361ad3efca..903e319705 100644 --- a/resources/lang/zh-HK/admin/asset_maintenances/table.php +++ b/resources/lang/zh-HK/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => '資產維護', 'asset_name' => '資產名稱', 'is_warranty' => '保固', - 'dl_csv' => '下載CSV檔' + 'dl_csv' => '下載CSV檔', ]; diff --git a/resources/lang/zh-HK/admin/categories/general.php b/resources/lang/zh-HK/admin/categories/general.php index 7741b7da62..804bab6ec5 100644 --- a/resources/lang/zh-HK/admin/categories/general.php +++ b/resources/lang/zh-HK/admin/categories/general.php @@ -1,6 +1,6 @@ 'Asset Categories', 'category_name' => 'Category Name', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', -); +]; diff --git a/resources/lang/zh-HK/admin/categories/message.php b/resources/lang/zh-HK/admin/categories/message.php index 48ad3197f0..64442a27c7 100644 --- a/resources/lang/zh-HK/admin/categories/message.php +++ b/resources/lang/zh-HK/admin/categories/message.php @@ -1,25 +1,25 @@ '類別不存在', 'assoc_models' => '至少還有一個樣板與此類別關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_items' => '至少還有一個 :asset_type 與此類別關聯，目前不能被刪除，請您檢查 :asset_type 後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增類別失敗，請重試。', - 'success' => '新增類別成功。' - ), + 'success' => '新增類別成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新類別失敗，請重試。', - 'success' => '更新類別成功。' - ), + 'success' => '更新類別成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此類別嗎？', 'error' => '刪除類別時發生問題。請再試一次。', - 'success' => '刪除類別成功。' - ) + 'success' => '刪除類別成功。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/categories/table.php b/resources/lang/zh-HK/admin/categories/table.php index 53b76c4dd3..f986713c1f 100644 --- a/resources/lang/zh-HK/admin/categories/table.php +++ b/resources/lang/zh-HK/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => '父類', 'require_acceptance' => '接受', 'title' => '資產類別名稱', -); +]; diff --git a/resources/lang/zh-HK/admin/companies/general.php b/resources/lang/zh-HK/admin/companies/general.php index 9d58ccb58e..318d188e3b 100644 --- a/resources/lang/zh-HK/admin/companies/general.php +++ b/resources/lang/zh-HK/admin/companies/general.php @@ -1,4 +1,5 @@ 'Select Company', ]; diff --git a/resources/lang/zh-HK/admin/companies/message.php b/resources/lang/zh-HK/admin/companies/message.php index e88cc0c59f..737fdbe59a 100644 --- a/resources/lang/zh-HK/admin/companies/message.php +++ b/resources/lang/zh-HK/admin/companies/message.php @@ -1,18 +1,19 @@ '公司不存在', 'assoc_users' => '至少還有一個資產與此公司關聯，目前不能被删除，請檢查後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增公司失敗，請重試。', - 'success' => '新增公司成功。' - ), - 'update' => array( + 'success' => '新增公司成功。', + ], + 'update' => [ 'error' => '更新公司失敗，請重試。', - 'success' => '更新公司成功。' - ), - 'delete' => array( + 'success' => '更新公司成功。', + ], + 'delete' => [ 'confirm' => '您確定要刪除此公司嗎？', 'error' => '刪除公司時發生問題。請再試一次。', - 'success' => '刪除公司成功。' - ) -); + 'success' => '刪除公司成功。', + ], +]; diff --git a/resources/lang/zh-HK/admin/companies/table.php b/resources/lang/zh-HK/admin/companies/table.php index a7a4604912..a53affe1b8 100644 --- a/resources/lang/zh-HK/admin/companies/table.php +++ b/resources/lang/zh-HK/admin/companies/table.php @@ -1,9 +1,10 @@ '公司', 'create' => '新增公司', 'title' => '公司', 'update' => '更新公司', 'name' => '公司名稱', 'id' => 'ID', -); +]; diff --git a/resources/lang/zh-HK/admin/components/general.php b/resources/lang/zh-HK/admin/components/general.php index f7689a7ad1..48102f39c6 100644 --- a/resources/lang/zh-HK/admin/components/general.php +++ b/resources/lang/zh-HK/admin/components/general.php @@ -1,6 +1,6 @@ 'Component Name', 'checkin' => 'Checkin Component', 'checkout' => 'Checkout Component', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Component', -); +]; diff --git a/resources/lang/zh-HK/admin/components/message.php b/resources/lang/zh-HK/admin/components/message.php index 1e6ff3ebac..529903e044 100644 --- a/resources/lang/zh-HK/admin/components/message.php +++ b/resources/lang/zh-HK/admin/components/message.php @@ -1,36 +1,35 @@ '組件不存在', - 'create' => array( + 'create' => [ 'error' => '新增組件失敗，請重試。', - 'success' => '新增組件成功。' - ), + 'success' => '新增組件成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新組件失敗，請重試。', - 'success' => '更新組件成功。' - ), + 'success' => '更新組件成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此組件嗎？', 'error' => '刪除組件時發生問題。請再試一次。', - 'success' => '刪除組件成功。' - ), + 'success' => '刪除組件成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '組件借出失敗。請再試一次。', 'success' => '借出組件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ), + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '組件繳回失敗。請再試一次。', 'success' => '繳回組件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ) + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - -); +]; diff --git a/resources/lang/zh-HK/admin/components/table.php b/resources/lang/zh-HK/admin/components/table.php index 8916991dbb..2d8530ae16 100644 --- a/resources/lang/zh-HK/admin/components/table.php +++ b/resources/lang/zh-HK/admin/components/table.php @@ -1,5 +1,5 @@ '組件名稱', -); +]; diff --git a/resources/lang/zh-HK/admin/consumables/general.php b/resources/lang/zh-HK/admin/consumables/general.php index 7c6bb32968..dc4ecb290f 100644 --- a/resources/lang/zh-HK/admin/consumables/general.php +++ b/resources/lang/zh-HK/admin/consumables/general.php @@ -1,6 +1,6 @@ 'Checkout Consumable to User', 'consumable_name' => 'Consumable Name', 'create' => 'Create Consumable', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', -); +]; diff --git a/resources/lang/zh-HK/admin/consumables/message.php b/resources/lang/zh-HK/admin/consumables/message.php index 82b9d94005..7b78b8337a 100644 --- a/resources/lang/zh-HK/admin/consumables/message.php +++ b/resources/lang/zh-HK/admin/consumables/message.php @@ -1,36 +1,35 @@ '耗材不存在。', - 'create' => array( + 'create' => [ 'error' => '新增耗材失敗，請重試。', - 'success' => '新增耗材成功。' - ), + 'success' => '新增耗材成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新耗材失敗，請重試。', - 'success' => '更新耗材成功。' - ), + 'success' => '更新耗材成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此耗材嗎？', 'error' => '刪除耗材時發生問題。請再試一次。', - 'success' => '刪除耗材成功。' - ), + 'success' => '刪除耗材成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '耗材領取失敗，請重試。', 'success' => '耗材領取成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ), + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '耗材登記失敗，請重試。', 'success' => '耗材登記成功', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ) + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - -); +]; diff --git a/resources/lang/zh-HK/admin/consumables/table.php b/resources/lang/zh-HK/admin/consumables/table.php index b08ddc4471..4ced1a1b60 100644 --- a/resources/lang/zh-HK/admin/consumables/table.php +++ b/resources/lang/zh-HK/admin/consumables/table.php @@ -1,5 +1,5 @@ '耗材名稱', -); +]; diff --git a/resources/lang/zh-HK/admin/custom_fields/general.php b/resources/lang/zh-HK/admin/custom_fields/general.php index 1471ea2c67..034809310c 100644 --- a/resources/lang/zh-HK/admin/custom_fields/general.php +++ b/resources/lang/zh-HK/admin/custom_fields/general.php @@ -1,6 +1,6 @@ '自訂欄位', 'field' => '欄位', 'about_fieldsets_title' => '關於欄位集', @@ -29,4 +29,4 @@ return array( 'create_field' => '新增欄位', 'value_encrypted' => '此欄位的值已被加密。只有管理員能夠查看原始資料。', 'show_in_email' => '在發送給用戶的借出通知信中包含此欄位的值？加密的欄位不能包含在電子郵件中。', -); +]; diff --git a/resources/lang/zh-HK/admin/custom_fields/message.php b/resources/lang/zh-HK/admin/custom_fields/message.php index 3346a091c6..9680fc601a 100644 --- a/resources/lang/zh-HK/admin/custom_fields/message.php +++ b/resources/lang/zh-HK/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => '欄位不存在。', 'already_added' => '已新增欄位。', - 'create' => array( + 'create' => [ 'error' => '新增欄位失敗，請重試。', 'success' => '新增欄位成功。', - 'assoc_success' => '新增欄位到欄位集成功' - ), + 'assoc_success' => '新增欄位到欄位集成功', + ], - 'update' => array( + 'update' => [ 'error' => '更新欄位失敗，請重試。', - 'success' => '更新欄位成功。' - ), + 'success' => '更新欄位成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此欄位？', 'error' => '刪除欄位時發生問題。請再試一次。', 'success' => '刪除欄位成功。', 'in_use' => '欄位還在使用中', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => '欄位集不存在', - 'create' => array( + 'create' => [ 'error' => '新增欄位集失敗，請重試。', - 'success' => '新增欄位集成功。' - ), + 'success' => '新增欄位集成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新欄位集失敗，請重試。', - 'success' => '更新欄位集成功。' - ), + 'success' => '更新欄位集成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此欄位集？', 'error' => '刪除欄位集時發生問題。請再試一次。', 'success' => '刪除欄位集成功。', 'in_use' => '欄位集還在使用中', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/zh-HK/admin/departments/message.php b/resources/lang/zh-HK/admin/departments/message.php index 471d17ebaf..bbe70e8ee7 100644 --- a/resources/lang/zh-HK/admin/departments/message.php +++ b/resources/lang/zh-HK/admin/departments/message.php @@ -1,21 +1,21 @@ '部門不存在。', 'assoc_users' => '至少還有一位使用者與此部門關聯，目前不能被删除，請檢查後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增部門失敗，請重試。', - 'success' => '新增部門成功。' - ), - 'update' => array( + 'success' => '新增部門成功。', + ], + 'update' => [ 'error' => '更新部門失敗，請重試。', - 'success' => '成功更新部門。' - ), - 'delete' => array( + 'success' => '成功更新部門。', + ], + 'delete' => [ 'confirm' => '您確定要刪除此部門嗎？', 'error' => '刪除部門時發生問題，請重試。', - 'success' => '刪除部門成功。' - ) + 'success' => '刪除部門成功。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/departments/table.php b/resources/lang/zh-HK/admin/departments/table.php index c8479f122e..adb3329e7a 100644 --- a/resources/lang/zh-HK/admin/departments/table.php +++ b/resources/lang/zh-HK/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => '部門名稱', @@ -8,4 +8,4 @@ return array( 'location' => '位置', 'create' => '新增部門', 'update' => '更新部門', - ); + ]; diff --git a/resources/lang/zh-HK/admin/depreciations/general.php b/resources/lang/zh-HK/admin/depreciations/general.php index 8675de4aef..e21ef85f96 100644 --- a/resources/lang/zh-HK/admin/depreciations/general.php +++ b/resources/lang/zh-HK/admin/depreciations/general.php @@ -1,6 +1,6 @@ '關於資產折舊', 'about_depreciations' => '您可以設置資產折舊期限', 'asset_depreciations' => '資產折舊', @@ -9,4 +9,4 @@ return array( 'number_of_months' => '月數', 'update' => '更新折舊', -); +]; diff --git a/resources/lang/zh-HK/admin/depreciations/message.php b/resources/lang/zh-HK/admin/depreciations/message.php index 73ddbc409f..9b6c733099 100644 --- a/resources/lang/zh-HK/admin/depreciations/message.php +++ b/resources/lang/zh-HK/admin/depreciations/message.php @@ -1,25 +1,24 @@ '折舊類別不存在', 'assoc_users' => '至少還有一個資產與此折舊關聯，請檢查後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增折舊類別失敗，請重試。', - 'success' => '新增折舊類別成功。' - ), + 'success' => '新增折舊類別成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新折舊類別失敗，請重試。', - 'success' => '更新折舊類別成功。' - ), + 'success' => '更新折舊類別成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此折舊類別嗎？', 'error' => '刪除折舊類別時發生問題。請再試一次。', - 'success' => '刪除折舊類別成功。' - ) + 'success' => '刪除折舊類別成功。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/depreciations/table.php b/resources/lang/zh-HK/admin/depreciations/table.php index 1907eb3f32..9cd80e9b1e 100644 --- a/resources/lang/zh-HK/admin/depreciations/table.php +++ b/resources/lang/zh-HK/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => '月數', 'term' => '期限', 'title' => '名稱', -); +]; diff --git a/resources/lang/zh-HK/admin/groups/message.php b/resources/lang/zh-HK/admin/groups/message.php index 40ceb5e787..6c95cb2e3d 100644 --- a/resources/lang/zh-HK/admin/groups/message.php +++ b/resources/lang/zh-HK/admin/groups/message.php @@ -1,22 +1,22 @@ '群組已存在', 'group_not_found' => '群組 [:id] 不存在', 'group_name_required' => '名稱欄位必填', - 'success' => array( + 'success' => [ 'create' => '新增群組成功。', 'update' => '更新群組成功。', 'delete' => '刪除群組成功。', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此群組嗎？', 'create' => '新增群組時發生問題。請重試。', 'update' => '更新群組時發生問題。請重試。', 'delete' => '刪除群組時發生問題。請重試。', - ), + ], -); +]; diff --git a/resources/lang/zh-HK/admin/groups/table.php b/resources/lang/zh-HK/admin/groups/table.php index c89b24b672..cf9aabb5b1 100644 --- a/resources/lang/zh-HK/admin/groups/table.php +++ b/resources/lang/zh-HK/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => '名稱', 'users' => '成員數', -); +]; diff --git a/resources/lang/zh-HK/admin/groups/titles.php b/resources/lang/zh-HK/admin/groups/titles.php index 7e716bbb3a..409f6c2d41 100644 --- a/resources/lang/zh-HK/admin/groups/titles.php +++ b/resources/lang/zh-HK/admin/groups/titles.php @@ -1,6 +1,6 @@ '關於群組', 'about_groups' => '群組用來區分使用者權限。', 'group_management' => '群組管理', @@ -11,4 +11,4 @@ return array( 'allow' => '允許', 'deny' => '拒絕', -); +]; diff --git a/resources/lang/zh-HK/admin/hardware/form.php b/resources/lang/zh-HK/admin/hardware/form.php index 8fb697509c..b001518e92 100644 --- a/resources/lang/zh-HK/admin/hardware/form.php +++ b/resources/lang/zh-HK/admin/hardware/form.php @@ -1,12 +1,12 @@ '確認批次刪除資產', +return [ + 'bulk_delete' => '確認批次刪除資產', 'bulk_delete_help' => '請再次確認批次刪除的資產。刪除後資產可以恢復，但將會失去當前的用戶關聯資訊。', 'bulk_delete_warn' => '即將刪除 :asset_count 項資產', - 'bulk_update' => '批次更新資產', - 'bulk_update_help' => '此表格允許您同時修改多項資產。請僅填寫需要修改的欄位，留空的欄位不會做任何修改。', - 'bulk_update_warn' => '即將修改 :asset_count 項資產屬性', + 'bulk_update' => '批次更新資產', + 'bulk_update_help' => '此表格允許您同時修改多項資產。請僅填寫需要修改的欄位，留空的欄位不會做任何修改。', + 'bulk_update_warn' => '即將修改 :asset_count 項資產屬性', 'checkedout_to' => '借出至', 'checkout_date' => '借出日期', 'checkin_date' => '繳回日期', @@ -38,7 +38,6 @@ return array( 'tag' => '資產標籤', 'update' => '更新資產', 'warranty' => '保固', - 'warranty_expires' => '保固期限', + 'warranty_expires' => '保固期限', 'years' => '年', -) -; +]; diff --git a/resources/lang/zh-HK/admin/hardware/general.php b/resources/lang/zh-HK/admin/hardware/general.php index f1fcd4731e..c5e5a483a4 100644 --- a/resources/lang/zh-HK/admin/hardware/general.php +++ b/resources/lang/zh-HK/admin/hardware/general.php @@ -1,9 +1,9 @@ 'About Assets', 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', - 'archived' => 'Archived', + 'archived' => 'Archived', 'asset' => 'Asset', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Pending', 'undeployable' => 'Undeployable', 'view' => 'View Asset', -); +]; diff --git a/resources/lang/zh-HK/admin/hardware/message.php b/resources/lang/zh-HK/admin/hardware/message.php index 69e1f405bb..2d0165cf64 100644 --- a/resources/lang/zh-HK/admin/hardware/message.php +++ b/resources/lang/zh-HK/admin/hardware/message.php @@ -1,82 +1,80 @@ '警告: 此資產目前已標記為不可佈署，如果資產狀態已改變，請更新狀態。', 'does_not_exist' => '資產不存在', 'does_not_exist_or_not_requestable' => '已重試。該資產不存在或不可申領。', 'assoc_users' => '此資產目前已借給某個使用者，不能被刪除，請檢查資產狀態，然後再嘗試刪除。', - 'create' => array( + 'create' => [ 'error' => '新增資產失敗，請重試。', - 'success' => '新增資產成功。' - ), + 'success' => '新增資產成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新資產失敗，請重試。', 'success' => '更新資產成功。', 'nothing_updated' => '沒有欄位被選擇，因此沒有更新任何內容。', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => '恢復資產失敗，請重試。', - 'success' => '恢復資產成功。' - ), + 'success' => '恢復資產成功。', + ], - 'audit' => array( + 'audit' => [ 'error' => '資產稽核失敗。請再試一次。', - 'success' => '資產稽核成功登錄。' - ), + 'success' => '資產稽核成功登錄。', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => '刪除檔案失敗，請重試。', 'success' => '刪除檔案成功。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '上傳檔案失敗，請重試。', 'success' => '上傳檔案成功。', 'nofiles' => '您尚未選擇要上傳的檔案，或上傳的檔案太大。', 'invalidfiles' => '一個或多個檔案太大或屬於不被允許的檔案類型。允許上傳的檔案類型：png, gif, jpg, doc, docx, pdf, txt。', - ), + ], - 'import' => array( + 'import' => [ 'error' => '某些項目沒有被正確匯入。', 'errorDetail' => '以下項目由於錯誤未被匯入。', - 'success' => "您的檔案已被匯入。", - 'file_delete_success' => "您的檔案已成功刪除。", - 'file_delete_error' => "您的檔案無法被刪除。", - ), + 'success' => '您的檔案已被匯入。', + 'file_delete_success' => '您的檔案已成功刪除。', + 'file_delete_error' => '您的檔案無法被刪除。', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此資產嗎？', 'error' => '刪除資產時發生問題，請重試。', 'nothing_updated' => '沒有資產被選擇，因此沒有更新任何內容。', - 'success' => '刪除資產成功。' - ), + 'success' => '刪除資產成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '借出資產失敗，請重試。', 'success' => '借出資產成功。', 'user_does_not_exist' => '無效使用者，請重試。', 'not_available' => '此資產無法借出', - 'no_assets_selected' => '你必須至少選擇一項資產。' - ), + 'no_assets_selected' => '你必須至少選擇一項資產。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '繳回資產失敗，請重試。', 'success' => '繳回資產成功。', 'user_does_not_exist' => '無效使用者，請重試。', 'already_checked_in' => '資產已繳回。', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => '申請資產失敗，請重試。', 'success' => '申請資產成功。', - 'canceled' => '借出申請已取消。' - ) + 'canceled' => '借出申請已取消。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/hardware/table.php b/resources/lang/zh-HK/admin/hardware/table.php index 38788e1984..e992b9d2a7 100644 --- a/resources/lang/zh-HK/admin/hardware/table.php +++ b/resources/lang/zh-HK/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Asset Tag', 'asset_model' => 'Model', @@ -20,6 +20,6 @@ return array( 'title' => 'Asset ', 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/zh-HK/admin/kits/general.php b/resources/lang/zh-HK/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/zh-HK/admin/kits/general.php +++ b/resources/lang/zh-HK/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/zh-HK/admin/licenses/form.php b/resources/lang/zh-HK/admin/licenses/form.php index ce61cf563d..7bbff27eb9 100644 --- a/resources/lang/zh-HK/admin/licenses/form.php +++ b/resources/lang/zh-HK/admin/licenses/form.php @@ -1,6 +1,6 @@ '資產', 'checkin' => '繳回', @@ -18,5 +18,5 @@ return array( 'to_email' => '授權信箱', 'to_name' => '授權給', 'update' => '更新授權', - 'checkout_help' => '請檢查這個授權是否已經分配給某個人或某個設備。你可以複選，但資產歸屬人必須是相同的。' -); + 'checkout_help' => '請檢查這個授權是否已經分配給某個人或某個設備。你可以複選，但資產歸屬人必須是相同的。', +]; diff --git a/resources/lang/zh-HK/admin/licenses/general.php b/resources/lang/zh-HK/admin/licenses/general.php index 8c873d56a0..25669dca6d 100644 --- a/resources/lang/zh-HK/admin/licenses/general.php +++ b/resources/lang/zh-HK/admin/licenses/general.php @@ -1,6 +1,6 @@ '關於授權', 'about_licenses' => '授權是用來追踨可供借出的軟體數量。', 'checkin' => '繳回授權數量', @@ -19,4 +19,4 @@ return array( 'user' => '使用者 ', 'view' => '檢視授權', -); +]; diff --git a/resources/lang/zh-HK/admin/licenses/message.php b/resources/lang/zh-HK/admin/licenses/message.php index 87a7c3d0b9..8a5807cba2 100644 --- a/resources/lang/zh-HK/admin/licenses/message.php +++ b/resources/lang/zh-HK/admin/licenses/message.php @@ -1,6 +1,6 @@ 'License does not exist.', 'user_does_not_exist' => 'User does not exist.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'You must select an asset or a user, but not both.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' - ), + 'success' => 'License created successfully.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' - ), + 'success' => 'License updated successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Are you sure you wish to delete this license?', 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' - ), + 'success' => 'The license was deleted successfully.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' - ), + 'success' => 'The license was checked out successfully', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' - ), + 'success' => 'The license was checked in successfully', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/licenses/table.php b/resources/lang/zh-HK/admin/licenses/table.php index 99dabc61ee..62502556dc 100644 --- a/resources/lang/zh-HK/admin/licenses/table.php +++ b/resources/lang/zh-HK/admin/licenses/table.php @@ -1,6 +1,6 @@ '分配給', 'checkout' => '進/出', @@ -14,4 +14,4 @@ return array( 'serial' => '序號', 'title' => '授權', -); +]; diff --git a/resources/lang/zh-HK/admin/locations/message.php b/resources/lang/zh-HK/admin/locations/message.php index 5ba71d0fe4..7c489a1ff5 100644 --- a/resources/lang/zh-HK/admin/locations/message.php +++ b/resources/lang/zh-HK/admin/locations/message.php @@ -1,27 +1,26 @@ '地點不存在.', 'assoc_users' => '至少還有一位使用者與此位置關聯，目前不能被删除，請檢查後重試。 ', 'assoc_assets' => '至少還有一個資產與此位置關聯，目前不能被删除，請檢查後重試。 ', 'assoc_child_loc' => '至少還有一個子項目與此位置關聯，目前不能被删除，請檢查後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增位置失敗，請重試。', - 'success' => '新增位置成功。' - ), + 'success' => '新增位置成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新位置失敗，請重試。', - 'success' => '成功更新地點.' - ), + 'success' => '成功更新地點.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此位置嗎？', 'error' => '刪除位置時發生問題，請重試。', - 'success' => '刪除位置成功。' - ) + 'success' => '刪除位置成功。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/locations/table.php b/resources/lang/zh-HK/admin/locations/table.php index 1cbe540749..4792273c32 100644 --- a/resources/lang/zh-HK/admin/locations/table.php +++ b/resources/lang/zh-HK/admin/locations/table.php @@ -1,6 +1,6 @@ 'About Locations', 'about_locations' => 'Locations are used to track location information for users, assets, and other items', 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Parent', 'currency' => 'Location Currency', 'ldap_ou' => 'LDAP Search OU', - ); + ]; diff --git a/resources/lang/zh-HK/admin/manufacturers/message.php b/resources/lang/zh-HK/admin/manufacturers/message.php index 4d5de1310d..5a195a7ba9 100644 --- a/resources/lang/zh-HK/admin/manufacturers/message.php +++ b/resources/lang/zh-HK/admin/manufacturers/message.php @@ -1,29 +1,29 @@ '製造商不存在', 'assoc_users' => '至少還有一個資產與此製造商關聯，目前不能被删除，請確認後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增製造商失敗，請重試。', - 'success' => '新增製造商成功。' - ), + 'success' => '新增製造商成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新製造商失敗，請重試。', - 'success' => '更新製造商成功。' - ), + 'success' => '更新製造商成功。', + ], - 'restore' => array( + 'restore' => [ 'error' => '製造商恢復失敗，請重試。', - 'success' => '製造商恢復成功。' - ), + 'success' => '製造商恢復成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此製造商嗎？', 'error' => '刪除製造商失敗，請重試。', - 'success' => '刪除製造商成功。' - ) + 'success' => '刪除製造商成功。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/manufacturers/table.php b/resources/lang/zh-HK/admin/manufacturers/table.php index 12cdd792e8..8d4b2c0bad 100644 --- a/resources/lang/zh-HK/admin/manufacturers/table.php +++ b/resources/lang/zh-HK/admin/manufacturers/table.php @@ -1,6 +1,6 @@ '關於製造商', 'about_manufacturers_text' => '廠商是提供您資產的公司，您可以在這裡儲存重要的支援資訊，並顯示在資產的詳細頁面。', 'asset_manufacturers' => '資產製造商', @@ -13,4 +13,4 @@ return array( 'update' => '更新製造商', 'url' => '網址', -); +]; diff --git a/resources/lang/zh-HK/admin/models/general.php b/resources/lang/zh-HK/admin/models/general.php index 765993b76b..ae7a7a4223 100644 --- a/resources/lang/zh-HK/admin/models/general.php +++ b/resources/lang/zh-HK/admin/models/general.php @@ -1,6 +1,6 @@ '關於資產型號', 'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。', 'deleted' => '此型號已被刪除。點擊此處恢復。', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。', 'restore' => '恢復型號', 'requestable' => '使用者可申請此型號', - 'show_mac_address' => '在型號資產中顯示MAC地址', + 'show_mac_address' => '在型號資產中顯示MAC地址', 'view_deleted' => '檢視已刪除', 'view_models' => '檢視型號', 'fieldset' => '欄位集', 'no_custom_field' => '沒有自訂欄位', 'add_default_values' => '新增預設值', -); +]; diff --git a/resources/lang/zh-HK/admin/models/message.php b/resources/lang/zh-HK/admin/models/message.php index c64026575a..d1513fef4d 100644 --- a/resources/lang/zh-HK/admin/models/message.php +++ b/resources/lang/zh-HK/admin/models/message.php @@ -1,42 +1,41 @@ '樣板不存在', 'assoc_users' => '至少還有一個資產與此樣板關聯，目前不能被删除，請在刪除資產後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增樣板失敗，請重試。', 'success' => '新增樣板成功。', 'duplicate_set' => '資產名稱、製造商、型號都相同的其它資產樣板已存在。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '更新樣板失敗，請重試。', - 'success' => '更新樣板成功。' - ), + 'success' => '更新樣板成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此樣板嗎？', 'error' => '刪除樣板失敗，請重試。', - 'success' => '刪除樣板成功。' - ), + 'success' => '刪除樣板成功。', + ], - 'restore' => array( + 'restore' => [ 'error' => '恢復樣板失敗，請重試。', - 'success' => '恢復樣板成功。' - ), + 'success' => '恢復樣板成功。', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => '沒有欄位被更改，因此沒有更新任何內容。', - 'success' => '樣板已更新。' - ), + 'success' => '樣板已更新。', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => '沒有型號被選擇，因此沒有更新任何內容。', 'success' => ':success_count 個型號已刪除!', - 'success_partial' => ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。' - ), + 'success_partial' => ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/models/table.php b/resources/lang/zh-HK/admin/models/table.php index 11b0300a26..001fcaaf71 100644 --- a/resources/lang/zh-HK/admin/models/table.php +++ b/resources/lang/zh-HK/admin/models/table.php @@ -1,6 +1,6 @@ '新增資產樣板', 'created_at' => '新增於', @@ -14,4 +14,4 @@ return array( 'update' => '更新資產樣板', 'clone' => '複製樣板', 'edit' => '編輯樣板', -); +]; diff --git a/resources/lang/zh-HK/admin/reports/general.php b/resources/lang/zh-HK/admin/reports/general.php index 6137909494..bdee19f2f0 100644 --- a/resources/lang/zh-HK/admin/reports/general.php +++ b/resources/lang/zh-HK/admin/reports/general.php @@ -1,5 +1,5 @@ '請選擇資產報表選項。' -); +return [ + 'info' => '請選擇資產報表選項。', +]; diff --git a/resources/lang/zh-HK/admin/reports/message.php b/resources/lang/zh-HK/admin/reports/message.php index 4c7eedb612..ee2e2f653a 100644 --- a/resources/lang/zh-HK/admin/reports/message.php +++ b/resources/lang/zh-HK/admin/reports/message.php @@ -1,5 +1,5 @@ '您至少要選擇一個選項。' -); +return [ + 'error' => '您至少要選擇一個選項。', +]; diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php index e15162210e..e09164f1ee 100644 --- a/resources/lang/zh-HK/admin/settings/general.php +++ b/resources/lang/zh-HK/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory domain', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Length of asset tags, including zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/zh-HK/admin/settings/message.php b/resources/lang/zh-HK/admin/settings/message.php index 2f88f4a274..17737a7def 100644 --- a/resources/lang/zh-HK/admin/settings/message.php +++ b/resources/lang/zh-HK/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '更新過程中發生問題。', - 'success' => '更新設定成功。' - ), - 'backup' => array( + 'success' => '更新設定成功。', + ], + 'backup' => [ 'delete_confirm' => '您確定要刪除此備份檔嗎？此動作無法復原。', 'file_deleted' => '刪除備份檔成功。', 'generated' => '成功新增一個新的備份檔。', 'file_not_found' => '在伺服器上找不到備份檔', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => '清除過程中發生錯誤。', 'validation_failed' => '你的清除確認不正確，請在文字輸入欄位輸入＂DELETE＂。', - 'success' => '已成功清除刪除記錄。' - ), + 'success' => '已成功清除刪除記錄。', + ], -); +]; diff --git a/resources/lang/zh-HK/admin/statuslabels/message.php b/resources/lang/zh-HK/admin/statuslabels/message.php index 87ebdf5313..bac2491144 100644 --- a/resources/lang/zh-HK/admin/statuslabels/message.php +++ b/resources/lang/zh-HK/admin/statuslabels/message.php @@ -1,32 +1,31 @@ '狀態標籤不存在', 'assoc_assets' => '至少還有一個資產與此狀態標籤關聯，目前不能被删除，請確認後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增狀態標籤失敗，請重試。', - 'success' => '新增狀態標籤成功。' - ), + 'success' => '新增狀態標籤成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新狀態標籤失敗，請重試。', - 'success' => '更新狀態標籤成功。' - ), + 'success' => '更新狀態標籤成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此狀態標籤嗎？', 'error' => '刪除狀態標籤失敗，請重試。', - 'success' => '刪除狀態標籤成功。' - ), + 'success' => '刪除狀態標籤成功。', + ], - 'help' => array( + 'help' => [ 'undeployable' => '這些資產不能分配給任何人。', 'deployable' => '這些資產可以檢出。一旦分配了它們，它們將承擔一個元狀態 Deployed。', 'archived' => '這些資產無法簽出，只會顯示在“存檔”視圖中。這有助於保留有關資產的預算/歷史目的信息，但將其保留在日常資產清單之外。', 'pending' => '這些資產不能分配給任何人，經常用於修理的物品，但預計將重新流通。', - ), + ], -); +]; diff --git a/resources/lang/zh-HK/admin/statuslabels/table.php b/resources/lang/zh-HK/admin/statuslabels/table.php index 591a25a544..3cb72255ef 100644 --- a/resources/lang/zh-HK/admin/statuslabels/table.php +++ b/resources/lang/zh-HK/admin/statuslabels/table.php @@ -1,6 +1,6 @@ '關於狀態標籤', 'archived' => '已封存', 'create' => '新增狀態標籤', @@ -16,4 +16,4 @@ return array( 'title' => '狀態標籤', 'undeployable' => '無法部署', 'update' => '更新狀態標籤', -); +]; diff --git a/resources/lang/zh-HK/admin/suppliers/message.php b/resources/lang/zh-HK/admin/suppliers/message.php index 62c6cf3bf5..3c1ca44c8e 100644 --- a/resources/lang/zh-HK/admin/suppliers/message.php +++ b/resources/lang/zh-HK/admin/suppliers/message.php @@ -1,27 +1,26 @@ '供應商不存在', - - 'create' => array( + 'create' => [ 'error' => '新增供應商失敗，請重試', - 'success' => '新增供應商成功。' - ), + 'success' => '新增供應商成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新供應商失敗，請重試', - 'success' => '更新供應商成功。' - ), + 'success' => '更新供應商成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此供應商嗎？', 'error' => '刪除供應商失敗，請重試', 'success' => '刪除供應商成功。', 'assoc_assets' => '至少還有 :asset_count 個樣板與此供應商關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_licenses' => '至少還有 :licenses_count 個授權與此供應商關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_maintenances' => '至少還有 :asset_maintenances_count 個資產維護與此供應商關聯，目前不能被刪除，請檢查後重試。 ', - ) + ], -); +]; diff --git a/resources/lang/zh-HK/admin/suppliers/table.php b/resources/lang/zh-HK/admin/suppliers/table.php index 3dbb05aee6..187d543ae2 100644 --- a/resources/lang/zh-HK/admin/suppliers/table.php +++ b/resources/lang/zh-HK/admin/suppliers/table.php @@ -1,6 +1,6 @@ '關於供應商', 'about_suppliers_text' => '供應商用來追踪物品的來源', 'address' => '供應商地址', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => '檢視資產關於', 'zip' => '郵遞區號', -); +]; diff --git a/resources/lang/zh-HK/admin/users/general.php b/resources/lang/zh-HK/admin/users/general.php index ac4f652025..69d40d8bea 100644 --- a/resources/lang/zh-HK/admin/users/general.php +++ b/resources/lang/zh-HK/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Assets assigned to :name', @@ -13,7 +12,7 @@ return array( 'edit' => 'Edit User', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'History for :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Click here to restore them.', 'last_login' => 'Last Login', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ', 'two_factor_enrolled' => '2FA Device Enrolled ', 'two_factor_active' => '2FA Active ', - ); + ]; diff --git a/resources/lang/zh-HK/admin/users/message.php b/resources/lang/zh-HK/admin/users/message.php index e517cd113b..45f7def529 100644 --- a/resources/lang/zh-HK/admin/users/message.php +++ b/resources/lang/zh-HK/admin/users/message.php @@ -1,6 +1,6 @@ 'You have successfully accepted this asset.', 'declined' => 'You have successfully declined this asset.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', 'update_bulk' => 'Users were successfully updated!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'User was successfully unsuspended.', 'restored' => 'User was successfully restored.', 'import' => 'Users imported successfully.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'There was an issue creating the user. Please try again.', 'update' => 'There was an issue updating the user. Please try again.', 'delete' => 'There was an issue deleting the user. Please try again.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them.
Error from LDAP Server:', 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'File not deleted. Please try again.', 'success' => 'File successfully deleted.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'File(s) not uploaded. Please try again.', 'success' => 'File(s) successfully uploaded.', 'nofiles' => 'You did not select any files for upload', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', - ), + ], -); +]; diff --git a/resources/lang/zh-HK/admin/users/table.php b/resources/lang/zh-HK/admin/users/table.php index ed261f406f..83ee009479 100644 --- a/resources/lang/zh-HK/admin/users/table.php +++ b/resources/lang/zh-HK/admin/users/table.php @@ -1,6 +1,6 @@ '啟用', 'allow' => '允許', 'checkedout' => '資產', @@ -28,11 +28,11 @@ return array( 'show_current' => '顯示當前使用者', 'show_deleted' => '顯示已刪除使用者', 'title' => '職稱', - 'to_restore_them' => '將它們還原。', + 'to_restore_them' => '將它們還原。', 'updateuser' => '更新使用者', 'username' => '使用者名稱', - 'user_deleted_text' => '此使用者已被標記為刪除。', + 'user_deleted_text' => '此使用者已被標記為刪除。', 'username_note' => '（這是用來綁定 Active Directory，非用來登入）', 'cloneuser' => '複製使用者', 'viewusers' => '檢視使用者', -); +]; diff --git a/resources/lang/zh-HK/auth/general.php b/resources/lang/zh-HK/auth/general.php index 33630310d4..d08f1714f2 100644 --- a/resources/lang/zh-HK/auth/general.php +++ b/resources/lang/zh-HK/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/zh-HK/auth/message.php b/resources/lang/zh-HK/auth/message.php index f086d8c04c..4dc8c08ea6 100644 --- a/resources/lang/zh-HK/auth/message.php +++ b/resources/lang/zh-HK/auth/message.php @@ -1,6 +1,6 @@ 'An account with the this email already exists.', 'account_not_found' => 'The username or password is incorrect.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'This user account is banned.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'There was a problem while trying to log you in, please try again.', 'success' => 'You have successfully logged in.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'There was a problem while trying to create your account, please try again.', 'success' => 'Account sucessfully created.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'There was a problem while trying to get a reset password code, please try again.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'There was a problem while trying to reset your password, please try again.', 'success' => 'Your password has been successfully reset.', - ), + ], - -); +]; diff --git a/resources/lang/zh-HK/button.php b/resources/lang/zh-HK/button.php index 2b97223250..8bc60582ce 100644 --- a/resources/lang/zh-HK/button.php +++ b/resources/lang/zh-HK/button.php @@ -1,6 +1,6 @@ 'Actions', 'add' => 'Add New', 'cancel' => 'Cancel', @@ -11,7 +11,7 @@ return array( 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', - 'select_file' => 'Select File...', + 'select_file' => 'Select File...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php index 539a01a13f..9bb3f84e44 100644 --- a/resources/lang/zh-HK/general.php +++ b/resources/lang/zh-HK/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'City', - 'click_here' => 'Click here', + 'click_here' => 'Click here', 'clear_selection' => 'Clear Selection', 'companies' => 'Companies', 'company' => 'Company', 'component' => 'Component', 'components' => 'Components', - 'complete' => 'Complete', + 'complete' => 'Complete', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Country', diff --git a/resources/lang/zh-HK/help.php b/resources/lang/zh-HK/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/zh-HK/help.php +++ b/resources/lang/zh-HK/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/zh-HK/mail.php b/resources/lang/zh-HK/mail.php index 65236a0b8a..bb9868e14a 100644 --- a/resources/lang/zh-HK/mail.php +++ b/resources/lang/zh-HK/mail.php @@ -1,6 +1,6 @@ 'A user has canceled an item request on the website', 'a_user_requested' => 'A user has requested an item on the website', 'accessory_name' => 'Accessory Name:', @@ -76,5 +76,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/zh-HK/pagination.php b/resources/lang/zh-HK/pagination.php index 88890d5ffa..92b29d3478 100644 --- a/resources/lang/zh-HK/pagination.php +++ b/resources/lang/zh-HK/pagination.php @@ -1,6 +1,6 @@ '下一步 »', -); +]; diff --git a/resources/lang/zh-HK/passwords.php b/resources/lang/zh-HK/passwords.php index 6e1d07f5ef..d36d477588 100644 --- a/resources/lang/zh-HK/passwords.php +++ b/resources/lang/zh-HK/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => '已發送您的密碼連結！', 'user' => '未找到使用該電子郵件的使用者。', ]; - diff --git a/resources/lang/zh-HK/reminders.php b/resources/lang/zh-HK/reminders.php index 7b9710c324..bb4e4b40d4 100644 --- a/resources/lang/zh-HK/reminders.php +++ b/resources/lang/zh-HK/reminders.php @@ -1,6 +1,6 @@ "密碼至少需要六個字符，並且與確認欄位相符", + 'password' => '密碼至少需要六個字符，並且與確認欄位相符', - "user" => "使用者名稱或電子郵件地址不正確", + 'user' => '使用者名稱或電子郵件地址不正確', - "token" => "這個密碼重置密鑰無效。", + 'token' => '這個密碼重置密鑰無效。', - "sent" => "如果郵件地址相符，則密碼已經發送。", + 'sent' => '如果郵件地址相符，則密碼已經發送。', -); +]; diff --git a/resources/lang/zh-HK/table.php b/resources/lang/zh-HK/table.php index d11fdbabc4..a63ec0ff14 100644 --- a/resources/lang/zh-HK/table.php +++ b/resources/lang/zh-HK/table.php @@ -1,10 +1,10 @@ '操作', 'action' => '操作', 'by' => '經由', 'item' => '項目', -); +]; diff --git a/resources/lang/zh-HK/validation.php b/resources/lang/zh-HK/validation.php index 08f2738525..c758cf19fa 100644 --- a/resources/lang/zh-HK/validation.php +++ b/resources/lang/zh-HK/validation.php @@ -1,6 +1,6 @@ ':attribute 已被採用', 'uploaded' => ':attribute 上傳失敗', 'url' => ':attribute 格式不正確', - "unique_undeleted" => ":attribute 必須是唯一值", + 'unique_undeleted' => ':attribute 必須是唯一值', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute 含有無效字元", - "email_array" => "一個或多個郵件地址不正確", - "hashed_pass" => "當前密碼不正確！", + 'alpha_space' => ':attribute 含有無效字元', + 'email_array' => '一個或多個郵件地址不正確', + 'hashed_pass' => '當前密碼不正確！', 'dumbpwd' => '該密碼太常見。', - "statuslabel_type" => "您必須選擇一個有效的狀態標籤", + 'statuslabel_type' => '您必須選擇一個有效的狀態標籤', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/zh-TW/admin/accessories/general.php b/resources/lang/zh-TW/admin/accessories/general.php index 1c440714db..3039c0c53d 100644 --- a/resources/lang/zh-TW/admin/accessories/general.php +++ b/resources/lang/zh-TW/admin/accessories/general.php @@ -1,6 +1,6 @@ '配件類別', 'accessory_name' => '配件名稱', 'checkout' => '配件借出', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => '用預設EULA（最終使用者許可協議）進行替換', 'use_default_eula_disabled' => '使用預設EULA（最終使用者許可協議）沒有設定預設EULA（最終使用者許可協議），請在設定中新增一個。', -); +]; diff --git a/resources/lang/zh-TW/admin/accessories/message.php b/resources/lang/zh-TW/admin/accessories/message.php index 9f62a18600..dc3abff016 100644 --- a/resources/lang/zh-TW/admin/accessories/message.php +++ b/resources/lang/zh-TW/admin/accessories/message.php @@ -1,37 +1,36 @@ '配件 [:id] 不存在', 'assoc_users' => '使用者目前已借出 :count 組配件。請在繳回配件後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增配件失敗，請重試。', - 'success' => '新增配件成功。' - ), + 'success' => '新增配件成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新配件失敗，請重試。', - 'success' => '更新配件成功。' - ), + 'success' => '更新配件成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此配件嗎？', 'error' => '刪除配件時發生問題。請再試一次。', - 'success' => '刪除配件成功。' - ), + 'success' => '刪除配件成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '配件借出失敗。請再試一次。', 'success' => '借出配件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ), + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '配件繳回失敗。請再試一次。', 'success' => '繳回配件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ) + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - -); +]; diff --git a/resources/lang/zh-TW/admin/accessories/table.php b/resources/lang/zh-TW/admin/accessories/table.php index be80f30ab8..5a8176c19f 100644 --- a/resources/lang/zh-TW/admin/accessories/table.php +++ b/resources/lang/zh-TW/admin/accessories/table.php @@ -1,11 +1,10 @@ '下載CSV檔', - 'eula_text' => 'EULA', +return [ + 'dl_csv' => '下載CSV檔', + 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => '接收', 'title' => '配件名稱', - -); +]; diff --git a/resources/lang/zh-TW/admin/asset_maintenances/form.php b/resources/lang/zh-TW/admin/asset_maintenances/form.php index 04a707e15e..bc611d3f5a 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/form.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => '資產維護所需天數', 'notes' => '備註', 'update' => '更新資產維護', - 'create' => '新建資產維護' + 'create' => '新建資產維護', ]; diff --git a/resources/lang/zh-TW/admin/asset_maintenances/message.php b/resources/lang/zh-TW/admin/asset_maintenances/message.php index add2fe4776..2b3572588f 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/message.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => '您確定要刪除此筆資產維護訊息嗎？', 'error' => '資產維護訊息刪除失敗。請再試一次', - 'success' => '資產維護訊息已刪除。' + 'success' => '資產維護訊息已刪除。', ], 'create' => [ 'error' => '資產維護訊息新增失敗。請再試一次', - 'success' => '資產維護訊息已新增。' + 'success' => '資產維護訊息已新增。', ], 'edit' => [ 'error' => '資產維護訊息修改失敗。請再試一次', - 'success' => '資產維護訊息已修改。' + 'success' => '資產維護訊息已修改。', ], 'asset_maintenance_incomplete' => '尚未完成', 'warranty' => '保固', 'not_warranty' => '無保固', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/zh-TW/admin/asset_maintenances/table.php b/resources/lang/zh-TW/admin/asset_maintenances/table.php index 361ad3efca..903e319705 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/table.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => '資產維護', 'asset_name' => '資產名稱', 'is_warranty' => '保固', - 'dl_csv' => '下載CSV檔' + 'dl_csv' => '下載CSV檔', ]; diff --git a/resources/lang/zh-TW/admin/categories/general.php b/resources/lang/zh-TW/admin/categories/general.php index 403a585b63..815819339c 100644 --- a/resources/lang/zh-TW/admin/categories/general.php +++ b/resources/lang/zh-TW/admin/categories/general.php @@ -1,6 +1,6 @@ '資產類別', 'category_name' => '類別名稱', 'checkin_email' => '在借出/繳回時發送郵件給使用者。', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => '用預設EULA（最終使用者許可協議） 進行替換。', 'use_default_eula_disabled' => '使用預設EULA（最終使用者許可協議）替換。沒有找到預設EULA（最終使用者許可協議）。請在設定中增加一個。', -); +]; diff --git a/resources/lang/zh-TW/admin/categories/message.php b/resources/lang/zh-TW/admin/categories/message.php index 48ad3197f0..64442a27c7 100644 --- a/resources/lang/zh-TW/admin/categories/message.php +++ b/resources/lang/zh-TW/admin/categories/message.php @@ -1,25 +1,25 @@ '類別不存在', 'assoc_models' => '至少還有一個樣板與此類別關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_items' => '至少還有一個 :asset_type 與此類別關聯，目前不能被刪除，請您檢查 :asset_type 後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增類別失敗，請重試。', - 'success' => '新增類別成功。' - ), + 'success' => '新增類別成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新類別失敗，請重試。', - 'success' => '更新類別成功。' - ), + 'success' => '更新類別成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此類別嗎？', 'error' => '刪除類別時發生問題。請再試一次。', - 'success' => '刪除類別成功。' - ) + 'success' => '刪除類別成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/categories/table.php b/resources/lang/zh-TW/admin/categories/table.php index 53b76c4dd3..f986713c1f 100644 --- a/resources/lang/zh-TW/admin/categories/table.php +++ b/resources/lang/zh-TW/admin/categories/table.php @@ -1,10 +1,10 @@ 'EULA', +return [ + 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => '父類', 'require_acceptance' => '接受', 'title' => '資產類別名稱', -); +]; diff --git a/resources/lang/zh-TW/admin/companies/general.php b/resources/lang/zh-TW/admin/companies/general.php index 4331f45da9..154803572d 100644 --- a/resources/lang/zh-TW/admin/companies/general.php +++ b/resources/lang/zh-TW/admin/companies/general.php @@ -1,4 +1,5 @@ '選擇公司', ]; diff --git a/resources/lang/zh-TW/admin/companies/message.php b/resources/lang/zh-TW/admin/companies/message.php index e88cc0c59f..737fdbe59a 100644 --- a/resources/lang/zh-TW/admin/companies/message.php +++ b/resources/lang/zh-TW/admin/companies/message.php @@ -1,18 +1,19 @@ '公司不存在', 'assoc_users' => '至少還有一個資產與此公司關聯，目前不能被删除，請檢查後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增公司失敗，請重試。', - 'success' => '新增公司成功。' - ), - 'update' => array( + 'success' => '新增公司成功。', + ], + 'update' => [ 'error' => '更新公司失敗，請重試。', - 'success' => '更新公司成功。' - ), - 'delete' => array( + 'success' => '更新公司成功。', + ], + 'delete' => [ 'confirm' => '您確定要刪除此公司嗎？', 'error' => '刪除公司時發生問題。請再試一次。', - 'success' => '刪除公司成功。' - ) -); + 'success' => '刪除公司成功。', + ], +]; diff --git a/resources/lang/zh-TW/admin/companies/table.php b/resources/lang/zh-TW/admin/companies/table.php index a7a4604912..a53affe1b8 100644 --- a/resources/lang/zh-TW/admin/companies/table.php +++ b/resources/lang/zh-TW/admin/companies/table.php @@ -1,9 +1,10 @@ '公司', 'create' => '新增公司', 'title' => '公司', 'update' => '更新公司', 'name' => '公司名稱', 'id' => 'ID', -); +]; diff --git a/resources/lang/zh-TW/admin/components/general.php b/resources/lang/zh-TW/admin/components/general.php index e537e9c373..16d0f31fd5 100644 --- a/resources/lang/zh-TW/admin/components/general.php +++ b/resources/lang/zh-TW/admin/components/general.php @@ -1,6 +1,6 @@ '組件名稱', 'checkin' => '組件繳回', 'checkout' => '組件借出', @@ -12,4 +12,4 @@ return array( 'remaining' => '剩餘', 'total' => '總計', 'update' => '更新組件', -); +]; diff --git a/resources/lang/zh-TW/admin/components/message.php b/resources/lang/zh-TW/admin/components/message.php index 1e6ff3ebac..529903e044 100644 --- a/resources/lang/zh-TW/admin/components/message.php +++ b/resources/lang/zh-TW/admin/components/message.php @@ -1,36 +1,35 @@ '組件不存在', - 'create' => array( + 'create' => [ 'error' => '新增組件失敗，請重試。', - 'success' => '新增組件成功。' - ), + 'success' => '新增組件成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新組件失敗，請重試。', - 'success' => '更新組件成功。' - ), + 'success' => '更新組件成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此組件嗎？', 'error' => '刪除組件時發生問題。請再試一次。', - 'success' => '刪除組件成功。' - ), + 'success' => '刪除組件成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '組件借出失敗。請再試一次。', 'success' => '借出組件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ), + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '組件繳回失敗。請再試一次。', 'success' => '繳回組件成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ) + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - -); +]; diff --git a/resources/lang/zh-TW/admin/components/table.php b/resources/lang/zh-TW/admin/components/table.php index 8916991dbb..2d8530ae16 100644 --- a/resources/lang/zh-TW/admin/components/table.php +++ b/resources/lang/zh-TW/admin/components/table.php @@ -1,5 +1,5 @@ '組件名稱', -); +]; diff --git a/resources/lang/zh-TW/admin/consumables/general.php b/resources/lang/zh-TW/admin/consumables/general.php index 9337216db2..9a9d766fae 100644 --- a/resources/lang/zh-TW/admin/consumables/general.php +++ b/resources/lang/zh-TW/admin/consumables/general.php @@ -1,6 +1,6 @@ '領取耗材給使用者', 'consumable_name' => '耗材名稱', 'create' => '新增耗材', @@ -8,4 +8,4 @@ return array( 'remaining' => '剩餘', 'total' => '總計', 'update' => '更新耗材', -); +]; diff --git a/resources/lang/zh-TW/admin/consumables/message.php b/resources/lang/zh-TW/admin/consumables/message.php index 82b9d94005..7b78b8337a 100644 --- a/resources/lang/zh-TW/admin/consumables/message.php +++ b/resources/lang/zh-TW/admin/consumables/message.php @@ -1,36 +1,35 @@ '耗材不存在。', - 'create' => array( + 'create' => [ 'error' => '新增耗材失敗，請重試。', - 'success' => '新增耗材成功。' - ), + 'success' => '新增耗材成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新耗材失敗，請重試。', - 'success' => '更新耗材成功。' - ), + 'success' => '更新耗材成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此耗材嗎？', 'error' => '刪除耗材時發生問題。請再試一次。', - 'success' => '刪除耗材成功。' - ), + 'success' => '刪除耗材成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '耗材領取失敗，請重試。', 'success' => '耗材領取成功。', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ), + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '耗材登記失敗，請重試。', 'success' => '耗材登記成功', - 'user_does_not_exist' => '使用者不正確。請再試一次。' - ) + 'user_does_not_exist' => '使用者不正確。請再試一次。', + ], - -); +]; diff --git a/resources/lang/zh-TW/admin/consumables/table.php b/resources/lang/zh-TW/admin/consumables/table.php index b08ddc4471..4ced1a1b60 100644 --- a/resources/lang/zh-TW/admin/consumables/table.php +++ b/resources/lang/zh-TW/admin/consumables/table.php @@ -1,5 +1,5 @@ '耗材名稱', -); +]; diff --git a/resources/lang/zh-TW/admin/custom_fields/general.php b/resources/lang/zh-TW/admin/custom_fields/general.php index 1471ea2c67..034809310c 100644 --- a/resources/lang/zh-TW/admin/custom_fields/general.php +++ b/resources/lang/zh-TW/admin/custom_fields/general.php @@ -1,6 +1,6 @@ '自訂欄位', 'field' => '欄位', 'about_fieldsets_title' => '關於欄位集', @@ -29,4 +29,4 @@ return array( 'create_field' => '新增欄位', 'value_encrypted' => '此欄位的值已被加密。只有管理員能夠查看原始資料。', 'show_in_email' => '在發送給用戶的借出通知信中包含此欄位的值？加密的欄位不能包含在電子郵件中。', -); +]; diff --git a/resources/lang/zh-TW/admin/custom_fields/message.php b/resources/lang/zh-TW/admin/custom_fields/message.php index 3346a091c6..9680fc601a 100644 --- a/resources/lang/zh-TW/admin/custom_fields/message.php +++ b/resources/lang/zh-TW/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => '欄位不存在。', 'already_added' => '已新增欄位。', - 'create' => array( + 'create' => [ 'error' => '新增欄位失敗，請重試。', 'success' => '新增欄位成功。', - 'assoc_success' => '新增欄位到欄位集成功' - ), + 'assoc_success' => '新增欄位到欄位集成功', + ], - 'update' => array( + 'update' => [ 'error' => '更新欄位失敗，請重試。', - 'success' => '更新欄位成功。' - ), + 'success' => '更新欄位成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此欄位？', 'error' => '刪除欄位時發生問題。請再試一次。', 'success' => '刪除欄位成功。', 'in_use' => '欄位還在使用中', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => '欄位集不存在', - 'create' => array( + 'create' => [ 'error' => '新增欄位集失敗，請重試。', - 'success' => '新增欄位集成功。' - ), + 'success' => '新增欄位集成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新欄位集失敗，請重試。', - 'success' => '更新欄位集成功。' - ), + 'success' => '更新欄位集成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此欄位集？', 'error' => '刪除欄位集時發生問題。請再試一次。', 'success' => '刪除欄位集成功。', 'in_use' => '欄位集還在使用中', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/zh-TW/admin/departments/message.php b/resources/lang/zh-TW/admin/departments/message.php index 471d17ebaf..bbe70e8ee7 100644 --- a/resources/lang/zh-TW/admin/departments/message.php +++ b/resources/lang/zh-TW/admin/departments/message.php @@ -1,21 +1,21 @@ '部門不存在。', 'assoc_users' => '至少還有一位使用者與此部門關聯，目前不能被删除，請檢查後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增部門失敗，請重試。', - 'success' => '新增部門成功。' - ), - 'update' => array( + 'success' => '新增部門成功。', + ], + 'update' => [ 'error' => '更新部門失敗，請重試。', - 'success' => '成功更新部門。' - ), - 'delete' => array( + 'success' => '成功更新部門。', + ], + 'delete' => [ 'confirm' => '您確定要刪除此部門嗎？', 'error' => '刪除部門時發生問題，請重試。', - 'success' => '刪除部門成功。' - ) + 'success' => '刪除部門成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/departments/table.php b/resources/lang/zh-TW/admin/departments/table.php index c8479f122e..adb3329e7a 100644 --- a/resources/lang/zh-TW/admin/departments/table.php +++ b/resources/lang/zh-TW/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => '部門名稱', @@ -8,4 +8,4 @@ return array( 'location' => '位置', 'create' => '新增部門', 'update' => '更新部門', - ); + ]; diff --git a/resources/lang/zh-TW/admin/depreciations/general.php b/resources/lang/zh-TW/admin/depreciations/general.php index 8675de4aef..e21ef85f96 100644 --- a/resources/lang/zh-TW/admin/depreciations/general.php +++ b/resources/lang/zh-TW/admin/depreciations/general.php @@ -1,6 +1,6 @@ '關於資產折舊', 'about_depreciations' => '您可以設置資產折舊期限', 'asset_depreciations' => '資產折舊', @@ -9,4 +9,4 @@ return array( 'number_of_months' => '月數', 'update' => '更新折舊', -); +]; diff --git a/resources/lang/zh-TW/admin/depreciations/message.php b/resources/lang/zh-TW/admin/depreciations/message.php index 73ddbc409f..9b6c733099 100644 --- a/resources/lang/zh-TW/admin/depreciations/message.php +++ b/resources/lang/zh-TW/admin/depreciations/message.php @@ -1,25 +1,24 @@ '折舊類別不存在', 'assoc_users' => '至少還有一個資產與此折舊關聯，請檢查後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增折舊類別失敗，請重試。', - 'success' => '新增折舊類別成功。' - ), + 'success' => '新增折舊類別成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新折舊類別失敗，請重試。', - 'success' => '更新折舊類別成功。' - ), + 'success' => '更新折舊類別成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此折舊類別嗎？', 'error' => '刪除折舊類別時發生問題。請再試一次。', - 'success' => '刪除折舊類別成功。' - ) + 'success' => '刪除折舊類別成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/depreciations/table.php b/resources/lang/zh-TW/admin/depreciations/table.php index 1907eb3f32..9cd80e9b1e 100644 --- a/resources/lang/zh-TW/admin/depreciations/table.php +++ b/resources/lang/zh-TW/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => '月數', 'term' => '期限', 'title' => '名稱', -); +]; diff --git a/resources/lang/zh-TW/admin/groups/message.php b/resources/lang/zh-TW/admin/groups/message.php index 40ceb5e787..6c95cb2e3d 100644 --- a/resources/lang/zh-TW/admin/groups/message.php +++ b/resources/lang/zh-TW/admin/groups/message.php @@ -1,22 +1,22 @@ '群組已存在', 'group_not_found' => '群組 [:id] 不存在', 'group_name_required' => '名稱欄位必填', - 'success' => array( + 'success' => [ 'create' => '新增群組成功。', 'update' => '更新群組成功。', 'delete' => '刪除群組成功。', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此群組嗎？', 'create' => '新增群組時發生問題。請重試。', 'update' => '更新群組時發生問題。請重試。', 'delete' => '刪除群組時發生問題。請重試。', - ), + ], -); +]; diff --git a/resources/lang/zh-TW/admin/groups/table.php b/resources/lang/zh-TW/admin/groups/table.php index c89b24b672..cf9aabb5b1 100644 --- a/resources/lang/zh-TW/admin/groups/table.php +++ b/resources/lang/zh-TW/admin/groups/table.php @@ -1,9 +1,9 @@ 'ID', 'name' => '名稱', 'users' => '成員數', -); +]; diff --git a/resources/lang/zh-TW/admin/groups/titles.php b/resources/lang/zh-TW/admin/groups/titles.php index 7e716bbb3a..409f6c2d41 100644 --- a/resources/lang/zh-TW/admin/groups/titles.php +++ b/resources/lang/zh-TW/admin/groups/titles.php @@ -1,6 +1,6 @@ '關於群組', 'about_groups' => '群組用來區分使用者權限。', 'group_management' => '群組管理', @@ -11,4 +11,4 @@ return array( 'allow' => '允許', 'deny' => '拒絕', -); +]; diff --git a/resources/lang/zh-TW/admin/hardware/form.php b/resources/lang/zh-TW/admin/hardware/form.php index 8fb697509c..b001518e92 100644 --- a/resources/lang/zh-TW/admin/hardware/form.php +++ b/resources/lang/zh-TW/admin/hardware/form.php @@ -1,12 +1,12 @@ '確認批次刪除資產', +return [ + 'bulk_delete' => '確認批次刪除資產', 'bulk_delete_help' => '請再次確認批次刪除的資產。刪除後資產可以恢復，但將會失去當前的用戶關聯資訊。', 'bulk_delete_warn' => '即將刪除 :asset_count 項資產', - 'bulk_update' => '批次更新資產', - 'bulk_update_help' => '此表格允許您同時修改多項資產。請僅填寫需要修改的欄位，留空的欄位不會做任何修改。', - 'bulk_update_warn' => '即將修改 :asset_count 項資產屬性', + 'bulk_update' => '批次更新資產', + 'bulk_update_help' => '此表格允許您同時修改多項資產。請僅填寫需要修改的欄位，留空的欄位不會做任何修改。', + 'bulk_update_warn' => '即將修改 :asset_count 項資產屬性', 'checkedout_to' => '借出至', 'checkout_date' => '借出日期', 'checkin_date' => '繳回日期', @@ -38,7 +38,6 @@ return array( 'tag' => '資產標籤', 'update' => '更新資產', 'warranty' => '保固', - 'warranty_expires' => '保固期限', + 'warranty_expires' => '保固期限', 'years' => '年', -) -; +]; diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php index b0f4280eb5..db1f57fc0a 100644 --- a/resources/lang/zh-TW/admin/hardware/general.php +++ b/resources/lang/zh-TW/admin/hardware/general.php @@ -1,9 +1,9 @@ '關於資產', 'about_assets_text' => '資產是按序號或資產標籤追蹤的物品。 他們往往是高價值並標示為重要的物品。', - 'archived' => '已封存', + 'archived' => '已封存', 'asset' => '資產', 'bulk_checkout' => '借出資產', 'checkin' => '資產繳回', @@ -19,4 +19,4 @@ return array( 'pending' => '待處理', 'undeployable' => '不可部署', 'view' => '檢視資產', -); +]; diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php index 69e1f405bb..2d0165cf64 100644 --- a/resources/lang/zh-TW/admin/hardware/message.php +++ b/resources/lang/zh-TW/admin/hardware/message.php @@ -1,82 +1,80 @@ '警告: 此資產目前已標記為不可佈署，如果資產狀態已改變，請更新狀態。', 'does_not_exist' => '資產不存在', 'does_not_exist_or_not_requestable' => '已重試。該資產不存在或不可申領。', 'assoc_users' => '此資產目前已借給某個使用者，不能被刪除，請檢查資產狀態，然後再嘗試刪除。', - 'create' => array( + 'create' => [ 'error' => '新增資產失敗，請重試。', - 'success' => '新增資產成功。' - ), + 'success' => '新增資產成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新資產失敗，請重試。', 'success' => '更新資產成功。', 'nothing_updated' => '沒有欄位被選擇，因此沒有更新任何內容。', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => '恢復資產失敗，請重試。', - 'success' => '恢復資產成功。' - ), + 'success' => '恢復資產成功。', + ], - 'audit' => array( + 'audit' => [ 'error' => '資產稽核失敗。請再試一次。', - 'success' => '資產稽核成功登錄。' - ), + 'success' => '資產稽核成功登錄。', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => '刪除檔案失敗，請重試。', 'success' => '刪除檔案成功。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '上傳檔案失敗，請重試。', 'success' => '上傳檔案成功。', 'nofiles' => '您尚未選擇要上傳的檔案，或上傳的檔案太大。', 'invalidfiles' => '一個或多個檔案太大或屬於不被允許的檔案類型。允許上傳的檔案類型：png, gif, jpg, doc, docx, pdf, txt。', - ), + ], - 'import' => array( + 'import' => [ 'error' => '某些項目沒有被正確匯入。', 'errorDetail' => '以下項目由於錯誤未被匯入。', - 'success' => "您的檔案已被匯入。", - 'file_delete_success' => "您的檔案已成功刪除。", - 'file_delete_error' => "您的檔案無法被刪除。", - ), + 'success' => '您的檔案已被匯入。', + 'file_delete_success' => '您的檔案已成功刪除。', + 'file_delete_error' => '您的檔案無法被刪除。', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此資產嗎？', 'error' => '刪除資產時發生問題，請重試。', 'nothing_updated' => '沒有資產被選擇，因此沒有更新任何內容。', - 'success' => '刪除資產成功。' - ), + 'success' => '刪除資產成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '借出資產失敗，請重試。', 'success' => '借出資產成功。', 'user_does_not_exist' => '無效使用者，請重試。', 'not_available' => '此資產無法借出', - 'no_assets_selected' => '你必須至少選擇一項資產。' - ), + 'no_assets_selected' => '你必須至少選擇一項資產。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '繳回資產失敗，請重試。', 'success' => '繳回資產成功。', 'user_does_not_exist' => '無效使用者，請重試。', 'already_checked_in' => '資產已繳回。', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => '申請資產失敗，請重試。', 'success' => '申請資產成功。', - 'canceled' => '借出申請已取消。' - ) + 'canceled' => '借出申請已取消。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/hardware/table.php b/resources/lang/zh-TW/admin/hardware/table.php index 545d89ca9b..59fd02fef3 100644 --- a/resources/lang/zh-TW/admin/hardware/table.php +++ b/resources/lang/zh-TW/admin/hardware/table.php @@ -1,6 +1,6 @@ '資產標籤', 'asset_model' => '型號', @@ -20,6 +20,6 @@ return array( 'title' => '資產', 'image' => '設備圖片', 'days_without_acceptance' => '過期天數', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/zh-TW/admin/kits/general.php b/resources/lang/zh-TW/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/zh-TW/admin/kits/general.php +++ b/resources/lang/zh-TW/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/zh-TW/admin/licenses/form.php b/resources/lang/zh-TW/admin/licenses/form.php index ce61cf563d..7bbff27eb9 100644 --- a/resources/lang/zh-TW/admin/licenses/form.php +++ b/resources/lang/zh-TW/admin/licenses/form.php @@ -1,6 +1,6 @@ '資產', 'checkin' => '繳回', @@ -18,5 +18,5 @@ return array( 'to_email' => '授權信箱', 'to_name' => '授權給', 'update' => '更新授權', - 'checkout_help' => '請檢查這個授權是否已經分配給某個人或某個設備。你可以複選，但資產歸屬人必須是相同的。' -); + 'checkout_help' => '請檢查這個授權是否已經分配給某個人或某個設備。你可以複選，但資產歸屬人必須是相同的。', +]; diff --git a/resources/lang/zh-TW/admin/licenses/general.php b/resources/lang/zh-TW/admin/licenses/general.php index 8c873d56a0..25669dca6d 100644 --- a/resources/lang/zh-TW/admin/licenses/general.php +++ b/resources/lang/zh-TW/admin/licenses/general.php @@ -1,6 +1,6 @@ '關於授權', 'about_licenses' => '授權是用來追踨可供借出的軟體數量。', 'checkin' => '繳回授權數量', @@ -19,4 +19,4 @@ return array( 'user' => '使用者 ', 'view' => '檢視授權', -); +]; diff --git a/resources/lang/zh-TW/admin/licenses/message.php b/resources/lang/zh-TW/admin/licenses/message.php index 3ab1f56e0f..212ba8f69d 100644 --- a/resources/lang/zh-TW/admin/licenses/message.php +++ b/resources/lang/zh-TW/admin/licenses/message.php @@ -1,6 +1,6 @@ '授權不存在。', 'user_does_not_exist' => '使用者不存在', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => '您必須選擇資產或用戶，但不能同時選擇兩者。', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => '新增授權失敗，請重試。', - 'success' => '新增授權成功。' - ), + 'success' => '新增授權成功。', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '刪除檔案失敗，請重試。', 'success' => '刪除檔案成功。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '上傳檔案失敗，請重試。', 'success' => '上傳檔案成功。', 'nofiles' => '您尚未選擇要上傳的檔案，或上傳的檔案太大。', 'invalidfiles' => '一個或多個檔案太大，或者是不允許的檔案類型。允許的檔案類型有 png、 gif、 jpg、 jpeg、 doc、 docx、 pdf、 txt、 zip、 rar、 rtf、 xml 和 lic。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '更新授權失敗，請重試。', - 'success' => '更新授權成功。' - ), + 'success' => '更新授權成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此授權嗎？', 'error' => '刪除授權時發生問題，請重試。', - 'success' => '刪除授權成功。' - ), + 'success' => '刪除授權成功。', + ], - 'checkout' => array( + 'checkout' => [ 'error' => '借出授權時發生問題，請重試。', - 'success' => '借出授權成功。' - ), + 'success' => '借出授權成功。', + ], - 'checkin' => array( + 'checkin' => [ 'error' => '繳回授權時發生問題，請重試。', - 'success' => '繳回授權成功。' - ), + 'success' => '繳回授權成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/licenses/table.php b/resources/lang/zh-TW/admin/licenses/table.php index 99dabc61ee..62502556dc 100644 --- a/resources/lang/zh-TW/admin/licenses/table.php +++ b/resources/lang/zh-TW/admin/licenses/table.php @@ -1,6 +1,6 @@ '分配給', 'checkout' => '進/出', @@ -14,4 +14,4 @@ return array( 'serial' => '序號', 'title' => '授權', -); +]; diff --git a/resources/lang/zh-TW/admin/locations/message.php b/resources/lang/zh-TW/admin/locations/message.php index 5ba71d0fe4..7c489a1ff5 100644 --- a/resources/lang/zh-TW/admin/locations/message.php +++ b/resources/lang/zh-TW/admin/locations/message.php @@ -1,27 +1,26 @@ '地點不存在.', 'assoc_users' => '至少還有一位使用者與此位置關聯，目前不能被删除，請檢查後重試。 ', 'assoc_assets' => '至少還有一個資產與此位置關聯，目前不能被删除，請檢查後重試。 ', 'assoc_child_loc' => '至少還有一個子項目與此位置關聯，目前不能被删除，請檢查後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增位置失敗，請重試。', - 'success' => '新增位置成功。' - ), + 'success' => '新增位置成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新位置失敗，請重試。', - 'success' => '成功更新地點.' - ), + 'success' => '成功更新地點.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此位置嗎？', 'error' => '刪除位置時發生問題，請重試。', - 'success' => '刪除位置成功。' - ) + 'success' => '刪除位置成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/locations/table.php b/resources/lang/zh-TW/admin/locations/table.php index 126db340e5..c9860d79d4 100644 --- a/resources/lang/zh-TW/admin/locations/table.php +++ b/resources/lang/zh-TW/admin/locations/table.php @@ -1,6 +1,6 @@ '關於位置', 'about_locations' => '位置用來追踪使用者、資產和其他項目的位置資訊', 'assets_rtd' => '資產', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => '父項目', 'currency' => '當地貨幣單位', 'ldap_ou' => 'LDAP 搜尋 OU', - ); + ]; diff --git a/resources/lang/zh-TW/admin/manufacturers/message.php b/resources/lang/zh-TW/admin/manufacturers/message.php index 4d5de1310d..5a195a7ba9 100644 --- a/resources/lang/zh-TW/admin/manufacturers/message.php +++ b/resources/lang/zh-TW/admin/manufacturers/message.php @@ -1,29 +1,29 @@ '製造商不存在', 'assoc_users' => '至少還有一個資產與此製造商關聯，目前不能被删除，請確認後重試。 ', - 'create' => array( + 'create' => [ 'error' => '新增製造商失敗，請重試。', - 'success' => '新增製造商成功。' - ), + 'success' => '新增製造商成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新製造商失敗，請重試。', - 'success' => '更新製造商成功。' - ), + 'success' => '更新製造商成功。', + ], - 'restore' => array( + 'restore' => [ 'error' => '製造商恢復失敗，請重試。', - 'success' => '製造商恢復成功。' - ), + 'success' => '製造商恢復成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此製造商嗎？', 'error' => '刪除製造商失敗，請重試。', - 'success' => '刪除製造商成功。' - ) + 'success' => '刪除製造商成功。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/manufacturers/table.php b/resources/lang/zh-TW/admin/manufacturers/table.php index 12cdd792e8..8d4b2c0bad 100644 --- a/resources/lang/zh-TW/admin/manufacturers/table.php +++ b/resources/lang/zh-TW/admin/manufacturers/table.php @@ -1,6 +1,6 @@ '關於製造商', 'about_manufacturers_text' => '廠商是提供您資產的公司，您可以在這裡儲存重要的支援資訊，並顯示在資產的詳細頁面。', 'asset_manufacturers' => '資產製造商', @@ -13,4 +13,4 @@ return array( 'update' => '更新製造商', 'url' => '網址', -); +]; diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php index 765993b76b..ae7a7a4223 100644 --- a/resources/lang/zh-TW/admin/models/general.php +++ b/resources/lang/zh-TW/admin/models/general.php @@ -1,6 +1,6 @@ '關於資產型號', 'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。', 'deleted' => '此型號已被刪除。點擊此處恢復。', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。', 'restore' => '恢復型號', 'requestable' => '使用者可申請此型號', - 'show_mac_address' => '在型號資產中顯示MAC地址', + 'show_mac_address' => '在型號資產中顯示MAC地址', 'view_deleted' => '檢視已刪除', 'view_models' => '檢視型號', 'fieldset' => '欄位集', 'no_custom_field' => '沒有自訂欄位', 'add_default_values' => '新增預設值', -); +]; diff --git a/resources/lang/zh-TW/admin/models/message.php b/resources/lang/zh-TW/admin/models/message.php index c64026575a..d1513fef4d 100644 --- a/resources/lang/zh-TW/admin/models/message.php +++ b/resources/lang/zh-TW/admin/models/message.php @@ -1,42 +1,41 @@ '樣板不存在', 'assoc_users' => '至少還有一個資產與此樣板關聯，目前不能被删除，請在刪除資產後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增樣板失敗，請重試。', 'success' => '新增樣板成功。', 'duplicate_set' => '資產名稱、製造商、型號都相同的其它資產樣板已存在。', - ), + ], - 'update' => array( + 'update' => [ 'error' => '更新樣板失敗，請重試。', - 'success' => '更新樣板成功。' - ), + 'success' => '更新樣板成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此樣板嗎？', 'error' => '刪除樣板失敗，請重試。', - 'success' => '刪除樣板成功。' - ), + 'success' => '刪除樣板成功。', + ], - 'restore' => array( + 'restore' => [ 'error' => '恢復樣板失敗，請重試。', - 'success' => '恢復樣板成功。' - ), + 'success' => '恢復樣板成功。', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => '沒有欄位被更改，因此沒有更新任何內容。', - 'success' => '樣板已更新。' - ), + 'success' => '樣板已更新。', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => '沒有型號被選擇，因此沒有更新任何內容。', 'success' => ':success_count 個型號已刪除!', - 'success_partial' => ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。' - ), + 'success_partial' => ':success_count 個型號被刪除, 但是 :fail_count 無法被刪除, 因為它們仍有與之關聯的資產。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/models/table.php b/resources/lang/zh-TW/admin/models/table.php index 11b0300a26..001fcaaf71 100644 --- a/resources/lang/zh-TW/admin/models/table.php +++ b/resources/lang/zh-TW/admin/models/table.php @@ -1,6 +1,6 @@ '新增資產樣板', 'created_at' => '新增於', @@ -14,4 +14,4 @@ return array( 'update' => '更新資產樣板', 'clone' => '複製樣板', 'edit' => '編輯樣板', -); +]; diff --git a/resources/lang/zh-TW/admin/reports/general.php b/resources/lang/zh-TW/admin/reports/general.php index 6137909494..bdee19f2f0 100644 --- a/resources/lang/zh-TW/admin/reports/general.php +++ b/resources/lang/zh-TW/admin/reports/general.php @@ -1,5 +1,5 @@ '請選擇資產報表選項。' -); +return [ + 'info' => '請選擇資產報表選項。', +]; diff --git a/resources/lang/zh-TW/admin/reports/message.php b/resources/lang/zh-TW/admin/reports/message.php index 4c7eedb612..ee2e2f653a 100644 --- a/resources/lang/zh-TW/admin/reports/message.php +++ b/resources/lang/zh-TW/admin/reports/message.php @@ -1,5 +1,5 @@ '您至少要選擇一個選項。' -); +return [ + 'error' => '您至少要選擇一個選項。', +]; diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php index 8d2129e5bb..f0287791ce 100644 --- a/resources/lang/zh-TW/admin/settings/general.php +++ b/resources/lang/zh-TW/admin/settings/general.php @@ -1,12 +1,12 @@ 'Active Directory', 'ad_domain' => 'Active Directory 域', 'ad_domain_help' => '通常(但並非全部情況下)這與您的郵件域相同。', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => '電子郵件副本', 'admin_cc_email_help' => '如果您想將發送給用戶的繳回/借出電子郵件的副本發送到其他電子郵件帳戶，請在此處輸入。否則，請將此字段留空。', 'is_ad' => '這是AD域伺服器', @@ -15,7 +15,7 @@ return array( 'alert_interval' => '警報閾值(天)', 'alert_inv_threshold' => '庫存警報閾值', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => '資產ID', 'audit_interval' => '稽核間隔', 'audit_interval_help' => '如果您需要定期對您的資產進行身體審核，請輸入幾個月的時間間隔。', @@ -214,7 +214,7 @@ return array( 'two_factor_enter_code' => '輸入雙因素認證代碼', 'two_factor_config_complete' => '送出代碼', 'two_factor_enabled_edit_not_allowed' => '您的管理員不允許您編輯此設定。', - 'two_factor_enrollment_text' => "雙因素認證是必要的，無論您是否已登記行動裝置。開啟您的 Google Authenticator app 並且掃描下方的 QR Code 以登記雙因素認證。當您已登記您的裝置，請在下方輸入認證代碼", + 'two_factor_enrollment_text' => '雙因素認證是必要的，無論您是否已登記行動裝置。開啟您的 Google Authenticator app 並且掃描下方的 QR Code 以登記雙因素認證。當您已登記您的裝置，請在下方輸入認證代碼', 'require_accept_signature' => '需要簽名', 'require_accept_signature_help_text' => '啟用此功能將需要使用者親自簽名來接受一項資產。', 'left' => '左', @@ -227,4 +227,4 @@ return array( 'unique_serial_help_text' => '選中此框將強制對資產序號進行唯一性約束', 'zerofill_count' => '資產標籤長度，包括補零', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php index 2f88f4a274..17737a7def 100644 --- a/resources/lang/zh-TW/admin/settings/message.php +++ b/resources/lang/zh-TW/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => '更新過程中發生問題。', - 'success' => '更新設定成功。' - ), - 'backup' => array( + 'success' => '更新設定成功。', + ], + 'backup' => [ 'delete_confirm' => '您確定要刪除此備份檔嗎？此動作無法復原。', 'file_deleted' => '刪除備份檔成功。', 'generated' => '成功新增一個新的備份檔。', 'file_not_found' => '在伺服器上找不到備份檔', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => '清除過程中發生錯誤。', 'validation_failed' => '你的清除確認不正確，請在文字輸入欄位輸入＂DELETE＂。', - 'success' => '已成功清除刪除記錄。' - ), + 'success' => '已成功清除刪除記錄。', + ], -); +]; diff --git a/resources/lang/zh-TW/admin/statuslabels/message.php b/resources/lang/zh-TW/admin/statuslabels/message.php index 87ebdf5313..bac2491144 100644 --- a/resources/lang/zh-TW/admin/statuslabels/message.php +++ b/resources/lang/zh-TW/admin/statuslabels/message.php @@ -1,32 +1,31 @@ '狀態標籤不存在', 'assoc_assets' => '至少還有一個資產與此狀態標籤關聯，目前不能被删除，請確認後重試。 ', - - 'create' => array( + 'create' => [ 'error' => '新增狀態標籤失敗，請重試。', - 'success' => '新增狀態標籤成功。' - ), + 'success' => '新增狀態標籤成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新狀態標籤失敗，請重試。', - 'success' => '更新狀態標籤成功。' - ), + 'success' => '更新狀態標籤成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此狀態標籤嗎？', 'error' => '刪除狀態標籤失敗，請重試。', - 'success' => '刪除狀態標籤成功。' - ), + 'success' => '刪除狀態標籤成功。', + ], - 'help' => array( + 'help' => [ 'undeployable' => '這些資產不能分配給任何人。', 'deployable' => '這些資產可以檢出。一旦分配了它們，它們將承擔一個元狀態 Deployed。', 'archived' => '這些資產無法簽出，只會顯示在“存檔”視圖中。這有助於保留有關資產的預算/歷史目的信息，但將其保留在日常資產清單之外。', 'pending' => '這些資產不能分配給任何人，經常用於修理的物品，但預計將重新流通。', - ), + ], -); +]; diff --git a/resources/lang/zh-TW/admin/statuslabels/table.php b/resources/lang/zh-TW/admin/statuslabels/table.php index 591a25a544..3cb72255ef 100644 --- a/resources/lang/zh-TW/admin/statuslabels/table.php +++ b/resources/lang/zh-TW/admin/statuslabels/table.php @@ -1,6 +1,6 @@ '關於狀態標籤', 'archived' => '已封存', 'create' => '新增狀態標籤', @@ -16,4 +16,4 @@ return array( 'title' => '狀態標籤', 'undeployable' => '無法部署', 'update' => '更新狀態標籤', -); +]; diff --git a/resources/lang/zh-TW/admin/suppliers/message.php b/resources/lang/zh-TW/admin/suppliers/message.php index 62c6cf3bf5..3c1ca44c8e 100644 --- a/resources/lang/zh-TW/admin/suppliers/message.php +++ b/resources/lang/zh-TW/admin/suppliers/message.php @@ -1,27 +1,26 @@ '供應商不存在', - - 'create' => array( + 'create' => [ 'error' => '新增供應商失敗，請重試', - 'success' => '新增供應商成功。' - ), + 'success' => '新增供應商成功。', + ], - 'update' => array( + 'update' => [ 'error' => '更新供應商失敗，請重試', - 'success' => '更新供應商成功。' - ), + 'success' => '更新供應商成功。', + ], - 'delete' => array( + 'delete' => [ 'confirm' => '您確定要刪除此供應商嗎？', 'error' => '刪除供應商失敗，請重試', 'success' => '刪除供應商成功。', 'assoc_assets' => '至少還有 :asset_count 個樣板與此供應商關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_licenses' => '至少還有 :licenses_count 個授權與此供應商關聯，目前不能被刪除，請檢查後重試。 ', 'assoc_maintenances' => '至少還有 :asset_maintenances_count 個資產維護與此供應商關聯，目前不能被刪除，請檢查後重試。 ', - ) + ], -); +]; diff --git a/resources/lang/zh-TW/admin/suppliers/table.php b/resources/lang/zh-TW/admin/suppliers/table.php index 3dbb05aee6..187d543ae2 100644 --- a/resources/lang/zh-TW/admin/suppliers/table.php +++ b/resources/lang/zh-TW/admin/suppliers/table.php @@ -1,6 +1,6 @@ '關於供應商', 'about_suppliers_text' => '供應商用來追踪物品的來源', 'address' => '供應商地址', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => '檢視資產關於', 'zip' => '郵遞區號', -); +]; diff --git a/resources/lang/zh-TW/admin/users/general.php b/resources/lang/zh-TW/admin/users/general.php index 32597c47ee..b116f170c2 100644 --- a/resources/lang/zh-TW/admin/users/general.php +++ b/resources/lang/zh-TW/admin/users/general.php @@ -1,7 +1,6 @@ '該用戶可以登錄', 'activated_disabled_help_text' => '您無法編輯自己帳戶的啟動狀態。', 'assets_user' => '分配給 :name 的資產', @@ -13,7 +12,7 @@ return array( 'edit' => '編輯使用者', 'filetype_info' => '允許檔案類型：png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar。', 'history_user' => ':name 的歷史記錄', - 'info' => '資訊', + 'info' => '資訊', 'restore_user' => '點擊此處可將它們還原。', 'last_login' => '上次登入', 'ldap_config_text' => 'LDAP 設定在 管理 > 設定。所選位置將套用至匯入的使用者。', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => '您當前的管理員設置允許使用雙因素身份驗證。', 'two_factor_enrolled' => '雙因素認證設備登記', 'two_factor_active' => '啟用雙因素認證', - ); + ]; diff --git a/resources/lang/zh-TW/admin/users/message.php b/resources/lang/zh-TW/admin/users/message.php index a37c02021f..9438a8588f 100644 --- a/resources/lang/zh-TW/admin/users/message.php +++ b/resources/lang/zh-TW/admin/users/message.php @@ -1,6 +1,6 @@ '您已接受這項資產。', 'declined' => '您已拒絕這項資產。', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP 整合尚未設定', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => '新增使用者成功。', 'update' => '更新使用者成功。', 'update_bulk' => '使用者更新成功 ！', @@ -26,9 +25,9 @@ return array( 'unsuspend' => '解除停用使用者成功。', 'restored' => '恢復使用者成功。', 'import' => '匯入使用者成功。', - ), + ], - 'error' => array( + 'error' => [ 'create' => '新增使用者失敗，請重試。', 'update' => '更新使用者失敗，請重試。', 'delete' => '刪除使用者失敗，請重試。', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => '查詢 LDAP 伺服器失敗，請檢查 LDAP 設定文件中的相關設定。
LDAP 伺服器錯誤訊息：', 'ldap_could_not_get_entries' => ' LDAP 伺服器取得資訊條目失敗，請檢查 LDAP 設定文件中的相關設定。
LDAP 伺服器錯誤訊息：', 'password_ldap' => '此帳戶的密碼由 LDAP/AD 管理。若要更改您的密碼，請聯繫您的 IT 部門。 ', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => '刪除檔案失敗，請重試', 'success' => '刪除檔案成功。', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => '上傳檔案失敗，請重試', 'success' => '上傳檔案成功。', 'nofiles' => '尚未選擇要上傳的檔案', 'invalidfiles' => '一個或多個檔案太大或屬於不被允許的檔案類型。允許上傳的檔案類型：png, gif, jpg, doc, docx, pdf, txt。', - ), + ], -); +]; diff --git a/resources/lang/zh-TW/admin/users/table.php b/resources/lang/zh-TW/admin/users/table.php index ed261f406f..83ee009479 100644 --- a/resources/lang/zh-TW/admin/users/table.php +++ b/resources/lang/zh-TW/admin/users/table.php @@ -1,6 +1,6 @@ '啟用', 'allow' => '允許', 'checkedout' => '資產', @@ -28,11 +28,11 @@ return array( 'show_current' => '顯示當前使用者', 'show_deleted' => '顯示已刪除使用者', 'title' => '職稱', - 'to_restore_them' => '將它們還原。', + 'to_restore_them' => '將它們還原。', 'updateuser' => '更新使用者', 'username' => '使用者名稱', - 'user_deleted_text' => '此使用者已被標記為刪除。', + 'user_deleted_text' => '此使用者已被標記為刪除。', 'username_note' => '（這是用來綁定 Active Directory，非用來登入）', 'cloneuser' => '複製使用者', 'viewusers' => '檢視使用者', -); +]; diff --git a/resources/lang/zh-TW/auth/general.php b/resources/lang/zh-TW/auth/general.php index 4aafd533fd..74b1464dbd 100644 --- a/resources/lang/zh-TW/auth/general.php +++ b/resources/lang/zh-TW/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/zh-TW/auth/message.php b/resources/lang/zh-TW/auth/message.php index fc19e07998..6ea65e955d 100644 --- a/resources/lang/zh-TW/auth/message.php +++ b/resources/lang/zh-TW/auth/message.php @@ -1,6 +1,6 @@ '此信箱已被註冊', 'account_not_found' => '使用者或密碼錯誤', @@ -9,37 +9,36 @@ return array( 'account_banned' => '使用者已被禁用', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => '您已成功登入', 'code_required' => 'Two-factor code is required.', 'invalid_code' => '兩階段驗證碼無效', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => '登入過程中發生問題，請重試', 'success' => '登入成功', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => '登出時發生問題，請稍後再試', 'success' => '您已成功登出', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => '在新增帳戶時發生問題，請重試', 'success' => '新增帳戶成功。', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => '在重設密碼時發生問題，請重試', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => '在重設密碼時發生問題，請重試', 'success' => '密碼重設成功。', - ), + ], - -); +]; diff --git a/resources/lang/zh-TW/button.php b/resources/lang/zh-TW/button.php index 4261594c72..b769d09992 100644 --- a/resources/lang/zh-TW/button.php +++ b/resources/lang/zh-TW/button.php @@ -1,6 +1,6 @@ '操作', 'add' => '新增', 'cancel' => '取消', @@ -11,7 +11,7 @@ return array( 'request' => '申請', 'submit' => '送出', 'upload' => '上傳', - 'select_file' => '選擇檔案…', + 'select_file' => '選擇檔案…', 'select_files' => '選擇檔案…', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index af1069ed80..0428932477 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -44,13 +44,13 @@ 'checkins_count' => '繳回', 'user_requests_count' => '申請', 'city' => '城市', - 'click_here' => '點擊這裡', + 'click_here' => '點擊這裡', 'clear_selection' => '清除選擇', 'companies' => '公司', 'company' => '公司', 'component' => '組件', 'components' => '組件', - 'complete' => '完成', + 'complete' => '完成', 'consumable' => '耗材', 'consumables' => '耗材', 'country' => '國家', diff --git a/resources/lang/zh-TW/help.php b/resources/lang/zh-TW/help.php index 4e9f9a4415..c72588704d 100644 --- a/resources/lang/zh-TW/help.php +++ b/resources/lang/zh-TW/help.php @@ -1,6 +1,6 @@ "更多資訊", + 'more_info_title' => '更多資訊', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/zh-TW/mail.php b/resources/lang/zh-TW/mail.php index f11f147f77..5de054e6d2 100644 --- a/resources/lang/zh-TW/mail.php +++ b/resources/lang/zh-TW/mail.php @@ -1,6 +1,6 @@ '使用者已取消項目申請', 'a_user_requested' => '使用者已申請項目', 'accessory_name' => '配件名稱：', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => '查看您的資產' -); + 'your_assets' => '查看您的資產', +]; diff --git a/resources/lang/zh-TW/pagination.php b/resources/lang/zh-TW/pagination.php index 88890d5ffa..92b29d3478 100644 --- a/resources/lang/zh-TW/pagination.php +++ b/resources/lang/zh-TW/pagination.php @@ -1,6 +1,6 @@ '下一步 »', -); +]; diff --git a/resources/lang/zh-TW/passwords.php b/resources/lang/zh-TW/passwords.php index 6e1d07f5ef..d36d477588 100644 --- a/resources/lang/zh-TW/passwords.php +++ b/resources/lang/zh-TW/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => '已發送您的密碼連結！', 'user' => '未找到使用該電子郵件的使用者。', ]; - diff --git a/resources/lang/zh-TW/reminders.php b/resources/lang/zh-TW/reminders.php index 7b9710c324..bb4e4b40d4 100644 --- a/resources/lang/zh-TW/reminders.php +++ b/resources/lang/zh-TW/reminders.php @@ -1,6 +1,6 @@ "密碼至少需要六個字符，並且與確認欄位相符", + 'password' => '密碼至少需要六個字符，並且與確認欄位相符', - "user" => "使用者名稱或電子郵件地址不正確", + 'user' => '使用者名稱或電子郵件地址不正確', - "token" => "這個密碼重置密鑰無效。", + 'token' => '這個密碼重置密鑰無效。', - "sent" => "如果郵件地址相符，則密碼已經發送。", + 'sent' => '如果郵件地址相符，則密碼已經發送。', -); +]; diff --git a/resources/lang/zh-TW/table.php b/resources/lang/zh-TW/table.php index d11fdbabc4..a63ec0ff14 100644 --- a/resources/lang/zh-TW/table.php +++ b/resources/lang/zh-TW/table.php @@ -1,10 +1,10 @@ '操作', 'action' => '操作', 'by' => '經由', 'item' => '項目', -); +]; diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 08f2738525..c758cf19fa 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -1,6 +1,6 @@ ':attribute 已被採用', 'uploaded' => ':attribute 上傳失敗', 'url' => ':attribute 格式不正確', - "unique_undeleted" => ":attribute 必須是唯一值", + 'unique_undeleted' => ':attribute 必須是唯一值', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => ":attribute 含有無效字元", - "email_array" => "一個或多個郵件地址不正確", - "hashed_pass" => "當前密碼不正確！", + 'alpha_space' => ':attribute 含有無效字元', + 'email_array' => '一個或多個郵件地址不正確', + 'hashed_pass' => '當前密碼不正確！', 'dumbpwd' => '該密碼太常見。', - "statuslabel_type" => "您必須選擇一個有效的狀態標籤", + 'statuslabel_type' => '您必須選擇一個有效的狀態標籤', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/lang/zu/admin/accessories/general.php b/resources/lang/zu/admin/accessories/general.php index a8ca617304..3d76f29689 100644 --- a/resources/lang/zu/admin/accessories/general.php +++ b/resources/lang/zu/admin/accessories/general.php @@ -1,6 +1,6 @@ 'Isigaba sokufinyelela', 'accessory_name' => 'Igama lokufinyelela', 'checkout' => 'I-Checkout Accessory', @@ -17,4 +17,4 @@ return array( 'use_default_eula' => 'Sebenzisa okungu-kuzenzakalela okuzenzakalelayo ku-EULA kunalokho.', 'use_default_eula_disabled' => 'Sebenzisa i-EULA eyinhloko yokuzenzakalela esikhundleni. Ayikho i-EULA eyimilayezo eyisisekelo esethiwe. Sicela ungeze eyodwa kuzilungiselelo.', -); +]; diff --git a/resources/lang/zu/admin/accessories/message.php b/resources/lang/zu/admin/accessories/message.php index 701e5fdeef..d1099fea47 100644 --- a/resources/lang/zu/admin/accessories/message.php +++ b/resources/lang/zu/admin/accessories/message.php @@ -1,37 +1,36 @@ 'The accessory [:id] does not exist.', 'assoc_users' => 'Lesi sesekeli samanje sino: ukubala izinto ezihlolwe kubasebenzisi. Sicela uhlole izesekeli bese uzama futhi.', - 'create' => array( + 'create' => [ 'error' => 'Impahla ayidalwanga, sicela uzame futhi.', - 'success' => 'I-accessory yenziwe ngempumelelo.' - ), + 'success' => 'I-accessory yenziwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Isesekeli asizange sibuyekezwe, sicela uzame futhi', - 'success' => 'I-accessory ibuyekezwe ngempumelelo.' - ), + 'success' => 'I-accessory ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa le ndawo yokufinyelela?', 'error' => 'Kube nenkinga yokususa i-accessory. Ngicela uzame futhi.', - 'success' => 'Isesekeli sisusiwe ngempumelelo.' - ), + 'success' => 'Isesekeli sisusiwe ngempumelelo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ukufinyelela akuzange kuhlolwe, sicela uzame futhi', 'success' => 'Ukufinyelela kufakwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ), + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ukufinyelela akuzange kungenwe, sicela uzame futhi', 'success' => 'Okufinyeleleka kuhlolwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ) + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - -); +]; diff --git a/resources/lang/zu/admin/accessories/table.php b/resources/lang/zu/admin/accessories/table.php index a1359d6775..e5a28ac01e 100644 --- a/resources/lang/zu/admin/accessories/table.php +++ b/resources/lang/zu/admin/accessories/table.php @@ -1,11 +1,10 @@ 'Landa i-CSV', - 'eula_text' => 'I-EULA', +return [ + 'dl_csv' => 'Landa i-CSV', + 'eula_text' => 'I-EULA', 'id' => 'ID', 'require_acceptance' => 'Ukwamukelwa', 'title' => 'Igama lokufinyelela', - -); +]; diff --git a/resources/lang/zu/admin/asset_maintenances/form.php b/resources/lang/zu/admin/asset_maintenances/form.php index 98f3388294..960cc4e332 100644 --- a/resources/lang/zu/admin/asset_maintenances/form.php +++ b/resources/lang/zu/admin/asset_maintenances/form.php @@ -10,5 +10,5 @@ 'asset_maintenance_time' => 'Izinsuku', 'notes' => 'Amanothi', 'update' => 'Ukubuyekeza', - 'create' => 'Dala' + 'create' => 'Dala', ]; diff --git a/resources/lang/zu/admin/asset_maintenances/message.php b/resources/lang/zu/admin/asset_maintenances/message.php index 287dc32d04..fa012d1b31 100644 --- a/resources/lang/zu/admin/asset_maintenances/message.php +++ b/resources/lang/zu/admin/asset_maintenances/message.php @@ -5,17 +5,17 @@ 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa lokhu kulungiswa kwempahla?', 'error' => 'Kube nenkinga yokususa ukugcinwa kwefa. Ngicela uzame futhi.', - 'success' => 'Ukugcinwa kwempahla kususiwe ngempumelelo.' + 'success' => 'Ukugcinwa kwempahla kususiwe ngempumelelo.', ], 'create' => [ 'error' => 'Ukugcinwa kwefa akuzange kudalwe, sicela uzame futhi.', - 'success' => 'Ukugcinwa Kwempahla kudalwe ngempumelelo.' + 'success' => 'Ukugcinwa Kwempahla kudalwe ngempumelelo.', ], 'edit' => [ 'error' => 'Ukugcinwa kwe-Asset akuhlelekile, sicela uzame futhi.', - 'success' => 'Ukugcinwa Kwempahla kuhlelwe ngempumelelo.' + 'success' => 'Ukugcinwa Kwempahla kuhlelwe ngempumelelo.', ], 'asset_maintenance_incomplete' => 'Akuqediwe Nokho', 'warranty' => 'Iwaranti', 'not_warranty' => 'Akuyona iwaranti', - ]; \ No newline at end of file + ]; diff --git a/resources/lang/zu/admin/asset_maintenances/table.php b/resources/lang/zu/admin/asset_maintenances/table.php index 78f1845e50..198e0a42f9 100644 --- a/resources/lang/zu/admin/asset_maintenances/table.php +++ b/resources/lang/zu/admin/asset_maintenances/table.php @@ -4,5 +4,5 @@ 'title' => 'Ukugcinwa Kwempahla', 'asset_name' => 'Igama lefa', 'is_warranty' => 'Iwaranti', - 'dl_csv' => 'Landa i-CSV' + 'dl_csv' => 'Landa i-CSV', ]; diff --git a/resources/lang/zu/admin/categories/general.php b/resources/lang/zu/admin/categories/general.php index eef7ee80fe..104d5394fc 100644 --- a/resources/lang/zu/admin/categories/general.php +++ b/resources/lang/zu/admin/categories/general.php @@ -1,6 +1,6 @@ 'Izigaba zefa', 'category_name' => 'Igama lesigaba', 'checkin_email' => 'Send email to user on checkin/checkout.', @@ -19,4 +19,4 @@ return array( 'use_default_eula' => 'Sebenzisa okungu-kuzenzakalela okuzenzakalelayo ku-EULA kunalokho.', 'use_default_eula_disabled' => 'Sebenzisa i-EULA eyinhloko yokuzenzakalela esikhundleni. Ayikho i-EULA eyimilayezo eyisisekelo esethiwe. Sicela ungeze eyodwa kuzilungiselelo.', -); +]; diff --git a/resources/lang/zu/admin/categories/message.php b/resources/lang/zu/admin/categories/message.php index d65a2dad80..6d5b9bebd5 100644 --- a/resources/lang/zu/admin/categories/message.php +++ b/resources/lang/zu/admin/categories/message.php @@ -1,25 +1,25 @@ 'Isigaba asikho.', 'assoc_models' => 'Lesi sigaba okwamanje sihlotshaniswa okungenani oyisibonelo esisodwa futhi asikwazi ukususwa. Sicela ubuyekeze amamodeli akho ukuthi ungasaphinde ubhekise lesi sigaba uphinde uzame futhi.', 'assoc_items' => 'Lesi sigaba okwamanje sihlotshaniswa okungenani esisodwa: i-asset_type futhi asikwazi ukususwa. Sicela ubuyekeze: i-asset_type ukuze ungasaphinde ubhekise lesi sigaba uphinde uzame futhi.', - 'create' => array( + 'create' => [ 'error' => 'Isigaba asizange sidalwe, sicela uzame futhi.', - 'success' => 'Isigaba sidalwe ngempumelelo.' - ), + 'success' => 'Isigaba sidalwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Isigaba asibuyekezwanga, sicela uzame futhi', - 'success' => 'Isigaba sibuyekezwe ngempumelelo.' - ), + 'success' => 'Isigaba sibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa lesi sigaba?', 'error' => 'Kube nenkinga yokususa isigaba. Ngicela uzame futhi.', - 'success' => 'Isigaba sisusiwe ngempumelelo.' - ) + 'success' => 'Isigaba sisusiwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/categories/table.php b/resources/lang/zu/admin/categories/table.php index ef63e97817..4ff2a346b9 100644 --- a/resources/lang/zu/admin/categories/table.php +++ b/resources/lang/zu/admin/categories/table.php @@ -1,10 +1,10 @@ 'I-EULA', +return [ + 'eula_text' => 'I-EULA', 'id' => 'ID', 'parent' => 'Umzali', 'require_acceptance' => 'Ukwamukelwa', 'title' => 'Igama lesigaba sefa', -); +]; diff --git a/resources/lang/zu/admin/companies/general.php b/resources/lang/zu/admin/companies/general.php index b14ab212d2..7744de22b1 100644 --- a/resources/lang/zu/admin/companies/general.php +++ b/resources/lang/zu/admin/companies/general.php @@ -1,4 +1,5 @@ 'Khetha inkampani', ]; diff --git a/resources/lang/zu/admin/companies/message.php b/resources/lang/zu/admin/companies/message.php index 8fe2ac3b5c..5aeca83ea7 100644 --- a/resources/lang/zu/admin/companies/message.php +++ b/resources/lang/zu/admin/companies/message.php @@ -1,18 +1,19 @@ 'Inkampani ayikho.', 'assoc_users' => 'Le nkampani okwamanje ihlotshaniswa okungenani oyisibonelo esisodwa futhi ayikwazi ukususwa. Sicela ubuyekeze amamodeli akho ukuthi angasaphinde abhekisele kule nkampani futhi uzame futhi.', - 'create' => array( + 'create' => [ 'error' => 'Inkampani ayidalwanga, sicela uzame futhi.', - 'success' => 'Inkampani idalwe ngempumelelo.' - ), - 'update' => array( + 'success' => 'Inkampani idalwe ngempumelelo.', + ], + 'update' => [ 'error' => 'Inkampani ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Inkampani ibuyekezwe ngempumelelo.' - ), - 'delete' => array( + 'success' => 'Inkampani ibuyekezwe ngempumelelo.', + ], + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le nkampani?', 'error' => 'Kube nenkinga yokususa inkampani. Ngicela uzame futhi.', - 'success' => 'INkampani isuliwe ngempumelelo.' - ) -); + 'success' => 'INkampani isuliwe ngempumelelo.', + ], +]; diff --git a/resources/lang/zu/admin/companies/table.php b/resources/lang/zu/admin/companies/table.php index 51885c01ef..7d10c3d298 100644 --- a/resources/lang/zu/admin/companies/table.php +++ b/resources/lang/zu/admin/companies/table.php @@ -1,9 +1,10 @@ 'Izinkampani', 'create' => 'Dala iNkampani', 'title' => 'Inkampani', 'update' => 'Buyekeza Inkampani', 'name' => 'Igama Lenkampani', 'id' => 'ID', -); +]; diff --git a/resources/lang/zu/admin/components/general.php b/resources/lang/zu/admin/components/general.php index 55f8aa33c3..8524ef8527 100644 --- a/resources/lang/zu/admin/components/general.php +++ b/resources/lang/zu/admin/components/general.php @@ -1,6 +1,6 @@ 'Igama lesakhiwo', 'checkin' => 'I-Checkin Ingxenye', 'checkout' => 'I-Checkout Ingxenye', @@ -12,4 +12,4 @@ return array( 'remaining' => 'Ukuhlala', 'total' => 'Inani', 'update' => 'Buyekeza Ingxenye', -); +]; diff --git a/resources/lang/zu/admin/components/message.php b/resources/lang/zu/admin/components/message.php index f64e4cbe88..9443797f9d 100644 --- a/resources/lang/zu/admin/components/message.php +++ b/resources/lang/zu/admin/components/message.php @@ -1,36 +1,35 @@ 'Ingxenye ayikho.', - 'create' => array( + 'create' => [ 'error' => 'Ingxenye ayizange idalwe, sicela uzame futhi.', - 'success' => 'Ingxenye idalwe ngempumelelo.' - ), + 'success' => 'Ingxenye idalwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ingxenye ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Ingxenye ibuyekezwe ngempumelelo.' - ), + 'success' => 'Ingxenye ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le ngxenye?', 'error' => 'Kube nenkinga yokususa ingxenye. Ngicela uzame futhi.', - 'success' => 'Ingxenye isusiwe ngempumelelo.' - ), + 'success' => 'Ingxenye isusiwe ngempumelelo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ingxenye ayizange ihlolwe, sicela uzame futhi', 'success' => 'Ingxenye ihloliwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ), + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ingxenye ayizange ihlolwe, sicela uzame futhi', 'success' => 'Ingxenye ihlolwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ) + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - -); +]; diff --git a/resources/lang/zu/admin/components/table.php b/resources/lang/zu/admin/components/table.php index e6e8f361ff..fab3e2ad5b 100644 --- a/resources/lang/zu/admin/components/table.php +++ b/resources/lang/zu/admin/components/table.php @@ -1,5 +1,5 @@ 'Igama lesakhiwo', -); +]; diff --git a/resources/lang/zu/admin/consumables/general.php b/resources/lang/zu/admin/consumables/general.php index 2261d166db..9720bb2cf1 100644 --- a/resources/lang/zu/admin/consumables/general.php +++ b/resources/lang/zu/admin/consumables/general.php @@ -1,6 +1,6 @@ 'I-Checkout Eyayisebenzisela Umsebenzisi', 'consumable_name' => 'Igama elihlekayo', 'create' => 'Dala ukukhishwa', @@ -8,4 +8,4 @@ return array( 'remaining' => 'Ukuhlala', 'total' => 'Inani', 'update' => 'Ukuvuselelwa okudliwe', -); +]; diff --git a/resources/lang/zu/admin/consumables/message.php b/resources/lang/zu/admin/consumables/message.php index 6a7effdbeb..6d49244dc3 100644 --- a/resources/lang/zu/admin/consumables/message.php +++ b/resources/lang/zu/admin/consumables/message.php @@ -1,36 +1,35 @@ 'Ukuthengwa akukho.', - 'create' => array( + 'create' => [ 'error' => 'Ukuthengwa akuzange kudalwe, sicela uzame futhi.', - 'success' => 'Ukuthengwa okudalwe ngempumelelo.' - ), + 'success' => 'Ukuthengwa okudalwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ukuthengwa akuzange kubuyekezwe, sicela uzame futhi', - 'success' => 'Ingahle ibuyekezwe ngempumelelo.' - ), + 'success' => 'Ingahle ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa lokhu okudliwayo?', 'error' => 'Kube nenkinga yokususa okungadliwayo. Ngicela uzame futhi.', - 'success' => 'I-consumable isusiwe ngempumelelo.' - ), + 'success' => 'I-consumable isusiwe ngempumelelo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ukuthengwa akuzange kuhlolwe, sicela uzame futhi', 'success' => 'Ukuthengwa kuhloliwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ), + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ukuthengwa akuzange kuhlolwe, sicela uzame futhi', 'success' => 'Ukuthengwa kuhlolwe ngempumelelo.', - 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.' - ) + 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', + ], - -); +]; diff --git a/resources/lang/zu/admin/consumables/table.php b/resources/lang/zu/admin/consumables/table.php index 764737b8fe..0e764156f8 100644 --- a/resources/lang/zu/admin/consumables/table.php +++ b/resources/lang/zu/admin/consumables/table.php @@ -1,5 +1,5 @@ 'Igama elihlekayo', -); +]; diff --git a/resources/lang/zu/admin/custom_fields/general.php b/resources/lang/zu/admin/custom_fields/general.php index 59f035dd71..e5179d9f3a 100644 --- a/resources/lang/zu/admin/custom_fields/general.php +++ b/resources/lang/zu/admin/custom_fields/general.php @@ -1,6 +1,6 @@ 'Amasimu wangokwezifiso', 'field' => 'Inkambu', 'about_fieldsets_title' => 'Mayelana nama-Fieldsets', @@ -29,4 +29,4 @@ return array( 'create_field' => 'Insimu Engokwezifiso Entsha', 'value_encrypted' => 'Inani lale nsimu libethelwe kwi-database. Abasebenzisi kuphela abasebenzisi bazokwazi ukubuka inani elimisiwe', 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.', -); +]; diff --git a/resources/lang/zu/admin/custom_fields/message.php b/resources/lang/zu/admin/custom_fields/message.php index d192e5695c..b45cc5108c 100644 --- a/resources/lang/zu/admin/custom_fields/message.php +++ b/resources/lang/zu/admin/custom_fields/message.php @@ -1,57 +1,52 @@ array( + 'field' => [ 'invalid' => 'Leyo nsiyo ayikho.', 'already_added' => 'Inkambu isivele iseziwe', - 'create' => array( + 'create' => [ 'error' => 'Inkundla ayidalwanga, sicela uzame futhi.', 'success' => 'Inkundla idalwe ngempumelelo.', - 'assoc_success' => 'Inkambu ingezwe ngempumelelo ku-fieldset.' - ), + 'assoc_success' => 'Inkambu ingezwe ngempumelelo ku-fieldset.', + ], - 'update' => array( + 'update' => [ 'error' => 'Inkambu ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Inkundla ibuyekezwe ngempumelelo.' - ), + 'success' => 'Inkundla ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le nsimu?', 'error' => 'Kube nenkinga yokususa insimu. Ngicela uzame futhi.', 'success' => 'Insimu isusiwe ngempumelelo.', 'in_use' => 'Insimu isasebenza.', - ) + ], - ), + ], - 'fieldset' => array( + 'fieldset' => [ 'does_not_exist' => 'I-Fieldset ayikho', - 'create' => array( + 'create' => [ 'error' => 'I-Fieldset ayidalwanga, sicela uzame futhi.', - 'success' => 'I-Fieldset idalwe ngempumelelo.' - ), + 'success' => 'I-Fieldset idalwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'I-Fieldset ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'I-Fieldset ibuyekezwe ngempumelelo.' - ), + 'success' => 'I-Fieldset ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa lesi sigaba sendawo?', 'error' => 'Kube nenkinga ekususeni ukusethwa kwenkambu. Ngicela uzame futhi.', 'success' => 'I-fieldset isusiwe ngempumelelo.', 'in_use' => 'I-Fieldset isasebenza.', - ) + ], - ), + ], - - - - - -); +]; diff --git a/resources/lang/zu/admin/departments/message.php b/resources/lang/zu/admin/departments/message.php index bb7f6289a5..b874a87008 100644 --- a/resources/lang/zu/admin/departments/message.php +++ b/resources/lang/zu/admin/departments/message.php @@ -1,21 +1,21 @@ 'Umnyango awukho.', 'assoc_users' => 'Lo mnyango njengamanje uhlotshaniswa nomsebenzisi oyedwa futhi awukwazi ukususwa. Sicela ubuyekeze abasebenzisi bakho ukuthi bangasaphinde babhekisele kulo mnyango bese uzama futhi.', - 'create' => array( + 'create' => [ 'error' => 'Umnyango awuzange wadalwe, sicela uzame futhi.', - 'success' => 'Umnyango udale ngempumelelo.' - ), - 'update' => array( + 'success' => 'Umnyango udale ngempumelelo.', + ], + 'update' => [ 'error' => 'Umnyango awubuyekezwanga, sicela uzame futhi', - 'success' => 'Umnyango ubuyekezwe ngempumelelo.' - ), - 'delete' => array( + 'success' => 'Umnyango ubuyekezwe ngempumelelo.', + ], + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa lo mnyango?', 'error' => 'Kube nenkinga yokususa umnyango. Ngicela uzame futhi.', - 'success' => 'Umnyango ususwe ngempumelelo.' - ) + 'success' => 'Umnyango ususwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/departments/table.php b/resources/lang/zu/admin/departments/table.php index 5e180073b4..fc2f2b64eb 100644 --- a/resources/lang/zu/admin/departments/table.php +++ b/resources/lang/zu/admin/departments/table.php @@ -1,6 +1,6 @@ 'ID', 'name' => 'Igama lomnyango', @@ -8,4 +8,4 @@ return array( 'location' => 'Indawo', 'create' => 'Dala uMnyango', 'update' => 'Umnyango Wokuvuselela', - ); + ]; diff --git a/resources/lang/zu/admin/depreciations/general.php b/resources/lang/zu/admin/depreciations/general.php index 5364b9b120..99f5e909a7 100644 --- a/resources/lang/zu/admin/depreciations/general.php +++ b/resources/lang/zu/admin/depreciations/general.php @@ -1,6 +1,6 @@ 'Mayelana nokunciphisa kwefa', 'about_depreciations' => 'Ungasetha ukwehla kwefa ukuze wehlise izimpahla ezisuselwe ekunciphiseni komugqa oqondile.', 'asset_depreciations' => 'Ukuncishiswa kwempahla', @@ -9,4 +9,4 @@ return array( 'number_of_months' => 'Inani lezinyanga', 'update' => 'Buyekeza ukwehla kwenani', -); +]; diff --git a/resources/lang/zu/admin/depreciations/message.php b/resources/lang/zu/admin/depreciations/message.php index 14ee21b2d2..5b5503d67e 100644 --- a/resources/lang/zu/admin/depreciations/message.php +++ b/resources/lang/zu/admin/depreciations/message.php @@ -1,25 +1,24 @@ 'Isigaba sokunciphisa asikho.', 'assoc_users' => 'Lokhu kwehla kwamanje kuhlotshaniswa nomfanekiso oyedwa noma ngaphezulu futhi awukwazi ukususwa. Sicela ususe amamodeli, bese uzama ukususa futhi.', - - 'create' => array( + 'create' => [ 'error' => 'Isigaba sokunciphisa asizange sidalwe, sicela uzame futhi. :(', - 'success' => 'Isigaba sokunciphisa senziwe ngempumelelo. :)' - ), + 'success' => 'Isigaba sokunciphisa senziwe ngempumelelo. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Isigaba sokunciphisa asizange sibuyekezwe, sicela uzame futhi', - 'success' => 'Isigaba sokunciphisa sibuyekezwe ngempumelelo.' - ), + 'success' => 'Isigaba sokunciphisa sibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa lesi sigaba sokunciphisa?', 'error' => 'Kube nenkinga yokususa isigaba sokunciphisa. Ngicela uzame futhi.', - 'success' => 'Isigaba sokunciphisa sisusiwe ngempumelelo.' - ) + 'success' => 'Isigaba sokunciphisa sisusiwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/depreciations/table.php b/resources/lang/zu/admin/depreciations/table.php index c12549f612..03cab40814 100644 --- a/resources/lang/zu/admin/depreciations/table.php +++ b/resources/lang/zu/admin/depreciations/table.php @@ -1,10 +1,10 @@ 'ID', 'months' => 'Izinyanga', 'term' => 'Ithemu', 'title' => 'Igama', -); +]; diff --git a/resources/lang/zu/admin/groups/message.php b/resources/lang/zu/admin/groups/message.php index 68c113d4e4..2661ee5256 100644 --- a/resources/lang/zu/admin/groups/message.php +++ b/resources/lang/zu/admin/groups/message.php @@ -1,22 +1,22 @@ 'Iqembu selivele likhona!', 'group_not_found' => 'Iqembu [: id] alikho.', 'group_name_required' => 'Inkambu yegama iyadingeka', - 'success' => array( + 'success' => [ 'create' => 'Iqembu ladalwa ngempumelelo.', 'update' => 'Iqembu libuyekezwe ngempumelelo.', 'delete' => 'Iqembu lisusiwe ngempumelelo.', - ), + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa leli qembu?', 'create' => 'Kube nenkinga yokudala iqembu. Ngicela uzame futhi.', 'update' => 'Kube nenkinga ekuvuseleleni iqembu. Ngicela uzame futhi.', 'delete' => 'Kube nenkinga yokususa iqembu. Ngicela uzame futhi.', - ), + ], -); +]; diff --git a/resources/lang/zu/admin/groups/table.php b/resources/lang/zu/admin/groups/table.php index cee780c165..803870cd1b 100644 --- a/resources/lang/zu/admin/groups/table.php +++ b/resources/lang/zu/admin/groups/table.php @@ -1,9 +1,9 @@ 'Id', 'name' => 'Igama', 'users' => 'Abasebenzisi abangu- #', -); +]; diff --git a/resources/lang/zu/admin/groups/titles.php b/resources/lang/zu/admin/groups/titles.php index 39bfca8dcd..c6d0138dc5 100644 --- a/resources/lang/zu/admin/groups/titles.php +++ b/resources/lang/zu/admin/groups/titles.php @@ -1,6 +1,6 @@ 'Mayelana namaqembu', 'about_groups' => 'Amaqembu asetshenziselwa ukukhiqiza izimvume zomsebenzisi.', 'group_management' => 'Ukuphathwa kweqembu', @@ -11,4 +11,4 @@ return array( 'allow' => 'Vumela', 'deny' => 'Yeka', -); +]; diff --git a/resources/lang/zu/admin/hardware/form.php b/resources/lang/zu/admin/hardware/form.php index 8c5683fba4..3fa058ee16 100644 --- a/resources/lang/zu/admin/hardware/form.php +++ b/resources/lang/zu/admin/hardware/form.php @@ -1,12 +1,12 @@ 'Qinisekisa u-Bulk Susa amafa', +return [ + 'bulk_delete' => 'Qinisekisa u-Bulk Susa amafa', 'bulk_delete_help' => 'Buyekeza amafa wokususwa okuningi ngezansi. Uma usususiwe, la mafa angabuyiselwa, kodwa ngeke ahlanganiswe nanoma yimuphi abasebenzisi okwamanje abelwe wona.', 'bulk_delete_warn' => 'Uzosusa: impahla ye-asethi_diza.', - 'bulk_update' => 'Ukuvuselela amafa we-Bulk', - 'bulk_update_help' => 'Leli fomu likuvumela ukuthi ubuyekeze amafa amaningi ngesikhathi esisodwa. Gcwalisa kuphela amasimu okudingayo ukuguqula. Noma yiziphi izinkambu ezishiywe zingenakushintshwa.', - 'bulk_update_warn' => 'Usuzohlela izakhiwo ze-asethi_impahla yamanani.', + 'bulk_update' => 'Ukuvuselela amafa we-Bulk', + 'bulk_update_help' => 'Leli fomu likuvumela ukuthi ubuyekeze amafa amaningi ngesikhathi esisodwa. Gcwalisa kuphela amasimu okudingayo ukuguqula. Noma yiziphi izinkambu ezishiywe zingenakushintshwa.', + 'bulk_update_warn' => 'Usuzohlela izakhiwo ze-asethi_impahla yamanani.', 'checkedout_to' => 'Ikhiyiwe Kuzo', 'checkout_date' => 'Usuku lokuhlola', 'checkin_date' => 'Usuku lokuhlola', @@ -38,7 +38,6 @@ return array( 'tag' => 'Ithegi lefa', 'update' => 'Ukuvuselelwa kwefa', 'warranty' => 'Iwaranti', - 'warranty_expires' => 'Warranty Expires', + 'warranty_expires' => 'Warranty Expires', 'years' => 'iminyaka', -) -; +]; diff --git a/resources/lang/zu/admin/hardware/general.php b/resources/lang/zu/admin/hardware/general.php index 9e47e56c93..9a49c9014a 100644 --- a/resources/lang/zu/admin/hardware/general.php +++ b/resources/lang/zu/admin/hardware/general.php @@ -1,9 +1,9 @@ 'Mayelana namafa', 'about_assets_text' => 'Amafa yizinto ezilandelwa inombolo ye-série noma i-tag tag. Bavame ukuba izinto eziphakeme kakhulu lapho behlonza izinto ezithile.', - 'archived' => 'I-Archived', + 'archived' => 'I-Archived', 'asset' => 'Impahla', 'bulk_checkout' => 'Checkout Assets', 'checkin' => 'I-Checkin Asset', @@ -19,4 +19,4 @@ return array( 'pending' => 'Kulindile', 'undeployable' => 'Awuvumelekile', 'view' => 'Buka Impahla', -); +]; diff --git a/resources/lang/zu/admin/hardware/message.php b/resources/lang/zu/admin/hardware/message.php index a5e998fc9e..61f989f640 100644 --- a/resources/lang/zu/admin/hardware/message.php +++ b/resources/lang/zu/admin/hardware/message.php @@ -1,82 +1,80 @@ 'Thola: Lelifa limakwe njengamanje elingenakutholakali. Uma lesi simo sesishintshile, sicela ubuyekeze isimo sesifa.', 'does_not_exist' => 'Impahla ayikho.', 'does_not_exist_or_not_requestable' => 'Zama okuhle. Lelifa alikho noma aliceli.', 'assoc_users' => 'Leli fayela okwamanje lihlolwe kumsebenzisi futhi alikwazi ukususwa. Sicela uhlole ifa ekuqaleni, bese uzama ukususa futhi.', - 'create' => array( + 'create' => [ 'error' => 'Impahla ayidalwanga, sicela uzame futhi. :(', - 'success' => 'Ifa lidalwe ngempumelelo. :)' - ), + 'success' => 'Ifa lidalwe ngempumelelo. :)', + ], - 'update' => array( + 'update' => [ 'error' => 'Ifa alizange libuyekezwe, sicela uzame futhi', 'success' => 'Ifa libuyekezwe ngempumelelo.', 'nothing_updated' => 'Awekho amasimu akhethiwe, ngakho-ke akukho lutho olubuyekeziwe.', - ), + ], - 'restore' => array( + 'restore' => [ 'error' => 'Ifa alizange libuyiselwe, sicela uzame futhi', - 'success' => 'Ifa libuyiselwe ngempumelelo.' - ), + 'success' => 'Ifa libuyiselwe ngempumelelo.', + ], - 'audit' => array( + 'audit' => [ 'error' => 'Ukuhlolwa kwamafa akuphumelelanga. Ngicela uzame futhi.', - 'success' => 'I-akhawunti yokuthengisa ilandelwe ngempumelelo.' - ), + 'success' => 'I-akhawunti yokuthengisa ilandelwe ngempumelelo.', + ], - - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ifayela alisusiwe. Ngicela uzame futhi.', 'success' => 'Ifayili isusiwe ngempumelelo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Amafayela (ama) awalayishiwe. Ngicela uzame futhi.', 'success' => 'Amafayela (ama) alayishwe ngempumelelo.', 'nofiles' => 'Awukakhethi noma yimaphi amafayela okulayishwa, noma ifayela ozama ukulilayisha likhulu kakhulu', 'invalidfiles' => 'Ifayela elilodwa noma ngaphezulu likhulu kakhulu noma ifayelathi engavumelekile. Amafayela afakiwe avunyelwe i-png, i-gif, i-jpg, i-doc, i-docx, i-pdf, ne-txt.', - ), + ], - 'import' => array( + 'import' => [ 'error' => 'Ezinye izinto azange zingenise ngendlela efanele.', 'errorDetail' => 'Izinto ezilandelayo azange zingeniswe ngenxa yamaphutha.', - 'success' => "Ifayela lakho lifakiwe", - 'file_delete_success' => "Ifayela lakho lisusiwe ngempumelelo", - 'file_delete_error' => "Ifayela alikwazanga ukususwa", - ), + 'success' => 'Ifayela lakho lifakiwe', + 'file_delete_success' => 'Ifayela lakho lisusiwe ngempumelelo', + 'file_delete_error' => 'Ifayela alikwazanga ukususwa', + ], - - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le mali?', 'error' => 'Kube nenkinga yokususa le mali. Ngicela uzame futhi.', 'nothing_updated' => 'Azikho izimpahla ezikhethiwe, ngakho akukho lutho olususwe.', - 'success' => 'Impahla isusiwe ngempumelelo.' - ), + 'success' => 'Impahla isusiwe ngempumelelo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Ifa alizange lihlolwe, sicela uzame futhi', 'success' => 'Ifa likhiphe ngempumelelo.', 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', 'not_available' => 'Le mali ayitholakali ukuhlolwa!', - 'no_assets_selected' => 'You must select at least one asset from the list' - ), + 'no_assets_selected' => 'You must select at least one asset from the list', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Ifa alizange lihlolwe, sicela uzame futhi', 'success' => 'Ifa lihlolwe ngempumelelo.', 'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.', 'already_checked_in' => 'Le mali isivele ihlolwe.', - ), + ], - 'requests' => array( + 'requests' => [ 'error' => 'Ifa alizange liceliwe, sicela uzame futhi', 'success' => 'Ifa liceliwe ngempumelelo.', - 'canceled' => 'Isicelo sokuhlola sikhanseliwe ngempumelelo' - ) + 'canceled' => 'Isicelo sokuhlola sikhanseliwe ngempumelelo', + ], -); +]; diff --git a/resources/lang/zu/admin/hardware/table.php b/resources/lang/zu/admin/hardware/table.php index d88a9702cf..06b94ed49f 100644 --- a/resources/lang/zu/admin/hardware/table.php +++ b/resources/lang/zu/admin/hardware/table.php @@ -1,6 +1,6 @@ 'Ithegi lefa', 'asset_model' => 'Isibonelo', @@ -20,6 +20,6 @@ return array( 'title' => 'Impahla', 'image' => 'Isithombe sedivayisi', 'days_without_acceptance' => 'Izinsuku Ngaphandle Kwemukelwa', - 'monthly_depreciation' => 'Monthly Depreciation' + 'monthly_depreciation' => 'Monthly Depreciation', -); +]; diff --git a/resources/lang/zu/admin/kits/general.php b/resources/lang/zu/admin/kits/general.php index b4f2d90ae1..0dfad82469 100644 --- a/resources/lang/zu/admin/kits/general.php +++ b/resources/lang/zu/admin/kits/general.php @@ -1,6 +1,6 @@ 'About Predefined Kits', 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', 'checkout' => 'Checkout Kit ', @@ -14,4 +14,4 @@ return array( 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', -); +]; diff --git a/resources/lang/zu/admin/licenses/form.php b/resources/lang/zu/admin/licenses/form.php index c90f4d5665..751b5fff45 100644 --- a/resources/lang/zu/admin/licenses/form.php +++ b/resources/lang/zu/admin/licenses/form.php @@ -1,6 +1,6 @@ 'Impahla', 'checkin' => 'Ngena', @@ -18,5 +18,5 @@ return array( 'to_email' => 'Ilayisensi ye-imeyili', 'to_name' => 'Ilayisensi Yegama', 'update' => 'Buyekeza i-License', - 'checkout_help' => 'Kumele uhlole ilayisense ku-hardware yefa noma umuntu. Ungakhetha kokubili, kodwa umnikazi wefa kufanele afane nomuntu ohlola ifa lakho.' -); + 'checkout_help' => 'Kumele uhlole ilayisense ku-hardware yefa noma umuntu. Ungakhetha kokubili, kodwa umnikazi wefa kufanele afane nomuntu ohlola ifa lakho.', +]; diff --git a/resources/lang/zu/admin/licenses/general.php b/resources/lang/zu/admin/licenses/general.php index 7de97daf4c..b128eb41aa 100644 --- a/resources/lang/zu/admin/licenses/general.php +++ b/resources/lang/zu/admin/licenses/general.php @@ -1,6 +1,6 @@ 'Mayelana namalayisense', 'about_licenses' => 'Amalayisensi asetshenziselwa ukulandelela isofthiwe. Unenombolo ecacisiwe yezihlalo ezingahlolwa kubantu ngabanye', 'checkin' => 'Isikhundla selayisensi ye-Checkin', @@ -18,4 +18,4 @@ return array( 'software_licenses' => 'Ilayisense Yezinhlelo', 'user' => 'Umsebenzisi', 'view' => 'Buka ilayisense', -); +]; diff --git a/resources/lang/zu/admin/licenses/message.php b/resources/lang/zu/admin/licenses/message.php index 964eb6c0ae..2c34fbe045 100644 --- a/resources/lang/zu/admin/licenses/message.php +++ b/resources/lang/zu/admin/licenses/message.php @@ -1,6 +1,6 @@ 'Ilayisense ayikho.', 'user_does_not_exist' => 'Umsebenzisi akakho.', @@ -10,43 +10,42 @@ return array( 'select_asset_or_person' => 'Kumele ukhethe ifa noma umsebenzisi, kodwa hhayi kokubili.', 'not_found' => 'License not found', - - 'create' => array( + 'create' => [ 'error' => 'Ilayisensi ayidalwanga, sicela uzame futhi.', - 'success' => 'Ilayisense idaliwe ngempumelelo.' - ), + 'success' => 'Ilayisense idaliwe ngempumelelo.', + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ifayela alisusiwe. Ngicela uzame futhi.', 'success' => 'Ifayili isusiwe ngempumelelo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Amafayela (ama) awalayishiwe. Ngicela uzame futhi.', 'success' => 'Amafayela (ama) alayishwe ngempumelelo.', 'nofiles' => 'Awukakhethi noma yimaphi amafayela okulayishwa, noma ifayela ozama ukulilayisha likhulu kakhulu', 'invalidfiles' => 'Ifayela elilodwa noma ngaphezulu likhulu kakhulu noma ifayelathi engavumelekile. Amafayela afakiwe avunyelwe ama-png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, nelayisensi.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Ilayisensi ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Ilayisensi ibuyekezwe ngempumelelo.' - ), + 'success' => 'Ilayisensi ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le layisensi?', 'error' => 'Kube nenkinga yokususa ilayisense. Ngicela uzame futhi.', - 'success' => 'Ilayisense isusiwe ngempumelelo.' - ), + 'success' => 'Ilayisense isusiwe ngempumelelo.', + ], - 'checkout' => array( + 'checkout' => [ 'error' => 'Kube nenkinga yokuhlola ilayisense. Ngicela uzame futhi.', - 'success' => 'Ilayisensi yahlolwa ngokuphumelelayo' - ), + 'success' => 'Ilayisensi yahlolwa ngokuphumelelayo', + ], - 'checkin' => array( + 'checkin' => [ 'error' => 'Kube nenkinga ekuhloleni ilayisense. Ngicela uzame futhi.', - 'success' => 'Ilayisensi ihlolwe ngempumelelo' - ), + 'success' => 'Ilayisensi ihlolwe ngempumelelo', + ], -); +]; diff --git a/resources/lang/zu/admin/licenses/table.php b/resources/lang/zu/admin/licenses/table.php index 2617943682..8742a81e17 100644 --- a/resources/lang/zu/admin/licenses/table.php +++ b/resources/lang/zu/admin/licenses/table.php @@ -1,6 +1,6 @@ 'Kwabiwa Ku', 'checkout' => 'In / Out', @@ -14,4 +14,4 @@ return array( 'serial' => 'Serial', 'title' => 'Ilayisensi', -); +]; diff --git a/resources/lang/zu/admin/locations/message.php b/resources/lang/zu/admin/locations/message.php index 38fa033e9c..bc04ae6ef7 100644 --- a/resources/lang/zu/admin/locations/message.php +++ b/resources/lang/zu/admin/locations/message.php @@ -1,27 +1,26 @@ 'Indawo ayikho.', 'assoc_users' => 'Le ndawo okwamanje ihlobene nomsebenzisi oyedwa futhi ayikwazi ukususwa. Sicela ubuyekeze abasebenzisi bakho ukuba bangabe besayibhekisela kule ndawo bese uzama futhi.', 'assoc_assets' => 'Le ndawo okwamanje ihlotshaniswa okungenani nefa elilodwa futhi ayikwazi ukususwa. Sicela ubuyekeze izimpahla zakho ukuze ungasaphinde ubhekise le ndawo futhi uzame futhi.', 'assoc_child_loc' => 'Le ndawo okwamanje ungumzali okungenani indawo eyodwa yengane futhi ayikwazi ukususwa. Sicela ubuyekeze izindawo zakho ukuze ungasaphinde ubhekisele kule ndawo bese uyazama futhi.', - - 'create' => array( + 'create' => [ 'error' => 'Indawo ayidalwanga, sicela uzame futhi.', - 'success' => 'Indawo idalwe ngempumelelo.' - ), + 'success' => 'Indawo idalwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Indawo ayizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Indawo ibuyekezwe ngempumelelo.' - ), + 'success' => 'Indawo ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa le ndawo?', 'error' => 'Kube nenkinga ekususeni indawo. Ngicela uzame futhi.', - 'success' => 'Indawo isusiwe ngempumelelo.' - ) + 'success' => 'Indawo isusiwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/locations/table.php b/resources/lang/zu/admin/locations/table.php index 97e5a01b54..7313440414 100644 --- a/resources/lang/zu/admin/locations/table.php +++ b/resources/lang/zu/admin/locations/table.php @@ -1,6 +1,6 @@ 'Mayelana Nezindawo', 'about_locations' => 'Izindawo zisetshenziselwa ukulandelela ulwazi lendawo kubasebenzisi, amafa, nezinye izinto', 'assets_rtd' => 'Amafa', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. @@ -20,4 +20,4 @@ return array( 'parent' => 'Umzali', 'currency' => 'Imali Yendawo', 'ldap_ou' => 'Usesho lwe-LDAP OU', - ); + ]; diff --git a/resources/lang/zu/admin/manufacturers/message.php b/resources/lang/zu/admin/manufacturers/message.php index 8a84d0ace0..aa2cd04f04 100644 --- a/resources/lang/zu/admin/manufacturers/message.php +++ b/resources/lang/zu/admin/manufacturers/message.php @@ -1,29 +1,29 @@ 'Umkhiqizi akekho.', 'assoc_users' => 'Lo menzi okwamanje uhlotshaniswa okungenani oyisibonelo esisodwa futhi angeke asuswe. Sicela ubuyekeze amamodeli akho ukuba angasaphinde abhekisele kulo mkhiqizi futhi uzame futhi.', - 'create' => array( + 'create' => [ 'error' => 'Umkhiqizi akazange adalwe, sicela uzame futhi.', - 'success' => 'Umkhiqizi wadalwa ngempumelelo.' - ), + 'success' => 'Umkhiqizi wadalwa ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Umkhiqizi akabuyekezwanga, sicela uzame futhi', - 'success' => 'Umkhiqizi ubuyekezwe ngempumelelo.' - ), + 'success' => 'Umkhiqizi ubuyekezwe ngempumelelo.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Manufacturer was not restored, please try again', - 'success' => 'Manufacturer restored successfully.' - ), + 'success' => 'Manufacturer restored successfully.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa lo menzi?', 'error' => 'Kube nenkinga yokususa umenzi. Ngicela uzame futhi.', - 'success' => 'Umkhiqizi ususiwe ngempumelelo.' - ) + 'success' => 'Umkhiqizi ususiwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/manufacturers/table.php b/resources/lang/zu/admin/manufacturers/table.php index 181e478849..6a2dde8f0c 100644 --- a/resources/lang/zu/admin/manufacturers/table.php +++ b/resources/lang/zu/admin/manufacturers/table.php @@ -1,6 +1,6 @@ 'Mayelana nabakhiqizi', 'about_manufacturers_text' => 'Abakhiqizi yizinkampani ezidala izimpahla zakho. Ungagcina imininingwane ebalulekile yokuxhumana yokusekela mayelana nabo lapha, ezoboniswa kumakhasi wakho imininingwane yempahla.', 'asset_manufacturers' => 'Abakhiqizi befa', @@ -13,4 +13,4 @@ return array( 'update' => 'Buyekeza umkhiqizi', 'url' => 'I-URL', -); +]; diff --git a/resources/lang/zu/admin/models/general.php b/resources/lang/zu/admin/models/general.php index f9a3ccb0f4..e217426f11 100644 --- a/resources/lang/zu/admin/models/general.php +++ b/resources/lang/zu/admin/models/general.php @@ -1,6 +1,6 @@ 'Mayelana namamodeli asefa', 'about_models_text' => 'Amamodeli asefa kuyindlela yokuqoqa amafa afanayo. "MBP 2013", "IPhone 6s", njll.', 'deleted' => 'Le model isusiwe. Chofoza lapha ukuze ubuyiselwe.', @@ -9,10 +9,10 @@ return array( 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', 'restore' => 'Buyisela Isibonelo', 'requestable' => 'Abasebenzisi bangacela lesi model', - 'show_mac_address' => 'Khombisa inkambu yekheli le-MAC kumpahla kule model', + 'show_mac_address' => 'Khombisa inkambu yekheli le-MAC kumpahla kule model', 'view_deleted' => 'Buka ukususiwe', 'view_models' => 'Buka amamodeli', 'fieldset' => 'Fieldset', 'no_custom_field' => 'Awekho amasimu wangokwezifiso', 'add_default_values' => 'Add default values', -); +]; diff --git a/resources/lang/zu/admin/models/message.php b/resources/lang/zu/admin/models/message.php index 199d47d682..c16ad243da 100644 --- a/resources/lang/zu/admin/models/message.php +++ b/resources/lang/zu/admin/models/message.php @@ -1,42 +1,41 @@ 'Isibonelo asikho.', 'assoc_users' => 'Lo modeli okwamanje uhlotshaniswa nefa elilodwa noma ngaphezulu futhi alinakususwa. Sicela ususe amafa, bese uzama ukususa futhi.', - - 'create' => array( + 'create' => [ 'error' => 'Isibonelo asizange sidalwe, sicela uzame futhi.', 'success' => 'Isibonelo sidalwe ngempumelelo.', 'duplicate_set' => 'Imodeli yezimpahla ngelo gama, umkhiqizi kanye nenombolo yomodeli kakade ikhona.', - ), + ], - 'update' => array( + 'update' => [ 'error' => 'Isibonelo asibuyekezwanga, sicela uzame futhi', - 'success' => 'Isibonelo sibuyekezwe ngempumelelo.' - ), + 'success' => 'Isibonelo sibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa le model?', 'error' => 'Kube nenkinga yokususa imodeli. Ngicela uzame futhi.', - 'success' => 'Imodeli isusiwe ngempumelelo.' - ), + 'success' => 'Imodeli isusiwe ngempumelelo.', + ], - 'restore' => array( + 'restore' => [ 'error' => 'Isibonelo asibuyisiwe, sicela uzame futhi', - 'success' => 'Isibonelo sibuyiselwe ngempumelelo.' - ), + 'success' => 'Isibonelo sibuyiselwe ngempumelelo.', + ], - 'bulkedit' => array( + 'bulkedit' => [ 'error' => 'Azikho amasimu ashintshiwe, ngakho akukho lutho olubuyekeziwe.', - 'success' => 'Amamodeli abuyekeziwe.' - ), + 'success' => 'Amamodeli abuyekeziwe.', + ], - 'bulkdelete' => array( + 'bulkdelete' => [ 'error' => 'No models were selected, so nothing was deleted.', 'success' => ':success_count model(s) deleted!', - 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.' - ), + 'success_partial' => ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.', + ], -); +]; diff --git a/resources/lang/zu/admin/models/table.php b/resources/lang/zu/admin/models/table.php index a3b43f07d8..c2dde189c7 100644 --- a/resources/lang/zu/admin/models/table.php +++ b/resources/lang/zu/admin/models/table.php @@ -1,6 +1,6 @@ 'Dala i-Asset Model', 'created_at' => 'Kudalwe ngaso', @@ -14,4 +14,4 @@ return array( 'update' => 'Buyekeza i-Asset Model', 'clone' => 'I-Clone Model', 'edit' => 'Hlela Isibonelo', -); +]; diff --git a/resources/lang/zu/admin/reports/general.php b/resources/lang/zu/admin/reports/general.php index 79fb7bdcab..ae19199ab1 100644 --- a/resources/lang/zu/admin/reports/general.php +++ b/resources/lang/zu/admin/reports/general.php @@ -1,5 +1,5 @@ 'Khetha okukhethwa kukho okufunayo kumbiko wakho wefa.' -); +return [ + 'info' => 'Khetha okukhethwa kukho okufunayo kumbiko wakho wefa.', +]; diff --git a/resources/lang/zu/admin/reports/message.php b/resources/lang/zu/admin/reports/message.php index 24b5d7bfe2..824397c3c0 100644 --- a/resources/lang/zu/admin/reports/message.php +++ b/resources/lang/zu/admin/reports/message.php @@ -1,5 +1,5 @@ 'Kumele ukhethe okungenani ukhetho olulodwa.' -); +return [ + 'error' => 'Kumele ukhethe okungenani ukhetho olulodwa.', +]; diff --git a/resources/lang/zu/admin/settings/general.php b/resources/lang/zu/admin/settings/general.php index 9bd8be50a1..484a6abda3 100644 --- a/resources/lang/zu/admin/settings/general.php +++ b/resources/lang/zu/admin/settings/general.php @@ -1,12 +1,12 @@ 'I-Active Directory', 'ad_domain' => 'Isizinda se-Active Directory', 'ad_domain_help' => 'Lokhu ngezinye izikhathi kufana nesizinda sakho se-imeyili, kodwa hhayi njalo.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'Lena iseva ye-Active Directory', @@ -15,7 +15,7 @@ return array( 'alert_interval' => 'Ukuphelelwa yisikhathi kwe-Alerts Threshold (ezinsukwini)', 'alert_inv_threshold' => 'Inventory Alert Threshold', 'allow_user_skin' => 'Allow user skin', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , + 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', 'asset_ids' => 'Ama-ID wefa', 'audit_interval' => 'I-Interval Audit', 'audit_interval_help' => 'Uma kudingeka ukuba uhlole amafa akho njalo ngokomzimba, faka isikhashana ezinyangeni.', @@ -213,7 +213,7 @@ return array( 'two_factor_enter_code' => 'Faka i-Code-Two Factor', 'two_factor_config_complete' => 'Thumela ikhodi', 'two_factor_enabled_edit_not_allowed' => 'Umlawuli wakho akakakuvumeli ukuhlela lesi silungiselelo.', - 'two_factor_enrollment_text' => "Ukuqinisekiswa okubili kokubili kuyadingeka, noma ngabe idivayisi yakho ayibhalisile okwamanje. Vula uhlelo lwakho lokusebenza lwe-Google Authenticator bese uskena ikhodi ye-QR ngezansi ukuze ubhalise idivayisi yakho. Uma usubhalisile idivayisi yakho, faka ikhodi ngezansi", + 'two_factor_enrollment_text' => 'Ukuqinisekiswa okubili kokubili kuyadingeka, noma ngabe idivayisi yakho ayibhalisile okwamanje. Vula uhlelo lwakho lokusebenza lwe-Google Authenticator bese uskena ikhodi ye-QR ngezansi ukuze ubhalise idivayisi yakho. Uma usubhalisile idivayisi yakho, faka ikhodi ngezansi', 'require_accept_signature' => 'Kudinga isignesha', 'require_accept_signature_help_text' => 'Ukunika amandla lesi sici kuzodinga ukuthi abasebenzisi bakwazi ukusayina ngokomzimba ngokwamukela ifa.', 'left' => 'kwesokunxele', @@ -226,4 +226,4 @@ return array( 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'zerofill_count' => 'Ubude bamathegi wefa, kufaka phakathi i-zerofill', 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.', -); +]; diff --git a/resources/lang/zu/admin/settings/message.php b/resources/lang/zu/admin/settings/message.php index a3ddde188e..db50f86a88 100644 --- a/resources/lang/zu/admin/settings/message.php +++ b/resources/lang/zu/admin/settings/message.php @@ -1,22 +1,21 @@ array( + 'update' => [ 'error' => 'Kuvele iphutha ngenkathi kubuyekezwa.', - 'success' => 'Izilungiselelo zibuyekezwe ngempumelelo.' - ), - 'backup' => array( + 'success' => 'Izilungiselelo zibuyekezwe ngempumelelo.', + ], + 'backup' => [ 'delete_confirm' => 'Uqinisekile ukuthi ungathanda ukususa le fayela yokulondoloza? Lesi senzo asikwazi ukuhlehliswa.', 'file_deleted' => 'Ifayela lokusekelayo lisusiwe ngempumelelo.', 'generated' => 'Ifayela elisha lokusekelayo lidalwe ngempumelelo.', 'file_not_found' => 'Leli fayela lokusekelayo ayitholakalanga kuseva.', - ), - 'purge' => array( + ], + 'purge' => [ 'error' => 'Kuvele iphutha ngenkathi kuhlanzwa.', 'validation_failed' => 'Isiqinisekiso sakho sokuhlanza asilungile. Sicela uthayiphe igama elithi "SUSELA" ebhokisini lokuqinisekisa.', - 'success' => 'Amarekhodi asusiwe ahlanjululwe ngempumelelo.' - ), + 'success' => 'Amarekhodi asusiwe ahlanjululwe ngempumelelo.', + ], -); +]; diff --git a/resources/lang/zu/admin/statuslabels/message.php b/resources/lang/zu/admin/statuslabels/message.php index 988a3232da..25e02434a8 100644 --- a/resources/lang/zu/admin/statuslabels/message.php +++ b/resources/lang/zu/admin/statuslabels/message.php @@ -1,32 +1,31 @@ 'Ilebula Label asikho.', 'assoc_assets' => 'Le Label Yesimo okwamanje ihlotshaniswa okungenani neAfa eyodwa futhi ayikwazi ukususwa. Sicela ubuyekeze izimpahla zakho ukuze ungasabonakali lesi simo futhi uzame futhi.', - - 'create' => array( + 'create' => [ 'error' => 'Ithebula lesimo asizange idalwe, sicela uzame futhi.', - 'success' => 'Ilebula Label isakhiwe ngempumelelo.' - ), + 'success' => 'Ilebula Label isakhiwe ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Ithebula lesimo asizange ibuyekezwe, sicela uzame futhi', - 'success' => 'Ilebuli yesimo ibuyekezwe ngempumelelo.' - ), + 'success' => 'Ilebuli yesimo ibuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Ingabe uqinisekile ukuthi ufisa ukususa le Label Yesimo?', 'error' => 'Kube khona inkinga yokusula i-Label Status. Ngicela uzame futhi.', - 'success' => 'Ilebula Label isusiwe ngempumelelo.' - ), + 'success' => 'Ilebula Label isusiwe ngempumelelo.', + ], - 'help' => array( + 'help' => [ 'undeployable' => 'Lezi zimpahla azikwazi ukwabiwa kunoma ubani.', 'deployable' => 'Lezi zimpahla zingahlolwa. Uma sebebelwe, bazobheka isimo se-meta sika Ihlisiwe.', 'archived' => 'Lezi zimpahla azikwazi ukuhlolwa, futhi zizovela kuphela ku-Archived view. Lokhu kuyasiza ukugcina ulwazi mayelana nempahla yezinhloso zebhajethi / zomlando kodwa ukuwagcina ohlwini lwamafaji wosuku nosuku.', 'pending' => 'Lezi zimpahla azikwazi ukunikezwa kunoma ubani, ngokuvamile okusetshenziselwa izinto ezingaphandle kokulungisa, kodwa kulindeleke ukuthi zibuyele ekusakazweni.', - ), + ], -); +]; diff --git a/resources/lang/zu/admin/statuslabels/table.php b/resources/lang/zu/admin/statuslabels/table.php index 36a3ba0f69..09d1333d38 100644 --- a/resources/lang/zu/admin/statuslabels/table.php +++ b/resources/lang/zu/admin/statuslabels/table.php @@ -1,6 +1,6 @@ 'Mayelana namalebula wesimo', 'archived' => 'I-Archived', 'create' => 'Dala Ithebula Lesimo', @@ -16,4 +16,4 @@ return array( 'title' => 'Amalebula wesimo', 'undeployable' => 'Awuvumelekile', 'update' => 'Buyekeza i-Label yesimo', -); +]; diff --git a/resources/lang/zu/admin/suppliers/message.php b/resources/lang/zu/admin/suppliers/message.php index 01d0a7f088..fbfc6d1797 100644 --- a/resources/lang/zu/admin/suppliers/message.php +++ b/resources/lang/zu/admin/suppliers/message.php @@ -1,27 +1,26 @@ 'Umphakeli akekho.', - - 'create' => array( + 'create' => [ 'error' => 'Umphakeli akazange adalwe, sicela uzame futhi.', - 'success' => 'Umphakeli wadala ngempumelelo.' - ), + 'success' => 'Umphakeli wadala ngempumelelo.', + ], - 'update' => array( + 'update' => [ 'error' => 'Umphakeli akabuyekezwanga, sicela uzame futhi', - 'success' => 'Umphakeli ubuyekezwe ngempumelelo.' - ), + 'success' => 'Umphakeli ubuyekezwe ngempumelelo.', + ], - 'delete' => array( + 'delete' => [ 'confirm' => 'Uqinisekile ukuthi ufisa ukususa lo mphakeli?', 'error' => 'Kube nenkinga yokususa umphakeli. Ngicela uzame futhi.', 'success' => 'Umphakeli ususiwe ngempumelelo.', 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', 'assoc_maintenances' => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', - ) + ], -); +]; diff --git a/resources/lang/zu/admin/suppliers/table.php b/resources/lang/zu/admin/suppliers/table.php index 1da48debcd..d16b822cef 100644 --- a/resources/lang/zu/admin/suppliers/table.php +++ b/resources/lang/zu/admin/suppliers/table.php @@ -1,6 +1,6 @@ 'Mayelana nabathengi', 'about_suppliers_text' => 'Abathengi basetshenziselwa ukulandelela umthombo wezinto', 'address' => 'Ikheli Lezinsizakalo', @@ -24,4 +24,4 @@ return array( 'view_assets_for' => 'Buka amafa', 'zip' => 'I-Postal Code', -); +]; diff --git a/resources/lang/zu/admin/users/general.php b/resources/lang/zu/admin/users/general.php index 61f5777594..2e7e87542f 100644 --- a/resources/lang/zu/admin/users/general.php +++ b/resources/lang/zu/admin/users/general.php @@ -1,7 +1,6 @@ 'This user can login', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Amafa abelwe: igama', @@ -13,7 +12,7 @@ return array( 'edit' => 'Hlela umsebenzisi', 'filetype_info' => 'Amafayela afakiwe avunyelwe yi-png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, ne-rar.', 'history_user' => 'Umlando wegama: igama', - 'info' => 'Ulwazi', + 'info' => 'Ulwazi', 'restore_user' => 'Chofoza lapha ukuze ubuyisele.', 'last_login' => 'Ukungena ngemvume kokugcina', 'ldap_config_text' => 'Izilungiselelo zokuhlela ze-LDAP zitholakala Admin> Izilungiselelo. Indawo (okukhethwa kukho) ekhethiwe izobekwa kuwo wonke abasebenzisi abangenisiwe.', @@ -25,4 +24,4 @@ return array( 'two_factor_admin_optin_help' => 'Izilungiselelo zakho zamanje zomlawuli zivumela ukusethwa okukhethiwe kokuqinisekiswa kwezinto ezimbili.', 'two_factor_enrolled' => 'I-2FA Idivayisi ibhalisiwe', 'two_factor_active' => 'I-2FA isebenza', - ); + ]; diff --git a/resources/lang/zu/admin/users/message.php b/resources/lang/zu/admin/users/message.php index 028cae65aa..9a8f054ec6 100644 --- a/resources/lang/zu/admin/users/message.php +++ b/resources/lang/zu/admin/users/message.php @@ -1,6 +1,6 @@ 'Uwamukele ngempumelelo le mali.', 'declined' => 'Uye wenqaba ngempumelelo le mali.', @@ -14,8 +14,7 @@ return array( 'ldap_not_configured' => 'Ukuhlanganiswa kwe-LDAP akulungiselelwe lokhu kufakwa.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', - - 'success' => array( + 'success' => [ 'create' => 'Umsebenzisi udale ngempumelelo.', 'update' => 'Umsebenzisi ubuyekezwe ngempumelelo.', 'update_bulk' => 'Abasebenzisi baphinde babuyekezwe ngempumelelo!', @@ -26,9 +25,9 @@ return array( 'unsuspend' => 'Umsebenzisi uphumelelwanga ngempumelelo.', 'restored' => 'Umsebenzisi ubuyiselwe ngempumelelo.', 'import' => 'Abasebenzisi bangeniswe ngempumelelo.', - ), + ], - 'error' => array( + 'error' => [ 'create' => 'Kube nenkinga yokudala umsebenzisi. Ngicela uzame futhi.', 'update' => 'Kube nenkinga yokuvuselela umsebenzisi. Ngicela uzame futhi.', 'delete' => 'Kube nenkinga yokusula umsebenzisi. Ngicela uzame futhi.', @@ -43,18 +42,18 @@ return array( 'ldap_could_not_search' => 'Ayikwazanga ukusesha isiphakeli se-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config.
Iphutha kusuka kwiseva ye-LDAP:', 'ldap_could_not_get_entries' => 'Ayikwazanga ukungena okuvela kuseva ye-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config.
Iphutha kusuka kwiseva ye-LDAP:', 'password_ldap' => 'Iphasiwedi yale akhawunti ilawulwa yi-LDAP / Active Directory. Sicela uxhumane nomnyango wakho we-IT ukushintsha iphasiwedi yakho.', - ), + ], - 'deletefile' => array( + 'deletefile' => [ 'error' => 'Ifayela alisusiwe. Ngicela uzame futhi.', 'success' => 'Ifayili isusiwe ngempumelelo.', - ), + ], - 'upload' => array( + 'upload' => [ 'error' => 'Amafayela (ama) awalayishiwe. Ngicela uzame futhi.', 'success' => 'Amafayela (ama) alayishwe ngempumelelo.', 'nofiles' => 'Awukakhethi noma yimaphi amafayela okulayishwa', 'invalidfiles' => 'Ifayela elilodwa noma ngaphezulu likhulu kakhulu noma ifayelathi engavumelekile. Amafayela afakiwe avunyelwe i-png, i-gif, i-jpg, i-doc, i-docx, i-pdf, ne-txt.', - ), + ], -); +]; diff --git a/resources/lang/zu/admin/users/table.php b/resources/lang/zu/admin/users/table.php index e651d6d768..0f1e28c3bc 100644 --- a/resources/lang/zu/admin/users/table.php +++ b/resources/lang/zu/admin/users/table.php @@ -1,6 +1,6 @@ 'Isebenza', 'allow' => 'Vumela', 'checkedout' => 'Amafa', @@ -28,11 +28,11 @@ return array( 'show_current' => 'Bonisa Abasebenzisi Bamanje', 'show_deleted' => 'Bonisa Abasebenzisi Abasusiwe', 'title' => 'Isihloko', - 'to_restore_them' => 'ukuze ubuyisele.', + 'to_restore_them' => 'ukuze ubuyisele.', 'updateuser' => 'Buyekeza Umsebenzisi', 'username' => 'Igama lomsebenzisi', - 'user_deleted_text' => 'Lo msebenzisi umakwe njengosusiwe.', + 'user_deleted_text' => 'Lo msebenzisi umakwe njengosusiwe.', 'username_note' => '(Lokhu kusetshenziselwa i-Active Directory ukubopha kuphela, hhayi ukungena ngemvume.)', 'cloneuser' => 'Clone Umsebenzisi', 'viewusers' => 'Buka Abasebenzisi', -); +]; diff --git a/resources/lang/zu/auth/general.php b/resources/lang/zu/auth/general.php index 39b6a21e4d..e8894c4557 100644 --- a/resources/lang/zu/auth/general.php +++ b/resources/lang/zu/auth/general.php @@ -12,4 +12,3 @@ return [ 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', ]; - diff --git a/resources/lang/zu/auth/message.php b/resources/lang/zu/auth/message.php index c4034b2f4a..66b8757b89 100644 --- a/resources/lang/zu/auth/message.php +++ b/resources/lang/zu/auth/message.php @@ -1,6 +1,6 @@ 'I-akhawunti nale imeyili isivele ikhona.', 'account_not_found' => 'Igama lomsebenzisi noma iphasiwedi alilungile.', @@ -9,37 +9,36 @@ return array( 'account_banned' => 'Le akhawunti yomsebenzisi ivaliwe.', 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.', - 'two_factor' => array( + 'two_factor' => [ 'already_enrolled' => 'Your device is already enrolled.', 'success' => 'You have successfully logged in.', 'code_required' => 'Two-factor code is required.', 'invalid_code' => 'Two-factor code is invalid.', - ), + ], - 'signin' => array( + 'signin' => [ 'error' => 'Kube nenkinga ngenkathi uzama ukungena ngemvume, sicela uzame futhi.', 'success' => 'Ungene ngemvume ngempumelelo.', - ), + ], - 'logout' => array( + 'logout' => [ 'error' => 'There was a problem while trying to log you out, please try again.', 'success' => 'You have successfully logged out.', - ), + ], - 'signup' => array( + 'signup' => [ 'error' => 'Kube nenkinga ngenkathi uzama ukudala i-akhawunti yakho, sicela uzame futhi.', 'success' => 'I-akhawunti idalwe ngokuphumelelayo.', - ), + ], - 'forgot-password' => array( + 'forgot-password' => [ 'error' => 'Kube nenkinga ngenkathi uzama ukuthola ikhodi yephasiwedi yokusetha kabusha, sicela uzame futhi.', 'success' => 'If that email address exists in our system, a password recovery email has been sent.', - ), + ], - 'forgot-password-confirm' => array( + 'forgot-password-confirm' => [ 'error' => 'Kube nenkinga ngenkathi uzama ukusetha kabusha iphasiwedi yakho, sicela uzame futhi.', 'success' => 'Iphasiwedi yakho isethwe kabusha ngempumelelo.', - ), + ], - -); +]; diff --git a/resources/lang/zu/button.php b/resources/lang/zu/button.php index 6e84e86782..bb7476e9e5 100644 --- a/resources/lang/zu/button.php +++ b/resources/lang/zu/button.php @@ -1,6 +1,6 @@ 'Izenzo', 'add' => 'Engeza okusha', 'cancel' => 'Khansela', @@ -11,7 +11,7 @@ return array( 'request' => 'Isicelo', 'submit' => 'Thumela', 'upload' => 'Layisha', - 'select_file' => 'Khetha Ifayela ...', + 'select_file' => 'Khetha Ifayela ...', 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -); +]; diff --git a/resources/lang/zu/general.php b/resources/lang/zu/general.php index 6ea7b247b9..1e86c33402 100644 --- a/resources/lang/zu/general.php +++ b/resources/lang/zu/general.php @@ -44,13 +44,13 @@ 'checkins_count' => 'Checkins', 'user_requests_count' => 'Requests', 'city' => 'Idolobha', - 'click_here' => 'Chofoza lapha', + 'click_here' => 'Chofoza lapha', 'clear_selection' => 'Clear Selection', 'companies' => 'Izinkampani', 'company' => 'Inkampani', 'component' => 'Ingxenye', 'components' => 'Izingxenye', - 'complete' => 'Qedela', + 'complete' => 'Qedela', 'consumable' => 'Iyatholakala', 'consumables' => 'Amakhomikhali', 'country' => 'Izwe', diff --git a/resources/lang/zu/help.php b/resources/lang/zu/help.php index 4cb2354f89..ac0df59422 100644 --- a/resources/lang/zu/help.php +++ b/resources/lang/zu/help.php @@ -1,6 +1,6 @@ "More Info", + 'more_info_title' => 'More Info', - "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.", + 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.

Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.', 'assets' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.', @@ -31,6 +31,4 @@ return array( 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - - -); +]; diff --git a/resources/lang/zu/mail.php b/resources/lang/zu/mail.php index 6a8b8520e6..a86ee1f912 100644 --- a/resources/lang/zu/mail.php +++ b/resources/lang/zu/mail.php @@ -1,6 +1,6 @@ 'Umsebenzisi ukhanse isicelo sezinto kuwebhusayithi', 'a_user_requested' => 'Umsebenzisi ucele into ku-website', 'accessory_name' => 'Igama lokufinyelela:', @@ -75,5 +75,5 @@ return array( 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', - 'your_assets' => 'View Your Assets' -); + 'your_assets' => 'View Your Assets', +]; diff --git a/resources/lang/zu/pagination.php b/resources/lang/zu/pagination.php index 196495c2f5..c4126c053f 100644 --- a/resources/lang/zu/pagination.php +++ b/resources/lang/zu/pagination.php @@ -1,6 +1,6 @@ 'Okulandelayo »', -); +]; diff --git a/resources/lang/zu/passwords.php b/resources/lang/zu/passwords.php index 5a2fac7579..f718f6c445 100644 --- a/resources/lang/zu/passwords.php +++ b/resources/lang/zu/passwords.php @@ -4,4 +4,3 @@ return [ 'sent' => 'Isixhumanisi sakho sephasiwedi sithunyelwe!', 'user' => 'No matching active user found with that email.', ]; - diff --git a/resources/lang/zu/reminders.php b/resources/lang/zu/reminders.php index 2f0478748d..95a8fb5e9d 100644 --- a/resources/lang/zu/reminders.php +++ b/resources/lang/zu/reminders.php @@ -1,6 +1,6 @@ "Amaphasiwedi kufanele abe izinhlamvu eziyisithupha futhi afane nokuqinisekiswa.", + 'password' => 'Amaphasiwedi kufanele abe izinhlamvu eziyisithupha futhi afane nokuqinisekiswa.', - "user" => "Igama lomsebenzisi noma ikheli le-imeyili alilungile", + 'user' => 'Igama lomsebenzisi noma ikheli le-imeyili alilungile', - "token" => "Le ithokheni yokusetha kabusha iphasiwedi ayivumelekile.", + 'token' => 'Le ithokheni yokusetha kabusha iphasiwedi ayivumelekile.', - "sent" => "Uma ikheli le-imeyili elifanayo litholakala, isikhumbuzi sephasiwedi sithunyelwe!", + 'sent' => 'Uma ikheli le-imeyili elifanayo litholakala, isikhumbuzi sephasiwedi sithunyelwe!', -); +]; diff --git a/resources/lang/zu/table.php b/resources/lang/zu/table.php index 0797bd00f3..5bf95cc99a 100644 --- a/resources/lang/zu/table.php +++ b/resources/lang/zu/table.php @@ -1,10 +1,10 @@ 'Izenzo', 'action' => 'Isenzo', 'by' => 'Ngu', 'item' => 'Into', -); +]; diff --git a/resources/lang/zu/validation.php b/resources/lang/zu/validation.php index a882a1ef78..7209fd0670 100644 --- a/resources/lang/zu/validation.php +++ b/resources/lang/zu/validation.php @@ -1,6 +1,6 @@ 'I: imfanelo isivele ithathwe.', 'uploaded' => 'I: imfanelo ayihlulekile ukulayisha.', 'url' => 'I: ifomethi yokwaziswa ayivumelekile.', - "unique_undeleted" => "The :attribute must be unique.", + 'unique_undeleted' => 'The :attribute must be unique.', /* |-------------------------------------------------------------------------- @@ -101,7 +101,6 @@ return array( | */ - /* |-------------------------------------------------------------------------- | Custom Validation Language Lines @@ -114,11 +113,11 @@ return array( */ 'custom' => [ - 'alpha_space' => "I: Insimu yemfanelo iqukethe umlingiswa ongavunyelwe.", - "email_array" => "Ikheli elilodwa noma ngaphezulu le-imeyili alivumelekile.", - "hashed_pass" => "Iphasiwedi yakho yamanje ayilungile", + 'alpha_space' => 'I: Insimu yemfanelo iqukethe umlingiswa ongavunyelwe.', + 'email_array' => 'Ikheli elilodwa noma ngaphezulu le-imeyili alivumelekile.', + 'hashed_pass' => 'Iphasiwedi yakho yamanje ayilungile', 'dumbpwd' => 'Lelo phasiwedi livame kakhulu.', - "statuslabel_type" => "Kumele ukhethe uhlobo lwelebula lesimo esivumelekile", + 'statuslabel_type' => 'Kumele ukhethe uhlobo lwelebula lesimo esivumelekile', ], /* @@ -134,4 +133,4 @@ return array( 'attributes' => [], -); +]; diff --git a/resources/macros/macros.php b/resources/macros/macros.php index f022aaf046..ab87bf0e33 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -1,77 +1,74 @@ " ", - 'en'=> "English, US", - 'en-GB'=> "English, UK", - 'af'=> "Afrikaans", - 'ar'=> "Arabic", - 'bg'=> "Bulgarian", - 'zh-CN'=> "Chinese Simplified", - 'zh-TW'=> "Chinese Traditional", - 'hr'=> "Croatian", - 'cs'=> "Czech", - 'da'=> "Danish", - 'nl'=> "Dutch", - 'en-ID'=> "English, Indonesia", - 'et'=> "Estonian", - 'fil'=> "Filipino", - 'fi'=> "Finnish", - 'fr'=> "French", - 'de'=> "German", - 'el'=> "Greek", - 'he'=> "Hebrew", - 'hu'=> "Hungarian", + * Locale macro + * Generates the dropdown menu of available languages + */ +Form::macro('locales', function ($name = 'locale', $selected = null, $class = null, $id = null) { + $locales = [ + ''=> ' ', + 'en'=> 'English, US', + 'en-GB'=> 'English, UK', + 'af'=> 'Afrikaans', + 'ar'=> 'Arabic', + 'bg'=> 'Bulgarian', + 'zh-CN'=> 'Chinese Simplified', + 'zh-TW'=> 'Chinese Traditional', + 'hr'=> 'Croatian', + 'cs'=> 'Czech', + 'da'=> 'Danish', + 'nl'=> 'Dutch', + 'en-ID'=> 'English, Indonesia', + 'et'=> 'Estonian', + 'fil'=> 'Filipino', + 'fi'=> 'Finnish', + 'fr'=> 'French', + 'de'=> 'German', + 'el'=> 'Greek', + 'he'=> 'Hebrew', + 'hu'=> 'Hungarian', 'is' => 'Icelandic', - 'id'=> "Indonesian", - 'ga-IE'=> "Irish", - 'it'=> "Italian", - 'ja'=> "Japanese", - 'ko'=> "Korean", + 'id'=> 'Indonesian', + 'ga-IE'=> 'Irish', + 'it'=> 'Italian', + 'ja'=> 'Japanese', + 'ko'=> 'Korean', 'lv'=>'Latvian', - 'lt'=> "Lithuanian", - 'mk'=> "Macedonian", - 'ms'=> "Malay", - 'mi'=> "Maori", - 'mn'=> "Mongolian", - 'no'=> "Norwegian", - 'fa'=> "Persian", - 'pl'=> "Polish", - 'pt-PT'=> "Portuguese", - 'pt-BR'=> "Portuguese, Brazilian", - 'ro'=> "Romanian", - 'ru'=> "Russian", + 'lt'=> 'Lithuanian', + 'mk'=> 'Macedonian', + 'ms'=> 'Malay', + 'mi'=> 'Maori', + 'mn'=> 'Mongolian', + 'no'=> 'Norwegian', + 'fa'=> 'Persian', + 'pl'=> 'Polish', + 'pt-PT'=> 'Portuguese', + 'pt-BR'=> 'Portuguese, Brazilian', + 'ro'=> 'Romanian', + 'ru'=> 'Russian', 'sr-CS' => 'Serbian (Latin)', - 'sl'=> "Slovenian", - 'es-ES'=> "Spanish", - 'es-CO'=> "Spanish, Colombia", - 'es-MX'=> "Spanish, Mexico", - 'es-VE'=> "Spanish, Venezuela", - 'sv-SE'=> "Swedish", - 'tl'=> "Tagalog", - 'ta'=> "Tamil", - 'th'=> "Thai", - 'tr'=> "Turkish", - 'uk'=> "Ukranian", - 'vi'=> "Vietnamese", - 'cy'=> "Welsh", - 'zu'=> "Zulu", - ); + 'sl'=> 'Slovenian', + 'es-ES'=> 'Spanish', + 'es-CO'=> 'Spanish, Colombia', + 'es-MX'=> 'Spanish, Mexico', + 'es-VE'=> 'Spanish, Venezuela', + 'sv-SE'=> 'Swedish', + 'tl'=> 'Tagalog', + 'ta'=> 'Tamil', + 'th'=> 'Thai', + 'tr'=> 'Turkish', + 'uk'=> 'Ukranian', + 'vi'=> 'Vietnamese', + 'cy'=> 'Welsh', + 'zu'=> 'Zulu', + ]; - $idclause=''; - if($id) { - $idclause=" id='$id'"; + $idclause = ''; + if ($id) { + $idclause = " id='$id'"; } $select = ''; return $select; - }); - /** -* Country macro -* Generates the dropdown menu of countries for the profile form -*/ -Form::macro('countries', function ($name = "country", $selected = null, $class = null, $id = null) { - - $countries = array( - ''=>"Select a Country", + * Country macro + * Generates the dropdown menu of countries for the profile form + */ +Form::macro('countries', function ($name = 'country', $selected = null, $class = null, $id = null) { + $countries = [ + ''=>'Select a Country', 'AC'=>'Ascension Island', 'AD'=>'Andorra', 'AE'=>'United Arab Emirates', @@ -340,29 +334,25 @@ Form::macro('countries', function ($name = "country", $selected = null, $class = 'YT'=>'Mayotte', 'ZA'=>'South Africa', 'ZM'=>'Zambia', - 'ZW'=>'Zimbabwe' - ); + 'ZW'=>'Zimbabwe', + ]; - $idclause=''; - if($id) { - $idclause=" id='$id'"; + $idclause = ''; + if ($id) { + $idclause = " id='$id'"; } $select = ''; return $select; - }); - - -Form::macro('date_display_format', function ($name = "date_display_format", $selected = null, $class = null) { - +Form::macro('date_display_format', function ($name = 'date_display_format', $selected = null, $class = null) { $formats = [ 'Y-m-d', 'D M d, Y', @@ -376,7 +366,6 @@ Form::macro('date_display_format', function ($name = "date_display_format", $sel ]; foreach ($formats as $format) { - $date_display_formats[$format] = Carbon::parse(date('Y').'-'.date('m').'-25')->format($format); } $select = ''; - return $select; + return $select; }); - -Form::macro('time_display_format', function ($name = "time_display_format", $selected = null, $class = null) { - +Form::macro('time_display_format', function ($name = 'time_display_format', $selected = null, $class = null) { $formats = [ 'g:iA', 'h:iA', @@ -407,12 +394,11 @@ Form::macro('time_display_format', function ($name = "time_display_format", $sel } $select .= ''; - return $select; + return $select; }); -Form::macro('digit_separator', function ($name = "digit_separator", $selected = null, $class = null) { - +Form::macro('digit_separator', function ($name = 'digit_separator', $selected = null, $class = null) { $formats = [ '1234.56', '1.234,56', @@ -421,22 +407,21 @@ Form::macro('digit_separator', function ($name = "digit_separator", $selected = foreach ($formats as $format) { } $select = ''; - return $select; + return $select; }); /** -* Barcode macro -* Generates the dropdown menu of available 1D barcodes -*/ -Form::macro('alt_barcode_types', function ($name = "alt_barcode", $selected = null, $class = null) { - - $barcode_types = array( + * Barcode macro + * Generates the dropdown menu of available 1D barcodes + */ +Form::macro('alt_barcode_types', function ($name = 'alt_barcode', $selected = null, $class = null) { + $barcode_types = [ 'C128', 'C39', 'PDF417', @@ -445,9 +430,7 @@ Form::macro('alt_barcode_types', function ($name = "alt_barcode", $selected = nu 'UPCA', 'UPCE', - - - ); + ]; $select = ''; return $select; - }); - /** -* Barcode macro -* Generates the dropdown menu of available 2D barcodes -*/ -Form::macro('barcode_types', function ($name = "barcode_type", $selected = null, $class = null) { - - $barcode_types = array( + * Barcode macro + * Generates the dropdown menu of available 2D barcodes + */ +Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null, $class = null) { + $barcode_types = [ 'QRCODE', 'DATAMATRIX', - ); + ]; $select = ''; return $select; - }); -Form::macro('username_format', function ($name = "username_format", $selected = null, $class = null) { - - $formats = array( +Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) { + $formats = [ 'firstname.lastname' => trans('general.firstname_lastname_format'), 'firstname' => trans('general.first_name_format'), 'filastname' => trans('general.filastname_format'), @@ -495,8 +473,8 @@ Form::macro('username_format', function ($name = "username_format", $selected = 'firstinitial.lastname' => trans('general.firstinitial.lastname'), 'lastname_firstinitial' => trans('general.lastname_firstinitial'), 'firstnamelastname' => trans('general.firstnamelastname'), - 'firstnamelastinitial' => trans('general.firstnamelastinitial') - ); + 'firstnamelastinitial' => trans('general.firstnamelastinitial'), + ]; $select = ''; return $select; - }); -Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selected = null, $class = null) { - - $formats = array( +Form::macro('two_factor_options', function ($name = 'two_factor_enabled', $selected = null, $class = null) { + $formats = [ '' => trans('admin/settings/general.two_factor_disabled'), '1' => trans('admin/settings/general.two_factor_optional'), '2' => trans('admin/settings/general.two_factor_required'), - ); + ]; $select = ''; return $select; - }); - -Form::macro('customfield_elements', function ($name = "customfield_elements", $selected = null, $class = null) { - - $formats = array( +Form::macro('customfield_elements', function ($name = 'customfield_elements', $selected = null, $class = null) { + $formats = [ 'text' => 'Text Box', 'listbox' => 'List Box', 'textarea' => 'Textarea (multi-line) ', 'checkbox' => 'Checkbox', 'radio' => 'Radio Buttons', - ); + ]; $select = ''; return $select; - }); - - -Form::macro('skin', function ($name = "skin", $selected = null, $class = null) { - - $formats = array( +Form::macro('skin', function ($name = 'skin', $selected = null, $class = null) { + $formats = [ 'blue' => 'Default Blue', 'blue-dark' => 'Blue (Dark Mode)', 'green' => 'Green Dark', @@ -571,7 +540,7 @@ Form::macro('skin', function ($name = "skin", $selected = null, $class = null) { 'yellow' => 'Yellow', 'yellow-dark' => 'Yellow (Dark Mode)', 'contrast' => 'High Contrast', - ); + ]; $select = ''; - return $select; + return $select; }); -Form::macro('user_skin', function ($name = "skin", $selected = null, $class = null) { - - $formats = array( +Form::macro('user_skin', function ($name = 'skin', $selected = null, $class = null) { + $formats = [ '' => 'Site Default', 'blue' => 'Default Blue', 'blue-dark' => 'Blue (Dark Mode)', @@ -602,7 +570,7 @@ Form::macro('user_skin', function ($name = "skin", $selected = null, $class = nu 'yellow' => 'Yellow', 'yellow-dark' => 'Yellow (Dark Mode)', 'contrast' => 'High Contrast', - ); + ]; $select = ''; - return $select; -}); \ No newline at end of file + return $select; +}); diff --git a/routes/api.php b/routes/api.php index c8f05d2f19..ddc512721f 100644 --- a/routes/api.php +++ b/routes/api.php @@ -13,12 +13,8 @@ use Illuminate\Http\Request; | */ - -Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'], function () { - - - Route::get('/', function() { - +Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api'], function () { + Route::get('/', function () { return response()->json( [ 'status' => 'error', @@ -27,193 +23,168 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ], 404); }); - - - Route::group(['prefix' => 'account'], function () { - Route::get('requestable/hardware', [ 'as' => 'api.assets.requestable', - 'uses' => 'AssetsController@requestable' + 'uses' => 'AssetsController@requestable', ] ); Route::get('requests', [ 'as' => 'api.assets.requested', - 'uses' => 'ProfileController@requestedAssets' + 'uses' => 'ProfileController@requestedAssets', ] ); - }); - /*--- Accessories API ---*/ + /*--- Accessories API ---*/ Route::group(['prefix' => 'accessories'], function () { - Route::get('{accessory}/checkedout', [ 'as' => 'api.accessories.checkedout', - 'uses' => 'AccessoriesController@checkedout' + 'uses' => 'AccessoriesController@checkedout', ] ); Route::get('selectlist', [ 'as' => 'api.accessories.selectlist', - 'uses'=> 'AccessoriesController@selectlist' + 'uses'=> 'AccessoriesController@selectlist', ] ); }); // Accessories group Route::resource('accessories', 'AccessoriesController', - ['names' => - [ + ['names' => [ 'index' => 'api.accessories.index', 'show' => 'api.accessories.show', 'update' => 'api.accessories.update', 'store' => 'api.accessories.store', - 'destroy' => 'api.accessories.destroy' + 'destroy' => 'api.accessories.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['accessory' => 'accessory_id'] + 'parameters' => ['accessory' => 'accessory_id'], ] ); // Accessories resource Route::group(['prefix' => 'accessories'], function () { - Route::get('{accessory}/checkedout', [ 'as' => 'api.accessories.checkedout', - 'uses' => 'AccessoriesController@checkedout' + 'uses' => 'AccessoriesController@checkedout', ] ); Route::post('{accessory}/checkout', [ 'as' => 'api.accessories.checkout', - 'uses' => 'AccessoriesController@checkout' + 'uses' => 'AccessoriesController@checkout', ] ); Route::post('{accessory}/checkin', [ 'as' => 'api.accessories.checkin', - 'uses' => 'AccessoriesController@checkin' + 'uses' => 'AccessoriesController@checkin', ] ); - }); // Accessories group - /*--- Categories API ---*/ Route::group(['prefix' => 'categories'], function () { - Route::get('{item_type}/selectlist', [ 'as' => 'api.categories.selectlist', - 'uses' => 'CategoriesController@selectlist' + 'uses' => 'CategoriesController@selectlist', ] ); - }); // Categories group Route::resource('categories', 'CategoriesController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.categories.index', 'show' => 'api.categories.show', 'store' => 'api.categories.store', 'update' => 'api.categories.update', - 'destroy' => 'api.categories.destroy' + 'destroy' => 'api.categories.destroy', ], 'except' => ['edit', 'create'], - 'parameters' => ['category' => 'category_id'] + 'parameters' => ['category' => 'category_id'], ] ); // Categories resource - /*--- Companies API ---*/ - Route::get( 'companies/selectlist', [ + Route::get('companies/selectlist', [ 'as' => 'companies.selectlist', - 'uses' => 'CompaniesController@selectlist' + 'uses' => 'CompaniesController@selectlist', ]); - // Companies resource Route::resource('companies', 'CompaniesController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.companies.index', 'show' => 'api.companies.show', 'store' => 'api.companies.store', 'update' => 'api.companies.update', - 'destroy' => 'api.companies.destroy' + 'destroy' => 'api.companies.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['component' => 'component_id'] + 'parameters' => ['component' => 'component_id'], ] ); // Companies resource - /*--- Departments API ---*/ Route::group(['prefix' => 'departments'], function () { - - Route::get('selectlist', [ 'as' => 'api.departments.selectlist', - 'uses' => 'DepartmentsController@selectlist' + 'uses' => 'DepartmentsController@selectlist', ] ); }); // Departments group - - Route::resource('departments', 'DepartmentsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.departments.index', 'show' => 'api.departments.show', 'store' => 'api.departments.store', 'update' => 'api.departments.update', - 'destroy' => 'api.departments.destroy' + 'destroy' => 'api.departments.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['department' => 'department_id'] + 'parameters' => ['department' => 'department_id'], ] ); // Departments resource - /*--- Components API ---*/ Route::resource('components', 'ComponentsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.components.index', 'show' => 'api.components.show', 'store' => 'api.components.store', 'update' => 'api.components.update', - 'destroy' => 'api.components.destroy' + 'destroy' => 'api.components.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['component' => 'component_id'] + 'parameters' => ['component' => 'component_id'], ] ); // Components resource Route::group(['prefix' => 'components'], function () { - Route::get('{component}/assets', [ 'as' =>'api.components.assets', @@ -222,27 +193,25 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ); }); // Components group - /*--- Consumables API ---*/ Route::get('consumables/selectlist', [ 'as' => 'api.consumables.selectlist', - 'uses'=> 'ConsumablesController@selectlist' + 'uses'=> 'ConsumablesController@selectlist', ] ); Route::resource('consumables', 'ConsumablesController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.consumables.index', 'show' => 'api.consumables.show', 'store' => 'api.consumables.store', 'update' => 'api.consumables.update', - 'destroy' => 'api.consumables.destroy' + 'destroy' => 'api.consumables.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['consumable' => 'consumable_id'] + 'parameters' => ['consumable' => 'consumable_id'], ] ); // Consumables resource @@ -250,14 +219,14 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] Route::get('view/{id}/users', [ 'as' => 'api.consumables.showUsers', - 'uses' => 'ConsumablesController@getDataView' + 'uses' => 'ConsumablesController@getDataView', ] ); Route::post('{consumable}/checkout', [ 'as' => 'api.consumables.checkout', - 'uses' => 'ConsumablesController@checkout' + 'uses' => 'ConsumablesController@checkout', ] ); }); @@ -266,20 +235,18 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] Route::resource('depreciations', 'DepreciationsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.depreciations.index', 'show' => 'api.depreciations.show', 'store' => 'api.depreciations.store', 'update' => 'api.depreciations.update', - 'destroy' => 'api.depreciations.destroy' + 'destroy' => 'api.depreciations.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['depreciation' => 'depreciation_id'] + 'parameters' => ['depreciation' => 'depreciation_id'], ] ); // Depreciations resource - /*--- Fields API ---*/ Route::resource('fields', 'CustomFieldsController', [ @@ -288,265 +255,242 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] 'show' => 'api.customfields.show', 'store' => 'api.customfields.store', 'update' => 'api.customfields.update', - 'destroy' => 'api.customfields.destroy' + 'destroy' => 'api.customfields.destroy', ], - 'except' => [ 'create', 'edit' ], - 'parameters' => [ 'field' => 'field_id' ] + 'except' => ['create', 'edit'], + 'parameters' => ['field' => 'field_id'], ]); Route::group(['prefix' => 'fields'], function () { Route::post('fieldsets/{id}/order', [ 'as' => 'api.customfields.order', - 'uses' => 'CustomFieldsController@postReorder' + 'uses' => 'CustomFieldsController@postReorder', ] ); Route::post('{field}/associate', [ 'as' => 'api.customfields.associate', - 'uses' => 'CustomFieldsController@associate' + 'uses' => 'CustomFieldsController@associate', ] ); Route::post('{field}/disassociate', [ 'as' => 'api.customfields.disassociate', - 'uses' => 'CustomFieldsController@disassociate' + 'uses' => 'CustomFieldsController@disassociate', ] ); }); // Fields group - /*--- Fieldsets API ---*/ Route::group(['prefix' => 'fieldsets'], function () { Route::get('{fieldset}/fields', [ 'as' => 'api.fieldsets.fields', - 'uses' => 'CustomFieldsetsController@fields' + 'uses' => 'CustomFieldsetsController@fields', ] ); Route::get('/{fieldset}/fields/{model}', [ 'as' => 'api.fieldsets.fields-with-default-value', - 'uses' => 'CustomFieldsetsController@fieldsWithDefaultValues' + 'uses' => 'CustomFieldsetsController@fieldsWithDefaultValues', ] ); }); Route::resource('fieldsets', 'CustomFieldsetsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.fieldsets.index', 'show' => 'api.fieldsets.show', 'store' => 'api.fieldsets.store', 'update' => 'api.fieldsets.update', - 'destroy' => 'api.fieldsets.destroy' + 'destroy' => 'api.fieldsets.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['fieldset' => 'fieldset_id'] + 'parameters' => ['fieldset' => 'fieldset_id'], ] ); // Custom fieldset resource - /*--- Groups API ---*/ Route::resource('groups', 'GroupsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.groups.index', 'show' => 'api.groups.show', 'store' => 'api.groups.store', 'update' => 'api.groups.update', - 'destroy' => 'api.groups.destroy' + 'destroy' => 'api.groups.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['group' => 'group_id'] + 'parameters' => ['group' => 'group_id'], ] ); // Groups resource - /*--- Hardware API ---*/ Route::group(['prefix' => 'hardware'], function () { - - Route::get('{asset_id}/licenses', [ + Route::get('{asset_id}/licenses', [ 'as' => 'api.assets.licenselist', - 'uses' => 'AssetsController@licenses' + 'uses' => 'AssetsController@licenses', ]); - - Route::get( 'bytag/{tag}', [ + + Route::get('bytag/{tag}', [ 'as' => 'assets.show.bytag', - 'uses' => 'AssetsController@showByTag' + 'uses' => 'AssetsController@showByTag', ]); Route::get('bytag/{any}', [ 'as' => 'api.assets.show.bytag', - 'uses' => 'AssetsController@showByTag' + 'uses' => 'AssetsController@showByTag', ] )->where('any', '.*'); - Route::get('byserial/{any}', [ 'as' => 'api.assets.show.byserial', - 'uses' => 'AssetsController@showBySerial' + 'uses' => 'AssetsController@showBySerial', ] )->where('any', '.*'); - - Route::get( 'selectlist', [ + Route::get('selectlist', [ 'as' => 'assets.selectlist', - 'uses' => 'AssetsController@selectlist' + 'uses' => 'AssetsController@selectlist', ]); Route::get('audit/{audit}', [ 'as' => 'api.asset.to-audit', - 'uses' => 'AssetsController@index' + 'uses' => 'AssetsController@index', ]); - Route::post('audit', [ 'as' => 'api.asset.audit', - 'uses' => 'AssetsController@audit' + 'uses' => 'AssetsController@audit', ]); Route::post('{asset_id}/checkout', [ 'as' => 'api.assets.checkout', - 'uses' => 'AssetsController@checkout' + 'uses' => 'AssetsController@checkout', ] ); Route::post('{asset_id}/checkin', [ 'as' => 'api.assets.checkin', - 'uses' => 'AssetsController@checkin' + 'uses' => 'AssetsController@checkin', ] ); - }); /*--- Asset Maintenances API ---*/ Route::resource('maintenances', 'AssetMaintenancesController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.maintenances.index', 'show' => 'api.maintenances.show', 'store' => 'api.maintenances.store', 'update' => 'api.maintenances.update', - 'destroy' => 'api.maintenances.destroy' + 'destroy' => 'api.maintenances.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['maintenance' => 'maintenance_id'] + 'parameters' => ['maintenance' => 'maintenance_id'], ] ); // Consumables resource - Route::resource('hardware', 'AssetsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.assets.index', 'show' => 'api.assets.show', 'store' => 'api.assets.store', 'update' => 'api.assets.update', - 'destroy' => 'api.assets.destroy' + 'destroy' => 'api.assets.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['asset' => 'asset_id'] + 'parameters' => ['asset' => 'asset_id'], ] ); // Hardware resource - /*--- Imports API ---*/ Route::resource('imports', 'ImportController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.imports.index', 'show' => 'api.imports.show', 'store' => 'api.imports.store', 'update' => 'api.imports.update', - 'destroy' => 'api.imports.destroy' + 'destroy' => 'api.imports.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['import' => 'import_id'] + 'parameters' => ['import' => 'import_id'], ] ); // Imports resource Route::group(['prefix' => 'imports'], function () { - Route::post('process/{import}', [ 'as' => 'api.imports.importFile', - 'uses'=> 'ImportController@process' + 'uses'=> 'ImportController@process', ] ); }); // Imports group - - - /*--- Licenses API ---*/ Route::group(['prefix' => 'licenses'], function () { Route::get('selectlist', [ 'as' => 'api.licenses.selectlist', - 'uses'=> 'LicensesController@selectlist' + 'uses'=> 'LicensesController@selectlist', ] ); - }); // Licenses group Route::resource('licenses', 'LicensesController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.licenses.index', 'show' => 'api.licenses.show', 'store' => 'api.licenses.store', 'update' => 'api.licenses.update', - 'destroy' => 'api.licenses.destroy' + 'destroy' => 'api.licenses.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['license' => 'license_id'] + 'parameters' => ['license' => 'license_id'], ] ); // Licenses resource Route::resource('licenses.seats', 'LicenseSeatsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.licenses.seats.index', 'show' => 'api.licenses.seats.show', - 'update' => 'api.licenses.seats.update' + 'update' => 'api.licenses.seats.update', ], 'except' => ['create', 'edit', 'destroy', 'store'], - 'parameters' => ['licenseseat' => 'licenseseat_id'] + 'parameters' => ['licenseseat' => 'licenseseat_id'], ] ); // Licenseseats resource /*--- Locations API ---*/ Route::group(['prefix' => 'locations'], function () { - Route::get('{location}/users', [ 'as'=>'api.locations.viewusers', - 'uses'=>'LocationsController@getDataViewUsers' + 'uses'=>'LocationsController@getDataViewUsers', ] ); Route::get('{location}/assets', [ 'as'=>'api.locations.viewassets', - 'uses'=>'LocationsController@getDataViewAssets' + 'uses'=>'LocationsController@getDataViewAssets', ] ); @@ -554,329 +498,289 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] Route::get('{location}/check', [ 'as' => 'api.locations.check', - 'uses' => 'LocationsController@show' + 'uses' => 'LocationsController@show', ] ); - Route::get( 'selectlist', [ + Route::get('selectlist', [ 'as' => 'locations.selectlist', - 'uses' => 'LocationsController@selectlist' + 'uses' => 'LocationsController@selectlist', ]); }); // Locations group - - Route::resource('locations', 'LocationsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.locations.index', 'show' => 'api.locations.show', 'store' => 'api.locations.store', 'update' => 'api.locations.update', - 'destroy' => 'api.locations.destroy' + 'destroy' => 'api.locations.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['location' => 'location_id'] + 'parameters' => ['location' => 'location_id'], ] ); // Locations resource - - - /*--- Manufacturers API ---*/ Route::group(['prefix' => 'manufacturers'], function () { - - Route::get( 'selectlist', [ + Route::get('selectlist', [ 'as' => 'manufacturers.selectlist', - 'uses' => 'ManufacturersController@selectlist' + 'uses' => 'ManufacturersController@selectlist', ]); }); // Locations group - Route::resource('manufacturers', 'ManufacturersController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.manufacturers.index', 'show' => 'api.manufacturers.show', 'store' => 'api.manufacturers.store', 'update' => 'api.manufacturers.update', - 'destroy' => 'api.manufacturers.destroy' + 'destroy' => 'api.manufacturers.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['manufacturer' => 'manufacturer_id'] + 'parameters' => ['manufacturer' => 'manufacturer_id'], ] ); // Manufacturers resource - /*--- Models API ---*/ Route::group(['prefix' => 'models'], function () { - Route::get('assets', [ 'as' => 'api.models.assets', - 'uses'=> 'AssetModelsController@assets' + 'uses'=> 'AssetModelsController@assets', ] ); Route::get('selectlist', [ 'as' => 'api.models.selectlist', - 'uses'=> 'AssetModelsController@selectlist' + 'uses'=> 'AssetModelsController@selectlist', ] ); }); // Models group - Route::resource('models', 'AssetModelsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.models.index', 'show' => 'api.models.show', 'store' => 'api.models.store', 'update' => 'api.models.update', - 'destroy' => 'api.models.destroy' + 'destroy' => 'api.models.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['model' => 'model_id'] + 'parameters' => ['model' => 'model_id'], ] ); // Models resource - - - /*--- Settings API ---*/ Route::get('settings/ldaptest', [ 'as' => 'api.settings.ldaptest', - 'uses' => 'SettingsController@ldapAdSettingsTest' + 'uses' => 'SettingsController@ldapAdSettingsTest', ]); Route::post('settings/purge_barcodes', [ 'as' => 'api.settings.purgebarcodes', - 'uses' => 'SettingsController@purgeBarcodes' + 'uses' => 'SettingsController@purgeBarcodes', ]); Route::get('settings/login-attempts', [ 'middleware' => ['auth', 'authorize:superuser'], 'as' => 'api.settings.login_attempts', - 'uses' => 'SettingsController@showLoginAttempts' + 'uses' => 'SettingsController@showLoginAttempts', ]); - Route::post('settings/ldaptestlogin', [ 'as' => 'api.settings.ldaptestlogin', - 'uses' => 'SettingsController@ldaptestlogin' + 'uses' => 'SettingsController@ldaptestlogin', ]); Route::post('settings/slacktest', [ 'as' => 'api.settings.slacktest', - 'uses' => 'SettingsController@slacktest' + 'uses' => 'SettingsController@slacktest', ]); Route::post( 'settings/mailtest', [ 'as' => 'api.settings.mailtest', - 'uses' => 'SettingsController@ajaxTestEmail' + 'uses' => 'SettingsController@ajaxTestEmail', ]); - Route::resource('settings', 'SettingsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.settings.index', 'store' => 'api.settings.store', 'show' => 'api.settings.show', - 'update' => 'api.settings.update' + 'update' => 'api.settings.update', ], 'except' => ['create', 'edit', 'destroy'], - 'parameters' => ['setting' => 'setting_id'] + 'parameters' => ['setting' => 'setting_id'], ] ); // Settings resource - - - /*--- Status Labels API ---*/ - Route::group(['prefix' => 'statuslabels'], function () { // Pie chart for dashboard Route::get('assets', [ 'as' => 'api.statuslabels.assets.bytype', - 'uses' => 'StatuslabelsController@getAssetCountByStatuslabel' + 'uses' => 'StatuslabelsController@getAssetCountByStatuslabel', ] ); Route::get('{statuslabel}/assetlist', [ 'as' => 'api.statuslabels.assets', - 'uses' => 'StatuslabelsController@assets' + 'uses' => 'StatuslabelsController@assets', ] ); Route::get('{statuslabel}/deployable', [ 'as' => 'api.statuslabels.deployable', - 'uses' => 'StatuslabelsController@checkIfDeployable' + 'uses' => 'StatuslabelsController@checkIfDeployable', ] ); - - }); Route::resource('statuslabels', 'StatuslabelsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.statuslabels.index', 'store' => 'api.statuslabels.store', 'show' => 'api.statuslabels.show', 'update' => 'api.statuslabels.update', - 'destroy' => 'api.statuslabels.destroy' + 'destroy' => 'api.statuslabels.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['statuslabel' => 'statuslabel_id'] + 'parameters' => ['statuslabel' => 'statuslabel_id'], ] ); // Status labels group - /*--- Suppliers API ---*/ Route::group(['prefix' => 'suppliers'], function () { - Route::get('list', [ 'as'=>'api.suppliers.list', - 'uses'=>'SuppliersController@getDatatable' + 'uses'=>'SuppliersController@getDatatable', ] ); Route::get('selectlist', [ 'as' => 'api.suppliers.selectlist', - 'uses' => 'SuppliersController@selectlist' + 'uses' => 'SuppliersController@selectlist', ] ); }); // Suppliers group - Route::resource('suppliers', 'SuppliersController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.suppliers.index', 'show' => 'api.suppliers.show', 'store' => 'api.suppliers.store', 'update' => 'api.suppliers.update', - 'destroy' => 'api.suppliers.destroy' + 'destroy' => 'api.suppliers.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['supplier' => 'supplier_id'] + 'parameters' => ['supplier' => 'supplier_id'], ] ); // Suppliers resource - - - /*--- Users API ---*/ - - Route::group([ 'prefix' => 'users' ], function () { - + Route::group(['prefix' => 'users'], function () { Route::post('two_factor_reset', [ 'as' => 'api.users.two_factor_reset', - 'uses' => 'UsersController@postTwoFactorReset' + 'uses' => 'UsersController@postTwoFactorReset', ] ); Route::get('me', [ 'as' => 'api.users.me', - 'uses' => 'UsersController@getCurrentUserInfo' + 'uses' => 'UsersController@getCurrentUserInfo', ] ); Route::get('list/{status?}', [ 'as' => 'api.users.list', - 'uses' => 'UsersController@getDatatable' + 'uses' => 'UsersController@getDatatable', ] ); Route::get('selectlist', [ 'as' => 'api.users.selectlist', - 'uses' => 'UsersController@selectList' + 'uses' => 'UsersController@selectList', ] ); Route::get('{user}/assets', [ 'as' => 'api.users.assetlist', - 'uses' => 'UsersController@assets' + 'uses' => 'UsersController@assets', ] ); - Route::get('{user}/accessories', [ 'as' => 'api.users.accessorieslist', - 'uses' => 'UsersController@accessories' + 'uses' => 'UsersController@accessories', ] ); - Route::get('{user}/licenses', [ 'as' => 'api.users.licenselist', - 'uses' => 'UsersController@licenses' + 'uses' => 'UsersController@licenses', ] ); Route::post('{user}/upload', [ 'as' => 'api.users.uploads', - 'uses' => 'UsersController@postUpload' + 'uses' => 'UsersController@postUpload', ] ); }); // Users group Route::resource('users', 'UsersController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.users.index', 'show' => 'api.users.show', 'store' => 'api.users.store', 'update' => 'api.users.update', - 'destroy' => 'api.users.destroy' + 'destroy' => 'api.users.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['user' => 'user_id'] + 'parameters' => ['user' => 'user_id'], ] ); // Users resource - Route::get( 'reports/activity', - [ 'as' => 'api.activity.index', 'uses' => 'ReportsController@index' ] + ['as' => 'api.activity.index', 'uses' => 'ReportsController@index'] ); /*--- Kits API ---*/ Route::resource('kits', 'PredefinedKitsController', [ - 'names' => - [ + 'names' => [ 'index' => 'api.kits.index', 'show' => 'api.kits.show', 'store' => 'api.kits.store', @@ -884,65 +788,64 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] 'destroy' => 'api.kits.destroy', ], 'except' => ['create', 'edit'], - 'parameters' => ['kit' => 'kit_id'] + 'parameters' => ['kit' => 'kit_id'], ] ); - - Route::group([ 'prefix' => 'kits/{kit_id}' ], function () { + Route::group(['prefix' => 'kits/{kit_id}'], function () { // kit licenses - Route::get('licenses', + Route::get('licenses', [ 'as' => 'api.kits.licenses.index', 'uses' => 'PredefinedKitsController@indexLicenses', ] ); - - Route::post('licenses', + + Route::post('licenses', [ 'as' => 'api.kits.licenses.store', 'uses' => 'PredefinedKitsController@storeLicense', ] ); - - Route::put('licenses/{license_id}', + + Route::put('licenses/{license_id}', [ 'as' => 'api.kits.licenses.update', 'uses' => 'PredefinedKitsController@updateLicense', ] ); - Route::delete('licenses/{license_id}', + Route::delete('licenses/{license_id}', [ 'as' => 'api.kits.licenses.destroy', 'uses' => 'PredefinedKitsController@detachLicense', ] ); - + // kit models - Route::get('models', + Route::get('models', [ 'as' => 'api.kits.models.index', 'uses' => 'PredefinedKitsController@indexModels', ] ); - - Route::post('models', + + Route::post('models', [ 'as' => 'api.kits.models.store', 'uses' => 'PredefinedKitsController@storeModel', ] ); - - Route::put('models/{model_id}', + + Route::put('models/{model_id}', [ 'as' => 'api.kits.models.update', 'uses' => 'PredefinedKitsController@updateModel', ] ); - Route::delete('models/{model_id}', + Route::delete('models/{model_id}', [ 'as' => 'api.kits.models.destroy', 'uses' => 'PredefinedKitsController@detachModel', @@ -950,28 +853,28 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ); // kit accessories - Route::get('accessories', + Route::get('accessories', [ 'as' => 'api.kits.accessories.index', 'uses' => 'PredefinedKitsController@indexAccessories', ] ); - - Route::post('accessories', + + Route::post('accessories', [ 'as' => 'api.kits.accessories.store', 'uses' => 'PredefinedKitsController@storeAccessory', ] ); - - Route::put('accessories/{accessory_id}', + + Route::put('accessories/{accessory_id}', [ 'as' => 'api.kits.accessories.update', 'uses' => 'PredefinedKitsController@updateAccessory', ] ); - Route::delete('accessories/{accessory_id}', + Route::delete('accessories/{accessory_id}', [ 'as' => 'api.kits.accessories.destroy', 'uses' => 'PredefinedKitsController@detachAccessory', @@ -979,37 +882,36 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ); // kit consumables - Route::get('consumables', + Route::get('consumables', [ 'as' => 'api.kits.consumables.index', 'uses' => 'PredefinedKitsController@indexConsumables', ] ); - - Route::post('consumables', + + Route::post('consumables', [ 'as' => 'api.kits.consumables.store', 'uses' => 'PredefinedKitsController@storeConsumable', ] ); - - Route::put('consumables/{consumable_id}', + + Route::put('consumables/{consumable_id}', [ 'as' => 'api.kits.consumables.update', 'uses' => 'PredefinedKitsController@updateConsumable', ] ); - Route::delete('consumables/{consumable_id}', + Route::delete('consumables/{consumable_id}', [ 'as' => 'api.kits.consumables.destroy', 'uses' => 'PredefinedKitsController@detachConsumable', ] ); - }); // kits group - Route::fallback(function(){ + Route::fallback(function () { return response()->json( [ 'status' => 'error', @@ -1017,7 +919,4 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] 'payload' => null, ], 404); }); - }); - - diff --git a/routes/console.php b/routes/console.php index 785b9387e4..f623be0cf9 100644 --- a/routes/console.php +++ b/routes/console.php @@ -19,7 +19,7 @@ Artisan::command('inspire', function () { })->describe('Display an inspiring quote'); Artisan::command('snipeit:travisci-install', function () { - if(!Setting::setupCompleted()) { + if (! Setting::setupCompleted()) { $settings = new Setting; $settings->site_name = 'test-ci'; $settings->alert_email = 'test@example.com'; diff --git a/routes/web.php b/routes/web.php index 21600d9f11..0211c2bdd2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,84 +1,78 @@ 'auth'], function () { /* * Companies */ Route::resource('companies', 'CompaniesController', [ - 'parameters' => ['company' => 'company_id'] + 'parameters' => ['company' => 'company_id'], ]); /* * Categories */ Route::resource('categories', 'CategoriesController', [ - 'parameters' => ['category' => 'category_id'] + 'parameters' => ['category' => 'category_id'], ]); /* * Locations */ Route::resource('locations', 'LocationsController', [ - 'parameters' => ['location' => 'location_id'] + 'parameters' => ['location' => 'location_id'], ]); - + Route::get( 'locations/{locationId}/printassigned', - [ 'as' => 'locations.print_assigned', 'uses' => 'LocationsController@print_assigned' ] + ['as' => 'locations.print_assigned', 'uses' => 'LocationsController@print_assigned'] ); - + Route::get( 'locations/{locationId}/printallassigned', - [ 'as' => 'locations.print_all_assigned', 'uses' => 'LocationsController@print_all_assigned' ] + ['as' => 'locations.print_all_assigned', 'uses' => 'LocationsController@print_all_assigned'] ); /* * Manufacturers */ - Route::group([ 'prefix' => 'manufacturers', 'middleware' => ['auth'] ], function () { - - Route::get('{manufacturers_id}/restore', [ 'as' => 'restore/manufacturer', 'uses' => 'ManufacturersController@restore']); + Route::group(['prefix' => 'manufacturers', 'middleware' => ['auth']], function () { + Route::get('{manufacturers_id}/restore', ['as' => 'restore/manufacturer', 'uses' => 'ManufacturersController@restore']); }); Route::resource('manufacturers', 'ManufacturersController', [ - 'parameters' => ['manufacturer' => 'manufacturers_id'] + 'parameters' => ['manufacturer' => 'manufacturers_id'], ]); /* * Suppliers */ Route::resource('suppliers', 'SuppliersController', [ - 'parameters' => ['supplier' => 'supplier_id'] + 'parameters' => ['supplier' => 'supplier_id'], ]); /* * Depreciations */ - Route::resource('depreciations', 'DepreciationsController', [ - 'parameters' => ['depreciation' => 'depreciation_id'] + Route::resource('depreciations', 'DepreciationsController', [ + 'parameters' => ['depreciation' => 'depreciation_id'], ]); - /* - * Status Labels - */ - Route::resource('statuslabels', 'StatuslabelsController', [ - 'parameters' => ['statuslabel' => 'statuslabel_id'] + /* + * Status Labels + */ + Route::resource('statuslabels', 'StatuslabelsController', [ + 'parameters' => ['statuslabel' => 'statuslabel_id'], ]); - /* * Departments */ Route::resource('departments', 'DepartmentsController', [ - 'parameters' => ['department' => 'department_id'] + 'parameters' => ['department' => 'department_id'], ]); - - }); - /* | |-------------------------------------------------------------------------- @@ -86,11 +80,11 @@ Route::group(['middleware' => 'auth'], function () { |-------------------------------------------------------------------------- | | Routes for various modal dialogs to interstitially create various things -| +| */ -Route::group(['middleware' => 'auth','prefix' => 'modals'], function () { - Route::get('{type}/{itemId?}',['as' => 'modal.show', 'uses' => 'ModalController@show']); +Route::group(['middleware' => 'auth', 'prefix' => 'modals'], function () { + Route::get('{type}/{itemId?}', ['as' => 'modal.show', 'uses' => 'ModalController@show']); }); /* @@ -103,19 +97,14 @@ Route::group(['middleware' => 'auth','prefix' => 'modals'], function () { */ Route::group(['middleware' => 'auth'], function () { - Route::get( 'display-sig/{filename}', [ 'as' => 'log.signature.view', - 'uses' => 'ActionlogController@displaySig' ] + 'uses' => 'ActionlogController@displaySig', ] ); - - }); - - /* |-------------------------------------------------------------------------- | Admin Routes @@ -125,89 +114,74 @@ Route::group(['middleware' => 'auth'], function () { | */ +Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () { + Route::get('settings', ['as' => 'settings.general.index', 'uses' => 'SettingsController@getSettings']); + Route::post('settings', ['as' => 'settings.general.save', 'uses' => 'SettingsController@postSettings']); + Route::get('branding', ['as' => 'settings.branding.index', 'uses' => 'SettingsController@getBranding']); + Route::post('branding', ['as' => 'settings.branding.save', 'uses' => 'SettingsController@postBranding']); -Route::group([ 'prefix' => 'admin','middleware' => ['auth', 'authorize:superuser']], function () { + Route::get('security', ['as' => 'settings.security.index', 'uses' => 'SettingsController@getSecurity']); + Route::post('security', ['as' => 'settings.security.save', 'uses' => 'SettingsController@postSecurity']); - Route::get('settings', ['as' => 'settings.general.index','uses' => 'SettingsController@getSettings' ]); - Route::post('settings', ['as' => 'settings.general.save','uses' => 'SettingsController@postSettings' ]); + Route::get('groups', ['as' => 'settings.groups.index', 'uses' => 'GroupsController@index']); + Route::get('localization', ['as' => 'settings.localization.index', 'uses' => 'SettingsController@getLocalization']); + Route::post('localization', ['as' => 'settings.localization.save', 'uses' => 'SettingsController@postLocalization']); - Route::get('branding', ['as' => 'settings.branding.index','uses' => 'SettingsController@getBranding' ]); - Route::post('branding', ['as' => 'settings.branding.save','uses' => 'SettingsController@postBranding' ]); + Route::get('notifications', ['as' => 'settings.alerts.index', 'uses' => 'SettingsController@getAlerts']); + Route::post('notifications', ['as' => 'settings.alerts.save', 'uses' => 'SettingsController@postAlerts']); - Route::get('security', ['as' => 'settings.security.index','uses' => 'SettingsController@getSecurity' ]); - Route::post('security', ['as' => 'settings.security.save','uses' => 'SettingsController@postSecurity' ]); + Route::get('slack', ['as' => 'settings.slack.index', 'uses' => 'SettingsController@getSlack']); + Route::post('slack', ['as' => 'settings.slack.save', 'uses' => 'SettingsController@postSlack']); - Route::get('groups', ['as' => 'settings.groups.index','uses' => 'GroupsController@index' ]); + Route::get('asset_tags', ['as' => 'settings.asset_tags.index', 'uses' => 'SettingsController@getAssetTags']); + Route::post('asset_tags', ['as' => 'settings.asset_tags.save', 'uses' => 'SettingsController@postAssetTags']); - Route::get('localization', ['as' => 'settings.localization.index','uses' => 'SettingsController@getLocalization' ]); - Route::post('localization', ['as' => 'settings.localization.save','uses' => 'SettingsController@postLocalization' ]); + Route::get('barcodes', ['as' => 'settings.barcodes.index', 'uses' => 'SettingsController@getBarcodes']); + Route::post('barcodes', ['as' => 'settings.barcodes.save', 'uses' => 'SettingsController@postBarcodes']); - Route::get('notifications', ['as' => 'settings.alerts.index','uses' => 'SettingsController@getAlerts' ]); - Route::post('notifications', ['as' => 'settings.alerts.save','uses' => 'SettingsController@postAlerts' ]); + Route::get('labels', ['as' => 'settings.labels.index', 'uses' => 'SettingsController@getLabels']); + Route::post('labels', ['as' => 'settings.labels.save', 'uses' => 'SettingsController@postLabels']); - Route::get('slack', ['as' => 'settings.slack.index','uses' => 'SettingsController@getSlack' ]); - Route::post('slack', ['as' => 'settings.slack.save','uses' => 'SettingsController@postSlack' ]); + Route::get('ldap', ['as' => 'settings.ldap.index', 'uses' => 'SettingsController@getLdapSettings']); + Route::post('ldap', ['as' => 'settings.ldap.save', 'uses' => 'SettingsController@postLdapSettings']); - Route::get('asset_tags', ['as' => 'settings.asset_tags.index','uses' => 'SettingsController@getAssetTags' ]); - Route::post('asset_tags', ['as' => 'settings.asset_tags.save','uses' => 'SettingsController@postAssetTags' ]); + Route::get('phpinfo', ['as' => 'settings.phpinfo.index', 'uses' => 'SettingsController@getPhpInfo']); - Route::get('barcodes', ['as' => 'settings.barcodes.index','uses' => 'SettingsController@getBarcodes' ]); - Route::post('barcodes', ['as' => 'settings.barcodes.save','uses' => 'SettingsController@postBarcodes' ]); - - Route::get('labels', ['as' => 'settings.labels.index','uses' => 'SettingsController@getLabels' ]); - Route::post('labels', ['as' => 'settings.labels.save','uses' => 'SettingsController@postLabels' ]); - - Route::get('ldap', ['as' => 'settings.ldap.index','uses' => 'SettingsController@getLdapSettings' ]); - Route::post('ldap', ['as' => 'settings.ldap.save','uses' => 'SettingsController@postLdapSettings' ]); - - Route::get('phpinfo', ['as' => 'settings.phpinfo.index','uses' => 'SettingsController@getPhpInfo' ]); - - - Route::get('oauth', [ 'as' => 'settings.oauth.index', 'uses' => 'SettingsController@api' ]); + Route::get('oauth', ['as' => 'settings.oauth.index', 'uses' => 'SettingsController@api']); Route::get('purge', ['as' => 'settings.purge.index', 'uses' => 'SettingsController@getPurge']); Route::post('purge', ['as' => 'settings.purge.save', 'uses' => 'SettingsController@postPurge']); - Route::get('login-attempts', ['as' => 'settings.logins.index','uses' => 'SettingsController@getLoginAttempts' ]); - - # Backups - Route::group([ 'prefix' => 'backups', 'middleware' => 'auth' ], function () { - + Route::get('login-attempts', ['as' => 'settings.logins.index', 'uses' => 'SettingsController@getLoginAttempts']); + // Backups + Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () { Route::get('download/{filename}', [ 'as' => 'settings.backups.download', - 'uses' => 'SettingsController@downloadFile' ]); + 'uses' => 'SettingsController@downloadFile', ]); Route::delete('delete/{filename}', [ 'as' => 'settings.backups.destroy', - 'uses' => 'SettingsController@deleteFile' ]); + 'uses' => 'SettingsController@deleteFile', ]); Route::post('/', [ 'as' => 'settings.backups.create', - 'uses' => 'SettingsController@postBackups' + 'uses' => 'SettingsController@postBackups', ]); - Route::get('/', [ 'as' => 'settings.backups.index', 'uses' => 'SettingsController@getBackups' ]); - + Route::get('/', ['as' => 'settings.backups.index', 'uses' => 'SettingsController@getBackups']); }); - - Route::resource('groups', 'GroupsController', [ 'middleware' => ['auth'], - 'parameters' => ['group' => 'group_id'] + 'parameters' => ['group' => 'group_id'], ]); - Route::get('/', ['as' => 'settings.index', 'uses' => 'SettingsController@index' ]); - - + Route::get('/', ['as' => 'settings.index', 'uses' => 'SettingsController@index']); }); - - - /* |-------------------------------------------------------------------------- | Importer Routes @@ -216,14 +190,13 @@ Route::group([ 'prefix' => 'admin','middleware' => ['auth', 'authorize:superuser | | */ -Route::group([ 'prefix' => 'import', 'middleware' => ['auth']], function () { - Route::get('/', [ +Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () { + Route::get('/', [ 'as' => 'imports.index', - 'uses' => 'ImportsController@index' + 'uses' => 'ImportsController@index', ]); }); - /* |-------------------------------------------------------------------------- | Account Routes @@ -232,130 +205,121 @@ Route::group([ 'prefix' => 'import', 'middleware' => ['auth']], function () { | | */ -Route::group([ 'prefix' => 'account', 'middleware' => ['auth']], function () { +Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () { - # Profile - Route::get('profile', [ 'as' => 'profile', 'uses' => 'ProfileController@getIndex' ]); + // Profile + Route::get('profile', ['as' => 'profile', 'uses' => 'ProfileController@getIndex']); Route::post('profile', 'ProfileController@postIndex'); - Route::get('menu', [ 'as' => 'account.menuprefs', 'uses' => 'ProfileController@getMenuState' ]); + Route::get('menu', ['as' => 'account.menuprefs', 'uses' => 'ProfileController@getMenuState']); - Route::get('password', [ 'as' => 'account.password.index', 'uses' => 'ProfileController@password' ]); - Route::post('password', [ 'uses' => 'ProfileController@passwordSave' ]); + Route::get('password', ['as' => 'account.password.index', 'uses' => 'ProfileController@password']); + Route::post('password', ['uses' => 'ProfileController@passwordSave']); - Route::get('api', [ 'as' => 'user.api', 'uses' => 'ProfileController@api' ]); + Route::get('api', ['as' => 'user.api', 'uses' => 'ProfileController@api']); - # View Assets - Route::get('view-assets', [ 'as' => 'view-assets', 'uses' => 'ViewAssetsController@getIndex' ]); + // View Assets + Route::get('view-assets', ['as' => 'view-assets', 'uses' => 'ViewAssetsController@getIndex']); - Route::get('requested', [ 'as' => 'account.requested', 'uses' => 'ViewAssetsController@getRequestedAssets' ]); + Route::get('requested', ['as' => 'account.requested', 'uses' => 'ViewAssetsController@getRequestedAssets']); - # Accept Asset + // Accept Asset Route::get( 'accept-asset/{logID}', - [ 'as' => 'account/accept-assets', 'uses' => 'ViewAssetsController@getAcceptAsset' ] + ['as' => 'account/accept-assets', 'uses' => 'ViewAssetsController@getAcceptAsset'] ); - # Profile + // Profile Route::get( 'requestable-assets', - [ 'as' => 'requestable-assets', 'uses' => 'ViewAssetsController@getRequestableIndex' ] + ['as' => 'requestable-assets', 'uses' => 'ViewAssetsController@getRequestableIndex'] ); Route::get( 'request-asset/{assetId}', - [ 'as' => 'account/request-asset', 'uses' => 'ViewAssetsController@getRequestAsset' ] + ['as' => 'account/request-asset', 'uses' => 'ViewAssetsController@getRequestAsset'] ); Route::post( 'request/{itemType}/{itemId}', - [ 'as' => 'account/request-item', 'uses' => 'ViewAssetsController@getRequestItem'] + ['as' => 'account/request-item', 'uses' => 'ViewAssetsController@getRequestItem'] ); - # Account Dashboard - Route::get('/', [ 'as' => 'account', 'uses' => 'ViewAssetsController@getIndex' ]); - + // Account Dashboard + Route::get('/', ['as' => 'account', 'uses' => 'ViewAssetsController@getIndex']); Route::get('accept', 'Account\AcceptanceController@index') ->name('account.accept'); - + Route::get('accept/{id}', 'Account\AcceptanceController@create') ->name('account.accept.item'); - Route::post('accept/{id}', 'Account\AcceptanceController@store'); - + Route::post('accept/{id}', 'Account\AcceptanceController@store'); }); - Route::group(['middleware' => ['auth']], function () { - Route::get('reports/audit', [ 'as' => 'reports.audit', - 'uses' => 'ReportsController@audit' + 'uses' => 'ReportsController@audit', ]); Route::get( 'reports/depreciation', - [ 'as' => 'reports/depreciation', 'uses' => 'ReportsController@getDeprecationReport' ] + ['as' => 'reports/depreciation', 'uses' => 'ReportsController@getDeprecationReport'] ); Route::get( 'reports/export/depreciation', - [ 'as' => 'reports/export/depreciation', 'uses' => 'ReportsController@exportDeprecationReport' ] + ['as' => 'reports/export/depreciation', 'uses' => 'ReportsController@exportDeprecationReport'] ); Route::get( 'reports/asset_maintenances', - [ 'as' => 'reports/asset_maintenances', 'uses' => 'ReportsController@getAssetMaintenancesReport' ] + ['as' => 'reports/asset_maintenances', 'uses' => 'ReportsController@getAssetMaintenancesReport'] ); Route::get( 'reports/export/asset_maintenances', [ 'as' => 'reports/export/asset_maintenances', - 'uses' => 'ReportsController@exportAssetMaintenancesReport' + 'uses' => 'ReportsController@exportAssetMaintenancesReport', ] ); Route::get( 'reports/licenses', - [ 'as' => 'reports/licenses', 'uses' => 'ReportsController@getLicenseReport' ] + ['as' => 'reports/licenses', 'uses' => 'ReportsController@getLicenseReport'] ); Route::get( 'reports/export/licenses', - [ 'as' => 'reports/export/licenses', 'uses' => 'ReportsController@exportLicenseReport' ] + ['as' => 'reports/export/licenses', 'uses' => 'ReportsController@exportLicenseReport'] ); - Route::get('reports/accessories', [ 'as' => 'reports/accessories', 'uses' => 'ReportsController@getAccessoryReport' ]); + Route::get('reports/accessories', ['as' => 'reports/accessories', 'uses' => 'ReportsController@getAccessoryReport']); Route::get( 'reports/export/accessories', - [ 'as' => 'reports/export/accessories', 'uses' => 'ReportsController@exportAccessoryReport' ] + ['as' => 'reports/export/accessories', 'uses' => 'ReportsController@exportAccessoryReport'] ); - Route::get('reports/custom', [ 'as' => 'reports/custom', 'uses' => 'ReportsController@getCustomReport' ]); + Route::get('reports/custom', ['as' => 'reports/custom', 'uses' => 'ReportsController@getCustomReport']); Route::post('reports/custom', 'ReportsController@postCustom'); Route::get( 'reports/activity', - [ 'as' => 'reports.activity', 'uses' => 'ReportsController@getActivityReport' ] + ['as' => 'reports.activity', 'uses' => 'ReportsController@getActivityReport'] ); Route::post('reports/activity', 'ReportsController@postActivityReport'); - - Route::get( 'reports/unaccepted_assets', - [ 'as' => 'reports/unaccepted_assets', 'uses' => 'ReportsController@getAssetAcceptanceReport' ] + ['as' => 'reports/unaccepted_assets', 'uses' => 'ReportsController@getAssetAcceptanceReport'] ); Route::get( 'reports/export/unaccepted_assets', - [ 'as' => 'reports/export/unaccepted_assets', 'uses' => 'ReportsController@exportAssetAcceptanceReport' ] + ['as' => 'reports/export/unaccepted_assets', 'uses' => 'ReportsController@exportAssetAcceptanceReport'] ); }); Route::get( 'auth/signin', - ['uses' => 'Auth\LoginController@legacyAuthRedirect' ] + ['uses' => 'Auth\LoginController@legacyAuthRedirect'] ); - - - /* |-------------------------------------------------------------------------- | Setup Routes @@ -364,51 +328,48 @@ Route::get( | | */ -Route::group([ 'prefix' => 'setup', 'middleware' => 'web'], function () { +Route::group(['prefix' => 'setup', 'middleware' => 'web'], function () { Route::get( 'user', [ 'as' => 'setup.user', - 'uses' => 'SettingsController@getSetupUser' ] + 'uses' => 'SettingsController@getSetupUser', ] ); Route::post( 'user', [ 'as' => 'setup.user.save', - 'uses' => 'SettingsController@postSaveFirstAdmin' ] + 'uses' => 'SettingsController@postSaveFirstAdmin', ] ); - Route::get( 'migrate', [ 'as' => 'setup.migrate', - 'uses' => 'SettingsController@getSetupMigrate' ] + 'uses' => 'SettingsController@getSetupMigrate', ] ); Route::get( 'done', [ 'as' => 'setup.done', - 'uses' => 'SettingsController@getSetupDone' ] + 'uses' => 'SettingsController@getSetupDone', ] ); Route::get( 'mailtest', [ 'as' => 'setup.mailtest', - 'uses' => 'SettingsController@ajaxTestEmail' ] + 'uses' => 'SettingsController@ajaxTestEmail', ] ); - Route::get( '/', [ 'as' => 'setup', - 'uses' => 'SettingsController@getSetupIndex' ] + 'uses' => 'SettingsController@getSetupIndex', ] ); - }); Route::get( @@ -416,7 +377,7 @@ Route::get( [ 'as' => 'two-factor-enroll', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@getTwoFactorEnroll' ] + 'uses' => 'Auth\LoginController@getTwoFactorEnroll', ] ); Route::get( @@ -424,7 +385,7 @@ Route::get( [ 'as' => 'two-factor', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@getTwoFactorAuth' ] + 'uses' => 'Auth\LoginController@getTwoFactorAuth', ] ); Route::post( @@ -432,7 +393,7 @@ Route::post( [ 'as' => 'two-factor', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@postTwoFactorAuth' ] + 'uses' => 'Auth\LoginController@postTwoFactorAuth', ] ); Route::get( @@ -440,11 +401,9 @@ Route::get( [ 'as' => 'home', 'middleware' => ['auth'], - 'uses' => 'DashboardController@getIndex' ] + 'uses' => 'DashboardController@getIndex', ] ); - - Route::group(['middleware' => 'web'], function () { //Route::auth(); Route::get( @@ -452,7 +411,7 @@ Route::group(['middleware' => 'web'], function () { [ 'as' => 'login', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@showLoginForm' ] + 'uses' => 'Auth\LoginController@showLoginForm', ] ); Route::post( @@ -460,18 +419,17 @@ Route::group(['middleware' => 'web'], function () { [ 'as' => 'login', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@login' ] + 'uses' => 'Auth\LoginController@login', ] ); Route::get( 'logout', [ 'as' => 'logout', - 'uses' => 'Auth\LoginController@logout' ] + 'uses' => 'Auth\LoginController@logout', ] ); - }); Auth::routes(); -Route::get('/health', [ 'as' => 'health', 'uses' => 'HealthController@get']); \ No newline at end of file +Route::get('/health', ['as' => 'health', 'uses' => 'HealthController@get']); diff --git a/routes/web/accessories.php b/routes/web/accessories.php index 1f1a70fa6f..5db8490f54 100644 --- a/routes/web/accessories.php +++ b/routes/web/accessories.php @@ -3,29 +3,27 @@ /* * Accessories */ -Route::group([ 'prefix' => 'accessories', 'middleware' => ['auth']], function () { - +Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function () { Route::get( '{accessoryID}/checkout', - [ 'as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@create' ] + ['as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@create'] ); Route::post( '{accessoryID}/checkout', - [ 'as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@store' ] + ['as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@store'] ); Route::get( '{accessoryID}/checkin/{backto?}', - [ 'as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@create' ] + ['as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@create'] ); Route::post( '{accessoryID}/checkin/{backto?}', - [ 'as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@store' ] + ['as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@store'] ); - }); Route::resource('accessories', 'Accessories\AccessoriesController', [ 'middleware' => ['auth'], - 'parameters' => ['accessory' => 'accessory_id'] + 'parameters' => ['accessory' => 'accessory_id'], ]); diff --git a/routes/web/components.php b/routes/web/components.php index b467c090b5..f884a3b4ac 100644 --- a/routes/web/components.php +++ b/routes/web/components.php @@ -1,28 +1,26 @@ 'components','middleware' => ['auth'] ], function () { - +// Components +Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () { Route::get( '{componentID}/checkout', - [ 'as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@create' ] + ['as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@create'] ); Route::post( '{componentID}/checkout', - [ 'as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@store' ] + ['as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@store'] ); Route::get( '{componentID}/checkin', - [ 'as' => 'checkin/component', 'uses' => 'Components\ComponentCheckinController@create' ] + ['as' => 'checkin/component', 'uses' => 'Components\ComponentCheckinController@create'] ); Route::post( '{componentID}/checkin', - [ 'as' => 'component.checkin.save', 'uses' => 'Components\ComponentCheckinController@store' ] + ['as' => 'component.checkin.save', 'uses' => 'Components\ComponentCheckinController@store'] ); - }); Route::resource('components', 'Components\ComponentsController', [ 'middleware' => ['auth'], - 'parameters' => ['component' => 'component_id'] + 'parameters' => ['component' => 'component_id'], ]); diff --git a/routes/web/consumables.php b/routes/web/consumables.php index 8fbdded4bd..a51710e528 100644 --- a/routes/web/consumables.php +++ b/routes/web/consumables.php @@ -1,19 +1,18 @@ 'consumables', 'middleware' => ['auth']], function () { + // Consumables + Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function () { Route::get( '{consumableID}/checkout', - [ 'as' => 'checkout/consumable','uses' => 'Consumables\ConsumableCheckoutController@create' ] + ['as' => 'checkout/consumable', 'uses' => 'Consumables\ConsumableCheckoutController@create'] ); Route::post( '{consumableID}/checkout', - [ 'as' => 'checkout/consumable', 'uses' => 'Consumables\ConsumableCheckoutController@store' ] + ['as' => 'checkout/consumable', 'uses' => 'Consumables\ConsumableCheckoutController@store'] ); }); Route::resource('consumables', 'Consumables\ConsumablesController', [ 'middleware' => ['auth'], - 'parameters' => ['consumable' => 'consumable_id'] + 'parameters' => ['consumable' => 'consumable_id'], ]); diff --git a/routes/web/fields.php b/routes/web/fields.php index a2fedcfd93..091245921e 100644 --- a/routes/web/fields.php +++ b/routes/web/fields.php @@ -3,38 +3,33 @@ * Custom Fields Routes */ - - -Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () { - +Route::group(['prefix' => 'fields', 'middleware' => ['auth']], function () { Route::get('required/{fieldset_id}/{field_id}', ['uses' => 'CustomFieldsetsController@makeFieldRequired', - 'as' => 'fields.required'] + 'as' => 'fields.required', ] ); Route::get('optional/{fieldset_id}/{field_id}', ['uses' => 'CustomFieldsetsController@makeFieldOptional', - 'as' => 'fields.optional'] + 'as' => 'fields.optional', ] ); Route::get('{field_id}/fieldset/{fieldset_id}/disassociate', ['uses' => 'CustomFieldsController@deleteFieldFromFieldset', - 'as' => 'fields.disassociate'] + 'as' => 'fields.disassociate', ] ); Route::post('fieldsets/{id}/associate', ['uses' => 'CustomFieldsetsController@associate', - 'as' => 'fieldsets.associate'] + 'as' => 'fieldsets.associate', ] ); Route::resource('fieldsets', 'CustomFieldsetsController', [ - 'parameters' => ['fieldset' => 'field_id', 'field' => 'field_id'] + 'parameters' => ['fieldset' => 'field_id', 'field' => 'field_id'], ]); - - }); Route::resource('fields', 'CustomFieldsController', [ 'middleware' => ['auth'], - 'parameters' => ['field' => 'field_id', 'fieldset' => 'fieldset_id'] + 'parameters' => ['field' => 'field_id', 'fieldset' => 'fieldset_id'], ]); diff --git a/routes/web/hardware.php b/routes/web/hardware.php index a5d6258b3b..bd0302a2ea 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -9,187 +9,177 @@ */ Route::group( ['prefix' => 'hardware', - 'middleware' => ['auth']], + 'middleware' => ['auth'], ], function () { - - Route::get( 'bulkaudit', [ + Route::get('bulkaudit', [ 'as' => 'assets.bulkaudit', - 'uses' => 'Assets\AssetsController@quickScan' + 'uses' => 'Assets\AssetsController@quickScan', ]); - # Asset Maintenances + // Asset Maintenances Route::resource('maintenances', 'AssetMaintenancesController', [ - 'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'] + 'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'], ]); - Route::get('requested', [ 'as' => 'assets.requested', 'uses' => 'Assets\AssetsController@getRequestedIndex']); + Route::get('requested', ['as' => 'assets.requested', 'uses' => 'Assets\AssetsController@getRequestedIndex']); Route::get('scan', [ 'as' => 'asset.scan', - 'uses' => 'Assets\AssetsController@scan' + 'uses' => 'Assets\AssetsController@scan', ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit' + 'uses' => 'Assets\AssetsController@dueForAudit', ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit' + 'uses' => 'Assets\AssetsController@overdueForAudit', ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit' + 'uses' => 'Assets\AssetsController@dueForAudit', ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit' + 'uses' => 'Assets\AssetsController@overdueForAudit', ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit' + 'uses' => 'Assets\AssetsController@dueForAudit', ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit' + 'uses' => 'Assets\AssetsController@overdueForAudit', ]); Route::get('audit/{id}', [ 'as' => 'asset.audit.create', - 'uses' => 'Assets\AssetsController@audit' + 'uses' => 'Assets\AssetsController@audit', ]); Route::post('audit/{id}', [ 'as' => 'asset.audit.store', - 'uses' => 'Assets\AssetsController@auditStore' + 'uses' => 'Assets\AssetsController@auditStore', ]); - Route::get('history', [ 'as' => 'asset.import-history', - 'uses' => 'Assets\AssetsController@getImportHistory' + 'uses' => 'Assets\AssetsController@getImportHistory', ]); Route::post('history', [ 'as' => 'asset.process-import-history', - 'uses' => 'Assets\AssetsController@postImportHistory' + 'uses' => 'Assets\AssetsController@postImportHistory', ]); Route::get('bytag/{any?}', [ 'as' => 'findbytag/hardware', - 'uses' => 'Assets\AssetsController@getAssetByTag' + 'uses' => 'Assets\AssetsController@getAssetByTag', ] )->where('any', '.*'); Route::get('byserial/{any?}', [ 'as' => 'findbyserial/hardware', - 'uses' => 'Assets\AssetsController@getAssetBySerial' + 'uses' => 'Assets\AssetsController@getAssetBySerial', ] )->where('any', '.*'); - - Route::get('{assetId}/clone', [ 'as' => 'clone/hardware', - 'uses' => 'Assets\AssetsController@getClone' + 'uses' => 'Assets\AssetsController@getClone', ]); Route::get('{assetId}/label', [ 'as' => 'label/hardware', - 'uses' => 'Assets\AssetsController@getLabel' + 'uses' => 'Assets\AssetsController@getLabel', ]); Route::post('{assetId}/clone', 'Assets\AssetsController@postCreate'); Route::get('{assetId}/checkout', [ 'as' => 'checkout/hardware', - 'uses' => 'Assets\AssetCheckoutController@create' + 'uses' => 'Assets\AssetCheckoutController@create', ]); Route::post('{assetId}/checkout', [ 'as' => 'checkout/hardware', - 'uses' => 'Assets\AssetCheckoutController@store' + 'uses' => 'Assets\AssetCheckoutController@store', ]); Route::get('{assetId}/checkin/{backto?}', [ 'as' => 'checkin/hardware', - 'uses' => 'Assets\AssetCheckinController@create' + 'uses' => 'Assets\AssetCheckinController@create', ]); Route::post('{assetId}/checkin/{backto?}', [ 'as' => 'checkin/hardware', - 'uses' => 'Assets\AssetCheckinController@store' + 'uses' => 'Assets\AssetCheckinController@store', ]); Route::get('{assetId}/view', [ 'as' => 'hardware.view', - 'uses' => 'Assets\AssetsController@show' + 'uses' => 'Assets\AssetsController@show', ]); - Route::get('{assetId}/qr_code', [ 'as' => 'qr_code/hardware', 'uses' => 'Assets\AssetsController@getQrCode' ]); - Route::get('{assetId}/barcode', [ 'as' => 'barcode/hardware', 'uses' => 'Assets\AssetsController@getBarCode' ]); + Route::get('{assetId}/qr_code', ['as' => 'qr_code/hardware', 'uses' => 'Assets\AssetsController@getQrCode']); + Route::get('{assetId}/barcode', ['as' => 'barcode/hardware', 'uses' => 'Assets\AssetsController@getBarCode']); Route::get('{assetId}/restore', [ 'as' => 'restore/hardware', - 'uses' => 'Assets\AssetsController@getRestore' + 'uses' => 'Assets\AssetsController@getRestore', ]); Route::post('{assetId}/upload', [ 'as' => 'upload/asset', - 'uses' => 'Assets\AssetFilesController@store' + 'uses' => 'Assets\AssetFilesController@store', ]); Route::get('{assetId}/showfile/{fileId}/{download?}', [ 'as' => 'show/assetfile', - 'uses' => 'Assets\AssetFilesController@show' + 'uses' => 'Assets\AssetFilesController@show', ]); Route::delete('{assetId}/showfile/{fileId}/delete', [ 'as' => 'delete/assetfile', - 'uses' => 'Assets\AssetFilesController@destroy' + 'uses' => 'Assets\AssetFilesController@destroy', ]); - Route::post( 'bulkedit', [ 'as' => 'hardware/bulkedit', - 'uses' => 'Assets\BulkAssetsController@edit' + 'uses' => 'Assets\BulkAssetsController@edit', ] ); Route::post( 'bulkdelete', [ 'as' => 'hardware/bulkdelete', - 'uses' => 'Assets\BulkAssetsController@destroy' + 'uses' => 'Assets\BulkAssetsController@destroy', ] ); Route::post( 'bulksave', [ 'as' => 'hardware/bulksave', - 'uses' => 'Assets\BulkAssetsController@update' + 'uses' => 'Assets\BulkAssetsController@update', ] ); - # Bulk checkout / checkin - Route::get( 'bulkcheckout', [ + // Bulk checkout / checkin + Route::get('bulkcheckout', [ 'as' => 'hardware/bulkcheckout', - 'uses' => 'Assets\BulkAssetsController@showCheckout' + 'uses' => 'Assets\BulkAssetsController@showCheckout', ]); - Route::post( 'bulkcheckout', [ + Route::post('bulkcheckout', [ 'as' => 'hardware/bulkcheckout', - 'uses' => 'Assets\BulkAssetsController@storeCheckout' + 'uses' => 'Assets\BulkAssetsController@storeCheckout', ]); - - - - -}); - + }); Route::resource('hardware', 'Assets\AssetsController', [ 'middleware' => ['auth'], - 'parameters' => ['asset' => 'asset_id'] + 'parameters' => ['asset' => 'asset_id'], ]); diff --git a/routes/web/kits.php b/routes/web/kits.php index 50712aba43..a73392d26a 100644 --- a/routes/web/kits.php +++ b/routes/web/kits.php @@ -3,119 +3,114 @@ // Predefined Kit Management Route::resource('kits', 'Kits\PredefinedKitsController', [ 'middleware' => ['auth'], - 'parameters' => ['kit' => 'kit_id'] + 'parameters' => ['kit' => 'kit_id'], ]); +Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function () { - -Route::group([ 'prefix' => 'kits/{kit_id}', 'middleware' => ['auth'] ], function () { - - // Route::get('licenses', + // Route::get('licenses', // [ // 'as' => 'kits.licenses.index', // 'uses' => 'Kits\PredefinedKitsController@indexLicenses', // ] // ); - - Route::post('licenses', + + Route::post('licenses', [ 'as' => 'kits.licenses.store', 'uses' => 'Kits\PredefinedKitsController@storeLicense', ] ); - - Route::put('licenses/{license_id}', + + Route::put('licenses/{license_id}', [ 'as' => 'kits.licenses.update', 'uses' => 'Kits\PredefinedKitsController@updateLicense', ] ); - - Route::get('licenses/{license_id}/edit', + + Route::get('licenses/{license_id}/edit', [ 'as' => 'kits.licenses.edit', 'uses' => 'Kits\PredefinedKitsController@editLicense', - + ] ); - Route::delete('licenses/{license_id}', + Route::delete('licenses/{license_id}', [ 'as' => 'kits.licenses.detach', 'uses' => 'Kits\PredefinedKitsController@detachLicense', ] ); - // Models - - Route::put('models/{model_id}', + + Route::put('models/{model_id}', [ 'as' => 'kits.models.update', 'uses' => 'Kits\PredefinedKitsController@updateModel', - 'parameters' => [2 => 'kit_id', 1 => 'model_id'] - ] - ); - - Route::get('models/{model_id}/edit', - [ - 'as' => 'kits.models.edit', - 'uses' => 'Kits\PredefinedKitsController@editModel', - + 'parameters' => [2 => 'kit_id', 1 => 'model_id'], ] ); - Route::delete('models/{model_id}', + Route::get('models/{model_id}/edit', + [ + 'as' => 'kits.models.edit', + 'uses' => 'Kits\PredefinedKitsController@editModel', + + ] + ); + + Route::delete('models/{model_id}', [ 'as' => 'kits.models.detach', 'uses' => 'Kits\PredefinedKitsController@detachModel', ] ); - // Consumables - Route::put('consumables/{consumable_id}', + Route::put('consumables/{consumable_id}', [ 'as' => 'kits.consumables.update', 'uses' => 'Kits\PredefinedKitsController@updateConsumable', - 'parameters' => [2 => 'kit_id', 1 => 'consumable_id'] - ] - ); - - Route::get('consumables/{consumable_id}/edit', - [ - 'as' => 'kits.consumables.edit', - 'uses' => 'Kits\PredefinedKitsController@editConsumable', - + 'parameters' => [2 => 'kit_id', 1 => 'consumable_id'], ] ); - Route::delete('consumables/{consumable_id}', + Route::get('consumables/{consumable_id}/edit', + [ + 'as' => 'kits.consumables.edit', + 'uses' => 'Kits\PredefinedKitsController@editConsumable', + + ] + ); + + Route::delete('consumables/{consumable_id}', [ 'as' => 'kits.consumables.detach', 'uses' => 'Kits\PredefinedKitsController@detachConsumable', ] ); - // Accessories - Route::put('accessories/{accessory_id}', + Route::put('accessories/{accessory_id}', [ 'as' => 'kits.accessories.update', 'uses' => 'Kits\PredefinedKitsController@updateAccessory', - 'parameters' => [2 => 'kit_id', 1 => 'accessory_id'] + 'parameters' => [2 => 'kit_id', 1 => 'accessory_id'], ] ); - Route::get('accessories/{accessory_id}/edit', + Route::get('accessories/{accessory_id}/edit', [ 'as' => 'kits.accessories.edit', 'uses' => 'Kits\PredefinedKitsController@editAccessory', - + ] ); - Route::delete('accessories/{accessory_id}', + Route::delete('accessories/{accessory_id}', [ 'as' => 'kits.accessories.detach', 'uses' => 'Kits\PredefinedKitsController@detachAccessory', @@ -134,4 +129,4 @@ Route::group([ 'prefix' => 'kits/{kit_id}', 'middleware' => ['auth'] ], function 'uses' => 'Kits\CheckoutKitController@store', ] ); -}); // kits \ No newline at end of file +}); // kits diff --git a/routes/web/licenses.php b/routes/web/licenses.php index ce046c3a3c..4c3b01d955 100644 --- a/routes/web/licenses.php +++ b/routes/web/licenses.php @@ -1,48 +1,46 @@ 'licenses', 'middleware' => ['auth'] ], function () { - - Route::get('{licenseId}/clone', [ 'as' => 'clone/license', 'uses' => 'Licenses\LicensesController@getClone' ]); +// Licenses +Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () { + Route::get('{licenseId}/clone', ['as' => 'clone/license', 'uses' => 'Licenses\LicensesController@getClone']); Route::get('{licenseId}/freecheckout', [ 'as' => 'licenses.freecheckout', - 'uses' => 'Licenses\LicensesController@getFreeLicense' + 'uses' => 'Licenses\LicensesController@getFreeLicense', ]); Route::get('{licenseId}/checkout/{seatId?}', [ 'as' => 'licenses.checkout', - 'uses' => 'Licenses\LicenseCheckoutController@create' + 'uses' => 'Licenses\LicenseCheckoutController@create', ]); Route::post( '{licenseId}/checkout/{seatId?}', - [ 'as' => 'licenses.checkout', 'uses' => 'Licenses\LicenseCheckoutController@store' ] + ['as' => 'licenses.checkout', 'uses' => 'Licenses\LicenseCheckoutController@store'] ); Route::get('{licenseSeatId}/checkin/{backto?}', [ 'as' => 'licenses.checkin', - 'uses' => 'Licenses\LicenseCheckinController@create' + 'uses' => 'Licenses\LicenseCheckinController@create', ]); Route::post('{licenseId}/checkin/{backto?}', [ 'as' => 'licenses.checkin.save', - 'uses' => 'Licenses\LicenseCheckinController@store' + 'uses' => 'Licenses\LicenseCheckinController@store', ]); Route::post( '{licenseId}/upload', - [ 'as' => 'upload/license', 'uses' => 'Licenses\LicenseFilesController@store' ] + ['as' => 'upload/license', 'uses' => 'Licenses\LicenseFilesController@store'] ); Route::delete( '{licenseId}/deletefile/{fileId}', - [ 'as' => 'delete/licensefile', 'uses' => 'Licenses\LicenseFilesController@destroy' ] + ['as' => 'delete/licensefile', 'uses' => 'Licenses\LicenseFilesController@destroy'] ); Route::get( '{licenseId}/showfile/{fileId}/{download?}', - [ 'as' => 'show.licensefile', 'uses' => 'Licenses\LicenseFilesController@show' ] + ['as' => 'show.licensefile', 'uses' => 'Licenses\LicenseFilesController@show'] ); }); Route::resource('licenses', 'Licenses\LicensesController', [ 'middleware' => ['auth'], - 'parameters' => ['license' => 'license_id'] + 'parameters' => ['license' => 'license_id'], ]); diff --git a/routes/web/models.php b/routes/web/models.php index a491c395da..b9d861ab4c 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -1,19 +1,18 @@ 'models', 'middleware' => ['auth'] ], function () { - - Route::get('{modelId}/clone', [ 'as' => 'clone/model', 'uses' => 'AssetModelsController@getClone' ]); +// Asset Model Management +Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () { + Route::get('{modelId}/clone', ['as' => 'clone/model', 'uses' => 'AssetModelsController@getClone']); Route::post('{modelId}/clone', 'AssetModelsController@postCreate'); - Route::get('{modelId}/view', [ 'as' => 'view/model', 'uses' => 'AssetModelsController@getView' ]); - Route::get('{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser'] ]); - Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model','uses' => 'AssetModelsController@getCustomFields']); - Route::post('bulkedit', ['as' => 'models.bulkedit.index','uses' => 'BulkAssetModelsController@edit']); - Route::post('bulksave', ['as' => 'models.bulkedit.store','uses' => 'BulkAssetModelsController@update']); - Route::post('bulkdelete', ['as' => 'models.bulkdelete.store','uses' => 'BulkAssetModelsController@destroy']); + Route::get('{modelId}/view', ['as' => 'view/model', 'uses' => 'AssetModelsController@getView']); + Route::get('{modelID}/restore', ['as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser']]); + Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model', 'uses' => 'AssetModelsController@getCustomFields']); + Route::post('bulkedit', ['as' => 'models.bulkedit.index', 'uses' => 'BulkAssetModelsController@edit']); + Route::post('bulksave', ['as' => 'models.bulkedit.store', 'uses' => 'BulkAssetModelsController@update']); + Route::post('bulkdelete', ['as' => 'models.bulkdelete.store', 'uses' => 'BulkAssetModelsController@destroy']); }); Route::resource('models', 'AssetModelsController', [ 'middleware' => ['auth'], - 'parameters' => ['model' => 'model_id'] + 'parameters' => ['model' => 'model_id'], ]); diff --git a/routes/web/users.php b/routes/web/users.php index fd0ef77158..0856788a44 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -1,22 +1,20 @@ 'users', 'middleware' => ['auth']], function () { - - Route::get('ldap', ['as' => 'ldap/user', 'uses' => 'Users\LDAPImportController@create' ]); +// User Management +Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () { + Route::get('ldap', ['as' => 'ldap/user', 'uses' => 'Users\LDAPImportController@create']); Route::post('ldap', 'Users\LDAPImportController@store'); - Route::get('export', [ 'as' => 'users.export', 'uses' => 'Users\UsersController@getExportUserCsv' ]); - Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'Users\UsersController@getClone' ]); - Route::post('{userId}/clone', [ 'uses' => 'Users\UsersController@postCreate' ]); - Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore' ]); - Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'Users\UsersController@getUnsuspend' ]); - Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'Users\UserFilesController@store' ]); + Route::get('export', ['as' => 'users.export', 'uses' => 'Users\UsersController@getExportUserCsv']); + Route::get('{userId}/clone', ['as' => 'clone/user', 'uses' => 'Users\UsersController@getClone']); + Route::post('{userId}/clone', ['uses' => 'Users\UsersController@postCreate']); + Route::get('{userId}/restore', ['as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore']); + Route::get('{userId}/unsuspend', ['as' => 'unsuspend/user', 'uses' => 'Users\UsersController@getUnsuspend']); + Route::post('{userId}/upload', ['as' => 'upload/user', 'uses' => 'Users\UserFilesController@store']); Route::delete( '{userId}/deletefile/{fileId}', - [ 'as' => 'userfile.destroy', 'uses' => 'Users\UserFilesController@destroy' ] + ['as' => 'userfile.destroy', 'uses' => 'Users\UserFilesController@destroy'] ); - Route::post( '{userId}/password', [ @@ -24,17 +22,15 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['auth']], function () { 'uses' => 'Users\UsersController@sendPasswordReset', ] ); - Route::get( '{userId}/print', - [ 'as' => 'users.print', 'uses' => 'Users\UsersController@printInventory' ] + ['as' => 'users.print', 'uses' => 'Users\UsersController@printInventory'] ); - Route::get( '{userId}/showfile/{fileId}', - [ 'as' => 'show/userfile', 'uses' => 'Users\UserFilesController@show' ] + ['as' => 'show/userfile', 'uses' => 'Users\UserFilesController@show'] ); Route::post( @@ -58,11 +54,9 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['auth']], function () { 'uses' => 'Users\BulkUsersController@update', ] ); - - }); Route::resource('users', 'Users\UsersController', [ 'middleware' => ['auth'], - 'parameters' => ['user' => 'user_id'] + 'parameters' => ['user' => 'user_id'], ]); diff --git a/tests/TestCase.php b/tests/TestCase.php index 7b3c65c174..d78f9c02f2 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -18,10 +18,10 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase { $app = require __DIR__.'/../bootstrap/app.php'; $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap(); + return $app; } - public function setUp() { parent::setUp(); diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index 243f9c85bc..074505f279 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -1,2 +1,3 @@ loadSessionSnapshot('login')) return; + // if snapshot exists - skipping login + //if ($I->loadSessionSnapshot('login')) return; - // logging in - $I->amOnPage('/login'); - $I->fillField('username', 'snipe'); - $I->fillField('password', 'password'); - $I->click('Login'); - //$I->saveSessionSnapshot('login'); + // logging in + $I->amOnPage('/login'); + $I->fillField('username', 'snipe'); + $I->fillField('password', 'password'); + $I->click('Login'); + //$I->saveSessionSnapshot('login'); } } diff --git a/tests/_support/ApiTester.php b/tests/_support/ApiTester.php index 1d6f6f18ff..f76364bc19 100644 --- a/tests/_support/ApiTester.php +++ b/tests/_support/ApiTester.php @@ -1,6 +1,5 @@ createPersonalAccessClient($user->id, 'Codeception API Test Client', @@ -54,6 +52,7 @@ class ApiTester extends \Codeception\Actor { unset($array['created_at']); unset($array['updated_at']); + return $array; } } diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index 937ce41d8c..603e5e1af8 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -14,7 +14,6 @@ use App\Models\Manufacturer; use App\Models\Supplier; use App\Models\User; - /** * Inherited Methods * @method void wantToTest($text) @@ -29,33 +28,32 @@ use App\Models\Manufacturer; * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL) * * @SuppressWarnings(PHPMD) -*/ + */ class FunctionalTester extends \Codeception\Actor { use _generated\FunctionalTesterActions; - /** - * Define custom actions here - */ - + /** + * Define custom actions here + */ public function getCompanyId() { - return Company::inRandomOrder()->first()->id; + return Company::inRandomOrder()->first()->id; } public function getCategoryId() { - return Category::inRandomOrder()->first()->id; + return Category::inRandomOrder()->first()->id; } public function getManufacturerId() { - return Manufacturer::inRandomOrder()->first()->id; + return Manufacturer::inRandomOrder()->first()->id; } public function getLocationId() { - return Location::inRandomOrder()->first()->id; + return Location::inRandomOrder()->first()->id; } /** @@ -63,7 +61,7 @@ class FunctionalTester extends \Codeception\Actor */ public function getAccessoryId() { - return Accessory::inRandomOrder()->first()->id; + return Accessory::inRandomOrder()->first()->id; } /** diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php index 65b94215e3..2dd1562b13 100644 --- a/tests/_support/Helper/Acceptance.php +++ b/tests/_support/Helper/Acceptance.php @@ -1,4 +1,5 @@ */ - namespace Helper; use Codeception\TestCase; @@ -61,25 +60,25 @@ class HTMLValidator extends \Codeception\Module private function validateByVNU($html) { $javaPath = $this->_getConfig('javaPath'); - if (!$javaPath) { + if (! $javaPath) { $javaPath = 'java'; } $vnuPath = $this->_getConfig('vnuPath'); - if (!$vnuPath) { + if (! $vnuPath) { $vnuPath = '/usr/local/bin/vnu.jar'; } - $filename = DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . uniqid('html-validate') . '.html'; + $filename = DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.uniqid('html-validate').'.html'; file_put_contents($filename, $html); - exec($javaPath . " -Xss1024k -jar " . $vnuPath . " --format json " . $filename . " 2>&1", $return); + exec($javaPath.' -Xss1024k -jar '.$vnuPath.' --format json '.$filename.' 2>&1', $return); $data = json_decode($return[0], true); - if (!$data || !isset($data['messages']) || !is_array($data['messages'])) { - throw new \Exception('Invalid data returned from validation service: ' . $return); + if (! $data || ! isset($data['messages']) || ! is_array($data['messages'])) { + throw new \Exception('Invalid data returned from validation service: '.$return); } + return $data['messages']; } - /** * @return string * @throws \Codeception\Exception\ModuleException @@ -87,12 +86,13 @@ class HTMLValidator extends \Codeception\Module */ private function getPageSource() { - if (!$this->hasModule('WebDriver')) { + if (! $this->hasModule('WebDriver')) { throw new \Exception('This validator needs WebDriver to work'); } /** @var \Codeception\Module\WebDriver $webdriver */ $webdriver = $this->getModule('WebDriver'); + return $webdriver->webDriver->getPageSource(); } @@ -106,27 +106,28 @@ class HTMLValidator extends \Codeception\Module $messages = $this->validateByVNU($source); } catch (\Exception $e) { $this->fail($e->getMessage()); + return; } $failMessages = []; - $lines = explode("\n", $source); + $lines = explode("\n", $source); foreach ($messages as $message) { if ($message['type'] == 'error') { - $formattedMsg = '- Line ' . $message['lastLine'] . ', column ' . $message['lastColumn'] . ': ' . - $message['message'] . "\n > " . $lines[$message['lastLine'] - 1]; - $ignoring = false; + $formattedMsg = '- Line '.$message['lastLine'].', column '.$message['lastColumn'].': '. + $message['message']."\n > ".$lines[$message['lastLine'] - 1]; + $ignoring = false; foreach ($ignoreMessages as $ignoreMessage) { if (mb_stripos($formattedMsg, $ignoreMessage) !== false) { $ignoring = true; } } - if (!$ignoring) { + if (! $ignoring) { $failMessages[] = $formattedMsg; } } } if (count($failMessages) > 0) { - \PHPUnit_Framework_Assert::fail('Invalid HTML: ' . "\n" . implode("\n", $failMessages)); + \PHPUnit_Framework_Assert::fail('Invalid HTML: '."\n".implode("\n", $failMessages)); } } } diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php index 6064d37327..4d27aa3599 100644 --- a/tests/_support/Helper/Unit.php +++ b/tests/_support/Helper/Unit.php @@ -1,4 +1,5 @@ wantTo('ensure that the accessories listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/accessories'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="accessories"] tr', [5,30]); +$I->seeNumberOfElements('table[name="accessories"] tr', [5, 30]); $I->seeInTitle('Accessories'); $I->see('Accessories'); $I->seeInPageSource('accessories/create'); diff --git a/tests/acceptance/AssetsCept.php b/tests/acceptance/AssetsCept.php index a4b4c81efb..6cc39e028c 100644 --- a/tests/acceptance/AssetsCept.php +++ b/tests/acceptance/AssetsCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -7,14 +8,13 @@ $I->amGoingTo('go to the assets listing page'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/hardware'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="assets"] tr', [5,50]); +$I->seeNumberOfElements('table[name="assets"] tr', [5, 50]); $I->seeInTitle('Assets'); $I->see('Assets'); $I->seeInPageSource('hardware/create'); $I->dontSee('Assets', '.page-header'); $I->see('Assets', 'h1.pull-left'); - /* Create Form */ $I->wantTo('ensure that the create assets form loads without errors'); $I->lookForwardTo('seeing it load without errors'); diff --git a/tests/acceptance/AssetsCest.php b/tests/acceptance/AssetsCest.php index 6939f007da..51011ce830 100644 --- a/tests/acceptance/AssetsCest.php +++ b/tests/acceptance/AssetsCest.php @@ -1,4 +1,4 @@ -am('logged in user'); @@ -16,7 +15,7 @@ class AssetsCest $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/hardware'); $I->waitForElement('.table', 20); // secs - $I->seeNumberOfElements('table[name="assets"] tr', [5,50]); + $I->seeNumberOfElements('table[name="assets"] tr', [5, 50]); $I->seeInTitle(trans('general.assets')); $I->see(trans('general.assets')); $I->seeInPageSource('hardware/create'); diff --git a/tests/acceptance/CategoriesCept.php b/tests/acceptance/CategoriesCept.php index 06d9074105..75a6d2be11 100644 --- a/tests/acceptance/CategoriesCept.php +++ b/tests/acceptance/CategoriesCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -6,7 +7,7 @@ $I->wantTo('ensure that the categories listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/categories'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="categories"] tr', [5,30]); +$I->seeNumberOfElements('table[name="categories"] tr', [5, 30]); $I->seeInTitle('Categories'); $I->see('Categories'); $I->seeInPageSource('/categories/create'); diff --git a/tests/acceptance/CompaniesCept.php b/tests/acceptance/CompaniesCept.php index 139e960185..98a06a6bfb 100644 --- a/tests/acceptance/CompaniesCept.php +++ b/tests/acceptance/CompaniesCept.php @@ -1,4 +1,5 @@ wantTo('ensure that the company listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/companies'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="companies"] tr', [5,30]); +$I->seeNumberOfElements('table[name="companies"] tr', [5, 30]); $I->seeInTitle('Companies'); $I->see('Companies'); $I->seeInPageSource('companies/create'); diff --git a/tests/acceptance/ConsumablesCept.php b/tests/acceptance/ConsumablesCept.php index 42d6d58293..9461c232c3 100644 --- a/tests/acceptance/ConsumablesCept.php +++ b/tests/acceptance/ConsumablesCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -6,7 +7,7 @@ $I->wantTo('ensure that the consumables listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/consumables'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="consumables"] tr', [5,30]); +$I->seeNumberOfElements('table[name="consumables"] tr', [5, 30]); $I->seeInTitle('Consumables'); $I->see('Consumables'); $I->seeInPageSource('/consumables/create'); diff --git a/tests/acceptance/CustomfieldsCept.php b/tests/acceptance/CustomfieldsCept.php index c17ef60c3a..9526316999 100644 --- a/tests/acceptance/CustomfieldsCept.php +++ b/tests/acceptance/CustomfieldsCept.php @@ -1,4 +1,5 @@ am('logged in user'); diff --git a/tests/acceptance/DepartmentsCept.php b/tests/acceptance/DepartmentsCept.php index 6549eac7ce..e9f6fd6b9c 100644 --- a/tests/acceptance/DepartmentsCept.php +++ b/tests/acceptance/DepartmentsCept.php @@ -1,4 +1,5 @@ wantTo('ensure that the department listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/departments'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="departments"] tr', [5,30]); +$I->seeNumberOfElements('table[name="departments"] tr', [5, 30]); $I->seeInTitle('Departments'); $I->see('Departments'); $I->seeInPageSource('departments/create'); diff --git a/tests/acceptance/DepreciationsCept.php b/tests/acceptance/DepreciationsCept.php index 710e36ac32..d0f43ad4e5 100644 --- a/tests/acceptance/DepreciationsCept.php +++ b/tests/acceptance/DepreciationsCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -8,7 +9,7 @@ $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/depreciations'); $I->seeInTitle('Depreciations'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="depreciations"] tbody tr', [1,5]); +$I->seeNumberOfElements('table[name="depreciations"] tbody tr', [1, 5]); $I->seeInPageSource('/depreciations/create'); $I->dontSee('Depreciations', '.page-header'); $I->see('Depreciations', 'h1.pull-left'); diff --git a/tests/acceptance/LocationsCept.php b/tests/acceptance/LocationsCept.php index 31c33a4c21..600b5c2822 100644 --- a/tests/acceptance/LocationsCept.php +++ b/tests/acceptance/LocationsCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -6,14 +7,13 @@ $I->wantTo('ensure that the locations listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/locations'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('tr', [5,30]); +$I->seeNumberOfElements('tr', [5, 30]); $I->seeInTitle('Locations'); $I->see('Locations'); $I->seeInPageSource('/locations/create'); $I->dontSee('Locations', '.page-header'); $I->see('Locations', 'h1.pull-left'); - /* Create Form */ $I->wantTo('ensure that the create location form loads without errors'); $I->lookForwardTo('seeing it load without errors'); diff --git a/tests/acceptance/ManufacturersCept.php b/tests/acceptance/ManufacturersCept.php index 3aed82c1da..69d0c0e6da 100644 --- a/tests/acceptance/ManufacturersCept.php +++ b/tests/acceptance/ManufacturersCept.php @@ -1,18 +1,18 @@ am('logged in user'); $I->wantTo('ensure that the manufacturers listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/manufacturers'); -$I->seeNumberOfElements('table[name="manufacturers"] tr', [5,30]); +$I->seeNumberOfElements('table[name="manufacturers"] tr', [5, 30]); $I->see('Manufacturers'); $I->seeInTitle('Manufacturers'); $I->seeInPageSource('manufacturers/create'); $I->dontSee('Manufacturers', '.page-header'); $I->see('Manufacturers', 'h1.pull-left'); - /* Create Form */ $I->wantTo('ensure that the create manufacturer form loads without errors'); $I->lookForwardTo('seeing it load without errors'); diff --git a/tests/acceptance/StatuslabelsCept.php b/tests/acceptance/StatuslabelsCept.php index 70b97c26b2..224a713250 100644 --- a/tests/acceptance/StatuslabelsCept.php +++ b/tests/acceptance/StatuslabelsCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -6,7 +7,7 @@ $I->wantTo('ensure the status labels listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/statuslabels'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('tr', [1,30]); +$I->seeNumberOfElements('tr', [1, 30]); $I->seeInTitle('Status Labels'); $I->see('Status Labels'); $I->seeInPageSource('statuslabels/create'); diff --git a/tests/acceptance/SuppliersCept.php b/tests/acceptance/SuppliersCept.php index 0aed96cf9f..59840dfd9d 100644 --- a/tests/acceptance/SuppliersCept.php +++ b/tests/acceptance/SuppliersCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -6,7 +7,7 @@ $I->wantTo('ensure that the suppliers listing page loads without errors'); $I->lookForwardTo('seeing it load without errors'); $I->amOnPage('/suppliers'); $I->waitForElement('.table', 5); // secs -$I->seeNumberOfElements('table[name="suppliers"] tr', [5,25]); +$I->seeNumberOfElements('table[name="suppliers"] tr', [5, 25]); $I->seeInTitle('Suppliers'); $I->see('Suppliers'); $I->seeInPageSource('suppliers/create'); diff --git a/tests/acceptance/UsersCept.php b/tests/acceptance/UsersCept.php index 85d695b3eb..0c25a263d6 100644 --- a/tests/acceptance/UsersCept.php +++ b/tests/acceptance/UsersCept.php @@ -1,4 +1,5 @@ am('logged in user'); @@ -15,7 +16,6 @@ $I->dontSee('Users', '.page-header'); $I->see('Users', 'h1.pull-left'); $I->seeLink('Create New'); // matches Logout - /* Create form */ $I->am('logged in admin'); $I->wantTo('ensure that you get errors when you submit an incomplete form'); @@ -33,7 +33,6 @@ $I->submitForm('#userForm', [ $I->seeElement('.alert-danger'); $I->dontSeeInSource('<br><'); - /* Submit form and expect errors */ $I->click(['name' => 'email']); $I->click(['name' => 'username']); @@ -47,8 +46,6 @@ $I->submitForm('#userForm', [ $I->seeElement('.alert-danger'); $I->dontSeeInSource('<br><'); - - /* Submit form and expect success */ $I->wantTo('submit the form successfully'); $I->click(['name' => 'email']); diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php index 8a88555806..62817a53c4 100644 --- a/tests/acceptance/_bootstrap.php +++ b/tests/acceptance/_bootstrap.php @@ -1,2 +1,3 @@ wantTo('Get a list of accessories'); // call @@ -41,8 +40,8 @@ class ApiAccessoriesCest $I->wantTo('Create a new accessory'); $temp_accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->make([ - 'name' => "Test Accessory Name", - 'company_id' => 2 + 'name' => 'Test Accessory Name', + 'company_id' => 2, ]); // setup @@ -68,6 +67,7 @@ class ApiAccessoriesCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateAccessoryWithPatch(ApiTester $I, $scenario) { @@ -77,13 +77,13 @@ class ApiAccessoriesCest $accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ 'name' => 'Original Accessory Name', 'company_id' => 2, - 'location_id' => 3 + 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Accessory::class, $accessory); $temp_accessory = factory(\App\Models\Accessory::class)->states('microsoft-mouse')->make([ 'company_id' => 3, - 'name' => "updated accessory name", + 'name' => 'updated accessory name', 'location_id' => 1, ]); @@ -105,7 +105,7 @@ class ApiAccessoriesCest $I->assertNotEquals($accessory->name, $data['name']); // update - $I->sendPATCH('/accessories/' . $accessory->id, $data); + $I->sendPATCH('/accessories/'.$accessory->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -121,7 +121,7 @@ class ApiAccessoriesCest $temp_accessory->updated_at = Carbon::parse($response->payload->updated_at); $temp_accessory->id = $accessory->id; // verify - $I->sendGET('/accessories/' . $accessory->id); + $I->sendGET('/accessories/'.$accessory->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new AccessoriesTransformer)->transformAccessory($temp_accessory)); @@ -134,12 +134,12 @@ class ApiAccessoriesCest // create $accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Accessory::class, $accessory); // delete - $I->sendDELETE('/accessories/' . $accessory->id); + $I->sendDELETE('/accessories/'.$accessory->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -148,7 +148,7 @@ class ApiAccessoriesCest $I->assertEquals(trans('admin/accessories/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/accessories/' . $accessory->id); + $I->sendGET('/accessories/'.$accessory->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiAssetsCest.php b/tests/api/ApiAssetsCest.php index cfa5a9645b..dd102a19fc 100644 --- a/tests/api/ApiAssetsCest.php +++ b/tests/api/ApiAssetsCest.php @@ -16,14 +16,13 @@ class ApiAssetsCest { $this->faker = \Faker\Factory::create(); $this->user = \App\Models\User::find(1); - Setting::getSettings()->time_display_format = "H:i"; + Setting::getSettings()->time_display_format = 'H:i'; $I->amBearerAuthenticated($I->getToken($this->user)); } /** @test */ public function indexAssets(ApiTester $I) { - $I->wantTo('Get a list of assets'); // call @@ -48,8 +47,8 @@ class ApiAssetsCest $I->wantTo('Create a new asset'); $temp_asset = factory(\App\Models\Asset::class)->states('laptop-mbp')->make([ - 'asset_tag' => "Test Asset Tag", - 'company_id' => 2 + 'asset_tag' => 'Test Asset Tag', + 'company_id' => 2, ]); // setup @@ -84,13 +83,13 @@ class ApiAssetsCest // create $asset = factory(\App\Models\Asset::class)->states('laptop-mbp')->create([ 'company_id' => 2, - 'rtd_location_id' => 3 + 'rtd_location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Asset::class, $asset); $temp_asset = factory(\App\Models\Asset::class)->states('laptop-air')->make([ 'company_id' => 3, - 'name' => "updated asset name", + 'name' => 'updated asset name', 'rtd_location_id' => 1, ]); @@ -115,7 +114,7 @@ class ApiAssetsCest $I->assertNotEquals($asset->name, $data['name']); // update - $I->sendPATCH('/hardware/' . $asset->id, $data); + $I->sendPATCH('/hardware/'.$asset->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -133,7 +132,7 @@ class ApiAssetsCest $temp_asset->location_id = $response->payload->rtd_location_id; // verify - $I->sendGET('/hardware/' . $asset->id); + $I->sendGET('/hardware/'.$asset->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new AssetsTransformer)->transformAsset($temp_asset)); @@ -149,7 +148,7 @@ class ApiAssetsCest $I->assertInstanceOf(\App\Models\Asset::class, $asset); // delete - $I->sendDELETE('/hardware/' . $asset->id); + $I->sendDELETE('/hardware/'.$asset->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -158,7 +157,7 @@ class ApiAssetsCest $I->assertEquals(trans('admin/hardware/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/hardware/' . $asset->id); + $I->sendGET('/hardware/'.$asset->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); diff --git a/tests/api/ApiCategoriesCest.php b/tests/api/ApiCategoriesCest.php index d844f45e99..e51aad5a0a 100644 --- a/tests/api/ApiCategoriesCest.php +++ b/tests/api/ApiCategoriesCest.php @@ -21,7 +21,6 @@ class ApiCategoriesCest /** @test */ public function indexCategorys(ApiTester $I) { - $I->wantTo('Get a list of categories'); // call @@ -31,7 +30,7 @@ class ApiCategoriesCest $response = json_decode($I->grabResponse(), true); // sample verify - $category = App\Models\Category::withCount('assets as assets_count','accessories as accessories_count','consumables as consumables_count','components as components_count','licenses as licenses_count') + $category = App\Models\Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count') ->orderByDesc('created_at')->take(10)->get()->shuffle()->first(); $I->seeResponseContainsJson($I->removeTimestamps((new CategoriesTransformer)->transformCategory($category))); } @@ -42,7 +41,7 @@ class ApiCategoriesCest $I->wantTo('Create a new category'); $temp_category = factory(\App\Models\Category::class)->states('asset-laptop-category')->make([ - 'name' => "Test Category Tag", + 'name' => 'Test Category Tag', ]); // setup @@ -63,6 +62,7 @@ class ApiCategoriesCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateCategoryWithPatch(ApiTester $I, $scenario) { @@ -77,7 +77,7 @@ class ApiCategoriesCest $temp_category = factory(\App\Models\Category::class) ->states('accessory-mouse-category')->make([ - 'name' => "updated category name", + 'name' => 'updated category name', ]); $data = [ @@ -92,7 +92,7 @@ class ApiCategoriesCest $I->assertNotEquals($category->name, $data['name']); // update - $I->sendPATCH('/categories/' . $category->id, $data); + $I->sendPATCH('/categories/'.$category->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -108,11 +108,10 @@ class ApiCategoriesCest $temp_category->id = $category->id; // verify - $I->sendGET('/categories/' . $category->id); + $I->sendGET('/categories/'.$category->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new CategoriesTransformer)->transformCategory($temp_category)); - } /** @test */ @@ -122,12 +121,12 @@ class ApiCategoriesCest // create $category = factory(\App\Models\Category::class)->states('asset-laptop-category')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Category::class, $category); // delete - $I->sendDELETE('/categories/' . $category->id); + $I->sendDELETE('/categories/'.$category->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -136,7 +135,7 @@ class ApiCategoriesCest $I->assertEquals(trans('admin/categories/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/categories/' . $category->id); + $I->sendGET('/categories/'.$category->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiCheckoutAssetsCest.php b/tests/api/ApiCheckoutAssetsCest.php index e9588b38f8..77c77615f6 100644 --- a/tests/api/ApiCheckoutAssetsCest.php +++ b/tests/api/ApiCheckoutAssetsCest.php @@ -20,17 +20,18 @@ class ApiCheckoutAssetsCest } /** @test */ - public function checkoutAssetToUser(ApiTester $I) { + public function checkoutAssetToUser(ApiTester $I) + { $I->wantTo('Check out an asset to a user'); //Grab an asset from the database that isn't checked out. $asset = Asset::whereNull('assigned_to')->first(); $targetUser = factory('App\Models\User')->create(); $data = [ 'assigned_user' => $targetUser->id, - 'note' => "This is a test checkout note", - 'expected_checkin' => "2018-05-24", - 'name' => "Updated Asset Name", - 'checkout_to_type' => 'user' + 'note' => 'This is a test checkout note', + 'expected_checkin' => '2018-05-24', + 'name' => 'Updated Asset Name', + 'checkout_to_type' => 'user', ]; $I->sendPOST("/hardware/{$asset->id}/checkout", $data); $I->seeResponseIsJson(); @@ -45,28 +46,28 @@ class ApiCheckoutAssetsCest $I->seeResponseContainsJson([ 'assigned_to' => [ 'id' => $targetUser->id, - 'type' => 'user' + 'type' => 'user', ], - 'name' => "Updated Asset Name", - 'expected_checkin' => Helper::getFormattedDateObject('2018-05-24', 'date') + 'name' => 'Updated Asset Name', + 'expected_checkin' => Helper::getFormattedDateObject('2018-05-24', 'date'), ]); - } - /** @test */ - public function checkoutAssetToAsset(ApiTester $I) { + /** @test */ + public function checkoutAssetToAsset(ApiTester $I) + { $I->wantTo('Check out an asset to an asset'); //Grab an asset from the database that isn't checked out. $asset = Asset::whereNull('assigned_to') - ->where('model_id',8) + ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance $targetAsset = factory('App\Models\Asset')->states('desktop-macpro')->create([ - 'name' => "Test Asset For Checkout to" + 'name' => 'Test Asset For Checkout to', ]); $data = [ 'assigned_asset' => $targetAsset->id, - 'checkout_to_type' => 'asset' + 'checkout_to_type' => 'asset', ]; $I->sendPOST("/hardware/{$asset->id}/checkout", $data); $I->seeResponseIsJson(); @@ -81,26 +82,26 @@ class ApiCheckoutAssetsCest $I->seeResponseContainsJson([ 'assigned_to' => [ 'id' => $targetAsset->id, - 'type' => 'asset' - ] + 'type' => 'asset', + ], ]); - } - /** @test */ - public function checkoutAssetToLocation(ApiTester $I) { + /** @test */ + public function checkoutAssetToLocation(ApiTester $I) + { $I->wantTo('Check out an asset to an asset'); //Grab an asset from the database that isn't checked out. $asset = Asset::whereNull('assigned_to') - ->where('model_id',8) + ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance $targetLocation = factory('App\Models\Location')->create([ - 'name' => "Test Location for Checkout" + 'name' => 'Test Location for Checkout', ]); $data = [ 'assigned_location' => $targetLocation->id, - 'checkout_to_type' => 'location' + 'checkout_to_type' => 'location', ]; $I->sendPOST("/hardware/{$asset->id}/checkout", $data); $I->seeResponseIsJson(); @@ -115,20 +116,20 @@ class ApiCheckoutAssetsCest $I->seeResponseContainsJson([ 'assigned_to' => [ 'id' => $targetLocation->id, - 'type' => 'location' - ] + 'type' => 'location', + ], ]); - } /** @test */ - public function checkinAsset(ApiTester $I) { + public function checkinAsset(ApiTester $I) + { $I->wantTo('Checkin an asset that is currently checked out'); $asset = Asset::whereNotNull('assigned_to')->first(); $I->sendPOST("/hardware/{$asset->id}/checkin", [ - "note" => "Checkin Note" + 'note' => 'Checkin Note', ]); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -140,7 +141,7 @@ class ApiCheckoutAssetsCest // Verify $I->sendGET("/hardware/{$asset->id}"); $I->seeResponseContainsJson([ - 'assigned_to' => null + 'assigned_to' => null, ]); } } diff --git a/tests/api/ApiCompaniesCest.php b/tests/api/ApiCompaniesCest.php index a6ad1345e7..17ac7c1714 100644 --- a/tests/api/ApiCompaniesCest.php +++ b/tests/api/ApiCompaniesCest.php @@ -21,7 +21,6 @@ class ApiCompaniesCest /** @test */ public function indexCompanys(ApiTester $I) { - $I->wantTo('Get a list of companies'); // call @@ -32,7 +31,7 @@ class ApiCompaniesCest $response = json_decode($I->grabResponse(), true); // dd($response); // sample verify - $company = App\Models\Company::withCount('assets as assets_count','licenses as licenses_count','accessories as accessories_count','consumables as consumables_count','components as components_count','users as users_count') + $company = App\Models\Company::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count') ->orderByDesc('created_at')->take(10)->get()->shuffle()->first(); $I->seeResponseContainsJson($I->removeTimestamps((new CompaniesTransformer)->transformCompany($company))); @@ -44,7 +43,7 @@ class ApiCompaniesCest $I->wantTo('Create a new company'); $temp_company = factory(\App\Models\Company::class)->make([ - 'name' => "Test Company Tag", + 'name' => 'Test Company Tag', ]); // setup @@ -60,6 +59,7 @@ class ApiCompaniesCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateCompanyWithPatch(ApiTester $I, $scenario) { @@ -72,7 +72,7 @@ class ApiCompaniesCest $I->assertInstanceOf(\App\Models\Company::class, $company); $temp_company = factory(\App\Models\Company::class)->make([ - 'name' => "updated company name", + 'name' => 'updated company name', ]); $data = [ @@ -82,7 +82,7 @@ class ApiCompaniesCest $I->assertNotEquals($company->name, $data['name']); // update - $I->sendPATCH('/companies/' . $company->id, $data); + $I->sendPATCH('/companies/'.$company->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -98,11 +98,10 @@ class ApiCompaniesCest $temp_company->id = $company->id; // verify - $I->sendGET('/companies/' . $company->id); + $I->sendGET('/companies/'.$company->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new CompaniesTransformer)->transformCompany($temp_company)); - } /** @test */ @@ -112,12 +111,12 @@ class ApiCompaniesCest // create $company = factory(\App\Models\Company::class)->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Company::class, $company); // delete - $I->sendDELETE('/companies/' . $company->id); + $I->sendDELETE('/companies/'.$company->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -126,7 +125,7 @@ class ApiCompaniesCest $I->assertEquals(trans('admin/companies/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/companies/' . $company->id); + $I->sendGET('/companies/'.$company->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiComponentsCest.php b/tests/api/ApiComponentsCest.php index 006b19e876..8f9b50b044 100644 --- a/tests/api/ApiComponentsCest.php +++ b/tests/api/ApiComponentsCest.php @@ -41,8 +41,8 @@ class ApiComponentsCest $I->wantTo('Create a new component'); $temp_component = factory(\App\Models\Component::class)->states('ram-crucial4')->make([ - 'name' => "Test Component Name", - 'company_id' => 2 + 'name' => 'Test Component Name', + 'company_id' => 2, ]); // setup @@ -57,7 +57,7 @@ class ApiComponentsCest 'purchase_cost' => $temp_component->purchase_cost, 'purchase_date' => $temp_component->purchase_date, 'qty' => $temp_component->qty, - 'serial' => $temp_component->serial + 'serial' => $temp_component->serial, ]; // create @@ -68,6 +68,7 @@ class ApiComponentsCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateComponentWithPatch(ApiTester $I, $scenario) { @@ -77,13 +78,13 @@ class ApiComponentsCest $component = factory(\App\Models\Component::class)->states('ram-crucial4')->create([ 'name' => 'Original Component Name', 'company_id' => 2, - 'location_id' => 3 + 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Component::class, $component); $temp_component = factory(\App\Models\Component::class)->states('ssd-crucial240')->make([ 'company_id' => 3, - 'name' => "updated component name", + 'name' => 'updated component name', 'location_id' => 1, ]); @@ -103,7 +104,7 @@ class ApiComponentsCest $I->assertNotEquals($component->name, $data['name']); // update - $I->sendPATCH('/components/' . $component->id, $data); + $I->sendPATCH('/components/'.$component->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -119,7 +120,7 @@ class ApiComponentsCest $temp_component->updated_at = Carbon::parse($response->payload->updated_at); $temp_component->id = $component->id; // verify - $I->sendGET('/components/' . $component->id); + $I->sendGET('/components/'.$component->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new ComponentsTransformer)->transformComponent($temp_component)); @@ -132,12 +133,12 @@ class ApiComponentsCest // create $component = factory(\App\Models\Component::class)->states('ram-crucial4')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Component::class, $component); // delete - $I->sendDELETE('/components/' . $component->id); + $I->sendDELETE('/components/'.$component->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -147,7 +148,7 @@ class ApiComponentsCest $I->assertEquals(trans('admin/components/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/components/' . $component->id); + $I->sendGET('/components/'.$component->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); diff --git a/tests/api/ApiConsumablesCest.php b/tests/api/ApiConsumablesCest.php index 73b431102c..9f453f4f1b 100644 --- a/tests/api/ApiConsumablesCest.php +++ b/tests/api/ApiConsumablesCest.php @@ -41,8 +41,8 @@ class ApiConsumablesCest $I->wantTo('Create a new consumable'); $temp_consumable = factory(\App\Models\Consumable::class)->states('ink')->make([ - 'name' => "Test Consumable Name", - 'company_id' => 2 + 'name' => 'Test Consumable Name', + 'company_id' => 2, ]); // setup @@ -67,6 +67,7 @@ class ApiConsumablesCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateConsumableWithPatch(ApiTester $I, $scenario) { @@ -76,13 +77,13 @@ class ApiConsumablesCest $consumable = factory(\App\Models\Consumable::class)->states('ink')->create([ 'name' => 'Original Consumable Name', 'company_id' => 2, - 'location_id' => 3 + 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Consumable::class, $consumable); $temp_consumable = factory(\App\Models\Consumable::class)->states('cardstock')->make([ 'company_id' => 3, - 'name' => "updated consumable name", + 'name' => 'updated consumable name', 'location_id' => 1, ]); @@ -104,7 +105,7 @@ class ApiConsumablesCest $I->assertNotEquals($consumable->name, $data['name']); // update - $I->sendPATCH('/consumables/' . $consumable->id, $data); + $I->sendPATCH('/consumables/'.$consumable->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -120,7 +121,7 @@ class ApiConsumablesCest $temp_consumable->updated_at = Carbon::parse($response->payload->updated_at); $temp_consumable->id = $consumable->id; // verify - $I->sendGET('/consumables/' . $consumable->id); + $I->sendGET('/consumables/'.$consumable->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new ConsumablesTransformer)->transformConsumable($temp_consumable)); @@ -133,12 +134,12 @@ class ApiConsumablesCest // create $consumable = factory(\App\Models\Consumable::class)->states('ink')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Consumable::class, $consumable); // delete - $I->sendDELETE('/consumables/' . $consumable->id); + $I->sendDELETE('/consumables/'.$consumable->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -147,7 +148,7 @@ class ApiConsumablesCest $I->assertEquals(trans('admin/consumables/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/consumables/' . $consumable->id); + $I->sendGET('/consumables/'.$consumable->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiLicenseSeatsCest.php b/tests/api/ApiLicenseSeatsCest.php index 30c9ccaa92..664915bb4c 100644 --- a/tests/api/ApiLicenseSeatsCest.php +++ b/tests/api/ApiLicenseSeatsCest.php @@ -30,14 +30,14 @@ class ApiLicenseSeatsCest // sample verify $licenseSeats = App\Models\LicenseSeat::where('license_id', 1) - ->orderBy('id','desc')->take(10)->get(); + ->orderBy('id', 'desc')->take(10)->get(); // pick a random seat $licenseSeat = $licenseSeats->random(); // need the index in the original list so that the "name" field is determined correctly $licenseSeatNumber = 0; - foreach($licenseSeats as $index=>$seat) { + foreach ($licenseSeats as $index=>$seat) { if ($licenseSeat === $seat) { - $licenseSeatNumber = $index+1; + $licenseSeatNumber = $index + 1; } } $I->seeResponseContainsJson($I->removeTimestamps((new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat, $licenseSeatNumber))); @@ -69,7 +69,7 @@ class ApiLicenseSeatsCest $data = [ 'assigned_to' => $user->id, - 'note' => 'Test Checkout to User via API' + 'note' => 'Test Checkout to User via API', ]; // update @@ -95,7 +95,7 @@ class ApiLicenseSeatsCest $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson([ - "action_type" => "checkout" + 'action_type' => 'checkout', ]); } @@ -110,7 +110,7 @@ class ApiLicenseSeatsCest $data = [ 'asset_id' => $asset->id, - 'note' => 'Test Checkout to Asset via API' + 'note' => 'Test Checkout to Asset via API', ]; // update @@ -136,7 +136,7 @@ class ApiLicenseSeatsCest $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson([ - "action_type" => "checkout" + 'action_type' => 'checkout', ]); } @@ -153,7 +153,7 @@ class ApiLicenseSeatsCest $data = [ 'asset_id' => $asset->id, 'assigned_to' => $user->id, - 'note' => 'Test Checkout to User and Asset via API' + 'note' => 'Test Checkout to User and Asset via API', ]; // update @@ -179,7 +179,7 @@ class ApiLicenseSeatsCest $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson([ - "action_type" => "checkout" + 'action_type' => 'checkout', ]); } } diff --git a/tests/api/ApiLicensesCest.php b/tests/api/ApiLicensesCest.php index db386d062c..22744412b6 100644 --- a/tests/api/ApiLicensesCest.php +++ b/tests/api/ApiLicensesCest.php @@ -42,9 +42,9 @@ class ApiLicensesCest $I->wantTo('Create a new license'); $temp_license = factory(\App\Models\License::class)->states('acrobat')->make([ - 'name' => "Test License Name", + 'name' => 'Test License Name', 'depreciation_id' => 3, - 'company_id' => 2 + 'company_id' => 2, ]); // setup @@ -77,6 +77,7 @@ class ApiLicensesCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateLicenseWithPatch(ApiTester $I, $scenario) { @@ -86,13 +87,13 @@ class ApiLicensesCest $license = factory(\App\Models\License::class)->states('acrobat')->create([ 'name' => 'Original License Name', 'depreciation_id' => 3, - 'company_id' => 2 + 'company_id' => 2, ]); $I->assertInstanceOf(\App\Models\License::class, $license); $temp_license = factory(\App\Models\License::class)->states('office')->make([ 'company_id' => 3, - 'depreciation_id' => 2 + 'depreciation_id' => 2, ]); $data = [ @@ -121,7 +122,7 @@ class ApiLicensesCest $I->assertNotEquals($license->name, $data['name']); // update - $I->sendPATCH('/licenses/' . $license->id, $data); + $I->sendPATCH('/licenses/'.$license->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -134,7 +135,7 @@ class ApiLicensesCest $temp_license->updated_at = Carbon::parse($response->payload->updated_at); $temp_license->id = $license->id; // verify - $I->sendGET('/licenses/' . $license->id); + $I->sendGET('/licenses/'.$license->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new LicensesTransformer)->transformLicense($temp_license)); @@ -147,7 +148,7 @@ class ApiLicensesCest // create $license = factory(\App\Models\License::class)->states('acrobat')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $licenseSeat = $license->freeSeat(); $licenseSeat->assigned_to = $this->user->id; @@ -155,7 +156,7 @@ class ApiLicensesCest $I->assertInstanceOf(\App\Models\License::class, $license); // delete - $I->sendDELETE('/licenses/' . $license->id); + $I->sendDELETE('/licenses/'.$license->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -171,12 +172,12 @@ class ApiLicensesCest // create $license = factory(\App\Models\License::class)->states('acrobat')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\License::class, $license); // delete - $I->sendDELETE('/licenses/' . $license->id); + $I->sendDELETE('/licenses/'.$license->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -185,7 +186,7 @@ class ApiLicensesCest $I->assertEquals(trans('admin/licenses/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/licenses/' . $license->id); + $I->sendGET('/licenses/'.$license->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); diff --git a/tests/api/ApiLocationsCest.php b/tests/api/ApiLocationsCest.php index 76573a35b7..2f185d084a 100644 --- a/tests/api/ApiLocationsCest.php +++ b/tests/api/ApiLocationsCest.php @@ -21,7 +21,6 @@ class ApiLocationsCest /** @test */ public function indexLocations(ApiTester $I) { - $I->wantTo('Get a list of locations'); // call @@ -32,7 +31,7 @@ class ApiLocationsCest $response = json_decode($I->grabResponse(), true); // sample verify $location = App\Models\Location::orderByDesc('created_at') - ->withCount('assignedAssets as assigned_assets_count', 'assets as assets_count', 'users as users_count') + ->withCount('assignedAssets as assigned_assets_count', 'assets as assets_count', 'users as users_count') ->take(10)->get()->shuffle()->first(); $I->seeResponseContainsJson($I->removeTimestamps((new LocationsTransformer)->transformLocation($location))); } @@ -43,7 +42,7 @@ class ApiLocationsCest $I->wantTo('Create a new location'); $temp_location = factory(\App\Models\Location::class)->make([ - 'name' => "Test Location Tag", + 'name' => 'Test Location Tag', ]); // setup @@ -59,7 +58,7 @@ class ApiLocationsCest 'parent_id' => $temp_location->parent_id, 'parent_id' => $temp_location->parent_id, 'manager_id' => $temp_location->manager_id, - 'currency' => $temp_location->currency + 'currency' => $temp_location->currency, ]; // create @@ -70,6 +69,7 @@ class ApiLocationsCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateLocationWithPatch(ApiTester $I, $scenario) { @@ -82,7 +82,7 @@ class ApiLocationsCest $I->assertInstanceOf(\App\Models\Location::class, $location); $temp_location = factory(\App\Models\Location::class)->make([ - 'name' => "updated location name", + 'name' => 'updated location name', ]); $data = [ @@ -97,13 +97,13 @@ class ApiLocationsCest 'parent_id' => $temp_location->parent_id, 'parent_id' => $temp_location->parent_id, 'manager_id' => $temp_location->manager_id, - 'currency' => $temp_location->currency + 'currency' => $temp_location->currency, ]; $I->assertNotEquals($location->name, $data['name']); // update - $I->sendPATCH('/locations/' . $location->id, $data); + $I->sendPATCH('/locations/'.$location->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -120,7 +120,7 @@ class ApiLocationsCest $temp_location->id = $location->id; // verify - $I->sendGET('/locations/' . $location->id); + $I->sendGET('/locations/'.$location->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new LocationsTransformer)->transformLocation($temp_location)); @@ -133,12 +133,12 @@ class ApiLocationsCest // create $location = factory(\App\Models\Location::class)->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Location::class, $location); // delete - $I->sendDELETE('/locations/' . $location->id); + $I->sendDELETE('/locations/'.$location->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -147,7 +147,7 @@ class ApiLocationsCest $I->assertEquals(trans('admin/locations/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/locations/' . $location->id); + $I->sendGET('/locations/'.$location->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiManufacturersCest.php b/tests/api/ApiManufacturersCest.php index a9a8d3da51..cd9afff031 100644 --- a/tests/api/ApiManufacturersCest.php +++ b/tests/api/ApiManufacturersCest.php @@ -21,7 +21,6 @@ class ApiManufacturersCest /** @test */ public function indexManufacturers(ApiTester $I) { - $I->wantTo('Get a list of manufacturers'); // call @@ -31,7 +30,7 @@ class ApiManufacturersCest $response = json_decode($I->grabResponse(), true); // sample verify - $manufacturer = App\Models\Manufacturer::withCount('assets as assets_count','accessories as accessories_count','consumables as consumables_count','licenses as licenses_count') + $manufacturer = App\Models\Manufacturer::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'licenses as licenses_count') ->orderByDesc('created_at')->take(10)->get()->shuffle()->first(); $I->seeResponseContainsJson($I->removeTimestamps((new ManufacturersTransformer)->transformManufacturer($manufacturer))); @@ -43,7 +42,7 @@ class ApiManufacturersCest $I->wantTo('Create a new manufacturer'); $temp_manufacturer = factory(\App\Models\Manufacturer::class)->states('apple')->make([ - 'name' => "Test Manufacturer Tag", + 'name' => 'Test Manufacturer Tag', ]); // setup @@ -64,6 +63,7 @@ class ApiManufacturersCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateManufacturerWithPatch(ApiTester $I, $scenario) { @@ -77,7 +77,7 @@ class ApiManufacturersCest $I->assertInstanceOf(\App\Models\Manufacturer::class, $manufacturer); $temp_manufacturer = factory(\App\Models\Manufacturer::class)->states('dell')->make([ - 'name' => "updated manufacturer name", + 'name' => 'updated manufacturer name', ]); $data = [ @@ -92,7 +92,7 @@ class ApiManufacturersCest $I->assertNotEquals($manufacturer->name, $data['name']); // update - $I->sendPATCH('/manufacturers/' . $manufacturer->id, $data); + $I->sendPATCH('/manufacturers/'.$manufacturer->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -108,11 +108,10 @@ class ApiManufacturersCest $temp_manufacturer->id = $manufacturer->id; // verify - $I->sendGET('/manufacturers/' . $manufacturer->id); + $I->sendGET('/manufacturers/'.$manufacturer->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new ManufacturersTransformer)->transformManufacturer($temp_manufacturer)); - } /** @test */ @@ -122,12 +121,12 @@ class ApiManufacturersCest // create $manufacturer = factory(\App\Models\Manufacturer::class)->states('apple')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Manufacturer::class, $manufacturer); // delete - $I->sendDELETE('/manufacturers/' . $manufacturer->id); + $I->sendDELETE('/manufacturers/'.$manufacturer->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -136,7 +135,7 @@ class ApiManufacturersCest $I->assertEquals(trans('admin/manufacturers/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/manufacturers/' . $manufacturer->id); + $I->sendGET('/manufacturers/'.$manufacturer->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiModelsCest.php b/tests/api/ApiModelsCest.php index 003dc995e9..9db4742eb8 100644 --- a/tests/api/ApiModelsCest.php +++ b/tests/api/ApiModelsCest.php @@ -6,7 +6,7 @@ use App\Models\AssetModel; use App\Models\Setting; use Illuminate\Support\Facades\Auth; -class ApiAssetModelsCest +class ApiModelsCest { protected $user; protected $timeFormat; @@ -21,7 +21,6 @@ class ApiAssetModelsCest /** @test */ public function indexAssetModels(ApiTester $I) { - $I->wantTo('Get a list of assetmodels'); // call @@ -41,7 +40,7 @@ class ApiAssetModelsCest $I->wantTo('Create a new assetmodel'); $temp_assetmodel = factory(\App\Models\AssetModel::class)->states('mbp-13-model')->make([ - 'name' => "Test AssetModel Tag", + 'name' => 'Test AssetModel Tag', ]); // setup @@ -64,6 +63,7 @@ class ApiAssetModelsCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateAssetModelWithPatch(ApiTester $I, $scenario) { @@ -76,7 +76,7 @@ class ApiAssetModelsCest $I->assertInstanceOf(\App\Models\AssetModel::class, $assetmodel); $temp_assetmodel = factory(\App\Models\AssetModel::class)->states('polycomcx-model')->make([ - 'name' => "updated AssetModel name", + 'name' => 'updated AssetModel name', 'fieldset_id' => 2, ]); @@ -95,7 +95,7 @@ class ApiAssetModelsCest $I->assertNotEquals($assetmodel->name, $data['name']); // update - $I->sendPATCH('/models/' . $assetmodel->id, $data); + $I->sendPATCH('/models/'.$assetmodel->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -111,7 +111,7 @@ class ApiAssetModelsCest $temp_assetmodel->updated_at = Carbon::parse($response->payload->updated_at); $temp_assetmodel->id = $assetmodel->id; // verify - $I->sendGET('/models/' . $assetmodel->id); + $I->sendGET('/models/'.$assetmodel->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new AssetModelsTransformer)->transformAssetModel($temp_assetmodel)); @@ -124,12 +124,12 @@ class ApiAssetModelsCest // create $assetmodel = factory(\App\Models\AssetModel::class)->states('mbp-13-model')->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\AssetModel::class, $assetmodel); // delete - $I->sendDELETE('/models/' . $assetmodel->id); + $I->sendDELETE('/models/'.$assetmodel->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -138,7 +138,7 @@ class ApiAssetModelsCest $I->assertEquals(trans('admin/models/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/models/' . $assetmodel->id); + $I->sendGET('/models/'.$assetmodel->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiStatusLabelsCest.php b/tests/api/ApiStatusLabelsCest.php index 2a3c7c26ce..5c14ed36b7 100644 --- a/tests/api/ApiStatusLabelsCest.php +++ b/tests/api/ApiStatusLabelsCest.php @@ -2,11 +2,11 @@ use App\Helpers\Helper; use App\Http\Transformers\StatuslabelsTransformer; -use App\Models\Statuslabel; use App\Models\Setting; +use App\Models\Statuslabel; use Illuminate\Support\Facades\Auth; -class ApiStatuslabelsCest +class ApiStatusLabelsCest { protected $user; protected $timeFormat; @@ -21,7 +21,6 @@ class ApiStatuslabelsCest /** @test */ public function indexStatuslabels(ApiTester $I) { - $I->wantTo('Get a list of statuslabels'); // call @@ -43,7 +42,7 @@ class ApiStatuslabelsCest $I->wantTo('Create a new statuslabel'); $temp_statuslabel = factory(\App\Models\Statuslabel::class)->make([ - 'name' => "Test Statuslabel Tag", + 'name' => 'Test Statuslabel Tag', ]); // setup @@ -53,7 +52,7 @@ class ApiStatuslabelsCest 'deployable' => $temp_statuslabel->deployable, 'notes' => $temp_statuslabel->notes, 'pending' => $temp_statuslabel->pending, - 'type' => 'deployable' + 'type' => 'deployable', ]; // create @@ -64,6 +63,7 @@ class ApiStatuslabelsCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateStatuslabelWithPatch(ApiTester $I, $scenario) { @@ -76,8 +76,8 @@ class ApiStatuslabelsCest $I->assertInstanceOf(\App\Models\Statuslabel::class, $statuslabel); $temp_statuslabel = factory(\App\Models\Statuslabel::class)->states('pending')->make([ - 'name' => "updated statuslabel name", - 'type' => 'pending' + 'name' => 'updated statuslabel name', + 'type' => 'pending', ]); $data = [ @@ -86,18 +86,18 @@ class ApiStatuslabelsCest 'deployable' => $temp_statuslabel->deployable, 'notes' => $temp_statuslabel->notes, 'pending' => $temp_statuslabel->pending, - 'type' => $temp_statuslabel->type + 'type' => $temp_statuslabel->type, ]; $I->assertNotEquals($statuslabel->name, $data['name']); // update - $I->sendPATCH('/statuslabels/' . $statuslabel->id, $data); + $I->sendPATCH('/statuslabels/'.$statuslabel->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $response = json_decode($I->grabResponse()); -// dd($response); + // dd($response); $I->assertEquals('success', $response->status); $I->assertEquals(trans('admin/statuslabels/message.update.success'), $response->messages); $I->assertEquals($statuslabel->id, $response->payload->id); // statuslabel id does not change @@ -108,11 +108,10 @@ class ApiStatuslabelsCest $temp_statuslabel->id = $statuslabel->id; // verify - $I->sendGET('/statuslabels/' . $statuslabel->id); + $I->sendGET('/statuslabels/'.$statuslabel->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new StatuslabelsTransformer)->transformStatuslabel($temp_statuslabel)); - } /** @test */ @@ -122,12 +121,12 @@ class ApiStatuslabelsCest // create $statuslabel = factory(\App\Models\Statuslabel::class)->create([ - 'name' => "Soon to be deleted" + 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Statuslabel::class, $statuslabel); // delete - $I->sendDELETE('/statuslabels/' . $statuslabel->id); + $I->sendDELETE('/statuslabels/'.$statuslabel->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -136,7 +135,7 @@ class ApiStatuslabelsCest $I->assertEquals(trans('admin/statuslabels/message.delete.success'), $response->messages); // verify, expect a 200 - $I->sendGET('/statuslabels/' . $statuslabel->id); + $I->sendGET('/statuslabels/'.$statuslabel->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } diff --git a/tests/api/ApiUsersCest.php b/tests/api/ApiUsersCest.php index 1306e81b0f..ce938489b2 100644 --- a/tests/api/ApiUsersCest.php +++ b/tests/api/ApiUsersCest.php @@ -43,7 +43,7 @@ class ApiUsersCest $I->wantTo('Create a new user'); $temp_user = factory(\App\Models\User::class)->make([ - 'name' => "Test User Name", + 'name' => 'Test User Name', ]); factory(Group::class, 2)->create(); $groups = Group::pluck('id'); @@ -70,7 +70,7 @@ class ApiUsersCest 'state' => $temp_user->state, 'username' => $temp_user->username, 'zip' => $temp_user->zip, - 'groups' => $groups + 'groups' => $groups, ]; // create @@ -83,6 +83,7 @@ class ApiUsersCest // Put is routed to the same method in the controller // DO we actually need to test both? + /** @test */ public function updateUserWithPatch(ApiTester $I, $scenario) { @@ -92,13 +93,13 @@ class ApiUsersCest $user = factory(\App\Models\User::class)->create([ 'first_name' => 'Original User Name', 'company_id' => 2, - 'location_id' => 3 + 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\User::class, $user); $temp_user = factory(\App\Models\User::class)->make([ 'company_id' => 3, - 'first_name' => "updated user name", + 'first_name' => 'updated user name', 'location_id' => 1, ]); @@ -132,7 +133,7 @@ class ApiUsersCest $I->assertNotEquals($user->first_name, $data['first_name']); // update - $I->sendPATCH('/users/' . $user->id, $data); + $I->sendPATCH('/users/'.$user->id, $data); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -150,7 +151,7 @@ class ApiUsersCest $temp_user->updated_at = Carbon::parse($response->payload->updated_at->datetime); $temp_user->id = $user->id; // verify - $I->sendGET('/users/' . $user->id); + $I->sendGET('/users/'.$user->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); $I->seeResponseContainsJson((new UsersTransformer)->transformUser($temp_user)); @@ -163,12 +164,12 @@ class ApiUsersCest // create $user = factory(\App\Models\User::class)->create([ - 'first_name' => "Soon to be deleted" + 'first_name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\User::class, $user); // delete - $I->sendDELETE('/users/' . $user->id); + $I->sendDELETE('/users/'.$user->id); $I->seeResponseIsJson(); $I->seeResponseCodeIs(200); @@ -178,15 +179,16 @@ class ApiUsersCest $I->assertEquals(trans('admin/users/message.success.delete'), $response->messages); // verify, expect a 200 - $I->sendGET('/users/' . $user->id); + $I->sendGET('/users/'.$user->id); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); } /** @test */ - public function fetchUserAssetsTest(ApiTester $I, $scenario) { - $I->wantTo("Fetch assets for a user"); + public function fetchUserAssetsTest(ApiTester $I, $scenario) + { + $I->wantTo('Fetch assets for a user'); $user = User::has('assets')->first(); $asset = $user->assets->shuffle()->first(); diff --git a/tests/api/_bootstrap.php b/tests/api/_bootstrap.php index 8a88555806..62817a53c4 100644 --- a/tests/api/_bootstrap.php +++ b/tests/api/_bootstrap.php @@ -1,2 +1,3 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); - $I->seeAuthentication(); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); + $I->seeAuthentication(); } // tests @@ -25,7 +24,7 @@ class AccessoriesCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage('/accessories/create'); $I->seeResponseCodeIs(200); $I->click('Save'); @@ -37,7 +36,7 @@ class AccessoriesCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage('/accessories/create'); $I->seeResponseCodeIs(200); $I->fillField('name', 't2'); @@ -65,7 +64,7 @@ class AccessoriesCest 'qty' => $accessory->qty, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage('/accessories/create'); $I->seeResponseCodeIs(200); @@ -79,7 +78,7 @@ class AccessoriesCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete an accessory'); - $I->sendDelete( route('accessories.destroy', $I->getAccessoryId() ), ['_token' => csrf_token()] ); + $I->sendDelete(route('accessories.destroy', $I->getAccessoryId()), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } } diff --git a/tests/functional/AssetModelsCest.php b/tests/functional/AssetModelsCest.php index d16a2996b5..e3a23b4e0d 100644 --- a/tests/functional/AssetModelsCest.php +++ b/tests/functional/AssetModelsCest.php @@ -1,6 +1,5 @@ fillField('password', 'password'); $I->click('Login'); } + // tests public function tryToTest(FunctionalTester $I) { @@ -22,7 +22,7 @@ class AssetModelsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('models.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -44,7 +44,7 @@ class AssetModelsCest 'notes' => $model->notes, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('models.create')); $I->submitForm('form#create-form', $values); @@ -56,9 +56,8 @@ class AssetModelsCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete an asset model'); - $model = factory(App\Models\AssetModel::class)->states('mbp-13-model')->create(['name' => "Test Model"]); + $model = factory(App\Models\AssetModel::class)->states('mbp-13-model')->create(['name' => 'Test Model']); $I->sendDelete(route('models.destroy', $model->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } - } diff --git a/tests/functional/AssetsCest.php b/tests/functional/AssetsCest.php index 078a39aa92..4f35534baa 100644 --- a/tests/functional/AssetsCest.php +++ b/tests/functional/AssetsCest.php @@ -1,6 +1,5 @@ fillField('password', 'password'); $I->click('Login'); } + // tests public function tryToTest(FunctionalTester $I) { @@ -22,7 +22,7 @@ class AssetsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('hardware.create')); // Settings factory can enable auto prefixes, which generate a random asset id. Lets clear it out for the sake of this test. $I->fillField('#asset_tag', ''); @@ -36,9 +36,9 @@ class AssetsCest { $asset = factory(App\Models\Asset::class)->states('laptop-mbp')->make([ 'asset_tag'=>'test tag', - 'name'=> "test asset", + 'name'=> 'test asset', 'company_id'=>1, - 'warranty_months'=>15 + 'warranty_months'=>15, ]); $userId = $I->getUserId(); $values = [ @@ -78,7 +78,7 @@ class AssetsCest 'warranty_months' => $asset->warranty_months, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('hardware.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('assets', $seenValues); diff --git a/tests/functional/CategoriesCest.php b/tests/functional/CategoriesCest.php index 6f054b5dd9..49dbf11ff5 100644 --- a/tests/functional/CategoriesCest.php +++ b/tests/functional/CategoriesCest.php @@ -1,14 +1,13 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } public function _after(FunctionalTester $I) @@ -27,7 +26,7 @@ class CategoriesCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('categories.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -38,7 +37,7 @@ class CategoriesCest public function passesCorrectValidation(FunctionalTester $I) { $category = factory(App\Models\Category::class)->states('asset-laptop-category')->make([ - 'name' => "Test Category" + 'name' => 'Test Category', ]); $values = [ 'category_type' => $category->category_type, @@ -47,18 +46,19 @@ class CategoriesCest 'name' => $category->name, 'require_acceptance' => $category->require_acceptance, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('categories.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('categories', $values); $I->dontSee('<span class="'); $I->seeElement('.alert-success'); } + public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a category'); $category = factory(App\Models\Category::class)->states('asset-laptop-category')->create([ - 'name'=>"Deletable Test Category" + 'name'=>'Deletable Test Category', ]); $I->sendDelete(route('categories.destroy', $category->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); diff --git a/tests/functional/CompaniesCest.php b/tests/functional/CompaniesCest.php index 8ede140a21..af7ce713f8 100644 --- a/tests/functional/CompaniesCest.php +++ b/tests/functional/CompaniesCest.php @@ -1,14 +1,13 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -23,7 +22,7 @@ class CompaniesCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('companies.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,9 +33,9 @@ class CompaniesCest { $company = factory(App\Models\Company::class)->make(); $values = [ - 'name' => $company->name + 'name' => $company->name, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('companies.create')); $I->fillField('name', 'TestCompany'); $I->submitForm('form#create-form', $values); diff --git a/tests/functional/ComponentsCest.php b/tests/functional/ComponentsCest.php index c23aaa5547..092bd8ccc2 100644 --- a/tests/functional/ComponentsCest.php +++ b/tests/functional/ComponentsCest.php @@ -1,14 +1,13 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -23,7 +22,7 @@ class ComponentsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('components.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,7 +33,7 @@ class ComponentsCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('components.create')); $I->fillField('name', 't2'); $I->fillField('qty', '-15'); @@ -49,7 +48,7 @@ class ComponentsCest { $component = factory(App\Models\Component::class)->states('ram-crucial4')->make([ 'name' => 'Test Component', - 'serial' => '3523-235325-1350235' + 'serial' => '3523-235325-1350235', ]); $values = [ 'category_id' => $component->category_id, @@ -63,13 +62,14 @@ class ComponentsCest 'qty' => $component->qty, 'serial' => $component->serial, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('components.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('components', $values); $I->dontSee('<span class="'); $I->seeElement('.alert-success'); } + public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a component'); diff --git a/tests/functional/ConsumablesCest.php b/tests/functional/ConsumablesCest.php index c6f8285ec2..cfca37a770 100644 --- a/tests/functional/ConsumablesCest.php +++ b/tests/functional/ConsumablesCest.php @@ -1,14 +1,13 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -23,7 +22,7 @@ class ConsumablesCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('consumables.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,7 +33,7 @@ class ConsumablesCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('consumables.create')); $I->fillField('name', 't2'); $I->fillField('qty', '-15'); @@ -50,7 +49,7 @@ class ConsumablesCest { $consumable = factory(App\Models\Consumable::class)->states('cardstock')->make([ 'name' => 'Test Consumable', - 'model_number' => 23520 + 'model_number' => 23520, ]); // dd($consumable); $values = [ @@ -66,7 +65,7 @@ class ConsumablesCest 'purchase_date' => '2016-01-01', 'qty' => $consumable->qty, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('consumables.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('consumables', $values); diff --git a/tests/functional/DepreciationsCest.php b/tests/functional/DepreciationsCest.php index 8e39a64f72..acf2d561db 100644 --- a/tests/functional/DepreciationsCest.php +++ b/tests/functional/DepreciationsCest.php @@ -1,14 +1,13 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -24,7 +23,7 @@ class DepreciationCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('depreciations.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,7 +33,7 @@ class DepreciationCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('depreciations.create')); $I->fillField('name', 't2'); $I->click('Save'); @@ -45,13 +44,13 @@ class DepreciationCest public function passesCorrectValidation(FunctionalTester $I) { $depreciation = factory(App\Models\Depreciation::class)->states('computer')->make([ - 'name'=>'Test Depreciation' + 'name'=>'Test Depreciation', ]); $values = [ 'name' => $depreciation->name, - 'months' => $depreciation->months + 'months' => $depreciation->months, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('depreciations.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('depreciations', $values); diff --git a/tests/functional/GroupsCest.php b/tests/functional/GroupsCest.php index dd976d8c00..aa9ba9872a 100644 --- a/tests/functional/GroupsCest.php +++ b/tests/functional/GroupsCest.php @@ -1,16 +1,15 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -26,7 +25,7 @@ class GroupsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('groups.create')); $I->seeResponseCodeIs(200); $I->click('Save'); @@ -36,7 +35,7 @@ class GroupsCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('groups.create')); $I->seeResponseCodeIs(200); $I->fillField('name', 't'); @@ -47,7 +46,7 @@ class GroupsCest public function passesCorrectValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('groups.create')); $I->seeResponseCodeIs(200); $I->fillField('name', 'TestGroup'); diff --git a/tests/functional/LicensesCest.php b/tests/functional/LicensesCest.php index 85c90232c1..a5d95450ba 100644 --- a/tests/functional/LicensesCest.php +++ b/tests/functional/LicensesCest.php @@ -1,16 +1,15 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -25,7 +24,7 @@ class LicensesCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('licenses.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -36,7 +35,7 @@ class LicensesCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('licenses.create')); $I->fillField('name', 't2'); $I->fillField('seats', '-15'); @@ -72,7 +71,7 @@ class LicensesCest 'termination_date' => '2020-01-01', ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('licenses.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('licenses', $values); @@ -86,5 +85,4 @@ class LicensesCest $I->sendDelete(route('licenses.destroy', License::doesntHave('assignedUsers')->first()->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } - } diff --git a/tests/functional/LocationsCest.php b/tests/functional/LocationsCest.php index 4977c15c0a..3ab0b60a57 100644 --- a/tests/functional/LocationsCest.php +++ b/tests/functional/LocationsCest.php @@ -1,17 +1,16 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + // logging in + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -27,7 +26,7 @@ class LocationsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('locations.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -36,13 +35,14 @@ class LocationsCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short values"); + $I->wantTo('Test Validation Fails with short values'); $I->amOnPage(route('locations.create')); $I->fillField('name', 't'); $I->click('Save'); $I->seeElement('.alert-danger'); $I->see('The name must be at least 2 characters', '.alert-msg'); } + public function passesCorrectValidation(FunctionalTester $I) { $location = factory(App\Models\Location::class)->make(); @@ -57,7 +57,7 @@ class LocationsCest 'country' => $location->country, 'zip' => $location->zip, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('locations.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('locations', $values); diff --git a/tests/functional/ManufacturersCest.php b/tests/functional/ManufacturersCest.php index 8c34badd1a..0a1f9dc8f7 100644 --- a/tests/functional/ManufacturersCest.php +++ b/tests/functional/ManufacturersCest.php @@ -1,16 +1,15 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -25,7 +24,7 @@ class ManufacturersCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('manufacturers.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,22 +33,23 @@ class ManufacturersCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('manufacturers.create')); $I->fillField('name', 't'); $I->click('Save'); $I->seeElement('.alert-danger'); $I->see('The name must be at least 2 characters', '.alert-msg'); } + public function passesCorrectValidation(FunctionalTester $I) { $manufacturer = factory(App\Models\Manufacturer::class)->states('microsoft')->make([ - 'name' => 'Test Manufacturer' + 'name' => 'Test Manufacturer', ]); $values = [ - 'name' => $manufacturer->name + 'name' => $manufacturer->name, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('manufacturers.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('manufacturers', $values); @@ -59,7 +59,7 @@ class ManufacturersCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a manufacturer'); - $manufacturerId = factory(App\Models\Manufacturer::class)->states('microsoft')->create(['name' => "Deletable Test Manufacturer"])->id; + $manufacturerId = factory(App\Models\Manufacturer::class)->states('microsoft')->create(['name' => 'Deletable Test Manufacturer'])->id; $I->sendDelete(route('manufacturers.destroy', $manufacturerId), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } diff --git a/tests/functional/StatusLabelsCest.php b/tests/functional/StatusLabelsCest.php index aba061842b..e6807c247f 100644 --- a/tests/functional/StatusLabelsCest.php +++ b/tests/functional/StatusLabelsCest.php @@ -1,16 +1,15 @@ amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -25,7 +24,7 @@ class StatusLabelsCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('statuslabels.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -52,7 +51,7 @@ class StatusLabelsCest 'notes' => $status->notes, 'show_in_nav' => true, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('statuslabels.create')); $I->submitForm('form#create-form', $submitValues); $I->seeRecord('status_labels', $recordValues); diff --git a/tests/functional/SuppliersCest.php b/tests/functional/SuppliersCest.php index e555023c04..ed80088f24 100644 --- a/tests/functional/SuppliersCest.php +++ b/tests/functional/SuppliersCest.php @@ -4,10 +4,10 @@ class SuppliersCest { public function _before(FunctionalTester $I) { - $I->amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } // tests @@ -22,7 +22,7 @@ class SuppliersCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('suppliers.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -46,9 +46,9 @@ class SuppliersCest 'fax' => $supplier->fax, 'email' => $supplier->email, 'url' => $supplier->url, - 'notes' => $supplier->notes + 'notes' => $supplier->notes, ]; - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->amOnPage(route('suppliers.create')); $I->submitForm('form#create-form', $values); $I->seeRecord('suppliers', $values); diff --git a/tests/functional/UsersCest.php b/tests/functional/UsersCest.php index 42ca897342..a235415dc2 100644 --- a/tests/functional/UsersCest.php +++ b/tests/functional/UsersCest.php @@ -4,15 +4,16 @@ use App\Models\User; class UsersCest { - public function _before(\FunctionalTester $I) + public function _before(FunctionalTester $I) { - $I->amOnPage('/login'); - $I->fillField('username', 'admin'); - $I->fillField('password', 'password'); - $I->click('Login'); + $I->amOnPage('/login'); + $I->fillField('username', 'admin'); + $I->fillField('password', 'password'); + $I->click('Login'); } + // tests - public function tryToTest(\FunctionalTester $I) + public function tryToTest(FunctionalTester $I) { $I->wantTo('ensure that the create users form loads without errors'); $I->lookForwardTo('seeing it load without errors'); @@ -23,7 +24,7 @@ class UsersCest public function failsEmptyValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with blank elements"); + $I->wantTo('Test Validation Fails with blank elements'); $I->amOnPage(route('users.create')); $I->click('Save'); $I->seeElement('.alert-danger'); @@ -34,7 +35,7 @@ class UsersCest public function failsShortValidation(FunctionalTester $I) { - $I->wantTo("Test Validation Fails with short name"); + $I->wantTo('Test Validation Fails with short name'); $I->amOnPage(route('users.create')); $I->fillField('first_name', 't2'); $I->fillField('last_name', 't2'); @@ -43,8 +44,8 @@ class UsersCest $I->click('Save'); $I->seeElement('.alert-danger'); $I->see('The password must be at least 8 characters', '.alert-msg'); - } + public function passesCorrectValidation(FunctionalTester $I) { $user = factory(App\Models\User::class)->make(); @@ -63,7 +64,7 @@ class UsersCest 'location_id' => $user->location_id, 'phone' => $user->phone, 'activated' => true, - 'notes' => $user->notes + 'notes' => $user->notes, ]; $storedValues = [ 'first_name' => $user->first_name, @@ -78,10 +79,10 @@ class UsersCest 'location_id' => $user->location_id, 'phone' => $user->phone, 'activated' => true, - 'notes' => $user->notes + 'notes' => $user->notes, ]; $I->amOnPage(route('users.create')); - $I->wantTo("Test Validation Succeeds"); + $I->wantTo('Test Validation Succeeds'); $I->submitForm('form#userForm', $submitValues); $I->seeRecord('users', $storedValues); $I->seeElement('.alert-success'); diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php index 8a88555806..62817a53c4 100644 --- a/tests/functional/_bootstrap.php +++ b/tests/functional/_bootstrap.php @@ -1,2 +1,3 @@ 'name', 'qty' => 'qty', - 'category_id' => 'category id' + 'category_id' => 'category id', ]; $errors = $a->getErrors(); foreach ($fields as $field => $fieldTitle) { @@ -37,12 +38,12 @@ class AccessoryTest extends BaseTest $a = factory(Accessory::class)->make([ 'name' => 'a', 'qty' => 0, - 'min_amt' => -1 + 'min_amt' => -1, ]); $fields = [ 'name' => 'name', 'qty' => 'qty', - 'min_amt' => 'min amt' + 'min_amt' => 'min amt', ]; $this->assertFalse($a->isValid()); $errors = $a->getErrors(); @@ -64,7 +65,7 @@ class AccessoryTest extends BaseTest $accessory->save(); $this->assertFalse($accessory->isValid()); - $this->assertStringContainsString("The selected category id is invalid.", $accessory->getErrors()->get('category_id')[0]); + $this->assertStringContainsString('The selected category id is invalid.', $accessory->getErrors()->get('category_id')[0]); } public function testAnAccessoryBelongsToACompany() diff --git a/tests/unit/AssetMaintenanceTest.php b/tests/unit/AssetMaintenanceTest.php index 0d56f07d06..1ea522b7b1 100644 --- a/tests/unit/AssetMaintenanceTest.php +++ b/tests/unit/AssetMaintenanceTest.php @@ -1,6 +1,5 @@ is_warranty = ''; $this->assertTrue($c->is_warranty === 0); $c->is_warranty = '4'; - $this->assertTrue($c->is_warranty==4); + $this->assertTrue($c->is_warranty == 4); } /** @@ -31,9 +30,9 @@ class AssetMaintenanceTest extends BaseTest $c->cost = '0.00'; $this->assertTrue($c->cost === null); $c->cost = '9.54'; - $this->assertTrue($c->cost===9.54); + $this->assertTrue($c->cost === 9.54); $c->cost = '9.50'; - $this->assertTrue($c->cost===9.5); + $this->assertTrue($c->cost === 9.5); } /** @@ -45,7 +44,7 @@ class AssetMaintenanceTest extends BaseTest $c->notes = ''; $this->assertTrue($c->notes === null); $c->notes = 'This is a long note'; - $this->assertTrue($c->notes==='This is a long note'); + $this->assertTrue($c->notes === 'This is a long note'); } /** @@ -57,9 +56,8 @@ class AssetMaintenanceTest extends BaseTest $c->completion_date = ''; $this->assertTrue($c->completion_date === null); $c->completion_date = '0000-00-00'; - $this->assertTrue($c->completion_date===null); + $this->assertTrue($c->completion_date === null); $c->completion_date = '2017-05-12'; - $this->assertTrue($c->completion_date==Carbon::parse('2017-05-12')); - + $this->assertTrue($c->completion_date == Carbon::parse('2017-05-12')); } } diff --git a/tests/unit/AssetModelTest.php b/tests/unit/AssetModelTest.php index a65832b7c6..8a5501dce1 100644 --- a/tests/unit/AssetModelTest.php +++ b/tests/unit/AssetModelTest.php @@ -1,4 +1,5 @@ assertFalse($a->isValid()); - $fields = [ + public function testAnAssetModelRequiresAttributes() + { + // An Asset Model requires a name, a category_id, and a manufacturer_id. + $a = AssetModel::create(); + $this->assertFalse($a->isValid()); + $fields = [ 'name' => 'name', 'manufacturer_id' => 'manufacturer id', - 'category_id' => 'category id' + 'category_id' => 'category id', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } - public function testAnAssetModelZerosOutBlankEols() - { - $am = new AssetModel; - $am->eol = ''; - $this->assertTrue($am->eol === 0); - $am->eol = '4'; - $this->assertTrue($am->eol==4); - } + public function testAnAssetModelZerosOutBlankEols() + { + $am = new AssetModel; + $am->eol = ''; + $this->assertTrue($am->eol === 0); + $am->eol = '4'; + $this->assertTrue($am->eol == 4); + } - public function testAnAssetModelContainsAssets() - { - $assetModel = $this->createValidAssetModel(); - $this->createValidAsset([ + public function testAnAssetModelContainsAssets() + { + $assetModel = $this->createValidAssetModel(); + $this->createValidAsset([ 'model_id' => $assetModel->id, ]); - $this->assertEquals(1, $assetModel->assets()->count()); - } + $this->assertEquals(1, $assetModel->assets()->count()); + } - public function testAnAssetModelHasACategory() - { - $assetmodel = $this->createValidAssetModel(); - $this->assertInstanceOf(App\Models\Category::class, $assetmodel->category); - } + public function testAnAssetModelHasACategory() + { + $assetmodel = $this->createValidAssetModel(); + $this->assertInstanceOf(App\Models\Category::class, $assetmodel->category); + } - public function testAnAssetModelHasADepreciation() - { - - $assetmodel = $this->createValidAssetModel(); - $this->assertInstanceOf(App\Models\Depreciation::class, $assetmodel->depreciation); - } - - public function testAnAssetModelHasAManufacturer() - { - $assetmodel = $this->createValidAssetModel(); - $this->assertInstanceOf(App\Models\Manufacturer::class, $assetmodel->manufacturer); - } + public function testAnAssetModelHasADepreciation() + { + $assetmodel = $this->createValidAssetModel(); + $this->assertInstanceOf(App\Models\Depreciation::class, $assetmodel->depreciation); + } + public function testAnAssetModelHasAManufacturer() + { + $assetmodel = $this->createValidAssetModel(); + $this->assertInstanceOf(App\Models\Manufacturer::class, $assetmodel->manufacturer); + } } diff --git a/tests/unit/AssetTest.php b/tests/unit/AssetTest.php index d1b5638859..e27f535920 100644 --- a/tests/unit/AssetTest.php +++ b/tests/unit/AssetTest.php @@ -1,4 +1,5 @@ assertFalse($a->isValid()); + $a = Asset::create(); + $this->assertFalse($a->isValid()); - $fields = [ + $fields = [ 'model_id' => 'model id', 'status_id' => 'status id', - 'asset_tag' => 'asset tag' + 'asset_tag' => 'asset tag', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } - + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } public function testAutoIncrementMixed() { @@ -46,7 +45,7 @@ class AssetTest extends BaseTest ['asset_tag' => 'WTF-745'], ['asset_tag' => '0012346'], ['asset_tag' => '00123410'], - ['asset_tag' => 'U8T7597h77'] + ['asset_tag' => 'U8T7597h77'], ]) ); @@ -64,263 +63,262 @@ class AssetTest extends BaseTest ['asset_tag' => 'WTF-745'], ['asset_tag' => '0012346'], ['asset_tag' => '00123410'], - ['asset_tag' => 'U8T7597h77'] + ['asset_tag' => 'U8T7597h77'], ] ); $this->assertEquals($expected, $next); } - - /** * @test */ - public function testWarrantyExpiresAttribute() - { + public function testWarrantyExpiresAttribute() + { $asset = factory(Asset::class)->states('laptop-mbp')->create([ 'model_id' => $this->createValidAssetModel()->id, 'supplier_id' => $this->createvalidSupplier()->id, - 'rtd_location_id' => $this->createValidLocation()->id + 'rtd_location_id' => $this->createValidLocation()->id, ]); - $asset->purchase_date = Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0); - $asset->warranty_months = 24; - $asset->save(); + $asset->purchase_date = Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0); + $asset->warranty_months = 24; + $asset->save(); - $saved_asset = Asset::find($asset->id); + $saved_asset = Asset::find($asset->id); - $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->purchase_date); - $this->tester->assertEquals( + $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->purchase_date); + $this->tester->assertEquals( Carbon::createFromDate(2017, 1, 1)->format('Y-m-d'), $saved_asset->purchase_date->format('Y-m-d') ); - $this->tester->assertEquals( + $this->tester->assertEquals( Carbon::createFromDate(2017, 1, 1)->setTime(0, 0, 0), $saved_asset->purchase_date ); - $this->tester->assertEquals(24, $saved_asset->warranty_months); - $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->warranty_expires); - $this->tester->assertEquals( + $this->tester->assertEquals(24, $saved_asset->warranty_months); + $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->warranty_expires); + $this->tester->assertEquals( Carbon::createFromDate(2019, 1, 1)->format('Y-m-d'), $saved_asset->warranty_expires->format('Y-m-d') ); - $this->tester->assertEquals( + $this->tester->assertEquals( Carbon::createFromDate(2019, 1, 1)->setTime(0, 0, 0), $saved_asset->warranty_expires ); - } + } - public function testModelIdMustExist() - { - $model = $this->createValidAssetModel(); - $asset = factory(Asset::class)->make([ + public function testModelIdMustExist() + { + $model = $this->createValidAssetModel(); + $asset = factory(Asset::class)->make([ 'model_id' => $model->id, 'supplier_id' => $this->createValidSupplier()->id, - 'rtd_location_id' => $this->createValidLocation()->id + 'rtd_location_id' => $this->createValidLocation()->id, ]); - $asset->save(); - $this->assertTrue($asset->isValid()); - $newId = $model->id + 1; - $asset = factory(Asset::class)->make(['model_id' => $newId]); - $asset->save(); + $asset->save(); + $this->assertTrue($asset->isValid()); + $newId = $model->id + 1; + $asset = factory(Asset::class)->make(['model_id' => $newId]); + $asset->save(); - $this->assertFalse($asset->isValid()); - } + $this->assertFalse($asset->isValid()); + } - public function testAnAssetHasRelationships() - { - $asset = factory(Asset::class)->states('laptop-mbp') + public function testAnAssetHasRelationships() + { + $asset = factory(Asset::class)->states('laptop-mbp') ->create([ 'model_id' => $this->createValidAssetModel()->id, 'company_id' => $this->createValidCompany()->id, 'supplier_id' => $this->createValidSupplier()->id, ]); - $this->assertInstanceOf(AssetModel::class, $asset->model); - $this->assertInstanceOf(Company::class, $asset->company); - $this->assertInstanceOf(App\Models\Depreciation::class, $asset->depreciation); - $this->assertInstanceOf(App\Models\Statuslabel::class, $asset->assetstatus); - $this->assertInstanceOf(App\Models\Supplier::class, $asset->supplier); - } + $this->assertInstanceOf(AssetModel::class, $asset->model); + $this->assertInstanceOf(Company::class, $asset->company); + $this->assertInstanceOf(App\Models\Depreciation::class, $asset->depreciation); + $this->assertInstanceOf(App\Models\Statuslabel::class, $asset->assetstatus); + $this->assertInstanceOf(App\Models\Supplier::class, $asset->supplier); + } - public function testAnAssetCanBeAvailableForCheckout() - { - // Logic: If the asset is not assigned to anyone, - // and the statuslabel type is "deployable" - // and the asset is not deleted - // Then it is available for checkout + public function testAnAssetCanBeAvailableForCheckout() + { + // Logic: If the asset is not assigned to anyone, + // and the statuslabel type is "deployable" + // and the asset is not deleted + // Then it is available for checkout - // An asset assigned to someone should not be available for checkout. - $assetAssigned = factory(Asset::class) + // An asset assigned to someone should not be available for checkout. + $assetAssigned = factory(Asset::class) ->states('laptop-mbp', 'assigned-to-user') ->create(['model_id' => $this->createValidAssetModel()]); - $this->assertFalse($assetAssigned->availableForCheckout()); + $this->assertFalse($assetAssigned->availableForCheckout()); - // An asset with a non deployable statuslabel should not be available for checkout. - $assetUndeployable = factory(Asset::class)->create([ + // An asset with a non deployable statuslabel should not be available for checkout. + $assetUndeployable = factory(Asset::class)->create([ 'status_id' => $this->createValidStatuslabel('archived')->id, - 'model_id' => $this->createValidAssetModel() + 'model_id' => $this->createValidAssetModel(), ]); - $this->assertFalse($assetUndeployable->availableForCheckout()); + $this->assertFalse($assetUndeployable->availableForCheckout()); - // An asset that has been deleted is not avaiable for checkout. - $assetDeleted = factory(Asset::class)->states('deleted')->create([ - 'model_id' => $this->createValidAssetModel() + // An asset that has been deleted is not avaiable for checkout. + $assetDeleted = factory(Asset::class)->states('deleted')->create([ + 'model_id' => $this->createValidAssetModel(), ]); - $this->assertFalse($assetDeleted->availableForCheckout()); + $this->assertFalse($assetDeleted->availableForCheckout()); - // A ready to deploy asset that isn't assigned to anyone is available for checkout - $asset = factory(Asset::class)->create([ + // A ready to deploy asset that isn't assigned to anyone is available for checkout + $asset = factory(Asset::class)->create([ 'status_id' => $this->createValidStatuslabel('rtd')->id, - 'model_id' => $this->createValidAssetModel() + 'model_id' => $this->createValidAssetModel(), ]); - $this->assertTrue($asset->availableForCheckout()); - } + $this->assertTrue($asset->availableForCheckout()); + } - public function testAnAssetCanHaveComponents() - { - $asset = $this->createValidAsset(); + public function testAnAssetCanHaveComponents() + { + $asset = $this->createValidAsset(); - $components = factory(App\Models\Component::class, 5)->states('ram-crucial4')->create([ - 'category_id' => $this->createValidCategory('component-hdd-category')->id + $components = factory(App\Models\Component::class, 5)->states('ram-crucial4')->create([ + 'category_id' => $this->createValidCategory('component-hdd-category')->id, ]); - $components->each(function($component) use ($asset) { - $component->assets()->attach($component, [ - 'asset_id'=>$asset->id + $components->each(function ($component) use ($asset) { + $component->assets()->attach($component, [ + 'asset_id'=>$asset->id, ]); - }); - $this->assertInstanceOf(App\Models\Component::class, $asset->components()->first()); - $this->assertCount(5, $asset->components); - } + }); + $this->assertInstanceOf(App\Models\Component::class, $asset->components()->first()); + $this->assertCount(5, $asset->components); + } - public function testAnAssetCanHaveUploads() - { - $asset = $this->createValidAsset([ - 'supplier_id' => $this->createValidSupplier()->id + public function testAnAssetCanHaveUploads() + { + $asset = $this->createValidAsset([ + 'supplier_id' => $this->createValidSupplier()->id, ]); - $this->assertCount(0, $asset->uploads); - factory(App\Models\Actionlog::class, 'asset-upload')->create(['item_id' => $asset->id]); - $this->assertCount(1, $asset->fresh()->uploads); - } + $this->assertCount(0, $asset->uploads); + factory(App\Models\Actionlog::class, 'asset-upload')->create(['item_id' => $asset->id]); + $this->assertCount(1, $asset->fresh()->uploads); + } // Helper Method for checking in assets.... We should extract this to the model or a trait. - private function checkin($asset, $target) { - $asset->expected_checkin = null; - $asset->last_checkout = null; - $asset->assigned_to = null; - $asset->assigned_type = null; - $asset->location_id = $asset->rtd_location_id; - $asset->assignedTo()->disassociate($asset); - $asset->accepted = null; - $asset->save(); - $asset->logCheckin($target, 'Test Checkin'); - } + private function checkin($asset, $target) + { + $asset->expected_checkin = null; + $asset->last_checkout = null; + $asset->assigned_to = null; + $asset->assigned_type = null; + $asset->location_id = $asset->rtd_location_id; + $asset->assignedTo()->disassociate($asset); + $asset->accepted = null; + $asset->save(); + $asset->logCheckin($target, 'Test Checkin'); + } - public function testAnAssetCanBeCheckedOut() - { - // This tests Asset::checkOut(), Asset::assignedTo(), Asset::assignedAssets(), Asset::assetLoc(), Asset::assignedType(), defaultLoc() - $asset = $this->createValidAsset(); - $adminUser = $this->signIn(); + public function testAnAssetCanBeCheckedOut() + { + // This tests Asset::checkOut(), Asset::assignedTo(), Asset::assignedAssets(), Asset::assetLoc(), Asset::assignedType(), defaultLoc() + $asset = $this->createValidAsset(); + $adminUser = $this->signIn(); - $target = factory(App\Models\User::class)->create([ - 'location_id' => factory(App\Models\Location::class)->create() + $target = factory(App\Models\User::class)->create([ + 'location_id' => factory(App\Models\Location::class)->create(), ]); - // An Asset Can be checked out to a user, and this should be logged. - $asset->checkOut($target, $adminUser); - $asset->save(); - $this->assertInstanceOf(App\Models\User::class, $asset->assignedTo); + // An Asset Can be checked out to a user, and this should be logged. + $asset->checkOut($target, $adminUser); + $asset->save(); + $this->assertInstanceOf(App\Models\User::class, $asset->assignedTo); - $this->assertEquals($asset->location->id, $target->userLoc->id); - $this->assertEquals('user', $asset->assignedType()); - $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); - $this->tester->seeRecord('action_logs', [ + $this->assertEquals($asset->location->id, $target->userLoc->id); + $this->assertEquals('user', $asset->assignedType()); + $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkout', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - $this->tester->seeRecord('assets', [ + $this->tester->seeRecord('assets', [ 'id' => $asset->id, 'assigned_to' => $target->id, - 'assigned_type' => User::class + 'assigned_type' => User::class, ]); - $this->checkin($asset, $target); - $this->assertNull($asset->fresh()->assignedTo); + $this->checkin($asset, $target); + $this->assertNull($asset->fresh()->assignedTo); - $this->tester->seeRecord('action_logs', [ + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkin from', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - $this->tester->seeRecord('assets', [ + $this->tester->seeRecord('assets', [ 'id' => $asset->id, 'assigned_to' => null, - 'assigned_type' => null + 'assigned_type' => null, ]); - // An Asset Can be checked out to a asset, and this should be logged. - $target = $this->createValidAsset(); + // An Asset Can be checked out to a asset, and this should be logged. + $target = $this->createValidAsset(); - $asset->checkOut($target, $adminUser); - $asset->save(); - $this->assertInstanceOf(App\Models\Asset::class, $asset->fresh()->assignedTo); - $this->assertEquals($asset->fresh()->location->id, $target->fresh()->location->id); - $this->assertEquals('asset', $asset->assignedType()); - $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); - $this->tester->seeRecord('action_logs', [ + $asset->checkOut($target, $adminUser); + $asset->save(); + $this->assertInstanceOf(App\Models\Asset::class, $asset->fresh()->assignedTo); + $this->assertEquals($asset->fresh()->location->id, $target->fresh()->location->id); + $this->assertEquals('asset', $asset->assignedType()); + $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkout', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - $this->assertCount(1, $target->assignedAssets); - $this->checkin($asset, $target); - $this->assertNull($asset->fresh()->assignedTo); + $this->assertCount(1, $target->assignedAssets); + $this->checkin($asset, $target); + $this->assertNull($asset->fresh()->assignedTo); - $this->tester->seeRecord('action_logs', [ + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkin from', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - // An Asset cannot be checked out to itself. - $target = $this->createValidAsset(); - $this->expectException(CheckoutNotAllowed::class); - $target->checkOut($target, $adminUser); + // An Asset cannot be checked out to itself. + $target = $this->createValidAsset(); + $this->expectException(CheckoutNotAllowed::class); + $target->checkOut($target, $adminUser); - // An Asset Can be checked out to a location, and this should be logged. - $target = $this->createValidLocation(); + // An Asset Can be checked out to a location, and this should be logged. + $target = $this->createValidLocation(); - $asset->checkOut($target, $adminUser); - $asset->save(); - $this->assertInstanceOf(App\Models\Location::class, $asset->fresh()->assignedTo); + $asset->checkOut($target, $adminUser); + $asset->save(); + $this->assertInstanceOf(App\Models\Location::class, $asset->fresh()->assignedTo); - $this->assertEquals($asset->fresh()->location->id, $target->fresh()->id); - $this->assertEquals('location', $asset->assignedType()); - $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); - $this->tester->seeRecord('action_logs', [ + $this->assertEquals($asset->fresh()->location->id, $target->fresh()->id); + $this->assertEquals('location', $asset->assignedType()); + $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id); + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkout', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - $this->checkin($asset, $target); - $this->assertNull($asset->fresh()->assignedTo); + $this->checkin($asset, $target); + $this->assertNull($asset->fresh()->assignedTo); - $this->tester->seeRecord('action_logs', [ + $this->tester->seeRecord('action_logs', [ 'action_type' => 'checkin from', 'target_type' => get_class($target), - 'target_id' => $target->id + 'target_id' => $target->id, ]); - } + } - public function testAnAssetHasMaintenances() - { - $asset = $this->createValidAsset(); - factory(App\Models\AssetMaintenance::class)->create(['asset_id' => $asset->id]); - $this->assertCount(1, $asset->assetmaintenances); - } + public function testAnAssetHasMaintenances() + { + $asset = $this->createValidAsset(); + factory(App\Models\AssetMaintenance::class)->create(['asset_id' => $asset->id]); + $this->assertCount(1, $asset->assetmaintenances); + } } diff --git a/tests/unit/BaseTest.php b/tests/unit/BaseTest.php index 16b171193a..f375ef2958 100644 --- a/tests/unit/BaseTest.php +++ b/tests/unit/BaseTest.php @@ -1,4 +1,5 @@ states('superuser')->create([ - 'location_id' => $this->createValidLocation()->id + 'location_id' => $this->createValidLocation()->id, ]); } Auth::login($user); @@ -25,14 +27,13 @@ class BaseTest extends \Codeception\TestCase\Test return $user; } - protected function createValidAssetModel($state = 'mbp-13-model', $overrides = []) { return factory(\App\Models\AssetModel::class)->states($state)->create(array_merge([ 'category_id' => $this->createValidCategory(), 'manufacturer_id' => $this->createValidManufacturer(), 'depreciation_id' => $this->createValidDepreciation(), - ],$overrides)); + ], $overrides)); } protected function createValidCategory($state = 'asset-laptop-category', $overrides = []) @@ -45,11 +46,10 @@ class BaseTest extends \Codeception\TestCase\Test return factory(App\Models\Company::class)->create($overrides); } - protected function createValidDepartment($state = 'engineering', $overrides = []) { return factory(App\Models\Department::class)->states($state)->create(array_merge([ - 'location_id' => $this->createValidLocation()->id + 'location_id' => $this->createValidLocation()->id, ], $overrides)); } @@ -73,16 +73,16 @@ class BaseTest extends \Codeception\TestCase\Test return factory(App\Models\Supplier::class)->create($overrides); } - protected function createValidStatuslabel($state = 'rtd', $overrides= []) + protected function createValidStatuslabel($state = 'rtd', $overrides = []) { return factory(App\Models\Statuslabel::class)->states($state)->create($overrides); } - protected function createValidUser($overrides= []) + protected function createValidUser($overrides = []) { return factory(App\Models\User::class)->create( - array_merge([ - 'location_id'=>$this->createValidLocation()->id + array_merge([ + 'location_id'=>$this->createValidLocation()->id, ], $overrides) ); } @@ -91,14 +91,13 @@ class BaseTest extends \Codeception\TestCase\Test { $locId = $this->createValidLocation()->id; $this->createValidAssetModel(); + return factory(\App\Models\Asset::class)->states('laptop-mbp')->create( array_merge([ 'rtd_location_id' => $locId, 'location_id' => $locId, - 'supplier_id' => $this->createValidSupplier()->id + 'supplier_id' => $this->createValidSupplier()->id, ], $overrides) ); } - - } diff --git a/tests/unit/CategoryTest.php b/tests/unit/CategoryTest.php index 69fc841ac9..61bfbc72a1 100644 --- a/tests/unit/CategoryTest.php +++ b/tests/unit/CategoryTest.php @@ -1,9 +1,10 @@ assertFalse($a->isValid()); + $a = Category::create(); + $this->assertFalse($a->isValid()); - $fields = [ + $fields = [ 'name' => 'name', - 'category_type' => 'category type' + 'category_type' => 'category type', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } - public function testACategoryCanHaveAssets() - { - $this->createValidAssetModel(); //This will seed various things to make the following work better. - $category = $this->createValidCategory('asset-desktop-category'); - $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['category_id' => $category->id]); + public function testACategoryCanHaveAssets() + { + $this->createValidAssetModel(); //This will seed various things to make the following work better. + $category = $this->createValidCategory('asset-desktop-category'); + $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['category_id' => $category->id]); - $this->assertEquals(5, $category->models->count()); - $this->assertCount(5, $category->models); + $this->assertEquals(5, $category->models->count()); + $this->assertCount(5, $category->models); - $models->each(function($model) { + $models->each(function ($model) { // This is intentionally run twice to generate the ten imagined assets, done this way to keep it in sync with createValidAsset rather than using the factory directly. - $this->createValidAsset(['model_id' => $model->id]); - $this->createValidAsset(['model_id' => $model->id]); - }); - $this->assertEquals(10, $category->itemCount()); - } + $this->createValidAsset(['model_id' => $model->id]); + $this->createValidAsset(['model_id' => $model->id]); + }); + $this->assertEquals(10, $category->itemCount()); + } - public function testACategoryCanHaveAccessories() - { - $category = $this->createValidCategory('accessory-keyboard-category'); - factory(App\Models\Accessory::class, 5)->states('apple-bt-keyboard')->create(['category_id' => $category->id]); + public function testACategoryCanHaveAccessories() + { + $category = $this->createValidCategory('accessory-keyboard-category'); + factory(App\Models\Accessory::class, 5)->states('apple-bt-keyboard')->create(['category_id' => $category->id]); - $this->assertCount(5, $category->accessories); - $this->assertEquals(5, $category->itemCount()); - } + $this->assertCount(5, $category->accessories); + $this->assertEquals(5, $category->itemCount()); + } - public function testACategoryCanHaveConsumables() - { - $category = $this->createValidCategory('consumable-paper-category'); - factory(App\Models\Consumable::class, 5)->states('cardstock')->create(['category_id' => $category->id]); - $this->assertCount(5, $category->consumables); - $this->assertEquals(5, $category->itemCount()); - } + public function testACategoryCanHaveConsumables() + { + $category = $this->createValidCategory('consumable-paper-category'); + factory(App\Models\Consumable::class, 5)->states('cardstock')->create(['category_id' => $category->id]); + $this->assertCount(5, $category->consumables); + $this->assertEquals(5, $category->itemCount()); + } - public function testACategoryCanHaveComponents() - { - $category = $this->createValidCategory('component-ram-category'); - factory(App\Models\Component::class, 5)->states('ram-crucial4')->create(['category_id' => $category->id]); - $this->assertCount(5, $category->components); - $this->assertEquals(5, $category->itemCount()); - } + public function testACategoryCanHaveComponents() + { + $category = $this->createValidCategory('component-ram-category'); + factory(App\Models\Component::class, 5)->states('ram-crucial4')->create(['category_id' => $category->id]); + $this->assertCount(5, $category->components); + $this->assertEquals(5, $category->itemCount()); + } } diff --git a/tests/unit/CompanyTest.php b/tests/unit/CompanyTest.php index 22ac12bd87..c3d663a42b 100644 --- a/tests/unit/CompanyTest.php +++ b/tests/unit/CompanyTest.php @@ -1,9 +1,10 @@ assertFalse($a->isValid()); + $a = Company::create(); + $this->assertFalse($a->isValid()); - $fields = [ + $fields = [ 'name' => 'name', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } - public function testACompanyCanHaveUsers() - { - $company = $this->createValidCompany(); - $user = $this->createValidUser(['company_id'=>$company->id]); - $this->assertCount(1, $company->users); - } + public function testACompanyCanHaveUsers() + { + $company = $this->createValidCompany(); + $user = $this->createValidUser(['company_id'=>$company->id]); + $this->assertCount(1, $company->users); + } - public function testACompanyCanHaveAssets() - { - $company = $this->createValidCompany(); - $this->createValidAsset(['company_id' => $company->id]); - $this->assertCount(1, $company->assets); - } + public function testACompanyCanHaveAssets() + { + $company = $this->createValidCompany(); + $this->createValidAsset(['company_id' => $company->id]); + $this->assertCount(1, $company->assets); + } - public function testACompanyCanHaveLicenses() - { - $company = $this->createValidCompany(); - factory(App\Models\License::class, 1)->states('acrobat')->create([ + public function testACompanyCanHaveLicenses() + { + $company = $this->createValidCompany(); + factory(App\Models\License::class, 1)->states('acrobat')->create([ 'company_id'=>$company->id, 'manufacturer_id' => factory(App\Models\Manufacturer::class)->states('adobe')->create()->id, - 'category_id' => factory(App\Models\Category::class)->states('license-office-category')->create()->id + 'category_id' => factory(App\Models\Category::class)->states('license-office-category')->create()->id, ]); - $this->assertCount(1, $company->licenses); - } + $this->assertCount(1, $company->licenses); + } - public function testACompanyCanHaveAccessories() - { - $company = $this->createValidCompany(); - $a = factory(App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ + public function testACompanyCanHaveAccessories() + { + $company = $this->createValidCompany(); + $a = factory(App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ 'category_id' => factory(App\Models\Category::class)->states('accessory-keyboard-category')->create()->id, - 'company_id' => $company->id - ]); - - $this->assertCount(1, $company->accessories); - } - - public function testACompanyCanHaveConsumables() - { - $company = $this->createValidCompany(); - factory(App\Models\Consumable::class, 1)->states('cardstock')->create([ 'company_id' => $company->id, - 'category_id' => factory(App\Models\Category::class)->states('consumable-paper-category')->create()->id ]); - $this->assertCount(1, $company->consumables); - } - public function testACompanyCanHaveComponents() - { - $company = $this->createValidCompany(); - factory(App\Models\Component::class, 1)->states('ram-crucial4')->create([ - 'company_id'=>$company->id, - 'category_id' => factory(App\Models\Category::class)->states('component-ram-category')->create()->id + $this->assertCount(1, $company->accessories); + } + + public function testACompanyCanHaveConsumables() + { + $company = $this->createValidCompany(); + factory(App\Models\Consumable::class, 1)->states('cardstock')->create([ + 'company_id' => $company->id, + 'category_id' => factory(App\Models\Category::class)->states('consumable-paper-category')->create()->id, ]); - $this->assertCount(1, $company->components); - } + $this->assertCount(1, $company->consumables); + } + + public function testACompanyCanHaveComponents() + { + $company = $this->createValidCompany(); + factory(App\Models\Component::class, 1)->states('ram-crucial4')->create([ + 'company_id'=>$company->id, + 'category_id' => factory(App\Models\Category::class)->states('component-ram-category')->create()->id, + ]); + $this->assertCount(1, $company->components); + } } diff --git a/tests/unit/ComponentTest.php b/tests/unit/ComponentTest.php index 1e167955a6..25aac1f683 100644 --- a/tests/unit/ComponentTest.php +++ b/tests/unit/ComponentTest.php @@ -1,4 +1,5 @@ 'name', 'qty' => 'qty', - 'category_id' => 'category id' + 'category_id' => 'category id', ]; $errors = $a->getErrors(); foreach ($fields as $field => $fieldTitle) { @@ -39,12 +40,12 @@ class ComponentTest extends BaseTest $a = factory(Component::class)->make([ 'name' => 'a', 'qty' => 0, - 'min_amt' => -1 + 'min_amt' => -1, ]); $fields = [ 'name' => 'name', 'qty' => 'qty', - 'min_amt' => 'min amt' + 'min_amt' => 'min amt', ]; $this->assertFalse($a->isValid()); $errors = $a->getErrors(); @@ -55,7 +56,7 @@ class ComponentTest extends BaseTest public function testCategoryIdMustExist() { - $category = $this->createValidCategory('component-hdd-category', + $category = $this->createValidCategory('component-hdd-category', ['category_type' => 'component']); $component = factory(Component::class) ->states('ssd-crucial240') @@ -69,7 +70,7 @@ class ComponentTest extends BaseTest $component->save(); $this->assertFalse($component->isValid()); - $this->assertStringContainsString("The selected category id is invalid.", $component->getErrors()->get('category_id')[0]); + $this->assertStringContainsString('The selected category id is invalid.', $component->getErrors()->get('category_id')[0]); } public function testAnComponentBelongsToACompany() @@ -92,7 +93,7 @@ class ComponentTest extends BaseTest ->create([ 'category_id' => factory(Category::class) ->states('component-hdd-category') - ->create(['category_type' => 'component'])->id + ->create(['category_type' => 'component'])->id, ]); $this->assertInstanceOf(Category::class, $component->category); $this->assertEquals('component', $component->category->category_type); diff --git a/tests/unit/ConsumableTest.php b/tests/unit/ConsumableTest.php index 1126594a19..2a41824fff 100644 --- a/tests/unit/ConsumableTest.php +++ b/tests/unit/ConsumableTest.php @@ -1,9 +1,10 @@ assertFalse($a->isValid()); + $a = Consumable::create(); + $this->assertFalse($a->isValid()); - $fields = [ + $fields = [ 'name' => 'name', 'qty' => 'qty', - 'category_id' => 'category id' + 'category_id' => 'category id', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } - public function testAConsumableHasRelationships() - { - $consumable = factory(Consumable::class)->states('cardstock')->create([ + public function testAConsumableHasRelationships() + { + $consumable = factory(Consumable::class)->states('cardstock')->create([ 'category_id' => $this->createValidCategory('consumable-paper-category')->id, 'manufacturer_id' => $this->createValidManufacturer('apple')->id, 'company_id' => $this->createValidCompany()->id, 'location_id' => $this->createValidLocation()->id, - 'user_id' => $this->signIn()->id + 'user_id' => $this->signIn()->id, ]); - - $this->assertInstanceOf(App\Models\User::class, $consumable->admin); - $this->assertInstanceOf(App\Models\Company::class, $consumable->company); - $this->assertInstanceOf(App\Models\Manufacturer::class, $consumable->manufacturer); - $this->assertInstanceOf(App\Models\Location::class, $consumable->location); - $this->assertInstanceOf(App\Models\Category::class, $consumable->category); - } + $this->assertInstanceOf(App\Models\User::class, $consumable->admin); + $this->assertInstanceOf(App\Models\Company::class, $consumable->company); + $this->assertInstanceOf(App\Models\Manufacturer::class, $consumable->manufacturer); + $this->assertInstanceOf(App\Models\Location::class, $consumable->location); + $this->assertInstanceOf(App\Models\Category::class, $consumable->category); + } } diff --git a/tests/unit/CustomFieldTest.php b/tests/unit/CustomFieldTest.php index 973bc2bb90..345e833fbb 100644 --- a/tests/unit/CustomFieldTest.php +++ b/tests/unit/CustomFieldTest.php @@ -1,9 +1,10 @@ assertEquals($customfield->getAttributes()['format'], CustomField::PREDEFINED_FORMATS['IP']); //this seems undocumented... - $this->assertEquals($customfield->format, "IP"); + $this->assertEquals($customfield->format, 'IP'); } public function testDbNameAscii() { $customfield = new CustomField(); - $customfield->name = "My hovercraft is full of eels"; + $customfield->name = 'My hovercraft is full of eels'; $customfield->id = 1337; - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_my_hovercraft_is_full_of_eels_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_my_hovercraft_is_full_of_eels_1337'); } // Western Europe public function testDbNameLatin() { - $customfield=new CustomField(); - $customfield->name="My hovercraft is full of eels"; + $customfield = new CustomField(); + $customfield->name = 'My hovercraft is full of eels'; $customfield->id = 1337; - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_my_hovercraft_is_full_of_eels_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_my_hovercraft_is_full_of_eels_1337'); } - // Asian public function testDbNameChinese() { - $customfield=new CustomField(); - $customfield->name="我的氣墊船裝滿了鱔魚"; + $customfield = new CustomField(); + $customfield->name = '我的氣墊船裝滿了鱔魚'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_wo_de_qi_dian_chuan_zhuang_man_le_shan_yu_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_wo_de_qi_dian_chuan_zhuang_man_le_shan_yu_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_aecsae0ase1eaeaeoees_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_aecsae0ase1eaeaeoees_1337'); } } public function testDbNameJapanese() { - $customfield=new CustomField(); - $customfield->name="私のホバークラフトは鰻でいっぱいです"; + $customfield = new CustomField(); + $customfield->name = '私のホバークラフトは鰻でいっぱいです'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_sinohohakurafutoha_manteihhaitesu_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_sinohohakurafutoha_manteihhaitesu_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_caafafafaafcafafae0aaaaaaa_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_caafafafaafcafafae0aaaaaaa_1337'); } } public function testDbNameKorean() { $customfield = new CustomField(); - $customfield->name = "내 호버크라프트는 장어로 가득 차 있어요"; + $customfield->name = '내 호버크라프트는 장어로 가득 차 있어요'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_nae_hobeokeulapeuteuneun_jang_eolo_gadeug_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_nae_hobeokeulapeuteuneun_jang_eolo_gadeug_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_e_ie2ieiises_izieoe_e0e_i0_iziis_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_e_ie2ieiises_izieoe_e0e_i0_iziis_1337'); } - } // Nordic languages public function testDbNameNonLatinEuro() { $customfield = new CustomField(); - $customfield->name = "Mój poduszkowiec jest pełen węgorzy"; + $customfield->name = 'Mój poduszkowiec jest pełen węgorzy'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_moj_poduszkowiec_jest_pelen_wegorzy_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_moj_poduszkowiec_jest_pelen_wegorzy_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_ma3j_poduszkowiec_jest_peaen_waegorzy_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_ma3j_poduszkowiec_jest_peaen_waegorzy_1337'); } } @@ -104,24 +103,24 @@ class CustomFieldTest extends BaseTest public function testDbNameTurkish() { $customfield = new CustomField(); - $customfield->name = "Hoverkraftım yılan balığı dolu"; + $customfield->name = 'Hoverkraftım yılan balığı dolu'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_hoverkraftim_yilan_baligi_dolu_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_hoverkraftim_yilan_baligi_dolu_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_hoverkraftaem_yaelan_balaeaeyae_dolu_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_hoverkraftaem_yaelan_balaeaeyae_dolu_1337'); } } public function testDbNameArabic() { - $customfield=new CustomField(); - $customfield->name="حَوّامتي مُمْتِلئة بِأَنْقَلَيْسون"; + $customfield = new CustomField(); + $customfield->name = 'حَوّامتي مُمْتِلئة بِأَنْقَلَيْسون'; $customfield->id = 1337; if (function_exists('transliterator_transliterate')) { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_hwamty_mmtlyt_banqlyswn_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_hwamty_mmtlyt_banqlyswn_1337'); } else { - $this->assertEquals($customfield->convertUnicodeDbSlug(), "_snipeit_ouzuuouoaus_uuuuoauuooc_ououzuuuuzuuzusuo_1337"); + $this->assertEquals($customfield->convertUnicodeDbSlug(), '_snipeit_ouzuuouoaus_uuuuoauuooc_ououzuuuuzuuzusuo_1337'); } } } diff --git a/tests/unit/DepartmentTest.php b/tests/unit/DepartmentTest.php index 92e77e3afb..ad20285dba 100644 --- a/tests/unit/DepartmentTest.php +++ b/tests/unit/DepartmentTest.php @@ -1,4 +1,5 @@ tester->seeRecord('departments', $values); // } - } diff --git a/tests/unit/DepreciationTest.php b/tests/unit/DepreciationTest.php index 9e442b1d4a..4e1732ec38 100644 --- a/tests/unit/DepreciationTest.php +++ b/tests/unit/DepreciationTest.php @@ -1,8 +1,9 @@ assertFalse($a->isValid()); + $a = Depreciation::create(); + $this->assertFalse($a->isValid()); - $fields = [ + $fields = [ 'name' => 'name', 'months' => 'months', ]; - $errors = $a->getErrors(); - foreach ($fields as $field => $fieldTitle) { - $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); - } - } + $errors = $a->getErrors(); + foreach ($fields as $field => $fieldTitle) { + $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required."); + } + } - public function testADepreciationHasModels() - { - $this->createValidAssetModel(); - $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); - $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['depreciation_id'=>$depreciation->id]); - $this->assertEquals(5,$depreciation->models->count()); - } + public function testADepreciationHasModels() + { + $this->createValidAssetModel(); + $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); + $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['depreciation_id'=>$depreciation->id]); + $this->assertEquals(5, $depreciation->models->count()); + } - public function testADepreciationHasLicenses() - { - $category = $this->createValidCategory('license-graphics-category'); - $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); - $licenses = factory(App\Models\License::class, 5)->states('photoshop')->create([ + public function testADepreciationHasLicenses() + { + $category = $this->createValidCategory('license-graphics-category'); + $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); + $licenses = factory(App\Models\License::class, 5)->states('photoshop')->create([ 'depreciation_id'=>$depreciation->id, - 'category_id' => $category->id + 'category_id' => $category->id, ]); - $this->assertEquals(5,$depreciation->licenses()->count()); - } + $this->assertEquals(5, $depreciation->licenses()->count()); + } } diff --git a/tests/unit/ImporterTest.php b/tests/unit/ImporterTest.php index db2aef4d5c..f0a3c51098 100644 --- a/tests/unit/ImporterTest.php +++ b/tests/unit/ImporterTest.php @@ -1,4 +1,5 @@ 'bnelson0@cdbaby.com', ]); $this->tester->seeRecord('categories', [ - 'name' => 'quam' + 'name' => 'quam', ]); $this->tester->seeRecord('models', [ 'name' => 'massa id', - 'model_number' => 6377018600094472 + 'model_number' => 6377018600094472, ]); $this->tester->seeRecord('manufacturers', [ - 'name' => 'Linkbridge' + 'name' => 'Linkbridge', ]); $this->tester->seeRecord('locations', [ - 'name' => 'Daping' + 'name' => 'Daping', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Alpha' + 'name' => 'Alpha', ]); $this->tester->seeRecord('status_labels', [ - 'name' => 'Undeployable' + 'name' => 'Undeployable', ]); $this->tester->seeRecord('suppliers', [ - 'name' => 'Blogspan' + 'name' => 'Blogspan', ]); $this->tester->seeRecord('assets', [ 'name' => 'eget nunc donec quis', 'serial' => '27aa8378-b0f4-4289-84a4-405da95c6147', 'asset_tag' => '970882174-8', - 'notes' => "Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.", + 'notes' => 'Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.', 'purchase_date' => '2016-04-05 00:00:01', - 'purchase_cost' => 133289.59 -, 'warranty_months' => 14, - '_snipeit_weight_2' => 35 + 'purchase_cost' => 133289.59, 'warranty_months' => 14, + '_snipeit_weight_2' => 35, ]); } @@ -105,30 +105,29 @@ EOT; $this->tester->seeRecord('assets', [ 'asset_tag' => '970882174-8', 'assigned_type' => User::class, - 'assigned_to' => $user->id + 'assigned_to' => $user->id, ]); $user = User::where('username', 'mgibson2')->firstOrFail(); $this->tester->seeRecord('assets', [ 'asset_tag' => '710141467-2', 'assigned_type' => User::class, - 'assigned_to' => $user->id + 'assigned_to' => $user->id, ]); $location = Location::where('name', 'Planet Earth')->firstOrFail(); $this->tester->seeRecord('assets', [ 'asset_tag' => '998233705-X', 'assigned_type' => Location::class, - 'assigned_to' => $location->id + 'assigned_to' => $location->id, ]); $location = Location::where('name', 'Daping')->firstOrFail(); $this->tester->seeRecord('assets', [ 'asset_tag' => '927820758-6', 'assigned_type' => Location::class, - 'assigned_to' => $location->id + 'assigned_to' => $location->id, ]); - } public function testUpdateAssetIncludingCustomFields() @@ -153,47 +152,47 @@ EOT; ->import(); $this->tester->seeRecord('categories', [ - 'name' => 'some other category' + 'name' => 'some other category', ]); $this->tester->seeRecord('models', [ 'name' => 'Another Model', - 'model_number' => 356 + 'model_number' => 356, ]); $this->tester->seeRecord('manufacturers', [ - 'name' => 'Linkbridge 32' + 'name' => 'Linkbridge 32', ]); $this->tester->seeRecord('locations', [ - 'name' => 'New Location' + 'name' => 'New Location', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Another Company' + 'name' => 'Another Company', ]); $this->tester->seeRecord('status_labels', [ - 'name' => 'Ready To Go' + 'name' => 'Ready To Go', ]); $this->tester->seeRecord('suppliers', [ - 'name' => 'Not Creative' + 'name' => 'Not Creative', ]); $this->tester->seeRecord('assets', [ 'name' => 'A new name', 'serial' => '67433477', 'asset_tag' => '970882174-8', - 'notes' => "I have no notes", + 'notes' => 'I have no notes', 'purchase_date' => '2018-04-05 00:00:01', 'purchase_cost' => 25.59, 'warranty_months' => 18, - '_snipeit_weight_2' => 95 + '_snipeit_weight_2' => 95, ]); } - public function testAssetModelNumber4359() + public function testAssetModelNumber4359() { // As per bug #4359 // 1) Create model with blank model # and custom field. @@ -206,27 +205,26 @@ Bonnie Nelson,bnelson0@cdbaby.com,bnelson0,eget nunc donec quis,quam,massa id,Li EOT; // Need to do this manually... - $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); - $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); - $customFieldSet->fields()->attach($customField, [ + $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); + $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); + $customFieldSet->fields()->attach($customField, [ 'required' => false, - 'order' => 'asc']); + 'order' => 'asc', ]); - factory(App\Models\Category::class)->states('asset-laptop-category')->create([ - 'name' => 'quam' + factory(App\Models\Category::class)->states('asset-laptop-category')->create([ + 'name' => 'quam', ]); - factory(App\Models\Manufacturer::class)->states('apple')->create([ - 'name' => 'Linkbridge' + factory(App\Models\Manufacturer::class)->states('apple')->create([ + 'name' => 'Linkbridge', ]); - - $am = factory(App\Models\AssetModel::class)->create([ + $am = factory(App\Models\AssetModel::class)->create([ 'name' => 'massa id', 'fieldset_id' => $customFieldSet->id, 'category_id' => 1, 'manufacturer_id' => 1, - 'model_number' => null + 'model_number' => null, ]); $this->import(new AssetImporter($csv)); @@ -242,21 +240,21 @@ EOT; $this->tester->seeRecord('assets', [ 'asset_tag' => '970882174-8', - '_snipeit_weight_2' => 115 + '_snipeit_weight_2' => 115, ]); } public function initializeCustomFields() { - $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); - $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); - $customFieldSet->fields()->attach($customField, [ + $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); + $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); + $customFieldSet->fields()->attach($customField, [ 'required' => false, - 'order' => 'asc']); + 'order' => 'asc', ]); - $am = factory(App\Models\AssetModel::class)->create([ + $am = factory(App\Models\AssetModel::class)->create([ 'name' => 'massa id', - 'fieldset_id' => $customFieldSet->id + 'fieldset_id' => $customFieldSet->id, ]); } @@ -276,7 +274,7 @@ EOT; 'expiration_date' => 'expiration date', 'location' => 'loc', 'notes' => 'Some Notes', - 'asset_model' => "model name", + 'asset_model' => 'model name', ]; $this->import(new AssetImporter($csv), $customFieldMap); @@ -294,44 +292,44 @@ EOT; ]); $this->tester->seeRecord('categories', [ - 'name' => 'quam' + 'name' => 'quam', ]); $this->tester->seeRecord('models', [ 'name' => 'massa id', - 'model_number' => 6377018600094472 + 'model_number' => 6377018600094472, ]); $this->tester->seeRecord('manufacturers', [ - 'name' => 'Linkbridge' + 'name' => 'Linkbridge', ]); $this->tester->seeRecord('locations', [ - 'name' => 'Daping' + 'name' => 'Daping', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Alpha' + 'name' => 'Alpha', ]); $this->tester->seeRecord('status_labels', [ - 'name' => 'Undeployable' + 'name' => 'Undeployable', ]); $this->tester->seeRecord('suppliers', [ - 'name' => 'Blogspan' + 'name' => 'Blogspan', ]); $this->tester->seeRecord('assets', [ 'name' => 'eget nunc donec quis', 'serial' => '27aa8378-b0f4-4289-84a4-405da95c6147', 'asset_tag' => '970882174-8', - 'notes' => "Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.", + 'notes' => 'Curabitur in libero ut massa volutpat convallis. Morbi odio odio, elementum eu, interdum eu, tincidunt in, leo. Maecenas pulvinar lobortis est.', 'purchase_date' => '2016-04-05 00:00:01', 'purchase_cost' => 133289.59, 'warranty_months' => 14, 'assigned_to' => $createdUser['id'], - 'assigned_type' => User::class + 'assigned_type' => User::class, ]); } @@ -347,19 +345,19 @@ EOT; 'purchase_date' => '2006-09-01 00:00:01', 'order_number' => 'J935H60W', 'requestable' => 0, - 'qty' => 278 + 'qty' => 278, ]); $this->tester->seeRecord('locations', [ - 'name' => 'metus. Vivamus' + 'name' => 'metus. Vivamus', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Macromedia' + 'name' => 'Macromedia', ]); $this->tester->seeRecord('categories', [ - 'name' => 'Customers' + 'name' => 'Customers', ]); } @@ -372,7 +370,6 @@ EOT; $this->import(new AccessoryImporter($csv)); $this->tester->seeNumRecords(1, 'accessories'); - $updatedCSV = <<<'EOT' Item Name,Purchase Date,Purchase Cost,Location,Company,Order Number,Category,Requestable,Quantity Walter Carter,09/01/2015,350,metus. Vivamus,Macromedia,35GGH,Customers,True,12 @@ -389,7 +386,7 @@ EOT; 'purchase_date' => '2015-09-01 00:00:01', 'order_number' => '35GGH', 'requestable' => 1, - 'qty' => 12 + 'qty' => 12, ]); } @@ -406,10 +403,10 @@ EOT; 'item_name' => 'Name', 'location' => 'Loc', 'purchase_date' => 'Pur Date', - 'purchase_cost' => "Cost", + 'purchase_cost' => 'Cost', 'order_number' => 'Order Num', 'requestable' => 'Request', - 'quantity' => 'Quan' + 'quantity' => 'Quan', ]; $this->import(new AccessoryImporter($csv), $customFieldMap); // dd($this->tester->grabRecord('accessories')); @@ -418,19 +415,19 @@ EOT; 'purchase_date' => '2006-09-01 00:00:01', 'order_number' => 'J935H60W', 'requestable' => 0, - 'qty' => 278 + 'qty' => 278, ]); $this->tester->seeRecord('locations', [ - 'name' => 'metus. Vivamus' + 'name' => 'metus. Vivamus', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Macromedia' + 'name' => 'Macromedia', ]); $this->tester->seeRecord('categories', [ - 'name' => 'Customers' + 'name' => 'Customers', ]); } @@ -449,19 +446,19 @@ EOT; 'requestable' => 0, 'qty' => 322, 'item_no' => 3305, - 'model_number' => 30123 + 'model_number' => 30123, ]); $this->tester->seeRecord('locations', [ - 'name' => 'mauris blandit mattis.' + 'name' => 'mauris blandit mattis.', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Lycos' + 'name' => 'Lycos', ]); $this->tester->seeRecord('categories', [ - 'name' => 'Triamterene/Hydrochlorothiazide' + 'name' => 'Triamterene/Hydrochlorothiazide', ]); } @@ -474,7 +471,6 @@ EOT; $this->import(new ConsumableImporter($csv)); $this->tester->seeNumRecords(1, 'consumables'); - $updatedCSV = <<<'EOT' Item Name,Purchase Date,Purchase Cost,Location,Company,Order Number,Category,Requestable,Quantity eget,12/05/2016,35.45,mauris blandit mattis.,Lycos,3666FF,New Cat,Yes,15 @@ -492,7 +488,7 @@ EOT; 'purchase_cost' => 35.45, 'order_number' => '3666FF', 'requestable' => 1, - 'qty' => 15 + 'qty' => 15, ]); } @@ -509,10 +505,10 @@ EOT; 'item_name' => 'Name', 'location' => 'Loc', 'purchase_date' => 'Pur date', - 'purchase_cost' => "Pur Cost", + 'purchase_cost' => 'Pur Cost', 'order_number' => 'Order Num', 'requestable' => 'Request', - 'quantity' => 'Quan' + 'quantity' => 'Quan', ]; $this->import(new ConsumableImporter($csv), $customFieldMap); $this->tester->seeRecord('consumables', [ @@ -521,19 +517,19 @@ EOT; 'purchase_cost' => 85.91, 'order_number' => 'T295T06V', 'requestable' => 0, - 'qty' => 322 + 'qty' => 322, ]); $this->tester->seeRecord('locations', [ - 'name' => 'mauris blandit mattis.' + 'name' => 'mauris blandit mattis.', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Lycos' + 'name' => 'Lycos', ]); $this->tester->seeRecord('categories', [ - 'name' => 'Triamterene/Hydrochlorothiazide' + 'name' => 'Triamterene/Hydrochlorothiazide', ]); } @@ -573,31 +569,31 @@ EOT; 'maintained' => 0, 'notes' => 'Sed ante. Vivamus tortor. Duis mattis egestas metus.', 'purchase_cost' => 79.66, - 'purchase_order' => "53008", + 'purchase_order' => '53008', 'reassignable' => 0, 'serial' => '1aa5b0eb-79c5-40b2-8943-5472a6893c3c', ]); $this->tester->seeRecord('manufacturers', [ - 'name' => 'Beer, Leannon and Lubowitz' + 'name' => 'Beer, Leannon and Lubowitz', ]); $this->tester->seeRecord('suppliers', [ - 'name' => "Hegmann, Mohr and Cremin", + 'name' => 'Hegmann, Mohr and Cremin', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Haag, Schmidt and Farrell' + 'name' => 'Haag, Schmidt and Farrell', ]); $this->tester->seeRecord('categories', [ - 'name' => 'Graphics Software' + 'name' => 'Graphics Software', ]); $this->tester->seeNumRecords(80, 'license_seats'); $this->tester->seeRecord('license_seats', [ 'assigned_to' => $createdUser['id'], - 'license_id' => \App\Models\License::where('serial','1aa5b0eb-79c5-40b2-8943-5472a6893c3c')->first()->id, - 'asset_id' => $testAsset->id + 'license_id' => \App\Models\License::where('serial', '1aa5b0eb-79c5-40b2-8943-5472a6893c3c')->first()->id, + 'asset_id' => $testAsset->id, ]); } @@ -610,7 +606,6 @@ EOT; $this->import(new LicenseImporter($csv)); $this->tester->seeNumRecords(1, 'licenses'); - $updatedCSV = <<<'EOT' Item name,serial,manufacturer,purchase date,purchase cost,purchase order,order number,Licensed To Name,Licensed to Email,expiration date,maintained,reassignable,seats,company,supplier,category,notes Argentum Malachite Athletes Foot Relief,1aa5b0eb-79c5-40b2-8943-5472a6893c3c,"Beer, Leannon and Lubowitz",05/15/2019,$1865.34,63 ar,18334,A Legend,Legendary@gov.uk,04/27/2016,yes,true,64,"Haag, Schmidt and Farrell","Hegmann, Mohr and Cremin",Graphics Software,Sed ante. Vivamus tortor. Duis mattis egestas metus. @@ -635,7 +630,7 @@ EOT; 'maintained' => 1, 'notes' => 'Sed ante. Vivamus tortor. Duis mattis egestas metus.', 'purchase_cost' => 1865.34, - 'purchase_order' => "63 ar", + 'purchase_order' => '63 ar', 'reassignable' => 1, 'serial' => '1aa5b0eb-79c5-40b2-8943-5472a6893c3c', ]); @@ -660,9 +655,9 @@ EOT; 'manufacturer' => 'manuf', 'notes' => 'note', 'order_number' => 'Order Num', - 'purchase_cost' => "Pur Cost", + 'purchase_cost' => 'Pur Cost', 'purchase_date' => 'Pur date', - 'purchase_order' => "Purc Order", + 'purchase_order' => 'Purc Order', 'quantity' => 'Quan', 'reassignable' => 'reass', 'requestable' => 'Request', @@ -682,27 +677,26 @@ EOT; 'maintained' => 0, 'notes' => 'Sed ante. Vivamus tortor. Duis mattis egestas metus.', 'purchase_cost' => 79.66, - 'purchase_order' => "53008", + 'purchase_order' => '53008', 'reassignable' => 0, 'serial' => '1aa5b0eb-79c5-40b2-8943-5472a6893c3c', ]); $this->tester->seeRecord('manufacturers', [ - 'name' => 'Beer, Leannon and Lubowitz' + 'name' => 'Beer, Leannon and Lubowitz', ]); $this->tester->seeRecord('suppliers', [ - 'name' => "Hegmann, Mohr and Cremin", + 'name' => 'Hegmann, Mohr and Cremin', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Haag, Schmidt and Farrell' + 'name' => 'Haag, Schmidt and Farrell', ]); $this->tester->seeNumRecords(80, 'license_seats'); } - public function testDefaultUserImport() { Notification::fake(); @@ -724,20 +718,21 @@ EOT; 'username' => 'bocollopy0', 'phone' => '63-(199)661-2186', 'jobtitle' => 'Clinical Specialist', - 'employee_num' => '7080919053' + 'employee_num' => '7080919053', ]); $this->tester->seeRecord('companies', [ - 'name' => 'Morar-Ward' + 'name' => 'Morar-Ward', ]); $this->tester->seeRecord('departments', [ - 'name' => 'Management' + 'name' => 'Management', ]); Notification::assertSentTo(User::find(2), \App\Notifications\WelcomeNotification::class); Notification::assertNotSentTo(User::find(3), \App\Notifications\WelcomeNotification::class); } + private function import($importer, $mappings = null) { if ($mappings) { diff --git a/tests/unit/LocationTest.php b/tests/unit/LocationTest.php index 82f0a14ef1..e1675b23f5 100644 --- a/tests/unit/LocationTest.php +++ b/tests/unit/LocationTest.php @@ -1,18 +1,20 @@ createValidLocation(['id' => 10]); $a = factory(Location::class)->make([ @@ -22,11 +24,10 @@ class LocationTest extends BaseTest ]); $this->assertTrue($a->isValid()); - } - public function testFailsIfSelfParent() { - + public function testFailsIfSelfParent() + { $a = factory(Location::class)->make([ 'name' => 'Test Location', 'id' => 1, @@ -34,9 +35,6 @@ class LocationTest extends BaseTest ]); $this->assertFalse($a->isValid()); - $this->assertStringContainsString("The parent id and id must be different", $a->getErrors()); - - + $this->assertStringContainsString('The parent id and id must be different', $a->getErrors()); } - } diff --git a/tests/unit/ManufacturerTest.php b/tests/unit/ManufacturerTest.php index a5e3d5d051..15f62e4080 100644 --- a/tests/unit/ManufacturerTest.php +++ b/tests/unit/ManufacturerTest.php @@ -1,9 +1,10 @@ tester->seeRecord('manufacturers', $values); // } - } diff --git a/tests/unit/NotificationTest.php b/tests/unit/NotificationTest.php index 4f1441b0e1..16fb185c9f 100644 --- a/tests/unit/NotificationTest.php +++ b/tests/unit/NotificationTest.php @@ -1,4 +1,5 @@ states('superuser')->create(); Auth::login($admin); $cat = $this->createValidCategory('asset-laptop-category', ['require_acceptance' => true]); @@ -31,5 +32,5 @@ class NotificationTest extends BaseTest Notification::fake(); $asset->checkOut($user, 1); Notification::assertSentTo($user, CheckoutAssetNotification::class); - } + } } diff --git a/tests/unit/PermissionsTest.php b/tests/unit/PermissionsTest.php index ea648293bc..fa7ac3e081 100644 --- a/tests/unit/PermissionsTest.php +++ b/tests/unit/PermissionsTest.php @@ -12,7 +12,6 @@ use Illuminate\Foundation\Testing\WithoutMiddleware; class PermissionsTest extends BaseTest { - public function _before() { parent::_before(); @@ -57,7 +56,6 @@ class PermissionsTest extends BaseTest 'users.edit' => false, 'users.delete' => false, ]; - } private $noHardware; @@ -68,6 +66,7 @@ class PermissionsTest extends BaseTest private $noUsers; // tests + /** * @test */ @@ -217,7 +216,7 @@ class PermissionsTest extends BaseTest /** * @test - */ + */ public function a_user_with_view_accessories_permissions_can_view_accessories() { $u = factory(App\Models\User::class)->states('view-accessories')->create(); @@ -366,7 +365,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('view-users')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noComponents; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; $permissions = array_merge($permissions, [ 'users.view' => true, @@ -384,7 +383,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('create-users')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noComponents; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; $permissions = array_merge($permissions, [ 'users.view' => false, @@ -402,7 +401,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('edit-users')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noComponents; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; $permissions = array_merge($permissions, [ 'users.view' => false, @@ -420,7 +419,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('delete-users')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noComponents; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; $permissions = array_merge($permissions, [ 'users.view' => false, @@ -438,7 +437,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('view-components')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noUsers; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; $permissions = array_merge($permissions, [ 'components.view' => true, @@ -455,7 +454,7 @@ class PermissionsTest extends BaseTest public function a_user_with_create_components_permissions_can_create_components() { $u = factory(App\Models\User::class)->states('create-components')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noUsers; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; $permissions = array_merge($permissions, [ 'components.view' => false, @@ -473,7 +472,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('edit-components')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noUsers; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; $permissions = array_merge($permissions, [ 'components.view' => false, @@ -491,7 +490,7 @@ class PermissionsTest extends BaseTest { $u = factory(App\Models\User::class)->states('delete-components')->create(); - $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories +$this->noConsumables + $this->noUsers; + $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; $permissions = array_merge($permissions, [ 'components.view' => false, diff --git a/tests/unit/SnipeModelTest.php b/tests/unit/SnipeModelTest.php index c7771cb9b5..0cf013e682 100644 --- a/tests/unit/SnipeModelTest.php +++ b/tests/unit/SnipeModelTest.php @@ -1,6 +1,5 @@ purchase_date = ''; $this->assertTrue($c->purchase_date === null); $c->purchase_date = '2016-03-25 12:35:50'; - $this->assertTrue($c->purchase_date==='2016-03-25 12:35:50'); + $this->assertTrue($c->purchase_date === '2016-03-25 12:35:50'); } /** @@ -32,9 +32,9 @@ class SnipeModelTest extends BaseTest $c->purchase_cost = '0.00'; $this->assertTrue($c->purchase_cost === null); $c->purchase_cost = '9.54'; - $this->assertTrue($c->purchase_cost===9.54); + $this->assertTrue($c->purchase_cost === 9.54); $c->purchase_cost = '9.50'; - $this->assertTrue($c->purchase_cost===9.5); + $this->assertTrue($c->purchase_cost === 9.5); } /** @@ -46,8 +46,9 @@ class SnipeModelTest extends BaseTest $c->location_id = ''; $this->assertTrue($c->location_id === null); $c->location_id = '5'; - $this->assertTrue($c->location_id==5); + $this->assertTrue($c->location_id == 5); } + /** * @test */ @@ -57,7 +58,7 @@ class SnipeModelTest extends BaseTest $c->category_id = ''; $this->assertTrue($c->category_id === null); $c->category_id = '1'; - $this->assertTrue($c->category_id==1); + $this->assertTrue($c->category_id == 1); } /** @@ -69,7 +70,7 @@ class SnipeModelTest extends BaseTest $c->supplier_id = ''; $this->assertTrue($c->supplier_id === null); $c->supplier_id = '4'; - $this->assertTrue($c->supplier_id==4); + $this->assertTrue($c->supplier_id == 4); } /** @@ -81,7 +82,7 @@ class SnipeModelTest extends BaseTest $c->depreciation_id = ''; $this->assertTrue($c->depreciation_id === null); $c->depreciation_id = '4'; - $this->assertTrue($c->depreciation_id==4); + $this->assertTrue($c->depreciation_id == 4); } /** @@ -93,6 +94,6 @@ class SnipeModelTest extends BaseTest $c->manufacturer_id = ''; $this->assertTrue($c->manufacturer_id === null); $c->manufacturer_id = '4'; - $this->assertTrue($c->manufacturer_id==4); + $this->assertTrue($c->manufacturer_id == 4); } -} \ No newline at end of file +} diff --git a/tests/unit/StatuslabelTest.php b/tests/unit/StatuslabelTest.php index 8884537cc0..e953b6b861 100644 --- a/tests/unit/StatuslabelTest.php +++ b/tests/unit/StatuslabelTest.php @@ -1,21 +1,22 @@ states('rtd')->make(); - $values = [ + public function testRTDStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('rtd')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, @@ -23,91 +24,91 @@ class StatuslabelTest extends BaseTest ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testPendingStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('pending')->make(); - $values = [ + public function testPendingStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('pending')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testArchivedStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('archived')->make(); - $values = [ + public function testArchivedStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('archived')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testOutForRepairStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('out_for_repair')->make(); - $values = [ + public function testOutForRepairStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('out_for_repair')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testOutForDiagnosticsStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('out_for_diagnostics')->make(); - $values = [ + public function testOutForDiagnosticsStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('out_for_diagnostics')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testBrokenStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('broken')->make(); - $values = [ + public function testBrokenStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('broken')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } - public function testLostStatuslabelAdd() - { - $statuslabel = factory(Statuslabel::class)->states('lost')->make(); - $values = [ + public function testLostStatuslabelAdd() + { + $statuslabel = factory(Statuslabel::class)->states('lost')->make(); + $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, 'pending' => $statuslabel->pending, 'archived' => $statuslabel->archived, ]; - Statuslabel::create($values); - $this->tester->seeRecord('status_labels', $values); - } + Statuslabel::create($values); + $this->tester->seeRecord('status_labels', $values); + } } diff --git a/tests/unit/SupplierTest.php b/tests/unit/SupplierTest.php index bd8c172edc..856f53c389 100644 --- a/tests/unit/SupplierTest.php +++ b/tests/unit/SupplierTest.php @@ -1,9 +1,10 @@ tester->seeRecord('suppliers', $values); // } - } diff --git a/tests/unit/UserTest.php b/tests/unit/UserTest.php index bbd4048156..010bd9c787 100644 --- a/tests/unit/UserTest.php +++ b/tests/unit/UserTest.php @@ -1,9 +1,10 @@ tester->seeRecord('users', $values); // } - public function testFirstNameSplit() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -62,7 +62,6 @@ class UserTest extends BaseTest $this->assertEquals($expected_username, $user['username']); } - public function testFirstInitialLastName() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -81,11 +80,12 @@ class UserTest extends BaseTest public function testSingleName() { - $fullname = "Natalia"; + $fullname = 'Natalia'; $expected_username = 'natalia'; $user = User::generateFormattedNameFromFullName('firstname_lastname', $fullname); $this->assertEquals($expected_username, $user['username']); } + public function firstInitialDotLastname() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -93,6 +93,7 @@ class UserTest extends BaseTest $user = User::generateFormattedNameFromFullName($fullname, 'firstinitial.lastname'); $this->assertEquals($expected_username, $user['username']); } + public function lastNameUnderscoreFirstInitial() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -100,6 +101,7 @@ class UserTest extends BaseTest $user = User::generateFormattedNameFromFullName($fullname, 'lastname_firstinitial'); $this->assertEquals($expected_username, $user['username']); } + public function firstNameLastName() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -107,6 +109,7 @@ class UserTest extends BaseTest $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastname'); $this->assertEquals($expected_username, $user['username']); } + public function firstNameLastInitial() { $fullname = "Natalia Allanovna Romanova-O'Shostakova"; @@ -114,5 +117,4 @@ class UserTest extends BaseTest $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastinitial'); $this->assertEquals($expected_username, $user['username']); } - } diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php index 8a88555806..62817a53c4 100644 --- a/tests/unit/_bootstrap.php +++ b/tests/unit/_bootstrap.php @@ -1,2 +1,3 @@ Date: Thu, 10 Jun 2021 20:16:56 +0000 Subject: [PATCH 02/19] Shift bindings PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser. --- app/Console/Commands/FixDoubleEscape.php | 30 ++++++++-------- .../Commands/FixMismatchedAssetsAndLogs.php | 6 ++-- app/Console/Commands/SyncAssetLocations.php | 6 ++-- app/Http/Controllers/Api/AssetsController.php | 2 +- app/Http/Controllers/ReportsController.php | 2 +- .../Controllers/Users/BulkUsersController.php | 2 +- .../Controllers/Users/UsersController.php | 4 +-- app/Listeners/CheckoutableListener.php | 4 +-- app/Models/Accessory.php | 18 +++++----- app/Models/Actionlog.php | 6 ++-- app/Models/Asset.php | 34 +++++++++---------- app/Models/AssetMaintenance.php | 6 ++-- app/Models/AssetModel.php | 14 ++++---- app/Models/Category.php | 14 ++++---- app/Models/Company.php | 2 +- app/Models/Component.php | 14 ++++---- app/Models/Consumable.php | 18 +++++----- app/Models/ConsumableAssignment.php | 6 ++-- app/Models/CustomField.php | 6 ++-- app/Models/CustomFieldset.php | 6 ++-- app/Models/Department.php | 8 ++--- app/Models/Depreciable.php | 2 +- app/Models/Depreciation.php | 6 ++-- app/Models/Group.php | 2 +- app/Models/License.php | 22 ++++++------ app/Models/LicenseSeat.php | 8 ++--- app/Models/Location.php | 16 ++++----- app/Models/Manufacturer.php | 12 +++---- app/Models/PredefinedKit.php | 12 +++---- app/Models/Statuslabel.php | 2 +- app/Models/Supplier.php | 8 ++--- app/Models/User.php | 32 ++++++++--------- app/Providers/EventServiceProvider.php | 4 +-- ...182149_migrate_asset_log_to_action_log.php | 10 +++--- ..._add_missing_target_type_to_logs_table.php | 2 +- ...619_fix_assigned_type_not_being_nulled.php | 2 +- ...kout_acceptances_for_unaccepted_assets.php | 4 +-- ..._accessory_checkout_note_to_join_table.php | 2 +- tests/api/ApiCheckoutAssetsCest.php | 6 ++-- tests/functional/AssetsCest.php | 2 +- 40 files changed, 181 insertions(+), 181 deletions(-) diff --git a/app/Console/Commands/FixDoubleEscape.php b/app/Console/Commands/FixDoubleEscape.php index 13a1d3b9b5..42a1765913 100644 --- a/app/Console/Commands/FixDoubleEscape.php +++ b/app/Console/Commands/FixDoubleEscape.php @@ -38,21 +38,21 @@ class FixDoubleEscape extends Command public function handle() { $tables = [ - '\App\Models\Asset' => ['name'], - '\App\Models\License' => ['name'], - '\App\Models\Consumable' => ['name'], - '\App\Models\Accessory' => ['name'], - '\App\Models\Component' => ['name'], - '\App\Models\Company' => ['name'], - '\App\Models\Manufacturer' => ['name'], - '\App\Models\Supplier' => ['name'], - '\App\Models\Statuslabel' => ['name'], - '\App\Models\Depreciation' => ['name'], - '\App\Models\AssetModel' => ['name'], - '\App\Models\Group' => ['name'], - '\App\Models\Department' => ['name'], - '\App\Models\Location' => ['name'], - '\App\Models\User' => ['first_name', 'last_name'], + \App\Models\Asset::class => ['name'], + \App\Models\License::class => ['name'], + \App\Models\Consumable::class => ['name'], + \App\Models\Accessory::class => ['name'], + \App\Models\Component::class => ['name'], + \App\Models\Company::class => ['name'], + \App\Models\Manufacturer::class => ['name'], + \App\Models\Supplier::class => ['name'], + \App\Models\Statuslabel::class => ['name'], + \App\Models\Depreciation::class => ['name'], + \App\Models\AssetModel::class => ['name'], + \App\Models\Group::class => ['name'], + \App\Models\Department::class => ['name'], + \App\Models\Location::class => ['name'], + \App\Models\User::class => ['first_name', 'last_name'], ]; $count = []; diff --git a/app/Console/Commands/FixMismatchedAssetsAndLogs.php b/app/Console/Commands/FixMismatchedAssetsAndLogs.php index 47729f8c30..34b6b3edfc 100644 --- a/app/Console/Commands/FixMismatchedAssetsAndLogs.php +++ b/app/Console/Commands/FixMismatchedAssetsAndLogs.php @@ -56,19 +56,19 @@ class FixMismatchedAssetsAndLogs extends Command $mismatch_count = 0; $assets = Asset::whereNotNull('assigned_to') - ->where('assigned_type', '=', 'App\\Models\\User') + ->where('assigned_type', '=', \App\Models\User::class) ->orderBy('id', 'ASC')->get(); foreach ($assets as $asset) { // get the last checkout of the asset - if ($checkout_log = Actionlog::where('target_type', '=', 'App\\Models\\User') + if ($checkout_log = Actionlog::where('target_type', '=', \App\Models\User::class) ->where('action_type', '=', 'checkout') ->where('item_id', '=', $asset->id) ->orderBy('created_at', 'DESC') ->first()) { // Now check for a subsequent checkin log - we want to ignore those - if (! $checkin_log = Actionlog::where('target_type', '=', 'App\\Models\\User') + if (! $checkin_log = Actionlog::where('target_type', '=', \App\Models\User::class) ->where('action_type', '=', 'checkin from') ->where('item_id', '=', $asset->id) ->whereDate('created_at', '>', $checkout_log->created_at) diff --git a/app/Console/Commands/SyncAssetLocations.php b/app/Console/Commands/SyncAssetLocations.php index e7aae9991e..f510176bce 100644 --- a/app/Console/Commands/SyncAssetLocations.php +++ b/app/Console/Commands/SyncAssetLocations.php @@ -57,7 +57,7 @@ class SyncAssetLocations extends Command $bar->advance(); } - $assigned_user_assets = Asset::where('assigned_type', 'App\Models\User')->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); + $assigned_user_assets = Asset::where('assigned_type', \App\Models\User::class)->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $output['info'][] = 'There are '.$assigned_user_assets->count().' assets checked out to users.'; foreach ($assigned_user_assets as $assigned_user_asset) { if (($assigned_user_asset->assignedTo) && ($assigned_user_asset->assignedTo->userLoc)) { @@ -73,7 +73,7 @@ class SyncAssetLocations extends Command $bar->advance(); } - $assigned_location_assets = Asset::where('assigned_type', 'App\Models\Location') + $assigned_location_assets = Asset::where('assigned_type', \App\Models\Location::class) ->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $output['info'][] = 'There are '.$assigned_location_assets->count().' assets checked out to locations.'; @@ -90,7 +90,7 @@ class SyncAssetLocations extends Command } // Assigned to assets - $assigned_asset_assets = Asset::where('assigned_type', 'App\Models\Asset') + $assigned_asset_assets = Asset::where('assigned_type', \App\Models\Asset::class) ->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $output['info'][] = 'Asset-assigned assets: '.$assigned_asset_assets->count(); diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 3ad544a785..a3c2bcd2ca 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -577,7 +577,7 @@ class AssetsController extends Controller } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) { $location = $target->location_id; - Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $id) + Asset::where('assigned_type', \App\Models\Asset::class)->where('assigned_to', $id) ->update(['location_id' => $target->location_id]); } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) { $location = $target->id; diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index be0b84a5c9..c514bb531e 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -914,7 +914,7 @@ class ReportsController extends Controller $assetsForReport = $acceptances ->filter(function ($acceptance) { - return $acceptance->checkoutable_type == 'App\Models\Asset'; + return $acceptance->checkoutable_type == \App\Models\Asset::class; }) ->map(function ($acceptance) { return $acceptance->checkoutable; diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index fc02753e74..9f41448d3b 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -166,7 +166,7 @@ class BulkUsersController extends Controller } $users = User::whereIn('id', $user_raw_array)->get(); - $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', 'App\Models\User')->get(); + $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', \App\Models\User::class)->get(); $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get(); $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get(); diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index bc7c2a2da5..018624d22f 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -125,7 +125,7 @@ class UsersController extends Controller $user->permissions = json_encode($permissions_array); // we have to invoke the - app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar'); + app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'image', 'avatars', 'avatar'); if ($user->save()) { if ($request->filled('groups')) { @@ -289,7 +289,7 @@ class UsersController extends Controller $user->permissions = json_encode($permissions_array); // Handle uploaded avatar - app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar'); + app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar'); //\Log::debug(print_r($user, true)); diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index 2baacbfaa8..ad8c127398 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -200,12 +200,12 @@ class CheckoutableListener public function subscribe($events) { $events->listen( - 'App\Events\CheckoutableCheckedIn', + \App\Events\CheckoutableCheckedIn::class, 'App\Listeners\CheckoutableListener@onCheckedIn' ); $events->listen( - 'App\Events\CheckoutableCheckedOut', + \App\Events\CheckoutableCheckedOut::class, 'App\Listeners\CheckoutableListener@onCheckedOut' ); } diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index c201ce07b5..c2e5399d29 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -16,7 +16,7 @@ use Watson\Validating\ValidatingTrait; */ class Accessory extends SnipeModel { - protected $presenter = 'App\Presenters\AccessoryPresenter'; + protected $presenter = \App\Presenters\AccessoryPresenter::class; use CompanyableTrait; use Loggable, Presentable; use SoftDeletes; @@ -102,7 +102,7 @@ class Accessory extends SnipeModel */ public function supplier() { - return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); + return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id'); } /** @@ -130,7 +130,7 @@ class Accessory extends SnipeModel */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -142,7 +142,7 @@ class Accessory extends SnipeModel */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id'); + return $this->belongsTo(\App\Models\Location::class, 'location_id'); } /** @@ -154,7 +154,7 @@ class Accessory extends SnipeModel */ public function category() { - return $this->belongsTo('\App\Models\Category', 'category_id')->where('category_type', '=', 'accessory'); + return $this->belongsTo(\App\Models\Category::class, 'category_id')->where('category_type', '=', 'accessory'); } /** @@ -166,7 +166,7 @@ class Accessory extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** @@ -228,7 +228,7 @@ class Accessory extends SnipeModel */ public function users() { - return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed(); + return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed(); } /** @@ -240,7 +240,7 @@ class Accessory extends SnipeModel */ public function hasUsers() { - return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->count(); + return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->count(); } /** @@ -252,7 +252,7 @@ class Accessory extends SnipeModel */ public function manufacturer() { - return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); + return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id'); } /** diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index b1f0cddb4c..3ac8c5cc7c 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Auth; */ class Actionlog extends SnipeModel { - protected $presenter = "App\Presenters\ActionlogPresenter"; + protected $presenter = \App\Presenters\ActionlogPresenter::class; use SoftDeletes; use Presentable; protected $dates = ['deleted_at']; @@ -88,7 +88,7 @@ class Actionlog extends SnipeModel */ public function company() { - return $this->hasMany('\App\Models\Company', 'id', 'company_id'); + return $this->hasMany(\App\Models\Company::class, 'id', 'company_id'); } /** @@ -183,7 +183,7 @@ class Actionlog extends SnipeModel */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); + return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed(); } /** diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 26c3a0a4ed..999c6711cb 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -26,7 +26,7 @@ use Watson\Validating\ValidatingTrait; */ class Asset extends Depreciable { - protected $presenter = 'App\Presenters\AssetPresenter'; + protected $presenter = \App\Presenters\AssetPresenter::class; use Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait; const LOCATION = 'location'; @@ -224,7 +224,7 @@ class Asset extends Depreciable */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -304,7 +304,7 @@ class Asset extends Depreciable if ($this->save()) { if (is_int($admin)) { $checkedOutBy = User::findOrFail($admin); - } elseif (get_class($admin) === 'App\Models\User') { + } elseif (get_class($admin) === \App\Models\User::class) { $checkedOutBy = $admin; } else { $checkedOutBy = Auth::user(); @@ -358,7 +358,7 @@ class Asset extends Depreciable */ public function depreciation() { - return $this->model->belongsTo('\App\Models\Depreciation', 'depreciation_id'); + return $this->model->belongsTo(\App\Models\Depreciation::class, 'depreciation_id'); } /** @@ -370,7 +370,7 @@ class Asset extends Depreciable */ public function components() { - return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed(); + return $this->belongsToMany(\App\Models\Component::class, 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed(); } /** @@ -398,7 +398,7 @@ class Asset extends Depreciable */ public function uploads() { - return $this->hasMany('\App\Models\Actionlog', 'item_id') + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') ->where('item_type', '=', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') @@ -443,7 +443,7 @@ class Asset extends Depreciable */ public function assignedAssets() { - return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); + return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } /** @@ -508,7 +508,7 @@ class Asset extends Depreciable */ public function defaultLoc() { - return $this->belongsTo('\App\Models\Location', 'rtd_location_id'); + return $this->belongsTo(\App\Models\Location::class, 'rtd_location_id'); } /** @@ -541,7 +541,7 @@ class Asset extends Depreciable */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id') + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') ->where('item_type', '=', self::class) ->orderBy('created_at', 'desc') ->withTrashed(); @@ -600,7 +600,7 @@ class Asset extends Depreciable */ public function assetmaintenances() { - return $this->hasMany('\App\Models\AssetMaintenance', 'asset_id') + return $this->hasMany(\App\Models\AssetMaintenance::class, 'asset_id') ->orderBy('created_at', 'desc'); } @@ -613,7 +613,7 @@ class Asset extends Depreciable */ public function adminuser() { - return $this->belongsTo('\App\Models\User', 'user_id'); + return $this->belongsTo(\App\Models\User::class, 'user_id'); } /** @@ -625,7 +625,7 @@ class Asset extends Depreciable */ public function assetstatus() { - return $this->belongsTo('\App\Models\Statuslabel', 'status_id'); + return $this->belongsTo(\App\Models\Statuslabel::class, 'status_id'); } /** @@ -637,7 +637,7 @@ class Asset extends Depreciable */ public function model() { - return $this->belongsTo('\App\Models\AssetModel', 'model_id')->withTrashed(); + return $this->belongsTo(\App\Models\AssetModel::class, 'model_id')->withTrashed(); } /** @@ -670,7 +670,7 @@ class Asset extends Depreciable */ public function licenses() { - return $this->belongsToMany('\App\Models\License', 'license_seats', 'asset_id', 'license_id'); + return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'asset_id', 'license_id'); } /** @@ -682,7 +682,7 @@ class Asset extends Depreciable */ public function licenseseats() { - return $this->hasMany('\App\Models\LicenseSeat', 'asset_id'); + return $this->hasMany(\App\Models\LicenseSeat::class, 'asset_id'); } /** @@ -694,7 +694,7 @@ class Asset extends Depreciable */ public function supplier() { - return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); + return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id'); } /** @@ -706,7 +706,7 @@ class Asset extends Depreciable */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id'); + return $this->belongsTo(\App\Models\Location::class, 'location_id'); } /** diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index d88a968fc6..d501f42361 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -129,7 +129,7 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function asset() { - return $this->belongsTo('\App\Models\Asset', 'asset_id') + return $this->belongsTo(\App\Models\Asset::class, 'asset_id') ->withTrashed(); } @@ -142,13 +142,13 @@ class AssetMaintenance extends Model implements ICompanyableChild */ public function admin() { - return $this->belongsTo('\App\Models\User', 'user_id') + return $this->belongsTo(\App\Models\User::class, 'user_id') ->withTrashed(); } public function supplier() { - return $this->belongsTo('\App\Models\Supplier', 'supplier_id') + return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id') ->withTrashed(); } diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index acb50b5879..377be0f9c8 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -17,7 +17,7 @@ use Watson\Validating\ValidatingTrait; class AssetModel extends SnipeModel { use SoftDeletes; - protected $presenter = 'App\Presenters\AssetModelPresenter'; + protected $presenter = \App\Presenters\AssetModelPresenter::class; use Requestable, Presentable; protected $dates = ['deleted_at']; protected $table = 'models'; @@ -98,7 +98,7 @@ class AssetModel extends SnipeModel */ public function assets() { - return $this->hasMany('\App\Models\Asset', 'model_id'); + return $this->hasMany(\App\Models\Asset::class, 'model_id'); } /** @@ -110,7 +110,7 @@ class AssetModel extends SnipeModel */ public function category() { - return $this->belongsTo('\App\Models\Category', 'category_id'); + return $this->belongsTo(\App\Models\Category::class, 'category_id'); } /** @@ -122,7 +122,7 @@ class AssetModel extends SnipeModel */ public function depreciation() { - return $this->belongsTo('\App\Models\Depreciation', 'depreciation_id'); + return $this->belongsTo(\App\Models\Depreciation::class, 'depreciation_id'); } /** @@ -134,7 +134,7 @@ class AssetModel extends SnipeModel */ public function manufacturer() { - return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); + return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id'); } /** @@ -146,7 +146,7 @@ class AssetModel extends SnipeModel */ public function fieldset() { - return $this->belongsTo('\App\Models\CustomFieldset', 'fieldset_id'); + return $this->belongsTo(\App\Models\CustomFieldset::class, 'fieldset_id'); } /** @@ -158,7 +158,7 @@ class AssetModel extends SnipeModel */ public function defaultValues() { - return $this->belongsToMany('\App\Models\CustomField', 'models_custom_fields')->withPivot('default_value'); + return $this->belongsToMany(\App\Models\CustomField::class, 'models_custom_fields')->withPivot('default_value'); } /** diff --git a/app/Models/Category.php b/app/Models/Category.php index 31726ee0d5..d19b013827 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -19,7 +19,7 @@ use Watson\Validating\ValidatingTrait; */ class Category extends SnipeModel { - protected $presenter = 'App\Presenters\CategoryPresenter'; + protected $presenter = \App\Presenters\CategoryPresenter::class; use Presentable; use SoftDeletes; protected $dates = ['deleted_at']; @@ -105,7 +105,7 @@ class Category extends SnipeModel */ public function accessories() { - return $this->hasMany('\App\Models\Accessory'); + return $this->hasMany(\App\Models\Accessory::class); } /** @@ -117,7 +117,7 @@ class Category extends SnipeModel */ public function licenses() { - return $this->hasMany('\App\Models\License'); + return $this->hasMany(\App\Models\License::class); } /** @@ -129,7 +129,7 @@ class Category extends SnipeModel */ public function consumables() { - return $this->hasMany('\App\Models\Consumable'); + return $this->hasMany(\App\Models\Consumable::class); } /** @@ -141,7 +141,7 @@ class Category extends SnipeModel */ public function components() { - return $this->hasMany('\App\Models\Component'); + return $this->hasMany(\App\Models\Component::class); } /** @@ -178,7 +178,7 @@ class Category extends SnipeModel */ public function assets() { - return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'category_id', 'model_id'); + return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'category_id', 'model_id'); } /** @@ -190,7 +190,7 @@ class Category extends SnipeModel */ public function models() { - return $this->hasMany('\App\Models\AssetModel', 'category_id'); + return $this->hasMany(\App\Models\AssetModel::class, 'category_id'); } /** diff --git a/app/Models/Company.php b/app/Models/Company.php index 373c623a32..e09c8472c7 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -23,7 +23,7 @@ final class Company extends SnipeModel 'name' => 'required|min:1|max:255|unique:companies,name', ]; - protected $presenter = 'App\Presenters\CompanyPresenter'; + protected $presenter = \App\Presenters\CompanyPresenter::class; use Presentable; /** diff --git a/app/Models/Component.php b/app/Models/Component.php index 5defd17d5e..7c413ea965 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -14,7 +14,7 @@ use Watson\Validating\ValidatingTrait; */ class Component extends SnipeModel { - protected $presenter = 'App\Presenters\ComponentPresenter'; + protected $presenter = \App\Presenters\ComponentPresenter::class; use CompanyableTrait; use Loggable, Presentable; use SoftDeletes; @@ -92,7 +92,7 @@ class Component extends SnipeModel */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id'); + return $this->belongsTo(\App\Models\Location::class, 'location_id'); } /** @@ -104,7 +104,7 @@ class Component extends SnipeModel */ public function assets() { - return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id'); + return $this->belongsToMany(\App\Models\Asset::class, 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id'); } /** @@ -118,7 +118,7 @@ class Component extends SnipeModel */ public function admin() { - return $this->belongsTo('\App\Models\User', 'user_id'); + return $this->belongsTo(\App\Models\User::class, 'user_id'); } /** @@ -130,7 +130,7 @@ class Component extends SnipeModel */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -142,7 +142,7 @@ class Component extends SnipeModel */ public function category() { - return $this->belongsTo('\App\Models\Category', 'category_id'); + return $this->belongsTo(\App\Models\Category::class, 'category_id'); } /** @@ -154,7 +154,7 @@ class Component extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index 3869ea68d3..b8a75a5c57 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -11,7 +11,7 @@ use Watson\Validating\ValidatingTrait; class Consumable extends SnipeModel { - protected $presenter = 'App\Presenters\ConsumablePresenter'; + protected $presenter = \App\Presenters\ConsumablePresenter::class; use CompanyableTrait; use Loggable, Presentable; use SoftDeletes; @@ -121,7 +121,7 @@ class Consumable extends SnipeModel */ public function admin() { - return $this->belongsTo('\App\Models\User', 'user_id'); + return $this->belongsTo(\App\Models\User::class, 'user_id'); } /** @@ -133,7 +133,7 @@ class Consumable extends SnipeModel */ public function consumableAssignments() { - return $this->hasMany('\App\Models\ConsumableAssignment'); + return $this->hasMany(\App\Models\ConsumableAssignment::class); } /** @@ -145,7 +145,7 @@ class Consumable extends SnipeModel */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -157,7 +157,7 @@ class Consumable extends SnipeModel */ public function manufacturer() { - return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); + return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id'); } /** @@ -169,7 +169,7 @@ class Consumable extends SnipeModel */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id'); + return $this->belongsTo(\App\Models\Location::class, 'location_id'); } /** @@ -181,7 +181,7 @@ class Consumable extends SnipeModel */ public function category() { - return $this->belongsTo('\App\Models\Category', 'category_id'); + return $this->belongsTo(\App\Models\Category::class, 'category_id'); } /** @@ -193,7 +193,7 @@ class Consumable extends SnipeModel */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); + return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); } /** @@ -221,7 +221,7 @@ class Consumable extends SnipeModel */ public function users() { - return $this->belongsToMany('\App\Models\User', 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps(); + return $this->belongsToMany(\App\Models\User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps(); } /** diff --git a/app/Models/ConsumableAssignment.php b/app/Models/ConsumableAssignment.php index d82cbb5870..4c5ef53a60 100644 --- a/app/Models/ConsumableAssignment.php +++ b/app/Models/ConsumableAssignment.php @@ -13,16 +13,16 @@ class ConsumableAssignment extends Model public function consumable() { - return $this->belongsTo('\App\Models\Consumable'); + return $this->belongsTo(\App\Models\Consumable::class); } public function user() { - return $this->belongsTo('\App\Models\User', 'assigned_to'); + return $this->belongsTo(\App\Models\User::class, 'assigned_to'); } public function admin() { - return $this->belongsTo('\App\Models\User', 'user_id'); + return $this->belongsTo(\App\Models\User::class, 'user_id'); } } diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index 3185ebd2ce..01c85ab2c0 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -167,7 +167,7 @@ class CustomField extends Model */ public function fieldset() { - return $this->belongsToMany('\App\Models\CustomFieldset'); + return $this->belongsToMany(\App\Models\CustomFieldset::class); } /** @@ -179,7 +179,7 @@ class CustomField extends Model */ public function user() { - return $this->belongsTo('\App\Models\User'); + return $this->belongsTo(\App\Models\User::class); } /** @@ -191,7 +191,7 @@ class CustomField extends Model */ public function defaultValues() { - return $this->belongsToMany('\App\Models\AssetModel', 'models_custom_fields')->withPivot('default_value'); + return $this->belongsToMany(\App\Models\AssetModel::class, 'models_custom_fields')->withPivot('default_value'); } /** diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index f6f1e77cd5..83e91a4b31 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -38,7 +38,7 @@ class CustomFieldset extends Model */ public function fields() { - return $this->belongsToMany('\App\Models\CustomField')->withPivot(['required', 'order'])->orderBy('pivot_order'); + return $this->belongsToMany(\App\Models\CustomField::class)->withPivot(['required', 'order'])->orderBy('pivot_order'); } /** @@ -50,7 +50,7 @@ class CustomFieldset extends Model */ public function models() { - return $this->hasMany('\App\Models\AssetModel', 'fieldset_id'); + return $this->hasMany(\App\Models\AssetModel::class, 'fieldset_id'); } /** @@ -62,7 +62,7 @@ class CustomFieldset extends Model */ public function user() { - return $this->belongsTo('\App\Models\User'); //WARNING - not all CustomFieldsets have a User!! + return $this->belongsTo(\App\Models\User::class); //WARNING - not all CustomFieldsets have a User!! } /** diff --git a/app/Models/Department.php b/app/Models/Department.php index 1fd9567145..56be77115d 100644 --- a/app/Models/Department.php +++ b/app/Models/Department.php @@ -71,7 +71,7 @@ class Department extends SnipeModel */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -83,7 +83,7 @@ class Department extends SnipeModel */ public function users() { - return $this->hasMany('\App\Models\User', 'department_id'); + return $this->hasMany(\App\Models\User::class, 'department_id'); } /** @@ -95,7 +95,7 @@ class Department extends SnipeModel */ public function manager() { - return $this->belongsTo('\App\Models\User', 'manager_id'); + return $this->belongsTo(\App\Models\User::class, 'manager_id'); } /** @@ -107,7 +107,7 @@ class Department extends SnipeModel */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id'); + return $this->belongsTo(\App\Models\Location::class, 'location_id'); } /** diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php index caced500c7..1492ea1965 100644 --- a/app/Models/Depreciable.php +++ b/app/Models/Depreciable.php @@ -25,7 +25,7 @@ class Depreciable extends SnipeModel public function depreciation() { - return $this->belongsTo('\App\Models\Depreciation', 'depreciation_id'); + return $this->belongsTo(\App\Models\Depreciation::class, 'depreciation_id'); } public function get_depreciation() diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php index 2612f6ee1b..281524943a 100755 --- a/app/Models/Depreciation.php +++ b/app/Models/Depreciation.php @@ -8,7 +8,7 @@ use Watson\Validating\ValidatingTrait; class Depreciation extends SnipeModel { - protected $presenter = 'App\Presenters\DepreciationPresenter'; + protected $presenter = \App\Presenters\DepreciationPresenter::class; use Presentable; // Declare the rules for the form validation protected $rules = [ @@ -58,7 +58,7 @@ class Depreciation extends SnipeModel */ public function models() { - return $this->hasMany('\App\Models\AssetModel', 'depreciation_id'); + return $this->hasMany(\App\Models\AssetModel::class, 'depreciation_id'); } /** @@ -70,6 +70,6 @@ class Depreciation extends SnipeModel */ public function licenses() { - return $this->hasMany('\App\Models\License', 'depreciation_id'); + return $this->hasMany(\App\Models\License::class, 'depreciation_id'); } } diff --git a/app/Models/Group.php b/app/Models/Group.php index b493d02fef..ab432d2dd9 100755 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -47,7 +47,7 @@ class Group extends SnipeModel */ public function users() { - return $this->belongsToMany('\App\Models\User', 'users_groups'); + return $this->belongsToMany(\App\Models\User::class, 'users_groups'); } /** diff --git a/app/Models/License.php b/app/Models/License.php index 027bb84d71..119e364509 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -13,7 +13,7 @@ use Watson\Validating\ValidatingTrait; class License extends Depreciable { - protected $presenter = 'App\Presenters\LicensePresenter'; + protected $presenter = \App\Presenters\LicensePresenter::class; use SoftDeletes; use CompanyableTrait; @@ -264,7 +264,7 @@ class License extends Depreciable */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -276,7 +276,7 @@ class License extends Depreciable */ public function category() { - return $this->belongsTo('\App\Models\Category', 'category_id'); + return $this->belongsTo(\App\Models\Category::class, 'category_id'); } /** @@ -288,7 +288,7 @@ class License extends Depreciable */ public function manufacturer() { - return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); + return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id'); } /** @@ -345,7 +345,7 @@ class License extends Depreciable */ public function assignedusers() { - return $this->belongsToMany('\App\Models\User', 'license_seats', 'assigned_to', 'license_id'); + return $this->belongsToMany(\App\Models\User::class, 'license_seats', 'assigned_to', 'license_id'); } /** @@ -357,7 +357,7 @@ class License extends Depreciable */ public function assetlog() { - return $this->hasMany('\App\Models\Actionlog', 'item_id') + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') ->where('item_type', '=', self::class) ->orderBy('created_at', 'desc'); } @@ -371,7 +371,7 @@ class License extends Depreciable */ public function uploads() { - return $this->hasMany('\App\Models\Actionlog', 'item_id') + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') ->where('item_type', '=', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') @@ -387,7 +387,7 @@ class License extends Depreciable */ public function adminuser() { - return $this->belongsTo('\App\Models\User', 'user_id'); + return $this->belongsTo(\App\Models\User::class, 'user_id'); } /** @@ -570,7 +570,7 @@ class License extends Depreciable */ public function licenseseats() { - return $this->hasMany('\App\Models\LicenseSeat'); + return $this->hasMany(\App\Models\LicenseSeat::class); } /** @@ -582,7 +582,7 @@ class License extends Depreciable */ public function supplier() { - return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); + return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id'); } /** @@ -614,7 +614,7 @@ class License extends Depreciable */ public function freeSeats() { - return $this->hasMany('\App\Models\LicenseSeat')->whereNull('assigned_to')->whereNull('deleted_at')->whereNull('asset_id'); + return $this->hasMany(\App\Models\LicenseSeat::class)->whereNull('assigned_to')->whereNull('deleted_at')->whereNull('asset_id'); } /** diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index e3a64332be..5d3a21f4b6 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -14,7 +14,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild use SoftDeletes; use Loggable; - protected $presenter = 'App\Presenters\LicenseSeatPresenter'; + protected $presenter = \App\Presenters\LicenseSeatPresenter::class; use Presentable; protected $dates = ['deleted_at']; @@ -64,7 +64,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild */ public function license() { - return $this->belongsTo('\App\Models\License', 'license_id'); + return $this->belongsTo(\App\Models\License::class, 'license_id'); } /** @@ -76,7 +76,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild */ public function user() { - return $this->belongsTo('\App\Models\User', 'assigned_to')->withTrashed(); + return $this->belongsTo(\App\Models\User::class, 'assigned_to')->withTrashed(); } /** @@ -88,7 +88,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild */ public function asset() { - return $this->belongsTo('\App\Models\Asset', 'asset_id')->withTrashed(); + return $this->belongsTo(\App\Models\Asset::class, 'asset_id')->withTrashed(); } /** diff --git a/app/Models/Location.php b/app/Models/Location.php index 9113f97d2f..4bb4c5f19a 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -16,7 +16,7 @@ use Watson\Validating\ValidatingTrait; class Location extends SnipeModel { - protected $presenter = 'App\Presenters\LocationPresenter'; + protected $presenter = \App\Presenters\LocationPresenter::class; use Presentable; use SoftDeletes; protected $dates = ['deleted_at']; @@ -97,12 +97,12 @@ class Location extends SnipeModel public function users() { - return $this->hasMany('\App\Models\User', 'location_id'); + return $this->hasMany(\App\Models\User::class, 'location_id'); } public function assets() { - return $this->hasMany('\App\Models\Asset', 'location_id') + return $this->hasMany(\App\Models\Asset::class, 'location_id') ->whereHas('assetstatus', function ($query) { $query->where('status_labels.deployable', '=', 1) ->orWhere('status_labels.pending', '=', 1) @@ -123,30 +123,30 @@ class Location extends SnipeModel In all likelyhood, we need to denorm an "effective_location" column into Assets to make this slightly less miserable. */ - return $this->hasMany('\App\Models\Asset', 'rtd_location_id'); + return $this->hasMany(\App\Models\Asset::class, 'rtd_location_id'); } public function parent() { - return $this->belongsTo('\App\Models\Location', 'parent_id', 'id') + return $this->belongsTo(\App\Models\Location::class, 'parent_id', 'id') ->with('parent'); } public function manager() { - return $this->belongsTo('\App\Models\User', 'manager_id'); + return $this->belongsTo(\App\Models\User::class, 'manager_id'); } public function children() { - return $this->hasMany('\App\Models\Location', 'parent_id') + return $this->hasMany(\App\Models\Location::class, 'parent_id') ->with('children'); } // I don't think we need this anymore since we de-normed location_id in assets? public function assignedAssets() { - return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); + return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } public function setLdapOuAttribute($ldap_ou) diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php index c5bd3e18d9..5d12b1d786 100755 --- a/app/Models/Manufacturer.php +++ b/app/Models/Manufacturer.php @@ -10,7 +10,7 @@ use Watson\Validating\ValidatingTrait; class Manufacturer extends SnipeModel { - protected $presenter = 'App\Presenters\ManufacturerPresenter'; + protected $presenter = \App\Presenters\ManufacturerPresenter::class; use Presentable; use SoftDeletes; protected $dates = ['deleted_at']; @@ -77,26 +77,26 @@ class Manufacturer extends SnipeModel public function assets() { - return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'manufacturer_id', 'model_id'); + return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'manufacturer_id', 'model_id'); } public function models() { - return $this->hasMany('\App\Models\AssetModel', 'manufacturer_id'); + return $this->hasMany(\App\Models\AssetModel::class, 'manufacturer_id'); } public function licenses() { - return $this->hasMany('\App\Models\License', 'manufacturer_id'); + return $this->hasMany(\App\Models\License::class, 'manufacturer_id'); } public function accessories() { - return $this->hasMany('\App\Models\Accessory', 'manufacturer_id'); + return $this->hasMany(\App\Models\Accessory::class, 'manufacturer_id'); } public function consumables() { - return $this->hasMany('\App\Models\Consumable', 'manufacturer_id'); + return $this->hasMany(\App\Models\Consumable::class, 'manufacturer_id'); } } diff --git a/app/Models/PredefinedKit.php b/app/Models/PredefinedKit.php index 9bc8f86c1f..1bf6cb098b 100644 --- a/app/Models/PredefinedKit.php +++ b/app/Models/PredefinedKit.php @@ -15,7 +15,7 @@ use Watson\Validating\ValidatingTrait; */ class PredefinedKit extends SnipeModel { - protected $presenter = 'App\Presenters\PredefinedKitPresenter'; + protected $presenter = \App\Presenters\PredefinedKitPresenter::class; use Presentable; protected $table = 'kits'; @@ -139,12 +139,12 @@ class PredefinedKit extends SnipeModel */ public function models() { - return $this->belongsToMany('\App\Models\AssetModel', 'kits_models', 'kit_id', 'model_id')->withPivot('id', 'quantity'); + return $this->belongsToMany(\App\Models\AssetModel::class, 'kits_models', 'kit_id', 'model_id')->withPivot('id', 'quantity'); } public function assets() { - return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'country_id', 'user_id'); + return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'country_id', 'user_id'); } /** @@ -153,7 +153,7 @@ class PredefinedKit extends SnipeModel */ public function licenses() { - return $this->belongsToMany('\App\Models\License', 'kits_licenses', 'kit_id', 'license_id')->withPivot('id', 'quantity'); + return $this->belongsToMany(\App\Models\License::class, 'kits_licenses', 'kit_id', 'license_id')->withPivot('id', 'quantity'); } /** @@ -162,7 +162,7 @@ class PredefinedKit extends SnipeModel */ public function consumables() { - return $this->belongsToMany('\App\Models\Consumable', 'kits_consumables', 'kit_id', 'consumable_id')->withPivot('id', 'quantity'); + return $this->belongsToMany(\App\Models\Consumable::class, 'kits_consumables', 'kit_id', 'consumable_id')->withPivot('id', 'quantity'); } /** @@ -171,7 +171,7 @@ class PredefinedKit extends SnipeModel */ public function accessories() { - return $this->belongsToMany('\App\Models\Accessory', 'kits_accessories', 'kit_id', 'accessory_id')->withPivot('id', 'quantity'); + return $this->belongsToMany(\App\Models\Accessory::class, 'kits_accessories', 'kit_id', 'accessory_id')->withPivot('id', 'quantity'); } /** diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index 681dd08307..17a277db7b 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -59,7 +59,7 @@ class Statuslabel extends SnipeModel */ public function assets() { - return $this->hasMany('\App\Models\Asset', 'status_id'); + return $this->hasMany(\App\Models\Asset::class, 'status_id'); } /** diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 285147b079..0b38c01683 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -104,7 +104,7 @@ class Supplier extends SnipeModel */ public function assets() { - return $this->hasMany('\App\Models\Asset', 'supplier_id'); + return $this->hasMany(\App\Models\Asset::class, 'supplier_id'); } /** @@ -116,7 +116,7 @@ class Supplier extends SnipeModel */ public function accessories() { - return $this->hasMany('\App\Models\Accessory', 'supplier_id'); + return $this->hasMany(\App\Models\Accessory::class, 'supplier_id'); } /** @@ -128,7 +128,7 @@ class Supplier extends SnipeModel */ public function asset_maintenances() { - return $this->hasMany('\App\Models\AssetMaintenance', 'supplier_id'); + return $this->hasMany(\App\Models\AssetMaintenance::class, 'supplier_id'); } /** @@ -156,7 +156,7 @@ class Supplier extends SnipeModel */ public function licenses() { - return $this->hasMany('\App\Models\License', 'supplier_id'); + return $this->hasMany(\App\Models\License::class, 'supplier_id'); } /** diff --git a/app/Models/User.php b/app/Models/User.php index 4a0fbfc934..f9d4a4071f 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -21,7 +21,7 @@ use Watson\Validating\ValidatingTrait; class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference { - protected $presenter = 'App\Presenters\UserPresenter'; + protected $presenter = \App\Presenters\UserPresenter::class; use SoftDeletes, ValidatingTrait; use Authenticatable, Authorizable, CanResetPassword, HasApiTokens; use UniqueUndeletedTrait; @@ -188,7 +188,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function company() { - return $this->belongsTo('\App\Models\Company', 'company_id'); + return $this->belongsTo(\App\Models\Company::class, 'company_id'); } /** @@ -200,7 +200,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function department() { - return $this->belongsTo('\App\Models\Department', 'department_id'); + return $this->belongsTo(\App\Models\Department::class, 'department_id'); } /** @@ -264,7 +264,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function assets() { - return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); + return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } /** @@ -279,7 +279,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function assetmaintenances() { - return $this->hasMany('\App\Models\AssetMaintenance', 'user_id')->withTrashed(); + return $this->hasMany(\App\Models\AssetMaintenance::class, 'user_id')->withTrashed(); } /** @@ -291,7 +291,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function accessories() { - return $this->belongsToMany('\App\Models\Accessory', 'accessories_users', 'assigned_to', 'accessory_id') + return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_users', 'assigned_to', 'accessory_id') ->withPivot('id', 'created_at', 'note')->withTrashed(); } @@ -304,7 +304,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function consumables() { - return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed(); + return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed(); } /** @@ -316,7 +316,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function licenses() { - return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id'); + return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id'); } /** @@ -328,7 +328,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function userlog() { - return $this->hasMany('\App\Models\Actionlog', 'target_id')->where('target_type', '=', 'App\Models\User')->orderBy('created_at', 'DESC')->withTrashed(); + return $this->hasMany(\App\Models\Actionlog::class, 'target_id')->where('target_type', '=', \App\Models\User::class)->orderBy('created_at', 'DESC')->withTrashed(); } /** @@ -344,7 +344,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function userloc() { - return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); + return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed(); } /** @@ -356,7 +356,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function location() { - return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); + return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed(); } /** @@ -368,7 +368,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function manager() { - return $this->belongsTo('\App\Models\User', 'manager_id')->withTrashed(); + return $this->belongsTo(\App\Models\User::class, 'manager_id')->withTrashed(); } /** @@ -380,7 +380,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function managedLocations() { - return $this->hasMany('\App\Models\Location', 'manager_id'); + return $this->hasMany(\App\Models\Location::class, 'manager_id'); } /** @@ -392,7 +392,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function groups() { - return $this->belongsToMany('\App\Models\Group', 'users_groups'); + return $this->belongsToMany(\App\Models\Group::class, 'users_groups'); } /** @@ -404,7 +404,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function assetlog() { - return $this->hasMany('\App\Models\Asset', 'id')->withTrashed(); + return $this->hasMany(\App\Models\Asset::class, 'id')->withTrashed(); } /** @@ -418,7 +418,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function uploads() { - return $this->hasMany('\App\Models\Actionlog', 'item_id') + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') ->where('item_type', self::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 6a454d28eb..1f08b445c9 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -15,11 +15,11 @@ class EventServiceProvider extends ServiceProvider */ protected $listen = [ 'Illuminate\Auth\Events\Login' => [ - 'App\Listeners\LogSuccessfulLogin', + \App\Listeners\LogSuccessfulLogin::class, ], 'Illuminate\Auth\Events\Failed' => [ - 'App\Listeners\LogFailedLogin', + \App\Listeners\LogFailedLogin::class, ], ]; diff --git a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php index b27c602741..874f7a6070 100644 --- a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php +++ b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php @@ -26,20 +26,20 @@ class MigrateAssetLogToActionLog extends Migration if (! is_null($log->asset_id)) { $a->item_id = $log->asset_id; if ($log->asset_type == 'hardware') { - $a->item_type = 'App\\Models\\Asset'; + $a->item_type = \App\Models\Asset::class; } else { - $a->item_type = 'App\\Models\\License'; + $a->item_type = \App\Models\License::class; } } if (! is_null($log->accessory_id)) { $a->item_id = $log->accessory_id; - $a->item_type = 'App\\Models\\Accessory'; + $a->item_type = \App\Models\Accessory::class; } elseif (! is_null($log->consumable_id)) { $a->item_id = $log->consumable_id; - $a->item_type = 'App\\Models\\Consumable'; + $a->item_type = \App\Models\Consumable::class; } elseif (! is_null($log->component_id)) { $a->item_id = $log->component_id; - $a->item_type = 'App\\Models\\Component'; + $a->item_type = \App\Models\Component::class; } $a->action_type = $log->action_type; // $a->checkout_to = $log->checkout_to; diff --git a/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php b/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php index 14bbea529f..bf0b5360a1 100644 --- a/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php +++ b/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php @@ -17,7 +17,7 @@ class AddMissingTargetTypeToLogsTable extends Migration DB::table('action_logs')->where('target_type', null)->where(function ($query) { $query->where('action_type', 'accepted') ->orWhere('action_type', 'declined'); - })->update(['target_type'=> 'App\Models\User']); + })->update(['target_type'=> \App\Models\User::class]); } /** diff --git a/database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php b/database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php index b9d2239981..ef7c3cd4c0 100644 --- a/database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php +++ b/database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php @@ -21,7 +21,7 @@ class FixAssignedTypeNotBeingNulled extends Migration // Additionally, the importer did not set assigned_type when importing. // In the case where we have an assigned_to but not an assigned_type, set the assigned_type to User. - Asset::whereNotNull('assigned_to')->whereNull('assigned_type')->update(['assigned_type' => 'App\Models\User']); + Asset::whereNotNull('assigned_to')->whereNull('assigned_type')->update(['assigned_type' => \App\Models\User::class]); } /** diff --git a/database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php b/database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php index 3783a568ed..2885f5ef84 100644 --- a/database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php +++ b/database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php @@ -16,13 +16,13 @@ class CreateCheckoutAcceptancesForUnacceptedAssets extends Migration public function up() { // Get all assets not accepted - $assets = DB::table('assets')->where('assigned_type', 'App\Models\User')->where('accepted', 'pending')->get(); + $assets = DB::table('assets')->where('assigned_type', \App\Models\User::class)->where('accepted', 'pending')->get(); $acceptances = []; foreach ($assets as $asset) { $acceptances[] = [ - 'checkoutable_type' => 'App\Models\Asset', + 'checkoutable_type' => \App\Models\Asset::class, 'checkoutable_id' => $asset->id, 'assigned_to_id' => $asset->assigned_to, ]; diff --git a/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php b/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php index cbf1e2d070..feea0d95a1 100644 --- a/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php +++ b/database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php @@ -43,7 +43,7 @@ class MoveAccessoryCheckoutNoteToJoinTable extends Migration $action_log_entries = Actionlog::where('created_at', '=', $join_log->created_at) ->where('target_id', '=', $join_log->assigned_to) ->where('item_id', '=', $accessory->id) - ->where('target_type', '=', 'App\\Models\\User') + ->where('target_type', '=', \App\Models\User::class) ->where('action_type', '=', 'checkout') ->orderBy('created_at', 'DESC')->get(); diff --git a/tests/api/ApiCheckoutAssetsCest.php b/tests/api/ApiCheckoutAssetsCest.php index 77c77615f6..4e137785d2 100644 --- a/tests/api/ApiCheckoutAssetsCest.php +++ b/tests/api/ApiCheckoutAssetsCest.php @@ -25,7 +25,7 @@ class ApiCheckoutAssetsCest $I->wantTo('Check out an asset to a user'); //Grab an asset from the database that isn't checked out. $asset = Asset::whereNull('assigned_to')->first(); - $targetUser = factory('App\Models\User')->create(); + $targetUser = factory(\App\Models\User::class)->create(); $data = [ 'assigned_user' => $targetUser->id, 'note' => 'This is a test checkout note', @@ -62,7 +62,7 @@ class ApiCheckoutAssetsCest ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance - $targetAsset = factory('App\Models\Asset')->states('desktop-macpro')->create([ + $targetAsset = factory(\App\Models\Asset::class)->states('desktop-macpro')->create([ 'name' => 'Test Asset For Checkout to', ]); $data = [ @@ -96,7 +96,7 @@ class ApiCheckoutAssetsCest ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance - $targetLocation = factory('App\Models\Location')->create([ + $targetLocation = factory(\App\Models\Location::class)->create([ 'name' => 'Test Location for Checkout', ]); $data = [ diff --git a/tests/functional/AssetsCest.php b/tests/functional/AssetsCest.php index 4f35534baa..e08b26069c 100644 --- a/tests/functional/AssetsCest.php +++ b/tests/functional/AssetsCest.php @@ -62,7 +62,7 @@ class AssetsCest $seenValues = [ 'asset_tag' => $asset->asset_tag, 'assigned_to' => $userId, - 'assigned_type' => 'App\\Models\\User', + 'assigned_type' => \App\Models\User::class, 'company_id' => $asset->company_id, 'model_id' => $asset->model_id, 'name' => $asset->name, From ec0dc681ba0e8a7c2818e092c0cda0a192b678c3 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:16:59 +0000 Subject: [PATCH 03/19] Shift core files --- resources/lang/en/auth.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 resources/lang/en/auth.php diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php new file mode 100644 index 0000000000..6598e2c060 --- /dev/null +++ b/resources/lang/en/auth.php @@ -0,0 +1,20 @@ + 'These credentials do not match our records.', + 'password' => 'The provided password is incorrect.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + +]; From 4ed3d6afb862a9680c0c5989660ef295a379b85a Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:04 +0000 Subject: [PATCH 04/19] Shift HTTP kernel and middleware --- app/Http/Kernel.php | 2 +- .../PreventRequestsDuringMaintenance.php | 17 ++++++++++++++ app/Http/Middleware/TrimStrings.php | 19 +++++++++++++++ app/Http/Middleware/TrustHosts.php | 20 ++++++++++++++++ app/Http/Middleware/TrustProxies.php | 23 +++++++++++++++++++ 5 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 app/Http/Middleware/PreventRequestsDuringMaintenance.php create mode 100644 app/Http/Middleware/TrimStrings.php create mode 100644 app/Http/Middleware/TrustHosts.php create mode 100644 app/Http/Middleware/TrustProxies.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index bedb8bcca5..da50b9c8bd 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -15,7 +15,7 @@ class Kernel extends HttpKernel */ protected $middleware = [ \App\Http\Middleware\NoSessionStore::class, - \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class, \Illuminate\Session\Middleware\StartSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \Fideloper\Proxy\TrustProxies::class, diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php new file mode 100644 index 0000000000..e4956d0bb9 --- /dev/null +++ b/app/Http/Middleware/PreventRequestsDuringMaintenance.php @@ -0,0 +1,17 @@ +allSubdomainsOfApplicationUrl(), + ]; + } +} diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php new file mode 100644 index 0000000000..a3b6aef90b --- /dev/null +++ b/app/Http/Middleware/TrustProxies.php @@ -0,0 +1,23 @@ + Date: Thu, 10 Jun 2021 20:17:07 +0000 Subject: [PATCH 05/19] Shift service providers --- app/Providers/RouteServiceProvider.php | 37 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f52cdcae15..f7742a6b25 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,6 +2,9 @@ namespace App\Providers; +use Illuminate\Support\Facades\RateLimiter; +use Illuminate\Http\Request; +use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Support\Facades\Route; @@ -23,24 +26,18 @@ class RouteServiceProvider extends ServiceProvider */ public function boot() { - // + $this->configureRateLimiting(); - parent::boot(); + $this->routes(function () { + $this->mapApiRoutes(); + + $this->mapWebRoutes(); + + // + }); } - /** - * Define the routes for the application. - * - * @return void - */ - public function map() - { - $this->mapApiRoutes(); - $this->mapWebRoutes(); - - // - } /** * Define the "web" routes for the application. @@ -85,4 +82,16 @@ class RouteServiceProvider extends ServiceProvider require base_path('routes/api.php'); }); } + + /** + * Configure the rate limiters for the application. + * + * @return void + */ + protected function configureRateLimiting() + { + RateLimiter::for('api', function (Request $request) { + return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip()); + }); + } } From bdf23e472e140aa8af4d4b2b7205cf68b6e68c32 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:14 +0000 Subject: [PATCH 06/19] Shift to class based routes --- app/Providers/RouteServiceProvider.php | 9 -- routes/api.php | 197 +++++++++++------------ routes/web.php | 206 ++++++++++++++----------- routes/web/accessories.php | 13 +- routes/web/components.php | 13 +- routes/web/consumables.php | 9 +- routes/web/fields.php | 16 +- routes/web/hardware.php | 76 ++++----- routes/web/kits.php | 37 +++-- routes/web/licenses.php | 23 +-- routes/web/models.php | 22 +-- routes/web/users.php | 35 +++-- 12 files changed, 351 insertions(+), 305 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f7742a6b25..57e9505d3f 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -10,15 +10,6 @@ use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { - /** - * This namespace is applied to your controller routes. - * - * In addition, it is set as the URL generator's root namespace. - * - * @var string - */ - protected $namespace = 'App\Http\Controllers'; - /** * Define your route model bindings, pattern filters, etc. * diff --git a/routes/api.php b/routes/api.php index ddc512721f..df2570c9ef 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,5 +1,8 @@ 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api'], function () { +Route::group(['prefix' => 'v1', 'middleware' => 'auth:api'], function () { Route::get('/', function () { return response()->json( [ @@ -27,14 +30,14 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('requestable/hardware', [ 'as' => 'api.assets.requestable', - 'uses' => 'AssetsController@requestable', + 'uses' => [Api\AssetsController::class, 'requestable'], ] ); Route::get('requests', [ 'as' => 'api.assets.requested', - 'uses' => 'ProfileController@requestedAssets', + 'uses' => [Api\ProfileController::class, 'requestedAssets'], ] ); }); @@ -44,20 +47,20 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{accessory}/checkedout', [ 'as' => 'api.accessories.checkedout', - 'uses' => 'AccessoriesController@checkedout', + 'uses' => [Api\AccessoriesController::class, 'checkedout'], ] ); Route::get('selectlist', [ 'as' => 'api.accessories.selectlist', - 'uses'=> 'AccessoriesController@selectlist', + 'uses'=> [Api\AccessoriesController::class, 'selectlist'], ] ); }); // Accessories group - Route::resource('accessories', 'AccessoriesController', + Route::resource('accessories', Api\AccessoriesController::class, ['names' => [ 'index' => 'api.accessories.index', 'show' => 'api.accessories.show', @@ -76,21 +79,21 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{accessory}/checkedout', [ 'as' => 'api.accessories.checkedout', - 'uses' => 'AccessoriesController@checkedout', + 'uses' => [Api\AccessoriesController::class, 'checkedout'], ] ); Route::post('{accessory}/checkout', [ 'as' => 'api.accessories.checkout', - 'uses' => 'AccessoriesController@checkout', + 'uses' => [Api\AccessoriesController::class, 'checkout'], ] ); Route::post('{accessory}/checkin', [ 'as' => 'api.accessories.checkin', - 'uses' => 'AccessoriesController@checkin', + 'uses' => [Api\AccessoriesController::class, 'checkin'], ] ); }); // Accessories group @@ -101,13 +104,13 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{item_type}/selectlist', [ 'as' => 'api.categories.selectlist', - 'uses' => 'CategoriesController@selectlist', + 'uses' => [Api\CategoriesController::class, 'selectlist'], ] ); }); // Categories group - Route::resource('categories', 'CategoriesController', + Route::resource('categories', Api\CategoriesController::class, [ 'names' => [ 'index' => 'api.categories.index', @@ -125,11 +128,11 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('companies/selectlist', [ 'as' => 'companies.selectlist', - 'uses' => 'CompaniesController@selectlist', + 'uses' => [Api\CompaniesController::class, 'selectlist'], ]); // Companies resource - Route::resource('companies', 'CompaniesController', + Route::resource('companies', Api\CompaniesController::class, [ 'names' => [ 'index' => 'api.companies.index', @@ -149,12 +152,12 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('selectlist', [ 'as' => 'api.departments.selectlist', - 'uses' => 'DepartmentsController@selectlist', + 'uses' => [Api\DepartmentsController::class, 'selectlist'], ] ); }); // Departments group - Route::resource('departments', 'DepartmentsController', + Route::resource('departments', Api\DepartmentsController::class, [ 'names' => [ 'index' => 'api.departments.index', @@ -170,7 +173,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' /*--- Components API ---*/ - Route::resource('components', 'ComponentsController', + Route::resource('components', Api\ComponentsController::class, [ 'names' => [ 'index' => 'api.components.index', @@ -188,7 +191,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{component}/assets', [ 'as' =>'api.components.assets', - 'uses' => 'ComponentsController@getAssets', + 'uses' => [Api\ComponentsController::class, 'getAssets'], ] ); }); // Components group @@ -197,11 +200,11 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('consumables/selectlist', [ 'as' => 'api.consumables.selectlist', - 'uses'=> 'ConsumablesController@selectlist', + 'uses'=> [Api\ConsumablesController::class, 'selectlist'], ] ); - Route::resource('consumables', 'ConsumablesController', + Route::resource('consumables', Api\ConsumablesController::class, [ 'names' => [ 'index' => 'api.consumables.index', @@ -219,21 +222,21 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('view/{id}/users', [ 'as' => 'api.consumables.showUsers', - 'uses' => 'ConsumablesController@getDataView', + 'uses' => [Api\ConsumablesController::class, 'getDataView'], ] ); Route::post('{consumable}/checkout', [ 'as' => 'api.consumables.checkout', - 'uses' => 'ConsumablesController@checkout', + 'uses' => [Api\ConsumablesController::class, 'checkout'], ] ); }); /*--- Depreciations API ---*/ - Route::resource('depreciations', 'DepreciationsController', + Route::resource('depreciations', Api\DepreciationsController::class, [ 'names' => [ 'index' => 'api.depreciations.index', @@ -249,7 +252,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' /*--- Fields API ---*/ - Route::resource('fields', 'CustomFieldsController', [ + Route::resource('fields', Api\CustomFieldsController::class, [ 'names' => [ 'index' => 'api.customfields.index', 'show' => 'api.customfields.show', @@ -265,19 +268,19 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::post('fieldsets/{id}/order', [ 'as' => 'api.customfields.order', - 'uses' => 'CustomFieldsController@postReorder', + 'uses' => [Api\CustomFieldsController::class, 'postReorder'], ] ); Route::post('{field}/associate', [ 'as' => 'api.customfields.associate', - 'uses' => 'CustomFieldsController@associate', + 'uses' => [Api\CustomFieldsController::class, 'associate'], ] ); Route::post('{field}/disassociate', [ 'as' => 'api.customfields.disassociate', - 'uses' => 'CustomFieldsController@disassociate', + 'uses' => [Api\CustomFieldsController::class, 'disassociate'], ] ); }); // Fields group @@ -288,18 +291,18 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{fieldset}/fields', [ 'as' => 'api.fieldsets.fields', - 'uses' => 'CustomFieldsetsController@fields', + 'uses' => [Api\CustomFieldsetsController::class, 'fields'], ] ); Route::get('/{fieldset}/fields/{model}', [ 'as' => 'api.fieldsets.fields-with-default-value', - 'uses' => 'CustomFieldsetsController@fieldsWithDefaultValues', + 'uses' => [Api\CustomFieldsetsController::class, 'fieldsWithDefaultValues'], ] ); }); - Route::resource('fieldsets', 'CustomFieldsetsController', + Route::resource('fieldsets', Api\CustomFieldsetsController::class, [ 'names' => [ 'index' => 'api.fieldsets.index', @@ -315,7 +318,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' /*--- Groups API ---*/ - Route::resource('groups', 'GroupsController', + Route::resource('groups', Api\GroupsController::class, [ 'names' => [ 'index' => 'api.groups.index', @@ -334,60 +337,60 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::group(['prefix' => 'hardware'], function () { Route::get('{asset_id}/licenses', [ 'as' => 'api.assets.licenselist', - 'uses' => 'AssetsController@licenses', + 'uses' => [Api\AssetsController::class, 'licenses'], ]); Route::get('bytag/{tag}', [ 'as' => 'assets.show.bytag', - 'uses' => 'AssetsController@showByTag', + 'uses' => [Api\AssetsController::class, 'showByTag'], ]); Route::get('bytag/{any}', [ 'as' => 'api.assets.show.bytag', - 'uses' => 'AssetsController@showByTag', + 'uses' => [Api\AssetsController::class, 'showByTag'], ] )->where('any', '.*'); Route::get('byserial/{any}', [ 'as' => 'api.assets.show.byserial', - 'uses' => 'AssetsController@showBySerial', + 'uses' => [Api\AssetsController::class, 'showBySerial'], ] )->where('any', '.*'); Route::get('selectlist', [ 'as' => 'assets.selectlist', - 'uses' => 'AssetsController@selectlist', + 'uses' => [Api\AssetsController::class, 'selectlist'], ]); Route::get('audit/{audit}', [ 'as' => 'api.asset.to-audit', - 'uses' => 'AssetsController@index', + 'uses' => [Api\AssetsController::class, 'index'], ]); Route::post('audit', [ 'as' => 'api.asset.audit', - 'uses' => 'AssetsController@audit', + 'uses' => [Api\AssetsController::class, 'audit'], ]); Route::post('{asset_id}/checkout', [ 'as' => 'api.assets.checkout', - 'uses' => 'AssetsController@checkout', + 'uses' => [Api\AssetsController::class, 'checkout'], ] ); Route::post('{asset_id}/checkin', [ 'as' => 'api.assets.checkin', - 'uses' => 'AssetsController@checkin', + 'uses' => [Api\AssetsController::class, 'checkin'], ] ); }); /*--- Asset Maintenances API ---*/ - Route::resource('maintenances', 'AssetMaintenancesController', + Route::resource('maintenances', Api\AssetMaintenancesController::class, [ 'names' => [ 'index' => 'api.maintenances.index', @@ -401,7 +404,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' ] ); // Consumables resource - Route::resource('hardware', 'AssetsController', + Route::resource('hardware', Api\AssetsController::class, [ 'names' => [ 'index' => 'api.assets.index', @@ -417,7 +420,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' /*--- Imports API ---*/ - Route::resource('imports', 'ImportController', + Route::resource('imports', Api\ImportController::class, [ 'names' => [ 'index' => 'api.imports.index', @@ -435,7 +438,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::post('process/{import}', [ 'as' => 'api.imports.importFile', - 'uses'=> 'ImportController@process', + 'uses'=> [Api\ImportController::class, 'process'], ] ); }); // Imports group @@ -446,12 +449,12 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('selectlist', [ 'as' => 'api.licenses.selectlist', - 'uses'=> 'LicensesController@selectlist', + 'uses'=> [Api\LicensesController::class, 'selectlist'], ] ); }); // Licenses group - Route::resource('licenses', 'LicensesController', + Route::resource('licenses', Api\LicensesController::class, [ 'names' => [ 'index' => 'api.licenses.index', @@ -465,7 +468,7 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' ] ); // Licenses resource - Route::resource('licenses.seats', 'LicenseSeatsController', + Route::resource('licenses.seats', Api\LicenseSeatsController::class, [ 'names' => [ 'index' => 'api.licenses.seats.index', @@ -483,14 +486,14 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{location}/users', [ 'as'=>'api.locations.viewusers', - 'uses'=>'LocationsController@getDataViewUsers', + 'uses'=>[Api\LocationsController::class, 'getDataViewUsers'], ] ); Route::get('{location}/assets', [ 'as'=>'api.locations.viewassets', - 'uses'=>'LocationsController@getDataViewAssets', + 'uses'=>[Api\LocationsController::class, 'getDataViewAssets'], ] ); @@ -498,17 +501,17 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('{location}/check', [ 'as' => 'api.locations.check', - 'uses' => 'LocationsController@show', + 'uses' => [Api\LocationsController::class, 'show'], ] ); Route::get('selectlist', [ 'as' => 'locations.selectlist', - 'uses' => 'LocationsController@selectlist', + 'uses' => [Api\LocationsController::class, 'selectlist'], ]); }); // Locations group - Route::resource('locations', 'LocationsController', + Route::resource('locations', Api\LocationsController::class, [ 'names' => [ 'index' => 'api.locations.index', @@ -527,11 +530,11 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::group(['prefix' => 'manufacturers'], function () { Route::get('selectlist', [ 'as' => 'manufacturers.selectlist', - 'uses' => 'ManufacturersController@selectlist', + 'uses' => [Api\ManufacturersController::class, 'selectlist'], ]); }); // Locations group - Route::resource('manufacturers', 'ManufacturersController', + Route::resource('manufacturers', Api\ManufacturersController::class, [ 'names' => [ 'index' => 'api.manufacturers.index', @@ -551,18 +554,18 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('assets', [ 'as' => 'api.models.assets', - 'uses'=> 'AssetModelsController@assets', + 'uses'=> [Api\AssetModelsController::class, 'assets'], ] ); Route::get('selectlist', [ 'as' => 'api.models.selectlist', - 'uses'=> 'AssetModelsController@selectlist', + 'uses'=> [Api\AssetModelsController::class, 'selectlist'], ] ); }); // Models group - Route::resource('models', 'AssetModelsController', + Route::resource('models', Api\AssetModelsController::class, [ 'names' => [ 'index' => 'api.models.index', @@ -579,38 +582,38 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' /*--- Settings API ---*/ Route::get('settings/ldaptest', [ 'as' => 'api.settings.ldaptest', - 'uses' => 'SettingsController@ldapAdSettingsTest', + 'uses' => [Api\SettingsController::class, 'ldapAdSettingsTest'], ]); Route::post('settings/purge_barcodes', [ 'as' => 'api.settings.purgebarcodes', - 'uses' => 'SettingsController@purgeBarcodes', + 'uses' => [Api\SettingsController::class, 'purgeBarcodes'], ]); Route::get('settings/login-attempts', [ 'middleware' => ['auth', 'authorize:superuser'], 'as' => 'api.settings.login_attempts', - 'uses' => 'SettingsController@showLoginAttempts', + 'uses' => [Api\SettingsController::class, 'showLoginAttempts'], ]); Route::post('settings/ldaptestlogin', [ 'as' => 'api.settings.ldaptestlogin', - 'uses' => 'SettingsController@ldaptestlogin', + 'uses' => [Api\SettingsController::class, 'ldaptestlogin'], ]); Route::post('settings/slacktest', [ 'as' => 'api.settings.slacktest', - 'uses' => 'SettingsController@slacktest', + 'uses' => [Api\SettingsController::class, 'slacktest'], ]); Route::post( 'settings/mailtest', [ 'as' => 'api.settings.mailtest', - 'uses' => 'SettingsController@ajaxTestEmail', + 'uses' => [Api\SettingsController::class, 'ajaxTestEmail'], ]); - Route::resource('settings', 'SettingsController', + Route::resource('settings', Api\SettingsController::class, [ 'names' => [ 'index' => 'api.settings.index', @@ -631,26 +634,26 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('assets', [ 'as' => 'api.statuslabels.assets.bytype', - 'uses' => 'StatuslabelsController@getAssetCountByStatuslabel', + 'uses' => [Api\StatuslabelsController::class, 'getAssetCountByStatuslabel'], ] ); Route::get('{statuslabel}/assetlist', [ 'as' => 'api.statuslabels.assets', - 'uses' => 'StatuslabelsController@assets', + 'uses' => [Api\StatuslabelsController::class, 'assets'], ] ); Route::get('{statuslabel}/deployable', [ 'as' => 'api.statuslabels.deployable', - 'uses' => 'StatuslabelsController@checkIfDeployable', + 'uses' => [Api\StatuslabelsController::class, 'checkIfDeployable'], ] ); }); - Route::resource('statuslabels', 'StatuslabelsController', + Route::resource('statuslabels', Api\StatuslabelsController::class, [ 'names' => [ 'index' => 'api.statuslabels.index', @@ -671,19 +674,19 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('list', [ 'as'=>'api.suppliers.list', - 'uses'=>'SuppliersController@getDatatable', + 'uses'=>[Api\SuppliersController::class, 'getDatatable'], ] ); Route::get('selectlist', [ 'as' => 'api.suppliers.selectlist', - 'uses' => 'SuppliersController@selectlist', + 'uses' => [Api\SuppliersController::class, 'selectlist'], ] ); }); // Suppliers group - Route::resource('suppliers', 'SuppliersController', + Route::resource('suppliers', Api\SuppliersController::class, [ 'names' => [ 'index' => 'api.suppliers.index', @@ -703,61 +706,61 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::post('two_factor_reset', [ 'as' => 'api.users.two_factor_reset', - 'uses' => 'UsersController@postTwoFactorReset', + 'uses' => [Api\UsersController::class, 'postTwoFactorReset'], ] ); Route::get('me', [ 'as' => 'api.users.me', - 'uses' => 'UsersController@getCurrentUserInfo', + 'uses' => [Api\UsersController::class, 'getCurrentUserInfo'], ] ); Route::get('list/{status?}', [ 'as' => 'api.users.list', - 'uses' => 'UsersController@getDatatable', + 'uses' => [Api\UsersController::class, 'getDatatable'], ] ); Route::get('selectlist', [ 'as' => 'api.users.selectlist', - 'uses' => 'UsersController@selectList', + 'uses' => [Api\UsersController::class, 'selectList'], ] ); Route::get('{user}/assets', [ 'as' => 'api.users.assetlist', - 'uses' => 'UsersController@assets', + 'uses' => [Api\UsersController::class, 'assets'], ] ); Route::get('{user}/accessories', [ 'as' => 'api.users.accessorieslist', - 'uses' => 'UsersController@accessories', + 'uses' => [Api\UsersController::class, 'accessories'], ] ); Route::get('{user}/licenses', [ 'as' => 'api.users.licenselist', - 'uses' => 'UsersController@licenses', + 'uses' => [Api\UsersController::class, 'licenses'], ] ); Route::post('{user}/upload', [ 'as' => 'api.users.uploads', - 'uses' => 'UsersController@postUpload', + 'uses' => [Api\UsersController::class, 'postUpload'], ] ); }); // Users group - Route::resource('users', 'UsersController', + Route::resource('users', Api\UsersController::class, [ 'names' => [ 'index' => 'api.users.index', @@ -773,12 +776,12 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get( 'reports/activity', - ['as' => 'api.activity.index', 'uses' => 'ReportsController@index'] + ['as' => 'api.activity.index', 'uses' => [Api\ReportsController::class, 'index']] ); /*--- Kits API ---*/ - Route::resource('kits', 'PredefinedKitsController', + Route::resource('kits', Api\PredefinedKitsController::class, [ 'names' => [ 'index' => 'api.kits.index', @@ -798,28 +801,28 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('licenses', [ 'as' => 'api.kits.licenses.index', - 'uses' => 'PredefinedKitsController@indexLicenses', + 'uses' => [Api\PredefinedKitsController::class, 'indexLicenses'], ] ); Route::post('licenses', [ 'as' => 'api.kits.licenses.store', - 'uses' => 'PredefinedKitsController@storeLicense', + 'uses' => [Api\PredefinedKitsController::class, 'storeLicense'], ] ); Route::put('licenses/{license_id}', [ 'as' => 'api.kits.licenses.update', - 'uses' => 'PredefinedKitsController@updateLicense', + 'uses' => [Api\PredefinedKitsController::class, 'updateLicense'], ] ); Route::delete('licenses/{license_id}', [ 'as' => 'api.kits.licenses.destroy', - 'uses' => 'PredefinedKitsController@detachLicense', + 'uses' => [Api\PredefinedKitsController::class, 'detachLicense'], ] ); @@ -827,28 +830,28 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('models', [ 'as' => 'api.kits.models.index', - 'uses' => 'PredefinedKitsController@indexModels', + 'uses' => [Api\PredefinedKitsController::class, 'indexModels'], ] ); Route::post('models', [ 'as' => 'api.kits.models.store', - 'uses' => 'PredefinedKitsController@storeModel', + 'uses' => [Api\PredefinedKitsController::class, 'storeModel'], ] ); Route::put('models/{model_id}', [ 'as' => 'api.kits.models.update', - 'uses' => 'PredefinedKitsController@updateModel', + 'uses' => [Api\PredefinedKitsController::class, 'updateModel'], ] ); Route::delete('models/{model_id}', [ 'as' => 'api.kits.models.destroy', - 'uses' => 'PredefinedKitsController@detachModel', + 'uses' => [Api\PredefinedKitsController::class, 'detachModel'], ] ); @@ -856,28 +859,28 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('accessories', [ 'as' => 'api.kits.accessories.index', - 'uses' => 'PredefinedKitsController@indexAccessories', + 'uses' => [Api\PredefinedKitsController::class, 'indexAccessories'], ] ); Route::post('accessories', [ 'as' => 'api.kits.accessories.store', - 'uses' => 'PredefinedKitsController@storeAccessory', + 'uses' => [Api\PredefinedKitsController::class, 'storeAccessory'], ] ); Route::put('accessories/{accessory_id}', [ 'as' => 'api.kits.accessories.update', - 'uses' => 'PredefinedKitsController@updateAccessory', + 'uses' => [Api\PredefinedKitsController::class, 'updateAccessory'], ] ); Route::delete('accessories/{accessory_id}', [ 'as' => 'api.kits.accessories.destroy', - 'uses' => 'PredefinedKitsController@detachAccessory', + 'uses' => [Api\PredefinedKitsController::class, 'detachAccessory'], ] ); @@ -885,28 +888,28 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'middleware' => 'auth:api' Route::get('consumables', [ 'as' => 'api.kits.consumables.index', - 'uses' => 'PredefinedKitsController@indexConsumables', + 'uses' => [Api\PredefinedKitsController::class, 'indexConsumables'], ] ); Route::post('consumables', [ 'as' => 'api.kits.consumables.store', - 'uses' => 'PredefinedKitsController@storeConsumable', + 'uses' => [Api\PredefinedKitsController::class, 'storeConsumable'], ] ); Route::put('consumables/{consumable_id}', [ 'as' => 'api.kits.consumables.update', - 'uses' => 'PredefinedKitsController@updateConsumable', + 'uses' => [Api\PredefinedKitsController::class, 'updateConsumable'], ] ); Route::delete('consumables/{consumable_id}', [ 'as' => 'api.kits.consumables.destroy', - 'uses' => 'PredefinedKitsController@detachConsumable', + 'uses' => [Api\PredefinedKitsController::class, 'detachConsumable'], ] ); }); // kits group diff --git a/routes/web.php b/routes/web.php index 0211c2bdd2..55a4f7b2d8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,35 +1,57 @@ 'auth'], function () { /* * Companies */ - Route::resource('companies', 'CompaniesController', [ + Route::resource('companies', CompaniesController::class, [ 'parameters' => ['company' => 'company_id'], ]); /* * Categories */ - Route::resource('categories', 'CategoriesController', [ + Route::resource('categories', CategoriesController::class, [ 'parameters' => ['category' => 'category_id'], ]); /* * Locations */ - Route::resource('locations', 'LocationsController', [ + Route::resource('locations', LocationsController::class, [ 'parameters' => ['location' => 'location_id'], ]); Route::get( 'locations/{locationId}/printassigned', - ['as' => 'locations.print_assigned', 'uses' => 'LocationsController@print_assigned'] + ['as' => 'locations.print_assigned', 'uses' => [LocationsController::class, 'print_assigned']] ); Route::get( 'locations/{locationId}/printallassigned', - ['as' => 'locations.print_all_assigned', 'uses' => 'LocationsController@print_all_assigned'] + ['as' => 'locations.print_all_assigned', 'uses' => [LocationsController::class, 'print_all_assigned']] ); /* @@ -37,38 +59,38 @@ Route::group(['middleware' => 'auth'], function () { */ Route::group(['prefix' => 'manufacturers', 'middleware' => ['auth']], function () { - Route::get('{manufacturers_id}/restore', ['as' => 'restore/manufacturer', 'uses' => 'ManufacturersController@restore']); + Route::get('{manufacturers_id}/restore', ['as' => 'restore/manufacturer', 'uses' => [ManufacturersController::class, 'restore']]); }); - Route::resource('manufacturers', 'ManufacturersController', [ + Route::resource('manufacturers', ManufacturersController::class, [ 'parameters' => ['manufacturer' => 'manufacturers_id'], ]); /* * Suppliers */ - Route::resource('suppliers', 'SuppliersController', [ + Route::resource('suppliers', SuppliersController::class, [ 'parameters' => ['supplier' => 'supplier_id'], ]); /* * Depreciations */ - Route::resource('depreciations', 'DepreciationsController', [ + Route::resource('depreciations', DepreciationsController::class, [ 'parameters' => ['depreciation' => 'depreciation_id'], ]); /* * Status Labels */ - Route::resource('statuslabels', 'StatuslabelsController', [ + Route::resource('statuslabels', StatuslabelsController::class, [ 'parameters' => ['statuslabel' => 'statuslabel_id'], ]); /* * Departments */ - Route::resource('departments', 'DepartmentsController', [ + Route::resource('departments', DepartmentsController::class, [ 'parameters' => ['department' => 'department_id'], ]); }); @@ -84,7 +106,7 @@ Route::group(['middleware' => 'auth'], function () { */ Route::group(['middleware' => 'auth', 'prefix' => 'modals'], function () { - Route::get('{type}/{itemId?}', ['as' => 'modal.show', 'uses' => 'ModalController@show']); + Route::get('{type}/{itemId?}', ['as' => 'modal.show', 'uses' => [ModalController::class, 'show']]); }); /* @@ -101,7 +123,7 @@ Route::group(['middleware' => 'auth'], function () { 'display-sig/{filename}', [ 'as' => 'log.signature.view', - 'uses' => 'ActionlogController@displaySig', ] + 'uses' => [ActionlogController::class, 'displaySig'], ] ); }); @@ -115,71 +137,71 @@ Route::group(['middleware' => 'auth'], function () { */ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () { - Route::get('settings', ['as' => 'settings.general.index', 'uses' => 'SettingsController@getSettings']); - Route::post('settings', ['as' => 'settings.general.save', 'uses' => 'SettingsController@postSettings']); + Route::get('settings', ['as' => 'settings.general.index', 'uses' => [SettingsController::class, 'getSettings']]); + Route::post('settings', ['as' => 'settings.general.save', 'uses' => [SettingsController::class, 'postSettings']]); - Route::get('branding', ['as' => 'settings.branding.index', 'uses' => 'SettingsController@getBranding']); - Route::post('branding', ['as' => 'settings.branding.save', 'uses' => 'SettingsController@postBranding']); + Route::get('branding', ['as' => 'settings.branding.index', 'uses' => [SettingsController::class, 'getBranding']]); + Route::post('branding', ['as' => 'settings.branding.save', 'uses' => [SettingsController::class, 'postBranding']]); - Route::get('security', ['as' => 'settings.security.index', 'uses' => 'SettingsController@getSecurity']); - Route::post('security', ['as' => 'settings.security.save', 'uses' => 'SettingsController@postSecurity']); + Route::get('security', ['as' => 'settings.security.index', 'uses' => [SettingsController::class, 'getSecurity']]); + Route::post('security', ['as' => 'settings.security.save', 'uses' => [SettingsController::class, 'postSecurity']]); - Route::get('groups', ['as' => 'settings.groups.index', 'uses' => 'GroupsController@index']); + Route::get('groups', ['as' => 'settings.groups.index', 'uses' => [GroupsController::class, 'index']]); - Route::get('localization', ['as' => 'settings.localization.index', 'uses' => 'SettingsController@getLocalization']); - Route::post('localization', ['as' => 'settings.localization.save', 'uses' => 'SettingsController@postLocalization']); + Route::get('localization', ['as' => 'settings.localization.index', 'uses' => [SettingsController::class, 'getLocalization']]); + Route::post('localization', ['as' => 'settings.localization.save', 'uses' => [SettingsController::class, 'postLocalization']]); - Route::get('notifications', ['as' => 'settings.alerts.index', 'uses' => 'SettingsController@getAlerts']); - Route::post('notifications', ['as' => 'settings.alerts.save', 'uses' => 'SettingsController@postAlerts']); + Route::get('notifications', ['as' => 'settings.alerts.index', 'uses' => [SettingsController::class, 'getAlerts']]); + Route::post('notifications', ['as' => 'settings.alerts.save', 'uses' => [SettingsController::class, 'postAlerts']]); - Route::get('slack', ['as' => 'settings.slack.index', 'uses' => 'SettingsController@getSlack']); - Route::post('slack', ['as' => 'settings.slack.save', 'uses' => 'SettingsController@postSlack']); + Route::get('slack', ['as' => 'settings.slack.index', 'uses' => [SettingsController::class, 'getSlack']]); + Route::post('slack', ['as' => 'settings.slack.save', 'uses' => [SettingsController::class, 'postSlack']]); - Route::get('asset_tags', ['as' => 'settings.asset_tags.index', 'uses' => 'SettingsController@getAssetTags']); - Route::post('asset_tags', ['as' => 'settings.asset_tags.save', 'uses' => 'SettingsController@postAssetTags']); + Route::get('asset_tags', ['as' => 'settings.asset_tags.index', 'uses' => [SettingsController::class, 'getAssetTags']]); + Route::post('asset_tags', ['as' => 'settings.asset_tags.save', 'uses' => [SettingsController::class, 'postAssetTags']]); - Route::get('barcodes', ['as' => 'settings.barcodes.index', 'uses' => 'SettingsController@getBarcodes']); - Route::post('barcodes', ['as' => 'settings.barcodes.save', 'uses' => 'SettingsController@postBarcodes']); + Route::get('barcodes', ['as' => 'settings.barcodes.index', 'uses' => [SettingsController::class, 'getBarcodes']]); + Route::post('barcodes', ['as' => 'settings.barcodes.save', 'uses' => [SettingsController::class, 'postBarcodes']]); - Route::get('labels', ['as' => 'settings.labels.index', 'uses' => 'SettingsController@getLabels']); - Route::post('labels', ['as' => 'settings.labels.save', 'uses' => 'SettingsController@postLabels']); + Route::get('labels', ['as' => 'settings.labels.index', 'uses' => [SettingsController::class, 'getLabels']]); + Route::post('labels', ['as' => 'settings.labels.save', 'uses' => [SettingsController::class, 'postLabels']]); - Route::get('ldap', ['as' => 'settings.ldap.index', 'uses' => 'SettingsController@getLdapSettings']); - Route::post('ldap', ['as' => 'settings.ldap.save', 'uses' => 'SettingsController@postLdapSettings']); + Route::get('ldap', ['as' => 'settings.ldap.index', 'uses' => [SettingsController::class, 'getLdapSettings']]); + Route::post('ldap', ['as' => 'settings.ldap.save', 'uses' => [SettingsController::class, 'postLdapSettings']]); - Route::get('phpinfo', ['as' => 'settings.phpinfo.index', 'uses' => 'SettingsController@getPhpInfo']); + Route::get('phpinfo', ['as' => 'settings.phpinfo.index', 'uses' => [SettingsController::class, 'getPhpInfo']]); - Route::get('oauth', ['as' => 'settings.oauth.index', 'uses' => 'SettingsController@api']); + Route::get('oauth', ['as' => 'settings.oauth.index', 'uses' => [SettingsController::class, 'api']]); - Route::get('purge', ['as' => 'settings.purge.index', 'uses' => 'SettingsController@getPurge']); - Route::post('purge', ['as' => 'settings.purge.save', 'uses' => 'SettingsController@postPurge']); + Route::get('purge', ['as' => 'settings.purge.index', 'uses' => [SettingsController::class, 'getPurge']]); + Route::post('purge', ['as' => 'settings.purge.save', 'uses' => [SettingsController::class, 'postPurge']]); - Route::get('login-attempts', ['as' => 'settings.logins.index', 'uses' => 'SettingsController@getLoginAttempts']); + Route::get('login-attempts', ['as' => 'settings.logins.index', 'uses' => [SettingsController::class, 'getLoginAttempts']]); // Backups Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () { Route::get('download/{filename}', [ 'as' => 'settings.backups.download', - 'uses' => 'SettingsController@downloadFile', ]); + 'uses' => [SettingsController::class, 'downloadFile'], ]); Route::delete('delete/{filename}', [ 'as' => 'settings.backups.destroy', - 'uses' => 'SettingsController@deleteFile', ]); + 'uses' => [SettingsController::class, 'deleteFile'], ]); Route::post('/', [ 'as' => 'settings.backups.create', - 'uses' => 'SettingsController@postBackups', + 'uses' => [SettingsController::class, 'postBackups'], ]); - Route::get('/', ['as' => 'settings.backups.index', 'uses' => 'SettingsController@getBackups']); + Route::get('/', ['as' => 'settings.backups.index', 'uses' => [SettingsController::class, 'getBackups']]); }); - Route::resource('groups', 'GroupsController', [ + Route::resource('groups', GroupsController::class, [ 'middleware' => ['auth'], 'parameters' => ['group' => 'group_id'], ]); - Route::get('/', ['as' => 'settings.index', 'uses' => 'SettingsController@index']); + Route::get('/', ['as' => 'settings.index', 'uses' => [SettingsController::class, 'index']]); }); /* @@ -193,7 +215,7 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () { Route::get('/', [ 'as' => 'imports.index', - 'uses' => 'ImportsController@index', + 'uses' => [ImportsController::class, 'index'], ]); }); @@ -208,116 +230,116 @@ Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () { Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () { // Profile - Route::get('profile', ['as' => 'profile', 'uses' => 'ProfileController@getIndex']); - Route::post('profile', 'ProfileController@postIndex'); + Route::get('profile', ['as' => 'profile', 'uses' => [ProfileController::class, 'getIndex']]); + Route::post('profile', [ProfileController::class, 'postIndex']); - Route::get('menu', ['as' => 'account.menuprefs', 'uses' => 'ProfileController@getMenuState']); + Route::get('menu', ['as' => 'account.menuprefs', 'uses' => [ProfileController::class, 'getMenuState']]); - Route::get('password', ['as' => 'account.password.index', 'uses' => 'ProfileController@password']); - Route::post('password', ['uses' => 'ProfileController@passwordSave']); + Route::get('password', ['as' => 'account.password.index', 'uses' => [ProfileController::class, 'password']]); + Route::post('password', ['uses' => [ProfileController::class, 'passwordSave']]); - Route::get('api', ['as' => 'user.api', 'uses' => 'ProfileController@api']); + Route::get('api', ['as' => 'user.api', 'uses' => [ProfileController::class, 'api']]); // View Assets - Route::get('view-assets', ['as' => 'view-assets', 'uses' => 'ViewAssetsController@getIndex']); + Route::get('view-assets', ['as' => 'view-assets', 'uses' => [ViewAssetsController::class, 'getIndex']]); - Route::get('requested', ['as' => 'account.requested', 'uses' => 'ViewAssetsController@getRequestedAssets']); + Route::get('requested', ['as' => 'account.requested', 'uses' => [ViewAssetsController::class, 'getRequestedAssets']]); // Accept Asset Route::get( 'accept-asset/{logID}', - ['as' => 'account/accept-assets', 'uses' => 'ViewAssetsController@getAcceptAsset'] + ['as' => 'account/accept-assets', 'uses' => [ViewAssetsController::class, 'getAcceptAsset']] ); // Profile Route::get( 'requestable-assets', - ['as' => 'requestable-assets', 'uses' => 'ViewAssetsController@getRequestableIndex'] + ['as' => 'requestable-assets', 'uses' => [ViewAssetsController::class, 'getRequestableIndex']] ); Route::get( 'request-asset/{assetId}', - ['as' => 'account/request-asset', 'uses' => 'ViewAssetsController@getRequestAsset'] + ['as' => 'account/request-asset', 'uses' => [ViewAssetsController::class, 'getRequestAsset']] ); Route::post( 'request/{itemType}/{itemId}', - ['as' => 'account/request-item', 'uses' => 'ViewAssetsController@getRequestItem'] + ['as' => 'account/request-item', 'uses' => [ViewAssetsController::class, 'getRequestItem']] ); // Account Dashboard - Route::get('/', ['as' => 'account', 'uses' => 'ViewAssetsController@getIndex']); + Route::get('/', ['as' => 'account', 'uses' => [ViewAssetsController::class, 'getIndex']]); - Route::get('accept', 'Account\AcceptanceController@index') + Route::get('accept', [Account\AcceptanceController::class, 'index']) ->name('account.accept'); - Route::get('accept/{id}', 'Account\AcceptanceController@create') + Route::get('accept/{id}', [Account\AcceptanceController::class, 'create']) ->name('account.accept.item'); - Route::post('accept/{id}', 'Account\AcceptanceController@store'); + Route::post('accept/{id}', [Account\AcceptanceController::class, 'store']); }); Route::group(['middleware' => ['auth']], function () { Route::get('reports/audit', [ 'as' => 'reports.audit', - 'uses' => 'ReportsController@audit', + 'uses' => [ReportsController::class, 'audit'], ]); Route::get( 'reports/depreciation', - ['as' => 'reports/depreciation', 'uses' => 'ReportsController@getDeprecationReport'] + ['as' => 'reports/depreciation', 'uses' => [ReportsController::class, 'getDeprecationReport']] ); Route::get( 'reports/export/depreciation', - ['as' => 'reports/export/depreciation', 'uses' => 'ReportsController@exportDeprecationReport'] + ['as' => 'reports/export/depreciation', 'uses' => [ReportsController::class, 'exportDeprecationReport']] ); Route::get( 'reports/asset_maintenances', - ['as' => 'reports/asset_maintenances', 'uses' => 'ReportsController@getAssetMaintenancesReport'] + ['as' => 'reports/asset_maintenances', 'uses' => [ReportsController::class, 'getAssetMaintenancesReport']] ); Route::get( 'reports/export/asset_maintenances', [ 'as' => 'reports/export/asset_maintenances', - 'uses' => 'ReportsController@exportAssetMaintenancesReport', + 'uses' => [ReportsController::class, 'exportAssetMaintenancesReport'], ] ); Route::get( 'reports/licenses', - ['as' => 'reports/licenses', 'uses' => 'ReportsController@getLicenseReport'] + ['as' => 'reports/licenses', 'uses' => [ReportsController::class, 'getLicenseReport']] ); Route::get( 'reports/export/licenses', - ['as' => 'reports/export/licenses', 'uses' => 'ReportsController@exportLicenseReport'] + ['as' => 'reports/export/licenses', 'uses' => [ReportsController::class, 'exportLicenseReport']] ); - Route::get('reports/accessories', ['as' => 'reports/accessories', 'uses' => 'ReportsController@getAccessoryReport']); + Route::get('reports/accessories', ['as' => 'reports/accessories', 'uses' => [ReportsController::class, 'getAccessoryReport']]); Route::get( 'reports/export/accessories', - ['as' => 'reports/export/accessories', 'uses' => 'ReportsController@exportAccessoryReport'] + ['as' => 'reports/export/accessories', 'uses' => [ReportsController::class, 'exportAccessoryReport']] ); - Route::get('reports/custom', ['as' => 'reports/custom', 'uses' => 'ReportsController@getCustomReport']); - Route::post('reports/custom', 'ReportsController@postCustom'); + Route::get('reports/custom', ['as' => 'reports/custom', 'uses' => [ReportsController::class, 'getCustomReport']]); + Route::post('reports/custom', [ReportsController::class, 'postCustom']); Route::get( 'reports/activity', - ['as' => 'reports.activity', 'uses' => 'ReportsController@getActivityReport'] + ['as' => 'reports.activity', 'uses' => [ReportsController::class, 'getActivityReport']] ); - Route::post('reports/activity', 'ReportsController@postActivityReport'); + Route::post('reports/activity', [ReportsController::class, 'postActivityReport']); Route::get( 'reports/unaccepted_assets', - ['as' => 'reports/unaccepted_assets', 'uses' => 'ReportsController@getAssetAcceptanceReport'] + ['as' => 'reports/unaccepted_assets', 'uses' => [ReportsController::class, 'getAssetAcceptanceReport']] ); Route::get( 'reports/export/unaccepted_assets', - ['as' => 'reports/export/unaccepted_assets', 'uses' => 'ReportsController@exportAssetAcceptanceReport'] + ['as' => 'reports/export/unaccepted_assets', 'uses' => [ReportsController::class, 'exportAssetAcceptanceReport']] ); }); Route::get( 'auth/signin', - ['uses' => 'Auth\LoginController@legacyAuthRedirect'] + ['uses' => [Auth\LoginController::class, 'legacyAuthRedirect']] ); /* @@ -333,42 +355,42 @@ Route::group(['prefix' => 'setup', 'middleware' => 'web'], function () { 'user', [ 'as' => 'setup.user', - 'uses' => 'SettingsController@getSetupUser', ] + 'uses' => [SettingsController::class, 'getSetupUser'], ] ); Route::post( 'user', [ 'as' => 'setup.user.save', - 'uses' => 'SettingsController@postSaveFirstAdmin', ] + 'uses' => [SettingsController::class, 'postSaveFirstAdmin'], ] ); Route::get( 'migrate', [ 'as' => 'setup.migrate', - 'uses' => 'SettingsController@getSetupMigrate', ] + 'uses' => [SettingsController::class, 'getSetupMigrate'], ] ); Route::get( 'done', [ 'as' => 'setup.done', - 'uses' => 'SettingsController@getSetupDone', ] + 'uses' => [SettingsController::class, 'getSetupDone'], ] ); Route::get( 'mailtest', [ 'as' => 'setup.mailtest', - 'uses' => 'SettingsController@ajaxTestEmail', ] + 'uses' => [SettingsController::class, 'ajaxTestEmail'], ] ); Route::get( '/', [ 'as' => 'setup', - 'uses' => 'SettingsController@getSetupIndex', ] + 'uses' => [SettingsController::class, 'getSetupIndex'], ] ); }); @@ -377,7 +399,7 @@ Route::get( [ 'as' => 'two-factor-enroll', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@getTwoFactorEnroll', ] + 'uses' => [Auth\LoginController::class, 'getTwoFactorEnroll'], ] ); Route::get( @@ -385,7 +407,7 @@ Route::get( [ 'as' => 'two-factor', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@getTwoFactorAuth', ] + 'uses' => [Auth\LoginController::class, 'getTwoFactorAuth'], ] ); Route::post( @@ -393,7 +415,7 @@ Route::post( [ 'as' => 'two-factor', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@postTwoFactorAuth', ] + 'uses' => [Auth\LoginController::class, 'postTwoFactorAuth'], ] ); Route::get( @@ -401,7 +423,7 @@ Route::get( [ 'as' => 'home', 'middleware' => ['auth'], - 'uses' => 'DashboardController@getIndex', ] + 'uses' => [DashboardController::class, 'getIndex'], ] ); Route::group(['middleware' => 'web'], function () { @@ -411,7 +433,7 @@ Route::group(['middleware' => 'web'], function () { [ 'as' => 'login', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@showLoginForm', ] + 'uses' => [Auth\LoginController::class, 'showLoginForm'], ] ); Route::post( @@ -419,17 +441,17 @@ Route::group(['middleware' => 'web'], function () { [ 'as' => 'login', 'middleware' => ['web'], - 'uses' => 'Auth\LoginController@login', ] + 'uses' => [Auth\LoginController::class, 'login'], ] ); Route::get( 'logout', [ 'as' => 'logout', - 'uses' => 'Auth\LoginController@logout', ] + 'uses' => [Auth\LoginController::class, 'logout'], ] ); }); Auth::routes(); -Route::get('/health', ['as' => 'health', 'uses' => 'HealthController@get']); +Route::get('/health', ['as' => 'health', 'uses' => [HealthController::class, 'get']]); diff --git a/routes/web/accessories.php b/routes/web/accessories.php index 5db8490f54..52b282ead8 100644 --- a/routes/web/accessories.php +++ b/routes/web/accessories.php @@ -1,29 +1,32 @@ 'accessories', 'middleware' => ['auth']], function () { Route::get( '{accessoryID}/checkout', - ['as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@create'] + ['as' => 'checkout/accessory', 'uses' => [Accessories\AccessoryCheckoutController::class, 'create']] ); Route::post( '{accessoryID}/checkout', - ['as' => 'checkout/accessory', 'uses' => 'Accessories\AccessoryCheckoutController@store'] + ['as' => 'checkout/accessory', 'uses' => [Accessories\AccessoryCheckoutController::class, 'store']] ); Route::get( '{accessoryID}/checkin/{backto?}', - ['as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@create'] + ['as' => 'checkin/accessory', 'uses' => [Accessories\AccessoryCheckinController::class, 'create']] ); Route::post( '{accessoryID}/checkin/{backto?}', - ['as' => 'checkin/accessory', 'uses' => 'Accessories\AccessoryCheckinController@store'] + ['as' => 'checkin/accessory', 'uses' => [Accessories\AccessoryCheckinController::class, 'store']] ); }); -Route::resource('accessories', 'Accessories\AccessoriesController', [ +Route::resource('accessories', Accessories\AccessoriesController::class, [ 'middleware' => ['auth'], 'parameters' => ['accessory' => 'accessory_id'], ]); diff --git a/routes/web/components.php b/routes/web/components.php index f884a3b4ac..7b37cc9eab 100644 --- a/routes/web/components.php +++ b/routes/web/components.php @@ -1,26 +1,29 @@ 'components', 'middleware' => ['auth']], function () { Route::get( '{componentID}/checkout', - ['as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@create'] + ['as' => 'checkout/component', 'uses' => [Components\ComponentCheckoutController::class, 'create']] ); Route::post( '{componentID}/checkout', - ['as' => 'checkout/component', 'uses' => 'Components\ComponentCheckoutController@store'] + ['as' => 'checkout/component', 'uses' => [Components\ComponentCheckoutController::class, 'store']] ); Route::get( '{componentID}/checkin', - ['as' => 'checkin/component', 'uses' => 'Components\ComponentCheckinController@create'] + ['as' => 'checkin/component', 'uses' => [Components\ComponentCheckinController::class, 'create']] ); Route::post( '{componentID}/checkin', - ['as' => 'component.checkin.save', 'uses' => 'Components\ComponentCheckinController@store'] + ['as' => 'component.checkin.save', 'uses' => [Components\ComponentCheckinController::class, 'store']] ); }); -Route::resource('components', 'Components\ComponentsController', [ +Route::resource('components', Components\ComponentsController::class, [ 'middleware' => ['auth'], 'parameters' => ['component' => 'component_id'], ]); diff --git a/routes/web/consumables.php b/routes/web/consumables.php index a51710e528..9caf442e4b 100644 --- a/routes/web/consumables.php +++ b/routes/web/consumables.php @@ -1,18 +1,21 @@ 'consumables', 'middleware' => ['auth']], function () { Route::get( '{consumableID}/checkout', - ['as' => 'checkout/consumable', 'uses' => 'Consumables\ConsumableCheckoutController@create'] + ['as' => 'checkout/consumable', 'uses' => [Consumables\ConsumableCheckoutController::class, 'create']] ); Route::post( '{consumableID}/checkout', - ['as' => 'checkout/consumable', 'uses' => 'Consumables\ConsumableCheckoutController@store'] + ['as' => 'checkout/consumable', 'uses' => [Consumables\ConsumableCheckoutController::class, 'store']] ); }); - Route::resource('consumables', 'Consumables\ConsumablesController', [ + Route::resource('consumables', Consumables\ConsumablesController::class, [ 'middleware' => ['auth'], 'parameters' => ['consumable' => 'consumable_id'], ]); diff --git a/routes/web/fields.php b/routes/web/fields.php index 091245921e..c1b82d45b9 100644 --- a/routes/web/fields.php +++ b/routes/web/fields.php @@ -1,35 +1,39 @@ 'fields', 'middleware' => ['auth']], function () { Route::get('required/{fieldset_id}/{field_id}', - ['uses' => 'CustomFieldsetsController@makeFieldRequired', + ['uses' => [CustomFieldsetsController::class, 'makeFieldRequired'], 'as' => 'fields.required', ] ); Route::get('optional/{fieldset_id}/{field_id}', - ['uses' => 'CustomFieldsetsController@makeFieldOptional', + ['uses' => [CustomFieldsetsController::class, 'makeFieldOptional'], 'as' => 'fields.optional', ] ); Route::get('{field_id}/fieldset/{fieldset_id}/disassociate', - ['uses' => 'CustomFieldsController@deleteFieldFromFieldset', + ['uses' => [CustomFieldsController::class, 'deleteFieldFromFieldset'], 'as' => 'fields.disassociate', ] ); Route::post('fieldsets/{id}/associate', - ['uses' => 'CustomFieldsetsController@associate', + ['uses' => [CustomFieldsetsController::class, 'associate'], 'as' => 'fieldsets.associate', ] ); - Route::resource('fieldsets', 'CustomFieldsetsController', [ + Route::resource('fieldsets', CustomFieldsetsController::class, [ 'parameters' => ['fieldset' => 'field_id', 'field' => 'field_id'], ]); }); -Route::resource('fields', 'CustomFieldsController', [ +Route::resource('fields', CustomFieldsController::class, [ 'middleware' => ['auth'], 'parameters' => ['field' => 'field_id', 'fieldset' => 'fieldset_id'], ]); diff --git a/routes/web/hardware.php b/routes/web/hardware.php index bd0302a2ea..095510a763 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -1,4 +1,8 @@ 'assets.bulkaudit', - 'uses' => 'Assets\AssetsController@quickScan', + 'uses' => [Assets\AssetsController::class, 'quickScan'], ]); // Asset Maintenances - Route::resource('maintenances', 'AssetMaintenancesController', [ + Route::resource('maintenances', AssetMaintenancesController::class, [ 'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'], ]); - Route::get('requested', ['as' => 'assets.requested', 'uses' => 'Assets\AssetsController@getRequestedIndex']); + Route::get('requested', ['as' => 'assets.requested', 'uses' => [Assets\AssetsController::class, 'getRequestedIndex']]); Route::get('scan', [ 'as' => 'asset.scan', - 'uses' => 'Assets\AssetsController@scan', + 'uses' => [Assets\AssetsController::class, 'scan'], ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit', + 'uses' => [Assets\AssetsController::class, 'dueForAudit'], ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit', + 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit', + 'uses' => [Assets\AssetsController::class, 'dueForAudit'], ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit', + 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], ]); Route::get('audit/due', [ 'as' => 'assets.audit.due', - 'uses' => 'Assets\AssetsController@dueForAudit', + 'uses' => [Assets\AssetsController::class, 'dueForAudit'], ]); Route::get('audit/overdue', [ 'as' => 'assets.audit.overdue', - 'uses' => 'Assets\AssetsController@overdueForAudit', + 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], ]); Route::get('audit/{id}', [ 'as' => 'asset.audit.create', - 'uses' => 'Assets\AssetsController@audit', + 'uses' => [Assets\AssetsController::class, 'audit'], ]); Route::post('audit/{id}', [ 'as' => 'asset.audit.store', - 'uses' => 'Assets\AssetsController@auditStore', + 'uses' => [Assets\AssetsController::class, 'auditStore'], ]); Route::get('history', [ 'as' => 'asset.import-history', - 'uses' => 'Assets\AssetsController@getImportHistory', + 'uses' => [Assets\AssetsController::class, 'getImportHistory'], ]); Route::post('history', [ 'as' => 'asset.process-import-history', - 'uses' => 'Assets\AssetsController@postImportHistory', + 'uses' => [Assets\AssetsController::class, 'postImportHistory'], ]); Route::get('bytag/{any?}', [ 'as' => 'findbytag/hardware', - 'uses' => 'Assets\AssetsController@getAssetByTag', + 'uses' => [Assets\AssetsController::class, 'getAssetByTag'], ] )->where('any', '.*'); Route::get('byserial/{any?}', [ 'as' => 'findbyserial/hardware', - 'uses' => 'Assets\AssetsController@getAssetBySerial', + 'uses' => [Assets\AssetsController::class, 'getAssetBySerial'], ] )->where('any', '.*'); Route::get('{assetId}/clone', [ 'as' => 'clone/hardware', - 'uses' => 'Assets\AssetsController@getClone', + 'uses' => [Assets\AssetsController::class, 'getClone'], ]); Route::get('{assetId}/label', [ 'as' => 'label/hardware', - 'uses' => 'Assets\AssetsController@getLabel', + 'uses' => [Assets\AssetsController::class, 'getLabel'], ]); - Route::post('{assetId}/clone', 'Assets\AssetsController@postCreate'); + Route::post('{assetId}/clone', [Assets\AssetsController::class, 'postCreate']); Route::get('{assetId}/checkout', [ 'as' => 'checkout/hardware', - 'uses' => 'Assets\AssetCheckoutController@create', + 'uses' => [Assets\AssetCheckoutController::class, 'create'], ]); Route::post('{assetId}/checkout', [ 'as' => 'checkout/hardware', - 'uses' => 'Assets\AssetCheckoutController@store', + 'uses' => [Assets\AssetCheckoutController::class, 'store'], ]); Route::get('{assetId}/checkin/{backto?}', [ 'as' => 'checkin/hardware', - 'uses' => 'Assets\AssetCheckinController@create', + 'uses' => [Assets\AssetCheckinController::class, 'create'], ]); Route::post('{assetId}/checkin/{backto?}', [ 'as' => 'checkin/hardware', - 'uses' => 'Assets\AssetCheckinController@store', + 'uses' => [Assets\AssetCheckinController::class, 'store'], ]); Route::get('{assetId}/view', [ 'as' => 'hardware.view', - 'uses' => 'Assets\AssetsController@show', + 'uses' => [Assets\AssetsController::class, 'show'], ]); - Route::get('{assetId}/qr_code', ['as' => 'qr_code/hardware', 'uses' => 'Assets\AssetsController@getQrCode']); - Route::get('{assetId}/barcode', ['as' => 'barcode/hardware', 'uses' => 'Assets\AssetsController@getBarCode']); + Route::get('{assetId}/qr_code', ['as' => 'qr_code/hardware', 'uses' => [Assets\AssetsController::class, 'getQrCode']]); + Route::get('{assetId}/barcode', ['as' => 'barcode/hardware', 'uses' => [Assets\AssetsController::class, 'getBarCode']]); Route::get('{assetId}/restore', [ 'as' => 'restore/hardware', - 'uses' => 'Assets\AssetsController@getRestore', + 'uses' => [Assets\AssetsController::class, 'getRestore'], ]); Route::post('{assetId}/upload', [ 'as' => 'upload/asset', - 'uses' => 'Assets\AssetFilesController@store', + 'uses' => [Assets\AssetFilesController::class, 'store'], ]); Route::get('{assetId}/showfile/{fileId}/{download?}', [ 'as' => 'show/assetfile', - 'uses' => 'Assets\AssetFilesController@show', + 'uses' => [Assets\AssetFilesController::class, 'show'], ]); Route::delete('{assetId}/showfile/{fileId}/delete', [ 'as' => 'delete/assetfile', - 'uses' => 'Assets\AssetFilesController@destroy', + 'uses' => [Assets\AssetFilesController::class, 'destroy'], ]); Route::post( 'bulkedit', [ 'as' => 'hardware/bulkedit', - 'uses' => 'Assets\BulkAssetsController@edit', + 'uses' => [Assets\BulkAssetsController::class, 'edit'], ] ); Route::post( 'bulkdelete', [ 'as' => 'hardware/bulkdelete', - 'uses' => 'Assets\BulkAssetsController@destroy', + 'uses' => [Assets\BulkAssetsController::class, 'destroy'], ] ); Route::post( 'bulksave', [ 'as' => 'hardware/bulksave', - 'uses' => 'Assets\BulkAssetsController@update', + 'uses' => [Assets\BulkAssetsController::class, 'update'], ] ); // Bulk checkout / checkin Route::get('bulkcheckout', [ 'as' => 'hardware/bulkcheckout', - 'uses' => 'Assets\BulkAssetsController@showCheckout', + 'uses' => [Assets\BulkAssetsController::class, 'showCheckout'], ]); Route::post('bulkcheckout', [ 'as' => 'hardware/bulkcheckout', - 'uses' => 'Assets\BulkAssetsController@storeCheckout', + 'uses' => [Assets\BulkAssetsController::class, 'storeCheckout'], ]); }); -Route::resource('hardware', 'Assets\AssetsController', [ +Route::resource('hardware', Assets\AssetsController::class, [ 'middleware' => ['auth'], 'parameters' => ['asset' => 'asset_id'], ]); diff --git a/routes/web/kits.php b/routes/web/kits.php index a73392d26a..53f3d29ae5 100644 --- a/routes/web/kits.php +++ b/routes/web/kits.php @@ -1,7 +1,10 @@ ['auth'], 'parameters' => ['kit' => 'kit_id'], ]); @@ -11,28 +14,28 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( // Route::get('licenses', // [ // 'as' => 'kits.licenses.index', - // 'uses' => 'Kits\PredefinedKitsController@indexLicenses', + // 'uses' => [Kits\PredefinedKitsController::class, 'indexLicenses'], // ] // ); Route::post('licenses', [ 'as' => 'kits.licenses.store', - 'uses' => 'Kits\PredefinedKitsController@storeLicense', + 'uses' => [Kits\PredefinedKitsController::class, 'storeLicense'], ] ); Route::put('licenses/{license_id}', [ 'as' => 'kits.licenses.update', - 'uses' => 'Kits\PredefinedKitsController@updateLicense', + 'uses' => [Kits\PredefinedKitsController::class, 'updateLicense'], ] ); Route::get('licenses/{license_id}/edit', [ 'as' => 'kits.licenses.edit', - 'uses' => 'Kits\PredefinedKitsController@editLicense', + 'uses' => [Kits\PredefinedKitsController::class, 'editLicense'], ] ); @@ -40,7 +43,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::delete('licenses/{license_id}', [ 'as' => 'kits.licenses.detach', - 'uses' => 'Kits\PredefinedKitsController@detachLicense', + 'uses' => [Kits\PredefinedKitsController::class, 'detachLicense'], ] ); @@ -49,7 +52,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::put('models/{model_id}', [ 'as' => 'kits.models.update', - 'uses' => 'Kits\PredefinedKitsController@updateModel', + 'uses' => [Kits\PredefinedKitsController::class, 'updateModel'], 'parameters' => [2 => 'kit_id', 1 => 'model_id'], ] ); @@ -57,7 +60,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::get('models/{model_id}/edit', [ 'as' => 'kits.models.edit', - 'uses' => 'Kits\PredefinedKitsController@editModel', + 'uses' => [Kits\PredefinedKitsController::class, 'editModel'], ] ); @@ -65,7 +68,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::delete('models/{model_id}', [ 'as' => 'kits.models.detach', - 'uses' => 'Kits\PredefinedKitsController@detachModel', + 'uses' => [Kits\PredefinedKitsController::class, 'detachModel'], ] ); @@ -73,7 +76,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::put('consumables/{consumable_id}', [ 'as' => 'kits.consumables.update', - 'uses' => 'Kits\PredefinedKitsController@updateConsumable', + 'uses' => [Kits\PredefinedKitsController::class, 'updateConsumable'], 'parameters' => [2 => 'kit_id', 1 => 'consumable_id'], ] ); @@ -81,7 +84,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::get('consumables/{consumable_id}/edit', [ 'as' => 'kits.consumables.edit', - 'uses' => 'Kits\PredefinedKitsController@editConsumable', + 'uses' => [Kits\PredefinedKitsController::class, 'editConsumable'], ] ); @@ -89,7 +92,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::delete('consumables/{consumable_id}', [ 'as' => 'kits.consumables.detach', - 'uses' => 'Kits\PredefinedKitsController@detachConsumable', + 'uses' => [Kits\PredefinedKitsController::class, 'detachConsumable'], ] ); @@ -97,7 +100,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::put('accessories/{accessory_id}', [ 'as' => 'kits.accessories.update', - 'uses' => 'Kits\PredefinedKitsController@updateAccessory', + 'uses' => [Kits\PredefinedKitsController::class, 'updateAccessory'], 'parameters' => [2 => 'kit_id', 1 => 'accessory_id'], ] ); @@ -105,7 +108,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::get('accessories/{accessory_id}/edit', [ 'as' => 'kits.accessories.edit', - 'uses' => 'Kits\PredefinedKitsController@editAccessory', + 'uses' => [Kits\PredefinedKitsController::class, 'editAccessory'], ] ); @@ -113,20 +116,20 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( Route::delete('accessories/{accessory_id}', [ 'as' => 'kits.accessories.detach', - 'uses' => 'Kits\PredefinedKitsController@detachAccessory', + 'uses' => [Kits\PredefinedKitsController::class, 'detachAccessory'], ] ); Route::get('checkout', [ 'as' => 'kits.checkout.show', - 'uses' => 'Kits\CheckoutKitController@showCheckout', + 'uses' => [Kits\CheckoutKitController::class, 'showCheckout'], ] ); Route::post('checkout', [ 'as' => 'kits.checkout.store', - 'uses' => 'Kits\CheckoutKitController@store', + 'uses' => [Kits\CheckoutKitController::class, 'store'], ] ); }); // kits diff --git a/routes/web/licenses.php b/routes/web/licenses.php index 4c3b01d955..a7a03b710f 100644 --- a/routes/web/licenses.php +++ b/routes/web/licenses.php @@ -1,46 +1,49 @@ 'licenses', 'middleware' => ['auth']], function () { - Route::get('{licenseId}/clone', ['as' => 'clone/license', 'uses' => 'Licenses\LicensesController@getClone']); + Route::get('{licenseId}/clone', ['as' => 'clone/license', 'uses' => [Licenses\LicensesController::class, 'getClone']]); Route::get('{licenseId}/freecheckout', [ 'as' => 'licenses.freecheckout', - 'uses' => 'Licenses\LicensesController@getFreeLicense', + 'uses' => [Licenses\LicensesController::class, 'getFreeLicense'], ]); Route::get('{licenseId}/checkout/{seatId?}', [ 'as' => 'licenses.checkout', - 'uses' => 'Licenses\LicenseCheckoutController@create', + 'uses' => [Licenses\LicenseCheckoutController::class, 'create'], ]); Route::post( '{licenseId}/checkout/{seatId?}', - ['as' => 'licenses.checkout', 'uses' => 'Licenses\LicenseCheckoutController@store'] + ['as' => 'licenses.checkout', 'uses' => [Licenses\LicenseCheckoutController::class, 'store']] ); Route::get('{licenseSeatId}/checkin/{backto?}', [ 'as' => 'licenses.checkin', - 'uses' => 'Licenses\LicenseCheckinController@create', + 'uses' => [Licenses\LicenseCheckinController::class, 'create'], ]); Route::post('{licenseId}/checkin/{backto?}', [ 'as' => 'licenses.checkin.save', - 'uses' => 'Licenses\LicenseCheckinController@store', + 'uses' => [Licenses\LicenseCheckinController::class, 'store'], ]); Route::post( '{licenseId}/upload', - ['as' => 'upload/license', 'uses' => 'Licenses\LicenseFilesController@store'] + ['as' => 'upload/license', 'uses' => [Licenses\LicenseFilesController::class, 'store']] ); Route::delete( '{licenseId}/deletefile/{fileId}', - ['as' => 'delete/licensefile', 'uses' => 'Licenses\LicenseFilesController@destroy'] + ['as' => 'delete/licensefile', 'uses' => [Licenses\LicenseFilesController::class, 'destroy']] ); Route::get( '{licenseId}/showfile/{fileId}/{download?}', - ['as' => 'show.licensefile', 'uses' => 'Licenses\LicenseFilesController@show'] + ['as' => 'show.licensefile', 'uses' => [Licenses\LicenseFilesController::class, 'show']] ); }); -Route::resource('licenses', 'Licenses\LicensesController', [ +Route::resource('licenses', Licenses\LicensesController::class, [ 'middleware' => ['auth'], 'parameters' => ['license' => 'license_id'], ]); diff --git a/routes/web/models.php b/routes/web/models.php index b9d861ab4c..fff7b67447 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -1,18 +1,22 @@ 'models', 'middleware' => ['auth']], function () { - Route::get('{modelId}/clone', ['as' => 'clone/model', 'uses' => 'AssetModelsController@getClone']); - Route::post('{modelId}/clone', 'AssetModelsController@postCreate'); - Route::get('{modelId}/view', ['as' => 'view/model', 'uses' => 'AssetModelsController@getView']); - Route::get('{modelID}/restore', ['as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser']]); - Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model', 'uses' => 'AssetModelsController@getCustomFields']); - Route::post('bulkedit', ['as' => 'models.bulkedit.index', 'uses' => 'BulkAssetModelsController@edit']); - Route::post('bulksave', ['as' => 'models.bulkedit.store', 'uses' => 'BulkAssetModelsController@update']); - Route::post('bulkdelete', ['as' => 'models.bulkdelete.store', 'uses' => 'BulkAssetModelsController@destroy']); + Route::get('{modelId}/clone', ['as' => 'clone/model', 'uses' => [AssetModelsController::class, 'getClone']]); + Route::post('{modelId}/clone', [AssetModelsController::class, 'postCreate']); + Route::get('{modelId}/view', ['as' => 'view/model', 'uses' => [AssetModelsController::class, 'getView']]); + Route::get('{modelID}/restore', ['as' => 'restore/model', 'uses' => [AssetModelsController::class, 'getRestore'], 'middleware' => ['authorize:superuser']]); + Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model', 'uses' => [AssetModelsController::class, 'getCustomFields']]); + Route::post('bulkedit', ['as' => 'models.bulkedit.index', 'uses' => [BulkAssetModelsController::class, 'edit']]); + Route::post('bulksave', ['as' => 'models.bulkedit.store', 'uses' => [BulkAssetModelsController::class, 'update']]); + Route::post('bulkdelete', ['as' => 'models.bulkdelete.store', 'uses' => [BulkAssetModelsController::class, 'destroy']]); }); -Route::resource('models', 'AssetModelsController', [ +Route::resource('models', AssetModelsController::class, [ 'middleware' => ['auth'], 'parameters' => ['model' => 'model_id'], ]); diff --git a/routes/web/users.php b/routes/web/users.php index 0856788a44..613aa348a4 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -1,62 +1,65 @@ 'users', 'middleware' => ['auth']], function () { - Route::get('ldap', ['as' => 'ldap/user', 'uses' => 'Users\LDAPImportController@create']); - Route::post('ldap', 'Users\LDAPImportController@store'); - Route::get('export', ['as' => 'users.export', 'uses' => 'Users\UsersController@getExportUserCsv']); - Route::get('{userId}/clone', ['as' => 'clone/user', 'uses' => 'Users\UsersController@getClone']); - Route::post('{userId}/clone', ['uses' => 'Users\UsersController@postCreate']); - Route::get('{userId}/restore', ['as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore']); - Route::get('{userId}/unsuspend', ['as' => 'unsuspend/user', 'uses' => 'Users\UsersController@getUnsuspend']); - Route::post('{userId}/upload', ['as' => 'upload/user', 'uses' => 'Users\UserFilesController@store']); + Route::get('ldap', ['as' => 'ldap/user', 'uses' => [Users\LDAPImportController::class, 'create']]); + Route::post('ldap', [Users\LDAPImportController::class, 'store']); + Route::get('export', ['as' => 'users.export', 'uses' => [Users\UsersController::class, 'getExportUserCsv']]); + Route::get('{userId}/clone', ['as' => 'clone/user', 'uses' => [Users\UsersController::class, 'getClone']]); + Route::post('{userId}/clone', ['uses' => [Users\UsersController::class, 'postCreate']]); + Route::get('{userId}/restore', ['as' => 'restore/user', 'uses' => [Users\UsersController::class, 'getRestore']]); + Route::get('{userId}/unsuspend', ['as' => 'unsuspend/user', 'uses' => [Users\UsersController::class, 'getUnsuspend']]); + Route::post('{userId}/upload', ['as' => 'upload/user', 'uses' => [Users\UserFilesController::class, 'store']]); Route::delete( '{userId}/deletefile/{fileId}', - ['as' => 'userfile.destroy', 'uses' => 'Users\UserFilesController@destroy'] + ['as' => 'userfile.destroy', 'uses' => [Users\UserFilesController::class, 'destroy']] ); Route::post( '{userId}/password', [ 'as' => 'users.password', - 'uses' => 'Users\UsersController@sendPasswordReset', + 'uses' => [Users\UsersController::class, 'sendPasswordReset'], ] ); Route::get( '{userId}/print', - ['as' => 'users.print', 'uses' => 'Users\UsersController@printInventory'] + ['as' => 'users.print', 'uses' => [Users\UsersController::class, 'printInventory']] ); Route::get( '{userId}/showfile/{fileId}', - ['as' => 'show/userfile', 'uses' => 'Users\UserFilesController@show'] + ['as' => 'show/userfile', 'uses' => [Users\UserFilesController::class, 'show']] ); Route::post( 'bulkedit', [ 'as' => 'users/bulkedit', - 'uses' => 'Users\BulkUsersController@edit', + 'uses' => [Users\BulkUsersController::class, 'edit'], ] ); Route::post( 'bulksave', [ 'as' => 'users/bulksave', - 'uses' => 'Users\BulkUsersController@destroy', + 'uses' => [Users\BulkUsersController::class, 'destroy'], ] ); Route::post( 'bulkeditsave', [ 'as' => 'users/bulkeditsave', - 'uses' => 'Users\BulkUsersController@update', + 'uses' => [Users\BulkUsersController::class, 'update'], ] ); }); -Route::resource('users', 'Users\UsersController', [ +Route::resource('users', Users\UsersController::class, [ 'middleware' => ['auth'], 'parameters' => ['user' => 'user_id'], ]); From 9f43ce97e99db5c6567cf5a4ad734b05b7af3c14 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:18 +0000 Subject: [PATCH 07/19] Convert deprecated `$dates` property to `$casts` --- app/Models/Accessory.php | 5 ++--- app/Models/Actionlog.php | 2 +- app/Models/Asset.php | 16 ++++++---------- app/Models/AssetMaintenance.php | 6 ++++-- app/Models/AssetModel.php | 2 +- app/Models/Category.php | 2 +- app/Models/CheckoutAcceptance.php | 12 +++--------- app/Models/Component.php | 5 +++-- app/Models/Consumable.php | 5 ++--- app/Models/ConsumableAssignment.php | 1 - app/Models/License.php | 12 ++++-------- app/Models/LicenseSeat.php | 1 - app/Models/Location.php | 2 +- app/Models/Manufacturer.php | 2 +- app/Models/Statuslabel.php | 2 +- app/Models/Supplier.php | 2 +- app/Models/User.php | 1 - 17 files changed, 31 insertions(+), 47 deletions(-) diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index c2e5399d29..b32822cd82 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -21,11 +21,10 @@ class Accessory extends SnipeModel use Loggable, Presentable; use SoftDeletes; - protected $dates = ['deleted_at', 'purchase_date']; protected $table = 'accessories'; protected $casts = [ - 'requestable' => 'boolean', - ]; + 'purchase_date' => 'datetime', + 'requestable' => 'boolean', ]; use Searchable; use Acceptable; diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index 3ac8c5cc7c..b42cfb5a00 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -19,7 +19,7 @@ class Actionlog extends SnipeModel protected $presenter = \App\Presenters\ActionlogPresenter::class; use SoftDeletes; use Presentable; - protected $dates = ['deleted_at']; + protected $table = 'action_logs'; public $timestamps = true; diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 999c6711cb..f193798fee 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -66,18 +66,14 @@ class Asset extends Depreciable protected $injectUniqueIdentifier = true; // We set these as protected dates so that they will be easily accessible via Carbon - protected $dates = [ - 'created_at', - 'updated_at', - 'deleted_at', - 'purchase_date', - 'last_checkout', - 'expected_checkin', - 'last_audit_date', - 'next_audit_date', - ]; + protected $casts = [ + 'purchase_date' => 'datetime', + 'last_checkout' => 'datetime', + 'expected_checkin' => 'datetime', + 'last_audit_date' => 'datetime', + 'next_audit_date' => 'datetime', 'model_id' => 'integer', 'status_id' => 'integer', 'company_id' => 'integer', diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index d501f42361..cd4bba1a28 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -18,8 +18,10 @@ class AssetMaintenance extends Model implements ICompanyableChild use SoftDeletes; use CompanyableChildTrait; use ValidatingTrait; - - protected $dates = ['deleted_at', 'start_date', 'completion_date']; + protected $casts = [ + 'start_date' => 'datetime', + 'completion_date' => 'datetime', + ]; protected $table = 'asset_maintenances'; protected $rules = [ 'asset_id' => 'required|integer', diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index 377be0f9c8..df0f7a4d68 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -19,7 +19,7 @@ class AssetModel extends SnipeModel use SoftDeletes; protected $presenter = \App\Presenters\AssetModelPresenter::class; use Requestable, Presentable; - protected $dates = ['deleted_at']; + protected $table = 'models'; protected $hidden = ['user_id', 'deleted_at']; diff --git a/app/Models/Category.php b/app/Models/Category.php index d19b013827..0bcd5fd100 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -22,7 +22,7 @@ class Category extends SnipeModel protected $presenter = \App\Presenters\CategoryPresenter::class; use Presentable; use SoftDeletes; - protected $dates = ['deleted_at']; + protected $table = 'categories'; protected $hidden = ['user_id', 'deleted_at']; diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php index cb58093a47..cc6ca37fd4 100644 --- a/app/Models/CheckoutAcceptance.php +++ b/app/Models/CheckoutAcceptance.php @@ -10,15 +10,9 @@ class CheckoutAcceptance extends Model { use SoftDeletes; - /** - * The attributes that should be mutated to dates. - * - * @var array - */ - protected $dates = [ - 'accepted_at', - 'declined_at', - 'deleted_at', + protected $casts = [ + 'accepted_at' => 'datetime', + 'declined_at' => 'datetime', ]; /** diff --git a/app/Models/Component.php b/app/Models/Component.php index 7c413ea965..f0af84fe71 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -18,8 +18,9 @@ class Component extends SnipeModel use CompanyableTrait; use Loggable, Presentable; use SoftDeletes; - - protected $dates = ['deleted_at', 'purchase_date']; + protected $casts = [ + 'purchase_date' => 'datetime', + ]; protected $table = 'components'; /** diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index b8a75a5c57..26a146149b 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -17,15 +17,14 @@ class Consumable extends SnipeModel use SoftDeletes; use Acceptable; - protected $dates = ['deleted_at', 'purchase_date']; protected $table = 'consumables'; protected $casts = [ + 'purchase_date' => 'datetime', 'requestable' => 'boolean', 'category_id' => 'integer', 'company_id' => 'integer', 'qty' => 'integer', - 'min_amt' => 'integer', - ]; + 'min_amt' => 'integer', ]; /** * Category validation rules diff --git a/app/Models/ConsumableAssignment.php b/app/Models/ConsumableAssignment.php index 4c5ef53a60..1e21a7f7d2 100644 --- a/app/Models/ConsumableAssignment.php +++ b/app/Models/ConsumableAssignment.php @@ -8,7 +8,6 @@ class ConsumableAssignment extends Model { use CompanyableTrait; - protected $dates = ['deleted_at']; protected $table = 'consumables_users'; public function consumable() diff --git a/app/Models/License.php b/app/Models/License.php index 119e364509..3476a141ef 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -22,14 +22,7 @@ class License extends Depreciable use ValidatingTrait; // We set these as protected dates so that they will be easily accessible via Carbon - protected $dates = [ - 'created_at', - 'updated_at', - 'deleted_at', - 'purchase_date', - 'expiration_date', - 'termination_date', - ]; + public $timestamps = true; @@ -37,6 +30,9 @@ class License extends Depreciable protected $table = 'licenses'; protected $casts = [ + 'purchase_date' => 'datetime', + 'expiration_date' => 'datetime', + 'termination_date' => 'datetime', 'seats' => 'integer', 'category_id' => 'integer', 'company_id' => 'integer', diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 5d3a21f4b6..2207edd02c 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -17,7 +17,6 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild protected $presenter = \App\Presenters\LicenseSeatPresenter::class; use Presentable; - protected $dates = ['deleted_at']; protected $guarded = 'id'; protected $table = 'license_seats'; diff --git a/app/Models/Location.php b/app/Models/Location.php index 4bb4c5f19a..080158a909 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -19,7 +19,7 @@ class Location extends SnipeModel protected $presenter = \App\Presenters\LocationPresenter::class; use Presentable; use SoftDeletes; - protected $dates = ['deleted_at']; + protected $table = 'locations'; protected $rules = [ 'name' => 'required|min:2|max:255|unique_undeleted', diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php index 5d12b1d786..0bd16f5bb3 100755 --- a/app/Models/Manufacturer.php +++ b/app/Models/Manufacturer.php @@ -13,7 +13,7 @@ class Manufacturer extends SnipeModel protected $presenter = \App\Presenters\ManufacturerPresenter::class; use Presentable; use SoftDeletes; - protected $dates = ['deleted_at']; + protected $table = 'manufacturers'; // Declare the rules for the form validation diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index 17a277db7b..772e1ee92d 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -14,7 +14,7 @@ class Statuslabel extends SnipeModel use UniqueUndeletedTrait; protected $injectUniqueIdentifier = true; - protected $dates = ['deleted_at']; + protected $table = 'status_labels'; protected $hidden = ['user_id', 'deleted_at']; diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 0b38c01683..8752126b8d 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -10,7 +10,7 @@ use Watson\Validating\ValidatingTrait; class Supplier extends SnipeModel { use SoftDeletes; - protected $dates = ['deleted_at']; + protected $table = 'suppliers'; protected $rules = [ diff --git a/app/Models/User.php b/app/Models/User.php index f9d4a4071f..f7ec2509cb 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -29,7 +29,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo use Presentable; use Searchable; - protected $dates = ['deleted_at']; protected $hidden = ['password', 'remember_token', 'permissions', 'reset_password_code', 'persist_code']; protected $table = 'users'; protected $injectUniqueIdentifier = true; From 3c40c6fe25195b92b298a1cdbee0283b117840fb Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:20 +0000 Subject: [PATCH 08/19] Shift console routes --- routes/console.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/console.php b/routes/console.php index f623be0cf9..a4c876ae04 100644 --- a/routes/console.php +++ b/routes/console.php @@ -16,7 +16,7 @@ use Illuminate\Foundation\Inspiring; Artisan::command('inspire', function () { $this->comment(Inspiring::quote()); -})->describe('Display an inspiring quote'); +})->purpose('Display an inspiring quote'); Artisan::command('snipeit:travisci-install', function () { if (! Setting::setupCompleted()) { @@ -34,4 +34,4 @@ Artisan::command('snipeit:travisci-install', function () { } else { $this->comment('Setup already ran'); } -})->describe('Travis-cli install script for unit tests'); +})->purpose('Travis-cli install script for unit tests'); From c02a95e73fd51f57b01111937817c3e3c560eb38 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:22 +0000 Subject: [PATCH 09/19] Ignore temporary framework files --- storage/framework/.gitignore | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore index 953edb7a99..05c4471f2b 100755 --- a/storage/framework/.gitignore +++ b/storage/framework/.gitignore @@ -1,7 +1,9 @@ -config.php -routes.php compiled.php -services.json -events.scanned.php -routes.scanned.php +config.php down +events.scanned.php +maintenance.php +routes.php +routes.scanned.php +schedule-* +services.json From 104b441e0dffd49f27444c2dc27c4ce9091febe9 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:17:44 +0000 Subject: [PATCH 10/19] Shift to class based factories --- app/Models/Accessory.php | 3 + app/Models/Actionlog.php | 3 + app/Models/Asset.php | 3 + app/Models/AssetMaintenance.php | 3 + app/Models/AssetModel.php | 3 + app/Models/Category.php | 3 + app/Models/Company.php | 3 + app/Models/Component.php | 3 + app/Models/Consumable.php | 3 + app/Models/CustomField.php | 3 + app/Models/CustomFieldset.php | 3 + app/Models/Department.php | 3 + app/Models/Depreciation.php | 3 + app/Models/Group.php | 3 + app/Models/License.php | 3 + app/Models/Location.php | 3 + app/Models/Manufacturer.php | 3 + app/Models/Setting.php | 3 + app/Models/Statuslabel.php | 3 + app/Models/Supplier.php | 3 + app/Models/User.php | 3 + database/factories/AccessoryFactory.php | 131 ++-- ...ionLogFactory.php => ActionlogFactory.php} | 49 +- database/factories/AssetFactory.php | 439 +++++++----- .../factories/AssetMaintenanceFactory.php | 49 ++ database/factories/AssetModelFactory.php | 492 ++++++++------ database/factories/CategoryFactory.php | 264 +++++--- database/factories/CompanyFactory.php | 45 ++ database/factories/ComponentFactory.php | 115 ++++ database/factories/ComponentsFactory.php | 59 -- database/factories/ConsumableFactory.php | 106 +-- database/factories/CustomFieldFactory.php | 78 +++ database/factories/CustomFieldsFactory.php | 45 -- database/factories/CustomFieldsetFactory.php | 54 +- database/factories/DepartmentFactory.php | 99 +++ database/factories/DepartmentsFactory.php | 59 -- database/factories/DepreciationFactory.php | 74 ++- database/factories/GroupFactory.php | 45 ++ database/factories/LicenseFactory.php | 156 +++-- database/factories/LocationFactory.php | 53 ++ database/factories/ManufacturerFactory.php | 256 ++++--- database/factories/ModelFactory.php | 99 --- database/factories/SettingFactory.php | 55 ++ database/factories/StatusLabelFactory.php | 67 -- database/factories/StatuslabelFactory.php | 109 +++ database/factories/SupplierFactory.php | 57 ++ database/factories/UserFactory.php | 627 +++++++++++------- database/seeds/AccessorySeeder.php | 8 +- database/seeds/ActionlogSeeder.php | 4 +- database/seeds/AssetModelSeeder.php | 36 +- database/seeds/AssetSeeder.php | 40 +- database/seeds/CategorySeeder.php | 30 +- database/seeds/CompanySeeder.php | 2 +- database/seeds/ComponentSeeder.php | 8 +- database/seeds/ConsumableSeeder.php | 6 +- database/seeds/CustomFieldSeeder.php | 14 +- database/seeds/DepartmentSeeder.php | 12 +- database/seeds/DepreciationSeeder.php | 6 +- database/seeds/LicenseSeeder.php | 8 +- database/seeds/LocationSeeder.php | 2 +- database/seeds/ManufacturerSeeder.php | 22 +- database/seeds/StatuslabelSeeder.php | 14 +- database/seeds/SupplierSeeder.php | 2 +- database/seeds/UserSeeder.php | 10 +- tests/api/ApiAccessoriesCest.php | 8 +- tests/api/ApiAssetsCest.php | 8 +- tests/api/ApiCategoriesCest.php | 9 +- tests/api/ApiCheckoutAssetsCest.php | 6 +- tests/api/ApiCompaniesCest.php | 8 +- tests/api/ApiComponentsCest.php | 8 +- tests/api/ApiConsumablesCest.php | 8 +- tests/api/ApiLicensesCest.php | 10 +- tests/api/ApiLocationsCest.php | 8 +- tests/api/ApiManufacturersCest.php | 8 +- tests/api/ApiModelsCest.php | 8 +- tests/api/ApiStatusLabelsCest.php | 8 +- tests/api/ApiUsersCest.php | 12 +- tests/functional/AccessoriesCest.php | 2 +- tests/functional/AssetModelsCest.php | 4 +- tests/functional/AssetsCest.php | 2 +- tests/functional/CategoriesCest.php | 4 +- tests/functional/CompaniesCest.php | 2 +- tests/functional/ComponentsCest.php | 2 +- tests/functional/ConsumablesCest.php | 2 +- tests/functional/DepreciationsCest.php | 2 +- tests/functional/LicensesCest.php | 2 +- tests/functional/LocationsCest.php | 4 +- tests/functional/ManufacturersCest.php | 4 +- tests/functional/StatusLabelsCest.php | 2 +- tests/functional/SuppliersCest.php | 4 +- tests/functional/UsersCest.php | 4 +- tests/unit/AccessoryTest.php | 20 +- tests/unit/AssetTest.php | 27 +- tests/unit/BaseTest.php | 26 +- tests/unit/CategoryTest.php | 8 +- tests/unit/CompanyTest.php | 18 +- tests/unit/ComponentTest.php | 20 +- tests/unit/ConsumableTest.php | 2 +- tests/unit/CustomFieldTest.php | 2 +- tests/unit/DepreciationTest.php | 4 +- tests/unit/ImporterTest.php | 16 +- tests/unit/LocationTest.php | 4 +- tests/unit/NotificationTest.php | 2 +- tests/unit/PermissionsTest.php | 50 +- tests/unit/StatuslabelTest.php | 14 +- 105 files changed, 2713 insertions(+), 1618 deletions(-) rename database/factories/{ActionLogFactory.php => ActionlogFactory.php} (79%) create mode 100644 database/factories/AssetMaintenanceFactory.php create mode 100644 database/factories/CompanyFactory.php create mode 100644 database/factories/ComponentFactory.php delete mode 100644 database/factories/ComponentsFactory.php create mode 100644 database/factories/CustomFieldFactory.php delete mode 100644 database/factories/CustomFieldsFactory.php create mode 100644 database/factories/DepartmentFactory.php delete mode 100644 database/factories/DepartmentsFactory.php create mode 100644 database/factories/GroupFactory.php create mode 100644 database/factories/LocationFactory.php delete mode 100644 database/factories/ModelFactory.php create mode 100644 database/factories/SettingFactory.php delete mode 100644 database/factories/StatusLabelFactory.php create mode 100644 database/factories/StatuslabelFactory.php create mode 100644 database/factories/SupplierFactory.php diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index b32822cd82..c3679ae571 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Acceptable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; @@ -16,6 +17,8 @@ use Watson\Validating\ValidatingTrait; */ class Accessory extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\AccessoryPresenter::class; use CompanyableTrait; use Loggable, Presentable; diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index b42cfb5a00..d94725dfb2 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Carbon; @@ -16,6 +17,8 @@ use Illuminate\Support\Facades\Auth; */ class Actionlog extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\ActionlogPresenter::class; use SoftDeletes; use Presentable; diff --git a/app/Models/Asset.php b/app/Models/Asset.php index f193798fee..f83b2e14f9 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Events\AssetCheckedOut; use App\Events\CheckoutableCheckedOut; use App\Exceptions\CheckoutNotAllowed; @@ -26,6 +27,8 @@ use Watson\Validating\ValidatingTrait; */ class Asset extends Depreciable { + use HasFactory; + protected $presenter = \App\Presenters\AssetPresenter::class; use Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait; diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index cd4bba1a28..bee38abb61 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Helpers\Helper; use App\Models\Traits\Searchable; use Illuminate\Database\Eloquent\Model; @@ -15,6 +16,8 @@ use Watson\Validating\ValidatingTrait; */ class AssetMaintenance extends Model implements ICompanyableChild { + use HasFactory; + use SoftDeletes; use CompanyableChildTrait; use ValidatingTrait; diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index df0f7a4d68..2d48f491fe 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -16,6 +17,8 @@ use Watson\Validating\ValidatingTrait; */ class AssetModel extends SnipeModel { + use HasFactory; + use SoftDeletes; protected $presenter = \App\Presenters\AssetModelPresenter::class; use Requestable, Presentable; diff --git a/app/Models/Category.php b/app/Models/Category.php index 0bcd5fd100..9c51fc4be4 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use App\Presenters\Presentable; @@ -19,6 +20,8 @@ use Watson\Validating\ValidatingTrait; */ class Category extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\CategoryPresenter::class; use Presentable; use SoftDeletes; diff --git a/app/Models/Company.php b/app/Models/Company.php index e09c8472c7..dae7bd28d2 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Auth; @@ -16,6 +17,8 @@ use Watson\Validating\ValidatingTrait; */ final class Company extends SnipeModel { + use HasFactory; + protected $table = 'companies'; // Declare the rules for the model validation diff --git a/app/Models/Component.php b/app/Models/Component.php index f0af84fe71..3c15d2dddb 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -14,6 +15,8 @@ use Watson\Validating\ValidatingTrait; */ class Component extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\ComponentPresenter::class; use CompanyableTrait; use Loggable, Presentable; diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index 26a146149b..203a56e4b8 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Acceptable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; @@ -11,6 +12,8 @@ use Watson\Validating\ValidatingTrait; class Consumable extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\ConsumablePresenter::class; use CompanyableTrait; use Loggable, Presentable; diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index 01c85ab2c0..d601bb4ef3 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use EasySlugger\Utf8Slugger; use Illuminate\Database\Eloquent\Model; @@ -11,6 +12,8 @@ use Watson\Validating\ValidatingTrait; class CustomField extends Model { + use HasFactory; + use ValidatingTrait, UniqueUndeletedTrait; diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index 83e91a4b31..dbfb685f8f 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -2,12 +2,15 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Gate; use Illuminate\Database\Eloquent\Model; use Watson\Validating\ValidatingTrait; class CustomFieldset extends Model { + use HasFactory; + use ValidatingTrait; protected $guarded = ['id']; diff --git a/app/Models/Department.php b/app/Models/Department.php index 56be77115d..7b2adeb471 100644 --- a/app/Models/Department.php +++ b/app/Models/Department.php @@ -2,12 +2,15 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use Watson\Validating\ValidatingTrait; class Department extends SnipeModel { + use HasFactory; + /** * Whether the model should inject it's identifier to the unique * validation rules before attempting validation. If this property diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php index 281524943a..9734315f08 100755 --- a/app/Models/Depreciation.php +++ b/app/Models/Depreciation.php @@ -2,12 +2,15 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Watson\Validating\ValidatingTrait; class Depreciation extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\DepreciationPresenter::class; use Presentable; // Declare the rules for the form validation diff --git a/app/Models/Group.php b/app/Models/Group.php index ab432d2dd9..5d9a01c31f 100755 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -2,11 +2,14 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use Watson\Validating\ValidatingTrait; class Group extends SnipeModel { + use HasFactory; + protected $table = 'permission_groups'; public $rules = [ diff --git a/app/Models/License.php b/app/Models/License.php index 3476a141ef..8c2bf2d02b 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Carbon\Carbon; @@ -13,6 +14,8 @@ use Watson\Validating\ValidatingTrait; class License extends Depreciable { + use HasFactory; + protected $presenter = \App\Presenters\LicensePresenter::class; use SoftDeletes; diff --git a/app/Models/Location.php b/app/Models/Location.php index 080158a909..a18eedc239 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Asset; use App\Models\SnipeModel; @@ -16,6 +17,8 @@ use Watson\Validating\ValidatingTrait; class Location extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\LocationPresenter::class; use Presentable; use SoftDeletes; diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php index 0bd16f5bb3..6a96e36788 100755 --- a/app/Models/Manufacturer.php +++ b/app/Models/Manufacturer.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -10,6 +11,8 @@ use Watson\Validating\ValidatingTrait; class Manufacturer extends SnipeModel { + use HasFactory; + protected $presenter = \App\Presenters\ManufacturerPresenter::class; use Presentable; use SoftDeletes; diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 9179a73c00..1721b78f44 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Collection; @@ -15,6 +16,8 @@ use Watson\Validating\ValidatingTrait; */ class Setting extends Model { + use HasFactory; + use Notifiable, ValidatingTrait; /** diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index 772e1ee92d..47e2ec2517 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -9,6 +10,8 @@ use Watson\Validating\ValidatingTrait; class Statuslabel extends SnipeModel { + use HasFactory; + use SoftDeletes; use ValidatingTrait; use UniqueUndeletedTrait; diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 8752126b8d..ad09721ce2 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use Illuminate\Database\Eloquent\SoftDeletes; @@ -9,6 +10,8 @@ use Watson\Validating\ValidatingTrait; class Supplier extends SnipeModel { + use HasFactory; + use SoftDeletes; protected $table = 'suppliers'; diff --git a/app/Models/User.php b/app/Models/User.php index f7ec2509cb..b07f08c2d7 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,6 +2,7 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use App\Presenters\Presentable; @@ -21,6 +22,8 @@ use Watson\Validating\ValidatingTrait; class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference { + use HasFactory; + protected $presenter = \App\Presenters\UserPresenter::class; use SoftDeletes, ValidatingTrait; use Authenticatable, Authorizable, CanResetPassword, HasApiTokens; diff --git a/database/factories/AccessoryFactory.php b/database/factories/AccessoryFactory.php index d6b9f0dde0..224241da0c 100644 --- a/database/factories/AccessoryFactory.php +++ b/database/factories/AccessoryFactory.php @@ -1,4 +1,7 @@ define(App\Models\Accessory::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'model_number' => $faker->numberBetween(1000000, 50000000), - 'location_id' => rand(1, 5), - ]; -}); +class AccessoryFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\Accessory::class; -$factory->state(App\Models\Accessory::class, 'apple-bt-keyboard', function ($faker) { - return [ - 'name' => 'Bluetooth Keyboard', - 'image' => 'bluetooth.jpg', - 'category_id' => 8, - 'manufacturer_id' => 1, - 'qty' => 10, - 'min_amt' => 2, - 'supplier_id' => rand(1, 5), - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + 'model_number' => $this->faker->numberBetween(1000000, 50000000), + 'location_id' => rand(1, 5), + ]; + } -$factory->state(App\Models\Accessory::class, 'apple-usb-keyboard', function ($faker) { - return [ - 'name' => 'USB Keyboard', - 'image' => 'usb-keyboard.jpg', - 'category_id' => 8, - 'manufacturer_id' => 1, - 'qty' => 15, - 'min_amt' => 2, - 'supplier_id' => rand(1, 5), - ]; -}); + public function appleBtKeyboard() + { + return $this->state(function () { + return [ + 'name' => 'Bluetooth Keyboard', + 'image' => 'bluetooth.jpg', + 'category_id' => 8, + 'manufacturer_id' => 1, + 'qty' => 10, + 'min_amt' => 2, + 'supplier_id' => rand(1, 5), + ]; + }); + } -$factory->state(App\Models\Accessory::class, 'apple-mouse', function ($faker) { - return [ - 'name' => 'Magic Mouse', - 'image' => 'magic-mouse.jpg', - 'category_id' => 9, - 'manufacturer_id' => 1, - 'qty' => 13, - 'min_amt' => 2, - 'supplier_id' => rand(1, 5), - ]; -}); + public function appleUsbKeyboard() + { + return $this->state(function () { + return [ + 'name' => 'USB Keyboard', + 'image' => 'usb-keyboard.jpg', + 'category_id' => 8, + 'manufacturer_id' => 1, + 'qty' => 15, + 'min_amt' => 2, + 'supplier_id' => rand(1, 5), + ]; + }); + } -$factory->state(App\Models\Accessory::class, 'microsoft-mouse', function ($faker) { - return [ - 'name' => 'Sculpt Comfort Mouse', - 'image' => 'comfort-mouse.jpg', - 'category_id' => 9, - 'manufacturer_id' => 2, - 'qty' => 13, - 'min_amt' => 2, - ]; -}); + public function appleMouse() + { + return $this->state(function () { + return [ + 'name' => 'Magic Mouse', + 'image' => 'magic-mouse.jpg', + 'category_id' => 9, + 'manufacturer_id' => 1, + 'qty' => 13, + 'min_amt' => 2, + 'supplier_id' => rand(1, 5), + ]; + }); + } + + public function microsoftMouse() + { + return $this->state(function () { + return [ + 'name' => 'Sculpt Comfort Mouse', + 'image' => 'comfort-mouse.jpg', + 'category_id' => 9, + 'manufacturer_id' => 2, + 'qty' => 13, + 'min_amt' => 2, + ]; + }); + } +} diff --git a/database/factories/ActionLogFactory.php b/database/factories/ActionlogFactory.php similarity index 79% rename from database/factories/ActionLogFactory.php rename to database/factories/ActionlogFactory.php index 939415c76b..17966f55b1 100644 --- a/database/factories/ActionLogFactory.php +++ b/database/factories/ActionlogFactory.php @@ -1,19 +1,17 @@ define(Actionlog::class, function (Faker\Generator $faker) { - return [ - 'note' => 'Sample checkout from DB seeder!', - ]; -}); $factory->defineAs(App\Models\Actionlog::class, 'asset-upload', function ($faker) { - $asset = factory(App\Models\Asset::class)->create(); + $asset = \App\Models\Asset::factory()->create(); return [ 'item_type' => get_class($asset), @@ -74,6 +72,7 @@ $factory->defineAs(Actionlog::class, 'asset-checkout-location', function (Faker\ }); // This doesn't work - we need to assign a seat + $factory->defineAs(Actionlog::class, 'license-checkout-asset', function (Faker\Generator $faker) { $target = Asset::inRandomOrder()->RTD()->first(); $item = License::inRandomOrder()->first(); @@ -109,10 +108,10 @@ $factory->defineAs(Actionlog::class, 'accessory-checkout', function (Faker\Gener }); $factory->defineAs(Actionlog::class, 'consumable-checkout', function (Faker\Generator $faker) { - $company = factory(App\Models\Company::class)->create(); - $user = factory(App\Models\User::class)->create(['company_id' => $company->id]); - $target = factory(App\Models\User::class)->create(['company_id' => $company->id]); - $item = factory(App\Models\Consumable::class)->create(['company_id' => $company->id]); + $company = \App\Models\Company::factory()->create(); + $user = \App\Models\User::factory()->create(['company_id' => $company->id]); + $target = \App\Models\User::factory()->create(['company_id' => $company->id]); + $item = \App\Models\Consumable::factory()->create(['company_id' => $company->id]); return [ 'user_id' => $user->id, @@ -128,10 +127,10 @@ $factory->defineAs(Actionlog::class, 'consumable-checkout', function (Faker\Gene }); $factory->defineAs(Actionlog::class, 'component-checkout', function (Faker\Generator $faker) { - $company = factory(App\Models\Company::class)->create(); - $user = factory(App\Models\User::class)->create(['company_id' => $company->id]); - $target = factory(App\Models\User::class)->create(['company_id' => $company->id]); - $item = factory(App\Models\Component::class)->create(['company_id' => $company->id]); + $company = \App\Models\Company::factory()->create(); + $user = \App\Models\User::factory()->create(['company_id' => $company->id]); + $target = \App\Models\User::factory()->create(['company_id' => $company->id]); + $item = \App\Models\Component::factory()->create(['company_id' => $company->id]); return [ 'user_id' => $user->id, @@ -145,3 +144,25 @@ $factory->defineAs(Actionlog::class, 'component-checkout', function (Faker\Gener 'company_id' => $company->id, ]; }); + +class ActionlogFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = Actionlog::class; + + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'note' => 'Sample checkout from DB seeder!', + ]; + } +} diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index 32f739e0ba..d4bae8f8c4 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -1,5 +1,8 @@ define(Asset::class, function (Faker\Generator $faker) { - return [ - 'name' => null, - 'rtd_location_id' => rand(1, 10), - 'serial' => $faker->uuid, - 'status_id' => 1, - 'user_id' => 1, - 'asset_tag' => $faker->unixTime('now'), - 'notes' => 'Created by DB seeder', - 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), - 'purchase_cost' => $faker->randomFloat(2, '299.99', '2999.99'), - 'order_number' => $faker->numberBetween(1000000, 50000000), - 'supplier_id' => 1, - 'requestable' => $faker->boolean(), - 'assigned_to' => null, - 'assigned_type' => null, - 'next_audit_date' => null, - 'last_checkout' => null, - ]; -}); -$factory->state(Asset::class, 'laptop-mbp', function ($faker) { - return [ - 'model_id' => 1, - ]; -}); -$factory->state(Asset::class, 'laptop-mbp-pending', function ($faker) { - return [ - 'model_id' => 1, - 'status_id' => 2, - ]; -}); -$factory->state(Asset::class, 'laptop-mbp-archived', function ($faker) { - return [ - 'model_id' => 1, - 'status_id' => 3, - ]; -}); -$factory->state(Asset::class, 'laptop-air', function ($faker) { - return [ - 'model_id' => 2, - ]; -}); -$factory->state(Asset::class, 'laptop-surface', function ($faker) { - return [ - 'model_id' => 3, - ]; -}); -$factory->state(Asset::class, 'laptop-xps', function ($faker) { - return [ - 'model_id' => 4, - ]; -}); -$factory->state(Asset::class, 'laptop-spectre', function ($faker) { - return [ - 'model_id' => 5, - ]; -}); -$factory->state(Asset::class, 'laptop-zenbook', function ($faker) { - return [ - 'model_id' => 6, - ]; -}); -$factory->state(Asset::class, 'laptop-yoga', function ($faker) { - return [ - 'model_id' => 7, - ]; -}); -$factory->state(Asset::class, 'desktop-macpro', function ($faker) { - return [ - 'model_id' => 8, - ]; -}); -$factory->state(Asset::class, 'desktop-lenovo-i5', function ($faker) { - return [ - 'model_id' => 9, - ]; -}); -$factory->state(Asset::class, 'desktop-optiplex', function ($faker) { - return [ - 'model_id' => 10, - ]; -}); -$factory->state(Asset::class, 'conf-polycom', function ($faker) { - return [ - 'model_id' => 11, - ]; -}); -$factory->state(Asset::class, 'conf-polycomcx', function ($faker) { - return [ - 'model_id' => 12, - ]; -}); -$factory->state(Asset::class, 'tablet-ipad', function ($faker) { - return [ - 'model_id' => 13, - ]; -}); -$factory->state(Asset::class, 'tablet-tab3', function ($faker) { - return [ - 'model_id' => 14, - ]; -}); -$factory->state(Asset::class, 'phone-iphone6s', function ($faker) { - return [ - 'model_id' => 15, - ]; -}); -$factory->state(Asset::class, 'phone-iphone7', function ($faker) { - return [ - 'model_id' => 16, - ]; -}); -$factory->state(Asset::class, 'ultrafine', function ($faker) { - return [ - 'model_id' => 17, - ]; -}); -$factory->state(Asset::class, 'ultrasharp', function ($faker) { - return [ - 'model_id' => 18, - ]; -}); // These are just for unit tests, not to generate data -$factory->state(Asset::class, 'assigned-to-user', function ($faker) { - return [ - 'model_id' => 1, - 'assigned_to' => factory(App\Models\User::class)->create()->id, - 'assigned_type' => App\Models\User::class, - ]; -}); -$factory->state(Asset::class, 'assigned-to-location', function ($faker) { - return [ - 'model_id' => 1, - 'assigned_to' => factory(App\Models\Location::class)->create()->id, - 'assigned_type' => App\Models\Location::class, - ]; -}); -$factory->state(Asset::class, 'assigned-to-asset', function ($faker) { - return [ - 'model_id' => 1, - 'assigned_to' => factory(App\Models\Asset::class)->create()->id, - 'assigned_type' => App\Models\Asset::class, - ]; -}); +class AssetFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = Asset::class; -$factory->state(Asset::class, 'requires-acceptance', function ($faker) { - return [ - 'model_id' => 1, - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'name' => null, + 'rtd_location_id' => rand(1, 10), + 'serial' => $this->faker->uuid, + 'status_id' => 1, + 'user_id' => 1, + 'asset_tag' => $this->faker->unixTime('now'), + 'notes' => 'Created by DB seeder', + 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), + 'purchase_cost' => $this->faker->randomFloat(2, '299.99', '2999.99'), + 'order_number' => $this->faker->numberBetween(1000000, 50000000), + 'supplier_id' => 1, + 'requestable' => $this->faker->boolean(), + 'assigned_to' => null, + 'assigned_type' => null, + 'next_audit_date' => null, + 'last_checkout' => null, + ]; + } -$factory->state(Asset::class, 'deleted', function ($faker) { - return [ - 'model_id' => 1, - 'deleted_at' => $faker->dateTime(), - ]; -}); + public function laptopMbp() + { + return $this->state(function () { + return [ + 'model_id' => 1, + ]; + }); + } -$factory->define(App\Models\AssetMaintenance::class, function (Faker\Generator $faker) { - return [ - 'asset_id' => function () { - return factory(App\Models\Asset::class)->create()->id; - }, - 'supplier_id' => function () { - return factory(App\Models\Supplier::class)->create()->id; - }, - 'asset_maintenance_type' => $faker->randomElement(['maintenance', 'repair', 'upgrade']), - 'title' => $faker->sentence, - 'start_date' => $faker->date(), - 'is_warranty' => $faker->boolean(), - 'notes' => $faker->paragraph(), - ]; -}); + public function laptopMbpPending() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'status_id' => 2, + ]; + }); + } + + public function laptopMbpArchived() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'status_id' => 3, + ]; + }); + } + + public function laptopAir() + { + return $this->state(function () { + return [ + 'model_id' => 2, + ]; + }); + } + + public function laptopSurface() + { + return $this->state(function () { + return [ + 'model_id' => 3, + ]; + }); + } + + public function laptopXps() + { + return $this->state(function () { + return [ + 'model_id' => 4, + ]; + }); + } + + public function laptopSpectre() + { + return $this->state(function () { + return [ + 'model_id' => 5, + ]; + }); + } + + public function laptopZenbook() + { + return $this->state(function () { + return [ + 'model_id' => 6, + ]; + }); + } + + public function laptopYoga() + { + return $this->state(function () { + return [ + 'model_id' => 7, + ]; + }); + } + + public function desktopMacpro() + { + return $this->state(function () { + return [ + 'model_id' => 8, + ]; + }); + } + + public function desktopLenovoI5() + { + return $this->state(function () { + return [ + 'model_id' => 9, + ]; + }); + } + + public function desktopOptiplex() + { + return $this->state(function () { + return [ + 'model_id' => 10, + ]; + }); + } + + public function confPolycom() + { + return $this->state(function () { + return [ + 'model_id' => 11, + ]; + }); + } + + public function confPolycomcx() + { + return $this->state(function () { + return [ + 'model_id' => 12, + ]; + }); + } + + public function tabletIpad() + { + return $this->state(function () { + return [ + 'model_id' => 13, + ]; + }); + } + + public function tabletTab3() + { + return $this->state(function () { + return [ + 'model_id' => 14, + ]; + }); + } + + public function phoneIphone6s() + { + return $this->state(function () { + return [ + 'model_id' => 15, + ]; + }); + } + + public function phoneIphone7() + { + return $this->state(function () { + return [ + 'model_id' => 16, + ]; + }); + } + + public function ultrafine() + { + return $this->state(function () { + return [ + 'model_id' => 17, + ]; + }); + } + + public function ultrasharp() + { + return $this->state(function () { + return [ + 'model_id' => 18, + ]; + }); + } + + public function assignedToUser() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'assigned_to' => \App\Models\User::factory()->create()->id, + 'assigned_type' => App\Models\User::class, + ]; + }); + } + + public function assignedToLocation() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'assigned_to' => \App\Models\Location::factory()->create()->id, + 'assigned_type' => App\Models\Location::class, + ]; + }); + } + + public function assignedToAsset() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'assigned_to' => \App\Models\Asset::factory()->create()->id, + 'assigned_type' => App\Models\Asset::class, + ]; + }); + } + + public function requiresAcceptance() + { + return $this->state(function () { + return [ + 'model_id' => 1, + ]; + }); + } + + public function deleted() + { + return $this->state(function () { + return [ + 'model_id' => 1, + 'deleted_at' => $this->faker->dateTime(), + ]; + }); + } +} diff --git a/database/factories/AssetMaintenanceFactory.php b/database/factories/AssetMaintenanceFactory.php new file mode 100644 index 0000000000..b3793c822c --- /dev/null +++ b/database/factories/AssetMaintenanceFactory.php @@ -0,0 +1,49 @@ + function () { + return \App\Models\Asset::factory()->create()->id; + }, + 'supplier_id' => function () { + return \App\Models\Supplier::factory()->create()->id; + }, + 'asset_maintenance_type' => $this->faker->randomElement(['maintenance', 'repair', 'upgrade']), + 'title' => $this->faker->sentence, + 'start_date' => $this->faker->date(), + 'is_warranty' => $this->faker->boolean(), + 'notes' => $this->faker->paragraph(), + ]; + } +} diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php index 8b4e9ea105..38391b1712 100644 --- a/database/factories/AssetModelFactory.php +++ b/database/factories/AssetModelFactory.php @@ -1,4 +1,7 @@ define(App\Models\AssetModel::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'model_number' => $faker->creditCardNumber(), - 'notes' => 'Created by demo seeder', - - ]; -}); // 1 -$factory->state(App\Models\AssetModel::class, 'mbp-13-model', function ($faker) { - return [ - 'name' => 'Macbook Pro 13"', - 'category_id' => 1, - 'manufacturer_id' => 1, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'mbp.jpg', - 'fieldset_id' => 2, - ]; -}); // 2 -$factory->state(App\Models\AssetModel::class, 'mbp-air-model', function ($faker) { - return [ - 'name' => 'Macbook Air', - 'category_id' => 1, - 'manufacturer_id' => 1, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'macbookair.jpg', - 'fieldset_id' => 2, - ]; -}); // 3 -$factory->state(App\Models\AssetModel::class, 'surface-model', function ($faker) { - return [ - 'name' => 'Surface', - 'category_id' => 1, - 'manufacturer_id' => 2, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'surface.jpg', - 'fieldset_id' => 2, - ]; -}); // 4 -$factory->state(App\Models\AssetModel::class, 'xps13-model', function ($faker) { - return [ - 'name' => 'XPS 13', - 'category_id' => 1, - 'manufacturer_id' => 3, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'xps.jpg', - 'fieldset_id' => 2, - ]; -}); // 5 -$factory->state(App\Models\AssetModel::class, 'zenbook-model', function ($faker) { - return [ - 'name' => 'ZenBook UX310', - 'category_id' => 1, - 'manufacturer_id' => 4, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'zenbook.jpg', - 'fieldset_id' => 2, - ]; -}); // 6 -$factory->state(App\Models\AssetModel::class, 'spectre-model', function ($faker) { - return [ - 'name' => 'Spectre', - 'category_id' => 1, - 'manufacturer_id' => 5, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'spectre.jpg', - 'fieldset_id' => 2, - ]; -}); // 7 -$factory->state(App\Models\AssetModel::class, 'yoga-model', function ($faker) { - return [ - 'name' => 'Yoga 910', - 'category_id' => 1, - 'manufacturer_id' => 6, - 'eol' => '36', - 'depreciation_id' => 1, - 'image' => 'yoga.png', - 'fieldset_id' => 2, - ]; -}); /* |-------------------------------------------------------------------------- @@ -120,42 +38,8 @@ $factory->state(App\Models\AssetModel::class, 'yoga-model', function ($faker) { |-------------------------------------------------------------------------- */ -$factory->state(App\Models\AssetModel::class, 'macpro-model', function ($faker) { - return [ - 'name' => 'iMac Pro', - 'category_id' => 2, - 'manufacturer_id' => 1, - 'eol' => '24', - 'depreciation_id' => 1, - 'image' => 'imacpro.jpg', - 'fieldset_id' => 2, - ]; -}); -$factory->state(App\Models\AssetModel::class, 'lenovo-i5-model', function ($faker) { - return [ - 'name' => 'Lenovo Intel Core i5', - 'category_id' => 2, - 'manufacturer_id' => 6, - 'eol' => '24', - 'depreciation_id' => 1, - 'image' => 'lenovoi5.png', - 'fieldset_id' => 2, - ]; -}); -$factory->state(App\Models\AssetModel::class, 'optiplex-model', function ($faker) { - return [ - 'name' => 'OptiPlex', - 'category_id' => 2, - 'manufacturer_id' => 3, - 'model_number' => '5040 (MRR81)', - 'eol' => '24', - 'depreciation_id' => 1, - 'image' => 'optiplex.jpg', - 'fieldset_id' => 2, - ]; -}); /* |-------------------------------------------------------------------------- @@ -163,27 +47,7 @@ $factory->state(App\Models\AssetModel::class, 'optiplex-model', function ($faker |-------------------------------------------------------------------------- */ -$factory->state(App\Models\AssetModel::class, 'polycom-model', function ($faker) { - return [ - 'name' => 'SoundStation 2', - 'category_id' => 6, - 'manufacturer_id' => 8, - 'eol' => '12', - 'depreciation_id' => 1, - 'image' => 'soundstation.jpg', - ]; -}); -$factory->state(App\Models\AssetModel::class, 'polycomcx-model', function ($faker) { - return [ - 'name' => 'Polycom CX3000 IP Conference Phone', - 'category_id' => 6, - 'manufacturer_id' => 8, - 'eol' => '12', - 'depreciation_id' => 1, - 'image' => 'cx3000.png', - ]; -}); /* |-------------------------------------------------------------------------- @@ -191,27 +55,7 @@ $factory->state(App\Models\AssetModel::class, 'polycomcx-model', function ($fake |-------------------------------------------------------------------------- */ -$factory->state(App\Models\AssetModel::class, 'ipad-model', function ($faker) { - return [ - 'name' => 'iPad Pro', - 'category_id' => 3, - 'manufacturer_id' => 1, - 'eol' => '12', - 'depreciation_id' => 1, - 'image' => 'ipad.jpg', - ]; -}); -$factory->state(App\Models\AssetModel::class, 'tab3-model', function ($faker) { - return [ - 'name' => 'Tab3', - 'category_id' => 3, - 'manufacturer_id' => 6, - 'eol' => '12', - 'depreciation_id' => 1, - 'image' => 'tab3.png', - ]; -}); /* |-------------------------------------------------------------------------- @@ -219,29 +63,7 @@ $factory->state(App\Models\AssetModel::class, 'tab3-model', function ($faker) { |-------------------------------------------------------------------------- */ -$factory->state(App\Models\AssetModel::class, 'iphone6s-model', function ($faker) { - return [ - 'name' => 'iPhone 6s', - 'category_id' => 4, - 'manufacturer_id' => 1, - 'eol' => '12', - 'depreciation_id' => 3, - 'image' => 'iphone6.jpg', - 'fieldset_id' => 1, - ]; -}); -$factory->state(App\Models\AssetModel::class, 'iphone7-model', function ($faker) { - return [ - 'name' => 'iPhone 7', - 'category_id' => 4, - 'manufacturer_id' => 1, - 'eol' => '12', - 'depreciation_id' => 1, - 'image' => 'iphone7.jpg', - 'fieldset_id' => 1, - ]; -}); /* |-------------------------------------------------------------------------- @@ -249,24 +71,292 @@ $factory->state(App\Models\AssetModel::class, 'iphone7-model', function ($faker) |-------------------------------------------------------------------------- */ -$factory->state(App\Models\AssetModel::class, 'ultrafine', function ($faker) { - return [ - 'name' => 'Ultrafine 4k', - 'category_id' => 5, - 'manufacturer_id' => 7, - 'eol' => '12', - 'depreciation_id' => 2, - 'image' => 'ultrafine.jpg', - ]; -}); +class AssetModelFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\AssetModel::class; -$factory->state(App\Models\AssetModel::class, 'ultrasharp', function ($faker) { - return [ - 'name' => 'Ultrasharp U2415', - 'category_id' => 5, - 'manufacturer_id' => 3, - 'eol' => '12', - 'depreciation_id' => 2, - 'image' => 'ultrasharp.jpg', - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + 'model_number' => $this->faker->creditCardNumber(), + 'notes' => 'Created by demo seeder', + + ]; + } + + public function mbp13Model() + { + return $this->state(function () { + return [ + 'name' => 'Macbook Pro 13"', + 'category_id' => 1, + 'manufacturer_id' => 1, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'mbp.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function mbpAirModel() + { + return $this->state(function () { + return [ + 'name' => 'Macbook Air', + 'category_id' => 1, + 'manufacturer_id' => 1, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'macbookair.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function surfaceModel() + { + return $this->state(function () { + return [ + 'name' => 'Surface', + 'category_id' => 1, + 'manufacturer_id' => 2, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'surface.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function xps13Model() + { + return $this->state(function () { + return [ + 'name' => 'XPS 13', + 'category_id' => 1, + 'manufacturer_id' => 3, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'xps.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function zenbookModel() + { + return $this->state(function () { + return [ + 'name' => 'ZenBook UX310', + 'category_id' => 1, + 'manufacturer_id' => 4, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'zenbook.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function spectreModel() + { + return $this->state(function () { + return [ + 'name' => 'Spectre', + 'category_id' => 1, + 'manufacturer_id' => 5, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'spectre.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function yogaModel() + { + return $this->state(function () { + return [ + 'name' => 'Yoga 910', + 'category_id' => 1, + 'manufacturer_id' => 6, + 'eol' => '36', + 'depreciation_id' => 1, + 'image' => 'yoga.png', + 'fieldset_id' => 2, + ]; + }); + } + + public function macproModel() + { + return $this->state(function () { + return [ + 'name' => 'iMac Pro', + 'category_id' => 2, + 'manufacturer_id' => 1, + 'eol' => '24', + 'depreciation_id' => 1, + 'image' => 'imacpro.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function lenovoI5Model() + { + return $this->state(function () { + return [ + 'name' => 'Lenovo Intel Core i5', + 'category_id' => 2, + 'manufacturer_id' => 6, + 'eol' => '24', + 'depreciation_id' => 1, + 'image' => 'lenovoi5.png', + 'fieldset_id' => 2, + ]; + }); + } + + public function optiplexModel() + { + return $this->state(function () { + return [ + 'name' => 'OptiPlex', + 'category_id' => 2, + 'manufacturer_id' => 3, + 'model_number' => '5040 (MRR81)', + 'eol' => '24', + 'depreciation_id' => 1, + 'image' => 'optiplex.jpg', + 'fieldset_id' => 2, + ]; + }); + } + + public function polycomModel() + { + return $this->state(function () { + return [ + 'name' => 'SoundStation 2', + 'category_id' => 6, + 'manufacturer_id' => 8, + 'eol' => '12', + 'depreciation_id' => 1, + 'image' => 'soundstation.jpg', + ]; + }); + } + + public function polycomcxModel() + { + return $this->state(function () { + return [ + 'name' => 'Polycom CX3000 IP Conference Phone', + 'category_id' => 6, + 'manufacturer_id' => 8, + 'eol' => '12', + 'depreciation_id' => 1, + 'image' => 'cx3000.png', + ]; + }); + } + + public function ipadModel() + { + return $this->state(function () { + return [ + 'name' => 'iPad Pro', + 'category_id' => 3, + 'manufacturer_id' => 1, + 'eol' => '12', + 'depreciation_id' => 1, + 'image' => 'ipad.jpg', + ]; + }); + } + + public function tab3Model() + { + return $this->state(function () { + return [ + 'name' => 'Tab3', + 'category_id' => 3, + 'manufacturer_id' => 6, + 'eol' => '12', + 'depreciation_id' => 1, + 'image' => 'tab3.png', + ]; + }); + } + + public function iphone6sModel() + { + return $this->state(function () { + return [ + 'name' => 'iPhone 6s', + 'category_id' => 4, + 'manufacturer_id' => 1, + 'eol' => '12', + 'depreciation_id' => 3, + 'image' => 'iphone6.jpg', + 'fieldset_id' => 1, + ]; + }); + } + + public function iphone7Model() + { + return $this->state(function () { + return [ + 'name' => 'iPhone 7', + 'category_id' => 4, + 'manufacturer_id' => 1, + 'eol' => '12', + 'depreciation_id' => 1, + 'image' => 'iphone7.jpg', + 'fieldset_id' => 1, + ]; + }); + } + + public function ultrafine() + { + return $this->state(function () { + return [ + 'name' => 'Ultrafine 4k', + 'category_id' => 5, + 'manufacturer_id' => 7, + 'eol' => '12', + 'depreciation_id' => 2, + 'image' => 'ultrafine.jpg', + ]; + }); + } + + public function ultrasharp() + { + return $this->state(function () { + return [ + 'name' => 'Ultrasharp U2415', + 'category_id' => 5, + 'manufacturer_id' => 3, + 'eol' => '12', + 'depreciation_id' => 2, + 'image' => 'ultrasharp.jpg', + ]; + }); + } +} diff --git a/database/factories/CategoryFactory.php b/database/factories/CategoryFactory.php index ec9a5f84f8..7ac5456bdc 100644 --- a/database/factories/CategoryFactory.php +++ b/database/factories/CategoryFactory.php @@ -1,4 +1,7 @@ define(App\Models\Category::class, function (Faker\Generator $faker) { - return [ - 'checkin_email' => $faker->boolean(), - 'eula_text' => $faker->paragraph(), - 'require_acceptance' => false, - 'use_default_eula' => $faker->boolean(), - 'user_id' => 1, - ]; -}); +class CategoryFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\Category::class; -$factory->state(App\Models\Category::class, 'asset-laptop-category', function ($faker) { - return [ - 'name' => 'Laptops', - 'category_type' => 'asset', - 'require_acceptance' => true, - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'checkin_email' => $this->faker->boolean(), + 'eula_text' => $this->faker->paragraph(), + 'require_acceptance' => false, + 'use_default_eula' => $this->faker->boolean(), + 'user_id' => 1, + ]; + } -$factory->state(App\Models\Category::class, 'asset-desktop-category', function ($faker) { - return [ - 'name' => 'Desktops', - 'category_type' => 'asset', - ]; -}); + public function assetLaptopCategory() + { + return $this->state(function () { + return [ + 'name' => 'Laptops', + 'category_type' => 'asset', + 'require_acceptance' => true, + ]; + }); + } -$factory->state(App\Models\Category::class, 'asset-display-category', function ($faker) { - return [ - 'name' => 'Displays', - 'category_type' => 'asset', - ]; -}); + public function assetDesktopCategory() + { + return $this->state(function () { + return [ + 'name' => 'Desktops', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'asset-tablet-category', function ($faker) { - return [ - 'name' => 'Tablets', - 'category_type' => 'asset', - ]; -}); + public function assetDisplayCategory() + { + return $this->state(function () { + return [ + 'name' => 'Displays', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'asset-mobile-category', function ($faker) { - return [ - 'name' => 'Mobile Phones', - 'category_type' => 'asset', - ]; -}); + public function assetTabletCategory() + { + return $this->state(function () { + return [ + 'name' => 'Tablets', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'asset-conference-category', function ($faker) { - return [ - 'name' => 'Conference Phones', - 'category_type' => 'asset', - ]; -}); + public function assetMobileCategory() + { + return $this->state(function () { + return [ + 'name' => 'Mobile Phones', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'asset-voip-category', function ($faker) { - return [ - 'name' => 'VOIP Phones', - 'category_type' => 'asset', - ]; -}); + public function assetConferenceCategory() + { + return $this->state(function () { + return [ + 'name' => 'Conference Phones', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'accessory-keyboard-category', function ($faker) { - return [ - 'name' => 'Keyboards', - 'category_type' => 'accessory', - ]; -}); + public function assetVoipCategory() + { + return $this->state(function () { + return [ + 'name' => 'VOIP Phones', + 'category_type' => 'asset', + ]; + }); + } -$factory->state(App\Models\Category::class, 'accessory-mouse-category', function ($faker) { - return [ - 'name' => 'Mouse', - 'category_type' => 'accessory', - ]; -}); + public function accessoryKeyboardCategory() + { + return $this->state(function () { + return [ + 'name' => 'Keyboards', + 'category_type' => 'accessory', + ]; + }); + } -$factory->state(App\Models\Category::class, 'component-hdd-category', function ($faker) { - return [ - 'name' => 'HDD/SSD', - 'category_type' => 'component', - ]; -}); + public function accessoryMouseCategory() + { + return $this->state(function () { + return [ + 'name' => 'Mouse', + 'category_type' => 'accessory', + ]; + }); + } -$factory->state(App\Models\Category::class, 'component-ram-category', function ($faker) { - return [ - 'name' => 'RAM', - 'category_type' => 'component', - ]; -}); + public function componentHddCategory() + { + return $this->state(function () { + return [ + 'name' => 'HDD/SSD', + 'category_type' => 'component', + ]; + }); + } -$factory->state(App\Models\Category::class, 'consumable-paper-category', function ($faker) { - return [ - 'name' => 'Printer Paper', - 'category_type' => 'consumable', - ]; -}); + public function componentRamCategory() + { + return $this->state(function () { + return [ + 'name' => 'RAM', + 'category_type' => 'component', + ]; + }); + } -$factory->state(App\Models\Category::class, 'consumable-ink-category', function ($faker) { - return [ - 'name' => 'Printer Ink', - 'category_type' => 'consumable', - ]; -}); + public function consumablePaperCategory() + { + return $this->state(function () { + return [ + 'name' => 'Printer Paper', + 'category_type' => 'consumable', + ]; + }); + } -$factory->state(App\Models\Category::class, 'license-graphics-category', function ($faker) { - return [ - 'name' => 'Graphics Software', - 'category_type' => 'license', - ]; -}); + public function consumableInkCategory() + { + return $this->state(function () { + return [ + 'name' => 'Printer Ink', + 'category_type' => 'consumable', + ]; + }); + } -$factory->state(App\Models\Category::class, 'license-office-category', function ($faker) { - return [ - 'name' => 'Office Software', - 'category_type' => 'license', - ]; -}); + public function licenseGraphicsCategory() + { + return $this->state(function () { + return [ + 'name' => 'Graphics Software', + 'category_type' => 'license', + ]; + }); + } + + public function licenseOfficeCategory() + { + return $this->state(function () { + return [ + 'name' => 'Office Software', + 'category_type' => 'license', + ]; + }); + } +} diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php new file mode 100644 index 0000000000..9f1e0b4ac1 --- /dev/null +++ b/database/factories/CompanyFactory.php @@ -0,0 +1,45 @@ + $this->faker->company, + ]; + } +} diff --git a/database/factories/ComponentFactory.php b/database/factories/ComponentFactory.php new file mode 100644 index 0000000000..10db6df97d --- /dev/null +++ b/database/factories/ComponentFactory.php @@ -0,0 +1,115 @@ + 1, + 'order_number' => $this->faker->numberBetween(1000000, 50000000), + 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), + 'purchase_cost' => $this->faker->randomFloat(2, 1, 50), + 'qty' => $this->faker->numberBetween(5, 10), + 'min_amt' => $this->faker->numberBetween($min = 1, $max = 2), + ]; + } + + public function ramCrucial4() + { + return $this->state(function () { + return [ + 'name' => 'Crucial 4GB DDR3L-1600 SODIMM', + 'category_id' => 13, + 'qty' => 10, + 'min_amt' => 2, + 'location_id' => 3, + 'company_id' => 2, + ]; + }); + } + + public function ramCrucial8() + { + return $this->state(function () { + return [ + 'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac', + 'category_id' => 13, + 'qty' => 10, + 'min_amt' => 2, + ]; + }); + } + + public function ssdCrucial120() + { + return $this->state(function () { + return [ + 'name' => 'Crucial BX300 120GB SATA Internal SSD', + 'category_id' => 12, + 'qty' => 10, + 'min_amt' => 2, + ]; + }); + } + + public function ssdCrucial240() + { + return $this->state(function () { + return [ + 'name' => 'Crucial BX300 240GB SATA Internal SSD', + 'category_id' => 12, + 'qty' => 10, + 'min_amt' => 2, + ]; + }); + } + + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'name' => $this->faker->text(20), + 'category_id' => function () { + return \App\Models\Category::factory()->create()->id; + }, + 'location_id' => 1, + 'serial' => $this->faker->uuid, + 'qty' => $this->faker->numberBetween(3, 10), + 'order_number' => $this->faker->numberBetween(1000000, 50000000), + 'purchase_date' => $this->faker->dateTime(), + 'purchase_cost' => $this->faker->randomFloat(2), + 'min_amt' => $this->faker->numberBetween($min = 1, $max = 2), + 'company_id' => function () { + return \App\Models\Company::factory()->create()->id; + }, + ]; + } +} diff --git a/database/factories/ComponentsFactory.php b/database/factories/ComponentsFactory.php deleted file mode 100644 index 90c61d7bd6..0000000000 --- a/database/factories/ComponentsFactory.php +++ /dev/null @@ -1,59 +0,0 @@ -define(App\Models\Component::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'order_number' => $faker->numberBetween(1000000, 50000000), - 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), - 'purchase_cost' => $faker->randomFloat(2, 1, 50), - 'qty' => $faker->numberBetween(5, 10), - 'min_amt' => $faker->numberBetween($min = 1, $max = 2), - ]; -}); - -$factory->state(App\Models\Component::class, 'ram-crucial4', function ($faker) { - return [ - 'name' => 'Crucial 4GB DDR3L-1600 SODIMM', - 'category_id' => 13, - 'qty' => 10, - 'min_amt' => 2, - 'location_id' => 3, - 'company_id' => 2, - ]; -}); - -$factory->state(App\Models\Component::class, 'ram-crucial8', function ($faker) { - return [ - 'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac', - 'category_id' => 13, - 'qty' => 10, - 'min_amt' => 2, - ]; -}); - -$factory->state(App\Models\Component::class, 'ssd-crucial120', function ($faker) { - return [ - 'name' => 'Crucial BX300 120GB SATA Internal SSD', - 'category_id' => 12, - 'qty' => 10, - 'min_amt' => 2, - ]; -}); - -$factory->state(App\Models\Component::class, 'ssd-crucial240', function ($faker) { - return [ - 'name' => 'Crucial BX300 240GB SATA Internal SSD', - 'category_id' => 12, - 'qty' => 10, - 'min_amt' => 2, - ]; -}); diff --git a/database/factories/ConsumableFactory.php b/database/factories/ConsumableFactory.php index 3148a0d7a4..9e88fb364c 100644 --- a/database/factories/ConsumableFactory.php +++ b/database/factories/ConsumableFactory.php @@ -1,4 +1,7 @@ define(App\Models\Consumable::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'item_no' => $faker->numberBetween(1000000, 50000000), - 'order_number' => $faker->numberBetween(1000000, 50000000), - 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), - 'purchase_cost' => $faker->randomFloat(2, 1, 50), - 'qty' => $faker->numberBetween(5, 10), - 'min_amt' => $faker->numberBetween($min = 1, $max = 2), - ]; -}); +class ConsumableFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\Consumable::class; -$factory->state(App\Models\Consumable::class, 'cardstock', function ($faker) { - return [ - 'name' => 'Cardstock (White)', - 'category_id' => 10, - 'manufacturer_id' => 10, - 'qty' => 10, - 'min_amt' => 2, - 'company_id' => 3, - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + 'item_no' => $this->faker->numberBetween(1000000, 50000000), + 'order_number' => $this->faker->numberBetween(1000000, 50000000), + 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), + 'purchase_cost' => $this->faker->randomFloat(2, 1, 50), + 'qty' => $this->faker->numberBetween(5, 10), + 'min_amt' => $this->faker->numberBetween($min = 1, $max = 2), + ]; + } -$factory->state(App\Models\Consumable::class, 'paper', function ($faker) { - return [ - 'name' => 'Laserjet Paper (Ream)', - 'category_id' => 10, - 'manufacturer_id' => 10, - 'qty' => 20, - 'min_amt' => 2, - ]; -}); + public function cardstock() + { + return $this->state(function () { + return [ + 'name' => 'Cardstock (White)', + 'category_id' => 10, + 'manufacturer_id' => 10, + 'qty' => 10, + 'min_amt' => 2, + 'company_id' => 3, + ]; + }); + } -$factory->state(App\Models\Consumable::class, 'ink', function ($faker) { - return [ - 'name' => 'Laserjet Toner (black)', - 'category_id' => 11, - 'manufacturer_id' => 5, - 'qty' => 20, - 'min_amt' => 2, - ]; -}); + public function paper() + { + return $this->state(function () { + return [ + 'name' => 'Laserjet Paper (Ream)', + 'category_id' => 10, + 'manufacturer_id' => 10, + 'qty' => 20, + 'min_amt' => 2, + ]; + }); + } + + public function ink() + { + return $this->state(function () { + return [ + 'name' => 'Laserjet Toner (black)', + 'category_id' => 11, + 'manufacturer_id' => 5, + 'qty' => 20, + 'min_amt' => 2, + ]; + }); + } +} diff --git a/database/factories/CustomFieldFactory.php b/database/factories/CustomFieldFactory.php new file mode 100644 index 0000000000..cf8323e6ff --- /dev/null +++ b/database/factories/CustomFieldFactory.php @@ -0,0 +1,78 @@ + $this->faker->catchPhrase, + 'format' => '', + 'element' => 'text', + ]; + } + + public function imei() + { + return $this->state(function () { + return [ + 'name' => 'IMEI', + 'help_text' => 'The IMEI number for this device.', + 'format' => 'regex:/^[0-9]{15}$/', + ]; + }); + } + + public function phone() + { + return $this->state(function () { + return [ + 'name' => 'Phone Number', + 'help_text' => 'Enter the phone number for this device.', + ]; + }); + } + + public function ram() + { + return $this->state(function () { + return [ + 'name' => 'RAM', + 'help_text' => 'The amount of RAM this device has.', + ]; + }); + } + + public function cpu() + { + return $this->state(function () { + return [ + 'name' => 'CPU', + 'help_text' => 'The speed of the processor on this device.', + ]; + }); + } + + public function macAddress() + { + return $this->state(function () { + return [ + 'name' => 'MAC Address', + 'format' => 'regex:/^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/', + ]; + }); + } +} diff --git a/database/factories/CustomFieldsFactory.php b/database/factories/CustomFieldsFactory.php deleted file mode 100644 index fd623341e2..0000000000 --- a/database/factories/CustomFieldsFactory.php +++ /dev/null @@ -1,45 +0,0 @@ -define(App\Models\CustomField::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->catchPhrase, - 'format' => '', - 'element' => 'text', - ]; -}); - -$factory->state(App\Models\CustomField::class, 'imei', function ($faker) { - return [ - 'name' => 'IMEI', - 'help_text' => 'The IMEI number for this device.', - 'format' => 'regex:/^[0-9]{15}$/', - ]; -}); - -$factory->state(App\Models\CustomField::class, 'phone', function ($faker) { - return [ - 'name' => 'Phone Number', - 'help_text' => 'Enter the phone number for this device.', - ]; -}); - -$factory->state(App\Models\CustomField::class, 'ram', function ($faker) { - return [ - 'name' => 'RAM', - 'help_text' => 'The amount of RAM this device has.', - ]; -}); - -$factory->state(App\Models\CustomField::class, 'cpu', function ($faker) { - return [ - 'name' => 'CPU', - 'help_text' => 'The speed of the processor on this device.', - ]; -}); - -$factory->state(App\Models\CustomField::class, 'mac-address', function ($faker) { - return [ - 'name' => 'MAC Address', - 'format' => 'regex:/^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/', - ]; -}); diff --git a/database/factories/CustomFieldsetFactory.php b/database/factories/CustomFieldsetFactory.php index 7a31378ac7..0ea0197a3a 100644 --- a/database/factories/CustomFieldsetFactory.php +++ b/database/factories/CustomFieldsetFactory.php @@ -1,19 +1,43 @@ define(App\Models\CustomFieldset::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->catchPhrase, - ]; -}); +class CustomFieldsetFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\CustomFieldset::class; -$factory->state(App\Models\CustomFieldset::class, 'mobile', function ($faker) { - return [ - 'name' => 'Mobile Devices', - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'name' => $this->faker->catchPhrase, + ]; + } -$factory->state(App\Models\CustomFieldset::class, 'computer', function ($faker) { - return [ - 'name' => 'Laptops and Desktops', - ]; -}); + public function mobile() + { + return $this->state(function () { + return [ + 'name' => 'Mobile Devices', + ]; + }); + } + + public function computer() + { + return $this->state(function () { + return [ + 'name' => 'Laptops and Desktops', + ]; + }); + } +} diff --git a/database/factories/DepartmentFactory.php b/database/factories/DepartmentFactory.php new file mode 100644 index 0000000000..1c419291a5 --- /dev/null +++ b/database/factories/DepartmentFactory.php @@ -0,0 +1,99 @@ + 1, + 'location_id' => rand(1, 5), + ]; + } + + public function hr() + { + return $this->state(function () { + return [ + 'name' => 'Human Resources', + ]; + }); + } + + public function engineering() + { + return $this->state(function () { + return [ + 'name' => 'Engineering', + ]; + }); + } + + public function marketing() + { + return $this->state(function () { + return [ + 'name' => 'Marketing', + ]; + }); + } + + public function client() + { + return $this->state(function () { + return [ + 'name' => 'Client Services', + ]; + }); + } + + public function design() + { + return $this->state(function () { + return [ + 'name' => 'Graphic Design', + ]; + }); + } + + public function product() + { + return $this->state(function () { + return [ + 'name' => 'Product Management', + ]; + }); + } + + public function silly() + { + return $this->state(function () { + return [ + 'name' => 'Dept of Silly Walks', + ]; + }); + } +} diff --git a/database/factories/DepartmentsFactory.php b/database/factories/DepartmentsFactory.php deleted file mode 100644 index 6a394e191c..0000000000 --- a/database/factories/DepartmentsFactory.php +++ /dev/null @@ -1,59 +0,0 @@ -define(App\Models\Department::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'location_id' => rand(1, 5), - ]; -}); - -$factory->state(App\Models\Department::class, 'hr', function ($faker) { - return [ - 'name' => 'Human Resources', - ]; -}); - -$factory->state(App\Models\Department::class, 'engineering', function ($faker) { - return [ - 'name' => 'Engineering', - ]; -}); - -$factory->state(App\Models\Department::class, 'marketing', function ($faker) { - return [ - 'name' => 'Marketing', - ]; -}); - -$factory->state(App\Models\Department::class, 'client', function ($faker) { - return [ - 'name' => 'Client Services', - ]; -}); - -$factory->state(App\Models\Department::class, 'design', function ($faker) { - return [ - 'name' => 'Graphic Design', - ]; -}); - -$factory->state(App\Models\Department::class, 'product', function ($faker) { - return [ - 'name' => 'Product Management', - ]; -}); - -$factory->state(App\Models\Department::class, 'silly', function ($faker) { - return [ - 'name' => 'Dept of Silly Walks', - ]; -}); diff --git a/database/factories/DepreciationFactory.php b/database/factories/DepreciationFactory.php index da7dfd29a3..425b600b66 100644 --- a/database/factories/DepreciationFactory.php +++ b/database/factories/DepreciationFactory.php @@ -1,4 +1,7 @@ define(App\Models\Depreciation::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - ]; -}); +class DepreciationFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\Depreciation::class; -$factory->state(App\Models\Depreciation::class, 'computer', function ($faker) { - return [ - 'name' => 'Computer Depreciation', - 'months' => 36, - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + ]; + } -$factory->state(App\Models\Depreciation::class, 'display', function ($faker) { - return [ - 'name' => 'Display Depreciation', - 'months' => 12, - ]; -}); + public function computer() + { + return $this->state(function () { + return [ + 'name' => 'Computer Depreciation', + 'months' => 36, + ]; + }); + } -$factory->state(App\Models\Depreciation::class, 'mobile-phones', function ($faker) { - return [ - 'name' => 'Mobile Phone Depreciation', - 'months' => 24, - ]; -}); + public function display() + { + return $this->state(function () { + return [ + 'name' => 'Display Depreciation', + 'months' => 12, + ]; + }); + } + + public function mobilePhones() + { + return $this->state(function () { + return [ + 'name' => 'Mobile Phone Depreciation', + 'months' => 24, + ]; + }); + } +} diff --git a/database/factories/GroupFactory.php b/database/factories/GroupFactory.php new file mode 100644 index 0000000000..e0542ef098 --- /dev/null +++ b/database/factories/GroupFactory.php @@ -0,0 +1,45 @@ + $this->faker->name, + ]; + } +} diff --git a/database/factories/LicenseFactory.php b/database/factories/LicenseFactory.php index 70bfa42e4b..00f20f218b 100644 --- a/database/factories/LicenseFactory.php +++ b/database/factories/LicenseFactory.php @@ -1,4 +1,7 @@ define(App\Models\License::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'license_name' => $faker->name, - 'license_email' => $faker->safeEmail, - 'serial' => $faker->uuid, - 'notes' => 'Created by DB seeder', - 'purchase_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), - 'order_number' => $faker->numberBetween(1000000, 50000000), - 'expiration_date' => $faker->dateTimeBetween('now', '+3 years', date_default_timezone_get())->format('Y-m-d H:i:s'), - 'reassignable' => $faker->boolean(), - 'termination_date' => $faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d H:i:s'), - 'supplier_id' => $faker->numberBetween(1, 5), - ]; -}); // 1 -$factory->state(App\Models\License::class, 'photoshop', function ($faker) { - $data = [ - 'name' => 'Photoshop', - 'manufacturer_id' => 9, - 'purchase_cost' => '299.99', - 'seats' => 10, - 'purchase_order' => '13503Q', - 'maintained' => true, - 'category_id' => 14, - ]; - - return $data; -}); // 2 -$factory->state(App\Models\License::class, 'acrobat', function ($faker) { - $data = [ - 'name' => 'Acrobat', - 'manufacturer_id' => 9, - 'purchase_cost' => '29.99', - 'seats' => 10, - 'category_id' => 14, - ]; - - return $data; -}); // 3 -$factory->state(App\Models\License::class, 'indesign', function ($faker) { - $data = [ - 'name' => 'InDesign', - 'manufacturer_id' => 9, - 'purchase_cost' => '199.99', - 'seats' => 10, - 'category_id' => 14, - ]; - - return $data; -}); // 4 -$factory->state(App\Models\License::class, 'office', function ($faker) { - $data = [ - 'name' => 'Office', - 'manufacturer_id' => 2, - 'purchase_cost' => '49.99', - 'seats' => 20, - 'category_id' => 15, - ]; - return $data; -}); +class LicenseFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\License::class; + + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + 'license_name' => $this->faker->name, + 'license_email' => $this->faker->safeEmail, + 'serial' => $this->faker->uuid, + 'notes' => 'Created by DB seeder', + 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), + 'order_number' => $this->faker->numberBetween(1000000, 50000000), + 'expiration_date' => $this->faker->dateTimeBetween('now', '+3 years', date_default_timezone_get())->format('Y-m-d H:i:s'), + 'reassignable' => $this->faker->boolean(), + 'termination_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d H:i:s'), + 'supplier_id' => $this->faker->numberBetween(1, 5), + ]; + } + + public function photoshop() + { + return $this->state(function () { + $data = [ + 'name' => 'Photoshop', + 'manufacturer_id' => 9, + 'purchase_cost' => '299.99', + 'seats' => 10, + 'purchase_order' => '13503Q', + 'maintained' => true, + 'category_id' => 14, + ]; + + return $data; + }); + } + + public function acrobat() + { + return $this->state(function () { + $data = [ + 'name' => 'Acrobat', + 'manufacturer_id' => 9, + 'purchase_cost' => '29.99', + 'seats' => 10, + 'category_id' => 14, + ]; + + return $data; + }); + } + + public function indesign() + { + return $this->state(function () { + $data = [ + 'name' => 'InDesign', + 'manufacturer_id' => 9, + 'purchase_cost' => '199.99', + 'seats' => 10, + 'category_id' => 14, + ]; + + return $data; + }); + } + + public function office() + { + return $this->state(function () { + $data = [ + 'name' => 'Office', + 'manufacturer_id' => 2, + 'purchase_cost' => '49.99', + 'seats' => 20, + 'category_id' => 15, + ]; + + return $data; + }); + } +} diff --git a/database/factories/LocationFactory.php b/database/factories/LocationFactory.php new file mode 100644 index 0000000000..9a8e2e5094 --- /dev/null +++ b/database/factories/LocationFactory.php @@ -0,0 +1,53 @@ + $this->faker->city, + 'address' => $this->faker->streetAddress, + 'address2' => $this->faker->secondaryAddress, + 'city' => $this->faker->city, + 'state' => $this->faker->stateAbbr, + 'country' => $this->faker->countryCode, + 'currency' => $this->faker->currencyCode, + 'zip' => $this->faker->postcode, + 'image' => rand(1, 9).'.jpg', + ]; + } +} diff --git a/database/factories/ManufacturerFactory.php b/database/factories/ManufacturerFactory.php index a4ba86c19f..002d7f8088 100644 --- a/database/factories/ManufacturerFactory.php +++ b/database/factories/ManufacturerFactory.php @@ -1,4 +1,7 @@ define(App\Models\Manufacturer::class, function (Faker\Generator $faker) { - return [ - 'user_id' => 1, - 'support_phone' => $faker->phoneNumber(), - 'url' => $faker->url(), - 'support_email' => $faker->safeEmail(), - ]; -}); // 1 -$factory->state(App\Models\Manufacturer::class, 'apple', function ($faker) { - return [ - 'name' => 'Apple', - 'url' => 'https://apple.com', - 'support_url' => 'https://support.apple.com', - 'image' => 'apple.jpg', - ]; -}); // 2 -$factory->state(App\Models\Manufacturer::class, 'microsoft', function ($faker) { - return [ - 'name' => 'Microsoft', - 'url' => 'https://microsoft.com', - 'support_url' => 'https://support.microsoft.com', - 'image' => 'microsoft.png', - ]; -}); // 3 -$factory->state(App\Models\Manufacturer::class, 'dell', function ($faker) { - return [ - 'name' => 'Dell', - 'url' => 'https://dell.com', - 'support_url' => 'https://support.dell.com', - 'image' => 'dell.png', - ]; -}); // 4 -$factory->state(App\Models\Manufacturer::class, 'asus', function ($faker) { - return [ - 'name' => 'Asus', - 'url' => 'https://asus.com', - 'support_url' => 'https://support.asus.com', - 'image' => 'asus.png', - ]; -}); // 5 -$factory->state(App\Models\Manufacturer::class, 'hp', function ($faker) { - return [ - 'name' => 'HP', - 'url' => 'https://hp.com', - 'support_url' => 'https://support.hp.com', - 'image' => 'hp.png', - ]; -}); // 6 -$factory->state(App\Models\Manufacturer::class, 'lenovo', function ($faker) { - return [ - 'name' => 'Lenovo', - 'url' => 'https://lenovo.com', - 'support_url' => 'https://support.lenovo.com', - 'image' => 'lenovo.jpg', - ]; -}); // 7 -$factory->state(App\Models\Manufacturer::class, 'lg', function ($faker) { - return [ - 'name' => 'LG', - 'url' => 'https://lg.com', - 'support_url' => 'https://support.lg.com', - 'image' => 'lg.jpg', - ]; -}); // 8 -$factory->state(App\Models\Manufacturer::class, 'polycom', function ($faker) { - return [ - 'name' => 'Polycom', - 'url' => 'https://polycom.com', - 'support_url' => 'https://support.polycom.com', - 'image' => 'polycom.png', - ]; -}); // 9 -$factory->state(App\Models\Manufacturer::class, 'adobe', function ($faker) { - return [ - 'name' => 'Adobe', - 'url' => 'https://adobe.com', - 'support_url' => 'https://support.adobe.com', - 'image' => 'adobe.jpg', - ]; -}); // 10 -$factory->state(App\Models\Manufacturer::class, 'avery', function ($faker) { - return [ - 'name' => 'Avery', - 'url' => 'https://avery.com', - 'support_url' => 'https://support.avery.com', - 'image' => 'avery.png', - ]; -}); // 11 -$factory->state(App\Models\Manufacturer::class, 'crucial', function ($faker) { - return [ - 'name' => 'Crucial', - 'url' => 'https://crucial.com', - 'support_url' => 'https://support.crucial.com', - 'image' => 'crucial.jpg', - ]; -}); + +class ManufacturerFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\Manufacturer::class; + + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'user_id' => 1, + 'support_phone' => $this->faker->phoneNumber(), + 'url' => $this->faker->url(), + 'support_email' => $this->faker->safeEmail(), + ]; + } + + public function apple() + { + return $this->state(function () { + return [ + 'name' => 'Apple', + 'url' => 'https://apple.com', + 'support_url' => 'https://support.apple.com', + 'image' => 'apple.jpg', + ]; + }); + } + + public function microsoft() + { + return $this->state(function () { + return [ + 'name' => 'Microsoft', + 'url' => 'https://microsoft.com', + 'support_url' => 'https://support.microsoft.com', + 'image' => 'microsoft.png', + ]; + }); + } + + public function dell() + { + return $this->state(function () { + return [ + 'name' => 'Dell', + 'url' => 'https://dell.com', + 'support_url' => 'https://support.dell.com', + 'image' => 'dell.png', + ]; + }); + } + + public function asus() + { + return $this->state(function () { + return [ + 'name' => 'Asus', + 'url' => 'https://asus.com', + 'support_url' => 'https://support.asus.com', + 'image' => 'asus.png', + ]; + }); + } + + public function hp() + { + return $this->state(function () { + return [ + 'name' => 'HP', + 'url' => 'https://hp.com', + 'support_url' => 'https://support.hp.com', + 'image' => 'hp.png', + ]; + }); + } + + public function lenovo() + { + return $this->state(function () { + return [ + 'name' => 'Lenovo', + 'url' => 'https://lenovo.com', + 'support_url' => 'https://support.lenovo.com', + 'image' => 'lenovo.jpg', + ]; + }); + } + + public function lg() + { + return $this->state(function () { + return [ + 'name' => 'LG', + 'url' => 'https://lg.com', + 'support_url' => 'https://support.lg.com', + 'image' => 'lg.jpg', + ]; + }); + } + + public function polycom() + { + return $this->state(function () { + return [ + 'name' => 'Polycom', + 'url' => 'https://polycom.com', + 'support_url' => 'https://support.polycom.com', + 'image' => 'polycom.png', + ]; + }); + } + + public function adobe() + { + return $this->state(function () { + return [ + 'name' => 'Adobe', + 'url' => 'https://adobe.com', + 'support_url' => 'https://support.adobe.com', + 'image' => 'adobe.jpg', + ]; + }); + } + + public function avery() + { + return $this->state(function () { + return [ + 'name' => 'Avery', + 'url' => 'https://avery.com', + 'support_url' => 'https://support.avery.com', + 'image' => 'avery.png', + ]; + }); + } + + public function crucial() + { + return $this->state(function () { + return [ + 'name' => 'Crucial', + 'url' => 'https://crucial.com', + 'support_url' => 'https://support.crucial.com', + 'image' => 'crucial.jpg', + ]; + }); + } +} diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php deleted file mode 100644 index 9dd9a14a8a..0000000000 --- a/database/factories/ModelFactory.php +++ /dev/null @@ -1,99 +0,0 @@ -define(App\Models\Company::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->company, - ]; -}); - -$factory->define(App\Models\Component::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->text(20), - 'category_id' => function () { - return factory(App\Models\Category::class)->create()->id; - }, - 'location_id' => 1, - 'serial' => $faker->uuid, - 'qty' => $faker->numberBetween(3, 10), - 'order_number' => $faker->numberBetween(1000000, 50000000), - 'purchase_date' => $faker->dateTime(), - 'purchase_cost' => $faker->randomFloat(2), - 'min_amt' => $faker->numberBetween($min = 1, $max = 2), - 'company_id' => function () { - return factory(App\Models\Company::class)->create()->id; - }, - ]; -}); - -$factory->define(App\Models\Group::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->name, - ]; -}); - -$factory->define(App\Models\Location::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->city, - 'address' => $faker->streetAddress, - 'address2' => $faker->secondaryAddress, - 'city' => $faker->city, - 'state' => $faker->stateAbbr, - 'country' => $faker->countryCode, - 'currency' => $faker->currencyCode, - 'zip' => $faker->postcode, - 'image' => rand(1, 9).'.jpg', - ]; -}); - -$factory->define(App\Models\Supplier::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->company, - 'address' => $faker->streetAddress, - 'address2' => $faker->secondaryAddress, - 'city' => $faker->city, - 'state' => $faker->stateAbbr, - 'zip' => $faker->postCode, - 'country' => $faker->countryCode, - 'contact' => $faker->name, - 'phone' => $faker->phoneNumber, - 'fax' => $faker->phoneNumber, - 'email' => $faker->safeEmail, - 'url' => $faker->url, - 'notes' => $faker->text(191), // Supplier notes can be a max of 255 characters. - ]; -}); - -$factory->define(App\Models\Setting::class, function ($faker) { - return [ - 'user_id' => 1, - 'per_page' => 20, - 'site_name' => $faker->sentence, - 'auto_increment_assets' => false, - 'alert_email' => $faker->safeEmail(), - 'alerts_enabled' => true, - 'brand' => 1, - 'default_currency' => $faker->currencyCode, - 'locale' => $faker->locale, - 'pwd_secure_min' => 10, // Match web setup - 'email_domain' => 'test.com', - ]; -}); diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php new file mode 100644 index 0000000000..530c35b060 --- /dev/null +++ b/database/factories/SettingFactory.php @@ -0,0 +1,55 @@ + 1, + 'per_page' => 20, + 'site_name' => $this->faker->sentence, + 'auto_increment_assets' => false, + 'alert_email' => $this->faker->safeEmail(), + 'alerts_enabled' => true, + 'brand' => 1, + 'default_currency' => $this->faker->currencyCode, + 'locale' => $this->faker->locale, + 'pwd_secure_min' => 10, // Match web setup + 'email_domain' => 'test.com', + ]; + } +} diff --git a/database/factories/StatusLabelFactory.php b/database/factories/StatusLabelFactory.php deleted file mode 100644 index 1c850564d8..0000000000 --- a/database/factories/StatusLabelFactory.php +++ /dev/null @@ -1,67 +0,0 @@ -define(Statuslabel::class, function (Faker\Generator $faker) { - return [ - 'name' => $faker->sentence, - 'created_at' => $faker->dateTime(), - 'updated_at' => $faker->dateTime(), - 'user_id' => 1, - 'deleted_at' => null, - 'deployable' => 0, - 'pending' => 0, - 'archived' => 0, - 'notes' => '', - ]; -}); -$factory->state(Statuslabel::class, 'rtd', function (Faker\Generator $faker) { - return [ - 'notes' => $faker->sentence, - 'deployable' => 1, - 'default_label' => 1, - ]; -}); -$factory->state(Statuslabel::class, 'pending', function (Faker\Generator $faker) { - return [ - 'notes' => $faker->sentence, - 'pending' => 1, - 'default_label' => 1, - ]; -}); - -$factory->state(Statuslabel::class, 'archived', function (Faker\Generator $faker) { - return [ - 'notes' => 'These assets are permanently undeployable', - 'archived' => 1, - 'default_label' => 0, - ]; -}); - -$factory->state(Statuslabel::class, 'out_for_diagnostics', function (Faker\Generator $faker) { - return [ - 'name' => 'Out for Diagnostics', - 'default_label' => 0, - ]; -}); - -$factory->state(Statuslabel::class, 'out_for_repair', function (Faker\Generator $faker) { - return [ - 'name' => 'Out for Repair', - 'default_label' => 0, - ]; -}); - -$factory->state(Statuslabel::class, 'broken', function (Faker\Generator $faker) { - return [ - 'name' => 'Broken - Not Fixable', - 'default_label' => 0, - ]; -}); - -$factory->state(Statuslabel::class, 'lost', function (Faker\Generator $faker) { - return [ - 'name' => 'Lost/Stolen', - 'default_label' => 0, - ]; -}); diff --git a/database/factories/StatuslabelFactory.php b/database/factories/StatuslabelFactory.php new file mode 100644 index 0000000000..1bb67684ce --- /dev/null +++ b/database/factories/StatuslabelFactory.php @@ -0,0 +1,109 @@ + $this->faker->sentence, + 'created_at' => $this->faker->dateTime(), + 'updated_at' => $this->faker->dateTime(), + 'user_id' => 1, + 'deleted_at' => null, + 'deployable' => 0, + 'pending' => 0, + 'archived' => 0, + 'notes' => '', + ]; + } + + public function rtd() + { + return $this->state(function () { + return [ + 'notes' => $this->faker->sentence, + 'deployable' => 1, + 'default_label' => 1, + ]; + }); + } + + public function pending() + { + return $this->state(function () { + return [ + 'notes' => $this->faker->sentence, + 'pending' => 1, + 'default_label' => 1, + ]; + }); + } + + public function archived() + { + return $this->state(function () { + return [ + 'notes' => 'These assets are permanently undeployable', + 'archived' => 1, + 'default_label' => 0, + ]; + }); + } + + public function outForDiagnostics() + { + return $this->state(function () { + return [ + 'name' => 'Out for Diagnostics', + 'default_label' => 0, + ]; + }); + } + + public function outForRepair() + { + return $this->state(function () { + return [ + 'name' => 'Out for Repair', + 'default_label' => 0, + ]; + }); + } + + public function broken() + { + return $this->state(function () { + return [ + 'name' => 'Broken - Not Fixable', + 'default_label' => 0, + ]; + }); + } + + public function lost() + { + return $this->state(function () { + return [ + 'name' => 'Lost/Stolen', + 'default_label' => 0, + ]; + }); + } +} diff --git a/database/factories/SupplierFactory.php b/database/factories/SupplierFactory.php new file mode 100644 index 0000000000..dd4a58616b --- /dev/null +++ b/database/factories/SupplierFactory.php @@ -0,0 +1,57 @@ + $this->faker->company, + 'address' => $this->faker->streetAddress, + 'address2' => $this->faker->secondaryAddress, + 'city' => $this->faker->city, + 'state' => $this->faker->stateAbbr, + 'zip' => $this->faker->postCode, + 'country' => $this->faker->countryCode, + 'contact' => $this->faker->name, + 'phone' => $this->faker->phoneNumber, + 'fax' => $this->faker->phoneNumber, + 'email' => $this->faker->safeEmail, + 'url' => $this->faker->url, + 'notes' => $this->faker->text(191), // Supplier notes can be a max of 255 characters. + ]; + } +} diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index cf5a0688d0..3efbaa8f33 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,278 +1,451 @@ define(App\Models\User::class, function (Faker\Generator $faker) use ($password) { - return [ - 'activated' => 1, - 'address' => $faker->address, - 'city' => $faker->city, - 'company_id' => rand(1, 4), - 'country' => $faker->country, - 'department_id' => rand(1, 6), - 'email' => $faker->safeEmail, - 'employee_num' => $faker->numberBetween(3500, 35050), - 'first_name' => $faker->firstName, - 'jobtitle' => $faker->jobTitle, - 'last_name' => $faker->lastName, - 'locale' => $faker->locale, - 'location_id' => rand(1, 5), - 'notes' => 'Created by DB seeder', - 'password' => $password, - 'permissions' => '{"user":"0"}', - 'phone' => $faker->phoneNumber, - 'state' => $faker->stateAbbr, - 'username' => $faker->username, - 'zip' => $faker->postcode, - ]; -}); -$factory->state(App\Models\User::class, 'first-admin', function ($faker) { - return [ - 'first_name' => 'Admin', - 'last_name' => 'User', - 'username' => 'admin', - 'permissions' => '{"superuser":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'snipe-admin', function ($faker) { - return [ - 'first_name' => 'Snipe E.', - 'last_name' => 'Head', - 'username' => 'snipe', - 'email' => 'snipe@snipe.net', - 'permissions' => '{"superuser":"1"}', - ]; -}); // USER GLOBAL PERMISSION STATES -$factory->state(App\Models\User::class, 'superuser', function ($faker) { - return [ - 'permissions' => '{"superuser":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'admin', function ($faker) { - return [ - 'permissions' => '{"admin":"1"}', - 'manager_id' => rand(1, 2), - ]; -}); // USER ASSET PERMISSION STATES -$factory->state(App\Models\User::class, 'view-assets', function ($faker) { - return [ - 'permissions' => '{"assets.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-assets', function ($faker) { - return [ - 'permissions' => '{"assets.create":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'edit-assets', function ($faker) { - return [ - 'permissions' => '{"assets.edit":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'delete-assets', function ($faker) { - return [ - 'permissions' => '{"assets.delete":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkin-assets', function ($faker) { - return [ - 'permissions' => '{"assets.checkin":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkout-assets', function ($faker) { - return [ - 'permissions' => '{"assets.checkout":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'view-requestable-assets', function ($faker) { - return [ - 'permissions' => '{"assets.view.requestable":"1"}', - ]; -}); // USER ACCESSORY PERMISSION STATES -$factory->state(App\Models\User::class, 'view-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.create":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'edit-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.edit":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'delete-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.delete":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkin-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.checkin":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkout-accessories', function ($faker) { - return [ - 'permissions' => '{"accessories.checkout":"1"}', - ]; -}); // USER CONSUMABLE PERMISSION STATES -$factory->state(App\Models\User::class, 'view-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.create":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'edit-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.edit":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'delete-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.delete":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkin-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.checkin":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkout-consumables', function ($faker) { - return [ - 'permissions' => '{"consumables.checkout":"1"}', - ]; -}); // USER LICENSE PERMISSION STATES -$factory->state(App\Models\User::class, 'view-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.create":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'edit-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.edit":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'delete-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.delete":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkout-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.checkout":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'view-keys-licenses', function ($faker) { - return [ - 'permissions' => '{"licenses.keys":"1"}', - ]; -}); // USER COMPONENTS PERMISSION STATES -$factory->state(App\Models\User::class, 'view-components', function ($faker) { - return [ - 'permissions' => '{"components.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-components', function ($faker) { - return [ - 'permissions' => '{"components.create":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'edit-components', function ($faker) { - return [ - 'permissions' => '{"components.edit":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'delete-components', function ($faker) { - return [ - 'permissions' => '{"components.delete":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkin-components', function ($faker) { - return [ - 'permissions' => '{"components.checkin":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'checkout-components', function ($faker) { - return [ - 'permissions' => '{"components.checkout":"1"}', - ]; -}); // USER USER PERMISSION STATES -$factory->state(App\Models\User::class, 'view-users', function ($faker) { - return [ - 'permissions' => '{"users.view":"1"}', - ]; -}); -$factory->state(App\Models\User::class, 'create-users', function ($faker) { - return [ - 'permissions' => '{"users.create":"1"}', - ]; -}); +class UserFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = \App\Models\User::class; -$factory->state(App\Models\User::class, 'edit-users', function ($faker) { - return [ - 'permissions' => '{"users.edit":"1"}', - ]; -}); + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'activated' => 1, + 'address' => $this->faker->address, + 'city' => $this->faker->city, + 'company_id' => rand(1, 4), + 'country' => $this->faker->country, + 'department_id' => rand(1, 6), + 'email' => $this->faker->safeEmail, + 'employee_num' => $this->faker->numberBetween(3500, 35050), + 'first_name' => $this->faker->firstName, + 'jobtitle' => $this->faker->jobTitle, + 'last_name' => $this->faker->lastName, + 'locale' => $this->faker->locale, + 'location_id' => rand(1, 5), + 'notes' => 'Created by DB seeder', + 'password' => $password, + 'permissions' => '{"user":"0"}', + 'phone' => $this->faker->phoneNumber, + 'state' => $this->faker->stateAbbr, + 'username' => $this->faker->username, + 'zip' => $this->faker->postcode, + ]; + } -$factory->state(App\Models\User::class, 'delete-users', function ($faker) { - return [ - 'permissions' => '{"users.delete":"1"}', - ]; -}); + public function firstAdmin() + { + return $this->state(function () { + return [ + 'first_name' => 'Admin', + 'last_name' => 'User', + 'username' => 'admin', + 'permissions' => '{"superuser":"1"}', + ]; + }); + } + + public function snipeAdmin() + { + return $this->state(function () { + return [ + 'first_name' => 'Snipe E.', + 'last_name' => 'Head', + 'username' => 'snipe', + 'email' => 'snipe@snipe.net', + 'permissions' => '{"superuser":"1"}', + ]; + }); + } + + public function superuser() + { + return $this->state(function () { + return [ + 'permissions' => '{"superuser":"1"}', + ]; + }); + } + + public function admin() + { + return $this->state(function () { + return [ + 'permissions' => '{"admin":"1"}', + 'manager_id' => rand(1, 2), + ]; + }); + } + + public function viewAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.view":"1"}', + ]; + }); + } + + public function createAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.create":"1"}', + ]; + }); + } + + public function editAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.edit":"1"}', + ]; + }); + } + + public function deleteAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.delete":"1"}', + ]; + }); + } + + public function checkinAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.checkin":"1"}', + ]; + }); + } + + public function checkoutAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.checkout":"1"}', + ]; + }); + } + + public function viewRequestableAssets() + { + return $this->state(function () { + return [ + 'permissions' => '{"assets.view.requestable":"1"}', + ]; + }); + } + + public function viewAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.view":"1"}', + ]; + }); + } + + public function createAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.create":"1"}', + ]; + }); + } + + public function editAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.edit":"1"}', + ]; + }); + } + + public function deleteAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.delete":"1"}', + ]; + }); + } + + public function checkinAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.checkin":"1"}', + ]; + }); + } + + public function checkoutAccessories() + { + return $this->state(function () { + return [ + 'permissions' => '{"accessories.checkout":"1"}', + ]; + }); + } + + public function viewConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.view":"1"}', + ]; + }); + } + + public function createConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.create":"1"}', + ]; + }); + } + + public function editConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.edit":"1"}', + ]; + }); + } + + public function deleteConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.delete":"1"}', + ]; + }); + } + + public function checkinConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.checkin":"1"}', + ]; + }); + } + + public function checkoutConsumables() + { + return $this->state(function () { + return [ + 'permissions' => '{"consumables.checkout":"1"}', + ]; + }); + } + + public function viewLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.view":"1"}', + ]; + }); + } + + public function createLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.create":"1"}', + ]; + }); + } + + public function editLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.edit":"1"}', + ]; + }); + } + + public function deleteLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.delete":"1"}', + ]; + }); + } + + public function checkoutLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.checkout":"1"}', + ]; + }); + } + + public function viewKeysLicenses() + { + return $this->state(function () { + return [ + 'permissions' => '{"licenses.keys":"1"}', + ]; + }); + } + + public function viewComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.view":"1"}', + ]; + }); + } + + public function createComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.create":"1"}', + ]; + }); + } + + public function editComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.edit":"1"}', + ]; + }); + } + + public function deleteComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.delete":"1"}', + ]; + }); + } + + public function checkinComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.checkin":"1"}', + ]; + }); + } + + public function checkoutComponents() + { + return $this->state(function () { + return [ + 'permissions' => '{"components.checkout":"1"}', + ]; + }); + } + + public function viewUsers() + { + return $this->state(function () { + return [ + 'permissions' => '{"users.view":"1"}', + ]; + }); + } + + public function createUsers() + { + return $this->state(function () { + return [ + 'permissions' => '{"users.create":"1"}', + ]; + }); + } + + public function editUsers() + { + return $this->state(function () { + return [ + 'permissions' => '{"users.edit":"1"}', + ]; + }); + } + + public function deleteUsers() + { + return $this->state(function () { + return [ + 'permissions' => '{"users.delete":"1"}', + ]; + }); + } +} diff --git a/database/seeds/AccessorySeeder.php b/database/seeds/AccessorySeeder.php index 7f35ba8e0e..dc9a1704dd 100644 --- a/database/seeds/AccessorySeeder.php +++ b/database/seeds/AccessorySeeder.php @@ -9,10 +9,10 @@ class AccessorySeeder extends Seeder { Accessory::truncate(); DB::table('accessories_users')->truncate(); - factory(Accessory::class, 1)->states('apple-usb-keyboard')->create(); - factory(Accessory::class, 1)->states('apple-bt-keyboard')->create(); - factory(Accessory::class, 1)->states('apple-mouse')->create(); - factory(Accessory::class, 1)->states('microsoft-mouse')->create(); + Accessory::factory()->count(1)->appleUsbKeyboard()->create(); + Accessory::factory()->count(1)->appleBtKeyboard()->create(); + Accessory::factory()->count(1)->appleMouse()->create(); + Accessory::factory()->count(1)->microsoftMouse()->create(); $src = public_path('/img/demo/accessories/'); $dst = 'accessories'.'/'; diff --git a/database/seeds/ActionlogSeeder.php b/database/seeds/ActionlogSeeder.php index 71d0bb08b8..9efb6c889e 100644 --- a/database/seeds/ActionlogSeeder.php +++ b/database/seeds/ActionlogSeeder.php @@ -8,7 +8,7 @@ class ActionlogSeeder extends Seeder public function run() { Actionlog::truncate(); - factory(Actionlog::class, 'asset-checkout-user', 300)->create(); - factory(Actionlog::class, 'asset-checkout-location', 100)->create(); + Actionlog::factory()->count('asset-checkout-user', 300)->create(); + Actionlog::factory()->count('asset-checkout-location', 100)->create(); } } diff --git a/database/seeds/AssetModelSeeder.php b/database/seeds/AssetModelSeeder.php index b179c5788e..5e143f2553 100755 --- a/database/seeds/AssetModelSeeder.php +++ b/database/seeds/AssetModelSeeder.php @@ -11,34 +11,34 @@ class AssetModelSeeder extends Seeder AssetModel::truncate(); // Laptops - factory(AssetModel::class, 1)->states('mbp-13-model')->create(); // 1 - factory(AssetModel::class, 1)->states('mbp-air-model')->create(); // 2 - factory(AssetModel::class, 1)->states('surface-model')->create(); // 3 - factory(AssetModel::class, 1)->states('xps13-model')->create(); // 4 - factory(AssetModel::class, 1)->states('spectre-model')->create(); // 5 - factory(AssetModel::class, 1)->states('zenbook-model')->create(); // 6 - factory(AssetModel::class, 1)->states('yoga-model')->create(); // 7 + AssetModel::factory()->count(1)->mbp13Model()->create(); // 1 + AssetModel::factory()->count(1)->mbpAirModel()->create(); // 2 + AssetModel::factory()->count(1)->surfaceModel()->create(); // 3 + AssetModel::factory()->count(1)->xps13Model()->create(); // 4 + AssetModel::factory()->count(1)->spectreModel()->create(); // 5 + AssetModel::factory()->count(1)->zenbookModel()->create(); // 6 + AssetModel::factory()->count(1)->yogaModel()->create(); // 7 // Desktops - factory(AssetModel::class, 1)->states('macpro-model')->create(); // 8 - factory(AssetModel::class, 1)->states('lenovo-i5-model')->create(); // 9 - factory(AssetModel::class, 1)->states('optiplex-model')->create(); // 10 + AssetModel::factory()->count(1)->macproModel()->create(); // 8 + AssetModel::factory()->count(1)->lenovoI5Model()->create(); // 9 + AssetModel::factory()->count(1)->optiplexModel()->create(); // 10 // Conference Phones - factory(AssetModel::class, 1)->states('polycom-model')->create(); // 11 - factory(AssetModel::class, 1)->states('polycomcx-model')->create(); // 12 + AssetModel::factory()->count(1)->polycomModel()->create(); // 11 + AssetModel::factory()->count(1)->polycomcxModel()->create(); // 12 // Tablets - factory(AssetModel::class, 1)->states('ipad-model')->create(); // 13 - factory(AssetModel::class, 1)->states('tab3-model')->create(); // 14 + AssetModel::factory()->count(1)->ipadModel()->create(); // 13 + AssetModel::factory()->count(1)->tab3Model()->create(); // 14 // Phones - factory(AssetModel::class, 1)->states('iphone6s-model')->create(); // 15 - factory(AssetModel::class, 1)->states('iphone7-model')->create(); // 16 + AssetModel::factory()->count(1)->iphone6sModel()->create(); // 15 + AssetModel::factory()->count(1)->iphone7Model()->create(); // 16 // Displays - factory(AssetModel::class, 1)->states('ultrafine')->create(); // 17 - factory(AssetModel::class, 1)->states('ultrasharp')->create(); // 18 + AssetModel::factory()->count(1)->ultrafine()->create(); // 17 + AssetModel::factory()->count(1)->ultrasharp()->create(); // 18 $src = public_path('/img/demo/models/'); $dst = 'models'.'/'; diff --git a/database/seeds/AssetSeeder.php b/database/seeds/AssetSeeder.php index 1d7db0f1a3..e5f4524472 100644 --- a/database/seeds/AssetSeeder.php +++ b/database/seeds/AssetSeeder.php @@ -9,31 +9,31 @@ class AssetSeeder extends Seeder public function run() { Asset::truncate(); - factory(Asset::class, 1000)->states('laptop-mbp')->create(); - factory(Asset::class, 50)->states('laptop-mbp-pending')->create(); - factory(Asset::class, 50)->states('laptop-mbp-archived')->create(); - factory(Asset::class, 50)->states('laptop-air')->create(); - factory(Asset::class, 5)->states('laptop-surface')->create(); - factory(Asset::class, 5)->states('laptop-xps')->create(); - factory(Asset::class, 5)->states('laptop-spectre')->create(); - factory(Asset::class, 5)->states('laptop-zenbook')->create(); - factory(Asset::class, 3)->states('laptop-yoga')->create(); + Asset::factory()->count(1000)->laptopMbp()->create(); + Asset::factory()->count(50)->laptopMbpPending()->create(); + Asset::factory()->count(50)->laptopMbpArchived()->create(); + Asset::factory()->count(50)->laptopAir()->create(); + Asset::factory()->count(5)->laptopSurface()->create(); + Asset::factory()->count(5)->laptopXps()->create(); + Asset::factory()->count(5)->laptopSpectre()->create(); + Asset::factory()->count(5)->laptopZenbook()->create(); + Asset::factory()->count(3)->laptopYoga()->create(); - factory(Asset::class, 30)->states('desktop-macpro')->create(); - factory(Asset::class, 30)->states('desktop-lenovo-i5')->create(); - factory(Asset::class, 30)->states('desktop-optiplex')->create(); + Asset::factory()->count(30)->desktopMacpro()->create(); + Asset::factory()->count(30)->desktopLenovoI5()->create(); + Asset::factory()->count(30)->desktopOptiplex()->create(); - factory(Asset::class, 5)->states('conf-polycom')->create(); - factory(Asset::class, 2)->states('conf-polycomcx')->create(); + Asset::factory()->count(5)->confPolycom()->create(); + Asset::factory()->count(2)->confPolycomcx()->create(); - factory(Asset::class, 12)->states('tablet-ipad')->create(); - factory(Asset::class, 4)->states('tablet-tab3')->create(); + Asset::factory()->count(12)->tabletIpad()->create(); + Asset::factory()->count(4)->tabletTab3()->create(); - factory(Asset::class, 27)->states('phone-iphone6s')->create(); - factory(Asset::class, 40)->states('phone-iphone7')->create(); + Asset::factory()->count(27)->phoneIphone6s()->create(); + Asset::factory()->count(40)->phoneIphone7()->create(); - factory(Asset::class, 10)->states('ultrafine')->create(); - factory(Asset::class, 10)->states('ultrasharp')->create(); + Asset::factory()->count(10)->ultrafine()->create(); + Asset::factory()->count(10)->ultrasharp()->create(); $del_files = Storage::files('assets'); foreach ($del_files as $del_file) { // iterate files diff --git a/database/seeds/CategorySeeder.php b/database/seeds/CategorySeeder.php index 37e11a2be8..92f72371cf 100755 --- a/database/seeds/CategorySeeder.php +++ b/database/seeds/CategorySeeder.php @@ -9,20 +9,20 @@ class CategorySeeder extends Seeder { Category::truncate(); - factory(Category::class, 1)->states('asset-laptop-category')->create(); // 1 - factory(Category::class, 1)->states('asset-desktop-category')->create(); // 2 - factory(Category::class, 1)->states('asset-tablet-category')->create(); // 3 - factory(Category::class, 1)->states('asset-mobile-category')->create(); // 4 - factory(Category::class, 1)->states('asset-display-category')->create(); // 5 - factory(Category::class, 1)->states('asset-voip-category')->create(); // 6 - factory(Category::class, 1)->states('asset-conference-category')->create(); // 7 - factory(Category::class, 1)->states('accessory-keyboard-category')->create(); // 8 - factory(Category::class, 1)->states('accessory-mouse-category')->create(); // 9 - factory(Category::class, 1)->states('consumable-paper-category')->create(); // 10 - factory(Category::class, 1)->states('consumable-ink-category')->create(); // 11 - factory(Category::class, 1)->states('component-hdd-category')->create(); // 12 - factory(Category::class, 1)->states('component-ram-category')->create(); // 13 - factory(Category::class, 1)->states('license-graphics-category')->create(); // 14 - factory(Category::class, 1)->states('license-office-category')->create(); // 15 + Category::factory()->count(1)->assetLaptopCategory()->create(); // 1 + Category::factory()->count(1)->assetDesktopCategory()->create(); // 2 + Category::factory()->count(1)->assetTabletCategory()->create(); // 3 + Category::factory()->count(1)->assetMobileCategory()->create(); // 4 + Category::factory()->count(1)->assetDisplayCategory()->create(); // 5 + Category::factory()->count(1)->assetVoipCategory()->create(); // 6 + Category::factory()->count(1)->assetConferenceCategory()->create(); // 7 + Category::factory()->count(1)->accessoryKeyboardCategory()->create(); // 8 + Category::factory()->count(1)->accessoryMouseCategory()->create(); // 9 + Category::factory()->count(1)->consumablePaperCategory()->create(); // 10 + Category::factory()->count(1)->consumableInkCategory()->create(); // 11 + Category::factory()->count(1)->componentHddCategory()->create(); // 12 + Category::factory()->count(1)->componentRamCategory()->create(); // 13 + Category::factory()->count(1)->licenseGraphicsCategory()->create(); // 14 + Category::factory()->count(1)->licenseOfficeCategory()->create(); // 15 } } diff --git a/database/seeds/CompanySeeder.php b/database/seeds/CompanySeeder.php index 5969b8cdbb..181108dcd1 100644 --- a/database/seeds/CompanySeeder.php +++ b/database/seeds/CompanySeeder.php @@ -14,7 +14,7 @@ class CompanySeeder extends Seeder { \Log::debug('Seed companies'); Company::truncate(); - factory(Company::class, 4)->create(); + Company::factory()->count(4)->create(); $src = public_path('/img/demo/companies/'); $dst = 'companies'.'/'; diff --git a/database/seeds/ComponentSeeder.php b/database/seeds/ComponentSeeder.php index 1347901a21..109272aa64 100644 --- a/database/seeds/ComponentSeeder.php +++ b/database/seeds/ComponentSeeder.php @@ -9,9 +9,9 @@ class ComponentSeeder extends Seeder { Component::truncate(); DB::table('components_assets')->truncate(); - factory(Component::class, 1)->states('ram-crucial4')->create(); // 1 - factory(Component::class, 1)->states('ram-crucial8')->create(); // 1 - factory(Component::class, 1)->states('ssd-crucial120')->create(); // 1 - factory(Component::class, 1)->states('ssd-crucial240')->create(); // 1 + Component::factory()->count(1)->ramCrucial4()->create(); // 1 + Component::factory()->count(1)->ramCrucial8()->create(); // 1 + Component::factory()->count(1)->ssdCrucial120()->create(); // 1 + Component::factory()->count(1)->ssdCrucial240()->create(); // 1 } } diff --git a/database/seeds/ConsumableSeeder.php b/database/seeds/ConsumableSeeder.php index 2c01b53b7f..72671a1fc1 100644 --- a/database/seeds/ConsumableSeeder.php +++ b/database/seeds/ConsumableSeeder.php @@ -9,8 +9,8 @@ class ConsumableSeeder extends Seeder { Consumable::truncate(); DB::table('consumables_users')->truncate(); - factory(Consumable::class, 1)->states('cardstock')->create(); // 1 - factory(Consumable::class, 1)->states('paper')->create(); // 2 - factory(Consumable::class, 1)->states('ink')->create(); // 3 + Consumable::factory()->count(1)->cardstock()->create(); // 1 + Consumable::factory()->count(1)->paper()->create(); // 2 + Consumable::factory()->count(1)->ink()->create(); // 3 } } diff --git a/database/seeds/CustomFieldSeeder.php b/database/seeds/CustomFieldSeeder.php index 0f8fb75399..75c7bff240 100644 --- a/database/seeds/CustomFieldSeeder.php +++ b/database/seeds/CustomFieldSeeder.php @@ -23,13 +23,13 @@ class CustomFieldSeeder extends Seeder CustomFieldset::truncate(); DB::table('custom_field_custom_fieldset')->truncate(); - factory(CustomFieldset::class, 1)->states('mobile')->create(); - factory(CustomFieldset::class, 1)->states('computer')->create(); - factory(CustomField::class, 1)->states('imei')->create(); - factory(CustomField::class, 1)->states('phone')->create(); - factory(CustomField::class, 1)->states('ram')->create(); - factory(CustomField::class, 1)->states('cpu')->create(); - factory(CustomField::class, 1)->states('mac-address')->create(); + CustomFieldset::factory()->count(1)->mobile()->create(); + CustomFieldset::factory()->count(1)->computer()->create(); + CustomField::factory()->count(1)->imei()->create(); + CustomField::factory()->count(1)->phone()->create(); + CustomField::factory()->count(1)->ram()->create(); + CustomField::factory()->count(1)->cpu()->create(); + CustomField::factory()->count(1)->macAddress()->create(); DB::table('custom_field_custom_fieldset')->insert([ [ diff --git a/database/seeds/DepartmentSeeder.php b/database/seeds/DepartmentSeeder.php index 3b3f929c77..c4c28e0382 100644 --- a/database/seeds/DepartmentSeeder.php +++ b/database/seeds/DepartmentSeeder.php @@ -8,11 +8,11 @@ class DepartmentSeeder extends Seeder public function run() { Department::truncate(); - factory(Department::class, 1)->states('hr')->create(); // 1 - factory(Department::class, 1)->states('engineering')->create(); // 2 - factory(Department::class, 1)->states('marketing')->create(); // 3 - factory(Department::class, 1)->states('client')->create(); // 4 - factory(Department::class, 1)->states('product')->create(); // 5 - factory(Department::class, 1)->states('silly')->create(); // 6 + Department::factory()->count(1)->hr()->create(); // 1 + Department::factory()->count(1)->engineering()->create(); // 2 + Department::factory()->count(1)->marketing()->create(); // 3 + Department::factory()->count(1)->client()->create(); // 4 + Department::factory()->count(1)->product()->create(); // 5 + Department::factory()->count(1)->silly()->create(); // 6 } } diff --git a/database/seeds/DepreciationSeeder.php b/database/seeds/DepreciationSeeder.php index 17c5bb09f1..bc5612579b 100644 --- a/database/seeds/DepreciationSeeder.php +++ b/database/seeds/DepreciationSeeder.php @@ -8,8 +8,8 @@ class DepreciationSeeder extends Seeder public function run() { Depreciation::truncate(); - factory(Depreciation::class, 1)->states('computer')->create(); // 1 - factory(Depreciation::class, 1)->states('display')->create(); // 2 - factory(Depreciation::class, 1)->states('mobile-phones')->create(); // 3 + Depreciation::factory()->count(1)->computer()->create(); // 1 + Depreciation::factory()->count(1)->display()->create(); // 2 + Depreciation::factory()->count(1)->mobilePhones()->create(); // 3 } } diff --git a/database/seeds/LicenseSeeder.php b/database/seeds/LicenseSeeder.php index 74e7193c4e..b32498312a 100644 --- a/database/seeds/LicenseSeeder.php +++ b/database/seeds/LicenseSeeder.php @@ -10,9 +10,9 @@ class LicenseSeeder extends Seeder { License::truncate(); LicenseSeat::truncate(); - factory(License::class, 1)->states('photoshop')->create(); - factory(License::class, 1)->states('acrobat')->create(); - factory(License::class, 1)->states('indesign')->create(); - factory(License::class, 1)->states('office')->create(); + License::factory()->count(1)->photoshop()->create(); + License::factory()->count(1)->acrobat()->create(); + License::factory()->count(1)->indesign()->create(); + License::factory()->count(1)->office()->create(); } } diff --git a/database/seeds/LocationSeeder.php b/database/seeds/LocationSeeder.php index be7ea0fa18..82216fdb21 100644 --- a/database/seeds/LocationSeeder.php +++ b/database/seeds/LocationSeeder.php @@ -9,7 +9,7 @@ class LocationSeeder extends Seeder public function run() { Location::truncate(); - factory(Location::class, 10)->create(); + Location::factory()->count(10)->create(); $src = public_path('/img/demo/locations/'); $dst = 'locations'.'/'; diff --git a/database/seeds/ManufacturerSeeder.php b/database/seeds/ManufacturerSeeder.php index c7bde59b0d..59685dc57b 100644 --- a/database/seeds/ManufacturerSeeder.php +++ b/database/seeds/ManufacturerSeeder.php @@ -9,17 +9,17 @@ class ManufacturerSeeder extends Seeder public function run() { Manufacturer::truncate(); - factory(Manufacturer::class, 1)->states('apple')->create(); // 1 - factory(Manufacturer::class, 1)->states('microsoft')->create(); // 2 - factory(Manufacturer::class, 1)->states('dell')->create(); // 3 - factory(Manufacturer::class, 1)->states('asus')->create(); // 4 - factory(Manufacturer::class, 1)->states('hp')->create(); // 5 - factory(Manufacturer::class, 1)->states('lenovo')->create(); // 6 - factory(Manufacturer::class, 1)->states('lg')->create(); // 7 - factory(Manufacturer::class, 1)->states('polycom')->create(); // 8 - factory(Manufacturer::class, 1)->states('adobe')->create(); // 9 - factory(Manufacturer::class, 1)->states('avery')->create(); // 10 - factory(Manufacturer::class, 1)->states('crucial')->create(); // 10 + Manufacturer::factory()->count(1)->apple()->create(); // 1 + Manufacturer::factory()->count(1)->microsoft()->create(); // 2 + Manufacturer::factory()->count(1)->dell()->create(); // 3 + Manufacturer::factory()->count(1)->asus()->create(); // 4 + Manufacturer::factory()->count(1)->hp()->create(); // 5 + Manufacturer::factory()->count(1)->lenovo()->create(); // 6 + Manufacturer::factory()->count(1)->lg()->create(); // 7 + Manufacturer::factory()->count(1)->polycom()->create(); // 8 + Manufacturer::factory()->count(1)->adobe()->create(); // 9 + Manufacturer::factory()->count(1)->avery()->create(); // 10 + Manufacturer::factory()->count(1)->crucial()->create(); // 10 $src = public_path('/img/demo/manufacturers/'); $dst = 'manufacturers'.'/'; diff --git a/database/seeds/StatuslabelSeeder.php b/database/seeds/StatuslabelSeeder.php index 733ed33d12..558aa92f5b 100755 --- a/database/seeds/StatuslabelSeeder.php +++ b/database/seeds/StatuslabelSeeder.php @@ -8,12 +8,12 @@ class StatuslabelSeeder extends Seeder public function run() { Statuslabel::truncate(); - factory(Statuslabel::class)->states('rtd')->create(['name' => 'Ready to Deploy']); - factory(Statuslabel::class)->states('pending')->create(['name' => 'Pending']); - factory(Statuslabel::class)->states('archived')->create(['name' => 'Archived']); - factory(Statuslabel::class)->states('out_for_diagnostics')->create(); - factory(Statuslabel::class)->states('out_for_repair')->create(); - factory(Statuslabel::class)->states('broken')->create(); - factory(Statuslabel::class)->states('lost')->create(); + Statuslabel::factory()->rtd()->create(['name' => 'Ready to Deploy']); + Statuslabel::factory()->pending()->create(['name' => 'Pending']); + Statuslabel::factory()->archived()->create(['name' => 'Archived']); + Statuslabel::factory()->outForDiagnostics()->create(); + Statuslabel::factory()->outForRepair()->create(); + Statuslabel::factory()->broken()->create(); + Statuslabel::factory()->lost()->create(); } } diff --git a/database/seeds/SupplierSeeder.php b/database/seeds/SupplierSeeder.php index 98336205bb..1dc4396610 100644 --- a/database/seeds/SupplierSeeder.php +++ b/database/seeds/SupplierSeeder.php @@ -8,6 +8,6 @@ class SupplierSeeder extends Seeder public function run() { Supplier::truncate(); - factory(Supplier::class, 5)->create(); + Supplier::factory()->count(5)->create(); } } diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php index 9e088df426..5b46ef712b 100644 --- a/database/seeds/UserSeeder.php +++ b/database/seeds/UserSeeder.php @@ -13,10 +13,10 @@ class UserSeeder extends Seeder public function run() { User::truncate(); - factory(User::class, 1)->states('first-admin')->create(); - factory(User::class, 1)->states('snipe-admin')->create(); - factory(User::class, 3)->states('superuser')->create(); - factory(User::class, 3)->states('admin')->create(); - factory(User::class, 50)->states('view-assets')->create(); + User::factory()->count(1)->firstAdmin()->create(); + User::factory()->count(1)->snipeAdmin()->create(); + User::factory()->count(3)->superuser()->create(); + User::factory()->count(3)->admin()->create(); + User::factory()->count(50)->viewAssets()->create(); } } diff --git a/tests/api/ApiAccessoriesCest.php b/tests/api/ApiAccessoriesCest.php index 57d7fef4cc..8d124268f5 100644 --- a/tests/api/ApiAccessoriesCest.php +++ b/tests/api/ApiAccessoriesCest.php @@ -39,7 +39,7 @@ class ApiAccessoriesCest { $I->wantTo('Create a new accessory'); - $temp_accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->make([ + $temp_accessory = \App\Models\Accessory::factory()->appleBtKeyboard()->make([ 'name' => 'Test Accessory Name', 'company_id' => 2, ]); @@ -74,14 +74,14 @@ class ApiAccessoriesCest $I->wantTo('Update an accessory with PATCH'); // create - $accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ + $accessory = \App\Models\Accessory::factory()->appleBtKeyboard()->create([ 'name' => 'Original Accessory Name', 'company_id' => 2, 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Accessory::class, $accessory); - $temp_accessory = factory(\App\Models\Accessory::class)->states('microsoft-mouse')->make([ + $temp_accessory = \App\Models\Accessory::factory()->microsoftMouse()->make([ 'company_id' => 3, 'name' => 'updated accessory name', 'location_id' => 1, @@ -133,7 +133,7 @@ class ApiAccessoriesCest $I->wantTo('Delete an accessory'); // create - $accessory = factory(\App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ + $accessory = \App\Models\Accessory::factory()->appleBtKeyboard()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Accessory::class, $accessory); diff --git a/tests/api/ApiAssetsCest.php b/tests/api/ApiAssetsCest.php index dd102a19fc..554d4c4230 100644 --- a/tests/api/ApiAssetsCest.php +++ b/tests/api/ApiAssetsCest.php @@ -46,7 +46,7 @@ class ApiAssetsCest { $I->wantTo('Create a new asset'); - $temp_asset = factory(\App\Models\Asset::class)->states('laptop-mbp')->make([ + $temp_asset = \App\Models\Asset::factory()->laptopMbp()->make([ 'asset_tag' => 'Test Asset Tag', 'company_id' => 2, ]); @@ -81,13 +81,13 @@ class ApiAssetsCest $I->wantTo('Update an asset with PATCH'); // create - $asset = factory(\App\Models\Asset::class)->states('laptop-mbp')->create([ + $asset = \App\Models\Asset::factory()->laptopMbp()->create([ 'company_id' => 2, 'rtd_location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Asset::class, $asset); - $temp_asset = factory(\App\Models\Asset::class)->states('laptop-air')->make([ + $temp_asset = \App\Models\Asset::factory()->laptopAir()->make([ 'company_id' => 3, 'name' => 'updated asset name', 'rtd_location_id' => 1, @@ -144,7 +144,7 @@ class ApiAssetsCest $I->wantTo('Delete an asset'); // create - $asset = factory(\App\Models\Asset::class)->states('laptop-mbp')->create(); + $asset = \App\Models\Asset::factory()->laptopMbp()->create(); $I->assertInstanceOf(\App\Models\Asset::class, $asset); // delete diff --git a/tests/api/ApiCategoriesCest.php b/tests/api/ApiCategoriesCest.php index e51aad5a0a..7605872a17 100644 --- a/tests/api/ApiCategoriesCest.php +++ b/tests/api/ApiCategoriesCest.php @@ -40,7 +40,7 @@ class ApiCategoriesCest { $I->wantTo('Create a new category'); - $temp_category = factory(\App\Models\Category::class)->states('asset-laptop-category')->make([ + $temp_category = \App\Models\Category::factory()->assetLaptopCategory()->make([ 'name' => 'Test Category Tag', ]); @@ -69,14 +69,13 @@ class ApiCategoriesCest $I->wantTo('Update an category with PATCH'); // create - $category = factory(\App\Models\Category::class)->states('asset-laptop-category') + $category = \App\Models\Category::factory()->assetLaptopCategory() ->create([ 'name' => 'Original Category Name', ]); $I->assertInstanceOf(\App\Models\Category::class, $category); - $temp_category = factory(\App\Models\Category::class) - ->states('accessory-mouse-category')->make([ + $temp_category = \App\Models\Category::factory()->accessoryMouseCategory()->make([ 'name' => 'updated category name', ]); @@ -120,7 +119,7 @@ class ApiCategoriesCest $I->wantTo('Delete an category'); // create - $category = factory(\App\Models\Category::class)->states('asset-laptop-category')->create([ + $category = \App\Models\Category::factory()->assetLaptopCategory()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Category::class, $category); diff --git a/tests/api/ApiCheckoutAssetsCest.php b/tests/api/ApiCheckoutAssetsCest.php index 4e137785d2..48b4bd2335 100644 --- a/tests/api/ApiCheckoutAssetsCest.php +++ b/tests/api/ApiCheckoutAssetsCest.php @@ -25,7 +25,7 @@ class ApiCheckoutAssetsCest $I->wantTo('Check out an asset to a user'); //Grab an asset from the database that isn't checked out. $asset = Asset::whereNull('assigned_to')->first(); - $targetUser = factory(\App\Models\User::class)->create(); + $targetUser = \App\Models\User::factory()->create(); $data = [ 'assigned_user' => $targetUser->id, 'note' => 'This is a test checkout note', @@ -62,7 +62,7 @@ class ApiCheckoutAssetsCest ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance - $targetAsset = factory(\App\Models\Asset::class)->states('desktop-macpro')->create([ + $targetAsset = \App\Models\Asset::factory()->desktopMacpro()->create([ 'name' => 'Test Asset For Checkout to', ]); $data = [ @@ -96,7 +96,7 @@ class ApiCheckoutAssetsCest ->where('model_id', 8) ->where('status_id', Statuslabel::deployable()->first()->id) ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance - $targetLocation = factory(\App\Models\Location::class)->create([ + $targetLocation = \App\Models\Location::factory()->create([ 'name' => 'Test Location for Checkout', ]); $data = [ diff --git a/tests/api/ApiCompaniesCest.php b/tests/api/ApiCompaniesCest.php index 17ac7c1714..55fa5bc218 100644 --- a/tests/api/ApiCompaniesCest.php +++ b/tests/api/ApiCompaniesCest.php @@ -42,7 +42,7 @@ class ApiCompaniesCest { $I->wantTo('Create a new company'); - $temp_company = factory(\App\Models\Company::class)->make([ + $temp_company = \App\Models\Company::factory()->make([ 'name' => 'Test Company Tag', ]); @@ -66,12 +66,12 @@ class ApiCompaniesCest $I->wantTo('Update an company with PATCH'); // create - $company = factory(\App\Models\Company::class)->create([ + $company = \App\Models\Company::factory()->create([ 'name' => 'Original Company Name', ]); $I->assertInstanceOf(\App\Models\Company::class, $company); - $temp_company = factory(\App\Models\Company::class)->make([ + $temp_company = \App\Models\Company::factory()->make([ 'name' => 'updated company name', ]); @@ -110,7 +110,7 @@ class ApiCompaniesCest $I->wantTo('Delete an company'); // create - $company = factory(\App\Models\Company::class)->create([ + $company = \App\Models\Company::factory()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Company::class, $company); diff --git a/tests/api/ApiComponentsCest.php b/tests/api/ApiComponentsCest.php index 8f9b50b044..dea9ece186 100644 --- a/tests/api/ApiComponentsCest.php +++ b/tests/api/ApiComponentsCest.php @@ -40,7 +40,7 @@ class ApiComponentsCest { $I->wantTo('Create a new component'); - $temp_component = factory(\App\Models\Component::class)->states('ram-crucial4')->make([ + $temp_component = \App\Models\Component::factory()->ramCrucial4()->make([ 'name' => 'Test Component Name', 'company_id' => 2, ]); @@ -75,14 +75,14 @@ class ApiComponentsCest $I->wantTo('Update an component with PATCH'); // create - $component = factory(\App\Models\Component::class)->states('ram-crucial4')->create([ + $component = \App\Models\Component::factory()->ramCrucial4()->create([ 'name' => 'Original Component Name', 'company_id' => 2, 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Component::class, $component); - $temp_component = factory(\App\Models\Component::class)->states('ssd-crucial240')->make([ + $temp_component = \App\Models\Component::factory()->ssdCrucial240()->make([ 'company_id' => 3, 'name' => 'updated component name', 'location_id' => 1, @@ -132,7 +132,7 @@ class ApiComponentsCest $I->wantTo('Delete an component'); // create - $component = factory(\App\Models\Component::class)->states('ram-crucial4')->create([ + $component = \App\Models\Component::factory()->ramCrucial4()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Component::class, $component); diff --git a/tests/api/ApiConsumablesCest.php b/tests/api/ApiConsumablesCest.php index 9f453f4f1b..8490c3a56e 100644 --- a/tests/api/ApiConsumablesCest.php +++ b/tests/api/ApiConsumablesCest.php @@ -40,7 +40,7 @@ class ApiConsumablesCest { $I->wantTo('Create a new consumable'); - $temp_consumable = factory(\App\Models\Consumable::class)->states('ink')->make([ + $temp_consumable = \App\Models\Consumable::factory()->ink()->make([ 'name' => 'Test Consumable Name', 'company_id' => 2, ]); @@ -74,14 +74,14 @@ class ApiConsumablesCest $I->wantTo('Update an consumable with PATCH'); // create - $consumable = factory(\App\Models\Consumable::class)->states('ink')->create([ + $consumable = \App\Models\Consumable::factory()->ink()->create([ 'name' => 'Original Consumable Name', 'company_id' => 2, 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\Consumable::class, $consumable); - $temp_consumable = factory(\App\Models\Consumable::class)->states('cardstock')->make([ + $temp_consumable = \App\Models\Consumable::factory()->cardstock()->make([ 'company_id' => 3, 'name' => 'updated consumable name', 'location_id' => 1, @@ -133,7 +133,7 @@ class ApiConsumablesCest $I->wantTo('Delete an consumable'); // create - $consumable = factory(\App\Models\Consumable::class)->states('ink')->create([ + $consumable = \App\Models\Consumable::factory()->ink()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Consumable::class, $consumable); diff --git a/tests/api/ApiLicensesCest.php b/tests/api/ApiLicensesCest.php index 22744412b6..0668e87628 100644 --- a/tests/api/ApiLicensesCest.php +++ b/tests/api/ApiLicensesCest.php @@ -41,7 +41,7 @@ class ApiLicensesCest { $I->wantTo('Create a new license'); - $temp_license = factory(\App\Models\License::class)->states('acrobat')->make([ + $temp_license = \App\Models\License::factory()->acrobat()->make([ 'name' => 'Test License Name', 'depreciation_id' => 3, 'company_id' => 2, @@ -84,14 +84,14 @@ class ApiLicensesCest $I->wantTo('Update a license with PATCH'); // create - $license = factory(\App\Models\License::class)->states('acrobat')->create([ + $license = \App\Models\License::factory()->acrobat()->create([ 'name' => 'Original License Name', 'depreciation_id' => 3, 'company_id' => 2, ]); $I->assertInstanceOf(\App\Models\License::class, $license); - $temp_license = factory(\App\Models\License::class)->states('office')->make([ + $temp_license = \App\Models\License::factory()->office()->make([ 'company_id' => 3, 'depreciation_id' => 2, ]); @@ -147,7 +147,7 @@ class ApiLicensesCest $I->wantTo('Ensure a license with seats checked out cannot be deleted'); // create - $license = factory(\App\Models\License::class)->states('acrobat')->create([ + $license = \App\Models\License::factory()->acrobat()->create([ 'name' => 'Soon to be deleted', ]); $licenseSeat = $license->freeSeat(); @@ -171,7 +171,7 @@ class ApiLicensesCest $I->wantTo('Delete an license'); // create - $license = factory(\App\Models\License::class)->states('acrobat')->create([ + $license = \App\Models\License::factory()->acrobat()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\License::class, $license); diff --git a/tests/api/ApiLocationsCest.php b/tests/api/ApiLocationsCest.php index 2f185d084a..536830f00d 100644 --- a/tests/api/ApiLocationsCest.php +++ b/tests/api/ApiLocationsCest.php @@ -41,7 +41,7 @@ class ApiLocationsCest { $I->wantTo('Create a new location'); - $temp_location = factory(\App\Models\Location::class)->make([ + $temp_location = \App\Models\Location::factory()->make([ 'name' => 'Test Location Tag', ]); @@ -76,12 +76,12 @@ class ApiLocationsCest $I->wantTo('Update an location with PATCH'); // create - $location = factory(\App\Models\Location::class)->create([ + $location = \App\Models\Location::factory()->create([ 'name' => 'Original Location Name', ]); $I->assertInstanceOf(\App\Models\Location::class, $location); - $temp_location = factory(\App\Models\Location::class)->make([ + $temp_location = \App\Models\Location::factory()->make([ 'name' => 'updated location name', ]); @@ -132,7 +132,7 @@ class ApiLocationsCest $I->wantTo('Delete an location'); // create - $location = factory(\App\Models\Location::class)->create([ + $location = \App\Models\Location::factory()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Location::class, $location); diff --git a/tests/api/ApiManufacturersCest.php b/tests/api/ApiManufacturersCest.php index cd9afff031..be2f4cc483 100644 --- a/tests/api/ApiManufacturersCest.php +++ b/tests/api/ApiManufacturersCest.php @@ -41,7 +41,7 @@ class ApiManufacturersCest { $I->wantTo('Create a new manufacturer'); - $temp_manufacturer = factory(\App\Models\Manufacturer::class)->states('apple')->make([ + $temp_manufacturer = \App\Models\Manufacturer::factory()->apple()->make([ 'name' => 'Test Manufacturer Tag', ]); @@ -70,13 +70,13 @@ class ApiManufacturersCest $I->wantTo('Update an manufacturer with PATCH'); // create - $manufacturer = factory(\App\Models\Manufacturer::class)->states('apple') + $manufacturer = \App\Models\Manufacturer::factory()->apple() ->create([ 'name' => 'Original Manufacturer Name', ]); $I->assertInstanceOf(\App\Models\Manufacturer::class, $manufacturer); - $temp_manufacturer = factory(\App\Models\Manufacturer::class)->states('dell')->make([ + $temp_manufacturer = \App\Models\Manufacturer::factory()->dell()->make([ 'name' => 'updated manufacturer name', ]); @@ -120,7 +120,7 @@ class ApiManufacturersCest $I->wantTo('Delete an manufacturer'); // create - $manufacturer = factory(\App\Models\Manufacturer::class)->states('apple')->create([ + $manufacturer = \App\Models\Manufacturer::factory()->apple()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Manufacturer::class, $manufacturer); diff --git a/tests/api/ApiModelsCest.php b/tests/api/ApiModelsCest.php index 9db4742eb8..1d3d6fc788 100644 --- a/tests/api/ApiModelsCest.php +++ b/tests/api/ApiModelsCest.php @@ -39,7 +39,7 @@ class ApiModelsCest { $I->wantTo('Create a new assetmodel'); - $temp_assetmodel = factory(\App\Models\AssetModel::class)->states('mbp-13-model')->make([ + $temp_assetmodel = \App\Models\AssetModel::factory()->mbp13Model()->make([ 'name' => 'Test AssetModel Tag', ]); @@ -70,12 +70,12 @@ class ApiModelsCest $I->wantTo('Update an assetmodel with PATCH'); // create - $assetmodel = factory(\App\Models\AssetModel::class)->states('mbp-13-model')->create([ + $assetmodel = \App\Models\AssetModel::factory()->mbp13Model()->create([ 'name' => 'Original AssetModel Name', ]); $I->assertInstanceOf(\App\Models\AssetModel::class, $assetmodel); - $temp_assetmodel = factory(\App\Models\AssetModel::class)->states('polycomcx-model')->make([ + $temp_assetmodel = \App\Models\AssetModel::factory()->polycomcxModel()->make([ 'name' => 'updated AssetModel name', 'fieldset_id' => 2, ]); @@ -123,7 +123,7 @@ class ApiModelsCest $I->wantTo('Delete an assetmodel'); // create - $assetmodel = factory(\App\Models\AssetModel::class)->states('mbp-13-model')->create([ + $assetmodel = \App\Models\AssetModel::factory()->mbp13Model()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\AssetModel::class, $assetmodel); diff --git a/tests/api/ApiStatusLabelsCest.php b/tests/api/ApiStatusLabelsCest.php index 5c14ed36b7..fabb71d51f 100644 --- a/tests/api/ApiStatusLabelsCest.php +++ b/tests/api/ApiStatusLabelsCest.php @@ -41,7 +41,7 @@ class ApiStatusLabelsCest { $I->wantTo('Create a new statuslabel'); - $temp_statuslabel = factory(\App\Models\Statuslabel::class)->make([ + $temp_statuslabel = \App\Models\Statuslabel::factory()->make([ 'name' => 'Test Statuslabel Tag', ]); @@ -70,12 +70,12 @@ class ApiStatusLabelsCest $I->wantTo('Update an statuslabel with PATCH'); // create - $statuslabel = factory(\App\Models\Statuslabel::class)->states('rtd')->create([ + $statuslabel = \App\Models\Statuslabel::factory()->rtd()->create([ 'name' => 'Original Statuslabel Name', ]); $I->assertInstanceOf(\App\Models\Statuslabel::class, $statuslabel); - $temp_statuslabel = factory(\App\Models\Statuslabel::class)->states('pending')->make([ + $temp_statuslabel = \App\Models\Statuslabel::factory()->pending()->make([ 'name' => 'updated statuslabel name', 'type' => 'pending', ]); @@ -120,7 +120,7 @@ class ApiStatusLabelsCest $I->wantTo('Delete an statuslabel'); // create - $statuslabel = factory(\App\Models\Statuslabel::class)->create([ + $statuslabel = \App\Models\Statuslabel::factory()->create([ 'name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\Statuslabel::class, $statuslabel); diff --git a/tests/api/ApiUsersCest.php b/tests/api/ApiUsersCest.php index ce938489b2..912653be2d 100644 --- a/tests/api/ApiUsersCest.php +++ b/tests/api/ApiUsersCest.php @@ -42,10 +42,10 @@ class ApiUsersCest { $I->wantTo('Create a new user'); - $temp_user = factory(\App\Models\User::class)->make([ + $temp_user = \App\Models\User::factory()->make([ 'name' => 'Test User Name', ]); - factory(Group::class, 2)->create(); + Group::factory()->count(2)->create(); $groups = Group::pluck('id'); // setup $data = [ @@ -90,20 +90,20 @@ class ApiUsersCest $I->wantTo('Update an user with PATCH'); // create - $user = factory(\App\Models\User::class)->create([ + $user = \App\Models\User::factory()->create([ 'first_name' => 'Original User Name', 'company_id' => 2, 'location_id' => 3, ]); $I->assertInstanceOf(\App\Models\User::class, $user); - $temp_user = factory(\App\Models\User::class)->make([ + $temp_user = \App\Models\User::factory()->make([ 'company_id' => 3, 'first_name' => 'updated user name', 'location_id' => 1, ]); - factory(Group::class, 2)->create(); + Group::factory()->count(2)->create(); $groups = Group::pluck('id'); $data = [ @@ -163,7 +163,7 @@ class ApiUsersCest $I->wantTo('Delete an user'); // create - $user = factory(\App\Models\User::class)->create([ + $user = \App\Models\User::factory()->create([ 'first_name' => 'Soon to be deleted', ]); $I->assertInstanceOf(\App\Models\User::class, $user); diff --git a/tests/functional/AccessoriesCest.php b/tests/functional/AccessoriesCest.php index 92096e763d..bee341b361 100644 --- a/tests/functional/AccessoriesCest.php +++ b/tests/functional/AccessoriesCest.php @@ -52,7 +52,7 @@ class AccessoriesCest public function passesCorrectValidation(FunctionalTester $I) { - $accessory = factory(App\Models\Accessory::class)->states('apple-bt-keyboard')->make(); + $accessory = \App\Models\Accessory::factory()->appleBtKeyboard()->make(); $values = [ 'category_id' => $accessory->category_id, 'location_id' => $accessory->location_id, diff --git a/tests/functional/AssetModelsCest.php b/tests/functional/AssetModelsCest.php index e3a23b4e0d..fbf43a5c57 100644 --- a/tests/functional/AssetModelsCest.php +++ b/tests/functional/AssetModelsCest.php @@ -33,7 +33,7 @@ class AssetModelsCest public function passesCorrectValidation(FunctionalTester $I) { - $model = factory(App\Models\AssetModel::class)->states('mbp-13-model')->make(['name'=>'Test Model']); + $model = \App\Models\AssetModel::factory()->mbp13Model()->make(['name'=>'Test Model']); $values = [ 'category_id' => $model->category_id, 'depreciation_id' => $model->depreciation_id, @@ -56,7 +56,7 @@ class AssetModelsCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete an asset model'); - $model = factory(App\Models\AssetModel::class)->states('mbp-13-model')->create(['name' => 'Test Model']); + $model = \App\Models\AssetModel::factory()->mbp13Model()->create(['name' => 'Test Model']); $I->sendDelete(route('models.destroy', $model->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } diff --git a/tests/functional/AssetsCest.php b/tests/functional/AssetsCest.php index e08b26069c..3c7ffc1282 100644 --- a/tests/functional/AssetsCest.php +++ b/tests/functional/AssetsCest.php @@ -34,7 +34,7 @@ class AssetsCest public function passesCreateAndCheckout(FunctionalTester $I) { - $asset = factory(App\Models\Asset::class)->states('laptop-mbp')->make([ + $asset = \App\Models\Asset::factory()->laptopMbp()->make([ 'asset_tag'=>'test tag', 'name'=> 'test asset', 'company_id'=>1, diff --git a/tests/functional/CategoriesCest.php b/tests/functional/CategoriesCest.php index 49dbf11ff5..ff89fcc152 100644 --- a/tests/functional/CategoriesCest.php +++ b/tests/functional/CategoriesCest.php @@ -36,7 +36,7 @@ class CategoriesCest public function passesCorrectValidation(FunctionalTester $I) { - $category = factory(App\Models\Category::class)->states('asset-laptop-category')->make([ + $category = \App\Models\Category::factory()->assetLaptopCategory()->make([ 'name' => 'Test Category', ]); $values = [ @@ -57,7 +57,7 @@ class CategoriesCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a category'); - $category = factory(App\Models\Category::class)->states('asset-laptop-category')->create([ + $category = \App\Models\Category::factory()->assetLaptopCategory()->create([ 'name'=>'Deletable Test Category', ]); $I->sendDelete(route('categories.destroy', $category->id), ['_token' => csrf_token()]); diff --git a/tests/functional/CompaniesCest.php b/tests/functional/CompaniesCest.php index af7ce713f8..75724aa206 100644 --- a/tests/functional/CompaniesCest.php +++ b/tests/functional/CompaniesCest.php @@ -31,7 +31,7 @@ class CompaniesCest public function passesCorrectValidation(FunctionalTester $I) { - $company = factory(App\Models\Company::class)->make(); + $company = \App\Models\Company::factory()->make(); $values = [ 'name' => $company->name, ]; diff --git a/tests/functional/ComponentsCest.php b/tests/functional/ComponentsCest.php index 092bd8ccc2..6e2a7f136b 100644 --- a/tests/functional/ComponentsCest.php +++ b/tests/functional/ComponentsCest.php @@ -46,7 +46,7 @@ class ComponentsCest public function passesCorrectValidation(FunctionalTester $I) { - $component = factory(App\Models\Component::class)->states('ram-crucial4')->make([ + $component = \App\Models\Component::factory()->ramCrucial4()->make([ 'name' => 'Test Component', 'serial' => '3523-235325-1350235', ]); diff --git a/tests/functional/ConsumablesCest.php b/tests/functional/ConsumablesCest.php index cfca37a770..c47eb23c0f 100644 --- a/tests/functional/ConsumablesCest.php +++ b/tests/functional/ConsumablesCest.php @@ -47,7 +47,7 @@ class ConsumablesCest public function passesCorrectValidation(FunctionalTester $I) { - $consumable = factory(App\Models\Consumable::class)->states('cardstock')->make([ + $consumable = \App\Models\Consumable::factory()->cardstock()->make([ 'name' => 'Test Consumable', 'model_number' => 23520, ]); diff --git a/tests/functional/DepreciationsCest.php b/tests/functional/DepreciationsCest.php index acf2d561db..25dcfaef1f 100644 --- a/tests/functional/DepreciationsCest.php +++ b/tests/functional/DepreciationsCest.php @@ -43,7 +43,7 @@ class DepreciationsCest public function passesCorrectValidation(FunctionalTester $I) { - $depreciation = factory(App\Models\Depreciation::class)->states('computer')->make([ + $depreciation = \App\Models\Depreciation::factory()->computer()->make([ 'name'=>'Test Depreciation', ]); $values = [ diff --git a/tests/functional/LicensesCest.php b/tests/functional/LicensesCest.php index a5d95450ba..5add67f51d 100644 --- a/tests/functional/LicensesCest.php +++ b/tests/functional/LicensesCest.php @@ -47,7 +47,7 @@ class LicensesCest public function passesCorrectValidation(FunctionalTester $I) { - $license = factory(App\Models\License::class)->states('photoshop')->make([ + $license = \App\Models\License::factory()->photoshop()->make([ 'name' => 'Test License', 'company_id' => 3, ]); diff --git a/tests/functional/LocationsCest.php b/tests/functional/LocationsCest.php index 3ab0b60a57..9177c6ae4b 100644 --- a/tests/functional/LocationsCest.php +++ b/tests/functional/LocationsCest.php @@ -45,7 +45,7 @@ class LocationsCest public function passesCorrectValidation(FunctionalTester $I) { - $location = factory(App\Models\Location::class)->make(); + $location = \App\Models\Location::factory()->make(); $values = [ 'name' => $location->name, 'parent_id' => $I->getLocationId(), @@ -67,7 +67,7 @@ class LocationsCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a location'); - $location = factory(App\Models\Location::class)->create(); + $location = \App\Models\Location::factory()->create(); $I->sendDelete(route('locations.destroy', $location->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } diff --git a/tests/functional/ManufacturersCest.php b/tests/functional/ManufacturersCest.php index 0a1f9dc8f7..65c8b1d190 100644 --- a/tests/functional/ManufacturersCest.php +++ b/tests/functional/ManufacturersCest.php @@ -43,7 +43,7 @@ class ManufacturersCest public function passesCorrectValidation(FunctionalTester $I) { - $manufacturer = factory(App\Models\Manufacturer::class)->states('microsoft')->make([ + $manufacturer = \App\Models\Manufacturer::factory()->microsoft()->make([ 'name' => 'Test Manufacturer', ]); $values = [ @@ -59,7 +59,7 @@ class ManufacturersCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a manufacturer'); - $manufacturerId = factory(App\Models\Manufacturer::class)->states('microsoft')->create(['name' => 'Deletable Test Manufacturer'])->id; + $manufacturerId = \App\Models\Manufacturer::factory()->microsoft()->create(['name' => 'Deletable Test Manufacturer'])->id; $I->sendDelete(route('manufacturers.destroy', $manufacturerId), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } diff --git a/tests/functional/StatusLabelsCest.php b/tests/functional/StatusLabelsCest.php index e6807c247f..ff1ec90961 100644 --- a/tests/functional/StatusLabelsCest.php +++ b/tests/functional/StatusLabelsCest.php @@ -33,7 +33,7 @@ class StatusLabelsCest public function passesCorrectValidation(FunctionalTester $I) { - $status = factory(App\Models\Statuslabel::class)->states('pending')->make(); + $status = \App\Models\Statuslabel::factory()->pending()->make(); $submitValues = [ 'name' => 'Testing Status', 'statuslabel_types' => 'pending', diff --git a/tests/functional/SuppliersCest.php b/tests/functional/SuppliersCest.php index ed80088f24..69746f86a5 100644 --- a/tests/functional/SuppliersCest.php +++ b/tests/functional/SuppliersCest.php @@ -31,7 +31,7 @@ class SuppliersCest public function passesCorrectValidation(FunctionalTester $I) { - $supplier = factory(App\Models\Supplier::class)->make(); + $supplier = \App\Models\Supplier::factory()->make(); $values = [ 'name' => $supplier->name, @@ -58,7 +58,7 @@ class SuppliersCest public function allowsDelete(FunctionalTester $I) { $I->wantTo('Ensure I can delete a supplier'); - $supplier = factory(App\Models\Supplier::class)->create(); + $supplier = \App\Models\Supplier::factory()->create(); $I->sendDelete(route('suppliers.destroy', $supplier->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); } diff --git a/tests/functional/UsersCest.php b/tests/functional/UsersCest.php index a235415dc2..e861694918 100644 --- a/tests/functional/UsersCest.php +++ b/tests/functional/UsersCest.php @@ -48,7 +48,7 @@ class UsersCest public function passesCorrectValidation(FunctionalTester $I) { - $user = factory(App\Models\User::class)->make(); + $user = \App\Models\User::factory()->make(); $submitValues = [ 'first_name' => $user->first_name, 'last_name' => $user->last_name, @@ -90,7 +90,7 @@ class UsersCest public function allowsDelete(FunctionalTester $I) { - $user = factory(App\Models\User::class)->create(); + $user = \App\Models\User::factory()->create(); $I->wantTo('Ensure I can delete a user'); $I->sendDelete(route('users.destroy', $user->id), ['_token' => csrf_token()]); $I->seeResponseCodeIs(200); diff --git a/tests/unit/AccessoryTest.php b/tests/unit/AccessoryTest.php index 0fff1c87fc..a3c7e73372 100644 --- a/tests/unit/AccessoryTest.php +++ b/tests/unit/AccessoryTest.php @@ -35,7 +35,7 @@ class AccessoryTest extends BaseTest // An Accessory name has a min length of 3 // An Accessory has a min qty of 1 // An Accessory has a min amount of 0 - $a = factory(Accessory::class)->make([ + $a = Accessory::factory()->make([ 'name' => 'a', 'qty' => 0, 'min_amt' => -1, @@ -55,13 +55,13 @@ class AccessoryTest extends BaseTest public function testCategoryIdMustExist() { $category = $this->createValidCategory('accessory-keyboard-category', ['category_type' => 'accessory']); - $accessory = factory(Accessory::class)->states('apple-bt-keyboard')->make(['category_id' => $category->id]); + $accessory = Accessory::factory()->appleBtKeyboard()->make(['category_id' => $category->id]); $this->createValidManufacturer('apple'); $accessory->save(); $this->assertTrue($accessory->isValid()); $newId = $category->id + 1; - $accessory = factory(Accessory::class)->states('apple-bt-keyboard')->make(['category_id' => $newId]); + $accessory = Accessory::factory()->appleBtKeyboard()->make(['category_id' => $newId]); $accessory->save(); $this->assertFalse($accessory->isValid()); @@ -70,22 +70,22 @@ class AccessoryTest extends BaseTest public function testAnAccessoryBelongsToACompany() { - $accessory = factory(Accessory::class) - ->create(['company_id' => factory(App\Models\Company::class)->create()->id]); + $accessory = Accessory::factory() + ->create(['company_id' => \App\Models\Company::factory()->create()->id]); $this->assertInstanceOf(App\Models\Company::class, $accessory->company); } public function testAnAccessoryHasALocation() { - $accessory = factory(Accessory::class) - ->create(['location_id' => factory(App\Models\Location::class)->create()->id]); + $accessory = Accessory::factory() + ->create(['location_id' => \App\Models\Location::factory()->create()->id]); $this->assertInstanceOf(App\Models\Location::class, $accessory->location); } public function testAnAccessoryBelongsToACategory() { - $accessory = factory(Accessory::class)->states('apple-bt-keyboard') - ->create(['category_id' => factory(Category::class)->states('accessory-keyboard-category')->create(['category_type' => 'accessory'])->id]); + $accessory = Accessory::factory()->appleBtKeyboard() + ->create(['category_id' => Category::factory()->accessoryKeyboardCategory()->create(['category_type' => 'accessory'])->id]); $this->assertInstanceOf(App\Models\Category::class, $accessory->category); $this->assertEquals('accessory', $accessory->category->category_type); } @@ -94,7 +94,7 @@ class AccessoryTest extends BaseTest { $this->createValidManufacturer('apple'); $this->createValidCategory('accessory-keyboard-category'); - $accessory = factory(Accessory::class)->states('apple-bt-keyboard')->create(['category_id' => 1]); + $accessory = Accessory::factory()->appleBtKeyboard()->create(['category_id' => 1]); $this->assertInstanceOf(App\Models\Manufacturer::class, $accessory->manufacturer); } } diff --git a/tests/unit/AssetTest.php b/tests/unit/AssetTest.php index e27f535920..84b83f1f27 100644 --- a/tests/unit/AssetTest.php +++ b/tests/unit/AssetTest.php @@ -74,7 +74,7 @@ class AssetTest extends BaseTest */ public function testWarrantyExpiresAttribute() { - $asset = factory(Asset::class)->states('laptop-mbp')->create([ + $asset = Asset::factory()->laptopMbp()->create([ 'model_id' => $this->createValidAssetModel()->id, 'supplier_id' => $this->createvalidSupplier()->id, 'rtd_location_id' => $this->createValidLocation()->id, @@ -110,7 +110,7 @@ class AssetTest extends BaseTest public function testModelIdMustExist() { $model = $this->createValidAssetModel(); - $asset = factory(Asset::class)->make([ + $asset = Asset::factory()->make([ 'model_id' => $model->id, 'supplier_id' => $this->createValidSupplier()->id, 'rtd_location_id' => $this->createValidLocation()->id, @@ -118,7 +118,7 @@ class AssetTest extends BaseTest $asset->save(); $this->assertTrue($asset->isValid()); $newId = $model->id + 1; - $asset = factory(Asset::class)->make(['model_id' => $newId]); + $asset = Asset::factory()->make(['model_id' => $newId]); $asset->save(); $this->assertFalse($asset->isValid()); @@ -126,7 +126,7 @@ class AssetTest extends BaseTest public function testAnAssetHasRelationships() { - $asset = factory(Asset::class)->states('laptop-mbp') + $asset = Asset::factory()->laptopMbp() ->create([ 'model_id' => $this->createValidAssetModel()->id, 'company_id' => $this->createValidCompany()->id, @@ -147,13 +147,12 @@ class AssetTest extends BaseTest // Then it is available for checkout // An asset assigned to someone should not be available for checkout. - $assetAssigned = factory(Asset::class) - ->states('laptop-mbp', 'assigned-to-user') + $assetAssigned = Asset::factory()->laptopMbp()->assignedToUser() ->create(['model_id' => $this->createValidAssetModel()]); $this->assertFalse($assetAssigned->availableForCheckout()); // An asset with a non deployable statuslabel should not be available for checkout. - $assetUndeployable = factory(Asset::class)->create([ + $assetUndeployable = Asset::factory()->create([ 'status_id' => $this->createValidStatuslabel('archived')->id, 'model_id' => $this->createValidAssetModel(), ]); @@ -161,13 +160,13 @@ class AssetTest extends BaseTest $this->assertFalse($assetUndeployable->availableForCheckout()); // An asset that has been deleted is not avaiable for checkout. - $assetDeleted = factory(Asset::class)->states('deleted')->create([ + $assetDeleted = Asset::factory()->deleted()->create([ 'model_id' => $this->createValidAssetModel(), ]); $this->assertFalse($assetDeleted->availableForCheckout()); // A ready to deploy asset that isn't assigned to anyone is available for checkout - $asset = factory(Asset::class)->create([ + $asset = Asset::factory()->create([ 'status_id' => $this->createValidStatuslabel('rtd')->id, 'model_id' => $this->createValidAssetModel(), ]); @@ -178,7 +177,7 @@ class AssetTest extends BaseTest { $asset = $this->createValidAsset(); - $components = factory(App\Models\Component::class, 5)->states('ram-crucial4')->create([ + $components = \App\Models\Component::factory()->count(5)->ramCrucial4()->create([ 'category_id' => $this->createValidCategory('component-hdd-category')->id, ]); @@ -197,7 +196,7 @@ class AssetTest extends BaseTest 'supplier_id' => $this->createValidSupplier()->id, ]); $this->assertCount(0, $asset->uploads); - factory(App\Models\Actionlog::class, 'asset-upload')->create(['item_id' => $asset->id]); + \App\Models\Actionlog::factory()->count('asset-upload')->create(['item_id' => $asset->id]); $this->assertCount(1, $asset->fresh()->uploads); } @@ -222,8 +221,8 @@ class AssetTest extends BaseTest $asset = $this->createValidAsset(); $adminUser = $this->signIn(); - $target = factory(App\Models\User::class)->create([ - 'location_id' => factory(App\Models\Location::class)->create(), + $target = \App\Models\User::factory()->create([ + 'location_id' => \App\Models\Location::factory()->create(), ]); // An Asset Can be checked out to a user, and this should be logged. $asset->checkOut($target, $adminUser); @@ -318,7 +317,7 @@ class AssetTest extends BaseTest public function testAnAssetHasMaintenances() { $asset = $this->createValidAsset(); - factory(App\Models\AssetMaintenance::class)->create(['asset_id' => $asset->id]); + \App\Models\AssetMaintenance::factory()->create(['asset_id' => $asset->id]); $this->assertCount(1, $asset->assetmaintenances); } } diff --git a/tests/unit/BaseTest.php b/tests/unit/BaseTest.php index f375ef2958..a2e81599b1 100644 --- a/tests/unit/BaseTest.php +++ b/tests/unit/BaseTest.php @@ -12,13 +12,13 @@ class BaseTest extends \Codeception\TestCase\Test protected function _before() { Artisan::call('migrate'); - factory(App\Models\Setting::class)->create(); + \App\Models\Setting::factory()->create(); } protected function signIn($user = null) { if (! $user) { - $user = factory(User::class)->states('superuser')->create([ + $user = User::factory()->superuser()->create([ 'location_id' => $this->createValidLocation()->id, ]); } @@ -29,7 +29,7 @@ class BaseTest extends \Codeception\TestCase\Test protected function createValidAssetModel($state = 'mbp-13-model', $overrides = []) { - return factory(\App\Models\AssetModel::class)->states($state)->create(array_merge([ + return \App\Models\AssetModel::factory()->state()->create(array_merge([ 'category_id' => $this->createValidCategory(), 'manufacturer_id' => $this->createValidManufacturer(), 'depreciation_id' => $this->createValidDepreciation(), @@ -38,49 +38,49 @@ class BaseTest extends \Codeception\TestCase\Test protected function createValidCategory($state = 'asset-laptop-category', $overrides = []) { - return factory(App\Models\Category::class)->states($state)->create($overrides); + return \App\Models\Category::factory()->state()->create($overrides); } protected function createValidCompany($overrides = []) { - return factory(App\Models\Company::class)->create($overrides); + return \App\Models\Company::factory()->create($overrides); } protected function createValidDepartment($state = 'engineering', $overrides = []) { - return factory(App\Models\Department::class)->states($state)->create(array_merge([ + return \App\Models\Department::factory()->state()->create(array_merge([ 'location_id' => $this->createValidLocation()->id, ], $overrides)); } protected function createValidDepreciation($state = 'computer', $overrides = []) { - return factory(App\Models\Depreciation::class)->states($state)->create($overrides); + return \App\Models\Depreciation::factory()->state()->create($overrides); } protected function createValidLocation($overrides = []) { - return factory(App\Models\Location::class)->create($overrides); + return \App\Models\Location::factory()->create($overrides); } protected function createValidManufacturer($state = 'apple', $overrides = []) { - return factory(App\Models\Manufacturer::class)->states($state)->create($overrides); + return \App\Models\Manufacturer::factory()->state()->create($overrides); } protected function createValidSupplier($overrides = []) { - return factory(App\Models\Supplier::class)->create($overrides); + return \App\Models\Supplier::factory()->create($overrides); } protected function createValidStatuslabel($state = 'rtd', $overrides = []) { - return factory(App\Models\Statuslabel::class)->states($state)->create($overrides); + return \App\Models\Statuslabel::factory()->state()->create($overrides); } protected function createValidUser($overrides = []) { - return factory(App\Models\User::class)->create( + return \App\Models\User::factory()->create( array_merge([ 'location_id'=>$this->createValidLocation()->id, ], $overrides) @@ -92,7 +92,7 @@ class BaseTest extends \Codeception\TestCase\Test $locId = $this->createValidLocation()->id; $this->createValidAssetModel(); - return factory(\App\Models\Asset::class)->states('laptop-mbp')->create( + return \App\Models\Asset::factory()->laptopMbp()->create( array_merge([ 'rtd_location_id' => $locId, 'location_id' => $locId, diff --git a/tests/unit/CategoryTest.php b/tests/unit/CategoryTest.php index 61bfbc72a1..88ca9c3d28 100644 --- a/tests/unit/CategoryTest.php +++ b/tests/unit/CategoryTest.php @@ -33,7 +33,7 @@ class CategoryTest extends BaseTest { $this->createValidAssetModel(); //This will seed various things to make the following work better. $category = $this->createValidCategory('asset-desktop-category'); - $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['category_id' => $category->id]); + $models = \App\Models\AssetModel::factory()->count(5)->mbp13Model()->create(['category_id' => $category->id]); $this->assertEquals(5, $category->models->count()); $this->assertCount(5, $category->models); @@ -49,7 +49,7 @@ class CategoryTest extends BaseTest public function testACategoryCanHaveAccessories() { $category = $this->createValidCategory('accessory-keyboard-category'); - factory(App\Models\Accessory::class, 5)->states('apple-bt-keyboard')->create(['category_id' => $category->id]); + \App\Models\Accessory::factory()->count(5)->appleBtKeyboard()->create(['category_id' => $category->id]); $this->assertCount(5, $category->accessories); $this->assertEquals(5, $category->itemCount()); @@ -58,7 +58,7 @@ class CategoryTest extends BaseTest public function testACategoryCanHaveConsumables() { $category = $this->createValidCategory('consumable-paper-category'); - factory(App\Models\Consumable::class, 5)->states('cardstock')->create(['category_id' => $category->id]); + \App\Models\Consumable::factory()->count(5)->cardstock()->create(['category_id' => $category->id]); $this->assertCount(5, $category->consumables); $this->assertEquals(5, $category->itemCount()); } @@ -66,7 +66,7 @@ class CategoryTest extends BaseTest public function testACategoryCanHaveComponents() { $category = $this->createValidCategory('component-ram-category'); - factory(App\Models\Component::class, 5)->states('ram-crucial4')->create(['category_id' => $category->id]); + \App\Models\Component::factory()->count(5)->ramCrucial4()->create(['category_id' => $category->id]); $this->assertCount(5, $category->components); $this->assertEquals(5, $category->itemCount()); } diff --git a/tests/unit/CompanyTest.php b/tests/unit/CompanyTest.php index c3d663a42b..7fe40ddb25 100644 --- a/tests/unit/CompanyTest.php +++ b/tests/unit/CompanyTest.php @@ -45,10 +45,10 @@ class CompanyTest extends BaseTest public function testACompanyCanHaveLicenses() { $company = $this->createValidCompany(); - factory(App\Models\License::class, 1)->states('acrobat')->create([ + \App\Models\License::factory()->count(1)->acrobat()->create([ 'company_id'=>$company->id, - 'manufacturer_id' => factory(App\Models\Manufacturer::class)->states('adobe')->create()->id, - 'category_id' => factory(App\Models\Category::class)->states('license-office-category')->create()->id, + 'manufacturer_id' => \App\Models\Manufacturer::factory()->adobe()->create()->id, + 'category_id' => \App\Models\Category::factory()->licenseOfficeCategory()->create()->id, ]); $this->assertCount(1, $company->licenses); } @@ -56,8 +56,8 @@ class CompanyTest extends BaseTest public function testACompanyCanHaveAccessories() { $company = $this->createValidCompany(); - $a = factory(App\Models\Accessory::class)->states('apple-bt-keyboard')->create([ - 'category_id' => factory(App\Models\Category::class)->states('accessory-keyboard-category')->create()->id, + $a = \App\Models\Accessory::factory()->appleBtKeyboard()->create([ + 'category_id' => \App\Models\Category::factory()->accessoryKeyboardCategory()->create()->id, 'company_id' => $company->id, ]); @@ -67,9 +67,9 @@ class CompanyTest extends BaseTest public function testACompanyCanHaveConsumables() { $company = $this->createValidCompany(); - factory(App\Models\Consumable::class, 1)->states('cardstock')->create([ + \App\Models\Consumable::factory()->count(1)->cardstock()->create([ 'company_id' => $company->id, - 'category_id' => factory(App\Models\Category::class)->states('consumable-paper-category')->create()->id, + 'category_id' => \App\Models\Category::factory()->consumablePaperCategory()->create()->id, ]); $this->assertCount(1, $company->consumables); } @@ -77,9 +77,9 @@ class CompanyTest extends BaseTest public function testACompanyCanHaveComponents() { $company = $this->createValidCompany(); - factory(App\Models\Component::class, 1)->states('ram-crucial4')->create([ + \App\Models\Component::factory()->count(1)->ramCrucial4()->create([ 'company_id'=>$company->id, - 'category_id' => factory(App\Models\Category::class)->states('component-ram-category')->create()->id, + 'category_id' => \App\Models\Category::factory()->componentRamCategory()->create()->id, ]); $this->assertCount(1, $company->components); } diff --git a/tests/unit/ComponentTest.php b/tests/unit/ComponentTest.php index 25aac1f683..985c2c8f7a 100644 --- a/tests/unit/ComponentTest.php +++ b/tests/unit/ComponentTest.php @@ -37,7 +37,7 @@ class ComponentTest extends BaseTest // An Component name has a min length of 3 // An Component has a min qty of 1 // An Component has a min amount of 0 - $a = factory(Component::class)->make([ + $a = Component::factory()->make([ 'name' => 'a', 'qty' => 0, 'min_amt' => -1, @@ -58,15 +58,14 @@ class ComponentTest extends BaseTest { $category = $this->createValidCategory('component-hdd-category', ['category_type' => 'component']); - $component = factory(Component::class) - ->states('ssd-crucial240') + $component = Component::factory()->ssdCrucial240() ->make(['category_id' => $category->id]); $this->createValidManufacturer('apple'); $component->save(); $this->assertTrue($component->isValid()); $newId = $category->id + 1; - $component = factory(Component::class)->states('ssd-crucial240')->make(['category_id' => $newId]); + $component = Component::factory()->ssdCrucial240()->make(['category_id' => $newId]); $component->save(); $this->assertFalse($component->isValid()); @@ -75,24 +74,23 @@ class ComponentTest extends BaseTest public function testAnComponentBelongsToACompany() { - $component = factory(Component::class) - ->create(['company_id' => factory(Company::class)->create()->id]); + $component = Component::factory() + ->create(['company_id' => Company::factory()->create()->id]); $this->assertInstanceOf(Company::class, $component->company); } public function testAnComponentHasALocation() { - $component = factory(Component::class) - ->create(['location_id' => factory(Location::class)->create()->id]); + $component = Component::factory() + ->create(['location_id' => Location::factory()->create()->id]); $this->assertInstanceOf(Location::class, $component->location); } public function testAnComponentBelongsToACategory() { - $component = factory(Component::class)->states('ssd-crucial240') + $component = Component::factory()->ssdCrucial240() ->create([ - 'category_id' => factory(Category::class) - ->states('component-hdd-category') + 'category_id' => Category::factory()->componentHddCategory() ->create(['category_type' => 'component'])->id, ]); $this->assertInstanceOf(Category::class, $component->category); diff --git a/tests/unit/ConsumableTest.php b/tests/unit/ConsumableTest.php index 2a41824fff..276699e6f2 100644 --- a/tests/unit/ConsumableTest.php +++ b/tests/unit/ConsumableTest.php @@ -32,7 +32,7 @@ class ConsumableTest extends BaseTest public function testAConsumableHasRelationships() { - $consumable = factory(Consumable::class)->states('cardstock')->create([ + $consumable = Consumable::factory()->cardstock()->create([ 'category_id' => $this->createValidCategory('consumable-paper-category')->id, 'manufacturer_id' => $this->createValidManufacturer('apple')->id, 'company_id' => $this->createValidCompany()->id, diff --git a/tests/unit/CustomFieldTest.php b/tests/unit/CustomFieldTest.php index 345e833fbb..33fbae5db7 100644 --- a/tests/unit/CustomFieldTest.php +++ b/tests/unit/CustomFieldTest.php @@ -21,7 +21,7 @@ class CustomFieldTest extends BaseTest public function testFormat() { - $customfield = factory(CustomField::class)->make(['format' => 'IP']); + $customfield = CustomField::factory()->make(['format' => 'IP']); $values = [ 'name' => $customfield->name, 'format' => $customfield->format, diff --git a/tests/unit/DepreciationTest.php b/tests/unit/DepreciationTest.php index 4e1732ec38..69dccb5ce9 100644 --- a/tests/unit/DepreciationTest.php +++ b/tests/unit/DepreciationTest.php @@ -32,7 +32,7 @@ class DepreciationTest extends BaseTest { $this->createValidAssetModel(); $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); - $models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['depreciation_id'=>$depreciation->id]); + $models = \App\Models\AssetModel::factory()->count(5)->mbp13Model()->create(['depreciation_id'=>$depreciation->id]); $this->assertEquals(5, $depreciation->models->count()); } @@ -40,7 +40,7 @@ class DepreciationTest extends BaseTest { $category = $this->createValidCategory('license-graphics-category'); $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); - $licenses = factory(App\Models\License::class, 5)->states('photoshop')->create([ + $licenses = \App\Models\License::factory()->count(5)->photoshop()->create([ 'depreciation_id'=>$depreciation->id, 'category_id' => $category->id, ]); diff --git a/tests/unit/ImporterTest.php b/tests/unit/ImporterTest.php index f0a3c51098..b0cb05f6ee 100644 --- a/tests/unit/ImporterTest.php +++ b/tests/unit/ImporterTest.php @@ -205,21 +205,21 @@ Bonnie Nelson,bnelson0@cdbaby.com,bnelson0,eget nunc donec quis,quam,massa id,Li EOT; // Need to do this manually... - $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); - $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); + $customField = \App\Models\CustomField::factory()->create(['name' => 'Weight']); + $customFieldSet = \App\Models\CustomFieldset::factory()->create(['name' => 'Default']); $customFieldSet->fields()->attach($customField, [ 'required' => false, 'order' => 'asc', ]); - factory(App\Models\Category::class)->states('asset-laptop-category')->create([ + \App\Models\Category::factory()->assetLaptopCategory()->create([ 'name' => 'quam', ]); - factory(App\Models\Manufacturer::class)->states('apple')->create([ + \App\Models\Manufacturer::factory()->apple()->create([ 'name' => 'Linkbridge', ]); - $am = factory(App\Models\AssetModel::class)->create([ + $am = \App\Models\AssetModel::factory()->create([ 'name' => 'massa id', 'fieldset_id' => $customFieldSet->id, 'category_id' => 1, @@ -246,13 +246,13 @@ EOT; public function initializeCustomFields() { - $customField = factory(App\Models\CustomField::class)->create(['name' => 'Weight']); - $customFieldSet = factory(App\Models\CustomFieldset::class)->create(['name' => 'Default']); + $customField = \App\Models\CustomField::factory()->create(['name' => 'Weight']); + $customFieldSet = \App\Models\CustomFieldset::factory()->create(['name' => 'Default']); $customFieldSet->fields()->attach($customField, [ 'required' => false, 'order' => 'asc', ]); - $am = factory(App\Models\AssetModel::class)->create([ + $am = \App\Models\AssetModel::factory()->create([ 'name' => 'massa id', 'fieldset_id' => $customFieldSet->id, ]); diff --git a/tests/unit/LocationTest.php b/tests/unit/LocationTest.php index e1675b23f5..2bb330cb49 100644 --- a/tests/unit/LocationTest.php +++ b/tests/unit/LocationTest.php @@ -17,7 +17,7 @@ class LocationTest extends BaseTest { $this->createValidLocation(['id' => 10]); - $a = factory(Location::class)->make([ + $a = Location::factory()->make([ 'name' => 'Test Location', 'id' => 1, 'parent_id' => 10, @@ -28,7 +28,7 @@ class LocationTest extends BaseTest public function testFailsIfSelfParent() { - $a = factory(Location::class)->make([ + $a = Location::factory()->make([ 'name' => 'Test Location', 'id' => 1, 'parent_id' => 1, diff --git a/tests/unit/NotificationTest.php b/tests/unit/NotificationTest.php index 16fb185c9f..72d815b498 100644 --- a/tests/unit/NotificationTest.php +++ b/tests/unit/NotificationTest.php @@ -22,7 +22,7 @@ class NotificationTest extends BaseTest public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA() { - $admin = factory(User::class)->states('superuser')->create(); + $admin = User::factory()->superuser()->create(); Auth::login($admin); $cat = $this->createValidCategory('asset-laptop-category', ['require_acceptance' => true]); $model = $this->createValidAssetModel('mbp-13-model', ['category_id' => $cat->id]); diff --git a/tests/unit/PermissionsTest.php b/tests/unit/PermissionsTest.php index fa7ac3e081..8c7d3a101f 100644 --- a/tests/unit/PermissionsTest.php +++ b/tests/unit/PermissionsTest.php @@ -72,7 +72,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_no_permissions_sees_nothing() { - $u = factory(App\Models\User::class)->create(); + $u = \App\Models\User::factory()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; // $permissions = $this->noHardware; $this->hitRoutes($permissions, $u); @@ -83,7 +83,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_asset_permissions_can_view_assets() { - $u = factory(App\Models\User::class)->states('view-assets')->create(); + $u = \App\Models\User::factory()->viewAssets()->create(); $permissions = $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -100,7 +100,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_asset_permissions_can_create_assets() { - $u = factory(App\Models\User::class)->states('create-assets')->create(); + $u = \App\Models\User::factory()->createAssets()->create(); $permissions = $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -117,7 +117,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_assets_permissions_can_edit_assets() { - $u = factory(App\Models\User::class)->states('edit-assets')->create(); + $u = \App\Models\User::factory()->editAssets()->create(); $permissions = $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -135,7 +135,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_assets_permissions_can_delete_assets() { - $u = factory(App\Models\User::class)->states('delete-assets')->create(); + $u = \App\Models\User::factory()->deleteAssets()->create(); $permissions = $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ 'assets.view' => false, @@ -151,7 +151,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_licenses_permissions_can_view_licenses() { - $u = factory(App\Models\User::class)->states('view-licenses')->create(); + $u = \App\Models\User::factory()->viewLicenses()->create(); $permissions = $this->noHardware + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -168,7 +168,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_licenses_permissions_can_create_licenses() { - $u = factory(App\Models\User::class)->states('create-licenses')->create(); + $u = \App\Models\User::factory()->createLicenses()->create(); $permissions = $this->noHardware + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -185,7 +185,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_licenses_permissions_can_edit_licenses() { - $u = factory(App\Models\User::class)->states('edit-licenses')->create(); + $u = \App\Models\User::factory()->editLicenses()->create(); $permissions = $this->noHardware + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -202,7 +202,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_licenses_permissions_can_delete_licenses() { - $u = factory(App\Models\User::class)->states('delete-licenses')->create(); + $u = \App\Models\User::factory()->deleteLicenses()->create(); $permissions = $this->noHardware + $this->noAccessories + $this->noConsumables + $this->noComponents + $this->noUsers; $permissions = array_merge($permissions, [ @@ -219,7 +219,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_accessories_permissions_can_view_accessories() { - $u = factory(App\Models\User::class)->states('view-accessories')->create(); + $u = \App\Models\User::factory()->viewAccessories()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -237,7 +237,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_accessories_permissions_can_create_accessories() { - $u = factory(App\Models\User::class)->states('create-accessories')->create(); + $u = \App\Models\User::factory()->createAccessories()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -255,7 +255,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_accessories_permissions_can_edit_accessories() { - $u = factory(App\Models\User::class)->states('edit-accessories')->create(); + $u = \App\Models\User::factory()->editAccessories()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -273,7 +273,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_accessories_permissions_can_delete_accessories() { - $u = factory(App\Models\User::class)->states('delete-accessories')->create(); + $u = \App\Models\User::factory()->deleteAccessories()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -291,7 +291,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_consumables_permissions_can_view_consumables() { - $u = factory(App\Models\User::class)->states('view-consumables')->create(); + $u = \App\Models\User::factory()->viewConsumables()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noComponents + $this->noUsers; @@ -309,7 +309,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_consumables_permissions_can_create_consumables() { - $u = factory(App\Models\User::class)->states('create-consumables')->create(); + $u = \App\Models\User::factory()->createConsumables()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noConsumables + $this->noComponents + $this->noUsers; @@ -327,7 +327,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_consumables_permissions_can_edit_consumables() { - $u = factory(App\Models\User::class)->states('edit-consumables')->create(); + $u = \App\Models\User::factory()->editConsumables()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noComponents + $this->noUsers; @@ -345,7 +345,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_consumables_permissions_can_delete_consumables() { - $u = factory(App\Models\User::class)->states('delete-consumables')->create(); + $u = \App\Models\User::factory()->deleteConsumables()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noComponents + $this->noUsers; @@ -363,7 +363,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_users_permissions_can_view_users() { - $u = factory(App\Models\User::class)->states('view-users')->create(); + $u = \App\Models\User::factory()->viewUsers()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; @@ -381,7 +381,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_users_permissions_can_create_users() { - $u = factory(App\Models\User::class)->states('create-users')->create(); + $u = \App\Models\User::factory()->createUsers()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; @@ -399,7 +399,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_users_permissions_can_edit_users() { - $u = factory(App\Models\User::class)->states('edit-users')->create(); + $u = \App\Models\User::factory()->editUsers()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; @@ -417,7 +417,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_users_permissions_can_delete_users() { - $u = factory(App\Models\User::class)->states('delete-users')->create(); + $u = \App\Models\User::factory()->deleteUsers()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noComponents; @@ -435,7 +435,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_view_components_permissions_can_view_components() { - $u = factory(App\Models\User::class)->states('view-components')->create(); + $u = \App\Models\User::factory()->viewComponents()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; @@ -453,7 +453,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_create_components_permissions_can_create_components() { - $u = factory(App\Models\User::class)->states('create-components')->create(); + $u = \App\Models\User::factory()->createComponents()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; $permissions = array_merge($permissions, [ @@ -470,7 +470,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_edit_components_permissions_can_edit_components() { - $u = factory(App\Models\User::class)->states('edit-components')->create(); + $u = \App\Models\User::factory()->editComponents()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; @@ -488,7 +488,7 @@ class PermissionsTest extends BaseTest */ public function a_user_with_delete_components_permissions_can_delete_components() { - $u = factory(App\Models\User::class)->states('delete-components')->create(); + $u = \App\Models\User::factory()->deleteComponents()->create(); $permissions = $this->noHardware + $this->noLicenses + $this->noAccessories + $this->noConsumables + $this->noUsers; diff --git a/tests/unit/StatuslabelTest.php b/tests/unit/StatuslabelTest.php index e953b6b861..6cbc582235 100644 --- a/tests/unit/StatuslabelTest.php +++ b/tests/unit/StatuslabelTest.php @@ -15,7 +15,7 @@ class StatuslabelTest extends BaseTest public function testRTDStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('rtd')->make(); + $statuslabel = Statuslabel::factory()->rtd()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -30,7 +30,7 @@ class StatuslabelTest extends BaseTest public function testPendingStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('pending')->make(); + $statuslabel = Statuslabel::factory()->pending()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -44,7 +44,7 @@ class StatuslabelTest extends BaseTest public function testArchivedStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('archived')->make(); + $statuslabel = Statuslabel::factory()->archived()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -58,7 +58,7 @@ class StatuslabelTest extends BaseTest public function testOutForRepairStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('out_for_repair')->make(); + $statuslabel = Statuslabel::factory()->outForRepair()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -72,7 +72,7 @@ class StatuslabelTest extends BaseTest public function testOutForDiagnosticsStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('out_for_diagnostics')->make(); + $statuslabel = Statuslabel::factory()->outForDiagnostics()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -86,7 +86,7 @@ class StatuslabelTest extends BaseTest public function testBrokenStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('broken')->make(); + $statuslabel = Statuslabel::factory()->broken()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, @@ -100,7 +100,7 @@ class StatuslabelTest extends BaseTest public function testLostStatuslabelAdd() { - $statuslabel = factory(Statuslabel::class)->states('lost')->make(); + $statuslabel = Statuslabel::factory()->lost()->make(); $values = [ 'name' => $statuslabel->name, 'deployable' => $statuslabel->deployable, From c90b1c6a43e2e36a659be02504d7911375d8a727 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:00 +0000 Subject: [PATCH 11/19] Namespace seeders --- database/{seeds => seeders}/.gitkeep | 0 database/{seeds => seeders}/AccessorySeeder.php | 2 ++ database/{seeds => seeders}/ActionlogSeeder.php | 2 ++ database/{seeds => seeders}/AssetModelSeeder.php | 2 ++ database/{seeds => seeders}/AssetSeeder.php | 2 ++ database/{seeds => seeders}/CategorySeeder.php | 2 ++ database/{seeds => seeders}/CompanySeeder.php | 2 ++ database/{seeds => seeders}/ComponentSeeder.php | 2 ++ database/{seeds => seeders}/ConsumableSeeder.php | 2 ++ database/{seeds => seeders}/CustomFieldSeeder.php | 2 ++ database/{seeds => seeders}/DatabaseSeeder.php | 11 +++++++++++ database/{seeds => seeders}/DepartmentSeeder.php | 2 ++ database/{seeds => seeders}/DepreciationSeeder.php | 2 ++ database/{seeds => seeders}/LicenseSeeder.php | 2 ++ database/{seeds => seeders}/LocationSeeder.php | 2 ++ database/{seeds => seeders}/ManufacturerSeeder.php | 2 ++ database/{seeds => seeders}/SettingsSeeder.php | 2 ++ database/{seeds => seeders}/StatuslabelSeeder.php | 2 ++ database/{seeds => seeders}/SupplierSeeder.php | 2 ++ database/{seeds => seeders}/UserSeeder.php | 2 ++ 20 files changed, 47 insertions(+) rename database/{seeds => seeders}/.gitkeep (100%) rename database/{seeds => seeders}/AccessorySeeder.php (97%) rename database/{seeds => seeders}/ActionlogSeeder.php (91%) rename database/{seeds => seeders}/AssetModelSeeder.php (98%) rename database/{seeds => seeders}/AssetSeeder.php (98%) rename database/{seeds => seeders}/CategorySeeder.php (97%) rename database/{seeds => seeders}/CompanySeeder.php (97%) rename database/{seeds => seeders}/ComponentSeeder.php (94%) rename database/{seeds => seeders}/ConsumableSeeder.php (93%) rename database/{seeds => seeders}/CustomFieldSeeder.php (98%) rename database/{seeds => seeders}/DatabaseSeeder.php (81%) rename database/{seeds => seeders}/DepartmentSeeder.php (95%) rename database/{seeds => seeders}/DepreciationSeeder.php (93%) rename database/{seeds => seeders}/LicenseSeeder.php (94%) rename database/{seeds => seeders}/LocationSeeder.php (97%) rename database/{seeds => seeders}/ManufacturerSeeder.php (98%) rename database/{seeds => seeders}/SettingsSeeder.php (98%) rename database/{seeds => seeders}/StatuslabelSeeder.php (95%) rename database/{seeds => seeders}/SupplierSeeder.php (88%) rename database/{seeds => seeders}/UserSeeder.php (94%) diff --git a/database/seeds/.gitkeep b/database/seeders/.gitkeep similarity index 100% rename from database/seeds/.gitkeep rename to database/seeders/.gitkeep diff --git a/database/seeds/AccessorySeeder.php b/database/seeders/AccessorySeeder.php similarity index 97% rename from database/seeds/AccessorySeeder.php rename to database/seeders/AccessorySeeder.php index dc9a1704dd..2a86679f19 100644 --- a/database/seeds/AccessorySeeder.php +++ b/database/seeders/AccessorySeeder.php @@ -1,5 +1,7 @@ Date: Thu, 10 Jun 2021 20:18:01 +0000 Subject: [PATCH 12/19] Shift PSR-4 autoloading --- composer.json | 224 +++++++++++++++++++++++++------------------------- 1 file changed, 113 insertions(+), 111 deletions(-) diff --git a/composer.json b/composer.json index 1c8cb94520..9285c0951f 100644 --- a/composer.json +++ b/composer.json @@ -1,115 +1,117 @@ { - "name": "snipe/snipe-it", - "description": "Open source asset management system built on Laravel.", - "keywords": [ - "assets", - "asset-management", - "it-tools", - "inventory", - "laravel" - ], - "license": "AGPL-3.0-or-later", - "type": "project", - "require": { - "php": "^7.2.5", - "ext-curl": "*", - "ext-fileinfo": "*", - "ext-json": "*", - "ext-mbstring": "*", - "ext-pdo": "*", - "adldap2/adldap2": "^10.2", - "alek13/slack": "^1.12", - "bacon/bacon-qr-code": "^1.0", - "barryvdh/laravel-cors": "^0.11.3", - "barryvdh/laravel-debugbar": "^3.2", - "doctrine/cache": "^1.10", - "doctrine/common": "^2.12", - "doctrine/dbal": "^2.10", - "doctrine/inflector": "^1.3", - "doctrine/instantiator": "^1.3", - "eduardokum/laravel-mail-auto-embed": "^1.0", - "enshrined/svg-sanitize": "^0.13.3", - "erusev/parsedown": "^1.7", - "fideloper/proxy": "^4.3", - "guzzlehttp/guzzle": "^6.5", - "intervention/image": "^2.5", - "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "^6.20", - "laravel/helpers": "^1.2", - "laravel/passport": "^9.3.2", - "laravel/slack-notification-channel": "^2.0", - "laravel/tinker": "^2.4", - "laravelcollective/html": "^6.0", - "league/csv": "^9.5", - "league/flysystem-aws-s3-v3": "^1.0", - "league/flysystem-cached-adapter": "^1.0", - "neitanod/forceutf8": "^2.0", - "nesbot/carbon": "^2.32", - "nunomaduro/collision": "^3.2", - "onelogin/php-saml": "^3.4", - "paragonie/constant_time_encoding": "^2.3", - "patchwork/utf8": "^1.3", - "phpdocumentor/reflection-docblock": "^5.1", - "phpspec/prophecy": "^1.10", - "pragmarx/google2fa-laravel": "^1.3", - "rollbar/rollbar-laravel": "^6.0", - "spatie/laravel-backup": "^6.9", - "tecnickcom/tc-lib-barcode": "^1.15", - "tightenco/ziggy": "^0.9.0", - "unicodeveloper/laravel-password": "^1.0", - "watson/validating": "^4.0" - }, - "require-dev": { - "codeception/codeception": "^4.1", - "codeception/module-asserts": "^1.2", - "codeception/module-laravel5": "^1.1", - "codeception/module-rest": "^1.2", - "codeception/module-webdriver": "^1.0", - "fzaninotto/faker": "^1.9", - "overtrue/phplint": "^2.2", - "phpunit/php-token-stream": "^3.1", - "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.5", - "symfony/css-selector": "^4.4", - "symfony/dom-crawler": "^4.4" - }, - "suggest": { - "ext-mcrypt": "For upgrading from before v5.1 this is used to re-encrypt data" - }, - "extra": { - "laravel": { - "dont-discover": [ - "rollbar/rollbar-laravel" - ] - } - }, - "autoload": { - "classmap": [ - "database" + "name": "snipe/snipe-it", + "description": "Open source asset management system built on Laravel.", + "keywords": [ + "assets", + "asset-management", + "it-tools", + "inventory", + "laravel" ], - "psr-4": { - "App\\": "app/" + "license": "AGPL-3.0-or-later", + "type": "project", + "require": { + "php": "^7.2.5", + "ext-curl": "*", + "ext-fileinfo": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pdo": "*", + "adldap2/adldap2": "^10.2", + "alek13/slack": "^1.12", + "bacon/bacon-qr-code": "^1.0", + "barryvdh/laravel-cors": "^0.11.3", + "barryvdh/laravel-debugbar": "^3.2", + "doctrine/cache": "^1.10", + "doctrine/common": "^2.12", + "doctrine/dbal": "^2.10", + "doctrine/inflector": "^1.3", + "doctrine/instantiator": "^1.3", + "eduardokum/laravel-mail-auto-embed": "^1.0", + "enshrined/svg-sanitize": "^0.13.3", + "erusev/parsedown": "^1.7", + "fideloper/proxy": "^4.3", + "guzzlehttp/guzzle": "^6.5", + "intervention/image": "^2.5", + "javiereguiluz/easyslugger": "^1.0", + "laravel/framework": "^6.20", + "laravel/helpers": "^1.2", + "laravel/passport": "^9.3.2", + "laravel/slack-notification-channel": "^2.0", + "laravel/tinker": "^2.4", + "laravelcollective/html": "^6.0", + "league/csv": "^9.5", + "league/flysystem-aws-s3-v3": "^1.0", + "league/flysystem-cached-adapter": "^1.0", + "neitanod/forceutf8": "^2.0", + "nesbot/carbon": "^2.32", + "nunomaduro/collision": "^3.2", + "onelogin/php-saml": "^3.4", + "paragonie/constant_time_encoding": "^2.3", + "patchwork/utf8": "^1.3", + "phpdocumentor/reflection-docblock": "^5.1", + "phpspec/prophecy": "^1.10", + "pragmarx/google2fa-laravel": "^1.3", + "rollbar/rollbar-laravel": "^6.0", + "spatie/laravel-backup": "^6.9", + "tecnickcom/tc-lib-barcode": "^1.15", + "tightenco/ziggy": "^0.9.0", + "unicodeveloper/laravel-password": "^1.0", + "watson/validating": "^4.0" + }, + "require-dev": { + "codeception/codeception": "^4.1", + "codeception/module-asserts": "^1.2", + "codeception/module-laravel5": "^1.1", + "codeception/module-rest": "^1.2", + "codeception/module-webdriver": "^1.0", + "fzaninotto/faker": "^1.9", + "overtrue/phplint": "^2.2", + "phpunit/php-token-stream": "^3.1", + "phpunit/phpunit": "^8.5", + "squizlabs/php_codesniffer": "^3.5", + "symfony/css-selector": "^4.4", + "symfony/dom-crawler": "^4.4" + }, + "suggest": { + "ext-mcrypt": "For upgrading from before v5.1 this is used to re-encrypt data" + }, + "extra": { + "laravel": { + "dont-discover": [ + "rollbar/rollbar-laravel" + ] + } + }, + "autoload": { + "classmap": [ + "database" + ], + "psr-4": { + "App\\": "app/", + "Database\\Factories\\": "database/factories/", + "Database\\Seeders\\": "database/seeders/" + } + }, + "autoload-dev": { + "classmap": [ + "tests/TestCase.php", + "tests/unit/BaseTest.php" + ] + }, + "scripts": { + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump" + ], + "post-create-project-cmd": [ + "php artisan key:generate" + ] + }, + "config": { + "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true, + "discard-changes": true, + "process-timeout": 3000 } - }, - "autoload-dev": { - "classmap": [ - "tests/TestCase.php", - "tests/unit/BaseTest.php" - ] - }, - "scripts": { - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump" - ], - "post-create-project-cmd": [ - "php artisan key:generate" - ] - }, - "config": { - "preferred-install": "dist", - "sort-packages": true, - "optimize-autoloader": true, - "discard-changes": true, - "process-timeout": 3000 - } } From cc3c59bf97959b0e4602e401fd3bd4db9197715c Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:10 +0000 Subject: [PATCH 13/19] Shift config files --- config/app.php | 1 + config/queue.php | 51 +++++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/config/app.php b/config/app.php index 2f3eda64b7..6c0cfd81f4 100755 --- a/config/app.php +++ b/config/app.php @@ -368,6 +368,7 @@ return [ 'Config' => Illuminate\Support\Facades\Config::class, 'Cookie' => Illuminate\Support\Facades\Cookie::class, 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'Date' => Illuminate\Support\Facades\Date::class, 'DB' => Illuminate\Support\Facades\DB::class, 'Eloquent' => Illuminate\Database\Eloquent\Model::class, 'Event' => Illuminate\Support\Facades\Event::class, diff --git a/config/queue.php b/config/queue.php index 6c2b7d2e17..25ea5a8193 100644 --- a/config/queue.php +++ b/config/queue.php @@ -4,19 +4,16 @@ return [ /* |-------------------------------------------------------------------------- - | Default Queue Driver + | Default Queue Connection Name |-------------------------------------------------------------------------- | - | The Laravel queue API supports a variety of back-ends via an unified + | Laravel's queue API supports an assortment of back-ends via a single | API, giving you convenient access to each back-end using the same - | syntax for each one. Here you may set the default queue driver. - | - | Supported: "null", "sync", "database", "beanstalkd", - | "sqs", "redis" + | syntax for every one. Here you may define a default connection. | */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'sync'), /* |-------------------------------------------------------------------------- @@ -27,6 +24,8 @@ return [ | is used by your application. A default configuration has been added | for each back-end shipped with Laravel. You are free to add more. | + | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" + | */ 'connections' => [ @@ -37,32 +36,39 @@ return [ 'database' => [ 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', - 'expire' => 60, + 'table' => 'jobs', + 'queue' => 'default', + 'retry_after' => 90, + 'after_commit' => false, ], 'beanstalkd' => [ 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'ttr' => 60, + 'host' => 'localhost', + 'queue' => 'default', + 'retry_after' => 90, + 'block_for' => 0, + 'after_commit' => false, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', - 'secret' => 'your-secret-key', - 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', - 'region' => 'us-east-1', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), + 'queue' => env('SQS_QUEUE', 'default'), + 'suffix' => env('SQS_SUFFIX'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'after_commit' => false, ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', - 'queue' => 'default', - 'expire' => 60, + 'queue' => env('REDIS_QUEUE', 'default'), + 'retry_after' => 90, + 'block_for' => null, + 'after_commit' => false, ], ], @@ -79,8 +85,9 @@ return [ */ 'failed' => [ + 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; From 7e93086dd409776c9c5df2f313b3cfda6ab28238 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:10 +0000 Subject: [PATCH 14/19] Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them and merged your true customizations - where ENV variables may not be used. --- config/auth.php | 17 +++---- config/broadcasting.php | 28 ++++++----- config/cache.php | 37 ++++++++++---- config/cors.php | 63 ++++++++++++------------ config/filesystems.php | 106 +++++++++++++--------------------------- config/logging.php | 58 ++++++++++++---------- 6 files changed, 148 insertions(+), 161 deletions(-) diff --git a/config/auth.php b/config/auth.php index e8bdb30bdc..4fc626a964 100644 --- a/config/auth.php +++ b/config/auth.php @@ -1,13 +1,5 @@ App\Models\User::class, ], + // 'users' => [ + // 'driver' => 'database', + // 'table' => 'users', + // ], ], /* @@ -102,10 +98,11 @@ return [ 'email' => 'auth.emails.password', 'table' => 'password_resets', 'expire' => env('RESET_PASSWORD_LINK_EXPIRES', 900), - 'throttle' => [ + 'throttle' => 60, 'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 5), + 'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60), - ], + ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 20512c8cbd..2d529820cc 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -1,13 +1,5 @@ env('BROADCAST_DRIVER', 'pusher'), + 'default' => env('BROADCAST_DRIVER', 'null'), /* |-------------------------------------------------------------------------- @@ -38,14 +32,20 @@ return [ 'pusher' => [ 'driver' => 'pusher', - 'key' => env('PUSHER_KEY'), - 'secret' => env('PUSHER_SECRET'), + 'key' => env('PUSHER_APP_KEY'), + 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), 'options' => [ - // + 'cluster' => env('PUSHER_APP_CLUSTER'), + 'useTLS' => true, ], ], + 'ably' => [ + 'driver' => 'ably', + 'key' => env('ABLY_KEY'), + ], + 'redis' => [ 'driver' => 'redis', 'connection' => 'default', @@ -55,6 +55,10 @@ return [ 'driver' => 'log', ], + 'null' => [ + 'driver' => 'null', + ], + ], ]; diff --git a/config/cache.php b/config/cache.php index d819784051..de0e53401f 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,12 +1,6 @@ [ @@ -42,12 +39,14 @@ return [ 'array' => [ 'driver' => 'array', + 'serialize' => false, ], 'database' => [ 'driver' => 'database', - 'table' => 'cache', + 'table' => 'cache', 'connection' => null, + 'lock_connection' => null, ], 'file' => [ @@ -56,7 +55,15 @@ return [ ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', + 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), + 'sasl' => [ + env('MEMCACHED_USERNAME'), + env('MEMCACHED_PASSWORD'), + ], + 'options' => [ + // Memcached::OPT_CONNECT_TIMEOUT => 2000, + ], 'servers' => [ [ 'host' => env('MEMCACHED_HOST', '127.0.0.1'), @@ -69,6 +76,16 @@ return [ 'redis' => [ 'driver' => 'redis', 'connection' => 'default', + 'lock_connection' => 'default', + ], + + 'dynamodb' => [ + 'driver' => 'dynamodb', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), + 'endpoint' => env('DYNAMODB_ENDPOINT'), ], ], @@ -84,6 +101,6 @@ return [ | */ - 'prefix' => env('CACHE_PREFIX', 'snipeit'), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), ]; diff --git a/config/cors.php b/config/cors.php index 2e3b8c993a..741dd11cea 100644 --- a/config/cors.php +++ b/config/cors.php @@ -1,45 +1,44 @@ false, + + 'allowedOrigins' => $allowed_origins, + + 'allowedHeaders' => ['*'], + + 'allowedMethods' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], + + 'maxAge' => 0, + /* |-------------------------------------------------------------------------- - | Laravel CORS + | Cross-Origin Resource Sharing (CORS) Configuration |-------------------------------------------------------------------------- | - | allowedOrigins, allowedHeaders and allowedMethods can be set to array('*') - | to accept any value. + | Here you may configure your settings for cross-origin resource sharing + | or "CORS". This determines what cross-origin operations may execute + | in web browsers. You are free to adjust these settings as needed. + | + | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS | */ - 'supportsCredentials' => false, - 'allowedOrigins' => $allowed_origins, - 'allowedOriginsPatterns' => [], - 'allowedHeaders' => ['*'], - 'allowedMethods' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], - 'exposedHeaders' => [], - 'maxAge' => 0, + 'paths' => ['api/*', 'sanctum/csrf-cookie'], + + 'allowed_methods' => ['*'], + + 'allowed_origins' => ['*'], + + 'allowed_origins_patterns' => [], + + 'allowed_headers' => ['*'], + + 'exposed_headers' => [], + + 'max_age' => 0, + + 'supports_credentials' => false, ]; diff --git a/config/filesystems.php b/config/filesystems.php index 2cad75b165..10c9d9be2a 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -1,6 +1,6 @@ env('PRIVATE_FILESYSTEM_DISK', 'local'), - - /* - |-------------------------------------------------------------------------- - | Default Cloud Filesystem Disk - |-------------------------------------------------------------------------- - | - | Many applications store files both locally and in the cloud. For this - | reason, you may specify a default "cloud" driver here. This driver - | will be bound as the Cloud disk implementation in the container. - | - */ - - 'cloud' => env('FILESYSTEM_CLOUD', 's3'), + 'default' => env('FILESYSTEM_DRIVER', 'local'), /* |-------------------------------------------------------------------------- @@ -37,7 +24,7 @@ $config = [ | may even configure multiple disks of the same driver. Defaults have | been setup for each driver as an example of the required options. | - | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace" + | Supported Drivers: "local", "ftp", "sftp", "s3" | */ @@ -45,64 +32,41 @@ $config = [ 'local' => [ 'driver' => 'local', - 'root' => storage_path(), - ], - - // This applies the LOCAL public only, not S3/FTP/etc - 'local_public' => [ - 'driver' => 'local', - 'root' => public_path('uploads'), - 'url' => env('APP_URL').'/uploads', - 'visibility' => 'public', - ], - - 's3_public' => [ - 'driver' => 's3', - 'key' => env('PUBLIC_AWS_ACCESS_KEY_ID'), - 'secret' => env('PUBLIC_AWS_SECRET_ACCESS_KEY'), - 'region' => env('PUBLIC_AWS_DEFAULT_REGION'), - 'bucket' => env('PUBLIC_AWS_BUCKET'), - 'url' => env('PUBLIC_AWS_URL'), - 'root' => env('PUBLIC_AWS_BUCKET_ROOT'), - 'visibility' => 'public', - ], - - 's3_private' => [ - // This bucket (if different than the 's3' bucket above) can be - // configured within AWS to *never* permit public documents - // For security reasons, its best to use separate buckets for - // public and private documents in S3 - 'driver' => 's3', - 'key' => env('PRIVATE_AWS_ACCESS_KEY_ID'), - 'secret' => env('PRIVATE_AWS_SECRET_ACCESS_KEY'), - 'region' => env('PRIVATE_AWS_DEFAULT_REGION'), - 'bucket' => env('PRIVATE_AWS_BUCKET'), - 'url' => env('PRIVATE_AWS_URL'), - 'root' => env('PRIVATE_AWS_BUCKET_ROOT'), - 'visibility' => 'private', - ], - - 'rackspace' => [ - 'driver' => 'rackspace', - 'username' => env('RACKSPACE_USERNAME'), - 'key' => env('RACKSPACE_KEY'), - 'container' => env('RACKSPACE_CONTAINER'), - 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', - 'region' => env('RACKSPACE_REGION'), - 'url_type' => env('RACKSPACE_URL_TYPE'), - ], - - 'backup' => [ - 'driver' => env('PRIVATE_FILESYSTEM_DISK', 'local'), 'root' => storage_path('app'), ], + 'public' => [ + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'url' => env('APP_URL').'/storage', + 'visibility' => 'public', + ], + + 's3' => [ + 'driver' => 's3', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION'), + 'bucket' => env('AWS_BUCKET'), + 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_ENDPOINT'), + ], + + ], + + /* + |-------------------------------------------------------------------------- + | Symbolic Links + |-------------------------------------------------------------------------- + | + | Here you may configure the symbolic links that will be created when the + | `storage:link` Artisan command is executed. The array keys should be + | the locations of the links and the values should be their targets. + | + */ + + 'links' => [ + public_path('storage') => storage_path('app/public'), ], ]; - -// copy the selected PUBLIC_FILESYSTEM_DISK's configuration to the 'public' key for easy use -// (by default, the PUBLIC_FILESYSTEM DISK is 'local_public', in the public/uploads directory) -$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK', 'local_public')]; - -return $config; diff --git a/config/logging.php b/config/logging.php index fa0d25d884..1aa06aa30f 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,8 +1,10 @@ env('LOG_CHANNEL', 'stack'), /* @@ -35,26 +38,20 @@ $config = [ 'stack' => [ 'driver' => 'stack', 'channels' => ['single'], + 'ignore_exceptions' => false, ], 'single' => [ 'driver' => 'single', 'path' => storage_path('logs/laravel.log'), - 'level' => env('APP_LOG_LEVEL', 'error'), + 'level' => env('LOG_LEVEL', 'debug'), ], 'daily' => [ 'driver' => 'daily', 'path' => storage_path('logs/laravel.log'), - 'level' => 'debug', - 'days' => env('APP_LOG_MAX_FILES', 5), - ], - - 'rollbar' => [ - 'driver' => 'monolog', - 'handler' => \Rollbar\Laravel\MonologHandler::class, - 'access_token' => env('ROLLBAR_TOKEN'), - 'level' => env('APP_LOG_LEVEL', 'debug'), + 'level' => env('LOG_LEVEL', 'debug'), + 'days' => 14, ], 'slack' => [ @@ -62,38 +59,47 @@ $config = [ 'url' => env('LOG_SLACK_WEBHOOK_URL'), 'username' => 'Laravel Log', 'emoji' => ':boom:', - 'level' => 'critical', + 'level' => env('LOG_LEVEL', 'critical'), + ], + + 'papertrail' => [ + 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), + 'handler' => SyslogUdpHandler::class, + 'handler_with' => [ + 'host' => env('PAPERTRAIL_URL'), + 'port' => env('PAPERTRAIL_PORT'), + ], ], 'stderr' => [ 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), 'handler' => StreamHandler::class, + 'formatter' => env('LOG_STDERR_FORMATTER'), 'with' => [ 'stream' => 'php://stderr', ], ], - 'stdout' => [ - 'driver' => 'monolog', - 'handler' => StreamHandler::class, - 'with' => ['stream' => 'php://stdout'], - ], - 'syslog' => [ 'driver' => 'syslog', - 'level' => env('APP_LOG_LEVEL', 'error'), + 'level' => env('LOG_LEVEL', 'debug'), ], 'errorlog' => [ 'driver' => 'errorlog', - 'level' => env('APP_LOG_LEVEL', 'error'), + 'level' => env('LOG_LEVEL', 'debug'), + ], + + 'null' => [ + 'driver' => 'monolog', + 'handler' => NullHandler::class, + ], + + 'emergency' => [ + 'path' => storage_path('logs/laravel.log'), ], ], ]; - -if ((env('APP_ENV') == 'production') && env('ROLLBAR_TOKEN')) { - array_push($config['channels']['stack']['channels'], 'rollbar'); -} - -return $config; From 30607ac2688682ebcae0cbb582ddfd33d8a571a2 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:11 +0000 Subject: [PATCH 15/19] Shift Laravel dependencies --- composer.json | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 9285c0951f..fec833a70a 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0-or-later", "type": "project", "require": { - "php": "^7.2.5", + "php": "^7.3|^8.0", "ext-curl": "*", "ext-fileinfo": "*", "ext-json": "*", @@ -20,29 +20,29 @@ "adldap2/adldap2": "^10.2", "alek13/slack": "^1.12", "bacon/bacon-qr-code": "^1.0", - "barryvdh/laravel-cors": "^0.11.3", - "barryvdh/laravel-debugbar": "^3.2", + "barryvdh/laravel-cors": "^2.0", + "barryvdh/laravel-debugbar": "^3.6", "doctrine/cache": "^1.10", "doctrine/common": "^2.12", - "doctrine/dbal": "^2.10", + "doctrine/dbal": "^3.1", "doctrine/inflector": "^1.3", "doctrine/instantiator": "^1.3", "eduardokum/laravel-mail-auto-embed": "^1.0", "enshrined/svg-sanitize": "^0.13.3", "erusev/parsedown": "^1.7", - "fideloper/proxy": "^4.3", - "guzzlehttp/guzzle": "^6.5", + "fideloper/proxy": "^4.4", + "guzzlehttp/guzzle": "^7.0.1", "intervention/image": "^2.5", "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "^6.20", - "laravel/helpers": "^1.2", - "laravel/passport": "^9.3.2", - "laravel/slack-notification-channel": "^2.0", - "laravel/tinker": "^2.4", - "laravelcollective/html": "^6.0", - "league/csv": "^9.5", + "laravel/framework": "^8.46", + "laravel/helpers": "^1.4", + "laravel/passport": "^10.0", + "laravel/slack-notification-channel": "^2.3", + "laravel/tinker": "^2.5", + "laravelcollective/html": "^6.2", + "league/csv": "^9.7", "league/flysystem-aws-s3-v3": "^1.0", - "league/flysystem-cached-adapter": "^1.0", + "league/flysystem-cached-adapter": "^1.1", "neitanod/forceutf8": "^2.0", "nesbot/carbon": "^2.32", "nunomaduro/collision": "^3.2", @@ -52,12 +52,13 @@ "phpdocumentor/reflection-docblock": "^5.1", "phpspec/prophecy": "^1.10", "pragmarx/google2fa-laravel": "^1.3", - "rollbar/rollbar-laravel": "^6.0", - "spatie/laravel-backup": "^6.9", + "rollbar/rollbar-laravel": "^7.0", + "spatie/laravel-backup": "^6.16", "tecnickcom/tc-lib-barcode": "^1.15", - "tightenco/ziggy": "^0.9.0", + "tightenco/ziggy": "^1.2", "unicodeveloper/laravel-password": "^1.0", - "watson/validating": "^4.0" + "watson/validating": "^6.1", + "fruitcake/laravel-cors": "^2.0" }, "require-dev": { "codeception/codeception": "^4.1", @@ -65,13 +66,16 @@ "codeception/module-laravel5": "^1.1", "codeception/module-rest": "^1.2", "codeception/module-webdriver": "^1.0", - "fzaninotto/faker": "^1.9", "overtrue/phplint": "^2.2", "phpunit/php-token-stream": "^3.1", - "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.5", - "symfony/css-selector": "^4.4", - "symfony/dom-crawler": "^4.4" + "phpunit/phpunit": "^9.3.3", + "squizlabs/php_codesniffer": "^3.6", + "symfony/css-selector": "^5.2", + "symfony/dom-crawler": "^5.3", + "fakerphp/faker": "^1.9.1", + "facade/ignition": "^2.5", + "mockery/mockery": "^1.4.2", + "nunomaduro/collision": "^5.0" }, "suggest": { "ext-mcrypt": "For upgrading from before v5.1 this is used to re-encrypt data" From 8b822627779250036dd71aa20820baf342dd41b0 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:12 +0000 Subject: [PATCH 16/19] Shift return type of base TestCase methods From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type: - `setUpBeforeClass()` - `setUp()` - `assertPreConditions()` - `assertPostConditions()` - `tearDown()` - `tearDownAfterClass()` - `onNotSuccessfulTest()` [1]: https://phpunit.de/announcements/phpunit-8.html --- tests/TestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index d78f9c02f2..c0e60bde33 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,12 +22,12 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase return $app; } - public function setUp() + protected function setUp(): void { parent::setUp(); } - public function tearDown() + protected function tearDown(): void { //Artisan::call('migrate:reset'); parent::tearDown(); From 9838c0c2ef0f912bcf941fa22343424a3fa3d7cb Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:18:15 +0000 Subject: [PATCH 17/19] Upgrade to Laravel Mix 6 --- package.json | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 064898bb74..7a86945fdd 100644 --- a/package.json +++ b/package.json @@ -1,58 +1,58 @@ { - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "npm run development -- --watch", - "watch-poll": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "engines": { - "node": ">=0.12" - }, - "devDependencies": { - "axios": "^0.20.0", - "babel-preset-latest": "^6.24.1", - "cross-env": "^7.0", - "jquery": "^3.5.1", - "laravel-mix": "^5.0.1", - "lodash": "^4.17.20", - "vue": "2.4.4", - "vue-loader": "^15.9.6", - "vue-template-compiler": "2.4.4" - }, - "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.1", - "admin-lte": "^2.4.18", - "ajv": "^6.12.6", - "blueimp-file-upload": "^9.34.0", - "bootstrap": "^3.4.1", - "bootstrap-colorpicker": "^2.5.3", - "bootstrap-datepicker": "^1.9.0", - "bootstrap-less": "^3.3.8", - "bootstrap-table": "^1.18.0", - "chart.js": "^2.9.4", - "css-loader": "^3.6.0", - "ekko-lightbox": "^5.1.1", - "font-awesome": "^4.7.0", - "icheck": "^1.0.2", - "imagemin": "^5.3.1", - "jquery-form-validator": "^2.3.79", - "jquery-slimscroll": "^1.3.8", - "jquery-ui": "^1.12.1", - "jquery-ui-bundle": "^1.12.1", - "jquery.iframe-transport": "^1.0.0", - "less": "^3.13.1", - "less-loader": "^4.1.0", - "list.js": "^1.5.0", - "papaparse": "^4.3.3", - "phantomjs": "^2.1.7", - "select2": "4.0.13", - "sheetjs": "^2.0.0", - "tableexport.jquery.plugin": "^1.10.20", - "tether": "^1.4.0", - "vue-resource": "^1.3.3" - } + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "mix watch", + "watch-poll": "mix watch -- --watch-options-poll=1000", + "hot": "mix watch --hot", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js" + }, + "engines": { + "node": ">=0.12" + }, + "devDependencies": { + "axios": "^0.20.0", + "babel-preset-latest": "^6.24.1", + "jquery": "^3.5.1", + "laravel-mix": "^6.0.12", + "lodash": "^4.17.20", + "vue": "2.4.4", + "vue-loader": "^15.9.6", + "vue-template-compiler": "2.4.4", + "postcss": "^8.2.8" + }, + "dependencies": { + "@fortawesome/fontawesome-free": "^5.15.1", + "admin-lte": "^2.4.18", + "ajv": "^6.12.6", + "blueimp-file-upload": "^9.34.0", + "bootstrap": "^3.4.1", + "bootstrap-colorpicker": "^2.5.3", + "bootstrap-datepicker": "^1.9.0", + "bootstrap-less": "^3.3.8", + "bootstrap-table": "^1.18.0", + "chart.js": "^2.9.4", + "css-loader": "^3.6.0", + "ekko-lightbox": "^5.1.1", + "font-awesome": "^4.7.0", + "icheck": "^1.0.2", + "imagemin": "^5.3.1", + "jquery-form-validator": "^2.3.79", + "jquery-slimscroll": "^1.3.8", + "jquery-ui": "^1.12.1", + "jquery-ui-bundle": "^1.12.1", + "jquery.iframe-transport": "^1.0.0", + "less": "^4.1.1", + "less-loader": "^8.0.0", + "list.js": "^1.5.0", + "papaparse": "^4.3.3", + "phantomjs": "^2.1.7", + "select2": "4.0.13", + "sheetjs": "^2.0.0", + "tableexport.jquery.plugin": "^1.10.20", + "tether": "^1.4.0", + "vue-resource": "^1.3.3" + } } From b62d1f49e430214ebbefd34e5f4bdbe1a14952f2 Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Thu, 10 Jun 2021 20:19:27 +0000 Subject: [PATCH 18/19] Shift cleanup --- app/Console/Commands/ObjectImportCommand.php | 1 - app/Http/Requests/ItemImportRequest.php | 1 - app/Importer/ConsumableImporter.php | 1 - app/Importer/UserImporter.php | 1 - app/Models/Accessory.php | 3 +- app/Models/Actionlog.php | 3 +- app/Models/Asset.php | 5 ++- app/Models/AssetMaintenance.php | 3 +- app/Models/AssetModel.php | 3 +- app/Models/Category.php | 2 +- app/Models/Company.php | 2 +- app/Models/Component.php | 2 +- app/Models/Consumable.php | 3 +- app/Models/CustomField.php | 3 +- app/Models/CustomFieldset.php | 3 +- app/Models/Department.php | 2 +- app/Models/Depreciation.php | 2 +- app/Models/Group.php | 2 +- app/Models/License.php | 3 +- app/Models/Location.php | 6 ++-- app/Models/Manufacturer.php | 2 +- app/Models/Setting.php | 1 - app/Models/SnipeModel.php | 17 ---------- app/Models/Statuslabel.php | 3 +- app/Models/Supplier.php | 3 +- app/Models/User.php | 6 ++-- app/Providers/RouteServiceProvider.php | 6 ++-- database/factories/AccessoryFactory.php | 5 +-- database/factories/ActionlogFactory.php | 3 +- database/factories/AssetFactory.php | 23 +------------- .../factories/AssetMaintenanceFactory.php | 2 +- database/factories/AssetModelFactory.php | 14 ++------- database/factories/CategoryFactory.php | 5 +-- database/factories/CompanyFactory.php | 2 +- database/factories/ComponentFactory.php | 5 +-- database/factories/ConsumableFactory.php | 5 +-- database/factories/CustomFieldFactory.php | 2 ++ database/factories/CustomFieldsetFactory.php | 2 ++ database/factories/DepartmentFactory.php | 5 +-- database/factories/DepreciationFactory.php | 5 +-- database/factories/GroupFactory.php | 2 +- database/factories/LicenseFactory.php | 6 ++-- database/factories/LocationFactory.php | 2 +- database/factories/ManufacturerFactory.php | 6 ++-- database/factories/SettingFactory.php | 2 +- database/factories/StatuslabelFactory.php | 2 +- database/factories/SupplierFactory.php | 2 +- database/factories/UserFactory.php | 31 +------------------ database/seeders/AccessorySeeder.php | 11 ++++--- database/seeders/AssetModelSeeder.php | 9 +++--- database/seeders/AssetSeeder.php | 6 ++-- database/seeders/CompanySeeder.php | 12 ++++--- database/seeders/ComponentSeeder.php | 1 + database/seeders/ConsumableSeeder.php | 1 + database/seeders/CustomFieldSeeder.php | 1 + database/seeders/DatabaseSeeder.php | 23 ++++++++------ database/seeders/LocationSeeder.php | 9 +++--- database/seeders/ManufacturerSeeder.php | 9 +++--- database/seeders/SettingsSeeder.php | 1 + routes/api.php | 3 +- routes/web.php | 12 +++---- routes/web/fields.php | 1 + routes/web/hardware.php | 1 + tests/_support/FunctionalTester.php | 2 +- 64 files changed, 128 insertions(+), 194 deletions(-) diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php index 089ba34637..c89018400a 100644 --- a/app/Console/Commands/ObjectImportCommand.php +++ b/app/Console/Commands/ObjectImportCommand.php @@ -74,7 +74,6 @@ class ObjectImportCommand extends Command $this->comment('All Items imported successfully!'); } $this->comment(''); - } public function errorCallback($item, $field, $errorString) diff --git a/app/Http/Requests/ItemImportRequest.php b/app/Http/Requests/ItemImportRequest.php index 05babb97cd..fbf36bf65f 100644 --- a/app/Http/Requests/ItemImportRequest.php +++ b/app/Http/Requests/ItemImportRequest.php @@ -80,7 +80,6 @@ class ItemImportRequest extends FormRequest public function progress($count) { // Open for future - } public function errorCallback($item, $field, $errorString) diff --git a/app/Importer/ConsumableImporter.php b/app/Importer/ConsumableImporter.php index 2fbed94dea..cc24daa930 100644 --- a/app/Importer/ConsumableImporter.php +++ b/app/Importer/ConsumableImporter.php @@ -53,6 +53,5 @@ class ConsumableImporter extends ItemImporter return; } $this->logError($consumable, 'Consumable'); - } } diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index 37434f1616..14614c02a7 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -106,7 +106,6 @@ class UserImporter extends ItemImporter } $this->logError($user, 'User'); - } /** diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index c3679ae571..09b2e11a17 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -2,10 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Acceptable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Storage; use Watson\Validating\ValidatingTrait; @@ -120,7 +120,6 @@ class Accessory extends SnipeModel $value = null; } $this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN); - } /** diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index d94725dfb2..edbc9d9eef 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -2,10 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Carbon; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Auth; @@ -23,7 +23,6 @@ class Actionlog extends SnipeModel use SoftDeletes; use Presentable; - protected $table = 'action_logs'; public $timestamps = true; protected $fillable = ['created_at', 'item_type', 'user_id', 'item_id', 'action_type', 'note', 'target_id', 'target_type']; diff --git a/app/Models/Asset.php b/app/Models/Asset.php index f83b2e14f9..b16d2d38c4 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -2,7 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Events\AssetCheckedOut; use App\Events\CheckoutableCheckedOut; use App\Exceptions\CheckoutNotAllowed; @@ -16,6 +15,7 @@ use Auth; use Carbon\Carbon; use DB; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Storage; use Watson\Validating\ValidatingTrait; @@ -70,7 +70,6 @@ class Asset extends Depreciable // We set these as protected dates so that they will be easily accessible via Carbon - protected $casts = [ 'purchase_date' => 'datetime', 'last_checkout' => 'datetime', @@ -442,7 +441,7 @@ class Asset extends Depreciable */ public function assignedAssets() { - return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); + return $this->morphMany(self::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } /** diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index bee38abb61..27273eefc4 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Helpers\Helper; use App\Models\Traits\Searchable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; @@ -17,7 +17,6 @@ use Watson\Validating\ValidatingTrait; class AssetMaintenance extends Model implements ICompanyableChild { use HasFactory; - use SoftDeletes; use CompanyableChildTrait; use ValidatingTrait; diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index 2d48f491fe..7968f84085 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Storage; use Watson\Validating\ValidatingTrait; @@ -18,7 +18,6 @@ use Watson\Validating\ValidatingTrait; class AssetModel extends SnipeModel { use HasFactory; - use SoftDeletes; protected $presenter = \App\Presenters\AssetModelPresenter::class; use Requestable, Presentable; diff --git a/app/Models/Category.php b/app/Models/Category.php index 9c51fc4be4..36cad63ec7 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -2,10 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Gate; use Watson\Validating\ValidatingTrait; diff --git a/app/Models/Company.php b/app/Models/Company.php index dae7bd28d2..26afdb032e 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -2,11 +2,11 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Auth; use DB; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Support\Facades\Gate; use Watson\Validating\ValidatingTrait; diff --git a/app/Models/Component.php b/app/Models/Component.php index 3c15d2dddb..eebd6a5403 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index 203a56e4b8..3903081b76 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -2,10 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Acceptable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Storage; use Watson\Validating\ValidatingTrait; @@ -111,7 +111,6 @@ class Consumable extends SnipeModel $value = null; } $this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN); - } /** diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index d601bb4ef3..0f58055254 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use EasySlugger\Utf8Slugger; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Validation\Rule; use Schema; @@ -13,7 +13,6 @@ use Watson\Validating\ValidatingTrait; class CustomField extends Model { use HasFactory; - use ValidatingTrait, UniqueUndeletedTrait; diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index dbfb685f8f..bcbe0b81d9 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -2,15 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Gate; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Watson\Validating\ValidatingTrait; class CustomFieldset extends Model { use HasFactory; - use ValidatingTrait; protected $guarded = ['id']; diff --git a/app/Models/Department.php b/app/Models/Department.php index 7b2adeb471..7be99d097b 100644 --- a/app/Models/Department.php +++ b/app/Models/Department.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Watson\Validating\ValidatingTrait; class Department extends SnipeModel diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php index 9734315f08..39fb935494 100755 --- a/app/Models/Depreciation.php +++ b/app/Models/Depreciation.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Watson\Validating\ValidatingTrait; class Depreciation extends SnipeModel diff --git a/app/Models/Group.php b/app/Models/Group.php index 5d9a01c31f..a68579adac 100755 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Watson\Validating\ValidatingTrait; class Group extends SnipeModel diff --git a/app/Models/License.php b/app/Models/License.php index 8c2bf2d02b..21af9549cb 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -2,11 +2,11 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Carbon\Carbon; use DB; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Session; @@ -26,7 +26,6 @@ class License extends Depreciable // We set these as protected dates so that they will be easily accessible via Carbon - public $timestamps = true; protected $guarded = 'id'; diff --git a/app/Models/Location.php b/app/Models/Location.php index a18eedc239..a85c8905e0 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -2,7 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Asset; use App\Models\SnipeModel; @@ -10,6 +9,7 @@ use App\Models\Traits\Searchable; use App\Models\User; use App\Presenters\Presentable; use DB; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Gate; @@ -131,7 +131,7 @@ class Location extends SnipeModel public function parent() { - return $this->belongsTo(\App\Models\Location::class, 'parent_id', 'id') + return $this->belongsTo(self::class, 'parent_id', 'id') ->with('parent'); } @@ -142,7 +142,7 @@ class Location extends SnipeModel public function children() { - return $this->hasMany(\App\Models\Location::class, 'parent_id') + return $this->hasMany(self::class, 'parent_id') ->with('children'); } diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php index 6a96e36788..5f01c3c273 100755 --- a/app/Models/Manufacturer.php +++ b/app/Models/Manufacturer.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Models\Traits\Searchable; use App\Presenters\Presentable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Gate; use Watson\Validating\ValidatingTrait; diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 1721b78f44..b8ef8e685e 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -17,7 +17,6 @@ use Watson\Validating\ValidatingTrait; class Setting extends Model { use HasFactory; - use Notifiable, ValidatingTrait; /** diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php index d220d27d93..e5a039a4e1 100644 --- a/app/Models/SnipeModel.php +++ b/app/Models/SnipeModel.php @@ -14,7 +14,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['purchase_date'] = $value; - } /** @@ -28,7 +27,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['purchase_cost'] = $value; - } public function setLocationIdAttribute($value) @@ -37,7 +35,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['location_id'] = $value; - } public function setCategoryIdAttribute($value) @@ -47,7 +44,6 @@ class SnipeModel extends Model } $this->attributes['category_id'] = $value; // dd($this->attributes); - } public function setSupplierIdAttribute($value) @@ -56,7 +52,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['supplier_id'] = $value; - } public function setDepreciationIdAttribute($value) @@ -65,7 +60,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['depreciation_id'] = $value; - } public function setManufacturerIdAttribute($value) @@ -74,7 +68,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['manufacturer_id'] = $value; - } public function setMinAmtAttribute($value) @@ -83,7 +76,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['min_amt'] = $value; - } public function setParentIdAttribute($value) @@ -92,7 +84,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['parent_id'] = $value; - } public function setFieldSetIdAttribute($value) @@ -101,7 +92,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['fieldset_id'] = $value; - } public function setCompanyIdAttribute($value) @@ -110,7 +100,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['company_id'] = $value; - } public function setWarrantyMonthsAttribute($value) @@ -119,7 +108,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['warranty_months'] = $value; - } public function setRtdLocationIdAttribute($value) @@ -128,7 +116,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['rtd_location_id'] = $value; - } public function setDepartmentIdAttribute($value) @@ -137,7 +124,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['department_id'] = $value; - } public function setManagerIdAttribute($value) @@ -146,7 +132,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['manager_id'] = $value; - } public function setModelIdAttribute($value) @@ -155,7 +140,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['model_id'] = $value; - } public function setStatusIdAttribute($value) @@ -164,7 +148,6 @@ class SnipeModel extends Model $value = null; } $this->attributes['status_id'] = $value; - } // diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index 47e2ec2517..ee824734e5 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -2,16 +2,15 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; class Statuslabel extends SnipeModel { use HasFactory; - use SoftDeletes; use ValidatingTrait; use UniqueUndeletedTrait; diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index ad09721ce2..a96fdacdb6 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -2,16 +2,15 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Watson\Validating\ValidatingTrait; class Supplier extends SnipeModel { use HasFactory; - use SoftDeletes; protected $table = 'suppliers'; diff --git a/app/Models/User.php b/app/Models/User.php index b07f08c2d7..d42ea740e4 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,7 +2,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\Searchable; use App\Presenters\Presentable; @@ -14,6 +13,7 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\Access\Authorizable; use Illuminate\Notifications\Notifiable; @@ -330,7 +330,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function userlog() { - return $this->hasMany(\App\Models\Actionlog::class, 'target_id')->where('target_type', '=', \App\Models\User::class)->orderBy('created_at', 'DESC')->withTrashed(); + return $this->hasMany(\App\Models\Actionlog::class, 'target_id')->where('target_type', '=', self::class)->orderBy('created_at', 'DESC')->withTrashed(); } /** @@ -370,7 +370,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function manager() { - return $this->belongsTo(\App\Models\User::class, 'manager_id')->withTrashed(); + return $this->belongsTo(self::class, 'manager_id')->withTrashed(); } /** diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 57e9505d3f..16a22d8660 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,10 +2,10 @@ namespace App\Providers; -use Illuminate\Support\Facades\RateLimiter; -use Illuminate\Http\Request; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider @@ -28,8 +28,6 @@ class RouteServiceProvider extends ServiceProvider }); } - - /** * Define the "web" routes for the application. * diff --git a/database/factories/AccessoryFactory.php b/database/factories/AccessoryFactory.php index 224241da0c..84edcb705c 100644 --- a/database/factories/AccessoryFactory.php +++ b/database/factories/AccessoryFactory.php @@ -1,7 +1,8 @@ defineAs(App\Models\Actionlog::class, 'asset-upload', function ($faker) { $asset = \App\Models\Asset::factory()->create(); diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index d4bae8f8c4..f4a5b73807 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; -use Illuminate\Database\Eloquent\Factories\Factory; use App\Models\Asset; use App\Models\AssetModel; use App\Models\Category; +use Illuminate\Database\Eloquent\Factories\Factory; /* |-------------------------------------------------------------------------- @@ -16,27 +16,6 @@ use App\Models\Category; | */ - - - - - - - - - - - - - - - - - - - - - // These are just for unit tests, not to generate data class AssetFactory extends Factory diff --git a/database/factories/AssetMaintenanceFactory.php b/database/factories/AssetMaintenanceFactory.php index b3793c822c..f9351f5188 100644 --- a/database/factories/AssetMaintenanceFactory.php +++ b/database/factories/AssetMaintenanceFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; -use Illuminate\Database\Eloquent\Factories\Factory; use App\Models\Asset; use App\Models\AssetModel; use App\Models\Category; +use Illuminate\Database\Eloquent\Factories\Factory; /* |-------------------------------------------------------------------------- diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php index 38391b1712..bd9bb5aa69 100644 --- a/database/factories/AssetModelFactory.php +++ b/database/factories/AssetModelFactory.php @@ -1,7 +1,8 @@ delete($dst.$del_file); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } $add_files = glob($src.'/*.*'); foreach ($add_files as $add_file) { $file_to_copy = str_replace($src, '', $add_file); - \Log::debug('Copying: '.$file_to_copy); + Log::debug('Copying: '.$file_to_copy); try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } } diff --git a/database/seeders/AssetModelSeeder.php b/database/seeders/AssetModelSeeder.php index e22525442b..e8816cc509 100755 --- a/database/seeders/AssetModelSeeder.php +++ b/database/seeders/AssetModelSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\AssetModel; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; class AssetModelSeeder extends Seeder @@ -48,22 +49,22 @@ class AssetModelSeeder extends Seeder foreach ($del_files as $del_file) { // iterate files $file_to_delete = str_replace($src, '', $del_file); - \Log::debug('Deleting: '.$file_to_delete); + Log::debug('Deleting: '.$file_to_delete); try { Storage::disk('public')->delete($dst.$del_file); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } $add_files = glob($src.'/*.*'); foreach ($add_files as $add_file) { $file_to_copy = str_replace($src, '', $add_file); - \Log::debug('Copying: '.$file_to_copy); + Log::debug('Copying: '.$file_to_copy); try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } } diff --git a/database/seeders/AssetSeeder.php b/database/seeders/AssetSeeder.php index fa2c23b85b..082e6b66af 100644 --- a/database/seeders/AssetSeeder.php +++ b/database/seeders/AssetSeeder.php @@ -4,6 +4,8 @@ namespace Database\Seeders; use App\Models\Asset; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; class AssetSeeder extends Seeder @@ -39,11 +41,11 @@ class AssetSeeder extends Seeder $del_files = Storage::files('assets'); foreach ($del_files as $del_file) { // iterate files - \Log::debug('Deleting: '.$del_files); + Log::debug('Deleting: '.$del_files); try { Storage::disk('public')->delete('assets'.'/'.$del_files); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } diff --git a/database/seeders/CompanySeeder.php b/database/seeders/CompanySeeder.php index a61c478433..04f9190f7c 100644 --- a/database/seeders/CompanySeeder.php +++ b/database/seeders/CompanySeeder.php @@ -4,6 +4,8 @@ namespace Database\Seeders; use App\Models\Company; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; class CompanySeeder extends Seeder { @@ -14,7 +16,7 @@ class CompanySeeder extends Seeder */ public function run() { - \Log::debug('Seed companies'); + Log::debug('Seed companies'); Company::truncate(); Company::factory()->count(4)->create(); @@ -24,22 +26,22 @@ class CompanySeeder extends Seeder foreach ($del_files as $del_file) { // iterate files $file_to_delete = str_replace($src, '', $del_file); - \Log::debug('Deleting: '.$file_to_delete); + Log::debug('Deleting: '.$file_to_delete); try { Storage::disk('public')->delete($dst.$del_file); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } $add_files = glob($src.'/*.*'); foreach ($add_files as $add_file) { $file_to_copy = str_replace($src, '', $add_file); - \Log::debug('Copying: '.$file_to_copy); + Log::debug('Copying: '.$file_to_copy); try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } } diff --git a/database/seeders/ComponentSeeder.php b/database/seeders/ComponentSeeder.php index 5d58889ec1..46380e1682 100644 --- a/database/seeders/ComponentSeeder.php +++ b/database/seeders/ComponentSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\Component; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; class ComponentSeeder extends Seeder { diff --git a/database/seeders/ConsumableSeeder.php b/database/seeders/ConsumableSeeder.php index e691ce837f..240741fe6d 100644 --- a/database/seeders/ConsumableSeeder.php +++ b/database/seeders/ConsumableSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\Consumable; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; class ConsumableSeeder extends Seeder { diff --git a/database/seeders/CustomFieldSeeder.php b/database/seeders/CustomFieldSeeder.php index 643c88d1a2..8776872644 100644 --- a/database/seeders/CustomFieldSeeder.php +++ b/database/seeders/CustomFieldSeeder.php @@ -6,6 +6,7 @@ use App\Models\CustomField; use App\Models\CustomFieldset; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; class CustomFieldSeeder extends Seeder diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index e92693c2dc..54fb1e088b 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -2,18 +2,21 @@ namespace Database\Seeders; -use Database\Seeders\CustomFieldSeeder; -use Database\Seeders\ConsumableSeeder; -use Database\Seeders\ComponentSeeder; -use Database\Seeders\CompanySeeder; -use Database\Seeders\CategorySeeder; -use Database\Seeders\AssetSeeder; -use Database\Seeders\AssetModelSeeder; -use Database\Seeders\ActionlogSeeder; -use Database\Seeders\AccessorySeeder; use App\Models\Setting; +use Database\Seeders\AccessorySeeder; +use Database\Seeders\ActionlogSeeder; +use Database\Seeders\AssetModelSeeder; +use Database\Seeders\AssetSeeder; +use Database\Seeders\CategorySeeder; +use Database\Seeders\CompanySeeder; +use Database\Seeders\ComponentSeeder; +use Database\Seeders\ConsumableSeeder; +use Database\Seeders\CustomFieldSeeder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Artisan; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class DatabaseSeeder extends Seeder { @@ -53,7 +56,7 @@ class DatabaseSeeder extends Seeder Artisan::call('snipeit:sync-asset-locations', ['--output' => 'all']); $output = Artisan::output(); - \Log::info($output); + Log::info($output); Model::reguard(); diff --git a/database/seeders/LocationSeeder.php b/database/seeders/LocationSeeder.php index 969587c067..4a98ecb9e8 100644 --- a/database/seeders/LocationSeeder.php +++ b/database/seeders/LocationSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\Location; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; class LocationSeeder extends Seeder @@ -19,22 +20,22 @@ class LocationSeeder extends Seeder foreach ($del_files as $del_file) { // iterate files $file_to_delete = str_replace($src, '', $del_file); - \Log::debug('Deleting: '.$file_to_delete); + Log::debug('Deleting: '.$file_to_delete); try { Storage::disk('public')->delete($dst.$del_file); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } $add_files = glob($src.'/*.*'); foreach ($add_files as $add_file) { $file_to_copy = str_replace($src, '', $add_file); - \Log::debug('Copying: '.$file_to_copy); + Log::debug('Copying: '.$file_to_copy); try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } } diff --git a/database/seeders/ManufacturerSeeder.php b/database/seeders/ManufacturerSeeder.php index a36d92b4c5..fc6a3c34e9 100644 --- a/database/seeders/ManufacturerSeeder.php +++ b/database/seeders/ManufacturerSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\Manufacturer; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; class ManufacturerSeeder extends Seeder @@ -29,22 +30,22 @@ class ManufacturerSeeder extends Seeder foreach ($del_files as $del_file) { // iterate files $file_to_delete = str_replace($src, '', $del_file); - \Log::debug('Deleting: '.$file_to_delete); + Log::debug('Deleting: '.$file_to_delete); try { Storage::disk('public')->delete($dst.$del_file); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } $add_files = glob($src.'/*.*'); foreach ($add_files as $add_file) { $file_to_copy = str_replace($src, '', $add_file); - \Log::debug('Copying: '.$file_to_copy); + Log::debug('Copying: '.$file_to_copy); try { Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); } catch (\Exception $e) { - \Log::debug($e); + Log::debug($e); } } } diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php index 185104153c..9cbdf79f94 100644 --- a/database/seeders/SettingsSeeder.php +++ b/database/seeders/SettingsSeeder.php @@ -5,6 +5,7 @@ namespace Database\Seeders; use App\Models\Setting; use App\Models\User; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Storage; class SettingsSeeder extends Seeder { diff --git a/routes/api.php b/routes/api.php index df2570c9ef..6229230357 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,9 +1,8 @@ Date: Fri, 11 Jun 2021 14:07:50 -0700 Subject: [PATCH 19/19] Misc fixes for shift // TODO - re-fix the exception handler Signed-off-by: snipe --- app/Exceptions/Handler.php | 116 +- app/Providers/AppServiceProvider.php | 3 + composer.json | 7 +- composer.lock | 4295 +++++++++++++++++--------- config/cors.php | 2 +- public/index.php | 68 +- routes/web.php | 2 +- 7 files changed, 2909 insertions(+), 1584 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index ccb9d57c11..c18c43cc12 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,120 +2,40 @@ namespace App\Exceptions; -use App\Helpers\Helper; -use Exception; -use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Illuminate\Validation\ValidationException; -use Log; +use Throwable; class Handler extends ExceptionHandler { /** - * A list of the exception types that should not be reported. + * A list of the exception types that are not reported. * * @var array */ protected $dontReport = [ - \Illuminate\Auth\AuthenticationException::class, - \Illuminate\Auth\Access\AuthorizationException::class, - \Symfony\Component\HttpKernel\Exception\HttpException::class, - \Illuminate\Database\Eloquent\ModelNotFoundException::class, - \Illuminate\Session\TokenMismatchException::class, - \Illuminate\Validation\ValidationException::class, - \Intervention\Image\Exception\NotSupportedException::class, - \League\OAuth2\Server\Exception\OAuthServerException::class, + // ]; /** - * Report or log an exception. + * A list of the inputs that are never flashed for validation exceptions. * - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. + * @var array + */ + protected $dontFlash = [ + 'current_password', + 'password', + 'password_confirmation', + ]; + + /** + * Register the exception handling callbacks for the application. * - * @param \Exception $exception * @return void */ - public function report(Exception $exception) + public function register() { - if ($this->shouldReport($exception)) { - \Log::error($exception); - - return parent::report($exception); - } - } - - /** - * Render an exception into an HTTP response. - * - * @param \Illuminate\Http\Request $request - * @param \Exception $e - * @return \Illuminate\Http\Response - */ - public function render($request, Exception $e) - { - - // CSRF token mismatch error - if ($e instanceof \Illuminate\Session\TokenMismatchException) { - return redirect()->back()->with('error', trans('general.token_expired')); - } - - // Handle Ajax requests that fail because the model doesn't exist - if ($request->ajax() || $request->wantsJson()) { - if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) { - $className = last(explode('\\', $e->getModel())); - - return response()->json(Helper::formatStandardApiResponse('error', null, $className.' not found'), 200); - } - - if ($this->isHttpException($e)) { - $statusCode = $e->getStatusCode(); - - switch ($e->getStatusCode()) { - case '404': - return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode.' endpoint not found'), 404); - case '405': - return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405); - default: - return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), 405); - - } - } - } - - if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404')) { - return response()->view('layouts/basic', [ - 'content' => view('errors/404'), - ], $statusCode); - } - - return parent::render($request, $e); - } - - /** - * Convert an authentication exception into an unauthenticated response. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $exception - * @return \Illuminate\Http\Response - */ - protected function unauthenticated($request, AuthenticationException $exception) - { - if ($request->expectsJson()) { - return response()->json(['error' => 'Unauthorized or unauthenticated.'], 401); - } - - return redirect()->guest('login'); - } - - /** - * Convert a validation exception into a JSON response. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Validation\ValidationException $exception - * @return \Illuminate\Http\JsonResponse - */ - protected function invalidJson($request, ValidationException $exception) - { - return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 400)); + $this->reportable(function (Throwable $e) { + // + }); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d05ab5fef9..bb5643a920 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -42,6 +42,9 @@ class AppServiceProvider extends ServiceProvider \Log::warning("'APP_FORCE_TLS' is set to true, but 'APP_URL' does not start with 'https://'. Will not force TLS on connections."); } } + + \Illuminate\Pagination\Paginator::useBootstrap(); + Schema::defaultStringLength(191); Asset::observe(AssetObserver::class); Accessory::observe(AccessoryObserver::class); diff --git a/composer.json b/composer.json index fec833a70a..a6b6d70bd0 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "enshrined/svg-sanitize": "^0.13.3", "erusev/parsedown": "^1.7", "fideloper/proxy": "^4.4", + "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "intervention/image": "^2.5", "javiereguiluz/easyslugger": "^1.0", @@ -39,13 +40,14 @@ "laravel/passport": "^10.0", "laravel/slack-notification-channel": "^2.3", "laravel/tinker": "^2.5", + "laravel/ui": "^3.3", "laravelcollective/html": "^6.2", "league/csv": "^9.7", "league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-cached-adapter": "^1.1", "neitanod/forceutf8": "^2.0", "nesbot/carbon": "^2.32", - "nunomaduro/collision": "^3.2", + "nunomaduro/collision": "^v5.4.0", "onelogin/php-saml": "^3.4", "paragonie/constant_time_encoding": "^2.3", "patchwork/utf8": "^1.3", @@ -57,8 +59,7 @@ "tecnickcom/tc-lib-barcode": "^1.15", "tightenco/ziggy": "^1.2", "unicodeveloper/laravel-password": "^1.0", - "watson/validating": "^6.1", - "fruitcake/laravel-cors": "^2.0" + "watson/validating": "^6.1" }, "require-dev": { "codeception/codeception": "^4.1", diff --git a/composer.lock b/composer.lock index 4d0aac698b..250ef1aa4c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "de58687444791ed74502fe3fa2b4ce61", + "content-hash": "97c80b37d706eddf9627518d8a8afed0", "packages": [ { "name": "adldap2/adldap2", @@ -63,6 +63,12 @@ "ldap", "windows" ], + "support": { + "docs": "https://github.com/Adldap2/Adldap2/blob/master/readme.md", + "email": "steven_bauman@outlook.com", + "issues": "https://github.com/Adldap2/Adldap2/issues", + "source": "https://github.com/Adldap2/Adldap2" + }, "time": "2021-03-05T21:14:57+00:00" }, { @@ -133,36 +139,36 @@ }, { "name": "asm89/stack-cors", - "version": "1.3.0", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/asm89/stack-cors.git", - "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08" + "reference": "9cb795bf30988e8c96dd3c40623c48a877bc6714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/asm89/stack-cors/zipball/b9c31def6a83f84b4d4a40d35996d375755f0e08", - "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08", + "url": "https://api.github.com/repos/asm89/stack-cors/zipball/9cb795bf30988e8c96dd3c40623c48a877bc6714", + "reference": "9cb795bf30988e8c96dd3c40623c48a877bc6714", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.0|^8.0", "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0", "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0" }, "require-dev": { - "phpunit/phpunit": "^5.0 || ^4.8.10", - "squizlabs/php_codesniffer": "^2.3" + "phpunit/phpunit": "^6|^7|^8|^9", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "2.0-dev" } }, "autoload": { "psr-4": { - "Asm89\\Stack\\": "src/Asm89/Stack/" + "Asm89\\Stack\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -183,22 +189,22 @@ ], "support": { "issues": "https://github.com/asm89/stack-cors/issues", - "source": "https://github.com/asm89/stack-cors/tree/1.3.0" + "source": "https://github.com/asm89/stack-cors/tree/v2.0.3" }, - "time": "2019-12-24T22:41:47+00:00" + "time": "2021-03-11T06:42:03+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.176.9", + "version": "3.184.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "17dc67514b148979994758fbfb54088a8a3393bf" + "reference": "78fe691ab466fecf195209672f6c00c5d4ed219a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/17dc67514b148979994758fbfb54088a8a3393bf", - "reference": "17dc67514b148979994758fbfb54088a8a3393bf", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/78fe691ab466fecf195209672f6c00c5d4ed219a", + "reference": "78fe691ab466fecf195209672f6c00c5d4ed219a", "shasum": "" }, "require": { @@ -270,7 +276,12 @@ "s3", "sdk" ], - "time": "2021-04-06T18:13:47+00:00" + "support": { + "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.184.2" + }, + "time": "2021-06-11T18:20:15+00:00" }, { "name": "bacon/bacon-qr-code", @@ -324,45 +335,46 @@ }, { "name": "barryvdh/laravel-cors", - "version": "v0.11.4", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9" + "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/03492f1a3bc74a05de23f93b94ac7cc5c173eec9", - "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/a8ccedc7ca95189ead0e407c43b530dc17791d6a", + "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a", "shasum": "" }, "require": { - "asm89/stack-cors": "^1.2", - "illuminate/support": "^5.5|^6", - "php": ">=7", - "symfony/http-foundation": "^3.1|^4", - "symfony/http-kernel": "^3.1|^4" + "asm89/stack-cors": "^2.0.1", + "illuminate/contracts": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", + "php": ">=7.2", + "symfony/http-foundation": "^4|^5", + "symfony/http-kernel": "^4.3.4|^5" }, "require-dev": { - "laravel/framework": "^5.5", - "orchestra/testbench": "3.3.x|3.4.x|3.5.x|3.6.x|3.7.x", - "phpunit/phpunit": "^4.8|^5.2|^7.0", - "squizlabs/php_codesniffer": "^2.3" + "laravel/framework": "^6|^7|^8", + "orchestra/testbench-dusk": "^4|^5|^6|^7", + "phpunit/phpunit": "^6|^7|^8|^9", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.11-dev" + "dev-master": "2.0-dev" }, "laravel": { "providers": [ - "Barryvdh\\Cors\\ServiceProvider" + "Fruitcake\\Cors\\CorsServiceProvider" ] } }, "autoload": { "psr-4": { - "Barryvdh\\Cors\\": "src/" + "Fruitcake\\Cors\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -370,6 +382,10 @@ "MIT" ], "authors": [ + { + "name": "Fruitcake", + "homepage": "https://fruitcake.nl" + }, { "name": "Barry vd. Heuvel", "email": "barryvdh@gmail.com" @@ -384,22 +400,28 @@ ], "support": { "issues": "https://github.com/fruitcake/laravel-cors/issues", - "source": "https://github.com/fruitcake/laravel-cors/tree/v0.11.4" + "source": "https://github.com/fruitcake/laravel-cors/tree/v2.0.4" }, - "time": "2019-08-28T11:27:11+00:00" + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2021-04-26T11:24:25+00:00" }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.5.4", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "b8af309dea71eab3f2c942652969f518130228ee" + "reference": "f6f0f895a33cac801286a74355d146bb5384a5da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b8af309dea71eab3f2c942652969f518130228ee", - "reference": "b8af309dea71eab3f2c942652969f518130228ee", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/f6f0f895a33cac801286a74355d146bb5384a5da", + "reference": "f6f0f895a33cac801286a74355d146bb5384a5da", "shasum": "" }, "require": { @@ -457,36 +479,168 @@ "profiler", "webprofiler" ], + "support": { + "issues": "https://github.com/barryvdh/laravel-debugbar/issues", + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.1" + }, "funding": [ { "url": "https://github.com/barryvdh", "type": "github" } ], - "time": "2021-04-06T18:11:42+00:00" + "time": "2021-06-02T06:42:22+00:00" }, { - "name": "defuse/php-encryption", - "version": "v2.2.1", + "name": "brick/math", + "version": "0.9.2", "source": { "type": "git", - "url": "https://github.com/defuse/php-encryption.git", - "reference": "0f407c43b953d571421e0020ba92082ed5fb7620" + "url": "https://github.com/brick/math.git", + "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/defuse/php-encryption/zipball/0f407c43b953d571421e0020ba92082ed5fb7620", - "reference": "0f407c43b953d571421e0020ba92082ed5fb7620", + "url": "https://api.github.com/repos/brick/math/zipball/dff976c2f3487d42c1db75a3b180e2b9f0e72ce0", + "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", + "vimeo/psalm": "4.3.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Brick\\Math\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Arbitrary-precision arithmetic library", + "keywords": [ + "Arbitrary-precision", + "BigInteger", + "BigRational", + "arithmetic", + "bigdecimal", + "bignum", + "brick", + "math" + ], + "support": { + "issues": "https://github.com/brick/math/issues", + "source": "https://github.com/brick/math/tree/0.9.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/brick/math", + "type": "tidelift" + } + ], + "time": "2021-01-20T22:51:39+00:00" + }, + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.2", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-05-24T07:46:03+00:00" + }, + { + "name": "defuse/php-encryption", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/defuse/php-encryption.git", + "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2", + "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2", "shasum": "" }, "require": { "ext-openssl": "*", "paragonie/random_compat": ">= 2", - "php": ">=5.4.0" + "php": ">=5.6.0" }, "require-dev": { - "nikic/php-parser": "^2.0|^3.0|^4.0", - "phpunit/phpunit": "^4|^5" + "phpunit/phpunit": "^4|^5|^6|^7|^8|^9" }, "bin": [ "bin/generate-defuse-key" @@ -528,71 +682,36 @@ ], "support": { "issues": "https://github.com/defuse/php-encryption/issues", - "source": "https://github.com/defuse/php-encryption/tree/master" + "source": "https://github.com/defuse/php-encryption/tree/v2.3.1" }, - "time": "2018-07-24T23:27:56+00:00" - }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "v0.1.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" - }, - "type": "library", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" - }, - "time": "2019-12-04T15:06:13+00:00" + "time": "2021-04-09T23:57:26+00:00" }, { "name": "doctrine/annotations", - "version": "1.12.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", "autoload": { @@ -633,44 +752,47 @@ "docblock", "parser" ], - "time": "2021-02-21T21:00:45+00:00" + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.1" + }, + "time": "2021-05-16T18:07:53+00:00" }, { "name": "doctrine/cache", - "version": "1.10.2", + "version": "1.11.3", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "13e3381b25847283a91948d04640543941309727" + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", - "reference": "13e3381b25847283a91948d04640543941309727", + "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d", + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d", "shasum": "" }, "require": { "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4" + "doctrine/common": ">2.2,<2.4", + "psr/cache": ">=3" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^8.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "predis/predis": "~1.0", + "psr/cache": "^1.0 || ^2.0", + "symfony/cache": "^4.4 || ^5.2" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -717,7 +839,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.10.x" + "source": "https://github.com/doctrine/cache/tree/1.11.3" }, "funding": [ { @@ -733,7 +855,7 @@ "type": "tidelift" } ], - "time": "2020-07-07T18:54:01+00:00" + "time": "2021-05-25T09:01:55+00:00" }, { "name": "doctrine/collections", @@ -907,30 +1029,33 @@ }, { "name": "doctrine/dbal", - "version": "2.13.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796" + "reference": "5ba62e7e40df119424866064faf2cef66cb5232a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/67d56d3203b33db29834e6b2fcdbfdc50535d796", - "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5ba62e7e40df119424866064faf2cef66cb5232a", + "reference": "5ba62e7e40df119424866064faf2cef66cb5232a", "shasum": "" }, "require": { + "composer/package-versions-deprecated": "^1.11.99", "doctrine/cache": "^1.0", "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", - "ext-pdo": "*", - "php": "^7.1 || ^8" + "php": "^7.3 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "8.2.0", "jetbrains/phpstorm-stubs": "2020.2", "phpstan/phpstan": "0.12.81", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.0", + "phpstan/phpstan-strict-rules": "^0.12.2", + "phpunit/phpunit": "9.5.0", + "psalm/plugin-phpunit": "0.13.0", + "squizlabs/php_codesniffer": "3.6.0", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "vimeo/psalm": "4.6.4" }, @@ -943,7 +1068,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" + "Doctrine\\DBAL\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -986,11 +1111,14 @@ "queryobject", "sasql", "sql", - "sqlanywhere", "sqlite", "sqlserver", "sqlsrv" ], + "support": { + "issues": "https://github.com/doctrine/dbal/issues", + "source": "https://github.com/doctrine/dbal/tree/3.1.0" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1005,7 +1133,7 @@ "type": "tidelift" } ], - "time": "2021-03-28T18:10:53+00:00" + "time": "2021-04-19T17:51:23+00:00" }, { "name": "doctrine/deprecations", @@ -1044,6 +1172,10 @@ ], "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v0.5.3" + }, "time": "2021-03-21T12:59:47+00:00" }, { @@ -1142,26 +1274,26 @@ }, { "name": "doctrine/inflector", - "version": "1.4.3", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c" + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4650c8b30c753a76bf44fb2ed00117d6f367490c", - "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^7.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", @@ -1218,7 +1350,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/1.4.x" + "source": "https://github.com/doctrine/inflector/tree/1.4.4" }, "funding": [ { @@ -1234,7 +1366,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T07:19:59+00:00" + "time": "2021-04-16T17:34:40+00:00" }, { "name": "doctrine/instantiator", @@ -1572,30 +1704,32 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v2.3.1", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2" + "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2", - "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c", + "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c", "shasum": "" }, "require": { - "php": "^7.0|^8.0" + "php": "^7.2|^8.0", + "webmozart/assert": "^1.7.0" + }, + "replace": { + "mtdowling/cron-expression": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^6.4|^7.0|^8.0|^9.0" + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-webmozart-assert": "^0.12.7", + "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, "autoload": { "psr-4": { "Cron\\": "src/Cron/" @@ -1606,11 +1740,6 @@ "MIT" ], "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, { "name": "Chris Tankersley", "email": "chris@ctankersley.com", @@ -1624,7 +1753,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0" }, "funding": [ { @@ -1632,35 +1761,31 @@ "type": "github" } ], - "time": "2020-10-13T00:52:37+00:00" + "time": "2020-11-24T19:55:57+00:00" }, { "name": "eduardokum/laravel-mail-auto-embed", - "version": "1.0.5", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/eduardokum/laravel-mail-auto-embed.git", - "reference": "83349a6a35560edb1c95e31205e2a848d73196ef" + "reference": "918c3aff220d965fbaee96ae4d48a09036381bdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/83349a6a35560edb1c95e31205e2a848d73196ef", - "reference": "83349a6a35560edb1c95e31205e2a848d73196ef", + "url": "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/918c3aff220d965fbaee96ae4d48a09036381bdf", + "reference": "918c3aff220d965fbaee96ae4d48a09036381bdf", "shasum": "" }, "require": { - "ext-dom": "*", - "illuminate/contracts": "^5.3 | ^6.0 | ^7.0", - "illuminate/mail": "^5.3 | ^6.0 | ^7.0 | ^8.0", - "illuminate/support": "^5.3 | ^6.0 | ^7.0", - "masterminds/html5": "^2.0", - "php": ">=5.6", - "squizlabs/php_codesniffer": "^3.5" + "illuminate/contracts": ">=5.3", + "illuminate/mail": ">=5.3", + "illuminate/support": ">=5.3", + "php": ">=5.5.0" }, "require-dev": { - "orchestra/testbench": "^3.4 | ^4.0 | ^5.0", - "php": ">=7.0", - "phpunit/phpunit": "^6.0 | ^7.0 | ^8.0" + "orchestra/testbench": "~3.0", + "phpunit/phpunit": "~5.0|~6.0" }, "type": "library", "extra": { @@ -1693,9 +1818,9 @@ ], "support": { "issues": "https://github.com/eduardokum/laravel-mail-auto-embed/issues", - "source": "https://github.com/eduardokum/laravel-mail-auto-embed/tree/1.0.5" + "source": "https://github.com/eduardokum/laravel-mail-auto-embed/tree/master" }, - "time": "2020-04-13T17:47:22+00:00" + "time": "2017-09-21T12:11:32+00:00" }, { "name": "egulias/email-validator", @@ -1860,6 +1985,59 @@ }, "time": "2019-12-30T22:54:17+00:00" }, + { + "name": "facade/ignition-contracts", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition-contracts.git", + "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267", + "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267", + "shasum": "" + }, + "require": { + "php": "^7.3|^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^v2.15.8", + "phpunit/phpunit": "^9.3.11", + "vimeo/psalm": "^3.17.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Facade\\IgnitionContracts\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://flareapp.io", + "role": "Developer" + } + ], + "description": "Solution contracts for Ignition", + "homepage": "https://github.com/facade/ignition-contracts", + "keywords": [ + "contracts", + "flare", + "ignition" + ], + "support": { + "issues": "https://github.com/facade/ignition-contracts/issues", + "source": "https://github.com/facade/ignition-contracts/tree/1.0.2" + }, + "time": "2020-10-16T08:27:54+00:00" + }, { "name": "fideloper/proxy", "version": "4.4.1", @@ -1920,16 +2098,16 @@ }, { "name": "filp/whoops", - "version": "2.12.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "d501fd2658d55491a2295ff600ae5978eaad7403" + "reference": "2edbc73a4687d9085c8f20f398eebade844e8424" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403", - "reference": "d501fd2658d55491a2295ff600ae5978eaad7403", + "url": "https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424", + "reference": "2edbc73a4687d9085c8f20f398eebade844e8424", "shasum": "" }, "require": { @@ -1977,26 +2155,30 @@ "throwable", "whoops" ], + "support": { + "issues": "https://github.com/filp/whoops/issues", + "source": "https://github.com/filp/whoops/tree/2.13.0" + }, "funding": [ { "url": "https://github.com/denis-sokolov", "type": "github" } ], - "time": "2021-03-30T12:00:00+00:00" + "time": "2021-06-04T12:00:00+00:00" }, { "name": "firebase/php-jwt", - "version": "v5.2.1", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "f42c9110abe98dd6cfe9053c49bc86acc70b2d23" + "reference": "3c2d70f2e64e2922345e89f2ceae47d2463faae1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f42c9110abe98dd6cfe9053c49bc86acc70b2d23", - "reference": "f42c9110abe98dd6cfe9053c49bc86acc70b2d23", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/3c2d70f2e64e2922345e89f2ceae47d2463faae1", + "reference": "3c2d70f2e64e2922345e89f2ceae47d2463faae1", "shasum": "" }, "require": { @@ -2033,41 +2215,195 @@ "jwt", "php" ], - "time": "2021-02-12T00:02:00+00:00" + "support": { + "issues": "https://github.com/firebase/php-jwt/issues", + "source": "https://github.com/firebase/php-jwt/tree/v5.3.0" + }, + "time": "2021-05-20T17:37:02+00:00" }, { - "name": "guzzlehttp/guzzle", - "version": "6.5.5", + "name": "fruitcake/laravel-cors", + "version": "v2.0.4", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" + "url": "https://github.com/fruitcake/laravel-cors.git", + "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/a8ccedc7ca95189ead0e407c43b530dc17791d6a", + "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a", + "shasum": "" + }, + "require": { + "asm89/stack-cors": "^2.0.1", + "illuminate/contracts": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", + "php": ">=7.2", + "symfony/http-foundation": "^4|^5", + "symfony/http-kernel": "^4.3.4|^5" + }, + "require-dev": { + "laravel/framework": "^6|^7|^8", + "orchestra/testbench-dusk": "^4|^5|^6|^7", + "phpunit/phpunit": "^6|^7|^8|^9", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + }, + "laravel": { + "providers": [ + "Fruitcake\\Cors\\CorsServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Fruitcake\\Cors\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fruitcake", + "homepage": "https://fruitcake.nl" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application", + "keywords": [ + "api", + "cors", + "crossdomain", + "laravel" + ], + "support": { + "issues": "https://github.com/fruitcake/laravel-cors/issues", + "source": "https://github.com/fruitcake/laravel-cors/tree/v2.0.4" + }, + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2021-04-26T11:24:25+00:00" + }, + { + "name": "graham-campbell/result-type", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/7e279d2cd5d7fbb156ce46daada972355cea27bb", + "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb", + "shasum": "" + }, + "require": { + "php": "^7.0|^8.0", + "phpoption/phpoption": "^1.7.3" + }, + "require-dev": { + "phpunit/phpunit": "^6.5|^7.5|^8.5|^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "support": { + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2020-04-13T13:17:36+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "7.3.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "7008573787b430c1c1f650e3722d9bba59967628" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628", + "reference": "7008573787b430c1c1f650e3722d9bba59967628", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "guzzlehttp/promises": "^1.4", + "guzzlehttp/psr7": "^1.7 || ^2.0", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", "psr/log": "^1.1" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.3-dev" } }, "autoload": { @@ -2087,6 +2423,11 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "Guzzle is a PHP HTTP client library", @@ -2097,14 +2438,34 @@ "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5" + "source": "https://github.com/guzzle/guzzle/tree/7.3.0" }, - "time": "2020-06-16T21:01:06+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://github.com/alexeyshockov", + "type": "github" + }, + { + "url": "https://github.com/gmponos", + "type": "github" + } + ], + "time": "2021-03-23T11:33:13+00:00" }, { "name": "guzzlehttp/promises", @@ -2155,20 +2516,24 @@ "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.4.1" + }, "time": "2021-03-07T09:25:29+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" + "reference": "dc960a912984efb74d0a90222870c72c87f10c91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91", "shasum": "" }, "require": { @@ -2226,7 +2591,11 @@ "uri", "url" ], - "time": "2021-03-21T16:25:00+00:00" + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.8.2" + }, + "time": "2021-04-26T09:17:50+00:00" }, { "name": "intervention/image", @@ -2336,216 +2705,62 @@ }, "time": "2015-04-12T19:57:10+00:00" }, - { - "name": "laminas/laminas-diactoros", - "version": "2.4.1", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "36ef09b73e884135d2059cc498c938e90821bb57" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/36ef09b73e884135d2059cc498c938e90821bb57", - "reference": "36ef09b73e884135d2059cc498c938e90821bb57", - "shasum": "" - }, - "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.1", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" - }, - "conflict": { - "phpspec/prophecy": "<1.9.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "replace": { - "zendframework/zend-diactoros": "^2.2.1" - }, - "require-dev": { - "ext-curl": "*", - "ext-dom": "*", - "ext-gd": "*", - "ext-libxml": "*", - "http-interop/http-factory-tests": "^0.5.0", - "laminas/laminas-coding-standard": "~1.0.0", - "php-http/psr7-integration-tests": "^1.0", - "phpunit/phpunit": "^7.5.18" - }, - "type": "library", - "extra": { - "laminas": { - "config-provider": "Laminas\\Diactoros\\ConfigProvider", - "module": "Laminas\\Diactoros" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php", - "src/functions/create_uploaded_file.legacy.php", - "src/functions/marshal_headers_from_sapi.legacy.php", - "src/functions/marshal_method_from_sapi.legacy.php", - "src/functions/marshal_protocol_version_from_sapi.legacy.php", - "src/functions/marshal_uri_from_sapi.legacy.php", - "src/functions/normalize_server.legacy.php", - "src/functions/normalize_uploaded_files.legacy.php", - "src/functions/parse_cookie_header.legacy.php" - ], - "psr-4": { - "Laminas\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://laminas.dev", - "keywords": [ - "http", - "laminas", - "psr", - "psr-17", - "psr-7" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-diactoros/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-diactoros/issues", - "rss": "https://github.com/laminas/laminas-diactoros/releases.atom", - "source": "https://github.com/laminas/laminas-diactoros" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2020-09-03T14:29:41+00:00" - }, - { - "name": "laminas/laminas-zendframework-bridge", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "extra": { - "laminas": { - "module": "Laminas\\ZendFrameworkBridge" - } - }, - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ZendFrameworkBridge\\": "src//" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Alias legacy ZF class names to Laminas Project equivalents.", - "keywords": [ - "ZendFramework", - "autoloading", - "laminas", - "zf" - ], - "support": { - "forum": "https://discourse.laminas.dev/", - "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues", - "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom", - "source": "https://github.com/laminas/laminas-zendframework-bridge" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2020-09-14T14:23:00+00:00" - }, { "name": "laravel/framework", - "version": "v6.20.22", + "version": "v8.46.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f4d2beff6f1793909e1db4f2204800183b4f1719" + "reference": "a18266c612e0e6aba5e0174b3c873d2d217dccfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f4d2beff6f1793909e1db4f2204800183b4f1719", - "reference": "f4d2beff6f1793909e1db4f2204800183b4f1719", + "url": "https://api.github.com/repos/laravel/framework/zipball/a18266c612e0e6aba5e0174b3c873d2d217dccfb", + "reference": "a18266c612e0e6aba5e0174b3c873d2d217dccfb", "shasum": "" }, "require": { "doctrine/inflector": "^1.4|^2.0", - "dragonmantank/cron-expression": "^2.3.1", + "dragonmantank/cron-expression": "^3.0.2", "egulias/email-validator": "^2.1.10", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/commonmark": "^1.3", "league/flysystem": "^1.1", - "monolog/monolog": "^1.12|^2.0", + "monolog/monolog": "^2.0", "nesbot/carbon": "^2.31", "opis/closure": "^3.6", - "php": "^7.2.5|^8.0", + "php": "^7.3|^8.0", "psr/container": "^1.0", "psr/simple-cache": "^1.0", - "ramsey/uuid": "^3.7", + "ramsey/uuid": "^4.0", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.3.4", - "symfony/debug": "^4.3.4", - "symfony/finder": "^4.3.4", - "symfony/http-foundation": "^4.3.4", - "symfony/http-kernel": "^4.3.4", - "symfony/polyfill-php73": "^1.17", - "symfony/process": "^4.3.4", - "symfony/routing": "^4.3.4", - "symfony/var-dumper": "^4.3.4", - "tijsverkoyen/css-to-inline-styles": "^2.2.1", - "vlucas/phpdotenv": "^3.3" + "symfony/console": "^5.1.4", + "symfony/error-handler": "^5.1.4", + "symfony/finder": "^5.1.4", + "symfony/http-foundation": "^5.1.4", + "symfony/http-kernel": "^5.1.4", + "symfony/mime": "^5.1.4", + "symfony/process": "^5.1.4", + "symfony/routing": "^5.1.4", + "symfony/var-dumper": "^5.1.4", + "tijsverkoyen/css-to-inline-styles": "^2.2.2", + "vlucas/phpdotenv": "^5.2", + "voku/portable-ascii": "^1.4.8" }, "conflict": { "tightenco/collect": "<5.5.33" }, + "provide": { + "psr/container-implementation": "1.0" + }, "replace": { "illuminate/auth": "self.version", "illuminate/broadcasting": "self.version", "illuminate/bus": "self.version", "illuminate/cache": "self.version", + "illuminate/collections": "self.version", "illuminate/config": "self.version", "illuminate/console": "self.version", "illuminate/container": "self.version", @@ -2558,6 +2773,7 @@ "illuminate/hashing": "self.version", "illuminate/http": "self.version", "illuminate/log": "self.version", + "illuminate/macroable": "self.version", "illuminate/mail": "self.version", "illuminate/notifications": "self.version", "illuminate/pagination": "self.version", @@ -2567,27 +2783,28 @@ "illuminate/routing": "self.version", "illuminate/session": "self.version", "illuminate/support": "self.version", + "illuminate/testing": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", "illuminate/view": "self.version" }, "require-dev": { "aws/aws-sdk-php": "^3.155", - "doctrine/dbal": "^2.6", + "doctrine/dbal": "^2.6|^3.0", "filp/whoops": "^2.8", - "guzzlehttp/guzzle": "^6.3.1|^7.0.1", + "guzzlehttp/guzzle": "^6.5.5|^7.0.1", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "~1.3.3|^1.4.2", - "moontoast/math": "^1.1", - "orchestra/testbench-core": "^4.8", + "mockery/mockery": "^1.4.2", + "orchestra/testbench-core": "^6.8", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5.15|^8.4|^9.3.3", - "predis/predis": "^1.1.1", - "symfony/cache": "^4.3.4" + "phpunit/phpunit": "^8.5.8|^9.3.3", + "predis/predis": "^1.1.2", + "symfony/cache": "^5.1.4" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", + "brianium/paratest": "Required to run tests in parallel (^6.0).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).", "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", "ext-memcached": "Required to use the memcache cache driver.", @@ -2596,34 +2813,42 @@ "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "filp/whoops": "Required for friendly error pages in development (^2.8).", - "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0.1).", + "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).", "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", - "moontoast/math": "Required to use ordered UUIDs (^1.1).", + "mockery/mockery": "Required to use mocking (^1.4.2).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", + "phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).", "predis/predis": "Required to use the predis connector (^1.1.2).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^5.1.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.x-dev" + "dev-master": "8.x-dev" } }, "autoload": { "files": [ + "src/Illuminate/Collections/helpers.php", + "src/Illuminate/Events/functions.php", "src/Illuminate/Foundation/helpers.php", "src/Illuminate/Support/helpers.php" ], "psr-4": { - "Illuminate\\": "src/Illuminate/" + "Illuminate\\": "src/Illuminate/", + "Illuminate\\Support\\": [ + "src/Illuminate/Macroable/", + "src/Illuminate/Collections/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -2642,7 +2867,11 @@ "framework", "laravel" ], - "time": "2021-03-30T21:33:47+00:00" + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2021-06-08T13:36:46+00:00" }, { "name": "laravel/helpers", @@ -2695,51 +2924,53 @@ "helpers", "laravel" ], + "support": { + "source": "https://github.com/laravel/helpers/tree/v1.4.1" + }, "time": "2021-02-16T15:27:11+00:00" }, { "name": "laravel/passport", - "version": "v9.4.0", + "version": "v10.1.3", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "011bd500e8ae3d459b692467880a49ff1ecd60c0" + "reference": "a5e4471dd99b7638ab5ca3ecab6cd87cf37eb410" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/011bd500e8ae3d459b692467880a49ff1ecd60c0", - "reference": "011bd500e8ae3d459b692467880a49ff1ecd60c0", + "url": "https://api.github.com/repos/laravel/passport/zipball/a5e4471dd99b7638ab5ca3ecab6cd87cf37eb410", + "reference": "a5e4471dd99b7638ab5ca3ecab6cd87cf37eb410", "shasum": "" }, "require": { "ext-json": "*", "firebase/php-jwt": "^5.0", - "illuminate/auth": "^6.18.31|^7.22.4", - "illuminate/console": "^6.18.31|^7.22.4", - "illuminate/container": "^6.18.31|^7.22.4", - "illuminate/contracts": "^6.18.31|^7.22.4", - "illuminate/cookie": "^6.18.31|^7.22.4", - "illuminate/database": "^6.18.31|^7.22.4", - "illuminate/encryption": "^6.18.31|^7.22.4", - "illuminate/http": "^6.18.31|^7.22.4", - "illuminate/support": "^6.18.31|^7.22.4", - "laminas/laminas-diactoros": "^2.2", + "illuminate/auth": "^8.2", + "illuminate/console": "^8.2", + "illuminate/container": "^8.2", + "illuminate/contracts": "^8.2", + "illuminate/cookie": "^8.2", + "illuminate/database": "^8.2", + "illuminate/encryption": "^8.2", + "illuminate/http": "^8.2", + "illuminate/support": "^8.2", "lcobucci/jwt": "^3.4|^4.0", - "league/oauth2-server": "^8.2.3", - "nyholm/psr7": "^1.0", - "php": "^7.2|^8.0", - "phpseclib/phpseclib": "^2.0", + "league/oauth2-server": "^8.2", + "nyholm/psr7": "^1.3", + "php": "^7.3|^8.0", + "phpseclib/phpseclib": "^2.0|^3.0", "symfony/psr-http-message-bridge": "^2.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^4.4|^5.0", - "phpunit/phpunit": "^8.5|^9.3" + "orchestra/testbench": "^6.0", + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" }, "laravel": { "providers": [ @@ -2749,7 +2980,8 @@ }, "autoload": { "psr-4": { - "Laravel\\Passport\\": "src/" + "Laravel\\Passport\\": "src/", + "Laravel\\Passport\\Database\\Factories\\": "database/factories/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2772,7 +3004,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2020-12-04T09:37:12+00:00" + "time": "2021-04-06T14:30:45+00:00" }, { "name": "laravel/slack-notification-channel", @@ -2897,8 +3129,70 @@ "laravel", "psysh" ], + "support": { + "issues": "https://github.com/laravel/tinker/issues", + "source": "https://github.com/laravel/tinker/tree/v2.6.1" + }, "time": "2021-03-02T16:53:12+00:00" }, + { + "name": "laravel/ui", + "version": "v3.3.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/ui.git", + "reference": "07d725813350c695c779382cbd6dac0ab8665537" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/ui/zipball/07d725813350c695c779382cbd6dac0ab8665537", + "reference": "07d725813350c695c779382cbd6dac0ab8665537", + "shasum": "" + }, + "require": { + "illuminate/console": "^8.42", + "illuminate/filesystem": "^8.42", + "illuminate/support": "^8.42", + "illuminate/validation": "^8.42", + "php": "^7.3|^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Ui\\UiServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Ui\\": "src/", + "Illuminate\\Foundation\\Auth\\": "auth-backend/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Laravel UI utilities and presets.", + "keywords": [ + "laravel", + "ui" + ], + "support": { + "source": "https://github.com/laravel/ui/tree/v3.3.0" + }, + "time": "2021-05-25T16:45:33+00:00" + }, { "name": "laravelcollective/html", "version": "v6.2.1", @@ -2972,66 +3266,54 @@ "time": "2020-12-15T20:20:05+00:00" }, { - "name": "lcobucci/jwt", - "version": "3.4.5", + "name": "lcobucci/clock", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/lcobucci/jwt.git", - "reference": "511629a54465e89a31d3d7e4cf0935feab8b14c1" + "url": "https://github.com/lcobucci/clock.git", + "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/511629a54465e89a31d3d7e4cf0935feab8b14c1", - "reference": "511629a54465e89a31d3d7e4cf0935feab8b14c1", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3", + "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3", "shasum": "" }, "require": { - "ext-mbstring": "*", - "ext-openssl": "*", - "php": "^5.6 || ^7.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "mikey179/vfsstream": "~1.5", - "phpmd/phpmd": "~2.2", - "phpunit/php-invoker": "~1.1", - "phpunit/phpunit": "^5.7 || ^7.3", - "squizlabs/php_codesniffer": "~2.3" - }, - "suggest": { - "lcobucci/clock": "*" + "infection/infection": "^0.17", + "lcobucci/coding-standard": "^6.0", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/php-code-coverage": "9.1.4", + "phpunit/phpunit": "9.3.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, "autoload": { "psr-4": { - "Lcobucci\\JWT\\": "src" - }, - "files": [ - "compat/class-aliases.php", - "compat/json-exception-polyfill.php", - "compat/lcobucci-clock-polyfill.php" - ] + "Lcobucci\\Clock\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Luís Otávio Cobucci Oblonczyk", - "email": "lcobucci@gmail.com", - "role": "Developer" + "name": "Luís Cobucci", + "email": "lcobucci@gmail.com" } ], - "description": "A simple library to work with JSON Web Token and JSON Web Signature", - "keywords": [ - "JWS", - "jwt" - ], + "description": "Yet another clock abstraction", + "support": { + "issues": "https://github.com/lcobucci/clock/issues", + "source": "https://github.com/lcobucci/clock/tree/2.0.x" + }, "funding": [ { "url": "https://github.com/lcobucci", @@ -3042,20 +3324,94 @@ "type": "patreon" } ], - "time": "2021-02-16T09:40:01+00:00" + "time": "2020-08-27T18:56:02+00:00" }, { - "name": "league/commonmark", - "version": "1.5.8", + "name": "lcobucci/jwt", + "version": "4.1.4", "source": { "type": "git", - "url": "https://github.com/thephpleague/commonmark.git", - "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf" + "url": "https://github.com/lcobucci/jwt.git", + "reference": "71cf170102c8371ccd933fa4df6252086d144de6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", - "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/71cf170102c8371ccd933fa4df6252086d144de6", + "reference": "71cf170102c8371ccd933fa4df6252086d144de6", + "shasum": "" + }, + "require": { + "ext-hash": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-openssl": "*", + "ext-sodium": "*", + "lcobucci/clock": "^2.0", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "infection/infection": "^0.21", + "lcobucci/coding-standard": "^6.0", + "mikey179/vfsstream": "^1.6.7", + "phpbench/phpbench": "^1.0@alpha", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/php-invoker": "^3.1", + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Lcobucci\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Luís Cobucci", + "email": "lcobucci@gmail.com", + "role": "Developer" + } + ], + "description": "A simple library to work with JSON Web Token and JSON Web Signature", + "keywords": [ + "JWS", + "jwt" + ], + "support": { + "issues": "https://github.com/lcobucci/jwt/issues", + "source": "https://github.com/lcobucci/jwt/tree/4.1.4" + }, + "funding": [ + { + "url": "https://github.com/lcobucci", + "type": "github" + }, + { + "url": "https://www.patreon.com/lcobucci", + "type": "patreon" + } + ], + "time": "2021-03-23T23:53:08+00:00" + }, + { + "name": "league/commonmark", + "version": "1.6.2", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/commonmark.git", + "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb", + "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb", "shasum": "" }, "require": { @@ -3111,6 +3467,12 @@ "md", "parser" ], + "support": { + "docs": "https://commonmark.thephpleague.com/", + "issues": "https://github.com/thephpleague/commonmark/issues", + "rss": "https://github.com/thephpleague/commonmark/releases.atom", + "source": "https://github.com/thephpleague/commonmark" + }, "funding": [ { "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", @@ -3137,26 +3499,26 @@ "type": "tidelift" } ], - "time": "2021-03-28T18:51:39+00:00" + "time": "2021-05-12T11:39:41+00:00" }, { "name": "league/csv", - "version": "9.6.2", + "version": "9.7.1", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "f28da6e483bf979bac10e2add384c90ae9983e4e" + "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/f28da6e483bf979bac10e2add384c90ae9983e4e", - "reference": "f28da6e483bf979bac10e2add384c90ae9983e4e", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/0ec57e8264ec92565974ead0d1724cf1026e10c1", + "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": ">=7.2.5" + "php": "^7.3 || ^8.0" }, "require-dev": { "ext-curl": "*", @@ -3165,7 +3527,7 @@ "phpstan/phpstan": "^0.12.0", "phpstan/phpstan-phpunit": "^0.12.0", "phpstan/phpstan-strict-rules": "^0.12.0", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.5" }, "suggest": { "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes", @@ -3221,7 +3583,7 @@ "type": "github" } ], - "time": "2020-12-10T19:40:30+00:00" + "time": "2021-04-17T16:32:08+00:00" }, { "name": "league/event", @@ -3617,75 +3979,6 @@ ], "time": "2020-12-10T11:35:44+00:00" }, - { - "name": "masterminds/html5", - "version": "2.7.4", - "source": { - "type": "git", - "url": "https://github.com/Masterminds/html5-php.git", - "reference": "9227822783c75406cfe400984b2f095cdf03d417" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/9227822783c75406cfe400984b2f095cdf03d417", - "reference": "9227822783c75406cfe400984b2f095cdf03d417", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-dom": "*", - "ext-libxml": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Masterminds\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Matt Butcher", - "email": "technosophos@gmail.com" - }, - { - "name": "Matt Farina", - "email": "matt@mattfarina.com" - }, - { - "name": "Asmir Mustafic", - "email": "goetas@gmail.com" - } - ], - "description": "An HTML5 parser and serializer.", - "homepage": "http://masterminds.github.io/html5-php", - "keywords": [ - "HTML5", - "dom", - "html", - "parser", - "querypath", - "serializer", - "xml" - ], - "support": { - "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.4" - }, - "time": "2020-10-01T13:52:52+00:00" - }, { "name": "maximebf/debugbar", "version": "v1.16.5", @@ -3951,16 +4244,16 @@ }, { "name": "nesbot/carbon", - "version": "2.46.0", + "version": "2.49.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4" + "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", - "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee", + "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee", "shasum": "" }, "require": { @@ -4026,6 +4319,10 @@ "datetime", "time" ], + "support": { + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, "funding": [ { "url": "https://opencollective.com/Carbon", @@ -4036,20 +4333,20 @@ "type": "tidelift" } ], - "time": "2021-02-24T17:30:44+00:00" + "time": "2021-06-02T07:31:40+00:00" }, { "name": "nikic/php-parser", - "version": "v4.10.4", + "version": "v4.10.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", "shasum": "" }, "require": { @@ -4090,33 +4387,41 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" }, - "time": "2020-12-20T10:01:03+00:00" + "time": "2021-05-03T19:11:20+00:00" }, { "name": "nunomaduro/collision", - "version": "v3.2.0", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "f7c45764dfe4ba5f2618d265a6f1f9c72732e01d" + "reference": "41b7e9999133d5082700d31a1d0977161df8322a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d", - "reference": "f7c45764dfe4ba5f2618d265a6f1f9c72732e01d", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/41b7e9999133d5082700d31a1d0977161df8322a", + "reference": "41b7e9999133d5082700d31a1d0977161df8322a", "shasum": "" }, "require": { - "filp/whoops": "^2.1.4", - "php": "^7.2.5 || ^8.0", - "php-parallel-lint/php-console-highlighter": "0.5.*", - "symfony/console": "~2.8|~3.3|~4.0" + "facade/ignition-contracts": "^1.0", + "filp/whoops": "^2.7.2", + "php": "^7.3 || ^8.0", + "symfony/console": "^5.0" }, "require-dev": { - "laravel/framework": "^6.0", - "phpunit/phpunit": "^8.0 || ^9.0" + "brianium/paratest": "^6.1", + "fideloper/proxy": "^4.4.1", + "friendsofphp/php-cs-fixer": "^2.17.3", + "fruitcake/laravel-cors": "^2.0.3", + "laravel/framework": "^9.0", + "nunomaduro/larastan": "^0.6.2", + "nunomaduro/mock-final-classes": "^1.0", + "orchestra/testbench": "^7.0", + "phpstan/phpstan": "^0.12.64", + "phpunit/phpunit": "^9.5.0" }, "type": "library", "extra": { @@ -4172,7 +4477,7 @@ "type": "patreon" } ], - "time": "2021-02-11T09:01:42+00:00" + "time": "2021-04-09T13:38:32+00:00" }, { "name": "nyholm/psr7", @@ -4235,6 +4540,10 @@ "psr-17", "psr-7" ], + "support": { + "issues": "https://github.com/Nyholm/psr7/issues", + "source": "https://github.com/Nyholm/psr7/tree/1.4.0" + }, "funding": [ { "url": "https://github.com/Zegnat", @@ -4295,20 +4604,25 @@ "onelogin", "saml" ], + "support": { + "email": "sixto.garcia@onelogin.com", + "issues": "https://github.com/onelogin/php-saml/issues", + "source": "https://github.com/onelogin/php-saml/" + }, "time": "2021-03-02T10:13:07+00:00" }, { "name": "opis/closure", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5" + "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", - "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", + "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6", + "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6", "shasum": "" }, "require": { @@ -4358,9 +4672,9 @@ ], "support": { "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.1" + "source": "https://github.com/opis/closure/tree/3.6.2" }, - "time": "2020-11-07T02:01:34+00:00" + "time": "2021-04-09T13:42:10+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -4431,20 +4745,20 @@ }, { "name": "paragonie/random_compat", - "version": "v9.99.99", + "version": "v9.99.100", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", "shasum": "" }, "require": { - "php": "^7" + "php": ">= 7" }, "require-dev": { "phpunit/phpunit": "4.*|5.*", @@ -4477,7 +4791,7 @@ "issues": "https://github.com/paragonie/random_compat/issues", "source": "https://github.com/paragonie/random_compat" }, - "time": "2018-07-02T15:55:56+00:00" + "time": "2020-10-15T08:29:30+00:00" }, { "name": "patchwork/utf8", @@ -4610,108 +4924,6 @@ }, "time": "2015-12-19T14:08:53+00:00" }, - { - "name": "php-parallel-lint/php-console-color", - "version": "v0.3", - "source": { - "type": "git", - "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git", - "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e", - "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "replace": { - "jakub-onderka/php-console-color": "*" - }, - "require-dev": { - "php-parallel-lint/php-code-style": "1.0", - "php-parallel-lint/php-parallel-lint": "1.0", - "php-parallel-lint/php-var-dump-check": "0.*", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleColor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com" - } - ], - "support": { - "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues", - "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/master" - }, - "time": "2020-05-14T05:47:14+00:00" - }, - { - "name": "php-parallel-lint/php-console-highlighter", - "version": "v0.5", - "source": { - "type": "git", - "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git", - "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8", - "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.4.0", - "php-parallel-lint/php-console-color": "~0.2" - }, - "replace": { - "jakub-onderka/php-console-highlighter": "*" - }, - "require-dev": { - "php-parallel-lint/php-code-style": "~1.0", - "php-parallel-lint/php-parallel-lint": "~1.0", - "php-parallel-lint/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleHighlighter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" - } - ], - "description": "Highlight PHP code in terminal", - "support": { - "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues", - "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/master" - }, - "time": "2020-05-13T07:37:49+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -4941,24 +5153,26 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.31", + "version": "3.0.8", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4" + "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/233a920cb38636a43b18d428f9a8db1f0a1a08f4", - "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d9615a6fb970d9933866ca8b4036ec3407b020b6", + "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6", "shasum": "" }, "require": { - "php": ">=5.3.3" + "paragonie/constant_time_encoding": "^1|^2", + "paragonie/random_compat": "^1.4|^2.0|^9.99.99", + "php": ">=5.6.1" }, "require-dev": { "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", + "phpunit/phpunit": "^5.7|^6.0|^9.4", "squizlabs/php_codesniffer": "~2.0" }, "suggest": { @@ -4973,7 +5187,7 @@ "phpseclib/bootstrap.php" ], "psr-4": { - "phpseclib\\": "phpseclib/" + "phpseclib3\\": "phpseclib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5028,6 +5242,10 @@ "x.509", "x509" ], + "support": { + "issues": "https://github.com/phpseclib/phpseclib/issues", + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.8" + }, "funding": [ { "url": "https://github.com/terrafrost", @@ -5042,7 +5260,7 @@ "type": "tidelift" } ], - "time": "2021-04-06T13:56:45+00:00" + "time": "2021-04-19T03:20:48+00:00" }, { "name": "phpspec/prophecy", @@ -5105,6 +5323,10 @@ "spy", "stub" ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/1.13.0" + }, "time": "2021-03-17T13:42:18+00:00" }, { @@ -5387,8 +5609,114 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.1" + }, "time": "2021-03-05T17:36:06+00:00" }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-factory", "version": "1.0.1", @@ -5499,16 +5827,16 @@ }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -5532,7 +5860,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -5543,9 +5871,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "psr/simple-cache", @@ -5600,20 +5928,19 @@ }, { "name": "psy/psysh", - "version": "v0.10.7", + "version": "v0.10.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a395af46999a12006213c0c8346c9445eb31640c" + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c", - "reference": "a395af46999a12006213c0c8346c9445eb31640c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", @@ -5668,7 +5995,11 @@ "interactive", "shell" ], - "time": "2021-03-14T02:14:56+00:00" + "support": { + "issues": "https://github.com/bobthecow/psysh/issues", + "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" + }, + "time": "2021-04-10T16:23:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -5715,54 +6046,140 @@ "time": "2019-03-08T08:55:37+00:00" }, { - "name": "ramsey/uuid", - "version": "3.9.3", + "name": "ramsey/collection", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/ramsey/uuid.git", - "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92" + "url": "https://github.com/ramsey/collection.git", + "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92", - "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92", + "url": "https://api.github.com/repos/ramsey/collection/zipball/28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", + "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", "shasum": "" }, "require": { + "php": "^7.2 || ^8" + }, + "require-dev": { + "captainhook/captainhook": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "ergebnis/composer-normalize": "^2.6", + "fakerphp/faker": "^1.5", + "hamcrest/hamcrest-php": "^2", + "jangregor/phpstan-prophecy": "^0.8", + "mockery/mockery": "^1.3", + "phpstan/extension-installer": "^1", + "phpstan/phpstan": "^0.12.32", + "phpstan/phpstan-mockery": "^0.12.5", + "phpstan/phpstan-phpunit": "^0.12.11", + "phpunit/phpunit": "^8.5 || ^9", + "psy/psysh": "^0.10.4", + "slevomat/coding-standard": "^6.3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Ramsey\\Collection\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "A PHP 7.2+ library for representing and manipulating collections.", + "keywords": [ + "array", + "collection", + "hash", + "map", + "queue", + "set" + ], + "support": { + "issues": "https://github.com/ramsey/collection/issues", + "source": "https://github.com/ramsey/collection/tree/1.1.3" + }, + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", + "type": "tidelift" + } + ], + "time": "2021-01-21T17:40:04+00:00" + }, + { + "name": "ramsey/uuid", + "version": "4.1.1", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "cd4032040a750077205918c86049aa0f43d22947" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/cd4032040a750077205918c86049aa0f43d22947", + "reference": "cd4032040a750077205918c86049aa0f43d22947", + "shasum": "" + }, + "require": { + "brick/math": "^0.8 || ^0.9", "ext-json": "*", - "paragonie/random_compat": "^1 | ^2 | 9.99.99", - "php": "^5.4 | ^7 | ^8", + "php": "^7.2 || ^8", + "ramsey/collection": "^1.0", "symfony/polyfill-ctype": "^1.8" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { - "codeception/aspect-mock": "^1 | ^2", - "doctrine/annotations": "^1.2", - "goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1", - "jakub-onderka/php-parallel-lint": "^1", - "mockery/mockery": "^0.9.11 | ^1", + "codeception/aspect-mock": "^3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0", + "doctrine/annotations": "^1.8", + "goaop/framework": "^2", + "mockery/mockery": "^1.3", "moontoast/math": "^1.1", "paragonie/random-lib": "^2", - "php-mock/php-mock-phpunit": "^0.3 | ^1.1", - "phpunit/phpunit": "^4.8 | ^5.4 | ^6.5", - "squizlabs/php_codesniffer": "^3.5" + "php-mock/php-mock-mockery": "^1.3", + "php-mock/php-mock-phpunit": "^2.5", + "php-parallel-lint/php-parallel-lint": "^1.1", + "phpbench/phpbench": "^0.17.1", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-mockery": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^8.5", + "psy/psysh": "^0.10.0", + "slevomat/coding-standard": "^6.0", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "3.9.4" }, "suggest": { - "ext-ctype": "Provides support for PHP Ctype functions", - "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", - "ext-openssl": "Provides the OpenSSL extension for use with the OpenSslGenerator", - "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", - "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", + "ext-ctype": "Enables faster processing of character classification using ctype functions.", + "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", + "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", - "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -5777,22 +6194,7 @@ "license": [ "MIT" ], - "authors": [ - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - }, - { - "name": "Marijn Huizendveld", - "email": "marijn.huizendveld@gmail.com" - }, - { - "name": "Thibaud Fabre", - "email": "thibaud@aztech.io" - } - ], - "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).", "homepage": "https://github.com/ramsey/uuid", "keywords": [ "guid", @@ -5802,10 +6204,15 @@ "support": { "issues": "https://github.com/ramsey/uuid/issues", "rss": "https://github.com/ramsey/uuid/releases.atom", - "source": "https://github.com/ramsey/uuid", - "wiki": "https://github.com/ramsey/uuid/wiki" + "source": "https://github.com/ramsey/uuid" }, - "time": "2020-02-21T04:36:14+00:00" + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], + "time": "2020-08-18T17:17:46+00:00" }, { "name": "robrichards/xmlseclibs", @@ -5915,26 +6322,26 @@ }, { "name": "rollbar/rollbar-laravel", - "version": "v6.0.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/rollbar/rollbar-php-laravel.git", - "reference": "11df7e19313a4cf60769d26ce35e29b09d5405cd" + "reference": "9ffed9026f3786538a64cf5fb7e28a1fbdd11b2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/11df7e19313a4cf60769d26ce35e29b09d5405cd", - "reference": "11df7e19313a4cf60769d26ce35e29b09d5405cd", + "url": "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/9ffed9026f3786538a64cf5fb7e28a1fbdd11b2d", + "reference": "9ffed9026f3786538a64cf5fb7e28a1fbdd11b2d", "shasum": "" }, "require": { - "illuminate/support": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0|^8.0", "php": ">=7.2", "rollbar/rollbar": "^2" }, "require-dev": { "mockery/mockery": "^1", - "orchestra/testbench": "^4|^5", + "orchestra/testbench": "^4.0|^5.0|^6.0", "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^8", "squizlabs/php_codesniffer": "3.*" @@ -5981,36 +6388,36 @@ ], "support": { "issues": "https://github.com/rollbar/rollbar-php-laravel/issues", - "source": "https://github.com/rollbar/rollbar-php-laravel/tree/v6.0.0" + "source": "https://github.com/rollbar/rollbar-php-laravel/tree/v7.0.0" }, - "time": "2020-03-03T20:09:19+00:00" + "time": "2020-09-10T17:20:14+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6049,7 +6456,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" }, "funding": [ { @@ -6057,33 +6464,33 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2020-10-26T15:49:45+00:00" }, { "name": "sebastian/diff", - "version": "3.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6115,7 +6522,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" }, "funding": [ { @@ -6123,34 +6530,34 @@ "type": "github" } ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.3", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6192,7 +6599,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" }, "funding": [ { @@ -6200,32 +6607,32 @@ "type": "github" } ], - "time": "2020-11-30T07:47:53+00:00" + "time": "2020-09-28T05:24:23+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6255,7 +6662,7 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" }, "funding": [ { @@ -6263,7 +6670,7 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2020-10-26T13:17:30+00:00" }, { "name": "spatie/db-dumper", @@ -6313,6 +6720,10 @@ "mysqldump", "spatie" ], + "support": { + "issues": "https://github.com/spatie/db-dumper/issues", + "source": "https://github.com/spatie/db-dumper/tree/2.21.1" + }, "funding": [ { "url": "https://github.com/spatie", @@ -6323,36 +6734,37 @@ }, { "name": "spatie/laravel-backup", - "version": "6.11.1", + "version": "6.16.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c" + "reference": "6b2229a07d92c2bb146ad9c5223fc32e9d74830c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c", - "reference": "3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/6b2229a07d92c2bb146ad9c5223fc32e9d74830c", + "reference": "6b2229a07d92c2bb146ad9c5223fc32e9d74830c", "shasum": "" }, "require": { - "illuminate/console": "^5.8.15|^6.0|^7.0", - "illuminate/contracts": "^5.8.15|^6.0|^7.0", - "illuminate/events": "^5.8.15|^6.0|^7.0", - "illuminate/filesystem": "^5.8.15|^6.0|^7.0", - "illuminate/notifications": "^5.8.15|^6.0|^7.0", - "illuminate/support": "^5.8.15|^6.0|^7.0", + "ext-zip": "^1.14.0", + "illuminate/console": "^6.0|^7.0|^8.0", + "illuminate/contracts": "^6.0|^7.0|^8.0", + "illuminate/events": "^6.0|^7.0|^8.0", + "illuminate/filesystem": "^6.0|^7.0|^8.0", + "illuminate/notifications": "^6.0|^7.0|^8.0", + "illuminate/support": "^6.0|^7.0|^8.0", "league/flysystem": "^1.0.49", - "php": "^7.2", + "php": "^7.3|^8.0", "spatie/db-dumper": "^2.12", "spatie/temporary-directory": "^1.1", "symfony/finder": "^4.2|^5.0" }, "require-dev": { - "laravel/slack-notification-channel": "^1.0", + "laravel/slack-notification-channel": "^2.3", "league/flysystem-aws-s3-v3": "^1.0", - "mockery/mockery": "^1.3", - "orchestra/testbench": "3.8.*|4.*|5.*", + "mockery/mockery": "^1.4.2", + "orchestra/testbench": "4.*|5.*|6.*", "phpunit/phpunit": "^8.4|^9.0" }, "suggest": { @@ -6396,19 +6808,19 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/master" + "source": "https://github.com/spatie/laravel-backup/tree/6.16.0" }, "funding": [ { - "url": "https://spatie.be/open-source/support-us", - "type": "custom" + "url": "https://github.com/sponsors/spatie", + "type": "github" }, { - "url": "https://github.com/spatie", - "type": "github" + "url": "https://spatie.be/open-source/support-us", + "type": "other" } ], - "time": "2020-06-18T09:59:06+00:00" + "time": "2021-04-15T09:31:32+00:00" }, { "name": "spatie/temporary-directory", @@ -6461,62 +6873,6 @@ }, "time": "2020-11-09T15:54:21+00:00" }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.5.8", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", - "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards" - ], - "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" - }, - "time": "2020-10-23T02:01:07+00:00" - }, { "name": "swiftmailer/swiftmailer", "version": "v6.2.7", @@ -6576,6 +6932,10 @@ "mail", "mailer" ], + "support": { + "issues": "https://github.com/swiftmailer/swiftmailer/issues", + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + }, "funding": [ { "url": "https://github.com/fabpot", @@ -6590,42 +6950,45 @@ }, { "name": "symfony/console", - "version": "v4.4.21", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23" + "reference": "058553870f7809087fa80fa734704a21b9bcaeb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", - "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", + "url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2", + "reference": "058553870f7809087fa80fa734704a21b9bcaeb2", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2" + "symfony/service-contracts": "^1.1|^2", + "symfony/string": "^5.1" }, "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", "symfony/lock": "<4.4", - "symfony/process": "<3.3" + "symfony/process": "<4.4" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0", "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" + "symfony/process": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -6658,6 +7021,15 @@ ], "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6672,24 +7044,24 @@ "type": "tidelift" } ], - "time": "2021-03-26T09:23:24+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/css-selector", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8" + "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8", - "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", + "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5" }, "type": "library", "autoload": { @@ -6720,6 +7092,9 @@ ], "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/css-selector/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6734,20 +7109,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-05-26T17:40:38+00:00" }, { "name": "symfony/debug", - "version": "v4.4.20", + "version": "v4.4.25", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16" + "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16", - "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16", + "url": "https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f", + "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f", "shasum": "" }, "require": { @@ -6786,6 +7161,9 @@ ], "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.25" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6800,20 +7178,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T16:54:48+00:00" + "time": "2021-05-26T17:39:37+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { @@ -6822,7 +7200,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6851,7 +7229,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -6867,30 +7245,30 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.21", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "48e81a375525872e788c2418430f54150d935810" + "reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/48e81a375525872e788c2418430f54150d935810", - "reference": "48e81a375525872e788c2418430f54150d935810", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/0e6768b8c0dcef26df087df2bbbaa143867a59b2", + "reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/log": "~1.0", - "symfony/debug": "^4.4.5", + "php": ">=7.2.5", + "psr/log": "^1.0", "symfony/polyfill-php80": "^1.15", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { + "symfony/deprecation-contracts": "^2.1", "symfony/http-kernel": "^4.4|^5.0", "symfony/serializer": "^4.4|^5.0" }, @@ -6919,6 +7297,9 @@ ], "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/error-handler/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6933,42 +7314,44 @@ "type": "tidelift" } ], - "time": "2021-03-08T10:28:40+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c" + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c", - "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67a5f354afa8e2f231081b3fa11a5912f933c3ce", + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/event-dispatcher-contracts": "^2", + "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/dependency-injection": "<3.4" + "symfony/dependency-injection": "<4.4" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "1.1" + "symfony/event-dispatcher-implementation": "2.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/error-handler": "~3.4|~4.4", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^3.4|^4.0|^5.0" + "symfony/stopwatch": "^4.4|^5.0" }, "suggest": { "symfony/dependency-injection": "", @@ -6999,6 +7382,9 @@ ], "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7013,33 +7399,33 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.9", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7" + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" }, "suggest": { - "psr/event-dispatcher": "", "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7076,7 +7462,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" }, "funding": [ { @@ -7092,24 +7478,24 @@ "type": "tidelift" } ], - "time": "2020-07-06T13:19:58+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/finder", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", + "url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5" }, "type": "library", "autoload": { @@ -7136,6 +7522,9 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7150,20 +7539,20 @@ "type": "tidelift" } ], - "time": "2021-02-12T10:48:09+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v2.3.1", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "41db680a15018f9c1d4b23516059633ce280ca33" + "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33", - "reference": "41db680a15018f9c1d4b23516059633ce280ca33", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4", + "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4", "shasum": "" }, "require": { @@ -7174,9 +7563,8 @@ }, "type": "library", "extra": { - "branch-version": "2.3", "branch-alias": { - "dev-main": "2.3-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7213,7 +7601,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1" + "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0" }, "funding": [ { @@ -7229,31 +7617,36 @@ "type": "tidelift" } ], - "time": "2020-10-14T17:08:19+00:00" + "time": "2021-04-11T23:07:08+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.20", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a" + "reference": "8827b90cf8806e467124ad476acd15216c2fceb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a", - "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8827b90cf8806e467124ad476acd15216c2fceb6", + "reference": "8827b90cf8806e467124ad476acd15216c2fceb6", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/mime": "^4.3|^5.0", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.1", "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "^3.4|^4.0|^5.0" + "symfony/cache": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/mime": "^4.4|^5.0" + }, + "suggest": { + "symfony/mime": "To use the file extension guesser" }, "type": "library", "autoload": { @@ -7280,6 +7673,9 @@ ], "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v5.3.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7294,61 +7690,69 @@ "type": "tidelift" } ], - "time": "2021-02-25T17:11:33+00:00" + "time": "2021-06-02T09:32:00+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.21", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "0248214120d00c5f44f1cd5d9ad65f0b38459333" + "reference": "74eb022e3bac36b3d3a897951a98759f2b32b864" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0248214120d00c5f44f1cd5d9ad65f0b38459333", - "reference": "0248214120d00c5f44f1cd5d9ad65f0b38459333", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/74eb022e3bac36b3d3a897951a98759f2b32b864", + "reference": "74eb022e3bac36b3d3a897951a98759f2b32b864", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "psr/log": "~1.0", - "symfony/error-handler": "^4.4", - "symfony/event-dispatcher": "^4.4", + "symfony/deprecation-contracts": "^2.1", + "symfony/error-handler": "^4.4|^5.0", + "symfony/event-dispatcher": "^5.0", "symfony/http-client-contracts": "^1.1|^2", - "symfony/http-foundation": "^4.4|^5.0", + "symfony/http-foundation": "^5.3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/browser-kit": "<4.3", - "symfony/config": "<3.4", - "symfony/console": ">=5", - "symfony/dependency-injection": "<4.3", - "symfony/translation": "<4.2", - "twig/twig": "<1.43|<2.13,>=2" + "symfony/browser-kit": "<4.4", + "symfony/cache": "<5.0", + "symfony/config": "<5.0", + "symfony/console": "<4.4", + "symfony/dependency-injection": "<5.3", + "symfony/doctrine-bridge": "<5.0", + "symfony/form": "<5.0", + "symfony/http-client": "<5.0", + "symfony/mailer": "<5.0", + "symfony/messenger": "<5.0", + "symfony/translation": "<5.0", + "symfony/twig-bridge": "<5.0", + "symfony/validator": "<5.0", + "twig/twig": "<2.13" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^4.3|^5.0", - "symfony/dom-crawler": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/routing": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2|^5.0", + "symfony/browser-kit": "^4.4|^5.0", + "symfony/config": "^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/css-selector": "^4.4|^5.0", + "symfony/dependency-injection": "^5.3", + "symfony/dom-crawler": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/process": "^4.4|^5.0", + "symfony/routing": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0", + "symfony/translation": "^4.4|^5.0", "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.43|^2.13|^3.0.4" + "twig/twig": "^2.13|^3.0.4" }, "suggest": { "symfony/browser-kit": "", @@ -7381,6 +7785,9 @@ ], "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v5.3.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7395,20 +7802,20 @@ "type": "tidelift" } ], - "time": "2021-03-29T05:11:04+00:00" + "time": "2021-06-02T10:07:12+00:00" }, { "name": "symfony/mime", - "version": "v5.2.6", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "1b2092244374cbe48ae733673f2ca0818b37197b" + "reference": "ed710d297b181f6a7194d8172c9c2423d58e4852" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b", - "reference": "1b2092244374cbe48ae733673f2ca0818b37197b", + "url": "https://api.github.com/repos/symfony/mime/zipball/ed710d297b181f6a7194d8172c9c2423d58e4852", + "reference": "ed710d297b181f6a7194d8172c9c2423d58e4852", "shasum": "" }, "require": { @@ -7461,6 +7868,9 @@ "mime", "mime-type" ], + "support": { + "source": "https://github.com/symfony/mime/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7475,20 +7885,20 @@ "type": "tidelift" } ], - "time": "2021-03-12T13:18:39+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -7500,7 +7910,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7537,6 +7947,9 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7551,20 +7964,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", "shasum": "" }, "require": { @@ -7576,7 +7989,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7614,6 +8027,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7628,20 +8044,101 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { - "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-27T09:17:38+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.23.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", "shasum": "" }, "require": { @@ -7655,7 +8152,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7698,6 +8195,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7712,20 +8212,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -7737,7 +8237,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7779,6 +8279,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7793,20 +8296,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", "shasum": "" }, "require": { @@ -7818,7 +8321,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7856,6 +8359,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7870,20 +8376,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { @@ -7892,7 +8398,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7929,6 +8435,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7943,20 +8452,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { @@ -7965,7 +8474,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8005,6 +8514,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8019,20 +8531,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", "shasum": "" }, "require": { @@ -8041,7 +8553,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8085,6 +8597,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8099,24 +8614,25 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/process", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a" + "reference": "53e36cb1c160505cdaf1ef201501669c4c317191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a", - "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a", + "url": "https://api.github.com/repos/symfony/process/zipball/53e36cb1c160505cdaf1ef201501669c4c317191", + "reference": "53e36cb1c160505cdaf1ef201501669c4c317191", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.15" }, "type": "library", "autoload": { @@ -8143,6 +8659,9 @@ ], "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8157,7 +8676,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -8227,6 +8746,10 @@ "psr-17", "psr-7" ], + "support": { + "issues": "https://github.com/symfony/psr-http-message-bridge/issues", + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8245,37 +8768,39 @@ }, { "name": "symfony/routing", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df" + "reference": "368e81376a8e049c37cb80ae87dbfbf411279199" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df", - "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df", + "url": "https://api.github.com/repos/symfony/routing/zipball/368e81376a8e049c37cb80ae87dbfbf411279199", + "reference": "368e81376a8e049c37cb80ae87dbfbf411279199", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/config": "<4.2", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" + "doctrine/annotations": "<1.12", + "symfony/config": "<5.3", + "symfony/dependency-injection": "<4.4", + "symfony/yaml": "<4.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", + "doctrine/annotations": "^1.12", "psr/log": "~1.0", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/config": "^5.3", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { - "doctrine/annotations": "For using the annotation loader", "symfony/config": "For using the all-in-one router or any loader", "symfony/expression-language": "For using expression matching", "symfony/http-foundation": "For using a Symfony Request object", @@ -8312,6 +8837,9 @@ "uri", "url" ], + "support": { + "source": "https://github.com/symfony/routing/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8326,25 +8854,25 @@ "type": "tidelift" } ], - "time": "2021-02-22T15:37:04+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1" + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.0" + "psr/container": "^1.1" }, "suggest": { "symfony/service-implementation": "" @@ -8352,7 +8880,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -8389,7 +8917,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/master" + "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" }, "funding": [ { @@ -8405,46 +8933,133 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-04-01T10:43:52+00:00" }, { - "name": "symfony/translation", - "version": "v4.4.21", + "name": "symfony/string", + "version": "v5.3.0", "source": { "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14" + "url": "https://github.com/symfony/string.git", + "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", - "reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", + "url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b", + "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1.6|^2" + "symfony/polyfill-php80": "~1.15" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0", + "symfony/http-client": "^4.4|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.3.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-26T17:43:10+00:00" + }, + { + "name": "symfony/translation", + "version": "v5.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "251de0d921c42ef0a81494d8f37405421deefdf6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/251de0d921c42ef0a81494d8f37405421deefdf6", + "reference": "251de0d921c42ef0a81494d8f37405421deefdf6", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15", + "symfony/translation-contracts": "^2.3" }, "conflict": { - "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4", - "symfony/yaml": "<3.4" + "symfony/config": "<4.4", + "symfony/dependency-injection": "<5.0", + "symfony/http-kernel": "<5.0", + "symfony/twig-bundle": "<5.0", + "symfony/yaml": "<4.4" }, "provide": { - "symfony/translation-implementation": "1.0|2.0" + "symfony/translation-implementation": "2.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/finder": "~2.8|~3.0|~4.0|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/intl": "^3.4|^4.0|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/dependency-injection": "^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/http-kernel": "^5.0", + "symfony/intl": "^4.4|^5.0", + "symfony/polyfill-intl-icu": "^1.21", "symfony/service-contracts": "^1.1.2|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -8453,6 +9068,9 @@ }, "type": "library", "autoload": { + "files": [ + "Resources/functions.php" + ], "psr-4": { "Symfony\\Component\\Translation\\": "" }, @@ -8476,6 +9094,9 @@ ], "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8490,20 +9111,20 @@ "type": "tidelift" } ], - "time": "2021-03-23T16:25:01+00:00" + "time": "2021-05-29T22:28:28+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105" + "reference": "95c812666f3e91db75385749fe219c5e494c7f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105", - "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95", + "reference": "95c812666f3e91db75385749fe219c5e494c7f95", "shasum": "" }, "require": { @@ -8515,7 +9136,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -8552,7 +9173,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0" }, "funding": [ { @@ -8568,37 +9189,36 @@ "type": "tidelift" } ], - "time": "2020-09-28T13:05:58+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.21", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806" + "reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806", - "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1d3953e627fe4b5f6df503f356b6545ada6351f3", + "reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php72": "~1.5", "symfony/polyfill-php80": "^1.15" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/console": "<3.4" + "phpunit/phpunit": "<5.4.3", + "symfony/console": "<4.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^3.4|^4.0|^5.0", + "symfony/console": "^4.4|^5.0", "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" + "twig/twig": "^2.13|^3.0.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -8640,6 +9260,9 @@ "debug", "dump" ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8654,7 +9277,7 @@ "type": "tidelift" } ], - "time": "2021-03-27T19:49:03+00:00" + "time": "2021-05-27T12:28:50+00:00" }, { "name": "tecnickcom/tc-lib-barcode", @@ -8742,6 +9365,10 @@ "tc-lib-barcode", "upc" ], + "support": { + "issues": "https://github.com/tecnickcom/tc-lib-barcode/issues", + "source": "https://github.com/tecnickcom/tc-lib-barcode/tree/1.17.6" + }, "funding": [ { "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tc-lib-barcode%20project", @@ -8809,6 +9436,10 @@ "tc-lib-color", "web" ], + "support": { + "issues": "https://github.com/tecnickcom/tc-lib-color/issues", + "source": "https://github.com/tecnickcom/tc-lib-color/tree/1.14.6" + }, "funding": [ { "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tc-lib-color%20project", @@ -8865,27 +9496,32 @@ "collection", "laravel" ], + "support": { + "issues": "https://github.com/tighten/collect/issues", + "source": "https://github.com/tighten/collect/tree/v8.34.0" + }, "time": "2021-03-29T21:29:00+00:00" }, { "name": "tightenco/ziggy", - "version": "0.9.4", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/tighten/ziggy.git", - "reference": "82ea6ec6cb6ab3545b0245310b2a424316fe48d8" + "reference": "147804d5f3e98b897fc1ed15efc2807f1099cf83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tighten/ziggy/zipball/82ea6ec6cb6ab3545b0245310b2a424316fe48d8", - "reference": "82ea6ec6cb6ab3545b0245310b2a424316fe48d8", + "url": "https://api.github.com/repos/tighten/ziggy/zipball/147804d5f3e98b897fc1ed15efc2807f1099cf83", + "reference": "147804d5f3e98b897fc1ed15efc2807f1099cf83", "shasum": "" }, "require": { "laravel/framework": ">=5.4@dev" }, "require-dev": { - "orchestra/testbench": "^5.0" + "orchestra/testbench": "^6.0", + "phpunit/phpunit": "^9.2" }, "type": "library", "extra": { @@ -8912,10 +9548,14 @@ { "name": "Jake Bathman", "email": "jake@tighten.co" + }, + { + "name": "Jacob Baker-Kretzmar", + "email": "jacob@tighten.co" } ], "description": "Generates a Blade directive exporting all of your named Laravel routes. Also provides a nice route() helper function in JavaScript.", - "homepage": "https://github.com/tightenco/ziggy", + "homepage": "https://github.com/tighten/ziggy", "keywords": [ "Ziggy", "javascript", @@ -8924,9 +9564,9 @@ ], "support": { "issues": "https://github.com/tighten/ziggy/issues", - "source": "https://github.com/tighten/ziggy/tree/0.9.4" + "source": "https://github.com/tighten/ziggy/tree/v1.2.0" }, - "time": "2020-06-05T14:42:41+00:00" + "time": "2021-05-24T22:46:59+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -9047,36 +9687,39 @@ }, { "name": "vlucas/phpdotenv", - "version": "v3.6.8", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "5e679f7616db829358341e2d5cccbd18773bdab8" + "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8", - "reference": "5e679f7616db829358341e2d5cccbd18773bdab8", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/b3eac5c7ac896e52deab4a99068e3f4ab12d9e56", + "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0", - "phpoption/phpoption": "^1.5.2", - "symfony/polyfill-ctype": "^1.17" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.1", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.7.4", + "symfony/polyfill-ctype": "^1.17", + "symfony/polyfill-mbstring": "^1.17", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20" + "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5.1" }, "suggest": { - "ext-filter": "Required to use the boolean validator.", - "ext-pcre": "Required to use most of the library." + "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "5.3-dev" } }, "autoload": { @@ -9108,7 +9751,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.8" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.3.0" }, "funding": [ { @@ -9120,33 +9763,107 @@ "type": "tidelift" } ], - "time": "2021-01-20T14:39:46+00:00" + "time": "2021-01-20T15:23:13+00:00" }, { - "name": "watson/validating", - "version": "4.0.0", + "name": "voku/portable-ascii", + "version": "1.5.6", "source": { "type": "git", - "url": "https://github.com/dwightwatson/validating.git", - "reference": "b8731af37eade6b25aac1fcec5e90fdfdb9de5f5" + "url": "https://github.com/voku/portable-ascii.git", + "reference": "80953678b19901e5165c56752d087fc11526017c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/b8731af37eade6b25aac1fcec5e90fdfdb9de5f5", - "reference": "b8731af37eade6b25aac1fcec5e90fdfdb9de5f5", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c", + "reference": "80953678b19901e5165c56752d087fc11526017c", "shasum": "" }, "require": { - "illuminate/contracts": "~6.0", - "illuminate/database": "~6.0", - "illuminate/events": "~6.0", - "illuminate/support": "~6.0", - "illuminate/validation": "~6.0", - "php": "^7.2" + "php": ">=7.0.0" }, "require-dev": { - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~8.0" + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-intl": "Use Intl for transliterator_transliterate() support" + }, + "type": "library", + "autoload": { + "psr-4": { + "voku\\": "src/voku/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lars Moelleken", + "homepage": "http://www.moelleken.org/" + } + ], + "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", + "homepage": "https://github.com/voku/portable-ascii", + "keywords": [ + "ascii", + "clean", + "php" + ], + "support": { + "issues": "https://github.com/voku/portable-ascii/issues", + "source": "https://github.com/voku/portable-ascii/tree/1.5.6" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], + "time": "2020-11-12T00:07:28+00:00" + }, + { + "name": "watson/validating", + "version": "6.1.0", + "source": { + "type": "git", + "url": "https://github.com/dwightwatson/validating.git", + "reference": "63c9af2ec2f01474b9a002c06c81492be10e9bd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/63c9af2ec2f01474b9a002c06c81492be10e9bd2", + "reference": "63c9af2ec2f01474b9a002c06c81492be10e9bd2", + "shasum": "" + }, + "require": { + "illuminate/contracts": "~8.0", + "illuminate/database": "~8.0", + "illuminate/events": "~8.0", + "illuminate/support": "~8.0", + "illuminate/validation": "~8.0", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "mockery/mockery": "^1.3.1", + "phpunit/phpunit": "~9.0" }, "type": "library", "autoload": { @@ -9172,9 +9889,9 @@ ], "support": { "issues": "https://github.com/dwightwatson/validating/issues", - "source": "https://github.com/dwightwatson/validating/tree/4.0.0" + "source": "https://github.com/dwightwatson/validating/tree/6.1.0" }, - "time": "2019-10-02T23:15:31+00:00" + "time": "2020-12-27T21:37:42+00:00" }, { "name": "webmozart/assert", @@ -9228,6 +9945,10 @@ "check", "validate" ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.10.0" + }, "time": "2021-03-09T10:59:23+00:00" } ], @@ -9290,20 +10011,24 @@ "gherkin", "parser" ], + "support": { + "issues": "https://github.com/Behat/Gherkin/issues", + "source": "https://github.com/Behat/Gherkin/tree/v4.8.0" + }, "time": "2021-02-04T12:44:21+00:00" }, { "name": "codeception/codeception", - "version": "4.1.20", + "version": "4.1.21", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a" + "reference": "c25f20d842a7e3fa0a8e6abf0828f102c914d419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/d8b16e13e1781dbc3a7ae8292117d520c89a9c5a", - "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c25f20d842a7e3fa0a8e6abf0828f102c914d419", + "reference": "c25f20d842a7e3fa0a8e6abf0828f102c914d419", "shasum": "" }, "require": { @@ -9323,11 +10048,11 @@ "symfony/yaml": ">=2.7 <6.0" }, "require-dev": { - "codeception/module-asserts": "*@dev", - "codeception/module-cli": "*@dev", - "codeception/module-db": "*@dev", - "codeception/module-filesystem": "*@dev", - "codeception/module-phpbrowser": "*@dev", + "codeception/module-asserts": "1.*@dev", + "codeception/module-cli": "1.*@dev", + "codeception/module-db": "1.*@dev", + "codeception/module-filesystem": "1.*@dev", + "codeception/module-phpbrowser": "1.*@dev", "codeception/specify": "~0.3", "codeception/util-universalframework": "*@dev", "monolog/monolog": "~1.8", @@ -9375,13 +10100,17 @@ "functional testing", "unit testing" ], + "support": { + "issues": "https://github.com/Codeception/Codeception/issues", + "source": "https://github.com/Codeception/Codeception/tree/4.1.21" + }, "funding": [ { "url": "https://opencollective.com/codeception", "type": "open_collective" } ], - "time": "2021-04-02T16:41:51+00:00" + "time": "2021-05-28T17:43:39+00:00" }, { "name": "codeception/lib-asserts", @@ -9439,16 +10168,16 @@ }, { "name": "codeception/lib-innerbrowser", - "version": "1.4.2", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "4ffb91c18e4cacd073ff2914c07e5ccaf5efe449" + "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4ffb91c18e4cacd073ff2914c07e5ccaf5efe449", - "reference": "4ffb91c18e4cacd073ff2914c07e5ccaf5efe449", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4b0d89b37fe454e060a610a85280a87ab4f534f1", + "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1", "shasum": "" }, "require": { @@ -9491,7 +10220,11 @@ "keywords": [ "codeception" ], - "time": "2021-04-06T05:26:49+00:00" + "support": { + "issues": "https://github.com/Codeception/lib-innerbrowser/issues", + "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.0" + }, + "time": "2021-04-23T06:18:29+00:00" }, { "name": "codeception/module-asserts", @@ -9605,16 +10338,16 @@ }, { "name": "codeception/module-rest", - "version": "1.2.8", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/Codeception/module-rest.git", - "reference": "4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10" + "reference": "293a0103d5257b7c884ef276147a9a06914e878f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-rest/zipball/4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10", - "reference": "4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10", + "url": "https://api.github.com/repos/Codeception/module-rest/zipball/293a0103d5257b7c884ef276147a9a06914e878f", + "reference": "293a0103d5257b7c884ef276147a9a06914e878f", "shasum": "" }, "require": { @@ -9651,20 +10384,24 @@ "codeception", "rest" ], - "time": "2021-03-02T06:47:59+00:00" + "support": { + "issues": "https://github.com/Codeception/module-rest/issues", + "source": "https://github.com/Codeception/module-rest/tree/1.3.1" + }, + "time": "2021-04-23T08:12:24+00:00" }, { "name": "codeception/module-webdriver", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Codeception/module-webdriver.git", - "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87" + "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/63ea08880a44df809bdfbca08597e1b68cee9f87", - "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87", + "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/ebbe729c630415e8caf6b0087e457906f0c6c0c6", + "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6", "shasum": "" }, "require": { @@ -9705,33 +10442,31 @@ ], "support": { "issues": "https://github.com/Codeception/module-webdriver/issues", - "source": "https://github.com/Codeception/module-webdriver/tree/1.2.0" + "source": "https://github.com/Codeception/module-webdriver/tree/1.2.1" }, - "time": "2021-01-17T19:23:20+00:00" + "time": "2021-04-23T17:30:57+00:00" }, { "name": "codeception/phpunit-wrapper", - "version": "8.1.4", + "version": "9.0.6", "source": { "type": "git", "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3" + "reference": "b0c06abb3181eedca690170f7ed0fd26a70bfacc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", - "reference": "f41335f0b4dd17cf7bbc63e87943b3ae72a8bbc3", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/b0c06abb3181eedca690170f7ed0fd26a70bfacc", + "reference": "b0c06abb3181eedca690170f7ed0fd26a70bfacc", "shasum": "" }, "require": { "php": ">=7.2", - "phpunit/php-code-coverage": "^7.0", - "phpunit/phpunit": "^8.0", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0" + "phpunit/phpunit": "^9.0" }, "require-dev": { "codeception/specify": "*", + "consolidation/robo": "^3.0.0-alpha3", "vlucas/phpdotenv": "^3.0" }, "type": "library", @@ -9748,14 +10483,17 @@ { "name": "Davert", "email": "davert.php@resend.cc" + }, + { + "name": "Naktibalda" } ], "description": "PHPUnit classes used by Codeception", "support": { "issues": "https://github.com/Codeception/phpunit-wrapper/issues", - "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" + "source": "https://github.com/Codeception/phpunit-wrapper/tree/9.0.6" }, - "time": "2020-12-28T14:00:08+00:00" + "time": "2020-12-28T13:59:47+00:00" }, { "name": "codeception/stub", @@ -9792,31 +10530,184 @@ "time": "2020-07-03T15:54:43+00:00" }, { - "name": "fzaninotto/faker", - "version": "v1.9.2", + "name": "facade/flare-client-php", + "version": "1.8.1", "source": { "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" + "url": "https://github.com/facade/flare-client-php.git", + "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f", + "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "facade/ignition-contracts": "~1.0", + "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0", + "php": "^7.1|^8.0", + "symfony/http-foundation": "^3.3|^4.1|^5.0", + "symfony/mime": "^3.4|^4.0|^5.1", + "symfony/var-dumper": "^3.4|^4.0|^5.0" }, "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^2.9.2" + "friendsofphp/php-cs-fixer": "^2.14", + "phpunit/phpunit": "^7.5.16", + "spatie/phpunit-snapshot-assertions": "^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Facade\\FlareClient\\": "src" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Send PHP errors to Flare", + "homepage": "https://github.com/facade/flare-client-php", + "keywords": [ + "exception", + "facade", + "flare", + "reporting" + ], + "support": { + "issues": "https://github.com/facade/flare-client-php/issues", + "source": "https://github.com/facade/flare-client-php/tree/1.8.1" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2021-05-31T19:23:29+00:00" + }, + { + "name": "facade/ignition", + "version": "2.10.2", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition.git", + "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition/zipball/43688227bbf27c43bc1ad83af224f135b6ef0ff4", + "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "facade/flare-client-php": "^1.6", + "facade/ignition-contracts": "^1.0.2", + "filp/whoops": "^2.4", + "illuminate/support": "^7.0|^8.0", + "monolog/monolog": "^2.0", + "php": "^7.2.5|^8.0", + "symfony/console": "^5.0", + "symfony/var-dumper": "^5.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "mockery/mockery": "^1.3", + "orchestra/testbench": "^5.0|^6.0", + "psalm/plugin-laravel": "^1.2" + }, + "suggest": { + "laravel/telescope": "^3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + }, + "laravel": { + "providers": [ + "Facade\\Ignition\\IgnitionServiceProvider" + ], + "aliases": { + "Flare": "Facade\\Ignition\\Facades\\Flare" + } + } + }, + "autoload": { + "psr-4": { + "Facade\\Ignition\\": "src" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A beautiful error page for Laravel applications.", + "homepage": "https://github.com/facade/ignition", + "keywords": [ + "error", + "flare", + "laravel", + "page" + ], + "support": { + "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction", + "forum": "https://twitter.com/flareappio", + "issues": "https://github.com/facade/ignition/issues", + "source": "https://github.com/facade/ignition" + }, + "time": "2021-06-11T06:57:25+00:00" + }, + { + "name": "fakerphp/faker", + "version": "v1.14.1", + "source": { + "type": "git", + "url": "https://github.com/FakerPHP/Faker.git", + "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1", + "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "psr/container": "^1.0", + "symfony/deprecation-contracts": "^2.2" + }, + "conflict": { + "fzaninotto/faker": "*" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "ext-intl": "*", + "symfony/phpunit-bridge": "^4.4 || ^5.2" + }, + "suggest": { + "ext-curl": "Required by Faker\\Provider\\Image to download images.", + "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", + "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", + "ext-mbstring": "Required for multibyte Unicode string functionality." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "v1.15-dev" } }, "autoload": { @@ -9840,11 +10731,61 @@ "fixtures" ], "support": { - "issues": "https://github.com/fzaninotto/Faker/issues", - "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" + "issues": "https://github.com/FakerPHP/Faker/issues", + "source": "https://github.com/FakerPHP/Faker/tree/v.1.14.1" }, - "abandoned": true, - "time": "2020-12-11T09:56:16+00:00" + "time": "2021-03-30T06:27:33+00:00" + }, + { + "name": "hamcrest/hamcrest-php", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "shasum": "" + }, + "require": { + "php": "^5.3|^7.0|^8.0" + }, + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" + }, + "require-dev": { + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "hamcrest" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "This is the PHP port of Hamcrest Matchers", + "keywords": [ + "test" + ], + "support": { + "issues": "https://github.com/hamcrest/hamcrest-php/issues", + "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" + }, + "time": "2020-07-09T08:09:16+00:00" }, { "name": "justinrainbow/json-schema", @@ -9916,6 +10857,78 @@ }, "time": "2020-05-27T16:41:55+00:00" }, + { + "name": "mockery/mockery", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea", + "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "^2.0.1", + "lib-pcre": ">=7.0", + "php": "^7.3 || ^8.0" + }, + "conflict": { + "phpunit/phpunit": "<8.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.5 || ^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Mockery": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ], + "support": { + "issues": "https://github.com/mockery/mockery/issues", + "source": "https://github.com/mockery/mockery/tree/1.4.3" + }, + "time": "2021-02-24T09:51:49+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.10.2", @@ -9976,25 +10989,25 @@ }, { "name": "n98/junit-xml", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/cmuench/junit-xml.git", - "reference": "7df0dbaf413fcaa1a63ffbcef18654e7a4cceb46" + "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cmuench/junit-xml/zipball/7df0dbaf413fcaa1a63ffbcef18654e7a4cceb46", - "reference": "7df0dbaf413fcaa1a63ffbcef18654e7a4cceb46", + "url": "https://api.github.com/repos/cmuench/junit-xml/zipball/0017dd92ac8cb619f02e32f4cffd768cfe327c73", + "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73", "shasum": "" }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "^9.5.0" }, "type": "library", "autoload": { - "psr-0": { - "N98\\JUnitXml": "src/" + "psr-4": { + "N98\\JUnitXml\\": "src/N98/JUnitXml" } }, "notification-url": "https://packagist.org/downloads/", @@ -10010,27 +11023,27 @@ "description": "JUnit XML Document generation library", "support": { "issues": "https://github.com/cmuench/junit-xml/issues", - "source": "https://github.com/cmuench/junit-xml/tree/master" + "source": "https://github.com/cmuench/junit-xml/tree/1.1.0" }, - "time": "2013-11-23T13:11:26+00:00" + "time": "2020-12-25T09:08:58+00:00" }, { "name": "overtrue/phplint", - "version": "2.3.5", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/overtrue/phplint.git", - "reference": "fa2a2ba64f997f268171a5b12d141b2fe94e5ad0" + "reference": "59affacd0b09a1460e39acf2c64c963ddbf734cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/phplint/zipball/fa2a2ba64f997f268171a5b12d141b2fe94e5ad0", - "reference": "fa2a2ba64f997f268171a5b12d141b2fe94e5ad0", + "url": "https://api.github.com/repos/overtrue/phplint/zipball/59affacd0b09a1460e39acf2c64c963ddbf734cf", + "reference": "59affacd0b09a1460e39acf2c64c963ddbf734cf", "shasum": "" }, "require": { "ext-json": "*", - "n98/junit-xml": "1.0.0", + "n98/junit-xml": "1.1.0", "php": ">=5.5.9", "symfony/console": "^3.2|^4.0|^5.0", "symfony/finder": "^3.0|^4.0|^5.0", @@ -10080,9 +11093,9 @@ ], "support": { "issues": "https://github.com/overtrue/phplint/issues", - "source": "https://github.com/overtrue/phplint/tree/2.3.5" + "source": "https://github.com/overtrue/phplint/tree/2.4.1" }, - "time": "2020-12-11T17:27:13+00:00" + "time": "2021-06-02T16:18:33+00:00" }, { "name": "phar-io/manifest", @@ -10189,20 +11202,24 @@ } ], "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.1.0" + }, "time": "2021-02-23T14:00:09+00:00" }, { "name": "php-webdriver/webdriver", - "version": "1.10.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211" + "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd9290b95b7651d495bd69253d6e3ef469a7f211", - "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/da16e39968f8dd5cfb7d07eef91dc2b731c69880", + "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880", "shasum": "" }, "require": { @@ -10230,11 +11247,6 @@ "ext-SimpleXML": "For Firefox profile creation" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.8.x-dev" - } - }, "autoload": { "psr-4": { "Facebook\\WebDriver\\": "lib/" @@ -10256,44 +11268,52 @@ "selenium", "webdriver" ], - "time": "2021-02-25T13:38:09+00:00" + "support": { + "issues": "https://github.com/php-webdriver/php-webdriver/issues", + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.1" + }, + "time": "2021-05-21T15:12:49+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.14", + "version": "9.2.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c" + "reference": "f6293e1b30a2354e8428e004689671b83871edde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c", - "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde", + "reference": "f6293e1b30a2354e8428e004689671b83871edde", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.1 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "nikic/php-parser": "^4.10.2", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.7.2" + "ext-pcov": "*", + "ext-xdebug": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -10321,7 +11341,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6" }, "funding": [ { @@ -10329,32 +11349,32 @@ "type": "github" } ], - "time": "2020-12-02T13:39:03+00:00" + "time": "2021-03-28T07:26:59+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -10381,7 +11401,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" }, "funding": [ { @@ -10389,26 +11409,97 @@ "type": "github" } ], - "time": "2020-11-30T08:25:21+00:00" + "time": "2020-09-28T05:57:25+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -10432,34 +11523,40 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" }, { "name": "phpunit/php-timer", - "version": "2.1.3", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -10485,7 +11582,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" }, "funding": [ { @@ -10493,7 +11590,7 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/php-token-stream", @@ -10557,16 +11654,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.15", + "version": "9.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef" + "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/038d4196d8e8cb405cd5e82cedfe413ad6eef9ef", - "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276", + "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276", "shasum": "" }, "require": { @@ -10577,32 +11674,35 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", + "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.1", "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" + "php": ">=7.3", + "phpspec/prophecy": "^1.12.1", + "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.5", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.3", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^2.3.2", + "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*" + "ext-pdo": "*", + "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" + "ext-xdebug": "*" }, "bin": [ "phpunit" @@ -10610,12 +11710,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.5-dev" + "dev-master": "9.5-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -10636,6 +11739,10 @@ "testing", "xunit" ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5" + }, "funding": [ { "url": "https://phpunit.de/donate.html", @@ -10646,32 +11753,144 @@ "type": "github" } ], - "time": "2021-03-17T07:27:54+00:00" + "time": "2021-06-05T04:49:07+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "sebastian/cli-parser", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -10693,7 +11912,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" }, "funding": [ { @@ -10701,27 +11920,84 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2020-09-28T05:30:19+00:00" }, { - "name": "sebastian/environment", - "version": "4.2.4", + "name": "sebastian/complexity", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", "shasum": "" }, "require": { - "php": ">=7.1" + "nikic/php-parser": "^4.7", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:52:27+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "388b6ced16caa751030f6a69e588299fa09200ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", + "reference": "388b6ced16caa751030f6a69e588299fa09200ac", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -10729,7 +12005,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -10756,7 +12032,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" }, "funding": [ { @@ -10764,30 +12040,30 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2020-09-28T05:52:38+00:00" }, { "name": "sebastian/global-state", - "version": "3.0.1", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", "shasum": "" }, "require": { - "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -10795,7 +12071,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -10820,7 +12096,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" }, "funding": [ { @@ -10828,34 +12104,91 @@ "type": "github" } ], - "time": "2020-11-30T07:43:24+00:00" + "time": "2021-06-11T13:31:12+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "3.0.4", + "name": "sebastian/lines-of-code", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "nikic/php-parser": "^4.6", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:42:11+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" } }, "autoload": { @@ -10877,7 +12210,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" }, "funding": [ { @@ -10885,79 +12218,27 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:37:18+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "shasum": "" - }, - "require": { - "php": ">=7.1" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { @@ -10980,11 +12261,11 @@ "email": "sebastian@phpunit.de" } ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" }, "funding": [ { @@ -10992,32 +12273,87 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2020-10-26T13:14:26+00:00" }, { - "name": "sebastian/type", - "version": "1.1.4", + "name": "sebastian/resource-operations", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.2" + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "2.3.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1", + "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" } }, "autoload": { @@ -11040,7 +12376,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + "source": "https://github.com/sebastianbergmann/type/tree/2.3.2" }, "funding": [ { @@ -11048,29 +12384,29 @@ "type": "github" } ], - "time": "2020-11-30T07:25:11+00:00" + "time": "2021-06-04T13:02:07+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -11093,31 +12429,34 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" }, - "time": "2016-10-03T07:35:21+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" }, { "name": "softcreatr/jsonpath", - "version": "0.7.3", + "version": "0.7.5", "source": { "type": "git", "url": "https://github.com/SoftCreatR/JSONPath.git", - "reference": "e3ae75112a5247e3b27a7e0e72155eae261d8c72" + "reference": "008569bf80aa3584834f7890781576bc7b65afa7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/e3ae75112a5247e3b27a7e0e72155eae261d8c72", - "reference": "e3ae75112a5247e3b27a7e0e72155eae261d8c72", + "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/008569bf80aa3584834f7890781576bc7b65afa7", + "reference": "008569bf80aa3584834f7890781576bc7b65afa7", "shasum": "" }, "require": { "ext-json": "*", "php": ">=7.1" }, - "conflict": { - "phpunit/phpunit": "<7.0 || >= 10.0" - }, "replace": { "flow/jsonpath": "*" }, @@ -11151,26 +12490,88 @@ } ], "description": "JSONPath implementation for parsing, searching and flattening arrays", + "support": { + "email": "hello@1-2.dev", + "forum": "https://github.com/SoftCreatR/JSONPath/discussions", + "issues": "https://github.com/SoftCreatR/JSONPath/issues", + "source": "https://github.com/SoftCreatR/JSONPath" + }, "funding": [ { "url": "https://github.com/softcreatr", "type": "github" } ], - "time": "2021-03-08T14:18:21+00:00" + "time": "2021-06-02T22:15:26+00:00" }, { - "name": "symfony/browser-kit", - "version": "v5.2.4", + "name": "squizlabs/php_codesniffer", + "version": "3.6.0", "source": { "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3ca3a57ce9860318b20a924fec5daf5c6db44d93", - "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards" + ], + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, + "time": "2021-04-09T00:54:41+00:00" + }, + { + "name": "symfony/browser-kit", + "version": "v5.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "379984e25eee9811b0a25a2105e1a2b3b8d9b734" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/379984e25eee9811b0a25a2105e1a2b3b8d9b734", + "reference": "379984e25eee9811b0a25a2105e1a2b3b8d9b734", "shasum": "" }, "require": { @@ -11211,6 +12612,9 @@ ], "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/browser-kit/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -11225,33 +12629,35 @@ "type": "tidelift" } ], - "time": "2021-02-22T06:48:33+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.4.20", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "be133557f1b0e6672367325b508e65da5513a311" + "reference": "55fff62b19f413f897a752488ade1bc9c8a19cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be133557f1b0e6672367325b508e65da5513a311", - "reference": "be133557f1b0e6672367325b508e65da5513a311", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/55fff62b19f413f897a752488ade1bc9c8a19cdd", + "reference": "55fff62b19f413f897a752488ade1bc9c8a19cdd", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "masterminds/html5": "<2.6" }, "require-dev": { "masterminds/html5": "^2.6", - "symfony/css-selector": "^3.4|^4.0|^5.0" + "symfony/css-selector": "^4.4|^5.0" }, "suggest": { "symfony/css-selector": "" @@ -11281,6 +12687,9 @@ ], "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dom-crawler/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -11295,20 +12704,20 @@ "type": "tidelift" } ], - "time": "2021-02-14T12:29:41+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/yaml", - "version": "v5.2.5", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "298a08ddda623485208506fcee08817807a251dd" + "reference": "3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd", - "reference": "298a08ddda623485208506fcee08817807a251dd", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11", + "reference": "3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11", "shasum": "" }, "require": { @@ -11353,6 +12762,9 @@ ], "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v5.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -11367,7 +12779,7 @@ "type": "tidelift" } ], - "time": "2021-03-06T07:59:01+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "theseer/tokenizer", @@ -11426,7 +12838,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.2.5", + "php": "^7.3|^8.0", "ext-curl": "*", "ext-fileinfo": "*", "ext-json": "*", @@ -11434,8 +12846,5 @@ "ext-pdo": "*" }, "platform-dev": [], - "platform-overrides": { - "php": "7.2.5" - }, - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/config/cors.php b/config/cors.php index 741dd11cea..9b0b36417d 100644 --- a/config/cors.php +++ b/config/cors.php @@ -4,7 +4,7 @@ return [ 'supportsCredentials' => false, - 'allowedOrigins' => $allowed_origins, + 'allowedOrigins' => '[*]', 'allowedHeaders' => ['*'], diff --git a/public/index.php b/public/index.php index 348b3d9785..66ea93cd05 100644 --- a/public/index.php +++ b/public/index.php @@ -1,11 +1,24 @@ - */ +use Illuminate\Contracts\Http\Kernel; +use Illuminate\Http\Request; + +define('LARAVEL_START', microtime(true)); + +/* +|-------------------------------------------------------------------------- +| Check If The Application Is Under Maintenance +|-------------------------------------------------------------------------- +| +| If the application is in maintenance / demo mode via the "down" command +| we will load this file so that any pre-rendered content can be shown +| instead of starting the framework, which could cause an exception. +| +*/ + +if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) { + require __DIR__.'/../storage/framework/maintenance.php'; +} /* |-------------------------------------------------------------------------- @@ -13,51 +26,30 @@ |-------------------------------------------------------------------------- | | Composer provides a convenient, automatically generated class loader for -| our application. We just need to utilize it! We'll simply require it -| into the script here so that we don't have to worry about manual -| loading any of our classes later on. It feels nice to relax. +| this application. We just need to utilize it! We'll simply require it +| into the script here so we don't need to manually load our classes. | */ -require __DIR__.'/../bootstrap/autoload.php'; - -/* -|-------------------------------------------------------------------------- -| Turn On The Lights -|-------------------------------------------------------------------------- -| -| We need to illuminate PHP development, so let us turn on the lights. -| This bootstraps the framework and gets it ready for use, then it -| will load up this application so that we can run it and send -| the responses back to the browser and delight our users. -| -*/ - -$app = require_once __DIR__.'/../bootstrap/app.php'; - -// set the public path to this directory -$app->bind('path.public', function() { - return __DIR__; -}); +require __DIR__.'/../vendor/autoload.php'; /* |-------------------------------------------------------------------------- | Run The Application |-------------------------------------------------------------------------- | -| Once we have the application, we can handle the incoming request -| through the kernel, and send the associated response back to -| the client's browser allowing them to enjoy the creative -| and wonderful application we have prepared for them. +| Once we have the application, we can handle the incoming request using +| the application's HTTP kernel. Then, we will send the response back +| to this client's browser, allowing them to enjoy our application. | */ -$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); +$app = require_once __DIR__.'/../bootstrap/app.php'; -$response = $kernel->handle( - $request = Illuminate\Http\Request::capture() -); +$kernel = $app->make(Kernel::class); -$response->send(); +$response = tap($kernel->handle( + $request = Request::capture() +))->send(); $kernel->terminate($request, $response); diff --git a/routes/web.php b/routes/web.php index 6f6585f248..ce1160433f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -2,7 +2,6 @@ use App\Http\Controllers\Account; use App\Http\Controllers\ActionlogController; -use App\Http\Controllers\Auth; use App\Http\Controllers\CategoriesController; use App\Http\Controllers\CompaniesController; use App\Http\Controllers\DashboardController; @@ -21,6 +20,7 @@ use App\Http\Controllers\StatuslabelsController; use App\Http\Controllers\SuppliersController; use App\Http\Controllers\ViewAssetsController; use Illuminate\Support\Facades\Route; +use Illuminate\Support\Facades\Auth; Route::group(['middleware' => 'auth'], function () { /*