Merge pull request #526 from mrkm4ntr/datetime-format

(ref #519) Change datetime formats
2025-11-08 22:45:51 +01:00 · 2014-11-01 03:10:18 +09:00
parent dbde79d2f2 5b875d7c73
commit 15d0c5b506
21 changed files with 83 additions and 32 deletions
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -1,5 +1,5 @@
 package view
-import java.util.{Date, TimeZone}
+import java.util.{Locale, Date, TimeZone}
 import java.text.SimpleDateFormat
 import play.twirl.api.Html
 import util.StringUtil
@@ -15,6 +15,47 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   */
  def datetime(date: Date): String = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)

+  val timeUnits = List(
+    (1000L, "second"),
+    (1000L * 60, "minute"),
+    (1000L * 60 * 60, "hour"),
+    (1000L * 60 * 60 * 24, "day"),
+    (1000L * 60 * 60 * 24 * 30, "month"),
+    (1000L * 60 * 60 * 24 * 365, "year")
+  ).reverse
+
+  /**
+   * Format java.util.Date to "x {seconds/minutes/hours/days/months/years} ago"
+   */
+  def datetimeAgo(date: Date): String = {
+    val duration = new Date().getTime - date.getTime
+    timeUnits.find(tuple => duration / tuple._1 > 0) match {
+      case Some((unitValue, unitString)) =>
+        val value = duration / unitValue
+        s"${value} ${unitString}${if (value > 1) "s" else ""} ago"
+      case None => "just now"
+    }
+  }
+
+  /**
+   *
+   * Format java.util.Date to "x {seconds/minutes/hours/days} ago"
+   * If duration over 1 month, format to "d MMM (yyyy)"
+   *
+   */
+  def datetimeAgoRecentOnly(date: Date): String = {
+    val duration = new Date().getTime - date.getTime
+    timeUnits.find(tuple => duration / tuple._1 > 0) match {
+      case Some((_, "month")) => s"on ${new SimpleDateFormat("d MMM", Locale.ENGLISH).format(date)}"
+      case Some((_, "year")) => s"on ${new SimpleDateFormat("d MMM yyyy", Locale.ENGLISH).format(date)}"
+      case Some((unitValue, unitString)) =>
+        val value = duration / unitValue
+        s"${value} ${unitString}${if (value > 1) "s" else ""} ago"
+      case None => "just now"
+    }
+  }
+
+
  /**
   * Format java.util.Date to "yyyy-MM-dd'T'hh:mm:ss'Z'".
   */
--- a/src/main/twirl/account/repositories.scala.html
+++ b/src/main/twirl/account/repositories.scala.html
@@ -25,7 +25,7 @@
          @if(repository.repository.description.isDefined){
            <div>@repository.repository.description</div>
          }
-          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
+          <div><span class="muted small">Updated @helper.html.datetimeago(repository.repository.lastActivityDate)</span></div>
        </div>
      </div>
    }
--- a/src/main/twirl/dashboard/issueslist.scala.html
+++ b/src/main/twirl/dashboard/issueslist.scala.html
@@ -165,7 +165,7 @@
                #@issue.issueId
              </span>
              <div class="small muted" style="margin-left: 20px;">
-                Opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)&nbsp;
+                Opened by @user(issue.openedUserName, styleClass="username") @helper.html.datetimeago(issue.registeredDate)&nbsp;
                @if(commentCount > 0){
                  <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
                }
--- a/src/main/twirl/dashboard/pullslist.scala.html
+++ b/src/main/twirl/dashboard/pullslist.scala.html
@@ -86,7 +86,7 @@
            }
          </div>
        <div class="small muted" style="margin-left: 20px;">
-          @avatarLink(issue.openedUserName, 20) by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)&nbsp;
+          @avatarLink(issue.openedUserName, 20) by @user(issue.openedUserName, styleClass="username") @helper.html.datetimeago(issue.registeredDate)&nbsp;
          @if(commentCount > 0){
            <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
          }
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -62,7 +62,7 @@
@detailActivity(activity: model.Activity, image: String) = {
  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
  <div class="activity-content">
-    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
    <div class="strong">
      @avatar(activity.activityUserName, 16)
      @activityMessage(activity.message)
@@ -76,7 +76,7 @@
@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
  <div class="activity-content">
-    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
    <div class="strong">
      @avatar(activity.activityUserName, 16)
      @activityMessage(activity.message)
@@ -91,7 +91,7 @@
    <div>
      @avatar(activity.activityUserName, 16)
      @activityMessage(activity.message)
-      <span class="muted small">@datetime(activity.activityDate)</span>
+      <span class="muted small">@helper.html.datetimeago(activity.activityDate)</span>
    </div>
  </div>
 }
--- a/src/main/twirl/helper/datetimeago.scala.html
+++ b/src/main/twirl/helper/datetimeago.scala.html
@@ -0,0 +1,10 @@
+@(latestUpdatedDate: java.util.Date,
+  recentOnly: Boolean = true)
+@import view.helpers._
+<span data-toggle="tooltip" title="@datetime(latestUpdatedDate)">
+  @if(recentOnly){
+    @datetimeAgoRecentOnly(latestUpdatedDate)
+  }else{
+    @datetimeAgo(latestUpdatedDate)
+  }
+</span>
--- a/src/main/twirl/issues/commentlist.scala.html
+++ b/src/main/twirl/issues/commentlist.scala.html
@@ -8,7 +8,7 @@
 <div class="issue-avatar-image">@avatar(issue.openedUserName, 48)</div>
 <div class="box issue-comment-box">
  <div class="box-header-small">
-    @user(issue.openedUserName, styleClass="username strong") <span class="muted">commented on @datetime(issue.registeredDate)</span>
+    @user(issue.openedUserName, styleClass="username strong") <span class="muted">commented @helper.html.datetimeago(issue.registeredDate)</span>
    <span class="pull-right">
      @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
        <a href="#" data-issue-id="@issue.issueId"><i class="icon-pencil"></i></a>
@@ -32,7 +32,7 @@
          } else {
            @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request }
          }
-          on @datetime(comment.registeredDate)
+          @helper.html.datetimeago(comment.registeredDate)
        </span>
        <span class="pull-right">
          @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" &&
@@ -70,7 +70,7 @@
      } else {
        <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span> to <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span>
      }
-      @datetime(comment.registeredDate)
+      @helper.html.datetimeago(comment.registeredDate)
    </div>
  }
  @if(comment.action == "close" || comment.action == "close_comment"){
@@ -78,9 +78,9 @@
      <span class="label label-important">Closed</span>
      @avatar(comment.commentedUserName, 20)
      @if(issue.isPullRequest){
-        @user(comment.commentedUserName, styleClass="username strong") closed the pull request @datetime(comment.registeredDate)
+        @user(comment.commentedUserName, styleClass="username strong") closed the pull request @helper.html.datetimeago(comment.registeredDate)
      } else {
-        @user(comment.commentedUserName, styleClass="username strong") closed the issue @datetime(comment.registeredDate)
+        @user(comment.commentedUserName, styleClass="username strong") closed the issue @helper.html.datetimeago(comment.registeredDate)
      }
    </div>
  }
@@ -88,14 +88,14 @@
    <div class="small issue-comment-action">
      <span class="label label-success">Reopened</span>
      @avatar(comment.commentedUserName, 20)
-      @user(comment.commentedUserName, styleClass="username strong") reopened the issue @datetime(comment.registeredDate)
+      @user(comment.commentedUserName, styleClass="username strong") reopened the issue @helper.html.datetimeago(comment.registeredDate)
    </div>
  }
  @if(comment.action == "delete_branch"){
    <div class="small issue-comment-action">
      <span class="label">Deleted</span>
      @avatar(comment.commentedUserName, 20)
-      @user(comment.commentedUserName, styleClass="username strong") deleted the <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> branch @datetime(comment.registeredDate)
+      @user(comment.commentedUserName, styleClass="username strong") deleted the <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> branch @helper.html.datetimeago(comment.registeredDate)
    </div>
  }
 }
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -28,7 +28,7 @@
          <span class="label label-success issue-status">Open</span>
        }
        <span class="muted">
-          @user(issue.openedUserName, styleClass="username strong") opened this issue on @datetime(issue.registeredDate) - @defining(
+          @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
            comments.filter( _.action.contains("comment") ).size
          ){ count =>
            @count @plural(count, "comment")
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -203,7 +203,7 @@
          }
        </span>
        <div class="small muted" style="margin-left: 40px; margin-top: 5px;">
-          #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
+          #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
          @milestone.map { milestone =>
            <span style="margin: 20px;"><a href="@condition.copy(milestoneId = Some(Some(1))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
          }
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -34,7 +34,7 @@
                <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a>
                <div style="margin-top: 6px">
                  @if(milestone.closedDate.isDefined){
-                    <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
+                    <span class="muted">Closed @helper.html.datetimeago(milestone.closedDate.get)</span>
                  } else {
                    @milestone.dueDate.map { dueDate =>
                      @if(isPast(dueDate)){
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -20,7 +20,7 @@
            <span class="label label-info">Merged</span>
            @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
            into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-            at @datetime(comment.registeredDate)
+            @helper.html.datetimeago(comment.registeredDate)
          }.getOrElse {
            <span class="label label-important">Closed</span>
            @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -34,7 +34,7 @@
          <div class="pull-left">
            @avatar(latestCommit, 20)
            @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
-            <span class="muted">@datetime(latestCommit.commitTime)</span>
+            <span class="muted">@helper.html.datetimeago(latestCommit.commitTime)</span>
            <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
          </div>
          <div class="btn-group pull-right">
--- a/src/main/twirl/repo/branches.scala.html
+++ b/src/main/twirl/repo/branches.scala.html
@@ -22,7 +22,7 @@
            }
          </td>
          <td>
-            @datetime(latestUpdateDate)
+            @helper.html.datetimeago(latestUpdateDate, false)
          </td>
          <td>
            @if(repository.repository.defaultBranch == branchName){
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -68,13 +68,13 @@
            <div class="author">
              @avatar(commit, 20)
              <span>@user(commit.authorName, commit.authorEmailAddress, "username strong")</span>
-              <span class="muted">authored on @datetime(commit.authorTime)</span>
+              <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
            </div>
            @if(commit.isDifferentFromAuthor) {
            <div class="committer">
              <span class="icon-arrow-right"></span>
              <span>@user(commit.committerName, commit.committerEmailAddress, "username strong")</span>
-              <span class="muted"> committed on @datetime(commit.commitTime)</span>
+              <span class="muted"> committed @helper.html.datetimeago(commit.commitTime)</span>
            </div>
            }
          </div>
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -58,11 +58,11 @@
                }
                <div class="small">
                  @user(commit.authorName, commit.authorEmailAddress, "username")
-                  <span class="muted">authored @datetime(commit.authorTime)</span>
+                  <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
                  @if(commit.isDifferentFromAuthor) {
                    <span class="icon-arrow-right" style="margin-top : -2px ;"></span>
                    @user(commit.committerName, commit.committerEmailAddress, "username")
-                    <span class="muted">committed @datetime(commit.authorTime)</span>
+                    <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
                  }
                </div>
              </div>
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -47,13 +47,13 @@
              <div class="author">
                @avatar(latestCommit, 20)
                <span>@user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")</span>
-                <span class="muted"> authored on @datetime(latestCommit.authorTime)</span>
+                <span class="muted"> authored @helper.html.datetimeago(latestCommit.authorTime)</span>
              </div>
              @if(latestCommit.isDifferentFromAuthor) {
              <div class="committer">
                <span class="icon-arrow-right"></span>
                <span>@user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong")</span>
-                <span class="muted"> committed on @datetime(latestCommit.commitTime)</span>
+                <span class="muted"> committed @helper.html.datetimeago(latestCommit.commitTime)</span>
              </div>
              }
            </div>
@@ -106,7 +106,7 @@
          <a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a>
          [@user(file.author, file.mailAddress)]
        </td>
-        <td style="text-align: right;">@datetime(file.time)</td>
+        <td style="text-align: right;">@helper.html.datetimeago(file.time, false)</td>
      </tr>
      }
    </table>
--- a/src/main/twirl/repo/tags.scala.html
+++ b/src/main/twirl/repo/tags.scala.html
@@ -14,7 +14,7 @@
      @repository.tags.reverse.map { tag =>
        <tr>
          <td><a href="@url(repository)/tree/@encodeRefName(tag.name)">@tag.name</a></td>
-          <td>@datetime(tag.time)</td>
+          <td>@helper.html.datetimeago(tag.time, false)</td>
          <td class="monospace"><a href="@url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
          <td>
              <a href="@url(repository)/archive/@{encodeRefName(tag.name)}.zip">ZIP</a>
--- a/src/main/twirl/search/code.scala.html
+++ b/src/main/twirl/search/code.scala.html
@@ -16,7 +16,7 @@
    @files.drop((page - 1) * CodeLimit).take(CodeLimit).map { file =>
      <div>
        <h5><a href="@url(repository)/blob/@repository.repository.defaultBranch/@file.path">@file.path</a></h5>
-        <div class="small muted">Latest commit at @datetime(file.lastModified)</div>
+        <div class="small muted">Last commited @helper.html.datetimeago(file.lastModified)</div>
        <pre class="prettyprint linenums:@file.highlightLineNumber" style="padding-left: 25px;">@Html(file.highlightText)</pre>
      </div>
    }
--- a/src/main/twirl/search/issues.scala.html
+++ b/src/main/twirl/search/issues.scala.html
@@ -22,7 +22,7 @@
        }
        <div class="small muted">
          Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a>
-          at @datetime(issue.registeredDate)
+          @helper.html.datetimeago(issue.registeredDate)
          @if(issue.commentCount > 0){
            &nbsp;&nbsp;<i class="icon-comment"></i><span class="strong">@issue.commentCount</span> @plural(issue.commentCount, "comment")
          }
--- a/src/main/twirl/wiki/history.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -36,7 +36,7 @@
          <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
          <td>@avatar(commit, 20)&nbsp;@user(commit.authorName, commit.authorEmailAddress)</td>
          <td width="80%">
-            <span class="muted">@datetime(commit.authorTime):</span>&nbsp;@commit.shortMessage
+            <span class="muted">@helper.html.datetimeago(commit.authorTime):</span>&nbsp;@commit.shortMessage
          </td>
        </tr>
      }
--- a/src/main/twirl/wiki/page.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -12,7 +12,7 @@
      <li>
        <h1 class="wiki-title">@pageName</h1>
        <div class="small">
-          <span class="muted"><strong>@page.committer</strong> edited this page at @datetime(page.time)</span>
+          <span class="muted"><strong>@page.committer</strong> edited this page @helper.html.datetimeago(page.time)</span>
        </div>
      </li>
      <li class="pull-right">