1
0
mirror of https://github.com/immich-app/immich.git synced 2024-12-25 10:43:13 +02:00

fix(web) fix test (#1059)

This commit is contained in:
Alex 2022-12-04 22:51:22 -06:00 committed by GitHub
parent 5d140145c1
commit 966d99217a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 17 deletions

View File

@ -18,7 +18,7 @@
$: [spaceUsage, spaceUnit] = getBytesWithUnit(stats.usageRaw);
const locale = navigator.languages;
const locale = navigator.language;
</script>
<div class="flex flex-col gap-5">
@ -28,7 +28,7 @@
<div class="flex mt-5 justify-between">
<StatsCard logo={CameraIris} title={'PHOTOS'} value={stats.photos.toString()} />
<StatsCard logo={PlayCircle} title={'VIDEOS'} value={stats.videos.toString()} />
<StatsCard logo={Memory} title={'STORAGE'} value={spaceUsage} unit={spaceUnit} />
<StatsCard logo={Memory} title={'STORAGE'} value={spaceUsage.toString()} unit={spaceUnit} />
</div>
</div>

View File

@ -14,9 +14,11 @@
return user.deletedAt != null;
};
const locale = navigator.languages;
const locale = navigator.language;
const deleteDateFormat: Intl.DateTimeFormatOptions = {
month: 'long', day: 'numeric', year: 'numeric'
month: 'long',
day: 'numeric',
year: 'numeric'
};
const getDeleteDate = (user: UserResponseDto): string => {

View File

@ -54,7 +54,7 @@
imageData = (await loadHighQualityThumbnail(album.albumThumbnailAssetId)) || NO_THUMBNAIL;
});
const locale = navigator.languages;
const locale = navigator.language;
</script>
<div

View File

@ -86,12 +86,12 @@
}
}
const locale = navigator.languages;
const locale = navigator.language;
const albumDateFormat: Intl.DateTimeFormatOptions = {
month: 'short',
day: 'numeric',
year: 'numeric'
};
month: 'short',
day: 'numeric',
year: 'numeric'
};
const getDateRange = () => {
const startDate = new Date(album.assets[0].createdAt);
@ -101,7 +101,9 @@
const endDateString = endDate.toLocaleDateString(locale, albumDateFormat);
// If the start and end date are the same, only show one date
return startDateString === endDateString ? startDateString : `${startDateString} - ${endDateString}`;
return startDateString === endDateString
? startDateString
: `${startDateString} - ${endDateString}`;
};
onMount(async () => {

View File

@ -70,7 +70,7 @@
return undefined;
};
const locale = navigator.languages;
const locale = navigator.language;
</script>
<section class="p-2 dark:bg-immich-dark-bg dark:text-immich-dark-fg">
@ -100,10 +100,21 @@
</div>
<div>
<p>{assetDateTimeOriginal.toLocaleDateString(locale, {month:'short', day:'numeric', year: 'numeric'})}</p>
<p>
{assetDateTimeOriginal.toLocaleDateString(locale, {
month: 'short',
day: 'numeric',
year: 'numeric'
})}
</p>
<div class="flex gap-2 text-sm">
<p>
{assetDateTimeOriginal.toLocaleString(locale, {weekday:'short', hour: 'numeric', minute: '2-digit', timeZoneName:'longOffset'})}
{assetDateTimeOriginal.toLocaleString(locale, {
weekday: 'short',
hour: 'numeric',
minute: '2-digit',
timeZoneName: 'longOffset'
})}
</p>
</div>
</div>

View File

@ -18,7 +18,7 @@
export let bucketHeight: number;
export let isAlbumSelectionMode = false;
const locale = navigator.languages;
const locale = navigator.language;
const groupDateFormat: Intl.DateTimeFormatOptions = {
weekday: 'short',
month: 'short',
@ -114,7 +114,10 @@
bind:clientHeight={actualBucketHeight}
>
{#each assetsGroupByDate as assetsInDateGroup, groupIndex (assetsInDateGroup[0].id)}
{@const dateGroupTitle = new Date(assetsInDateGroup[0].createdAt).toLocaleDateString(locale, groupDateFormat)}
{@const dateGroupTitle = new Date(assetsInDateGroup[0].createdAt).toLocaleDateString(
locale,
groupDateFormat
)}
<!-- Asset Group By Date -->
<div

View File

@ -39,7 +39,7 @@ export function getBytesWithUnit(bytes: number, maxPrecision = 1): [number, stri
* @returns localized bytes with unit as string
*/
export function asByteUnitString(bytes: number, maxPrecision = 1): string {
const locale = Array.from(navigator.languages);
const locale = Array.from(navigator.language);
const [size, unit] = getBytesWithUnit(bytes, maxPrecision);
return `${size.toLocaleString(locale)} ${unit}`;
}