Merge pull request #95 from Scarbous/master

Translate the format in getAmountInWords

Author: mc0de

resources/lang/en/invoice.php

@@ -8,29 +8,30 @@
     |--------------------------------------------------------------------------
     */
 
-    'serial'          => 'Serial No.',
-    'date'            => 'Invoice date',
-    'seller'          => 'Seller',
-    'buyer'           => 'Buyer',
-    'address'         => 'Address',
-    'code'            => 'Code',
-    'vat'             => 'VAT code',
-    'phone'           => 'Phone',
-    'description'     => 'Description',
-    'units'           => 'Units',
-    'quantity'        => 'Qty',
-    'price'           => 'Price',
-    'discount'        => 'Discount',
-    'tax'             => 'Tax',
-    'sub_total'       => 'Sub total',
-    'total_discount'  => 'Total discount',
-    'taxable_amount'  => 'Taxable amount',
-    'total_taxes'     => 'Total taxes',
-    'tax_rate'        => 'Tax rate',
-    'total_amount'    => 'Total amount',
-    'pay_until'       => 'Please pay until',
-    'amount_in_words' => 'Amount in words',
-    'notes'           => 'Notes',
-    'shipping'        => 'Shipping',
+    'serial'                 => 'Serial No.',
+    'date'                   => 'Invoice date',
+    'seller'                 => 'Seller',
+    'buyer'                  => 'Buyer',
+    'address'                => 'Address',
+    'code'                   => 'Code',
+    'vat'                    => 'VAT code',
+    'phone'                  => 'Phone',
+    'description'            => 'Description',
+    'units'                  => 'Units',
+    'quantity'               => 'Qty',
+    'price'                  => 'Price',
+    'discount'               => 'Discount',
+    'tax'                    => 'Tax',
+    'sub_total'              => 'Sub total',
+    'total_discount'         => 'Total discount',
+    'taxable_amount'         => 'Taxable amount',
+    'total_taxes'            => 'Total taxes',
+    'tax_rate'               => 'Tax rate',
+    'total_amount'           => 'Total amount',
+    'pay_until'              => 'Please pay until',
+    'amount_in_words'        => 'Amount in words',
+    'amount_in_words_format' => '%s %s and %s %s',
+    'notes'                  => 'Notes',
+    'shipping'               => 'Shipping',
 
 ];

resources/lang/nl/invoice.php

@@ -8,29 +8,30 @@
     |--------------------------------------------------------------------------
     */
 
-    'serial'          => 'Factuurnummer',
-    'date'            => 'Factuurdatum',
-    'seller'          => 'Leverancier',
-    'buyer'           => 'Afnemer',
-    'address'         => 'Adres',
-    'code'            => 'Code',
-    'vat'             => 'Btw-identificatienummer',
-    'phone'           => 'Telefoonnummer',
-    'description'     => 'Omschrijving',
-    'units'           => 'Eenheid',
-    'quantity'        => 'Aantal',
-    'price'           => 'Prijs',
-    'discount'        => 'Korting',
-    'tax'             => 'Belasting',
-    'sub_total'       => 'Subtotaal',
-    'total_discount'  => 'Totale korting',
-    'taxable_amount'  => 'Belastbaar bedrag',
-    'total_taxes'     => 'Totaal belastingen',
-    'tax_rate'        => 'Belastingtarief',
-    'total_amount'    => 'Totaalbedrag',
-    'pay_until'       => 'Gelieve te betalen voor',
-    'amount_in_words' => 'Totaalbedrag in woorden',
-    'notes'           => 'Opmerkingen',
-    'shipping'        => 'Verzending',
+    'serial'                 => 'Factuurnummer',
+    'date'                   => 'Factuurdatum',
+    'seller'                 => 'Leverancier',
+    'buyer'                  => 'Afnemer',
+    'address'                => 'Adres',
+    'code'                   => 'Code',
+    'vat'                    => 'Btw-identificatienummer',
+    'phone'                  => 'Telefoonnummer',
+    'description'            => 'Omschrijving',
+    'units'                  => 'Eenheid',
+    'quantity'               => 'Aantal',
+    'price'                  => 'Prijs',
+    'discount'               => 'Korting',
+    'tax'                    => 'Belasting',
+    'sub_total'              => 'Subtotaal',
+    'total_discount'         => 'Totale korting',
+    'taxable_amount'         => 'Belastbaar bedrag',
+    'total_taxes'            => 'Totaal belastingen',
+    'tax_rate'               => 'Belastingtarief',
+    'total_amount'           => 'Totaalbedrag',
+    'pay_until'              => 'Gelieve te betalen voor',
+    'amount_in_words'        => 'Totaalbedrag in woorden',
+    'amount_in_words_format' => '%s %s en %s %s',
+    'notes'                  => 'Opmerkingen',
+    'shipping'               => 'Verzending',
 
 ];

src/Traits/CurrencyFormatter.php

@@ -163,7 +163,7 @@ public function getAmountInWords(float $amount, ?string $locale = null)
         }
 
         return sprintf(
-            '%s %s and %s %s',
+            trans('invoices::invoice.amount_in_words_format'),
             ucfirst($integer_value),
             strtoupper($this->currency_code),
             $fraction_value,