From 9164daf5bcdb7207225872769e0f4b63e683019c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=A4chtler=2C=20Yannick?= Date: Fri, 19 Nov 2021 15:23:48 +0100 Subject: [PATCH] Added localized strings for admin/settings --- resources/lang/en/admin/settings/general.php | 92 ++++++++++++++++++- resources/lang/en/admin/settings/message.php | 23 ++++- resources/lang/en/admin/settings/table.php | 6 ++ resources/lang/en/general.php | 1 + resources/views/settings/alerts.blade.php | 6 +- resources/views/settings/api.blade.php | 2 +- resources/views/settings/asset_tags.blade.php | 4 +- resources/views/settings/backups.blade.php | 47 +++++----- resources/views/settings/barcodes.blade.php | 10 +- resources/views/settings/branding.blade.php | 4 +- resources/views/settings/general.blade.php | 14 +-- resources/views/settings/index.blade.php | 84 ++++++++--------- resources/views/settings/labels.blade.php | 4 +- resources/views/settings/ldap.blade.php | 30 +++--- .../views/settings/localization.blade.php | 4 +- resources/views/settings/logins.blade.php | 10 +- resources/views/settings/phpinfo.blade.php | 4 +- resources/views/settings/purge-form.blade.php | 2 +- resources/views/settings/saml.blade.php | 6 +- resources/views/settings/security.blade.php | 14 +-- resources/views/settings/slack.blade.php | 11 ++- 21 files changed, 250 insertions(+), 128 deletions(-) create mode 100644 resources/lang/en/admin/settings/table.php diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index ca028be152..cd0d77e9f8 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -10,7 +10,10 @@ return [ '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', + 'alerts' => 'Alerts', + 'alert_title' => 'Update Alert Settings', 'alert_email' => 'Send alerts to', + 'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated', 'alerts_enabled' => 'Email Alerts Enabled', 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', @@ -25,6 +28,7 @@ return [ 'auto_increment_prefix' => 'Prefix (optional)', 'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this', 'backups' => 'Backups', + 'backups_help' => 'Download files & Data', 'barcode_settings' => 'Barcode Settings', 'confirm_purge' => 'Confirm Purge', 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)', @@ -55,12 +59,17 @@ return [ 'footer_text' => 'Additional Footer Text ', 'footer_text_help' => 'This text will appear in the right-side footer. Links are allowed using Github flavored markdown. Line breaks, headers, images, etc may result in unpredictable results.', 'general_settings' => 'General Settings', + 'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, tos, dashboard, privacy', + 'general_settings_help' => 'Default EULA and more', 'generate_backup' => 'Generate Backup', 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'label_logo' => 'Label Logo', 'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ', 'laravel' => 'Laravel Version', + 'ldap' => 'LDAP', + 'ldap_help' => 'LDAP/Active Directory', + 'ldap_client_tls_key' => 'LDAP Client TLS Key', 'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate', 'ldap_enabled' => 'LDAP enabled', 'ldap_integration' => 'LDAP Integration', @@ -93,9 +102,17 @@ return [ 'ldap_activated_flag_help' => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.', 'ldap_emp_num' => 'LDAP Employee Number', 'ldap_email' => 'LDAP Email', - 'license' => 'Software License', + 'ldap_test' => 'Test LDAP', + 'ldap_test_sync' => 'Test LDAP Synchronization', + 'license' => 'Software License', 'load_remote_text' => 'Remote Scripts', 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'login' => 'Login Attempts', + 'login_attempt' => 'Login Attempt', + 'login_ip' => 'IP Address', + 'login_success' => 'Success?', + 'login_user_agent' => 'User Agent', + 'login_help' => 'List of attempted logins', 'login_note' => 'Login Note', 'login_note_help' => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts Github flavored markdown', 'login_remote_user_text' => 'Remote User login options', @@ -116,16 +133,28 @@ return [ 'optional' => 'optional', 'per_page' => 'Results Per Page', 'php' => 'PHP Version', + 'php_info' => 'PHP Info', + 'php_overview' => 'PHP', + 'php_overview_keywords' => 'phpinfo, system, info', + 'php_overview_help' => 'PHP System info', 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', 'pwd_secure_complexity' => 'Password Complexity', 'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.', + 'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username', + 'pwd_secure_complexity_letters' => 'Require at least one letter', + 'pwd_secure_complexity_numbers' => 'Require at least one number', + 'pwd_secure_complexity_symbols' => 'Require at least one symbol', + 'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase', 'pwd_secure_min' => 'Password minimum characters', 'pwd_secure_min_help' => 'Minimum permitted value is 8', 'pwd_secure_uncommon' => 'Prevent common passwords', 'pwd_secure_uncommon_help' => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.', 'qr_help' => 'Enable QR Codes first to set this', 'qr_text' => 'QR Code Text', + 'saml' => 'SAML', + 'saml_title' => 'Update SAML settings', + 'saml_help' => 'SAML settings', 'saml_enabled' => 'SAML enabled', 'saml_integration' => 'SAML Integration', 'saml_sp_entityid' => 'Entity ID', @@ -145,6 +174,7 @@ return [ 'saml_slo_help' => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.', 'saml_custom_settings' => 'SAML Custom Settings', 'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.', + 'saml_download' => 'Download Metadata', 'setting' => 'Setting', 'settings' => 'Settings', 'show_alerts_in_menu' => 'Show alerts in top menu', @@ -155,6 +185,9 @@ return [ 'show_images_in_email' => 'Show images in emails', 'show_images_in_email_help' => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.', 'site_name' => 'Site Name', + 'slack' => 'Slack', + 'slack_title' => 'Update Slack Settings', + 'slack_help' => 'Slack settings', 'slack_botname' => 'Slack Botname', 'slack_channel' => 'Slack Channel', 'slack_endpoint' => 'Slack Endpoint', @@ -171,6 +204,8 @@ return [ 'update' => 'Update Settings', 'value' => 'Value', 'brand' => 'Branding', + 'brand_keywords' => 'footer, logo, print, theme, skin, header, colors, color, css', + 'brand_help' => 'Logo, Site Name', 'web_brand' => 'Web Branding Type', 'about_settings_title' => 'About Settings', 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', @@ -182,6 +217,7 @@ return [ 'privacy_policy' => 'Privacy Policy', 'privacy_policy_link_help' => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ', 'purge' => 'Purge Deleted Records', + 'purge_deleted' => 'Purge Deleted ', 'labels_display_bgutter' => 'Label bottom gutter', 'labels_display_sgutter' => 'Label side gutter', 'labels_fontsize' => 'Label font size', @@ -227,4 +263,58 @@ return [ '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.', + 'oauth_title' => 'OAuth API Settings', + 'oauth' => 'OAuth', + 'oauth_help' => 'Oauth Endpoint Settings', + 'asset_tag_title' => 'Update Asset Tag Settings', + 'backup_upload' => 'Upload Backup', + 'backup_files_path' => '

Backup files on the server are stored in: :path

', + 'backup_restore' => 'Restoring from Backup', + 'backup_restore_info' => '

+ Use the restore button to + restore from a previous backup. (This does not currently with with S3 file storage.)

+ +

Your entire :app database and any uploaded files will be completely replaced by what is in the backup file. +

+ +

+ You will be logged out once your restore is complete. +

+ +

+ Very large backups may time out on the restore attempt and may still need to be run via command line. +

', + 'barcode_title' => 'Update Barcode Settings', + 'barcodes' => 'Barcodes', + 'barcodes_help_overview' => 'Barcode & QR settings', + 'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.', + 'barcodes_spinner' => 'Attempting to delete files...', + 'barcode_delete_cache' => 'Delete Barcode Cache', + 'branding_title' => 'Update Branding Settings', + 'general_title' => 'Update General Settings', + 'mail_test' => 'Send Test', + 'mail_test_help' => 'This will attempt to send a test mail to :replyto.', + 'filter_by_keyword' => 'Filter by setting keyword', + 'security' => 'Security', + 'security_title' => 'Update Security Settings', + 'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication', + 'security_help' => 'Two-factor, Password Restrictions', + 'groups_keywords' => 'permissions, permission groups, authorization', + 'groups_help' => 'Account permission groups', + 'localization' => 'Localization', + 'localization_title' => 'Update Localization Settings', + 'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation', + 'localization_help' => 'Language, date display', + 'notifications' => 'Notifications', + 'notifications_help' => 'Email alerts, audit settings', + 'asset_tags_help' => 'Incrementing and prefixes', + 'labels' => 'Labels', + 'labels_title' => 'Update Label Settings', + 'labels_help' => 'Label sizes & settings', + 'purge' => 'Purge', + 'purge_keywords' => 'permanently delete', + 'purge_help' => 'Purge Deleted Records', + 'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.', + 'ldap_ad' => 'LDAP/AD', + 'employee_number' => 'Employee Number', ]; diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php index 621522293a..d3ed9af4ac 100644 --- a/resources/lang/en/admin/settings/message.php +++ b/resources/lang/en/admin/settings/message.php @@ -11,11 +11,32 @@ return [ '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.', + 'restore_warning' => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).', + 'restore_confirm' => 'Are you sure you wish to restore your database from :filename?' ], '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.', ], - + 'mail' => [ + 'sending' => 'Sending Test Email...', + 'success' => 'Mail sent!', + 'error' => 'Mail could not be sent.', + 'additional' => 'No additional error message provided. Check your mail settings and your app log.' + ], + 'ldap' => [ + 'testing' => 'Testing LDAP Connection, Binding & Query ...', + '500' => '500 Server Error. Please check your server logs for more information.', + 'error' => 'Something went wrong :(', + 'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:', + 'testing_authentication' => 'Testing LDAP Authentication...', + 'authentication_success' => 'User authenticated against LDAP successfully!' + ], + 'slack' => [ + 'sending' => 'Sending Slack test message...', + 'success_pt1' => 'Success! Check the ', + 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.', + '500' => '500 Server Error.' + ] ]; diff --git a/resources/lang/en/admin/settings/table.php b/resources/lang/en/admin/settings/table.php new file mode 100644 index 0000000000..2f221b4290 --- /dev/null +++ b/resources/lang/en/admin/settings/table.php @@ -0,0 +1,6 @@ + 'Created', + 'size' => 'Size', +]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 2b9ffc74fb..afbf987fe2 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -19,6 +19,7 @@ 'asset' => 'Asset', 'asset_report' => 'Asset Report', 'asset_tag' => 'Asset Tag', + 'asset_tags' => 'Asset Tags', 'assets_available' => 'Assets available', 'accept_assets' => 'Accept Assets :name', 'accept_assets_menu' => 'Accept Assets', diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index 58b808bf48..aa6f94f672 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Alert Settings + {{ trans('admin/settings/general.alert_title') }} @parent @stop @@ -32,7 +32,7 @@

- Alerts + {{ trans('admin/settings/general.alerts') }}

@@ -73,7 +73,7 @@ {{ Form::text('alert_email', old('alert_email', $setting->alert_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }} {!! $errors->first('alert_email', '
') !!} -

Email addresses or distribution lists you want alerts to be sent to, comma separated

+

{{ trans('admin/settings/general.alert_email_help') }}

diff --git a/resources/views/settings/api.blade.php b/resources/views/settings/api.blade.php index 5133529920..5db4e1e7dc 100644 --- a/resources/views/settings/api.blade.php +++ b/resources/views/settings/api.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - OAuth API Settings + {{ trans('admin/settings/general.oauth_title') }} @parent @stop diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php index a395f35d88..0d05424871 100644 --- a/resources/views/settings/asset_tags.blade.php +++ b/resources/views/settings/asset_tags.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Asset Tag Settings + {{ trans('admin/settings/general.asset_tag_title') }} @parent @stop @@ -32,7 +32,7 @@

- Asset Tags + {{ trans('general.asset_tags') }}

diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index 2018fe1212..dcd3e839de 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -45,10 +45,10 @@ class="table table-striped snipe-table"> - File - Created + {{ trans('general.file_name') }} + {{ trans('admin/settings/table.created') }} - Size + {{ trans('admin/settings/table.created') }} {{ trans('general.delete') }} @@ -67,14 +67,24 @@ @can('superadmin') + class="btn delete-asset btn-danger btn-sm {{ (config('app.lock_passwords')) ? ' disabled': '' }}" + data-toggle="modal" href="{{ route('settings.backups.destroy', $file['filename']) }}" + data-content="{{ trans('admin/settings/message.backup.delete_confirm') }}" + data-title="{{ trans('general.delete') }} {{ e($file['filename']) }} ?" + onClick="return false;"> {{ trans('general.delete') }} - + - Restore + {{ trans('general.restore') }} @endcan @@ -95,15 +105,15 @@

- Upload Backup

+ {{ trans('admin/settings/general.backup_upload') }}
-

Backup files on the server are stored in: {{ $path }}

- + {!! trans('admin/settings/general.backup_files_path', array('path' => $path)) !!} + @if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

@else @@ -139,7 +149,7 @@
- +
@@ -161,26 +171,13 @@

- Restoring from Backup

+ {{ trans('admin/settings/general.backup_restore') }}
-

- Use the restore button to - restore from a previous backup. (This does not currently with with S3 file storage.)

- -

Your entire {{ config('app.name') }} database and any uploaded files will be completely replaced by what's in the backup file. -

- -

- You will be logged out once your restore is complete. -

- -

- Very large backups may time out on the restore attempt and may still need to be run via command line. -

+ {!! trans('admin/settings/general.backup_restore_info', array('app' => config('app.name'))) !!}
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php index 6859a6de4d..4a421eec74 100644 --- a/resources/views/settings/barcodes.blade.php +++ b/resources/views/settings/barcodes.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Barcode Settings + {{ trans('admin/settings/general.barcode_title') }} @parent @stop @@ -32,7 +32,7 @@

- Barcodes + {{ trans('admin/settings/general.barcodes') }}

@@ -119,7 +119,7 @@
- Delete Barcode Cache + {{ trans('admin/settings/general.barcode_delete_cache') }} @@ -128,7 +128,7 @@
-

This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.

+

{{ trans('admin/settings/general.barcodes_help') }}

@@ -164,7 +164,7 @@ $("#purgebarcodesicon").html(''); $("#purgebarcodesstatus").html(''); $('#purgebarcodesstatus-error').html(''); - $("#purgebarcodesicon").html(' Attempting to delete files...'); + $("#purgebarcodesicon").html(' {{ trans('admin/settings/general.barcodes_spinner') }}'); $.ajax({ url: '{{ route('api.settings.purgebarcodes') }}', type: 'POST', diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 858d72c98b..104e426a7c 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Branding Settings + {{ trans('admin/settings/general.branding_title') }} @parent @stop @@ -32,7 +32,7 @@

- Branding + {{ trans('admin/settings/general.brand') }}

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 3ff9168023..0dceec88f2 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update General Settings + {{ trans('admin/settings/general.general_title') }} @parent @stop @@ -206,7 +206,7 @@
- Send Test + {{ trans('admin/settings/general.mail_test') }} @@ -215,7 +215,7 @@
-

This will attempt to send a test mail to {{ config('mail.reply_to.address') }}.

+
{{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}

@@ -366,7 +366,7 @@ $("#mailtesticon").html(''); $("#mailteststatus").html(''); $('#mailteststatus-error').html(''); - $("#mailtesticon").html(' Sending Test Email...'); + $("#mailtesticon").html(' {{ trans('admin/settings/message.mail.sending') }}'); $.ajax({ url: '{{ route('api.settings.mailtest') }}', type: 'POST', @@ -387,7 +387,7 @@ if (data.message) { $("#mailteststatus").html(' ' + data.message); } else { - $("#mailteststatus").html(' Mail sent!'); + $("#mailteststatus").html(' {{ trans('admin/settings/message.mail.success') }}'); } }, @@ -399,12 +399,12 @@ $("#mailteststatus").removeClass('text-success'); $("#mailteststatus").addClass('text-danger'); $("#mailtesticon").html(''); - $('#mailteststatus').html('Mail could not be sent.'); + $('#mailteststatus').html('{{ trans('admin/settings/message.mail.error') }}'); if (data.responseJSON) { if (data.responseJSON.messages) { $('#mailteststatus-error').html('Error: ' + data.responseJSON.messages); } else { - $('#mailteststatus-error').html('No additional error message provided. Check your mail settings and your app log.'); + $('#mailteststatus-error').html('{{ trans('admin/settings/message.mail.additional') }}'); } } else { console.dir(data); diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 6d115f0ae0..c44ff33b1b 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -34,7 +34,7 @@
- +
@@ -53,11 +53,11 @@

- Branding - + {{ trans('admin/settings/general.brand') }} + -

Logo, Site Name

+

{{ trans('admin/settings/general.brand_help') }}

@@ -70,11 +70,11 @@

- General Settings - + {{ trans('admin/settings/general.general_settings') }} + -

Default EULA and more

+

{{ trans('admin/settings/general.general_settings_help') }}

@@ -87,11 +87,11 @@

- Security - + {{ trans('admin/settings/general.security') }} + -

Two-factor, Password Restrictions

+

{{ trans('admin/settings/general.security_help') }}

@@ -103,11 +103,11 @@

- Groups - + {{ trans('general.groups') }} + -

Account permission groups

+

{{ trans('admin/settings/general.groups_help') }}

@@ -120,11 +120,11 @@

- Localization - + {{ trans('admin/settings/general.localization') }} + -

Language, date display

+

{{ trans('admin/settings/general.localization_help') }}

@@ -138,11 +138,11 @@

- Notifications + {{ trans('admin/settings/general.notifications') }} -

Email alerts, audit settings

+

{{ trans('admin/settings/general.notifications_help') }}

@@ -154,10 +154,10 @@

- Slack + {{ trans('admin/settings/general.slack') }} -

Slack settings

+

{{ trans('admin/settings/general.slack_help') }}

@@ -169,10 +169,10 @@

- Asset Tags + {{ trans('general.asset_tags') }} -

Incrementing and prefixes

+

{{ trans('admin/settings/general.asset_tags_help') }}

@@ -184,10 +184,10 @@

- Barcodes + {{ trans('admin/settings/general.barcodes') }} -

Barcode & QR settings

+

{!! trans('admin/settings/general.barcodes_help_overview') !!}

@@ -199,10 +199,10 @@

- Labels + {{ trans('admin/settings/general.labels') }} -

Label sizes & settings

+

{!! trans('admin/settings/general.labels_help') !!}

@@ -215,10 +215,10 @@

- LDAP + {{ trans('admin/settings/general.ldap') }} -

LDAP/Active Directory

+

{{ trans('admin/settings/general.ldap_help') }}

@@ -230,10 +230,10 @@

- SAML + {{ trans('admin/settings/general.saml') }} -

SAML settings

+

{{ trans('admin/settings/general.saml_help') }}

@@ -245,10 +245,10 @@

- Backups + {{ trans('admin/settings/general.backups') }} -

Download files & Data

+

{!! trans('admin/settings/general.backups_help') !!}

@@ -261,10 +261,10 @@

- Login Attempts + {{ trans('admin/settings/general.login') }} -

List of attempted logins

+

{{ trans('admin/settings/general.login_help') }}

@@ -276,10 +276,10 @@

- OAuth + {{ trans('admin/settings/general.oauth') }} -

Oauth Endpoint Settings

+

{{ trans('admin/settings/general.oauth_help') }}

@@ -292,11 +292,11 @@

- PHP - + {{ trans('admin/settings/general.php_overview') }} + -

PHP System Info

+

{{ trans('admin/settings/general.php_overview_help') }}

@@ -309,11 +309,11 @@

- Purge - + {{ trans('admin/settings/general.purge') }} + -

Purge Deleted Records

+

{{ trans('admin/settings/general.purge_help') }}

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 615cb6e49a..a509769dee 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Label Settings + {{ trans('admin/settings/general.labels_title') }} @parent @stop @@ -32,7 +32,7 @@

- Labels + {{ trans('admin/settings/general.labels') }}

diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index e01ad2c86a..ee74a0fefd 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -25,7 +25,7 @@
- It doesn't look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work. + {{ trans('admin/settings/general.ldap_extension_warning') }}
@@ -49,7 +49,7 @@

- LDAP/AD + {{ trans('admin/settings/general.ldap_ad') }}

@@ -447,7 +447,7 @@ {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}

@@ -476,7 +476,7 @@
- Test LDAP + {{ trans('admin/settings/general.ldap_test') }}
@@ -562,7 +562,7 @@ $("#ldaptest").click(function () { $("#ldapad_test_results").removeClass('hidden text-success text-danger'); $("#ldapad_test_results").html(''); - $("#ldapad_test_results").html(' Testing LDAP Connection, Binding & Query ...'); + $("#ldapad_test_results").html(' {{ trans('admin/settings/message.ldap.testing') }}'); $.ajax({ url: '{{ route('api.settings.ldaptest') }}', type: 'GET', @@ -586,7 +586,7 @@ $("#ldapad_test_results").addClass('text-danger'); let errorIcon = '' + ' '; if (data.status == 500) { - $('#ldapad_test_results').html(errorIcon + '500 Server Error. Please check your server logs for more information.'); + $('#ldapad_test_results').html(errorIcon + '{{ trans('admin/settings/message.ldap.500') }}'); } else if (data.status == 400) { let errorMessage = ''; if( typeof data.responseJSON.user_sync !== 'undefined') { @@ -597,7 +597,7 @@ } $('#ldapad_test_results').html(errorIcon + errorMessage); } else { - $('#ldapad_test_results').html('Something went wrong :( '); + $('#ldapad_test_results').html('{{ trans('admin/settings/message.ldap.error') }}'); // $('#ldapad_test_results').html(errorIcon + data.responseText.message); } } @@ -614,7 +614,7 @@ html += '
  • ' + results.login.message + '
    • ' html += '
  • ' + results.bind.message + '
    • ' html += '' - html += '
    A sample of 10 users returned from the LDAP server based on your settings:
    ' + html += '
    {{ trans('admin/settings/message.ldap.sync_success') }}
    ' html += '' html += buildLdapResultsTableHeader() html += buildLdapResultsTableBody(results.user_sync.users) @@ -624,7 +624,13 @@ function buildLdapResultsTableHeader(user) { - var keys = ['Employee Number', 'Username', 'First Name', 'Last Name','Email'] + var keys = [ + '{{ trans('admin/settings/general.employee_number') }}', + '{{ trans('mail.username') }}', + '{{ trans('general.first_name') }}', + '{{ trans('general.last_name') }}', + '{{ trans('general.email') }}' + ] let header = '' for (var i in keys) { header += '' @@ -648,7 +654,7 @@ $("#ldaptestloginrow").removeClass('text-danger'); $("#ldaptestloginstatus").removeClass('text-danger'); $("#ldaptestloginstatus").html(''); - $("#ldaptestloginicon").html(' Testing LDAP Authentication...'); + $("#ldaptestloginicon").html(' {{ trans('admin/settings/message.ldap.testing_authentication') }}'); $.ajax({ url: '{{ route('api.settings.ldaptestlogin') }}', type: 'POST', @@ -667,7 +673,7 @@ $("#ldaptestloginicon").html(''); $("#ldaptestloginrow").addClass('text-success'); $("#ldaptestloginstatus").addClass('text-success'); - $("#ldaptestloginstatus").html(' User authenticated against LDAP successfully!'); + $("#ldaptestloginstatus").html(' {{ trans('admin/settings/message.ldap.authentication_success') }}'); }, error: function (data) { @@ -685,7 +691,7 @@ $("#ldaptestloginicon").html(''); if (data.status == 500) { - $('#ldaptestloginstatus').html('500 Server Error'); + $('#ldaptestloginstatus').html('{{ trans('admin/settings/message.ldap.500') }}'); } else if (data.status == 400) { if (typeof errors !='string') { diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php index c1c7c94064..6e126dee64 100644 --- a/resources/views/settings/localization.blade.php +++ b/resources/views/settings/localization.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Localization Settings + {{ trans('admin/settings/general.localization_title') }} @parent @stop @@ -32,7 +32,7 @@

    - Localization + {{ trans('admin/settings/general.localization') }}

    diff --git a/resources/views/settings/logins.blade.php b/resources/views/settings/logins.blade.php index 0812340d4a..aedef4f84e 100644 --- a/resources/views/settings/logins.blade.php +++ b/resources/views/settings/logins.blade.php @@ -34,11 +34,11 @@
    - - - - - + + + + +
    ' + keys[i] + '
    UsernameLogin AttemptUser AgentIPSuccess{{ trans('mail.username') }}{{ trans('admin/settings/general.login_attempt') }}{{ trans('admin/settings/general.login_user_agent') }}{{ trans('admin/settings/general.login_ip') }}{{ trans('admin/settings/general.login_success') }}
    diff --git a/resources/views/settings/phpinfo.blade.php b/resources/views/settings/phpinfo.blade.php index a237a4b83a..36576e10e7 100644 --- a/resources/views/settings/phpinfo.blade.php +++ b/resources/views/settings/phpinfo.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - PHP Info + {{ trans('admin/settings/general.php_info') }} @parent @stop @@ -19,7 +19,7 @@
    -

    PHP Info

    +

    {{ trans('admin/settings/general.php_info') }}

    diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php index ef5f83f628..f8e53dbde8 100644 --- a/resources/views/settings/purge-form.blade.php +++ b/resources/views/settings/purge-form.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Purge Deleted + {{ trans('admin/settings/general.purge_deleted') }} @parent @stop diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php index 3c1a7146f4..c6b34f6c36 100644 --- a/resources/views/settings/saml.blade.php +++ b/resources/views/settings/saml.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update SAML Settings + {{ trans('admin/settings/general.saml_title') }} @parent @stop @@ -38,7 +38,7 @@

    - SAML + {{ trans('admin/settings/general.saml') }}

    @@ -88,7 +88,7 @@ {{ Form::text('saml_sp_metadata_url', route('saml.metadata'), ['class' => 'form-control', 'readonly']) }}

    - Download Metadata + {{ trans('admin/settings/general.saml_download') }}

    @endif {!! $errors->first('saml_enabled', '') !!} diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index c7cb93d492..cf223b5537 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Security Settings + {{ trans('admin/settings/general.security_title') }} @parent @stop @@ -27,7 +27,7 @@

    - Security + {{ trans('admin/settings/general.security') }}

    @@ -100,20 +100,20 @@
    {{ Form::checkbox("pwd_secure_complexity['disallow_same_pwd_as_user_fields']", 'disallow_same_pwd_as_user_fields', old('disallow_same_pwd_as_user_fields', strpos($setting->pwd_secure_complexity, 'disallow_same_pwd_as_user_fields')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} - Password cannot be the same as first name, last name, email, or username
    + {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}
    {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} - Require at least one letter
    + {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}
    {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} - Require at least one number
    + {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}
    {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} - Require at least one symbol
    + {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}
    {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} - Require at least one uppercase and one lowercase + {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}

    {{ trans('admin/settings/general.pwd_secure_complexity_help') }} diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index 3158639782..f8a85f0720 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Update Slack Settings + {{ trans('admin/settings/general.slack_title') }} @parent @stop @@ -32,7 +32,7 @@

    - Slack + {{ trans('admin/settings/general.slack') }}

    @@ -165,7 +165,7 @@ $("#slacktestrow").removeClass('text-danger'); $("#slackteststatus").removeClass('text-danger'); $("#slackteststatus").html(''); - $("#slacktesticon").html(' Sending Slack test message...'); + $("#slacktesticon").html(' {{ trans('admin/settings/message.slack.sending') }}'); $.ajax({ url: '{{ route('api.settings.slacktest') }}', type: 'POST', @@ -187,7 +187,8 @@ $("#slacktesticon").html(''); $("#slacktestrow").addClass('text-success'); $("#slackteststatus").addClass('text-success'); - $("#slackteststatus").html(' Success! Check the ' + $('#slack_channel').val() + ' channel for your test message, and be sure to click SAVE below to store your settings.'); + //TODO: This is a bit hacky...Might need some cleanup + $("#slackteststatus").html(' {{ trans('admin/settings/message.slack.success_pt1') }} ' + $('#slack_channel').val() + '{{ trans('admin/settings/message.slack.success_pt2') }}'); }, error: function (data) { @@ -207,7 +208,7 @@ $("#slacktesticon").html(''); if (data.status == 500) { - $('#slackteststatus').html('500 Server Error'); + $('#slackteststatus').html('{{ trans('admin/settings/message.slack.500') }}'); } else if (data.status == 400) { if (typeof errors != 'string') {