From b546f4e79341bc3ed7bfdbdbf30611a5436328e8 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Mon, 15 Jan 2024 17:26:28 +0100
Subject: [PATCH 01/12] Begin Work

---
 locales/en-US/index.json |  3 +++
 pages/auth/authorize.vue | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 805adae294..2c318dc9d6 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -1,4 +1,7 @@
 {
+  "auth.authorize.error.not-location-found": {
+    "message": "No redirect location found in response"
+  },
   "button.cancel": {
     "message": "Cancel"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index e0f30aea0c..d2b5048d0d 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -68,6 +68,15 @@ import { useAuth } from '@/composables/auth.js'
 
 import { useScopes } from '@/composables/auth/scopes.ts'
 
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+  noLocationFoundError: {
+    id: 'auth.authorize.error.not-location-found',
+    defaultMessage: 'No redirect location found in response',
+  },
+})
+
 const data = useNuxtApp()
 
 const router = useRoute()
@@ -143,11 +152,11 @@ const onAuthorize = async () => {
       return
     }
 
-    throw new Error('No redirect location found in response')
+    throw new Error(formatMessage(messages.noLocationFoundError))
   } catch (error) {
     data.$notify({
       group: 'main',
-      title: 'An error occurred',
+      title: formatMessage(commonMessages.errorNotificationTitle),
       text: err.data ? err.data.description : err,
       type: 'error',
     })
@@ -170,11 +179,11 @@ const onReject = async () => {
       return
     }
 
-    throw new Error('No redirect location found in response')
+    throw new Error(formatMessage(messages.noLocationFoundError))
   } catch (error) {
     data.$notify({
       group: 'main',
-      title: 'An error occurred',
+      title: formatMessage(commonMessages.errorNotificationTitle),
       text: err.data ? err.data.description : err,
       type: 'error',
     })

From 99e3df31e073569e1343f27188d0d8913b61b69c Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Mon, 15 Jan 2024 17:39:53 +0100
Subject: [PATCH 02/12] Error label

---
 locales/en-US/index.json | 3 +++
 pages/auth/authorize.vue | 2 +-
 utils/common-messages.ts | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 2c318dc9d6..e1b1f760b5 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -35,6 +35,9 @@
   "input.view.list": {
     "message": "List view"
   },
+  "label.error": {
+    "message": "Error"
+  },
   "notification.error.title": {
     "message": "An error occurred"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index d2b5048d0d..ec6781db09 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -2,7 +2,7 @@
   <div>
     <div v-if="error" class="oauth-items">
       <div>
-        <h1>Error</h1>
+        <h1>{{ formatMessage(commonMessages.errorLabel) }}</h1>
       </div>
       <p>
         <span>{{ error.data.error }}: </span>
diff --git a/utils/common-messages.ts b/utils/common-messages.ts
index 965175a299..bb14c9ed5c 100644
--- a/utils/common-messages.ts
+++ b/utils/common-messages.ts
@@ -15,6 +15,10 @@ export const commonMessages = defineMessages({
     id: 'button.edit',
     defaultMessage: 'Edit',
   },
+  errorLabel: {
+    id: 'label.error',
+    defaultMessage: 'Error',
+  },
   galleryInputView: {
     id: 'input.view.gallery',
     defaultMessage: 'Gallery view',

From 3a085a2e726e03e59400719c9425cebaaa18a739 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Tue, 16 Jan 2024 10:18:50 +0100
Subject: [PATCH 03/12] WIP

---
 locales/en-US/index.json | 3 +++
 pages/auth/authorize.vue | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index e1b1f760b5..801d62fbd5 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -1,4 +1,7 @@
 {
+  "auth.authorize.button.authorize": {
+    "message": "Authorize"
+  },
   "auth.authorize.error.not-location-found": {
     "message": "No redirect location found in response"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index ec6781db09..8718016a1a 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -48,7 +48,7 @@
         </Button>
         <Button class="wide-button" color="primary" large :action="onAuthorize" :disabled="pending">
           <CheckIcon />
-          Authorize
+          {{ formatMessage(messages.authorizeButton) }}
         </Button>
       </div>
       <div class="redirection-notice">
@@ -71,6 +71,10 @@ import { useScopes } from '@/composables/auth/scopes.ts'
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
+  authorizeButton: {
+    id: 'auth.authorize.button.authorize',
+    defaultMessage: 'Authorize',
+  },
   noLocationFoundError: {
     id: 'auth.authorize.error.not-location-found',
     defaultMessage: 'No redirect location found in response',

From e062d0645eac1dceae673861e13007a82487b68a Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Tue, 16 Jan 2024 10:27:10 +0100
Subject: [PATCH 04/12] Finish button & add authorize label

---
 locales/en-US/index.json | 6 ++++++
 pages/auth/authorize.vue | 8 ++++++--
 utils/common-messages.ts | 4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 801d62fbd5..fccdd481a6 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -5,9 +5,15 @@
   "auth.authorize.error.not-location-found": {
     "message": "No redirect location found in response"
   },
+  "auth.authorize.label.authorize-app-name": {
+    "message": "Authorize {app_name}"
+  },
   "button.cancel": {
     "message": "Cancel"
   },
+  "button.decline": {
+    "message": "Decline"
+  },
   "button.edit": {
     "message": "Edit"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index 8718016a1a..c6df2ee6d0 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div class="title">
-        <h1>Authorize {{ app.name }}</h1>
+        <h1>{{ formatMessage(messages.authorizeAppNameLabel, { app_name: app.name }) }}</h1>
       </div>
       <div class="auth-info">
         <div class="scope-heading">
@@ -44,7 +44,7 @@
       <div class="button-row">
         <Button class="wide-button" large :action="onReject" :disabled="pending">
           <XIcon />
-          Decline
+          {{ formatMessage(commonMessages.declineButton) }}
         </Button>
         <Button class="wide-button" color="primary" large :action="onAuthorize" :disabled="pending">
           <CheckIcon />
@@ -71,6 +71,10 @@ import { useScopes } from '@/composables/auth/scopes.ts'
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
+  authorizeAppNameLabel: {
+    id: 'auth.authorize.label.authorize-app-name',
+    defaultMessage: 'Authorize {app_name}',
+  },
   authorizeButton: {
     id: 'auth.authorize.button.authorize',
     defaultMessage: 'Authorize',
diff --git a/utils/common-messages.ts b/utils/common-messages.ts
index bb14c9ed5c..29207f7826 100644
--- a/utils/common-messages.ts
+++ b/utils/common-messages.ts
@@ -11,6 +11,10 @@ export const commonMessages = defineMessages({
     id: 'tooltip.date-at-time',
     defaultMessage: '{date, date, long} at {time, time, short}',
   },
+  declineButton: {
+    id: 'button.decline',
+    defaultMessage: 'Decline',
+  },
   editButton: {
     id: 'button.edit',
     defaultMessage: 'Edit',

From f98dcbad5fdaafd93e79f69f365b38d760772993 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Tue, 16 Jan 2024 10:56:19 +0100
Subject: [PATCH 05/12] Redirect URL Label

---
 locales/en-US/index.json |  3 +++
 pages/auth/authorize.vue | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index fccdd481a6..f858d462c3 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -8,6 +8,9 @@
   "auth.authorize.label.authorize-app-name": {
     "message": "Authorize {app_name}"
   },
+  "auth.authorize.label.redirect-url": {
+    "message": "You will be redirected to <redirect-url>{url}</redirect-url>"
+  },
   "button.cancel": {
     "message": "Cancel"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index c6df2ee6d0..2da51b53e0 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -53,8 +53,16 @@
       </div>
       <div class="redirection-notice">
         <p class="redirect-instructions">
-          You will be redirected to
-          <span class="redirect-url">{{ redirectUri }}</span>
+          <IntlFormatted
+            :message-id="messages.redirectUrlLabel"
+            :values="{ url: redirectUri }"
+          >
+            <template #redirect-url="{ children }">
+              <span class="redirect-url">
+                <component :is="() => normalizeChildren(children)" />
+              </span>
+            </template>
+          </IntlFormatted>
         </p>
       </div>
     </div>
@@ -83,6 +91,10 @@ const messages = defineMessages({
     id: 'auth.authorize.error.not-location-found',
     defaultMessage: 'No redirect location found in response',
   },
+  redirectUrlLabel: {
+    id: 'auth.authorize.label.redirect-url',
+    defaultMessage: 'You will be redirected to <redirect-url>{url}</redirect-url>',
+  },
 })
 
 const data = useNuxtApp()

From 781ff5958d24b25eb297c9720817c961cb4e9f3d Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Fri, 19 Jan 2024 15:34:04 +0100
Subject: [PATCH 06/12] Reorganize

---
 locales/en-US/index.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index ee4b9fc33f..34bddf11d2 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -29,12 +29,12 @@
   "button.cancel": {
     "message": "Cancel"
   },
-  "button.decline": {
-    "message": "Decline"
-  },
   "button.continue": {
     "message": "Continue"
   },
+  "button.decline": {
+    "message": "Decline"
+  },
   "button.edit": {
     "message": "Edit"
   },

From 506e1a162459fbc16972149589588385b749fb9c Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sat, 20 Jan 2024 17:11:09 +0100
Subject: [PATCH 07/12] Finish work

---
 locales/en-US/index.json |  3 +++
 pages/auth/authorize.vue | 27 ++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 34bddf11d2..1567229379 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -5,6 +5,9 @@
   "auth.authorize.error.not-location-found": {
     "message": "No redirect location found in response"
   },
+  "auth.authorize.label.app-info": {
+    "message": "<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:"
+  },
   "auth.authorize.label.authorize-app-name": {
     "message": "Authorize {app_name}"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index 2da51b53e0..6f79d8b642 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -24,11 +24,24 @@
       </div>
       <div class="auth-info">
         <div class="scope-heading">
-          <strong>{{ app.name }}</strong> by
-          <nuxt-link class="text-link" :to="'/user/' + createdBy.id">{{
-            createdBy.username
-          }}</nuxt-link>
-          will be able to:
+          <IntlFormatted 
+            :message-id="messages.appInfoLabel"
+            :values="{ 
+              app_name: app.name,
+              creator_username: createdBy.username,
+            }"
+          >
+            <template #strong="{ children }">
+              <strong>
+                <component :is="() => normalizeChildren(children)" />
+                </strong>
+            </template>
+            <template #creator-link="{ children }">
+              <nuxt-link class="text-link" :to="'/user/' + createdBy.id">
+                <component :is="() => normalizeChildren(children)" />
+              </nuxt-link>
+            </template>
+          </IntlFormatted>
         </div>
         <div class="scope-items">
           <div v-for="scopeItem in scopeDefinitions" :key="scopeItem">
@@ -79,6 +92,10 @@ import { useScopes } from '@/composables/auth/scopes.ts'
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
+  appInfoLabel: {
+    id: 'auth.authorize.label.app-info',
+    defaultMessage: '<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:',
+  },
   authorizeAppNameLabel: {
     id: 'auth.authorize.label.authorize-app-name',
     defaultMessage: 'Authorize {app_name}',

From 0ab922939346a090eae7c02067520695fecbe851 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sat, 20 Jan 2024 17:12:02 +0100
Subject: [PATCH 08/12] Fix lint error

---
 pages/auth/authorize.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index 6f79d8b642..b944683616 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -24,9 +24,9 @@
       </div>
       <div class="auth-info">
         <div class="scope-heading">
-          <IntlFormatted 
+          <IntlFormatted
             :message-id="messages.appInfoLabel"
-            :values="{ 
+            :values="{
               app_name: app.name,
               creator_username: createdBy.username,
             }"
@@ -34,7 +34,7 @@
             <template #strong="{ children }">
               <strong>
                 <component :is="() => normalizeChildren(children)" />
-                </strong>
+              </strong>
             </template>
             <template #creator-link="{ children }">
               <nuxt-link class="text-link" :to="'/user/' + createdBy.id">
@@ -66,10 +66,7 @@
       </div>
       <div class="redirection-notice">
         <p class="redirect-instructions">
-          <IntlFormatted
-            :message-id="messages.redirectUrlLabel"
-            :values="{ url: redirectUri }"
-          >
+          <IntlFormatted :message-id="messages.redirectUrlLabel" :values="{ url: redirectUri }">
             <template #redirect-url="{ children }">
               <span class="redirect-url">
                 <component :is="() => normalizeChildren(children)" />
@@ -94,7 +91,8 @@ const { formatMessage } = useVIntl()
 const messages = defineMessages({
   appInfoLabel: {
     id: 'auth.authorize.label.app-info',
-    defaultMessage: '<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:',
+    defaultMessage:
+      '<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:',
   },
   authorizeAppNameLabel: {
     id: 'auth.authorize.label.authorize-app-name',

From c2a5581867977f1083142f771ea8df50ec90cbbc Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sun, 21 Jan 2024 17:40:04 +0100
Subject: [PATCH 09/12] camelCase !

---
 locales/en-US/index.json | 2 +-
 pages/auth/authorize.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 1567229379..d2ed4a3c35 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -6,7 +6,7 @@
     "message": "No redirect location found in response"
   },
   "auth.authorize.label.app-info": {
-    "message": "<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:"
+    "message": "<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:"
   },
   "auth.authorize.label.authorize-app-name": {
     "message": "Authorize {app_name}"
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index b944683616..cb083dd032 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -27,8 +27,8 @@
           <IntlFormatted
             :message-id="messages.appInfoLabel"
             :values="{
-              app_name: app.name,
-              creator_username: createdBy.username,
+              appName: app.name,
+              creatorUsername: createdBy.username,
             }"
           >
             <template #strong="{ children }">
@@ -92,7 +92,7 @@ const messages = defineMessages({
   appInfoLabel: {
     id: 'auth.authorize.label.app-info',
     defaultMessage:
-      '<strong>{app_name}</strong> by <creator-link>{creator_username}</creator-link> will be able to:',
+      '<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:',
   },
   authorizeAppNameLabel: {
     id: 'auth.authorize.label.authorize-app-name',

From 7583bfbb99886f439bec56b9131e33fe39ddf331 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sat, 27 Jan 2024 15:36:47 +0100
Subject: [PATCH 10/12] Normalization

---
 locales/en-US/index.json | 14 +++++++-------
 pages/auth/authorize.vue | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index d2ed4a3c35..729a6587ee 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -1,17 +1,17 @@
 {
-  "auth.authorize.button.authorize": {
+  "auth.authorize.action.authorize": {
     "message": "Authorize"
   },
-  "auth.authorize.error.not-location-found": {
-    "message": "No redirect location found in response"
-  },
-  "auth.authorize.label.app-info": {
+  "auth.authorize.app-info": {
     "message": "<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:"
   },
-  "auth.authorize.label.authorize-app-name": {
+  "auth.authorize.authorize-app-name": {
     "message": "Authorize {app_name}"
   },
-  "auth.authorize.label.redirect-url": {
+  "auth.authorize.error.no-redirect-url": {
+    "message": "No redirect location found in response"
+  },
+  "auth.authorize.redirect-url": {
     "message": "You will be redirected to <redirect-url>{url}</redirect-url>"
   },
   "auth.welcome.checkbox.subscribe": {
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index cb083dd032..d0ac3472a5 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -20,12 +20,12 @@
         </div>
       </div>
       <div class="title">
-        <h1>{{ formatMessage(messages.authorizeAppNameLabel, { app_name: app.name }) }}</h1>
+        <h1>{{ formatMessage(messages.authorizeAppName, { app_name: app.name }) }}</h1>
       </div>
       <div class="auth-info">
         <div class="scope-heading">
           <IntlFormatted
-            :message-id="messages.appInfoLabel"
+            :message-id="messages.appInfo"
             :values="{
               appName: app.name,
               creatorUsername: createdBy.username,
@@ -61,12 +61,12 @@
         </Button>
         <Button class="wide-button" color="primary" large :action="onAuthorize" :disabled="pending">
           <CheckIcon />
-          {{ formatMessage(messages.authorizeButton) }}
+          {{ formatMessage(messages.authorize) }}
         </Button>
       </div>
       <div class="redirection-notice">
         <p class="redirect-instructions">
-          <IntlFormatted :message-id="messages.redirectUrlLabel" :values="{ url: redirectUri }">
+          <IntlFormatted :message-id="messages.redirectUrl" :values="{ url: redirectUri }">
             <template #redirect-url="{ children }">
               <span class="redirect-url">
                 <component :is="() => normalizeChildren(children)" />
@@ -89,25 +89,25 @@ import { useScopes } from '@/composables/auth/scopes.ts'
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
-  appInfoLabel: {
-    id: 'auth.authorize.label.app-info',
+  appInfo: {
+    id: 'auth.authorize.app-info',
     defaultMessage:
       '<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:',
   },
-  authorizeAppNameLabel: {
-    id: 'auth.authorize.label.authorize-app-name',
+  authorizeAppName: {
+    id: 'auth.authorize.authorize-app-name',
     defaultMessage: 'Authorize {app_name}',
   },
-  authorizeButton: {
-    id: 'auth.authorize.button.authorize',
+  authorize: {
+    id: 'auth.authorize.action.authorize',
     defaultMessage: 'Authorize',
   },
-  noLocationFoundError: {
-    id: 'auth.authorize.error.not-location-found',
+  noRedirectUrlError: {
+    id: 'auth.authorize.error.no-redirect-url',
     defaultMessage: 'No redirect location found in response',
   },
-  redirectUrlLabel: {
-    id: 'auth.authorize.label.redirect-url',
+  redirectUrl: {
+    id: 'auth.authorize.redirect-url',
     defaultMessage: 'You will be redirected to <redirect-url>{url}</redirect-url>',
   },
 })
@@ -187,7 +187,7 @@ const onAuthorize = async () => {
       return
     }
 
-    throw new Error(formatMessage(messages.noLocationFoundError))
+    throw new Error(formatMessage(messages.noRedirectUrlError))
   } catch (error) {
     data.$notify({
       group: 'main',
@@ -214,7 +214,7 @@ const onReject = async () => {
       return
     }
 
-    throw new Error(formatMessage(messages.noLocationFoundError))
+    throw new Error(formatMessage(messages.noRedirectUrlError))
   } catch (error) {
     data.$notify({
       group: 'main',

From 84809880b88f66e9e64460e9627efe8621f177c6 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sat, 27 Jan 2024 16:38:45 +0100
Subject: [PATCH 11/12] Apply suggestion from brawaru

---
 locales/en-US/index.json | 10 +++++-----
 pages/auth/authorize.vue | 18 +++++++++++-------
 utils/common-messages.ts |  4 ----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 729a6587ee..cd37523f63 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -2,11 +2,14 @@
   "auth.authorize.action.authorize": {
     "message": "Authorize"
   },
+  "auth.authorize.action.decline": {
+    "message": "Decline"
+  },
   "auth.authorize.app-info": {
-    "message": "<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:"
+    "message": "<strong>{appName}</strong> by <creator-link>{creator}</creator-link> will be able to:"
   },
   "auth.authorize.authorize-app-name": {
-    "message": "Authorize {app_name}"
+    "message": "Authorize {appName}"
   },
   "auth.authorize.error.no-redirect-url": {
     "message": "No redirect location found in response"
@@ -35,9 +38,6 @@
   "button.continue": {
     "message": "Continue"
   },
-  "button.decline": {
-    "message": "Decline"
-  },
   "button.edit": {
     "message": "Edit"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index d0ac3472a5..e864b95e39 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div class="title">
-        <h1>{{ formatMessage(messages.authorizeAppName, { app_name: app.name }) }}</h1>
+        <h1>{{ formatMessage(messages.title, { appName: app.name }) }}</h1>
       </div>
       <div class="auth-info">
         <div class="scope-heading">
@@ -57,7 +57,7 @@
       <div class="button-row">
         <Button class="wide-button" large :action="onReject" :disabled="pending">
           <XIcon />
-          {{ formatMessage(commonMessages.declineButton) }}
+          {{ formatMessage(messages.decline) }}
         </Button>
         <Button class="wide-button" color="primary" large :action="onAuthorize" :disabled="pending">
           <CheckIcon />
@@ -92,16 +92,16 @@ const messages = defineMessages({
   appInfo: {
     id: 'auth.authorize.app-info',
     defaultMessage:
-      '<strong>{appName}</strong> by <creator-link>{creatorUsername}</creator-link> will be able to:',
-  },
-  authorizeAppName: {
-    id: 'auth.authorize.authorize-app-name',
-    defaultMessage: 'Authorize {app_name}',
+      '<strong>{appName}</strong> by <creator-link>{creator}</creator-link> will be able to:',
   },
   authorize: {
     id: 'auth.authorize.action.authorize',
     defaultMessage: 'Authorize',
   },
+  decline: {
+    id: 'auth.authorize.action.decline',
+    defaultMessage: 'Decline',
+  },
   noRedirectUrlError: {
     id: 'auth.authorize.error.no-redirect-url',
     defaultMessage: 'No redirect location found in response',
@@ -110,6 +110,10 @@ const messages = defineMessages({
     id: 'auth.authorize.redirect-url',
     defaultMessage: 'You will be redirected to <redirect-url>{url}</redirect-url>',
   },
+  title: {
+    id: 'auth.authorize.authorize-app-name',
+    defaultMessage: 'Authorize {appName}',
+  },
 })
 
 const data = useNuxtApp()
diff --git a/utils/common-messages.ts b/utils/common-messages.ts
index 266dadff97..a976d187ed 100644
--- a/utils/common-messages.ts
+++ b/utils/common-messages.ts
@@ -15,10 +15,6 @@ export const commonMessages = defineMessages({
     id: 'tooltip.date-at-time',
     defaultMessage: '{date, date, long} at {time, time, short}',
   },
-  declineButton: {
-    id: 'button.decline',
-    defaultMessage: 'Decline',
-  },
   editButton: {
     id: 'button.edit',
     defaultMessage: 'Edit',

From 1aab835d1d46feea9d1d43cfb209fd0336a04a22 Mon Sep 17 00:00:00 2001
From: Mysterious-Dev <mysteriousdevs@gmail.com>
Date: Sat, 27 Jan 2024 16:57:54 +0100
Subject: [PATCH 12/12] Fix forgotten

---
 pages/auth/authorize.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index e864b95e39..bd434d1ca6 100644
--- a/pages/auth/authorize.vue
+++ b/pages/auth/authorize.vue
@@ -28,7 +28,7 @@
             :message-id="messages.appInfo"
             :values="{
               appName: app.name,
-              creatorUsername: createdBy.username,
+              creator: createdBy.username,
             }"
           >
             <template #strong="{ children }">