From 4f3db7e5e6bd8d8b1187a0cf7fceff8bcdc1d511 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 9 Dec 2024 17:31:10 +0800
Subject: [PATCH 1/2] Release/1.4.2 (#1200)

---
 internal/migrations/migrations.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go
index 00e441985..6160ca881 100644
--- a/internal/migrations/migrations.go
+++ b/internal/migrations/migrations.go
@@ -99,7 +99,7 @@ var migrations = []Migration{
 	NewMigration("v1.3.6", "add hot score to question table", addQuestionHotScore, true),
 	NewMigration("v1.4.0", "add badge/badge_group/badge_award table", addBadges, true),
 	NewMigration("v1.4.1", "add question link", addQuestionLink, true),
-	NewMigration("v1.4.2", "add the number of question links", addQuestionLinkedCount, false),
+	NewMigration("v1.4.2", "add the number of question links", addQuestionLinkedCount, true),
 }
 
 func GetMigrations() []Migration {

From 4324eece92035cade141c4db0f8885f1b305f1e1 Mon Sep 17 00:00:00 2001
From: mindslayer001 <manisankarchintagunti@gmail.com>
Date: Mon, 30 Dec 2024 13:43:29 +0530
Subject: [PATCH 2/2] ui: Added privacy policy and terms of service link in the
 footer( solved #1187)

---
 i18n/en_US.yaml                    |  2 ++
 ui/src/components/Footer/index.tsx | 33 ++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 9d9046222..f811fca23 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1177,6 +1177,8 @@ ui:
     build_on: >-
       Powered by <1> Apache Answer </1>- the open-source software that powers Q&A
       communities.<br />Made with love © {{cc}}.
+    privacy: Privacy Policy
+    terms_of_service: Terms of Service
   upload_img:
     name: Change
     loading: loading...
diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsx
index 506e0cade..f437413ea 100644
--- a/ui/src/components/Footer/index.tsx
+++ b/ui/src/components/Footer/index.tsx
@@ -19,29 +19,46 @@
 
 import React from 'react';
 import { Container } from 'react-bootstrap';
-import { Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 
 import dayjs from 'dayjs';
 
 import { siteInfoStore } from '@/stores';
 
-const Index = () => {
+const Footer = () => {
+  const { t } = useTranslation('translation', { keyPrefix: 'footer' }); // Scoped translations for footer
   const fullYear = dayjs().format('YYYY');
   const siteName = siteInfoStore((state) => state.siteInfo.name);
   const cc = `${fullYear} ${siteName}`;
+
   return (
     <footer className="bg-light">
       <Container className="py-3">
         <p className="text-center mb-0 small text-secondary">
-          <Trans i18nKey="footer.build_on" values={{ cc }}>
-            Powered by
-            {/* eslint-disable-next-line react/jsx-no-target-blank */}
-            <a href="https://answer.apache.org" target="_blank">
+          <a
+            className="me-2"
+            href="/privacy"
+            target="_blank"
+            rel="noopener noreferrer">
+            {t('privacy')} {/* Fetch translated Privacy Policy text */}
+          </a>
+          <a href="/tos" target="_blank" rel="noopener noreferrer">
+            {t('terms_of_service')}{' '}
+            {/* Fetch translated Terms of Service text */}
+          </a>
+        </p>
+        <p className="text-center mb-0 small text-secondary">
+          <Trans i18nKey="build_on" values={{ cc }}>
+            Powered by{' '}
+            <a
+              href="https://answer.apache.org"
+              target="_blank"
+              rel="noopener noreferrer">
               Apache Answer
             </a>
             - the open-source software that powers Q&A communities.
             <br />
-            Made with love. © 2022 Answer.
+            Made with love © 2022 Answer.
           </Trans>
         </p>
       </Container>
@@ -49,4 +66,4 @@ const Index = () => {
   );
 };
 
-export default React.memo(Index);
+export default React.memo(Footer);