From 6338b3ef8b496dbe85296dc38070330a3f28bb27 Mon Sep 17 00:00:00 2001 From: miguel456 Date: Sat, 19 Mar 2022 19:06:25 +0000 Subject: [PATCH] refactor: refactored auth strings --- resources/views/auth/2fa.blade.php | 12 ++-- resources/views/auth/login.blade.php | 22 ++++---- .../views/auth/passwords/email.blade.php | 10 ++-- .../views/auth/passwords/reset.blade.php | 8 ++- resources/views/auth/register.blade.php | 55 ++++++++++--------- resources/views/auth/verify.blade.php | 2 + .../views/breadcrumbs/auth/main.blade.php | 2 +- .../breadcrumbs/dashboard/footer.blade.php | 6 +- resources/views/breadcrumbs/footer.blade.php | 2 +- resources/views/breadcrumbs/header.blade.php | 16 +++--- .../views/components/no-permission.blade.php | 20 +++---- resources/views/layouts/app.blade.php | 6 +- 12 files changed, 85 insertions(+), 76 deletions(-) diff --git a/resources/views/auth/2fa.blade.php b/resources/views/auth/2fa.blade.php index f9d4fae..d29e6cc 100755 --- a/resources/views/auth/2fa.blade.php +++ b/resources/views/auth/2fa.blade.php @@ -17,15 +17,15 @@
@csrf
- - + +
- +
- + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 25b9216..b01b1b2 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,30 +27,32 @@
  • staffmember@example.com
  • enduser@example.com
  • -

    {{ __('The password is ":password" for all accounts.', ['password' => 'password']) }}

    +

    {{ __('The password is ":demoPassword" for all accounts.', ['demoPassword' => 'password']) }}

    @endif
    - - + +
    - +
    - +
    - + - {{__('messages.forgot_pw')}} - + {{__('Forgot password?')}} + diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 9a25a65..a193902 100755 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -23,16 +23,18 @@
    @csrf
    - - + +
    {{__('Back to login')}} diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 7ebafdd..70f3faf 100755 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -68,10 +68,12 @@ - {{__('Back to login')}} + {{__('Back to sign in')}} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index c2071ba..98c92fc 100755 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -13,34 +13,34 @@
    {{ config('adminlte.logo') }}
    -

    {{__('messages.register_acc')}}

    +

    {{__('Sign up for an account')}}

    @if(\App\Facades\Options::getOption('pw_security_policy') !== 'off')
    × -

    {{__('messages.pwsec.line1')}}

    -

    {{__('messages.pwsec.line2')}}

    +

    {{__('Basic password security')}}

    +

    {{__("For your security, we implement strict password policies. It's also advisable to let your password manager or browser generate and save passwords for you (if it's a private device).")}}

    -

    {{__('messages.pwsec.line3')}}

    +

    {{__('Passwords must be a combination of:')}}

    @endif
    @csrf
    - - + +
    - - + +
    - - + +
    - - + +
    @if(\App\Facades\Options::getOption('requireGameLicense') && \App\Facades\Options::getOption('currentGame') == 'MINECRAFT')
    - - + +
    @endif - +
    - + diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php index 4474c97..703368a 100755 --- a/resources/views/auth/verify.blade.php +++ b/resources/views/auth/verify.blade.php @@ -32,6 +32,8 @@ diff --git a/resources/views/breadcrumbs/auth/main.blade.php b/resources/views/breadcrumbs/auth/main.blade.php index e41e288..a0dca99 100755 --- a/resources/views/breadcrumbs/auth/main.blade.php +++ b/resources/views/breadcrumbs/auth/main.blade.php @@ -1,5 +1,5 @@ - + diff --git a/resources/views/breadcrumbs/dashboard/footer.blade.php b/resources/views/breadcrumbs/dashboard/footer.blade.php index abb7736..34a2cf2 100755 --- a/resources/views/breadcrumbs/dashboard/footer.blade.php +++ b/resources/views/breadcrumbs/dashboard/footer.blade.php @@ -6,8 +6,8 @@
  • - Gitea - Issue Tracker + {{ __('Gitea') }} + {{ __('Issue Tracker') }}
  • @@ -16,7 +16,7 @@
    -

    © Miguel N. {{ \Carbon\Carbon::now()->year }}— GNU General Public License

    +

    © Miguel N. {{ \Carbon\Carbon::now()->year }}— {{ __('GNU General Public License') }}

    diff --git a/resources/views/breadcrumbs/footer.blade.php b/resources/views/breadcrumbs/footer.blade.php index b2f4fc6..28d1b08 100755 --- a/resources/views/breadcrumbs/footer.blade.php +++ b/resources/views/breadcrumbs/footer.blade.php @@ -3,7 +3,7 @@ diff --git a/resources/views/breadcrumbs/header.blade.php b/resources/views/breadcrumbs/header.blade.php index 6c77061..240511f 100755 --- a/resources/views/breadcrumbs/header.blade.php +++ b/resources/views/breadcrumbs/header.blade.php @@ -1,6 +1,6 @@ - + @@ -25,8 +25,8 @@ {{config('app.name')}} | {{ __('Home') }} - - + + @@ -79,23 +79,23 @@