Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f7e1d067f4 | |||
| d8d7b500ad |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"version": "1.0.89",
|
"version": "1.0.90",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"version": "1.0.89",
|
"version": "1.0.90",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tanstack/react-query": "^5.0.0",
|
"@tanstack/react-query": "^5.0.0",
|
||||||
"@tiptap/extension-character-count": "^2.26.1",
|
"@tiptap/extension-character-count": "^2.26.1",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.89",
|
"version": "1.0.90",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -4,6 +4,14 @@ import { de, enUS } from 'date-fns/locale';
|
|||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import { publicSettingsService } from '../services/publicSettings.service';
|
import { publicSettingsService } from '../services/publicSettings.service';
|
||||||
|
|
||||||
|
// Convert old date format strings to new date-fns format
|
||||||
|
const convertDateFormat = (format: string): string => {
|
||||||
|
return format
|
||||||
|
.replace(/DD/g, 'dd') // Days: DD -> dd
|
||||||
|
.replace(/YYYY/g, 'yyyy') // Years: YYYY -> yyyy
|
||||||
|
.replace(/YY/g, 'yy'); // Short years: YY -> yy
|
||||||
|
};
|
||||||
|
|
||||||
export const useLocalizedDate = () => {
|
export const useLocalizedDate = () => {
|
||||||
const { i18n } = useTranslation();
|
const { i18n } = useTranslation();
|
||||||
|
|
||||||
@@ -30,6 +38,10 @@ export const useLocalizedDate = () => {
|
|||||||
: settings.general_date_format.format || 'PPP';
|
: settings.general_date_format.format || 'PPP';
|
||||||
}
|
}
|
||||||
dateFormat = dateFormat || 'PPP';
|
dateFormat = dateFormat || 'PPP';
|
||||||
|
|
||||||
|
// Convert old format to new format
|
||||||
|
dateFormat = convertDateFormat(dateFormat);
|
||||||
|
|
||||||
return dateFnsFormat(dateObj, dateFormat, { locale: getLocale() });
|
return dateFnsFormat(dateObj, dateFormat, { locale: getLocale() });
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -43,9 +55,11 @@ export const useLocalizedDate = () => {
|
|||||||
formatDistanceToNow,
|
formatDistanceToNow,
|
||||||
locale: getLocale(),
|
locale: getLocale(),
|
||||||
dateFormat: settings?.general_date_format
|
dateFormat: settings?.general_date_format
|
||||||
? (typeof settings.general_date_format === 'string'
|
? convertDateFormat(
|
||||||
? settings.general_date_format
|
typeof settings.general_date_format === 'string'
|
||||||
: settings.general_date_format.format || 'PPP')
|
? settings.general_date_format
|
||||||
|
: settings.general_date_format.format || 'PPP'
|
||||||
|
)
|
||||||
: 'PPP'
|
: 'PPP'
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user