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:
@@ -6,19 +6,19 @@ import { general as labels } from '../../i18n/en/cycle-day'
|
|||||||
export default function (date) {
|
export default function (date) {
|
||||||
const today = LocalDate.now()
|
const today = LocalDate.now()
|
||||||
const dateToDisplay = LocalDate.parse(date)
|
const dateToDisplay = LocalDate.parse(date)
|
||||||
return today.equals(dateToDisplay) ?
|
return today.equals(dateToDisplay)
|
||||||
labels.today :
|
? labels.today
|
||||||
moment(date).format('MMMM Do YYYY')
|
: moment(date).format('MMMM Do YYYY')
|
||||||
}
|
}
|
||||||
|
|
||||||
export function formatDateForShortText (date) {
|
export function formatDateForShortText(date) {
|
||||||
return moment(date.toString()).format('dddd, MMMM Do')
|
return moment(date.toString()).format('dddd, MMMM Do')
|
||||||
}
|
}
|
||||||
|
|
||||||
export function dateToTitle(dateString) {
|
export function dateToTitle(dateString) {
|
||||||
const today = LocalDate.now()
|
const today = LocalDate.now()
|
||||||
const dateToDisplay = LocalDate.parse(dateString)
|
const dateToDisplay = LocalDate.parse(dateString)
|
||||||
return today.equals(dateToDisplay) ?
|
return today.equals(dateToDisplay)
|
||||||
labels.today :
|
? labels.today
|
||||||
moment(dateString).format('dddd, Do MMM YYYY')
|
: moment(dateString).format('ddd DD. MMM YY')
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user