Skip to content

Firefly III: a personal finances manager

Add store, fix locale.

James Cole1320c766f92d
diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php
index be4aacaabc..648cbf6787 100644
--- a/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php
+++ b/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php
@@ -25,8 +25,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Autocomplete;
use FireflyIII\Api\V1\Requests\AggregateFormRequest;
-use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;
use FireflyIII\Api\V1\Requests\Generic\QueryRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\ObjectGroup;
diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.js
index 9732d0dec4..aa1570c7a8 100644
--- a/resources/assets/v3/js/boot/bootstrap.js
+++ b/resources/assets/v3/js/boot/bootstrap.js
@@ -78,6 +78,7 @@ getFreshVariable("lastActivity")
window.__localeId__ = values.locale;
store.set("language", values.language);
store.set("locale", values.locale);
+ console.log('Language is ' + values.language + ', locale is ' + values.locale);
loadTranslations(values.locale).then(() => {
const event = new Event("firefly-iii-bootstrapped");
document.dispatchEvent(event);
diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.js
index a16c44f777..1c1f5cd210 100644
--- a/resources/assets/v3/js/pages/dashboard/dashboard.js
+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js
@@ -37,8 +37,8 @@ let index = function () {
this.loadPiggyBanks();
console.log("Dashboard");
getVariable("anonymous").then((value) => {
- let start = new Date(store.get('start'));
- let end = new Date(store.get('end'));
+ let start = new Date(window.store.get('start'));
+ let end = new Date(window.store.get('end'));
drawMultiCurrencyChart(
"line",
"api/v1/chart/account/overview?period=1D&start=" + format(start,"yyyy-LL-dd") + "&end=" + format(end,"yyyy-LL-dd"),
diff --git a/resources/assets/v3/js/shared/draw-chart.js b/resources/assets/v3/js/shared/draw-chart.js
index b56361cc98..83686c27c4 100644
--- a/resources/assets/v3/js/shared/draw-chart.js
+++ b/resources/assets/v3/js/shared/draw-chart.js
@@ -21,7 +21,7 @@
import Chart from "chart.js/auto";
import formatMoney from "../util/format-money.js";
import i18next from "i18next";
-import format from "date-fns/format";
+import format from '../util/format.js';
let defaultChartOptions = {
elements: {
diff --git a/resources/assets/v3/js/util/format.js b/resources/assets/v3/js/util/format.js
index a19c965f5c..87a51270e8 100644
--- a/resources/assets/v3/js/util/format.js
+++ b/resources/assets/v3/js/util/format.js
@@ -93,6 +93,7 @@ const locales = {
// it will format dates in whichever way is appropriate to the locale
export default function (date, formatStr = "PP") {
let locale = window.__localeId__.replace("_", "");
+ console.log('Locale is ' + locale);
return format(date, formatStr, {
locale:
locales[locale] ?? locales[locale.slice(0, 2)] ?? locales["enUS"], // or global.__localeId__