Fix last sync date
This commit is contained in:
@@ -62,7 +62,7 @@ import ListItemButton from '@mui/material/ListItemButton';
|
|||||||
import { AwaitableComponent } from 'awaitable-component';
|
import { AwaitableComponent } from 'awaitable-component';
|
||||||
import { convertToAutoBackupFlags, getAutoBackupFlagsInfo } from '@/features/backup/Backup.utils.ts';
|
import { convertToAutoBackupFlags, getAutoBackupFlagsInfo } from '@/features/backup/Backup.utils.ts';
|
||||||
import type { BackupFlagInclusionState } from '@/features/backup/Backup.types.ts';
|
import type { BackupFlagInclusionState } from '@/features/backup/Backup.types.ts';
|
||||||
import { epochToDate, getDateString } from '@/base/utils/DateHelper.ts';
|
import { getDateString } from '@/base/utils/DateHelper.ts';
|
||||||
|
|
||||||
const convertSyncDataToBackupFlags = (settings: ServerSettingsType): BackupFlagInclusionState => ({
|
const convertSyncDataToBackupFlags = (settings: ServerSettingsType): BackupFlagInclusionState => ({
|
||||||
includeManga: settings.syncDataManga,
|
includeManga: settings.syncDataManga,
|
||||||
@@ -236,7 +236,8 @@ export const ServerSettings = () => {
|
|||||||
const excludedSyncDataText = syncDataFlagsInfo.false;
|
const excludedSyncDataText = syncDataFlagsInfo.false;
|
||||||
|
|
||||||
const syncStatus = syncStatusRequest.data?.lastSyncStatus;
|
const syncStatus = syncStatusRequest.data?.lastSyncStatus;
|
||||||
const syncDate = syncStatus?.endDate ?? syncStatus?.startDate;
|
const tmpSyncDate = syncStatus?.endDate ?? syncStatus?.startDate;
|
||||||
|
const syncDate = tmpSyncDate ? getDateString(Number(tmpSyncDate), true, true) : undefined;
|
||||||
const syncState = syncStatus?.state;
|
const syncState = syncStatus?.state;
|
||||||
const isSyncing = !!syncState && ![SyncState.Success, SyncState.Error].includes(syncState);
|
const isSyncing = !!syncState && ![SyncState.Success, SyncState.Error].includes(syncState);
|
||||||
|
|
||||||
@@ -771,7 +772,7 @@ export const ServerSettings = () => {
|
|||||||
primary={isSyncing ? t`Sync status` : t`Start sync`}
|
primary={isSyncing ? t`Sync status` : t`Start sync`}
|
||||||
secondary={
|
secondary={
|
||||||
<>
|
<>
|
||||||
{syncDate && t`Last sync: ${getDateString(epochToDate(Number(syncDate)), true, true)}`}{' '}
|
{syncDate && t`Last sync: ${syncDate}`}{' '}
|
||||||
{syncState && t`- State: ${t(SYNC_STATE_TRANSLATION[syncState])}`}
|
{syncState && t`- State: ${t(SYNC_STATE_TRANSLATION[syncState])}`}
|
||||||
{!!syncStatus?.errorMessage && `\nError: ${syncStatus.errorMessage}`}
|
{!!syncStatus?.errorMessage && `\nError: ${syncStatus.errorMessage}`}
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -2194,10 +2194,9 @@ msgstr "Large"
|
|||||||
msgid "Last read chapter"
|
msgid "Last read chapter"
|
||||||
msgstr "Last read chapter"
|
msgstr "Last read chapter"
|
||||||
|
|
||||||
#. placeholder {0}: getDateString(epochToDate(Number(syncDate)), true, true)
|
|
||||||
#: src/features/settings/screens/ServerSettings.tsx
|
#: src/features/settings/screens/ServerSettings.tsx
|
||||||
msgid "Last sync: {0}"
|
msgid "Last sync: {syncDate}"
|
||||||
msgstr "Last sync: {0}"
|
msgstr "Last sync: {syncDate}"
|
||||||
|
|
||||||
#: src/features/updates/screens/Updates.tsx
|
#: src/features/updates/screens/Updates.tsx
|
||||||
msgid "Last update: {date}"
|
msgid "Last update: {date}"
|
||||||
|
|||||||
Reference in New Issue
Block a user