From 726b8b2752a7a2d5c03515920ffdd58bacc3d8bd Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Sun, 16 Jun 2024 09:37:34 +0200
Subject: [PATCH] feat(observations): Display date instead of timestamp in list
and detail view
---
observations/locale/bg/LC_MESSAGES/django.po | 4 ++--
.../locale/bg/LC_MESSAGES/djangojs.po | 2 +-
observations/locale/bs/LC_MESSAGES/django.po | 4 ++--
.../locale/bs/LC_MESSAGES/djangojs.po | 2 +-
observations/locale/de/LC_MESSAGES/django.po | 4 ++--
.../locale/de/LC_MESSAGES/djangojs.po | 2 +-
observations/locale/fi/LC_MESSAGES/django.po | 4 ++--
.../locale/fi/LC_MESSAGES/djangojs.po | 2 +-
observations/locale/nb/LC_MESSAGES/django.mo | Bin 1413 -> 1408 bytes
observations/locale/nb/LC_MESSAGES/django.po | 6 +++---
.../locale/nb/LC_MESSAGES/djangojs.po | 2 +-
observations/locale/vi/LC_MESSAGES/django.po | 4 ++--
.../locale/vi/LC_MESSAGES/djangojs.po | 2 +-
.../locale/zh_Hans/LC_MESSAGES/django.mo | Bin 830 -> 830 bytes
.../locale/zh_Hans/LC_MESSAGES/django.po | 4 ++--
.../locale/zh_Hans/LC_MESSAGES/djangojs.po | 2 +-
.../static/observations/js/observationList.js | 2 +-
.../templates/observations/detail.html | 4 ++--
.../templates/observations/index.html | 2 +-
.../templates/observations/index_old.html | 2 +-
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/observations/locale/bg/LC_MESSAGES/django.po b/observations/locale/bg/LC_MESSAGES/django.po
index db3efa64..4731b169 100644
--- a/observations/locale/bg/LC_MESSAGES/django.po
+++ b/observations/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
diff --git a/observations/locale/bg/LC_MESSAGES/djangojs.po b/observations/locale/bg/LC_MESSAGES/djangojs.po
index a9ed1e02..610729fb 100644
--- a/observations/locale/bg/LC_MESSAGES/djangojs.po
+++ b/observations/locale/bg/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/bs/LC_MESSAGES/django.po b/observations/locale/bs/LC_MESSAGES/django.po
index 1f7fa66a..cbe5916d 100644
--- a/observations/locale/bs/LC_MESSAGES/django.po
+++ b/observations/locale/bs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
diff --git a/observations/locale/bs/LC_MESSAGES/djangojs.po b/observations/locale/bs/LC_MESSAGES/djangojs.po
index d48ba98a..e4fa42be 100644
--- a/observations/locale/bs/LC_MESSAGES/djangojs.po
+++ b/observations/locale/bs/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po
index db3efa64..4731b169 100755
--- a/observations/locale/de/LC_MESSAGES/django.po
+++ b/observations/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
diff --git a/observations/locale/de/LC_MESSAGES/djangojs.po b/observations/locale/de/LC_MESSAGES/djangojs.po
index 7618b366..fe07d322 100644
--- a/observations/locale/de/LC_MESSAGES/djangojs.po
+++ b/observations/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/fi/LC_MESSAGES/django.po b/observations/locale/fi/LC_MESSAGES/django.po
index db3efa64..4731b169 100644
--- a/observations/locale/fi/LC_MESSAGES/django.po
+++ b/observations/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
diff --git a/observations/locale/fi/LC_MESSAGES/djangojs.po b/observations/locale/fi/LC_MESSAGES/djangojs.po
index a9ed1e02..610729fb 100644
--- a/observations/locale/fi/LC_MESSAGES/djangojs.po
+++ b/observations/locale/fi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo
index 1d078e5476f1c908cb6a2c2f2b004ea2dac95378..dd5c8aff24103c45080a796510f29378c22406b8 100755
GIT binary patch
delta 416
zcmZqWZs4BalPb)>z@W^;z`)JGz+leAz`(}9z~Icpz`(-5z~IHiz`)MHz~Ilsz`)DE
zz!1*Fz@W{*z>vzsz#zuJz%UW2Zv_(rg8%~q!xkn61~~=>hNDaj3_J`B3{RLC7&sUh
z7(Pzi=v@y|(8vN2n8X56Fq?&efti7UVFe2V0~Z4W!x|O_20jJ`hV3j23^EK1498d)
z7-Sh37#_1g9LUHDv51$IfkBypfkBQH;xH#x1_n+B28IAuh<Q=03=E<S3=DCs5Pc=A
z4D}3*3=9lR3=9k)AA?-azyPrf<YSQK{0tDqAfJL<4>ACxMuY(p3Lv&11H=N5uRwed
z23afwVn8t~10?i79%gXN$x$dsEiNgZ{EJbKFF#EoKdCsis4TH0Ge2*#64TMmznR(?
WdHf-Q#aa1z#gl7T&Q6YJRRaLi4=hmt
delta 429
zcmZqRZsnfflgiD&z@W^;z`(}9z@X2>z`(-5z+lG2z`)MHz+lb9z`)DEz~Icpz@W{*
zz!1p9z#zuJz);J?zyQ)Wg^7VdfPsNw0TTm*90LQxMkWRZ9tH-63rq|Q91IK$cbOO%
zgc%qZo=x27T@MmyWPvE?VqsulW?*2L&ceXJ#lXNYn}vaakAZ<<84Cl03<CqhRu%>Z
zSq27%ODqtJKCnP6`oqG&pv=I)z{?78m?0|z11AFmgFPz)gD3+7gC{G*+;}KInH8eH
zl9i#JfsuiMfr){EL5Kn3Dh7~23=p4#3<3EB<QR|-K)wSR2=c861H^G4^&kv#I4E>L
zY!C){Oc2C?Vpax7DDs2&jyX9B1*yd)#gl(A>P@y`+Aoxuo2rnXrjVahoLW?tSdy8a
kxA`Yi2jk>PEGI<$A%ewO`FX`9nJL8urFq#UlOtKx0r~<mp#T5?
diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po
index 7fb1f1bd..0cb163e8 100755
--- a/observations/locale/nb/LC_MESSAGES/django.po
+++ b/observations/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: 2024-06-06 13:42+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -41,8 +41,8 @@ msgstr "Kultur"
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
-msgstr "Observasjonstidspunkt"
+msgid "Date of observation"
+msgstr "Observasjonsdato"
#: templates/observations/detail.html:40
msgid "Observation data"
diff --git a/observations/locale/nb/LC_MESSAGES/djangojs.po b/observations/locale/nb/LC_MESSAGES/djangojs.po
index e332890f..8b3f93b8 100644
--- a/observations/locale/nb/LC_MESSAGES/djangojs.po
+++ b/observations/locale/nb/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/vi/LC_MESSAGES/django.po b/observations/locale/vi/LC_MESSAGES/django.po
index 67e42da6..28da2c7a 100644
--- a/observations/locale/vi/LC_MESSAGES/django.po
+++ b/observations/locale/vi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
diff --git a/observations/locale/vi/LC_MESSAGES/djangojs.po b/observations/locale/vi/LC_MESSAGES/djangojs.po
index 48aabc02..0bf1eb77 100644
--- a/observations/locale/vi/LC_MESSAGES/djangojs.po
+++ b/observations/locale/vi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.mo b/observations/locale/zh_Hans/LC_MESSAGES/django.mo
index dd5cef254fb3a3969da7110a7b55553ee9f2425d..20ea5971a71c780cf6050a6a672e61b6aec053e9 100644
GIT binary patch
delta 246
zcmdnTwvTOsiK#FH1A_r00|Pq)1A_}A0|Pe$1A`AE1A_nq149HO1A`m`14AYw0|O5O
z149QR0|N&G1H;sbncAixfvZdm3~USx43D7nOD2fI4@?XUq6`cSf1%>S%n)@_6HiLV
zvoJsa$R?0xRtOjD0xkxK4NxI4#mvCKz{vnHn87h8N1-6KxTKiDxhTJY!6mUIRUto3
wAwQ`&wWutyBr`v6vOZ(<=6Q_fj65%vH$B_h{cQTSm(#aQzQW`%S&>;501!qf8~^|S
delta 246
zcmdnTwvTOsi77h+1A_r00|Pe$1A_%41A_nq1A_}A1A`m`14Aey0|O5O149WT0|N&G
z14APt1A{OF14GxuOl?y(1_p+!ObiSl`VJFB;bSHS22lnEh7VA2HfD%CFEd15Wa3F_
zZ;(kKQ$aSeGB7Z(FhBsvAWjAb29S#&A`p@pLNRcGXvdr!g@V-Ll41tuqWpr%&WzE*
zA(^?U3i)XY`ANm8MP-R4nfZB}=Q3I_PJYB>&+}q=)3dGJ&!%sCIep7y1!g$_Ob{m_
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.po b/observations/locale/zh_Hans/LC_MESSAGES/django.po
index 4a97c2e1..0107c33f 100755
--- a/observations/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/observations/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-06 13:36+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: 2016-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -39,7 +39,7 @@ msgstr "作物"
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
-msgid "Time of observation"
+msgid "Date of observation"
msgstr "观测时间"
#: templates/observations/detail.html:40
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po b/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
index a98c5d57..1cf68347 100644
--- a/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
+++ b/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 14:01+0200\n"
+"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/observations/static/observations/js/observationList.js b/observations/static/observations/js/observationList.js
index 2cbc5b23..61afbebb 100644
--- a/observations/static/observations/js/observationList.js
+++ b/observations/static/observations/js/observationList.js
@@ -346,7 +346,7 @@ var renderObservationTable = function(data)
tbodyHTML.push("<tr>");
- tbodyHTML.push("<td>" + moment(obs.timeOfObservation).format("YYYY-MM-DD HH:mm ZZ") + "</td>");
+ tbodyHTML.push("<td>" + moment(obs.timeOfObservation).format("YYYY-MM-DD") + "</td>");
tbodyHTML.push("<td>" + obs.organismName + "</td>");
tbodyHTML.push("<td>" + obs.cropOrganismName + "</td>");
tbodyHTML.push("<td>" + obs.observationHeading + "</td>");
diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html
index 7b25c343..1c5654da 100755
--- a/observations/templates/observations/detail.html
+++ b/observations/templates/observations/detail.html
@@ -33,7 +33,7 @@
<p id="organismName"></p>
<h4>{% trans "Crop" %}</h4>
<p id="cropOrganismName"></p>
- <h4>{% trans "Time of observation" %}</h4>
+ <h4>{% trans "Date of observation" %}</h4>
<p id="timeOfObservation"></p>
<h2 id="observationHeading"></h2>
<p id="observationText"></p>
@@ -65,7 +65,7 @@
//console.log(observation);
document.getElementById("organismName").innerHTML = getLocalizedOrganismName(observation.organism) + " <i>(" + observation.organism.latinName + ")</i>";
document.getElementById("cropOrganismName").innerHTML = getLocalizedOrganismName(observation.cropOrganism) + " <i>(" + observation.cropOrganism.latinName + ")</i>";
- document.getElementById("timeOfObservation").innerHTML = getStandardFormattedTimestamp(observation.timeOfObservation);
+ document.getElementById("timeOfObservation").innerHTML = getStandardFormattedDate(observation.timeOfObservation);
//document.getElementById("observerName").innerHTML = observation.user.firstName + " " + observation.user.lastName;
document.getElementById("observationHeading").innerHTML = observation.observationHeading;
document.getElementById("observationText").innerHTML = observation.observationText;
diff --git a/observations/templates/observations/index.html b/observations/templates/observations/index.html
index 77955ab5..4c800cdf 100644
--- a/observations/templates/observations/index.html
+++ b/observations/templates/observations/index.html
@@ -64,7 +64,7 @@
<div class="table-responsive">
<table class="table table-striped" id="observationTable">
<thead>
- <th>{% trans "Time of observation" %}</th>
+ <th>{% trans "Date of observation" %}</th>
<th>{% trans "Organism" %}</th>
<th>{% trans "Crop" %}</th>
<th>{% trans "Heading" %}</th>
diff --git a/observations/templates/observations/index_old.html b/observations/templates/observations/index_old.html
index 580cb9df..1a935992 100755
--- a/observations/templates/observations/index_old.html
+++ b/observations/templates/observations/index_old.html
@@ -59,7 +59,7 @@
<table class="table">
<thead>
<tr>
- <th>{% trans "Time of observation" %}</th>
+ <th>{% trans "Date of observation" %}</th>
<th>{% trans "Organism" %}</th>
<th>{% trans "Crop" %}</th>
<th>{% trans "Heading" %}</th>
--
GitLab