# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-03-09 11:15:56
# Node ID 0e2fda16c0e2641d5e1ceee513347511187a302b
# Parent  c84f21f323170ad60c5dc4ab871d69c7c28159a3
# Parent  67e2bbf8f0864b3a5f9b33f53b46d9146cc7c8e3

Merged with default

diff --git a/boards/static/js/main.js b/boards/static/js/main.js
--- a/boards/static/js/main.js
+++ b/boards/static/js/main.js
@@ -23,6 +23,15 @@
  for the JavaScript code in this page.
  */
 
+var LOCALE = window.navigator.language;
+var FORMATTER = new Intl.DateTimeFormat(
+    LOCALE,
+    {
+        weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
+        hour: 'numeric', minute: '2-digit', second: '2-digit'
+    }
+);
+
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
@@ -40,6 +49,32 @@ function highlightCode(node) {
     });
 }
 
+/**
+ * Translate timestamps to local ones for all <time> tags inside node.
+ */
+function translate_time(node) {
+    var elements;
+
+    if (node === null) {
+        elements = $('time');
+    } else {
+        elements = node.find('time');
+    }
+
+    if (!elements.length) {
+        return;
+    }
+
+    elements.each(function() {
+        var element = $(this);
+        var dateAttr = element.attr('datetime');
+        if (dateAttr) {
+            var date = new Date(dateAttr);
+            element.text(FORMATTER.format(date));
+        }
+    });
+}
+
 $( document ).ready(function() {
     hideEmailFromForm();
 
@@ -53,4 +88,6 @@ function highlightCode(node) {
     addRefLinkPreview();
 
     highlightCode($(document));
+
+    translate_time(null);
 });
diff --git a/boards/static/js/refpopup.js b/boards/static/js/refpopup.js
--- a/boards/static/js/refpopup.js
+++ b/boards/static/js/refpopup.js
@@ -52,6 +52,7 @@ function showPostPreview(e) {
 
         highlightCode($(cln));
         addRefLinkPreview(cln);
+        translate_time($(cln));
     };
 
 
diff --git a/boards/static/js/thread_update.js b/boards/static/js/thread_update.js
--- a/boards/static/js/thread_update.js
+++ b/boards/static/js/thread_update.js
@@ -140,7 +140,7 @@ function updatePost(postHtml) {
         showNewPostsTitle(1);
 
         lastUpdate = post.children('.post-info').first()
-            .children('.pub_time').first().text();
+            .children('.pub_time').first().html();
 
         if (bottom) {
             scrollToBottom();
@@ -195,7 +195,8 @@ function updateMetadataPanel(lastUpdate)
 
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
-        lastUpdateField.text(lastUpdate);
+        lastUpdateField.html(lastUpdate);
+        translate_time(lastUpdateField);
         blink(lastUpdateField);
     }
 
@@ -305,6 +306,7 @@ function showAsErrors(form, text) {
 function processNewPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
+    translate_time(post);
     blink(post);
 }
 
diff --git a/boards/templates/boards/post.html b/boards/templates/boards/post.html
--- a/boards/templates/boards/post.html
+++ b/boards/templates/boards/post.html
@@ -18,7 +18,7 @@
        onclick="javascript:addQuickReply('{{ post.id }}'); return false;"
        title="{% trans 'Quote' %}" {% endif %}>({{ post.get_absolute_id }})</a>
     <span class="title">{{ post.title }}</span>
-    <span class="pub_time">{{ post.pub_time|date:'r' }}</span>
+    <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time|date:'r' }}</time></span>
     {% comment %}
         Thread death time needs to be shown only if the thread is alredy archived
         and this is an opening post (thread death time) or a post for popup
@@ -68,7 +68,7 @@
 <div class="message">
     {% autoescape off %}
         {% if truncated %}
-            {{ post.get_text|truncatewords_html:50|truncate_lines:3 }}
+            {{ post.get_text|truncatewords_html:50 }}
         {% else %}
             {{ post.get_text }}
         {% endif %}
diff --git a/boards/templates/boards/posting_general.html b/boards/templates/boards/posting_general.html
--- a/boards/templates/boards/posting_general.html
+++ b/boards/templates/boards/posting_general.html
@@ -127,7 +127,7 @@
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <div class="swappable-form-full">
-            <form enctype="multipart/form-data" method="post"id="form">{% csrf_token %}
+            <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html
--- a/boards/templates/boards/thread.html
+++ b/boards/templates/boards/thread.html
@@ -85,7 +85,7 @@
             <button id="autoupdate">{% trans 'Update' %}</button>
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
-            {% trans 'Last update: ' %}<span id="last-update">{{ thread.last_edit_time|date:'r' }}</span>
+            {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time></span>
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html
--- a/boards/templates/boards/thread_gallery.html
+++ b/boards/templates/boards/thread_gallery.html
@@ -58,7 +58,7 @@
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
             {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
-            {% trans 'Last update: ' %}{{ thread.last_edit_time|date:'r' }}
+            {% trans 'Last update: ' %}<time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time>
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>