From a39881e73ff838d0a66b25936fa2f6655313f81e Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Thu, 11 Jan 2024 23:03:10 +0100 Subject: [PATCH] Misc/Fixup * fixed borked Lang::load in setup after d0d2451ff51157728e622142c3be7ae0ba7dcebe --- setup/tools/clisetup/account.func.php | 2 +- setup/tools/filegen/enchants.func.php | 6 +++--- setup/tools/filegen/gems.func.php | 2 +- setup/tools/filegen/glyphs.func.php | 2 +- setup/tools/filegen/itemsets.func.php | 2 +- setup/tools/filegen/pets.func.php | 2 +- setup/tools/filegen/profiler.func.php | 14 +++++++------- setup/tools/filegen/talentCalc.func.php | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/setup/tools/clisetup/account.func.php b/setup/tools/clisetup/account.func.php index a6637ecc..defce766 100644 --- a/setup/tools/clisetup/account.func.php +++ b/setup/tools/clisetup/account.func.php @@ -20,7 +20,7 @@ function account() : void ); User::useLocale(LOCALE_EN); - Lang::load(Util::$localeStrings[LOCALE_EN]); + Lang::load(LOCALE_EN); if (CLI::read($fields)) { diff --git a/setup/tools/filegen/enchants.func.php b/setup/tools/filegen/enchants.func.php index 4727df56..951a2ce7 100644 --- a/setup/tools/filegen/enchants.func.php +++ b/setup/tools/filegen/enchants.func.php @@ -13,13 +13,13 @@ if (!CLI) /* Examples 15: { - name:'Leichtes Rüstungsset', + name:'Leichtes Rüstungsset', quality:1, icon:'INV_Misc_ArmorKit_17', source:-2304, skill:-1, slots:525008, - enchantment:'Verstärkt (+8 Rüstung)', + enchantment:'Verstärkt (+8 Rüstung)', jsonequip:{"armor":8,"reqlevel":1}, temp:0, classes:0, @@ -96,7 +96,7 @@ if (!CLI) foreach (CLISetup::$localeIds as $lId) { User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); $enchantsOut = []; foreach ($enchantSpells as $esId => $es) diff --git a/setup/tools/filegen/gems.func.php b/setup/tools/filegen/gems.func.php index f1719e7e..1d93fdc3 100644 --- a/setup/tools/filegen/gems.func.php +++ b/setup/tools/filegen/gems.func.php @@ -66,7 +66,7 @@ if (!CLI) set_time_limit(5); User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); $gemsOut = []; foreach ($gems as $pop) diff --git a/setup/tools/filegen/glyphs.func.php b/setup/tools/filegen/glyphs.func.php index f39914d2..a7fd25bb 100644 --- a/setup/tools/filegen/glyphs.func.php +++ b/setup/tools/filegen/glyphs.func.php @@ -55,7 +55,7 @@ if (!CLI) set_time_limit(30); User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); $glyphsOut = []; foreach ($glyphSpells->iterate() as $__) diff --git a/setup/tools/filegen/itemsets.func.php b/setup/tools/filegen/itemsets.func.php index 36c1b24c..a0ba2466 100644 --- a/setup/tools/filegen/itemsets.func.php +++ b/setup/tools/filegen/itemsets.func.php @@ -45,7 +45,7 @@ if (!CLI) foreach (CLISetup::$localeIds as $lId) { User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); $itemsetOut = []; foreach ($setList as $set) diff --git a/setup/tools/filegen/pets.func.php b/setup/tools/filegen/pets.func.php index ee2bb476..c255efb7 100644 --- a/setup/tools/filegen/pets.func.php +++ b/setup/tools/filegen/pets.func.php @@ -59,7 +59,7 @@ if (!CLI) foreach (CLISetup::$localeIds as $lId) { User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); $petsOut = []; foreach ($petList as $pet) diff --git a/setup/tools/filegen/profiler.func.php b/setup/tools/filegen/profiler.func.php index e014e830..6a4fb254 100644 --- a/setup/tools/filegen/profiler.func.php +++ b/setup/tools/filegen/profiler.func.php @@ -115,7 +115,7 @@ if (!CLI) set_time_limit(20); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); if (!$relCurr->error) { @@ -166,7 +166,7 @@ if (!CLI) set_time_limit(5); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); foreach ([0, 1] as $g) // gender { @@ -220,7 +220,7 @@ if (!CLI) set_time_limit(5); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); $buff = "var _ = g_spells;\n"; foreach ($mountz->getListviewData(ITEMINFO_MODEL) as $id => $data) @@ -269,7 +269,7 @@ if (!CLI) set_time_limit(5); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); $buff = "var _ = g_spells;\n"; foreach ($companionz->getListviewData(ITEMINFO_MODEL) as $id => $data) @@ -307,7 +307,7 @@ if (!CLI) set_time_limit(5); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); $buff = "var _ = g_factions;\n"; foreach ($factionz->getListviewData() as $id => $data) @@ -361,7 +361,7 @@ if (!CLI) set_time_limit(10); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); $buff = ''; foreach ($recipez->getListviewData() as $id => $data) @@ -408,7 +408,7 @@ if (!CLI) set_time_limit(5); User::useLocale($l); - Lang::load(Util::$localeStrings[$l]); + Lang::load($l); $sumPoints = 0; $buff = "var _ = g_achievements;\n"; diff --git a/setup/tools/filegen/talentCalc.func.php b/setup/tools/filegen/talentCalc.func.php index 10e6d68d..cb540920 100644 --- a/setup/tools/filegen/talentCalc.func.php +++ b/setup/tools/filegen/talentCalc.func.php @@ -176,7 +176,7 @@ if (!CLI) foreach (CLISetup::$localeIds as $lId) { User::useLocale($lId); - Lang::load(Util::$localeStrings[$lId]); + Lang::load($lId); // TalentCalc foreach ($classes as $cMask)