diff --git a/resources/lang/en-US/admin/depreciations/general.php b/resources/lang/en-US/admin/depreciations/general.php index 1a5666f9dc..4a9a9b8cd1 100644 --- a/resources/lang/en-US/admin/depreciations/general.php +++ b/resources/lang/en-US/admin/depreciations/general.php @@ -13,4 +13,8 @@ return [ 'no_depreciations_warning' => 'Warning: You do not currently have any depreciations set up. Please set up at least one depreciation to view the depreciation report.', + 'depreciation_method' => 'Depreciation Method', + 'linear_depreciation' => 'Linear (Default)', + 'half_1' => 'Half-year convention, always applied', + 'half_2' => 'Half-year convention, applied with condition', ]; diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 97567df8df..e419a4ad87 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -132,6 +132,7 @@ return [ 'login_user_agent' => 'User Agent', 'login_help' => 'List of attempted logins', 'login_note' => 'Login Note', + 'login_note_placeholder' => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.", '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', 'login_remote_user_enabled_text' => 'Enable Login with Remote User Header', @@ -341,6 +342,7 @@ return [ 'setup_migration_create_user' => 'Next: Create User', 'ldap_settings_link' => 'LDAP Settings Page', 'slack_test' => 'Test Integration', + 'status_label_name' => 'Status Label Name', 'label2_enable' => 'New Label Engine', 'label2_enable_help' => 'Switch to the new label engine. Note: You will need to save this setting before setting others.', 'label2_template' => 'Template', @@ -374,6 +376,7 @@ return [ 'database_driver' => 'Database Driver', 'bs_table_storage' => 'Table Storage', 'timezone' => 'Timezone', + 'test_mail' => 'Test Mail', 'profile_edit' => 'Edit Profile', 'profile_edit_help' => 'Allow users to edit their own profiles.', 'default_avatar' => 'Upload custom default avatar', @@ -383,6 +386,15 @@ return [ 'due_checkin_days' => 'Due For Checkin Warning', 'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?', 'no_groups' => 'No groups have been created yet. Visit Admin Settings > Permission Groups to add one.', + 'text' => 'Text', + + + 'logo_option_types' => [ + '0' => trans('text'), + '1' => trans('logo'), + '2' => trans('logo'). ' + '. trans('text'), + ], + /* Keywords for settings overview help */ diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index c586917ef5..d090f13376 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -59,7 +59,9 @@ - + @php + $optionTypes = trans('admin/settings/general.logo_option_types'); + @endphp
@@ -67,7 +69,7 @@ {{ Form::label('brand', trans('admin/settings/general.web_brand')) }}
- {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} + {!! Form::select('brand', array($optionTypes), old('brand', $setting->brand), ['class' => 'form-control select2', 'style' => 'width: 150px;']) !!} {!! $errors->first('brand', '') !!}
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 1de5d4035d..46dfd16935 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -241,11 +241,11 @@
@if (config('app.lock_passwords')) - + {!! $errors->first('login_note', '') !!}

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

@else - + {!! $errors->first('login_note', '') !!} @endif

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

@@ -255,7 +255,7 @@
- {{ Form::label('login_note', 'Test Mail') }} + {{ Form::label('login_note', trans('admin/settings/general.test_mail')) }}
{{ Form::select('dash_chart_type', array( - 'name' => 'Status Label Name', + 'name' => trans('admin/settings/general.status_label_name'), 'type' => 'Status Label Type'), old('dash_chart_type', $setting->dash_chart_type), ['class' =>'select2', 'style' => 'width: 80%']) }}
@@ -369,13 +369,13 @@
- {{ Form::label('depreciation_method', trans('Depreciation method')) }} + {{ Form::label('depreciation_method', trans('admin/depreciations/general.depreciation_method')) }}
{{ Form::select('depreciation_method', array( - 'default' => 'Linear (default)', - 'half_1' => 'Half-year convention, always applied', - 'half_2' => 'Half-year convention, applied with condition', + 'default' => trans('admin/depreciations/general.linear_depreciation'), + 'half_1' => trans('admin/depreciations/general.half_1'), + 'half_2' => trans('admin/depreciations/general.half_2'), ), old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}