Merge branch 'master' of https://github.com/bytefury/crater

crater-invoice-inc · Jan 12, 2022 · 4ef5e7e · 4ef5e7e
2 parents 941bc4b + e2bb414
commit 4ef5e7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/app/Traits/GeneratesPdfTrait.php b/app/Traits/GeneratesPdfTrait.php
@@ -157,6 +157,10 @@ public function getFieldsArray()
         foreach ($customerCustomFields as $customField) {
             $fields['{'.$customField->customField->slug.'}'] = $customField->defaultAnswer;
         }
+
+        foreach ($fields as $key => $field) {
+            $fields[$key] = htmlspecialchars($field, ENT_QUOTES, 'UTF-8');
+        }
 
         return $fields;
     }

diff --git a/resources/scripts/locales/fr.json b/resources/scripts/locales/fr.json
@@ -52,7 +52,7 @@
     "percentage": "Pourcentage",
     "tax": "IMPÔT",
     "total_amount": "MONTANT TOTAL",
-    "bill_to": "facturer",
+    "bill_to": "Facturer à",
     "ship_to": "Envoyez à",
     "due": "Dû",
     "draft": "Brouillon",
@@ -296,7 +296,7 @@
       "title": "Titre de l'article",
       "description": "Description",
       "quantity": "Quantité",
-      "price": "Prix",
+      "price": "Prix unitaire",
       "discount": "Remise",
       "total": "Total",
       "total_discount": "Remise totale",
@@ -929,8 +929,8 @@
       "disk_name": "Nom",
       "new_disk": "Ajouter un nouvel espace de stockage",
       "filesystem_driver": "Pilote du système de fichiers",
-      "local_driver": "pilote local",
-      "local_root": "répertoire local",
+      "local_driver": "Pilote local",
+      "local_root": "Répertoire local",
       "public_driver": "Pilote public",
       "public_root": "Répertoire public",
       "public_url": "URL publique",
@@ -1113,12 +1113,12 @@
   "pdf_notes": "Remarques",
   "pdf_items_label": "Articles",
   "pdf_quantity_label": "Quantité",
-  "pdf_price_label": "Prix",
+  "pdf_price_label": "Prix unitaire",
   "pdf_discount_label": "Remise",
   "pdf_amount_label": "Montant",
   "pdf_subtotal": "Sous-total",
   "pdf_total": "Total",
-  "pdf_payment_label": "Payment",
+  "pdf_payment_label": "Paiement",
   "pdf_payment_receipt_label": "Reçu de paiement",
   "pdf_payment_date": "Date de paiement",
   "pdf_payment_number": "N°",
@@ -1127,9 +1127,9 @@
   "pdf_expense_report_label": "RAPPORT DE DÉPENSES",
   "pdf_total_expenses_label": "TOTAL DES DÉPENSES",
   "pdf_profit_loss_label": "RAPPORT DES BÉNÉFICES ET DES PERTES",
-  "pdf_sales_customers_label": "Sales Customer Report",
-  "pdf_sales_items_label": "Sales Item Report",
-  "pdf_tax_summery_label": "Tax Summary Report",
+  "pdf_sales_customers_label": "Rapport sur les ventes des clients",
+  "pdf_sales_items_label": "Rapport d'articles de vente",
+  "pdf_tax_summery_label": "Rapport de synthèse sur les impôts",
   "pdf_income_label": "REVENU",
   "pdf_net_profit_label": "BÉNÉFICE NET",
   "pdf_customer_sales_report": "Rapport de ventes : par client",
@@ -1139,8 +1139,8 @@
   "pdf_total_tax_label": "TOTAL DES TAXES",
   "pdf_tax_types_label": "Types de taxe",
   "pdf_expenses_label": "Dépenses",
-  "pdf_bill_to": "facturer,",
-  "pdf_ship_to": "Envoyer à,",
+  "pdf_bill_to": "Facturer à :",
+  "pdf_ship_to": "Envoyer à :",
   "pdf_received_from": "Reçu de :",
   "pdf_tax_label": "Tax"
 }