@@ -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'))
+ : ''
},
},
}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 1ce7d2f61..68472840a 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -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?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f25cc8575..7d49c6e21 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -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?",