From 163077bd98d32166cc0e205607e8dd3247e409de Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 16 Mar 2010 15:36:06 +0200
Subject: 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
---
 indra/newview/llgroupmgr.cpp                   | 19 +++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml |  3 +++
 2 files changed, 22 insertions(+)

(limited to 'indra/newview')

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>
-- 
cgit v1.2.3