From 7bcd217e4a0d1799ebf64514cdecfd1e6efc2671 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Tue, 16 Sep 2025 09:48:45 -0500
Subject: [PATCH] chore: handle merge conflicts

---
 src/plugins/vite/namespaces-i18n-plugin.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/vite/namespaces-i18n-plugin.ts b/src/plugins/vite/namespaces-i18n-plugin.ts
index 5ac59bb5481..0ae095d9b68 100644
--- a/src/plugins/vite/namespaces-i18n-plugin.ts
+++ b/src/plugins/vite/namespaces-i18n-plugin.ts
@@ -3,7 +3,7 @@ import path from "path";
 import { normalizePath, type Plugin as VitePlugin } from "vite";
 import "#app/plugins/utils-plugins";
 import { isFileInsideDir, namespaceMap, objectSwap } from "#app/plugins/utils-plugins";
-import { kebabCaseToCamelCase } from "#app/utils/strings";
+import { toCamelCase } from "#app/utils/strings";
 
 const namespaceMapSwap = objectSwap(namespaceMap);
 
@@ -36,16 +36,16 @@ function processDirectory(file: string, filePath: string, namespace: string[]) {
     let ns = subNameSpace;
     if (namespaceMapSwap[file.replace(".json", "")]) {
       ns = namespaceMapSwap[file.replace(".json", "")];
-    } else if (kebabCaseToCamelCase(file).replace(".json", "").startsWith("mysteryEncounters")) {
+    } else if (toCamelCase(file).replace(".json", "").startsWith("mysteryEncounters")) {
       ns = subNameSpace.replace(/Dialogue$/, "");
     }
     // format "directory/namespace" for namespace in folder
-    namespace.push(`${kebabCaseToCamelCase(file).replace(".json", "")}/${ns}`);
+    namespace.push(`${toCamelCase(file).replace(".json", "")}/${ns}`);
   }
 }
 
 function processJsonFile(file: string, namespace: string[]) {
-  let ns = kebabCaseToCamelCase(file).replace(".json", "");
+  let ns = toCamelCase(file).replace(".json", "");
   if (namespaceMapSwap[file.replace(".json", "")]) {
     ns = namespaceMapSwap[file.replace(".json", "")];
   }