From c48586252f89b72340abf47f0bc97cf5278071bb Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Thu, 12 Apr 2018 18:06:47 +0800
Subject: [PATCH 01/10] [Optimization] Rewrite some code logic and method
 change

    Original updated_diff checking method changed
    From date(new Date(), [format])
    To full_date(new Date(), [format])
    For full datetime checking.

    Also merge some excess if statement.
    References theme-next/hexo-theme-next#223
---
 _config.yml             |  7 +++++--
 layout/_macro/post.swig | 37 +++++++++++++++----------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/_config.yml b/_config.yml
index fc83307c57..6e3caab1f2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -264,8 +264,11 @@ post_meta:
   updated_at: false
   # Only show 'updated' if different from 'created'.
   updated_diff: false
-  # If true, post's time format will be hexo config's date_format + ' ' + time_format.
-  date_time_merge: false
+  # If set this option, the updated_diff will check diff base on this format.
+  # Leave empty will check by both date and time.
+  updated_diff_check_format:
+  # Leave empty will use default hexo date_formt + ' ' + time_format for every post.
+  datetime_format:
   categories: true
 
 # Post wordcount display settings
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 07635aa2d9..d94fd37973 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -73,11 +73,6 @@
 
         <div class="post-meta">
           <span class="post-time">
-            {% if theme.post_meta.date_time_merge %}
-                {% set datetime_format = config.date_format + ' ' + config.time_format %}
-            {% else %}
-                {% set datetime_format = config.date_format %}
-            {% endif %}
 
             {% if theme.post_meta.created_at %}
               <span class="post-meta-item-icon">
@@ -91,27 +86,25 @@
             #}</time>
             {% endif %}
 
-            {% set date_updated_diff = date(post.date, datetime_format) != date(post.updated, datetime_format) %}
+            {% set date_updated_diff = full_date(post.date, theme.post_meta.updated_diff_check_format) != full_date(post.updated, theme.post_meta.updated_diff_check_format) %}
             {% if theme.post_meta.updated_at %}
-              {% if !theme.post_meta.updated_diff || theme.post_meta.updated_diff && date_updated_diff %}
-                {% set display_updated = true %}
-              {% endif %}
-            {% endif %}
+              {% set display_updated = !theme.post_meta.updated_diff || theme.post_meta.updated_diff && date_updated_diff %}
 
-            {% if display_updated or (!theme.post_meta.created_at and theme.post_meta.updated_at) %}
-              {% if theme.post_meta.created_at and theme.post_meta.updated_at %}
-              <span class="post-meta-divider">|</span>
-              {% endif %}
+              {% if display_updated or !theme.post_meta.created_at %}
+                {% if theme.post_meta.created_at and theme.post_meta.updated_at %}
+                <span class="post-meta-divider">|</span>
+                {% endif %}
 
-              <span class="post-meta-item-icon">
-                <i class="fa fa-calendar-check-o"></i>
-              </span>
-              {% if theme.post_meta.item_text %}
-                <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
+                <span class="post-meta-item-icon">
+                  <i class="fa fa-calendar-check-o"></i>
+                </span>
+                {% if theme.post_meta.item_text %}
+                  <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
+                {% endif %}
+                <time title="{{ __('post.modified') }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
+                #}{{ full_date(post.updated, theme.post_meta.datetime_format) }}{#
+              #}</time>
               {% endif %}
-              <time title="{{ __('post.modified') }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
-              #}{{ date(post.updated, datetime_format) }}{#
-            #}</time>
             {% endif %}
           </span>
 

From 4aaa0158ccaab6bef70b5c7e187dc57f8c9c5895 Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Thu, 12 Apr 2018 22:22:05 +0800
Subject: [PATCH 02/10] Add missed method replacement and under line of time

---
 layout/_macro/post.swig                           | 6 +++---
 source/css/_common/components/post/post-meta.styl | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index d94fd37973..02265545d6 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -81,8 +81,8 @@
               {% if theme.post_meta.item_text %}
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
-              <time title="{{ __('post.created') }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
-              #}{{ date(post.date, datetime_format) }}{#
+              <time title="{{ __('post.created') }} {{ full_date(post.date) }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
+              #}{{ full_date(post.date, datetime_format) }}{#
             #}</time>
             {% endif %}
 
@@ -101,7 +101,7 @@
                 {% if theme.post_meta.item_text %}
                   <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
                 {% endif %}
-                <time title="{{ __('post.modified') }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
+                <time title="{{ __('post.modified') }} {{ full_date(post.updated ) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
                 #}{{ full_date(post.updated, theme.post_meta.datetime_format) }}{#
               #}</time>
               {% endif %}
diff --git a/source/css/_common/components/post/post-meta.styl b/source/css/_common/components/post/post-meta.styl
index 13647316c1..770ba60dd0 100644
--- a/source/css/_common/components/post/post-meta.styl
+++ b/source/css/_common/components/post/post-meta.styl
@@ -16,6 +16,10 @@
     font-size: 14px;
     margin-top: 2px;
   }
+
+  time {
+    border-bottom: 1px solid $grey-dark;
+  }
 }
 
 .post-symbolscount {

From f8fad534ea0444db5ed1089e496f25fc4c417650 Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Fri, 13 Apr 2018 12:42:12 +0800
Subject: [PATCH 03/10] Lower digits in meta titile

---
 _config.yml             |  5 -----
 layout/_macro/post.swig | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/_config.yml b/_config.yml
index 6e3caab1f2..258eaa9ce2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -264,11 +264,6 @@ post_meta:
   updated_at: false
   # Only show 'updated' if different from 'created'.
   updated_diff: false
-  # If set this option, the updated_diff will check diff base on this format.
-  # Leave empty will check by both date and time.
-  updated_diff_check_format:
-  # Leave empty will use default hexo date_formt + ' ' + time_format for every post.
-  datetime_format:
   categories: true
 
 # Post wordcount display settings
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 02265545d6..68a0a9eed9 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -74,6 +74,9 @@
         <div class="post-meta">
           <span class="post-time">
 
+            {% set date_diff = date(post.date) != date(post.updated) %}
+            {% set datetime_diff = full_date(post.date) != full_date(post.updated) %}
+
             {% if theme.post_meta.created_at %}
               <span class="post-meta-item-icon">
                 <i class="fa fa-calendar-o"></i>
@@ -81,14 +84,20 @@
               {% if theme.post_meta.item_text %}
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
-              <time title="{{ __('post.created') }} {{ full_date(post.date) }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
-              #}{{ full_date(post.date, datetime_format) }}{#
+
+              {% if !date_diff %}
+                {% set create_title = __('post.created') + ' ' + full_date(post.date) + '/' + __('post.modified') + ' ' + full_date(post.updated) %}
+              {% else %}
+                {% set create_title = full_date(post.date) %}
+              {% endif %}
+
+              <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
+              #}{{ date(post.date) }}{#
             #}</time>
             {% endif %}
 
-            {% set date_updated_diff = full_date(post.date, theme.post_meta.updated_diff_check_format) != full_date(post.updated, theme.post_meta.updated_diff_check_format) %}
-            {% if theme.post_meta.updated_at %}
-              {% set display_updated = !theme.post_meta.updated_diff || theme.post_meta.updated_diff && date_updated_diff %}
+            {% if theme.post_meta.updated_at && date_diff %}
+              {% set display_updated = !theme.post_meta.updated_diff || theme.post_meta.updated_diff && datetime_diff %}
 
               {% if display_updated or !theme.post_meta.created_at %}
                 {% if theme.post_meta.created_at and theme.post_meta.updated_at %}
@@ -101,8 +110,8 @@
                 {% if theme.post_meta.item_text %}
                   <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
                 {% endif %}
-                <time title="{{ __('post.modified') }} {{ full_date(post.updated ) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
-                #}{{ full_date(post.updated, theme.post_meta.datetime_format) }}{#
+                <time title="{{ full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
+                #}{{ date(post.updated) }}{#
               #}</time>
               {% endif %}
             {% endif %}

From 495738aee707cebc7a9253a1482f69bc3696781c Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Fri, 13 Apr 2018 14:41:59 +0800
Subject: [PATCH 04/10] Add missing updated_at field check

---
 layout/_macro/post.swig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 68a0a9eed9..205c4a7def 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -85,7 +85,7 @@
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
 
-              {% if !date_diff %}
+              {% if !date_diff && theme.post_meta.updated_at %}
                 {% set create_title = __('post.created') + ' ' + full_date(post.date) + '/' + __('post.modified') + ' ' + full_date(post.updated) %}
               {% else %}
                 {% set create_title = full_date(post.date) %}

From 44d6307033824b7070f3f6049d2e9fbc5c0526f1 Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Fri, 13 Apr 2018 20:12:09 +0800
Subject: [PATCH 05/10] Adjust time tag's border style

---
 source/css/_common/components/post/post-meta.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/css/_common/components/post/post-meta.styl b/source/css/_common/components/post/post-meta.styl
index 770ba60dd0..baa7ed178a 100644
--- a/source/css/_common/components/post/post-meta.styl
+++ b/source/css/_common/components/post/post-meta.styl
@@ -18,7 +18,7 @@
   }
 
   time {
-    border-bottom: 1px solid $grey-dark;
+    border-bottom: 1px dashed $grey-dark;
   }
 }
 

From f296b2746d2fa1b62a70435949db1b280469ec83 Mon Sep 17 00:00:00 2001
From: "Ivan.Nginx" <ivan.nginx@gmail.com>
Date: Sat, 14 Apr 2018 21:02:56 +0300
Subject: [PATCH 06/10] Added support for hexo-symbols-count-time v0.4.0

1. Modified default settings: AWL = 4; WPM = 275.
2. Added suffix as string parameter if time to read less then 60 minutes. Default: 'mins.'
3. Refactored language translates.
---
 _config.yml                  |  4 ++--
 languages/en.yml             | 11 +++++++----
 layout/_macro/post.swig      | 10 +++++-----
 layout/_partials/footer.swig | 10 +++++-----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/_config.yml b/_config.yml
index 258eaa9ce2..dda7273b36 100644
--- a/_config.yml
+++ b/_config.yml
@@ -272,8 +272,8 @@ symbols_count_time:
   separated_meta: true
   item_text_post: true
   item_text_total: false
-  awl: 5
-  wpm: 200
+  awl: 4
+  wpm: 275
 
 # Manual define the border radius in codeblock
 # Leave it empty for the default 1
diff --git a/languages/en.yml b/languages/en.yml
index 304c6f8d6a..abca306569 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -34,10 +34,6 @@ post:
   toc_empty: This post does not have a Table of Contents
   views: Views
   comments_count: Comments
-  symbols_count: Symbols count in article
-  symbols_time: Reading time
-  total_symbols: Symbols count total
-  total_time: Reading time total
   related_posts: Related Posts
   copyright:
     author: Post author
@@ -107,3 +103,10 @@ accessibility:
   nav_toggle: Toggle navigation bar
   prev_page: Previous page
   next_page: Next page
+
+symbols_count_time:
+  count: Symbols count in article
+  count_total: Symbols count total
+  time: Reading time
+  time_total: Reading time total
+  time_minutes: mins.
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 205c4a7def..bfeafe0373 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -250,9 +250,9 @@
                   <i class="fa fa-file-word-o"></i>
                 </span>
                 {% if theme.symbols_count_time.item_text_post %}
-                  <span class="post-meta-item-text">{{ __('post.symbols_count') + __('symbol.colon') }}</span>
+                  <span class="post-meta-item-text">{{ __('symbols_count_time.count') + __('symbol.colon') }}</span>
                 {% endif %}
-                <span title="{{ __('post.symbols_count') }}">{#
+                <span title="{{ __('symbols_count_time.count') }}">{#
                 #}{{ symbolsCount(post.content) }}{#
               #}</span>
               {% endif %}
@@ -266,10 +266,10 @@
                   <i class="fa fa-clock-o"></i>
                 </span>
                 {% if theme.symbols_count_time.item_text_post %}
-                  <span class="post-meta-item-text">{{ __('post.symbols_time') }}&asymp;</span>
+                  <span class="post-meta-item-text">{{ __('symbols_count_time.time') }} &asymp;</span>
                 {% endif %}
-                <span title="{{ __('post.symbols_time') }}">{#
-                #}{{ symbolsTime(post.content, theme.symbols_count_time.awl, theme.symbols_count_time.wpm) }}{#
+                <span title="{{ __('symbols_count_time.time') }}">{#
+                #}{{ symbolsTime(post.content, theme.symbols_count_time.awl, theme.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}{#
               #}</span>
               {% endif %}
             </div>
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
index 7938eddb00..99e9f359c3 100644
--- a/layout/_partials/footer.swig
+++ b/layout/_partials/footer.swig
@@ -13,9 +13,9 @@
       <i class="fa fa-area-chart"></i>
     </span>
     {% if theme.symbols_count_time.item_text_total %}
-      <span class="post-meta-item-text">{{ __('post.total_symbols') + __('symbol.colon') }}</span>
+      <span class="post-meta-item-text">{{ __('symbols_count_time.count_total') + __('symbol.colon') }}</span>
     {% endif %}
-    <span title="{{ __('post.total_symbols') }}">{#
+    <span title="{{ __('symbols_count_time.count_total') }}">{#
     #}{{ symbolsCountTotal(site) }}{#
   #}</span>
   {% endif %}
@@ -26,10 +26,10 @@
       <i class="fa fa-coffee"></i>
     </span>
     {% if theme.symbols_count_time.item_text_total %}
-      <span class="post-meta-item-text">{{ __('post.total_time') + __('symbol.colon') }}</span>
+      <span class="post-meta-item-text">{{ __('symbols_count_time.time_total')}} &asymp;</span>
     {% endif %}
-    <span title="{{ __('post.total_time') }}">{#
-    #}{{ symbolsTimeTotal(site, theme.symbols_count_time.awl, theme.symbols_count_time.wpm) }}{#
+    <span title="{{ __('symbols_count_time.time_total') }}">{#
+    #}{{ symbolsTimeTotal(site, theme.symbols_count_time.awl, theme.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}{#
   #}</span>
   {% endif %}
 </div>

From a482a37f3ad536b1f43daa8dea3212f45eb83859 Mon Sep 17 00:00:00 2001
From: clode <jackey8616@gmail.com>
Date: Sun, 15 Apr 2018 13:42:21 +0800
Subject: [PATCH 07/10] Add missed judgment in if statement

---
 layout/_macro/post.swig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index bfeafe0373..7a06c573f8 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -75,7 +75,8 @@
           <span class="post-time">
 
             {% set date_diff = date(post.date) != date(post.updated) %}
-            {% set datetime_diff = full_date(post.date) != full_date(post.updated) %}
+            {% set time_diff = time(post.date) != time(post.updated) %}
+            {% set datetime_diff = date_diff or time_diff %}
 
             {% if theme.post_meta.created_at %}
               <span class="post-meta-item-icon">
@@ -85,8 +86,8 @@
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
 
-              {% if !date_diff && theme.post_meta.updated_at %}
-                {% set create_title = __('post.created') + ' ' + full_date(post.date) + '/' + __('post.modified') + ' ' + full_date(post.updated) %}
+              {% if !date_diff && time_diff && theme.post_meta.updated_at %}
+                {% set create_title = __('post.created') + ' ' + full_date(post.date) + ' / ' + __('post.modified') + ' ' + time(post.updated) %}
               {% else %}
                 {% set create_title = full_date(post.date) %}
               {% endif %}

From 67881ee9d2b0ad945493c39af039bfc67e7a6540 Mon Sep 17 00:00:00 2001
From: "Ivan.Nginx" <ivan.nginx@gmail.com>
Date: Sun, 15 Apr 2018 18:15:00 +0300
Subject: [PATCH 08/10] Refactored `date_updated` optimization.

1. Replaced `updated_diff` by `only_diff` and set it under suboption: `updated_at.only_diff`.
---
 _config.yml                                      |  6 +++---
 languages/en.yml                                 | 11 ++++++-----
 layout/_macro/post.swig                          | 16 ++++++++--------
 .../css/_common/components/post/post-meta.styl   |  1 +
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/_config.yml b/_config.yml
index dda7273b36..ee523d98b1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -261,9 +261,9 @@ auto_excerpt:
 post_meta:
   item_text: true
   created_at: true
-  updated_at: false
-  # Only show 'updated' if different from 'created'.
-  updated_diff: false
+  updated_at:
+    enabled: true
+    only_diff: false # Show 'updated' only if different from 'created'.
   categories: true
 
 # Post wordcount display settings
diff --git a/languages/en.yml b/languages/en.yml
index abca306569..5f8292b694 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -22,15 +22,16 @@ sidebar:
   toc: Table of Contents
 
 post:
-  created: Post created
-  modified: Post modified
-  edit: Edit this post
-  sticky: Sticky
   posted: Posted on
+  edited: Edited on
+  created: Created
+  modified: Modified
+  edit: Edit this post
   in: In
   more: more
   read_more: Read more
   untitled: Untitled
+  sticky: Sticky
   toc_empty: This post does not have a Table of Contents
   views: Views
   comments_count: Comments
@@ -89,7 +90,7 @@ keep_on: Keep on posting.
 symbol:
   comma: ", "
   period: ". "
-  colon: ":"
+  colon: ": "
 
 reward:
   donate: Donate
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 7a06c573f8..ea40ed321c 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -86,10 +86,10 @@
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
 
-              {% if !date_diff && time_diff && theme.post_meta.updated_at %}
-                {% set create_title = __('post.created') + ' ' + full_date(post.date) + ' / ' + __('post.modified') + ' ' + time(post.updated) %}
+              {% if !date_diff && time_diff && theme.post_meta.updated_at.enabled %}
+                {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
               {% else %}
-                {% set create_title = full_date(post.date) %}
+                {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
               {% endif %}
 
               <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
@@ -97,11 +97,11 @@
             #}</time>
             {% endif %}
 
-            {% if theme.post_meta.updated_at && date_diff %}
-              {% set display_updated = !theme.post_meta.updated_diff || theme.post_meta.updated_diff && datetime_diff %}
+            {% if theme.post_meta.updated_at.enabled && date_diff %}
+              {% set display_updated = !theme.post_meta.updated_at.only_diff || theme.post_meta.updated_at.only_diff && datetime_diff %}
 
               {% if display_updated or !theme.post_meta.created_at %}
-                {% if theme.post_meta.created_at and theme.post_meta.updated_at %}
+                {% if theme.post_meta.created_at and theme.post_meta.updated_at.enabled %}
                 <span class="post-meta-divider">|</span>
                 {% endif %}
 
@@ -109,9 +109,9 @@
                   <i class="fa fa-calendar-check-o"></i>
                 </span>
                 {% if theme.post_meta.item_text %}
-                  <span class="post-meta-item-text">{{ __('post.modified') + __('symbol.colon') }}</span>
+                  <span class="post-meta-item-text">{{ __('post.edited') }}</span>
                 {% endif %}
-                <time title="{{ full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
+                <time title="{{ __('post.modified') + __('symbol.colon') + full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
                 #}{{ date(post.updated) }}{#
               #}</time>
               {% endif %}
diff --git a/source/css/_common/components/post/post-meta.styl b/source/css/_common/components/post/post-meta.styl
index baa7ed178a..1dc44a9d54 100644
--- a/source/css/_common/components/post/post-meta.styl
+++ b/source/css/_common/components/post/post-meta.styl
@@ -19,6 +19,7 @@
 
   time {
     border-bottom: 1px dashed $grey-dark;
+    cursor: help;
   }
 }
 

From 9513a11afbf84a33381af446b8b4159bef68f5ce Mon Sep 17 00:00:00 2001
From: "Ivan.Nginx" <ivan.nginx@gmail.com>
Date: Sun, 15 Apr 2018 18:48:20 +0300
Subject: [PATCH 09/10] Fixed bug and replaced `only_diff` by `another_day`
 option.

---
 _config.yml             | 4 +++-
 layout/_macro/post.swig | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_config.yml b/_config.yml
index ee523d98b1..07a93bab3c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -263,7 +263,9 @@ post_meta:
   created_at: true
   updated_at:
     enabled: true
-    only_diff: false # Show 'updated' only if different from 'created'.
+    # Show updated date only if `updated date` different from 'created date'. If false, will show even if `updated time` have difference from 'created time'.
+    # Another words: show updated label only if post edited in another day than was created.
+    another_day: false
   categories: true
 
 # Post wordcount display settings
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index ea40ed321c..89f5372659 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -97,8 +97,8 @@
             #}</time>
             {% endif %}
 
-            {% if theme.post_meta.updated_at.enabled && date_diff %}
-              {% set display_updated = !theme.post_meta.updated_at.only_diff || theme.post_meta.updated_at.only_diff && datetime_diff %}
+            {% if theme.post_meta.updated_at.enabled && datetime_diff %}
+              {% set display_updated = !theme.post_meta.updated_at.another_day || theme.post_meta.updated_at.another_day && date_diff %}
 
               {% if display_updated or !theme.post_meta.created_at %}
                 {% if theme.post_meta.created_at and theme.post_meta.updated_at.enabled %}

From 9f4f0143aff6e7e804e3396f33acdcf9a109efd0 Mon Sep 17 00:00:00 2001
From: "Ivan.Nginx" <ivan.nginx@gmail.com>
Date: Sun, 15 Apr 2018 19:34:11 +0300
Subject: [PATCH 10/10] Final optimization for `another_day` option.

1. If true, show updated date label only if `updated date` different from 'created date' (post edited in another day than was created). And if post will edited in same day as created, edited time will show in popup title under created time label.
2. If false show anyway, but if post edited in same day, show only edited time.
---
 _config.yml             |  7 ++++---
 layout/_macro/post.swig | 14 +++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_config.yml b/_config.yml
index 07a93bab3c..82783dc7b2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -263,9 +263,10 @@ post_meta:
   created_at: true
   updated_at:
     enabled: true
-    # Show updated date only if `updated date` different from 'created date'. If false, will show even if `updated time` have difference from 'created time'.
-    # Another words: show updated label only if post edited in another day than was created.
-    another_day: false
+    # If true, show updated date label only if `updated date` different from 'created date' (post edited in another day than was created).
+    # And if post will edited in same day as created, edited time will show in popup title under created time label.
+    # If false show anyway, but if post edited in same day, show only edited time.
+    another_day: true
   categories: true
 
 # Post wordcount display settings
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 89f5372659..addab9555b 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -86,15 +86,15 @@
                 <span class="post-meta-item-text">{{ __('post.posted') }}</span>
               {% endif %}
 
-              {% if !date_diff && time_diff && theme.post_meta.updated_at.enabled %}
+              {% if !date_diff && time_diff && theme.post_meta.updated_at.enabled && theme.post_meta.updated_at.another_day %}
                 {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
               {% else %}
                 {% set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
               {% endif %}
 
               <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{#
-              #}{{ date(post.date) }}{#
-            #}</time>
+              #}{{ date(post.date) -}}
+              </time>
             {% endif %}
 
             {% if theme.post_meta.updated_at.enabled && datetime_diff %}
@@ -112,8 +112,12 @@
                   <span class="post-meta-item-text">{{ __('post.edited') }}</span>
                 {% endif %}
                 <time title="{{ __('post.modified') + __('symbol.colon') + full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{#
-                #}{{ date(post.updated) }}{#
-              #}</time>
+                #}{% if date_diff -%}
+                    {{- date(post.updated) -}}
+                  {%- else -%}
+                    {{- time(post.updated) -}}
+                  {%- endif -%}
+                </time>
               {% endif %}
             {% endif %}
           </span>