changing where translations live. coalescing
This commit is contained in:
akemidx
parent
7701c6097f
commit
1307146831
4 changed files with 64 additions and 58 deletions
|
|
@ -396,18 +396,38 @@ return [
|
|||
'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 <code>Admin Settings > Permission Groups</code> to add one.',
|
||||
'text' => 'Text',
|
||||
'firstname_lastname_format' => 'First Name Last Name (jane.smith)',
|
||||
'first_name_format' => 'First Name (jane)',
|
||||
'last_name_format' => 'Last Name (doe)',
|
||||
'filastname_format' => 'First Initial Last Name (jsmith)',
|
||||
'lastnamefirstinitial_format' => 'Last Name First Initial (smithj)',
|
||||
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
|
||||
'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
|
||||
'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
|
||||
'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
|
||||
'firstnamelastname' => 'First Name Last Name (janesmith)',
|
||||
'firstnamelastinitial' => 'First Name Last Initial (janes)',
|
||||
'lastnamefirstname' => 'Last Name.First Name (smith.jane)',
|
||||
|
||||
'username_formats' => [
|
||||
'username_format' => 'Username Format',
|
||||
'firstname_lastname_format' => 'First Name Last Name (jane.smith)',
|
||||
'first_name_format' => 'First Name (jane)',
|
||||
'last_name_format' => 'Last Name (doe)',
|
||||
'filastname_format' => 'First Initial Last Name (jsmith)',
|
||||
'lastnamefirstinitial_format' => 'Last Name First Initial (smithj)',
|
||||
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
|
||||
'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
|
||||
'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
|
||||
'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
|
||||
'firstnamelastname' => 'First Name Last Name (janesmith)',
|
||||
'firstnamelastinitial' => 'First Name Last Initial (janes)',
|
||||
'lastnamefirstname' => 'Last Name.First Name (smith.jane)',
|
||||
],
|
||||
|
||||
'email_formats' => [
|
||||
'email_format' => 'Email Format',
|
||||
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
|
||||
'first_name_format' => 'First Name (jane@example.com)',
|
||||
'last_name_format' => 'Last Name (doe@example.com)',
|
||||
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
|
||||
'lastnamefirstinitial_format' => 'Last Name First Initial (smithj@example.com)',
|
||||
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
|
||||
'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
|
||||
'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
|
||||
'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
|
||||
'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
|
||||
'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
|
||||
'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
|
||||
],
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -121,30 +121,13 @@ return [
|
|||
'editprofile' => 'Edit Your Profile',
|
||||
'eol' => 'EOL',
|
||||
'email_domain' => 'Email Domain',
|
||||
'email_format' => 'Email Format',
|
||||
'employee_number' => 'Employee Number',
|
||||
'email_domain_help' => 'This is used to generate email addresses when importing',
|
||||
'error' => 'Error',
|
||||
'exclude_archived' => 'Exclude Archived Assets',
|
||||
'exclude_deleted' => 'Exclude Deleted Assets',
|
||||
'example' => 'Example: ',
|
||||
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
|
||||
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
|
||||
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
|
||||
'lastnamefirstinitial_format' => 'Last Name First Initial (smithj@example.com)',
|
||||
'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
|
||||
'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
|
||||
'firstname_lastname_display' => 'First Name Last Name (Jane Smith)',
|
||||
'lastname_firstname_display' => 'Last Name First Name (Smith Jane)',
|
||||
'name_display_format' => 'Name Display Format',
|
||||
'first' => 'First',
|
||||
'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
|
||||
'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
|
||||
'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
|
||||
'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
|
||||
'lastnamefirstname' => 'Last Name.First Name (smith.jane@example.com)',
|
||||
'first_name' => 'First Name',
|
||||
'first_name_format' => 'First Name (jane@example.com)',
|
||||
|
||||
'files' => 'Files',
|
||||
'file_name' => 'File',
|
||||
'file_type' => 'File Type',
|
||||
|
|
@ -186,7 +169,11 @@ return [
|
|||
'last' => 'Last',
|
||||
'last_login' => 'Last Login',
|
||||
'last_name' => 'Last Name',
|
||||
'last_name_format' => 'Last Name (doe@example.com)',
|
||||
'firstname_lastname_display' => 'First Name Last Name (Jane Smith)',
|
||||
'lastname_firstname_display' => 'Last Name First Name (Smith Jane)',
|
||||
'name_display_format' => 'Name Display Format',
|
||||
'first' => 'First',
|
||||
'first_name' => 'First Name',
|
||||
'license' => 'License',
|
||||
'license_report' => 'License Report',
|
||||
'licenses_available' => 'Licenses available',
|
||||
|
|
@ -315,7 +302,6 @@ return [
|
|||
'type' => 'Type',
|
||||
'undeployable' => 'Un-deployable',
|
||||
'unknown_admin' => 'Unknown Admin',
|
||||
'username_format' => 'Username Format',
|
||||
'username' => 'Username',
|
||||
'update' => 'Update',
|
||||
'updating_item' => 'Updating :item',
|
||||
|
|
|
|||
|
|
@ -191,18 +191,18 @@ Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null,
|
|||
|
||||
Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) {
|
||||
$formats = [
|
||||
'firstname.lastname' => trans('general.firstname_lastname_format'),
|
||||
'firstname' => trans('general.first_name_format'),
|
||||
'lastname' => trans('general.last_name_format'),
|
||||
'filastname' => trans('general.filastname_format'),
|
||||
'lastnamefirstinitial' => trans('general.lastnamefirstinitial_format'),
|
||||
'firstname_lastname' => trans('general.firstname_lastname_underscore_format'),
|
||||
'firstinitial.lastname' => trans('general.firstinitial.lastname'),
|
||||
'lastname_firstinitial' => trans('general.lastname_firstinitial'),
|
||||
'lastname.firstinitial' => trans('general.lastname_dot_firstinitial_format'),
|
||||
'firstnamelastname' => trans('general.firstnamelastname'),
|
||||
'firstnamelastinitial' => trans('general.firstnamelastinitial'),
|
||||
'lastname.firstname' => trans('general.lastnamefirstname'),
|
||||
'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
|
||||
'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
|
||||
'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
|
||||
'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
|
||||
'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
|
||||
'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
|
||||
'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial.lastname'),
|
||||
'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
|
||||
'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
|
||||
'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
|
||||
'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
|
||||
'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
|
||||
];
|
||||
|
||||
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
|
||||
|
|
@ -217,18 +217,18 @@ Form::macro('email_format', function ($name = 'email_format', $selected = null,
|
|||
|
||||
Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {
|
||||
$formats = [
|
||||
'firstname.lastname' => trans('admin/settings/general.firstname_lastname_format'),
|
||||
'firstname' => trans('admin/settings/general.first_name_format'),
|
||||
'lastname' => trans('admin/settings/general.last_name_format'),
|
||||
'filastname' => trans('admin/settings/general.filastname_format'),
|
||||
'lastnamefirstinitial' => trans('admin/settings/general.lastnamefirstinitial_format'),
|
||||
'firstname_lastname' => trans('admin/settings/general.firstname_lastname_underscore_format'),
|
||||
'firstinitial.lastname' => trans('admin/settings/general.firstinitial.lastname'),
|
||||
'lastname_firstinitial' => trans('admin/settings/general.lastname_firstinitial'),
|
||||
'lastname.firstinitial' => trans('admin/settings/general.lastname_dot_firstinitial_format'),
|
||||
'firstnamelastname' => trans('admin/settings/general.firstnamelastname'),
|
||||
'firstnamelastinitial' => trans('admin/settings/general.firstnamelastinitial'),
|
||||
'lastname.firstname' => trans('admin/settings/general.lastnamefirstname'),
|
||||
'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),
|
||||
'firstname' => trans('admin/settings/general.username_formats.first_name_format'),
|
||||
'lastname' => trans('admin/settings/general.username_formats.last_name_format'),
|
||||
'filastname' => trans('admin/settings/general.username_formats.filastname_format'),
|
||||
'lastnamefirstinitial' => trans('admin/settings/general.username_formats.lastnamefirstinitial_format'),
|
||||
'firstname_lastname' => trans('admin/settings/general.username_formats.firstname_lastname_underscore_format'),
|
||||
'firstinitial.lastname' => trans('admin/settings/general.username_formats.firstinitial.lastname'),
|
||||
'lastname_firstinitial' => trans('admin/settings/general.username_formats.lastname_firstinitial'),
|
||||
'lastname.firstinitial' => trans('admin/settings/general.username_formats.lastname_dot_firstinitial_format'),
|
||||
'firstnamelastname' => trans('admin/settings/general.username_formats.firstnamelastname'),
|
||||
'firstnamelastinitial' => trans('admin/settings/general.username_formats.firstnamelastinitial'),
|
||||
'lastname.firstname' => trans('admin/settings/general.username_formats.lastnamefirstname'),
|
||||
];
|
||||
|
||||
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@
|
|||
<!-- Email format -->
|
||||
<div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="email_format">{{ trans('general.email_format') }}</label>
|
||||
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<!-- Username format -->
|
||||
<div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="username_format">{{ trans('general.username_format') }}</label>
|
||||
<label for="username_format">{{ trans('admin/settings/general.username_formats.username_format') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue