From 54831878e00b78883fb592137d6a3df4cf9b8332 Mon Sep 17 00:00:00 2001
From: Jonathan Jogenfors <jonathan@jogenfors.se>
Date: Wed, 15 Mar 2023 20:39:29 +0100
Subject: [PATCH] Fix storage template extension display (#2002)

* Display correct jpg file extension

* Fix typo in template directory

* Move storage template to correct spelling
---
 .../storage-template-settings.svelte                        | 6 +++---
 .../supported-datetime-panel.svelte                         | 0
 .../supported-variables-panel.svelte                        | 0
 web/src/routes/admin/system-settings/+page.svelte           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename web/src/lib/components/admin-page/settings/{storate-template => storage-template}/storage-template-settings.svelte (98%)
 rename web/src/lib/components/admin-page/settings/{storate-template => storage-template}/supported-datetime-panel.svelte (100%)
 rename web/src/lib/components/admin-page/settings/{storate-template => storage-template}/supported-variables-panel.svelte (100%)

diff --git a/web/src/lib/components/admin-page/settings/storate-template/storage-template-settings.svelte b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/settings/storate-template/storage-template-settings.svelte
rename to web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte
index 929c800959..d1aac9dd29 100644
--- a/web/src/lib/components/admin-page/settings/storate-template/storage-template-settings.svelte
+++ b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte
@@ -57,7 +57,7 @@
 
 		const substitutions: Record<string, string> = {
 			filename: 'IMAGE_56437',
-			ext: 'jpeg',
+			ext: 'jpg',
 			filetype: 'IMG',
 			filetypefull: 'IMAGE'
 		};
@@ -179,7 +179,7 @@
 				>
 					<span class="text-immich-fg/25 dark:text-immich-dark-fg/50"
 						>UPLOAD_LOCATION/{user.id}</span
-					>/{parsedTemplate()}.jpeg
+					>/{parsedTemplate()}.jpg
 				</p>
 
 				<form autocomplete="off" class="flex flex-col" on:submit|preventDefault>
@@ -210,7 +210,7 @@
 							<SettingInputField
 								label="EXTENSION"
 								inputType={SettingInputFieldType.TEXT}
-								value={'.jpeg'}
+								value={'.jpg'}
 								disabled
 							/>
 						</div>
diff --git a/web/src/lib/components/admin-page/settings/storate-template/supported-datetime-panel.svelte b/web/src/lib/components/admin-page/settings/storage-template/supported-datetime-panel.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/storate-template/supported-datetime-panel.svelte
rename to web/src/lib/components/admin-page/settings/storage-template/supported-datetime-panel.svelte
diff --git a/web/src/lib/components/admin-page/settings/storate-template/supported-variables-panel.svelte b/web/src/lib/components/admin-page/settings/storage-template/supported-variables-panel.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/storate-template/supported-variables-panel.svelte
rename to web/src/lib/components/admin-page/settings/storage-template/supported-variables-panel.svelte
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index 023887ae03..ef47a9bde3 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -4,7 +4,7 @@
 	import OAuthSettings from '$lib/components/admin-page/settings/oauth/oauth-settings.svelte';
 	import PasswordLoginSettings from '$lib/components/admin-page/settings/password-login/password-login-settings.svelte';
 	import SettingAccordion from '$lib/components/admin-page/settings/setting-accordion.svelte';
-	import StorageTemplateSettings from '$lib/components/admin-page/settings/storate-template/storage-template-settings.svelte';
+	import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';
 	import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
 	import { api } from '@api';
 	import type { PageData } from './$types';