diff --git a/app/Helpers/Csv/Converter/Date.php b/app/Helpers/Csv/Converter/Date.php index c92de17921..d43a961ac1 100644 --- a/app/Helpers/Csv/Converter/Date.php +++ b/app/Helpers/Csv/Converter/Date.php @@ -3,6 +3,9 @@ namespace FireflyIII\Helpers\Csv\Converter; use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use InvalidArgumentException; +use Log; use Session; /** @@ -19,8 +22,16 @@ class Date extends BasicConverter implements ConverterInterface public function convert() { $format = Session::get('csv-date-format'); + try { + $date = Carbon::createFromFormat($format, $this->value); + } catch (InvalidArgumentException $e) { + Log::error('Date conversion error: ' . $e->getMessage() . '. Value was "' . $this->value . '", format was "' . $format . '".'); + + $message = trans('firefly.csv_date_parse_error', ['format' => $format, 'value' => $this->value]); + + throw new FireflyException($message); + } - $date = Carbon::createFromFormat($format, $this->value); return $date; }