Skip to content

Firefly III: a personal finances manager

Fix null dates and missing translation.

James Cole59174e9fc7e1
diff --git a/resources/assets/v3/js/pages/transactions/shared/parse-downloaded-splits.js b/resources/assets/v3/js/pages/transactions/shared/parse-downloaded-splits.js
index b19aaff3f0..54f149adf3 100644
--- a/resources/assets/v3/js/pages/transactions/shared/parse-downloaded-splits.js
+++ b/resources/assets/v3/js/pages/transactions/shared/parse-downloaded-splits.js
@@ -42,12 +42,12 @@ export function parseDownloadedSplits(downloads, groupId) {
current.piggy_bank_name = download.piggy_bank_name;
// meta dates
- current.book_date = format(new Date(download.book_date), "yyyy-MM-dd");
- current.due_date = format(new Date(download.due_date), "yyyy-MM-dd");
- current.interest_date = format(new Date(download.interest_date), "yyyy-MM-dd");
- current.invoice_date = format(new Date(download.invoice_date), "yyyy-MM-dd");
- current.payment_date = format(new Date(download.payment_date), "yyyy-MM-dd");
- current.process_date = format(new Date(download.process_date), "yyyy-MM-dd");
+ current.book_date = null === download.book_date ? '' : format(new Date(download.book_date), "yyyy-MM-dd");
+ current.due_date = null === download.due_date ? '' : format(new Date(download.due_date), "yyyy-MM-dd");
+ current.interest_date = null === download.interest_date ? '' : format(new Date(download.interest_date), "yyyy-MM-dd");
+ current.invoice_date = null === download.invoice_date ? '' : format(new Date(download.invoice_date), "yyyy-MM-dd");
+ current.payment_date = null === download.payment_date ? '' : format(new Date(download.payment_date), "yyyy-MM-dd");
+ current.process_date = null === download.process_date ? '' : format(new Date(download.process_date), "yyyy-MM-dd");
// more meta
current.external_url = download.external_url;
diff --git a/resources/views/preferences/index.blade.php b/resources/views/preferences/index.blade.php
index 536806e121..f5f37321fa 100644
--- a/resources/views/preferences/index.blade.php
+++ b/resources/views/preferences/index.blade.php
@@ -373,7 +373,7 @@
<input type="radio" name="darkMode"
value="{{ $mode }}"
@if($darkMode === $mode) checked @endif>
- {{ __('dark_mode_option_' . $mode) }}
+ {{ __('firefly.dark_mode_option_' . $mode) }}
</label>
</div>
@endforeach