mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-23 15:03:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: handle merge conflicts

Browse Source
This commit is contained in:
Sirz Benjie 2025-09-16 09:48:45 -05:00
parent 079fe97109
commit 7bcd217e4a
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vite/namespaces-i18n-plugin.ts
View File

@ -3,7 +3,7 @@ import path from "path";
import { normalizePath, type Plugin as VitePlugin } from "vite"; import { normalizePath, type Plugin as VitePlugin } from "vite";
import "#app/plugins/utils-plugins"; import "#app/plugins/utils-plugins";
import { isFileInsideDir, namespaceMap, objectSwap } from "#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); const namespaceMapSwap = objectSwap(namespaceMap);
@ -36,16 +36,16 @@ function processDirectory(file: string, filePath: string, namespace: string[]) {
let ns = subNameSpace; let ns = subNameSpace;
if (namespaceMapSwap[file.replace(".json", "")]) { if (namespaceMapSwap[file.replace(".json", "")]) {
ns = 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$/, ""); ns = subNameSpace.replace(/Dialogue$/, "");
} }
// format "directory/namespace" for namespace in folder // 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[]) { function processJsonFile(file: string, namespace: string[]) {
let ns = kebabCaseToCamelCase(file).replace(".json", ""); let ns = toCamelCase(file).replace(".json", "");
if (namespaceMapSwap[file.replace(".json", "")]) { if (namespaceMapSwap[file.replace(".json", "")]) {
ns = namespaceMapSwap[file.replace(".json", "")]; ns = namespaceMapSwap[file.replace(".json", "")];
} }