IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-16 18:25:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #5100

Browse Source
This commit is contained in:
James Cole 2021-09-25 06:31:12 +02:00
parent 138b60c462
commit dd7344d05d
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/src/components/bills/Index.vue
View File

@ -92,17 +92,33 @@
</span>
</template>
<template #cell(start_date)="data">
{{ formatDate(new Date(data.item.date.substring(0, 10)), $t('config.month_and_day_fns')) }}
{{
new Intl.DateTimeFormat(locale, {
year: 'numeric',
month: 'long',
day: 'numeric'
}).format(new Date(data.item.date.substring(0, 10)))
}}
</template>
<template #cell(end_date)="data">
<span v-if="null !== data.item.end_date">{{
formatDate(new Date(data.item.end_date.substring(0, 10)), $t('config.month_and_day_fns'))
}}</span>
<span v-if="null !== data.item.end_date">
{{
new Intl.DateTimeFormat(locale, {
year: 'numeric',
month: 'long',
day: 'numeric'
}).format(new Date(data.item.end_date.substring(0, 10)))
}}
</span>
<span v-if="null === data.item.end_date">{{ $t('firefly.forever') }}</span>
<span v-if="null !== data.item.extension_date"><br/>
<small>
{{
$t('firefly.extension_date_is', {date: formatDate(new Date(data.item.extension_date.substring(0, 10)), $t('config.month_and_day_fns'))})
$t('firefly.extension_date_is', {date: new Intl.DateTimeFormat(locale, {
year: 'numeric',
month: 'long',
day: 'numeric'
}).format(new Date(data.item.extension_date.substring(0, 10)))})
}}
</small>
</span>
@ -179,6 +195,7 @@ import {mapGetters, mapMutations} from "vuex";
import {configureAxios} from "../../shared/forageStore";
import format from "date-fns/format";
export default {
name: "Index",
data() {
@ -189,6 +206,7 @@ export default {
locale: 'en-US',
sortedGroups: [],
fields: [],
fnsLocale: null
}
},
computed: {
@ -196,13 +214,15 @@ export default {
},
created() {
this.locale = localStorage.locale ?? 'en-US';
console.log(this.locale);
this.updateFieldList();
this.downloadBills(1);
},
methods: {
...mapMutations('root', ['refreshCacheKey',]),
formatDate: function (date, frm) {
return format(date, frm);
return format(date, frm, {locale: {code: this.locale}});
},
updateFieldList: function () {
this.fields = [];