Merge d62a0ad into 349a5a1

srmklive · Mar 24, 2019 · 019184a · 019184a
2 parents 349a5a1 + d62a0ad
commit 019184a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   "require": {
     "guzzlehttp/guzzle": "~6.0",
     "illuminate/support": "~5.1|~5.2|~5.3|~5.4|~5.5|~5.6|~5.7|~5.8",
-    "nesbot/carbon": "~1.0"
+    "nesbot/carbon": "~1.0 || ~2.0"
   },
   "config": {
     "sort-packages": true

diff --git a/lang/fr/error.php b/lang/fr/error.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'paypal_transaction_declined'     =>
+        'Impossible de traiter le paiement car votre transaction a été refusée sur PayPal',
+    'paypal_transaction_not_verified' => 'Impossible de vérifier la transaction depuis PayPal',
+    'paypal_connection_error'         => 'Impossible de se connecter à PayPal. Veuillez réessayer',
+];