[gitg] Show commit author's time and zone in commit log and diff view
- From: Sindhu S <sindhus src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Show commit author's time and zone in commit log and diff view
- Date: Tue, 23 Apr 2013 11:00:22 +0000 (UTC)
commit 6eb08ef0395620b98175d571dc990e4c55ed5451
Author: Sindhu S <sindhus live in>
Date: Tue Apr 23 12:04:38 2013 +0530
Show commit author's time and zone in commit log and diff view
Remove obsolete code.
libgitg-gtk/gitg-gtk-diff-view-request-diff.vala | 2 +-
libgitg-gtk/resources/diff-view.js | 45 +---------------------
libgitg/gitg-commit.vala | 8 ++--
3 files changed, 6 insertions(+), 49 deletions(-)
---
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
b/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
index 5ede62a..238ddfc 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
+++ b/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
@@ -192,7 +192,7 @@ namespace GitgGtk
builder.add_string_value(Checksum.compute_for_string(ChecksumType.MD5,
sig.get_email().down()));
builder.set_member_name("time");
- builder.add_int_value(sig.get_time().to_unix());
+ builder.add_string_value(sig.get_time().to_timezone(sig.get_time_zone()).format("%x
%X %z"));
builder.end_object();
}
diff --git a/libgitg-gtk/resources/diff-view.js b/libgitg-gtk/resources/diff-view.js
index 027f9bd..d990685 100644
--- a/libgitg-gtk/resources/diff-view.js
+++ b/libgitg-gtk/resources/diff-view.js
@@ -200,47 +200,6 @@ function update_diff(id)
r.send();
}
-function date_to_string(d)
-{
- var t = ((new Date()).getTime() - d.getTime()) / 1000.0;
-
- if (t < 1)
- {
- return "Less than a second ago";
- }
- else if (t < 60)
- {
- return "Less than a minute ago";
- }
- else if (t < 600)
- {
- return "Less than 10 minutes ago";
- }
- else if (t < 1800)
- {
- return "Half an hour ago";
- }
- else if (t < 3600)
- {
- return "An hour ago";
- }
- else if (t < 3600 * 12)
- {
- var tt = Math.round(t / 3600)
- return tt + " hours ago";
- }
- else if (t < 3600 * 24)
- {
- return "A day ago";
- }
- else if (t < 3600 * 24 * 6)
- {
- return Math.round(t / (3600 * 24)) + " days ago";
- }
-
- return d.toLocaleString();
-}
-
addEventListener('DOMContentLoaded', function () {
create_template("commit", {
'.author': function () {
@@ -250,9 +209,7 @@ addEventListener('DOMContentLoaded', function () {
return {html: $('<span/>').append(name).append(' <').append(a).append('>')};
},
'.date': function () {
- var d = new Date();
- d.setTime(this.author.time * 1000);
- return {text: date_to_string(d)};
+ return {text: this.author.time};
},
'.subject': function () {
return this.subject;
diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
index 187d9ea..c2360ea 100644
--- a/libgitg/gitg-commit.vala
+++ b/libgitg/gitg-commit.vala
@@ -93,7 +93,7 @@ public class Commit : Ggit.Commit
}
}
- private string date_for_display(DateTime dt)
+ private string date_for_display(DateTime dt, TimeZone timeZone)
{
var t = (new DateTime.now_local()).to_unix() - dt.to_unix();
@@ -130,14 +130,14 @@ public class Commit : Ggit.Commit
return "%d days ago".printf((int)Math.round(t / (3600 * 24)));
}
- return dt.format("%c");
+ return dt.to_timezone(timeZone).format("%x %X %z");
}
public string committer_date_for_display
{
owned get
{
- return date_for_display(get_committer().get_time());
+ return date_for_display(get_committer().get_time(), get_committer().get_time_zone());
}
}
@@ -145,7 +145,7 @@ public class Commit : Ggit.Commit
{
owned get
{
- return date_for_display(get_author().get_time());
+ return date_for_display(get_author().get_time(), get_author().get_time_zone());
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]