From 1a1223424a27029609676b408a1ac60a0a2a9fd5 Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 13 Dec 2021 10:42:22 +0100 Subject: [PATCH] quicksafe --- resources/lang/de.json | 68 ++++++++++++++++++- resources/views/auth/login.blade.php | 12 ++-- .../views/auth/passwords/email.blade.php | 8 +-- .../views/auth/passwords/reset.blade.php | 10 +-- resources/views/auth/register.blade.php | 14 ++-- resources/views/layouts/main.blade.php | 61 ++++++++--------- .../views/mail/payment/confirmed.blade.php | 20 +++--- .../models/redeem_voucher_modal.blade.php | 9 +-- resources/views/notifications/index.blade.php | 8 +-- resources/views/profile/index.blade.php | 32 ++++----- 10 files changed, 153 insertions(+), 89 deletions(-) diff --git a/resources/lang/de.json b/resources/lang/de.json index d96d4318..1448a3ef 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -10,6 +10,7 @@ "Edit Configuration": "Einstellungen bearbeiten", "Text Field": "Textfeld", "Cancel": "Abbrechen", + "Close": "Schließen", "Save": "Speichern", "true": "wahr", "false": "falsch", @@ -143,7 +144,72 @@ "Status": "Status", "Used / Uses": "Benutzungen", - "Expires": "Ablauf" + "Expires": "Ablauf", + + "Please confirm your password before continuing.": "Bitte bestätige dein Passwort bevor du fortfährst", + "Password": "Passwort", + "Confirm Password": "Passwort bestätigen", + "Forgot Your Password?": "Passwort vergessen?", + "Sign in to start your session": "Melde dich an um das Dashboard zu benutzen", + "Remember Me": "Login Speichern", + "Sign In": "Anmelden", + "Register a new membership": "Neuen Account registrieren", + "You forgot your password? Here you can easily retrieve a new password.": "Passwort vergessen? Hier kannst du ganz leicht ein neues anfordern", + "Request new password": "Neues Passwort anfordern", + "Login": "Anmelden", + "You are only one step a way from your new password, recover your password now.":"Du bist nurnoch einen Schritt von deinem Passwort entfernt.", + "Retype password": "Passwort bestätigen", + "Change password": "Passwort ändern", + "I already have a membership": "Ich habe bereits einen Account", + "Register": "Registrieren", + "Verify Your Email Address": "Bestätige deine E-Mail Adresse", + "A fresh verification link has been sent to your email address.": "Dir wurde ein neuer Verifizierungslink zugeschickt", + "Before proceeding, please check your email for a verification link.": "Bitte überprüfe dein E-Mail Postfach nach einem Verifizierungslink", + "If you did not receive the email": "Solltest du keine E-Mail erhalten haben", + "click here to request another": "Klicke hier um eine neue zu erhalten", + + "Home": "Startseite", + "See all Notifications": "Alle Nachrichten anzeigen", + "Profile": "Profil", + "Log back in": "Zurück anmelden", + "Logout": "Abmelden", + "Administration": "Administration", + "Overview": "Übersicht", + "Application API": "API", + "Management": "Management", + "Other": "Anderes", + "Logs": "Logs", + "Redeem code": "Code einlösen", + + "You have not yet verified your email address": "Deine E-Mail Adresse ist nicht bestätigt", + "Click here to resend verification email": "Klicke hier, um eine neue Bestätigungsmail zu senden", + "Please contact support If you didnt receive your verification email.": "Wende dich an den Kundensupport wenn du keine E-Mail erhalten hast", + + "Thank you for your purchase!": "Vielen Dank für deinen Einkauf!", + "Your payment has been confirmed; Your credit balance has been updated.": "Deine Zahlung wurde bestätigt und deine Credits angepasst", + + "Payment ID": "Zahlungs-ID", + "Balance": "Stand", + "User ID": "User-ID", + "Thanks": "Vielen Dank", + + "Redeem voucher code": "Gutscheincode einlösen", + "Redeem": "Einlösen", + + "All notifications": "Alle Nachrichten", + + "Required Email verification!": "E-Mail verifizierung nötig!", + "Required Discord verification!": "Discord verifizierung nötig!", + "You have not yet verified your discord account": "Du hast deinen Discord Account noch nicht bestätigt", + "Login with discord": "Mit discord anmelden", + "Please contact support If you face any issues.": "Melde dich beim Support, solltest du Probleme haben", + "Due to system settings you are required to verify your discord account!": "Um das System zu benutzten, musst du deinen Discord Account bestätigen", + "It looks like this hasnt been set-up correctly! Please contact support.": "Es scheint so, als wäre dies nicht richtig Konfiguriert. Bitte melde dich beim Support", + + + + + } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b2f4eba6..02e25132 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -9,7 +9,7 @@ {{config('app.name', 'Laravel')}}
- + @if (session('message'))
{{ session('message') }}
@@ -25,7 +25,7 @@
- +
@@ -43,7 +43,7 @@
+ placeholder="{{__('Password')}}">
@@ -72,13 +72,13 @@
- +
@@ -102,7 +102,7 @@ @endif

- Register a new membership + {{__('Register a new membership')}}

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index f35bf5d1..a8a721fd 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -13,12 +13,12 @@ {{ session('status') }}
@endif - +
@csrf
- +
@@ -34,13 +34,13 @@
- +

- Login + {{__('Login')}}

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 51fa57d8..0b0092c4 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -8,7 +8,7 @@ {{config('app.name', 'Laravel')}}
- +
@csrf @@ -16,7 +16,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -56,7 +56,7 @@
- +
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 02341358..ad4e4d70 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -8,7 +8,7 @@ {{config('app.name', 'Laravel')}}
- + @@ -28,7 +28,7 @@
+ placeholder="{{__('Username')}}" required autocomplete="name" autofocus>
@@ -45,7 +45,7 @@
-
@@ -62,7 +62,7 @@
- +
@@ -77,7 +77,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -122,7 +122,7 @@ {{-- --}} {{--
--}} - I already have a membership + {{__('I already have a membership')}}
diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 167863e6..dc0b4a6c 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -41,10 +41,10 @@
  • - Home + {{__('Home')}}
  • - Discord + {{__('Discord')}}
    • @@ -60,7 +60,7 @@ @endif
    - {{Auth::user()->unreadNotifications->count()}} Notifications + {{Auth::user()->unreadNotifications->count()}} {{__('Notifications')}}
    @foreach(Auth::user()->unreadNotifications->sortBy('created_at')->take(5) as $notification) @@ -73,8 +73,7 @@ @endforeach
    - See All - Notifications + {{__('See all Notifications')}}
    @@ -113,7 +112,7 @@
    - Profile + {{__('Profile')}} {{-- --}} {{-- --}} @@ -123,7 +122,7 @@
    - Log back in + {{__('Log back in')}} @endif
    @@ -131,7 +130,7 @@ @csrf
    @@ -161,7 +160,7 @@
  • -

    Dashboard

    +

    {{__('Dashboard')}}
    • @@ -169,7 +168,7 @@ -

    Servers +

    {{__('Servers')}} {{Auth::user()->servers()->count()}} / {{Auth::user()->server_limit}}

    @@ -181,20 +180,20 @@     -

    Store

    +

    {{__('Store')}}

     @endif @if(Auth::user()->role == 'admin') -
  • Administration
    • +
  • {{__('Administration')}}
  • -

    Overview

    +

    {{__('Overview')}}
    • @@ -202,7 +201,7 @@ -

    Configurations

    +

    {{__('Configurations')}}

     @@ -210,7 +209,7 @@ -

    Settings

    +

    {{__('Settings')}}

     @@ -218,17 +217,17 @@ -

    Application API

    +

    {{__('Application API')}}

     -
  • Management
    • +
  • {{__('Management')}}
  • -

    Users

    +

    {{__('Users')}}
    • @@ -236,7 +235,7 @@ -

    Servers

    +

    {{__('Servers')}}

     @@ -244,7 +243,7 @@ -

    Products

    +

    {{__('Products')}}

     @@ -252,7 +251,7 @@ -

    Store

    +

    {{__('Store')}}

     @@ -260,7 +259,7 @@ -

    Vouchers

    +

    {{__('Vouchers')}}

     @@ -283,23 +282,23 @@ {{-- --}} -
  • Other
    • +
  • {{__('Other')}}
  • -

    Useful Links

    +

    {{__('Useful Links')}}
    • -
  • Logs
    • +
  • {{__('Logs')}}
  • -

    Payments +

    {{__('Payments')}} {{\App\Models\Payment::count()}}

    @@ -309,7 +308,7 @@ -

    Activity Logs

    +

    {{__('Activity Logs')}}
    • @@ -330,11 +329,9 @@ @if(Auth::user()->created_at->diffInHours(now(), false) > 1)
    Warning!
    - You have not yet verified your email address Click here to - resend - verification email
    - Please contact support If you didn't receive your verification email. + {{__('You have not yet verified your email address')}} {{__('Click here to + resend verification email')}}
    + {{__('Please contact support If you didnt receive your verification email.')}}
    @endif @endif diff --git a/resources/views/mail/payment/confirmed.blade.php b/resources/views/mail/payment/confirmed.blade.php index 2ba7c487..68a527ed 100644 --- a/resources/views/mail/payment/confirmed.blade.php +++ b/resources/views/mail/payment/confirmed.blade.php @@ -1,18 +1,18 @@ @component('mail::message') -# Thank you for your purchase! -Your payment has been confirmed; Your credit balance has been updated.
    +# {{__('Thank you for your purchase!')}} +{{__('Your payment has been confirmed; Your credit balance has been updated.')}}'
    # Details ___ -### Payment ID: **{{$payment->id}}**
    -### Status: **{{$payment->status}}**
    -### Price: **{{$payment->formatToCurrency($payment->total_price)}}**
    -### Type: **{{$payment->type}}**
    -### Amount: **{{$payment->amount}}**
    -### Balance: **{{$payment->user->credits}}**
    -### User ID: **{{$payment->user_id}}**
    +### {{__('Payment ID')}}': **{{$payment->id}}**
    +### {{__('Status')}}': **{{$payment->status}}**
    +### {{__('Price')}}': **{{$payment->formatToCurrency($payment->total_price)}}**
    +### {{__('Type')}}': **{{$payment->type}}**
    +### {{__('Amount')}}': **{{$payment->amount}}**
    +### {{__('Balance')}}': **{{$payment->user->credits}}**
    +### {{__('User ID')}}': **{{$payment->user_id}}**

    -Thanks,
    +{{__('Thanks')}},
    {{ config('app.name') }} @endcomponent diff --git a/resources/views/models/redeem_voucher_modal.blade.php b/resources/views/models/redeem_voucher_modal.blade.php index 84a243dd..a9c888fd 100644 --- a/resources/views/models/redeem_voucher_modal.blade.php +++ b/resources/views/models/redeem_voucher_modal.blade.php @@ -5,7 +5,8 @@
    -

    Redeem voucher code

    +

    {{__('Redeem voucher code')}}

    +
    @@ -13,7 +14,7 @@
    - +
    @@ -31,9 +32,9 @@
    - +
    diff --git a/resources/views/notifications/index.blade.php b/resources/views/notifications/index.blade.php index b9d59552..d240646b 100644 --- a/resources/views/notifications/index.blade.php +++ b/resources/views/notifications/index.blade.php @@ -6,12 +6,12 @@
    -

    Notifications

    +

    {{__('Notifications')}}

      -
    1. Dashboard
      2. -
    2. Notifications +
    3. {{__('Dashboard')}}
      4. +
    4. {{__('Notifications')}}
    @@ -27,7 +27,7 @@
    -

    All notifications

    +

    {{__('All notifications')}}

    @foreach($notifications as $notification)
    diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php index 4423691e..a4bac1ff 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/profile/index.blade.php @@ -6,12 +6,12 @@
    -

    Profile

    +

    {{__('Profile')}}

      -
    1. Dashboard
      2. -
    2. Profile +
    3. {{__('Dashboard')}}
      4. +
    4. {{__('Profile')}}
    @@ -28,27 +28,27 @@
    @if(!Auth::user()->hasVerifiedEmail() && strtolower($force_email_verification) == 'true')
    -
    Required Email verification!
    - You have not yet verified your email address - Click here to resend - verification email
    - Please contact support If you didn't receive your verification email. +
    {{__('Required Email verification!')}}
    + {{__('You have not yet verified your email address')}} + {{__('Click here to resend + verification email')}}
    + {{__('Please contact support If you didnt receive your verification email.')}}
    @endif @if(is_null(Auth::user()->discordUser) && strtolower($force_discord_verification) == 'true') @if(!empty(env('DISCORD_CLIENT_ID')) && !empty(env('DISCORD_CLIENT_SECRET')))
    -
    Required Discord verification!
    - You have not yet verified your discord account - Login with discord
    - Please contact support If you face any issues. +
    {{__('Required Discord verification!')}}
    + {{__('You have not yet verified your discord account')}} + {{__('Login with discord')}}
    + {{__('Please contact support If you face any issues.')}}
    @else
    -
    Required Discord verification!
    - Due to system settings you are required to verify your discord account!
    - It looks like this hasn't been set-up correctly! Please contact support. +
    {{__('Required Discord verification!')}}
    + {{__('Due to system settings you are required to verify your discord account!')}}
    + {{__('It looks like this hasnt been set-up correctly! Please contact support.')}}'
    @endif @endif @@ -100,7 +100,7 @@