diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php index 0fb90a5079..8483c67c69 100644 --- a/resources/lang/en/admin/custom_fields/general.php +++ b/resources/lang/en/admin/custom_fields/general.php @@ -2,6 +2,7 @@ return [ 'custom_fields' => 'Custom Fields', + 'manage' => 'Manage', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.', @@ -26,7 +27,19 @@ return [ 'used_by_models' => 'Used By Models', 'order' => 'Order', 'create_fieldset' => 'New Fieldset', + 'create_fieldset_title' => 'Create a new fieldset', 'create_field' => 'New Custom Field', + 'create_field_title' => 'Create a 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.', + 'help_text' => 'Help Text', + 'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.', + 'about_custom_fields_title' => 'About Custom Fields', + 'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.', + 'add_field_to_fieldset' => 'Add Field to Fieldset', + 'make_optional' => 'Required - click to make optional', + 'make_required' => 'Optional - click to make required', + 'reorder' => 'Reorder', + 'db_field' => 'DB Field', + 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column but should be :expected .' ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index 12bda167b3..ac1e6aa429 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -8,6 +8,7 @@ return [ 'delete' => 'Delete', 'edit' => 'Edit', 'restore' => 'Restore', + 'remove' => 'Remove', 'request' => 'Request', 'submit' => 'Submit', 'upload' => 'Upload', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 9b6c4d4dfd..5cf5d88445 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -6,7 +6,6 @@ 'accessory' => 'Accessory', 'accessory_report' => 'Accessory Report', 'action' => 'Action', - 'actions' => 'Actions', 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', @@ -261,4 +260,6 @@ 'hide_help' => 'Hide help', 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', + 'email' => 'Email', + 'Help' ]; diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 17997be6e5..7370c3a38a 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -35,7 +35,7 @@ {{ trans('general.name')}} - {{ trans('general.actions')}} + {{ trans('button.actions')}} diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index a28a58f62c..fd9e78ee3a 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -96,11 +96,11 @@
{{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }} -

This is optional text that will appear below the form elements while editing an asset to provide context on the field.

+

{{ trans('admin/custom_fields/general.help_text_description') }}

{!! $errors->first('help_text', '') !!}
@@ -147,8 +147,8 @@
-

About Custom Fields

-

Custom fields allow you to add arbitrary attributes to assets.

+

{{ trans('admin/custom_fields/general.about_custom_fields_title') }}

+

{{ trans('admin/custom_fields/general.about_custom_fields_text') }}

diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index 99a614d83a..04885891ec 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -42,8 +42,8 @@ {{ Form::close() }}
-

About Fieldsets

-

Fieldsets work like containers of the custom fields you've created. This allows you to group commonly used custom attributes together for easy associations.

+

{{ trans('admin/custom_fields/general.about_fieldsets_title') }}

+

{{ trans('admin/custom_fields/general.about_fieldsets_text') }}

@stop diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index da08f7ab61..82b9498fa7 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -27,7 +27,7 @@ {{-- Hide the sorting handle if we can't update the fieldset --}} @can('update', $custom_fieldset) - Reorder + {{ trans('admin/custom_fields/general.reorder') }} @endcan {{ trans('admin/custom_fields/general.order') }} {{ trans('admin/custom_fields/general.field_name') }} @@ -35,7 +35,7 @@ {{ trans('admin/custom_fields/general.field_element') }} {{ trans('admin/custom_fields/general.encrypted') }} {{ trans('admin/custom_fields/general.required') }} - Remove + {{ trans('button.remove') }} @@ -60,18 +60,18 @@ @if ($field->pivot->required) - Required - click to make optional + {{ trans('admin/custom_fields/general.make_optional') }} @else - Optional - click to make required + {{ trans('admin/custom_fields/general.make_required') }} @endif @can('update', $custom_fieldset) - Remove + {{ trans('button.remove') }} @endcan @@ -89,7 +89,7 @@
{{ Form::select("field_id",$custom_fields_list,"",['aria-label'=>'field_id', 'class'=>'select2']) }} @@ -106,7 +106,7 @@
{{ Form::text('order', $maxid, array('class' => 'form-control col-sm-1 col-md-1', 'style'=> 'width: 80px; padding-;right: 10px;', 'aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }} - +
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 434bd78a94..351e27cf5d 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -6,7 +6,7 @@ {{-- Page title --}} @section('title') - Manage {{ trans('admin/custom_fields/general.custom_fields') }} + {{ trans('admin/custom_fields/general.manage') }} {{ trans('admin/custom_fields/general.custom_fields') }} @parent @stop @@ -21,7 +21,7 @@

{{ trans('admin/custom_fields/general.fieldsets') }}

@@ -48,7 +48,7 @@ {{ trans('general.name') }} {{ trans('admin/custom_fields/general.qty_fields') }} {{ trans('admin/custom_fields/general.used_by_models') }} - Actions + {{ trans('button.actions') }} @@ -100,7 +100,7 @@

{{ trans('admin/custom_fields/general.custom_fields') }}

@can('create', \App\Models\CustomField::class) - {{ trans('admin/custom_fields/general.create_field') }} + {{ trans('admin/custom_fields/general.create_field') }} @endcan
@@ -127,13 +127,13 @@ {{ trans('general.name') }} - Help Text - Email - DB Field + {{ trans('admin/custom_fields/general.help_text')}} + {{ trans('general.email') }} + {{ trans('admin/custom_fields/general.db_field') }} {{ trans('admin/custom_fields/general.field_format') }} {{ trans('admin/custom_fields/general.field_element_short') }} {{ trans('admin/custom_fields/general.fieldsets') }} - Actions + {{ trans('button.actions') }} @@ -145,7 +145,7 @@ {{ $field->convertUnicodeDbSlug() }} @if ($field->convertUnicodeDbSlug()!=$field->db_column) -
WARNING. This field is in the custom fields table as {{ $field->db_column }} but should be {{ $field->convertUnicodeDbSlug() }}. +
{{!! trans('admin/custom_fields/general.db_convert_warning', array('db_column' => $field->db_column, 'expected' => $field->convertUnicodeDbSlug())) !!}} @endif {{ $field->format }} @@ -160,19 +160,19 @@ @can('update', $field) - Edit + {{ trans('button.edit') }} - @endcan + @endcan @can('delete', $field) {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }} @if($field->fieldset->count()>0) + {{ trans('button.delete') }} @else @endif {{ Form::close() }}