From b5921897d6c929c9eed51654a540b67d323a5a60 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com>
Date: Sat, 27 Jan 2024 18:53:46 +0100
Subject: [PATCH] Rework session keys for normalization (#1603)

---
 locales/en-US/index.json    | 28 ++++++++++++++--------------
 pages/settings/sessions.vue | 20 ++++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index dd3eeda7f..a4714f04f 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -695,30 +695,30 @@
   "settings.language.title": {
     "message": "Language"
   },
-  "settings.sessions.button.revoke-session": {
+  "settings.sessions.action.revoke-session": {
     "message": "Revoke session"
   },
+  "settings.sessions.created-ago": {
+    "message": "Created {ago}"
+  },
+  "settings.sessions.current-session": {
+    "message": "Current session"
+  },
   "settings.sessions.description": {
     "message": "Here are all the devices that are currently logged in with your Modrinth account. You can log out of each one individually.\n\nIf you see an entry you don't recognize, log out of that device and change your Modrinth account password immediately."
   },
-  "settings.sessions.label.created-at": {
-    "message": "Created {ago}"
-  },
-  "settings.sessions.label.current-session": {
-    "message": "Current session"
-  },
-  "settings.sessions.label.last-accessed-at": {
+  "settings.sessions.last-accessed-ago": {
     "message": "Last accessed {ago}"
   },
-  "settings.sessions.label.unknown-os": {
-    "message": "Unknown OS"
-  },
-  "settings.sessions.label.unknown-platform": {
-    "message": "Unknown platform"
-  },
   "settings.sessions.title": {
     "message": "Sessions"
   },
+  "settings.sessions.unknown-os": {
+    "message": "Unknown OS"
+  },
+  "settings.sessions.unknown-platform": {
+    "message": "Unknown platform"
+  },
   "tooltip.date-at-time": {
     "message": "{date, date, long} at {time, time, short}"
   }
diff --git a/pages/settings/sessions.vue b/pages/settings/sessions.vue
index 107c994c7..1f3e7b019 100644
--- a/pages/settings/sessions.vue
+++ b/pages/settings/sessions.vue
@@ -24,7 +24,7 @@
             "
           >
             {{
-              formatMessage(messages.sessionsLastAccessedAt, {
+              formatMessage(messages.lastAccessedAgoLabel, {
                 ago: formatRelativeTime(session.last_login),
               })
             }}
@@ -39,7 +39,7 @@
             "
           >
             {{
-              formatMessage(messages.sessionsCreatedAt, {
+              formatMessage(messages.createdAgoLabel, {
                 ago: formatRelativeTime(session.created),
               })
             }}
@@ -67,15 +67,15 @@ const formatRelativeTime = useRelativeTime()
 
 const messages = defineMessages({
   currentSessionLabel: {
-    id: 'settings.sessions.label.current-session',
+    id: 'settings.sessions.current-session',
     defaultMessage: 'Current session',
   },
   revokeSessionButton: {
-    id: 'settings.sessions.button.revoke-session',
+    id: 'settings.sessions.action.revoke-session',
     defaultMessage: 'Revoke session',
   },
-  sessionsCreatedAt: {
-    id: 'settings.sessions.label.created-at',
+  createdAgoLabel: {
+    id: 'settings.sessions.created-ago',
     defaultMessage: 'Created {ago}',
   },
   sessionsDescription: {
@@ -83,8 +83,8 @@ const messages = defineMessages({
     defaultMessage:
       "Here are all the devices that are currently logged in with your Modrinth account. You can log out of each one individually.\n\nIf you see an entry you don't recognize, log out of that device and change your Modrinth account password immediately.",
   },
-  sessionsLastAccessedAt: {
-    id: 'settings.sessions.label.last-accessed-at',
+  lastAccessedAgoLabel: {
+    id: 'settings.sessions.last-accessed-ago',
     defaultMessage: 'Last accessed {ago}',
   },
   sessionsTitle: {
@@ -92,11 +92,11 @@ const messages = defineMessages({
     defaultMessage: 'Sessions',
   },
   unknownOsLabel: {
-    id: 'settings.sessions.label.unknown-os',
+    id: 'settings.sessions.unknown-os',
     defaultMessage: 'Unknown OS',
   },
   unknownPlatformLabel: {
-    id: 'settings.sessions.label.unknown-platform',
+    id: 'settings.sessions.unknown-platform',
     defaultMessage: 'Unknown platform',
   },
 })