From 277d28df85c50a88cdd178e1625236201cddbcc4 Mon Sep 17 00:00:00 2001 From: IceToast Date: Wed, 22 Dec 2021 14:51:29 +0100 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=90=9B=20removed=20invoices::inv?= =?UTF-8?q?oice.string=20localization=20->=20no=20need=20to=20translate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/lang/en.json | 35 ++---------- .../invoices/templates/default.blade.php | 56 +++++++++---------- 2 files changed, 33 insertions(+), 58 deletions(-) diff --git a/resources/lang/en.json b/resources/lang/en.json index 4d42e61c..0509689d 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -67,7 +67,7 @@ "User ID": "User ID", "Server Creation Error": "Server Creation Error", "Your servers have been suspended!": "Your servers have been suspended!", - "To automatically re-enable your server/s, you need to purchase more credits.": "To automatically re-enable your server/s, you need to purchase more credits.", + "To automatically re-enable your server\/s, you need to purchase more credits.": "To automatically re-enable your server\/s, you need to purchase more credits.", "Purchase credits": "Purchase credits", "If you have any questions please let us know.": "If you have any questions please let us know.", "Regards": "Regards", @@ -213,7 +213,7 @@ "A voucher can only be used one time per user. Uses specifies the number of different users that can use this voucher.": "A voucher can only be used one time per user. Uses specifies the number of different users that can use this voucher.", "Max": "Max", "Expires at": "Expires at", - "Used / Uses": "Used / Uses", + "Used \/ Uses": "Used \/ Uses", "Expires": "Expires", "Sign in to start your session": "Sign in to start your session", "Password": "Password", @@ -283,7 +283,7 @@ "No nodes have been linked!": "No nodes have been linked!", "No nests available!": "No nests available!", "No eggs have been linked!": "No eggs have been linked!", - "Software / Games": "Software / Games", + "Software \/ Games": "Software \/ Games", "Please select software ...": "Please select software ...", "---": "---", "Specification ": "Specification ", @@ -343,30 +343,5 @@ "Total amount": "Total amount", "Notes": "Notes", "Amount in words": "Amount in words", - "Please pay until": "Please pay until", - - "invoices::invoice.serial": "invoices::invoice.serial", - "invoices::invoice.date": "invoices::invoice.date", - "invoices::invoice.seller": "invoices::invoice.seller", - "invoices::invoice.buyer": "invoices::invoice.buyer", - "invoices::invoice.address": "invoices::invoice.address", - "invoices::invoice.code": "invoices::invoice.code", - "invoices::invoice.vat": "invoices::invoice.vat", - "invoices::invoice.phone": "invoices::invoice.phone", - "invoices::invoice.description": "invoices::invoice.description", - "invoices::invoice.units": "invoices::invoice.units", - "invoices::invoice.quantity": "invoices::invoice.quantity", - "invoices::invoice.price": "invoices::invoice.price", - "invoices::invoice.discount": "invoices::invoice.discount", - "invoices::invoice.tax": "invoices::invoice.tax", - "invoices::invoice.sub_total": "invoices::invoice.sub_total", - "invoices::invoice.total_discount": "invoices::invoice.total_discount", - "invoices::invoice.taxable_amount": "invoices::invoice.taxable_amount", - "invoices::invoice.tax_rate": "invoices::invoice.tax_rate", - "invoices::invoice.total_taxes": "invoices::invoice.total_taxes", - "invoices::invoice.shipping": "invoices::invoice.shipping", - "invoices::invoice.total_amount": "invoices::invoice.total_amount", - "invoices::invoice.notes": "invoices::invoice.notes", - "invoices::invoice.amount_in_words": "invoices::invoice.amount_in_words", - "invoices::invoice.pay_until": "invoices::invoice.pay_until" -} + "Please pay until": "Please pay until" +} \ No newline at end of file diff --git a/resources/views/vendor/invoices/templates/default.blade.php b/resources/views/vendor/invoices/templates/default.blade.php index 9c672bdd..c1fafe6c 100644 --- a/resources/views/vendor/invoices/templates/default.blade.php +++ b/resources/views/vendor/invoices/templates/default.blade.php @@ -152,8 +152,8 @@ {{ $invoice->status }} @endif -

{{ __('invoices::invoice.serial') }} {{ $invoice->getSerialNumber() }}

-

{{ __('invoices::invoice.date') }}: {{ $invoice->getDate() }}

+

{{ trans('invoices::invoice.serial') }} {{ $invoice->getSerialNumber() }}

+

{{ trans('invoices::invoice.date') }}: {{ $invoice->getDate() }}

@@ -164,11 +164,11 @@ - {{ __('invoices::invoice.seller') }} + {{ trans('invoices::invoice.seller') }} - {{ __('invoices::invoice.buyer') }} + {{ trans('invoices::invoice.buyer') }} @@ -183,25 +183,25 @@ @if($invoice->seller->address)

- {{ __('invoices::invoice.address') }}: {{ $invoice->seller->address }} + {{ trans('invoices::invoice.address') }}: {{ $invoice->seller->address }}

@endif @if($invoice->seller->code)

- {{ __('invoices::invoice.code') }}: {{ $invoice->seller->code }} + {{ trans('invoices::invoice.code') }}: {{ $invoice->seller->code }}

@endif @if($invoice->seller->vat)

- {{ __('invoices::invoice.vat') }}: {{ $invoice->seller->vat }} + {{ trans('invoices::invoice.vat') }}: {{ $invoice->seller->vat }}

@endif @if($invoice->seller->phone)

- {{ __('invoices::invoice.phone') }}: {{ $invoice->seller->phone }} + {{ trans('invoices::invoice.phone') }}: {{ $invoice->seller->phone }}

@endif @@ -221,25 +221,25 @@ @if($invoice->buyer->address)

- {{ __('invoices::invoice.address') }}: {{ $invoice->buyer->address }} + {{ trans('invoices::invoice.address') }}: {{ $invoice->buyer->address }}

@endif @if($invoice->buyer->code)

- {{ __('invoices::invoice.code') }}: {{ $invoice->buyer->code }} + {{ trans('invoices::invoice.code') }}: {{ $invoice->buyer->code }}

@endif @if($invoice->buyer->vat)

- {{ __('invoices::invoice.vat') }}: {{ $invoice->buyer->vat }} + {{ trans('invoices::invoice.vat') }}: {{ $invoice->buyer->vat }}

@endif @if($invoice->buyer->phone)

- {{ __('invoices::invoice.phone') }}: {{ $invoice->buyer->phone }} + {{ trans('invoices::invoice.phone') }}: {{ $invoice->buyer->phone }}

@endif @@ -257,19 +257,19 @@ - + @if($invoice->hasItemUnits) - + @endif - - + + @if($invoice->hasItemDiscount) - + @endif @if($invoice->hasItemTax) - + @endif - + @@ -310,7 +310,7 @@ @if($invoice->hasItemOrInvoiceDiscount()) - + @@ -319,7 +319,7 @@ @if($invoice->taxable_amount) - + @@ -328,7 +328,7 @@ @if($invoice->tax_rate) - + @@ -337,7 +337,7 @@ @if($invoice->hasItemOrInvoiceTax()) - + @@ -346,7 +346,7 @@ @if($invoice->shipping_amount) - + @@ -354,7 +354,7 @@ @endif - + @@ -364,15 +364,15 @@ @if($invoice->notes)

- {{ __('invoices::invoice.notes') }}: {!! $invoice->notes !!} + {{ trans('invoices::invoice.notes') }}: {!! $invoice->notes !!}

@endif

- {{ __('invoices::invoice.amount_in_words') }}: {{ $invoice->getTotalAmountInWords() }} + {{ trans('invoices::invoice.amount_in_words') }}: {{ $invoice->getTotalAmountInWords() }}

- {{ __('invoices::invoice.pay_until') }}: {{ $invoice->getPayUntilDate() }} + {{ trans('invoices::invoice.pay_until') }}: {{ $invoice->getPayUntilDate() }}

{{ __('invoices::invoice.description') }}{{ trans('invoices::invoice.description') }}{{ __('invoices::invoice.units') }}{{ trans('invoices::invoice.units') }}{{ __('invoices::invoice.quantity') }}{{ __('invoices::invoice.price') }}{{ trans('invoices::invoice.quantity') }}{{ trans('invoices::invoice.price') }}{{ __('invoices::invoice.discount') }}{{ trans('invoices::invoice.discount') }}{{ __('invoices::invoice.tax') }}{{ trans('invoices::invoice.tax') }}{{ __('invoices::invoice.sub_total') }}{{ trans('invoices::invoice.sub_total') }}
{{ __('invoices::invoice.total_discount') }}{{ trans('invoices::invoice.total_discount') }} {{ $invoice->formatCurrency($invoice->total_discount) }}
{{ __('invoices::invoice.taxable_amount') }}{{ trans('invoices::invoice.taxable_amount') }} {{ $invoice->formatCurrency($invoice->taxable_amount) }}
{{ __('invoices::invoice.tax_rate') }}{{ trans('invoices::invoice.tax_rate') }} {{ $invoice->tax_rate }}%
{{ __('invoices::invoice.total_taxes') }}{{ trans('invoices::invoice.total_taxes') }} {{ $invoice->formatCurrency($invoice->total_taxes) }}
{{ __('invoices::invoice.shipping') }}{{ trans('invoices::invoice.shipping') }} {{ $invoice->formatCurrency($invoice->shipping_amount) }}
{{ __('invoices::invoice.total_amount') }}{{ trans('invoices::invoice.total_amount') }} {{ $invoice->formatCurrency($invoice->total_amount) }}