From b4a1a4bb198080a379add342e778950c46137fd8 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Wed, 17 Mar 2021 22:33:22 +0000 Subject: [PATCH] feat: add some date settings --- src/components/modals/settings/sections/Time.jsx | 7 +++++++ src/components/widgets/time/Date.jsx | 3 ++- src/translations/en-GB.json | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/modals/settings/sections/Time.jsx b/src/components/modals/settings/sections/Time.jsx index 1d8e9eb6..931ac4d8 100644 --- a/src/components/modals/settings/sections/Time.jsx +++ b/src/components/modals/settings/sections/Time.jsx @@ -21,6 +21,7 @@ export default class TimeSettings extends React.PureComponent { componentDidMount() { document.getElementById('dateformat').value = localStorage.getItem('dateFormat'); + document.getElementById('shortformat').value = localStorage.getItem('shortFormat'); document.getElementById('timeType').value = localStorage.getItem('timeType'); } @@ -64,12 +65,18 @@ export default class TimeSettings extends React.PureComponent { {digitalSettings}

{this.props.language.date.title}

+ localStorage.setItem('dateFormat', document.getElementById('dateformat').value)}> + localStorage.setItem('shortFormat', document.getElementById('shortformat').value)}> + + + + ); } diff --git a/src/components/widgets/time/Date.jsx b/src/components/widgets/time/Date.jsx index eccf6618..ac80e165 100644 --- a/src/components/widgets/time/Date.jsx +++ b/src/components/widgets/time/Date.jsx @@ -56,8 +56,9 @@ export default class DateWidget extends React.PureComponent { // Full date const lang = localStorage.getItem('language'); - const day = date.toLocaleDateString(lang, { weekday: 'long' }); const nth = (localStorage.getItem('datenth') === 'true') ? dtf.nth(date.getDate()) : date.getDate(); + + const day = (localStorage.getItem('dayofweek') === 'true') ? date.toLocaleDateString(lang, { weekday: 'long' }) : ''; const month = date.toLocaleDateString(lang, { month: 'long' }); const year = date.getFullYear(); diff --git a/src/translations/en-GB.json b/src/translations/en-GB.json index 688a4036..150b291f 100644 --- a/src/translations/en-GB.json +++ b/src/translations/en-GB.json @@ -55,6 +55,7 @@ "percentage_complete": "Percentage of the Day Complete", "date": { "title": "Date", + "day_of_week": "Day of week", "short_date": "Short Date", "short_format": "Short Format", "short_separator": {