From 2163312997ac8a347723bf98aa618685ce6d0d58 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 29 Jan 2025 10:35:26 -0800 Subject: [PATCH] adds translations for branding and general settings --- .../lang/en-US/admin/settings/general.php | 9 ++++--- resources/views/settings/branding.blade.php | 27 +++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index e419a4ad879..cb028de3e06 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -42,6 +42,7 @@ '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.)', 'custom_css' => 'Custom CSS', + 'custom_css_placeholder' => 'Add your custom CSS', 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', 'custom_forgot_pass_url' => 'Custom Password Reset URL', 'custom_forgot_pass_url_help' => 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.', @@ -69,6 +70,7 @@ 'favicon_size' => 'Favicons should be square images, 16x16 pixels.', '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.', + 'footer_text_placeholder' => 'Optional footer text', 'general_settings' => 'General Settings', 'general_settings_help' => 'Default EULA and more', 'generate_backup' => 'Generate Backup', @@ -343,6 +345,7 @@ 'ldap_settings_link' => 'LDAP Settings Page', 'slack_test' => 'Test Integration', 'status_label_name' => 'Status Label Name', + 'super_admin_only' => 'Super Admin Only', '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', @@ -390,9 +393,9 @@ 'logo_option_types' => [ - '0' => trans('text'), - '1' => trans('logo'), - '2' => trans('logo'). ' + '. trans('text'), + 'text' => 'Text', + 'logo' => 'Logo', + 'logo_and_text' => 'Logo and Text', ], diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index d090f133768..c848ae942be 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -66,11 +66,16 @@
- {{ Form::label('brand', trans('admin/settings/general.web_brand')) }} +
- {!! Form::select('brand', array($optionTypes), old('brand', $setting->brand), ['class' => 'form-control select2', 'style' => 'width: 150px;']) !!} - {!! $errors->first('brand', '') !!} +
@@ -235,11 +240,11 @@
@if (config('app.lock_passwords')===true) - {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }} + {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => trans('admin/settings/general.custom_css_placeholder'),'disabled'=>'disabled', 'aria-label'=>'custom_css')) }} {!! $errors->first('custom_css', '') !!}

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

@else - {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }} + {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => trans('admin/settings/general.custom_css_placeholder'), 'aria-label'=>'custom_css')) }} {!! $errors->first('custom_css', '') !!} @endif

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

@@ -254,10 +259,10 @@
@if (config('app.lock_passwords')===true) - {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} + {!! Form::select('support_footer', array('on'=>trans('admin/settings/general.enabled'),'off'=>trans('admin/settings/general.two_factor_disabled'),'admin'=>trans('admin/settings/general.super_admin_only')), old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}

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

@else - {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} + {!! Form::select('support_footer', array('on'=>trans('admin/settings/general.enabled'),'off'=>trans('admin/settings/general.two_factor_disabled'),'admin'=>trans('admin/settings/general.super_admin_only')), old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} @endif @@ -273,10 +278,10 @@
@if (config('app.lock_passwords')===true) - {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} + {!! Form::select('version_footer', array('on'=>trans('admin/settings/general.enabled'),'off'=>trans('admin/settings/general.two_factor_disabled'),'admin'=>trans('admin/settings/general.super_admin_only')), old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}

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

@else - {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} + {!! Form::select('version_footer', array('on'=>trans('admin/settings/general.enabled'),'off'=>trans('admin/settings/general.two_factor_disabled'),'admin'=>trans('admin/settings/general.super_admin_only')), old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} @endif

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

@@ -291,10 +296,10 @@
@if (config('app.lock_passwords')===true) - {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => 'Optional footer text','disabled'=>'disabled')) }} + {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => trans('admin/settings/general.footer_text_placeholder'),'disabled'=>'disabled')) }}

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

@else - {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }} + {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => trans('admin/settings/general.footer_text_placeholder'))) }} @endif

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

{!! $errors->first('footer_text', '') !!}