From 1589c597d21fa128b9f6a5bc941e4b6f57581143 Mon Sep 17 00:00:00 2001
From: snlkapil <snlkapil@gmail.com>
Date: Mon, 18 Dec 2017 23:23:03 -0800
Subject: [PATCH] settings: Show local time instead of UTC in invitations tab.

---
 static/js/settings_invites.js | 2 ++
 zerver/lib/actions.py         | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/static/js/settings_invites.js b/static/js/settings_invites.js
index d2218d6391..2f02eaf372 100644
--- a/static/js/settings_invites.js
+++ b/static/js/settings_invites.js
@@ -24,6 +24,7 @@ function populate_invites(invites_data) {
     list_render(invites_table, invites_data.invites, {
         name: "admin_invites_list",
         modifier: function (item) {
+            item.invited = timerender.absolute_time(item.invited * 1000);
             return templates.render("admin_invites_list", { invite: item });
         },
         filter: {
@@ -139,6 +140,7 @@ exports.on_load_success = function (invites_data) {
             success: function (data) {
                 resend_button.text(i18n.t("Sent!"));
                 resend_button.removeClass('resend btn-warning').addClass('sea-green');
+                data.timestamp = timerender.absolute_time(data.timestamp * 1000);
                 meta.current_resend_invite_user_modal_row.find(".invited_at").text(data.timestamp);
             },
         });
diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 29d515ab68..f111a0f0c2 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -4025,7 +4025,7 @@ def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
     for invitee in prereg_users:
         invites.append(dict(email=invitee.email,
                             ref=invitee.referred_by.email,
-                            invited=invitee.invited_at.strftime("%Y-%m-%d %H:%M:%S"),
+                            invited=datetime_to_timestamp(invitee.invited_at),
                             id=invitee.id,
                             invited_as_admin=invitee.invited_as_admin))
 
@@ -4044,7 +4044,7 @@ def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None:
     prereg_user.delete()
     clear_scheduled_invitation_emails(email)
 
-def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> str:
+def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> int:
     check_invite_limit(prereg_user.referred_by, 1)
 
     prereg_user.invited_at = timezone_now()
@@ -4058,7 +4058,7 @@ def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> str:
     event = {"prereg_id": prereg_user.id, "referrer_id": prereg_user.referred_by.id, "email_body": None}
     queue_json_publish("invites", event)
 
-    return prereg_user.invited_at.strftime("%Y-%m-%d %H:%M:%S")
+    return datetime_to_timestamp(prereg_user.invited_at)
 
 def notify_realm_emoji(realm: Realm) -> None:
     event = dict(type="realm_emoji", op="update",