From fef9121fce55aefeea5aa5faf584477066c26a3c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 13 Mar 2025 12:52:37 +0200
Subject: [PATCH] fix poll labels always assuming relative time format

---
 src/components/poll/poll.js   |  7 ++++
 src/components/poll/poll.scss |  6 ----
 src/components/poll/poll.vue  | 62 ++++++++++++++++++-----------------
 src/i18n/en.json              |  3 +-
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index fb72b1212..a1b7808f2 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -45,6 +45,13 @@ export default {
     expired () {
       return (this.poll && this.poll.expired) || false
     },
+    expirationLabel () {
+      if (this.$store.getters.mergedConfig.useAbsoluteTimeFormat) {
+        return this.expired ? 'polls.expired_at' : 'polls.expires_at'
+      } else {
+        return this.expired ? 'polls.expired' : 'polls.expires_in'
+      }
+    },
     loggedIn () {
       return this.$store.state.users.currentUser
     },
diff --git a/src/components/poll/poll.scss b/src/components/poll/poll.scss
index 4cf13a1fd..d227e6472 100644
--- a/src/components/poll/poll.scss
+++ b/src/components/poll/poll.scss
@@ -47,12 +47,6 @@
     width: 3.5em;
   }
 
-  .footer {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-  }
-
   &.loading * {
     cursor: progress;
   }
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index f043d82a3..91ae2f40c 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -56,6 +56,38 @@
       </div>
     </div>
     <div class="footer faint">
+      <p>
+        <span
+          v-if="poll.pleroma?.non_anonymous"
+          :title="$t('polls.non_anonymous_title')"
+        >
+          {{ $t('polls.non_anonymous') }}
+          &nbsp;·&nbsp;
+        </span>
+        <span class="total">
+          <template v-if="typeof poll.voters_count === 'number'">
+            {{ $t("polls.people_voted_count", { count: poll.voters_count }, poll.voters_count) }}
+          </template>
+          <template v-else>
+            {{ $t("polls.votes_count", { count: poll.votes_count }, poll.votes_count) }}
+          </template>
+          <span v-if="expiresAt !== null">
+            &nbsp;·&nbsp;
+          </span>
+        </span>
+        <span v-if="expiresAt !== null">
+          <i18n-t
+            scope="global"
+            :keypath="expirationLabel"
+          >
+            <Timeago
+              :time="expiresAt"
+              :auto-update="60"
+              :now-threshold="0"
+            />
+          </i18n-t>
+        </span>
+      </p>
       <button
         v-if="!showResults"
         class="btn button-default poll-vote-button"
@@ -65,36 +97,6 @@
       >
         {{ $t('polls.vote') }}
       </button>
-      <span
-        v-if="poll.pleroma?.non_anonymous"
-        :title="$t('polls.non_anonymous_title')"
-      >
-        {{ $t('polls.non_anonymous') }}
-        &nbsp;·&nbsp;
-      </span>
-      <div class="total">
-        <template v-if="typeof poll.voters_count === 'number'">
-          {{ $t("polls.people_voted_count", { count: poll.voters_count }, poll.voters_count) }}
-        </template>
-        <template v-else>
-          {{ $t("polls.votes_count", { count: poll.votes_count }, poll.votes_count) }}
-        </template>
-        <span v-if="expiresAt !== null">
-          &nbsp;·&nbsp;
-        </span>
-      </div>
-      <span v-if="expiresAt !== null">
-        <i18n-t
-          scope="global"
-          :keypath="expired ? 'polls.expired' : 'polls.expires_in'"
-        >
-          <Timeago
-            :time="expiresAt"
-            :auto-update="60"
-            :now-threshold="0"
-          />
-        </i18n-t>
-      </span>
     </div>
   </div>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 545cdb1e1..d4585805b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -231,8 +231,9 @@
     "single_choice": "Single choice",
     "multiple_choices": "Multiple choices",
     "expiry": "Poll age",
-    "expires_in": "Poll ends in {0}",
+    "expires_at": "Poll ends {0}",
     "expired": "Poll ended {0} ago",
+    "expired_at": "Poll ended {0}",
     "not_enough_options": "Too few unique options in poll",
     "non_anonymous": "Public poll",
     "non_anonymous_title": "Other instances may display the options you voted for"