Timeline: fix date formatting

diff --git a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
index 49ec499..28ddd8b 100644 (file)
--- a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
@@ -401,7 +401,7 @@ sub _format_timestamp {
         return $dt->strftime('%Y-%m-%dT%H:%M:%S+00:00');
     }
     elsif ($format eq "user" && $user) {
-        return $dt->strftime($user->{config}->{time_format});
+        return $dt->strftime($user->{config}->{ui}->{time_format});
     }
     elsif ($format eq "ja") {
         $dt->set_time_zone('UTC');

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Timeline.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Timeline.pm
index 6499864..76a309c 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Timeline.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Timeline.pm
@@ -247,6 +247,8 @@ sub get {
         $item->{icon_url} = _get_primary_topic_icon_url($c, $item);
         $item->{content_url} = _content_url($c, $item);
         $item->{tagmoderation} = "";
+        $item->{formated_timestamp} = $c->format_timestamp(user => $user,
+                                                           mysql => $item->{create_time});
 
         # create index
         if ($item->{globjid}) {

diff --git a/src/newslash_web/public/js/newslash.js b/src/newslash_web/public/js/newslash.js
index 23144e4..dd479d5 100644 (file)
--- a/src/newslash_web/public/js/newslash.js
+++ b/src/newslash_web/public/js/newslash.js
@@ -40,7 +40,7 @@ function _initNewslash() {
     path += day.length > 1 ? ("/" + day) : ("/0" + day);
     return path + "/";
   };
-  
+
   /* base get.post API */
   Newslash.prototype.get = function (path) {
     var url = this.baseUrl + path;

diff --git a/src/newslash_web/templates/common/components/timeline.html.tt2 b/src/newslash_web/templates/common/components/timeline.html.tt2
index c8f606f..ea12725 100644 (file)
--- a/src/newslash_web/templates/common/components/timeline.html.tt2
+++ b/src/newslash_web/templates/common/components/timeline.html.tt2
@@ -67,7 +67,7 @@
         <span class="author">
           by <a :href="'/~' + item.author + '/'" v-text="item.author"></a>
         </span>
-        <span class="create-time" v-text="item.create_time"></span>
+        <span class="create-time" v-text="item.formated_timestamp"></span>
 
         [%- IF user.is_admin %]
         <span class="score">