mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-03-07 15:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved datetime formatter to utils

Browse Source
This commit is contained in:
Jake Potrebic 2020-08-06 16:46:09 -07:00
parent d8e94d807b
commit 34ad0d6974
No known key found for this signature in database
GPG Key ID: 7C58557EC9C421F8
14 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/minidigger/hangar/util/TemplateHelper.java
View File

@ -38,7 +38,11 @@ public class TemplateHelper {
}
}
public String prettifyDate(OffsetDateTime dateTime) {
public String prettifyDateTime(OffsetDateTime dateTime) {
return DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).format(dateTime);
}
public String prettifyDate(OffsetDateTime dateTime) {
return DateTimeFormatter.ofPattern("dd MM uuuu").format(dateTime);
}
}

4
src/main/resources/templates/projects/admin/flags.ftlh
View File

@ -38,9 +38,9 @@
<tr>
<td>${flag.reportedBy}</td>
<td>${flag.flag.reason.title}, ${flag.flag.comment}</td>
<td>${(flag.flag.createdAt).format("yyyy-MM-dd HH:mm:ss")}</td>
<td>${utils.prettifyDateTime(flag.flag.createdAt)}</td>
<#if flag.flag.isResolved>
<td>${flag.resolvedBy} at ${(flag.flag.resolvedAt).format("yyyy-MM-dd HH:mm:ss")}</td>
<td>${flag.resolvedBy} at ${utils.prettifyDateTime(flag.flag.resolvedAt)}</td>
<#else>
<td>-not resolved-</td>
</#if>

2
src/main/resources/templates/projects/admin/notes.ftlh
View File

@ -43,7 +43,7 @@
<tbody>
<#list notes as note>
<tr>
<td class="note-fixed-with">${note.toDateTime().format("yyyy-MM-dd HH:mm:ss")}</td>
<td class="note-fixed-with">${utils.prettifyDateTime(note.toDateTime())}</td>
<td class="note-fixed-with"><strong>${note.getUser()!"Unknown"}</strong></td>
<td>${markdownService.render(note.getMessage())}</td>
</tr>

2
src/main/resources/templates/projects/pages/view.ftlh
View File

@ -52,7 +52,7 @@ Documentation page within Project overview.
<div class="stats minor">
<p><@spring.messageArgs code="project.category.info" args=[p.project.category.title] /></p>
<p><@spring.messageArgs code="project.publishDate" args=[p.project.createdAt.format("yyyy-MM-dd")] /></p>
<p><@spring.messageArgs code="project.publishDate" args=[utils.prettifyDateTime(p.project.createdAt)] /></p>
<p><span id="view-count"></span> views</p>
<p><span id="star-count"></span> <a href="${routes.getRouteUrl("projects.showStargazers", p.project.ownerName, p.project.slug, "")}">star<#if p.starCount != 1>s</#if></a></p>
<p><span id="watcher-count"></span> <a href="${routes.getRouteUrl("projects.showWatchers", p.project.ownerName, p.project.slug, "")}">watcher<#if p.watcherCount != 1>s</#if></a></p>

4
src/main/resources/templates/projects/versions/view.ftlh
View File

@ -37,7 +37,7 @@
<a href="${routes.getRouteUrl("users.showProjects", v.p.project.ownerName)}">
<strong>${v.p.project.ownerName}</strong>
</a>
released this version on ${utils.prettifyDate(v.v.createdAt)}
released this version on ${utils.prettifyDateTime(v.v.createdAt)}
</p>
<!-- Buttons -->
@ -55,7 +55,7 @@
<#if headerData.globalPerm(Permission.Reviewer)>
<#if v.approvedBy?has_content>
<i class="minor">
<#assign msgArgs=[v.approvedBy, utils.prettifyDate(v.v.approvedAt)] />
<#assign msgArgs=[v.approvedBy, utils.prettifyDateTime(v.v.approvedAt)] />
<@spring.messageArgs "version.approved.info" msgArgs />
</i>
</#if>

4
src/main/resources/templates/users/admin/activity.ftlh
View File

@ -29,7 +29,7 @@
<#if activity.class.simpleName == "ReviewActivity">
<tr>
<td>Review approved</td>
<td>${(activity.endedAt!OffsetDateTime.MIN).format("yyyy-MM-dd HH:mm:ss")}</td>
<td>${utils.prettifyDateTime(activity.endedAt!OffsetDateTime.MIN))}</td>
<td>for:
<a href="${routes.getRouteUrl("reviews.showReviews", activity.getProject().getOwner(), activity.getProject().getSlug(), activity.id)}">
${activity.getProject().getOwner()} / ${activity.getProject().getSlug()}
@ -39,7 +39,7 @@
<#elseif activity.class.simpleName = "FlagActivity">
<tr>
<td>Flag resolved</td>
<td>${(activity.resolvedAt!OffsetDateTime.MIN).format("yyyy-MM-dd HH:mm:ss")}</td>
<td>${utils.prettifyDateTime(activity.resolvedAt!OffsetDateTime.MIN))}</td> <#--TODO: activity end datetime needs to be moved to abstract Activity-->
<td>for:
<a href="${routes.getRouteUrl("projects.show", activity.getProject().getSlug(), activity.getProject().getSlug())}">
${activity.getProject().getOwner()} / ${activity.getProject().getSlug()}

2
src/main/resources/templates/users/admin/flags.ftlh
View File

@ -39,7 +39,7 @@
<span class="minor"> for </span>
<strong>${flag.flag.reason.title}</strong>
<span class="minor"> at </span>
<strong>${(flag.flag.createdAt).format("yyyy-MM-dd HH:mm:ss")}</strong>
<strong>${utils.prettifyDateTime(flag.flag.createdAt)}</strong>
<br><i class="minor">${flag.flag.comment}</i>
</span>
</div>

2
src/main/resources/templates/users/admin/health.ftlh
View File

@ -49,7 +49,7 @@
<div class="panel-body">
<#list erroredJobs as job>
<div class="list-group-item">
Job type: ${job.jobType} Error type: ${job.lastErrorDescriptor} Happened: ${(job.lastUpdated).format("YYYY-mm-dd HH:mm:ss")}
Job type: ${job.jobType} Error type: ${job.lastErrorDescriptor} Happened: ${utils.prettifyDateTime(job.lastUpdated)}
<div class="clearfix"></div>
</div>
</#list>

2
src/main/resources/templates/users/admin/log.ftlh
View File

@ -64,7 +64,7 @@
<#if canViewIP>
<td>${action.address}</td>
</#if>
<td>${action.createdAt.format("yyyy-MM-dd HH:mm:ss")}</td>
<td>${utils.prettifyDateTime(action.createdAt)}</td>
<td>
${action.action.description}
<small class="filter-action">(<a href="${routes.getRouteUrl("showLog", page?string, userFilter, projectFilter, versionFilter, pageFilter, action.action.value, subjectFilter)}">${action.action.value}</a>)</small>

6
src/main/resources/templates/users/admin/queue.ftlh
View File

@ -72,7 +72,7 @@
Unknown
</#if>
<br>
${entry.versionCreatedAt.format("yyyy-MM-dd HH:mm")}
${utils.prettifyDateTime(entry.versionCreatedAt)}
</td>
<td style="text-align: right; max-width: 40px">
<#if entry.unfinished>
@ -149,9 +149,9 @@
</a>
</td>
<td>
<span class="faint">${entry.versionCreatedAt.format("yyyy-MM-dd HH:mm")}</span>
<span class="faint">${utils.prettifyDateTime(entry.versionCreatedAt)}</span>
<span class="minor">${entry.versionString}</span>
<span class="channel" style="background-color: ${entry.channelColor.hex};">${entry.channelName}</span>
<span class="channel" style="background-color: ${entry.channelColor.hex};">${entry.channelName}</span>`
</td>
<td>
<#if entry.versionAuthor??>

12
src/main/resources/templates/users/admin/reviews.ftlh
View File

@ -35,7 +35,7 @@
<a href="${routes.getRouteUrl("users.showProjects", project.project.ownerName)}">
<strong>${project.project.ownerName}</strong>
</a>
released this version on ${utils.prettifyDate(version.v.createdAt)}
released this version on ${utils.prettifyDateTime(version.v.createdAt)}
</p>
<#if !version.v.reviewState.checked>
<div class="pull-right">
@ -102,7 +102,7 @@
<#if reviews?size gt (reviews?size - review?index)>
<#if review.endedAt.toEpochSecond() == reviews?reverse[reviews?size - review?index - 1].endedAt.toEpochSecond()>
<tr>
<td>${utils.prettifyDate(review.endedAt)}</td>
<td>${utils.prettifyDateTime(review.endedAt)}</td>
<td>
<strong>${review.userName!"Unknown"}</strong>
took over from
@ -116,19 +116,19 @@
</tr>
<#else>
<tr>
<td>${utils.prettifyDate(review.endedAt)}</td>
<td>${utils.prettifyDateTime(review.endedAt)}</td>
<td><strong>${review.userName!"Unknown"}</strong> stopped</td>
</tr>
</#if>
<#else>
<#if version.approvedAt??>
<tr>
<td>${utils.prettifyDate(review.endedAt)}</td>
<td>${utils.prettifyDateTime(review.endedAt)}</td>
<td><strong>${review.userName!"Unknown"}</strong> approved</td>
</tr>
<#else>
<tr>
<td>${utils.prettifyDate(review.endedAt)}</td>
<td>${utils.prettifyDateTime(review.endedAt)}</td>
<td>
<strong>${review.userName!"Unknown"}</strong>
stopped
@ -156,7 +156,7 @@
</tr>
</#list>
<tr>
<td>${utils.prettifyDate(review.createdAt)}</td>
<td>${utils.prettifyDateTime(review.createdAt)}</td>
<td><strong>${review.userName!"Unknown"}</strong> started a review</td>
</tr>
</#list>

2
src/main/resources/templates/users/authors.ftlh
View File

@ -88,7 +88,7 @@
</span>
</#if>
</td>
<td>${(author.joinDate!author.createdAt).format("yyyy-MM-dd")}</td>
<td>${utils.prettifyDate(author.joinDate!author.createdAt)}</td>
<td>${author.count}</td>
</tr>
</#list>

2
src/main/resources/templates/users/staff.ftlh
View File

@ -58,7 +58,7 @@
${staffUser.role.title}
</span>
</td>
<td>${(staffUser.joinDate!staffUser.createdAt).format("yyyy-MM-dd")}</td>
<td>${utils.prettifyDate(staffUser.joinDate!staffUser.createdAt)}</td>
</tr>
</#list>
<#-- @ftlvariable name="page" type="java.lang.Integer" -->

2
src/main/resources/templates/users/view.ftlh
View File

@ -125,7 +125,7 @@
<div class="user-info">
<i class="minor">${u.projectCount}&nbsp;<#if u.projectCount == 1>project<#else>projects</#if></i><br/>
<i class="minor">
<@spring.messageArgs code="user.memberSince" args=[(u.user.joinDate!u.user.createdAt).format("yyyy-MM-dd")] />
<@spring.messageArgs code="user.memberSince" args=[utils.prettifyDate(u.user.joinDate!u.user.createdAt)] />
</i><br/>
<a href="https://papermc.io/forums/users/${u.user.name}">
<@spring.message "user.viewOnForums" /> <i class="fas fa-external-link-alt"></i>