From 5aa17648482b66a06ec69f0ab05151ffd8de0860 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:59:08 +0100
Subject: [PATCH] Add translation keys for authorize page (#1594)

* Begin Work

* Error label

* WIP

* Finish button & add authorize label

* Redirect URL Label

* Reorganize

* Finish work

* Fix lint error

* camelCase !

* Normalization

* Apply suggestion from brawaru

* Fix forgotten
---
 locales/en-US/index.json | 21 +++++++++++
 pages/auth/authorize.vue | 78 ++++++++++++++++++++++++++++++++--------
 utils/common-messages.ts |  4 +++
 3 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/locales/en-US/index.json b/locales/en-US/index.json
index 709d83257..db44837d0 100644
--- a/locales/en-US/index.json
+++ b/locales/en-US/index.json
@@ -1,4 +1,22 @@
 {
+  "auth.authorize.action.authorize": {
+    "message": "Authorize"
+  },
+  "auth.authorize.action.decline": {
+    "message": "Decline"
+  },
+  "auth.authorize.app-info": {
+    "message": "<strong>{appName}</strong> by <creator-link>{creator}</creator-link> will be able to:"
+  },
+  "auth.authorize.authorize-app-name": {
+    "message": "Authorize {appName}"
+  },
+  "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.reset-password.method-choice.action": {
     "message": "Send recovery email"
   },
@@ -278,6 +296,9 @@
   "label.description": {
     "message": "Description"
   },
+  "label.error": {
+    "message": "Error"
+  },
   "label.followed-projects": {
     "message": "Followed projects"
   },
diff --git a/pages/auth/authorize.vue b/pages/auth/authorize.vue
index e0f30aea0..bd434d1ca 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>
@@ -20,15 +20,28 @@
         </div>
       </div>
       <div class="title">
-        <h1>Authorize {{ app.name }}</h1>
+        <h1>{{ formatMessage(messages.title, { appName: app.name }) }}</h1>
       </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.appInfo"
+            :values="{
+              appName: app.name,
+              creator: 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">
@@ -44,17 +57,22 @@
       <div class="button-row">
         <Button class="wide-button" large :action="onReject" :disabled="pending">
           <XIcon />
-          Decline
+          {{ formatMessage(messages.decline) }}
         </Button>
         <Button class="wide-button" color="primary" large :action="onAuthorize" :disabled="pending">
           <CheckIcon />
-          Authorize
+          {{ formatMessage(messages.authorize) }}
         </Button>
       </div>
       <div class="redirection-notice">
         <p class="redirect-instructions">
-          You will be redirected to
-          <span class="redirect-url">{{ redirectUri }}</span>
+          <IntlFormatted :message-id="messages.redirectUrl" :values="{ url: redirectUri }">
+            <template #redirect-url="{ children }">
+              <span class="redirect-url">
+                <component :is="() => normalizeChildren(children)" />
+              </span>
+            </template>
+          </IntlFormatted>
         </p>
       </div>
     </div>
@@ -68,6 +86,36 @@ import { useAuth } from '@/composables/auth.js'
 
 import { useScopes } from '@/composables/auth/scopes.ts'
 
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+  appInfo: {
+    id: 'auth.authorize.app-info',
+    defaultMessage:
+      '<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',
+  },
+  redirectUrl: {
+    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()
 
 const router = useRoute()
@@ -143,11 +191,11 @@ const onAuthorize = async () => {
       return
     }
 
-    throw new Error('No redirect location found in response')
+    throw new Error(formatMessage(messages.noRedirectUrlError))
   } 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 +218,11 @@ const onReject = async () => {
       return
     }
 
-    throw new Error('No redirect location found in response')
+    throw new Error(formatMessage(messages.noRedirectUrlError))
   } catch (error) {
     data.$notify({
       group: 'main',
-      title: 'An error occurred',
+      title: formatMessage(commonMessages.errorNotificationTitle),
       text: err.data ? err.data.description : err,
       type: 'error',
     })
diff --git a/utils/common-messages.ts b/utils/common-messages.ts
index e2658b4dd..70c6ebdd2 100644
--- a/utils/common-messages.ts
+++ b/utils/common-messages.ts
@@ -35,6 +35,10 @@ export const commonMessages = defineMessages({
     id: 'button.edit',
     defaultMessage: 'Edit',
   },
+  errorLabel: {
+    id: 'label.error',
+    defaultMessage: 'Error',
+  },
   errorNotificationTitle: {
     id: 'notification.error.title',
     defaultMessage: 'An error occurred',