Merge branch '546-bug-cycle-day-title-covers-navigation-on-upper-right-2' into 'master'

Fix: Make date format more compact for cycle day

Closes #546

See merge request bloodyhealth/drip!411
This commit is contained in:
bl00dymarie
2022-07-10 16:46:04 +00:00
+6 -6
View File
@@ -6,9 +6,9 @@ import { general as labels } from '../../i18n/en/cycle-day'
export default function (date) {
const today = LocalDate.now()
const dateToDisplay = LocalDate.parse(date)
return today.equals(dateToDisplay) ?
labels.today :
moment(date).format('MMMM Do YYYY')
return today.equals(dateToDisplay)
? labels.today
: moment(date).format('MMMM Do YYYY')
}
export function formatDateForShortText(date) {
@@ -18,7 +18,7 @@ export function formatDateForShortText (date) {
export function dateToTitle(dateString) {
const today = LocalDate.now()
const dateToDisplay = LocalDate.parse(dateString)
return today.equals(dateToDisplay) ?
labels.today :
moment(dateString).format('dddd, Do MMM YYYY')
return today.equals(dateToDisplay)
? labels.today
: moment(dateString).format('ddd DD. MMM YY')
}