DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11191 from snipe/fixes/corrected_activated_language_in_bulk_edit

Browse source 
Updated language strings from activated to able to login
This commit is contained in:
snipe 2022-05-24 13:13:02 -07:00 committed by GitHub
parent 4839985f38 67616dbcf4
commit 0e6c82776a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lang/en/admin/users/general.php
View file

@ -24,7 +24,8 @@ return [
'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication. ',
'two_factor_enrolled' => '2FA Device Enrolled ',
'two_factor_active' => '2FA Active ',
'user_deactivated' => 'User is de-activated',
'user_deactivated' => 'User cannot login',
'user_activated' => 'User can login',
'activation_status_warning' => 'Do not change activation status',
'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',

4
resources/views/users/bulk-edit.blade.php
View file

@ -104,13 +104,13 @@
<!-- activated -->
<div class="form-group">
<div class="col-sm-3 control-label">
{{ trans('general.activated') }}
{{ trans('general.login_enabled') }}
</div>
<div class="col-sm-9">
<div class="radio">
<label for="activated">
{{ Form::radio('activated', '', true, ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('general.login_enabled')}} <br>
{{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('admin/users/general.user_activated')}} <br>
{{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }} {{ trans('admin/users/general.user_deactivated')}}
</label>