Fix displayed date for Created on column

qgis · Nov 30, 2023 · 88d9dd0 · 88d9dd0
1 parent efb26d0
commit 88d9dd0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html
@@ -94,7 +94,7 @@ <h2>{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}</h2>
                 {% if object.author %}
                 <td><a title="{% trans "See all plugins by"%} {{ object.author }}" href="{% url "author_plugins" object.author %}">{{ object.author }}</a></td>
                 {% endif %}
-                <td>{{ object.latest_version_date|local_timezone:"SHORT" }}</td>
+                <td>{{ object.latest_version_date|local_timezone:"SHORT_NATURAL_DAY" }}</td>
                 <td>{{ object.created_on|local_timezone:"SHORT" }}</td>
                 <td><div><div class="star-ratings"><span style="width:{% widthratio object.average_vote 5 100 %}%" class="rating"></span></div> ({{ object.rating_votes }})</div></td>
                 <td>{% if object.stable %}<a href="{% url "version_download" object.package_name object.stable.version %}" title="{% trans "Download the stable version" %}" >{{ object.stable.version }}</a>{% else %}&mdash;{% endif %}</td>

diff --git a/qgis-app/plugins/templatetags/local_timezone.py b/qgis-app/plugins/templatetags/local_timezone.py
@@ -9,8 +9,10 @@
 def local_timezone(date, args="LONG"):
     try:
         utcdate = date.astimezone(pytz.utc).isoformat()
-        if args and str(args).lower() == "short":
-            result = '<span class="short-user-timezone">%s</span>' % (utcdate,)
+        if args and str(args) == "SHORT":
+            result = '<span class="user-timezone-short">%s</span>' % (utcdate,)
+        elif args and str(args) == "SHORT_NATURAL_DAY":
+            result = '<span class="user-timezone-short-naturalday">%s</span>' % (utcdate,)
         else:
             result = '<span class="user-timezone">%s</span>' % (utcdate,)
     except AttributeError:

diff --git a/qgis-app/static/js/local_timezone.js b/qgis-app/static/js/local_timezone.js
@@ -5,12 +5,17 @@ $(".user-timezone").each(function (i) {
   $(this).text(localDate);
 })
 
-$(".short-user-timezone").each(function (i) {
-  let localDate = toUserTimeZone($(this).text(), false);
+$(".user-timezone-short").each(function (i) {
+  let localDate = toUserTimeZone($(this).text(), withTime=false);
   $(this).text(localDate);
 })
 
-function toUserTimeZone(date, withTime=true) {
+$(".user-timezone-short-naturalday").each(function (i) {
+  let localDate = toUserTimeZone($(this).text(), withTime=false, isNaturalDay=true);
+  $(this).text(localDate);
+})
+
+function toUserTimeZone(date, withTime=true, isNaturalDay=false) {
   try {
     date = new Date(date);
     let options = {
@@ -23,7 +28,7 @@ function toUserTimeZone(date, withTime=true) {
     }
     const diffInDays = moment().diff(moment(date), 'days');
 
-    if (diffInDays <= 1 && !withTime) {
+    if (diffInDays <= 1 && isNaturalDay) {
       const distance = moment(date).fromNow();
       return distance
     }