Partial cherry-pick 653954c14d6136295691e18d7e21918d46d0761f to fix build

Core/Misc:
- Update LocaleConstant enum
- Update Quest locale system for WoD
- Fix some rnd typo in quest template

Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Packets/QuestPackets.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Common.cpp
	src/server/shared/Common.h
This commit is contained in:
ariel- committed 2016-01-11 23:27:47 -03:00
1 parent b14208520e
commit 471002f233
3 files changed
+14 -12

No files matched your search

+4 -3
View File
@@ -27,15 +27,16 @@ char const* localeNames[TOTAL_LOCALES] = {
"zhTW",
"esES",
"esMX",
"ruRU"
"ruRU",
"none",
"ptBR"
};
LocaleConstant GetLocaleByName(const std::string& name)
{
for (uint32 i = 0; i < TOTAL_LOCALES; ++i)
if (name==localeNames[i])
if (name == localeNames[i])
return LocaleConstant(i);
return LOCALE_enUS; // including enGB case
}