feat: add to support en & zh language.

Vilsol · Jan 24, 2024 · 30aec8a · 30aec8a
1 parent 258c8cf
commit 30aec8a
Show file tree

Hide file tree

Showing 24 changed files with 349 additions and 117 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,5 @@
+.PHONY: wasm
+wasm:
+	GOOS=js GOARCH=wasm go build -ldflags="-s -w" -v -o frontend/static/calculator.wasm ./wasm
+dev: wasm
+	cd frontend; bun run dev
diff --git a/data/main.go b/data/main.go
@@ -3,9 +3,12 @@ package data
 import (
 	"bytes"
 	"compress/gzip"
-	_ "embed"
+	"embed"
 	"encoding/json"
+	"fmt"
 	"io"
+	"regexp"
+	"strings"
 )
 
 //go:embed alternate_passive_additions.json.gz
@@ -45,17 +48,8 @@ var skillTreeGz []byte
 var SkillTreeJSON []byte
 var SkillTreeData SkillTree
 
-//go:embed stat_descriptions.json.gz
-var statTranslationsGz []byte
-var StatTranslationsJSON []byte
-
-//go:embed passive_skill_stat_descriptions.json.gz
-var passiveSkillStatTranslationsGz []byte
-var PassiveSkillStatTranslationsJSON []byte
-
-//go:embed passive_skill_aura_stat_descriptions.json.gz
-var passiveSkillAuraStatTranslationsGz []byte
-var PassiveSkillAuraStatTranslationsJSON []byte
+//go:embed trs/*
+var trs embed.FS
 
 //go:embed possible_stats.json.gz
 var possibleStatsGz []byte
@@ -116,13 +110,45 @@ func init() {
 		panic(err)
 	}
 
-	StatTranslationsJSON = unzipTo(statTranslationsGz)
-	PassiveSkillStatTranslationsJSON = unzipTo(passiveSkillStatTranslationsGz)
-	PassiveSkillAuraStatTranslationsJSON = unzipTo(passiveSkillAuraStatTranslationsGz)
-
 	PossibleStatsJSON = unzipTo(possibleStatsGz)
 }
 
+func getLocale(locale string) string {
+	matches := regexp.MustCompile(`(?mi)en|zh`).FindStringSubmatch(locale)
+	if len(matches) > 0 {
+		return strings.ToLower(matches[0])
+	}
+
+	return "en"
+}
+
+func StatTranslationsJSON(locale string) string {
+	var gz, err = trs.ReadFile(fmt.Sprintf("trs/%s/stat_descriptions.json.gz", getLocale(locale)))
+	if err != nil {
+		panic(err)
+	}
+
+	return string(unzipTo(gz))
+}
+
+func PassiveSkillStatTranslationsJSON(locale string) string {
+	var gz, err = trs.ReadFile(fmt.Sprintf("trs/%s/passive_skill_stat_descriptions.json.gz", getLocale(locale)))
+	if err != nil {
+		panic(err)
+	}
+
+	return string(unzipTo(gz))
+}
+
+func PassiveSkillAuraStatTranslationsJSON(locale string) string {
+	var gz, err = trs.ReadFile(fmt.Sprintf("trs/%s/passive_skill_aura_stat_descriptions.json.gz", getLocale(locale)))
+	if err != nil {
+		panic(err)
+	}
+
+	return string(unzipTo(gz))
+}
+
 func unzipJSONTo[T any](data []byte) T {
 	var out = new(T)
 	if err := json.Unmarshal(unzipTo(data), &out); err != nil {

diff --git a/data/main_test.go b/data/main_test.go
@@ -0,0 +1,14 @@
+package data
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_getLocale(t *testing.T) {
+	assert.Equal(t, getLocale("zh-CN"), "zh")
+	assert.Equal(t, getLocale("zh-TW"), "zh")
+	assert.Equal(t, getLocale("en-US"), "en")
+	assert.Equal(t, getLocale("other"), "en")
+}
diff --git a/...sive_skill_aura_stat_descriptions.json.gz → ...sive_skill_aura_stat_descriptions.json.gz b/...sive_skill_aura_stat_descriptions.json.gz → ...sive_skill_aura_stat_descriptions.json.gz
diff --git a/data/passive_skill_stat_descriptions.json.gz → ...n/passive_skill_stat_descriptions.json.gz b/data/passive_skill_stat_descriptions.json.gz → ...n/passive_skill_stat_descriptions.json.gz
diff --git a/data/stat_descriptions.json.gz → data/trs/en/stat_descriptions.json.gz b/data/stat_descriptions.json.gz → data/trs/en/stat_descriptions.json.gz
diff --git a/data/trs/zh/passive_skill_aura_stat_descriptions.json.gz b/data/trs/zh/passive_skill_aura_stat_descriptions.json.gz
diff --git a/data/trs/zh/passive_skill_stat_descriptions.json.gz b/data/trs/zh/passive_skill_stat_descriptions.json.gz
diff --git a/data/trs/zh/stat_descriptions.json.gz b/data/trs/zh/stat_descriptions.json.gz
diff --git a/frontend/bun.lockb b/frontend/bun.lockb
diff --git a/frontend/package.json b/frontend/package.json
@@ -37,5 +37,8 @@
     "typescript": "^5.2.2",
     "vite": "^4.4.9"
   },
-  "type": "module"
+  "type": "module",
+  "dependencies": {
+    "svelte-i18n": "^4.0.0"
+  }
 }
diff --git a/frontend/src/i18n.ts b/frontend/src/i18n.ts
@@ -0,0 +1,11 @@
+import { addMessages, getLocaleFromNavigator, init } from 'svelte-i18n';
+
+import locales from './locales.json';
+
+addMessages('en', locales.en);
+addMessages('zh', locales.zh);
+
+init({
+  fallbackLocale: 'en',
+  initialLocale: getLocaleFromNavigator()
+});
diff --git a/frontend/src/lib/skill_tree.ts b/frontend/src/lib/skill_tree.ts
@@ -1,4 +1,4 @@
-import type { Translation, Node, SkillTreeData, Group, Sprite, TranslationFile } from './skill_tree_types';
+import type { Group, Node, SkillTreeData, Sprite, Translation, TranslationFile } from './skill_tree_types';
 import { data } from './types';
 
 export let skillTree: SkillTreeData;
@@ -13,7 +13,7 @@ export const inverseTranslations: Record<string, Translation> = {};
 
 export const passiveToTree: Record<number, number> = {};
 
-export const loadSkillTree = () => {
+export const loadSkillTree = (locale: string) => {
   skillTree = JSON.parse(data.SkillTree);
   console.log('Loaded skill tree', skillTree);
 
@@ -94,7 +94,7 @@ export const loadSkillTree = () => {
   ];
 
   translationFiles.forEach((f) => {
-    const translations: TranslationFile = JSON.parse(f);
+    const translations: TranslationFile = JSON.parse(f(locale));
 
     translations.descriptors.forEach((t) => {
       t.ids.forEach((id) => {

diff --git a/frontend/src/lib/sync_worker.ts b/frontend/src/lib/sync_worker.ts
@@ -1,7 +1,7 @@
 import { expose } from 'comlink';
 import '../wasm_exec.js';
+import type { ReverseSearchConfig, SearchResults, SearchWithSeed } from './skill_tree';
 import { loadSkillTree, passiveToTree } from './skill_tree';
-import type { SearchWithSeed, ReverseSearchConfig, SearchResults } from './skill_tree';
 import { calculator, initializeCrystalline } from './types';
 
 const obj = {
@@ -14,7 +14,7 @@ const obj = {
 
       initializeCrystalline();
 
-      loadSkillTree();
+      loadSkillTree(navigator.language || 'en');
     });
   },
   async search(args: ReverseSearchConfig, callback: (seed: number) => Promise<void>): Promise<SearchResults> {

diff --git a/frontend/src/lib/types/index.d.ts b/frontend/src/lib/types/index.d.ts
@@ -1,7 +1,18 @@
 /* eslint-disable */
 export declare namespace calculator {
-  function Calculate(passiveID: number, seed: number, timelessJewelType: number, conqueror: string): data.AlternatePassiveSkillInformation;
-  function ReverseSearch(passiveIDs?: Array<number>, statIDs?: Array<number>, timelessJewelType: number, conqueror: string, updates: (arg1: number) => Promise<void>): Promise<(Record<number, Record<number, Record<number, number> | undefined> | undefined> | undefined)>;
+  function Calculate(
+    passiveID: number,
+    seed: number,
+    timelessJewelType: number,
+    conqueror: string
+  ): data.AlternatePassiveSkillInformation;
+  function ReverseSearch(
+    passiveIDs?: Array<number>,
+    statIDs?: Array<number>,
+    timelessJewelType: number,
+    conqueror: string,
+    updates: (arg1: number) => Promise<void>
+  ): Promise<Record<number, Record<number, Record<number, number> | undefined> | undefined> | undefined>;
 }
 export declare namespace data {
   interface AlternatePassiveAddition {
@@ -15,7 +26,7 @@ export declare namespace data {
     Stat2Min: number;
     Stat2Max: number;
     PassiveType?: Array<number>;
-    GetStatMinMax(min: boolean, index: number): number;
+    GetStatMinMax(arg1: boolean, arg2: number): number;
   }
   interface AlternatePassiveAdditionInformation {
     AlternatePassiveAddition?: data.AlternatePassiveAddition;
@@ -41,7 +52,7 @@ export declare namespace data {
     RandomMin: number;
     RandomMax: number;
     ConquerorVersion: number;
-    GetStatMinMax(min: boolean, index: number): number;
+    GetStatMinMax(arg1: boolean, arg2: number): number;
   }
   interface AlternatePassiveSkillInformation {
     AlternatePassiveSkill?: data.AlternatePassiveSkill;
@@ -73,19 +84,21 @@ export declare namespace data {
     Index: number;
     Version: number;
   }
-  function GetAlternatePassiveAdditionByIndex(index: number): (data.AlternatePassiveAddition | undefined);
-  function GetAlternatePassiveSkillByIndex(index: number): (data.AlternatePassiveSkill | undefined);
-  function GetPassiveSkillByIndex(index: number): (data.PassiveSkill | undefined);
-  function GetStatByIndex(index: number): (data.Stat | undefined);
-  const PassiveSkillAuraStatTranslationsJSON: string;
-  const PassiveSkillStatTranslationsJSON: string;
+  function GetAlternatePassiveAdditionByIndex(index: number): data.AlternatePassiveAddition | undefined;
+  function GetAlternatePassiveSkillByIndex(index: number): data.AlternatePassiveSkill | undefined;
+  function GetPassiveSkillByIndex(index: number): data.PassiveSkill | undefined;
+  function GetStatByIndex(index: number): data.Stat | undefined;
+  function StatTranslationsJSON(locale: string): string;
+  function PassiveSkillAuraStatTranslationsJSON(locale: string): string;
+  function PassiveSkillStatTranslationsJSON(locale: string): string;
   const PassiveSkills: Array<data.PassiveSkill | undefined> | undefined;
   const PossibleStats: string;
   const SkillTree: string;
-  const StatTranslationsJSON: string;
-  const TimelessJewelConquerors: Record<number, Record<string, data.TimelessJewelConqueror | undefined> | undefined> | undefined;
+  const TimelessJewelConquerors:
+    | Record<number, Record<string, data.TimelessJewelConqueror | undefined> | undefined>
+    | undefined;
   const TimelessJewelSeedRanges: Record<number, data.Range> | undefined;
   const TimelessJewels: Record<number, string> | undefined;
   const TreeToPassive: Record<number, data.PassiveSkill | undefined> | undefined;
 }
-export const initializeCrystalline: () => void;
+export const initializeCrystalline: () => void;
diff --git a/frontend/src/lib/types/index.js b/frontend/src/lib/types/index.js
@@ -4,23 +4,25 @@ export let data;
 
 export const initializeCrystalline = () => {
   calculator = {
-    Calculate: globalThis["go"]["timeless-jewels"]["calculator"]["Calculate"],
-    ReverseSearch: globalThis["go"]["timeless-jewels"]["calculator"]["ReverseSearch"],
-  }
+    Calculate: globalThis['go']['timeless-jewels']['calculator']['Calculate'],
+    ReverseSearch: globalThis['go']['timeless-jewels']['calculator']['ReverseSearch']
+  };
   data = {
-    GetAlternatePassiveAdditionByIndex: globalThis["go"]["timeless-jewels"]["data"]["GetAlternatePassiveAdditionByIndex"],
-    GetAlternatePassiveSkillByIndex: globalThis["go"]["timeless-jewels"]["data"]["GetAlternatePassiveSkillByIndex"],
-    GetPassiveSkillByIndex: globalThis["go"]["timeless-jewels"]["data"]["GetPassiveSkillByIndex"],
-    GetStatByIndex: globalThis["go"]["timeless-jewels"]["data"]["GetStatByIndex"],
-    PassiveSkillAuraStatTranslationsJSON: globalThis["go"]["timeless-jewels"]["data"]["PassiveSkillAuraStatTranslationsJSON"],
-    PassiveSkillStatTranslationsJSON: globalThis["go"]["timeless-jewels"]["data"]["PassiveSkillStatTranslationsJSON"],
-    PassiveSkills: globalThis["go"]["timeless-jewels"]["data"]["PassiveSkills"],
-    PossibleStats: globalThis["go"]["timeless-jewels"]["data"]["PossibleStats"],
-    SkillTree: globalThis["go"]["timeless-jewels"]["data"]["SkillTree"],
-    StatTranslationsJSON: globalThis["go"]["timeless-jewels"]["data"]["StatTranslationsJSON"],
-    TimelessJewelConquerors: globalThis["go"]["timeless-jewels"]["data"]["TimelessJewelConquerors"],
-    TimelessJewelSeedRanges: globalThis["go"]["timeless-jewels"]["data"]["TimelessJewelSeedRanges"],
-    TimelessJewels: globalThis["go"]["timeless-jewels"]["data"]["TimelessJewels"],
-    TreeToPassive: globalThis["go"]["timeless-jewels"]["data"]["TreeToPassive"],
-  }
-}
+    GetAlternatePassiveAdditionByIndex:
+      globalThis['go']['timeless-jewels']['data']['GetAlternatePassiveAdditionByIndex'],
+    GetAlternatePassiveSkillByIndex: globalThis['go']['timeless-jewels']['data']['GetAlternatePassiveSkillByIndex'],
+    GetPassiveSkillByIndex: globalThis['go']['timeless-jewels']['data']['GetPassiveSkillByIndex'],
+    GetStatByIndex: globalThis['go']['timeless-jewels']['data']['GetStatByIndex'],
+    PassiveSkillAuraStatTranslationsJSON:
+      globalThis['go']['timeless-jewels']['data']['PassiveSkillAuraStatTranslationsJSON'],
+    PassiveSkillStatTranslationsJSON: globalThis['go']['timeless-jewels']['data']['PassiveSkillStatTranslationsJSON'],
+    PassiveSkills: globalThis['go']['timeless-jewels']['data']['PassiveSkills'],
+    PossibleStats: globalThis['go']['timeless-jewels']['data']['PossibleStats'],
+    SkillTree: globalThis['go']['timeless-jewels']['data']['SkillTree'],
+    StatTranslationsJSON: globalThis['go']['timeless-jewels']['data']['StatTranslationsJSON'],
+    TimelessJewelConquerors: globalThis['go']['timeless-jewels']['data']['TimelessJewelConquerors'],
+    TimelessJewelSeedRanges: globalThis['go']['timeless-jewels']['data']['TimelessJewelSeedRanges'],
+    TimelessJewels: globalThis['go']['timeless-jewels']['data']['TimelessJewels'],
+    TreeToPassive: globalThis['go']['timeless-jewels']['data']['TreeToPassive']
+  };
+};