Translate Invoice-Email. Fix Typo

app/Http/Controllers/Admin/SettingsController.php

@@ -54,7 +54,7 @@ class SettingsController extends Controller
             'id' => "1"
         ], [
             'company_name' => $request->get('company-name'),
-            'company_adress' => $request->get('company-adress'),
+            'company_adress' => $request->get('company-address'),
             'company_phone' => $request->get('company-phone'),
             'company_mail' => $request->get('company-mail'),
             'company_vat' => $request->get('company-vat'),

app/Notifications/InvoiceNotification.php

@@ -55,15 +55,15 @@ class InvoiceNotification extends Notification
     public function toMail($notifiable)
     {
         return (new MailMessage)
-            ->subject('Your Payment was successful!')
-            ->greeting('Hello,')
-            ->line("Your payment was processed successfully!")
-            ->line('Status: ' . $this->payment->status)
-            ->line('Price: ' . $this->payment->formatToCurrency($this->payment->total_price))
-            ->line('Type: ' . $this->payment->type)
-            ->line('Amount: ' . $this->payment->amount)
-            ->line('Balance: ' . number_format($this->user->credits,2))
-            ->line('User ID: ' . $this->payment->user_id)
+            ->subject(__('Your Payment was successful!'))
+            ->greeting(__('Hello').',')
+            ->line(__("Your payment was processed successfully!"))
+            ->line(__('Status').': ' . $this->payment->status)
+            ->line(__('Price').': ' . $this->payment->formatToCurrency($this->payment->total_price))
+            ->line(__('Type').': ' . $this->payment->type)
+            ->line(__('Amount').': ' . $this->payment->amount)
+            ->line(__('Balance').': ' . number_format($this->user->credits,2))
+            ->line(__('User ID').': ' . $this->payment->user_id)
             ->attach(storage_path('app/invoice/' . $this->user->id . '/' . now()->format('Y') . '/' . $this->invoice->filename));
     }
 }

resources/lang/de.json

@@ -6,7 +6,6 @@
     "Causer": "Verursacher",
     "Description": "Beschreibung",
     "Created at": "Erstellt am",
-
     "Edit Configuration": "Einstellungen bearbeiten",
     "Text Field": "Textfeld",
     "Cancel": "Abbrechen",
@@ -14,13 +13,11 @@
     "Save": "Speichern",
     "true": "wahr",
     "false": "falsch",
-
     "Configurations": "Einstellungen",
     "Dashboard": "Dashboard",
     "Key": "Schlüssel",
     "Value": "Wert",
     "Type": "Typ",
-
     "Admin Overview": "Admin Übersicht",
     "Support server": "Discord Server",
     "Documentation": "Dokumentation",
@@ -41,7 +38,6 @@
     "Eggs": "Eggs",
     "Last updated :date": "Zuletzt aktualisiert :date",
     "Purchase": "Kaufen",
-
     "ID": "ID",
     "User": "Benutzer",
     "Amount": "Anzahl",
@@ -50,13 +46,11 @@
     "Total Price": "Gesamtpreis",
     "Payment_ID": "Zahlungs-ID",
     "Payer_ID": "Käufer-ID",
-
     "Product": "Produkt",
     "Products": "Produkte",
     "Create": "Erstellen",
     "Product Details": "Produktdetails",
     "Server Details": "Serverdetails",
-
     "Product Linking": "Produktbeziehungen",
     "Name": "Name",
     "Price in": "Preis in ",
@@ -79,22 +73,18 @@
     "Setting to -1 will use the value from configuration.": "Benutzt den Standard, wenn der Wert auf -1 gesetzt wird",
     "This is what the users sees": "Das wird der Benutzer sehen",
     "Edit": "Bearbeiten",
-
     "Price": "Preis",
     "Are you sure you wish to delete?": "Sicher, dass du dies löschen möchtest?",
     "Create new": "Neu erstellen",
     "Show": "Zeige",
     "Updated at": "Aktualisiert",
     "Suspended at": "Suspendiert",
-
     "Settings": "Einstellungen",
     "Dashboard icons": "Dashboard Icons",
     "Select panel icon": "Icon auswählen",
     "Select panel favicon": "Favicon auswählen",
-
     "Token": "Token",
     "Last used": "Zuletzt benutzt",
-
     "Store": "Laden",
     "Currency code": "Währungscode",
     "Checkout the paypal docs to select the appropriate code": "Siehe Paypal für die entsprechenden Codes",
@@ -104,17 +94,14 @@
     "This is what the user sees at store and checkout": "Dies ist die 'Anzahl' welche der User beim Kaufen sieht",
     "This is what the user sees at checkout": "Dies ist die Beschreibung auf der Rechnung und was der Kunde beim kauf sieht",
     "Adds 1000 credits to your account": "Fügt deinem Account 1000 Credits hinzu",
-
     "Active": "Aktiv",
     "Paypal is not configured.": "Paypal ist nicht konfiguriert!",
     "To configure PayPal, head to the .env and add your PayPal’s client id and secret.": "Um Paypal zu konfigurieren, füge deine Paypal client ID und Secretkey in deine .env-Datei hinzu",
-
     "Useful Links": "Nützliche Links",
     "Icon class name": "Icon Klassen-Name",
     "You can find available free icons": "Hier gibt es kostenlose Icons",
     "Title": "Titel",
     "Link": "Link",
-
     "Username": "Username",
     "Email": "E-Mail",
     "Pterodactly ID": "Pterodactyl ID",
@@ -127,20 +114,15 @@
     "Confirm Password": "Passwort bestätigen",
     "This ID refers to the user account created on pterodactyls panel.": "Die ist die Pterodactyl-ID des Users",
     "Only edit this if you know what youre doing :)": "Bearbeite dies nur, wenn du weißt, was du tust :)",
-
     "Verified": "Verifiziert",
     "Last seen": "Zuletzt online",
     "Notify": "Benachrichtigen",
-
     "All": "Alle",
     "Send via": "Senden via",
     "Content": "Inhalt",
     "Notifications": "Benachrichtigungen",
-
     "Usage": "Nutzung",
-
     "Config": "Konfiguration",
-
     "Vouchers": "Gutscheine",
     "Voucher details": "Gutschein details",
     "Memo": "Name",
@@ -149,11 +131,9 @@
     "Expires at": "Läuft ab am",
     "Max": "Max",
     "Random": "Zufällig",
-
     "Status": "Status",
     "Used / Uses": "Benutzungen",
     "Expires": "Ablauf",
-
     "Please confirm your password before continuing.": "Bitte bestätige dein Passwort bevor du fortfährst",
     "Password": "Passwort",
     "Forgot Your Password?": "Passwort vergessen?",
@@ -164,7 +144,7 @@
     "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.",
+    "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",
@@ -174,8 +154,8 @@
     "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",
+    "Languages": "Sprachen",
     "See all Notifications": "Alle Nachrichten anzeigen",
     "Profile": "Profil",
     "Log back in": "Zurück anmelden",
@@ -187,24 +167,18 @@
     "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",
@@ -212,7 +186,6 @@
     "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",
-
     "Change Password": "Passwort ändern",
     "Current Password": "Momentanes Passwort",
     "Save Changes": "Änderungen speichern",
@@ -246,7 +219,6 @@
     "Delete server": "Server löschen",
     "Price per Hour": "Preis pro Stunde",
     "Price per Month": "Preis pro Monat",
-
     "Date": "Datum",
     "To": "Zu",
     "From": "Von",
@@ -258,13 +230,10 @@
     "There are no store products!": "Es gibt keine Produkte",
     "The store is not correctly configured!": "Der Laden wurde nicht richtig konfiguriert",
     "Out of Credits in": "Keine :credits mehr in",
-
     "days": "Tage",
     "hours": "Stunden",
     "You ran out of Credits": "Keine Credits übrig!",
-
     "Profile updated": "Profile updated",
-
     "You are required to verify your email address before you can create a server.": "Du musst deine E-Mail verifizieren bevor du einen Server erstellen kannst",
     "You are required to link your discord account before you can create a server.": "Du musst dein Discord verifizieren bevor du einen Server erstellen kannst",
     "No allocations satisfying the requirements for automatic deployment on this node were found.": "Keine automatischen Portzuweisungen für dieses Node vorhanden",
@@ -273,9 +242,7 @@
     "An exception has occurred while trying to remove a resource \"": "Folgender Fehler ist aufgetreten: ",
     "You are required to verify your email address before you can purchase credits.": "Vor dem Kauf musst du deine E-Mail verifizieren",
     "You are required to link your discord account before you can purchase ": "Vor dem Kauf musst du dein Discord verlinken!",
-
     "Warning!": "Warnung!",
-
     "api key created!": "API Key erstellt",
     "api key updated!": "API Key updated",
     "api key has been removed!": "API Key gelöscht",
@@ -283,11 +250,10 @@
     "Pterodactyl synced": "Pterodactyl synced",
     "Your credit balance has been increased!": "Dein Kontostand wurde updated",
     "Payment was Canceled": "Zahlung abgebrochen",
-
     "Store item has been created!": "Item wurde erstellt!",
     "Store item has been updated!": "Item updated",
     "Product has been updated!": "Product updated",
-    "Store item has been removed!":"Item gelöscht",
+    "Store item has been removed!": "Item gelöscht",
     "Product has been created!": "Produkt erstellt",
     "Product has been removed!": "Produkt gelöscht",
     "Server has been updated!": "Server updated",
@@ -329,17 +295,16 @@
     "Shipping": "Lieferbedingung",
     "Paid": "Bezahlt",
     "Due:": "Fällig",
-    "Invoice Settings":"Rechnungsoptionen",
-    "Download all Invoices":"Alle Rechnungen runterladen",
-    "Enter your companys name":"Firmenname",
-    "Enter your companys adress":"Firmenadresse",
-    "Enter your companys phone number":"Telefonnummer",
-    "Enter your companys VAT id":"SteuerID Nummer",
-    "Enter your companys email adress":"Firmen E-Mail",
-    "Enter your companys website":"Firmenwebsite",
-    "Enter your custom invoice prefix":"Rechnungsprefix",
-    "Select Invoice Logo":"Firmenlogo auswählen",
-
+    "Invoice Settings": "Rechnungsoptionen",
+    "Download all Invoices": "Alle Rechnungen runterladen",
+    "Enter your companys name": "Firmenname",
+    "Enter your companys address": "Firmenadresse",
+    "Enter your companys phone number": "Telefonnummer",
+    "Enter your companys VAT id": "SteuerID Nummer",
+    "Enter your companys email address": "Firmen E-Mail",
+    "Enter your companys website": "Firmenwebsite",
+    "Enter your custom invoice prefix": "Rechnungsprefix",
+    "Select Invoice Logo": "Firmenlogo auswählen",
     "Payment Confirmation": "Zahlungsbestätigung",
     "Payment Confirmed!": "Zahlung bestätigt!",
     "Server Creation Error": "Fehler beim erstellen des Servers",
@@ -348,7 +313,6 @@
     "Purchase credits": "Credits kaufen",
     "If you have any questions please let us know.": "Solltest du weiter fragen haben, melde dich gerne beim Support!",
     "Regards": "mit freundlichen Grüßen",
-
     "Getting started!": "Den Anfang machen!",
     "EXPIRED": "ABGELAUFEN",
     "VALID": "GÜLTIG",
@@ -357,7 +321,8 @@
     "Delete": "Löschen",
     "Login as User": "Als User anmelden",
     "Clone": "Klonen",
-
-    "Amount due": "Zahlung fällig am"
-
+    "Amount due": "Zahlung fällig am",
+    "Your Payment was successful!": "Deine Zahlung ist erfolgreich bei uns eingegangen!",
+    "Hello": "Hallo",
+    "Your payment was processed successfully!": "Deine Zahlung wurde erfolgreich verarbeitet!"
 }

resources/lang/en.json

@@ -164,7 +164,7 @@
     "You forgot your password? Here you can easily retrieve a new password.": "You forgot your password? Here you can easily retrieve a new password.",
     "Request new password": "Request new password",
     "Login": "Login",
-    "You are only one step a way from your new password, recover your password now.":"Du bist nurnoch einen Schritt von deinem Passwort entfernt.",
+    "You are only one step a way from your new password, recover your password now.":"You are only one step a way from your new password, recover your password now.",
     "Retype password": "Retype password",
     "Change password": "Change password",
     "I already have a membership": "I already have a membership",
@@ -176,6 +176,7 @@
     "click here to request another": "click here to request another",
 
     "Home": "Home",
+    "Languages": "Languages",
     "See all Notifications": "See all Notifications",
     "Profile": "Profile",
     "Log back in": "Log back in",
@@ -332,10 +333,10 @@
     "Invoice Settings": "Invoice Settings",
     "Download all Invoices": "Download all Invoices",
     "Enter your companys name": "Enter your companys name",
-    "Enter your companys adress": "Enter your companys adress",
+    "Enter your companys address": "Enter your companys address",
     "Enter your companys phone number": "Enter your companys phone number",
     "Enter your companys VAT id": "Enter your companys VAT id",
-    "Enter your companys email adress": "Enter your companys email adress",
+    "Enter your companys email address": "Enter your companys email address",
     "Enter your companys website": "Enter your companys website",
     "Enter your custom invoice prefix": "Enter your custom invoice prefix",
     "Select Invoice Logo": "Select Invoice Logo",
@@ -359,6 +360,11 @@
     "Login as User": "Login as User",
     "Clone": "Clone",
 
-    "Amount due": "Amount due"
+    "Amount due": "Amount due",
+
+    "Your Payment was successful!": "Your Payment was successful!",
+    "Hello":"Hello",
+    "Your payment was processed successfully!":"Your payment was processed successfully!"
+
 
 }

resources/views/admin/settings/index.blade.php

@@ -113,14 +113,14 @@
                                                        class="form-control @error('company-name') is-invalid @enderror">
                                             </div>
                                         </div>
-                                        <!-- adress -->
+                                        <!-- address -->
                                         <div class="form-group">
                                             <div class="custom-control mb-3">
                                                 <label
-                                                    for="company-adress">{{__('Enter your companys adress' )}}</label>
-                                                <input x-model="company-adress" id="company-adress"
-                                                       name="company-adress" type="text" value="{{$company_adress}}"
-                                                       class="form-control @error('company-adress') is-invalid @enderror">
+                                                    for="company-address">{{__('Enter your companys address' )}}</label>
+                                                <input x-model="company-address" id="company-address"
+                                                       name="company-address" type="text" value="{{$company_adress}}"
+                                                       class="form-control @error('company-address') is-invalid @enderror">
                                             </div>
                                         </div>
                                         <!-- Phone -->
@@ -148,7 +148,7 @@
                                         <div class="form-group">
                                             <div class="custom-control mb-3">
                                                 <label
-                                                    for="company-mail">{{__('Enter your companys email adress' )}}</label>
+                                                    for="company-mail">{{__('Enter your companys email address' )}}</label>
                                                 <input x-model="company-mail" id="company-mail" name="company-mail"
                                                        type="text" value="{{$company_mail}}"
                                                        class="form-control @error('company-mail') is-invalid @enderror">

resources/views/vendor/invoices/templates/controlpanel.blade.php

@@ -183,7 +183,7 @@
 
                         @if($invoice->seller->address)
                             <p class="seller-address">
-                                {{ __('Adress') }}: {{ $invoice->seller->address }}
+                                {{ __('Address') }}: {{ $invoice->seller->address }}
                             </p>
                         @endif
 
@@ -219,9 +219,9 @@
                             </p>
                         @endif
 
-                        @if($invoice->buyer->address)
+                        @if($invoice->buyer->adress)
                             <p class="buyer-address">
-                                {{ __('Adress') }}: {{ $invoice->buyer->address }}
+                                {{ __('Address') }}: {{ $invoice->buyer->address }}
                             </p>
                         @endif