Merge pull request #44 from cinderblockgames/master

greeter.tsx fixes
This commit is contained in:
Bastian Meissner 2021-11-18 17:46:44 +01:00 committed by GitHub
commit be93940a50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 5 deletions

View file

@ -70,11 +70,11 @@ export const getGreeting = (greetings: Array<IGreetingProps>): string => {
export const getExtension = (day: number) => {
let extension = "th";
if (day % 10 === 1) {
if (day % 10 === 1 && day !== 11) {
extension = "st";
} else if (day % 10 === 2) {
} else if (day % 10 === 2 && day !== 12) {
extension = "nd";
} else if (day % 10 === 3) {
} else if (day % 10 === 3 && day !== 13) {
extension = "rd";
}
@ -93,9 +93,9 @@ export const getDateString = (
) => {
let currentDate = new Date();
let weekday = weekdays[currentDate.getUTCDay()];
let weekday = weekdays[currentDate.getDay()];
let day = currentDate.getDate();
let month = months[currentDate.getUTCMonth()];
let month = months[currentDate.getMonth()];
let extension = getExtension(day);
let year = currentDate.getFullYear();
let isodate = currentDate.toISOString().slice(0,10);