Merge pull request #74 from m1x0n/related-time

related-time: Fixed templates
B1naryStudio · Aug 14, 2015 · b7fbc07 · b7fbc07
2 parents e8dd775 + 3ed7e1a
commit b7fbc07
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/public/js/models/related-timestamps-model.js b/public/js/models/related-timestamps-model.js
@@ -3,10 +3,10 @@ define(['app', 'moment'], function(App, moment) {
         App.RelatedTimestampsModel = Backbone.Model.extend({
             attachLocalDates: function () {
                 var updatedRelative = moment.utc(this.get('updated_at')).toDate();
-                this.set('updated_local', moment(updatedRelative).fromNow());
+                this.set('updated_relative', moment(updatedRelative).fromNow());
 
                 var createdRelative = moment.utc(this.get('created_at')).toDate();
-                this.set('created_local', moment(createdRelative).fromNow());
+                this.set('created_relative', moment(createdRelative).fromNow());
             }
         });
     });

diff --git a/public/js/views/templates/answer/single-answer.tpl b/public/js/views/templates/answer/single-answer.tpl
@@ -12,7 +12,7 @@
             <div class="votes"></div>
 
             <!-- Text -->
-            <time>Answered at <%- created_local %></time>
+            <time>Answered <%- created_relative %></time>
             <div class="description"><%= description %></div>
 
             <!-- Comments -->

diff --git a/public/js/views/templates/comment/single-comment.tpl b/public/js/views/templates/comment/single-comment.tpl
@@ -10,7 +10,7 @@
         <div class="col-md-10">
 
             <!-- Text -->
-            <time>Commented at <%- created_local %></time>
+            <time>Commented <%- created_relative %></time>
             <p><%- text %></p>
         </div>
     </div>

diff --git a/public/js/views/templates/question/question-layout.tpl b/public/js/views/templates/question/question-layout.tpl
@@ -14,7 +14,7 @@
         <div class="row">
             <!-- Time, title, folder -->
             <div class="col-md-10">
-                <time>Asked at <%- created_local %></time>
+                <time>Asked <%- created_relative %></time>
                 <h2><%- title %></h2>
                 <div class="folder"><span class="icon glyphicon glyphicon-folder-open"></span> <%- folder.title %></div>
             </div>

diff --git a/public/js/views/templates/question/row.tpl b/public/js/views/templates/question/row.tpl
@@ -10,7 +10,7 @@
         <div class="col-md-10">
             <div class="row">
                 <div class="col-md-10 question-header">
-                    <div class="asked_time">Asked at <%- created_local %></div>
+                    <div class="asked_time">Asked <%- created_relative %></div>
                     <div><a class="question" href="#questions/<%- id %>"><b><%- title %></b></a></div>
                     <div class="folder">
                         <span class="icon glyphicon glyphicon-folder-close" aria-hidden="true"></span>