From 275c6e791d5576cdeb7c6ced88d007c520ad08a8 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Wed, 20 May 2020 22:31:07 +0200 Subject: [PATCH] refactor(DB/acore_string): Rename locale columns (#2929) --- .../pending_db_world/rev_1587630388241612100.sql | 11 +++++++++++ src/server/game/Globals/ObjectMgr.cpp | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1587630388241612100.sql diff --git a/data/sql/updates/pending_db_world/rev_1587630388241612100.sql b/data/sql/updates/pending_db_world/rev_1587630388241612100.sql new file mode 100644 index 000000000..5bdd067a3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1587630388241612100.sql @@ -0,0 +1,11 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1587630388241612100'); + +ALTER TABLE `acore_string` + CHANGE `content_loc1` `locale_koKR` TEXT, + CHANGE `content_loc2` `locale_frFR` TEXT, + CHANGE `content_loc3` `locale_deDE` TEXT, + CHANGE `content_loc4` `locale_zhCN` TEXT, + CHANGE `content_loc5` `locale_zhTW` TEXT, + CHANGE `content_loc6` `locale_esES` TEXT, + CHANGE `content_loc7` `locale_esMX` TEXT, + CHANGE `content_loc8` `locale_ruRU` TEXT; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index cd6dd22b3..0e8b3f3cd 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7756,7 +7756,7 @@ bool ObjectMgr::LoadAcoreStrings() uint32 oldMSTime = getMSTime(); _acoreStringStore.clear(); // for reload case - QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8 FROM acore_string"); + QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, locale_koKR, locale_frFR, locale_deDE, locale_zhCN, locale_zhTW, locale_esES, locale_esMX, locale_ruRU FROM acore_string"); if (!result) { sLog->outString(">> Loaded 0 acore strings. DB table `acore_strings` is empty."); @@ -7795,7 +7795,7 @@ char const* ObjectMgr::GetAcoreString(uint32 entry, LocaleConstant locale) const return ts->Content[DEFAULT_LOCALE].c_str(); } - sLog->outErrorDb("Trinity string entry %u not found in DB.", entry); + sLog->outErrorDb("Acore string entry %u not found in DB.", entry); return ""; }