diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index d4422174e..d2c8d20db 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -1591,10 +1591,10 @@ namespace NLGUI parentId = _Paragraph->getId(); } - CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, parentId+":"+id, tmplParams); + CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, this->_Id+":"+id, tmplParams); if (inst) { - inst->setId(parentId+":"+id); + inst->setId(this->_Id+":"+id); inst->updateCoords(); if (haveParentDiv) { diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index ec9742319..72474e7f6 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -527,6 +527,8 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls) LUABIND_FUNC(getPlayerSelectedSlot), LUABIND_FUNC(isInGame), LUABIND_FUNC(isPlayerSlotNewbieLand), + LUABIND_FUNC(getSheetLocalizedName), + LUABIND_FUNC(getSheetLocalizedDesc), LUABIND_FUNC(getSkillIdFromName), LUABIND_FUNC(getSkillLocalizedName), LUABIND_FUNC(getMaxSkillValue), @@ -3106,6 +3108,20 @@ bool CLuaIHMRyzom::isPlayerSlotNewbieLand(uint32 slot) return CharacterSummaries[slot].InNewbieland; } +// *************************************************************************** +ucstring CLuaIHMRyzom::getSheetLocalizedName(const std::string &sheet) +{ + return ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedName(CSheetId(sheet))); +} + +// *************************************************************************** +ucstring CLuaIHMRyzom::getSheetLocalizedDesc(const std::string &sheet) +{ + return ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(CSheetId(sheet))); +} + + + // *************************************************************************** sint32 CLuaIHMRyzom::getSkillIdFromName(const std::string &def) { diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h index c86167878..306ce45f6 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h @@ -178,6 +178,8 @@ private: static bool isPlayerSlotNewbieLand(uint32 slot); // test if one of the player slot is a newbieland one, if not so, client must be patched in order to continue // GameInfo + static ucstring getSheetLocalizedName(const std::string &sheet); + static ucstring getSheetLocalizedDesc(const std::string &sheet); static sint32 getSkillIdFromName(const std::string &def); static ucstring getSkillLocalizedName(sint32 skillId); static sint32 getMaxSkillValue(sint32 skillId);