[SRO] Organize DM-l10n strings

libs/sr/dm-localization/src/executors/gen-locale/executor.ts

@@ -16,12 +16,17 @@ const runExecutor: PromiseExecutor<GenLocaleExecutorSchema> = async (
       //general manual localization namespaces
       if (
         [
+          'characters',
           'charNames',
+          'common',
+          'lightCones',
           'lightConeNames',
+          'relics',
           'relicNames',
-          'sheet',
-          'slotKey',
+          'paths',
           'statKey',
+          'teams',
+          'ui',
         ].includes(type)
       )
         return dumpFile(`${fileDir}/${type}_gen.json`, typeData)

libs/sr/dm-localization/src/executors/gen-locale/lib/charHashData.ts → libs/sr/dm-localization/src/executors/gen-locale/lib/charHashData/allCharacters.ts

@@ -14,7 +14,7 @@ import {
   avatarSkillTreeConfig,
   characterIdMap,
 } from '@genshin-optimizer/sr/dm'
-import { convertToHash } from './util'
+import { convertToHash } from '../util'
 
 type CharData = {
   name: string
@@ -128,4 +128,4 @@ const charArray = Object.entries(avatarConfig).map(([charId, charConfig]) => {
 
 const data = Object.fromEntries(charArray)
 verifyObjKeys(data, allCharacterDataKeys)
-export const charHashData = data
+export const allCharHashData = data

libs/sr/dm-localization/src/executors/gen-locale/lib/sheetHashData.ts → libs/sr/dm-localization/src/executors/gen-locale/lib/charHashData/character.ts

@@ -1,4 +1,10 @@
-export const sheetHashData = {
+export const charHashData = {
+  label: {
+    one: '-1435714104', // Character
+    many: '-676993900', // Characters
+  },
+  eidolonLvl: '1102721995', // "Eidolon Level:"
+  traces: '1252031000',
   type: {
     physical: '-1101149179',
     quantum: '88513016',
@@ -8,15 +14,6 @@ export const sheetHashData = {
     fire: '-1474263915',
     imaginary: '118034640',
   },
-  path: {
-    Erudition: '-953720572',
-    Preservation: '-1357005099',
-    Abundance: '1371878256',
-    Nihility: '-1760289626',
-    Destruction: '209078842',
-    Harmony: '-194205685',
-    TheHunt: '612363369',
-  },
   ability: {
     basic: '216145179',
     skill: '216145178',
@@ -32,7 +29,4 @@ export const sheetHashData = {
     support: '1560729279',
     impair: '397929865',
   },
-  eidolonLvl: '1102721995', //"Eidolon Level:"
-  lvl: '982642653', //"Lv."
-  superimpose: '-2008197403', //"Superimposition"
 }

libs/sr/dm-localization/src/executors/gen-locale/lib/charHashData/index.ts

@@ -0,0 +1,2 @@
+export * from './allCharacters'
+export * from './character'

libs/sr/dm-localization/src/executors/gen-locale/lib/hashData.ts

@@ -4,47 +4,71 @@ import {
   allLightConeKeys,
   allRelicSetKeys,
 } from '@genshin-optimizer/sr/consts'
-import { charHashData } from './charHashData'
-import { lightConeHashData } from './lightConeHashData'
-import { relicHashData } from './relicHashData'
-import { sheetHashData } from './sheetHashData'
+import { allCharHashData, charHashData } from './charHashData'
+import { allLightConeHashData, lightConeHashData } from './lightConeHashData'
+import { allRelicHashData, relicHashData } from './relicHashData'
+import { uiHashData } from './uiHashData'
 
 export type LanguageData = typeof HashData
 
 const charNames = Object.fromEntries(
-  Object.entries(charHashData).map(([key, data]) => [key, data.name])
+  Object.entries(allCharHashData).map(([key, data]) => [key, data.name])
 )
 verifyObjKeys(charNames, allCharacterDataKeys)
 
 const relicNames = Object.fromEntries(
-  Object.entries(relicHashData).map(([key, data]) => [key, data.setName])
+  Object.entries(allRelicHashData).map(([key, data]) => [key, data.setName])
 )
 verifyObjKeys(relicNames, allRelicSetKeys)
 
 const lightConeNames = Object.fromEntries(
-  Object.entries(lightConeHashData).map(([key, data]) => [key, data.name])
+  Object.entries(allLightConeHashData).map(([key, data]) => [key, data.name])
 )
 verifyObjKeys(lightConeNames, allLightConeKeys)
 
 export const HashData = {
-  char: charHashData,
+  char: allCharHashData,
   charNames,
+  characters: charHashData,
 
-  relic: relicHashData,
+  relic: allRelicHashData,
   relicNames,
+  relics: relicHashData,
 
-  lightCone: lightConeHashData,
+  lightCone: allLightConeHashData,
   lightConeNames,
+  lightCones: lightConeHashData,
 
-  sheet: sheetHashData,
-  slotKey: {
-    head: '1826268247',
-    hands: '-2144127003',
-    body: '1799740313',
-    feet: '1154536283',
-    sphere: '1873322474',
-    rope: '74129613',
+  ui: uiHashData,
+
+  common: {
+    level: '-636045037', // Level
+    lv: '982642653', // Lv.
+    rarity: '1898197464',
+  },
+
+  teams: {
+    label: '-839489437', // Team
+    name: '858715661', // Team Name
+    editTeam: '-756448810',
   },
+
+  paths: {
+    label: {
+      one: '-1952347303', // Path
+      many: '-815380608', // Paths
+    },
+    pathKey: {
+      Erudition: '-953720572',
+      Preservation: '-1357005099',
+      Abundance: '1371878256',
+      Nihility: '-1760289626',
+      Destruction: '209078842',
+      Harmony: '-194205685',
+      TheHunt: '612363369',
+    },
+  },
+
   statKey: {
     spd: '461357812',
     spd_: '461357812',

libs/sr/dm-localization/src/executors/gen-locale/lib/lightConeHashData.ts → libs/sr/dm-localization/src/executors/gen-locale/lib/lightConeHashData/allLightCones.ts

@@ -41,4 +41,4 @@ const lightConeArray = Object.entries(equipmentConfig).map(
 const data = Object.fromEntries(lightConeArray)
 verifyObjKeys(data, allLightConeKeys)
 
-export const lightConeHashData = data
+export const allLightConeHashData = data

libs/sr/dm-localization/src/executors/gen-locale/lib/lightConeHashData/index.ts

@@ -0,0 +1,2 @@
+export * from './allLightCones'
+export * from './lightCone'

libs/sr/dm-localization/src/executors/gen-locale/lib/lightConeHashData/lightCone.ts

@@ -0,0 +1,7 @@
+export const lightConeHashData = {
+  label: {
+    one: '-514739711', // Light Cone
+    many: '582917607', // Light Cones
+  },
+  superimposition: '-2008197403',
+}

libs/sr/dm-localization/src/executors/gen-locale/lib/relicHashData.ts → libs/sr/dm-localization/src/executors/gen-locale/lib/relicHashData/allRelics.ts

@@ -9,7 +9,7 @@ import {
   relicSetIdMap,
   relicSetSkillConfig,
 } from '@genshin-optimizer/sr/dm'
-import { convertToHash } from './util'
+import { convertToHash } from '../util'
 
 type RelicData = {
   setName: string
@@ -43,4 +43,4 @@ const relicArray = Object.entries(relicSetConfig).map(([setId, setConfig]) => {
 
 const data = Object.fromEntries(relicArray)
 verifyObjKeys(data, allRelicSetKeys)
-export const relicHashData = data
+export const allRelicHashData = data

libs/sr/dm-localization/src/executors/gen-locale/lib/relicHashData/index.ts

@@ -0,0 +1,2 @@
+export * from './allRelics'
+export * from './relic'

libs/sr/dm-localization/src/executors/gen-locale/lib/relicHashData/relic.ts

@@ -0,0 +1,14 @@
+export const relicHashData = {
+  label: '-1823495414', // Relics
+  set: '1604210092',
+  mainStat: '-338586359',
+  slot: '-1409515362',
+  slotKey: {
+    head: '1826268247',
+    hands: '-2144127003',
+    body: '1799740313',
+    feet: '1154536283',
+    sphere: '1873322474',
+    rope: '74129613',
+  },
+}

libs/sr/dm-localization/src/executors/gen-locale/lib/stringData.ts

@@ -21,6 +21,10 @@ export type InterpolationTag = keyof typeof interpolationTags
 // Process tags in string to template for i18n
 function processString(str: string | undefined) {
   if (str === undefined) str = ''
+
+  // Remove '{SPACE}' artifacts from certain strings
+  // Do this first to match curly brackets to prevent interfering with later str replacements
+  str = str.replace(/(.*?){SPACE}/g, '$1')
   // Find portion similar to
   // <color=#f29e38ff><unbreak>#1[i]%</unbreak></color>
   // replaces with '<color=#f29e38ff>#1[i]%</color>'

libs/sr/dm-localization/src/executors/gen-locale/lib/uiHashData.ts

@@ -0,0 +1,50 @@
+export const uiHashData = {
+  confirm: '35141102',
+  cancel: '-923369432',
+
+  open: '554533651',
+  close: '-316424440',
+
+  edit: '71676923',
+  preview: '1494310683',
+  save: '922770375',
+  delete: '1854908959',
+  clear: '-644581385',
+  reset: '1035909461',
+
+  add: '627092858',
+  remove: '1045883501',
+
+  locked: '936395545',
+  unlocked: '2032806954',
+  lockAll: '1539252863',
+  unlockAll: '-26831078',
+
+  excluded: '-1904552378',
+  includeSelected: '1476839551',
+  excludeSelected: '-1093811249',
+
+  activated: '-1242210091',
+  notActivated: '-732278832',
+
+  equipped: '1791115444',
+  unequipped: '-202463180',
+  currentlyEquipped: '1354485618',
+  notEquipped: '961141924',
+
+  equip: '-1174264395',
+  switch: '310431922',
+  compare: '111565860',
+
+  search: '1781769983',
+  filter: '-1811155248',
+  empty: '681643565',
+
+  inventory: '888911468',
+  settings: '-1818257148',
+
+  gender: {
+    F: '732414811',
+    M: '1491929698',
+  },
+}