diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-16 15:36:06 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-16 15:36:06 +0200 |
| commit | 163077bd98d32166cc0e205607e8dd3247e409de (patch) | |
| tree | b224b23f63a6ae758ff0dbc9bf831ffa69cb61b7 | |
| parent | bda0e60f98cc7e07fe50bff6a4842c2791ec3ef7 (diff) | |
EXT-6013 Normal [HARD CODED] - Group Invitation, Group Roles: The group roles need to be localized
reviwed https://codereview.productengine.com/secondlife/r/22/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llgroupmgr.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
2 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index aeac3841f9..7f93a357de 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -54,6 +54,7 @@ #include "llgroupactions.h" #include "llnotificationsutil.h" #include "lluictrlfactory.h" +#include "lltrans.h" #include <boost/regex.hpp> #if LL_MSVC @@ -1062,6 +1063,24 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data) msg->getU64("RoleData","Powers",powers,i); msg->getU32("RoleData","Members",member_count,i); + //there are 3 predifined roles - Owners, Officers, Everyone + //there names are defined in lldatagroups.cpp + //lets change names from server to localized strings + if(name == "Everyone") + { + name = LLTrans::getString("group_role_everyone"); + } + else if(name == "Officers") + { + name = LLTrans::getString("group_role_officers"); + } + else if(name == "Owners") + { + name = LLTrans::getString("group_role_owners"); + } + + + lldebugs << "Adding role data: " << name << " {" << role_id << "}" << llendl; LLGroupRoleData* rd = new LLGroupRoleData(role_id,name,title,desc,powers,member_count); group_data->mRoles[role_id] = rd; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 725539cee5..7d230bdf41 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3028,5 +3028,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. </string>" <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> + <string name="group_role_everyone">Everyone</string> + <string name="group_role_officers">Officers</string> + <string name="group_role_owners">Owners</string> </strings> |