ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fulfill Mogges suggestions

Browse Source 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
This commit is contained in:
Wolfgang Huß 2023-06-07 20:10:10 +02:00
parent 438f8c101a
commit 9ee47c1362
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webapp/components/DateTimeRange/DateTimeRange.vue
View File

@ -8,11 +8,12 @@
<div>
<base-icon name="clock" data-test="calendar" />
{{
getStartTimeString + (this.endDateAsDate && isSameDay ? '&mdash;' + getEndTimeString : '')
getStartTimeString +
(this.endDateAsDate && isSameDayLocal ? '&mdash;' + getEndTimeString : '')
}}
</div>
</div>
<template v-if="!isSameDay">
<template v-if="!isSameDayLocal">
&nbsp;&mdash;&nbsp;
<div>
<div>
@ -61,27 +62,31 @@ export default {
endDateAsDate() {
return this.endDate ? new Date(this.endDate) : null
},
isSameDay() {
isSameDayLocal() {
return !this.endDateAsDate || isSameDay(this.endDateAsDate, this.startDateAsDate)
},
isSameYear() {
isSameYearLocal() {
return !this.endDateAsDate || isSameYear(this.endDateAsDate, this.startDateAsDate)
},
getStartDateString() {
let startDateFormat = 'dd.MM.yyyy'
if (!this.isSameDay && this.isSameYear) {
startDateFormat = 'dd.MM.'
let startDateFormat = this.$t('components.dateTimeRange.yearMonthDay')
if (!this.isSameDayLocal && this.isSameYearLocal) {
startDateFormat = this.$t('components.dateTimeRange.monthDay')
}
return format(this.startDateAsDate, startDateFormat)
},
getStartTimeString() {
return format(new Date(this.startDate), 'HH:mm')
return format(new Date(this.startDate), this.$t('components.dateTimeRange.hourMinute'))
},
getEndDateString() {
return this.endDate ? format(new Date(this.endDate), 'dd.MM.yyyy') : ''
return this.endDate
? format(new Date(this.endDate), this.$t('components.dateTimeRange.yearMonthDay'))
: ''
},
getEndTimeString() {
return this.endDate ? format(new Date(this.endDate), 'HH:mm') : ''
return this.endDate
? format(new Date(this.endDate), this.$t('components.dateTimeRange.hourMinute'))
: ''
},
},
}

5
webapp/locales/de.json
View File

@ -124,6 +124,11 @@
"versus": "Versus"
},
"components": {
"dateTimeRange": {
"hourMinute": "HH:mm",
"monthDay": "dd.MM.",
"yearMonthDay": "dd.MM.yyyy"
},
"password-reset": {
"change-password": {
"error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",

5
webapp/locales/en.json
View File

@ -124,6 +124,11 @@
"versus": "Versus"
},
"components": {
"dateTimeRange": {
"hourMinute": "HH:mm",
"monthDay": "MM/dd/",
"yearMonthDay": "MM/dd/yyyy"
},
"password-reset": {
"change-password": {
"error": "Changing your password failed. Maybe the security code was not correct?",