Ryan/Reactive-Resume
1
0
Fork 0
mirror of https://github.com/AmruthPillai/Reactive-Resume.git synced 2025-11-13 16:22:59 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(client): show "present" string if end date is not entered, also add to i18n locales

Browse Source 
fix #653
This commit is contained in:
Amruth Pillai
2022-03-12 12:49:11 +01:00
parent 799f20823e
commit b5cd6c412b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/utils/date.ts
View File

@ -2,6 +2,7 @@ import { DateRange } from '@reactive-resume/schema';
import dayjs from 'dayjs';
import isEmpty from 'lodash/isEmpty';
import isString from 'lodash/isString';
import { i18n } from 'next-i18next';
export const dateFormatOptions: string[] = [
'MMMM DD, YYYY',
@ -21,6 +22,8 @@ export const dateFormatOptions: string[] = [
export const getRelativeTime = (timestamp: dayjs.ConfigType): string => dayjs(timestamp).toNow(true);
export const formatDateString = (date: string | DateRange, formatStr: string): string | null => {
const presentString = i18n?.t('common.date.present') ?? '';
if (isEmpty(date)) return null;
// If `date` is a string
@ -39,5 +42,5 @@ export const formatDateString = (date: string | DateRange, formatStr: string): s
return `${dayjs(date.start).format(formatStr)} - ${dayjs(date.end).format(formatStr)}`;
}
return dayjs(date.start).format(formatStr);
return `${dayjs(date.start).format(formatStr)} - ${presentString}`;
};