diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index a3b64996d5..0516bb6a83 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -349,7 +349,7 @@ return [ 'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.', 'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold', 'help_blank_to_use' => 'Leave blank to use the value from :setting_name', - 'help_default_will_use' => ':default will use the value from :setting_name', + 'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ', 'default' => 'Default', 'none' => 'None', 'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization's Google developer console .', diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index d23ff8ef2c..46ce4fe610 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -106,7 +106,7 @@
{{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
-
+
{{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }} {!! $errors->first('label2_title', '') !!}

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

@@ -142,7 +142,7 @@
{{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }}
-
+
@php $select1DValues = [ 'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]', @@ -174,7 +174,7 @@
{{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }}
-
+
@php $select2DValues = [ 'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',