Merge pull request #1386 from crupest/dev

Develop.

1 files changed, 4 insertions, 27 deletions

diff --git a/FrontEnd/src/common.ts b/FrontEnd/src/common.ts
index b819d209..965f9933 100644
--- a/FrontEnd/src/common.ts
+++ b/FrontEnd/src/common.ts
@@ -1,33 +1,10 @@
-import { TFunction } from "i18next";
-
 // This error is thrown when ui goes wrong with bad logic.
 // Such as a variable should not be null, but it does.
 // This error should never occur. If it does, it indicates there is some logic bug in codes.
 export class UiLogicError extends Error {}
 
-export type I18nText =
-  | string
-  | { type: "custom"; value: string }
-  | { type: "i18n"; value: string };
-
-export function convertI18nText(text: I18nText, t: TFunction): string;
-export function convertI18nText(
-  text: I18nText | null | undefined,
-  t: TFunction
-): string | null;
-export function convertI18nText(
-  text: I18nText | null | undefined,
-  t: TFunction
-): string | null {
-  if (text == null) {
-    return null;
-  } else if (typeof text === "string") {
-    return t(text);
-  } else if (text.type === "i18n") {
-    return t(text.value);
-  } else {
-    return text.value;
-  }
-}
-
 export const highlightTimelineUsername = "crupest";
+
+export type { I18nText } from "./i18n";
+export { c, convertI18nText } from "./i18n";
+export { default as useC } from "./utilities/hooks/use-c";