Merge pull request ChatGPTNextWeb#5093 from DDMeaqua/feat-i18n

feat: update i18n
xubuild · Aug 16, 2024 · f64763b · f64763b
2 parents 87325fa + e033bef
commit f64763b
Show file tree

Hide file tree

Showing 17 changed files with 5,705 additions and 1,687 deletions.
diff --git a/app/config/server.ts b/app/config/server.ts
@@ -1,5 +1,5 @@
 import md5 from "spark-md5";
-import { DEFAULT_MODELS } from "../constant";
+import { DEFAULT_MODELS, DEFAULT_GA_ID } from "../constant";
 
 declare global {
   namespace NodeJS {
@@ -211,6 +211,7 @@ export const getServerSideConfig = () => {
     cloudflareKVTTL: process.env.CLOUDFLARE_KV_TTL,
 
     gtmId: process.env.GTM_ID,
+    gaId: process.env.GA_ID || DEFAULT_GA_ID,
 
     needCode: ACCESS_CODES.size > 0,
     code: process.env.CODE,

diff --git a/app/constant.ts b/app/constant.ts
@@ -474,4 +474,5 @@ export const internalAllowedWebDavEndpoints = [
   "https://app.koofr.net/dav/Koofr",
 ];
 
+export const DEFAULT_GA_ID = "G-89WN60ZK2E";
 export const PLUGINS = [{ name: "Stable Diffusion", path: Path.Sd }];
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -6,7 +6,7 @@ import { getClientConfig } from "./config/client";
 import type { Metadata, Viewport } from "next";
 import { SpeedInsights } from "@vercel/speed-insights/next";
 import { getServerSideConfig } from "./config/server";
-import { GoogleTagManager } from "@next/third-parties/google";
+import { GoogleTagManager, GoogleAnalytics } from "@next/third-parties/google";
 const serverConfig = getServerSideConfig();
 
 export const metadata: Metadata = {
@@ -56,6 +56,11 @@ export default function RootLayout({
             <GoogleTagManager gtmId={serverConfig.gtmId} />
           </>
         )}
+        {serverConfig?.gaId && (
+          <>
+            <GoogleAnalytics gaId={serverConfig.gaId} />
+          </>
+        )}
       </body>
     </html>
   );