Skip to content

Commit 0fe6202

Browse files
author
Tamas Koos
committed
[Fix] Parse asset date time with location
1 parent 52e85a1 commit 0fe6202

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

internal/templates/partials/metadata.templ

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,25 @@ func AssetDateTime(viewData common.ViewData, assetIndex int, moreInfo bool) stri
181181
assetDateFormat = config.DefaultDateLayout
182182
}
183183

184-
localDateTime := viewData.Assets[assetIndex].ImmichAsset.LocalDateTime
184+
parsedDateTime := viewData.Assets[assetIndex].ImmichAsset.LocalDateTime
185+
timeZone := viewData.Assets[assetIndex].ImmichAsset.ExifInfo.TimeZone
186+
if timeZone != "" {
187+
loc, err := time.LoadLocation(timeZone)
188+
if err == nil {
189+
parsedDateTime = viewData.Assets[assetIndex].ImmichAsset.ExifInfo.DateTimeOriginal.In(loc)
190+
}
191+
}
185192
switch {
186193
case moreInfo || (viewData.ShowImageDate && viewData.ShowImageTime):
187194
assetDate = fmt.Sprintf(
188195
"%s %s",
189-
monday.Format(localDateTime, assetDateFormat, viewData.SystemLang),
190-
localDateTime.Format(assetTimeFormat),
196+
monday.Format(parsedDateTime, assetDateFormat, viewData.SystemLang),
197+
parsedDateTime.Format(assetTimeFormat),
191198
)
192199
case viewData.ShowImageDate:
193-
assetDate = monday.Format(localDateTime, assetDateFormat, viewData.SystemLang)
200+
assetDate = monday.Format(parsedDateTime, assetDateFormat, viewData.SystemLang)
194201
case viewData.ShowImageTime:
195-
assetDate = localDateTime.Format(assetTimeFormat)
202+
assetDate = parsedDateTime.Format(assetTimeFormat)
196203
}
197204

198205
return strings.ToLower(assetDate)

0 commit comments

Comments
 (0)