Revert "fix: refactor i18n loadTranslations and set timeout to 3s (calcom#22633)"

This reverts commit 6ff20b9.

Author: emrysal

apps/web/test/lib/handleChildrenEventTypes.test.ts

@@ -26,12 +26,7 @@ vi.mock("@calcom/emails/email-manager", () => {
 
 vi.mock("@calcom/lib/server/i18n", () => {
   return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
+    getTranslation: (key: string) => key,
   };
 });
 

packages/features/ee/billing/credit-service.test.ts

@@ -25,17 +25,6 @@ vi.mock("@calcom/prisma", () => {
 
 vi.mock("stripe");
 
-vi.mock("@calcom/lib/server/i18n", () => {
-  return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
-  };
-});
-
 vi.mock("@calcom/lib/constants", async () => {
   const actual = (await vi.importActual("@calcom/lib/constants")) as typeof import("@calcom/lib/constants");
   return {

packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts

@@ -43,17 +43,6 @@ vi.mock("@calcom/lib/domainManager/organization", () => ({
   createDomain: vi.fn(),
 }));
 
-vi.mock("@calcom/lib/server/i18n", () => {
-  return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
-  };
-});
-
 const mockOrganizationOnboarding = {
   name: "Test Org",
   slug: "test-org",

packages/features/ee/workflows/lib/reminders/reminderScheduler.test.ts

@@ -17,16 +17,6 @@ vi.mock("@calcom/features/ee/workflows/lib/reminders/providers/emailProvider", (
   sendOrScheduleWorkflowEmails: vi.fn(),
 }));
 
-vi.mock("@calcom/lib/server/i18n", () => {
-  return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
-  };
-});
 describe("reminderScheduler", () => {
   beforeEach(() => {
     vi.clearAllMocks();

packages/features/ee/workflows/lib/test/compareReminderBodyToTemplate.test.ts

@@ -1,5 +1,5 @@
 import { createInstance } from "i18next";
-import { vi, expect, test, describe } from "vitest";
+import { expect, test, describe } from "vitest";
 
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { TimeFormat } from "@calcom/lib/timeFormat";
@@ -10,17 +10,6 @@ import { getTemplateBodyForAction } from "../actionHelperFunctions";
 import compareReminderBodyToTemplate from "../compareReminderBodyToTemplate";
 import plainTextReminderTemplates from "../reminders/templates/plainTextTemplates";
 
-vi.mock("@calcom/lib/server/i18n", () => {
-  return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
-  };
-});
-
 const translation = async () => {
   const _i18n = createInstance();
   await _i18n.init({

packages/lib/fetchWithTimeout.ts

@@ -1,48 +1,72 @@
 import { createInstance } from "i18next";
 
-import { i18n } from "@calcom/config/next-i18next.config";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 
-import { fetchWithTimeout } from "../fetchWithTimeout";
-import logger from "../logger";
-
 const translationCache = new Map<string, Record<string, string>>();
 const i18nInstanceCache = new Map<string, any>();
-const SUPPORTED_NAMESPACES = ["common"];
+
+/**
+ * Loads English fallback translations for when requested locale translations fail
+ * Implements caching to avoid redundant network requests
+ * @returns {Promise<Record<string, string>>} English translations object or empty object on failure
+ */
+async function loadFallbackTranslations() {
+  const cacheKey = "en-common";
+
+  if (translationCache.has(cacheKey)) {
+    return translationCache.get(cacheKey);
+  }
+
+  try {
+    const res = await fetch(`${WEBAPP_URL}/static/locales/en/common.json`, {
+      cache: process.env.NODE_ENV === "production" ? "force-cache" : "no-store",
+    });
+
+    if (!res.ok) {
+      throw new Error(`Failed to fetch fallback translations: ${res.status}`);
+    }
+
+    const translations = await res.json();
+    translationCache.set(cacheKey, translations);
+    return translations;
+  } catch (error) {
+    console.error("Could not fetch fallback translations:", error);
+    return {};
+  }
+}
 
 /**
  * Loads translations for a specific locale and namespace with optimized caching
  * @param {string} _locale - The locale code (e.g., 'en', 'fr', 'zh')
  * @param {string} ns - The namespace for the translations
  * @returns {Promise<Record<string, string>>} Translations object or fallback translations on failure
  */
-export async function loadTranslations(_locale: string, _ns: string) {
-  let locale = _locale === "zh" ? "zh-CN" : _locale;
-  locale = i18n.locales.includes(locale) ? locale : "en";
-  const ns = SUPPORTED_NAMESPACES.includes(_ns) ? _ns : "common";
+export async function loadTranslations(_locale: string, ns: string) {
+  const locale = _locale === "zh" ? "zh-CN" : _locale;
   const cacheKey = `${locale}-${ns}`;
 
   if (translationCache.has(cacheKey)) {
     return translationCache.get(cacheKey);
   }
 
-  const url = `${WEBAPP_URL}/static/locales/${locale}/${ns}.json`;
-  const response = await fetchWithTimeout(
-    url,
-    {
+  try {
+    const url = `${WEBAPP_URL}/static/locales/${locale}/${ns}.json`;
+    const response = await fetch(url, {
       cache: process.env.NODE_ENV === "production" ? "force-cache" : "no-store",
-    },
-    3000
-  );
+    });
 
-  if (!response.ok) {
-    logger.error(`Failed to fetch translations: ${response.status}`);
-    return {};
-  }
+    if (!response.ok) {
+      throw new Error(`Failed to fetch translations: ${response.status}`);
+    }
 
-  const translations = await response.json();
-  translationCache.set(cacheKey, translations);
-  return translations;
+    const translations = await response.json();
+    translationCache.set(cacheKey, translations);
+    return translations;
+  } catch (error) {
+    console.warn(`Failed to load translations for ${locale}/${ns}, falling back to English:`, error);
+    const fallbackTranslations = await loadFallbackTranslations();
+    return fallbackTranslations;
+  }
 }
 
 /**

packages/lib/server/i18n.ts

@@ -9,11 +9,8 @@ import { UserRepository } from "./user";
 
 vi.mock("@calcom/lib/server/i18n", () => {
   return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
+    getTranslation: (key: string) => {
+      return () => key;
     },
   };
 });

packages/lib/server/repository/user.test.ts

@@ -11,11 +11,8 @@ import { UserCreationService } from "./userCreationService";
 
 vi.mock("@calcom/lib/server/i18n", () => {
   return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
+    getTranslation: (key: string) => {
+      return () => key;
     },
   };
 });